裂解炉炉管测温测压

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

@@ -1432,40 +1432,45 @@ public class TFurnancePressureController extends BaseController
      * 每日巡检数据生成
      */
     public synchronized List<TFurnancePressure> genData(TFurnancePressure tFurnancePressure) {
-        // 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
-            TFurnancePressure pressure1 = new TFurnancePressure();
-            pressure1.setRecordTime(am);
-            pressure1.setDeptId(103L);
-            pressure1.setFurnanceName(furnanceName);
-            tFurnancePressureService.insertTFurnancePressure(pressure1);
-            // 测压 20:00:00
-            TFurnancePressure pressure2 = new TFurnancePressure();
-            pressure2.setRecordTime(pm);
-            pressure2.setDeptId(103L);
-            pressure2.setFurnanceName(furnanceName);
-            tFurnancePressureService.insertTFurnancePressure(pressure2);
-            // 测温 08:00:00
-            TFurnanceTemperature temperature = new TFurnanceTemperature();
-            temperature.setRecordTime(am);
-            temperature.setDeptId(103L);
-            temperature.setFurnanceName(furnanceName);
-            tFurnanceTemperatureService.insertTFurnanceTemperature(temperature);
-        }
-        return tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
+        List<TFurnancePressure> list = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
+        if (list.size() != 0) {
+            return list;
+        } else {
+            // 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
+                TFurnancePressure pressure1 = new TFurnancePressure();
+                pressure1.setRecordTime(am);
+                pressure1.setDeptId(103L);
+                pressure1.setFurnanceName(furnanceName);
+                tFurnancePressureService.insertTFurnancePressure(pressure1);
+                // 测压 20:00:00
+                TFurnancePressure pressure2 = new TFurnancePressure();
+                pressure2.setRecordTime(pm);
+                pressure2.setDeptId(103L);
+                pressure2.setFurnanceName(furnanceName);
+                tFurnancePressureService.insertTFurnancePressure(pressure2);
+                // 测温 08:00:00
+                TFurnanceTemperature temperature = new TFurnanceTemperature();
+                temperature.setRecordTime(am);
+                temperature.setDeptId(103L);
+                temperature.setFurnanceName(furnanceName);
+                tFurnanceTemperatureService.insertTFurnanceTemperature(temperature);
+            }
+            return tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
+        }
     }
 
     /**

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

@@ -545,40 +545,45 @@ public class TFurnanceTemperatureController extends BaseController
      * 每日巡检数据生成
      */
     public synchronized TFurnanceTemperature genData(TFurnanceTemperature tFurnanceTemperature) {
-        // 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
-            TFurnancePressure pressure1 = new TFurnancePressure();
-            pressure1.setRecordTime(am);
-            pressure1.setDeptId(103L);
-            pressure1.setFurnanceName(furnanceName);
-            tFurnancePressureService.insertTFurnancePressure(pressure1);
-            // 测压 20:00:00
-            TFurnancePressure pressure2 = new TFurnancePressure();
-            pressure2.setRecordTime(pm);
-            pressure2.setDeptId(103L);
-            pressure2.setFurnanceName(furnanceName);
-            tFurnancePressureService.insertTFurnancePressure(pressure2);
-            // 测温 08:00:00
-            TFurnanceTemperature temperature = new TFurnanceTemperature();
-            temperature.setRecordTime(am);
-            temperature.setDeptId(103L);
-            temperature.setFurnanceName(furnanceName);
-            tFurnanceTemperatureService.insertTFurnanceTemperature(temperature);
-        }
-        return tFurnanceTemperatureService.selectTFurnanceTemperatureByDate(tFurnanceTemperature);
+        TFurnanceTemperature obj = tFurnanceTemperatureService.selectTFurnanceTemperatureByDate(tFurnanceTemperature);
+        if (obj != null) {
+            return obj;
+        } else {
+            // 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
+                TFurnancePressure pressure1 = new TFurnancePressure();
+                pressure1.setRecordTime(am);
+                pressure1.setDeptId(103L);
+                pressure1.setFurnanceName(furnanceName);
+                tFurnancePressureService.insertTFurnancePressure(pressure1);
+                // 测压 20:00:00
+                TFurnancePressure pressure2 = new TFurnancePressure();
+                pressure2.setRecordTime(pm);
+                pressure2.setDeptId(103L);
+                pressure2.setFurnanceName(furnanceName);
+                tFurnancePressureService.insertTFurnancePressure(pressure2);
+                // 测温 08:00:00
+                TFurnanceTemperature temperature = new TFurnanceTemperature();
+                temperature.setRecordTime(am);
+                temperature.setDeptId(103L);
+                temperature.setFurnanceName(furnanceName);
+                tFurnanceTemperatureService.insertTFurnanceTemperature(temperature);
+            }
+            return tFurnanceTemperatureService.selectTFurnanceTemperatureByDate(tFurnanceTemperature);
+        }
     }
 
     /**