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 4c8e19b..b38284e 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 @@ -81,6 +81,8 @@ public class Heatanalysis extends JeecgEntity { private Integer isExtract;//是否抽取 0否 1是 @TableField(exist = false) private Integer isExtracted;//是否被抽取 0否 1是 + @TableField(exist = false) + private Integer isTimeout;//是否超时 0否 1是 @TableField(exist = false) private String SDate;//开始时间 @@ -88,10 +90,6 @@ public class Heatanalysis extends JeecgEntity { private String EDate;//结束时间 @TableField(exist = false) private String tableName;//表名字 - private String delFlag; // 删除标识 - public static final String DEL_FLAG_NORMAL = "0"; - public static final String DEL_FLAG_DELETE = "1"; - public static final String DEL_FLAG_AUDIT = "2"; } \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatsource.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatsource.java index f3714ec..a85bc1b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatsource.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatsource.java @@ -86,8 +86,5 @@ public class Heatsource extends JeecgEntity { private String supplyBuild; private String delFlag; // 删除标识 - public static final String DEL_FLAG_NORMAL = "0"; - public static final String DEL_FLAG_DELETE = "1"; - public static final String DEL_FLAG_AUDIT = "2"; } \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatsourcestation.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatsourcestation.java index b95c1cd..2c931fb 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatsourcestation.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatsourcestation.java @@ -78,7 +78,4 @@ public class Heatsourcestation extends JeecgEntity { private String treeId; //树形ID private String supplybuild; //所供楼宇 private String delFlag; // 删除标识 - public static final String DEL_FLAG_NORMAL = "0"; - public static final String DEL_FLAG_DELETE = "1"; - public static final String DEL_FLAG_AUDIT = "2"; } \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Substation.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Substation.java index 38afb9c..1f5f627 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Substation.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Substation.java @@ -55,7 +55,4 @@ public class Substation extends JeecgEntity { @TableField(exist = false) private String sourceNameView; // 热源名称 private String delFlag; // 删除标识 - public static final String DEL_FLAG_NORMAL = "0"; - public static final String DEL_FLAG_DELETE = "1"; - public static final String DEL_FLAG_AUDIT = "2"; } \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Thermalcompany.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Thermalcompany.java index 2e20bee..2b270fc 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Thermalcompany.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Thermalcompany.java @@ -55,9 +55,5 @@ public class Thermalcompany extends JeecgEntity { private String delFlag; // 删除标识 private String treeId; //排序ID private String orderId; - - public static final String DEL_FLAG_NORMAL = "0"; - public static final String DEL_FLAG_DELETE = "1"; - public static final String DEL_FLAG_AUDIT = "2"; } \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml index d7276ff..1f2b4a4 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml @@ -62,18 +62,11 @@ a.del_flag AS "delFlag", a.report_type AS "reportType", a.is_extract AS "isExtract", --- b.company_name AS "view001Name", --- c.source_name AS "view002Name", --- d.name AS "view003Name", --- e.station_name AS "view004Name", - (select count(*) from bl_data_extract_config bl where bl.one_pipe_sim = a.sim or bl.two_pipe_sim = a.sim) as isExtracted + (select count(*) from bl_data_extract_config bl where bl.one_pipe_sim = a.sim or bl.two_pipe_sim = a.sim) as isExtracted, + (case when datatime > DATE_ADD(NOW(), INTERVAL -10 MINUTE) then 0 else 1 end) as isTimeout FROM HEATANALYSIS a --- LEFT JOIN thermalcompany b ON b.id=a.view001 --- LEFT JOIN heatsource c ON c.id=a.view002 --- LEFT JOIN substation d ON d.id=a.view003 --- LEFT JOIN heatsourcestation e ON e.id=a.view004 - a.del_flag = #{params.DEL_FLAG_NORMAL} + a.del_flag = '0' AND a.view001 = #{params.view001} @@ -143,9 +136,9 @@ -- INNER JOIN thermalcompany b ON b.id=a.view001 -- INNER JOIN heatsource c ON c.id=a.view002 WHERE - a.del_flag = #{DEL_FLAG_NORMAL} - and b.del_flag = #{DEL_FLAG_NORMAL} - and c.del_flag = #{DEL_FLAG_NORMAL} + a.del_flag = '0' +-- and b.del_flag = '0' +-- and c.del_flag = '0' and ifnull(a.view001,'') != '' and ifnull(a.view002,'') != '' and ifnull(a.view004,'') = '' @@ -206,7 +199,7 @@ -- LEFT JOIN substation d ON d.id=a.view003 -- LEFT JOIN heatsourcestation e ON e.id=a.view004 - a.del_flag = #{DEL_FLAG_NORMAL} + a.del_flag = '0' and ifnull(a.view001,'') != '' AND a.view001 = #{view001} @@ -248,7 +241,7 @@ FROM HEATANALYSIS a LEFT JOIN thermalcompany b ON b.id=a.view001 LEFT JOIN heatsourcestation e ON e.id=a.view004 and e.id != 20 - where a.del_flag = #{DEL_FLAG_NORMAL} + where a.del_flag = '0' group by view001,view001Name ORDER BY A.view001 DESC @@ -256,7 +249,7 @@ @@ -346,9 +339,7 @@ a.report_type AS "reportType" FROM HEATANALYSIS a INNER JOIN bl_data_extract_config bl on a.sim = bl.one_pipe_sim and bl.sim = #{params.sim} - - a.del_flag = #{params.DEL_FLAG_NORMAL} - + where a.del_flag = '0' ORDER BY view001 asc ,view002 asc,view004 asc,DATATIME DESC @@ -391,9 +382,7 @@ a.report_type AS "reportType" FROM HEATANALYSIS a INNER JOIN bl_data_extract_config bl on a.sim = bl.two_pipe_sim and bl.sim = #{params.sim} - - a.del_flag = #{params.DEL_FLAG_NORMAL} - + where a.del_flag = '0' ORDER BY view001 asc ,view002 asc,view004 asc,DATATIME DESC @@ -436,9 +425,7 @@ a.report_type AS "reportType" FROM HEATANALYSIS a INNER JOIN bl_data_extract_config bl on a.sim = bl.sim and bl.one_pipe_sim = #{params.sim} - - a.del_flag = #{params.DEL_FLAG_NORMAL} - + where a.del_flag = '0' ORDER BY view001 asc ,view002 asc,view004 asc,DATATIME DESC @@ -481,9 +468,7 @@ a.report_type AS "reportType" FROM HEATANALYSIS a INNER JOIN bl_data_extract_config bl on a.sim = bl.sim and bl.two_pipe_sim = #{params.sim} - - a.del_flag = #{params.DEL_FLAG_NORMAL} - + where a.del_flag = '0' ORDER BY view001 asc ,view002 asc,view004 asc,DATATIME DESC diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatsourceMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatsourceMapper.xml index 30ea3ea..97f071f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatsourceMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatsourceMapper.xml @@ -60,7 +60,7 @@ FROM heatsource a - a.del_flag = #{DEL_FLAG_NORMAL} + a.del_flag = '0' AND a.source_name LIKE concat('%',#{sourceName},'%') diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatsourcestationMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatsourcestationMapper.xml index 84637d1..1d9da40 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatsourcestationMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatsourcestationMapper.xml @@ -55,7 +55,7 @@ FROM heatsourcestation a - a.del_flag = #{DEL_FLAG_NORMAL} + a.del_flag = '0' AND a.station_name LIKE concat('%',#{stationName},'%') diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/SubstationMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/SubstationMapper.xml index c9d267a..0a636ff 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/SubstationMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/SubstationMapper.xml @@ -41,7 +41,7 @@ FROM substation a - a.del_flag = #{DEL_FLAG_NORMAL} + a.del_flag = '0' AND a.name LIKE concat('%',#{name},'%') diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/ThermalcompanyMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/ThermalcompanyMapper.xml index b01c3ab..49c0adb 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/ThermalcompanyMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/ThermalcompanyMapper.xml @@ -40,7 +40,7 @@ FROM thermalcompany a - AND del_flag=#{DEL_FLAG_NORMAL} + AND del_flag = '0' AND a.company_name LIKE concat('%',#{companyName},'%')