裂解炉炉管测压 - 08:00前访问info接口返回前一天晚班数据

裂解炉炉管测温测压 - 巡检数据生成定时任务判空

master/src/main/java/com/ruoyi/framework/task/FurnanceTask.java

@@ -4,7 +4,6 @@ import com.github.stuxuhai.jpinyin.PinyinException;
 import com.ruoyi.common.sendEmail.IMailService;
 import com.ruoyi.common.thread.furnance.FurnancePressureThread;
 import com.ruoyi.common.thread.furnance.FurnanceTemperatureThread;
-import com.ruoyi.common.thread.sai.SaiApplyDueMailThread;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
@@ -64,10 +63,44 @@ public class FurnanceTask extends BaseController {
     @Autowired
     private ISysUserService userService;
 
+    @Autowired
+    private ITFurnanceTemperatureService tFurnanceTemperatureService;
+
+    @Autowired
+    private ITFurnancePressureService tFurnancePressureService;
+
     /**
      * 每日巡检数据生成
      */
-    public void genData() {
+    public void genData() throws ParseException {
+        TFurnancePressure pressure = new TFurnancePressure();
+        TFurnanceTemperature temperature = new TFurnanceTemperature();
+        Date recordTime = new Date();
+        Date date = new Date();
+        date.setYear(recordTime.getYear());
+        date.setMonth(recordTime.getMonth());
+        date.setDate(recordTime.getDate());
+        date.setHours(0);
+        date.setMinutes(0);
+        date.setSeconds(0);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date parse = sdf.parse(sdf.format(date));
+        pressure.setRecordTime(parse);
+        temperature.setRecordTime(parse);
+        List<TFurnancePressure> tFurnancePressures = tFurnancePressureService.selectTFurnancePressureByDate(pressure);
+        List<TFurnanceTemperature> tFurnanceTemperatures = tFurnanceTemperatureService.selectTFurnanceTemperatureByDate2(temperature);
+        if (tFurnancePressures.size() == 0) {
+            this.genPressureData();
+        }
+        if (tFurnanceTemperatures.size() == 0) {
+            this.genTemperatureData();
+        }
+    }
+
+    /**
+     * 生成测压数据
+     */
+    public void genPressureData() {
         // yyyy-MM-dd 08:00:00
         Date am = new Date();
         am.setHours(8);
@@ -94,6 +127,27 @@ public class FurnanceTask extends BaseController {
             pressure2.setDeptId(103L);
             pressure2.setFurnanceName(furnanceName);
             pressureService.insertTFurnancePressure(pressure2);
+        }
+    }
+
+    /**
+     * 生成测温数据
+     */
+    public void genTemperatureData() {
+        // yyyy-MM-dd 08:00:00
+        Date am = new Date();
+        am.setHours(8);
+        am.setMinutes(0);
+        am.setSeconds(0);
+        // yyyy-MM-dd 20:00:00
+        Date pm = new Date();
+        pm.setHours(20);
+        pm.setMinutes(0);
+        pm.setSeconds(0);
+        // furnanceName array
+        String[] furnanceNames = {"H109", "H110", "H111", "H112", "H113", "H114", "H115", "H116", "H117", "H118", "H130"};
+        // 遍历生成数据
+        for (String furnanceName : furnanceNames) {
             // 测温 08:00:00
             TFurnanceTemperature temperature = new TFurnanceTemperature();
             temperature.setRecordTime(am);

master/src/main/java/com/ruoyi/project/production/controller/TFurnancePressureController.java

@@ -1112,7 +1112,11 @@ public class TFurnancePressureController extends BaseController
         Date date = new Date();
         date.setYear(recordTime.getYear());
         date.setMonth(recordTime.getMonth());
-        date.setDate(recordTime.getDate());
+        if (date.getHours() < 8) {
+            date.setDate(recordTime.getDate() - 1);
+        } else {
+            date.setDate(recordTime.getDate());
+        }
         date.setHours(0);
         date.setMinutes(0);
         date.setSeconds(0);

master/src/main/java/com/ruoyi/project/production/controller/TFurnanceTemperatureController.java

@@ -7,7 +7,6 @@ import java.util.Date;
 import java.util.List;
 
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.task.FurnanceTask;
 import com.ruoyi.project.production.controller.vo.FurnanceSummaryVO;
 import com.ruoyi.project.production.controller.vo.FurnanceTemperatureVO;
 import com.ruoyi.project.production.domain.TFurnancePressure;
@@ -25,7 +24,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.production.domain.TFurnanceTemperature;
 import com.ruoyi.project.production.service.ITFurnanceTemperatureService;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;