diff --git a/mallinkAdmin/src/main/java/com/simple/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/simple/config/ShiroConfig.java index 6883fdb37..1f84466e2 100644 --- a/mallinkAdmin/src/main/java/com/simple/config/ShiroConfig.java +++ b/mallinkAdmin/src/main/java/com/simple/config/ShiroConfig.java @@ -19,7 +19,7 @@ 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.service.MallPermissionService; import com.simple.shiro.MyShiroRealm; /** @@ -28,7 +28,7 @@ import com.simple.shiro.MyShiroRealm; @Configuration public class ShiroConfig { @Autowired(required = false) - private SysPermissionService resourcesService; + private MallPermissionService resourcesService; @Value("${spring.redis.host}") private String host; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java b/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java index 41af8e33c..3d18cdfdd 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java @@ -17,11 +17,11 @@ 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; +import com.simple.domain.po.MallPermission; +import com.simple.domain.po.MallRole; +import com.simple.domain.po.MallUserInfo; +import com.simple.service.MallPermissionService; +import com.simple.service.MallRoleService; import com.simple.shiro.UserSession; import io.swagger.annotations.Api; @@ -33,10 +33,10 @@ import io.swagger.annotations.ApiOperation; public class HomeController { @Autowired - private SysRoleService sysRoleService; + private MallRoleService sysRoleService; @Autowired - private SysPermissionService sysPermissionService; + private MallPermissionService sysPermissionService; @GetMapping("login") public ResultData login() { @@ -45,7 +45,7 @@ public class HomeController { @ApiOperation("登录") @PostMapping("/doLogin") - public ResultData login(@RequestBody UserInfo user) { + public ResultData login(@RequestBody MallUserInfo user) { ResultData data = new ResultData(); if (StringUtils.isEmpty(user.getUsername()) || StringUtils.isEmpty(user.getPassword())) { // throw new SystemException(ErrorCode.LOGIN_USER_OR_PWD_ERROR); @@ -55,14 +55,14 @@ public class HomeController { Subject subject = SecurityUtils.getSubject(); UsernamePasswordToken token = new UsernamePasswordToken(user.getUsername(), user.getPassword()); subject.login(token); - List roleList = sysRoleService.findRoleByUserId(user.getId()); + List roleList = sysRoleService.findRoleByUserId(user.getId()); if (null != roleList && roleList.size() > 0) { - List permissionList = sysPermissionService - .findPermissionByRoleIds(roleList.stream().map(SysRole::getId).collect(Collectors.toList())); + List permissionList = sysPermissionService + .findPermissionByRoleIds(roleList.stream().map(MallRole::getId).collect(Collectors.toList())); user.setRole(roleList); user.setPermission(permissionList); } - UserInfo info =(UserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); + MallUserInfo info =(MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); info.setPassword("保密"); System.out.println("id:"+ SecurityUtils.getSubject().getSession().getId()); data.data=info; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/RoleController.java b/mallinkAdmin/src/main/java/com/simple/controller/RoleController.java index fe641a2d0..48b530085 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/RoleController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/RoleController.java @@ -1,5 +1,8 @@ package com.simple.controller; +import com.simple.domain.po.MallRole; +import com.simple.service.MallRoleService; +import com.simple.service.MallUserRolePermissionService; import io.swagger.annotations.Api; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -12,9 +15,7 @@ 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") @@ -22,21 +23,21 @@ import com.simple.service.SysRoleService; public class RoleController { @Autowired - private SysRoleService sysRoleService; + private MallRoleService sysRoleService; @Autowired - private SysRolePermissionService SysRolePermissionService; + private MallUserRolePermissionService 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); + public ResultData list(MallRole sysRole, Integer pageNum, Integer pageSize) { + final PageInfo page = sysRoleService.listAsPage(sysRole, pageNum, pageSize); return new ResultData(page); } @PostMapping("add") - public ResultData add(SysRole sysRole) { + public ResultData add(MallRole sysRole) { Assert.notNull(sysRole.getName(), "角色名不能为空"); Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); sysRoleService.saveOrUpdate(sysRole); @@ -44,7 +45,7 @@ public class RoleController { } @PostMapping("update") - public ResultData update(SysRole sysRole) { + public ResultData update(MallRole sysRole) { if (sysRole.getName() != null) { System.out.println(checkUnique(sysRole.getName(), sysRole.getId())); Assert.isTrue(!checkUnique(sysRole.getName(), sysRole.getId()), "角色名已存在"); @@ -55,21 +56,22 @@ public class RoleController { } @GetMapping("/del") - public ResultData delete(String id) { + public ResultData delete(Long id) { sysRoleService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @GetMapping("setPermission") - public ResultData setPermission(String roleId, String perId) { + public ResultData setPermission(Long roleId, String perId) { Assert.notNull(perId,"请选择权限"); - String[] perIds = perId.split(","); - SysRolePermissionService.savePermissions(roleId, perIds); + /*String[] perIds = perId.split(","); + SysRolePermissionService.savePermissions(roleId, perIds);*/ + //TODO return new ResultData(Result.SUCCESS, "设置角色权限成功", null); } - private boolean checkUnique(String name, String id) { + private boolean checkUnique(String name, Long 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 index 620fc7ea1..d2c7a5d12 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/SysPermissionController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/SysPermissionController.java @@ -10,8 +10,8 @@ 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; +import com.simple.domain.po.MallPermission; +import com.simple.service.MallPermissionService; /** * @author chenkx @@ -22,32 +22,32 @@ import com.simple.service.SysPermissionService; public class SysPermissionController { @Autowired - SysPermissionService sysPermissionService; + MallPermissionService mallPermissionService; @GetMapping("alllist") public ResultData alllist(String ava) { - SysPermission record = new SysPermission(); + MallPermission record = new MallPermission(); record.setAvailable(ava); - PageInfo permissions= sysPermissionService.listAsPage(record, 1, 10000); + PageInfo permissions= mallPermissionService.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()); + public ResultData createPermission(MallPermission mallPermission) { + Assert.notNull(mallPermission.getName(), "用户名不能为空"); + mallPermissionService.saveOrUpdate(mallPermission); + return new ResultData(mallPermission.getId()); } @PostMapping("update") - public ResultData updatePermission(SysPermission sysPermission) { - sysPermissionService.saveOrUpdate(sysPermission); + public ResultData updatePermission(MallPermission sysPermission) { + mallPermissionService.saveOrUpdate(sysPermission); return new ResultData(); } @GetMapping("/del") - public ResultData delete(String id) { - sysPermissionService.deleteById(id); + public ResultData delete(Long id) { + mallPermissionService.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 index e34c48c6c..0a19d1276 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/UserInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/UserInfoController.java @@ -5,6 +5,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.simple.domain.po.MallUserInfo; +import com.simple.domain.po.MallUserRole; +import com.simple.service.MallUserInfoService; +import com.simple.service.MallUserRoleService; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; @@ -15,10 +19,6 @@ 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; @@ -35,28 +35,28 @@ import io.swagger.annotations.ApiOperation; public class UserInfoController { @Autowired - UserInfoService userInfoService; + MallUserInfoService userInfoService; @Autowired - SysUserRoleService userRoleService; + MallUserRoleService 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); + public ResultData listAsPage(MallUserInfo 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); + public ResultData detail(Long id){ + final MallUserInfo user = userInfoService.getById(id); return new ResultData(user); } @ApiOperation(value = "创建用户接口", response = String.class) @PostMapping("add") - public ResultData createUser(UserInfo userInfo){ + public ResultData createUser(MallUserInfo userInfo){ Assert.notNull(userInfo.getUsername(), "用户名不能为空"); Assert.isTrue(checkUnique(userInfo.getUsername(), 0), "重复的用户名"); Assert.notNull(userInfo.getPassword(), "密码不能为空"); @@ -68,7 +68,7 @@ public class UserInfoController { @ApiOperation(value = "修改用户接口", response = String.class) @PostMapping("update") - public ResultData updateUser(UserInfo userInfo){ + public ResultData updateUser(MallUserInfo userInfo){ Assert.notNull(userInfo.getUsername(), "用户名不能为空"); Assert.isTrue(checkUnique(userInfo.getUsername(), 1), "重复的用户名"); Assert.notNull(userInfo.getPassword(), "密码不能为空"); @@ -80,8 +80,8 @@ public class UserInfoController { @ApiOperation(value = "删除用户接口", response = String.class) @GetMapping("/del") - public ResultData deleteUser(String id) { - userInfoService.deleteUser(id); + public ResultData deleteUser(Long id) { + userInfoService.deleteById(id); return new ResultData(); } @@ -93,8 +93,8 @@ public class UserInfoController { */ @ApiOperation(value = "起停用户接口", response = String.class) @GetMapping("status") - public ResultData modifyStatus(String userId, Integer status) { - UserInfo userInfo = userInfoService.getById(userId); + public ResultData modifyStatus(Long userId, Integer status) { + MallUserInfo userInfo = userInfoService.getById(userId); userInfo.setStatus(status); userInfoService.saveOrUpdate(userInfo); return new ResultData(userInfo); @@ -102,16 +102,16 @@ public class UserInfoController { @ApiOperation(value = "用户添加角色接口", response = String.class) @PostMapping("setRoles") - public ResultData setRoles(String userId,String roleIds) { - String[] roIds = roleIds.split(","); - List u2rs = new ArrayList<>(roIds.length); + public ResultData setRoles(Long userId,String roleIds) { + /*String[] roIds = roleIds.split(","); + List u2rs = new ArrayList<>(roIds.length); for (String roleId : roIds) { - SysUserRole userRole = new SysUserRole(); + MallUserRole userRole = new MallUserRole(); userRole.setRoleId(roleId); userRole.setUid(userId); u2rs.add(userRole); } - userRoleService.batchInsert(u2rs); + userRoleService.batchInsert(u2rs);*/ return new ResultData(); } @@ -134,7 +134,7 @@ public class UserInfoController { public ResultData hasButtonPermission(String permissions){ Map map=new HashMap<>(); for(String name:permissions.split(",")){ - String userId = (String) + Long userId = (Long) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userId); boolean has =userInfoService.hasButtonPermission(userId, name); map.put(name, has); @@ -151,7 +151,7 @@ public class UserInfoController { @GetMapping("getUser") public ResultData getUserInfo(){ - UserInfo info =(UserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); + MallUserInfo info =(MallUserInfo) 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/WxCouponController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java index b6c367805..dd39b05b8 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java @@ -11,15 +11,12 @@ import com.simple.common.ResultData; import com.simple.domain.po.WxCoupon; import com.simple.service.WxCouponService; - -import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("wxCoupon") -@Api(description="优惠券相关接口") public class WxCouponController extends BaseController { @Autowired diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java new file mode 100644 index 000000000..b43a78ab1 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java @@ -0,0 +1,71 @@ +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.WxCouponSend; +import com.simple.service.WxCouponSendService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxCouponSend") +public class WxCouponSendController extends BaseController +{ + @Autowired + private WxCouponSendService wxCouponSendService; + + private Logger logger = Logger.getLogger(WxCouponSendController.class); + + @ApiOperation("分页列表接口") + @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 WxCouponSend wxCouponSend,Integer pageNum, Integer pageSize) { + if (null == wxCouponSend) wxCouponSend = new WxCouponSend(); + final PageInfo page = wxCouponSendService.listAsPage(wxCouponSend, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCouponSend wxCouponSend) { + //Assert.notNull(wxCouponSend.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCouponSendService.saveOrUpdate(wxCouponSend); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCouponSend wxCouponSend) { + wxCouponSendService.saveOrUpdate(wxCouponSend); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxCouponSendService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxCouponSendService.getById(id)); + } + + + +} diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponTargetController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponTargetController.java new file mode 100644 index 000000000..38e656110 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponTargetController.java @@ -0,0 +1,71 @@ +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.WxCouponTarget; +import com.simple.service.WxCouponTargetService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxCouponTarget") +public class WxCouponTargetController extends BaseController +{ + @Autowired + private WxCouponTargetService wxCouponTargetService; + + private Logger logger = Logger.getLogger(WxCouponTargetController.class); + + @ApiOperation("分页列表接口") + @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 WxCouponTarget wxCouponTarget,Integer pageNum, Integer pageSize) { + if (null == wxCouponTarget) wxCouponTarget = new WxCouponTarget(); + final PageInfo page = wxCouponTargetService.listAsPage(wxCouponTarget, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCouponTarget wxCouponTarget) { + //Assert.notNull(wxCouponTarget.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCouponTargetService.saveOrUpdate(wxCouponTarget); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCouponTarget wxCouponTarget) { + wxCouponTargetService.saveOrUpdate(wxCouponTarget); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxCouponTargetService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxCouponTargetService.getById(id)); + } + + + +} diff --git a/mallinkAdmin/src/main/java/com/simple/shiro/MyShiroRealm.java b/mallinkAdmin/src/main/java/com/simple/shiro/MyShiroRealm.java index 9895eeb85..522df5602 100644 --- a/mallinkAdmin/src/main/java/com/simple/shiro/MyShiroRealm.java +++ b/mallinkAdmin/src/main/java/com/simple/shiro/MyShiroRealm.java @@ -2,6 +2,7 @@ package com.simple.shiro; import javax.annotation.Resource; +import com.simple.service.MallUserInfoService; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationInfo; @@ -15,9 +16,9 @@ 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; +import com.simple.domain.po.MallUserInfo; +import com.simple.service.MallPermissionService; +import com.simple.service.MallUserInfoService; /** * Created by yangqj on 2017/4/21. @@ -25,15 +26,15 @@ import com.simple.service.UserInfoService; public class MyShiroRealm extends AuthorizingRealm { @Resource - private UserInfoService userService; + private MallUserInfoService userService; @Resource - private SysPermissionService resourcesService; + private MallPermissionService resourcesService; //授权 @Override protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principalCollection) { - UserInfo user= (UserInfo) SecurityUtils.getSubject().getPrincipal();//User{id=1, username='admin', password='3ef7164d1f6167cb9f2658c07d3c2f0a', enable=1} + MallUserInfo user= (MallUserInfo) 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); @@ -50,7 +51,7 @@ public class MyShiroRealm extends AuthorizingRealm { protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException { //获取用户的输入的账号. String username = (String)token.getPrincipal(); - UserInfo user = userService.getByUsername(username); + MallUserInfo user = userService.getByUsername(username); if(user==null) throw new UnknownAccountException("用户名不存在"); // if (0==user.getEnable()) { // throw new LockedAccountException(); // 帐号锁定 diff --git a/mallinkAdmin/src/main/java/com/simple/shiro/PasswordHelper.java b/mallinkAdmin/src/main/java/com/simple/shiro/PasswordHelper.java index ea042a67e..6e5b171e6 100644 --- a/mallinkAdmin/src/main/java/com/simple/shiro/PasswordHelper.java +++ b/mallinkAdmin/src/main/java/com/simple/shiro/PasswordHelper.java @@ -1,17 +1,18 @@ package com.simple.shiro; +import com.simple.domain.po.MallUserInfo; 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) { + public void encryptPassword(MallUserInfo 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(); diff --git a/mallinkAdmin/src/main/java/com/simple/shiro/ShiroService.java b/mallinkAdmin/src/main/java/com/simple/shiro/ShiroService.java index 606c72797..d69ed3911 100644 --- a/mallinkAdmin/src/main/java/com/simple/shiro/ShiroService.java +++ b/mallinkAdmin/src/main/java/com/simple/shiro/ShiroService.java @@ -14,8 +14,8 @@ 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; +import com.simple.domain.po.MallPermission; +import com.simple.service.MallPermissionService; /** * Created by yangqj on 2017/4/30. @@ -25,7 +25,7 @@ public class ShiroService { @Autowired private ShiroFilterFactoryBean shiroFilterFactoryBean; @Autowired - private SysPermissionService resourcesService; + private MallPermissionService resourcesService; @Autowired private RedisSessionDAO redisSessionDAO; /** diff --git a/mallinkService/src/main/java/com/simple/domain/po/SysPermission.java b/mallinkService/src/main/java/com/simple/domain/po/MallPermission.java similarity index 89% rename from mallinkService/src/main/java/com/simple/domain/po/SysPermission.java rename to mallinkService/src/main/java/com/simple/domain/po/MallPermission.java index 41951351c..d4f914bc2 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/SysPermission.java +++ b/mallinkService/src/main/java/com/simple/domain/po/MallPermission.java @@ -1,31 +1,32 @@ package com.simple.domain.po; -import javax.persistence.*; -import java.util.*; -import java.io.Serializable; -import java.math.*; +import javax.persistence.Id; +import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; +import java.util.ArrayList; import java.util.List; -import javax.persistence.Id; -@Table(name = "sys_permission") -public class SysPermission implements Serializable{ +@Table(name = "mall_permission") +public class MallPermission implements Serializable { private static final long serialVersionUID = 1L; @Id - protected String id; + protected Long id; @Transient protected List ids; @Transient protected String sortColumns; - public String getId() { + public Long getId() { return id; } - public void setId(String id) { + + public void setId(Long id) { this.id = id; } + public String getSortColumns() { return sortColumns; } @@ -39,6 +40,9 @@ public class SysPermission implements Serializable{ + /*租户ID**/ + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + private String tenantId; /*权限名称[LIKE]**/ @io.swagger.annotations.ApiModelProperty(value="权限名称[LIKE]",name="name") private String name; @@ -79,6 +83,12 @@ public class SysPermission implements Serializable{ private Integer sortLte; @Transient private Integer sortLt; + public String getTenantId() { + return tenantId; + } + public void setTenantId(String _tenantId) { + tenantId = _tenantId; + } public String getName() { return name; } @@ -181,6 +191,7 @@ public class SysPermission implements Serializable{ public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` 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") @@ -206,7 +217,7 @@ public class SysPermission implements Serializable{ } } - public void setSortColumns(SysPermission.Field... fields) + public void setSortColumns(MallPermission.Field... fields) { if (fields == null || fields.length == 0) { return; @@ -221,9 +232,9 @@ public class SysPermission implements Serializable{ sb.append(","); sb.append(fields[k].toString()); } - + } - + public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { @@ -231,7 +242,7 @@ public class SysPermission implements Serializable{ } if (sortColumns.contains(",")) { String[] cols = sortColumns.split(","); - java.util.List fList = new java.util.ArrayList(); + List fList = new ArrayList(); for (int k = 0; k < cols.length; k++) { fList.add(Field.valueOf(cols[k])); } diff --git a/mallinkService/src/main/java/com/simple/domain/po/SysRole.java b/mallinkService/src/main/java/com/simple/domain/po/MallRole.java similarity index 80% rename from mallinkService/src/main/java/com/simple/domain/po/SysRole.java rename to mallinkService/src/main/java/com/simple/domain/po/MallRole.java index 292f2e73a..0b1809620 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/SysRole.java +++ b/mallinkService/src/main/java/com/simple/domain/po/MallRole.java @@ -1,31 +1,32 @@ package com.simple.domain.po; -import javax.persistence.*; -import java.util.*; -import java.io.Serializable; -import java.math.*; +import javax.persistence.Id; +import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; +import java.util.ArrayList; import java.util.List; -import javax.persistence.Id; -@Table(name = "sys_role") -public class SysRole implements Serializable{ +@Table(name = "mall_role") +public class MallRole implements Serializable { private static final long serialVersionUID = 1L; @Id - protected String id; + protected Long id; @Transient protected List ids; @Transient protected String sortColumns; - public String getId() { + public Long getId() { return id; } - public void setId(String id) { + + public void setId(Long id) { this.id = id; } + public String getSortColumns() { return sortColumns; } @@ -39,6 +40,9 @@ public class SysRole implements Serializable{ + /*租户ID**/ + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + private String tenantId; /*角色名称**/ @io.swagger.annotations.ApiModelProperty(value="角色名称",name="name") private String name; @@ -48,6 +52,12 @@ public class SysRole implements Serializable{ /*角色描述**/ @io.swagger.annotations.ApiModelProperty(value="角色描述",name="description") private String description; + public String getTenantId() { + return tenantId; + } + public void setTenantId(String _tenantId) { + tenantId = _tenantId; + } public String getName() { return name; } @@ -72,6 +82,7 @@ public class SysRole implements Serializable{ public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` 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") @@ -92,7 +103,7 @@ public class SysRole implements Serializable{ } } - public void setSortColumns(SysRole.Field... fields) + public void setSortColumns(MallRole.Field... fields) { if (fields == null || fields.length == 0) { return; @@ -107,9 +118,9 @@ public class SysRole implements Serializable{ sb.append(","); sb.append(fields[k].toString()); } - + } - + public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { @@ -117,7 +128,7 @@ public class SysRole implements Serializable{ } if (sortColumns.contains(",")) { String[] cols = sortColumns.split(","); - java.util.List fList = new java.util.ArrayList(); + List fList = new ArrayList(); for (int k = 0; k < cols.length; k++) { fList.add(Field.valueOf(cols[k])); } diff --git a/mallinkService/src/main/java/com/simple/domain/po/UserInfo.java b/mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java similarity index 82% rename from mallinkService/src/main/java/com/simple/domain/po/UserInfo.java rename to mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java index 9b1dfaa30..82bfe3647 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/UserInfo.java +++ b/mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java @@ -1,31 +1,33 @@ package com.simple.domain.po; -import java.io.Serializable; -import java.util.Date; -import java.util.List; - import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -@Table(name = "user_info") -public class UserInfo implements Serializable{ +@Table(name = "mall_user_info") +public class MallUserInfo implements Serializable { private static final long serialVersionUID = 1L; @Id - protected String id; + protected Long id; @Transient protected List ids; @Transient protected String sortColumns; - public String getId() { + public Long getId() { return id; } - public void setId(String id) { + + public void setId(Long id) { this.id = id; } + public String getSortColumns() { return sortColumns; } @@ -39,6 +41,9 @@ public class UserInfo implements Serializable{ + /*租户ID**/ + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + private String tenantId; /*登录用户名**/ @io.swagger.annotations.ApiModelProperty(value="登录用户名",name="username") private String username; @@ -62,10 +67,16 @@ public class UserInfo implements Serializable{ private Integer isAdmin; //该用户所有的角色 @Transient - private List role; + private List role; //该用户包含的所有权限 @Transient - private List permission; + private List permission; + public String getTenantId() { + return tenantId; + } + public void setTenantId(String _tenantId) { + tenantId = _tenantId; + } public String getUsername() { return username; } @@ -108,19 +119,19 @@ public class UserInfo implements Serializable{ public void setIsAdmin(Integer _isAdmin) { isAdmin = _isAdmin; } - public List getRole() { + public List getRole() { return role; } - public void setRole(List role) { + public void setRole(List role) { this.role = role; } - public List getPermission() { + public List getPermission() { return permission; } - public void setPermission(List permission) { + public void setPermission(List permission) { this.permission = permission; } @@ -129,6 +140,7 @@ public class UserInfo implements Serializable{ public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` 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") @@ -153,7 +165,7 @@ public class UserInfo implements Serializable{ } } - public void setSortColumns(UserInfo.Field... fields) + public void setSortColumns(MallUserInfo.Field... fields) { if (fields == null || fields.length == 0) { return; @@ -168,9 +180,9 @@ public class UserInfo implements Serializable{ sb.append(","); sb.append(fields[k].toString()); } - + } - + public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { @@ -178,7 +190,7 @@ public class UserInfo implements Serializable{ } if (sortColumns.contains(",")) { String[] cols = sortColumns.split(","); - java.util.List fList = new java.util.ArrayList(); + List fList = new ArrayList(); for (int k = 0; k < cols.length; k++) { fList.add(Field.valueOf(cols[k])); } diff --git a/mallinkService/src/main/java/com/simple/domain/po/SysUserRole.java b/mallinkService/src/main/java/com/simple/domain/po/MallUserRole.java similarity index 78% rename from mallinkService/src/main/java/com/simple/domain/po/SysUserRole.java rename to mallinkService/src/main/java/com/simple/domain/po/MallUserRole.java index aaf889c63..92385b463 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/SysUserRole.java +++ b/mallinkService/src/main/java/com/simple/domain/po/MallUserRole.java @@ -1,31 +1,32 @@ package com.simple.domain.po; -import javax.persistence.*; -import java.util.*; -import java.io.Serializable; -import java.math.*; +import javax.persistence.Id; +import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; +import java.util.ArrayList; import java.util.List; -import javax.persistence.Id; -@Table(name = "sys_user_role") -public class SysUserRole implements Serializable{ +@Table(name = "mall_user_role") +public class MallUserRole implements Serializable { private static final long serialVersionUID = 1L; @Id - protected String id; + protected Long id; @Transient protected List ids; @Transient protected String sortColumns; - public String getId() { + public Long getId() { return id; } - public void setId(String id) { + + public void setId(Long id) { this.id = id; } + public String getSortColumns() { return sortColumns; } @@ -41,20 +42,20 @@ public class SysUserRole implements Serializable{ /*用户ID**/ @io.swagger.annotations.ApiModelProperty(value="用户ID",name="uid") - private String uid; + private Long uid; /*角色ID**/ @io.swagger.annotations.ApiModelProperty(value="角色ID",name="roleId") - private String roleId; - public String getUid() { + private Long roleId; + public Long getUid() { return uid; } - public void setUid(String _uid) { + public void setUid(Long _uid) { uid = _uid; } - public String getRoleId() { + public Long getRoleId() { return roleId; } - public void setRoleId(String _roleId) { + public void setRoleId(Long _roleId) { roleId = _roleId; } @@ -82,7 +83,7 @@ public class SysUserRole implements Serializable{ } } - public void setSortColumns(SysUserRole.Field... fields) + public void setSortColumns(MallUserRole.Field... fields) { if (fields == null || fields.length == 0) { return; @@ -97,9 +98,9 @@ public class SysUserRole implements Serializable{ sb.append(","); sb.append(fields[k].toString()); } - + } - + public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { @@ -107,7 +108,7 @@ public class SysUserRole implements Serializable{ } if (sortColumns.contains(",")) { String[] cols = sortColumns.split(","); - java.util.List fList = new java.util.ArrayList(); + List fList = new ArrayList(); for (int k = 0; k < cols.length; k++) { fList.add(Field.valueOf(cols[k])); } diff --git a/mallinkService/src/main/java/com/simple/domain/po/SysRolePermission.java b/mallinkService/src/main/java/com/simple/domain/po/MallUserRolePermission.java similarity index 66% rename from mallinkService/src/main/java/com/simple/domain/po/SysRolePermission.java rename to mallinkService/src/main/java/com/simple/domain/po/MallUserRolePermission.java index cba5d2d44..7a997b02e 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/SysRolePermission.java +++ b/mallinkService/src/main/java/com/simple/domain/po/MallUserRolePermission.java @@ -1,31 +1,32 @@ package com.simple.domain.po; -import javax.persistence.*; -import java.util.*; -import java.io.Serializable; -import java.math.*; +import javax.persistence.Id; +import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; +import java.util.ArrayList; import java.util.List; -import javax.persistence.Id; -@Table(name = "sys_role_permission") -public class SysRolePermission implements Serializable{ +@Table(name = "mall_user_role_permission") +public class MallUserRolePermission implements Serializable { private static final long serialVersionUID = 1L; @Id - protected String id; + protected Long id; @Transient protected List ids; @Transient protected String sortColumns; - public String getId() { + public Long getId() { return id; } - public void setId(String id) { + + public void setId(Long id) { this.id = id; } + public String getSortColumns() { return sortColumns; } @@ -39,22 +40,31 @@ public class SysRolePermission implements Serializable{ + /*租户ID**/ + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + private String tenantId; /*权限ID**/ @io.swagger.annotations.ApiModelProperty(value="权限ID",name="permissionId") - private String permissionId; + private Long permissionId; /*角色ID**/ @io.swagger.annotations.ApiModelProperty(value="角色ID",name="roleId") - private String roleId; - public String getPermissionId() { + private Long roleId; + public String getTenantId() { + return tenantId; + } + public void setTenantId(String _tenantId) { + tenantId = _tenantId; + } + public Long getPermissionId() { return permissionId; } - public void setPermissionId(String _permissionId) { + public void setPermissionId(Long _permissionId) { permissionId = _permissionId; } - public String getRoleId() { + public Long getRoleId() { return roleId; } - public void setRoleId(String _roleId) { + public void setRoleId(Long _roleId) { roleId = _roleId; } @@ -62,9 +72,10 @@ public class SysRolePermission implements Serializable{ public static enum Field { - PermissionId_ASC("`permissionId` ASC"),PermissionId_DESC("`permissionId` DESC") + Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") + ,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){ @@ -82,7 +93,7 @@ public class SysRolePermission implements Serializable{ } } - public void setSortColumns(SysRolePermission.Field... fields) + public void setSortColumns(MallUserRolePermission.Field... fields) { if (fields == null || fields.length == 0) { return; @@ -97,9 +108,9 @@ public class SysRolePermission implements Serializable{ sb.append(","); sb.append(fields[k].toString()); } - + } - + public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { @@ -107,7 +118,7 @@ public class SysRolePermission implements Serializable{ } if (sortColumns.contains(",")) { String[] cols = sortColumns.split(","); - java.util.List fList = new java.util.ArrayList(); + List fList = new ArrayList(); for (int k = 0; k < cols.length; k++) { fList.add(Field.valueOf(cols[k])); } 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 dd5a043f3..602f0211e 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java @@ -44,14 +44,11 @@ public class WxCoupon implements Serializable { /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /*卡券活动id**/ - @io.swagger.annotations.ApiModelProperty(value="卡券活动id",name="activityId") - private Long activityId; /*商户id**/ @io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId") private Long merchantId; - /*券类型**/ - @io.swagger.annotations.ApiModelProperty(value="券类型",name="type") + /*券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)**/ + @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)",name="type") private Integer type; /*封面图**/ @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") @@ -62,23 +59,53 @@ public class WxCoupon implements Serializable { /*副标题**/ @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") private String subTitle; + /*售价(适用于类型2,3,4,5)**/ + @io.swagger.annotations.ApiModelProperty(value="售价(适用于类型2,3,4,5)",name="salePrice") + private BigDecimal salePrice; + /*使用条件金额(适用于类型1,2,3,4)**/ + @io.swagger.annotations.ApiModelProperty(value="使用条件金额(适用于类型1,2,3,4)",name="usePrice") + private BigDecimal usePrice; + /*限领张数**/ + @io.swagger.annotations.ApiModelProperty(value="限领张数",name="useLimitQuantity") + private Integer useLimitQuantity; + /*发放开始时间**/ + @io.swagger.annotations.ApiModelProperty(value="发放开始时间",name="sendStartDate") + private Date sendStartDate; + /*发放结束时间**/ + @io.swagger.annotations.ApiModelProperty(value="发放结束时间",name="sendEndDate") + private Date sendEndDate; + /*有效日期-开始**/ + @io.swagger.annotations.ApiModelProperty(value="有效日期-开始",name="validStartDate") + private Date validStartDate; + /*有效日期-结束**/ + @io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="validEndDate") + private Date validEndDate; + /*自领取之日几日有效,(停车券当天有效)**/ + @io.swagger.annotations.ApiModelProperty(value="自领取之日几日有效,(停车券当天有效)",name="validDays") + private Integer validDays; /*须知**/ @io.swagger.annotations.ApiModelProperty(value="须知",name="detail") private String detail; + /*发券方式(1.主动领取,2.定向投放)**/ + @io.swagger.annotations.ApiModelProperty(value="发券方式(1.主动领取,2.定向投放)",name="sendType") + private Integer sendType; + /*投放频道位置(1.banner图,2.限时抢购)**/ + @io.swagger.annotations.ApiModelProperty(value="投放频道位置(1.banner图,2.限时抢购)",name="targetAd") + private Integer targetAd; + /*业态**/ + @io.swagger.annotations.ApiModelProperty(value="业态",name="businesses") + private String businesses; /*面额**/ @io.swagger.annotations.ApiModelProperty(value="面额",name="price") private BigDecimal price; - /*售价**/ - @io.swagger.annotations.ApiModelProperty(value="售价",name="salePrice") - private BigDecimal salePrice; - /*使用条件金额**/ - @io.swagger.annotations.ApiModelProperty(value="使用条件金额",name="usePrice") - private BigDecimal usePrice; - /*业态**/ - @io.swagger.annotations.ApiModelProperty(value="业态",name="business") - private String business; - /*状态(0.未绑定1.已绑定)**/ - @io.swagger.annotations.ApiModelProperty(value="状态(0.未绑定1.已绑定)",name="status") + /*库存**/ + @io.swagger.annotations.ApiModelProperty(value="库存",name="number") + private Integer number; + /*总数**/ + @io.swagger.annotations.ApiModelProperty(value="总数",name="total") + private Integer total; + /*状态(0:草稿,1:待生效,2:已生效,3:已失效,4:已作废)**/ + @io.swagger.annotations.ApiModelProperty(value="状态(0:草稿,1:待生效,2:已生效,3:已失效,4:已作废)",name="status") private Integer status; /*创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") @@ -92,12 +119,6 @@ public class WxCoupon implements Serializable { public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public Long getActivityId() { - return activityId; - } - public void setActivityId(Long _activityId) { - activityId = _activityId; - } public Long getMerchantId() { return merchantId; } @@ -128,35 +149,95 @@ public class WxCoupon implements Serializable { public void setSubTitle(String _subTitle) { subTitle = _subTitle; } + public BigDecimal getSalePrice() { + return salePrice; + } + public void setSalePrice(BigDecimal _salePrice) { + salePrice = _salePrice; + } + public BigDecimal getUsePrice() { + return usePrice; + } + public void setUsePrice(BigDecimal _usePrice) { + usePrice = _usePrice; + } + public Integer getUseLimitQuantity() { + return useLimitQuantity; + } + public void setUseLimitQuantity(Integer _useLimitQuantity) { + useLimitQuantity = _useLimitQuantity; + } + public Date getSendStartDate() { + return sendStartDate; + } + public void setSendStartDate(Date _sendStartDate) { + sendStartDate = _sendStartDate; + } + public Date getSendEndDate() { + return sendEndDate; + } + public void setSendEndDate(Date _sendEndDate) { + sendEndDate = _sendEndDate; + } + public Date getValidStartDate() { + return validStartDate; + } + public void setValidStartDate(Date _validStartDate) { + validStartDate = _validStartDate; + } + public Date getValidEndDate() { + return validEndDate; + } + public void setValidEndDate(Date _validEndDate) { + validEndDate = _validEndDate; + } + public Integer getValidDays() { + return validDays; + } + public void setValidDays(Integer _validDays) { + validDays = _validDays; + } public String getDetail() { return detail; } public void setDetail(String _detail) { detail = _detail; } + public Integer getSendType() { + return sendType; + } + public void setSendType(Integer _sendType) { + sendType = _sendType; + } + public Integer getTargetAd() { + return targetAd; + } + public void setTargetAd(Integer _targetAd) { + targetAd = _targetAd; + } + public String getBusinesses() { + return businesses; + } + public void setBusinesses(String _businesses) { + businesses = _businesses; + } public BigDecimal getPrice() { return price; } public void setPrice(BigDecimal _price) { price = _price; } - public BigDecimal getSalePrice() { - return salePrice; - } - public void setSalePrice(BigDecimal _salePrice) { - salePrice = _salePrice; + public Integer getNumber() { + return number; } - public BigDecimal getUsePrice() { - return usePrice; + public void setNumber(Integer _number) { + number = _number; } - public void setUsePrice(BigDecimal _usePrice) { - usePrice = _usePrice; - } - public String getBusiness() { - return business; + public Integer getTotal() { + return total; } - public void setBusiness(String _business) { - business = _business; + public void setTotal(Integer _total) { + total = _total; } public Integer getStatus() { return status; @@ -183,17 +264,26 @@ public class WxCoupon implements Serializable { { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,ActivityId_ASC("`activityId` ASC"),ActivityId_DESC("`activityId` DESC") ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") ,CoverImg_ASC("`coverImg` ASC"),CoverImg_DESC("`coverImg` DESC") ,Title_ASC("`title` ASC"),Title_DESC("`title` DESC") ,SubTitle_ASC("`subTitle` ASC"),SubTitle_DESC("`subTitle` DESC") - ,Detail_ASC("`detail` ASC"),Detail_DESC("`detail` DESC") - ,Price_ASC("`price` ASC"),Price_DESC("`price` DESC") ,SalePrice_ASC("`salePrice` ASC"),SalePrice_DESC("`salePrice` DESC") ,UsePrice_ASC("`usePrice` ASC"),UsePrice_DESC("`usePrice` DESC") - ,Business_ASC("`business` ASC"),Business_DESC("`business` DESC") + ,UseLimitQuantity_ASC("`useLimitQuantity` ASC"),UseLimitQuantity_DESC("`useLimitQuantity` DESC") + ,SendStartDate_ASC("`sendStartDate` ASC"),SendStartDate_DESC("`sendStartDate` DESC") + ,SendEndDate_ASC("`sendEndDate` ASC"),SendEndDate_DESC("`sendEndDate` DESC") + ,ValidStartDate_ASC("`validStartDate` ASC"),ValidStartDate_DESC("`validStartDate` DESC") + ,ValidEndDate_ASC("`validEndDate` ASC"),ValidEndDate_DESC("`validEndDate` DESC") + ,ValidDays_ASC("`validDays` ASC"),ValidDays_DESC("`validDays` DESC") + ,Detail_ASC("`detail` ASC"),Detail_DESC("`detail` DESC") + ,SendType_ASC("`sendType` ASC"),SendType_DESC("`sendType` DESC") + ,TargetAd_ASC("`targetAd` ASC"),TargetAd_DESC("`targetAd` DESC") + ,Businesses_ASC("`businesses` ASC"),Businesses_DESC("`businesses` DESC") + ,Price_ASC("`price` ASC"),Price_DESC("`price` DESC") + ,Number_ASC("`number` ASC"),Number_DESC("`number` DESC") + ,Total_ASC("`total` ASC"),Total_DESC("`total` DESC") ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCouponSend.java b/mallinkService/src/main/java/com/simple/domain/po/WxCouponSend.java new file mode 100644 index 000000000..730acce5d --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCouponSend.java @@ -0,0 +1,181 @@ +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; +import java.io.Serializable; + +@Table(name = "wx_coupon_send") +public class WxCouponSend implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + protected Long id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public Long getId() { + return id; + } + + public void setId(Long 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="tenantId") + private String tenantId; + /*商户id**/ + @io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId") + private Long merchantId; + /*卡券id**/ + @io.swagger.annotations.ApiModelProperty(value="卡券id",name="couponId") + private Long couponId; + /*券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)**/ + @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)",name="type") + private Integer type; + /*券名称**/ + @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") + private String title; + /*发券方式(1.主动领取,2.停车发券,3.核销发券)**/ + @io.swagger.annotations.ApiModelProperty(value="发券方式(1.主动领取,2.停车发券,3.核销发券)",name="sendType") + private Integer sendType; + /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + /*更新时间**/ + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; + public String getTenantId() { + return tenantId; + } + public void setTenantId(String _tenantId) { + tenantId = _tenantId; + } + public Long getMerchantId() { + return merchantId; + } + public void setMerchantId(Long _merchantId) { + merchantId = _merchantId; + } + public Long getCouponId() { + return couponId; + } + public void setCouponId(Long _couponId) { + couponId = _couponId; + } + public Integer getType() { + return type; + } + public void setType(Integer _type) { + type = _type; + } + public String getTitle() { + return title; + } + public void setTitle(String _title) { + title = _title; + } + public Integer getSendType() { + return sendType; + } + public void setSendType(Integer _sendType) { + sendType = _sendType; + } + public Date getCreateDate() { + return createDate; + } + public void setCreateDate(Date _createDate) { + createDate = _createDate; + } + public Date getUpdateDate() { + return updateDate; + } + public void setUpdateDate(Date _updateDate) { + updateDate = _updateDate; + } + + + + public static enum Field + { + Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") + ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") + ,CouponId_ASC("`couponId` ASC"),CouponId_DESC("`couponId` DESC") + ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") + ,Title_ASC("`title` ASC"),Title_DESC("`title` DESC") + ,SendType_ASC("`sendType` ASC"),SendType_DESC("`sendType` DESC") + ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") + ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` 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(WxCouponSend.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/WxCouponTarget.java b/mallinkService/src/main/java/com/simple/domain/po/WxCouponTarget.java new file mode 100644 index 000000000..90834ab0a --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCouponTarget.java @@ -0,0 +1,181 @@ +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; +import java.io.Serializable; + +@Table(name = "wx_coupon_target") +public class WxCouponTarget implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + protected Long id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public Long getId() { + return id; + } + + public void setId(Long 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="tenantId") + private String tenantId; + /*商户id**/ + @io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId") + private Long merchantId; + /*卡券id**/ + @io.swagger.annotations.ApiModelProperty(value="卡券id",name="couponId") + private Long couponId; + /*券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)**/ + @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)",name="type") + private Integer type; + /*券名称**/ + @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") + private String title; + /*投放频道位置(1.banner图,2.限时抢购)**/ + @io.swagger.annotations.ApiModelProperty(value="投放频道位置(1.banner图,2.限时抢购)",name="targetAd") + private Integer targetAd; + /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + /*更新时间**/ + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; + public String getTenantId() { + return tenantId; + } + public void setTenantId(String _tenantId) { + tenantId = _tenantId; + } + public Long getMerchantId() { + return merchantId; + } + public void setMerchantId(Long _merchantId) { + merchantId = _merchantId; + } + public Long getCouponId() { + return couponId; + } + public void setCouponId(Long _couponId) { + couponId = _couponId; + } + public Integer getType() { + return type; + } + public void setType(Integer _type) { + type = _type; + } + public String getTitle() { + return title; + } + public void setTitle(String _title) { + title = _title; + } + public Integer getTargetAd() { + return targetAd; + } + public void setTargetAd(Integer _targetAd) { + targetAd = _targetAd; + } + public Date getCreateDate() { + return createDate; + } + public void setCreateDate(Date _createDate) { + createDate = _createDate; + } + public Date getUpdateDate() { + return updateDate; + } + public void setUpdateDate(Date _updateDate) { + updateDate = _updateDate; + } + + + + public static enum Field + { + Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") + ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") + ,CouponId_ASC("`couponId` ASC"),CouponId_DESC("`couponId` DESC") + ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") + ,Title_ASC("`title` ASC"),Title_DESC("`title` DESC") + ,TargetAd_ASC("`targetAd` ASC"),TargetAd_DESC("`targetAd` DESC") + ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") + ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` 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(WxCouponTarget.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/WxMerchant.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java index 119de75b6..b28c0258a 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java @@ -59,9 +59,7 @@ public class WxMerchant implements Serializable { /*银行开户行**/ @io.swagger.annotations.ApiModelProperty(value="银行开户行",name="bankName") private String bankName; - /*商户id**/ - @io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId") - private String merchantId; + public String getTenantId() { return tenantId; } @@ -98,12 +96,7 @@ public class WxMerchant implements Serializable { public void setBankName(String _bankName) { bankName = _bankName; } - public String getMerchantId() { - return merchantId; - } - public void setMerchantId(String _merchantId) { - merchantId = _merchantId; - } + diff --git a/mallinkService/src/main/java/com/simple/mapper/MallPermissionMapper.java b/mallinkService/src/main/java/com/simple/mapper/MallPermissionMapper.java new file mode 100644 index 000000000..022e71f00 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/mapper/MallPermissionMapper.java @@ -0,0 +1,20 @@ +package com.simple.mapper; + +import com.simple.common.CommonMapper; +import com.simple.domain.po.MallPermission; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface MallPermissionMapper extends CommonMapper { + + List findList(MallPermission mallPermission); + + List findPermissionByRoleId(Long roleId); + List findPermissionByRoleIds(@Param("roleIds") List roleIds); + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/mapper/MallRoleMapper.java b/mallinkService/src/main/java/com/simple/mapper/MallRoleMapper.java new file mode 100644 index 000000000..65ed63ed9 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/mapper/MallRoleMapper.java @@ -0,0 +1,20 @@ +package com.simple.mapper; + +import com.simple.common.CommonMapper; +import com.simple.domain.po.MallRole; + +import java.util.List; +import java.util.Map; + +public interface MallRoleMapper extends CommonMapper { + + List findList(MallRole mallRole); + + + List findRoleByUserId(Long userId); + int countByName(Map map); + + + + +} diff --git a/mallinkService/src/main/java/com/simple/mapper/MallUserInfoMapper.java b/mallinkService/src/main/java/com/simple/mapper/MallUserInfoMapper.java new file mode 100644 index 000000000..07340c82f --- /dev/null +++ b/mallinkService/src/main/java/com/simple/mapper/MallUserInfoMapper.java @@ -0,0 +1,19 @@ +package com.simple.mapper; + +import com.simple.common.CommonMapper; +import com.simple.domain.po.MallUserInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface MallUserInfoMapper extends CommonMapper { + + List findList(MallUserInfo mallUserInfo); + + + + + Integer hasButtonPermission(@Param("userId") Long userId, @Param("permission") String permission); + + +} diff --git a/mallinkService/src/main/java/com/simple/mapper/MallUserRoleMapper.java b/mallinkService/src/main/java/com/simple/mapper/MallUserRoleMapper.java new file mode 100644 index 000000000..699612961 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/mapper/MallUserRoleMapper.java @@ -0,0 +1,17 @@ +package com.simple.mapper; + +import com.simple.common.CommonMapper; +import com.simple.domain.po.MallUserRole; + +import java.util.List; + +public interface MallUserRoleMapper extends CommonMapper { + + List findList(MallUserRole mallUserRole); + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/mapper/MallUserRolePermissionMapper.java b/mallinkService/src/main/java/com/simple/mapper/MallUserRolePermissionMapper.java new file mode 100644 index 000000000..9a62053a9 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/mapper/MallUserRolePermissionMapper.java @@ -0,0 +1,19 @@ +package com.simple.mapper; + +import com.simple.common.CommonMapper; +import com.simple.domain.po.MallUserRolePermission; + +import java.util.List; +import java.util.Map; + +public interface MallUserRolePermissionMapper extends CommonMapper { + + List findList(MallUserRolePermission mallUserRolePermission); + + + + void deleteByRoleId(Map map); + + + +} diff --git a/mallinkService/src/main/java/com/simple/mapper/SysPermissionMapper.java b/mallinkService/src/main/java/com/simple/mapper/SysPermissionMapper.java deleted file mode 100644 index 7f773ef98..000000000 --- a/mallinkService/src/main/java/com/simple/mapper/SysPermissionMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index 22b968196..000000000 --- a/mallinkService/src/main/java/com/simple/mapper/SysRoleMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index c5f5695bd..000000000 --- a/mallinkService/src/main/java/com/simple/mapper/SysRolePermissionMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index 10a38c022..000000000 --- a/mallinkService/src/main/java/com/simple/mapper/SysUserRoleMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -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 deleted file mode 100644 index 411debbbf..000000000 --- a/mallinkService/src/main/java/com/simple/mapper/UserInfoMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -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/WxCouponSendMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponSendMapper.java new file mode 100644 index 000000000..a24aea6e4 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponSendMapper.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.WxCouponSend; + +public interface WxCouponSendMapper extends CommonMapper { + + List findList(WxCouponSend wxCouponSend); + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponTargetMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponTargetMapper.java new file mode 100644 index 000000000..cfca24d5c --- /dev/null +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponTargetMapper.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.WxCouponTarget; + +public interface WxCouponTargetMapper extends CommonMapper { + + List findList(WxCouponTarget wxCouponTarget); + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/SysPermissionService.java b/mallinkService/src/main/java/com/simple/service/MallPermissionService.java similarity index 59% rename from mallinkService/src/main/java/com/simple/service/SysPermissionService.java rename to mallinkService/src/main/java/com/simple/service/MallPermissionService.java index a61ae335c..364ebdf2b 100644 --- a/mallinkService/src/main/java/com/simple/service/SysPermissionService.java +++ b/mallinkService/src/main/java/com/simple/service/MallPermissionService.java @@ -1,10 +1,11 @@ package com.simple.service; -import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.domain.po.SysPermission; +import com.simple.domain.po.MallPermission; -public interface SysPermissionService { +import java.util.List; + +public interface MallPermissionService { /** * 根据实体查询分页列表 @@ -14,7 +15,7 @@ public interface SysPermissionService { * @param limit * @return */ - PageInfo listAsPage(SysPermission record, Integer pageIndex, Integer pageSize); + PageInfo listAsPage(MallPermission record, Integer pageIndex, Integer pageSize); /** * 根据Id获得实体 @@ -22,35 +23,35 @@ public interface SysPermissionService { * @param id * @return */ - SysPermission getById(String id); + MallPermission getById(Long id); /** * 保存或更新实体 * * @param record */ - void saveOrUpdate(SysPermission record); + void saveOrUpdate(MallPermission record); /** * 根据Id删除实体 * * @param id */ - void deleteById(String id); + void deleteById(Long id); /** * 根据roleId查询菜单和按钮权限 * @param roleId * @return */ - List findPermissionByRoleId(String roleId); + List findPermissionByRoleId(Long roleId); /** * 根据ruleId权限组查找相应权限 * @param roleIds * @return */ - List findPermissionByRoleIds(List roleIds); + List findPermissionByRoleIds(List roleIds); diff --git a/mallinkService/src/main/java/com/simple/service/SysRoleService.java b/mallinkService/src/main/java/com/simple/service/MallRoleService.java similarity index 62% rename from mallinkService/src/main/java/com/simple/service/SysRoleService.java rename to mallinkService/src/main/java/com/simple/service/MallRoleService.java index f3ea3a421..a9b2110a1 100644 --- a/mallinkService/src/main/java/com/simple/service/SysRoleService.java +++ b/mallinkService/src/main/java/com/simple/service/MallRoleService.java @@ -1,10 +1,11 @@ package com.simple.service; -import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.domain.po.SysRole; +import com.simple.domain.po.MallRole; -public interface SysRoleService { +import java.util.List; + +public interface MallRoleService { /** * 根据实体查询分页列表 @@ -14,7 +15,7 @@ public interface SysRoleService { * @param limit * @return */ - PageInfo listAsPage(SysRole record, Integer pageIndex, Integer pageSize); + PageInfo listAsPage(MallRole record, Integer pageIndex, Integer pageSize); /** * 根据Id获得实体 @@ -22,21 +23,21 @@ public interface SysRoleService { * @param id * @return */ - SysRole getById(String id); + MallRole getById(Long id); /** * 保存或更新实体 * * @param record */ - void saveOrUpdate(SysRole record); + void saveOrUpdate(MallRole record); /** * 根据Id删除实体 * * @param id */ - void deleteById(String id); + void deleteById(Long id); /** @@ -44,14 +45,14 @@ public interface SysRoleService { * @param userId * @return */ - List findRoleByUserId(String userId); + List findRoleByUserId(Long userId); /** * 根据名称查询数量 * @param name 名称 * @return */ - int countByName(String name,String id); + int countByName(String name, Long id); diff --git a/mallinkService/src/main/java/com/simple/service/UserInfoService.java b/mallinkService/src/main/java/com/simple/service/MallUserInfoService.java similarity index 69% rename from mallinkService/src/main/java/com/simple/service/UserInfoService.java rename to mallinkService/src/main/java/com/simple/service/MallUserInfoService.java index 88760edf9..fb58165ff 100644 --- a/mallinkService/src/main/java/com/simple/service/UserInfoService.java +++ b/mallinkService/src/main/java/com/simple/service/MallUserInfoService.java @@ -1,10 +1,9 @@ package com.simple.service; -import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.domain.po.UserInfo; +import com.simple.domain.po.MallUserInfo; -public interface UserInfoService { +public interface MallUserInfoService { /** * 根据实体查询分页列表 @@ -14,7 +13,7 @@ public interface UserInfoService { * @param limit * @return */ - PageInfo listAsPage(UserInfo record, Integer pageIndex, Integer pageSize); + PageInfo listAsPage(MallUserInfo record, Integer pageIndex, Integer pageSize); /** * 根据Id获得实体 @@ -22,21 +21,21 @@ public interface UserInfoService { * @param id * @return */ - UserInfo getById(String id); + MallUserInfo getById(Long id); /** * 保存或更新实体 * * @param record */ - void saveOrUpdate(UserInfo record); + void saveOrUpdate(MallUserInfo record); /** * 根据Id删除实体 * * @param id */ - void deleteById(String id); + void deleteById(Long id); @@ -53,13 +52,13 @@ public interface UserInfoService { * @param username * @return */ - UserInfo getByUsername(String username); + MallUserInfo getByUsername(String username); /** * 删除用户相关数据(用户记录,角色关联) * @param id */ - void deleteUser(String id); + void deleteUser(Long id); /** * 检查用户按钮是否有权限 @@ -67,7 +66,7 @@ public interface UserInfoService { * @param permission * @return 是否有权限(true: 有| false: 没有) */ - boolean hasButtonPermission(String userId, String permission); + boolean hasButtonPermission(Long userId, String permission); diff --git a/mallinkService/src/main/java/com/simple/service/SysRolePermissionService.java b/mallinkService/src/main/java/com/simple/service/MallUserRolePermissionService.java similarity index 57% rename from mallinkService/src/main/java/com/simple/service/SysRolePermissionService.java rename to mallinkService/src/main/java/com/simple/service/MallUserRolePermissionService.java index 7c5fe5dee..10096caa3 100644 --- a/mallinkService/src/main/java/com/simple/service/SysRolePermissionService.java +++ b/mallinkService/src/main/java/com/simple/service/MallUserRolePermissionService.java @@ -1,10 +1,9 @@ package com.simple.service; -import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.domain.po.SysRolePermission; +import com.simple.domain.po.MallUserRolePermission; -public interface SysRolePermissionService { +public interface MallUserRolePermissionService { /** * 根据实体查询分页列表 @@ -14,7 +13,7 @@ public interface SysRolePermissionService { * @param limit * @return */ - PageInfo listAsPage(SysRolePermission record, Integer pageIndex, Integer pageSize); + PageInfo listAsPage(MallUserRolePermission record, Integer pageIndex, Integer pageSize); /** * 根据Id获得实体 @@ -22,21 +21,21 @@ public interface SysRolePermissionService { * @param id * @return */ - SysRolePermission getById(String id); + MallUserRolePermission getById(Long id); /** * 保存或更新实体 * * @param record */ - void saveOrUpdate(SysRolePermission record); + void saveOrUpdate(MallUserRolePermission record); /** * 根据Id删除实体 * * @param id */ - void deleteById(String id); + void deleteById(Long id); @@ -45,7 +44,7 @@ public interface SysRolePermissionService { * @param roleId * @param perId */ - void savePermissions(String roleId,String[] perId); + void savePermissions(Long roleId, Long[] perId); diff --git a/mallinkService/src/main/java/com/simple/service/SysUserRoleService.java b/mallinkService/src/main/java/com/simple/service/MallUserRoleService.java similarity index 59% rename from mallinkService/src/main/java/com/simple/service/SysUserRoleService.java rename to mallinkService/src/main/java/com/simple/service/MallUserRoleService.java index adad10149..2337f9a49 100644 --- a/mallinkService/src/main/java/com/simple/service/SysUserRoleService.java +++ b/mallinkService/src/main/java/com/simple/service/MallUserRoleService.java @@ -1,10 +1,11 @@ package com.simple.service; -import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.domain.po.SysUserRole; +import com.simple.domain.po.MallUserRole; -public interface SysUserRoleService { +import java.util.List; + +public interface MallUserRoleService { /** * 根据实体查询分页列表 @@ -14,7 +15,7 @@ public interface SysUserRoleService { * @param limit * @return */ - PageInfo listAsPage(SysUserRole record, Integer pageIndex, Integer pageSize); + PageInfo listAsPage(MallUserRole record, Integer pageIndex, Integer pageSize); /** * 根据Id获得实体 @@ -22,30 +23,30 @@ public interface SysUserRoleService { * @param id * @return */ - SysUserRole getById(String id); + MallUserRole getById(Long id); /** * 保存或更新实体 * * @param record */ - void saveOrUpdate(SysUserRole record); + void saveOrUpdate(MallUserRole record); /** * 根据Id删除实体 * * @param id */ - void deleteById(String id); - - - + void deleteById(Long id); /** * 批量增加用户对应角色 * @param u2rs */ - void batchInsert(List u2rs); + void batchInsert(List u2rs); + + + diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponSendService.java b/mallinkService/src/main/java/com/simple/service/WxCouponSendService.java new file mode 100644 index 000000000..af08191ed --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/WxCouponSendService.java @@ -0,0 +1,48 @@ +package com.simple.service; + +import java.util.*; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.WxCouponSend; + +public interface WxCouponSendService { + + /** + * 根据实体查询分页列表 + * + * @param record + * @param offset + * @param limit + * @return + */ + PageInfo listAsPage(WxCouponSend record, Integer pageIndex, Integer pageSize); + + /** + * 根据Id获得实体 + * + * @param id + * @return + */ + WxCouponSend getById(Long id); + + /** + * 保存或更新实体 + * + * @param record + */ + void saveOrUpdate(WxCouponSend record); + + /** + * 根据Id删除实体 + * + * @param id + */ + void deleteById(Long id); + + + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponTargetService.java b/mallinkService/src/main/java/com/simple/service/WxCouponTargetService.java new file mode 100644 index 000000000..fc8f9d8a3 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/WxCouponTargetService.java @@ -0,0 +1,48 @@ +package com.simple.service; + +import java.util.*; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.WxCouponTarget; + +public interface WxCouponTargetService { + + /** + * 根据实体查询分页列表 + * + * @param record + * @param offset + * @param limit + * @return + */ + PageInfo listAsPage(WxCouponTarget record, Integer pageIndex, Integer pageSize); + + /** + * 根据Id获得实体 + * + * @param id + * @return + */ + WxCouponTarget getById(Long id); + + /** + * 保存或更新实体 + * + * @param record + */ + void saveOrUpdate(WxCouponTarget record); + + /** + * 根据Id删除实体 + * + * @param id + */ + void deleteById(Long id); + + + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/impl/MallPermissionServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/MallPermissionServiceImpl.java new file mode 100644 index 000000000..6caf3b1a9 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/impl/MallPermissionServiceImpl.java @@ -0,0 +1,63 @@ +package com.simple.service.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simple.common.IdWorker; +import com.simple.domain.po.MallPermission; +import com.simple.mapper.MallPermissionMapper; +import com.simple.service.MallPermissionService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class MallPermissionServiceImpl implements MallPermissionService { + + @Autowired + MallPermissionMapper mallPermissionMapper; + + + @Override + public PageInfo listAsPage(MallPermission record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> mallPermissionMapper.findList(record)); + } + + @Override + public MallPermission getById(Long id) { + return mallPermissionMapper.selectByPrimaryKey(id); + } + + @Override + public void saveOrUpdate(MallPermission record) { + if (record.getId() == null) { + //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + + mallPermissionMapper.insertSelective(record); + } else { + mallPermissionMapper.updateByPrimaryKeySelective(record); + } + } + + @Override + public void deleteById(Long id) { + mallPermissionMapper.deleteByPrimaryKey(id); + } + + @Override + public List findPermissionByRoleId(Long roleId) { + return mallPermissionMapper.findPermissionByRoleId(roleId); + } + + @Override + public List findPermissionByRoleIds(List roleIds) { + return mallPermissionMapper.findPermissionByRoleIds(roleIds); + } + + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/impl/MallRoleServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/MallRoleServiceImpl.java new file mode 100644 index 000000000..628f2a2ea --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/impl/MallRoleServiceImpl.java @@ -0,0 +1,69 @@ +package com.simple.service.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simple.common.IdWorker; +import com.simple.domain.po.MallRole; +import com.simple.mapper.MallRoleMapper; +import com.simple.service.MallRoleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service +public class MallRoleServiceImpl implements MallRoleService { + + @Autowired + MallRoleMapper mallRoleMapper; + + + @Override + public PageInfo listAsPage(MallRole record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> mallRoleMapper.findList(record)); + } + + @Override + public MallRole getById(Long id) { + return mallRoleMapper.selectByPrimaryKey(id); + } + + @Override + public void saveOrUpdate(MallRole record) { + if (record.getId() == null) { + //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + IdWorker idWorker = new IdWorker(0, 0); + record.setId(idWorker.nextId()); + mallRoleMapper.insertSelective(record); + } else { + mallRoleMapper.updateByPrimaryKeySelective(record); + } + } + + @Override + public void deleteById(Long id) { + mallRoleMapper.deleteByPrimaryKey(id); + } + + + @Override + public List findRoleByUserId(Long userId) { + return mallRoleMapper.findRoleByUserId(userId); + } + + @Override + public int countByName(String name,Long id) { + Map map = new HashMap<>(2); + map.put("name", name); + map.put("id", id); + return mallRoleMapper.countByName(map); + } + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/impl/MallUserInfoServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/MallUserInfoServiceImpl.java new file mode 100644 index 000000000..da88d44b6 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/impl/MallUserInfoServiceImpl.java @@ -0,0 +1,85 @@ +package com.simple.service.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simple.common.IdWorker; +import com.simple.domain.po.MallUserInfo; +import com.simple.domain.po.MallUserRole; +import com.simple.mapper.MallUserInfoMapper; +import com.simple.mapper.MallUserRoleMapper; +import com.simple.service.MallUserInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +public class MallUserInfoServiceImpl implements MallUserInfoService { + + @Autowired + MallUserInfoMapper mallUserInfoMapper; + @Autowired + MallUserRoleMapper userRoleMapper; + + + @Override + public PageInfo listAsPage(MallUserInfo record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> mallUserInfoMapper.findList(record)); + } + + @Override + public MallUserInfo getById(Long id) { + return mallUserInfoMapper.selectByPrimaryKey(id); + } + + @Override + public void saveOrUpdate(MallUserInfo record) { + if (record.getId() == null) { + //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + IdWorker idWorker = new IdWorker(0, 0); + record.setId(idWorker.nextId()); + mallUserInfoMapper.insertSelective(record); + } else { + mallUserInfoMapper.updateByPrimaryKeySelective(record); + } + } + + @Override + public void deleteById(Long id) { + mallUserInfoMapper.deleteByPrimaryKey(id); + } + + + + + + @Override + public MallUserInfo getByUsername(String username) { + MallUserInfo userInfo = new MallUserInfo(); + userInfo.setUsername(username); + return mallUserInfoMapper.selectOne(userInfo); + } + + @Override + public long cntByUserName(String username) { + MallUserInfo userInfo = new MallUserInfo(); + userInfo.setUsername(username); + return PageHelper.count(() -> mallUserInfoMapper.select(userInfo)); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteUser(Long id) { + mallUserInfoMapper.deleteByPrimaryKey(id); + MallUserRole userRole = new MallUserRole(); + userRole.setUid(id); + userRoleMapper.delete(userRole); + } + + @Override + public boolean hasButtonPermission(Long userId, String permission) { + return mallUserInfoMapper.hasButtonPermission(userId, permission) == null ? false : true; + } + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/impl/MallUserRolePermissionServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/MallUserRolePermissionServiceImpl.java new file mode 100644 index 000000000..b22f82057 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/impl/MallUserRolePermissionServiceImpl.java @@ -0,0 +1,69 @@ +package com.simple.service.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simple.common.IdWorker; +import com.simple.domain.po.MallUserRolePermission; +import com.simple.mapper.MallUserRolePermissionMapper; +import com.simple.service.MallUserRolePermissionService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.Map; + +@Service +public class MallUserRolePermissionServiceImpl implements MallUserRolePermissionService { + + @Autowired + MallUserRolePermissionMapper mallUserRolePermissionMapper; + + + @Override + public PageInfo listAsPage(MallUserRolePermission record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> mallUserRolePermissionMapper.findList(record)); + } + + @Override + public MallUserRolePermission getById(Long id) { + return mallUserRolePermissionMapper.selectByPrimaryKey(id); + } + + @Override + public void saveOrUpdate(MallUserRolePermission record) { + if (record.getId() == null) { + //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + IdWorker idWorker = new IdWorker(0, 0); + record.setId(idWorker.nextId()); + mallUserRolePermissionMapper.insertSelective(record); + } else { + mallUserRolePermissionMapper.updateByPrimaryKeySelective(record); + } + } + + @Override + public void deleteById(Long id) { + mallUserRolePermissionMapper.deleteByPrimaryKey(id); + } + + + + @Override + public void savePermissions(Long roleId, Long[] perId) { + Map map = new HashMap<>(); + map.put("roleId", roleId); + mallUserRolePermissionMapper.deleteByRoleId(map); + for(Long pId:perId){ + MallUserRolePermission permission =new MallUserRolePermission(); + permission.setId(roleId); + permission.setPermissionId(pId); + mallUserRolePermissionMapper.insert(permission); + } + + } + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/impl/MallUserRoleServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/MallUserRoleServiceImpl.java new file mode 100644 index 000000000..a0bfddc09 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/impl/MallUserRoleServiceImpl.java @@ -0,0 +1,59 @@ +package com.simple.service.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simple.common.IdWorker; +import com.simple.domain.po.MallUserRole; +import com.simple.mapper.MallUserRoleMapper; +import com.simple.service.MallUserRoleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class MallUserRoleServiceImpl implements MallUserRoleService { + + @Autowired + MallUserRoleMapper mallUserRoleMapper; + + + @Override + public PageInfo listAsPage(MallUserRole record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> mallUserRoleMapper.findList(record)); + } + + @Override + public MallUserRole getById(Long id) { + return mallUserRoleMapper.selectByPrimaryKey(id); + } + + @Override + public void saveOrUpdate(MallUserRole record) { + if (record.getId() == null) { + //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + IdWorker idWorker = new IdWorker(0, 0); + record.setId(idWorker.nextId()); + mallUserRoleMapper.insertSelective(record); + } else { + mallUserRoleMapper.updateByPrimaryKeySelective(record); + } + } + + @Override + public void deleteById(Long id) { + mallUserRoleMapper.deleteByPrimaryKey(id); + } + + + + + @Override + public void batchInsert(List u2rs) { + mallUserRoleMapper.insertList(u2rs); + } + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/impl/SysPermissionServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/SysPermissionServiceImpl.java deleted file mode 100644 index 5ac7bc8d5..000000000 --- a/mallinkService/src/main/java/com/simple/service/impl/SysPermissionServiceImpl.java +++ /dev/null @@ -1,60 +0,0 @@ -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 deleted file mode 100644 index 2d42aafd8..000000000 --- a/mallinkService/src/main/java/com/simple/service/impl/SysRolePermissionServiceImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -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 deleted file mode 100644 index 41e568113..000000000 --- a/mallinkService/src/main/java/com/simple/service/impl/SysRoleServiceImpl.java +++ /dev/null @@ -1,63 +0,0 @@ -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 deleted file mode 100644 index 13057b4d6..000000000 --- a/mallinkService/src/main/java/com/simple/service/impl/SysUserRoleServiceImpl.java +++ /dev/null @@ -1,55 +0,0 @@ -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 deleted file mode 100644 index 7fd9ed9e7..000000000 --- a/mallinkService/src/main/java/com/simple/service/impl/UserInfoServiceImpl.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.simple.service.impl; - -import java.util.UUID; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simple.domain.po.SysUserRole; -import com.simple.domain.po.UserInfo; -import com.simple.mapper.SysUserRoleMapper; -import com.simple.mapper.UserInfoMapper; -import com.simple.service.UserInfoService; - -@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 getByUsername(String username) { - UserInfo userInfo = new UserInfo(); - userInfo.setUsername(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/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponSendServiceImpl.java new file mode 100644 index 000000000..02e96450e --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponSendServiceImpl.java @@ -0,0 +1,54 @@ +package com.simple.service.impl; + +import java.util.*; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.WxCouponSend; +import com.simple.mapper.WxCouponSendMapper; +import com.simple.service.WxCouponSendService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.simple.common.IdWorker; + +@Service +public class WxCouponSendServiceImpl implements WxCouponSendService { + + @Autowired + WxCouponSendMapper wxCouponSendMapper; + + + @Override + public PageInfo listAsPage(WxCouponSend record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponSendMapper.findList(record)); + } + + @Override + public WxCouponSend getById(Long id) { + return wxCouponSendMapper.selectByPrimaryKey(id); + } + + @Override + public void saveOrUpdate(WxCouponSend record) { + if (record.getId() == null) { + //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + IdWorker idWorker = new IdWorker(0, 0); + record.setId(idWorker.nextId()); + wxCouponSendMapper.insertSelective(record); + } else { + wxCouponSendMapper.updateByPrimaryKeySelective(record); + } + } + + @Override + public void deleteById(Long id) { + wxCouponSendMapper.deleteByPrimaryKey(id); + } + + + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponTargetServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponTargetServiceImpl.java new file mode 100644 index 000000000..6aaf39920 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponTargetServiceImpl.java @@ -0,0 +1,54 @@ +package com.simple.service.impl; + +import java.util.*; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.WxCouponTarget; +import com.simple.mapper.WxCouponTargetMapper; +import com.simple.service.WxCouponTargetService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.simple.common.IdWorker; + +@Service +public class WxCouponTargetServiceImpl implements WxCouponTargetService { + + @Autowired + WxCouponTargetMapper wxCouponTargetMapper; + + + @Override + public PageInfo listAsPage(WxCouponTarget record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponTargetMapper.findList(record)); + } + + @Override + public WxCouponTarget getById(Long id) { + return wxCouponTargetMapper.selectByPrimaryKey(id); + } + + @Override + public void saveOrUpdate(WxCouponTarget record) { + if (record.getId() == null) { + //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + IdWorker idWorker = new IdWorker(0, 0); + record.setId(idWorker.nextId()); + wxCouponTargetMapper.insertSelective(record); + } else { + wxCouponTargetMapper.updateByPrimaryKeySelective(record); + } + } + + @Override + public void deleteById(Long id) { + wxCouponTargetMapper.deleteByPrimaryKey(id); + } + + + + + + + + +} diff --git a/mallinkService/src/main/resources/mapper/SysPermissionMapper.xml b/mallinkService/src/main/resources/mapper/MallPermissionMapper.xml similarity index 56% rename from mallinkService/src/main/resources/mapper/SysPermissionMapper.xml rename to mallinkService/src/main/resources/mapper/MallPermissionMapper.xml index 68add1e74..4807ea205 100644 --- a/mallinkService/src/main/resources/mapper/SysPermissionMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallPermissionMapper.xml @@ -1,12 +1,13 @@ - - + + + - - + + @@ -14,27 +15,68 @@ - `id`,`name`,`available`,`parent_id`,`parent_ids`,`permission`,`resource_type`,`url`,`sort` + `id`,`tenant_id`,`name`,`available`,`parent_id`,`parent_ids`,`permission`,`resource_type`,`url`,`sort` where 1 = 1 - and `id` = #{id} - and `name` = #{name} + + + and `id` like concat('%', #{id},'%') + + + + + and `tenant_id` like concat('%', #{tenantId},'%') + + + + + and `name` like concat('%', #{name},'%') + + and `name` like concat('%', #{nameLike},'%') - and `available` = #{available} - and `parent_id` = #{parentId} - and `parent_ids` = #{parentIds} - and `permission` = #{permission} + + + and `available` like concat('%', #{available},'%') + + + + + and `parent_id` like concat('%', #{parentId},'%') + + + + + and `parent_ids` like concat('%', #{parentIds},'%') + + + + + and `permission` like concat('%', #{permission},'%') + + and `permission` in #{item_permission} - and `resource_type` = #{resourceType} - and `url` = #{url} - and `sort` = #{sort} + + + and `resource_type` like concat('%', #{resourceType},'%') + + + + + and `url` like concat('%', #{url},'%') + + + + + and `sort` = #{sort} + + and `sort` >= #{sortFrom} and #{sortTo} >= `sort` and `sort` >= #{sortGte} @@ -50,21 +92,21 @@ order by ${sortColumns} - + select from mall_permission - select from sys_role + diff --git a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml new file mode 100644 index 000000000..6589b4083 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + `id`,`tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin` + + + + where 1 = 1 + + + and `id` = #{id} + + + + + and `tenant_id` like concat('%', #{tenantId},'%') + + + + + and `username` like concat('%', #{username},'%') + + + + + and `name` like concat('%', #{name},'%') + + + + + and `password` like concat('%', #{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/SysUserRoleMapper.xml b/mallinkService/src/main/resources/mapper/MallUserRoleMapper.xml similarity index 56% rename from mallinkService/src/main/resources/mapper/SysUserRoleMapper.xml rename to mallinkService/src/main/resources/mapper/MallUserRoleMapper.xml index d6834759e..8f3335102 100644 --- a/mallinkService/src/main/resources/mapper/SysUserRoleMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserRoleMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -13,9 +13,21 @@ where 1 = 1 - and `uid` = #{uid} - and `role_id` = #{roleId} - and `id` = #{id} + + + and `uid` like concat('%', #{uid},'%') + + + + + and `role_id` like concat('%', #{roleId},'%') + + + + + and `id` like concat('%', #{id},'%') + + and id in @@ -25,8 +37,8 @@ order by ${sortColumns} - + select from mall_user_role diff --git a/mallinkService/src/main/resources/mapper/MallUserRolePermissionMapper.xml b/mallinkService/src/main/resources/mapper/MallUserRolePermissionMapper.xml new file mode 100644 index 000000000..90c2ec0da --- /dev/null +++ b/mallinkService/src/main/resources/mapper/MallUserRolePermissionMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + `id`,`tenant_id`,`permission_id`,`role_id` + + + + where 1 = 1 + + + and `id` = #{id} + + + + + and `tenant_id` like concat('%', #{tenantId},'%') + + + + + and `permission_id` like concat('%', #{permissionId},'%') + + + + + and `role_id` like concat('%', #{roleId},'%') + + + + 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 deleted file mode 100644 index 43c5f7087..000000000 --- a/mallinkService/src/main/resources/mapper/SysRolePermissionMapper.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - `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/UserInfoMapper.xml b/mallinkService/src/main/resources/mapper/UserInfoMapper.xml deleted file mode 100644 index 84cb082ae..000000000 --- a/mallinkService/src/main/resources/mapper/UserInfoMapper.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - `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/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index cea1da6be..e6de7c089 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -4,24 +4,33 @@ - - - - + + + + + + + + + + + + + - `id`,`tenant_id`,`activity_id`,`merchant_id`,`type`,`cover_img`,`title`,`sub_title`,`detail`,`price`,`sale_price`,`use_price`,`business`,`status`,`create_date`,`update_date` + `id`,`tenant_id`,`merchant_id`,`type`,`cover_img`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`send_start_date`,`send_end_date`,`valid_start_date`,`valid_end_date`,`valid_days`,`detail`,`send_type`,`target_ad`,`businesses`,`price`,`number`,`total`,`status`,`create_date`,`update_date` @@ -37,11 +46,6 @@ - - and `activity_id` = #{activityId} - - - and `merchant_id` = #{merchantId} @@ -67,28 +71,78 @@ + + and `sale_price` = #{salePrice} + + + + + and `use_price` = #{usePrice} + + + + + and `use_limit_quantity` = #{useLimitQuantity} + + + + + and `send_start_date` = #{sendStartDate} + + + + + and `send_end_date` = #{sendEndDate} + + + + + and `valid_start_date` = #{validStartDate} + + + + + and `valid_end_date` = #{validEndDate} + + + + + and `valid_days` = #{validDays} + + + and `detail` like concat('%', #{detail},'%') - - and `price` = #{price} + + and `send_type` = #{sendType} - - and `sale_price` = #{salePrice} + + and `target_ad` = #{targetAd} - - and `use_price` = #{usePrice} + + and `businesses` like concat('%', #{businesses},'%') + + + + + and `price` = #{price} + + + + + and `number` = #{number} - - and `business` like concat('%', #{business},'%') + + and `total` = #{total} diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml new file mode 100644 index 000000000..092b603c4 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + `id`,`tenant_id`,`merchant_id`,`coupon_id`,`type`,`title`,`send_type`,`create_date`,`update_date` + + + + where 1 = 1 + + + and `id` = #{id} + + + + + and `tenant_id` like concat('%', #{tenantId},'%') + + + + + and `merchant_id` = #{merchantId} + + + + + and `coupon_id` = #{couponId} + + + + + and `type` = #{type} + + + + + and `title` like concat('%', #{title},'%') + + + + + and `send_type` = #{sendType} + + + + + and `create_date` = #{createDate} + + + + + and `update_date` = #{updateDate} + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxCouponTargetMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponTargetMapper.xml new file mode 100644 index 000000000..7b4822ce1 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxCouponTargetMapper.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + `id`,`tenant_id`,`merchant_id`,`coupon_id`,`type`,`title`,`target_ad`,`create_date`,`update_date` + + + + where 1 = 1 + + + and `id` = #{id} + + + + + and `tenant_id` like concat('%', #{tenantId},'%') + + + + + and `merchant_id` = #{merchantId} + + + + + and `coupon_id` = #{couponId} + + + + + and `type` = #{type} + + + + + and `title` like concat('%', #{title},'%') + + + + + and `target_ad` = #{targetAd} + + + + + and `create_date` = #{createDate} + + + + + and `update_date` = #{updateDate} + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 8c6047af5..22c5034a3 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -9,11 +9,10 @@ - - `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`bank_card`,`bank_name`,`merchant_id` + `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`bank_card`,`bank_name` @@ -53,11 +52,7 @@ and `bank_name` like concat('%', #{bankName},'%') - - - and `merchant_id` like concat('%', #{merchantId},'%') - - + and id in