From 00dfcad52b511013017a6235217cc37e7ce38b91 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Tue, 4 Mar 2025 11:35:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20controller=20=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/auth/AuthAdminController.java | 12 +-- .../controller/auth/AuthUserController.java | 12 ++- .../api/controller/auth/DeptController.java | 79 ++++++++----------- .../controller/auth/DeptUserController.java | 5 +- .../controller/auth/InvBusUserController.java | 18 ++--- .../auth/InvWarehouseController.java | 23 ++---- .../api/controller/auth/LoginController.java | 10 +-- .../controller/auth/RegisterController.java | 17 +--- .../auth/SysCustomConfigController.java | 2 - .../auth/SysDictDataController.java | 4 - .../auth/SysDictTypeController.java | 3 - .../controller/auth/SysMenuController.java | 13 +-- .../controller/auth/SysRoleController.java | 10 --- .../controller/auth/SysUserController.java | 11 +-- .../basic/BasicBusTypePreController.java | 2 - .../basic/BasicBussinessTypeController.java | 22 +----- .../auth/impl/SysDictTypeServiceImpl.java | 2 +- 17 files changed, 66 insertions(+), 179 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/AuthAdminController.java b/src/main/java/com/glxp/api/controller/auth/AuthAdminController.java index 7f62d166..06495603 100644 --- a/src/main/java/com/glxp/api/controller/auth/AuthAdminController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthAdminController.java @@ -35,11 +35,7 @@ public class AuthAdminController { PageInfo pageInfo = new PageInfo<>(authRoleList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); - List authAdminRoleResponses = authRoleList.stream().map(e -> { - AuthAdminRoleResponse authAdminRoleResponse = new AuthAdminRoleResponse(); - BeanUtil.copyProperties(e, authAdminRoleResponse); - return authAdminRoleResponse; - }).collect(Collectors.toList()); + List authAdminRoleResponses = BeanUtil.copyToList(authRoleList, AuthAdminRoleResponse.class); pageSimpleResponse.setList(authAdminRoleResponses); return ResultVOUtils.success(pageSimpleResponse); @@ -55,11 +51,7 @@ public class AuthAdminController { PageInfo pageInfo = new PageInfo<>(authRoleList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); - List authAdminRoleResponses = authRoleList.stream().map(e -> { - AuthAdminRoleResponse authAdminRoleResponse = new AuthAdminRoleResponse(); - BeanUtil.copyProperties(e, authAdminRoleResponse); - return authAdminRoleResponse; - }).collect(Collectors.toList()); + List authAdminRoleResponses = BeanUtil.copyToList(authRoleList, AuthAdminRoleResponse.class); pageSimpleResponse.setList(authAdminRoleResponses); return ResultVOUtils.success(pageSimpleResponse); diff --git a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java index f50f640e..5198f11d 100644 --- a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java @@ -29,8 +29,7 @@ import java.util.*; */ @RestController public class AuthUserController extends BaseController { - @Resource - CustomerService customerService; + @Resource private AuthAdminService authAdminService; @Resource @@ -130,8 +129,7 @@ public class AuthUserController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/admin/auth/admin/updateUser") public BaseResponse updateUser(@RequestBody UpdateUserRequset updateUserRequset) { - AuthAdmin authAdmin = customerService.getUserBean(); - System.out.println(updateUserRequset.toString()); + AuthAdmin authAdmin = getUser(); if (StrUtil.isEmpty(updateUserRequset.getPassWord())) { updateUserRequset.setPassWord(authAdmin.getPassWord()); } @@ -164,7 +162,7 @@ public class AuthUserController extends BaseController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - AuthAdmin authAdmin = customerService.getUserBean(); + AuthAdmin authAdmin = getUser(); if (StringUtils.isBlank(updateUserRequset.getNewPassword())) { return ResultVOUtils.error(500, "请输入新密码！"); } @@ -185,13 +183,13 @@ public class AuthUserController extends BaseController { return ResultVOUtils.error(500, "新密码与确认密码不相同！请重新修改！"); } + } - } @AuthRuleAnnotation("") @GetMapping("/admin/auth/admin/selectUser") public BaseResponse selectUser() { - AuthAdmin authAdmin = customerService.getUserBean(); + AuthAdmin authAdmin = getUser(); return ResultVOUtils.success(authAdmin); } } diff --git a/src/main/java/com/glxp/api/controller/auth/DeptController.java b/src/main/java/com/glxp/api/controller/auth/DeptController.java index 3abe970a..c863ebb5 100644 --- a/src/main/java/com/glxp/api/controller/auth/DeptController.java +++ b/src/main/java/com/glxp/api/controller/auth/DeptController.java @@ -12,7 +12,6 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.controller.BaseController; import com.glxp.api.dto.DictDto; -import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.entity.auth.DeptUserEntity; import com.glxp.api.entity.auth.InvWarehouseEntity; @@ -21,7 +20,6 @@ import com.glxp.api.req.auth.FilterDeptUserReqeust; import com.glxp.api.req.auth.FilterInvWarehouseRequest; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.DeptService; import com.glxp.api.service.auth.DeptUserService; import com.glxp.api.service.auth.InvWarehouseService; @@ -40,8 +38,6 @@ public class DeptController extends BaseController { @Resource DeptService deptService; @Resource - CustomerService customerService; - @Resource SystemParamConfigService systemParamConfigService; @Resource @@ -87,7 +83,6 @@ public class DeptController extends BaseController { public BaseResponse filterNext(FilterInvWarehouseRequest filterInvWarehouseRequest) { filterInvWarehouseRequest.setPid(0); filterInvWarehouseRequest.setStatus(1); - List invWarehouseEntities = deptService.filterGroupInvWarehouse(filterInvWarehouseRequest); return ResultVOUtils.success(invWarehouseEntities); } @@ -98,15 +93,11 @@ public class DeptController extends BaseController { public BaseResponse filterByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) { if (isHosUser()) { - AuthAdmin authAdmin = customerService.getUserBean(); - filterInvWarehouseRequest.setUserId(authAdmin.getId()); - } else { - + filterInvWarehouseRequest.setUserId(getUserId()); } filterInvWarehouseRequest.setPid(0); filterInvWarehouseRequest.setStatus(1); - List mInvWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest); return ResultVOUtils.success(mInvWarehouseEntities); } @@ -117,15 +108,11 @@ public class DeptController extends BaseController { public BaseResponse filterByUserOptimize(FilterInvWarehouseRequest filterInvWarehouseRequest) { if (isHosUser()) { - AuthAdmin authAdmin = customerService.getUserBean(); - filterInvWarehouseRequest.setUserId(authAdmin.getId()); - } else { - + filterInvWarehouseRequest.setUserId(getUserId()); } filterInvWarehouseRequest.setPid(0); filterInvWarehouseRequest.setStatus(1); - List mInvWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest); List reList = mInvWarehouseEntities.stream().map(s-> { DictDto dictDto = new DictDto(s.getCode(),s.getName()); @@ -142,25 +129,21 @@ public class DeptController extends BaseController { filterInvWarehouseRequest.setStatus(1); List invWarehouseEntities = deptService.filterInvWarehouse(filterInvWarehouseRequest); SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv"); - List temps = new ArrayList<>(); + if (systemParamConfigEntity.getParamValue().equals("1")) { - for (DeptEntity deptEntity : invWarehouseEntities) { - if (!deptEntity.getCode().equals(filterInvWarehouseRequest.getLocInvCode())) { - temps.add(deptEntity); - } - } + List temps = invWarehouseEntities.stream() + .filter(e -> !e.getCode().equals(filterInvWarehouseRequest.getLocInvCode())) + .collect(Collectors.toList()); return ResultVOUtils.success(temps); } else { DeptEntity curEntity = deptService.selectByCode(filterInvWarehouseRequest.getLocInvCode()); - for (DeptEntity deptEntity : invWarehouseEntities) { - if (!StrUtil.isEmpty(curEntity.getPcode()) && curEntity.getPcode().equals(deptEntity.getCode())) { - temps.add(deptEntity); - } else if (!StrUtil.isEmpty(deptEntity.getPcode()) && deptEntity.getPcode().equals(curEntity.getCode())) { - temps.add(deptEntity); - } - } + List temps = invWarehouseEntities.stream() + .filter(e -> !StrUtil.isEmpty(curEntity.getPcode()) && curEntity.getPcode().equals(e.getCode()) + || !StrUtil.isEmpty(e.getPcode()) && e.getPcode().equals(curEntity.getCode())) + .collect(Collectors.toList()); return ResultVOUtils.success(temps); } + } @@ -169,13 +152,13 @@ public class DeptController extends BaseController { public BaseResponse filterUplLocInv(FilterInvWarehouseRequest filterInvWarehouseRequest) { filterInvWarehouseRequest.setPid(0); filterInvWarehouseRequest.setStatus(1); - List invWarehouseEntities; - AuthAdmin authAdmin = customerService.getUserBean(); - filterInvWarehouseRequest.setUserId(authAdmin.getId()); + filterInvWarehouseRequest.setUserId(getUserId()); filterInvWarehouseRequest.setPid(0); List mInvWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest); + Map invWarehouseEntityMap = new HashMap<>(); - if (mInvWarehouseEntities.size() > 0) { + List invWarehouseEntities = new ArrayList<>(); + if (CollUtil.isNotEmpty(mInvWarehouseEntities)) { for (DeptEntity deptEntity : mInvWarehouseEntities) { invWarehouseEntityMap.put(deptEntity.getCode(), deptEntity); if (!"0".equals(deptEntity.getPcode())) { @@ -183,11 +166,12 @@ public class DeptController extends BaseController { invWarehouseEntityMap.put(temp.getCode(), temp); } } + + for (DeptEntity deptEntity : invWarehouseEntityMap.values()) { + invWarehouseEntities.add(deptEntity); + } } - invWarehouseEntities = new ArrayList<>(); - for (DeptEntity deptEntity : invWarehouseEntityMap.values()) { - invWarehouseEntities.add(deptEntity); - } + return ResultVOUtils.success(invWarehouseEntities); } @@ -195,17 +179,16 @@ public class DeptController extends BaseController { @AuthRuleAnnotation("") @GetMapping("spms/inv/warehouse/filterAllByUser") public BaseResponse filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) { - List invWarehouseEntities; - AuthAdmin authAdmin = customerService.getUserBean(); - if (authAdmin.getCustomerId().equals("110")) { - filterInvWarehouseRequest.setCustomerId("110"); - filterInvWarehouseRequest.setUserId(authAdmin.getId()); + if (isHosUser()) { + filterInvWarehouseRequest.setCustomerId(getCustomerId()); + filterInvWarehouseRequest.setUserId(getUserId()); } else { filterInvWarehouseRequest.setUserId(null); filterInvWarehouseRequest.setSpUse(true); } filterInvWarehouseRequest.setPid(0); - invWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest); + + List invWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest); return ResultVOUtils.success(invWarehouseEntities); } @@ -222,7 +205,7 @@ public class DeptController extends BaseController { } List deptEntityList = deptService.selectByNameList(deptEntity.getName()); - if (deptEntityList != null && deptEntityList.size() > 0) { + if (CollUtil.isNotEmpty(deptEntityList)) { for (DeptEntity obj : deptEntityList) { if (obj.getName().equals(deptEntity.getName()) && !obj.getId().equals(deptEntity.getId())) { return ResultVOUtils.error(500, "已存在相同名称的仓库，无法继续添加！"); @@ -292,7 +275,7 @@ public class DeptController extends BaseController { return ResultVOUtils.error(999, msg); } //判断供应商状态 - if (deptEntity.getSpUse() == false) { + if (deptEntity.getSpUse()) { FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust(); filterDeptUserReqeust.setDeptId(deptEntity.getId().longValue()); List deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust); @@ -302,7 +285,7 @@ public class DeptController extends BaseController { } List deptEntityList = deptService.selectByNameList(deptEntity.getName()); - if (deptEntityList != null && deptEntityList.size() > 0) { + if (CollUtil.isNotEmpty(deptEntityList)) { for (DeptEntity obj : deptEntityList) { if (obj.getName().equals(deptEntity.getName()) && !obj.getId().equals(deptEntity.getId())) { return ResultVOUtils.error(500, "已存在相同名称的仓库，无法继续添加！"); @@ -332,7 +315,7 @@ public class DeptController extends BaseController { } DeptEntity deptEntity = deptService.selectById(deleteRequest.getId()); - if (deptEntity.getLevel() != null && deptEntity.getLevel() == 1) { + if (deptEntity != null && deptEntity.getLevel() == 1) { return ResultVOUtils.error(500, "删除失败，一级部门不允许删除！"); } @@ -341,13 +324,13 @@ public class DeptController extends BaseController { return ResultVOUtils.error(500, "删除失败，请先移除该部门关联仓库信息！"); } FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust(); - filterDeptUserReqeust.setDeptId(deptEntity.getId().longValue()); + filterDeptUserReqeust.setDeptId(deptEntity.getId()); List deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust); if (CollUtil.isNotEmpty(deptUserEntities)) { return ResultVOUtils.error(500, "删除失败，请先移除该部门关联用户信息！"); } List deptEntities = deptService.selectByPcode(deptEntity.getCode()); - if (deptEntities.size() > 0) { + if (CollUtil.isNotEmpty(deptEntities)) { return ResultVOUtils.error(500, "删除失败，请先移除该部门下的子部门！"); } diff --git a/src/main/java/com/glxp/api/controller/auth/DeptUserController.java b/src/main/java/com/glxp/api/controller/auth/DeptUserController.java index 2179603a..d6cfef3c 100644 --- a/src/main/java/com/glxp/api/controller/auth/DeptUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/DeptUserController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.auth; +import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; @@ -65,12 +66,12 @@ public class DeptUserController { public BaseResponse delete(@RequestBody DeptUserEntity deptUserEntity) { // 判断此用户是否创建单据 List ioOrderEntities = ioOrderService.selectList(deptUserEntity.getUserId()); - if (ioOrderEntities != null && ioOrderEntities.size() != 0) { + if (CollUtil.isNotEmpty(ioOrderEntities)) { return ResultVOUtils.error(500, "该用户已创建单据,不能移除!"); } //判断此用户是否与仓库有关联 List listWareHouse = warehouseUserService.selectCodeByUser(deptUserEntity.getUserId() + ""); - if (listWareHouse != null && listWareHouse.size() != 0) { + if (CollUtil.isNotEmpty(listWareHouse)) { return ResultVOUtils.error(500, "该用户已绑定仓库,不能移除!"); } diff --git a/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java b/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java index e76ea63d..c1a8ac0d 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java @@ -69,11 +69,7 @@ public class InvBusUserController { @GetMapping("spms/bus/user/unselect/filter") public BaseResponse filterUnSelectInvUser(FilterInvBusUserRequest filterInvBusUserRequest) { List responses = invBusUserService.filterInvBusUser(filterInvBusUserRequest); - List selectedCodes = new ArrayList<>(); - responses.forEach(invBusUserEntity -> - { - selectedCodes.add(invBusUserEntity.getScAction()); - }); + List selectedCodes = responses.stream().map(InvBusUserEntity::getScAction).collect(Collectors.toList()); filterInvBusUserRequest.setSelectedCodes(selectedCodes); List warehouseBussinessTypeEntityList = invBusUserService.filterUnSelect(filterInvBusUserRequest); @@ -112,13 +108,14 @@ public class InvBusUserController { @Log(title = "用户管理", businessType = BusinessType.UPDATE) public BaseResponse updateRes(@RequestBody UpdateUserRelBusRequset relBusRequset) { boolean b = invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode()); - if (CollUtil.isNotEmpty(relBusRequset.getInvBusUserEntities())) { - relBusRequset.getInvBusUserEntities().forEach(warehouseBussinessTypeEntity -> + List invBusUserEntities = relBusRequset.getInvBusUserEntities(); + if (CollUtil.isNotEmpty(invBusUserEntities)) { + invBusUserEntities.forEach(item -> { InvBusUserEntity invBusUserEntity = new InvBusUserEntity(); invBusUserEntity.setUserId(relBusRequset.getUserId()); invBusUserEntity.setSubInvCode(relBusRequset.getSubInvCode()); - invBusUserEntity.setScAction(warehouseBussinessTypeEntity.getAction()); + invBusUserEntity.setScAction(item.getAction()); invBusUserService.insertInvBusUser(invBusUserEntity); }); } @@ -133,8 +130,9 @@ public class InvBusUserController { @Log(title = "用户管理", businessType = BusinessType.INSERT) public BaseResponse postRes(@RequestBody UpdateUserRelBusRequset relBusRequset) { invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode()); - if (CollUtil.isNotEmpty(relBusRequset.getSelectActions())) { - relBusRequset.getSelectActions().forEach(action -> + List selectActions = relBusRequset.getSelectActions(); + if (CollUtil.isNotEmpty(selectActions)) { + selectActions.forEach(action -> { InvBusUserEntity invBusUserEntity = new InvBusUserEntity(); invBusUserEntity.setUserId(relBusRequset.getUserId()); diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 215d00d3..c8eabf87 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -97,9 +97,9 @@ public class InvWarehouseController extends BaseController { @AuthRuleAnnotation("") @GetMapping("spms/inv/warehouse/findByDeptUser") public BaseResponse findByDept(FilterInvWarehouseRequest filterInvWarehouseRequest) { - AuthAdmin authAdmin = getUser(); - if (authAdmin.getCustomerId().equals("110")) { - filterInvWarehouseRequest.setUserId(authAdmin.getId()); + + if (isHosUser()) { + filterInvWarehouseRequest.setUserId(getUserId()); } else { if (IntUtil.value(filterInvWarehouseRequest.getType()) == 1) { filterInvWarehouseRequest.setSpUse(true); @@ -209,11 +209,6 @@ public class InvWarehouseController extends BaseController { @AuthRuleAnnotation("") @GetMapping("spms/sub/inv/warehouse/filterSub") public BaseResponse filterSub(FilterInvWarehouseRequest filterInvWarehouseRequest) { - -// if (StrUtil.isEmpty(filterInvWarehouseRequest.getPcode()) || filterInvWarehouseRequest.getUserId() == null) { -// return ResultVOUtils.error(500, "用户或仓库不能未空！"); -// } - AuthAdmin authAdmin = customerService.getUserBean(); InvWarehouseEntity invWarehouseEntity = invWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); filterInvWarehouseRequest.setSubordinateCode(invWarehouseEntity.getParentId()); filterInvWarehouseRequest.setCode(null); @@ -247,7 +242,6 @@ public class InvWarehouseController extends BaseController { invWarehouseEntity.setCode(Integer.parseInt(codeEntity.getCode()) + 1 + ""); } - DeptEntity updateEntity = new DeptEntity(); updateEntity.setId(pEntity.getId()); updateEntity.setUpdateTime(new Date()); @@ -282,7 +276,6 @@ public class InvWarehouseController extends BaseController { } } - // 先判断是否有相同名字的仓库 boolean checkResult = invWarehouseService.updateCheckExit(invWarehouseEntity); if (checkResult) { @@ -328,9 +321,6 @@ public class InvWarehouseController extends BaseController { } InvWarehouseEntity invWarehouseEntity = invWarehouseService.findById(deleteRequest.getId()); - - //todo 代码未迁移完，记得回来修改 - Integer userCount = warehouseUserService.countUserBySubInvCode(invWarehouseEntity.getCode()); if (userCount > 0) { return ResultVOUtils.error(500, "请先移除该仓库关联用户！"); @@ -348,7 +338,6 @@ public class InvWarehouseController extends BaseController { return ResultVOUtils.error(500, "此仓库下存在仓库无法删除！"); } - //判断此分库下是否有货位 List spaceList = invSpaceService.findBySubWarehouseCode(invWarehouseEntity.getCode()); if (CollUtil.isNotEmpty(spaceList)) { @@ -373,8 +362,7 @@ public class InvWarehouseController extends BaseController { FilterBasicThirdSysRequest sysRequest = new FilterBasicThirdSysRequest(); sysRequest.setEnabled(true); List list = invWarehouseService.getThirdSysDetail(request.getId()); - PageInfo pageInfo; - pageInfo = new PageInfo<>(list); + PageInfo pageInfo = new PageInfo<>(list); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(list); @@ -573,8 +561,7 @@ public class InvWarehouseController extends BaseController { return ResultVOUtils.error(500, "已存在该用户关联单据类型，无法删除！"); } - InvWarehouseEntity invSubWarehouseEntity = - invWarehouseService.findByInvSubByCode(warehouseUserEntity.getCode()); + InvWarehouseEntity invSubWarehouseEntity = invWarehouseService.findByInvSubByCode(warehouseUserEntity.getCode()); deptService.updateTime(invSubWarehouseEntity.getParentId(), new Date()); warehouseUserService.deleteWarehouseUser(id); return ResultVOUtils.success(); diff --git a/src/main/java/com/glxp/api/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java index 4b12d636..c8c0cb59 100644 --- a/src/main/java/com/glxp/api/controller/auth/LoginController.java +++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java @@ -340,13 +340,11 @@ public class LoginController extends BaseController { @PostMapping(value = "/verify") public BaseResponse verify(@RequestBody Map params, HttpServletRequest request) { - AuthAdmin authAdmin; - authAdmin = authAdminService.findByUserName(params.get("username").toString()); + AuthAdmin authAdmin = authAdminService.findByUserName(params.get("username").toString()); if (authAdmin == null) { throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); } - if (!PasswordUtils.authAdminPwd(params.get("password").toString()).equals(authAdmin.getPassWord())) { throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); } @@ -386,14 +384,12 @@ public class LoginController extends BaseController { @GetMapping("/spms/sub/inv/warehouse/getSubInvForUdims") public BaseResponse getSubInvForUdims(String invCode) { - List data = invWarehouseDao.getByWarePId(invCode); return ResultVOUtils.success(data); } @GetMapping("/udiwms/bussinessType/udimsFilter") public BaseResponse udimsFilter(String invSubCode) { - List data = warehouseBussinessTypeService.filterActionList(invSubCode); return ResultVOUtils.success(data); } @@ -430,13 +426,11 @@ public class LoginController extends BaseController { @PostMapping(value = "/udims/verify") public BaseResponse udimsVerify(@RequestBody Map params, HttpServletRequest request) { - AuthAdmin authAdmin; - authAdmin = authAdminService.findByUserName(params.get("username").toString()); + AuthAdmin authAdmin = authAdminService.findByUserName(params.get("username").toString()); if (authAdmin == null) { throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); } - if (!PasswordUtils.authAdminPwd(params.get("password").toString()).equals(authAdmin.getPassWord())) { throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); } diff --git a/src/main/java/com/glxp/api/controller/auth/RegisterController.java b/src/main/java/com/glxp/api/controller/auth/RegisterController.java index 420f3b14..a748df2c 100644 --- a/src/main/java/com/glxp/api/controller/auth/RegisterController.java +++ b/src/main/java/com/glxp/api/controller/auth/RegisterController.java @@ -67,7 +67,6 @@ public class RegisterController { private CustomerInfoService customerInfoService; @Resource private CustomerContactService customerContactService; - @Resource private CompanyService companyService; @Resource @@ -81,10 +80,8 @@ public class RegisterController { @AuthRuleAnnotation("") @GetMapping("salewarehouse/register/list") public BaseResponse filterList(UserResisterFilterRequest userResisterFilterRequest) { - List userRegisterEntities = userRegisterService.filterUserRegisters(userResisterFilterRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(userRegisterEntities); + PageInfo pageInfo = new PageInfo<>(userRegisterEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(userRegisterEntities); @@ -293,7 +290,7 @@ public class RegisterController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - log.info(httpSession.getId()); + JSONObject userCode = JSONObject.parseObject(String.valueOf(redisUtil.get(Constant.CAPTCHAS + resetPasswdRequest.getMobile()))); if (userCode == null) { return ResultVOUtils.error(500, "验证码已失效，请重新获取"); @@ -402,17 +399,10 @@ public class RegisterController { authAdmin.setUserFlag(1); authAdmin.setLastModifyTime(new Date()); authAdminDao.insert(authAdmin); -// authAdminService.insertAuthAdmin(authAdmin); authAdmin = authAdminService.findByUserName(authAdmin.getUserName()); - //分配角色 -// List roles = new ArrayList<>(); -// roles.add(Long.valueOf(13));//默认角色 - - //生产客户信息表 CustomerInfoEntity customerInfoEntity = new CustomerInfoEntity(); -// customerInfoEntity.setCustomerId(Long.valueOf(String.valueOf(authAdmin.getCustomerId()))); customerInfoEntity.setCustomerId(customerId); customerInfoEntity.setArea(userRegisterEntity.getArea()); customerInfoEntity.setDetailAddr(userRegisterEntity.getDetailAddr()); @@ -481,10 +471,9 @@ public class RegisterController { } if (i <= 0) { customerInfoService.insertCustomerInfo(customerInfoEntity); - companyService.insertCompany(companyEntity);//TODO !!!!!!!!!!! + companyService.insertCompany(companyEntity); } - if (!b) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); } diff --git a/src/main/java/com/glxp/api/controller/auth/SysCustomConfigController.java b/src/main/java/com/glxp/api/controller/auth/SysCustomConfigController.java index 8552aa72..a54ff9e4 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysCustomConfigController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysCustomConfigController.java @@ -104,8 +104,6 @@ public class SysCustomConfigController extends BaseController { } return ResultVOUtils.success("修改成功！"); - - } @AuthRuleAnnotation("") diff --git a/src/main/java/com/glxp/api/controller/auth/SysDictDataController.java b/src/main/java/com/glxp/api/controller/auth/SysDictDataController.java index 5ec69838..33f4bb2e 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysDictDataController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysDictDataController.java @@ -35,7 +35,6 @@ public class SysDictDataController extends BaseController { */ @GetMapping("/list") public BaseResponse list(SysDictDataRequest sysDictDataRequest) { - return ResultVOUtils.success(dictDataService.selectDictDataList(sysDictDataRequest)); } @@ -58,9 +57,6 @@ public class SysDictDataController extends BaseController { @GetMapping(value = "/type/{dictType}") public BaseResponse dictType(@PathVariable String dictType) { List data = dictTypeService.selectDictDataByType(dictType); - if (ObjectUtil.isNull(data)) { - data = new ArrayList<>(); - } return ResultVOUtils.success(data); } diff --git a/src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java b/src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java index 874e3745..61c2be68 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java @@ -71,9 +71,6 @@ public class SysDictTypeController extends BaseController { @PutMapping @Log(title = "用户管理", businessType = BusinessType.UPDATE) public BaseResponse edit(@Validated @RequestBody SysDictType dict) { -// if (Constant.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { -// return R.fail("修改字典'" + dict.getDictName() + "'失败，字典类型已存在"); -// } dictTypeService.updateDictType(dict); return ResultVOUtils.success("修改成功！"); } diff --git a/src/main/java/com/glxp/api/controller/auth/SysMenuController.java b/src/main/java/com/glxp/api/controller/auth/SysMenuController.java index 912e793c..55b04e50 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysMenuController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysMenuController.java @@ -33,17 +33,12 @@ public class SysMenuController extends BaseController { @Resource ISysMenuService menuService; - @Resource - CustomerService customerService; - - /** * 获取菜单列表 */ @GetMapping("/list") public BaseResponse list(SysMenu menu) { - AuthAdmin authAdmin = customerService.getUserBean(); - List menus = menuService.selectMenuList(menu, authAdmin.getId()); + List menus = menuService.selectMenuList(menu, getUserId()); return ResultVOUtils.success(menus); } @@ -62,8 +57,7 @@ public class SysMenuController extends BaseController { */ @GetMapping("/treeselect") public BaseResponse treeselect(SysMenu menu) { - AuthAdmin authAdmin = customerService.getUserBean(); - List menus = menuService.selectMenuList(menu, authAdmin.getId()); + List menus = menuService.selectMenuList(menu, getUserId()); List> data = menuService.buildMenuTreeSelect(menus); return ResultVOUtils.success(data); } @@ -75,8 +69,7 @@ public class SysMenuController extends BaseController { */ @GetMapping(value = "/roleMenuTreeselect/{roleId}") public BaseResponse roleMenuTreeselect(@PathVariable("roleId") Long roleId) { - AuthAdmin authAdmin = customerService.getUserBean(); - List menus = menuService.selectMenuList(authAdmin.getId()); + List menus = menuService.selectMenuList(getUserId()); Map ajax = new HashMap<>(); ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId)); ajax.put("menus", menuService.buildMenuTreeSelect(menus)); diff --git a/src/main/java/com/glxp/api/controller/auth/SysRoleController.java b/src/main/java/com/glxp/api/controller/auth/SysRoleController.java index 71d5af50..58a3f662 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysRoleController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysRoleController.java @@ -40,7 +40,6 @@ public class SysRoleController extends BaseController { */ @GetMapping("/list") public BaseResponse list(FilterRoleRequest filterRoleRequest) { - List sysRoles = roleService.selectPageRoleList(filterRoleRequest); PageInfo pageInfo = new PageInfo<>(sysRoles); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -120,8 +119,6 @@ public class SysRoleController extends BaseController { public BaseResponse dataScope(@RequestBody SysRole role) { roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); - - int i = roleService.authDataScope(role); return ResultVOUtils.success("修改成功！"); } @@ -159,9 +156,7 @@ public class SysRoleController extends BaseController { @SaCheckPermission("system:role:query") @GetMapping("/optionselect") public BaseResponse optionselect() { - return ResultVOUtils.success(roleService.selectRoleAll()); - } /** @@ -169,8 +164,6 @@ public class SysRoleController extends BaseController { */ @GetMapping("/authUser/allocatedList") public BaseResponse allocatedList(FilterAuthUserRequest filterAuthUserRequest) { - - List authAdminList = userService.selectAllocatedList(filterAuthUserRequest); PageInfo pageInfo = new PageInfo<>(authAdminList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -184,8 +177,6 @@ public class SysRoleController extends BaseController { */ @GetMapping("/authUser/unallocatedList") public BaseResponse unallocatedList(FilterAuthUserRequest filterAuthUserRequest) { - - List authAdminList = userService.selectUnallocatedList(filterAuthUserRequest); PageInfo pageInfo = new PageInfo<>(authAdminList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -214,7 +205,6 @@ public class SysRoleController extends BaseController { @PutMapping("/authUser/cancelAll") @Log(title = "用户管理", businessType = BusinessType.DELETE) public BaseResponse cancelAuthUserAll(Long roleId, Long[] userIds) { - int i = roleService.deleteAuthUsers(roleId, userIds); return ResultVOUtils.success("取消成功！"); } diff --git a/src/main/java/com/glxp/api/controller/auth/SysUserController.java b/src/main/java/com/glxp/api/controller/auth/SysUserController.java index 9cd20b2d..ea3dd8df 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysUserController.java @@ -60,9 +60,6 @@ public class SysUserController extends BaseController { @Resource private AuthAdminService authAdminService; - @Resource - private DeptService deptService; - @GetMapping("/list") public BaseResponse list(FilterAuthUserRequest filterAuthUserRequest, BindingResult bindingResult) { @@ -101,7 +98,6 @@ public class SysUserController extends BaseController { return authAdminResponse; }).collect(Collectors.toList()); - PageInfo authAdminPageInfo = new PageInfo<>(authAdminList); PageSimpleResponse authAdminPageSimpleResponse = new PageSimpleResponse<>(); authAdminPageSimpleResponse.setTotal(authAdminPageInfo.getTotal()); @@ -165,7 +161,6 @@ public class SysUserController extends BaseController { @PostMapping("/save") public BaseResponse save(@RequestBody @Valid AuthUserSaveRequest authUserSaveRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } @@ -294,16 +289,13 @@ public class SysUserController extends BaseController { userService.insertUserAuth(authAdmin.getId(), authUserSaveRequest.getRoles()); } - userService.updateAuthAdmin(authAdmin); - - //默认插入第一部门 ArrayList deptCodeList = new ArrayList<>(); FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust(); filterDeptUserReqeust.setUserId(authUserSaveRequest.getId()); List deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust); - if (deptUserEntities == null) { + if (CollUtil.isEmpty(deptUserEntities)) { deptCodeList.add(1L); authUserSaveRequest.setDepts(deptCodeList); } else { @@ -337,5 +329,4 @@ public class SysUserController extends BaseController { return ResultVOUtils.success(); } - } diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java index 82b1cf4e..4051b9e0 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java @@ -173,7 +173,6 @@ public class BasicBusTypePreController { if (result) { return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "原单据类型已存在，不允许重复添加！"); } - basicBusTypePreService.updateBusChangeType(basicBusTypePreEntity); } else { ResultVOUtils.error(999, "参数错误"); @@ -196,7 +195,6 @@ public class BasicBusTypePreController { } if (basicBusTypePreEntity != null) { //判断是否重复添加 - BasicBusTypePreEntity exitEntity = basicBusTypePreService.findByOriginAction(basicBusTypePreEntity.getOriginAction()); if (exitEntity != null) return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "原单据类型已存在，不允许重复添加！"); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java index bacb3702..1dba2671 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -98,14 +98,11 @@ public class BasicBussinessTypeController extends BaseController { if (isHosUser()) { bussinessTypeFilterRequest.setUserId(getUserId()); } else { - - // 供应商用户默认获取全部单据类型 bussinessTypeFilterRequest.setUserId(null); bussinessTypeFilterRequest.setCode(null); } List bussinessTypeEntities; - bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser( - bussinessTypeFilterRequest); + bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser(bussinessTypeFilterRequest); return ResultVOUtils.success(bussinessTypeEntities); } @@ -194,7 +191,6 @@ public class BasicBussinessTypeController extends BaseController { public BaseResponse filterJoinByUser(FilterBussinessTypeRequest bussinessTypeFilterRequest, BindingResult bindingResult) { - if (StrUtil.isNotEmpty(bussinessTypeFilterRequest.getVueType())) { List result = new ArrayList<>(); List bussinessTypeEntities = basicBussinessTypeService.findByVueTypeAndType(bussinessTypeFilterRequest); @@ -217,7 +213,6 @@ public class BasicBussinessTypeController extends BaseController { } else { result.addAll(bussinessTypeEntities); } - System.out.println("result:" + result.toArray()); PageInfo pageInfo; pageInfo = new PageInfo<>(result); @@ -234,8 +229,7 @@ public class BasicBussinessTypeController extends BaseController { bussinessTypeFilterRequest.setSpUse(3); } bussinessTypeFilterRequest.setUserId(getUserId()); - bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser( - bussinessTypeFilterRequest); + bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser(bussinessTypeFilterRequest); } else { //当前用户为供应商，查询单据类型添加允许供应商使用参数 if (bussinessTypeFilterRequest.getSpUse() == null) { @@ -244,7 +238,6 @@ public class BasicBussinessTypeController extends BaseController { bussinessTypeEntities = basicBussinessTypeService.filterJoinByInv(bussinessTypeFilterRequest); } - PageInfo pageInfo; pageInfo = new PageInfo<>(bussinessTypeEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -252,8 +245,6 @@ public class BasicBussinessTypeController extends BaseController { pageSimpleResponse.setList(bussinessTypeEntities); return ResultVOUtils.success(pageSimpleResponse); } - - } @AuthRuleAnnotation("") @@ -321,9 +312,7 @@ public class BasicBussinessTypeController extends BaseController { @PostMapping("/udiwms/bussinessType/delete") @Log(title = "单据管理", businessType = BusinessType.DELETE) public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest) { - String id = deleteRequest.getId(); - BasicDataRequest basicDataRequest = new BasicDataRequest(); basicDataRequest.setDeleteRequest(deleteRequest); Long userId = getUserId(); @@ -332,8 +321,6 @@ public class BasicBussinessTypeController extends BaseController { BasicDataRequest request = webSocketServer.insert(basicDataRequest, userId + ""); request.setDeleteRequest(deleteRequest); webSocketServer.sendMessage(SocketMsgEntity.builder().type(SocketMsgType.BASIC_BUSINESS_TYPE_DELETE).content(request).remark("单据类型").build(), null); - - return basicBussinessTypeService.deleteBussinessType(id) == true ? ResultVOUtils.success("删除成功") : ResultVOUtils.error(500, "删除失败，系统繁忙"); } @@ -352,7 +339,6 @@ public class BasicBussinessTypeController extends BaseController { cookie = cookie.substring(9); } - for (int i = 0; i < files.size(); i++) { MultipartFile file = files.get(i); if (file.isEmpty()) { @@ -438,7 +424,6 @@ public class BasicBussinessTypeController extends BaseController { @GetMapping("/udiwms/localBusType/filterUnUse") public BaseResponse filterUnUse(BusNoUserRequest busNoUserRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } @@ -457,7 +442,6 @@ public class BasicBussinessTypeController extends BaseController { @GetMapping("/udiwms/busType/change/origin") public BaseResponse changeOrigins(FilterBussinessTypeRequest bussinessTypeFilterRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } @@ -475,7 +459,6 @@ public class BasicBussinessTypeController extends BaseController { @GetMapping("/udiwms/busType/change/target") public BaseResponse changeTarget(FilterBussinessTypeRequest bussinessTypeFilterRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } @@ -490,7 +473,6 @@ public class BasicBussinessTypeController extends BaseController { @GetMapping("/udiwms/busType/selectList") public BaseResponse selectList() { - FilterBussinessTypeRequest bussinessTypeFilterRequest = new FilterBussinessTypeRequest(); bussinessTypeFilterRequest.setActionType(2); bussinessTypeFilterRequest.setMainAction(ConstantType.TYPE_OUT); diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java index d5692cd7..56a0b1cc 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java @@ -59,7 +59,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { if (CollUtil.isNotEmpty(dictDatas)) { return dictDatas; } - return null; + return new ArrayList<>(); } /**