diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java index 088aefdfd..576bd48b1 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java @@ -1,6 +1,7 @@ package com.glxp.api.dao.basic; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; import com.glxp.api.req.basic.FilterBusTypeChangeRequest; import com.glxp.api.res.basic.BasicBusTypeChangeResponse; @@ -12,7 +13,7 @@ import java.util.List; * 单据转换表查询接口 */ @Mapper -public interface BasicBusTypeChangeDao extends BaseMapper { +public interface BasicBusTypeChangeDao extends BaseMapperPlus { /** * 查询单据转换设置列表 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 ef908a01b..c7be86aad 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -15,6 +15,7 @@ import com.glxp.api.dao.basic.*; import com.glxp.api.dao.inout.IoCodeLostMapper; import com.glxp.api.dao.inout.IoCodeRelMapper; import com.glxp.api.dao.purchase.*; +import com.glxp.api.dao.thrsys.ThrBusTypeOriginDao; import com.glxp.api.dto.RelaySyncDto; import com.glxp.api.entity.basic.*; import com.glxp.api.entity.inout.*; @@ -949,8 +950,11 @@ public class HeartService { case OTHER_DATA: this.insertOtherData(bean.getFileContent()); break; -// case COUNTRY_DI_DATA: -// break; + case DOCUMENT_TYPE_DATA: + this.insertDocumentTypeData(bean.getFileContent()); + break; + case COUNTRY_DI_DATA: + break; } String taskId = bean.getTaskId(); if (StrUtil.isNotBlank(taskId)) { @@ -1046,6 +1050,32 @@ public class HeartService { } } + + private final BasicBussinessTypeDao bussinessTypeDao; + private final BasicBusTypeChangeDao busTypeChangeDao; + private final ThrBusTypeOriginDao thrBusTypeOriginDao; + /** + * 设置嵌套事物 + * + * @param content 内容 + */ + @Transactional(propagation = Propagation.NESTED) + public void insertDocumentTypeData(String content) { + cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(content); + List bussinessTypeEntities = JSONUtil.toList(jsonObject.getJSONArray(BasicBussinessTypeEntity.class.getSimpleName()), BasicBussinessTypeEntity.class); + List busTypeChangeEntities = JSONUtil.toList(jsonObject.getJSONArray(BasicBusTypeChangeEntity.class.getSimpleName()), BasicBusTypeChangeEntity.class); + List typeOriginEntities = JSONUtil.toList(jsonObject.getJSONArray(ThrBusTypeOriginEntity.class.getSimpleName()), ThrBusTypeOriginEntity.class); + if (CollectionUtil.isNotEmpty(bussinessTypeEntities)) { + bussinessTypeDao.insertOrUpdateBatch(bussinessTypeEntities); + } + if (CollectionUtil.isNotEmpty(busTypeChangeEntities)) { + busTypeChangeDao.insertOrUpdateBatch(busTypeChangeEntities); + } + if (CollectionUtil.isNotEmpty(typeOriginEntities)) { + thrBusTypeOriginDao.insertOrUpdateBatch(typeOriginEntities); + } + } + /** * 从UDI自助平台拉取基础数据 */