裂解炉炉管测温测压 - 当天数据未生成提示

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

@@ -769,7 +769,6 @@ public class TFurnancePressureController extends BaseController
     @PostMapping("/info")
     public AjaxResult getPressureInfo(@RequestBody TFurnancePressure tFurnancePressure) throws ParseException {
         String furnanceName = tFurnancePressure.getFurnanceName();
-//        Date recordTime = tFurnancePressure.getRecordTime();
         Date recordTime = new Date();
         if ("".equals(furnanceName) || recordTime == null) {
             return AjaxResult.success();
@@ -799,11 +798,19 @@ public class TFurnancePressureController extends BaseController
             }
         }
         if (recordTime.getTime() >= parse.getTime()) {
-            this.isComplete(pm);
-            return AjaxResult.success(pm);
+            if (pm == null ) {
+                return AjaxResult.error("当天数据未生成");
+            } else {
+                this.isComplete(pm);
+                return AjaxResult.success(pm);
+            }
         } else {
-            this.isComplete(am);
-            return AjaxResult.success(am);
+            if (am == null ) {
+                return AjaxResult.error("当天数据未生成");
+            } else {
+                this.isComplete(am);
+                return AjaxResult.success(am);
+            }
         }
     }
     public TFurnancePressure isComplete(TFurnancePressure tFurnancePressure) {

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

@@ -170,7 +170,6 @@ public class TFurnanceTemperatureController extends BaseController
     @PostMapping("/info")
     public AjaxResult getTemperatureInfo(@RequestBody TFurnanceTemperature tFurnanceTemperature) throws ParseException {
         String furnanceName = tFurnanceTemperature.getFurnanceName();
-//        Date recordTime = tFurnanceTemperature.getRecordTime();
         Date recordTime = new Date();
         if ("".equals(furnanceName) || recordTime == null) {
             return AjaxResult.success();
@@ -186,8 +185,12 @@ public class TFurnanceTemperatureController extends BaseController
         Date parse = sdf.parse(sdf.format(date));
         tFurnanceTemperature.setRecordTime(parse);
         TFurnanceTemperature temperature = tFurnanceTemperatureService.selectTFurnanceTemperatureByDate(tFurnanceTemperature);
-        this.isComplete(temperature);
-        return AjaxResult.success(temperature);
+        if (temperature == null ) {
+            return AjaxResult.error("当天数据未生成");
+        } else {
+            this.isComplete(temperature);
+            return AjaxResult.success(temperature);
+        }
     }
     public TFurnanceTemperature isComplete(TFurnanceTemperature tFurnanceTemperature) {
         String furnanceName = tFurnanceTemperature.getFurnanceName();