item:数据同步，修改类名

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/PlanOperationRecord.java → YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/CPlanOperationRecord.java

@@ -15,8 +15,8 @@ import java.util.Date;
 @Data
 @Entity
 @Table(name="c_plan_operation_record")
-@NamedQuery(name="PlanOperationRecord.findAll", query="SELECT e FROM PlanOperationRecord e")
-public class PlanOperationRecord extends BasicEntity {
+@NamedQuery(name="PlanOperationRecord.findAll", query="SELECT e FROM CPlanOperationRecord e")
+public class CPlanOperationRecord extends BasicEntity {
 
     /**
      * 预案ID

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/ContingencyAction.java

@@ -38,7 +38,7 @@ import com.yeejoin.amos.fas.core.util.DateUtil;
 import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance;
 import com.yeejoin.amos.fas.dao.entity.Equipment;
 import com.yeejoin.amos.fas.dao.entity.PlanDetail;
-import com.yeejoin.amos.fas.dao.entity.PlanOperationRecord;
+import com.yeejoin.amos.fas.dao.entity.CPlanOperationRecord;
 import com.yeejoin.amos.fas.datasync.bo.PlanDetailSyncBo;
 import com.yeejoin.amos.fas.datasync.bo.PlanOperationRecordSyncBo;
 import org.slf4j.Logger;
@@ -754,14 +754,14 @@ public class ContingencyAction implements CustomerAction {
         }
 
         //  结束预案 更新预案记录表,预案状态
-        PlanOperationRecord planOperationRecord = planOperationRecordDao.findByBatchNo(contingencyRo.getBatchNo());
-        if (planOperationRecord != null && planOperationRecord.getStatus() == PlanRecordStatusEnum.OPERATION.getCode()) {
-            planOperationRecord.setStatus(PlanRecordStatusEnum.COMPLETE.getCode());
-            planOperationRecord.setEndTime(new Date());
-            PlanOperationRecord record = planOperationRecordDao.save(planOperationRecord);
+        CPlanOperationRecord CPlanOperationRecord = planOperationRecordDao.findByBatchNo(contingencyRo.getBatchNo());
+        if (CPlanOperationRecord != null && CPlanOperationRecord.getStatus() == PlanRecordStatusEnum.OPERATION.getCode()) {
+            CPlanOperationRecord.setStatus(PlanRecordStatusEnum.COMPLETE.getCode());
+            CPlanOperationRecord.setEndTime(new Date());
+            CPlanOperationRecord record = planOperationRecordDao.save(CPlanOperationRecord);
             //  异步数据同步之消息发送
             planOperationRecordDataSync(record);
-            Optional<PlanDetail> optionalPlanDetail = planDetailDao.findById(planOperationRecord.getPlanId());
+            Optional<PlanDetail> optionalPlanDetail = planDetailDao.findById(CPlanOperationRecord.getPlanId());
             if (optionalPlanDetail.get() != null) {
                 PlanDetail planDetail = optionalPlanDetail.get();
                 planDetail.setStatus(ContingencyPlanStatusEnum.AVAILABLE.getCode());
@@ -790,7 +790,7 @@ public class ContingencyAction implements CustomerAction {
         }
     }
 
-    private void planOperationRecordDataSync(PlanOperationRecord record) {
+    private void planOperationRecordDataSync(CPlanOperationRecord record) {
         //  异步数据同步之消息发送
         if (dataSyncSwitch) {
             try {
@@ -975,14 +975,14 @@ public class ContingencyAction implements CustomerAction {
      */
     public void updateNumberPlan(String batchNo) {
         //  结束预案 更新预案记录表,预案状态
-        PlanOperationRecord planOperationRecord = planOperationRecordDao.findByBatchNo(batchNo);
-        if (planOperationRecord != null) {
-            planOperationRecord.setStatus(PlanRecordStatusEnum.INTERRUPT.getCode());
-            planOperationRecord.setEndTime(new Date());
-            PlanOperationRecord record = planOperationRecordDao.save(planOperationRecord);
+        CPlanOperationRecord CPlanOperationRecord = planOperationRecordDao.findByBatchNo(batchNo);
+        if (CPlanOperationRecord != null) {
+            CPlanOperationRecord.setStatus(PlanRecordStatusEnum.INTERRUPT.getCode());
+            CPlanOperationRecord.setEndTime(new Date());
+            CPlanOperationRecord record = planOperationRecordDao.save(CPlanOperationRecord);
             //  异步数据同步之消息发送
             planOperationRecordDataSync(record);
-            Optional<PlanDetail> optionalPlanDetail = planDetailDao.findById(planOperationRecord.getPlanId());
+            Optional<PlanDetail> optionalPlanDetail = planDetailDao.findById(CPlanOperationRecord.getPlanId());
             if (optionalPlanDetail.get() != null) {
                 PlanDetail planDetail = optionalPlanDetail.get();
                 planDetail.setStatus(ContingencyPlanStatusEnum.AVAILABLE.getCode());

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IPlanOperationRecordDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
-import com.yeejoin.amos.fas.dao.entity.PlanOperationRecord;
+import com.yeejoin.amos.fas.dao.entity.CPlanOperationRecord;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
@@ -13,12 +13,12 @@ import java.util.List;
  * @date 2021/1/15 10:36
  */
 @Repository
-public interface IPlanOperationRecordDao extends BaseDao<PlanOperationRecord, Long> {
+public interface IPlanOperationRecordDao extends BaseDao<CPlanOperationRecord, Long> {
     @Query(value="SELECT * from c_plan_operation_record where batch_no = ?1 AND is_delete = 0 ", nativeQuery = true)
-    PlanOperationRecord findByBatchNo(String batchNo);
+    CPlanOperationRecord findByBatchNo(String batchNo);
 
     @Query(value="SELECT * from c_plan_operation_record where plan_id = ?1 AND is_delete = 0 AND status = 0 ORDER BY create_date DESC", nativeQuery = true)
-    List<PlanOperationRecord> findByPlanId1(Long planId);
+    List<CPlanOperationRecord> findByPlanId1(Long planId);
 
 
     int countByPlanId(Long planId);
@@ -28,6 +28,6 @@ public interface IPlanOperationRecordDao extends BaseDao<PlanOperationRecord, Lo
      * @param status 状态
      * @return list
      */
-    List<PlanOperationRecord> findByStatus(Integer status);
+    List<CPlanOperationRecord> findByStatus(Integer status);
 
 }