From 75d388e121f409698d9eeb96f360f3ef6d5122cd Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 28 Apr 2023 21:34:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=8A=9F=E8=83=BD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/auth/SysUserController.java | 36 ++++++++--------- .../controller/thrsys/ThrDeptController.java | 11 +++-- .../com/glxp/api/dao/auth/InvSpaceDao.java | 2 - .../glxp/api/http/sync/SpGetHttpClient.java | 16 +++++--- .../auth/impl/InvSpaceServiceImpl.java | 10 +++-- .../auth/impl/InvWarehouseServiceImpl.java | 2 +- .../glxp/api/service/sync/HeartService.java | 4 +- .../api/service/thrsys/ThrDeptService.java | 2 + .../thrsys/impl/ThrDeptServiceImpl.java | 8 +++- .../java/com/glxp/api/task/SyncHeartTask.java | 2 +- .../mybatis/mapper/auth/InvSpaceDao.xml | 40 +++++++------------ .../mybatis/mapper/auth/InvWarehouseDao.xml | 3 ++ src/main/resources/schemas/schema_v2.1.sql | 2 +- 13 files changed, 72 insertions(+), 66 deletions(-) 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 642ed02fe..53d6a7afa 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysUserController.java @@ -71,24 +71,24 @@ public class SysUserController extends BaseController { AuthAdminResponse authAdminResponse = new AuthAdminResponse(); BeanUtils.copyProperties(item, authAdminResponse); List roles = sysRoleService.selectRoleListByUserId(authAdminResponse.getId()); - List deptUserResponses=null; - if("key".equals(filterAuthUserRequest.getKey())){ - deptUserResponses = deptUserService.selectByUserIdKey(authAdminResponse.getId()); - }else{ + List deptUserResponses = null; + if ("key".equals(filterAuthUserRequest.getKey())) { + deptUserResponses = deptUserService.selectByUserIdKey(authAdminResponse.getId()); + } else { deptUserResponses = deptUserService.selectByUserId(authAdminResponse.getId()); } if (CollUtil.isNotEmpty(deptUserResponses)) { List depts = new ArrayList<>(); String deptName = ""; for (DeptUserResponse deptUserResponse : deptUserResponses) { - if(deptUserResponse.getDeptId()!=1){ + if (deptUserResponse.getDeptId() != 1) { depts.add(deptUserResponse.getDeptId()); deptName = deptName + "," + deptUserResponse.getDeptName(); } } - if(deptName.length()!=0){ + if (deptName.length() != 0) { authAdminResponse.setDeptName(deptName.substring(1)); - }else{ + } else { authAdminResponse.setDeptName(deptName); } authAdminResponse.setDepts(depts); @@ -190,9 +190,9 @@ public class SysUserController extends BaseController { } //默认插入第一部门 - List deptCodeList=authUserSaveRequest.getDepts(); - if(deptCodeList == null){ - deptCodeList=new ArrayList<>(); + List deptCodeList = authUserSaveRequest.getDepts(); + if (deptCodeList == null) { + deptCodeList = new ArrayList<>(); } deptCodeList.add(1L); authUserSaveRequest.setDepts(deptCodeList); @@ -261,7 +261,7 @@ public class SysUserController extends BaseController { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); } // 修改角色 - // userService.insertUserAuth(authAdmin.getId(), authUserSaveRequest.getRoles()); + // userService.insertUserAuth(authAdmin.getId(), authUserSaveRequest.getRoles()); userService.updateAuthAdmin(authAdmin); @@ -270,19 +270,19 @@ public class SysUserController extends BaseController { FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust(); filterDeptUserReqeust.setUserId(authUserSaveRequest.getId()); List deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust); - if(deptUserEntities == null){ + if (deptUserEntities == null) { deptCodeList.add(1L); authUserSaveRequest.setDepts(deptCodeList); - }else{ - Boolean checkDeptId=false; + } else { + Boolean checkDeptId = false; for (DeptUserEntity deptUserEntity : deptUserEntities) { - if(deptUserEntity.getDeptId() == 1){ - checkDeptId=true; - }else{ + if (deptUserEntity.getDeptId() == 1) { + checkDeptId = true; + } else { deptCodeList.add(deptUserEntity.getDeptId()); } } - if(checkDeptId==false){ + if (checkDeptId == false) { deptCodeList.add(1L); authUserSaveRequest.setDepts(deptCodeList); } diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java index fd558aa7b..843519757 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java @@ -90,7 +90,7 @@ public class ThrDeptController { @PostMapping("/spms/thrsys/warehouse/edit") public BaseResponse edit(@RequestBody @Valid ThrDeptEntity thrDeptEntity, - BindingResult bindingResult,FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest,FilterThrDeptRequest filterThrDeptRequest) { + BindingResult bindingResult, FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest, FilterThrDeptRequest filterThrDeptRequest) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -108,13 +108,12 @@ public class ThrDeptController { //修改仓库 thrInvWarehouseService.updateThrInvWarehouse(thrInvWarehouseEntity); } - //判断部门是否存在 + //判断部门是否存在 filterThrDeptRequest.setCode(thrDeptEntity.getCode()); filterThrDeptRequest.setName(thrDeptEntity.getName()); filterThrDeptRequest.setThirdSysFk(thrDeptEntity.getThirdSysFk()); filterThrDeptRequest.setStatus(thrDeptEntity.getStatus()); - List thrDeptEntities = thrDeptService.filterThrInvWarehouse(filterThrDeptRequest); - if(thrDeptEntities.size()==0 ){ + if (!thrDeptService.editExit(thrDeptEntity.getCode(), thrDeptEntity.getCode(), thrDeptEntity.getId())) { thrDeptEntity.setPid(null); // 不能修改父级 pid thrDeptEntity.setUpdateTime(new Date()); boolean b = thrDeptService.updateInvWarehouse(thrDeptEntity); @@ -122,7 +121,7 @@ public class ThrDeptController { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); } return ResultVOUtils.success(); - }else{ + } else { return ResultVOUtils.error(ResultEnum.DATA_REPEAT); } @@ -158,7 +157,7 @@ public class ThrDeptController { // } // filterThrSubInvWarehouseRequest.setParentId((String) thirdId); filterThrSubInvWarehouseRequest.setStatus(0); - List thrInvWarehouseEntities = thrInvWarehouseService.selectByThrDeptCode(filterThrSubInvWarehouseRequest); + List thrInvWarehouseEntities = thrInvWarehouseService.selectByThrDeptCode(filterThrSubInvWarehouseRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(thrInvWarehouseEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); diff --git a/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java b/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java index fdb5931f0..8615c95b3 100644 --- a/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java +++ b/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java @@ -12,13 +12,11 @@ import java.util.List; @Mapper public interface InvSpaceDao extends BaseMapperPlus { - int deleteByPrimaryKey(Integer id); int insertEntity(InvSpace record); int insertSelective(InvSpace record); - InvSpace selectByPrimaryKey(Integer id); int updateByPrimaryKeySelective(InvSpace record); diff --git a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java index 6a010dec7..070e99c07 100644 --- a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java +++ b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java @@ -154,11 +154,17 @@ public class SpGetHttpClient { public BaseResponse updateSynsSet(SyncDataSetResponse syncDataSetResponse) { String json = JSONUtil.toJsonStr(syncDataSetResponse); - String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/system/param/syncData/save", json, buildHeader()); - BaseResponse response = - JSONObject.parseObject(result, new TypeReference>() { - }); - return response; + try { + String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/system/param/syncData/save", json, buildHeader()); + BaseResponse response = + JSONObject.parseObject(result, new TypeReference>() { + }); + return response; + } catch (Exception e) { + e.printStackTrace(); + } + return ResultVOUtils.error(500, "连接上级服务失败"); + } diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java index 8eed488e0..280f5e102 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; @@ -68,7 +69,8 @@ public class InvSpaceServiceImpl extends ServiceImpl impl invSpace.setUpdateTime(date); invSpace.setCreateUser(user.getUserName()); invSpace.setUpdateUser(user.getUserName()); - invSpaceDao.insertEntity(invSpace); + invSpace.setId(IdUtil.getSnowflakeNextId()); + invSpaceDao.insert(invSpace); return ResultVOUtils.success(); } @@ -92,8 +94,8 @@ public class InvSpaceServiceImpl extends ServiceImpl impl @Override public BaseResponse deleteSpace(String id) { //校验此货位是否已经被使用，如果已经被使用，不能删除 - Integer spaceId = Integer.valueOf(id); - InvSpace invSpace = invSpaceDao.selectByPrimaryKey(spaceId); + Long spaceId = Long.valueOf(id); + InvSpace invSpace = invSpaceDao.selectById(spaceId); //todo 代码迁移，后面记得修改 @@ -108,7 +110,7 @@ public class InvSpaceServiceImpl extends ServiceImpl impl // if (count > 0) { // return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "此货位已被使用，无法删除！"); // } - invSpaceDao.deleteByPrimaryKey(spaceId); + invSpaceDao.deleteById(spaceId); return ResultVOUtils.success(); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java index 91bff5a72..1f7d1b0c1 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java @@ -122,7 +122,7 @@ public class InvWarehouseServiceImpl extends ServiceImpl 0; } @Override diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index 6ece8f4fb..b1d8cec05 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -247,7 +247,7 @@ public class HeartService { } break; case USER_DATA: - if (!needExec(info.getBasicDept(), info.getBasicInv(), info.getSysUser())) { + if (needExec(info.getBasicDept(), info.getBasicInv(), info.getSysUser())) { uploadData(exportType, taskId, x -> x.getUserData(info, taskId, now, syncTime)); } break; @@ -758,7 +758,7 @@ public class HeartService { syncTimeMap.put("oldDate", syncTime); //确认有开启第三方部门信息同步 - if (needExec(info.getBasicThirdDept())) { + if (needExec(info.getBasicThirdInv())) { Map map; if (syncTime == null) { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_DEPT); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java b/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java index e9e415d3a..55fbd0f27 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java @@ -14,6 +14,8 @@ public interface ThrDeptService extends IService { ThrDeptEntity findDefault(Boolean advaceType, Boolean isDefault); + boolean editExit(String code, String thirdSysFk, Long id); + List filterThrInvWarehouse(FilterThrDeptRequest filterThrDeptRequest); List filterGroupInvWarehouse(FilterThrDeptRequest filterThrDeptRequest); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java index f79172bd0..e01d38dbc 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java @@ -2,6 +2,7 @@ package com.glxp.api.service.thrsys.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; @@ -27,7 +28,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class ThrDeptServiceImpl extends ServiceImpl implements ThrDeptService { +public class ThrDeptServiceImpl extends ServiceImpl implements ThrDeptService { @Resource private ThrDeptDao thrDeptDao; @@ -48,6 +49,11 @@ public class ThrDeptServiceImpl extends ServiceImpl im return null; } + @Override + public boolean editExit(String code, String thirdSysFk, Long id) { + return thrDeptDao.exists(new QueryWrapper().eq("code", code).eq("thirdSysFk", thirdSysFk).ne("id", id)); + } + @Override public List filterThrInvWarehouse(FilterThrDeptRequest filterThrDeptRequest) { if (filterThrDeptRequest == null) { diff --git a/src/main/java/com/glxp/api/task/SyncHeartTask.java b/src/main/java/com/glxp/api/task/SyncHeartTask.java index 932e4b435..6c80753f5 100644 --- a/src/main/java/com/glxp/api/task/SyncHeartTask.java +++ b/src/main/java/com/glxp/api/task/SyncHeartTask.java @@ -60,7 +60,7 @@ public class SyncHeartTask implements SchedulingConfigurer { //定时上传最近更新基础数据至上游轮询时间 - long timeInterval1 = syncDataSetEntity.getSyncTime() * 60 * 1000L; + long timeInterval1 = syncDataSetEntity.getSyncTime() * 6 * 1000L; long curTime1 = System.currentTimeMillis(); Long lastTime1 = (Long) redisUtil.get("SPS_SYNC_UPLOAD_DATA"); if (lastTime1 == null) { diff --git a/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml b/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml index 7847c6588..f24fb02ca 100644 --- a/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml @@ -31,25 +31,13 @@ remark - - - - delete - from auth_space - where id = #{id,jdbcType=INTEGER} - insert into auth_space (code, `name`, type, invStorageCode, - invWarehouseCode, `status`, createTime, - updateTime, `createUser`, updateUser, - remark) + invWarehouseCode, `status`, createTime, + updateTime, `createUser`, updateUser, + remark) values (#{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{invStorageCode,jdbcType=VARCHAR}, #{invWarehouseCode,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, @@ -255,9 +243,9 @@ insert into auth_space - (code, `name`, type, invStorageCode, invWarehouseCode, `status`, createTime, updateTime, - `createUser`, updateUser, remark) - values + (code, `name`, type, invStorageCode, invWarehouseCode, `status`, createTime, updateTime, + `createUser`, updateUser, remark) + values (#{item.code,jdbcType=VARCHAR}, #{item.name,jdbcType=VARCHAR}, #{item.type,jdbcType=VARCHAR}, #{item.invStorageCode,jdbcType=VARCHAR}, @@ -269,13 +257,14 @@ - select s.*, w.name invStorageName, iws.name invSubStorageName from auth_space s - left join auth_dept w on s.invStorageCode = w.code - left join auth_warehouse iws on s.invWarehouseCode = iws.code + left join auth_dept w on s.invStorageCode = w.code + left join auth_warehouse iws on s.invWarehouseCode = iws.code AND s.invStorageCode = #{invStorageCode} @@ -318,8 +307,8 @@ select - + from auth_space @@ -401,7 +390,8 @@