diff --git a/mallinkAdmin/pom.xml b/mallinkAdmin/pom.xml index 13278b661..bf44f1930 100644 --- a/mallinkAdmin/pom.xml +++ b/mallinkAdmin/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - + mallink com.simple 1.0 diff --git a/mallinkAdmin/src/main/java/com/simple/config/RedisConfig.java b/mallinkAdmin/src/main/java/com/simple/config/RedisConfig.java new file mode 100644 index 000000000..b4187b35c --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/config/RedisConfig.java @@ -0,0 +1,46 @@ +package com.simple.config; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.cache.annotation.CachingConfigurerSupport; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import redis.clients.jedis.JedisPool; +import redis.clients.jedis.JedisPoolConfig; + +/** + * Created by yangqj on 2017/4/30. + */ +@Configuration +@EnableCaching +public class RedisConfig extends CachingConfigurerSupport { + @Value("${spring.redis.host}") + private String host; + + @Value("${spring.redis.port}") + private int port; + + @Value("${spring.redis.timeout}") + private int timeout; + + @Value("${spring.redis.pool.max-idle}") + private int maxIdle; + + @Value("${spring.redis.pool.max-wait}") + private long maxWaitMillis; + + @Bean + public JedisPool redisPoolFactory() { + Logger.getLogger(getClass()).info("JedisPool注入成功!!"); + Logger.getLogger(getClass()).info("redis地址:" + host + ":" + port); + JedisPoolConfig jedisPoolConfig = new JedisPoolConfig(); + jedisPoolConfig.setMaxIdle(maxIdle); + jedisPoolConfig.setMaxWaitMillis(maxWaitMillis); + + JedisPool jedisPool = new JedisPool(jedisPoolConfig, host, port, timeout); + + return jedisPool; + } + +} diff --git a/mallinkAdmin/src/main/java/com/simple/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/simple/config/ShiroConfig.java new file mode 100644 index 000000000..8a23c2ce1 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/config/ShiroConfig.java @@ -0,0 +1,210 @@ +package com.simple.config; + +import java.util.LinkedHashMap; +import java.util.Map; + +import org.apache.shiro.authc.credential.HashedCredentialsMatcher; +import org.apache.shiro.mgt.SecurityManager; +import org.apache.shiro.spring.LifecycleBeanPostProcessor; +import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor; +import org.apache.shiro.spring.web.ShiroFilterFactoryBean; +import org.apache.shiro.web.mgt.DefaultWebSecurityManager; +import org.apache.shiro.web.session.mgt.DefaultWebSessionManager; +import org.crazycake.shiro.RedisCacheManager; +import org.crazycake.shiro.RedisManager; +import org.crazycake.shiro.RedisSessionDAO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import com.simple.service.SysPermissionService; +import com.simple.shiro.MyShiroRealm; + +/** + * Created by yangqj on 2017/4/23. + */ +@Configuration +public class ShiroConfig { + @Autowired(required = false) + private SysPermissionService resourcesService; + + @Value("${spring.redis.host}") + private String host; + + @Value("${spring.redis.port}") + private int port; + + @Value("${spring.redis.timeout}") + private int timeout; + + @Value("${spring.redis.expire}") + private int expire; + + @Bean + public static LifecycleBeanPostProcessor getLifecycleBeanPostProcessor() { + return new LifecycleBeanPostProcessor(); + } + + /** + * ShiroDialect,为了在thymeleaf里使用shiro的标签的bean + * @return + */ +// @Bean +// public ShiroDialect shiroDialect() { +// return new ShiroDialect(); +// } + /** + * ShiroFilterFactoryBean 处理拦截资源文件问题。 + * 注意:单独一个ShiroFilterFactoryBean配置是或报错的,因为在 + * 初始化ShiroFilterFactoryBean的时候需要注入:SecurityManager + * + Filter Chain定义说明 + 1、一个URL可以配置多个Filter,使用逗号分隔 + 2、当设置多个过滤器时,全部验证通过,才视为通过 + 3、部分过滤器可指定参数,如perms,roles + * + */ + @Bean + public ShiroFilterFactoryBean shirFilter(SecurityManager securityManager){ + System.out.println("ShiroConfiguration.shirFilter()"); + ShiroFilterFactoryBean shiroFilterFactoryBean = new ShiroFilterFactoryBean(); + + // 必须设置 SecurityManager + shiroFilterFactoryBean.setSecurityManager(securityManager); + // 如果不设置默认会自动寻找Web工程根目录下的"/login.jsp"页面 + shiroFilterFactoryBean.setLoginUrl("/login"); + // 登录成功后要跳转的链接 + + shiroFilterFactoryBean.setSuccessUrl("/usersPage"); + //未授权界面; + shiroFilterFactoryBean.setUnauthorizedUrl("/403"); + //拦截器. + Map filterChainDefinitionMap = new LinkedHashMap(); + + //配置退出 过滤器,其中的具体的退出代码Shiro已经替我们实现了 + filterChainDefinitionMap.put("/logout", "logout"); + filterChainDefinitionMap.put("/doLogin/**","anon"); + filterChainDefinitionMap.put("/css/**","anon"); + filterChainDefinitionMap.put("/js/**","anon"); + filterChainDefinitionMap.put("/img/**","anon"); + filterChainDefinitionMap.put("/font-awesome/**","anon"); + //:这是一个坑呢,一不小心代码就不好使了; + // + //自定义加载权限资源关系 +// Map map = new HashMap<>(); +// List resourcesList = resourcesService.list(map); +// for(SysPermission resources:resourcesList){ +// +// if (StringUtil.isNotEmpty(resources.getUrl())) { +// String permission = "perms[" + resources.getUrl()+ "]"; +// filterChainDefinitionMap.put(resources.getUrl(),permission); +// } +// } + filterChainDefinitionMap.put("/**", "authc"); + + + shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); + return shiroFilterFactoryBean; + } + + + @Bean + public SecurityManager securityManager(){ + DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager(); + //设置realm. + securityManager.setRealm(myShiroRealm()); + // 自定义缓存实现 使用redis + //securityManager.setCacheManager(cacheManager()); + // 自定义session管理 使用redis + securityManager.setSessionManager(sessionManager()); + return securityManager; + } + + @Bean + public MyShiroRealm myShiroRealm(){ + MyShiroRealm myShiroRealm = new MyShiroRealm(); + myShiroRealm.setCredentialsMatcher(hashedCredentialsMatcher()); + return myShiroRealm; + } + + /** + * 凭证匹配器 + * (由于我们的密码校验交给Shiro的SimpleAuthenticationInfo进行处理了 + * 所以我们需要修改下doGetAuthenticationInfo中的代码; + * ) + * @return + */ + @Bean + public HashedCredentialsMatcher hashedCredentialsMatcher(){ + HashedCredentialsMatcher hashedCredentialsMatcher = new HashedCredentialsMatcher(); + + hashedCredentialsMatcher.setHashAlgorithmName("md5");//散列算法:这里使用MD5算法; + hashedCredentialsMatcher.setHashIterations(2);//散列的次数,比如散列两次,相当于 md5(md5("")); + + return hashedCredentialsMatcher; + } + + + /** + * 开启shiro aop注解支持. + * 使用代理方式;所以需要开启代码支持; + * @param securityManager + * @return + */ + @Bean + public AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor(SecurityManager securityManager){ + AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor = new AuthorizationAttributeSourceAdvisor(); + authorizationAttributeSourceAdvisor.setSecurityManager(securityManager); + return authorizationAttributeSourceAdvisor; + } + + /** + * 配置shiro redisManager + * 使用的是shiro-redis开源插件 + * @return + */ + public RedisManager redisManager() { + RedisManager redisManager = new RedisManager(); + redisManager.setHost(host); + redisManager.setPort(port); + redisManager.setExpire(expire);// 配置缓存过期时间 + redisManager.setTimeout(timeout); + // redisManager.setPassword(password); + return redisManager; + } + + /** + * cacheManager 缓存 redis实现 + * 使用的是shiro-redis开源插件 + * @return + */ + public RedisCacheManager cacheManager() { + RedisCacheManager redisCacheManager = new RedisCacheManager(); + redisCacheManager.setRedisManager(redisManager()); + return redisCacheManager; + } + + + /** + * RedisSessionDAO shiro sessionDao层的实现 通过redis + * 使用的是shiro-redis开源插件 + */ + @Bean + public RedisSessionDAO redisSessionDAO() { + RedisSessionDAO redisSessionDAO = new RedisSessionDAO(); + redisSessionDAO.setRedisManager(redisManager()); + return redisSessionDAO; + } + + /** + * shiro session的管理 + */ + @Bean + public DefaultWebSessionManager sessionManager() { + DefaultWebSessionManager sessionManager = new DefaultWebSessionManager(); + sessionManager.setSessionDAO(redisSessionDAO()); + return sessionManager; + } + +} diff --git a/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java b/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java new file mode 100644 index 000000000..76f1361c5 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java @@ -0,0 +1,59 @@ +package com.simple.controller; + +import java.util.List; +import java.util.stream.Collectors; + +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authc.UsernamePasswordToken; +import org.apache.shiro.subject.Subject; +import org.omg.CORBA.SystemException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.simple.common.ErrorCode; +import com.simple.common.Result; +import com.simple.common.ResultData; +import com.simple.domain.po.SysPermission; +import com.simple.domain.po.SysRole; +import com.simple.domain.po.UserInfo; +import com.simple.service.SysPermissionService; +import com.simple.service.SysRoleService; + + +@RestController +public class HomeController { + + @Autowired + private SysRoleService sysRoleService; + + @Autowired + private SysPermissionService sysPermissionService; + + @GetMapping("login") + public ResultData login() { + return new ResultData(Result.UNLOGIN, "用户未登录"); + } + + @GetMapping("/doLogin") + public ResultData login(UserInfo user) { + if (StringUtils.isEmpty(user.getUsername()) || StringUtils.isEmpty(user.getPassword())) { +// throw new SystemException(ErrorCode.LOGIN_USER_OR_PWD_ERROR); + return new ResultData(ResultData.ERROR); + } + Subject subject = SecurityUtils.getSubject(); + UsernamePasswordToken token = new UsernamePasswordToken(user.getUsername(), user.getPassword()); + subject.login(token); + List roleList = sysRoleService.findRoleByUserId(user.getId()); + if (null != roleList && roleList.size() > 0) { + List permissionList = sysPermissionService + .findPermissionByRoleIds(roleList.stream().map(SysRole::getId).collect(Collectors.toList())); + // user.setRole(roleList); + user.setPermission(permissionList); + } + return new ResultData(); + + } + +} \ No newline at end of file diff --git a/mallinkAdmin/src/main/java/com/simple/controller/RoleController.java b/mallinkAdmin/src/main/java/com/simple/controller/RoleController.java new file mode 100644 index 000000000..5cf3bac3f --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/controller/RoleController.java @@ -0,0 +1,74 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; +import com.simple.domain.po.SysRole; +import com.simple.service.SysRolePermissionService; +import com.simple.service.SysRoleService; + +@RestController +@RequestMapping("role") +public class RoleController { + + @Autowired + private SysRoleService sysRoleService; + + @Autowired + private SysRolePermissionService SysRolePermissionService; + + private Logger logger = Logger.getLogger(RoleController.class); + + @GetMapping("list") + public ResultData list(SysRole sysRole,Integer pageNum, Integer pageSize) { + final PageInfo page = sysRoleService.listAsPage(sysRole, pageNum, pageSize); + return new ResultData(page); + } + + @PostMapping("add") + public ResultData add(SysRole sysRole) { + Assert.notNull(sysRole.getName(), "角色名不能为空"); + Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + sysRoleService.saveOrUpdate(sysRole); + return new ResultData(); + } + + @PostMapping("update") + public ResultData update(SysRole sysRole) { + if (sysRole.getName() != null) { + System.out.println(checkUnique(sysRole.getName(), sysRole.getId())); + Assert.isTrue(!checkUnique(sysRole.getName(), sysRole.getId()), "角色名已存在"); + } + sysRoleService.saveOrUpdate(sysRole); +// Assert.notNull(sysRole.getName(), "角色名不能为空"); + return new ResultData(); + } + + @GetMapping("/del") + public ResultData delete(String id) { + sysRoleService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @GetMapping("setPermission") + public ResultData setPermission(String roleId, String perId) { + Assert.notNull(perId,"请选择权限"); + String[] perIds = perId.split(","); + SysRolePermissionService.savePermissions(roleId, perIds); + return new ResultData(Result.SUCCESS, "设置角色权限成功", null); + + } + + private boolean checkUnique(String name, String id) { + return sysRoleService.countByName(name, id) > 0 ? true : false; + } + +} diff --git a/mallinkAdmin/src/main/java/com/simple/controller/SysPermissionController.java b/mallinkAdmin/src/main/java/com/simple/controller/SysPermissionController.java new file mode 100644 index 000000000..620fc7ea1 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/controller/SysPermissionController.java @@ -0,0 +1,55 @@ +package com.simple.controller; + +import org.apache.shiro.util.Assert; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; +import com.simple.domain.po.SysPermission; +import com.simple.service.SysPermissionService; + +/** + * @author chenkx + * @date 2018-01-05. + */ +@RestController +@RequestMapping("permission") +public class SysPermissionController { + + @Autowired + SysPermissionService sysPermissionService; + + @GetMapping("alllist") + public ResultData alllist(String ava) { + SysPermission record = new SysPermission(); + record.setAvailable(ava); + PageInfo permissions= sysPermissionService.listAsPage(record, 1, 10000); + return new ResultData(Result.SUCCESS, "查询成功", permissions.getList()); + } + + @PostMapping("add") + public ResultData createPermission(SysPermission sysPermission) { + Assert.notNull(sysPermission.getName(), "用户名不能为空"); + sysPermissionService.saveOrUpdate(sysPermission); + return new ResultData(sysPermission.getId()); + } + + @PostMapping("update") + public ResultData updatePermission(SysPermission sysPermission) { + sysPermissionService.saveOrUpdate(sysPermission); + return new ResultData(); + } + + @GetMapping("/del") + public ResultData delete(String id) { + sysPermissionService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + +} diff --git a/mallinkAdmin/src/main/java/com/simple/controller/UserInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/UserInfoController.java new file mode 100644 index 000000000..e34c48c6c --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/controller/UserInfoController.java @@ -0,0 +1,159 @@ +package com.simple.controller; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.shiro.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.github.pagehelper.PageInfo; +import com.simple.common.ResultData; +import com.simple.domain.po.SysUserRole; +import com.simple.domain.po.UserInfo; +import com.simple.service.SysUserRoleService; +import com.simple.service.UserInfoService; +import com.simple.shiro.PasswordHelper; +import com.simple.shiro.UserSession; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + +/** + * @author chenkx + * @date 2018-01-05. + */ +@Api(value = "API - UserInfoController", description = "用户接口") +@RestController +@RequestMapping("user") +public class UserInfoController { + + @Autowired + UserInfoService userInfoService; + + @Autowired + SysUserRoleService userRoleService; + + @ApiOperation(value = "用户分页接口", response = String.class) + @GetMapping("lists") + public ResultData listAsPage(UserInfo userInfo, Integer pageNum, Integer pageSize){ + final PageInfo page = userInfoService.listAsPage(userInfo, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation(value = "用户详情接口", response = String.class) + @GetMapping("detail") + public ResultData detail(String id){ + final UserInfo user = userInfoService.getById(id); + return new ResultData(user); + } + + @ApiOperation(value = "创建用户接口", response = String.class) + @PostMapping("add") + public ResultData createUser(UserInfo userInfo){ + Assert.notNull(userInfo.getUsername(), "用户名不能为空"); + Assert.isTrue(checkUnique(userInfo.getUsername(), 0), "重复的用户名"); + Assert.notNull(userInfo.getPassword(), "密码不能为空"); + PasswordHelper passwordHelper = new PasswordHelper(); + passwordHelper.encryptPassword(userInfo); + userInfoService.saveOrUpdate(userInfo); + return new ResultData(); + } + + @ApiOperation(value = "修改用户接口", response = String.class) + @PostMapping("update") + public ResultData updateUser(UserInfo userInfo){ + Assert.notNull(userInfo.getUsername(), "用户名不能为空"); + Assert.isTrue(checkUnique(userInfo.getUsername(), 1), "重复的用户名"); + Assert.notNull(userInfo.getPassword(), "密码不能为空"); + PasswordHelper passwordHelper = new PasswordHelper(); + passwordHelper.encryptPassword(userInfo); + userInfoService.saveOrUpdate(userInfo); + return new ResultData(); + } + + @ApiOperation(value = "删除用户接口", response = String.class) + @GetMapping("/del") + public ResultData deleteUser(String id) { + userInfoService.deleteUser(id); + return new ResultData(); + } + + /** + * 启用,停用用户 + * @param userId + * @param status + * @return + */ + @ApiOperation(value = "起停用户接口", response = String.class) + @GetMapping("status") + public ResultData modifyStatus(String userId, Integer status) { + UserInfo userInfo = userInfoService.getById(userId); + userInfo.setStatus(status); + userInfoService.saveOrUpdate(userInfo); + return new ResultData(userInfo); + } + + @ApiOperation(value = "用户添加角色接口", response = String.class) + @PostMapping("setRoles") + public ResultData setRoles(String userId,String roleIds) { + String[] roIds = roleIds.split(","); + List u2rs = new ArrayList<>(roIds.length); + for (String roleId : roIds) { + SysUserRole userRole = new SysUserRole(); + userRole.setRoleId(roleId); + userRole.setUid(userId); + u2rs.add(userRole); + } + userRoleService.batchInsert(u2rs); + return new ResultData(); + } + + private boolean checkUnique(String username, Integer type) { + if (type == 0) { + if (userInfoService.cntByUserName(username) > 0) { + return false; + } + } + if (type == 1) { + if (userInfoService.cntByUserName(username) > 1) { + return false; + } + } + return true; + } + + + @GetMapping("hasButtonPermission") + public ResultData hasButtonPermission(String permissions){ + Map map=new HashMap<>(); + for(String name:permissions.split(",")){ + String userId = (String) + SecurityUtils.getSubject().getSession().getAttribute(UserSession.userId); + boolean has =userInfoService.hasButtonPermission(userId, name); + map.put(name, has); + } +// StringBuffer buffer = new StringBuffer(); +// for(Entry entrySet :map.entrySet()){ +// buffer.append("var "+entrySet.getKey()); +// buffer.append("="+entrySet.getValue()); +// buffer.append(";"); +// } + //return new ResultData(buffer.toString()); + return new ResultData(map); + } + + @GetMapping("getUser") + public ResultData getUserInfo(){ + UserInfo info =(UserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); + ResultData data = new ResultData(); + data.data=info; + return data; + } +} diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxAppinfoController.java index d1761a031..8a56deb4b 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxAppinfoController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxAppinfo; import com.simple.service.WxAppinfoService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxBLogController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxBLogController.java index 38566ee27..886b4c811 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxBLogController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxBLogController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxBLog; import com.simple.service.WxBLogService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxBUserMerchantController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxBUserMerchantController.java index 3433eff7d..635190014 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxBUserMerchantController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxBUserMerchantController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxBUserMerchant; import com.simple.service.WxBUserMerchantService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxBannersController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxBannersController.java index a426eec58..16132ec9c 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxBannersController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxBannersController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxBanners; import com.simple.service.WxBannersService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxBusinessController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxBusinessController.java index ce29f52e9..540f30180 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxBusinessController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxBusiness; import com.simple.service.WxBusinessService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCLogController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCLogController.java index 103c9484c..3f84bc3a9 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCLogController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCLogController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxCLog; import com.simple.service.WxCLogService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserCarsController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserCarsController.java index 23510bced..071125a90 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserCarsController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserCarsController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxCUserCars; import com.simple.service.WxCUserCarsService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserCloudController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserCloudController.java index 2a865c2de..98a740796 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserCloudController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserCloudController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxCUserCloud; import com.simple.service.WxCUserCloudService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserController.java index eda908358..37984ac2b 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxCUser; import com.simple.service.WxCUserService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserEtcpTokenController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserEtcpTokenController.java new file mode 100644 index 000000000..a3eb086d5 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserEtcpTokenController.java @@ -0,0 +1,65 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxCUserEtcpToken; +import com.simple.service.WxCUserEtcpTokenService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; + +@RestController +@RequestMapping("wxCUserEtcpToken") +public class WxCUserEtcpTokenController extends BaseController +{ + @Autowired + private WxCUserEtcpTokenService wxCUserEtcpTokenService; + + private Logger logger = Logger.getLogger(WxCUserEtcpTokenController.class); + + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxCUserEtcpToken wxCUserEtcpToken,Integer pageNum, Integer pageSize) { + if (null == wxCUserEtcpToken) wxCUserEtcpToken = new WxCUserEtcpToken(); + final PageInfo page = wxCUserEtcpTokenService.listAsPage(wxCUserEtcpToken, pageNum, pageSize); + return new ResultData(page); + } + + @PostMapping("add") + public ResultData add(@RequestBody WxCUserEtcpToken wxCUserEtcpToken) { + //Assert.notNull(wxCUserEtcpToken.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCUserEtcpTokenService.saveOrUpdate(wxCUserEtcpToken); + return new ResultData(); + } + + @PostMapping("update") + public ResultData update(@RequestBody WxCUserEtcpToken wxCUserEtcpToken) { + wxCUserEtcpTokenService.saveOrUpdate(wxCUserEtcpToken); + return new ResultData(); + } + + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true) + public ResultData delete(String id) { + wxCUserEtcpTokenService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true) + public ResultData findById(String id) { + return new ResultData(Result.SUCCESS,"查询成功",wxCUserEtcpTokenService.getById(id)); + } + + + +} diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserTagsController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserTagsController.java index 379d21002..baf43284c 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserTagsController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserTagsController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxCUserTags; import com.simple.service.WxCUserTagsService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponActionLogController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponActionLogController.java index bff51d202..756f5cb82 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponActionLogController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponActionLogController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxCouponActionLog; import com.simple.service.WxCouponActionLogService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponActivityController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponActivityController.java index f54ab5606..8befb34d5 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponActivityController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponActivityController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxCouponActivity; import com.simple.service.WxCouponActivityService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java index 65428a3e7..58467ed03 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxCoupon; import com.simple.service.WxCouponService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponRecordController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponRecordController.java index 0bdc3c03b..21f1f1fea 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponRecordController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponRecordController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxCouponRecord; import com.simple.service.WxCouponRecordService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponTypeController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponTypeController.java index fcc8d7f29..fbf11c730 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponTypeController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponTypeController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxCouponType; import com.simple.service.WxCouponTypeService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java index 8b62627cf..9f09e5b43 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxEtcpCouponRecord; import com.simple.service.WxEtcpCouponRecordService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java index 84fdfe97f..fd198087d 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxEtcpParkDissolution; import com.simple.service.WxEtcpParkDissolutionService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkInController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkInController.java index fe370ad44..65cddd04b 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkInController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkInController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxEtcpParkIn; import com.simple.service.WxEtcpParkInService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java index a051cade7..ef8f594bd 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxEtcpParkMsgSuc; import com.simple.service.WxEtcpParkMsgSucService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java index 86768578a..3938e280d 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxEtcpParkOrderunpay; import com.simple.service.WxEtcpParkOrderunpayService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOutController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOutController.java index f514fdb09..de04cf11b 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOutController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOutController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxEtcpParkOut; import com.simple.service.WxEtcpParkOutService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java index 72d505014..a3f12be50 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxEtcpParkTransaction; import com.simple.service.WxEtcpParkTransactionService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java index 5240a6532..b0b2ee725 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxEtcpParkUnbind; import com.simple.service.WxEtcpParkUnbindService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxFlashSaleController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxFlashSaleController.java index 454e1ffe0..0defb49e1 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxFlashSaleController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxFlashSaleController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxFlashSale; import com.simple.service.WxFlashSaleService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMallBuildingController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMallBuildingController.java index e09199a9a..1d0a17624 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMallBuildingController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMallBuildingController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxMallBuilding; import com.simple.service.WxMallBuildingService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMallController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMallController.java index 4f62dc142..c64cbb591 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMallController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMallController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxMall; import com.simple.service.WxMallService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMallFloorController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMallFloorController.java index d2c900c0b..6145bf6aa 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMallFloorController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMallFloorController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxMallFloor; import com.simple.service.WxMallFloorService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java index 1c47bd7ad..d33f77fdf 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxMerchant; import com.simple.service.WxMerchantService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantShopController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantShopController.java index 0c3c21691..73b885b16 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantShopController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantShopController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxMerchantShop; import com.simple.service.WxMerchantShopService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantTradeDaysController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantTradeDaysController.java index 5ab8ba092..1d5804c60 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantTradeDaysController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantTradeDaysController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxMerchantTradeDays; import com.simple.service.WxMerchantTradeDaysService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgConfigController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgConfigController.java new file mode 100644 index 000000000..1b6abefe0 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgConfigController.java @@ -0,0 +1,65 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxMsgConfig; +import com.simple.service.WxMsgConfigService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; + +@RestController +@RequestMapping("wxMsgConfig") +public class WxMsgConfigController extends BaseController +{ + @Autowired + private WxMsgConfigService wxMsgConfigService; + + private Logger logger = Logger.getLogger(WxMsgConfigController.class); + + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxMsgConfig wxMsgConfig,Integer pageNum, Integer pageSize) { + if (null == wxMsgConfig) wxMsgConfig = new WxMsgConfig(); + final PageInfo page = wxMsgConfigService.listAsPage(wxMsgConfig, pageNum, pageSize); + return new ResultData(page); + } + + @PostMapping("add") + public ResultData add(@RequestBody WxMsgConfig wxMsgConfig) { + //Assert.notNull(wxMsgConfig.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMsgConfigService.saveOrUpdate(wxMsgConfig); + return new ResultData(); + } + + @PostMapping("update") + public ResultData update(@RequestBody WxMsgConfig wxMsgConfig) { + wxMsgConfigService.saveOrUpdate(wxMsgConfig); + return new ResultData(); + } + + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true) + public ResultData delete(String id) { + wxMsgConfigService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true) + public ResultData findById(String id) { + return new ResultData(Result.SUCCESS,"查询成功",wxMsgConfigService.getById(id)); + } + + + +} diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java index e150f16f3..80a5e3637 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxMsg; import com.simple.service.WxMsgService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java index df8f6fd9d..2ad3f25a7 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxMsgModel; import com.simple.service.WxMsgModelService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgSignatureController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgSignatureController.java index 4c3df57e2..d170c1551 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgSignatureController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgSignatureController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxMsgSignature; import com.simple.service.WxMsgSignatureService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxOrdersController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxOrdersController.java index fd4c34300..3bc2ada0d 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxOrdersController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxOrdersController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxOrders; import com.simple.service.WxOrdersService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxParkController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxParkController.java index 3df5879ba..b5886d0f0 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxParkController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxParkController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxPark; import com.simple.service.WxParkService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxScoreHistoryController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxScoreHistoryController.java index f826ce76b..1ee827a6a 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxScoreHistoryController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxScoreHistoryController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxScoreHistory; import com.simple.service.WxScoreHistoryService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxScoreRulesController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxScoreRulesController.java index 570a1607e..5e610ac85 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxScoreRulesController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxScoreRulesController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxScoreRules; import com.simple.service.WxScoreRulesService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java index 136aa6a39..a9fc09025 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxScoreValidityPeriod; import com.simple.service.WxScoreValidityPeriodService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java index 0fe0f8686..e648b392a 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxShop; import com.simple.service.WxShopService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxTagsController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxTagsController.java index 5e245ebf3..2ddced75c 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxTagsController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxTagsController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxTags; import com.simple.service.WxTagsService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxWebLogController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxWebLogController.java index c1fa57afb..16b67ecd7 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxWebLogController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxWebLogController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxWebLog; import com.simple.service.WxWebLogService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/simple/shiro/MyShiroRealm.java b/mallinkAdmin/src/main/java/com/simple/shiro/MyShiroRealm.java new file mode 100644 index 000000000..4d6a83db1 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/shiro/MyShiroRealm.java @@ -0,0 +1,82 @@ +package com.simple.shiro; + +import javax.annotation.Resource; + +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authc.AuthenticationException; +import org.apache.shiro.authc.AuthenticationInfo; +import org.apache.shiro.authc.AuthenticationToken; +import org.apache.shiro.authc.SimpleAuthenticationInfo; +import org.apache.shiro.authc.UnknownAccountException; +import org.apache.shiro.authz.AuthorizationInfo; +import org.apache.shiro.authz.SimpleAuthorizationInfo; +import org.apache.shiro.realm.AuthorizingRealm; +import org.apache.shiro.session.Session; +import org.apache.shiro.subject.PrincipalCollection; +import org.apache.shiro.util.ByteSource; + +import com.simple.domain.po.UserInfo; +import com.simple.service.SysPermissionService; +import com.simple.service.UserInfoService; + +/** + * Created by yangqj on 2017/4/21. + */ +public class MyShiroRealm extends AuthorizingRealm { + + @Resource + private UserInfoService userService; + + @Resource + private SysPermissionService resourcesService; + + //授权 + @Override + protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principalCollection) { + UserInfo user= (UserInfo) SecurityUtils.getSubject().getPrincipal();//User{id=1, username='admin', password='3ef7164d1f6167cb9f2658c07d3c2f0a', enable=1} +// Map map = new HashMap(); +// map.put("userid",user.getId()); +// List resourcesList = resourcesService.list(map); +// 权限信息对象info,用来存放查出的用户的所有的角色(role)及权限(permission) + SimpleAuthorizationInfo info = new SimpleAuthorizationInfo(); +// for(SysPermission resources: resourcesList){ +// info.addStringPermission(resources.getUrl()); +// } + return info; + } + + //认证 + @Override + protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException { + //获取用户的输入的账号. + String username = (String)token.getPrincipal(); + UserInfo user = userService.getByName(username); + if(user==null) throw new UnknownAccountException(); +// if (0==user.getEnable()) { +// throw new LockedAccountException(); // 帐号锁定 +// } + SimpleAuthenticationInfo authenticationInfo = new SimpleAuthenticationInfo( + user, //用户 + user.getPassword(), //密码 + ByteSource.Util.bytes(username), + getName() //realm name + ); + // 当验证都通过后,把用户信息放在session里 + Session session = SecurityUtils.getSubject().getSession(); + session.setAttribute(UserSession.userInfo, user); + session.setAttribute(UserSession.userId, user.getId()); + return authenticationInfo; + } + + + /** + * 指定principalCollection 清除 + */ + /* public void clearCachedAuthorizationInfo(PrincipalCollection principalCollection) { + + SimplePrincipalCollection principals = new SimplePrincipalCollection( + principalCollection, getName()); + super.clearCachedAuthorizationInfo(principals); + } +*/ +} diff --git a/mallinkAdmin/src/main/java/com/simple/shiro/PasswordHelper.java b/mallinkAdmin/src/main/java/com/simple/shiro/PasswordHelper.java new file mode 100644 index 000000000..ea042a67e --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/shiro/PasswordHelper.java @@ -0,0 +1,22 @@ +package com.simple.shiro; + + +import org.apache.shiro.crypto.hash.SimpleHash; +import org.apache.shiro.util.ByteSource; + +import com.simple.domain.po.UserInfo; + +public class PasswordHelper { + //private RandomNumberGenerator randomNumberGenerator = new SecureRandomNumberGenerator(); + private String algorithmName = "md5"; + private int hashIterations = 2; + + public void encryptPassword(UserInfo user) { + //String salt=randomNumberGenerator.nextBytes().toHex(); + String newPassword = new SimpleHash(algorithmName, user.getPassword(), ByteSource.Util.bytes(user.getUsername()), hashIterations).toHex(); + //String newPassword = new SimpleHash(algorithmName, user.getPassword()).toHex(); + user.setPassword(newPassword); + + } + +} diff --git a/mallinkAdmin/src/main/java/com/simple/shiro/ShiroService.java b/mallinkAdmin/src/main/java/com/simple/shiro/ShiroService.java new file mode 100644 index 000000000..606c72797 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/shiro/ShiroService.java @@ -0,0 +1,132 @@ +package com.simple.shiro; + +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import org.apache.shiro.spring.web.ShiroFilterFactoryBean; +import org.apache.shiro.web.filter.mgt.DefaultFilterChainManager; +import org.apache.shiro.web.filter.mgt.PathMatchingFilterChainResolver; +import org.apache.shiro.web.servlet.AbstractShiroFilter; +import org.crazycake.shiro.RedisSessionDAO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.github.pagehelper.util.StringUtil; +import com.simple.domain.po.SysPermission; +import com.simple.service.SysPermissionService; + +/** + * Created by yangqj on 2017/4/30. + */ +@Service +public class ShiroService { + @Autowired + private ShiroFilterFactoryBean shiroFilterFactoryBean; + @Autowired + private SysPermissionService resourcesService; + @Autowired + private RedisSessionDAO redisSessionDAO; + /** + * 初始化权限 + */ + public Map loadFilterChainDefinitions() { + // 权限控制map.从数据库获取 + Map filterChainDefinitionMap = new LinkedHashMap(); + filterChainDefinitionMap.put("/logout", "logout"); + filterChainDefinitionMap.put("/css/**","anon"); + filterChainDefinitionMap.put("/js/**","anon"); + filterChainDefinitionMap.put("/img/**","anon"); + filterChainDefinitionMap.put("/user/**","anon"); + filterChainDefinitionMap.put("/font-awesome/**","anon"); +// Map map = new HashMap<>(); +// List resourcesList = resourcesService.list(map); +// for(SysPermission resources:resourcesList){ +// +// if (StringUtil.isNotEmpty(resources.getUrl())) { +// String permission = "perms[" + resources.getUrl()+ "]"; +// filterChainDefinitionMap.put(resources.getUrl(),permission); +// } +// } + filterChainDefinitionMap.put("/**", "authc"); + return filterChainDefinitionMap; + } + + /** + * 重新加载权限 + */ + public void updatePermission() { + + synchronized (shiroFilterFactoryBean) { + + AbstractShiroFilter shiroFilter = null; + try { + shiroFilter = (AbstractShiroFilter) shiroFilterFactoryBean + .getObject(); + } catch (Exception e) { + throw new RuntimeException( + "get ShiroFilter from shiroFilterFactoryBean error!"); + } + + PathMatchingFilterChainResolver filterChainResolver = (PathMatchingFilterChainResolver) shiroFilter + .getFilterChainResolver(); + DefaultFilterChainManager manager = (DefaultFilterChainManager) filterChainResolver + .getFilterChainManager(); + + // 清空老的权限控制 + manager.getFilterChains().clear(); + + shiroFilterFactoryBean.getFilterChainDefinitionMap().clear(); + shiroFilterFactoryBean + .setFilterChainDefinitionMap(loadFilterChainDefinitions()); + // 重新构建生成 + Map chains = shiroFilterFactoryBean + .getFilterChainDefinitionMap(); + for (Map.Entry entry : chains.entrySet()) { + String url = entry.getKey(); + String chainDefinition = entry.getValue().trim() + .replace(" ", ""); + manager.createChain(url, chainDefinition); + } + + System.out.println("更新权限成功!!"); + } + } + + /** + * 根据userId 清除当前session存在的用户的权限缓存 + * @param userIds 已经修改了权限的userId + */ + /* public void clearUserAuthByUserId(List userIds){ + if(null == userIds || userIds.size() == 0) return ; + //获取所有session + Collection sessions = redisSessionDAO.getActiveSessions(); + //定义返回 + List list = new ArrayList(); + for (Session session:sessions){ + //获取session登录信息。 + Object obj = session.getAttribute(DefaultSubjectContext.PRINCIPALS_SESSION_KEY); + if(null != obj && obj instanceof SimplePrincipalCollection){ + //强转 + SimplePrincipalCollection spc = (SimplePrincipalCollection)obj; + //判断用户,匹配用户ID。 + obj = spc.getPrimaryPrincipal(); + if(null != obj && obj instanceof User){ + User user = (User) obj; + System.out.println("user:"+user); + //比较用户ID,符合即加入集合 + if(null != user && userIds.contains(user.getId())){ + list.add(spc); + } + } + } + } + RealmSecurityManager securityManager = + (RealmSecurityManager) SecurityUtils.getSecurityManager(); + MyShiroRealm realm = (MyShiroRealm)securityManager.getRealms().iterator().next(); + for (SimplePrincipalCollection simplePrincipalCollection : list) { + realm.clearCachedAuthorizationInfo(simplePrincipalCollection); + } + }*/ +} diff --git a/mallinkAdmin/src/main/java/com/simple/shiro/UserSession.java b/mallinkAdmin/src/main/java/com/simple/shiro/UserSession.java new file mode 100644 index 000000000..1afa3a2f2 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/shiro/UserSession.java @@ -0,0 +1,9 @@ +package com.simple.shiro; + +public class UserSession { + + public static String userInfo="userSession"; + + public static String userId ="userSessionId"; + +} diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index f77289b69..8bcd356f3 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -1,12 +1,9 @@ spring: # JDBC datasource: -# url: jdbc:mysql://127.0.0.1:63306/mallink?characterEncoding=UTF-8&useSSL=false -# username: root -# password: root - url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&useSSL=false - username: mallone - password: m@1l0ne123@# + url: jdbc:mysql://127.0.0.1:63306/mallink?characterEncoding=UTF-8&useSSL=false + username: root + password: root type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver filters: stat diff --git a/mallinkApi/pom.xml b/mallinkApi/pom.xml index c3a43acc1..3a5f279f1 100644 --- a/mallinkApi/pom.xml +++ b/mallinkApi/pom.xml @@ -3,8 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - + mallink com.simple 1.0 @@ -12,21 +11,23 @@ mallinkApi - + com.simple mallinkService 1.0 - - + + - org.springframework.boot - spring-boot-maven-plugin + org.apache.maven.plugins + maven-compiler-plugin + 3.1 - true + 1.8 + 1.8 diff --git a/mallinkApi/src/main/java/com/simple/controller/WxAppinfoController.java b/mallinkApi/src/main/java/com/simple/controller/WxAppinfoController.java index d1761a031..8a56deb4b 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxAppinfoController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxAppinfoController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxAppinfo; import com.simple.service.WxAppinfoService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxBLogController.java b/mallinkApi/src/main/java/com/simple/controller/WxBLogController.java index 38566ee27..886b4c811 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxBLogController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxBLogController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxBLog; import com.simple.service.WxBLogService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxBUserMerchantController.java b/mallinkApi/src/main/java/com/simple/controller/WxBUserMerchantController.java index 3433eff7d..635190014 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxBUserMerchantController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxBUserMerchantController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxBUserMerchant; import com.simple.service.WxBUserMerchantService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxBannersController.java b/mallinkApi/src/main/java/com/simple/controller/WxBannersController.java index a426eec58..16132ec9c 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxBannersController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxBannersController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxBanners; import com.simple.service.WxBannersService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxBusinessController.java b/mallinkApi/src/main/java/com/simple/controller/WxBusinessController.java index ce29f52e9..540f30180 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxBusinessController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxBusinessController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxBusiness; import com.simple.service.WxBusinessService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCLogController.java b/mallinkApi/src/main/java/com/simple/controller/WxCLogController.java index 103c9484c..3f84bc3a9 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxCLogController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxCLogController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxCLog; import com.simple.service.WxCLogService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCUserCarsController.java b/mallinkApi/src/main/java/com/simple/controller/WxCUserCarsController.java index 23510bced..071125a90 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxCUserCarsController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxCUserCarsController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxCUserCars; import com.simple.service.WxCUserCarsService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCUserCloudController.java b/mallinkApi/src/main/java/com/simple/controller/WxCUserCloudController.java index 2a865c2de..98a740796 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxCUserCloudController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxCUserCloudController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxCUserCloud; import com.simple.service.WxCUserCloudService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCUserController.java b/mallinkApi/src/main/java/com/simple/controller/WxCUserController.java index eda908358..37984ac2b 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxCUserController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxCUserController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxCUser; import com.simple.service.WxCUserService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCUserEtcpTokenController.java b/mallinkApi/src/main/java/com/simple/controller/WxCUserEtcpTokenController.java new file mode 100644 index 000000000..a3eb086d5 --- /dev/null +++ b/mallinkApi/src/main/java/com/simple/controller/WxCUserEtcpTokenController.java @@ -0,0 +1,65 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxCUserEtcpToken; +import com.simple.service.WxCUserEtcpTokenService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; + +@RestController +@RequestMapping("wxCUserEtcpToken") +public class WxCUserEtcpTokenController extends BaseController +{ + @Autowired + private WxCUserEtcpTokenService wxCUserEtcpTokenService; + + private Logger logger = Logger.getLogger(WxCUserEtcpTokenController.class); + + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxCUserEtcpToken wxCUserEtcpToken,Integer pageNum, Integer pageSize) { + if (null == wxCUserEtcpToken) wxCUserEtcpToken = new WxCUserEtcpToken(); + final PageInfo page = wxCUserEtcpTokenService.listAsPage(wxCUserEtcpToken, pageNum, pageSize); + return new ResultData(page); + } + + @PostMapping("add") + public ResultData add(@RequestBody WxCUserEtcpToken wxCUserEtcpToken) { + //Assert.notNull(wxCUserEtcpToken.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCUserEtcpTokenService.saveOrUpdate(wxCUserEtcpToken); + return new ResultData(); + } + + @PostMapping("update") + public ResultData update(@RequestBody WxCUserEtcpToken wxCUserEtcpToken) { + wxCUserEtcpTokenService.saveOrUpdate(wxCUserEtcpToken); + return new ResultData(); + } + + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true) + public ResultData delete(String id) { + wxCUserEtcpTokenService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true) + public ResultData findById(String id) { + return new ResultData(Result.SUCCESS,"查询成功",wxCUserEtcpTokenService.getById(id)); + } + + + +} diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCUserTagsController.java b/mallinkApi/src/main/java/com/simple/controller/WxCUserTagsController.java index 379d21002..baf43284c 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxCUserTagsController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxCUserTagsController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxCUserTags; import com.simple.service.WxCUserTagsService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCouponActionLogController.java b/mallinkApi/src/main/java/com/simple/controller/WxCouponActionLogController.java index bff51d202..756f5cb82 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxCouponActionLogController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxCouponActionLogController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxCouponActionLog; import com.simple.service.WxCouponActionLogService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCouponActivityController.java b/mallinkApi/src/main/java/com/simple/controller/WxCouponActivityController.java index f54ab5606..8befb34d5 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxCouponActivityController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxCouponActivityController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxCouponActivity; import com.simple.service.WxCouponActivityService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCouponController.java b/mallinkApi/src/main/java/com/simple/controller/WxCouponController.java index 65428a3e7..58467ed03 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxCouponController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxCoupon; import com.simple.service.WxCouponService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCouponRecordController.java b/mallinkApi/src/main/java/com/simple/controller/WxCouponRecordController.java index 0bdc3c03b..21f1f1fea 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxCouponRecordController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxCouponRecordController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxCouponRecord; import com.simple.service.WxCouponRecordService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCouponTypeController.java b/mallinkApi/src/main/java/com/simple/controller/WxCouponTypeController.java index fcc8d7f29..fbf11c730 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxCouponTypeController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxCouponTypeController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxCouponType; import com.simple.service.WxCouponTypeService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java b/mallinkApi/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java index 8b62627cf..9f09e5b43 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxEtcpCouponRecord; import com.simple.service.WxEtcpCouponRecordService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java index 84fdfe97f..fd198087d 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxEtcpParkDissolution; import com.simple.service.WxEtcpParkDissolutionService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkInController.java b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkInController.java index fe370ad44..65cddd04b 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkInController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkInController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxEtcpParkIn; import com.simple.service.WxEtcpParkInService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java index a051cade7..ef8f594bd 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxEtcpParkMsgSuc; import com.simple.service.WxEtcpParkMsgSucService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java index 86768578a..3938e280d 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxEtcpParkOrderunpay; import com.simple.service.WxEtcpParkOrderunpayService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOutController.java b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOutController.java index f514fdb09..de04cf11b 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOutController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOutController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxEtcpParkOut; import com.simple.service.WxEtcpParkOutService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java index 72d505014..a3f12be50 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxEtcpParkTransaction; import com.simple.service.WxEtcpParkTransactionService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java index 5240a6532..b0b2ee725 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxEtcpParkUnbind; import com.simple.service.WxEtcpParkUnbindService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxFlashSaleController.java b/mallinkApi/src/main/java/com/simple/controller/WxFlashSaleController.java index 454e1ffe0..0defb49e1 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxFlashSaleController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxFlashSaleController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxFlashSale; import com.simple.service.WxFlashSaleService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMallBuildingController.java b/mallinkApi/src/main/java/com/simple/controller/WxMallBuildingController.java index e09199a9a..1d0a17624 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxMallBuildingController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxMallBuildingController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxMallBuilding; import com.simple.service.WxMallBuildingService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMallController.java b/mallinkApi/src/main/java/com/simple/controller/WxMallController.java index 4f62dc142..c64cbb591 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxMallController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxMallController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxMall; import com.simple.service.WxMallService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMallFloorController.java b/mallinkApi/src/main/java/com/simple/controller/WxMallFloorController.java index d2c900c0b..6145bf6aa 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxMallFloorController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxMallFloorController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxMallFloor; import com.simple.service.WxMallFloorService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMerchantController.java b/mallinkApi/src/main/java/com/simple/controller/WxMerchantController.java index 1c47bd7ad..d33f77fdf 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxMerchantController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxMerchantController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxMerchant; import com.simple.service.WxMerchantService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMerchantShopController.java b/mallinkApi/src/main/java/com/simple/controller/WxMerchantShopController.java index 0c3c21691..73b885b16 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxMerchantShopController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxMerchantShopController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxMerchantShop; import com.simple.service.WxMerchantShopService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMerchantTradeDaysController.java b/mallinkApi/src/main/java/com/simple/controller/WxMerchantTradeDaysController.java index 5ab8ba092..1d5804c60 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxMerchantTradeDaysController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxMerchantTradeDaysController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxMerchantTradeDays; import com.simple.service.WxMerchantTradeDaysService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMsgConfigController.java b/mallinkApi/src/main/java/com/simple/controller/WxMsgConfigController.java new file mode 100644 index 000000000..1b6abefe0 --- /dev/null +++ b/mallinkApi/src/main/java/com/simple/controller/WxMsgConfigController.java @@ -0,0 +1,65 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxMsgConfig; +import com.simple.service.WxMsgConfigService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; + +@RestController +@RequestMapping("wxMsgConfig") +public class WxMsgConfigController extends BaseController +{ + @Autowired + private WxMsgConfigService wxMsgConfigService; + + private Logger logger = Logger.getLogger(WxMsgConfigController.class); + + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxMsgConfig wxMsgConfig,Integer pageNum, Integer pageSize) { + if (null == wxMsgConfig) wxMsgConfig = new WxMsgConfig(); + final PageInfo page = wxMsgConfigService.listAsPage(wxMsgConfig, pageNum, pageSize); + return new ResultData(page); + } + + @PostMapping("add") + public ResultData add(@RequestBody WxMsgConfig wxMsgConfig) { + //Assert.notNull(wxMsgConfig.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMsgConfigService.saveOrUpdate(wxMsgConfig); + return new ResultData(); + } + + @PostMapping("update") + public ResultData update(@RequestBody WxMsgConfig wxMsgConfig) { + wxMsgConfigService.saveOrUpdate(wxMsgConfig); + return new ResultData(); + } + + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true) + public ResultData delete(String id) { + wxMsgConfigService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true) + public ResultData findById(String id) { + return new ResultData(Result.SUCCESS,"查询成功",wxMsgConfigService.getById(id)); + } + + + +} diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMsgController.java b/mallinkApi/src/main/java/com/simple/controller/WxMsgController.java index e150f16f3..80a5e3637 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxMsgController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxMsgController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxMsg; import com.simple.service.WxMsgService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMsgModelController.java b/mallinkApi/src/main/java/com/simple/controller/WxMsgModelController.java index df8f6fd9d..2ad3f25a7 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxMsgModelController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxMsgModelController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxMsgModel; import com.simple.service.WxMsgModelService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMsgSignatureController.java b/mallinkApi/src/main/java/com/simple/controller/WxMsgSignatureController.java index 4c3df57e2..d170c1551 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxMsgSignatureController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxMsgSignatureController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxMsgSignature; import com.simple.service.WxMsgSignatureService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxOrdersController.java b/mallinkApi/src/main/java/com/simple/controller/WxOrdersController.java index fd4c34300..3bc2ada0d 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxOrdersController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxOrdersController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxOrders; import com.simple.service.WxOrdersService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxParkController.java b/mallinkApi/src/main/java/com/simple/controller/WxParkController.java index 3df5879ba..b5886d0f0 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxParkController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxParkController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxPark; import com.simple.service.WxParkService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxScoreHistoryController.java b/mallinkApi/src/main/java/com/simple/controller/WxScoreHistoryController.java index f826ce76b..1ee827a6a 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxScoreHistoryController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxScoreHistoryController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxScoreHistory; import com.simple.service.WxScoreHistoryService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxScoreRulesController.java b/mallinkApi/src/main/java/com/simple/controller/WxScoreRulesController.java index 570a1607e..5e610ac85 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxScoreRulesController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxScoreRulesController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxScoreRules; import com.simple.service.WxScoreRulesService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java b/mallinkApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java index 136aa6a39..a9fc09025 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxScoreValidityPeriod; import com.simple.service.WxScoreValidityPeriodService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxShopController.java b/mallinkApi/src/main/java/com/simple/controller/WxShopController.java index 0fe0f8686..e648b392a 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxShopController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxShopController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxShop; import com.simple.service.WxShopService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxTagsController.java b/mallinkApi/src/main/java/com/simple/controller/WxTagsController.java index 5e245ebf3..2ddced75c 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxTagsController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxTagsController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxTags; import com.simple.service.WxTagsService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkApi/src/main/java/com/simple/controller/WxWebLogController.java b/mallinkApi/src/main/java/com/simple/controller/WxWebLogController.java index c1fa57afb..16b67ecd7 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxWebLogController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxWebLogController.java @@ -6,10 +6,9 @@ import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; -import com.simple.common.rest.Result; -import com.simple.common.rest.ResultData; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import com.simple.common.Result; +import com.simple.common.ResultData; + import com.simple.domain.po.WxWebLog; import com.simple.service.WxWebLogService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkService/pom.xml b/mallinkService/pom.xml index 47ddf2151..f0a2d8a70 100644 --- a/mallinkService/pom.xml +++ b/mallinkService/pom.xml @@ -10,4 +10,17 @@ 4.0.0 mallinkService + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + + + + \ No newline at end of file diff --git a/mallinkService/src/main/java/com/simple/common/CommonMapper.java b/mallinkService/src/main/java/com/simple/common/CommonMapper.java new file mode 100644 index 000000000..d054250d6 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/common/CommonMapper.java @@ -0,0 +1,16 @@ +package com.simple.common; + +import tk.mybatis.mapper.common.BaseMapper; +import tk.mybatis.mapper.common.IdsMapper; +import tk.mybatis.mapper.common.Marker; +import tk.mybatis.mapper.common.special.InsertListMapper; + +import java.io.Serializable; + +/** + * @author chenkx + * @date 2017-12-27 + */ + +public interface CommonMapper extends BaseMapper, IdsMapper, InsertListMapper, Marker { +} diff --git a/mallinkService/src/main/java/com/simple/common/ErrorCode.java b/mallinkService/src/main/java/com/simple/common/ErrorCode.java new file mode 100644 index 000000000..0c10fe3af --- /dev/null +++ b/mallinkService/src/main/java/com/simple/common/ErrorCode.java @@ -0,0 +1,76 @@ +package com.simple.common; + +import java.text.MessageFormat; + +/** + * @author chenkx + * @date 2017-12-28. + */ +public enum ErrorCode{ + + /** + * 系统级别 + * 1000-1999 + */ + SERVER_ERROR(1000, "服务器请求异常"), + PARAMETER_ERROR(1001, "参数不合法"), + PARAMETER_NOT_NULL(1002, "参数不能为空"), + PARAMETER_TYPE_ERROR(1003, "参数类型异常"), + PARAMETER_CAST_ERROR(1004, "参数转换异常"), + PARAMETER_EMPTY_ERROR(1005, "参数转换异常"), + BEAN_EMPTY_PROPERTY_ERROR(1006, "实体转换异常"), + MEDIATYPE_NOT_SUPPORT(1007, "不支持的媒体类型"), + NULLPOINTER_ERROR(1008, "空指针异常"), + METHOD_NOT_SUPPORT(1009, "不支持的请求类型"), + CLASSCAST_ERROR(1010, "类型转换异常"), + NUMBER_FORMAT_ERROR(1011, "数字转化异常"), + EXTEND_JSON_ERROR(1012, "JSON格式异常"), + REPEAT_SUBMIT_EXCEPTION(1013, "请勿重复操作"), + + LOGIN_DENIED(1013, "登录失败"), + TOKEN_INVALID(1014, "TOKEN无效"), + + + /** + * 业务级别 + */ + /** + * 用户2000-2099 + */ + USER_IS_EMPTY(2000, "用户不存在"), + PASSWORD_ERROR(2001, "密码错误"), + LOGIN_USER_OR_PWD_ERROR(2002, "用户名或密码错误"), + USER_IS_LOCKED(2003, "用户已经被锁定不能登录,请与管理员联系"); + + + + private int code; + private String message; + + ErrorCode(int code, String message) { + this.code = code; + this.message = message; + } + + public int getCode() { + return code; + } + + public String getMessage(Object... param) { + if (param.length == 0) { + return message; + } + return MessageFormat.format(message, param); + } + + public static ErrorCode getByCode(int code) { + ErrorCode[] values = ErrorCode.values(); + for (ErrorCode value : values) { + if (value.getCode() == code) { + return value; + } + + } + return null; + } +} diff --git a/mallinkService/src/main/java/com/simple/common/Result.java b/mallinkService/src/main/java/com/simple/common/Result.java new file mode 100644 index 000000000..8a9b4e0bd --- /dev/null +++ b/mallinkService/src/main/java/com/simple/common/Result.java @@ -0,0 +1,27 @@ +package com.simple.common; + + + +/** + * @author chenkx + * @date 2018-01-05. + */ +public class Result { + + public int code; + public String message; + public static final int SUCCESS = 200; + public static final int ERROR = 500; + public static final int UNLOGIN = 701; + + public Result() { + this.code = 200; + this.message = "success"; + } + + public Result(int code, String message) { + this.code = code; + this.message = message; + } + +} diff --git a/mallinkService/src/main/java/com/simple/common/ResultData.java b/mallinkService/src/main/java/com/simple/common/ResultData.java new file mode 100644 index 000000000..3590caff0 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/common/ResultData.java @@ -0,0 +1,87 @@ +package com.simple.common; + +import java.beans.BeanInfo; +import java.beans.Introspector; +import java.beans.PropertyDescriptor; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author chenkx + * @date 2018-01-05. + */ +public class ResultData extends Result { + + public Object data; + + public ResultData() { + super(); + } + + public ResultData(Object data) { + this(); + this.data = data; + } + + + public static ResultData returnResultObject(int code) { + String value = ErrorCode.getByCode(code).getMessage(); + return new ResultData(code, value); + } + + + public ResultData(Enum[] ens) { + List> list = new ArrayList>(); + for (Enum en : ens) { + Map map = enumToMap(en); + list.add(map); + } + data = list; + } + + + private Map enumToMap(Enum en) { + Map map = new HashMap<>(); + try { + BeanInfo info = Introspector.getBeanInfo(en.getClass()); + PropertyDescriptor[] descriptors = info.getPropertyDescriptors(); + for (PropertyDescriptor property : descriptors) { + if (property.getPropertyType().getName().equals(Class.class.getName())) { + continue; + } + Object value = property.getReadMethod().invoke(en); + map.put(property.getName(), value); + } + } catch (Exception ex) { + throw new RuntimeException(ex); + } + return map; + } + + + public ResultData(int code, Exception e) { + super(code, e.toString()); + } + + + public ResultData(int code, String message) { + super(code, message); + } + + public ResultData(int code, String message, Object data) { + this.code = code; + this.message = message; + this.data = data; + } + + public HashMap toHashMap() { + HashMap map = new HashMap<>(3); + map.put("code", this.code); + map.put("message", this.message); + map.put("data", data); + return map; + } + +} diff --git a/mallinkService/src/main/java/com/simple/domain/po/SysPermission.java b/mallinkService/src/main/java/com/simple/domain/po/SysPermission.java new file mode 100644 index 000000000..79bcf7f87 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/po/SysPermission.java @@ -0,0 +1,242 @@ +package com.simple.domain.po; + +import javax.persistence.*; +import java.util.*; +import java.math.*; +import javax.persistence.Transient; +import java.util.List; +import javax.persistence.Id; + +@Table(name = "sys_permission") +public class SysPermission { + private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + + /*权限名称[LIKE]**/ + @io.swagger.annotations.ApiModelProperty(value="权限名称[LIKE]",name="name") + private String name; + @Transient + private String nameLike; + /*是否可用 Y/N**/ + @io.swagger.annotations.ApiModelProperty(value="是否可用 Y/N",name="available") + private String available; + /*父编号**/ + @io.swagger.annotations.ApiModelProperty(value="父编号",name="parentId") + private String parentId; + /*父编号列表**/ + @io.swagger.annotations.ApiModelProperty(value="父编号列表",name="parentIds") + private String parentIds; + /*权限字符串[LIST]**/ + @io.swagger.annotations.ApiModelProperty(value="权限字符串[LIST]",name="permission") + private String permission; + @Transient + private List permissions; + /*资源类型0菜单 1,按钮**/ + @io.swagger.annotations.ApiModelProperty(value="资源类型0菜单 1,按钮",name="resourceType") + private String resourceType; + /*资源路径**/ + @io.swagger.annotations.ApiModelProperty(value="资源路径",name="url") + private String url; + /*排序[FROM][TO][GTE][GT][LTE][LT]**/ + @io.swagger.annotations.ApiModelProperty(value="排序[FROM][TO][GTE][GT][LTE][LT]",name="sort") + private Integer sort; + @Transient + private Integer sortFrom; + @Transient + private Integer sortTo; + @Transient + private Integer sortGte; + @Transient + private Integer sortGt; + @Transient + private Integer sortLte; + @Transient + private Integer sortLt; + public String getName() { + return name; + } + public void setName(String _name) { + name = _name; + } + public String getNameLike() { + return nameLike; + } + public void setNameLike( String _nameLike) { + nameLike = _nameLike; + } + public String getAvailable() { + return available; + } + public void setAvailable(String _available) { + available = _available; + } + public String getParentId() { + return parentId; + } + public void setParentId(String _parentId) { + parentId = _parentId; + } + public String getParentIds() { + return parentIds; + } + public void setParentIds(String _parentIds) { + parentIds = _parentIds; + } + public String getPermission() { + return permission; + } + public void setPermission(String _permission) { + permission = _permission; + } + public List getPermissions() { + return permissions; + } + public void setPermissions( List _permissions) { + permissions = _permissions; + } + public String getResourceType() { + return resourceType; + } + public void setResourceType(String _resourceType) { + resourceType = _resourceType; + } + public String getUrl() { + return url; + } + public void setUrl(String _url) { + url = _url; + } + public Integer getSort() { + return sort; + } + public void setSort(Integer _sort) { + sort = _sort; + } + public Integer getSortFrom() { + return sortFrom; + } + public void setSortFrom( Integer _sortFrom) { + sortFrom = _sortFrom; + } + public Integer getSortTo() { + return sortTo; + } + public void setSortTo( Integer _sortTo) { + sortTo = _sortTo; + } + public Integer getSortGte() { + return sortGte; + } + public void setSortGte( Integer _sortGte) { + sortGte = _sortGte; + } + public Integer getSortGt() { + return sortGt; + } + public void setSortGt( Integer _sortGt) { + sortGt = _sortGt; + } + public Integer getSortLte() { + return sortLte; + } + public void setSortLte( Integer _sortLte) { + sortLte = _sortLte; + } + public Integer getSortLt() { + return sortLt; + } + public void setSortLt( Integer _sortLt) { + sortLt = _sortLt; + } + + + + public static enum Field + { + Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") + ,Available_ASC("`available` ASC"),Available_DESC("`available` DESC") + ,ParentId_ASC("`parentId` ASC"),ParentId_DESC("`parentId` DESC") + ,ParentIds_ASC("`parentIds` ASC"),ParentIds_DESC("`parentIds` DESC") + ,Permission_ASC("`permission` ASC"),Permission_DESC("`permission` DESC") + ,ResourceType_ASC("`resourceType` ASC"),ResourceType_DESC("`resourceType` DESC") + ,Url_ASC("`url` ASC"),Url_DESC("`url` DESC") + ,Sort_ASC("`sort` ASC"),Sort_DESC("`sort` DESC") + ; + private String value; + Field(String value){ + this.value = value; + } + public String getValue() { + return value; + } + public void setCol(String value) { + this.value = value; + } + @Override + public String toString() { + return this.getValue(); + } + } + + public void setSortColumns(SysPermission.Field... fields) + { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + + } + + public void setSortColumns(String sortColumns) + { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + java.util.List fList = new java.util.ArrayList(); + for (int k = 0; k < cols.length; k++) { + fList.add(Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new Field[fList.size()])); + } else { + this.setSortColumns(Field.valueOf(sortColumns)); + } + } +} diff --git a/mallinkService/src/main/java/com/simple/domain/po/SysRole.java b/mallinkService/src/main/java/com/simple/domain/po/SysRole.java new file mode 100644 index 000000000..5fd7fa2fd --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/po/SysRole.java @@ -0,0 +1,128 @@ +package com.simple.domain.po; + +import javax.persistence.*; +import java.util.*; +import java.math.*; +import javax.persistence.Transient; +import java.util.List; +import javax.persistence.Id; + +@Table(name = "sys_role") +public class SysRole { + private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + + /*角色名称**/ + @io.swagger.annotations.ApiModelProperty(value="角色名称",name="name") + private String name; + /*是否可用 0可用 1不可用**/ + @io.swagger.annotations.ApiModelProperty(value="是否可用 0可用 1不可用",name="available") + private String available; + /*角色描述**/ + @io.swagger.annotations.ApiModelProperty(value="角色描述",name="description") + private String description; + public String getName() { + return name; + } + public void setName(String _name) { + name = _name; + } + public String getAvailable() { + return available; + } + public void setAvailable(String _available) { + available = _available; + } + public String getDescription() { + return description; + } + public void setDescription(String _description) { + description = _description; + } + + + + public static enum Field + { + Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") + ,Available_ASC("`available` ASC"),Available_DESC("`available` DESC") + ,Description_ASC("`description` ASC"),Description_DESC("`description` DESC") + ; + private String value; + Field(String value){ + this.value = value; + } + public String getValue() { + return value; + } + public void setCol(String value) { + this.value = value; + } + @Override + public String toString() { + return this.getValue(); + } + } + + public void setSortColumns(SysRole.Field... fields) + { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + + } + + public void setSortColumns(String sortColumns) + { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + java.util.List fList = new java.util.ArrayList(); + for (int k = 0; k < cols.length; k++) { + fList.add(Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new Field[fList.size()])); + } else { + this.setSortColumns(Field.valueOf(sortColumns)); + } + } +} diff --git a/mallinkService/src/main/java/com/simple/domain/po/SysRolePermission.java b/mallinkService/src/main/java/com/simple/domain/po/SysRolePermission.java new file mode 100644 index 000000000..4563c411e --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/po/SysRolePermission.java @@ -0,0 +1,118 @@ +package com.simple.domain.po; + +import javax.persistence.*; +import java.util.*; +import java.math.*; +import javax.persistence.Transient; +import java.util.List; +import javax.persistence.Id; + +@Table(name = "sys_role_permission") +public class SysRolePermission { + private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + + /*权限ID**/ + @io.swagger.annotations.ApiModelProperty(value="权限ID",name="permissionId") + private String permissionId; + /*角色ID**/ + @io.swagger.annotations.ApiModelProperty(value="角色ID",name="roleId") + private String roleId; + public String getPermissionId() { + return permissionId; + } + public void setPermissionId(String _permissionId) { + permissionId = _permissionId; + } + public String getRoleId() { + return roleId; + } + public void setRoleId(String _roleId) { + roleId = _roleId; + } + + + + public static enum Field + { + PermissionId_ASC("`permissionId` ASC"),PermissionId_DESC("`permissionId` DESC") + ,RoleId_ASC("`roleId` ASC"),RoleId_DESC("`roleId` DESC") + ,Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ; + private String value; + Field(String value){ + this.value = value; + } + public String getValue() { + return value; + } + public void setCol(String value) { + this.value = value; + } + @Override + public String toString() { + return this.getValue(); + } + } + + public void setSortColumns(SysRolePermission.Field... fields) + { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + + } + + public void setSortColumns(String sortColumns) + { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + java.util.List fList = new java.util.ArrayList(); + for (int k = 0; k < cols.length; k++) { + fList.add(Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new Field[fList.size()])); + } else { + this.setSortColumns(Field.valueOf(sortColumns)); + } + } +} diff --git a/mallinkService/src/main/java/com/simple/domain/po/SysUserRole.java b/mallinkService/src/main/java/com/simple/domain/po/SysUserRole.java new file mode 100644 index 000000000..243e327ac --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/po/SysUserRole.java @@ -0,0 +1,118 @@ +package com.simple.domain.po; + +import javax.persistence.*; +import java.util.*; +import java.math.*; +import javax.persistence.Transient; +import java.util.List; +import javax.persistence.Id; + +@Table(name = "sys_user_role") +public class SysUserRole { + private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + + /*用户ID**/ + @io.swagger.annotations.ApiModelProperty(value="用户ID",name="uid") + private String uid; + /*角色ID**/ + @io.swagger.annotations.ApiModelProperty(value="角色ID",name="roleId") + private String roleId; + public String getUid() { + return uid; + } + public void setUid(String _uid) { + uid = _uid; + } + public String getRoleId() { + return roleId; + } + public void setRoleId(String _roleId) { + roleId = _roleId; + } + + + + public static enum Field + { + Uid_ASC("`uid` ASC"),Uid_DESC("`uid` DESC") + ,RoleId_ASC("`roleId` ASC"),RoleId_DESC("`roleId` DESC") + ,Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ; + private String value; + Field(String value){ + this.value = value; + } + public String getValue() { + return value; + } + public void setCol(String value) { + this.value = value; + } + @Override + public String toString() { + return this.getValue(); + } + } + + public void setSortColumns(SysUserRole.Field... fields) + { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + + } + + public void setSortColumns(String sortColumns) + { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + java.util.List fList = new java.util.ArrayList(); + for (int k = 0; k < cols.length; k++) { + fList.add(Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new Field[fList.size()])); + } else { + this.setSortColumns(Field.valueOf(sortColumns)); + } + } +} diff --git a/mallinkService/src/main/java/com/simple/domain/po/UserInfo.java b/mallinkService/src/main/java/com/simple/domain/po/UserInfo.java new file mode 100644 index 000000000..98f8688ec --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/po/UserInfo.java @@ -0,0 +1,189 @@ +package com.simple.domain.po; + +import javax.persistence.*; +import java.util.*; +import java.math.*; +import javax.persistence.Transient; +import java.util.List; +import javax.persistence.Id; + +@Table(name = "user_info") +public class UserInfo { + private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + + /*登录用户名**/ + @io.swagger.annotations.ApiModelProperty(value="登录用户名",name="username") + private String username; + /*用户名称**/ + @io.swagger.annotations.ApiModelProperty(value="用户名称",name="name") + private String name; + /*密码**/ + @io.swagger.annotations.ApiModelProperty(value="密码",name="password") + private String password; + /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") + private Date createTime; + /*最后登录时间**/ + @io.swagger.annotations.ApiModelProperty(value="最后登录时间",name="lastLoginTime") + private Date lastLoginTime; + /*1:有效,0:禁止登录**/ + @io.swagger.annotations.ApiModelProperty(value="1:有效,0:禁止登录",name="status") + private Integer status; + /*0 不是超管 1是超管**/ + @io.swagger.annotations.ApiModelProperty(value="0 不是超管 1是超管",name="isAdmin") + private Integer isAdmin; + //该用户所有的角色 + @Transient + private List role; + //该用户包含的所有权限 + @Transient + private List permission; + public String getUsername() { + return username; + } + public void setUsername(String _username) { + username = _username; + } + public String getName() { + return name; + } + public void setName(String _name) { + name = _name; + } + public String getPassword() { + return password; + } + public void setPassword(String _password) { + password = _password; + } + public Date getCreateTime() { + return createTime; + } + public void setCreateTime(Date _createTime) { + createTime = _createTime; + } + public Date getLastLoginTime() { + return lastLoginTime; + } + public void setLastLoginTime(Date _lastLoginTime) { + lastLoginTime = _lastLoginTime; + } + public Integer getStatus() { + return status; + } + public void setStatus(Integer _status) { + status = _status; + } + public Integer getIsAdmin() { + return isAdmin; + } + public void setIsAdmin(Integer _isAdmin) { + isAdmin = _isAdmin; + } + public List getRole() { + return role; + } + + public void setRole(List role) { + this.role = role; + } + + public List getPermission() { + return permission; + } + + public void setPermission(List permission) { + this.permission = permission; + } + + + + public static enum Field + { + Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,Username_ASC("`username` ASC"),Username_DESC("`username` DESC") + ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") + ,Password_ASC("`password` ASC"),Password_DESC("`password` DESC") + ,CreateTime_ASC("`createTime` ASC"),CreateTime_DESC("`createTime` DESC") + ,LastLoginTime_ASC("`lastLoginTime` ASC"),LastLoginTime_DESC("`lastLoginTime` DESC") + ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") + ,IsAdmin_ASC("`isAdmin` ASC"),IsAdmin_DESC("`isAdmin` DESC") + ; + private String value; + Field(String value){ + this.value = value; + } + public String getValue() { + return value; + } + public void setCol(String value) { + this.value = value; + } + @Override + public String toString() { + return this.getValue(); + } + } + + public void setSortColumns(UserInfo.Field... fields) + { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + + } + + public void setSortColumns(String sortColumns) + { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + java.util.List fList = new java.util.ArrayList(); + for (int k = 0; k < cols.length; k++) { + fList.add(Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new Field[fList.size()])); + } else { + this.setSortColumns(Field.valueOf(sortColumns)); + } + } +} diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxAppinfo.java b/mallinkService/src/main/java/com/simple/domain/po/WxAppinfo.java index ec1098d51..6289c27bf 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxAppinfo.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxAppinfo.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_appinfo") -public class WxAppinfo extends BaseModel { +public class WxAppinfo { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*小程序ID**/ @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appid") private String appid; @@ -129,10 +156,9 @@ public class WxAppinfo extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxBLog.java b/mallinkService/src/main/java/com/simple/domain/po/WxBLog.java index 7d2edf329..0878c4b54 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxBLog.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxBLog.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_b_log") -public class WxBLog extends BaseModel { +public class WxBLog { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /***/ @io.swagger.annotations.ApiModelProperty(value="",name="data") private String data; @@ -69,10 +96,9 @@ public class WxBLog extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxBUserMerchant.java b/mallinkService/src/main/java/com/simple/domain/po/WxBUserMerchant.java index 02c85b9de..1444a86f3 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxBUserMerchant.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxBUserMerchant.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_b_user_merchant") -public class WxBUserMerchant extends BaseModel { +public class WxBUserMerchant { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*B端用户id**/ @io.swagger.annotations.ApiModelProperty(value="B端用户id",name="bUserId") private Integer bUserId; @@ -69,10 +96,9 @@ public class WxBUserMerchant extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxBanners.java b/mallinkService/src/main/java/com/simple/domain/po/WxBanners.java index 563ec78b3..f93df3344 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxBanners.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxBanners.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_banners") -public class WxBanners extends BaseModel { +public class WxBanners { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*封面图**/ @io.swagger.annotations.ApiModelProperty(value="封面图",name="facePicUrl") private String facePicUrl; @@ -129,10 +156,9 @@ public class WxBanners extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxBusiness.java b/mallinkService/src/main/java/com/simple/domain/po/WxBusiness.java index d4748ecc4..f9da58858 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxBusiness.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxBusiness.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_business") -public class WxBusiness extends BaseModel { +public class WxBusiness { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*业态名**/ @io.swagger.annotations.ApiModelProperty(value="业态名",name="title") private String title; @@ -59,10 +86,9 @@ public class WxBusiness extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCLog.java b/mallinkService/src/main/java/com/simple/domain/po/WxCLog.java index 7e03d4e67..860674f27 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCLog.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCLog.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_c_log") -public class WxCLog extends BaseModel { +public class WxCLog { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /***/ @io.swagger.annotations.ApiModelProperty(value="",name="data") private String data; @@ -69,10 +96,9 @@ public class WxCLog extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCUser.java b/mallinkService/src/main/java/com/simple/domain/po/WxCUser.java index c5ca400d7..a23f9354e 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCUser.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUser.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_c_user") -public class WxCUser extends BaseModel { +public class WxCUser { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*微信openId**/ @io.swagger.annotations.ApiModelProperty(value="微信openId",name="openId") private String openId; @@ -239,10 +266,9 @@ public class WxCUser extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCUserCars.java b/mallinkService/src/main/java/com/simple/domain/po/WxCUserCars.java index a0b87486f..ea2fa9c46 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCUserCars.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUserCars.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_c_user_cars") -public class WxCUserCars extends BaseModel { +public class WxCUserCars { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*c端用户id**/ @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId") private Integer cUserId; @@ -69,10 +96,9 @@ public class WxCUserCars extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCUserCloud.java b/mallinkService/src/main/java/com/simple/domain/po/WxCUserCloud.java index 0b23196a5..7ea1cba84 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCUserCloud.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUserCloud.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_c_user_cloud") -public class WxCUserCloud extends BaseModel { +public class WxCUserCloud { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*大数据相关信息**/ @io.swagger.annotations.ApiModelProperty(value="大数据相关信息",name="cloudData") private String cloudData; @@ -69,10 +96,9 @@ public class WxCUserCloud extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCUserEtcpToken.java b/mallinkService/src/main/java/com/simple/domain/po/WxCUserEtcpToken.java new file mode 100644 index 000000000..3599527e2 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUserEtcpToken.java @@ -0,0 +1,138 @@ +package com.simple.domain.po; + +import javax.persistence.*; +import java.util.*; +import java.math.*; +import javax.persistence.Transient; +import java.util.List; +import javax.persistence.Id; + +@Table(name = "wx_c_user_etcp_token") +public class WxCUserEtcpToken { + private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + + /***/ + @io.swagger.annotations.ApiModelProperty(value="",name="cUserId") + private Integer cUserId; + /*etcp token**/ + @io.swagger.annotations.ApiModelProperty(value="etcp token",name="etcpToken") + private String etcpToken; + /*第一次共同登陆时间**/ + @io.swagger.annotations.ApiModelProperty(value="第一次共同登陆时间",name="etcpCreateTime") + private Date etcpCreateTime; + /*更新时间**/ + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="etcpUpdateTime") + private Date etcpUpdateTime; + public Integer getCUserId() { + return cUserId; + } + public void setCUserId(Integer _cUserId) { + cUserId = _cUserId; + } + public String getEtcpToken() { + return etcpToken; + } + public void setEtcpToken(String _etcpToken) { + etcpToken = _etcpToken; + } + public Date getEtcpCreateTime() { + return etcpCreateTime; + } + public void setEtcpCreateTime(Date _etcpCreateTime) { + etcpCreateTime = _etcpCreateTime; + } + public Date getEtcpUpdateTime() { + return etcpUpdateTime; + } + public void setEtcpUpdateTime(Date _etcpUpdateTime) { + etcpUpdateTime = _etcpUpdateTime; + } + + + + public static enum Field + { + Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,CUserId_ASC("`cUserId` ASC"),CUserId_DESC("`cUserId` DESC") + ,EtcpToken_ASC("`etcpToken` ASC"),EtcpToken_DESC("`etcpToken` DESC") + ,EtcpCreateTime_ASC("`etcpCreateTime` ASC"),EtcpCreateTime_DESC("`etcpCreateTime` DESC") + ,EtcpUpdateTime_ASC("`etcpUpdateTime` ASC"),EtcpUpdateTime_DESC("`etcpUpdateTime` DESC") + ; + private String value; + Field(String value){ + this.value = value; + } + public String getValue() { + return value; + } + public void setCol(String value) { + this.value = value; + } + @Override + public String toString() { + return this.getValue(); + } + } + + public void setSortColumns(WxCUserEtcpToken.Field... fields) + { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + + } + + public void setSortColumns(String sortColumns) + { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + java.util.List fList = new java.util.ArrayList(); + for (int k = 0; k < cols.length; k++) { + fList.add(Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new Field[fList.size()])); + } else { + this.setSortColumns(Field.valueOf(sortColumns)); + } + } +} diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCUserTags.java b/mallinkService/src/main/java/com/simple/domain/po/WxCUserTags.java index 89a4a7d2e..5e404bc92 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCUserTags.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUserTags.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_c_user_tags") -public class WxCUserTags extends BaseModel { +public class WxCUserTags { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*c端用户id**/ @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="userId") private Integer userId; @@ -69,10 +96,9 @@ public class WxCUserTags extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java index 0f0c35655..4825d5381 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_coupon") -public class WxCoupon extends BaseModel { +public class WxCoupon { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*卡券活动id**/ @io.swagger.annotations.ApiModelProperty(value="卡券活动id",name="activityId") private Integer activityId; @@ -189,10 +216,9 @@ public class WxCoupon extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCouponActionLog.java b/mallinkService/src/main/java/com/simple/domain/po/WxCouponActionLog.java index e4e68c1a8..065d1ecdd 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCouponActionLog.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCouponActionLog.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_coupon_action_log") -public class WxCouponActionLog extends BaseModel { +public class WxCouponActionLog { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*coupon id**/ @io.swagger.annotations.ApiModelProperty(value="coupon id",name="couponId") private Integer couponId; @@ -99,10 +126,9 @@ public class WxCouponActionLog extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCouponActivity.java b/mallinkService/src/main/java/com/simple/domain/po/WxCouponActivity.java index 13b5a5d04..2a931186e 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCouponActivity.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCouponActivity.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_coupon_activity") -public class WxCouponActivity extends BaseModel { +public class WxCouponActivity { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)**/ @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)",name="type") private Integer type; @@ -259,10 +286,9 @@ public class WxCouponActivity extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCouponRecord.java b/mallinkService/src/main/java/com/simple/domain/po/WxCouponRecord.java index b304025fa..d763637e3 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCouponRecord.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCouponRecord.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_coupon_record") -public class WxCouponRecord extends BaseModel { +public class WxCouponRecord { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*coupon id**/ @io.swagger.annotations.ApiModelProperty(value="coupon id",name="couponId") private Integer couponId; @@ -139,10 +166,9 @@ public class WxCouponRecord extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCouponType.java b/mallinkService/src/main/java/com/simple/domain/po/WxCouponType.java index 1d8307227..35a3f741f 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCouponType.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCouponType.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_coupon_type") -public class WxCouponType extends BaseModel { +public class WxCouponType { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*券类型**/ @io.swagger.annotations.ApiModelProperty(value="券类型",name="title") private String title; @@ -59,10 +86,9 @@ public class WxCouponType extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpCouponRecord.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpCouponRecord.java index 0a2b55d83..6e8eb01af 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpCouponRecord.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpCouponRecord.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_etcp_coupon_record") -public class WxEtcpCouponRecord extends BaseModel { +public class WxEtcpCouponRecord { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*coupon id**/ @io.swagger.annotations.ApiModelProperty(value="coupon id",name="couponId") private Integer couponId; @@ -139,10 +166,9 @@ public class WxEtcpCouponRecord extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkDissolution.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkDissolution.java index 39f950695..f90fc7901 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkDissolution.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkDissolution.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_etcp_park_dissolution") -public class WxEtcpParkDissolution extends BaseModel { +public class WxEtcpParkDissolution { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /* 签约号**/ @io.swagger.annotations.ApiModelProperty(value=" 签约号",name="signNo") private String signNo; @@ -59,10 +86,9 @@ public class WxEtcpParkDissolution extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkIn.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkIn.java index a0f803031..6f6f5bb26 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkIn.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkIn.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_etcp_park_in") -public class WxEtcpParkIn extends BaseModel { +public class WxEtcpParkIn { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /***/ @io.swagger.annotations.ApiModelProperty(value="",name="synId") private String synId; @@ -79,10 +106,9 @@ public class WxEtcpParkIn extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkMsgSuc.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkMsgSuc.java index 4d6f117a9..5d0d16efa 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkMsgSuc.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkMsgSuc.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_etcp_park_msg_suc") -public class WxEtcpParkMsgSuc extends BaseModel { +public class WxEtcpParkMsgSuc { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*签约号**/ @io.swagger.annotations.ApiModelProperty(value="签约号",name="signNo") private String signNo; @@ -59,10 +86,9 @@ public class WxEtcpParkMsgSuc extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOrderunpay.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOrderunpay.java index 92d9d27ea..d0ef37f7b 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOrderunpay.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOrderunpay.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_etcp_park_orderunpay") -public class WxEtcpParkOrderunpay extends BaseModel { +public class WxEtcpParkOrderunpay { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*车牌号**/ @io.swagger.annotations.ApiModelProperty(value="车牌号",name="plateNumber") private String plateNumber; @@ -229,10 +256,9 @@ public class WxEtcpParkOrderunpay extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOut.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOut.java index 8c5701c06..b8cd7e41b 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOut.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOut.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_etcp_park_out") -public class WxEtcpParkOut extends BaseModel { +public class WxEtcpParkOut { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /***/ @io.swagger.annotations.ApiModelProperty(value="",name="synId") private String synId; @@ -79,10 +106,9 @@ public class WxEtcpParkOut extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkTransaction.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkTransaction.java index 2072572dc..3256fff9e 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkTransaction.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkTransaction.java @@ -1,19 +1,44 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_etcp_park_transaction") -public class WxEtcpParkTransaction extends BaseModel { +public class WxEtcpParkTransaction { private static final long serialVersionUID = 1L; - /*Integer 支付方式(1 微信公众号内支付 -2 支付宝 H5 支付 3 微信二维码 -4 支付宝二维码 5 微信 H5)**/ + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + + /*支付方式(1 微信公众号内支付2 支付宝 H5 支付 3 微信二维码4 支付宝二维码 5 微信 H5)**/ @io.swagger.annotations.ApiModelProperty(value="支付方式(1 微信公众号内支付2 支付宝 H5 支付 3 微信二维码4 支付宝二维码 5 微信 H5)",name="payType") private Integer payType; /*停车记录标识(查费接口中的 返回的 orderId 字段)**/ @@ -151,10 +176,9 @@ public class WxEtcpParkTransaction extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkUnbind.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkUnbind.java index 82a26cb17..a6d0fb33e 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkUnbind.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkUnbind.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_etcp_park_unbind") -public class WxEtcpParkUnbind extends BaseModel { +public class WxEtcpParkUnbind { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*车牌号**/ @io.swagger.annotations.ApiModelProperty(value="车牌号",name="plateNumber") private String plateNumber; @@ -59,10 +86,9 @@ public class WxEtcpParkUnbind extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxFlashSale.java b/mallinkService/src/main/java/com/simple/domain/po/WxFlashSale.java index a2617aa5d..381e8ac1b 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxFlashSale.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxFlashSale.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_flash_sale") -public class WxFlashSale extends BaseModel { +public class WxFlashSale { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /***/ @io.swagger.annotations.ApiModelProperty(value="",name="activityId") private Integer activityId; @@ -89,10 +116,9 @@ public class WxFlashSale extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMall.java b/mallinkService/src/main/java/com/simple/domain/po/WxMall.java index dc736e993..b8786617c 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMall.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMall.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_mall") -public class WxMall extends BaseModel { +public class WxMall { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*商场名**/ @io.swagger.annotations.ApiModelProperty(value="商场名",name="name") private String name; @@ -169,10 +196,9 @@ public class WxMall extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMallBuilding.java b/mallinkService/src/main/java/com/simple/domain/po/WxMallBuilding.java index 3ac70e4e8..261cd0243 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMallBuilding.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMallBuilding.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_mall_building") -public class WxMallBuilding extends BaseModel { +public class WxMallBuilding { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /***/ @io.swagger.annotations.ApiModelProperty(value="",name="mallId") private Integer mallId; @@ -79,10 +106,9 @@ public class WxMallBuilding extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMallFloor.java b/mallinkService/src/main/java/com/simple/domain/po/WxMallFloor.java index c33463ff0..82ad115fe 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMallFloor.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMallFloor.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_mall_floor") -public class WxMallFloor extends BaseModel { +public class WxMallFloor { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*商场id**/ @io.swagger.annotations.ApiModelProperty(value="商场id",name="mallId") private Integer mallId; @@ -79,10 +106,9 @@ public class WxMallFloor extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java index 433e75810..fef0ee740 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_merchant") -public class WxMerchant extends BaseModel { +public class WxMerchant { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*商户图片**/ @io.swagger.annotations.ApiModelProperty(value="商户图片",name="imgUrl") private String imgUrl; @@ -119,10 +146,9 @@ public class WxMerchant extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantShop.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantShop.java index e199a2a86..c45d463fc 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantShop.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantShop.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_merchant_shop") -public class WxMerchantShop extends BaseModel { +public class WxMerchantShop { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /***/ @io.swagger.annotations.ApiModelProperty(value="",name="merchantId") private Integer merchantId; @@ -69,10 +96,9 @@ public class WxMerchantShop extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantTradeDays.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantTradeDays.java index c03e2171c..93a07833f 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantTradeDays.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantTradeDays.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_merchant_trade_days") -public class WxMerchantTradeDays extends BaseModel { +public class WxMerchantTradeDays { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*商户id**/ @io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId") private Integer merchantId; @@ -79,10 +106,9 @@ public class WxMerchantTradeDays extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMsg.java b/mallinkService/src/main/java/com/simple/domain/po/WxMsg.java index 79619e3ea..232588d50 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMsg.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMsg.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_msg") -public class WxMsg extends BaseModel { +public class WxMsg { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*模板id**/ @io.swagger.annotations.ApiModelProperty(value="模板id",name="modelId") private Integer modelId; @@ -139,10 +166,9 @@ public class WxMsg extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMsgConfig.java b/mallinkService/src/main/java/com/simple/domain/po/WxMsgConfig.java new file mode 100644 index 000000000..5d093ecda --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMsgConfig.java @@ -0,0 +1,198 @@ +package com.simple.domain.po; + +import javax.persistence.*; +import java.util.*; +import java.math.*; +import javax.persistence.Transient; +import java.util.List; +import javax.persistence.Id; + +@Table(name = "wx_msg_config") +public class WxMsgConfig { + private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + + /***/ + @io.swagger.annotations.ApiModelProperty(value="",name="secret") + private String secret; + /***/ + @io.swagger.annotations.ApiModelProperty(value="",name="publickey") + private String publickey; + /***/ + @io.swagger.annotations.ApiModelProperty(value="",name="bid") + private String bid; + /*充值条数**/ + @io.swagger.annotations.ApiModelProperty(value="充值条数",name="recharge") + private Integer recharge; + /*剩余条数**/ + @io.swagger.annotations.ApiModelProperty(value="剩余条数",name="remains") + private Integer remains; + /*短信总数**/ + @io.swagger.annotations.ApiModelProperty(value="短信总数",name="total") + private Integer total; + /***/ + @io.swagger.annotations.ApiModelProperty(value="",name="account") + private String account; + /***/ + @io.swagger.annotations.ApiModelProperty(value="",name="reminderstatus") + private Integer reminderstatus; + /***/ + @io.swagger.annotations.ApiModelProperty(value="",name="reminder") + private Integer reminder; + /***/ + @io.swagger.annotations.ApiModelProperty(value="",name="phone") + private String phone; + public String getSecret() { + return secret; + } + public void setSecret(String _secret) { + secret = _secret; + } + public String getPublickey() { + return publickey; + } + public void setPublickey(String _publickey) { + publickey = _publickey; + } + public String getBid() { + return bid; + } + public void setBid(String _bid) { + bid = _bid; + } + public Integer getRecharge() { + return recharge; + } + public void setRecharge(Integer _recharge) { + recharge = _recharge; + } + public Integer getRemains() { + return remains; + } + public void setRemains(Integer _remains) { + remains = _remains; + } + public Integer getTotal() { + return total; + } + public void setTotal(Integer _total) { + total = _total; + } + public String getAccount() { + return account; + } + public void setAccount(String _account) { + account = _account; + } + public Integer getReminderstatus() { + return reminderstatus; + } + public void setReminderstatus(Integer _reminderstatus) { + reminderstatus = _reminderstatus; + } + public Integer getReminder() { + return reminder; + } + public void setReminder(Integer _reminder) { + reminder = _reminder; + } + public String getPhone() { + return phone; + } + public void setPhone(String _phone) { + phone = _phone; + } + + + + public static enum Field + { + Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,Secret_ASC("`secret` ASC"),Secret_DESC("`secret` DESC") + ,Publickey_ASC("`publickey` ASC"),Publickey_DESC("`publickey` DESC") + ,Bid_ASC("`bid` ASC"),Bid_DESC("`bid` DESC") + ,Recharge_ASC("`recharge` ASC"),Recharge_DESC("`recharge` DESC") + ,Remains_ASC("`remains` ASC"),Remains_DESC("`remains` DESC") + ,Total_ASC("`total` ASC"),Total_DESC("`total` DESC") + ,Account_ASC("`account` ASC"),Account_DESC("`account` DESC") + ,Reminderstatus_ASC("`reminderstatus` ASC"),Reminderstatus_DESC("`reminderstatus` DESC") + ,Reminder_ASC("`reminder` ASC"),Reminder_DESC("`reminder` DESC") + ,Phone_ASC("`phone` ASC"),Phone_DESC("`phone` DESC") + ; + private String value; + Field(String value){ + this.value = value; + } + public String getValue() { + return value; + } + public void setCol(String value) { + this.value = value; + } + @Override + public String toString() { + return this.getValue(); + } + } + + public void setSortColumns(WxMsgConfig.Field... fields) + { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + + } + + public void setSortColumns(String sortColumns) + { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + java.util.List fList = new java.util.ArrayList(); + for (int k = 0; k < cols.length; k++) { + fList.add(Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new Field[fList.size()])); + } else { + this.setSortColumns(Field.valueOf(sortColumns)); + } + } +} diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMsgModel.java b/mallinkService/src/main/java/com/simple/domain/po/WxMsgModel.java index 88d98f600..38403fbbc 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMsgModel.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMsgModel.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_msg_model") -public class WxMsgModel extends BaseModel { +public class WxMsgModel { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*名称**/ @io.swagger.annotations.ApiModelProperty(value="名称",name="name") private String name; @@ -99,10 +126,9 @@ public class WxMsgModel extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMsgSignature.java b/mallinkService/src/main/java/com/simple/domain/po/WxMsgSignature.java index 89e66a05a..78fcbef4d 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMsgSignature.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMsgSignature.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_msg_signature") -public class WxMsgSignature extends BaseModel { +public class WxMsgSignature { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*签名**/ @io.swagger.annotations.ApiModelProperty(value="签名",name="name") private String name; @@ -69,10 +96,9 @@ public class WxMsgSignature extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxOrders.java b/mallinkService/src/main/java/com/simple/domain/po/WxOrders.java index e7628a4df..6d91be3fc 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxOrders.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxOrders.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_orders") -public class WxOrders extends BaseModel { +public class WxOrders { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*卡券活动id**/ @io.swagger.annotations.ApiModelProperty(value="卡券活动id",name="couponId") private Integer couponId; @@ -109,10 +136,9 @@ public class WxOrders extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxPark.java b/mallinkService/src/main/java/com/simple/domain/po/WxPark.java index 0f2976b31..fbcea786c 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxPark.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxPark.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_park") -public class WxPark extends BaseModel { +public class WxPark { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*停车场地址**/ @io.swagger.annotations.ApiModelProperty(value="停车场地址",name="addr") private String addr; @@ -89,10 +116,9 @@ public class WxPark extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxScoreHistory.java b/mallinkService/src/main/java/com/simple/domain/po/WxScoreHistory.java index 049b3b7fe..6afd7942c 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxScoreHistory.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxScoreHistory.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_score_history") -public class WxScoreHistory extends BaseModel { +public class WxScoreHistory { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*会员ID**/ @io.swagger.annotations.ApiModelProperty(value="会员ID",name="cUserId") private Integer cUserId; @@ -119,10 +146,9 @@ public class WxScoreHistory extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxScoreRules.java b/mallinkService/src/main/java/com/simple/domain/po/WxScoreRules.java index e2a268898..1218ac77d 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxScoreRules.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxScoreRules.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_score_rules") -public class WxScoreRules extends BaseModel { +public class WxScoreRules { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*消费金额**/ @io.swagger.annotations.ApiModelProperty(value="消费金额",name="consumptionAmount") private BigDecimal consumptionAmount; @@ -69,10 +96,9 @@ public class WxScoreRules extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxScoreValidityPeriod.java b/mallinkService/src/main/java/com/simple/domain/po/WxScoreValidityPeriod.java index 1514647a2..87d35172d 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxScoreValidityPeriod.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxScoreValidityPeriod.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_score_validity_period") -public class WxScoreValidityPeriod extends BaseModel { +public class WxScoreValidityPeriod { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*年**/ @io.swagger.annotations.ApiModelProperty(value="年",name="year") private String year; @@ -59,10 +86,9 @@ public class WxScoreValidityPeriod extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxShop.java b/mallinkService/src/main/java/com/simple/domain/po/WxShop.java index 259f840a7..543ebd6fd 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxShop.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxShop.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_shop") -public class WxShop extends BaseModel { +public class WxShop { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*商铺名**/ @io.swagger.annotations.ApiModelProperty(value="商铺名",name="title") private String title; @@ -149,10 +176,9 @@ public class WxShop extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxTags.java b/mallinkService/src/main/java/com/simple/domain/po/WxTags.java index e163dd596..d84e16f68 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxTags.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxTags.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_tags") -public class WxTags extends BaseModel { +public class WxTags { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /*名称**/ @io.swagger.annotations.ApiModelProperty(value="名称",name="name") private String name; @@ -79,10 +106,9 @@ public class WxTags extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxWebLog.java b/mallinkService/src/main/java/com/simple/domain/po/WxWebLog.java index fac31117b..7b8e20d98 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxWebLog.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxWebLog.java @@ -1,16 +1,43 @@ package com.simple.domain.po; -import com.simple.common.crud.BaseModel; import javax.persistence.*; import java.util.*; import java.math.*; import javax.persistence.Transient; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; +import java.util.List; +import javax.persistence.Id; @Table(name = "wx_web_log") -public class WxWebLog extends BaseModel { +public class WxWebLog { private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + /***/ @io.swagger.annotations.ApiModelProperty(value="",name="data") private String data; @@ -69,10 +96,9 @@ public class WxWebLog extends BaseModel { sb.append(","); sb.append(fields[k].toString()); } - super.setSortColumns(sb.toString()); + } - @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { diff --git a/mallinkService/src/main/java/com/simple/mapper/SysPermissionMapper.java b/mallinkService/src/main/java/com/simple/mapper/SysPermissionMapper.java new file mode 100644 index 000000000..7f773ef98 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/mapper/SysPermissionMapper.java @@ -0,0 +1,19 @@ +package com.simple.mapper; + +import java.util.*; +import com.simple.common.CommonMapper; +import org.apache.ibatis.annotations.Param; +import com.simple.domain.po.SysPermission; + +public interface SysPermissionMapper extends CommonMapper { + + List findList(SysPermission sysPermission); + + List findPermissionByRoleId(String roleId); + List findPermissionByRoleIds(@Param("roleIds") List roleIds); + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/mapper/SysRoleMapper.java b/mallinkService/src/main/java/com/simple/mapper/SysRoleMapper.java new file mode 100644 index 000000000..22b968196 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/mapper/SysRoleMapper.java @@ -0,0 +1,19 @@ +package com.simple.mapper; + +import java.util.*; +import com.simple.common.CommonMapper; +import org.apache.ibatis.annotations.Param; +import com.simple.domain.po.SysRole; + +public interface SysRoleMapper extends CommonMapper { + + List findList(SysRole sysRole); + + + List findRoleByUserId(String userId); + int countByName(Map map); + + + + +} diff --git a/mallinkService/src/main/java/com/simple/mapper/SysRolePermissionMapper.java b/mallinkService/src/main/java/com/simple/mapper/SysRolePermissionMapper.java new file mode 100644 index 000000000..c5f5695bd --- /dev/null +++ b/mallinkService/src/main/java/com/simple/mapper/SysRolePermissionMapper.java @@ -0,0 +1,18 @@ +package com.simple.mapper; + +import java.util.*; +import com.simple.common.CommonMapper; +import org.apache.ibatis.annotations.Param; +import com.simple.domain.po.SysRolePermission; + +public interface SysRolePermissionMapper extends CommonMapper { + + List findList(SysRolePermission sysRolePermission); + + + + void deleteByRoleId(Map map); + + + +} diff --git a/mallinkService/src/main/java/com/simple/mapper/SysUserRoleMapper.java b/mallinkService/src/main/java/com/simple/mapper/SysUserRoleMapper.java new file mode 100644 index 000000000..10a38c022 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/mapper/SysUserRoleMapper.java @@ -0,0 +1,17 @@ +package com.simple.mapper; + +import java.util.*; +import com.simple.common.CommonMapper; +import org.apache.ibatis.annotations.Param; +import com.simple.domain.po.SysUserRole; + +public interface SysUserRoleMapper extends CommonMapper { + + List findList(SysUserRole sysUserRole); + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/mapper/UserInfoMapper.java b/mallinkService/src/main/java/com/simple/mapper/UserInfoMapper.java new file mode 100644 index 000000000..411debbbf --- /dev/null +++ b/mallinkService/src/main/java/com/simple/mapper/UserInfoMapper.java @@ -0,0 +1,18 @@ +package com.simple.mapper; + +import java.util.*; +import com.simple.common.CommonMapper; +import org.apache.ibatis.annotations.Param; +import com.simple.domain.po.UserInfo; + +public interface UserInfoMapper extends CommonMapper { + + List findList(UserInfo userInfo); + + + + + Integer hasButtonPermission(@Param("userId") String userId, @Param("permission") String permission); + + +} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxAppinfoMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxAppinfoMapper.java index 043a91699..660e650a8 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxAppinfoMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxAppinfoMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxAppinfo; public interface WxAppinfoMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxBLogMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxBLogMapper.java index a65858d40..955f56168 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxBLogMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxBLogMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxBLog; public interface WxBLogMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxBUserMerchantMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxBUserMerchantMapper.java index f6a5e187b..2ddca26e9 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxBUserMerchantMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxBUserMerchantMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxBUserMerchant; public interface WxBUserMerchantMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxBannersMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxBannersMapper.java index 3d6a2f1ae..f100713bf 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxBannersMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxBannersMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxBanners; public interface WxBannersMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxBusinessMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxBusinessMapper.java index c64a53a1d..c78c7cc43 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxBusinessMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxBusinessMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxBusiness; public interface WxBusinessMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCLogMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCLogMapper.java index 87ceffd95..87355a80a 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCLogMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCLogMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCLog; public interface WxCLogMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCUserCarsMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCUserCarsMapper.java index 5c46fd36d..bbcaf9c38 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCUserCarsMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCUserCarsMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCUserCars; public interface WxCUserCarsMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCUserCloudMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCUserCloudMapper.java index 34d3d6b8d..221a9157c 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCUserCloudMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCUserCloudMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCUserCloud; public interface WxCUserCloudMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCUserEtcpTokenMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCUserEtcpTokenMapper.java new file mode 100644 index 000000000..ff0dc0fa8 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/mapper/WxCUserEtcpTokenMapper.java @@ -0,0 +1,17 @@ +package com.simple.mapper; + +import java.util.*; +import com.simple.common.CommonMapper; +import org.apache.ibatis.annotations.Param; +import com.simple.domain.po.WxCUserEtcpToken; + +public interface WxCUserEtcpTokenMapper extends CommonMapper { + + List findList(WxCUserEtcpToken wxCUserEtcpToken); + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCUserMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCUserMapper.java index 7504be50d..3371bb978 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCUserMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCUserMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCUser; public interface WxCUserMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCUserTagsMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCUserTagsMapper.java index 4d61d6e6f..fe572edca 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCUserTagsMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCUserTagsMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCUserTags; public interface WxCUserTagsMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponActionLogMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponActionLogMapper.java index ca9fd4866..053fa82d8 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCouponActionLogMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponActionLogMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCouponActionLog; public interface WxCouponActionLogMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponActivityMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponActivityMapper.java index 873c60910..1a6b9dfe3 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCouponActivityMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponActivityMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCouponActivity; public interface WxCouponActivityMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponMapper.java index 47d25a784..679b1944e 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCouponMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCoupon; public interface WxCouponMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponRecordMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponRecordMapper.java index 2e0dd17f7..6e16fe2fa 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCouponRecordMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponRecordMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCouponRecord; public interface WxCouponRecordMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponTypeMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponTypeMapper.java index 9c4d33dae..3c8dff8a3 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCouponTypeMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponTypeMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCouponType; public interface WxCouponTypeMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxEtcpCouponRecordMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxEtcpCouponRecordMapper.java index 2da257ce9..da5ab6282 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxEtcpCouponRecordMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxEtcpCouponRecordMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxEtcpCouponRecord; public interface WxEtcpCouponRecordMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkDissolutionMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkDissolutionMapper.java index d1138c095..4deb06e47 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkDissolutionMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkDissolutionMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxEtcpParkDissolution; public interface WxEtcpParkDissolutionMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkInMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkInMapper.java index 207a15a10..50b17f257 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkInMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkInMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxEtcpParkIn; public interface WxEtcpParkInMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkMsgSucMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkMsgSucMapper.java index 8e8a5804e..229c065c8 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkMsgSucMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkMsgSucMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxEtcpParkMsgSuc; public interface WxEtcpParkMsgSucMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkOrderunpayMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkOrderunpayMapper.java index 864b82b91..44ce3be35 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkOrderunpayMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkOrderunpayMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxEtcpParkOrderunpay; public interface WxEtcpParkOrderunpayMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkOutMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkOutMapper.java index 247b442d3..7e963c809 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkOutMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkOutMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxEtcpParkOut; public interface WxEtcpParkOutMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkTransactionMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkTransactionMapper.java index 3646172af..08d154ca2 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkTransactionMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkTransactionMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxEtcpParkTransaction; public interface WxEtcpParkTransactionMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkUnbindMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkUnbindMapper.java index 7d74de267..4c0dce2de 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkUnbindMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkUnbindMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxEtcpParkUnbind; public interface WxEtcpParkUnbindMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxFlashSaleMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxFlashSaleMapper.java index c0cc30c0b..8166881ad 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxFlashSaleMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxFlashSaleMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxFlashSale; public interface WxFlashSaleMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxMallBuildingMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxMallBuildingMapper.java index ccc68ae28..a9a7639cf 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxMallBuildingMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxMallBuildingMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMallBuilding; public interface WxMallBuildingMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxMallFloorMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxMallFloorMapper.java index c98dbcb03..860566c4c 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxMallFloorMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxMallFloorMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMallFloor; public interface WxMallFloorMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxMallMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxMallMapper.java index 594daea08..75f0d214c 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxMallMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxMallMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMall; public interface WxMallMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxMerchantMapper.java index 5d60b215b..9ba17d017 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxMerchantMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMerchant; public interface WxMerchantMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxMerchantShopMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxMerchantShopMapper.java index efb304cef..58a4ad27b 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxMerchantShopMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxMerchantShopMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMerchantShop; public interface WxMerchantShopMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxMerchantTradeDaysMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxMerchantTradeDaysMapper.java index 530bd294d..d67a68bf5 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxMerchantTradeDaysMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxMerchantTradeDaysMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMerchantTradeDays; public interface WxMerchantTradeDaysMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxMsgConfigMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxMsgConfigMapper.java new file mode 100644 index 000000000..c14bf5b1d --- /dev/null +++ b/mallinkService/src/main/java/com/simple/mapper/WxMsgConfigMapper.java @@ -0,0 +1,17 @@ +package com.simple.mapper; + +import java.util.*; +import com.simple.common.CommonMapper; +import org.apache.ibatis.annotations.Param; +import com.simple.domain.po.WxMsgConfig; + +public interface WxMsgConfigMapper extends CommonMapper { + + List findList(WxMsgConfig wxMsgConfig); + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxMsgMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxMsgMapper.java index 8bcbee614..9078154de 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxMsgMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxMsgMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMsg; public interface WxMsgMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxMsgModelMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxMsgModelMapper.java index c1f286193..5a2cbbfbc 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxMsgModelMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxMsgModelMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMsgModel; public interface WxMsgModelMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxMsgSignatureMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxMsgSignatureMapper.java index 9d8409402..eff190c28 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxMsgSignatureMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxMsgSignatureMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMsgSignature; public interface WxMsgSignatureMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxOrdersMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxOrdersMapper.java index 618c5332e..c79effb38 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxOrdersMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxOrdersMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxOrders; public interface WxOrdersMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxParkMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxParkMapper.java index 736ef172a..bbf5898e6 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxParkMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxParkMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxPark; public interface WxParkMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxScoreHistoryMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxScoreHistoryMapper.java index d3e696cc0..0652a589c 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxScoreHistoryMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxScoreHistoryMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxScoreHistory; public interface WxScoreHistoryMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxScoreRulesMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxScoreRulesMapper.java index 01701d201..60e706e1c 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxScoreRulesMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxScoreRulesMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxScoreRules; public interface WxScoreRulesMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxScoreValidityPeriodMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxScoreValidityPeriodMapper.java index 9a5014333..57ea19df3 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxScoreValidityPeriodMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxScoreValidityPeriodMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxScoreValidityPeriod; public interface WxScoreValidityPeriodMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxShopMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxShopMapper.java index 24ad777c8..3db1381d5 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxShopMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxShopMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxShop; public interface WxShopMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxTagsMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxTagsMapper.java index 68a7cb97e..a432046aa 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxTagsMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxTagsMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxTags; public interface WxTagsMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxWebLogMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxWebLogMapper.java index cd301a72f..946d07fbc 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxWebLogMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxWebLogMapper.java @@ -1,10 +1,8 @@ package com.simple.mapper; import java.util.*; -import com.simple.common.crud.CommonMapper; +import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxWebLog; public interface WxWebLogMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/service/SysPermissionService.java b/mallinkService/src/main/java/com/simple/service/SysPermissionService.java new file mode 100644 index 000000000..a61ae335c --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/SysPermissionService.java @@ -0,0 +1,61 @@ +package com.simple.service; + +import java.util.*; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.SysPermission; + +public interface SysPermissionService { + + /** + * 根据实体查询分页列表 + * + * @param record + * @param offset + * @param limit + * @return + */ + PageInfo listAsPage(SysPermission record, Integer pageIndex, Integer pageSize); + + /** + * 根据Id获得实体 + * + * @param id + * @return + */ + SysPermission getById(String id); + + /** + * 保存或更新实体 + * + * @param record + */ + void saveOrUpdate(SysPermission record); + + /** + * 根据Id删除实体 + * + * @param id + */ + void deleteById(String id); + + /** + * 根据roleId查询菜单和按钮权限 + * @param roleId + * @return + */ + List findPermissionByRoleId(String roleId); + + /** + * 根据ruleId权限组查找相应权限 + * @param roleIds + * @return + */ + List findPermissionByRoleIds(List roleIds); + + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/SysRolePermissionService.java b/mallinkService/src/main/java/com/simple/service/SysRolePermissionService.java new file mode 100644 index 000000000..7c5fe5dee --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/SysRolePermissionService.java @@ -0,0 +1,54 @@ +package com.simple.service; + +import java.util.*; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.SysRolePermission; + +public interface SysRolePermissionService { + + /** + * 根据实体查询分页列表 + * + * @param record + * @param offset + * @param limit + * @return + */ + PageInfo listAsPage(SysRolePermission record, Integer pageIndex, Integer pageSize); + + /** + * 根据Id获得实体 + * + * @param id + * @return + */ + SysRolePermission getById(String id); + + /** + * 保存或更新实体 + * + * @param record + */ + void saveOrUpdate(SysRolePermission record); + + /** + * 根据Id删除实体 + * + * @param id + */ + void deleteById(String id); + + + + /** + * 批量保存 + * @param roleId + * @param perId + */ + void savePermissions(String roleId,String[] perId); + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/SysRoleService.java b/mallinkService/src/main/java/com/simple/service/SysRoleService.java new file mode 100644 index 000000000..f3ea3a421 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/SysRoleService.java @@ -0,0 +1,61 @@ +package com.simple.service; + +import java.util.*; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.SysRole; + +public interface SysRoleService { + + /** + * 根据实体查询分页列表 + * + * @param record + * @param offset + * @param limit + * @return + */ + PageInfo listAsPage(SysRole record, Integer pageIndex, Integer pageSize); + + /** + * 根据Id获得实体 + * + * @param id + * @return + */ + SysRole getById(String id); + + /** + * 保存或更新实体 + * + * @param record + */ + void saveOrUpdate(SysRole record); + + /** + * 根据Id删除实体 + * + * @param id + */ + void deleteById(String id); + + + /** + * 根据userId查找Role集合 + * @param userId + * @return + */ + List findRoleByUserId(String userId); + + /** + * 根据名称查询数量 + * @param name 名称 + * @return + */ + int countByName(String name,String id); + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/SysUserRoleService.java b/mallinkService/src/main/java/com/simple/service/SysUserRoleService.java new file mode 100644 index 000000000..adad10149 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/SysUserRoleService.java @@ -0,0 +1,53 @@ +package com.simple.service; + +import java.util.*; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.SysUserRole; + +public interface SysUserRoleService { + + /** + * 根据实体查询分页列表 + * + * @param record + * @param offset + * @param limit + * @return + */ + PageInfo listAsPage(SysUserRole record, Integer pageIndex, Integer pageSize); + + /** + * 根据Id获得实体 + * + * @param id + * @return + */ + SysUserRole getById(String id); + + /** + * 保存或更新实体 + * + * @param record + */ + void saveOrUpdate(SysUserRole record); + + /** + * 根据Id删除实体 + * + * @param id + */ + void deleteById(String id); + + + + + /** + * 批量增加用户对应角色 + * @param u2rs + */ + void batchInsert(List u2rs); + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/UserInfoService.java b/mallinkService/src/main/java/com/simple/service/UserInfoService.java new file mode 100644 index 000000000..43c7592ef --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/UserInfoService.java @@ -0,0 +1,74 @@ +package com.simple.service; + +import java.util.*; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.UserInfo; + +public interface UserInfoService { + + /** + * 根据实体查询分页列表 + * + * @param record + * @param offset + * @param limit + * @return + */ + PageInfo listAsPage(UserInfo record, Integer pageIndex, Integer pageSize); + + /** + * 根据Id获得实体 + * + * @param id + * @return + */ + UserInfo getById(String id); + + /** + * 保存或更新实体 + * + * @param record + */ + void saveOrUpdate(UserInfo record); + + /** + * 根据Id删除实体 + * + * @param id + */ + void deleteById(String id); + + + + + + /** + * 查询用户名总数,用于校验用户名是否重复 + * @param username + */ + long cntByUserName(String username); + + /** + * 根据用户名查询用户对象 + * @param username + * @return + */ + UserInfo getByName(String username); + + /** + * 删除用户相关数据(用户记录,角色关联) + * @param id + */ + void deleteUser(String id); + + /** + * 检查用户按钮是否有权限 + * @param userId + * @param permission + * @return 是否有权限(true: 有| false: 没有) + */ + boolean hasButtonPermission(String userId, String permission); + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/WxAppinfoService.java b/mallinkService/src/main/java/com/simple/service/WxAppinfoService.java index 013ee3148..cedf1abd9 100644 --- a/mallinkService/src/main/java/com/simple/service/WxAppinfoService.java +++ b/mallinkService/src/main/java/com/simple/service/WxAppinfoService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxAppinfo; public interface WxAppinfoService { diff --git a/mallinkService/src/main/java/com/simple/service/WxBLogService.java b/mallinkService/src/main/java/com/simple/service/WxBLogService.java index 8ee5ec5e4..24c01e6be 100644 --- a/mallinkService/src/main/java/com/simple/service/WxBLogService.java +++ b/mallinkService/src/main/java/com/simple/service/WxBLogService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxBLog; public interface WxBLogService { diff --git a/mallinkService/src/main/java/com/simple/service/WxBUserMerchantService.java b/mallinkService/src/main/java/com/simple/service/WxBUserMerchantService.java index 644adb2b3..8ef8efc4e 100644 --- a/mallinkService/src/main/java/com/simple/service/WxBUserMerchantService.java +++ b/mallinkService/src/main/java/com/simple/service/WxBUserMerchantService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxBUserMerchant; public interface WxBUserMerchantService { diff --git a/mallinkService/src/main/java/com/simple/service/WxBannersService.java b/mallinkService/src/main/java/com/simple/service/WxBannersService.java index 4470dbc52..7cdeac6f1 100644 --- a/mallinkService/src/main/java/com/simple/service/WxBannersService.java +++ b/mallinkService/src/main/java/com/simple/service/WxBannersService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxBanners; public interface WxBannersService { diff --git a/mallinkService/src/main/java/com/simple/service/WxBusinessService.java b/mallinkService/src/main/java/com/simple/service/WxBusinessService.java index 566019e38..709a9fce6 100644 --- a/mallinkService/src/main/java/com/simple/service/WxBusinessService.java +++ b/mallinkService/src/main/java/com/simple/service/WxBusinessService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxBusiness; public interface WxBusinessService { diff --git a/mallinkService/src/main/java/com/simple/service/WxCLogService.java b/mallinkService/src/main/java/com/simple/service/WxCLogService.java index 2571f85e4..292bafcc5 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCLogService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCLogService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCLog; public interface WxCLogService { diff --git a/mallinkService/src/main/java/com/simple/service/WxCUserCarsService.java b/mallinkService/src/main/java/com/simple/service/WxCUserCarsService.java index da8be3f8b..d41d5c6be 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCUserCarsService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCUserCarsService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCUserCars; public interface WxCUserCarsService { diff --git a/mallinkService/src/main/java/com/simple/service/WxCUserCloudService.java b/mallinkService/src/main/java/com/simple/service/WxCUserCloudService.java index 2c5c0e20e..8297fdb17 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCUserCloudService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCUserCloudService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCUserCloud; public interface WxCUserCloudService { diff --git a/mallinkService/src/main/java/com/simple/service/WxCUserEtcpTokenService.java b/mallinkService/src/main/java/com/simple/service/WxCUserEtcpTokenService.java new file mode 100644 index 000000000..2f4fafdc3 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/WxCUserEtcpTokenService.java @@ -0,0 +1,48 @@ +package com.simple.service; + +import java.util.*; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.WxCUserEtcpToken; + +public interface WxCUserEtcpTokenService { + + /** + * 根据实体查询分页列表 + * + * @param record + * @param offset + * @param limit + * @return + */ + PageInfo listAsPage(WxCUserEtcpToken record, Integer pageIndex, Integer pageSize); + + /** + * 根据Id获得实体 + * + * @param id + * @return + */ + WxCUserEtcpToken getById(String id); + + /** + * 保存或更新实体 + * + * @param record + */ + void saveOrUpdate(WxCUserEtcpToken record); + + /** + * 根据Id删除实体 + * + * @param id + */ + void deleteById(String id); + + + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/WxCUserService.java b/mallinkService/src/main/java/com/simple/service/WxCUserService.java index 10e191949..c85ffb019 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCUserService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCUserService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCUser; public interface WxCUserService { diff --git a/mallinkService/src/main/java/com/simple/service/WxCUserTagsService.java b/mallinkService/src/main/java/com/simple/service/WxCUserTagsService.java index 9ab492c57..b496974fb 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCUserTagsService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCUserTagsService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCUserTags; public interface WxCUserTagsService { diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponActionLogService.java b/mallinkService/src/main/java/com/simple/service/WxCouponActionLogService.java index 6f8f5586f..9e0a3e790 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponActionLogService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponActionLogService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCouponActionLog; public interface WxCouponActionLogService { diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponActivityService.java b/mallinkService/src/main/java/com/simple/service/WxCouponActivityService.java index c674d8668..529e90565 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponActivityService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponActivityService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCouponActivity; public interface WxCouponActivityService { diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponRecordService.java b/mallinkService/src/main/java/com/simple/service/WxCouponRecordService.java index 2299998f3..c46f08b88 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponRecordService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponRecordService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCouponRecord; public interface WxCouponRecordService { diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponService.java b/mallinkService/src/main/java/com/simple/service/WxCouponService.java index 8dd1da447..806a30af9 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCoupon; public interface WxCouponService { diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponTypeService.java b/mallinkService/src/main/java/com/simple/service/WxCouponTypeService.java index e6d59c7cc..ba10d552f 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponTypeService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponTypeService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCouponType; public interface WxCouponTypeService { diff --git a/mallinkService/src/main/java/com/simple/service/WxEtcpCouponRecordService.java b/mallinkService/src/main/java/com/simple/service/WxEtcpCouponRecordService.java index ad8db64a9..0c94975fa 100644 --- a/mallinkService/src/main/java/com/simple/service/WxEtcpCouponRecordService.java +++ b/mallinkService/src/main/java/com/simple/service/WxEtcpCouponRecordService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxEtcpCouponRecord; public interface WxEtcpCouponRecordService { diff --git a/mallinkService/src/main/java/com/simple/service/WxEtcpParkDissolutionService.java b/mallinkService/src/main/java/com/simple/service/WxEtcpParkDissolutionService.java index 293fb688d..d0ea3217b 100644 --- a/mallinkService/src/main/java/com/simple/service/WxEtcpParkDissolutionService.java +++ b/mallinkService/src/main/java/com/simple/service/WxEtcpParkDissolutionService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxEtcpParkDissolution; public interface WxEtcpParkDissolutionService { diff --git a/mallinkService/src/main/java/com/simple/service/WxEtcpParkInService.java b/mallinkService/src/main/java/com/simple/service/WxEtcpParkInService.java index 06eaf9b81..31481943b 100644 --- a/mallinkService/src/main/java/com/simple/service/WxEtcpParkInService.java +++ b/mallinkService/src/main/java/com/simple/service/WxEtcpParkInService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxEtcpParkIn; public interface WxEtcpParkInService { diff --git a/mallinkService/src/main/java/com/simple/service/WxEtcpParkMsgSucService.java b/mallinkService/src/main/java/com/simple/service/WxEtcpParkMsgSucService.java index aa4eef268..8e86009e8 100644 --- a/mallinkService/src/main/java/com/simple/service/WxEtcpParkMsgSucService.java +++ b/mallinkService/src/main/java/com/simple/service/WxEtcpParkMsgSucService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxEtcpParkMsgSuc; public interface WxEtcpParkMsgSucService { diff --git a/mallinkService/src/main/java/com/simple/service/WxEtcpParkOrderunpayService.java b/mallinkService/src/main/java/com/simple/service/WxEtcpParkOrderunpayService.java index 09837395f..c9e6678b3 100644 --- a/mallinkService/src/main/java/com/simple/service/WxEtcpParkOrderunpayService.java +++ b/mallinkService/src/main/java/com/simple/service/WxEtcpParkOrderunpayService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxEtcpParkOrderunpay; public interface WxEtcpParkOrderunpayService { diff --git a/mallinkService/src/main/java/com/simple/service/WxEtcpParkOutService.java b/mallinkService/src/main/java/com/simple/service/WxEtcpParkOutService.java index 9fb0bd8c5..fb3e920b3 100644 --- a/mallinkService/src/main/java/com/simple/service/WxEtcpParkOutService.java +++ b/mallinkService/src/main/java/com/simple/service/WxEtcpParkOutService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxEtcpParkOut; public interface WxEtcpParkOutService { diff --git a/mallinkService/src/main/java/com/simple/service/WxEtcpParkTransactionService.java b/mallinkService/src/main/java/com/simple/service/WxEtcpParkTransactionService.java index c31fe3403..820fdad0f 100644 --- a/mallinkService/src/main/java/com/simple/service/WxEtcpParkTransactionService.java +++ b/mallinkService/src/main/java/com/simple/service/WxEtcpParkTransactionService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxEtcpParkTransaction; public interface WxEtcpParkTransactionService { diff --git a/mallinkService/src/main/java/com/simple/service/WxEtcpParkUnbindService.java b/mallinkService/src/main/java/com/simple/service/WxEtcpParkUnbindService.java index f7d8f742d..e5a7c4f1d 100644 --- a/mallinkService/src/main/java/com/simple/service/WxEtcpParkUnbindService.java +++ b/mallinkService/src/main/java/com/simple/service/WxEtcpParkUnbindService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxEtcpParkUnbind; public interface WxEtcpParkUnbindService { diff --git a/mallinkService/src/main/java/com/simple/service/WxFlashSaleService.java b/mallinkService/src/main/java/com/simple/service/WxFlashSaleService.java index e305344cc..6614969af 100644 --- a/mallinkService/src/main/java/com/simple/service/WxFlashSaleService.java +++ b/mallinkService/src/main/java/com/simple/service/WxFlashSaleService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxFlashSale; public interface WxFlashSaleService { diff --git a/mallinkService/src/main/java/com/simple/service/WxMallBuildingService.java b/mallinkService/src/main/java/com/simple/service/WxMallBuildingService.java index e8ff7c64e..f2291b7e7 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMallBuildingService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMallBuildingService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMallBuilding; public interface WxMallBuildingService { diff --git a/mallinkService/src/main/java/com/simple/service/WxMallFloorService.java b/mallinkService/src/main/java/com/simple/service/WxMallFloorService.java index bc843688d..5e9513991 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMallFloorService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMallFloorService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMallFloor; public interface WxMallFloorService { diff --git a/mallinkService/src/main/java/com/simple/service/WxMallService.java b/mallinkService/src/main/java/com/simple/service/WxMallService.java index 4d92db0a1..6ec761b5d 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMallService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMallService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMall; public interface WxMallService { diff --git a/mallinkService/src/main/java/com/simple/service/WxMerchantService.java b/mallinkService/src/main/java/com/simple/service/WxMerchantService.java index b353abc2e..a26f36d95 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMerchantService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMerchant; public interface WxMerchantService { diff --git a/mallinkService/src/main/java/com/simple/service/WxMerchantShopService.java b/mallinkService/src/main/java/com/simple/service/WxMerchantShopService.java index 7b0d02f65..d6e3204bd 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMerchantShopService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMerchantShopService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMerchantShop; public interface WxMerchantShopService { diff --git a/mallinkService/src/main/java/com/simple/service/WxMerchantTradeDaysService.java b/mallinkService/src/main/java/com/simple/service/WxMerchantTradeDaysService.java index ed40d25f7..368ec2c1c 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMerchantTradeDaysService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMerchantTradeDaysService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMerchantTradeDays; public interface WxMerchantTradeDaysService { diff --git a/mallinkService/src/main/java/com/simple/service/WxMsgConfigService.java b/mallinkService/src/main/java/com/simple/service/WxMsgConfigService.java new file mode 100644 index 000000000..3001ed47f --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/WxMsgConfigService.java @@ -0,0 +1,48 @@ +package com.simple.service; + +import java.util.*; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.WxMsgConfig; + +public interface WxMsgConfigService { + + /** + * 根据实体查询分页列表 + * + * @param record + * @param offset + * @param limit + * @return + */ + PageInfo listAsPage(WxMsgConfig record, Integer pageIndex, Integer pageSize); + + /** + * 根据Id获得实体 + * + * @param id + * @return + */ + WxMsgConfig getById(String id); + + /** + * 保存或更新实体 + * + * @param record + */ + void saveOrUpdate(WxMsgConfig record); + + /** + * 根据Id删除实体 + * + * @param id + */ + void deleteById(String id); + + + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/WxMsgModelService.java b/mallinkService/src/main/java/com/simple/service/WxMsgModelService.java index 46878acfc..08ca625e2 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMsgModelService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMsgModelService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMsgModel; public interface WxMsgModelService { diff --git a/mallinkService/src/main/java/com/simple/service/WxMsgService.java b/mallinkService/src/main/java/com/simple/service/WxMsgService.java index 0a4755b36..5cd0132da 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMsgService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMsgService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMsg; public interface WxMsgService { diff --git a/mallinkService/src/main/java/com/simple/service/WxMsgSignatureService.java b/mallinkService/src/main/java/com/simple/service/WxMsgSignatureService.java index a7ae40cea..5ae68ba72 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMsgSignatureService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMsgSignatureService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMsgSignature; public interface WxMsgSignatureService { diff --git a/mallinkService/src/main/java/com/simple/service/WxOrdersService.java b/mallinkService/src/main/java/com/simple/service/WxOrdersService.java index 87b63c414..c649bf17e 100644 --- a/mallinkService/src/main/java/com/simple/service/WxOrdersService.java +++ b/mallinkService/src/main/java/com/simple/service/WxOrdersService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxOrders; public interface WxOrdersService { diff --git a/mallinkService/src/main/java/com/simple/service/WxParkService.java b/mallinkService/src/main/java/com/simple/service/WxParkService.java index 6fed4406c..c095328df 100644 --- a/mallinkService/src/main/java/com/simple/service/WxParkService.java +++ b/mallinkService/src/main/java/com/simple/service/WxParkService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxPark; public interface WxParkService { diff --git a/mallinkService/src/main/java/com/simple/service/WxScoreHistoryService.java b/mallinkService/src/main/java/com/simple/service/WxScoreHistoryService.java index 832349573..3a131e689 100644 --- a/mallinkService/src/main/java/com/simple/service/WxScoreHistoryService.java +++ b/mallinkService/src/main/java/com/simple/service/WxScoreHistoryService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxScoreHistory; public interface WxScoreHistoryService { diff --git a/mallinkService/src/main/java/com/simple/service/WxScoreRulesService.java b/mallinkService/src/main/java/com/simple/service/WxScoreRulesService.java index 83c17b8a7..536426cd5 100644 --- a/mallinkService/src/main/java/com/simple/service/WxScoreRulesService.java +++ b/mallinkService/src/main/java/com/simple/service/WxScoreRulesService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxScoreRules; public interface WxScoreRulesService { diff --git a/mallinkService/src/main/java/com/simple/service/WxScoreValidityPeriodService.java b/mallinkService/src/main/java/com/simple/service/WxScoreValidityPeriodService.java index bb5f114a9..bb8c463ec 100644 --- a/mallinkService/src/main/java/com/simple/service/WxScoreValidityPeriodService.java +++ b/mallinkService/src/main/java/com/simple/service/WxScoreValidityPeriodService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxScoreValidityPeriod; public interface WxScoreValidityPeriodService { diff --git a/mallinkService/src/main/java/com/simple/service/WxShopService.java b/mallinkService/src/main/java/com/simple/service/WxShopService.java index 3416468cd..7f6254618 100644 --- a/mallinkService/src/main/java/com/simple/service/WxShopService.java +++ b/mallinkService/src/main/java/com/simple/service/WxShopService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxShop; public interface WxShopService { diff --git a/mallinkService/src/main/java/com/simple/service/WxTagsService.java b/mallinkService/src/main/java/com/simple/service/WxTagsService.java index 015bf9e52..55cadb99d 100644 --- a/mallinkService/src/main/java/com/simple/service/WxTagsService.java +++ b/mallinkService/src/main/java/com/simple/service/WxTagsService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxTags; public interface WxTagsService { diff --git a/mallinkService/src/main/java/com/simple/service/WxWebLogService.java b/mallinkService/src/main/java/com/simple/service/WxWebLogService.java index b8d901853..3a33c96d3 100644 --- a/mallinkService/src/main/java/com/simple/service/WxWebLogService.java +++ b/mallinkService/src/main/java/com/simple/service/WxWebLogService.java @@ -2,8 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxWebLog; public interface WxWebLogService { diff --git a/mallinkService/src/main/java/com/simple/service/impl/SysPermissionServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/SysPermissionServiceImpl.java new file mode 100644 index 000000000..5ac7bc8d5 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/impl/SysPermissionServiceImpl.java @@ -0,0 +1,60 @@ +package com.simple.service.impl; + +import java.util.*; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.SysPermission; +import com.simple.mapper.SysPermissionMapper; +import com.simple.service.SysPermissionService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class SysPermissionServiceImpl implements SysPermissionService { + + @Autowired + SysPermissionMapper sysPermissionMapper; + + + @Override + public PageInfo listAsPage(SysPermission record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> sysPermissionMapper.findList(record)); + } + + @Override + public SysPermission getById(String id) { + return sysPermissionMapper.selectByPrimaryKey(id); + } + + @Override + public void saveOrUpdate(SysPermission record) { + if (record.getId() == null) { + record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + sysPermissionMapper.insertSelective(record); + } else { + sysPermissionMapper.updateByPrimaryKeySelective(record); + } + } + + @Override + public void deleteById(String id) { + sysPermissionMapper.deleteByPrimaryKey(id); + } + + @Override + public List findPermissionByRoleId(String roleId) { + return sysPermissionMapper.findPermissionByRoleId(roleId); + } + + @Override + public List findPermissionByRoleIds(List roleIds) { + return sysPermissionMapper.findPermissionByRoleIds(roleIds); + } + + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/impl/SysRolePermissionServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/SysRolePermissionServiceImpl.java new file mode 100644 index 000000000..2d42aafd8 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/impl/SysRolePermissionServiceImpl.java @@ -0,0 +1,64 @@ +package com.simple.service.impl; + +import java.util.*; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.SysRolePermission; +import com.simple.mapper.SysRolePermissionMapper; +import com.simple.service.SysRolePermissionService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class SysRolePermissionServiceImpl implements SysRolePermissionService { + + @Autowired + SysRolePermissionMapper sysRolePermissionMapper; + + + @Override + public PageInfo listAsPage(SysRolePermission record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> sysRolePermissionMapper.findList(record)); + } + + @Override + public SysRolePermission getById(String id) { + return sysRolePermissionMapper.selectByPrimaryKey(id); + } + + @Override + public void saveOrUpdate(SysRolePermission record) { + if (record.getId() == null) { + record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + sysRolePermissionMapper.insertSelective(record); + } else { + sysRolePermissionMapper.updateByPrimaryKeySelective(record); + } + } + + @Override + public void deleteById(String id) { + sysRolePermissionMapper.deleteByPrimaryKey(id); + } + + + + @Override + public void savePermissions(String roleId, String[] perId) { + Map map = new HashMap<>(); + map.put("roleId", roleId); + sysRolePermissionMapper.deleteByRoleId(map); + for(String pId:perId){ + SysRolePermission permission =new SysRolePermission(); + permission.setId(roleId); + permission.setPermissionId(pId); + sysRolePermissionMapper.insert(permission); + } + + } + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/impl/SysRoleServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/SysRoleServiceImpl.java new file mode 100644 index 000000000..41e568113 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/impl/SysRoleServiceImpl.java @@ -0,0 +1,63 @@ +package com.simple.service.impl; + +import java.util.*; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.SysRole; +import com.simple.mapper.SysRoleMapper; +import com.simple.service.SysRoleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class SysRoleServiceImpl implements SysRoleService { + + @Autowired + SysRoleMapper sysRoleMapper; + + + @Override + public PageInfo listAsPage(SysRole record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> sysRoleMapper.findList(record)); + } + + @Override + public SysRole getById(String id) { + return sysRoleMapper.selectByPrimaryKey(id); + } + + @Override + public void saveOrUpdate(SysRole record) { + if (record.getId() == null) { + record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + sysRoleMapper.insertSelective(record); + } else { + sysRoleMapper.updateByPrimaryKeySelective(record); + } + } + + @Override + public void deleteById(String id) { + sysRoleMapper.deleteByPrimaryKey(id); + } + + + @Override + public List findRoleByUserId(String userId) { + return sysRoleMapper.findRoleByUserId(userId); + } + + @Override + public int countByName(String name,String id) { + Map map = new HashMap<>(2); + map.put("name", name); + map.put("id", id); + return sysRoleMapper.countByName(map); + } + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/impl/SysUserRoleServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/SysUserRoleServiceImpl.java new file mode 100644 index 000000000..13057b4d6 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/impl/SysUserRoleServiceImpl.java @@ -0,0 +1,55 @@ +package com.simple.service.impl; + +import java.util.*; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.SysUserRole; +import com.simple.mapper.SysUserRoleMapper; +import com.simple.service.SysUserRoleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class SysUserRoleServiceImpl implements SysUserRoleService { + + @Autowired + SysUserRoleMapper sysUserRoleMapper; + + + @Override + public PageInfo listAsPage(SysUserRole record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> sysUserRoleMapper.findList(record)); + } + + @Override + public SysUserRole getById(String id) { + return sysUserRoleMapper.selectByPrimaryKey(id); + } + + @Override + public void saveOrUpdate(SysUserRole record) { + if (record.getId() == null) { + record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + sysUserRoleMapper.insertSelective(record); + } else { + sysUserRoleMapper.updateByPrimaryKeySelective(record); + } + } + + @Override + public void deleteById(String id) { + sysUserRoleMapper.deleteByPrimaryKey(id); + } + + + + + @Override + public void batchInsert(List u2rs) { + sysUserRoleMapper.insertList(u2rs); + } + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/impl/UserInfoServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/UserInfoServiceImpl.java new file mode 100644 index 000000000..4d2c1a777 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/impl/UserInfoServiceImpl.java @@ -0,0 +1,83 @@ +package com.simple.service.impl; + +import java.util.*; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.UserInfo; +import com.simple.mapper.UserInfoMapper; +import com.simple.service.UserInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.simple.domain.po.SysUserRole; +import com.simple.mapper.SysUserRoleMapper; + +@Service +public class UserInfoServiceImpl implements UserInfoService { + + @Autowired + UserInfoMapper userInfoMapper; + @Autowired + SysUserRoleMapper userRoleMapper; + + + @Override + public PageInfo listAsPage(UserInfo record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> userInfoMapper.findList(record)); + } + + @Override + public UserInfo getById(String id) { + return userInfoMapper.selectByPrimaryKey(id); + } + + @Override + public void saveOrUpdate(UserInfo record) { + if (record.getId() == null) { + record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + userInfoMapper.insertSelective(record); + } else { + userInfoMapper.updateByPrimaryKeySelective(record); + } + } + + @Override + public void deleteById(String id) { + userInfoMapper.deleteByPrimaryKey(id); + } + + + + + + @Override + public UserInfo getByName(String username) { + UserInfo userInfo = new UserInfo(); + userInfo.setName(username); + return userInfoMapper.selectOne(userInfo); + } + + @Override + public long cntByUserName(String username) { + UserInfo userInfo = new UserInfo(); + userInfo.setUsername(username); + return PageHelper.count(() -> userInfoMapper.select(userInfo)); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteUser(String id) { + userInfoMapper.deleteByPrimaryKey(id); + SysUserRole userRole = new SysUserRole(); + userRole.setUid(id); + userRoleMapper.delete(userRole); + } + + @Override + public boolean hasButtonPermission(String userId, String permission) { + return userInfoMapper.hasButtonPermission(userId, permission) == null ? false : true; + } + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxAppinfoServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxAppinfoServiceImpl.java index aad2f913c..eb54770eb 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxAppinfoServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxAppinfoServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxAppinfo; import com.simple.mapper.WxAppinfoMapper; import com.simple.service.WxAppinfoService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxBLogServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxBLogServiceImpl.java index b305d5daa..1e0686d6a 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxBLogServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxBLogServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxBLog; import com.simple.mapper.WxBLogMapper; import com.simple.service.WxBLogService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxBUserMerchantServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxBUserMerchantServiceImpl.java index df6bf74e8..581ec1ec5 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxBUserMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxBUserMerchantServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxBUserMerchant; import com.simple.mapper.WxBUserMerchantMapper; import com.simple.service.WxBUserMerchantService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxBannersServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxBannersServiceImpl.java index 8b4bbf05d..29e78ed73 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxBannersServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxBannersServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxBanners; import com.simple.mapper.WxBannersMapper; import com.simple.service.WxBannersService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxBusinessServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxBusinessServiceImpl.java index bcf53eaf3..c52a40dba 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxBusinessServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxBusiness; import com.simple.mapper.WxBusinessMapper; import com.simple.service.WxBusinessService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCLogServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCLogServiceImpl.java index dbbea556a..109f0c20c 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCLogServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCLogServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCLog; import com.simple.mapper.WxCLogMapper; import com.simple.service.WxCLogService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCUserCarsServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCUserCarsServiceImpl.java index 6c6811cbb..fd347bc4c 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCUserCarsServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserCarsServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCUserCars; import com.simple.mapper.WxCUserCarsMapper; import com.simple.service.WxCUserCarsService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCUserCloudServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCUserCloudServiceImpl.java index d45ddb982..cb316a7c8 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCUserCloudServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserCloudServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCUserCloud; import com.simple.mapper.WxCUserCloudMapper; import com.simple.service.WxCUserCloudService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCUserEtcpTokenServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCUserEtcpTokenServiceImpl.java new file mode 100644 index 000000000..c378a1cab --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserEtcpTokenServiceImpl.java @@ -0,0 +1,51 @@ +package com.simple.service.impl; + +import java.util.*; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.WxCUserEtcpToken; +import com.simple.mapper.WxCUserEtcpTokenMapper; +import com.simple.service.WxCUserEtcpTokenService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class WxCUserEtcpTokenServiceImpl implements WxCUserEtcpTokenService { + + @Autowired + WxCUserEtcpTokenMapper wxCUserEtcpTokenMapper; + + + @Override + public PageInfo listAsPage(WxCUserEtcpToken record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCUserEtcpTokenMapper.findList(record)); + } + + @Override + public WxCUserEtcpToken getById(String id) { + return wxCUserEtcpTokenMapper.selectByPrimaryKey(id); + } + + @Override + public void saveOrUpdate(WxCUserEtcpToken record) { + if (record.getId() == null) { + record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + wxCUserEtcpTokenMapper.insertSelective(record); + } else { + wxCUserEtcpTokenMapper.updateByPrimaryKeySelective(record); + } + } + + @Override + public void deleteById(String id) { + wxCUserEtcpTokenMapper.deleteByPrimaryKey(id); + } + + + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCUserServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCUserServiceImpl.java index 3a1e96637..1ff402977 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCUserServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCUser; import com.simple.mapper.WxCUserMapper; import com.simple.service.WxCUserService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCUserTagsServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCUserTagsServiceImpl.java index 76f880800..a115c6b17 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCUserTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserTagsServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCUserTags; import com.simple.mapper.WxCUserTagsMapper; import com.simple.service.WxCUserTagsService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponActionLogServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponActionLogServiceImpl.java index 8648b7fc7..0a17d4169 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponActionLogServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponActionLogServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCouponActionLog; import com.simple.mapper.WxCouponActionLogMapper; import com.simple.service.WxCouponActionLogService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponActivityServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponActivityServiceImpl.java index 04edc97bc..9df4ff895 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponActivityServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCouponActivity; import com.simple.mapper.WxCouponActivityMapper; import com.simple.service.WxCouponActivityService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponRecordServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponRecordServiceImpl.java index 8b3e70df0..111994780 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponRecordServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCouponRecord; import com.simple.mapper.WxCouponRecordMapper; import com.simple.service.WxCouponRecordService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java index 9f38c178e..800ad2050 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCoupon; import com.simple.mapper.WxCouponMapper; import com.simple.service.WxCouponService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponTypeServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponTypeServiceImpl.java index 1652b4a80..1d4353140 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponTypeServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponTypeServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxCouponType; import com.simple.mapper.WxCouponTypeMapper; import com.simple.service.WxCouponTypeService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpCouponRecordServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpCouponRecordServiceImpl.java index 970cd4b60..cf477cbf4 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpCouponRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpCouponRecordServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxEtcpCouponRecord; import com.simple.mapper.WxEtcpCouponRecordMapper; import com.simple.service.WxEtcpCouponRecordService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkDissolutionServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkDissolutionServiceImpl.java index 7a0107cec..bc0c96f31 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkDissolutionServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkDissolutionServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxEtcpParkDissolution; import com.simple.mapper.WxEtcpParkDissolutionMapper; import com.simple.service.WxEtcpParkDissolutionService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkInServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkInServiceImpl.java index b0cd68e4f..650f662bd 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkInServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkInServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxEtcpParkIn; import com.simple.mapper.WxEtcpParkInMapper; import com.simple.service.WxEtcpParkInService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkMsgSucServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkMsgSucServiceImpl.java index 92495a294..6a0e9336c 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkMsgSucServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkMsgSucServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxEtcpParkMsgSuc; import com.simple.mapper.WxEtcpParkMsgSucMapper; import com.simple.service.WxEtcpParkMsgSucService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkOrderunpayServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkOrderunpayServiceImpl.java index 75b7fffa3..cc468fdc4 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkOrderunpayServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkOrderunpayServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxEtcpParkOrderunpay; import com.simple.mapper.WxEtcpParkOrderunpayMapper; import com.simple.service.WxEtcpParkOrderunpayService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkOutServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkOutServiceImpl.java index d2edb58b6..0af904755 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkOutServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkOutServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxEtcpParkOut; import com.simple.mapper.WxEtcpParkOutMapper; import com.simple.service.WxEtcpParkOutService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkTransactionServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkTransactionServiceImpl.java index 51d221253..b1dd86d31 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkTransactionServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkTransactionServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxEtcpParkTransaction; import com.simple.mapper.WxEtcpParkTransactionMapper; import com.simple.service.WxEtcpParkTransactionService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkUnbindServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkUnbindServiceImpl.java index 2c3a7155e..29a49b9bc 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkUnbindServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkUnbindServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxEtcpParkUnbind; import com.simple.mapper.WxEtcpParkUnbindMapper; import com.simple.service.WxEtcpParkUnbindService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxFlashSaleServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxFlashSaleServiceImpl.java index ff3844a24..7bdf147f4 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxFlashSaleServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxFlashSaleServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxFlashSale; import com.simple.mapper.WxFlashSaleMapper; import com.simple.service.WxFlashSaleService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMallBuildingServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMallBuildingServiceImpl.java index 666a0dc91..34bea37b3 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMallBuildingServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMallBuildingServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMallBuilding; import com.simple.mapper.WxMallBuildingMapper; import com.simple.service.WxMallBuildingService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMallFloorServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMallFloorServiceImpl.java index 48d72646e..fba5ba613 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMallFloorServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMallFloorServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMallFloor; import com.simple.mapper.WxMallFloorMapper; import com.simple.service.WxMallFloorService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMallServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMallServiceImpl.java index 0b5b319bb..eec451247 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMallServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMallServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMall; import com.simple.mapper.WxMallMapper; import com.simple.service.WxMallService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java index 6f52d045a..d08c43ca2 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMerchant; import com.simple.mapper.WxMerchantMapper; import com.simple.service.WxMerchantService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantShopServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantShopServiceImpl.java index 13c104556..965e7f5e9 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantShopServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantShopServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMerchantShop; import com.simple.mapper.WxMerchantShopMapper; import com.simple.service.WxMerchantShopService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDaysServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDaysServiceImpl.java index 297dfa66e..1a2275161 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDaysServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDaysServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMerchantTradeDays; import com.simple.mapper.WxMerchantTradeDaysMapper; import com.simple.service.WxMerchantTradeDaysService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMsgConfigServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMsgConfigServiceImpl.java new file mode 100644 index 000000000..abd012518 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgConfigServiceImpl.java @@ -0,0 +1,51 @@ +package com.simple.service.impl; + +import java.util.*; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.WxMsgConfig; +import com.simple.mapper.WxMsgConfigMapper; +import com.simple.service.WxMsgConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class WxMsgConfigServiceImpl implements WxMsgConfigService { + + @Autowired + WxMsgConfigMapper wxMsgConfigMapper; + + + @Override + public PageInfo listAsPage(WxMsgConfig record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMsgConfigMapper.findList(record)); + } + + @Override + public WxMsgConfig getById(String id) { + return wxMsgConfigMapper.selectByPrimaryKey(id); + } + + @Override + public void saveOrUpdate(WxMsgConfig record) { + if (record.getId() == null) { + record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + wxMsgConfigMapper.insertSelective(record); + } else { + wxMsgConfigMapper.updateByPrimaryKeySelective(record); + } + } + + @Override + public void deleteById(String id) { + wxMsgConfigMapper.deleteByPrimaryKey(id); + } + + + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMsgModelServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMsgModelServiceImpl.java index 5c878d38c..58e6ce39c 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgModelServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgModelServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMsgModel; import com.simple.mapper.WxMsgModelMapper; import com.simple.service.WxMsgModelService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java index 4a676bda7..6e2b2656e 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMsg; import com.simple.mapper.WxMsgMapper; import com.simple.service.WxMsgService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMsgSignatureServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMsgSignatureServiceImpl.java index 60b771ab1..60efa5e90 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgSignatureServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgSignatureServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxMsgSignature; import com.simple.mapper.WxMsgSignatureMapper; import com.simple.service.WxMsgSignatureService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxOrdersServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxOrdersServiceImpl.java index 5fcb5ebe0..f0e4edb85 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxOrdersServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxOrdersServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxOrders; import com.simple.mapper.WxOrdersMapper; import com.simple.service.WxOrdersService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxParkServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxParkServiceImpl.java index 396bd9ca4..d496e5034 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxParkServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxParkServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxPark; import com.simple.mapper.WxParkMapper; import com.simple.service.WxParkService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxScoreHistoryServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxScoreHistoryServiceImpl.java index 76b412474..cfe41fb58 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxScoreHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxScoreHistoryServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxScoreHistory; import com.simple.mapper.WxScoreHistoryMapper; import com.simple.service.WxScoreHistoryService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxScoreRulesServiceImpl.java index 7a6111e2f..f7fd5b500 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxScoreRulesServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxScoreRules; import com.simple.mapper.WxScoreRulesMapper; import com.simple.service.WxScoreRulesService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxScoreValidityPeriodServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxScoreValidityPeriodServiceImpl.java index d8a1c4f83..06020e17e 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxScoreValidityPeriodServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxScoreValidityPeriodServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxScoreValidityPeriod; import com.simple.mapper.WxScoreValidityPeriodMapper; import com.simple.service.WxScoreValidityPeriodService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java index c3755afbe..123cdf650 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxShop; import com.simple.mapper.WxShopMapper; import com.simple.service.WxShopService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxTagsServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxTagsServiceImpl.java index 551fbcb67..52a76acc4 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxTagsServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxTags; import com.simple.mapper.WxTagsMapper; import com.simple.service.WxTagsService; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxWebLogServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxWebLogServiceImpl.java index 1fe6c0a29..a921d04d1 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxWebLogServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxWebLogServiceImpl.java @@ -3,8 +3,6 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.annotation.HoldBegin; -import com.simple.annotation.HoldEnd; import com.simple.domain.po.WxWebLog; import com.simple.mapper.WxWebLogMapper; import com.simple.service.WxWebLogService; diff --git a/mallinkService/src/main/resources/mapper/SysPermissionMapper.xml b/mallinkService/src/main/resources/mapper/SysPermissionMapper.xml new file mode 100644 index 000000000..68add1e74 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/SysPermissionMapper.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + `id`,`name`,`available`,`parent_id`,`parent_ids`,`permission`,`resource_type`,`url`,`sort` + + + + where 1 = 1 + and `id` = #{id} + and `name` = #{name} + and `name` like concat('%', #{nameLike},'%') + and `available` = #{available} + and `parent_id` = #{parentId} + and `parent_ids` = #{parentIds} + and `permission` = #{permission} + + and `permission` in + + #{item_permission} + + + and `resource_type` = #{resourceType} + and `url` = #{url} + and `sort` = #{sort} + and `sort` >= #{sortFrom} + and #{sortTo} >= `sort` + and `sort` >= #{sortGte} + and `sort` > #{sortGt} + and #{sortLte} >= `sort` + and #{sortLt} > `sort` + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + + + + + + diff --git a/mallinkService/src/main/resources/mapper/SysRoleMapper.xml b/mallinkService/src/main/resources/mapper/SysRoleMapper.xml new file mode 100644 index 000000000..8aafc7320 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/SysRoleMapper.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + `id`,`name`,`available`,`description` + + + + where 1 = 1 + and `id` = #{id} + and `name` = #{name} + and `available` = #{available} + and `description` = #{description} + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + + + + + + diff --git a/mallinkService/src/main/resources/mapper/SysRolePermissionMapper.xml b/mallinkService/src/main/resources/mapper/SysRolePermissionMapper.xml new file mode 100644 index 000000000..43c5f7087 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/SysRolePermissionMapper.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + `permission_id`,`role_id`,`id` + + + + where 1 = 1 + and `permission_id` = #{permissionId} + and `role_id` = #{roleId} + and `id` = #{id} + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + delete from sys_role_permission where role_id=#{roleId} + + + + + diff --git a/mallinkService/src/main/resources/mapper/SysUserRoleMapper.xml b/mallinkService/src/main/resources/mapper/SysUserRoleMapper.xml new file mode 100644 index 000000000..d6834759e --- /dev/null +++ b/mallinkService/src/main/resources/mapper/SysUserRoleMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + `uid`,`role_id`,`id` + + + + where 1 = 1 + and `uid` = #{uid} + and `role_id` = #{roleId} + and `id` = #{id} + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + + + diff --git a/mallinkService/src/main/resources/mapper/UserInfoMapper.xml b/mallinkService/src/main/resources/mapper/UserInfoMapper.xml new file mode 100644 index 000000000..84cb082ae --- /dev/null +++ b/mallinkService/src/main/resources/mapper/UserInfoMapper.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + `id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin` + + + + where 1 = 1 + and `id` = #{id} + and `username` = #{username} + and `name` = #{name} + and `password` = #{password} + and `create_time` = #{createTime} + and `last_login_time` = #{lastLoginTime} + and `status` = #{status} + and `is_admin` = #{isAdmin} + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxCUserEtcpTokenMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserEtcpTokenMapper.xml new file mode 100644 index 000000000..c235c3dec --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxCUserEtcpTokenMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + `id`,`c_user_id`,`etcp_token`,`etcp_create_time`,`etcp_update_time` + + + + where 1 = 1 + and `id` = #{id} + and `c_user_id` = #{cUserId} + and `etcp_token` = #{etcpToken} + and `etcp_create_time` = #{etcpCreateTime} + and `etcp_update_time` = #{etcpUpdateTime} + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml new file mode 100644 index 000000000..b6195697d --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + `id`,`secret`,`publickey`,`bid`,`recharge`,`remains`,`total`,`account`,`reminderstatus`,`reminder`,`phone` + + + + where 1 = 1 + and `id` = #{id} + and `secret` = #{secret} + and `publickey` = #{publickey} + and `bid` = #{bid} + and `recharge` = #{recharge} + and `remains` = #{remains} + and `total` = #{total} + and `account` = #{account} + and `reminderstatus` = #{reminderstatus} + and `reminder` = #{reminder} + and `phone` = #{phone} + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 9032112ac..153d3bad4 100644 --- a/pom.xml +++ b/pom.xml @@ -2,11 +2,7 @@ - - boot - com.simple - 1.0 - + 4.0.0 com.simple @@ -14,18 +10,175 @@ pom 1.0 - mallinkService mallinkAdmin mallinkApi - + + + org.springframework.boot + spring-boot-starter-parent + 1.5.9.RELEASE + + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-amqp + + + org.springframework.boot + spring-boot-starter-data-redis + + + org.springframework.boot + spring-boot-starter-freemarker + + + org.springframework.boot + spring-boot-configuration-processor + true + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 1.3.1 + + + com.github.pagehelper + pagehelper-spring-boot-starter + 1.2.1 + + + tk.mybatis + mapper-spring-boot-starter + 1.1.7 + + + + mysql + mysql-connector-java + 5.1.44 + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + + + org.apache.commons + commons-lang3 + 3.6 + + + com.google.guava + guava + 23.6-jre + + + + com.alibaba + fastjson + 1.2.44 + + + com.alibaba + druid + 1.1.2 + + + org.mybatis.generator + mybatis-generator-core + 1.3.6 + + + + + io.springfox + springfox-swagger-ui + 2.6.1 + + + io.springfox + springfox-swagger2 + 2.6.1 + + + javax.persistence + persistence-api + 1.0 + + + + + + + + + + + + + - com.simple - base + org.apache.shiro + shiro-spring + 1.4.0 + + + + org.crazycake + shiro-redis + 2.4.2.1-RELEASE + + + + jdom + jdom 1.0 + + + org.bouncycastle + bcprov-jdk16 + 1.45 + + + + + + + + commons-lang + commons-lang + 2.6 + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + + + + \ No newline at end of file