用户数据同步

src/main/java/com/glxp/api/config/MasterDataSourceConfig.java

@@ -1,5 +1,9 @@
 package com.glxp.api.config;
 
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import com.baomidou.mybatisplus.core.config.GlobalConfig;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
 import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
@@ -36,12 +40,24 @@ public class MasterDataSourceConfig {
         return new DataSourceTransactionManager(masterDataSource());
     }
 
+
+    @Configuration
+    @ConfigurationProperties(prefix = "mybatis-plus.configuration")
+    public class CusMybatisConfiguration extends MybatisConfiguration{
+    }
+    @Configuration
+    @ConfigurationProperties(prefix = "mybatis-plus.global-config")
+    public class CusGlobalConfig extends GlobalConfig {
+    }
+
     @Bean(name = "masterSqlSessionFactory")
     @Primary
-    public SqlSessionFactory masterSqlSessionFactory(@Qualifier("masterDataSource") DataSource masterDataSource)
+    public SqlSessionFactory masterSqlSessionFactory(@Qualifier("masterDataSource") DataSource masterDataSource, CusMybatisConfiguration configuration, CusGlobalConfig globalConfig)
             throws Exception {
         final MybatisSqlSessionFactoryBean sessionFactory = new MybatisSqlSessionFactoryBean();
         sessionFactory.setDataSource(masterDataSource);
+        sessionFactory.setConfiguration((MybatisConfiguration) configuration);
+        sessionFactory.setGlobalConfig(globalConfig);
         sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
                 .getResources(MasterDataSourceConfig.MAPPER_LOCATION));
         return sessionFactory.getObject();

src/main/java/com/glxp/api/config/YudaoMybatisAutoConfiguration.java

@@ -1,6 +1,7 @@
 package com.glxp.api.config;
 
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;
@@ -16,6 +17,8 @@ public class YudaoMybatisAutoConfiguration {
         MybatisPlusInterceptor mybatisPlusInterceptor = new MybatisPlusInterceptor();
         PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
         mybatisPlusInterceptor.addInnerInterceptor(paginationInnerInterceptor); // 分页插件
+        //防全表修改删除
+        mybatisPlusInterceptor.addInnerInterceptor(new BlockAttackInnerInterceptor());
         return mybatisPlusInterceptor;
     }
 

src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java

@@ -56,6 +56,21 @@ public enum BasicExportStatusTimeEnum {
      * 业务单据类型
      */
     THR_BUSTYPE_ORIGIN("thr_bustype_origin","第三方单据类型"),
+
+    /**
+     * 部门数据
+     */
+    DEPARTMENT("department","部门数据"),
+
+    /**
+     * 仓库数据
+     */
+    WAREHOUSE_DICT("warehouse_dict","仓库数据"),
+
+    /**
+     * 用户数据
+     */
+    USER_DATA("user_data","用户数据"),
     ;
     @EnumValue
     private String key;

src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java

@@ -30,6 +30,11 @@ public enum BasicExportTypeEnum {
      * 其他数据
      */
     OTHER_DATA("other_data", "其他数据"),
+
+    /**
+     * 用户数据
+     */
+    USER_DATA("user_data", "用户数据"),
     ;
     @EnumValue
     private String key;

src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java

@@ -33,7 +33,6 @@ import com.glxp.api.entity.thrsys.*;
 import com.glxp.api.req.sync.SpsSyncDataRequest;
 import com.glxp.api.req.sync.SyncUpLoadRequest;
 import com.glxp.api.res.sync.*;
-import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.inout.IoAddInoutService;
 import com.glxp.api.service.inout.IoCheckInoutService;
 import com.glxp.api.service.inout.IoOrderService;
@@ -102,6 +101,7 @@ public class SpsSyncDownloadController {
     WarehouseBussinessTypeDao warehouseBussinessTypeDao;
     @Resource
     WarehouseUserDao warehouseUserDao;
+    private final InvSpaceDao invSpaceDao;
 
 
     //    下发单据接口 ，供给中继服务，UDI管理系统下载
@@ -337,6 +337,9 @@ public class SpsSyncDownloadController {
                 case DOCUMENT_TYPE_DATA:
                     saveUploadDocumentTypeData(JSONUtil.toBean(obj, SpsSyncBusResponse.class));
                     break;
+                case USER_DATA:
+                    saveUploadUserData(JSONUtil.toBean(obj, SpsSyncDataResponse.class));
+                    break;
                 case COUNTRY_DI_DATA:
             }
             String taskId = obj.getStr("taskId");
@@ -359,6 +362,34 @@ public class SpsSyncDownloadController {
 
     }
 
+    private void saveUploadUserData(SpsSyncDataResponse bean) {
+
+        if (CollectionUtil.isNotEmpty(bean.getAuthAdminList())) {
+            authAdminDao.insertOrUpdateBatch(bean.getAuthAdminList());
+        }
+        if (CollectionUtil.isNotEmpty(bean.getDeptEntityList())) {
+            deptDao.insertOrUpdateBatch(bean.getDeptEntityList());
+        }
+        if (CollectionUtil.isNotEmpty(bean.getDeptUserEntities())) {
+            deptUserDao.insertOrUpdateBatch(bean.getDeptUserEntities());
+        }
+        if (CollectionUtil.isNotEmpty(bean.getInvWarehouseEntities())) {
+            invWarehouseDao.insertOrUpdateBatch(bean.getInvWarehouseEntities());
+        }
+        if (CollectionUtil.isNotEmpty(bean.getWarehouseUserEntities())) {
+            warehouseUserDao.insertOrUpdateBatch(bean.getWarehouseUserEntities());
+        }
+        if (CollectionUtil.isNotEmpty(bean.getWarehouseBussinessTypeEntities())) {
+            warehouseBussinessTypeDao.insertOrUpdateBatch(bean.getWarehouseBussinessTypeEntities());
+        }
+        if (CollectionUtil.isNotEmpty(bean.getInvSpaces())) {
+            invSpaceDao.insertOrUpdateBatch(bean.getInvSpaces());
+        }
+        if (CollectionUtil.isNotEmpty(bean.getInvBusUserEntities())) {
+            invBusUserDao.insertOrUpdateBatch(bean.getInvBusUserEntities());
+        }
+    }
+
     private final BasicBussinessTypeDao basicBussinessTypeDao;
     private final BasicBusTypeChangeDao busTypeChangeDao;
     private final ThrBusTypeOriginDao thrBusTypeOriginDao;
@@ -764,7 +795,7 @@ public class SpsSyncDownloadController {
             //仓库用户表
             if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseUserEntities())) {
                 for (WarehouseUserEntity warehouseUserEntity : syncDataResponse.getWarehouseUserEntities()) {
-                    warehouseUserDao.insertOrUpdate(warehouseUserEntity);
+                    warehouseUserDao.insertOrUpdateEntity(warehouseUserEntity);
                 }
                 remark.append("仓库用户信息：").append(syncDataResponse.getWarehouseUserEntities().size()).append("条\n");
             }

src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java

@@ -1,5 +1,6 @@
 package com.glxp.api.dao.auth;
 
+import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.auth.InvSpace;
 import com.glxp.api.req.auth.FilterInvSpaceRequest;
 import com.glxp.api.res.auth.InvSpaceResponse;
@@ -9,11 +10,11 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 @Mapper
-public interface InvSpaceDao {
+public interface InvSpaceDao extends BaseMapperPlus<InvSpaceDao, InvSpace, InvSpace> {
 
     int deleteByPrimaryKey(Integer id);
 
-    int insert(InvSpace record);
+    int insertEntity(InvSpace record);
 
     int insertSelective(InvSpace record);
 

src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java

@@ -1,5 +1,6 @@
 package com.glxp.api.dao.auth;
 
+import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.auth.WarehouseUserEntity;
 import com.glxp.api.req.auth.FilterInvLinkDataRequest;
 import com.glxp.api.req.auth.FilterInvUserRequest;
@@ -9,16 +10,16 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 @Mapper
-public interface WarehouseUserDao {
+public interface WarehouseUserDao extends BaseMapperPlus<WarehouseUserDao, WarehouseUserEntity, WarehouseUserEntity> {
     int deleteByPrimaryKey(Integer id);
 
     int deleteByCodeAndId(@Param("id") Long id, @Param("code") String code);
 
     List<WarehouseUserEntity> filterList(FilterInvUserRequest filterInvUserRequest);
 
-    int insert(WarehouseUserEntity record);
+    int insertEntity(WarehouseUserEntity record);
 
-    int insertOrUpdate(WarehouseUserEntity record);
+    int insertOrUpdateEntity(WarehouseUserEntity record);
 
     int insertOrUpdateSelective(WarehouseUserEntity record);
 
@@ -40,7 +41,8 @@ public interface WarehouseUserDao {
 
     List<WarehouseUserEntity> selectListkey(FilterInvLinkDataRequest filterInvLinkDataRequest);
 
-    List<WarehouseUserEntity> selectNotSelectUserid(@Param("userIds")List<Long> userIds );
+    List<WarehouseUserEntity> selectNotSelectUserid(@Param("userIds") List<Long> userIds);
+
     List<String> selectCodeByUser(@Param("userId") String userId);
 
     void deleteByCode(@Param("code") String code);

src/main/java/com/glxp/api/entity/auth/AuthAdmin.java

@@ -1,5 +1,7 @@
 package com.glxp.api.entity.auth;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.glxp.api.constant.Constant;
 import lombok.Data;
 
@@ -7,41 +9,54 @@ import java.util.Date;
 import java.util.List;
 
 @Data
+@TableName("auth_user")
 public class AuthAdmin {
 
     // 主键
     private Long id;
     // 昵称
+    @TableField("userName")
     private String userName;
     // 登录密码
+    @TableField("passWord")
     private String passWord;
 
     // 最后登录ip
+    @TableField("lastLoginIp")
     private String lastLoginIp;
     // 最后登录时间
+    @TableField("lastLoginTime")
     private Date lastLoginTime;
     // 创建时间
+    @TableField("createTime")
     private Date createTime;
     // 状态
+    @TableField("userFlag")
     private Integer userFlag;
 
+    @TableField("lastModifyTime")
     private Date lastModifyTime;
     private String comments;
+    @TableField("employeeName")
     private String employeeName;
-    private String CustomerId;
+    @TableField("CustomerId")
+    private Long CustomerId;
+    @TableField("locDeptCode")
     private String locDeptCode;
+    @TableField("locInvCode")
     private String locInvCode;
 
+    @TableField(exist = false)
     private String deptName;
 
-    private String warehouseName;
-
 
+    @TableField(exist = false)
     private List<SysRole> roles;
+    @TableField(exist = false)
     private Long[] roleIds;
 
 
     public boolean isAdmin() {
         return Constant.ADMIN_ID.equals(this.id + "");
     }
-}
+}

src/main/java/com/glxp/api/entity/auth/DeptUserEntity.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 @TableName(value = "auth_dept_user")
 public class DeptUserEntity {
@@ -11,5 +13,7 @@ public class DeptUserEntity {
     private Long deptId;
     @TableField(value = "userId")
     private Long userId;
+    @TableField("updateTime")
+    private Date updateTime;
 
 }

src/main/java/com/glxp/api/entity/auth/InvBusUserEntity.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.util.Date;
+
 
 @Data
 @TableName(value = "auth_user_bustype")
@@ -20,5 +22,7 @@ public class InvBusUserEntity {
     private String scAction;
     @TableField(value = "remark")
     private String remark;
+    @TableField(value = "updateTime")
+    private Date updateTime;
 
 }

src/main/java/com/glxp/api/entity/auth/WarehouseBussinessTypeEntity.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 仓库字典-单据类型关联表
  */
@@ -36,6 +38,9 @@ public class WarehouseBussinessTypeEntity {
     @TableField(value = "name")
     private String name;
 
+    @TableField("updateTime")
+    private Date updateTimel;
+
     @TableField(exist = false)
     private boolean select;
 }

src/main/java/com/glxp/api/entity/auth/WarehouseUserEntity.java

@@ -1,11 +1,16 @@
 package com.glxp.api.entity.auth;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 仓库字典-用户关联表
  */
 @Data
+@TableName("auth_warehouse_user")
 public class WarehouseUserEntity {
     /**
      * id
@@ -30,8 +35,13 @@ public class WarehouseUserEntity {
     /**
      * 是否是仓库主管
      */
+    @TableField("isDirector")
     private boolean isDirector;
 
+    @TableField("employeeName")
     private String employeeName;
 
+    @TableField("updateTime")
+    private Date updateTime;
+
 }

src/main/java/com/glxp/api/entity/sync/SyncDataSetEntity.java

@@ -23,6 +23,10 @@ public class SyncDataSetEntity {
     private int dbDiProducts;        //DI产品信息
     private int dbDiCompany;        //DI企业信息
 
+    private int department; //部门信息
+    private int warehouseDict; //仓库字典
+    private int userData; //用户信息
+
     private int udiCodeLost; // UDI码补齐
     private int udiCodeRel; //UDI码关联关系
 

src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java

@@ -24,6 +24,10 @@ public class SyncDataSetResponse {
     private int dbDiProducts;
     private int dbDiCompany;
 
+    private int department; //部门信息
+    private int warehouseDict; //仓库字典
+    private int userData; //用户信息
+
     private int udiCodeLost; // UDI码补齐
     private int udiCodeRel; //UDI码关联关系
 

src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java

@@ -59,7 +59,7 @@ public class InvSpaceServiceImpl implements InvSpaceService {
         invSpace.setUpdateTime(date);
         invSpace.setCreateUser(user.getUserName());
         invSpace.setUpdateUser(user.getUserName());
-        invSpaceDao.insert(invSpace);
+        invSpaceDao.insertEntity(invSpace);
         return ResultVOUtils.success();
     }
 

src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java

@@ -141,6 +141,6 @@ public class WarehouseUserServiceImpl implements WarehouseUserService {
 
     @Override
     public boolean insert(WarehouseUserEntity warehouseUserEntity) {
-        return warehouseUserDao.insert(warehouseUserEntity)>0;
+        return warehouseUserDao.insertEntity(warehouseUserEntity)>0;
     }
 }

src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java

@@ -662,9 +662,10 @@ public class SpsSyncDownloadService {
 
     /**
      * 修改任务数据
-     * @param exportType 任务类型
+     *
+     * @param exportType   任务类型
      * @param fileFullPath 文件地址
-     * @param total 总条数
+     * @param total        总条数
      * @return 更新结果 true/false
      */
     private boolean updateExportStatus(BasicExportTypeEnum exportType, String fileFullPath, Integer total) {

src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml

@@ -44,7 +44,7 @@
         where id = #{id,jdbcType=INTEGER}
     </delete>
 
-    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.auth.InvSpace"
+    <insert id="insertEntity" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.auth.InvSpace"
             useGeneratedKeys="true">
         insert into auth_space (code, `name`, type, invStorageCode,
                                invWarehouseCode, `status`, createTime,

src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml

@@ -51,7 +51,7 @@
         where userid = #{id}
           and code = #{code}
     </delete>
-    <insert id="insert" keyColumn="id" keyProperty="id"
+    <insert id="insertEntity" keyColumn="id" keyProperty="id"
             parameterType="com.glxp.api.entity.auth.WarehouseUserEntity" useGeneratedKeys="true">
         <!--@mbg.generated-->
         insert into auth_warehouse_user (code, userId, userName, isDirector)
@@ -177,7 +177,7 @@
              #{item.isDirector})
         </foreach>
     </insert>
-    <insert id="insertOrUpdate" keyColumn="id" keyProperty="id"
+    <insert id="insertOrUpdateEntity" keyColumn="id" keyProperty="id"
             parameterType="com.glxp.api.entity.auth.WarehouseUserEntity" useGeneratedKeys="true">
         <!--@mbg.generated-->
         insert into auth_warehouse_user

src/main/resources/schemas/schema_v2.1.sql

@@ -1,8 +1,18 @@
 #   字段新增   （表名，字段名，字段类型，修改方式（1：新增，2：修改，3：删除）
 
+CALL Pro_Temp_ColumnWork('auth_user_bustype', 'updateTime', 'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 1);
+CALL Pro_Temp_ColumnWork('auth_warehouse_bustype', 'updateTime', 'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 1);
+CALL Pro_Temp_ColumnWork('auth_warehouse_user', 'updateTime', 'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 1);
+CALL Pro_Temp_ColumnWork('auth_dept_user', 'updateTime', 'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 1);
+
+CALL Pro_Temp_ColumnWork('sync_data_set', 'department', 'tinyint ', 1);
+CALL Pro_Temp_ColumnWork('sync_data_set', 'warehouseDict', 'tinyint ', 1);
+CALL Pro_Temp_ColumnWork('sync_data_set', 'userData', 'tinyint ', 1);
+
 CALL Pro_Temp_ColumnWork('sync_data_set', 'udiCodeLost', 'tinyint ', 1);
 CALL Pro_Temp_ColumnWork('sync_data_set', 'udiCodeRel', 'tinyint ', 1);
 CALL Pro_Temp_ColumnWork('sync_data_set', 'dbDiCompany', 'tinyint', 1);
+
 CALL Pro_Temp_ColumnWork('io_order', 'fromReceiveBillNo', 'varchar(255) ', 1);
 CALL Pro_Temp_ColumnWork('io_order', 'fromThrBillNo', 'varchar(255) ', 1);
 CALL Pro_Temp_ColumnWork('io_order', 'syncStatus', 'tinyint ', 1);