diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/DeptController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/DeptController.java index bf71a7a0..ab33dcac 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/DeptController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/DeptController.java @@ -2,6 +2,9 @@ package com.glxp.api.admin.controller.auth; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.annotation.AuthRuleAnnotation; +import com.glxp.api.admin.annotation.Log; +import com.glxp.api.admin.constant.BusinessType; +import com.glxp.api.admin.controller.BaseController; import com.glxp.api.admin.entity.auth.DeptEntity; import com.glxp.api.admin.req.auth.FilterDeptRequest; import com.glxp.api.admin.req.inout.DeleteRequest; @@ -20,7 +23,7 @@ import java.util.Date; import java.util.List; @RestController -public class DeptController { +public class DeptController extends BaseController { @Resource @@ -39,38 +42,52 @@ public class DeptController { return ResultVOUtils.success(deptEntityPageSimpleResponse); } + + @AuthRuleAnnotation("") + @GetMapping("udi/auth/dept/getDept") + public BaseResponse getDept(FilterDeptRequest filterDeptRequest) { + DeptEntity deptEntity = deptService.selectById(filterDeptRequest.getId()); + return ResultVOUtils.success(deptEntity); + } + @AuthRuleAnnotation("") + @Log(title = "部门管理", businessType = BusinessType.INSERT) @PostMapping("udi/auth/dept/add") public BaseResponse addDept(@RequestBody DeptEntity deptEntity) { deptEntity.setCode(gennerOrderUtils.getDeptCode()); + deptEntity.setCreateTime(new Date()); deptEntity.setUpdateTime(new Date()); + deptEntity.setCreateBy(getUser().getUserName()); boolean b = deptService.insertDept(deptEntity); if (b) return ResultVOUtils.success("添加成功"); else { return ResultVOUtils.error(500, "添加失败"); } - } + @Log(title = "部门管理", businessType = BusinessType.UPDATE) @AuthRuleAnnotation("") @PostMapping("udi/auth/dept/update") public BaseResponse updateDept(@RequestBody DeptEntity deptEntity) { + deptEntity.setUpdateBy(getUser().getUserName()); deptEntity.setUpdateTime(new Date()); boolean b = deptService.updateDept(deptEntity); - if (b) return ResultVOUtils.success("更新成功！"); else { - return ResultVOUtils.error(500, "更新成功!"); + return ResultVOUtils.error(500, "更新失败!"); } } - + @Log(title = "部门管理", businessType = BusinessType.DELETE) @AuthRuleAnnotation("") @PostMapping("udi/auth/dept/delete") public BaseResponse deleteDept(@RequestBody DeleteRequest deleteRequest) { + if (deptService.filterSubDepts(Integer.parseInt(deleteRequest.getId())).size() > 0) { + return ResultVOUtils.error(500, "删除失败，存在子级部门，请先移除！"); + } boolean b = deptService.deleteById(Integer.parseInt(deleteRequest.getId())); if (b) return ResultVOUtils.success("删除成功"); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysHisStatusController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysHisStatusController.java new file mode 100644 index 00000000..9f403102 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysHisStatusController.java @@ -0,0 +1,107 @@ +package com.glxp.api.admin.controller.auth; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.annotation.AuthRuleAnnotation; +import com.glxp.api.admin.annotation.Log; +import com.glxp.api.admin.constant.BusinessType; +import com.glxp.api.admin.controller.BaseController; +import com.glxp.api.admin.entity.auth.SysHisStatusEntity; +import com.glxp.api.admin.req.auth.FilterSysHisStatusRequest; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.auth.ISysHisStatusService; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@RestController +public class SysHisStatusController extends BaseController { + + @Resource + ISysHisStatusService sysHisStatusService; + + + @AuthRuleAnnotation("") + @GetMapping("/sys/his/stauts/filter") + public BaseResponse filterList(FilterSysHisStatusRequest filterSysHisStatusRequest) { + List selectList = sysHisStatusService.selectList(filterSysHisStatusRequest); + PageInfo pageInfo = new PageInfo<>(selectList); + PageSimpleResponse deptEntityPageSimpleResponse = new PageSimpleResponse<>(); + deptEntityPageSimpleResponse.setTotal(pageInfo.getTotal()); + deptEntityPageSimpleResponse.setList(selectList); + return ResultVOUtils.success(deptEntityPageSimpleResponse); + } + + //获取数据权限列表树形列表 + @AuthRuleAnnotation("") + @GetMapping("/sys/his/stauts/tree") + public BaseResponse treeList(FilterSysHisStatusRequest filterSysHisStatusRequest) { + List selectList = sysHisStatusService.selectList(filterSysHisStatusRequest); + return ResultVOUtils.success(sysHisStatusService.buildStatusTreeSelect(selectList)); + } + + //获取数据权限包含已经选中树形列表 + @AuthRuleAnnotation("") + @GetMapping("/sys/his/stauts/treeSelect") + public BaseResponse treeSelectedList(FilterSysHisStatusRequest filterSysHisStatusRequest) { + List menus = sysHisStatusService.selectList(filterSysHisStatusRequest); + Map ajax = new HashMap<>(); + ajax.put("checkedKeys", sysHisStatusService.selectListByDeptId(filterSysHisStatusRequest.getDeptId())); + ajax.put("menus", sysHisStatusService.buildStatusTreeSelect(menus)); + return ResultVOUtils.success(ajax); + } + + + @AuthRuleAnnotation("") + @Log(title = "数据状态", businessType = BusinessType.INSERT) + @PostMapping("sys/his/stauts/add") + public BaseResponse addStatus(@RequestBody SysHisStatusEntity sysHisStatusEntity) { + sysHisStatusEntity.setUpdateTime(new Date()); + boolean b = sysHisStatusService.insert(sysHisStatusEntity); + if (b) + return ResultVOUtils.success("添加成功"); + else { + return ResultVOUtils.error(500, "添加失败"); + } + } + + @Log(title = "数据状态", businessType = BusinessType.UPDATE) + @AuthRuleAnnotation("") + @PostMapping("sys/his/stauts/update") + public BaseResponse updateStatus(@RequestBody SysHisStatusEntity sysHisStatusEntity) { + sysHisStatusEntity.setUpdateTime(new Date()); + boolean b = sysHisStatusService.update(sysHisStatusEntity); + if (b) + return ResultVOUtils.success("更新成功！"); + else { + return ResultVOUtils.error(500, "更新失败!"); + } + } + + + @Log(title = "数据状态", businessType = BusinessType.DELETE) + @AuthRuleAnnotation("") + @PostMapping("sys/his/stauts/delete") + public BaseResponse deleteStatus(@RequestBody DeleteRequest deleteRequest) { +// if (deptService.filterSubDepts(Integer.parseInt(deleteRequest.getId())).size() > 0) { +// return ResultVOUtils.error(500, "删除失败，存在子级部门，请先移除！"); +// } + boolean b = sysHisStatusService.deleteById(Integer.parseInt(deleteRequest.getId())); + if (b) + return ResultVOUtils.success("删除成功"); + else { + return ResultVOUtils.error(500, "删除失败"); + } + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysRoleController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysRoleController.java index 303389c5..eaa8b9e0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysRoleController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysRoleController.java @@ -12,7 +12,6 @@ import com.glxp.api.admin.req.auth.SysRoleRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.service.auth.AuthAdminService; import com.glxp.api.admin.service.auth.ISysRoleService; -import com.glxp.api.admin.service.auth.SysPermissionService; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import lombok.RequiredArgsConstructor; @@ -32,8 +31,6 @@ public class SysRoleController extends BaseController { ISysRoleService roleService; @Resource AuthAdminService userService; - @Resource - SysPermissionService permissionService; /** * 获取角色信息列表 diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java index b4e31bdf..6d3ad9f7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java @@ -749,7 +749,7 @@ public class WareHouseController { if (addOrderRequest.isVailInv()) { if (bussinessTypeEntity.isAdvanceType()) { int count = invPreProductDetailService.vailStockCount(code); - if (count < 0) { + if (count <= 0) { return ResultVOUtils.error(500, "当前库存不足，不允许0库存出库"); } } else { @@ -1376,12 +1376,12 @@ public class WareHouseController { if (null == id) return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); WarehouseBussinessTypeEntity warehouseBussinessTypeEntity = warehouseBussinessTypeService.selectById(id); - FilterInvBusUserRequest filterInvBusUserRequest=new FilterInvBusUserRequest(); + FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest(); filterInvBusUserRequest.setScAction(warehouseBussinessTypeEntity.getAction()); filterInvBusUserRequest.setSubInvCode(warehouseBussinessTypeEntity.getCode()); - List invBusUserEntityList=invBusUserService.filterInvBusUser(filterInvBusUserRequest); - if(invBusUserEntityList.size()>0){ - return ResultVOUtils.error(999,"有用户关联该单据请先移除再进行删除！"); + List invBusUserEntityList = invBusUserService.filterInvBusUser(filterInvBusUserRequest); + if (invBusUserEntityList.size() > 0) { + return ResultVOUtils.error(999, "有用户关联该单据请先移除再进行删除！"); } InvSubWarehouseEntity invSubWarehouseEntity = diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvWarehouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvWarehouseController.java index c6da9401..7de149e6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvWarehouseController.java @@ -12,7 +12,6 @@ import com.glxp.api.admin.constant.BasicProcessStatus; import com.glxp.api.admin.entity.auth.AuthAdmin; import com.glxp.api.admin.entity.basic.BasicExportStatusEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity; import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; @@ -29,9 +28,7 @@ import com.glxp.api.admin.res.inventory.InvWarehouseResponse; import com.glxp.api.admin.res.inventory.InvWarehouseThirdSysResponse; import com.glxp.api.admin.service.auth.CustomerService; import com.glxp.api.admin.service.basic.BasicExportService; -import com.glxp.api.admin.service.basic.BussinessTypeService; import com.glxp.api.admin.service.info.SystemParamConfigService; -import com.glxp.api.admin.service.inout.WarehouseBussinessTypeService; import com.glxp.api.admin.service.inventory.InvProductDetailService; import com.glxp.api.admin.service.inventory.InvSubWarehouseService; import com.glxp.api.admin.service.inventory.InvWarehouseService; @@ -229,8 +226,6 @@ public class InvWarehouseController { } } - - if (invWarehouseEntity.getPid() == null || invWarehouseEntity.getPid() == 0) {//仓库 invWarehouseEntity.setPid(0); // 默认设置 FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/monitor/SysOperlogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/monitor/SysOperlogController.java index d44e3eb3..fa107d3d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/monitor/SysOperlogController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/monitor/SysOperlogController.java @@ -32,7 +32,7 @@ public class SysOperlogController extends BaseController { /** * 获取操作日志记录列表 */ - @Log(title = "操作日志", businessType = BusinessType.OTHER) +// @Log(title = "操作日志", businessType = BusinessType.OTHER) @SaCheckPermission("monitor:operlog:list") @GetMapping("/list") public BaseResponse list(SysOperLogRequest sysOperLogRequest) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptHisStatusDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptHisStatusDao.java new file mode 100644 index 00000000..b852a3f3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptHisStatusDao.java @@ -0,0 +1,23 @@ +package com.glxp.api.admin.dao.auth; + +import com.glxp.api.admin.entity.auth.DeptHisStatusEntity; +import com.glxp.api.admin.req.auth.SysRoleMenuRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface DeptHisStatusDao { + + + List selectDeptHisStatus(SysRoleMenuRequest sysRoleMenu); + + int deleteById(Integer id); + + + int deleteByList(@Param("ids") List ids); + + int insertBatch(List list); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysHisStatusDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysHisStatusDao.java new file mode 100644 index 00000000..bca3cec4 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysHisStatusDao.java @@ -0,0 +1,22 @@ +package com.glxp.api.admin.dao.auth; + +import com.glxp.api.admin.entity.auth.SysHisStatusEntity; +import com.glxp.api.admin.req.auth.FilterSysHisStatusRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface SysHisStatusDao { + + List selectList(FilterSysHisStatusRequest filterSysHisStatusRequest); + + boolean insert(SysHisStatusEntity sysHisStatusEntity); + + boolean deleteById(Integer id); + + boolean update(SysHisStatusEntity sysHisStatusEntity); + + List selectListByDeptId(@Param("deptId") Integer deptId); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysRoleMenuMapper.java b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysRoleMenuMapper.java index 7f73d8e7..6b85ba8b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysRoleMenuMapper.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/SysRoleMenuMapper.java @@ -13,10 +13,8 @@ public interface SysRoleMenuMapper { List selectRoleMenuList(SysRoleMenuRequest sysRoleMenu); - int deleteById(Long id); - int deleteByList(@Param("ids") List ids); int insertBatch(List list); diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/DeptEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/auth/DeptEntity.java index f9d772ac..e27d53d0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/DeptEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/auth/DeptEntity.java @@ -1,16 +1,22 @@ package com.glxp.api.admin.entity.auth; +import com.glxp.api.admin.entity.BaseEntity; import lombok.Data; +import org.apache.poi.ss.formula.functions.T; +import java.util.ArrayList; import java.util.Date; +import java.util.List; @Data -public class DeptEntity { +public class DeptEntity extends BaseEntity { private String code; private Integer id; private String name; - private String parentId; + private Integer parentId; private String remark; private Integer flag; private Date updateTime; + private List children = new ArrayList<>(); + List statusIds; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/DeptHisStatusEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/auth/DeptHisStatusEntity.java new file mode 100644 index 00000000..abe56fd7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/auth/DeptHisStatusEntity.java @@ -0,0 +1,11 @@ +package com.glxp.api.admin.entity.auth; + +import lombok.Data; + +@Data +public class DeptHisStatusEntity { + + private Integer deptId; + private Integer statusId; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/SysHisStatusEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/auth/SysHisStatusEntity.java new file mode 100644 index 00000000..e5abcd65 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/auth/SysHisStatusEntity.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.entity.auth; + +import lombok.Data; + +import java.util.Date; + +@Data +public class SysHisStatusEntity { + + private Integer id; + private String type; + private String typeName; + private Integer parentId; + private Integer status; + private String remark; + private Date updateTime; + private String parentName; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/DeptHisStatusRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/auth/DeptHisStatusRequest.java new file mode 100644 index 00000000..9bb47a30 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/auth/DeptHisStatusRequest.java @@ -0,0 +1,12 @@ +package com.glxp.api.admin.req.auth; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class DeptHisStatusRequest extends ListPageRequest { + + private Integer deptId; + private Integer statusId; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/FilterDeptRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/auth/FilterDeptRequest.java index f3210bd7..5ffb4a14 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/FilterDeptRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/auth/FilterDeptRequest.java @@ -9,6 +9,7 @@ public class FilterDeptRequest extends ListPageRequest { private String name; private Integer flag; private String lastUpdateTime; - private String parentId; + private Integer parentId; + private Integer id; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/FilterSysHisStatusRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/auth/FilterSysHisStatusRequest.java new file mode 100644 index 00000000..e6c33a2a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/auth/FilterSysHisStatusRequest.java @@ -0,0 +1,18 @@ +package com.glxp.api.admin.req.auth; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterSysHisStatusRequest extends ListPageRequest { + + private Integer id; + private String type; + private String typeName; + private Integer parentId; + private Integer status; + + + private Integer deptId; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptService.java b/api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptService.java index 049dbcd7..21514b48 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptService.java @@ -9,6 +9,10 @@ import java.util.List; public interface DeptService { + List filterSubDepts(Integer id); + + DeptEntity selectById(Integer id); + List filterDepts(FilterDeptRequest filterDeptRequest); boolean insertDept(DeptEntity deptEntity); @@ -17,7 +21,6 @@ public interface DeptService { boolean deleteById(Integer id); - boolean deleteAll(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/ISysHisStatusService.java b/api-admin/src/main/java/com/glxp/api/admin/service/auth/ISysHisStatusService.java new file mode 100644 index 00000000..a4eabbbd --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/auth/ISysHisStatusService.java @@ -0,0 +1,23 @@ +package com.glxp.api.admin.service.auth; + +import cn.hutool.core.lang.tree.Tree; +import com.glxp.api.admin.entity.auth.SysHisStatusEntity; +import com.glxp.api.admin.req.auth.FilterSysHisStatusRequest; + +import java.util.List; + +public interface ISysHisStatusService { + + + List selectList(FilterSysHisStatusRequest filterSysHisStatusRequest); + + boolean insert(SysHisStatusEntity sysHisStatusEntity); + + boolean deleteById(Integer id); + + boolean update(SysHisStatusEntity sysHisStatusEntity); + + List selectListByDeptId(Integer deptId); + + List> buildStatusTreeSelect(List sysHisStatusEntities); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptServiceImpl.java index d21690a9..ee886a54 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptServiceImpl.java @@ -1,19 +1,43 @@ package com.glxp.api.admin.service.auth.impl; +import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; import com.glxp.api.admin.dao.auth.DeptDao; +import com.glxp.api.admin.dao.auth.DeptHisStatusDao; import com.glxp.api.admin.entity.auth.DeptEntity; +import com.glxp.api.admin.entity.auth.DeptHisStatusEntity; import com.glxp.api.admin.req.auth.FilterDeptRequest; import com.glxp.api.admin.service.auth.DeptService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; @Service public class DeptServiceImpl implements DeptService { @Resource DeptDao deptDao; + @Resource + DeptHisStatusDao deptHisStatusDao; + + @Override + public List filterSubDepts(Integer id) { + + FilterDeptRequest filterDeptRequest = new FilterDeptRequest(); + filterDeptRequest.setParentId(id); + return deptDao.filterDepts(filterDeptRequest); + } + + @Override + public DeptEntity selectById(Integer id) { + FilterDeptRequest filterDeptRequest = new FilterDeptRequest(); + filterDeptRequest.setId(id); + List deptEntityList = deptDao.filterDepts(filterDeptRequest); + if (CollUtil.isNotEmpty(deptEntityList)) + return deptEntityList.get(0); + return null; + } @Override public List filterDepts(FilterDeptRequest filterDeptRequest) { @@ -26,12 +50,32 @@ public class DeptServiceImpl implements DeptService { @Override public boolean insertDept(DeptEntity deptEntity) { - return deptDao.insertDept(deptEntity); + deptDao.insertDept(deptEntity); + insertDeptHisStatus(deptEntity); + return true; } @Override public boolean updateDept(DeptEntity deptEntity) { - return deptDao.updateDept(deptEntity); + + deptHisStatusDao.deleteById(deptEntity.getId()); + deptDao.updateDept(deptEntity); + insertDeptHisStatus(deptEntity); + return true; + } + + public void insertDeptHisStatus(DeptEntity deptEntity) { + List list = new ArrayList(); + for (Integer statusId : deptEntity.getStatusIds()) { + DeptHisStatusEntity deptHisStatusEntity = new DeptHisStatusEntity(); + deptHisStatusEntity.setDeptId(deptEntity.getId()); + deptHisStatusEntity.setStatusId(statusId); + list.add(deptHisStatusEntity); + } + if (CollUtil.isNotEmpty(list)) { + deptHisStatusDao.insertBatch(list); + } + } @Override diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/ISysHisStatusServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/ISysHisStatusServiceImpl.java new file mode 100644 index 00000000..5a881cc3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/ISysHisStatusServiceImpl.java @@ -0,0 +1,63 @@ +package com.glxp.api.admin.service.auth.impl; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.lang.tree.Tree; +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.auth.SysHisStatusDao; +import com.glxp.api.admin.entity.auth.SysHisStatusEntity; +import com.glxp.api.admin.req.auth.FilterSysHisStatusRequest; +import com.glxp.api.admin.service.auth.ISysHisStatusService; +import com.glxp.api.admin.util.TreeBuildUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class ISysHisStatusServiceImpl implements ISysHisStatusService { + + @Resource + SysHisStatusDao sysHisStatusDao; + + @Override + public List selectList(FilterSysHisStatusRequest filterSysHisStatusRequest) { + + if (filterSysHisStatusRequest.getPage() != null) { + int offset = (filterSysHisStatusRequest.getPage() - 1) * filterSysHisStatusRequest.getLimit(); + PageHelper.offsetPage(offset, filterSysHisStatusRequest.getLimit()); + } + return sysHisStatusDao.selectList(filterSysHisStatusRequest); + } + + @Override + public boolean insert(SysHisStatusEntity sysHisStatusEntity) { + return sysHisStatusDao.insert(sysHisStatusEntity); + } + + @Override + public boolean deleteById(Integer id) { + return sysHisStatusDao.deleteById(id); + } + + @Override + public boolean update(SysHisStatusEntity sysHisStatusEntity) { + return sysHisStatusDao.update(sysHisStatusEntity); + } + + @Override + public List selectListByDeptId(Integer roleId) { + return sysHisStatusDao.selectListByDeptId(roleId); + } + + @Override + public List> buildStatusTreeSelect(List sysHisStatusEntities) { + if (CollUtil.isEmpty(sysHisStatusEntities)) { + return CollUtil.newArrayList(); + } + return TreeBuildUtils.build(sysHisStatusEntities, (menu, tree) -> + tree.setId(menu.getId()) + .setParentId(menu.getParentId()) + .setName(menu.getTypeName()) + .setWeight(menu.getId())); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/JwtUtils.java b/api-admin/src/main/java/com/glxp/api/admin/util/JwtUtils.java index 7d6aa624..8dc31e91 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/JwtUtils.java +++ b/api-admin/src/main/java/com/glxp/api/admin/util/JwtUtils.java @@ -86,7 +86,7 @@ public class JwtUtils { .setSigningKey(generateKey()) //此处的key要与之前创建的key一致 .parseClaimsJws(jwt) .getBody(); - }catch (ExpiredJwtException e){ + }catch (Exception e){ return null; } } diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml index 12a74308..38db043e 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml @@ -8,7 +8,10 @@ SELECT * FROM auth_dept - + + and id = #{id} + + and flag = #{flag} diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/DeptHisStatusDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/DeptHisStatusDao.xml new file mode 100644 index 00000000..e73d9e5e --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/auth/DeptHisStatusDao.xml @@ -0,0 +1,55 @@ + + + + + + + + + delete + from auth_dept_status + where deptId = #{id} + + + + delete + from auth_dept_status + where deptId in + + #{item} + + + + + + + insert INTO auth_dept_status + ( + deptId,statusId + ) + values + + ( + #{item.deptId}, + #{item.statusId} + ) + + + + diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/SysHisStatusDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/SysHisStatusDao.xml new file mode 100644 index 00000000..08d57f3e --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/auth/SysHisStatusDao.xml @@ -0,0 +1,68 @@ + + + + + + + + + + INSERT INTO sys_his_status(`type`, `typeName`, `parentId`, status, remark, updateTime) + values (#{type}, + #{typeName}, + #{parentId}, #{status}, #{remark}, #{updateTime}) + + + + UPDATE sys_his_status + + `type`=#{type}, + `typeName`=#{typeName}, + parentId=#{parentId}, + status=#{status}, + updateTime=#{updateTime}, + remark=#{remark}, + + WHERE id=#{id} + + + + delete + from sys_his_status + where id = #{id} + + + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml index c0791826..e6afdcd8 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml @@ -90,14 +90,12 @@ @@ -30,7 +34,9 @@