diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysUserStatusEnum.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysUserStatusEnum.java index 27770d3..57c01b6 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysUserStatusEnum.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysUserStatusEnum.java @@ -7,9 +7,10 @@ import com.baomidou.mybatisplus.enums.IEnum; * 用户状态 */ public enum SysUserStatusEnum implements IEnum { - NORMAL("normal", "正常"), - LOCKED("locked", "锁定"), - DISABLED("disable" , "禁用"); + NORMAL("0", "正常"), + DELETE("1" , "禁用"), + DISABLED("2" , "禁用"), + LOCKED("3", "锁定"),; private String value; private String desc; diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/IPostService.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/IPostService.java deleted file mode 100644 index ab1fadd..0000000 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/IPostService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.tamguo.modules.sys.service; - -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.service.IService; -import com.tamguo.modules.sys.model.SysPostEntity; -import com.tamguo.modules.sys.model.condition.SysPostCondition; - -public interface IPostService extends IService{ - - /** 查询列表*/ - Page listData(SysPostCondition condition); - - /** 添加数据*/ - void add(SysPostEntity post); - - /** 修改数据*/ - void update(SysPostEntity post); - -} diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysPostService.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysPostService.java index d855b96..5063daf 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysPostService.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysPostService.java @@ -1,8 +1,19 @@ package com.tamguo.modules.sys.service; +import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; import com.tamguo.modules.sys.model.SysPostEntity; +import com.tamguo.modules.sys.model.condition.SysPostCondition; public interface ISysPostService extends IService{ + /** 查询列表*/ + Page listData(SysPostCondition condition); + + /** 添加数据*/ + void add(SysPostEntity post); + + /** 修改数据*/ + void update(SysPostEntity post); + } diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/PostServiceImpl.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/PostServiceImpl.java deleted file mode 100644 index 1e8f8a3..0000000 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/PostServiceImpl.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.tamguo.modules.sys.service.impl; - -import java.util.Date; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import com.tamguo.modules.sys.dao.SysPostMapper; -import com.tamguo.modules.sys.model.SysPostEntity; -import com.tamguo.modules.sys.model.condition.SysPostCondition; -import com.tamguo.modules.sys.model.enums.SysPostStatusEnum; -import com.tamguo.modules.sys.service.IPostService; - -@Service -public class PostServiceImpl extends ServiceImpl implements IPostService{ - - @Autowired - private SysPostMapper sysPostMapper; - - @Override - public Page listData(SysPostCondition condition) { - Page page = new Page<>(condition.getPageNo(), condition.getPageSize()); - return page.setRecords(sysPostMapper.listData(condition , page)); - } - - @Transactional(readOnly=false) - @Override - public void add(SysPostEntity post) { - post.setCreateDate(new Date()); - post.setUpdateDate(new Date()); - post.setStatus(SysPostStatusEnum.NORMAL); - sysPostMapper.insert(post); - } - - @Transactional(readOnly=false) - @Override - public void update(SysPostEntity post) { - post.setUpdateDate(new Date()); - sysPostMapper.updateById(post); - } - -} diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysPostServiceImpl.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysPostServiceImpl.java index 1b52cb6..5d7de7e 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysPostServiceImpl.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysPostServiceImpl.java @@ -1,13 +1,45 @@ package com.tamguo.modules.sys.service.impl; +import java.util.Date; + +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.tamguo.modules.sys.dao.SysPostMapper; import com.tamguo.modules.sys.model.SysPostEntity; +import com.tamguo.modules.sys.model.condition.SysPostCondition; +import com.tamguo.modules.sys.model.enums.SysPostStatusEnum; import com.tamguo.modules.sys.service.ISysPostService; @Service public class SysPostServiceImpl extends ServiceImpl implements ISysPostService{ + @Autowired + private SysPostMapper sysPostMapper; + + @Override + public Page listData(SysPostCondition condition) { + Page page = new Page<>(condition.getPageNo(), condition.getPageSize()); + return page.setRecords(sysPostMapper.listData(condition , page)); + } + + @Transactional(readOnly=false) + @Override + public void add(SysPostEntity post) { + post.setCreateDate(new Date()); + post.setUpdateDate(new Date()); + post.setStatus(SysPostStatusEnum.NORMAL); + sysPostMapper.insert(post); + } + + @Transactional(readOnly=false) + @Override + public void update(SysPostEntity post) { + post.setUpdateDate(new Date()); + sysPostMapper.updateById(post); + } + } diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java index f1a5f73..5a3a5c3 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java @@ -115,6 +115,10 @@ public class SysUserServiceImpl extends ServiceImpl listData(SysPostCondition condition) { - Page page = iPostService.listData(condition); + Page page = iSysPostService.listData(condition); return Result.jqGridResult(page.getRecords(), page.getTotal(), page.getSize(), page.getCurrent(), page.getPages()); } @@ -56,7 +55,7 @@ public class SysPostController { @ResponseBody public Result save(SysPostEntity post) { try { - iPostService.add(post); + iSysPostService.add(post); return Result.result(0, null, "操作成功"); } catch (Exception e) { return ExceptionSupport.resolverResult("保存岗位", this.getClass(), e); @@ -67,7 +66,7 @@ public class SysPostController { @ResponseBody public Result update(SysPostEntity post) { try { - iPostService.update(post); + iSysPostService.update(post); return Result.result(0, null, "操作成功"); } catch (Exception e) { return ExceptionSupport.resolverResult("修改岗位", this.getClass(), e); diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java index 9d23f38..7786ff8 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java @@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.mapper.Condition; import com.baomidou.mybatisplus.plugins.Page; import com.tamguo.modules.sys.model.SysUserEntity; import com.tamguo.modules.sys.model.condition.SysUserCondition; -import com.tamguo.modules.sys.service.IPostService; +import com.tamguo.modules.sys.service.ISysPostService; import com.tamguo.modules.sys.service.ISysUserService; import com.tamguo.modules.sys.utils.Result; @@ -27,13 +27,13 @@ public class SysUserController { @Autowired private ISysUserService iSysUserService; @Autowired - private IPostService iPostService; + private ISysPostService iSysPostService; @SuppressWarnings("unchecked") @RequestMapping(path="list") public ModelAndView list(ModelAndView model) { model.setViewName(USER_LIST_PAGE); - model.addObject("postList", iPostService.selectList(Condition.create().eq("status", "0"))); + model.addObject("postList", iSysPostService.selectList(Condition.create().eq("status", "0"))); return model; } @@ -41,7 +41,7 @@ public class SysUserController { @RequestMapping(path="add") public ModelAndView add(String userCode , ModelAndView model) { model.setViewName(USER_ADD_PAGE); - model.addObject("postList", iPostService.selectList(Condition.create().eq("status", "0"))); + model.addObject("postList", iSysPostService.selectList(Condition.create().eq("status", "0"))); return model; } @@ -50,7 +50,7 @@ public class SysUserController { public ModelAndView update(String userCode , ModelAndView model) { model.setViewName(USER_UPDATE_PAGE); model.addObject("user", iSysUserService.selectById(userCode)); - model.addObject("postList", iPostService.selectList(Condition.create().eq("status", "0"))); + model.addObject("postList", iSysPostService.selectList(Condition.create().eq("status", "0"))); model.addObject("userPostCode", iSysUserService.queryUserPostByUserCode(userCode)); return model; }