diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/controller/HeatanalysisHistoryController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/controller/HeatanalysisHistoryController.java index 970e511..6dac103 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/controller/HeatanalysisHistoryController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/controller/HeatanalysisHistoryController.java @@ -54,6 +54,36 @@ public class HeatanalysisHistoryController extends JeecgController queryJxPageList(HeatanalysisHistory heatanalysisHistory, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + @RequestParam(name = "SDateStr", required = false) String SDateStr, + @RequestParam(name = "EDateStr", required = false) String EDateStr, HttpServletRequest req) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + if(StringUtils.isNotBlank(SDateStr)){ + heatanalysisHistory.setSDate(sdf.parse(SDateStr)); + } + if(StringUtils.isNotBlank(EDateStr)){ + heatanalysisHistory.setEDate(sdf.parse(EDateStr)); + } + } catch (ParseException e) { + e.printStackTrace(); + } + Page page = new Page(pageNo, pageSize); + IPage pageList = service.findJxPage(page, heatanalysisHistory); + return Result.ok(pageList); + } + @GetMapping(value = "/queryHistoryList") public Result queryHistoryList(HeatanalysisHistory heatanalysisHistory, HttpServletRequest req) { return service.findHistoryList(heatanalysisHistory); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatanalysis.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatanalysis.java index 7bafa0d..1b358ab 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatanalysis.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatanalysis.java @@ -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 String view032; // 流量数据上报时间 + private Date view032; // 流量数据上报时间 private String view033; // 仪表ID - 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 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 Integer isExtract;//是否抽取 0否 1是 /**地区类型*/ @Excel(name = "地区类型", width = 15) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/HeatanalysisHistory.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/HeatanalysisHistory.java index 64901df..5d85656 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/HeatanalysisHistory.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/HeatanalysisHistory.java @@ -80,6 +80,25 @@ public class HeatanalysisHistory extends JeecgEntity { private String sim; // sim private String code; // code private Integer reportType;//数据采集类型 1设备自动上报 2定时模拟 + private String fromFlow; // 温度是否从流量取 0否 1是 + private String view031; // 流量设备SN，view031到view047全是从流量表上获取的数据 + private Date 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 Integer isExtract;//是否抽取 0否 1是 /**地区类型*/ @Excel(name = "地区类型", width = 15) @ApiModelProperty(value = "地区类型") diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/job/FlowanalysisJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/job/FlowanalysisJob.java index 17d9be4..c46abbe 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/job/FlowanalysisJob.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/job/FlowanalysisJob.java @@ -32,161 +32,162 @@ import java.io.IOException; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; + /** * 发送消息任务 + * * @author: jeecg-boot */ @Slf4j public class FlowanalysisJob implements Job { - @Autowired - private HeatanalysisService heatanalysisService; + @Autowired + private HeatanalysisService heatanalysisService; - @Autowired - private IBlWaterFlowConfigService WaterFlowConfigService; + @Autowired + private IBlWaterFlowConfigService WaterFlowConfigService; - @Override - public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { + @Override + public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { - log.info(String.format("获取热量水流量数据 ! 时间:" + DateUtils.getTimestamp())); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("del_flag","0"); - List list = WaterFlowConfigService.list(queryWrapper); - for(BlWaterFlowConfig config : list){ - try{ - String sn = config.getSn(); - String json = getWebInfo(sn); - if(StringUtils.equals(json,"false")) continue; - JSONObject jsonObject = new JSONObject(json); - log.info("jsonObject:"+jsonObject); - String success = jsonObject.getStr("success"); - if(StringUtils.equals(success,"true")){ - QueryWrapper heatanalysisQueryWrapper = new QueryWrapper<>(); - heatanalysisQueryWrapper.eq("view031",sn); - heatanalysisQueryWrapper.last("limit 1"); - Heatanalysis heatanalysis = heatanalysisService.getOne(heatanalysisQueryWrapper); - if(heatanalysis != null){ - String view032_old = heatanalysis.getView032(); - String data = jsonObject.getStr("data"); - JSONObject dataObject = new JSONObject(data); - String view032 = dataObject.getStr("logat"); - if(StringUtils.equals(view032,view032_old)){ - log.info("--------数据重复---------"); - continue; - } - String view033 = dataObject.getStr("ID"); - String view034 = dataObject.getStr("valid"); - String view035 = dataObject.getStr("gswd"); - String view036 = dataObject.getStr("hswd"); - String view037 = dataObject.getStr("flowRate"); - String view037_2 = dataObject.getStr("ssll"); - String view038 = dataObject.getStr("pflowAccumulator"); - String view038_2 = dataObject.getStr("zljll"); - String view039 = dataObject.getStr("nflowAccumulator"); - String view039_2 = dataObject.getStr("fljll"); - String view040 = dataObject.getStr("netflowAccumulator"); - String view040_2 = dataObject.getStr("jljll"); - String view041 = dataObject.getStr("ssrl"); - String view042 = dataObject.getStr("zljrl"); - String view043 = dataObject.getStr("fljrl"); - String view044 = dataObject.getStr("jljrl"); - String view045 = dataObject.getStr("ltsd"); - String view046 = dataObject.getStr("n"); - String view047 = dataObject.getStr("m"); - heatanalysis.setView031(sn); - heatanalysis.setView032(view032); - heatanalysis.setView033(view033); - heatanalysis.setView034(view034); - heatanalysis.setView035(view035); - heatanalysis.setView036(view036); - if (StringUtils.isEmpty(view037)){ - heatanalysis.setView037(view037_2); - }else{ - heatanalysis.setView037(view037); - } - if (StringUtils.isEmpty(view038)){ - heatanalysis.setView038(view038_2); - }else{ - heatanalysis.setView038(view038); - } - if (StringUtils.isEmpty(view039)){ - heatanalysis.setView039(view039_2); - }else{ - heatanalysis.setView039(view039); - } - if (StringUtils.isEmpty(view040)){ - heatanalysis.setView040(view040_2); - }else{ - heatanalysis.setView040(view040); - } - heatanalysis.setView041(view041); - heatanalysis.setView042(view042); - heatanalysis.setView043(view043); - heatanalysis.setView044(view044); - heatanalysis.setView045(view045); - heatanalysis.setView046(view046); - heatanalysis.setView047(view047); - heatanalysisService.exeWater(heatanalysis); + log.info(String.format("获取热量水流量数据 ! 时间:" + DateUtils.getTimestamp())); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("del_flag", "0"); + List list = WaterFlowConfigService.list(queryWrapper); + for (BlWaterFlowConfig config : list) { + try { + String sn = config.getSn(); + String json = getWebInfo(sn); + if (StringUtils.equals(json, "false")) continue; + JSONObject jsonObject = new JSONObject(json); + log.info("jsonObject:" + jsonObject); + String success = jsonObject.getStr("success"); + if (StringUtils.equals(success, "true")) { + QueryWrapper heatanalysisQueryWrapper = new QueryWrapper<>(); + heatanalysisQueryWrapper.eq("view031", sn); + heatanalysisQueryWrapper.last("limit 1"); + Heatanalysis heatanalysis = heatanalysisService.getOne(heatanalysisQueryWrapper); + if (heatanalysis != null) { + Date 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))) { + log.info("--------数据重复---------"); + continue; + } + String view033 = dataObject.getStr("ID"); + String view034 = dataObject.getStr("valid"); + String view035 = dataObject.getStr("gswd"); + String view036 = dataObject.getStr("hswd"); + String view037 = dataObject.getStr("flowRate"); + String view037_2 = dataObject.getStr("ssll"); + String view038 = dataObject.getStr("pflowAccumulator"); + String view038_2 = dataObject.getStr("zljll"); + String view039 = dataObject.getStr("nflowAccumulator"); + String view039_2 = dataObject.getStr("fljll"); + String view040 = dataObject.getStr("netflowAccumulator"); + String view040_2 = dataObject.getStr("jljll"); + String view041 = dataObject.getStr("ssrl"); + String view042 = dataObject.getStr("zljrl"); + String view043 = dataObject.getStr("fljrl"); + String view044 = dataObject.getStr("jljrl"); + String view045 = dataObject.getStr("ltsd"); + String view046 = dataObject.getStr("n"); + String view047 = dataObject.getStr("m"); + heatanalysis.setView031(sn); + heatanalysis.setView032(new Date(view032)); + heatanalysis.setView033(view033); + heatanalysis.setView034(Integer.parseInt(view034)); + heatanalysis.setView035(Double.parseDouble(view035)); + heatanalysis.setView036(Double.parseDouble(view036)); + if (StringUtils.isEmpty(view037)) { + heatanalysis.setView037(Double.parseDouble(view037_2)); + } else { + heatanalysis.setView037(Double.parseDouble(view037)); + } + if (StringUtils.isEmpty(view038)) { + heatanalysis.setView038(Double.parseDouble(view038_2)); + } else { + heatanalysis.setView038(Double.parseDouble(view038)); + } + if (StringUtils.isEmpty(view039)) { + heatanalysis.setView039(Double.parseDouble(view039_2)); + } else { + heatanalysis.setView039(Double.parseDouble(view039)); + } + if (StringUtils.isEmpty(view040)) { + heatanalysis.setView040(Double.parseDouble(view040_2)); + } else { + heatanalysis.setView040(Double.parseDouble(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)); + heatanalysisService.exeWater(heatanalysis); - } - } + } + } - } catch (Exception e) { - e.printStackTrace(); - } - } - } + } catch (Exception e) { + e.printStackTrace(); + } + } + } + public static String getWebInfo(String sn) { + String result = "false"; + try { + // 1. 创建URL对象 + URL url = new URL("http://49.235.190.102:8068/api/v1/feeding/snap/b501a6e0-d23f-4282-8fab-78661bf999e7/" + sn); - public static String getWebInfo(String sn) { - String result = "false"; - try { - // 1. 创建URL对象 - URL url = new URL("http://49.235.190.102:8068/api/v1/feeding/snap/b501a6e0-d23f-4282-8fab-78661bf999e7/"+sn); + // 2. 打开连接，转换为HttpURLConnection + HttpURLConnection connection = (HttpURLConnection) url.openConnection(); - // 2. 打开连接，转换为HttpURLConnection - HttpURLConnection connection = (HttpURLConnection) url.openConnection(); + // 3. 设置请求方法为GET + connection.setRequestMethod("GET"); - // 3. 设置请求方法为GET - connection.setRequestMethod("GET"); + // 4. 可选：设置请求头（例如，指定期望的响应内容类型） + connection.setRequestProperty("Accept", "application/json"); - // 4. 可选：设置请求头（例如，指定期望的响应内容类型） - connection.setRequestProperty("Accept", "application/json"); + // 5. 获取响应代码 + int responseCode = connection.getResponseCode(); + System.out.println("Response Code: " + responseCode); - // 5. 获取响应代码 - int responseCode = connection.getResponseCode(); - System.out.println("Response Code: " + responseCode); + // 6. 如果响应成功（200 OK），读取响应体 + if (responseCode == HttpURLConnection.HTTP_OK) { + // 使用BufferedReader读取输入流 + BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream())); + String inputLine; + StringBuilder response = new StringBuilder(); - // 6. 如果响应成功（200 OK），读取响应体 - if (responseCode == HttpURLConnection.HTTP_OK) { - // 使用BufferedReader读取输入流 - BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream())); - String inputLine; - StringBuilder response = new StringBuilder(); + while ((inputLine = in.readLine()) != null) { + response.append(inputLine); + } + in.close(); // 关闭流 - while ((inputLine = in.readLine()) != null) { - response.append(inputLine); - } - in.close(); // 关闭流 + // 打印响应结果 + log.info(String.format("获取热量水流量数据 - Response Body:" + response.toString())); + result = response.toString(); + } else { + log.error(String.format("获取热量水流量数据 - GET request failed.")); + result = "false"; + } - // 打印响应结果 - log.info(String.format("获取热量水流量数据 - Response Body:" + response.toString())); - result = response.toString(); - } else { - log.error(String.format("获取热量水流量数据 - GET request failed.")); - result = "false"; - } + // 7. 断开连接 + connection.disconnect(); - // 7. 断开连接 - connection.disconnect(); - - } catch (IOException e) { - e.printStackTrace(); - result = "false"; - } - return result; - } + } catch (IOException e) { + e.printStackTrace(); + result = "false"; + } + return result; + } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisHistoryMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisHistoryMapper.java index 9257980..00cd908 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisHistoryMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisHistoryMapper.java @@ -9,5 +9,6 @@ import java.util.List; public interface HeatanalysisHistoryMapper extends BaseMapper { Page findPage(Page page, @Param("params") HeatanalysisHistory heatanalysisHistory); + Page findJxPage(Page page, @Param("params") HeatanalysisHistory heatanalysisHistory); List findHistoryList(HeatanalysisHistory heatanalysisHistory); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisHistoryMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisHistoryMapper.xml index 8315d9b..ab0e98a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisHistoryMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisHistoryMapper.xml @@ -81,6 +81,103 @@ ORDER BY view001 asc ,view002 asc,view004 asc,DATATIME DESC + +