diff --git a/src/main/java/com/glxp/api/constant/BasicProcessStatus.java b/src/main/java/com/glxp/api/constant/BasicProcessStatus.java index 29cbd66a..aab7eba9 100644 --- a/src/main/java/com/glxp/api/constant/BasicProcessStatus.java +++ b/src/main/java/com/glxp/api/constant/BasicProcessStatus.java @@ -25,7 +25,7 @@ public class BasicProcessStatus { public static final int BASIC_THIRD_PRODUCTS = 4; //往来单位 public static final int BASIC_THIRD_CORP = 5; //往来单位 public static final int BASIC_THIRD_ORDER = 6; //往来单位 - public static final int NEW_ALL_DATA = 7; //所有最新数据 + public static final String NEW_ALL_DATA = "7"; //用户相关信息 public static final String NEW_ALL_BUS = "8"; public static final String NEW_ALL_ORDER = "9"; public static final String NEW_ALL_BUS_ORDER = "11"; diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java index d202f19c..507f251e 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java @@ -9,15 +9,14 @@ import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.controller.purchase.PurOrderController; -import com.glxp.api.dao.basic.BasicBusTypeChangeDao; -import com.glxp.api.dao.basic.BasicBussinessTypeDao; +import com.glxp.api.dao.auth.*; +import com.glxp.api.dao.basic.*; import com.glxp.api.dao.inout.*; import com.glxp.api.dao.purchase.PurOrderDao; import com.glxp.api.dao.purchase.PurOrderDetailDao; -import com.glxp.api.dao.thrsys.ThrBusTypeOriginDao; -import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; -import com.glxp.api.entity.basic.BasicBussinessTypeEntity; -import com.glxp.api.entity.basic.EntrustReceEntity; +import com.glxp.api.dao.thrsys.*; +import com.glxp.api.entity.auth.*; +import com.glxp.api.entity.basic.*; import com.glxp.api.entity.inout.*; import com.glxp.api.entity.purchase.PurOrderDetailEntity; import com.glxp.api.entity.purchase.PurOrderEntity; @@ -25,13 +24,12 @@ import com.glxp.api.entity.sync.BasicDownloadStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusEntity; import com.glxp.api.entity.sync.SyncDataBustypeEntity; import com.glxp.api.entity.sync.SyncDataSetEntity; -import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity; +import com.glxp.api.entity.thrsys.*; +import com.glxp.api.req.basic.UdiInfoRequest; import com.glxp.api.req.sync.SpsSyncDataRequest; -import com.glxp.api.res.sync.SpSyncUdiResponse; -import com.glxp.api.res.sync.SpsSyncBusOrderResponse; -import com.glxp.api.res.sync.SpsSyncBusResponse; -import com.glxp.api.res.sync.SpsSyncOrderResponse; +import com.glxp.api.res.sync.*; import com.glxp.api.res.system.SyncDataSetResponse; +import com.glxp.api.service.auth.AuthAdminService; import com.glxp.api.service.inout.IoAddInoutService; import com.glxp.api.service.inout.IoCheckInoutService; import com.glxp.api.service.inout.IoOrderService; @@ -41,6 +39,7 @@ import com.glxp.api.service.sync.BasicDownloadService; import com.glxp.api.service.sync.BasicExportService; import com.glxp.api.service.sync.SpsSyncDownloadService; import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.DateUtil; import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; @@ -78,6 +77,20 @@ public class SpsSyncDownloadController { IoCheckInoutService ioCheckInoutService; @Resource PurOrderDetailService purOrderDetailService; + @Resource + AuthAdminDao authAdminDao; + @Resource + InvBusUserDao invBusUserDao; + @Resource + DeptDao deptDao; + @Resource + DeptUserDao deptUserDao; + @Resource + InvWarehouseDao invWarehouseDao; + @Resource + WarehouseBussinessTypeDao warehouseBussinessTypeDao; + @Resource + WarehouseUserDao warehouseUserDao; // 下发单据接口 ，供给中继服务，UDI管理系统下载 @@ -382,6 +395,93 @@ public class SpsSyncDownloadController { return ResultVOUtils.success("上传成功！"); } + + //接收中继服务、UDI管理系统上传用户数据 + @AuthRuleAnnotation("") + @PostMapping("sps/sync/userData/upload") + public BaseResponse uploadUserData(@RequestBody SpsSyncDataResponse syncDataResponse) { + if (syncDataResponse != null) { + SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); + BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity(); + basicDownloadStatusEntity.setId(CustomUtil.getId()); + basicDownloadStatusEntity.setTaskId(syncDataResponse.getTaskId()); + basicDownloadStatusEntity.setStartTime(new Date()); + basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_BASIC_DATA); + basicDownloadStatusEntity.setStatus(0); + basicDownloadStatusEntity.setType(BasicProcessStatus.NEW_ALL_DATA); + basicDownloadStatusEntity.setScheduleType(1); + + basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); + StringBuffer remark = new StringBuffer(); + + //用户表 + if (CollUtil.isNotEmpty(syncDataResponse.getAuthAdminList())) { + for (AuthAdmin authAdmin : syncDataResponse.getAuthAdminList()) { + authAdmin.setId(null); + authAdminDao.insertOrUpdate(authAdmin); + remark.append("用户信息：").append(syncDataResponse.getAuthAdminList().size()).append("条\n"); + } + } + + //用户对应单据类型 + if (CollUtil.isNotEmpty(syncDataResponse.getInvBusUserEntities())) { + for (InvBusUserEntity invBusUserEntity : syncDataResponse.getInvBusUserEntities()) { + invBusUserDao.insertOrUpdate(invBusUserEntity); + } + } + +// 部门信息 + if (CollUtil.isNotEmpty(syncDataResponse.getDeptEntityList())) { + for (DeptEntity deptEntity : syncDataResponse.getDeptEntityList()) { + deptDao.insertInvWarehouse(deptEntity); + } + } +// 部门信息关联用户信息 + if (CollUtil.isNotEmpty(syncDataResponse.getDeptUserEntities())) { + for (DeptUserEntity deptUserEntity : syncDataResponse.getDeptUserEntities()) { + deptUserDao.insertOrUpdate(deptUserEntity); + } + } + + //仓库字典导入 + if (CollUtil.isNotEmpty(syncDataResponse.getInvWarehouseEntities())) { + + for (InvWarehouseEntity invWarehouseEntity : syncDataResponse.getInvWarehouseEntities()) { + invWarehouseDao.insertOrUpdate(invWarehouseEntity); + } + remark.append("仓库字典：").append(syncDataResponse.getInvWarehouseEntities().size()).append("条\n"); + } + + + //仓库用户表 + if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseUserEntities())) { + for (WarehouseUserEntity warehouseUserEntity : syncDataResponse.getWarehouseUserEntities()) { + warehouseUserDao.insertOrUpdate(warehouseUserEntity); + } + remark.append("仓库用户信息：").append(syncDataResponse.getWarehouseUserEntities().size()).append("条\n"); + } + + //仓库单据类型表 + if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseBussinessTypeEntities())) { + for (WarehouseBussinessTypeEntity warehouseUserEntity : syncDataResponse.getWarehouseBussinessTypeEntities()) { + warehouseBussinessTypeDao.insertOrUpdate(warehouseUserEntity); + } + remark.append("仓库所属单据类型：").append(syncDataResponse.getWarehouseBussinessTypeEntities().size()).append("条\n"); + } + + + batchSession.close(); + basicDownloadStatusEntity.setStatus(1); + basicDownloadStatusEntity.setUpdateTime(new Date()); + basicDownloadStatusEntity.setEndTime(new Date()); + basicDownloadStatusEntity.setRemark(remark.toString()); + basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity); + + } + return ResultVOUtils.success("上传成功！"); + } + + //接收中继服务、UDI管理系统上传基础信息 diff --git a/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java b/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java index b43f8987..ccefcb42 100644 --- a/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java @@ -1,5 +1,7 @@ package com.glxp.api.dao.auth; +import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.DeptUserEntity; import com.glxp.api.req.auth.FilterDeptUserReqeust; import com.glxp.api.res.auth.DeptUserResponse; @@ -9,7 +11,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface DeptUserDao { +public interface DeptUserDao extends BaseMapperPlus { List selectDeptUser(FilterDeptUserReqeust filterDeptUserReqeust); @@ -18,7 +20,7 @@ public interface DeptUserDao { List selectJoinDeptUserKey(FilterDeptUserReqeust filterDeptUserReqeust); - boolean delete(@Param("deptId") Long deptId, @Param("userId") Long userId); + boolean deleteByDept(@Param("deptId") Long deptId, @Param("userId") Long userId); int deleteById(Integer id); diff --git a/src/main/java/com/glxp/api/entity/auth/DeptUserEntity.java b/src/main/java/com/glxp/api/entity/auth/DeptUserEntity.java index ffd1cf6f..bcc06e0a 100644 --- a/src/main/java/com/glxp/api/entity/auth/DeptUserEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/DeptUserEntity.java @@ -1,10 +1,15 @@ package com.glxp.api.entity.auth; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data +@TableName(value = "auth_dept_user") public class DeptUserEntity { + @TableField(value = "deptId") private Long deptId; + @TableField(value = "userId") private Long userId; } diff --git a/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java index 1e3eb700..cf0e7d5b 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java @@ -25,7 +25,6 @@ public class DeptUserServiceImpl implements DeptUserService { DeptDao deptDao; - @Override public List selectDeptUser(FilterDeptUserReqeust filterDeptUserReqeust) { if (filterDeptUserReqeust.getPage() != null) { @@ -65,7 +64,7 @@ public class DeptUserServiceImpl implements DeptUserService { @Override public boolean delete(Long deptId, Long userId) { - return deptUserDao.delete(deptId, userId); + return deptUserDao.deleteByDept(deptId, userId); } @Override diff --git a/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml b/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml index 1d105a0a..953f1165 100644 --- a/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml +++ b/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml @@ -81,7 +81,7 @@ from auth_dept_user where userId = #{userId} - + delete from auth_dept_user where userId = #{userId}