代码提交

src/main/java/com/example/removetolocal/config/base/DeviceInvisibleRange.java

+package com.example.removetolocal.config.base;
+
+import lombok.AllArgsConstructor;
+
+/**
+ * @author dengdiyi
+ * 装备可见范围枚举
+ */
+
+@AllArgsConstructor
+public enum DeviceInvisibleRange {
+    /**
+     * 省一级
+     */
+    SHEN(1, "省一级"),
+    /**
+     * 市一级
+     */
+    SHI(2, "市一级"),
+    /**
+     * 县一级
+     */
+    XIAN(3, "县一级");
+
+    public Integer id;
+
+    public String name;
+
+}

src/main/java/com/example/removetolocal/config/base/DeviceSecretLevel.java

+package com.example.removetolocal.config.base;
+
+import lombok.AllArgsConstructor;
+
+/**
+ * @author dengdiyi
+ * 装备可见范围枚举
+ */
+
+@AllArgsConstructor
+public enum DeviceSecretLevel {
+    /**
+     * 省一级
+     */
+    SECRETLEVEL_1(1, "绝密"),
+    /**
+     * 县一级
+     */
+    SECRETLEVEL_2(2, "秘密"),
+    /**
+     * 市一级
+     */
+    SECRETLEVEL_3(3, "机密"),
+    /**
+     * 县一级
+     */
+    SECRETLEVEL_4(4, "无");
+
+    public Integer id;
+
+    public String name;
+
+}

src/main/java/com/example/removetolocal/config/base/DeviceStyle.java

+package com.example.removetolocal.config.base;
+
+import lombok.AllArgsConstructor;
+
+/**
+ * @author dengdiyi
+ * 装备形态枚举
+ */
+
+@AllArgsConstructor
+public enum DeviceStyle {
+    /**
+     * 密码机
+     */
+    STYLE_1(1, "密码机"),
+    /**
+     * 密码模块
+     */
+    STYLE_2(2, "密码模块"),
+    /**
+     * 密码芯片
+     */
+    STYLE_3(3, "密码芯片"),
+    /**
+     * 说明书
+     */
+    STYLE_4(4, "说明书"),
+    /**
+     * U盘
+     */
+    STYLE_5(5, "U盘"),
+    /**
+     * 光盘
+     */
+    STYLE_6(6, "光盘"),
+    /**
+     * 密码软件
+     */
+    STYLE_7(7, "密码软件"),
+    /**
+     * 密码卡
+     */
+    STYLE_8(8, "密码卡"),
+    STYLE_9(9, "其它");
+
+    public Integer id;
+
+    public String name;
+
+}

src/main/java/com/example/removetolocal/config/base/GlobalMap.java

+package com.example.removetolocal.config.base;
+
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * @author dengdiyi
+ */
+public class GlobalMap {
+
+    private static final Map<Integer, MatchingRange> matchingRangeMap;
+
+    private static final Map<Integer, DeviceInvisibleRange> deviceInvisibleRangeMap;
+
+    private static final Map<Integer,DeviceSecretLevel> deviceSecretLevelMap;
+
+    private static final Map<Integer, DeviceStyle> deviceStyleMap;
+
+    static {
+        deviceStyleMap = Arrays.stream(DeviceStyle.values())
+                .collect(Collectors.toMap(deviceStyle -> deviceStyle.id, Function.identity()));
+        matchingRangeMap = Arrays.stream(MatchingRange.values())
+                .collect(Collectors.toMap(matchingRange -> matchingRange.id, Function.identity()));
+        deviceInvisibleRangeMap = Arrays.stream(DeviceInvisibleRange.values())
+                .collect(Collectors.toMap(deviceInvisibleRange -> deviceInvisibleRange.id, Function.identity()));
+        deviceSecretLevelMap = Arrays.stream(DeviceSecretLevel.values())
+                .collect(Collectors.toMap(deviceSecretLevel -> deviceSecretLevel.id, Function.identity()));
+    }
+
+    public static Map<Integer, DeviceStyle> getDeviceStyleMap() {
+        return deviceStyleMap;
+    }
+
+    public static Map<Integer, MatchingRange> getMatchingRangeMap() {
+        return matchingRangeMap;
+    }
+
+    public static Map<Integer, DeviceSecretLevel> getDeviceSecretLevelMap() {
+        return deviceSecretLevelMap;
+    }
+
+    public static Map<Integer, DeviceInvisibleRange> getDeviceInvisibleRangeMap() {
+        return deviceInvisibleRangeMap;
+    }
+
+}

src/main/java/com/example/removetolocal/config/base/MatchingRange.java

+package com.example.removetolocal.config.base;
+
+import lombok.AllArgsConstructor;
+
+/**
+ * @author dengdiyi
+ * 配用范围枚举
+ */
+
+@AllArgsConstructor
+public enum MatchingRange {
+    /**
+     * 中央到省
+     */
+    MATCHINGRANGE_2(2, "中央到省"),
+    /**
+     * 省以下纵向
+     */
+    PROVINCIAL_VERTICAL(1, "省以下纵向"),
+    /**
+     * 省以下横向
+     */
+    MATCHINGRANGE_3(3, "省以下横向"),
+    /**
+     * 其它
+     */
+    MATCHINGRANGE_4(4, "其它");
+
+    public Integer id;
+
+    public String name;
+
+}

src/main/java/com/example/removetolocal/newentity/dao/NewRepairBackBillDao.java

@@ -13,5 +13,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
  */
 public interface NewRepairBackBillDao extends JpaRepository<RepairBackBill, Integer>, JpaSpecificationExecutor<RepairBackBill> {
     RepairBackBill findByDeviceRepairBillId(Integer repairBillId);
+
+    RepairBackBill findByOldId(Integer oldId);
 }
 

src/main/java/com/example/removetolocal/newentity/dao/NewRepairDetailDao.java

@@ -8,4 +8,6 @@ import java.util.List;
 
 public interface NewRepairDetailDao extends JpaRepository<RepairDetail, Integer>, JpaSpecificationExecutor<RepairDetail> {
     List<RepairDetail> findByDeviceRepairBillId(Integer billId);
+    RepairDetail findByPid(Integer pid);
+    RepairDetail findByOldId(Integer oldId);
 }

src/main/java/com/example/removetolocal/newentity/entity/Area.java

@@ -48,6 +48,7 @@ public class Area {
     @Column(name = "father_id")
     private Integer fatherId;
 
-
+    @Column(name = "old_id")
+    private String oldId;
 
 }

src/main/java/com/example/removetolocal/newentity/entity/DeviceLibrary.java

@@ -172,4 +172,6 @@ public class DeviceLibrary {
     @Column(name = "record_id")
     private String recordId;
 
+    @Column(name = "old_id")
+    private Integer oldId;
 }

src/main/java/com/example/removetolocal/newentity/entity/DeviceLog.java

@@ -83,4 +83,6 @@ public class DeviceLog {
 	@Column(name = "record_id")
 	private String recordId;
 
+	@Column(name = "old_id")
+	private Integer oldId;
 }

src/main/java/com/example/removetolocal/newentity/entity/Mgrcert.java

@@ -60,5 +60,6 @@ public class Mgrcert {
     @Column(name = "cert_name")
     private String certName;
 
-
+    @Column(name = "old_id")
+    private Integer oldId;
 }

src/main/java/com/example/removetolocal/newentity/entity/PackingLibrary.java

@@ -172,4 +172,6 @@ public class PackingLibrary {
     @Column(name = "delete_tag")
     private Integer deleteTag = 0;
 
+    @Column(name = "old_id")
+    private Integer oldId;
 }

src/main/java/com/example/removetolocal/newentity/entity/RepairBackBill.java

@@ -88,7 +88,7 @@ public class RepairBackBill {
 	* deleteTag
 	*/
 	@Column(name = "delete_tag")
-	private Integer deleteTag;
+	private Integer deleteTag = 0;
 	/**
 	* deviceRepairBillId
 	*/
@@ -217,4 +217,12 @@ public class RepairBackBill {
 	@Column(name = "send_files")
 	private String sendFiles;
 
+	@Column(name = "old_id")
+	private Integer oldId;
+
+	@Column(name = "receive_files",columnDefinition = "TEXT")
+	private String receiveFiles;
+
+	@Column(name = "script_json",columnDefinition = "TEXT")
+	private String scriptJson;
 }

src/main/java/com/example/removetolocal/newentity/entity/RepairBill.java

@@ -48,7 +48,7 @@ public class RepairBill {
 	* deleteTag
 	*/
 	@Column(name = "delete_tag")
-	private Integer deleteTag;
+	private Integer deleteTag = 0;
 	/**
 	* docNum
 	*/
@@ -122,4 +122,6 @@ public class RepairBill {
 	@LastModifiedBy
 	private Integer updateUserId;
 
+	@Column(name = "old_id")
+	private Integer oldId;
 }

src/main/java/com/example/removetolocal/newentity/entity/RepairDetail.java

@@ -43,7 +43,7 @@ public class RepairDetail {
 	* deleteTag
 	*/
 	@Column(name = "delete_tag")
-	private Integer deleteTag;
+	private Integer deleteTag = 0;
 	/**
 	* deviceId
 	*/
@@ -147,4 +147,9 @@ public class RepairDetail {
 	@Column(name = "pid")
 	private Integer pid;
 
+	@Column(name = "old_id")
+	private Integer oldId;
+
+	@Column(name = "back_remark")
+	private String backRemark;
 }

src/main/java/com/example/removetolocal/newentity/entity/RepairSendBill.java

@@ -63,7 +63,7 @@ public class RepairSendBill {
 	* deleteTag
 	*/
 	@Column(name = "delete_tag")
-	private Integer deleteTag;
+	private Integer deleteTag = 0;
 	/**
 	* deviceRepairBillId
 	*/
@@ -209,7 +209,15 @@ public class RepairSendBill {
 	/**
 	* sendFiles
 	*/
-	@Column(name = "send_files")
+	@Column(name = "send_files",columnDefinition = "TEXT")
 	private String sendFiles;
 
+	@Column(name = "receive_files",columnDefinition = "TEXT")
+	private String receiveFiles;
+
+	@Column(name = "script_json",columnDefinition = "TEXT")
+	private String scriptJson;
+
+	@Column(name = "old_id")
+	private Integer oldId;
 }

src/main/java/com/example/removetolocal/newentity/entity/Task.java

@@ -69,7 +69,7 @@ public class Task {
 	* deleteTag
 	*/
 	@Column(name = "delete_tag")
-	private Integer deleteTag;
+	private Integer deleteTag = 0;
 	/**
 	* involveUsers
 	*/

src/main/java/com/example/removetolocal/newentity/entity/TaskLog.java

@@ -44,7 +44,7 @@ public class TaskLog {
 	* deleteTag
 	*/
 	@Column(name = "delete_tag")
-	private Integer deleteTag;
+	private Integer deleteTag = 0;
 	/**
 	* fileDetail
 	*/
@@ -78,4 +78,6 @@ public class TaskLog {
 	@Column(name = "record_id")
 	private String recordId;
 
+	@Column(name = "old_id")
+	private Integer oldId;
 }

src/main/java/com/example/removetolocal/newentity/entity/Units.java

@@ -65,4 +65,7 @@ public class Units {
 
     @Column(name = "show_order")
     private Integer showOrder;
+
+    @Column(name = "old_id")
+    private String oldId;
 }

src/main/java/com/example/removetolocal/newentity/entity/User.java

@@ -112,4 +112,9 @@ public class User {
     @Column(name = "train_status")
     private Integer trainStatus;
 
+    @Column(name = "old_id")
+    private String oldId;
+
+    @Column(name = "old_code")
+    private String oldCode;
 }

src/main/java/com/example/removetolocal/newrepair/vo/ScriptSaveVo.java

+package com.example.removetolocal.newrepair.vo;
+
+import com.example.removetolocal.utils.JacksonUtil;
+import lombok.Data;
+
+/**
+ * @author dengdiyi
+ */
+@Data
+public class ScriptSaveVo {
+
+    private String model;
+
+    private String type;
+
+    private String name;
+
+    private String seqNumber;
+
+    private String secretLevel;
+
+    private String invisibleRange;
+
+    private String allotType;
+
+    private Integer num;
+
+    private Integer id;
+
+    private String remark;
+
+    private Integer detailId;
+
+    private String allotTypeNum;
+
+    public String toJson(){
+        return JacksonUtil.toJSon(this);
+    }
+}

src/main/java/com/example/removetolocal/newstorage/bto/TaskBto.java

@@ -100,6 +100,20 @@ public class TaskBto {
         return task;
     }
 
+    /**
+     * bto类转化为do类
+     */
+    public com.example.removetolocal.newentity.entity.Task toDo2() {
+        //复制相同属性
+        ModelMapper modelMapper = BeanHelper.getUserMapper();
+        com.example.removetolocal.newentity.entity.Task task = modelMapper.map(this, com.example.removetolocal.newentity.entity.Task.class);
+        //set组合字段
+        task.setInvolveUsers(StringSplitUtil.idListToString(this.involveUserIdList));
+        task.setUserReadDetail(StringSplitUtil.idListToString(this.userReadDetailList));
+        task.setTopFlagDetail(StringSplitUtil.idListToString(this.topFlagDetailList));
+        return task;
+    }
+
     /**
      * @return 最后一个参与该任务的人员id, 用于任务状态变化时人员不变的情况
      */

src/main/java/com/example/removetolocal/service/MysqlToSTService.java

@@ -2,4 +2,5 @@ package com.example.removetolocal.service;
 
 public interface MysqlToSTService {
     void dbToDb();
+    void  oldIdMove();
 }

src/main/java/com/example/removetolocal/service/impl/DeviceServiceImpl.java

@@ -101,6 +101,8 @@ public class DeviceServiceImpl implements DeviceService {
             packingLibrary.setNature(devCatalogEntity.getPackingProperty());
             if (devCatalogEntity.getStyle()!=null) {
                 switch (devCatalogEntity.getStyle()) {
+                    case 0:
+                        packingLibrary.setType(9);
                     case 1:
                         packingLibrary.setType(7);
                         break;
@@ -130,6 +132,9 @@ public class DeviceServiceImpl implements DeviceService {
                         break;
                 }
             }
+            else {
+                packingLibrary.setType(9);
+            }
             if (devCatalogEntity.getVisibleRange()!=null) {
                 switch (devCatalogEntity.getVisibleRange()) {
                     case 1:
@@ -158,19 +163,22 @@ public class DeviceServiceImpl implements DeviceService {
                         packingLibrary.setMatchingRange(1);
                         break;
                     case 3:
-                        packingLibrary.setMatchingRange(2);
+                        packingLibrary.setMatchingRange(3);
                         break;
                     case 4:
-                        packingLibrary.setMatchingRange(5);
+                        packingLibrary.setMatchingRange(4);
                         break;
                     case 5:
-                        packingLibrary.setMatchingRange(4);
+                        packingLibrary.setMatchingRange(1);
                         break;
                     default:
                         packingLibrary.setMatchingRange(devCatalogEntity.getMatchingArea());
                         break;
                 }
             }
+            else {
+                packingLibrary.setMatchingRange(4);
+            }
             if (devCatalogEntity.getAppType()!=null) {
                 switch (devCatalogEntity.getAppType()) {
                     case 4:
@@ -291,7 +299,7 @@ public class DeviceServiceImpl implements DeviceService {
             deviceLibrary.setProdNumber(devRecordEntity.getProNum());
 //            deviceLibrary.setRfidCardId(devRecordEntity.getRfid());
 //            deviceLibrary.setRfidSurfaceId(makeRfidNumber(packingLibrary.getType()==null?"0":String.valueOf(packingLibrary.getType()),devRecordEntity.getSerNum(),devRecordEntity.getProNum(),devRecordEntity.getModel()));
-            deviceLibrary.setRfidSurfaceId(deviceLibrary.getSeqNumber());
+            deviceLibrary.setRfidSurfaceId(null);
             if (devRecordEntity.getWhereUnit()!=null){
                 if (sysCompanyDao.findById(devRecordEntity.getWhereUnit()).isPresent()) {
                     deviceLibrary.setLocationUnit(sysCompanyDao.findById(devRecordEntity.getWhereUnit()).get().getCompanyName());

src/main/java/com/example/removetolocal/service/impl/MysqlToSTServiceImpl.java

@@ -160,14 +160,54 @@ public class MysqlToSTServiceImpl implements MysqlToSTService {
         log.info("task_log表迁移成功");
         userRoleToSt();
         log.info("user_role表迁移成功");
-        repairBillToSt();
-        log.info("repair_bill表迁移成功");
-        repairSendBillToSt();
-        log.info("repair_send_bill表迁移成功");
-        repairBackBillToSt();
-        log.info("repair_back_bill表迁移成功");
-        repairDetailToSt();
-        log.info("repair_detail表迁移成功");
+//        repairBillToSt();
+//        log.info("repair_bill表迁移成功");
+//        repairSendBillToSt();
+//        log.info("repair_send_bill表迁移成功");
+//        repairBackBillToSt();
+//        log.info("repair_back_bill表迁移成功");
+//        repairDetailToSt();
+//        log.info("repair_detail表迁移成功");
+    }
+
+    @Override
+    public void oldIdMove() {
+        userDao.findAll().forEach(user -> {
+            com.example.removetolocal.newentity.entity.User user1 = newUserDaoSt.findById(user.getUserId()).get();
+            user1.setOldCode(user.getOldCode());
+            user1.setOldId(user.getOldId());
+            newUserDaoSt.save(user1);
+        });
+        unitsDao.findAll().forEach(units -> {
+            com.example.removetolocal.newentity.entity.Units units1 = newUnitsDaoSt.findById(units.getUnitId()).get();
+            units1.setOldId(units.getOldId());
+            newUnitsDaoSt.save(units1);
+        });
+        mgrcertDao.findAll().forEach(mgrcert -> {
+            com.example.removetolocal.newentity.entity.Mgrcert units1 = newMgrcertDaoSt.findById(mgrcert.getId()).get();
+            units1.setOldId(mgrcert.getOldId());
+            newMgrcertDaoSt.save(units1);
+        });
+        areaDao.findAll().forEach(area -> {
+            com.example.removetolocal.newentity.entity.Area units1 = newAreaDaoSt.findById(area.getId()).get();
+            units1.setOldId(area.getOldId());
+            newAreaDaoSt.save(units1);
+        });
+        deviceLibraryDao.findAll().forEach(deviceLibrary -> {
+            com.example.removetolocal.newentity.entity.DeviceLibrary units1 = newDeviceLibraryDaoSt.findById(deviceLibrary.getId()).get();
+            units1.setOldId(deviceLibrary.getOldId());
+            newDeviceLibraryDaoSt.save(units1);
+        });
+        packingLibraryDao.findAll().forEach(packingLibrary -> {
+            com.example.removetolocal.newentity.entity.PackingLibrary units1 = newPackingLibraryDaoSt.findById(packingLibrary.getId()).get();
+            units1.setOldId(packingLibrary.getOldId());
+            newPackingLibraryDaoSt.save(units1);
+        });
+        deviceLogDao.findAll().forEach(deviceLog -> {
+            com.example.removetolocal.newentity.entity.DeviceLog units1 = newDeviceLogDao.findById(deviceLog.getId()).get();
+            units1.setOldId(deviceLog.getOldId());
+            newDeviceLogDao.save(units1);
+        });
     }
 
     private void userRoleToSt(){