|
@@ -7,9 +7,12 @@ 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;
|
|
|
import com.ruoyi.project.production.domain.TFurnanceTemperature;
|
|
|
+import com.ruoyi.project.production.service.ITFurnancePressureService;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
@@ -42,6 +45,9 @@ public class TFurnanceTemperatureController extends BaseController
|
|
|
@Autowired
|
|
|
private ITFurnanceTemperatureService tFurnanceTemperatureService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ITFurnancePressureService tFurnancePressureService;
|
|
|
+
|
|
|
/**
|
|
|
* 裂解炉测温列表Summary(APP)
|
|
|
*/
|
|
@@ -188,11 +194,12 @@ public class TFurnanceTemperatureController extends BaseController
|
|
|
tFurnanceTemperature.setRecordTime(parse);
|
|
|
TFurnanceTemperature temperature = tFurnanceTemperatureService.selectTFurnanceTemperatureByDate(tFurnanceTemperature);
|
|
|
if (temperature == null ) {
|
|
|
- return AjaxResult.error("当天数据未生成");
|
|
|
- } else {
|
|
|
- this.isComplete(temperature);
|
|
|
- return AjaxResult.success(temperature);
|
|
|
+// return AjaxResult.error("当天数据未生成");
|
|
|
+ this.genData();
|
|
|
+ temperature = tFurnanceTemperatureService.selectTFurnanceTemperatureByDate(tFurnanceTemperature);
|
|
|
}
|
|
|
+ this.isComplete(temperature);
|
|
|
+ return AjaxResult.success(temperature);
|
|
|
}
|
|
|
public TFurnanceTemperature isComplete(TFurnanceTemperature tFurnanceTemperature) {
|
|
|
String furnanceName = tFurnanceTemperature.getFurnanceName();
|
|
@@ -538,6 +545,45 @@ public class TFurnanceTemperatureController extends BaseController
|
|
|
return tFurnanceTemperature;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 每日巡检数据生成
|
|
|
+ */
|
|
|
+ public void genData() {
|
|
|
+ // 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);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 查询裂解炉炉管测温MAX
|
|
|
*/
|