UDI
/
udi-spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: controller 代码优化

Browse Source
dev_drug_dm
chenhc 4 months ago
parent f0330fce94
commit 00dfcad52b
17 changed files with 66 additions and 179 deletions
Show Stats Download Patch File Download Diff File

12
src/main/java/com/glxp/api/controller/auth/AuthAdminController.java
Unescape Escape View File

@ -35,11 +35,7 @@ public class AuthAdminController {
PageInfo<AuthRole> pageInfo = new PageInfo<>(authRoleList); PageInfo<AuthRole> pageInfo = new PageInfo<>(authRoleList);
PageSimpleResponse<AuthAdminRoleResponse> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<AuthAdminRoleResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setTotal(pageInfo.getTotal());
List<AuthAdminRoleResponse> authAdminRoleResponses = authRoleList.stream().map(e -> { List<AuthAdminRoleResponse> authAdminRoleResponses = BeanUtil.copyToList(authRoleList, AuthAdminRoleResponse.class);
AuthAdminRoleResponse authAdminRoleResponse = new AuthAdminRoleResponse();
BeanUtil.copyProperties(e, authAdminRoleResponse);
return authAdminRoleResponse;
}).collect(Collectors.toList());
pageSimpleResponse.setList(authAdminRoleResponses); pageSimpleResponse.setList(authAdminRoleResponses);
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
@ -55,11 +51,7 @@ public class AuthAdminController {
PageInfo<AuthRole> pageInfo = new PageInfo<>(authRoleList); PageInfo<AuthRole> pageInfo = new PageInfo<>(authRoleList);
PageSimpleResponse<AuthAdminRoleResponse> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<AuthAdminRoleResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setTotal(pageInfo.getTotal());
List<AuthAdminRoleResponse> authAdminRoleResponses = authRoleList.stream().map(e -> { List<AuthAdminRoleResponse> authAdminRoleResponses = BeanUtil.copyToList(authRoleList, AuthAdminRoleResponse.class);
AuthAdminRoleResponse authAdminRoleResponse = new AuthAdminRoleResponse();
BeanUtil.copyProperties(e, authAdminRoleResponse);
return authAdminRoleResponse;
}).collect(Collectors.toList());
pageSimpleResponse.setList(authAdminRoleResponses); pageSimpleResponse.setList(authAdminRoleResponses);
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);

12
src/main/java/com/glxp/api/controller/auth/AuthUserController.java
Unescape Escape View File

@ -29,8 +29,7 @@ import java.util.*;
*/ */
@RestController @RestController
public class AuthUserController extends BaseController { public class AuthUserController extends BaseController {
@Resource
CustomerService customerService;
@Resource @Resource
private AuthAdminService authAdminService; private AuthAdminService authAdminService;
@Resource @Resource
@ -130,8 +129,7 @@ public class AuthUserController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/admin/auth/admin/updateUser") @PostMapping("/admin/auth/admin/updateUser")
public BaseResponse updateUser(@RequestBody UpdateUserRequset updateUserRequset) { public BaseResponse updateUser(@RequestBody UpdateUserRequset updateUserRequset) {
AuthAdmin authAdmin = customerService.getUserBean(); AuthAdmin authAdmin = getUser();
System.out.println(updateUserRequset.toString());
if (StrUtil.isEmpty(updateUserRequset.getPassWord())) { if (StrUtil.isEmpty(updateUserRequset.getPassWord())) {
updateUserRequset.setPassWord(authAdmin.getPassWord()); updateUserRequset.setPassWord(authAdmin.getPassWord());
} }
@ -164,7 +162,7 @@ public class AuthUserController extends BaseController {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
AuthAdmin authAdmin = customerService.getUserBean(); AuthAdmin authAdmin = getUser();
if (StringUtils.isBlank(updateUserRequset.getNewPassword())) { if (StringUtils.isBlank(updateUserRequset.getNewPassword())) {
return ResultVOUtils.error(500, "请输入新密码！"); return ResultVOUtils.error(500, "请输入新密码！");
} }
@ -185,13 +183,13 @@ public class AuthUserController extends BaseController {
return ResultVOUtils.error(500, "新密码与确认密码不相同！请重新修改！"); return ResultVOUtils.error(500, "新密码与确认密码不相同！请重新修改！");
} }
}
}
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("/admin/auth/admin/selectUser") @GetMapping("/admin/auth/admin/selectUser")
public BaseResponse selectUser() { public BaseResponse selectUser() {
AuthAdmin authAdmin = customerService.getUserBean(); AuthAdmin authAdmin = getUser();
return ResultVOUtils.success(authAdmin); return ResultVOUtils.success(authAdmin);
} }
} }

75
src/main/java/com/glxp/api/controller/auth/DeptController.java
Unescape Escape View File

@ -12,7 +12,6 @@ import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.BusinessType;
import com.glxp.api.controller.BaseController; import com.glxp.api.controller.BaseController;
import com.glxp.api.dto.DictDto; 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.DeptEntity;
import com.glxp.api.entity.auth.DeptUserEntity; import com.glxp.api.entity.auth.DeptUserEntity;
import com.glxp.api.entity.auth.InvWarehouseEntity; 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.auth.FilterInvWarehouseRequest;
import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.system.DeleteRequest;
import com.glxp.api.res.PageSimpleResponse; 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.DeptService;
import com.glxp.api.service.auth.DeptUserService; import com.glxp.api.service.auth.DeptUserService;
import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.auth.InvWarehouseService;
@ -40,8 +38,6 @@ public class DeptController extends BaseController {
@Resource @Resource
DeptService deptService; DeptService deptService;
@Resource @Resource
CustomerService customerService;
@Resource
SystemParamConfigService systemParamConfigService; SystemParamConfigService systemParamConfigService;
@Resource @Resource
@ -87,7 +83,6 @@ public class DeptController extends BaseController {
public BaseResponse filterNext(FilterInvWarehouseRequest filterInvWarehouseRequest) { public BaseResponse filterNext(FilterInvWarehouseRequest filterInvWarehouseRequest) {
filterInvWarehouseRequest.setPid(0); filterInvWarehouseRequest.setPid(0);
filterInvWarehouseRequest.setStatus(1); filterInvWarehouseRequest.setStatus(1);
List<DeptEntity> invWarehouseEntities = deptService.filterGroupInvWarehouse(filterInvWarehouseRequest); List<DeptEntity> invWarehouseEntities = deptService.filterGroupInvWarehouse(filterInvWarehouseRequest);
return ResultVOUtils.success(invWarehouseEntities); return ResultVOUtils.success(invWarehouseEntities);
} }
@ -98,15 +93,11 @@ public class DeptController extends BaseController {
public BaseResponse filterByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) { public BaseResponse filterByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) {
if (isHosUser()) { if (isHosUser()) {
AuthAdmin authAdmin = customerService.getUserBean(); filterInvWarehouseRequest.setUserId(getUserId());
filterInvWarehouseRequest.setUserId(authAdmin.getId());
} else {
} }
filterInvWarehouseRequest.setPid(0); filterInvWarehouseRequest.setPid(0);
filterInvWarehouseRequest.setStatus(1); filterInvWarehouseRequest.setStatus(1);
List<DeptEntity> mInvWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest); List<DeptEntity> mInvWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest);
return ResultVOUtils.success(mInvWarehouseEntities); return ResultVOUtils.success(mInvWarehouseEntities);
} }
@ -117,15 +108,11 @@ public class DeptController extends BaseController {
public BaseResponse filterByUserOptimize(FilterInvWarehouseRequest filterInvWarehouseRequest) { public BaseResponse filterByUserOptimize(FilterInvWarehouseRequest filterInvWarehouseRequest) {
if (isHosUser()) { if (isHosUser()) {
AuthAdmin authAdmin = customerService.getUserBean(); filterInvWarehouseRequest.setUserId(getUserId());
filterInvWarehouseRequest.setUserId(authAdmin.getId());
} else {
} }
filterInvWarehouseRequest.setPid(0); filterInvWarehouseRequest.setPid(0);
filterInvWarehouseRequest.setStatus(1); filterInvWarehouseRequest.setStatus(1);
List<DeptEntity> mInvWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest); List<DeptEntity> mInvWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest);
List<DictDto> reList = mInvWarehouseEntities.stream().map(s-> { List<DictDto> reList = mInvWarehouseEntities.stream().map(s-> {
DictDto dictDto = new DictDto(s.getCode(),s.getName()); DictDto dictDto = new DictDto(s.getCode(),s.getName());
@ -142,25 +129,21 @@ public class DeptController extends BaseController {
filterInvWarehouseRequest.setStatus(1); filterInvWarehouseRequest.setStatus(1);
List<DeptEntity> invWarehouseEntities = deptService.filterInvWarehouse(filterInvWarehouseRequest); List<DeptEntity> invWarehouseEntities = deptService.filterInvWarehouse(filterInvWarehouseRequest);
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv"); SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv");
List<DeptEntity> temps = new ArrayList<>();
if (systemParamConfigEntity.getParamValue().equals("1")) { if (systemParamConfigEntity.getParamValue().equals("1")) {
for (DeptEntity deptEntity : invWarehouseEntities) { List<DeptEntity> temps = invWarehouseEntities.stream()
if (!deptEntity.getCode().equals(filterInvWarehouseRequest.getLocInvCode())) { .filter(e -> !e.getCode().equals(filterInvWarehouseRequest.getLocInvCode()))
temps.add(deptEntity); .collect(Collectors.toList());
}
}
return ResultVOUtils.success(temps); return ResultVOUtils.success(temps);
} else { } else {
DeptEntity curEntity = deptService.selectByCode(filterInvWarehouseRequest.getLocInvCode()); DeptEntity curEntity = deptService.selectByCode(filterInvWarehouseRequest.getLocInvCode());
for (DeptEntity deptEntity : invWarehouseEntities) { List<DeptEntity> temps = invWarehouseEntities.stream()
if (!StrUtil.isEmpty(curEntity.getPcode()) && curEntity.getPcode().equals(deptEntity.getCode())) { .filter(e -> !StrUtil.isEmpty(curEntity.getPcode()) && curEntity.getPcode().equals(e.getCode())
temps.add(deptEntity); || !StrUtil.isEmpty(e.getPcode()) && e.getPcode().equals(curEntity.getCode()))
} else if (!StrUtil.isEmpty(deptEntity.getPcode()) && deptEntity.getPcode().equals(curEntity.getCode())) { .collect(Collectors.toList());
temps.add(deptEntity);
}
}
return ResultVOUtils.success(temps); return ResultVOUtils.success(temps);
} }
} }
@ -169,13 +152,13 @@ public class DeptController extends BaseController {
public BaseResponse filterUplLocInv(FilterInvWarehouseRequest filterInvWarehouseRequest) { public BaseResponse filterUplLocInv(FilterInvWarehouseRequest filterInvWarehouseRequest) {
filterInvWarehouseRequest.setPid(0); filterInvWarehouseRequest.setPid(0);
filterInvWarehouseRequest.setStatus(1); filterInvWarehouseRequest.setStatus(1);
List<DeptEntity> invWarehouseEntities; filterInvWarehouseRequest.setUserId(getUserId());
AuthAdmin authAdmin = customerService.getUserBean();
filterInvWarehouseRequest.setUserId(authAdmin.getId());
filterInvWarehouseRequest.setPid(0); filterInvWarehouseRequest.setPid(0);
List<DeptEntity> mInvWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest); List<DeptEntity> mInvWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest);
Map<String, DeptEntity> invWarehouseEntityMap = new HashMap<>(); Map<String, DeptEntity> invWarehouseEntityMap = new HashMap<>();
if (mInvWarehouseEntities.size() > 0) { List<DeptEntity> invWarehouseEntities = new ArrayList<>();
if (CollUtil.isNotEmpty(mInvWarehouseEntities)) {
for (DeptEntity deptEntity : mInvWarehouseEntities) { for (DeptEntity deptEntity : mInvWarehouseEntities) {
invWarehouseEntityMap.put(deptEntity.getCode(), deptEntity); invWarehouseEntityMap.put(deptEntity.getCode(), deptEntity);
if (!"0".equals(deptEntity.getPcode())) { if (!"0".equals(deptEntity.getPcode())) {
@ -183,11 +166,12 @@ public class DeptController extends BaseController {
invWarehouseEntityMap.put(temp.getCode(), temp); invWarehouseEntityMap.put(temp.getCode(), temp);
} }
} }
}
invWarehouseEntities = new ArrayList<>();
for (DeptEntity deptEntity : invWarehouseEntityMap.values()) { for (DeptEntity deptEntity : invWarehouseEntityMap.values()) {
invWarehouseEntities.add(deptEntity); invWarehouseEntities.add(deptEntity);
} }
}
return ResultVOUtils.success(invWarehouseEntities); return ResultVOUtils.success(invWarehouseEntities);
} }
@ -195,17 +179,16 @@ public class DeptController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/filterAllByUser") @GetMapping("spms/inv/warehouse/filterAllByUser")
public BaseResponse filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) { public BaseResponse filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) {
List<DeptEntity> invWarehouseEntities; if (isHosUser()) {
AuthAdmin authAdmin = customerService.getUserBean(); filterInvWarehouseRequest.setCustomerId(getCustomerId());
if (authAdmin.getCustomerId().equals("110")) { filterInvWarehouseRequest.setUserId(getUserId());
filterInvWarehouseRequest.setCustomerId("110");
filterInvWarehouseRequest.setUserId(authAdmin.getId());
} else { } else {
filterInvWarehouseRequest.setUserId(null); filterInvWarehouseRequest.setUserId(null);
filterInvWarehouseRequest.setSpUse(true); filterInvWarehouseRequest.setSpUse(true);
} }
filterInvWarehouseRequest.setPid(0); filterInvWarehouseRequest.setPid(0);
invWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest);
List<DeptEntity> invWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest);
return ResultVOUtils.success(invWarehouseEntities); return ResultVOUtils.success(invWarehouseEntities);
} }
@ -222,7 +205,7 @@ public class DeptController extends BaseController {
} }
List<DeptEntity> deptEntityList = deptService.selectByNameList(deptEntity.getName()); List<DeptEntity> deptEntityList = deptService.selectByNameList(deptEntity.getName());
if (deptEntityList != null && deptEntityList.size() > 0) { if (CollUtil.isNotEmpty(deptEntityList)) {
for (DeptEntity obj : deptEntityList) { for (DeptEntity obj : deptEntityList) {
if (obj.getName().equals(deptEntity.getName()) && !obj.getId().equals(deptEntity.getId())) { if (obj.getName().equals(deptEntity.getName()) && !obj.getId().equals(deptEntity.getId())) {
return ResultVOUtils.error(500, "已存在相同名称的仓库，无法继续添加！"); return ResultVOUtils.error(500, "已存在相同名称的仓库，无法继续添加！");
@ -292,7 +275,7 @@ public class DeptController extends BaseController {
return ResultVOUtils.error(999, msg); return ResultVOUtils.error(999, msg);
} }
//判断供应商状态 //判断供应商状态
if (deptEntity.getSpUse() == false) { if (deptEntity.getSpUse()) {
FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust(); FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust();
filterDeptUserReqeust.setDeptId(deptEntity.getId().longValue()); filterDeptUserReqeust.setDeptId(deptEntity.getId().longValue());
List<DeptUserEntity> deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust); List<DeptUserEntity> deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust);
@ -302,7 +285,7 @@ public class DeptController extends BaseController {
} }
List<DeptEntity> deptEntityList = deptService.selectByNameList(deptEntity.getName()); List<DeptEntity> deptEntityList = deptService.selectByNameList(deptEntity.getName());
if (deptEntityList != null && deptEntityList.size() > 0) { if (CollUtil.isNotEmpty(deptEntityList)) {
for (DeptEntity obj : deptEntityList) { for (DeptEntity obj : deptEntityList) {
if (obj.getName().equals(deptEntity.getName()) && !obj.getId().equals(deptEntity.getId())) { if (obj.getName().equals(deptEntity.getName()) && !obj.getId().equals(deptEntity.getId())) {
return ResultVOUtils.error(500, "已存在相同名称的仓库，无法继续添加！"); return ResultVOUtils.error(500, "已存在相同名称的仓库，无法继续添加！");
@ -332,7 +315,7 @@ public class DeptController extends BaseController {
} }
DeptEntity deptEntity = deptService.selectById(deleteRequest.getId()); DeptEntity deptEntity = deptService.selectById(deleteRequest.getId());
if (deptEntity.getLevel() != null && deptEntity.getLevel() == 1) { if (deptEntity != null && deptEntity.getLevel() == 1) {
return ResultVOUtils.error(500, "删除失败，一级部门不允许删除！"); return ResultVOUtils.error(500, "删除失败，一级部门不允许删除！");
} }
@ -341,13 +324,13 @@ public class DeptController extends BaseController {
return ResultVOUtils.error(500, "删除失败，请先移除该部门关联仓库信息！"); return ResultVOUtils.error(500, "删除失败，请先移除该部门关联仓库信息！");
} }
FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust(); FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust();
filterDeptUserReqeust.setDeptId(deptEntity.getId().longValue()); filterDeptUserReqeust.setDeptId(deptEntity.getId());
List<DeptUserEntity> deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust); List<DeptUserEntity> deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust);
if (CollUtil.isNotEmpty(deptUserEntities)) { if (CollUtil.isNotEmpty(deptUserEntities)) {
return ResultVOUtils.error(500, "删除失败，请先移除该部门关联用户信息！"); return ResultVOUtils.error(500, "删除失败，请先移除该部门关联用户信息！");
} }
List<DeptEntity> deptEntities = deptService.selectByPcode(deptEntity.getCode()); List<DeptEntity> deptEntities = deptService.selectByPcode(deptEntity.getCode());
if (deptEntities.size() > 0) { if (CollUtil.isNotEmpty(deptEntities)) {
return ResultVOUtils.error(500, "删除失败，请先移除该部门下的子部门！"); return ResultVOUtils.error(500, "删除失败，请先移除该部门下的子部门！");
} }

5
src/main/java/com/glxp/api/controller/auth/DeptUserController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.auth; package com.glxp.api.controller.auth;
import cn.hutool.core.collection.CollUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log; import com.glxp.api.annotation.Log;
@ -65,12 +66,12 @@ public class DeptUserController {
public BaseResponse delete(@RequestBody DeptUserEntity deptUserEntity) { public BaseResponse delete(@RequestBody DeptUserEntity deptUserEntity) {
// 判断此用户是否创建单据 // 判断此用户是否创建单据
List<IoOrderEntity> ioOrderEntities = ioOrderService.selectList(deptUserEntity.getUserId()); List<IoOrderEntity> ioOrderEntities = ioOrderService.selectList(deptUserEntity.getUserId());
if (ioOrderEntities != null && ioOrderEntities.size() != 0) { if (CollUtil.isNotEmpty(ioOrderEntities)) {
return ResultVOUtils.error(500, "该用户已创建单据,不能移除!"); return ResultVOUtils.error(500, "该用户已创建单据,不能移除!");
} }
//判断此用户是否与仓库有关联 //判断此用户是否与仓库有关联
List<String> listWareHouse = warehouseUserService.selectCodeByUser(deptUserEntity.getUserId() + ""); List<String> listWareHouse = warehouseUserService.selectCodeByUser(deptUserEntity.getUserId() + "");
if (listWareHouse != null && listWareHouse.size() != 0) { if (CollUtil.isNotEmpty(listWareHouse)) {
return ResultVOUtils.error(500, "该用户已绑定仓库,不能移除!"); return ResultVOUtils.error(500, "该用户已绑定仓库,不能移除!");
} }

18
src/main/java/com/glxp/api/controller/auth/InvBusUserController.java
Unescape Escape View File

@ -69,11 +69,7 @@ public class InvBusUserController {
@GetMapping("spms/bus/user/unselect/filter") @GetMapping("spms/bus/user/unselect/filter")
public BaseResponse filterUnSelectInvUser(FilterInvBusUserRequest filterInvBusUserRequest) { public BaseResponse filterUnSelectInvUser(FilterInvBusUserRequest filterInvBusUserRequest) {
List<InvBusUserEntity> responses = invBusUserService.filterInvBusUser(filterInvBusUserRequest); List<InvBusUserEntity> responses = invBusUserService.filterInvBusUser(filterInvBusUserRequest);
List<String> selectedCodes = new ArrayList<>(); List<String> selectedCodes = responses.stream().map(InvBusUserEntity::getScAction).collect(Collectors.toList());
responses.forEach(invBusUserEntity ->
{
selectedCodes.add(invBusUserEntity.getScAction());
});
filterInvBusUserRequest.setSelectedCodes(selectedCodes); filterInvBusUserRequest.setSelectedCodes(selectedCodes);
List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntityList = invBusUserService.filterUnSelect(filterInvBusUserRequest); List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntityList = invBusUserService.filterUnSelect(filterInvBusUserRequest);
@ -112,13 +108,14 @@ public class InvBusUserController {
@Log(title = "用户管理", businessType = BusinessType.UPDATE) @Log(title = "用户管理", businessType = BusinessType.UPDATE)
public BaseResponse updateRes(@RequestBody UpdateUserRelBusRequset relBusRequset) { public BaseResponse updateRes(@RequestBody UpdateUserRelBusRequset relBusRequset) {
boolean b = invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode()); boolean b = invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode());
if (CollUtil.isNotEmpty(relBusRequset.getInvBusUserEntities())) { List<WarehouseBussinessTypeEntity> invBusUserEntities = relBusRequset.getInvBusUserEntities();
relBusRequset.getInvBusUserEntities().forEach(warehouseBussinessTypeEntity -> if (CollUtil.isNotEmpty(invBusUserEntities)) {
invBusUserEntities.forEach(item ->
{ {
InvBusUserEntity invBusUserEntity = new InvBusUserEntity(); InvBusUserEntity invBusUserEntity = new InvBusUserEntity();
invBusUserEntity.setUserId(relBusRequset.getUserId()); invBusUserEntity.setUserId(relBusRequset.getUserId());
invBusUserEntity.setSubInvCode(relBusRequset.getSubInvCode()); invBusUserEntity.setSubInvCode(relBusRequset.getSubInvCode());
invBusUserEntity.setScAction(warehouseBussinessTypeEntity.getAction()); invBusUserEntity.setScAction(item.getAction());
invBusUserService.insertInvBusUser(invBusUserEntity); invBusUserService.insertInvBusUser(invBusUserEntity);
}); });
} }
@ -133,8 +130,9 @@ public class InvBusUserController {
@Log(title = "用户管理", businessType = BusinessType.INSERT) @Log(title = "用户管理", businessType = BusinessType.INSERT)
public BaseResponse postRes(@RequestBody UpdateUserRelBusRequset relBusRequset) { public BaseResponse postRes(@RequestBody UpdateUserRelBusRequset relBusRequset) {
invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode()); invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode());
if (CollUtil.isNotEmpty(relBusRequset.getSelectActions())) { List<String> selectActions = relBusRequset.getSelectActions();
relBusRequset.getSelectActions().forEach(action -> if (CollUtil.isNotEmpty(selectActions)) {
selectActions.forEach(action ->
{ {
InvBusUserEntity invBusUserEntity = new InvBusUserEntity(); InvBusUserEntity invBusUserEntity = new InvBusUserEntity();
invBusUserEntity.setUserId(relBusRequset.getUserId()); invBusUserEntity.setUserId(relBusRequset.getUserId());

23
src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
Unescape Escape View File

@ -97,9 +97,9 @@ public class InvWarehouseController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/findByDeptUser") @GetMapping("spms/inv/warehouse/findByDeptUser")
public BaseResponse findByDept(FilterInvWarehouseRequest filterInvWarehouseRequest) { public BaseResponse findByDept(FilterInvWarehouseRequest filterInvWarehouseRequest) {
AuthAdmin authAdmin = getUser();
if (authAdmin.getCustomerId().equals("110")) { if (isHosUser()) {
filterInvWarehouseRequest.setUserId(authAdmin.getId()); filterInvWarehouseRequest.setUserId(getUserId());
} else { } else {
if (IntUtil.value(filterInvWarehouseRequest.getType()) == 1) { if (IntUtil.value(filterInvWarehouseRequest.getType()) == 1) {
filterInvWarehouseRequest.setSpUse(true); filterInvWarehouseRequest.setSpUse(true);
@ -209,11 +209,6 @@ public class InvWarehouseController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("spms/sub/inv/warehouse/filterSub") @GetMapping("spms/sub/inv/warehouse/filterSub")
public BaseResponse filterSub(FilterInvWarehouseRequest filterInvWarehouseRequest) { 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()); InvWarehouseEntity invWarehouseEntity = invWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode());
filterInvWarehouseRequest.setSubordinateCode(invWarehouseEntity.getParentId()); filterInvWarehouseRequest.setSubordinateCode(invWarehouseEntity.getParentId());
filterInvWarehouseRequest.setCode(null); filterInvWarehouseRequest.setCode(null);
@ -247,7 +242,6 @@ public class InvWarehouseController extends BaseController {
invWarehouseEntity.setCode(Integer.parseInt(codeEntity.getCode()) + 1 + ""); invWarehouseEntity.setCode(Integer.parseInt(codeEntity.getCode()) + 1 + "");
} }
DeptEntity updateEntity = new DeptEntity(); DeptEntity updateEntity = new DeptEntity();
updateEntity.setId(pEntity.getId()); updateEntity.setId(pEntity.getId());
updateEntity.setUpdateTime(new Date()); updateEntity.setUpdateTime(new Date());
@ -282,7 +276,6 @@ public class InvWarehouseController extends BaseController {
} }
} }
// 先判断是否有相同名字的仓库 // 先判断是否有相同名字的仓库
boolean checkResult = invWarehouseService.updateCheckExit(invWarehouseEntity); boolean checkResult = invWarehouseService.updateCheckExit(invWarehouseEntity);
if (checkResult) { if (checkResult) {
@ -328,9 +321,6 @@ public class InvWarehouseController extends BaseController {
} }
InvWarehouseEntity invWarehouseEntity = invWarehouseService.findById(deleteRequest.getId()); InvWarehouseEntity invWarehouseEntity = invWarehouseService.findById(deleteRequest.getId());
//todo 代码未迁移完，记得回来修改
Integer userCount = warehouseUserService.countUserBySubInvCode(invWarehouseEntity.getCode()); Integer userCount = warehouseUserService.countUserBySubInvCode(invWarehouseEntity.getCode());
if (userCount > 0) { if (userCount > 0) {
return ResultVOUtils.error(500, "请先移除该仓库关联用户！"); return ResultVOUtils.error(500, "请先移除该仓库关联用户！");
@ -348,7 +338,6 @@ public class InvWarehouseController extends BaseController {
return ResultVOUtils.error(500, "此仓库下存在仓库无法删除！"); return ResultVOUtils.error(500, "此仓库下存在仓库无法删除！");
} }
//判断此分库下是否有货位 //判断此分库下是否有货位
List<InvSpace> spaceList = invSpaceService.findBySubWarehouseCode(invWarehouseEntity.getCode()); List<InvSpace> spaceList = invSpaceService.findBySubWarehouseCode(invWarehouseEntity.getCode());
if (CollUtil.isNotEmpty(spaceList)) { if (CollUtil.isNotEmpty(spaceList)) {
@ -373,8 +362,7 @@ public class InvWarehouseController extends BaseController {
FilterBasicThirdSysRequest sysRequest = new FilterBasicThirdSysRequest(); FilterBasicThirdSysRequest sysRequest = new FilterBasicThirdSysRequest();
sysRequest.setEnabled(true); sysRequest.setEnabled(true);
List<InvWarehouseThirdSysResponse> list = invWarehouseService.getThirdSysDetail(request.getId()); List<InvWarehouseThirdSysResponse> list = invWarehouseService.getThirdSysDetail(request.getId());
PageInfo<InvWarehouseThirdSysResponse> pageInfo; PageInfo<InvWarehouseThirdSysResponse> pageInfo = new PageInfo<>(list);
pageInfo = new PageInfo<>(list);
PageSimpleResponse<InvWarehouseThirdSysResponse> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<InvWarehouseThirdSysResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(list); pageSimpleResponse.setList(list);
@ -573,8 +561,7 @@ public class InvWarehouseController extends BaseController {
return ResultVOUtils.error(500, "已存在该用户关联单据类型，无法删除！"); return ResultVOUtils.error(500, "已存在该用户关联单据类型，无法删除！");
} }
InvWarehouseEntity invSubWarehouseEntity = InvWarehouseEntity invSubWarehouseEntity = invWarehouseService.findByInvSubByCode(warehouseUserEntity.getCode());
invWarehouseService.findByInvSubByCode(warehouseUserEntity.getCode());
deptService.updateTime(invSubWarehouseEntity.getParentId(), new Date()); deptService.updateTime(invSubWarehouseEntity.getParentId(), new Date());
warehouseUserService.deleteWarehouseUser(id); warehouseUserService.deleteWarehouseUser(id);
return ResultVOUtils.success(); return ResultVOUtils.success();

10
src/main/java/com/glxp/api/controller/auth/LoginController.java
Unescape Escape View File

@ -340,13 +340,11 @@ public class LoginController extends BaseController {
@PostMapping(value = "/verify") @PostMapping(value = "/verify")
public BaseResponse verify(@RequestBody Map<String, Object> params, public BaseResponse verify(@RequestBody Map<String, Object> params,
HttpServletRequest request) { HttpServletRequest request) {
AuthAdmin authAdmin; AuthAdmin authAdmin = authAdminService.findByUserName(params.get("username").toString());
authAdmin = authAdminService.findByUserName(params.get("username").toString());
if (authAdmin == null) { if (authAdmin == null) {
throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
} }
if (!PasswordUtils.authAdminPwd(params.get("password").toString()).equals(authAdmin.getPassWord())) { if (!PasswordUtils.authAdminPwd(params.get("password").toString()).equals(authAdmin.getPassWord())) {
throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
} }
@ -386,14 +384,12 @@ public class LoginController extends BaseController {
@GetMapping("/spms/sub/inv/warehouse/getSubInvForUdims") @GetMapping("/spms/sub/inv/warehouse/getSubInvForUdims")
public BaseResponse getSubInvForUdims(String invCode) { public BaseResponse getSubInvForUdims(String invCode) {
List<InvWarehouseEntity> data = invWarehouseDao.getByWarePId(invCode); List<InvWarehouseEntity> data = invWarehouseDao.getByWarePId(invCode);
return ResultVOUtils.success(data); return ResultVOUtils.success(data);
} }
@GetMapping("/udiwms/bussinessType/udimsFilter") @GetMapping("/udiwms/bussinessType/udimsFilter")
public BaseResponse udimsFilter(String invSubCode) { public BaseResponse udimsFilter(String invSubCode) {
List<WarehouseBussinessTypeEntity> data = warehouseBussinessTypeService.filterActionList(invSubCode); List<WarehouseBussinessTypeEntity> data = warehouseBussinessTypeService.filterActionList(invSubCode);
return ResultVOUtils.success(data); return ResultVOUtils.success(data);
} }
@ -430,13 +426,11 @@ public class LoginController extends BaseController {
@PostMapping(value = "/udims/verify") @PostMapping(value = "/udims/verify")
public BaseResponse udimsVerify(@RequestBody Map<String, Object> params, public BaseResponse udimsVerify(@RequestBody Map<String, Object> params,
HttpServletRequest request) { HttpServletRequest request) {
AuthAdmin authAdmin; AuthAdmin authAdmin = authAdminService.findByUserName(params.get("username").toString());
authAdmin = authAdminService.findByUserName(params.get("username").toString());
if (authAdmin == null) { if (authAdmin == null) {
throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
} }
if (!PasswordUtils.authAdminPwd(params.get("password").toString()).equals(authAdmin.getPassWord())) { if (!PasswordUtils.authAdminPwd(params.get("password").toString()).equals(authAdmin.getPassWord())) {
throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
} }

17
src/main/java/com/glxp/api/controller/auth/RegisterController.java
Unescape Escape View File

@ -67,7 +67,6 @@ public class RegisterController {
private CustomerInfoService customerInfoService; private CustomerInfoService customerInfoService;
@Resource @Resource
private CustomerContactService customerContactService; private CustomerContactService customerContactService;
@Resource @Resource
private CompanyService companyService; private CompanyService companyService;
@Resource @Resource
@ -81,10 +80,8 @@ public class RegisterController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("salewarehouse/register/list") @GetMapping("salewarehouse/register/list")
public BaseResponse filterList(UserResisterFilterRequest userResisterFilterRequest) { public BaseResponse filterList(UserResisterFilterRequest userResisterFilterRequest) {
List<UserRegisterEntity> userRegisterEntities = userRegisterService.filterUserRegisters(userResisterFilterRequest); List<UserRegisterEntity> userRegisterEntities = userRegisterService.filterUserRegisters(userResisterFilterRequest);
PageInfo<UserRegisterEntity> pageInfo; PageInfo<UserRegisterEntity> pageInfo = new PageInfo<>(userRegisterEntities);
pageInfo = new PageInfo<>(userRegisterEntities);
PageSimpleResponse<UserRegisterEntity> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<UserRegisterEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(userRegisterEntities); pageSimpleResponse.setList(userRegisterEntities);
@ -293,7 +290,7 @@ public class RegisterController {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); 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()))); JSONObject userCode = JSONObject.parseObject(String.valueOf(redisUtil.get(Constant.CAPTCHAS + resetPasswdRequest.getMobile())));
if (userCode == null) { if (userCode == null) {
return ResultVOUtils.error(500, "验证码已失效，请重新获取"); return ResultVOUtils.error(500, "验证码已失效，请重新获取");
@ -402,17 +399,10 @@ public class RegisterController {
authAdmin.setUserFlag(1); authAdmin.setUserFlag(1);
authAdmin.setLastModifyTime(new Date()); authAdmin.setLastModifyTime(new Date());
authAdminDao.insert(authAdmin); authAdminDao.insert(authAdmin);
// authAdminService.insertAuthAdmin(authAdmin);
authAdmin = authAdminService.findByUserName(authAdmin.getUserName()); authAdmin = authAdminService.findByUserName(authAdmin.getUserName());
//分配角色
// List<Long> roles = new ArrayList<>();
// roles.add(Long.valueOf(13));//默认角色
//生产客户信息表 //生产客户信息表
CustomerInfoEntity customerInfoEntity = new CustomerInfoEntity(); CustomerInfoEntity customerInfoEntity = new CustomerInfoEntity();
// customerInfoEntity.setCustomerId(Long.valueOf(String.valueOf(authAdmin.getCustomerId())));
customerInfoEntity.setCustomerId(customerId); customerInfoEntity.setCustomerId(customerId);
customerInfoEntity.setArea(userRegisterEntity.getArea()); customerInfoEntity.setArea(userRegisterEntity.getArea());
customerInfoEntity.setDetailAddr(userRegisterEntity.getDetailAddr()); customerInfoEntity.setDetailAddr(userRegisterEntity.getDetailAddr());
@ -481,10 +471,9 @@ public class RegisterController {
} }
if (i <= 0) { if (i <= 0) {
customerInfoService.insertCustomerInfo(customerInfoEntity); customerInfoService.insertCustomerInfo(customerInfoEntity);
companyService.insertCompany(companyEntity);//TODO !!!!!!!!!!! companyService.insertCompany(companyEntity);
} }
if (!b) { if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK); return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
} }

2
src/main/java/com/glxp/api/controller/auth/SysCustomConfigController.java
Unescape Escape View File

@ -104,8 +104,6 @@ public class SysCustomConfigController extends BaseController {
} }
return ResultVOUtils.success("修改成功！"); return ResultVOUtils.success("修改成功！");
} }
@AuthRuleAnnotation("") @AuthRuleAnnotation("")

4
src/main/java/com/glxp/api/controller/auth/SysDictDataController.java
Unescape Escape View File

@ -35,7 +35,6 @@ public class SysDictDataController extends BaseController {
*/ */
@GetMapping("/list") @GetMapping("/list")
public BaseResponse list(SysDictDataRequest sysDictDataRequest) { public BaseResponse list(SysDictDataRequest sysDictDataRequest) {
return ResultVOUtils.success(dictDataService.selectDictDataList(sysDictDataRequest)); return ResultVOUtils.success(dictDataService.selectDictDataList(sysDictDataRequest));
} }
@ -58,9 +57,6 @@ public class SysDictDataController extends BaseController {
@GetMapping(value = "/type/{dictType}") @GetMapping(value = "/type/{dictType}")
public BaseResponse dictType(@PathVariable String dictType) { public BaseResponse dictType(@PathVariable String dictType) {
List<SysDictData> data = dictTypeService.selectDictDataByType(dictType); List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
if (ObjectUtil.isNull(data)) {
data = new ArrayList<>();
}
return ResultVOUtils.success(data); return ResultVOUtils.success(data);
} }

3
src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java
Unescape Escape View File

@ -71,9 +71,6 @@ public class SysDictTypeController extends BaseController {
@PutMapping @PutMapping
@Log(title = "用户管理", businessType = BusinessType.UPDATE) @Log(title = "用户管理", businessType = BusinessType.UPDATE)
public BaseResponse edit(@Validated @RequestBody SysDictType dict) { public BaseResponse edit(@Validated @RequestBody SysDictType dict) {
// if (Constant.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
// return R.fail("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
// }
dictTypeService.updateDictType(dict); dictTypeService.updateDictType(dict);
return ResultVOUtils.success("修改成功！"); return ResultVOUtils.success("修改成功！");
} }

13
src/main/java/com/glxp/api/controller/auth/SysMenuController.java
Unescape Escape View File

@ -33,17 +33,12 @@ public class SysMenuController extends BaseController {
@Resource @Resource
ISysMenuService menuService; ISysMenuService menuService;
@Resource
CustomerService customerService;
/** /**
* 获取菜单列表 * 获取菜单列表
*/ */
@GetMapping("/list") @GetMapping("/list")
public BaseResponse list(SysMenu menu) { public BaseResponse list(SysMenu menu) {
AuthAdmin authAdmin = customerService.getUserBean(); List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
List<SysMenu> menus = menuService.selectMenuList(menu, authAdmin.getId());
return ResultVOUtils.success(menus); return ResultVOUtils.success(menus);
} }
@ -62,8 +57,7 @@ public class SysMenuController extends BaseController {
*/ */
@GetMapping("/treeselect") @GetMapping("/treeselect")
public BaseResponse treeselect(SysMenu menu) { public BaseResponse treeselect(SysMenu menu) {
AuthAdmin authAdmin = customerService.getUserBean(); List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
List<SysMenu> menus = menuService.selectMenuList(menu, authAdmin.getId());
List<Tree<Long>> data = menuService.buildMenuTreeSelect(menus); List<Tree<Long>> data = menuService.buildMenuTreeSelect(menus);
return ResultVOUtils.success(data); return ResultVOUtils.success(data);
} }
@ -75,8 +69,7 @@ public class SysMenuController extends BaseController {
*/ */
@GetMapping(value = "/roleMenuTreeselect/{roleId}") @GetMapping(value = "/roleMenuTreeselect/{roleId}")
public BaseResponse roleMenuTreeselect(@PathVariable("roleId") Long roleId) { public BaseResponse roleMenuTreeselect(@PathVariable("roleId") Long roleId) {
AuthAdmin authAdmin = customerService.getUserBean(); List<SysMenu> menus = menuService.selectMenuList(getUserId());
List<SysMenu> menus = menuService.selectMenuList(authAdmin.getId());
Map<String, Object> ajax = new HashMap<>(); Map<String, Object> ajax = new HashMap<>();
ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId)); ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
ajax.put("menus", menuService.buildMenuTreeSelect(menus)); ajax.put("menus", menuService.buildMenuTreeSelect(menus));

10
src/main/java/com/glxp/api/controller/auth/SysRoleController.java
Unescape Escape View File

@ -40,7 +40,6 @@ public class SysRoleController extends BaseController {
*/ */
@GetMapping("/list") @GetMapping("/list")
public BaseResponse list(FilterRoleRequest filterRoleRequest) { public BaseResponse list(FilterRoleRequest filterRoleRequest) {
List<SysRole> sysRoles = roleService.selectPageRoleList(filterRoleRequest); List<SysRole> sysRoles = roleService.selectPageRoleList(filterRoleRequest);
PageInfo<SysRole> pageInfo = new PageInfo<>(sysRoles); PageInfo<SysRole> pageInfo = new PageInfo<>(sysRoles);
PageSimpleResponse<SysRole> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<SysRole> pageSimpleResponse = new PageSimpleResponse<>();
@ -120,8 +119,6 @@ public class SysRoleController extends BaseController {
public BaseResponse dataScope(@RequestBody SysRole role) { public BaseResponse dataScope(@RequestBody SysRole role) {
roleService.checkRoleAllowed(role); roleService.checkRoleAllowed(role);
roleService.checkRoleDataScope(role.getRoleId()); roleService.checkRoleDataScope(role.getRoleId());
int i = roleService.authDataScope(role); int i = roleService.authDataScope(role);
return ResultVOUtils.success("修改成功！"); return ResultVOUtils.success("修改成功！");
} }
@ -159,9 +156,7 @@ public class SysRoleController extends BaseController {
@SaCheckPermission("system:role:query") @SaCheckPermission("system:role:query")
@GetMapping("/optionselect") @GetMapping("/optionselect")
public BaseResponse optionselect() { public BaseResponse optionselect() {
return ResultVOUtils.success(roleService.selectRoleAll()); return ResultVOUtils.success(roleService.selectRoleAll());
} }
/** /**
@ -169,8 +164,6 @@ public class SysRoleController extends BaseController {
*/ */
@GetMapping("/authUser/allocatedList") @GetMapping("/authUser/allocatedList")
public BaseResponse allocatedList(FilterAuthUserRequest filterAuthUserRequest) { public BaseResponse allocatedList(FilterAuthUserRequest filterAuthUserRequest) {
List<AuthAdmin> authAdminList = userService.selectAllocatedList(filterAuthUserRequest); List<AuthAdmin> authAdminList = userService.selectAllocatedList(filterAuthUserRequest);
PageInfo<AuthAdmin> pageInfo = new PageInfo<>(authAdminList); PageInfo<AuthAdmin> pageInfo = new PageInfo<>(authAdminList);
PageSimpleResponse<AuthAdmin> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<AuthAdmin> pageSimpleResponse = new PageSimpleResponse<>();
@ -184,8 +177,6 @@ public class SysRoleController extends BaseController {
*/ */
@GetMapping("/authUser/unallocatedList") @GetMapping("/authUser/unallocatedList")
public BaseResponse unallocatedList(FilterAuthUserRequest filterAuthUserRequest) { public BaseResponse unallocatedList(FilterAuthUserRequest filterAuthUserRequest) {
List<AuthAdmin> authAdminList = userService.selectUnallocatedList(filterAuthUserRequest); List<AuthAdmin> authAdminList = userService.selectUnallocatedList(filterAuthUserRequest);
PageInfo<AuthAdmin> pageInfo = new PageInfo<>(authAdminList); PageInfo<AuthAdmin> pageInfo = new PageInfo<>(authAdminList);
PageSimpleResponse<AuthAdmin> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<AuthAdmin> pageSimpleResponse = new PageSimpleResponse<>();
@ -214,7 +205,6 @@ public class SysRoleController extends BaseController {
@PutMapping("/authUser/cancelAll") @PutMapping("/authUser/cancelAll")
@Log(title = "用户管理", businessType = BusinessType.DELETE) @Log(title = "用户管理", businessType = BusinessType.DELETE)
public BaseResponse cancelAuthUserAll(Long roleId, Long[] userIds) { public BaseResponse cancelAuthUserAll(Long roleId, Long[] userIds) {
int i = roleService.deleteAuthUsers(roleId, userIds); int i = roleService.deleteAuthUsers(roleId, userIds);
return ResultVOUtils.success("取消成功！"); return ResultVOUtils.success("取消成功！");
} }

11
src/main/java/com/glxp/api/controller/auth/SysUserController.java
Unescape Escape View File

@ -60,9 +60,6 @@ public class SysUserController extends BaseController {
@Resource @Resource
private AuthAdminService authAdminService; private AuthAdminService authAdminService;
@Resource
private DeptService deptService;
@GetMapping("/list") @GetMapping("/list")
public BaseResponse list(FilterAuthUserRequest filterAuthUserRequest, BindingResult bindingResult) { public BaseResponse list(FilterAuthUserRequest filterAuthUserRequest, BindingResult bindingResult) {
@ -101,7 +98,6 @@ public class SysUserController extends BaseController {
return authAdminResponse; return authAdminResponse;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
PageInfo<AuthAdmin> authAdminPageInfo = new PageInfo<>(authAdminList); PageInfo<AuthAdmin> authAdminPageInfo = new PageInfo<>(authAdminList);
PageSimpleResponse<AuthAdminResponse> authAdminPageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<AuthAdminResponse> authAdminPageSimpleResponse = new PageSimpleResponse<>();
authAdminPageSimpleResponse.setTotal(authAdminPageInfo.getTotal()); authAdminPageSimpleResponse.setTotal(authAdminPageInfo.getTotal());
@ -165,7 +161,6 @@ public class SysUserController extends BaseController {
@PostMapping("/save") @PostMapping("/save")
public BaseResponse save(@RequestBody @Valid AuthUserSaveRequest authUserSaveRequest, public BaseResponse save(@RequestBody @Valid AuthUserSaveRequest authUserSaveRequest,
BindingResult bindingResult) { BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); 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.insertUserAuth(authAdmin.getId(), authUserSaveRequest.getRoles());
} }
userService.updateAuthAdmin(authAdmin); userService.updateAuthAdmin(authAdmin);
//默认插入第一部门 //默认插入第一部门
ArrayList<Long> deptCodeList = new ArrayList<>(); ArrayList<Long> deptCodeList = new ArrayList<>();
FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust(); FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust();
filterDeptUserReqeust.setUserId(authUserSaveRequest.getId()); filterDeptUserReqeust.setUserId(authUserSaveRequest.getId());
List<DeptUserEntity> deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust); List<DeptUserEntity> deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust);
if (deptUserEntities == null) { if (CollUtil.isEmpty(deptUserEntities)) {
deptCodeList.add(1L); deptCodeList.add(1L);
authUserSaveRequest.setDepts(deptCodeList); authUserSaveRequest.setDepts(deptCodeList);
} else { } else {
@ -337,5 +329,4 @@ public class SysUserController extends BaseController {
return ResultVOUtils.success(); return ResultVOUtils.success();
} }
} }

2
src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java
Unescape Escape View File

@ -173,7 +173,6 @@ public class BasicBusTypePreController {
if (result) { if (result) {
return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "原单据类型已存在，不允许重复添加！"); return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "原单据类型已存在，不允许重复添加！");
} }
basicBusTypePreService.updateBusChangeType(basicBusTypePreEntity); basicBusTypePreService.updateBusChangeType(basicBusTypePreEntity);
} else { } else {
ResultVOUtils.error(999, "参数错误"); ResultVOUtils.error(999, "参数错误");
@ -196,7 +195,6 @@ public class BasicBusTypePreController {
} }
if (basicBusTypePreEntity != null) { if (basicBusTypePreEntity != null) {
//判断是否重复添加 //判断是否重复添加
BasicBusTypePreEntity exitEntity = basicBusTypePreService.findByOriginAction(basicBusTypePreEntity.getOriginAction()); BasicBusTypePreEntity exitEntity = basicBusTypePreService.findByOriginAction(basicBusTypePreEntity.getOriginAction());
if (exitEntity != null) if (exitEntity != null)
return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "原单据类型已存在，不允许重复添加！"); return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "原单据类型已存在，不允许重复添加！");

22
src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java
Unescape Escape View File

@ -98,14 +98,11 @@ public class BasicBussinessTypeController extends BaseController {
if (isHosUser()) { if (isHosUser()) {
bussinessTypeFilterRequest.setUserId(getUserId()); bussinessTypeFilterRequest.setUserId(getUserId());
} else { } else {
// 供应商用户默认获取全部单据类型
bussinessTypeFilterRequest.setUserId(null); bussinessTypeFilterRequest.setUserId(null);
bussinessTypeFilterRequest.setCode(null); bussinessTypeFilterRequest.setCode(null);
} }
List<BasicBussinessTypeResponse> bussinessTypeEntities; List<BasicBussinessTypeResponse> bussinessTypeEntities;
bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser( bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser(bussinessTypeFilterRequest);
bussinessTypeFilterRequest);
return ResultVOUtils.success(bussinessTypeEntities); return ResultVOUtils.success(bussinessTypeEntities);
} }
@ -194,7 +191,6 @@ public class BasicBussinessTypeController extends BaseController {
public BaseResponse filterJoinByUser(FilterBussinessTypeRequest bussinessTypeFilterRequest, public BaseResponse filterJoinByUser(FilterBussinessTypeRequest bussinessTypeFilterRequest,
BindingResult bindingResult) { BindingResult bindingResult) {
if (StrUtil.isNotEmpty(bussinessTypeFilterRequest.getVueType())) { if (StrUtil.isNotEmpty(bussinessTypeFilterRequest.getVueType())) {
List<BasicBussinessTypeEntity> result = new ArrayList<>(); List<BasicBussinessTypeEntity> result = new ArrayList<>();
List<BasicBussinessTypeEntity> bussinessTypeEntities = basicBussinessTypeService.findByVueTypeAndType(bussinessTypeFilterRequest); List<BasicBussinessTypeEntity> bussinessTypeEntities = basicBussinessTypeService.findByVueTypeAndType(bussinessTypeFilterRequest);
@ -217,7 +213,6 @@ public class BasicBussinessTypeController extends BaseController {
} else { } else {
result.addAll(bussinessTypeEntities); result.addAll(bussinessTypeEntities);
} }
System.out.println("result:" + result.toArray());
PageInfo<BasicBussinessTypeEntity> pageInfo; PageInfo<BasicBussinessTypeEntity> pageInfo;
pageInfo = new PageInfo<>(result); pageInfo = new PageInfo<>(result);
@ -234,8 +229,7 @@ public class BasicBussinessTypeController extends BaseController {
bussinessTypeFilterRequest.setSpUse(3); bussinessTypeFilterRequest.setSpUse(3);
} }
bussinessTypeFilterRequest.setUserId(getUserId()); bussinessTypeFilterRequest.setUserId(getUserId());
bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser( bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser(bussinessTypeFilterRequest);
bussinessTypeFilterRequest);
} else { } else {
//当前用户为供应商，查询单据类型添加允许供应商使用参数 //当前用户为供应商，查询单据类型添加允许供应商使用参数
if (bussinessTypeFilterRequest.getSpUse() == null) { if (bussinessTypeFilterRequest.getSpUse() == null) {
@ -244,7 +238,6 @@ public class BasicBussinessTypeController extends BaseController {
bussinessTypeEntities = basicBussinessTypeService.filterJoinByInv(bussinessTypeFilterRequest); bussinessTypeEntities = basicBussinessTypeService.filterJoinByInv(bussinessTypeFilterRequest);
} }
PageInfo<BasicBussinessTypeResponse> pageInfo; PageInfo<BasicBussinessTypeResponse> pageInfo;
pageInfo = new PageInfo<>(bussinessTypeEntities); pageInfo = new PageInfo<>(bussinessTypeEntities);
PageSimpleResponse<BasicBussinessTypeResponse> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<BasicBussinessTypeResponse> pageSimpleResponse = new PageSimpleResponse<>();
@ -252,8 +245,6 @@ public class BasicBussinessTypeController extends BaseController {
pageSimpleResponse.setList(bussinessTypeEntities); pageSimpleResponse.setList(bussinessTypeEntities);
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }
} }
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@ -321,9 +312,7 @@ public class BasicBussinessTypeController extends BaseController {
@PostMapping("/udiwms/bussinessType/delete") @PostMapping("/udiwms/bussinessType/delete")
@Log(title = "单据管理", businessType = BusinessType.DELETE) @Log(title = "单据管理", businessType = BusinessType.DELETE)
public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest) { public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest) {
String id = deleteRequest.getId(); String id = deleteRequest.getId();
BasicDataRequest basicDataRequest = new BasicDataRequest(); BasicDataRequest basicDataRequest = new BasicDataRequest();
basicDataRequest.setDeleteRequest(deleteRequest); basicDataRequest.setDeleteRequest(deleteRequest);
Long userId = getUserId(); Long userId = getUserId();
@ -332,8 +321,6 @@ public class BasicBussinessTypeController extends BaseController {
BasicDataRequest request = webSocketServer.insert(basicDataRequest, userId + ""); BasicDataRequest request = webSocketServer.insert(basicDataRequest, userId + "");
request.setDeleteRequest(deleteRequest); request.setDeleteRequest(deleteRequest);
webSocketServer.sendMessage(SocketMsgEntity.builder().type(SocketMsgType.BASIC_BUSINESS_TYPE_DELETE).content(request).remark("单据类型").build(), null); 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, "删除失败，系统繁忙"); return basicBussinessTypeService.deleteBussinessType(id) == true ? ResultVOUtils.success("删除成功") : ResultVOUtils.error(500, "删除失败，系统繁忙");
} }
@ -352,7 +339,6 @@ public class BasicBussinessTypeController extends BaseController {
cookie = cookie.substring(9); cookie = cookie.substring(9);
} }
for (int i = 0; i < files.size(); i++) { for (int i = 0; i < files.size(); i++) {
MultipartFile file = files.get(i); MultipartFile file = files.get(i);
if (file.isEmpty()) { if (file.isEmpty()) {
@ -438,7 +424,6 @@ public class BasicBussinessTypeController extends BaseController {
@GetMapping("/udiwms/localBusType/filterUnUse") @GetMapping("/udiwms/localBusType/filterUnUse")
public BaseResponse filterUnUse(BusNoUserRequest busNoUserRequest, public BaseResponse filterUnUse(BusNoUserRequest busNoUserRequest,
BindingResult bindingResult) { BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
@ -457,7 +442,6 @@ public class BasicBussinessTypeController extends BaseController {
@GetMapping("/udiwms/busType/change/origin") @GetMapping("/udiwms/busType/change/origin")
public BaseResponse changeOrigins(FilterBussinessTypeRequest bussinessTypeFilterRequest, public BaseResponse changeOrigins(FilterBussinessTypeRequest bussinessTypeFilterRequest,
BindingResult bindingResult) { BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
@ -475,7 +459,6 @@ public class BasicBussinessTypeController extends BaseController {
@GetMapping("/udiwms/busType/change/target") @GetMapping("/udiwms/busType/change/target")
public BaseResponse changeTarget(FilterBussinessTypeRequest bussinessTypeFilterRequest, public BaseResponse changeTarget(FilterBussinessTypeRequest bussinessTypeFilterRequest,
BindingResult bindingResult) { BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
@ -490,7 +473,6 @@ public class BasicBussinessTypeController extends BaseController {
@GetMapping("/udiwms/busType/selectList") @GetMapping("/udiwms/busType/selectList")
public BaseResponse selectList() { public BaseResponse selectList() {
FilterBussinessTypeRequest bussinessTypeFilterRequest = new FilterBussinessTypeRequest(); FilterBussinessTypeRequest bussinessTypeFilterRequest = new FilterBussinessTypeRequest();
bussinessTypeFilterRequest.setActionType(2); bussinessTypeFilterRequest.setActionType(2);
bussinessTypeFilterRequest.setMainAction(ConstantType.TYPE_OUT); bussinessTypeFilterRequest.setMainAction(ConstantType.TYPE_OUT);

2
src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java
Unescape Escape View File

@ -59,7 +59,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService {
if (CollUtil.isNotEmpty(dictDatas)) { if (CollUtil.isNotEmpty(dictDatas)) {
return dictDatas; return dictDatas;
} }
return null; return new ArrayList<>();
} }
/** /**

Write Preview
Loading…
Cancel
Save