保存代码优化

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/constants/XJConstant.java

@@ -372,6 +372,7 @@ public class XJConstant {
     public static final String NORISK = "无风险";
     public static final String NOUSE = "不涉及";
 
+    public static final int INIT_NUM = 0;
     public static final int RISK_NUM = 1;
     public static final int NORISK_NUM = 2;
 

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java

@@ -54,6 +54,8 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
 import javax.transaction.Transactional;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -114,6 +116,13 @@ public class CheckServiceImpl implements ICheckService {
     @Autowired
     private IdxFeign idxFeign;
 
+    @PersistenceContext
+    private final EntityManager em;
+
+    public CheckServiceImpl(EntityManager em) {
+        this.em = em;
+    }
+
     public static final Logger log = LoggerFactory.getLogger(CheckServiceImpl.class);
 
     @Override
@@ -201,10 +210,12 @@ public class CheckServiceImpl implements ICheckService {
     public void saveCheckImg(List<CheckShot> imgList) {
         Check check = checkDao.findById(imgList.get(0).getCheckId()).get();
         check.setShotNumber(check.getShotNumber() + imgList.size());
-        checkDao.save(check);
+        checkDao.saveAndFlush(check);
         for (CheckShot cs: imgList
              ) {
-            checkShotDao.saveAndFlush(cs);
+            em.persist(cs);
+            em.flush();
+            em.clear();
         }
     }
 
@@ -576,7 +587,7 @@ public class CheckServiceImpl implements ICheckService {
                 score += checkInput.getScore();
                 checkItemList.add(checkInput);
             }
-            if(ObjectUtils.isEmpty(planTask.getRiskStatus())) {
+            if(ObjectUtils.isEmpty(planTask.getRiskStatus()) || planTask.getRiskStatus() == XJConstant.INIT_NUM) {
                 planTask.setRiskStatus(XJConstant.NORISK_NUM);
             }
             planTaskDao.saveAndFlush(planTask);
@@ -645,7 +656,9 @@ public class CheckServiceImpl implements ICheckService {
                 }
             }
             for (CheckInput checkInput : checkItemList) {
-                checkInputDao.saveAndFlush(checkInput);
+                em.persist(checkInput);
+                em.flush();
+                em.clear();
             }
 
             if (imgList.size() > 0) {
@@ -909,6 +922,10 @@ public class CheckServiceImpl implements ICheckService {
                 pointImgUrls.add(action.getPhotoData());
             });
             Check check = checkDao.findById(checkId).get();
+            pointCheckRespone.setTaskStatus(planPointInfo.getTaskStatus());
+            pointCheckRespone.setPointStatus(planPointInfo.getPointStatus());
+            pointCheckRespone.setBeginTime(planPointInfo.getBeginTime());
+            pointCheckRespone.setEndTime(planPointInfo.getEndTime());
             pointCheckRespone.setPointId(pointCheckDetailBo.getPointId());
             pointCheckRespone.setPointName(pointCheckDetailBo.getPointName());
             pointCheckRespone.setPointNo(pointCheckDetailBo.getPointNo());

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -68,6 +68,8 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
@@ -146,6 +148,13 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
     @Autowired
     private RepositoryTs repositoryTs;
 
+    @PersistenceContext
+    private final EntityManager em;
+
+    public PlanTaskServiceImpl(EntityManager em) {
+        this.em = em;
+    }
+
     private final String PATROL_PLAN_TASK_KEY = "PATROL_PLAN_ID:";
 
     private final String packageId = "消息/addCheckRule";
@@ -804,12 +813,16 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
                 // 发送APP待办消息       (20220617  改为定时任务发送消息)
 //                sendMessage(plan, planTask);
                 String executorId = planTask.getUserId();
-                long planId = planTask.getId();
+
+                em.persist(planTask);
+                em.flush();
+                em.clear();
+                
                 for (int i1 = 0; i1 < pointIdList.size(); i1++) {
                     Number pointId = pointIdList.get(i1);
                     PlanTaskDetail planTaskDetailInstance = new PlanTaskDetail();
                     planTaskDetailInstance.setPointId(pointId.longValue());
-                    planTaskDetailInstance.setTaskNo(planId);
+                    planTaskDetailInstance.setTaskNo(planTask.getId());
                     planTaskDetailInstance.setStatus("0");
                     if (XJConstant.TASK_STATUS_TIMEOUT == planTask.getFinishStatus()) {
                         planTaskDetailInstance.setIsFinish(Integer.parseInt(XJConstant.PLAN_TASK_DET_FINISH_OUT));
@@ -819,12 +832,12 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
                         planTaskDetailInstance.setIsFinish(Integer.parseInt(XJConstant.PLAN_TASK_DET_FINISH_YES));
                         planTaskDetailInstance.setStatus("1");
                     }
-                    // 2.保存执行数据明细表
-//                    planTaskDetail.saveAndFlush(planTaskDetailInstance);
+//                    // 2.保存执行数据明细表
+////                    planTaskDetail.saveAndFlush(planTaskDetailInstance);
                     planTaskDetailListSync.add(planTaskDetailInstance);
                 }
             }
-            repositoryTs.batchSave(taskList);
+//            repositoryTs.batchSave(taskList);
             repositoryTs.batchSave(planTaskDetailListSync);
             // 定时任务监控
             log.error("计划重做开始添加定时任务监控========");