From 3f81a88bcef2c43063bc7a59f8218c15669e658b Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 6 Apr 2023 11:42:30 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E5=90=8C=E6=AD=A5=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=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 --- .../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 @@ - - + +