From f2e715bd9a8815b5ee0bd3ad8d7f8c21684b4e0d Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 6 Apr 2023 10:53:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=EF=BC=8C=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sync/SyncDataSetController.java | 8 ++++ .../dao/sync/SyncDataChangeBustypesDao.java | 7 +++ .../sync/SyncDataChangeBustypesEntity.java | 31 +++++++++++++ .../api/res/system/SyncDataSetResponse.java | 4 +- .../impl/DeviceRepairOrderServiceImpl.java | 1 + .../sync/SyncDataChangeBustypeService.java | 18 ++++++++ .../SyncDataChangeBustypeServiceImpl.java | 44 +++++++++++++++++++ .../sync/impl/SyncDataSetServiceImpl.java | 7 +++ .../mapper/sync/SyncDataChangeBustypesDao.xml | 17 +++++++ 9 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/glxp/api/dao/sync/SyncDataChangeBustypesDao.java create mode 100644 src/main/java/com/glxp/api/entity/sync/SyncDataChangeBustypesEntity.java create mode 100644 src/main/java/com/glxp/api/service/sync/SyncDataChangeBustypeService.java create mode 100644 src/main/java/com/glxp/api/service/sync/impl/SyncDataChangeBustypeServiceImpl.java create mode 100644 src/main/resources/mybatis/mapper/sync/SyncDataChangeBustypesDao.xml diff --git a/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java index 1350b88a5..c63e17bec 100644 --- a/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java +++ b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java @@ -7,6 +7,7 @@ import com.glxp.api.entity.system.SyncDataBustypeEntity; import com.glxp.api.entity.system.SyncDataSetEntity; import com.glxp.api.res.system.SyncDataSetResponse; import com.glxp.api.service.sync.SyncDataBustypeService; +import com.glxp.api.service.sync.SyncDataChangeBustypeService; import com.glxp.api.service.sync.SyncDataSetService; import com.glxp.api.util.RedisUtil; import com.glxp.api.common.enums.ResultEnum; @@ -31,6 +32,8 @@ public class SyncDataSetController { @Resource private SyncDataBustypeService syncDataBustypeService; @Resource + private SyncDataChangeBustypeService syncDataChangeBustypeService; + @Resource private RedisUtil redisUtil; @@ -60,6 +63,11 @@ public class SyncDataSetController { if (CollUtil.isNotEmpty(busTypes)) syncDataBustypeService.inserts(busTypes); syncDataSetEntity.setBusTypes(null); + + if (CollUtil.isNotEmpty(syncDataSetResponse.getChangeBusTypes())) { + syncDataChangeBustypeService.inserts(syncDataSetResponse.getChangeBusTypes()); + } + boolean b = syncDataSetService.insert(syncDataSetEntity); if (syncDataSetResponse.getDelaySyncTime() != null && syncDataSetResponse.getDelaySyncTime() > 0) { diff --git a/src/main/java/com/glxp/api/dao/sync/SyncDataChangeBustypesDao.java b/src/main/java/com/glxp/api/dao/sync/SyncDataChangeBustypesDao.java new file mode 100644 index 000000000..2a35324e2 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/sync/SyncDataChangeBustypesDao.java @@ -0,0 +1,7 @@ +package com.glxp.api.dao.sync; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.sync.SyncDataChangeBustypesEntity; + +public interface SyncDataChangeBustypesDao extends BaseMapper { +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/sync/SyncDataChangeBustypesEntity.java b/src/main/java/com/glxp/api/entity/sync/SyncDataChangeBustypesEntity.java new file mode 100644 index 000000000..ab47b5b32 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/sync/SyncDataChangeBustypesEntity.java @@ -0,0 +1,31 @@ +package com.glxp.api.entity.sync; + +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; + +/** + * 单据同步 - 业务单据类型 + */ +@Data +@TableName(value = "sync_data_change_bustypes") +public class SyncDataChangeBustypesEntity { + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @TableField(value = "`action`") + private String action; + + @TableField(value = "`name`") + private String name; + + @TableField(value = "outChange") + private Byte outChange; + + @TableField(value = "orderStatus") + private Byte orderStatus; + +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java b/src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java index 6cd4c5662..b45054a20 100644 --- a/src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java +++ b/src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java @@ -1,5 +1,6 @@ package com.glxp.api.res.system; +import com.glxp.api.entity.sync.SyncDataChangeBustypesEntity; import com.glxp.api.entity.system.SyncDataBustypeEntity; import com.glxp.api.entity.system.SyncDataPurTypeEntity; import lombok.Data; @@ -29,7 +30,8 @@ public class SyncDataSetResponse { private Integer syncDownloadTime; //定时下载时间 private boolean sysUser; - private List busTypes; + private List busTypes; //扫码单据类型 + private List changeBusTypes; //业务单据类型 private List purTypeEntities; private String orderSyncStart; diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java index 1595618b9..0fe6fde00 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java @@ -18,6 +18,7 @@ import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; diff --git a/src/main/java/com/glxp/api/service/sync/SyncDataChangeBustypeService.java b/src/main/java/com/glxp/api/service/sync/SyncDataChangeBustypeService.java new file mode 100644 index 000000000..0a1b0a831 --- /dev/null +++ b/src/main/java/com/glxp/api/service/sync/SyncDataChangeBustypeService.java @@ -0,0 +1,18 @@ +package com.glxp.api.service.sync; + +import com.glxp.api.entity.sync.SyncDataChangeBustypesEntity; + +import java.util.List; + +/** + * 单据同步 - 业务单据类型 Service + */ +public interface SyncDataChangeBustypeService { + + List findAll(); + + boolean deleteAll(); + + void inserts(List syncDataChangeBustypesEntities); + +} diff --git a/src/main/java/com/glxp/api/service/sync/impl/SyncDataChangeBustypeServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/SyncDataChangeBustypeServiceImpl.java new file mode 100644 index 000000000..5cb7b012b --- /dev/null +++ b/src/main/java/com/glxp/api/service/sync/impl/SyncDataChangeBustypeServiceImpl.java @@ -0,0 +1,44 @@ +package com.glxp.api.service.sync.impl; + +import cn.hutool.core.collection.CollUtil; +import com.glxp.api.dao.sync.SyncDataChangeBustypesDao; +import com.glxp.api.entity.sync.SyncDataChangeBustypesEntity; +import com.glxp.api.service.sync.SyncDataChangeBustypeService; +import org.apache.ibatis.session.ExecutorType; +import org.apache.ibatis.session.SqlSession; +import org.apache.ibatis.session.SqlSessionFactory; +import org.apache.ibatis.session.TransactionIsolationLevel; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; + +@Service +@Transactional(rollbackFor = Exception.class) +public class SyncDataChangeBustypeServiceImpl implements SyncDataChangeBustypeService { + + @Resource + private SyncDataChangeBustypesDao syncDataChangeBustypesDao; + @Resource + private SqlSessionFactory sqlSessionFactory; + + @Override + public List findAll() { + return syncDataChangeBustypesDao.selectList(null); + } + + @Override + public boolean deleteAll() { + syncDataChangeBustypesDao.delete(null); + return true; + } + + @Override + public void inserts(List syncDataChangeBustypesEntities) { + if (CollUtil.isNotEmpty(syncDataChangeBustypesEntities)) { + SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); + syncDataChangeBustypesEntities.forEach(item -> syncDataChangeBustypesDao.insert(item)); + } + } +} diff --git a/src/main/java/com/glxp/api/service/sync/impl/SyncDataSetServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/SyncDataSetServiceImpl.java index 1e1126e84..dce45e389 100644 --- a/src/main/java/com/glxp/api/service/sync/impl/SyncDataSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/SyncDataSetServiceImpl.java @@ -1,10 +1,12 @@ package com.glxp.api.service.sync.impl; import com.glxp.api.dao.system.SyncDataSetDao; +import com.glxp.api.entity.sync.SyncDataChangeBustypesEntity; import com.glxp.api.entity.system.SyncDataBustypeEntity; import com.glxp.api.entity.system.SyncDataSetEntity; import com.glxp.api.res.system.SyncDataSetResponse; import com.glxp.api.service.sync.SyncDataBustypeService; +import com.glxp.api.service.sync.SyncDataChangeBustypeService; import com.glxp.api.service.sync.SyncDataSetService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -21,6 +23,8 @@ public class SyncDataSetServiceImpl implements SyncDataSetService { SyncDataSetDao syncDataSetDao; @Resource SyncDataBustypeService syncDataBustypeService; + @Resource + private SyncDataChangeBustypeService syncDataChangeBustypeService; @Override public SyncDataSetEntity findSet() { @@ -34,7 +38,10 @@ public class SyncDataSetServiceImpl implements SyncDataSetService { SyncDataSetResponse syncDataSetResponse = new SyncDataSetResponse(); BeanUtils.copyProperties(syncDataSetEntity, syncDataSetResponse); List syncDataBustypeEntities = syncDataBustypeService.findAll(); + List changeBustypesEntities = syncDataChangeBustypeService.findAll(); syncDataSetResponse.setBusTypes(syncDataBustypeEntities); + syncDataSetResponse.setChangeBusTypes(changeBustypesEntities); + return syncDataSetResponse; } diff --git a/src/main/resources/mybatis/mapper/sync/SyncDataChangeBustypesDao.xml b/src/main/resources/mybatis/mapper/sync/SyncDataChangeBustypesDao.xml new file mode 100644 index 000000000..a7a32c6dc --- /dev/null +++ b/src/main/resources/mybatis/mapper/sync/SyncDataChangeBustypesDao.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + id, `action`, `name`, outChange, orderStatus + + \ No newline at end of file From 3f81a88bcef2c43063bc7a59f8218c15669e658b Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 6 Apr 2023 11:42:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/dao/{sync => system}/SyncDataChangeBustypesDao.java | 4 ++-- .../{sync => system}/SyncDataChangeBustypesEntity.java | 6 +++--- .../java/com/glxp/api/res/system/SyncDataSetResponse.java | 2 +- .../glxp/api/service/sync/SyncDataChangeBustypeService.java | 2 +- .../service/sync/impl/SyncDataChangeBustypeServiceImpl.java | 4 ++-- .../glxp/api/service/sync/impl/SyncDataSetServiceImpl.java | 2 +- .../mapper/{sync => system}/SyncDataChangeBustypesDao.xml | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) rename src/main/java/com/glxp/api/dao/{sync => system}/SyncDataChangeBustypesDao.java (60%) rename src/main/java/com/glxp/api/entity/{sync => system}/SyncDataChangeBustypesEntity.java (86%) rename src/main/resources/mybatis/mapper/{sync => system}/SyncDataChangeBustypesDao.xml (79%) diff --git a/src/main/java/com/glxp/api/dao/sync/SyncDataChangeBustypesDao.java b/src/main/java/com/glxp/api/dao/system/SyncDataChangeBustypesDao.java similarity index 60% rename from src/main/java/com/glxp/api/dao/sync/SyncDataChangeBustypesDao.java rename to src/main/java/com/glxp/api/dao/system/SyncDataChangeBustypesDao.java index 2a35324e2..e13082124 100644 --- a/src/main/java/com/glxp/api/dao/sync/SyncDataChangeBustypesDao.java +++ b/src/main/java/com/glxp/api/dao/system/SyncDataChangeBustypesDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.dao.sync; +package com.glxp.api.dao.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.sync.SyncDataChangeBustypesEntity; +import com.glxp.api.entity.system.SyncDataChangeBustypesEntity; public interface SyncDataChangeBustypesDao extends BaseMapper { } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/sync/SyncDataChangeBustypesEntity.java b/src/main/java/com/glxp/api/entity/system/SyncDataChangeBustypesEntity.java similarity index 86% rename from src/main/java/com/glxp/api/entity/sync/SyncDataChangeBustypesEntity.java rename to src/main/java/com/glxp/api/entity/system/SyncDataChangeBustypesEntity.java index ab47b5b32..6b0a3c830 100644 --- a/src/main/java/com/glxp/api/entity/sync/SyncDataChangeBustypesEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SyncDataChangeBustypesEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.entity.sync; +package com.glxp.api.entity.system; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -23,9 +23,9 @@ public class SyncDataChangeBustypesEntity { private String name; @TableField(value = "outChange") - private Byte outChange; + private boolean outChange; @TableField(value = "orderStatus") - private Byte orderStatus; + private Integer orderStatus; } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java b/src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java index b45054a20..c347850e3 100644 --- a/src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java +++ b/src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java @@ -1,6 +1,6 @@ package com.glxp.api.res.system; -import com.glxp.api.entity.sync.SyncDataChangeBustypesEntity; +import com.glxp.api.entity.system.SyncDataChangeBustypesEntity; import com.glxp.api.entity.system.SyncDataBustypeEntity; import com.glxp.api.entity.system.SyncDataPurTypeEntity; import lombok.Data; diff --git a/src/main/java/com/glxp/api/service/sync/SyncDataChangeBustypeService.java b/src/main/java/com/glxp/api/service/sync/SyncDataChangeBustypeService.java index 0a1b0a831..385ae9bb0 100644 --- a/src/main/java/com/glxp/api/service/sync/SyncDataChangeBustypeService.java +++ b/src/main/java/com/glxp/api/service/sync/SyncDataChangeBustypeService.java @@ -1,6 +1,6 @@ package com.glxp.api.service.sync; -import com.glxp.api.entity.sync.SyncDataChangeBustypesEntity; +import com.glxp.api.entity.system.SyncDataChangeBustypesEntity; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/sync/impl/SyncDataChangeBustypeServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/SyncDataChangeBustypeServiceImpl.java index 5cb7b012b..d1be070db 100644 --- a/src/main/java/com/glxp/api/service/sync/impl/SyncDataChangeBustypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/SyncDataChangeBustypeServiceImpl.java @@ -1,8 +1,8 @@ package com.glxp.api.service.sync.impl; import cn.hutool.core.collection.CollUtil; -import com.glxp.api.dao.sync.SyncDataChangeBustypesDao; -import com.glxp.api.entity.sync.SyncDataChangeBustypesEntity; +import com.glxp.api.dao.system.SyncDataChangeBustypesDao; +import com.glxp.api.entity.system.SyncDataChangeBustypesEntity; import com.glxp.api.service.sync.SyncDataChangeBustypeService; import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; diff --git a/src/main/java/com/glxp/api/service/sync/impl/SyncDataSetServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/SyncDataSetServiceImpl.java index dce45e389..f922b303a 100644 --- a/src/main/java/com/glxp/api/service/sync/impl/SyncDataSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/SyncDataSetServiceImpl.java @@ -1,7 +1,7 @@ package com.glxp.api.service.sync.impl; import com.glxp.api.dao.system.SyncDataSetDao; -import com.glxp.api.entity.sync.SyncDataChangeBustypesEntity; +import com.glxp.api.entity.system.SyncDataChangeBustypesEntity; import com.glxp.api.entity.system.SyncDataBustypeEntity; import com.glxp.api.entity.system.SyncDataSetEntity; import com.glxp.api.res.system.SyncDataSetResponse; diff --git a/src/main/resources/mybatis/mapper/sync/SyncDataChangeBustypesDao.xml b/src/main/resources/mybatis/mapper/system/SyncDataChangeBustypesDao.xml similarity index 79% rename from src/main/resources/mybatis/mapper/sync/SyncDataChangeBustypesDao.xml rename to src/main/resources/mybatis/mapper/system/SyncDataChangeBustypesDao.xml index a7a32c6dc..d701a9daf 100644 --- a/src/main/resources/mybatis/mapper/sync/SyncDataChangeBustypesDao.xml +++ b/src/main/resources/mybatis/mapper/system/SyncDataChangeBustypesDao.xml @@ -1,7 +1,7 @@ - - + +