裂解炉炉管测温测压 - 巡检数据生成方法加锁

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

@@ -1125,9 +1125,7 @@ public class TFurnancePressureController extends BaseController
         tFurnancePressure.setRecordTime(parse);
         List<TFurnancePressure> tFurnancePressures = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
         if (tFurnancePressures.size() == 0) {
-//            return AjaxResult.error("当天数据未生成");
-            this.genData();
-            tFurnancePressures = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
+            tFurnancePressures = this.genData(tFurnancePressure);
         }
         TFurnancePressure am = new TFurnancePressure();
         TFurnancePressure pm = new TFurnancePressure();
@@ -1433,7 +1431,7 @@ public class TFurnancePressureController extends BaseController
     /**
      * 每日巡检数据生成
      */
-    public void genData() {
+    public synchronized List<TFurnancePressure> genData(TFurnancePressure tFurnancePressure) {
         // yyyy-MM-dd 08:00:00
         Date am = new Date();
         am.setHours(8);
@@ -1467,6 +1465,7 @@ public class TFurnancePressureController extends BaseController
             temperature.setFurnanceName(furnanceName);
             tFurnanceTemperatureService.insertTFurnanceTemperature(temperature);
         }
+        return tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
     }
 
     /**

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

@@ -192,9 +192,7 @@ public class TFurnanceTemperatureController extends BaseController
         tFurnanceTemperature.setRecordTime(parse);
         TFurnanceTemperature temperature = tFurnanceTemperatureService.selectTFurnanceTemperatureByDate(tFurnanceTemperature);
         if (temperature == null ) {
-//            return AjaxResult.error("当天数据未生成");
-            this.genData();
-            temperature = tFurnanceTemperatureService.selectTFurnanceTemperatureByDate(tFurnanceTemperature);
+            temperature = this.genData(tFurnanceTemperature);
         }
         this.isComplete(temperature);
         return AjaxResult.success(temperature);
@@ -546,7 +544,7 @@ public class TFurnanceTemperatureController extends BaseController
     /**
      * 每日巡检数据生成
      */
-    public void genData() {
+    public synchronized TFurnanceTemperature genData(TFurnanceTemperature tFurnanceTemperature) {
         // yyyy-MM-dd 08:00:00
         Date am = new Date();
         am.setHours(8);
@@ -580,6 +578,7 @@ public class TFurnanceTemperatureController extends BaseController
             temperature.setFurnanceName(furnanceName);
             tFurnanceTemperatureService.insertTFurnanceTemperature(temperature);
         }
+        return tFurnanceTemperatureService.selectTFurnanceTemperatureByDate(tFurnanceTemperature);
     }
 
     /**