diff --git a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java index 0acfe7c51..cfd599c33 100644 --- a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java +++ b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java @@ -69,6 +69,11 @@ public enum BasicExportTypeEnum { * 药品关联信息任务同步 */ DRUG_DATA_TASK("drug_data_task", "药品关联信息数据"), + + /** + * 医共体数据 + */ + UNIFY_DATA("unify_data", "医共体数据"), // // NEW_ALL_ORDER("all_order", "出入库扫码单据"), // ALL_BUS_ORDER("all_bus_order", "业务单据"), diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index ff3d10a3a..668f4f64f 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -2,12 +2,15 @@ package com.glxp.api.controller.basic; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.thread.ThreadUtil; +import com.glxp.api.dao.auth.WarehouseUserDao; import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.dto.DictDto; +import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.thrsys.CodeRel; import com.glxp.api.entity.thrsys.YbDrug; import com.glxp.api.http.ErpBasicClient; import com.glxp.api.http.sync.SpsDirectClient; +import com.glxp.api.req.auth.FilterInvLinkDataRequest; import com.glxp.api.res.chs.YbHcflEntityResponse; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inv.impl.InvProductService; @@ -54,10 +57,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; @RestController @@ -90,6 +90,8 @@ public class UdiRelevanceController extends BaseController { YbDrugService ybDrugService; @Resource SpsDirectClient spsDirectClient; + @Resource + WarehouseUserDao warehouseUserDao; //手持终端下载UDI产品信息 @@ -653,101 +655,102 @@ public class UdiRelevanceController extends BaseController { return ResultVOUtils.success(); FilterBasicThirdSysRequest filterBasicThirdSysRequest = new FilterBasicThirdSysRequest(); filterBasicThirdSysRequest.setEnabled(true); + String customerId = getCustomerId(); + if (!"110".equals(customerId)){ + FilterInvLinkDataRequest filterInvLinkDataRequest = new FilterInvLinkDataRequest(); + filterInvLinkDataRequest.setCustomerId(customerId); + List invWarehouseEntities = warehouseUserDao.authWarehouseListByCustomerId(filterInvLinkDataRequest); + if (CollUtil.isNotEmpty(invWarehouseEntities)){ + + List thirdIds = invWarehouseEntities.stream() + .map(InvWarehouseEntity::getThirdId) // 提取 thirdId + .filter(Objects::nonNull) // 排除 null 值 + .filter(s -> !s.isEmpty()) // 排除空字符串 + .distinct() // 去重 + .collect(Collectors.toList()); // 收集到 List + + filterBasicThirdSysRequest.setThirdIds(thirdIds); + } + } List basicThirdSysEntities = thrSystemService.filterBasicThiSys(filterBasicThirdSysRequest); List basicProductThirdSysResponses = new ArrayList<>(); if (basicThirdSysEntities != null && basicThirdSysEntities.size() > 0) { for (ThrSystemEntity thrSystemEntity : basicThirdSysEntities) { - if (thrSystemEntity.getThirdId().equals("thirdId")) { - BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse(); - if (StrUtil.isNotEmpty(udiRelevanceEntity.getThirdId())) - basicProductThirdSysResponse.setThirdId(udiRelevanceEntity.getThirdId()); - basicProductThirdSysResponse.setSysName(thrSystemEntity.getThirdName()); - basicProductThirdSysResponse.setSysId(thrSystemEntity.getThirdId()); - if (udiRelevanceEntity.getThirdId() != null && !udiRelevanceEntity.getThirdId().isEmpty()) { - if (udiRelevanceEntity.getThirdId() != null) { - ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getThirdId(), "thirdId"); - if (thrProductsEntity != null) { - basicProductThirdSysResponse.setManufactory(thrProductsEntity.getManufactory()); - basicProductThirdSysResponse.setRegisterNo(thrProductsEntity.getRegisterNo()); - basicProductThirdSysResponse.setSpec(thrProductsEntity.getSpec()); - basicProductThirdSysResponse.setThirdName(thrProductsEntity.getName()); - } - } - } - basicProductThirdSysResponses.add(basicProductThirdSysResponse); - } - if (thrSystemEntity.getThirdId().equals("thirdId1")) { - BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse(); - if (StrUtil.isNotEmpty(udiRelevanceEntity.getThirdId1())) - basicProductThirdSysResponse.setThirdId(udiRelevanceEntity.getThirdId1()); - basicProductThirdSysResponse.setSysName(thrSystemEntity.getThirdName()); - basicProductThirdSysResponse.setSysId(thrSystemEntity.getThirdId()); - if (udiRelevanceEntity.getThirdId1() != null && !udiRelevanceEntity.getThirdId1().isEmpty()) { - ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getThirdId1(), "thirdId1"); - if (thrProductsEntity != null) { - basicProductThirdSysResponse.setManufactory(thrProductsEntity.getManufactory()); - basicProductThirdSysResponse.setRegisterNo(thrProductsEntity.getRegisterNo()); - basicProductThirdSysResponse.setSpec(thrProductsEntity.getSpec()); - basicProductThirdSysResponse.setThirdName(thrProductsEntity.getName()); - } - } - basicProductThirdSysResponses.add(basicProductThirdSysResponse); - } - if (thrSystemEntity.getThirdId().equals("thirdId2")) { - BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse(); - if (StrUtil.isNotEmpty(udiRelevanceEntity.getThirdId2())) - basicProductThirdSysResponse.setThirdId(udiRelevanceEntity.getThirdId2()); - basicProductThirdSysResponse.setSysName(thrSystemEntity.getThirdName()); - basicProductThirdSysResponse.setSysId(thrSystemEntity.getThirdId()); - if (udiRelevanceEntity.getThirdId2() != null && !udiRelevanceEntity.getThirdId2().isEmpty()) { - ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getThirdId2(), "thirdId2"); - if (thrProductsEntity != null) { - basicProductThirdSysResponse.setManufactory(thrProductsEntity.getManufactory()); - basicProductThirdSysResponse.setRegisterNo(thrProductsEntity.getRegisterNo()); - basicProductThirdSysResponse.setSpec(thrProductsEntity.getSpec()); - basicProductThirdSysResponse.setThirdName(thrProductsEntity.getName()); - } - } - basicProductThirdSysResponses.add(basicProductThirdSysResponse); + String thirdId = thrSystemEntity.getThirdId(); + String correspondingId = null; + switch (thirdId) { + case "thirdId": + correspondingId = udiRelevanceEntity.getThirdId(); + break; + case "thirdId1": + correspondingId = udiRelevanceEntity.getThirdId1(); + break; + case "thirdId3": + correspondingId = udiRelevanceEntity.getThirdId3(); + break; + case "thirdId4": + correspondingId = udiRelevanceEntity.getThirdId4(); + break; + case "thirdId5": + correspondingId = udiRelevanceEntity.getThirdId5(); + break; + case "thirdId6": + correspondingId = udiRelevanceEntity.getThirdId6(); + break; + case "thirdId7": + correspondingId = udiRelevanceEntity.getThirdId7(); + break; + case "thirdId8": + correspondingId = udiRelevanceEntity.getThirdId8(); + break; + case "thirdId9": + correspondingId = udiRelevanceEntity.getThirdId9(); + break; + case "thirdId10": + correspondingId = udiRelevanceEntity.getThirdId10(); + break; + case "thirdId11": + correspondingId = udiRelevanceEntity.getThirdId11(); + break; + case "thirdId12": + correspondingId = udiRelevanceEntity.getThirdId12(); + break; + case "thirdId13": + correspondingId = udiRelevanceEntity.getThirdId13(); + break; + case "thirdId14": + correspondingId = udiRelevanceEntity.getThirdId14(); + break; + case "thirdId15": + correspondingId = udiRelevanceEntity.getThirdId15(); + break; + case "thirdId16": + correspondingId = udiRelevanceEntity.getThirdId16(); + break; + case "thirdId17": + correspondingId = udiRelevanceEntity.getThirdId17(); + break; + case "thirdId18": + correspondingId = udiRelevanceEntity.getThirdId18(); + break; + case "thirdId19": + correspondingId = udiRelevanceEntity.getThirdId19(); + break; + case "thirdId20": + correspondingId = udiRelevanceEntity.getThirdId20(); + break; + default: + // 处理未知的 thirdId + break; } - if (thrSystemEntity.getThirdId().equals("thirdId3")) { - BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse(); - if (StrUtil.isNotEmpty(udiRelevanceEntity.getThirdId3())) - basicProductThirdSysResponse.setThirdId(udiRelevanceEntity.getThirdId3()); - basicProductThirdSysResponse.setSysName(thrSystemEntity.getThirdName()); - basicProductThirdSysResponse.setSysId(thrSystemEntity.getThirdId()); - if (udiRelevanceEntity.getThirdId3() != null && !udiRelevanceEntity.getThirdId3().isEmpty()) { - ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getThirdId3(), "thirdId3"); - if (thrProductsEntity != null) { - basicProductThirdSysResponse.setManufactory(thrProductsEntity.getManufactory()); - basicProductThirdSysResponse.setRegisterNo(thrProductsEntity.getRegisterNo()); - basicProductThirdSysResponse.setSpec(thrProductsEntity.getSpec()); - basicProductThirdSysResponse.setThirdName(thrProductsEntity.getName()); - } - } - basicProductThirdSysResponses.add(basicProductThirdSysResponse); - } - if (thrSystemEntity.getThirdId().equals("thirdId4")) { - BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse(); - if (StrUtil.isNotEmpty(udiRelevanceEntity.getThirdId4())) - basicProductThirdSysResponse.setThirdId(udiRelevanceEntity.getThirdId4()); - basicProductThirdSysResponse.setSysName(thrSystemEntity.getThirdName()); - basicProductThirdSysResponse.setSysId(thrSystemEntity.getThirdId()); - if (udiRelevanceEntity.getThirdId4() != null && !udiRelevanceEntity.getThirdId4().isEmpty()) { - ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getThirdId4(), "thirdId4"); - if (thrProductsEntity != null) { - basicProductThirdSysResponse.setManufactory(thrProductsEntity.getManufactory()); - basicProductThirdSysResponse.setRegisterNo(thrProductsEntity.getRegisterNo()); - basicProductThirdSysResponse.setSpec(thrProductsEntity.getSpec()); - basicProductThirdSysResponse.setThirdName(thrProductsEntity.getName()); - - } + if (correspondingId != null) { + BasicProductThirdSysResponse response = handleThirdId(thirdId, correspondingId, thrSystemEntity); + if (response != null) { + basicProductThirdSysResponses.add(response); } - - basicProductThirdSysResponses.add(basicProductThirdSysResponse); } } } @@ -759,6 +762,28 @@ public class UdiRelevanceController extends BaseController { return ResultVOUtils.success(pageSimpleResponse); } + // 假设 handleThirdId 方法返回 null 或一个有效的 BasicProductThirdSysResponse 对象 + private BasicProductThirdSysResponse handleThirdId(String thirdId, String value, ThrSystemEntity thrSystemEntity) { + BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse(); + if (StrUtil.isNotEmpty(value)) { + if (StrUtil.isNotEmpty(value)) + basicProductThirdSysResponse.setThirdId(value); + basicProductThirdSysResponse.setSysName(thrSystemEntity.getThirdName()); + basicProductThirdSysResponse.setSysId(thrSystemEntity.getThirdId()); + if (value != null && !value.isEmpty()) { + if (value != null) { + ThrProductsEntity thrProductsEntity = thrDataService.getProducts(value, thirdId); + if (thrProductsEntity != null) { + basicProductThirdSysResponse.setManufactory(thrProductsEntity.getManufactory()); + basicProductThirdSysResponse.setRegisterNo(thrProductsEntity.getRegisterNo()); + basicProductThirdSysResponse.setSpec(thrProductsEntity.getSpec()); + basicProductThirdSysResponse.setThirdName(thrProductsEntity.getName()); + } + } + } + } + return basicProductThirdSysResponse; + } //获取是否启用供应商维护产品信息 @AuthRuleAnnotation("") diff --git a/src/main/java/com/glxp/api/dao/auth/AuthWarehouseUnifyMapper.java b/src/main/java/com/glxp/api/dao/auth/AuthWarehouseUnifyMapper.java new file mode 100644 index 000000000..6fa410bf6 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/auth/AuthWarehouseUnifyMapper.java @@ -0,0 +1,10 @@ +package com.glxp.api.dao.auth; + +import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.entity.auth.AuthWarehouseUnify; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface AuthWarehouseUnifyMapper extends BaseMapperPlus { + +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java index 109b703e8..562fee989 100644 --- a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java @@ -1,6 +1,7 @@ package com.glxp.api.dao.auth; import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.auth.WarehouseUserEntity; import com.glxp.api.req.auth.FilterInvLinkDataRequest; import com.glxp.api.req.auth.FilterInvUserRequest; @@ -68,4 +69,6 @@ public interface WarehouseUserDao extends BaseMapperPlus authWarehouseListByCustomerId(FilterInvLinkDataRequest filterInvLinkDataRequest); } diff --git a/src/main/java/com/glxp/api/entity/auth/AuthWarehouseUnify.java b/src/main/java/com/glxp/api/entity/auth/AuthWarehouseUnify.java new file mode 100644 index 000000000..bda612106 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/auth/AuthWarehouseUnify.java @@ -0,0 +1,37 @@ +package com.glxp.api.entity.auth; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 医院共同体关系表 + */ +@Data +@TableName(value = "auth_warehouse_unify") +public class AuthWarehouseUnify { + + @TableId(value = "id", type = IdType.INPUT) + private Long id; + + /** + * 仓库编码 + */ + @TableField("code") + private String code; + + /** + * 客户ID + */ + @TableField("customerId") + private String customerId; + + @TableField("updateTime") + private Date updateTime; + + +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/auth/InvWarehouseEntity.java b/src/main/java/com/glxp/api/entity/auth/InvWarehouseEntity.java index da0e864af..2a322b1e6 100644 --- a/src/main/java/com/glxp/api/entity/auth/InvWarehouseEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/InvWarehouseEntity.java @@ -129,5 +129,9 @@ public class InvWarehouseEntity { return Objects.equals(code, person.getCode()); } - + /** + * 是否医院标识 0否 1是 + */ + @TableField(value = "unifyUse") + private Boolean unifyUse; } diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java index 47d36ea8d..69eb413f2 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java @@ -67,6 +67,103 @@ public class UdiRelevanceEntity { @TableField(value = "thirdId4") private String thirdId4; + /** + * 第三方产品ID4 + */ + @TableField(value = "thirdId5") + private String thirdId5; + + /** + * 第三方产品ID4 + */ + @TableField(value = "thirdId6") + private String thirdId6; + + /** + * 第三方产品ID4 + */ + @TableField(value = "thirdId7") + private String thirdId7; + + /** + * 第三方产品ID4 + */ + @TableField(value = "thirdId8") + private String thirdId8; + + /** + * 第三方产品ID4 + */ + @TableField(value = "thirdId9") + private String thirdId9; + + /** + * 第三方产品ID4 + */ + @TableField(value = "thirdId10") + private String thirdId10; + + /** + * 第三方产品ID4 + */ + @TableField(value = "thirdId11") + private String thirdId11; + + /** + * 第三方产品ID4 + */ + @TableField(value = "thirdId12") + private String thirdId12; + + /** + * 第三方产品ID4 + */ + @TableField(value = "thirdId13") + private String thirdId13; + + /** + * 第三方产品ID4 + */ + @TableField(value = "thirdId14") + private String thirdId14; + + /** + * 第三方产品ID4 + */ + @TableField(value = "thirdId15") + private String thirdId15; + + /** + * 第三方产品ID4 + */ + @TableField(value = "thirdId16") + private String thirdId16; + + /** + * 第三方产品ID4 + */ + @TableField(value = "thirdId17") + private String thirdId17; + /** + * 第三方产品ID4 + */ + @TableField(value = "thirdId18") + private String thirdId18; + + /** + * 第三方产品ID4 + */ + @TableField(value = "thirdId19") + private String thirdId19; + + + /** + * 第三方产品ID4 + */ + @TableField(value = "thirdId20") + private String thirdId20; + + /** * 阳光采购平台编码 */ diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java index 58fc1977b..13bf8ef6f 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java @@ -15,6 +15,6 @@ public class FilterInvLinkDataRequest extends ListPageRequest { private String employeeName; private Long listUser[]; private String parentId; - + private String customerId; } diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterBasicThirdSysRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterBasicThirdSysRequest.java index 74492f895..597445dec 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterBasicThirdSysRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterBasicThirdSysRequest.java @@ -3,10 +3,13 @@ package com.glxp.api.req.thrsys; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; +import java.util.List; + @Data public class FilterBasicThirdSysRequest extends ListPageRequest { private String thirdId; + private List thirdIds; private String thirdName; private Boolean enabled; private Integer fromType; diff --git a/src/main/java/com/glxp/api/service/auth/AuthWarehouseUnifyService.java b/src/main/java/com/glxp/api/service/auth/AuthWarehouseUnifyService.java new file mode 100644 index 000000000..b0137ef73 --- /dev/null +++ b/src/main/java/com/glxp/api/service/auth/AuthWarehouseUnifyService.java @@ -0,0 +1,8 @@ +package com.glxp.api.service.auth; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.glxp.api.entity.auth.AuthWarehouseUnify; + +public interface AuthWarehouseUnifyService extends IService { + void deleteWarehouseCustomer(AuthWarehouseUnify authWarehouseUnify); +} diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthWarehouseUnifyServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthWarehouseUnifyServiceImpl.java new file mode 100644 index 000000000..10f9967cb --- /dev/null +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthWarehouseUnifyServiceImpl.java @@ -0,0 +1,23 @@ +package com.glxp.api.service.auth.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.dao.auth.AuthWarehouseUnifyMapper; +import com.glxp.api.entity.auth.AuthWarehouseUnify; +import com.glxp.api.service.auth.AuthWarehouseUnifyService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; + +@Service +@Transactional(rollbackFor = Exception.class) +public class AuthWarehouseUnifyServiceImpl extends ServiceImpl implements AuthWarehouseUnifyService { + + @Resource + AuthWarehouseUnifyMapper authWarehouseUnifyMapper; + + @Override + public void deleteWarehouseCustomer(AuthWarehouseUnify authWarehouseUnify) { + authWarehouseUnifyMapper.deleteById(authWarehouseUnify.getId()); + } +} 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 cfc7503c0..664dad2bd 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.glxp.api.dao.auth.AuthWarehouseUnifyMapper; import com.glxp.api.dao.collect.RelCodeBatchMapper; import com.glxp.api.dao.collect.RelCodeDetailMapper; import com.glxp.api.dao.dev.*; @@ -117,6 +118,8 @@ public class HeartService { IoOrderDetailCodeService orderDetailCodeService; @Resource IoOrderDetailResultService orderDetailResultService; + @Resource + AuthWarehouseUnifyService authWarehouseUnifyService; @Resource IoOrderInvoiceMapper ioOrderInvoiceMapper; @@ -1812,6 +1815,10 @@ public class HeartService { case DRUG_DATA_TASK: this.insertDrugData(bean.getFileContent()); break; + case UNIFY_DATA: + this.insertUnifyData(bean.getFileContent()); + break; + } String taskId = bean.getTaskId(); if (StrUtil.isNotBlank(taskId)) { @@ -1841,6 +1848,28 @@ public class HeartService { } } } + /** + * 设置嵌套事物 + * + * @param content 内容 + */ + @Transactional(propagation = Propagation.NESTED) + public void insertUnifyData(String content) { + cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(content); + List authWarehouseUnifies = JSONUtil.toList(jsonObject.getJSONArray(AuthWarehouseUnify.class.getSimpleName()), AuthWarehouseUnify.class); + if (CollectionUtil.isNotEmpty(authWarehouseUnifies)) { + for (AuthWarehouseUnify authWarehouseUnify : authWarehouseUnifies) { + authWarehouseUnify.setUpdateTime(null); + } + boolean b = authWarehouseUnifyService.saveOrUpdateBatch(authWarehouseUnifies); + if (b == false) { + } + } + List syncFiles = JSONUtil.toList(jsonObject.getJSONArray("syncFiles"), String.class); + if (CollUtil.isNotEmpty(syncFiles)) { + fileService.download(syncFiles); + } + } /** diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 2da350c4d..2fbe4070e 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_hlfy_pro?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://192.168.0.43:3306/udi_wms_unify?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: diff --git a/src/main/resources/mybatis/mapper/auth/AuthWarehouseUnifyMapper.xml b/src/main/resources/mybatis/mapper/auth/AuthWarehouseUnifyMapper.xml new file mode 100644 index 000000000..e306ec9ea --- /dev/null +++ b/src/main/resources/mybatis/mapper/auth/AuthWarehouseUnifyMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml b/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml index 38f7fa303..383f7e3da 100644 --- a/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml +++ b/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml @@ -325,4 +325,22 @@ set isDirector = #{isDirector} where id = #{id} + + diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrSystemDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrSystemDao.xml index b00e05fc0..7518fb9a5 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrSystemDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrSystemDao.xml @@ -36,6 +36,12 @@ AND mainSys = #{mainSys} + + and thirdId in + + #{item} + +