yangjun
/
panshi_java_new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

恢复实体类字段类型

This commit is contained in:
1378012178@qq.com 2025-08-28 10:45:53 +08:00
parent ceac0d6996
commit 563edf466b
2 changed files with 147 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatanalysis.java
View File

@ -100,22 +100,22 @@ public class Heatanalysis extends JeecgEntity {
private Integer reportType;//数据采集类型 1设备自动上报 2定时模拟
private String fromFlow; // 温度是否从流量取 0否 1是
private String view031; // 流量设备SN，view031到view047全是从流量表上获取的数据
private Date view032; // 流量数据上报时间
private String view032; // 流量数据上报时间
private String view033; // 仪表ID
private int view034; // 数据有效标识 0无效 1有效
private Double view035; // 供水温度
private Double view036; // 回水温度
private Double view037; // 瞬时流量
private Double view038; // 正累积流量
private Double view039; // 负累积流量
private Double view040; // 净累积流量
private Double view041; // 瞬时热量
private Double view042; // 正累积热量
private Double view043; // 负累积热量
private Double view044; // 净累积热量
private Double view045; // 流体速度
private Double view046; // 流量因子
private Double view047; // 热量因子
private String view034; // 数据有效标识 0无效 1有效
private String view035; // 供水温度
private String view036; // 回水温度
private String view037; // 瞬时流量
private String view038; // 正累积流量
private String view039; // 负累积流量
private String view040; // 净累积流量
private String view041; // 瞬时热量
private String view042; // 正累积热量
private String view043; // 负累积热量
private String view044; // 净累积热量
private String view045; // 流体速度
private String view046; // 流量因子
private String view047; // 热量因子
private Integer isExtract;//是否抽取 0否 1是
/**地区类型*/
@Excel(name = "地区类型", width = 15)

45
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/job/FlowanalysisJob.java
View File

@ -32,10 +32,8 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
/**
* 发送消息任务
*
* @author: jeecg-boot
*/
@ -69,11 +67,11 @@ public class FlowanalysisJob implements Job {
heatanalysisQueryWrapper.last("limit 1");
Heatanalysis heatanalysis = heatanalysisService.getOne(heatanalysisQueryWrapper);
if(heatanalysis != null){
Date view032_old = heatanalysis.getView032();
String view032_old = heatanalysis.getView032();
String data = jsonObject.getStr("data");
JSONObject dataObject = new JSONObject(data);
String view032 = dataObject.getStr("logat");
if (StringUtils.equals(view032, new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(view032_old))) {
if(StringUtils.equals(view032,view032_old)){
log.info("--------数据重复---------");
continue;
}
@ -97,38 +95,38 @@ public class FlowanalysisJob implements Job {
String view046 = dataObject.getStr("n");
String view047 = dataObject.getStr("m");
heatanalysis.setView031(sn);
heatanalysis.setView032(new Date(view032));
heatanalysis.setView032(view032);
heatanalysis.setView033(view033);
heatanalysis.setView034(Integer.parseInt(view034));
heatanalysis.setView035(Double.parseDouble(view035));
heatanalysis.setView036(Double.parseDouble(view036));
heatanalysis.setView034(view034);
heatanalysis.setView035(view035);
heatanalysis.setView036(view036);
if (StringUtils.isEmpty(view037)){
heatanalysis.setView037(Double.parseDouble(view037_2));
heatanalysis.setView037(view037_2);
}else{
heatanalysis.setView037(Double.parseDouble(view037));
heatanalysis.setView037(view037);
}
if (StringUtils.isEmpty(view038)){
heatanalysis.setView038(Double.parseDouble(view038_2));
heatanalysis.setView038(view038_2);
}else{
heatanalysis.setView038(Double.parseDouble(view038));
heatanalysis.setView038(view038);
}
if (StringUtils.isEmpty(view039)){
heatanalysis.setView039(Double.parseDouble(view039_2));
heatanalysis.setView039(view039_2);
}else{
heatanalysis.setView039(Double.parseDouble(view039));
heatanalysis.setView039(view039);
}
if (StringUtils.isEmpty(view040)){
heatanalysis.setView040(Double.parseDouble(view040_2));
heatanalysis.setView040(view040_2);
}else{
heatanalysis.setView040(Double.parseDouble(view040));
heatanalysis.setView040(view040);
}
heatanalysis.setView041(Double.parseDouble(view041));
heatanalysis.setView042(Double.parseDouble(view042));
heatanalysis.setView043(Double.parseDouble(view043));
heatanalysis.setView044(Double.parseDouble(view044));
heatanalysis.setView045(Double.parseDouble(view045));
heatanalysis.setView046(Double.parseDouble(view046));
heatanalysis.setView047(Double.parseDouble(view047));
heatanalysis.setView041(view041);
heatanalysis.setView042(view042);
heatanalysis.setView043(view043);
heatanalysis.setView044(view044);
heatanalysis.setView045(view045);
heatanalysis.setView046(view046);
heatanalysis.setView047(view047);
heatanalysisService.exeWater(heatanalysis);
}
@ -141,6 +139,7 @@ public class FlowanalysisJob implements Job {
}
public static String getWebInfo(String sn) {
String result = "false";
try {