|
@@ -12,13 +12,16 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
|
import com.ruoyi.common.utils.file.FileUploadUtils;
|
|
|
import com.ruoyi.framework.config.RuoYiConfig;
|
|
|
+import com.ruoyi.framework.task.FurnanceTask;
|
|
|
import com.ruoyi.project.common.domain.TCommonfile;
|
|
|
import com.ruoyi.project.common.service.ITCommonfileService;
|
|
|
import com.ruoyi.project.production.controller.vo.FurnancePressureFvpVO;
|
|
|
import com.ruoyi.project.production.controller.vo.FurnancePressureVO;
|
|
|
import com.ruoyi.project.production.controller.vo.FurnanceSummaryVO;
|
|
|
import com.ruoyi.project.production.controller.vo.FvpAnalysisQueryVO;
|
|
|
+import com.ruoyi.project.production.domain.TFurnanceTemperature;
|
|
|
import com.ruoyi.project.production.mapper.TFurnancePressureMapper;
|
|
|
+import com.ruoyi.project.production.service.ITFurnanceTemperatureService;
|
|
|
import org.apache.http.HttpEntity;
|
|
|
import org.apache.http.client.methods.CloseableHttpResponse;
|
|
|
import org.apache.http.client.methods.HttpPost;
|
|
@@ -58,6 +61,9 @@ public class TFurnancePressureController extends BaseController
|
|
|
@Autowired
|
|
|
private ITFurnancePressureService tFurnancePressureService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ITFurnanceTemperatureService tFurnanceTemperatureService;
|
|
|
+
|
|
|
@Resource
|
|
|
private TFurnancePressureMapper tFurnancePressureMapper;
|
|
|
|
|
@@ -1114,6 +1120,11 @@ public class TFurnancePressureController extends BaseController
|
|
|
Date parse = sdf.parse(sdf.format(date));
|
|
|
tFurnancePressure.setRecordTime(parse);
|
|
|
List<TFurnancePressure> tFurnancePressures = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
|
|
|
+ if (tFurnancePressures.size() == 0) {
|
|
|
+// return AjaxResult.error("当天数据未生成");
|
|
|
+ this.genData();
|
|
|
+ tFurnancePressures = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
|
|
|
+ }
|
|
|
TFurnancePressure am = new TFurnancePressure();
|
|
|
TFurnancePressure pm = new TFurnancePressure();
|
|
|
parse.setHours(20);
|
|
@@ -1127,16 +1138,12 @@ public class TFurnancePressureController extends BaseController
|
|
|
am = furnancePressure;
|
|
|
}
|
|
|
}
|
|
|
- if (tFurnancePressures.size() == 0) {
|
|
|
- return AjaxResult.error("当天数据未生成");
|
|
|
+ if (recordTime.getTime() >= parse.getTime()) {
|
|
|
+ this.isComplete(pm);
|
|
|
+ return AjaxResult.success(pm);
|
|
|
} else {
|
|
|
- if (recordTime.getTime() >= parse.getTime()) {
|
|
|
- this.isComplete(pm);
|
|
|
- return AjaxResult.success(pm);
|
|
|
- } else {
|
|
|
- this.isComplete(am);
|
|
|
- return AjaxResult.success(am);
|
|
|
- }
|
|
|
+ this.isComplete(am);
|
|
|
+ return AjaxResult.success(am);
|
|
|
}
|
|
|
}
|
|
|
public TFurnancePressure isComplete(TFurnancePressure tFurnancePressure) {
|
|
@@ -1419,6 +1426,45 @@ public class TFurnancePressureController extends BaseController
|
|
|
return tFurnancePressure;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 每日巡检数据生成
|
|
|
+ */
|
|
|
+ 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);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 查询裂解炉炉管测压FVP
|
|
|
*/
|