fix：修改转移实体变为2个主键

src/main/java/com/tykj/transfer/SlaveService/impl/Biz088DcActivityStatisticsServiceImpl.java

@@ -29,38 +29,26 @@ public class Biz088DcActivityStatisticsServiceImpl implements Biz088DcActivitySt
     private Biz088DcActivityStatisticsDao biz088DcActivityStatisticsDao;
 
 
-
     @Override
     public void transferActivity() {
         List<Activity> all = activitiesDao.findAll();
         Date date = new Date();
-        List<Biz088DcActivityStatistics> rs=new ArrayList<>();
+        List<Biz088DcActivityStatistics> rs = new ArrayList<>();
         for (Activity activity : all) {
-            // 检查数据库是否已存在的对象
-            Optional<Biz088DcActivityStatistics> byId = biz088DcActivityStatisticsDao.findById(activity.getId());
-            if (byId.isPresent()) {
-                // 如果已存在，进行更新操作
-                Biz088DcActivityStatistics biz088DcActivityStatistics = byId.get();
-                BeanUtils.copyProperties(activity, biz088DcActivityStatistics);
-                biz088DcActivityStatisticsDao.save(biz088DcActivityStatistics);
-            } else {
-                // 否则，进行保存操作
-                Biz088DcActivityStatistics newObj = new Biz088DcActivityStatistics();
-                BeanUtils.copyProperties(activity, newObj);
-                newObj.setBizTime(date);
-                newObj.setLoadTime(date);
-                if(!StringUtils.equals(activity.getDataActiveStatus(), "1")) {
-                    newObj.setOp("delete");
-                }
-                newObj.setTongTime(date);
-                newObj.setTongId(0L);
-                rs.add(newObj);
+            Biz088DcActivityStatistics newObj = new Biz088DcActivityStatistics();
+            BeanUtils.copyProperties(activity, newObj);
+            newObj.setBizTime(date);
+            newObj.setLoadTime(date);
+            if (!StringUtils.equals(activity.getDataActiveStatus(), "1")) {
+                newObj.setOp("delete");
             }
+            newObj.setTongTime(date);
+            newObj.setTongId(0L);
+            rs.add(newObj);
         }
         if (!rs.isEmpty()) {
             biz088DcActivityStatisticsDao.saveAll(rs);
         }
-
-        log.info("活动转移完成，成功转移了{}条",rs.size());
+        log.info("活动转移完成，成功转移了{}条", rs.size());
     }
 }

src/main/java/com/tykj/transfer/SlaveService/impl/Biz088DcBranchTrainStatisticsImpl.java

@@ -30,33 +30,22 @@ public class Biz088DcBranchTrainStatisticsImpl implements Biz088DcNetworkStatist
     public void transferBranch() {
         List<Branches> all = branchesDao.findAll();
         Date date = new Date();
-        List<Biz088DcNetworkStatistics> rs=new ArrayList<>();
+        List<Biz088DcNetworkStatistics> rs = new ArrayList<>();
         for (Branches branches : all) {
-            // 检查数据库是否已存在的对象
-            Optional<Biz088DcNetworkStatistics> byId = biz088DcNetworkStatisticsDao.findById(branches.getId());
-            if (byId.isPresent()) {
-                // 如果已存在，进行更新操作
-                Biz088DcNetworkStatistics biz088DcBranchTrainStatistics = byId.get();
-                BeanUtils.copyProperties(branches, biz088DcBranchTrainStatistics);
-                biz088DcNetworkStatisticsDao.save(biz088DcBranchTrainStatistics);
-            } else {
-                // 否则，进行保存操作
-                Biz088DcNetworkStatistics newObj = new Biz088DcNetworkStatistics();
-                BeanUtils.copyProperties(branches, newObj);
-                newObj.setBizTime(date);
-                newObj.setLoadTime(date);
-                if(!StringUtils.equals(branches.getDataActiveStatus(), "1")) {
-                    newObj.setOp("delete");
-                }
-                newObj.setTongTime(date);
-                newObj.setTongId(0L);
-                rs.add(newObj);
+            Biz088DcNetworkStatistics newObj = new Biz088DcNetworkStatistics();
+            BeanUtils.copyProperties(branches, newObj);
+            newObj.setBizTime(date);
+            newObj.setLoadTime(date);
+            if (!StringUtils.equals(branches.getDataActiveStatus(), "1")) {
+                newObj.setOp("delete");
             }
+            newObj.setTongTime(date);
+            newObj.setTongId(0L);
+            rs.add(newObj);
         }
         if (!rs.isEmpty()) {
             biz088DcNetworkStatisticsDao.saveAll(rs);
         }
-        log.info("网点转移完成,成功转移了{}条",rs.size());
+        log.info("网点转移完成,成功转移了{}条", rs.size());
     }
-
 }

src/main/java/com/tykj/transfer/pojo/Biz088DcActivityStatistics.java

@@ -17,7 +17,7 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
-//@IdClass(YlPrimaryKeyLong.class)
+@IdClass(YlPrimaryKeyLong.class)
 @Table(name = "biz_088_dc_activity_statistics")
 public class Biz088DcActivityStatistics {
 
@@ -215,7 +215,7 @@ public class Biz088DcActivityStatistics {
 	/**
 	* tongId
 	*/
-//	@Id
+	@Id
 	@Column(name = "tongID")
 	private Long tongId;
 

src/main/java/com/tykj/transfer/pojo/Biz088DcNetworkStatistics.java

@@ -17,6 +17,7 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
+@IdClass(YlPrimaryKeyLong.class)
 @Table(name = "biz_088_dc_network_statistics")
 public class Biz088DcNetworkStatistics {
 
@@ -145,6 +146,7 @@ public class Biz088DcNetworkStatistics {
 	/**
 	* tongId
 	*/
+	@Id
 	@Column(name = "tongID")
 	private Long tongId;