Merge remote-tracking branch 'origin/master'

zgztBus/jeecg-module-gcm/src/main/java/org/jeecg/modules/externalData/mapper/xml/SteelMakeMapper.xml

@@ -5,7 +5,7 @@
     <select id="getDataList" resultType="org.jeecg.modules.externalData.entity.Detector">
         select `id`, address,ifnull(data_value,'离线') as number
         from steel_make
-        where type != '-1' AND type_position is NULL
+        where type != '-1' AND type_position = '27'
     </select>
 
     <select id="getFilterDataList" resultType="org.jeecg.modules.externalData.entity.Detector">

zgztBus/jeecg-module-gcm/src/main/java/org/jeecg/modules/externalData/mapper/xml/SteelMakeNewMapper.xml

@@ -5,7 +5,7 @@
     <select id="getDataList" resultType="org.jeecg.modules.externalData.entity.Detector">
         select `id`, address,ifnull(data_value,'离线') as number
         from steel_make_new
-        where type != '-1' AND type_position is NULL
+        where type != '-1' AND type_position = '27'
     </select>
 
     <select id="getFilterDataList" resultType="org.jeecg.modules.externalData.entity.Detector">

zgztBus/jeecg-module-gcm/src/main/java/org/jeecg/modules/externalData/mapper/xml/SteelMakeOldMapper.xml

@@ -5,7 +5,7 @@
     <select id="getDataList" resultType="org.jeecg.modules.externalData.entity.Detector">
         select `id`, ifnull(address, vname) as address,ifnull(data_value,'离线') as number
         from steel_make_old
-        where type != '-1' AND type_position is NULL
+        where type != '-1' AND type_position = '27'
     </select>
 
     <select id="getFilterDataList" resultType="org.jeecg.modules.externalData.entity.Detector">

zgztBus/jeecg-module-gcm/src/main/java/org/jeecg/modules/externalData/mapper/xml/SteelMakeSinterMapper.xml

@@ -5,7 +5,7 @@
     <select id="getDataList" resultType="org.jeecg.modules.externalData.entity.Detector">
         select `id`, address,ifnull(data_value,'离线') as number
         from steel_make_sinter
-        where type != '-1' AND type_position is NULL
+        where type != '-1' AND type_position = '27'
     </select>
 
     <select id="getTsDataList" resultType="org.jeecg.modules.externalData.entity.Detector">

zgztBus/jeecg-module-gcm/src/main/java/org/jeecg/modules/externalData/mapper/xml/SteelRollingMapper.xml

@@ -5,7 +5,7 @@
     <select id="getDataList" resultType="org.jeecg.modules.externalData.entity.Detector">
         select `id`, address,ifnull(data_value,'离线') as number
         from steel_rolling
-        where type != '-1' AND type_position is NULL
+        where type != '-1' AND type_position = '27'
     </select>
 
     <select id="getTsDataList" resultType="org.jeecg.modules.externalData.entity.Detector">

zgztBus/jeecg-module-gcm/src/main/java/org/jeecg/modules/externalData/service/impl/ExternalDataServiceImpl.java

@@ -61,7 +61,7 @@ public class ExternalDataServiceImpl implements IExternalDataService {
 //            statement.setInt(2,pageSize);
             String sql = "";
             if ("0".equals(dataType)){
-                sql = "select `id`,address,`number` from detector where gas = 'CO' and type_position is null and address not in ('5浅脱硫排水器','1#浅脱硫排水器','2#浅脱硫排水器','3#浅脱硫排水器','4#浅脱硫排水器','1#浅脱硫门口','2#浅脱硫门口','5#热值分析仪','4#热值分析仪','柜前U型水封2层平台','柜前U型水封','U型水封放散平台','1#、2#高炉Z37-4e','1#、2#高炉Z37-1e')";
+                sql = "select `id`,address,`number` from detector where gas = 'CO' and address not in ('5浅脱硫排水器','1#浅脱硫排水器','2#浅脱硫排水器','3#浅脱硫排水器','4#浅脱硫排水器','1#浅脱硫门口','2#浅脱硫门口','5#热值分析仪','4#热值分析仪','柜前U型水封2层平台','柜前U型水封','U型水封放散平台','1#、2#高炉Z37-4e','1#、2#高炉Z37-1e')";
             }else {
                 sql = "select `id`,address,`number` from detector where gas = 'CO' and type_position = 27 and address not in ('5浅脱硫排水器','1#浅脱硫排水器','2#浅脱硫排水器','3#浅脱硫排水器','4#浅脱硫排水器','1#浅脱硫门口','2#浅脱硫门口','5#热值分析仪','4#热值分析仪','柜前U型水封2层平台','柜前U型水封','U型水封放散平台','1#、2#高炉Z37-4e','1#、2#高炉Z37-1e')";
             }
@@ -79,7 +79,7 @@ public class ExternalDataServiceImpl implements IExternalDataService {
             statement.clearBatch();
             String sqlInfo = "";
             if ("0".equals(dataType)){
-                sqlInfo = "select count(0) from detector where gas = 'CO' and type_position is null and address not in ('5浅脱硫排水器','1#浅脱硫排水器','2#浅脱硫排水器','3#浅脱硫排水器','4#浅脱硫排水器','1#浅脱硫门口','2#浅脱硫门口','5#热值分析仪','4#热值分析仪','柜前U型水封2层平台','柜前U型水封','U型水封放散平台','1#、2#高炉Z37-4e','1#、2#高炉Z37-1e')";
+                sqlInfo = "select count(0) from detector where gas = 'CO' and address not in ('5浅脱硫排水器','1#浅脱硫排水器','2#浅脱硫排水器','3#浅脱硫排水器','4#浅脱硫排水器','1#浅脱硫门口','2#浅脱硫门口','5#热值分析仪','4#热值分析仪','柜前U型水封2层平台','柜前U型水封','U型水封放散平台','1#、2#高炉Z37-4e','1#、2#高炉Z37-1e')";
             }else {
                 sqlInfo = "select count(0) from detector where gas = 'CO' and type_position = 27 and address not in ('5浅脱硫排水器','1#浅脱硫排水器','2#浅脱硫排水器','3#浅脱硫排水器','4#浅脱硫排水器','1#浅脱硫门口','2#浅脱硫门口','5#热值分析仪','4#热值分析仪','柜前U型水封2层平台','柜前U型水封','U型水封放散平台','1#、2#高炉Z37-4e','1#、2#高炉Z37-1e')";
             }
@@ -121,9 +121,9 @@ public class ExternalDataServiceImpl implements IExternalDataService {
             for (int i = 0; i <4 ; i++) {
                 String sqlInfo = "";
                 if ("0".equals(dataType)){
-                    sqlInfo = "select count(0) as amount from detector where gas = 'CO' and type_position is null and address not in ('5浅脱硫排水器','1#浅脱硫排水器','2#浅脱硫排水器','3#浅脱硫排水器','4#浅脱硫排水器','1#浅脱硫门口','2#浅脱硫门口','5#热值分析仪','4#热值分析仪','柜前U型水封2层平台','柜前U型水封','U型水封放散平台','1#、2#高炉Z37-4e','1#、2#高炉Z37-1e') and type = " + i;
+                    sqlInfo = "select count(0) as amount from detector where gas = 'CO' and address not in ('5浅脱硫排水器','1#浅脱硫排水器','2#浅脱硫排水器','3#浅脱硫排水器','4#浅脱硫排水器','1#浅脱硫门口','2#浅脱硫门口','5#热值分析仪','4#热值分析仪','柜前U型水封2层平台','柜前U型水封','U型水封放散平台','1#、2#高炉Z37-4e','1#、2#高炉Z37-1e') and type = " + i;
                     if(i==0){
-                        sqlInfo = "select count(0) as amount from detector where gas = 'CO' and type_position is null and address not in ('5浅脱硫排水器','1#浅脱硫排水器','2#浅脱硫排水器','3#浅脱硫排水器','4#浅脱硫排水器','1#浅脱硫门口','2#浅脱硫门口','5#热值分析仪','4#热值分析仪','柜前U型水封2层平台','柜前U型水封','U型水封放散平台','1#、2#高炉Z37-4e','1#、2#高炉Z37-1e') and (type = " + i +" or type = 5)";
+                        sqlInfo = "select count(0) as amount from detector where gas = 'CO' and address not in ('5浅脱硫排水器','1#浅脱硫排水器','2#浅脱硫排水器','3#浅脱硫排水器','4#浅脱硫排水器','1#浅脱硫门口','2#浅脱硫门口','5#热值分析仪','4#热值分析仪','柜前U型水封2层平台','柜前U型水封','U型水封放散平台','1#、2#高炉Z37-4e','1#、2#高炉Z37-1e') and (type = " + i +" or type = 5)";
                     }
                 }else {
                     sqlInfo = "select count(0) as amount from detector where gas = 'CO' and type_position = 27 and address not in ('5浅脱硫排水器','1#浅脱硫排水器','2#浅脱硫排水器','3#浅脱硫排水器','4#浅脱硫排水器','1#浅脱硫门口','2#浅脱硫门口','5#热值分析仪','4#热值分析仪','柜前U型水封2层平台','柜前U型水封','U型水封放散平台','1#、2#高炉Z37-4e','1#、2#高炉Z37-1e') and type = " + i;
@@ -179,7 +179,7 @@ public class ExternalDataServiceImpl implements IExternalDataService {
         for (int i = 0; i <4 ; i++) {
             LambdaQueryWrapper<SteelMakeNew> queryWrapper = new LambdaQueryWrapper<>();
             if ("0".equals(dataType)){
-                queryWrapper = new LambdaQueryWrapper<SteelMakeNew>().eq(SteelMakeNew::getType, i).isNull(SteelMakeNew::getTypePosition);
+                queryWrapper = new LambdaQueryWrapper<SteelMakeNew>().eq(SteelMakeNew::getType, i);
             }else if ("1".equals(dataType)){
                 queryWrapper = new LambdaQueryWrapper<SteelMakeNew>().eq(SteelMakeNew::getType, i).eq(SteelMakeNew::getGroupType, dataType).eq(SteelMakeNew::getTypePosition, "27");
             }else if ("2".equals(dataType)){
@@ -218,7 +218,7 @@ public class ExternalDataServiceImpl implements IExternalDataService {
         for (int i = 0; i <4 ; i++) {
             LambdaQueryWrapper<SteelMakeOld> queryWrapper = new LambdaQueryWrapper<>();
             if ("0".equals(dataType)){
-                queryWrapper = new LambdaQueryWrapper<SteelMakeOld>().eq(SteelMakeOld::getType, i).isNull(SteelMakeOld::getTypePosition);
+                queryWrapper = new LambdaQueryWrapper<SteelMakeOld>().eq(SteelMakeOld::getType, i);
             }else if ("1".equals(dataType)){
                 queryWrapper = new LambdaQueryWrapper<SteelMakeOld>().eq(SteelMakeOld::getType, i).eq(SteelMakeOld::getGroupType, dataType).eq(SteelMakeOld::getTypePosition, "27");
             }else if ("2".equals(dataType)){
@@ -255,7 +255,7 @@ public class ExternalDataServiceImpl implements IExternalDataService {
         for (int i = 0; i <4 ; i++) {
             LambdaQueryWrapper<SteelMakeSinter> queryWrapper = new LambdaQueryWrapper<>();
             if ("0".equals(dataType)){
-                queryWrapper = new LambdaQueryWrapper<SteelMakeSinter>().eq(SteelMakeSinter::getType, i).isNull(SteelMakeSinter::getTypePosition);
+                queryWrapper = new LambdaQueryWrapper<SteelMakeSinter>().eq(SteelMakeSinter::getType, i);
             }else if ("1".equals(dataType)){
                 queryWrapper = new LambdaQueryWrapper<SteelMakeSinter>().eq(SteelMakeSinter::getType, i).eq(SteelMakeSinter::getTypePosition, "27");
             }else if ("2".equals(dataType)){
@@ -303,7 +303,7 @@ public class ExternalDataServiceImpl implements IExternalDataService {
         for (int i = 0; i <4 ; i++) { // 等级(四种等级)
             LambdaQueryWrapper<SteelRolling> queryWrapper = new LambdaQueryWrapper<>();
             if ("0".equals(dataType)){
-                queryWrapper = new LambdaQueryWrapper<SteelRolling>().eq(SteelRolling::getType, i).isNull(SteelRolling::getTypePosition);
+                queryWrapper = new LambdaQueryWrapper<SteelRolling>().eq(SteelRolling::getType, i);
             }else if ("1".equals(dataType)){
                 queryWrapper = new LambdaQueryWrapper<SteelRolling>().eq(SteelRolling::getType, i).eq(SteelRolling::getTypePosition, "27");
             }else if ("2".equals(dataType)){
@@ -342,7 +342,7 @@ public class ExternalDataServiceImpl implements IExternalDataService {
         for (int i = 0; i <4 ; i++) {
             LambdaQueryWrapper<SteelMake> queryWrapper = new LambdaQueryWrapper<>();
             if ("0".equals(dataType)){
-                queryWrapper = new LambdaQueryWrapper<SteelMake>().eq(SteelMake::getType, i).isNull(SteelMake::getTypePosition);
+                queryWrapper = new LambdaQueryWrapper<SteelMake>().eq(SteelMake::getType, i);
             }else if ("1".equals(dataType)){
                 queryWrapper = new LambdaQueryWrapper<SteelMake>().eq(SteelMake::getType, i).eq(SteelMake::getGroupType, dataType).eq(SteelMake::getTypePosition, "27");
             }else if ("2".equals(dataType)){
@@ -379,9 +379,9 @@ public class ExternalDataServiceImpl implements IExternalDataService {
             statement = connection.createStatement();
             String sql = "";
             if ("0".equals(dataType)){
-                sql = "select address,factory from detector where gas = 'CO' and type_position is null and address not in ('5浅脱硫排水器','1#浅脱硫排水器','2#浅脱硫排水器','3#浅脱硫排水器','4#浅脱硫排水器','1#浅脱硫门口','2#浅脱硫门口','5#热值分析仪','4#热值分析仪','柜前U型水封2层平台','柜前U型水封','U型水封放散平台','1#、2#高炉Z37-4e','1#、2#高炉Z37-1e') and type = " + type;
+                sql = "select address,factory from detector where gas = 'CO' and address not in ('5浅脱硫排水器','1#浅脱硫排水器','2#浅脱硫排水器','3#浅脱硫排水器','4#浅脱硫排水器','1#浅脱硫门口','2#浅脱硫门口','5#热值分析仪','4#热值分析仪','柜前U型水封2层平台','柜前U型水封','U型水封放散平台','1#、2#高炉Z37-4e','1#、2#高炉Z37-1e') and type = " + type;
                 if(type.equals("0")){
-                    sql = "select address,factory from detector where gas = 'CO' and type_position is null and address not in ('5浅脱硫排水器','1#浅脱硫排水器','2#浅脱硫排水器','3#浅脱硫排水器','4#浅脱硫排水器','1#浅脱硫门口','2#浅脱硫门口','5#热值分析仪','4#热值分析仪','柜前U型水封2层平台','柜前U型水封','U型水封放散平台','1#、2#高炉Z37-4e','1#、2#高炉Z37-1e') and (type = 0 or type = 5)";
+                    sql = "select address,factory from detector where gas = 'CO' and address not in ('5浅脱硫排水器','1#浅脱硫排水器','2#浅脱硫排水器','3#浅脱硫排水器','4#浅脱硫排水器','1#浅脱硫门口','2#浅脱硫门口','5#热值分析仪','4#热值分析仪','柜前U型水封2层平台','柜前U型水封','U型水封放散平台','1#、2#高炉Z37-4e','1#、2#高炉Z37-1e') and (type = 0 or type = 5)";
                 }
             }else if ("1".equals(dataType)){
                 sql = "select address,factory from detector where gas = 'CO' and type_position = '27' and address not in ('5浅脱硫排水器','1#浅脱硫排水器','2#浅脱硫排水器','3#浅脱硫排水器','4#浅脱硫排水器','1#浅脱硫门口','2#浅脱硫门口','5#热值分析仪','4#热值分析仪','柜前U型水封2层平台','柜前U型水封','U型水封放散平台','1#、2#高炉Z37-4e','1#、2#高炉Z37-1e') and type = " + type;
@@ -417,7 +417,7 @@ public class ExternalDataServiceImpl implements IExternalDataService {
     public List<SteelMakeOld> getDeviceOld(String type, String dataType) {
         LambdaQueryWrapper<SteelMakeOld> queryWrapper = new LambdaQueryWrapper<SteelMakeOld>().eq(SteelMakeOld::getType,type);
         if ("0".equals(dataType)){
-            queryWrapper = new LambdaQueryWrapper<SteelMakeOld>().eq(SteelMakeOld::getType,type).isNull(SteelMakeOld::getTypePosition);
+            queryWrapper = new LambdaQueryWrapper<SteelMakeOld>().eq(SteelMakeOld::getType,type);
         }else if ("1".equals(dataType)){
             queryWrapper = new LambdaQueryWrapper<SteelMakeOld>().eq(SteelMakeOld::getType,type).eq(SteelMakeOld::getGroupType,dataType).eq(SteelMakeOld::getTypePosition,"27");
         }else if ("2".equals(dataType)){
@@ -435,7 +435,7 @@ public class ExternalDataServiceImpl implements IExternalDataService {
     public List<SteelMakeSinter> getDeviceSinter(String type, String dataType) {
         LambdaQueryWrapper<SteelMakeSinter> queryWrapper = new LambdaQueryWrapper<>();
         if ("0".equals(dataType)){
-            queryWrapper = new LambdaQueryWrapper<SteelMakeSinter>().eq(SteelMakeSinter::getType,type).isNull(SteelMakeSinter::getTypePosition);
+            queryWrapper = new LambdaQueryWrapper<SteelMakeSinter>().eq(SteelMakeSinter::getType,type);
         }else if ("1".equals(dataType)){
             queryWrapper = new LambdaQueryWrapper<SteelMakeSinter>().eq(SteelMakeSinter::getType,type).eq(SteelMakeSinter::getTypePosition, "27");
         }else if ("2".equals(dataType)){
@@ -453,7 +453,7 @@ public class ExternalDataServiceImpl implements IExternalDataService {
     public List<SteelMakeNew> getDeviceNew(String type, String dataType) {
         LambdaQueryWrapper<SteelMakeNew> queryWrapper = new LambdaQueryWrapper<>();
         if ("0".equals(dataType)){
-            queryWrapper = new LambdaQueryWrapper<SteelMakeNew>().eq(SteelMakeNew::getType,type).isNull(SteelMakeNew::getTypePosition);
+            queryWrapper = new LambdaQueryWrapper<SteelMakeNew>().eq(SteelMakeNew::getType,type);
         }else if ("1".equals(dataType)){
             queryWrapper = new LambdaQueryWrapper<SteelMakeNew>().eq(SteelMakeNew::getType,type).eq(SteelMakeNew::getGroupType,dataType).eq(SteelMakeNew::getTypePosition, "27");
         }else if ("2".equals(dataType)){
@@ -471,7 +471,7 @@ public class ExternalDataServiceImpl implements IExternalDataService {
     public List<SteelRolling> getDeviceRolling(String type, String dataType) {
         LambdaQueryWrapper<SteelRolling> queryWrapper = new LambdaQueryWrapper<>();
         if ("0".equals(dataType)){
-            queryWrapper = new LambdaQueryWrapper<SteelRolling>().eq(SteelRolling::getType,type).isNull(SteelRolling::getTypePosition);
+            queryWrapper = new LambdaQueryWrapper<SteelRolling>().eq(SteelRolling::getType,type);
         }else if ("1".equals(dataType)){
             queryWrapper = new LambdaQueryWrapper<SteelRolling>().eq(SteelRolling::getType,type).eq(SteelRolling::getTypePosition,"27");
         }else if ("2".equals(dataType)){
@@ -489,7 +489,7 @@ public class ExternalDataServiceImpl implements IExternalDataService {
     public List<SteelMake> getDeviceSteel(String type, String dataType) {
         LambdaQueryWrapper<SteelMake> queryWrapper = new LambdaQueryWrapper<>();
         if ("0".equals(dataType)){
-            queryWrapper = new LambdaQueryWrapper<SteelMake>().eq(SteelMake::getType,type).isNull(SteelMake::getTypePosition);
+            queryWrapper = new LambdaQueryWrapper<SteelMake>().eq(SteelMake::getType,type);
         }else if ("1".equals(dataType)){
             queryWrapper = new LambdaQueryWrapper<SteelMake>().eq(SteelMake::getType,type).eq(SteelMake::getGroupType,dataType).eq(SteelMake::getTypePosition,"27");
         }else if ("2".equals(dataType)){
@@ -576,8 +576,8 @@ public class ExternalDataServiceImpl implements IExternalDataService {
         LambdaQueryWrapper<SteelMake> queryWrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<SteelMake> queryOneWrapper = new LambdaQueryWrapper<>();
         if ("0".equals(dataType)){
-            queryWrapper = new LambdaQueryWrapper<SteelMake>().eq(SteelMake::getType,"3").isNull(SteelMake::getTypePosition);
-            queryOneWrapper = new LambdaQueryWrapper<SteelMake>().eq(SteelMake::getType,"2").isNull(SteelMake::getTypePosition);
+            queryWrapper = new LambdaQueryWrapper<SteelMake>().eq(SteelMake::getType,"3");
+            queryOneWrapper = new LambdaQueryWrapper<SteelMake>().eq(SteelMake::getType,"2");
         } else if ("1".equals(dataType)) {
             queryWrapper = new LambdaQueryWrapper<SteelMake>().eq(SteelMake::getType,"3").eq(SteelMake::getGroupType, dataType).eq(SteelMake::getTypePosition, "27");
             queryOneWrapper = new LambdaQueryWrapper<SteelMake>().eq(SteelMake::getType,"2").eq(SteelMake::getGroupType, dataType).eq(SteelMake::getTypePosition, "27");
@@ -600,8 +600,8 @@ public class ExternalDataServiceImpl implements IExternalDataService {
         LambdaQueryWrapper<SteelMakeOld> queryWrapperOld = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<SteelMakeOld> queryOneWrapperOld = new LambdaQueryWrapper<>();
         if ("0".equals(dataType)){
-            queryWrapperOld = new LambdaQueryWrapper<SteelMakeOld>().eq(SteelMakeOld::getType,"3").isNull(SteelMakeOld::getTypePosition);
-            queryOneWrapperOld = new LambdaQueryWrapper<SteelMakeOld>().eq(SteelMakeOld::getType,"2").isNull(SteelMakeOld::getTypePosition);
+            queryWrapperOld = new LambdaQueryWrapper<SteelMakeOld>().eq(SteelMakeOld::getType,"3");
+            queryOneWrapperOld = new LambdaQueryWrapper<SteelMakeOld>().eq(SteelMakeOld::getType,"2");
         } else if ("1".equals(dataType)) {
             queryWrapperOld = new LambdaQueryWrapper<SteelMakeOld>().eq(SteelMakeOld::getType,"3").eq(SteelMakeOld::getGroupType, dataType).eq(SteelMakeOld::getTypePosition, "27");
             queryOneWrapperOld = new LambdaQueryWrapper<SteelMakeOld>().eq(SteelMakeOld::getType,"2").eq(SteelMakeOld::getGroupType, dataType).eq(SteelMakeOld::getTypePosition, "27");
@@ -624,8 +624,8 @@ public class ExternalDataServiceImpl implements IExternalDataService {
         LambdaQueryWrapper<SteelMakeNew> queryWrapperNew = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<SteelMakeNew> queryOneWrapperNew = new LambdaQueryWrapper<>();
         if ("0".equals(dataType)){
-            queryWrapperNew = new LambdaQueryWrapper<SteelMakeNew>().eq(SteelMakeNew::getType,"3").isNull(SteelMakeNew::getTypePosition);
-            queryOneWrapperNew = new LambdaQueryWrapper<SteelMakeNew>().eq(SteelMakeNew::getType,"2").isNull(SteelMakeNew::getTypePosition);
+            queryWrapperNew = new LambdaQueryWrapper<SteelMakeNew>().eq(SteelMakeNew::getType,"3");
+            queryOneWrapperNew = new LambdaQueryWrapper<SteelMakeNew>().eq(SteelMakeNew::getType,"2");
         } else if ("1".equals(dataType)) {
             queryWrapperNew = new LambdaQueryWrapper<SteelMakeNew>().eq(SteelMakeNew::getType,"3").eq(SteelMakeNew::getGroupType, dataType).eq(SteelMakeNew::getTypePosition, "27");
             queryOneWrapperNew = new LambdaQueryWrapper<SteelMakeNew>().eq(SteelMakeNew::getType,"2").eq(SteelMakeNew::getGroupType, dataType).eq(SteelMakeNew::getTypePosition, "27");
@@ -647,7 +647,7 @@ public class ExternalDataServiceImpl implements IExternalDataService {
 //        List<SteelMakeSinter> steelMakeSintersOne = steelMakeSinterMapper.selectList(new LambdaQueryWrapper<SteelMakeSinter>().eq(SteelMakeSinter::getType,"2"));
         LambdaQueryWrapper<SteelMakeSinter> queryWrapperMakeSinters = new LambdaQueryWrapper<>();
         if ("0".equals(dataType)){
-            queryWrapperMakeSinters = new LambdaQueryWrapper<SteelMakeSinter>().eq(SteelMakeSinter::getType,"3").isNull(SteelMakeSinter::getTypePosition);
+            queryWrapperMakeSinters = new LambdaQueryWrapper<SteelMakeSinter>().eq(SteelMakeSinter::getType,"3");
         } else if ("1".equals(dataType)) {
             queryWrapperMakeSinters = new LambdaQueryWrapper<SteelMakeSinter>().eq(SteelMakeSinter::getType,"3").eq(SteelMakeSinter::getTypePosition,"27");
         }else if ("2".equals(dataType)) {
@@ -667,7 +667,7 @@ public class ExternalDataServiceImpl implements IExternalDataService {
         }
         Long oneSteelMakeSinterCount = 0l;
         if ("0".equals(dataType)){
-            oneSteelMakeSinterCount = steelMakeSinterMapper.selectCount(new LambdaQueryWrapper<SteelMakeSinter>().eq(SteelMakeSinter::getType,"2").isNull(SteelMakeSinter::getTypePosition));
+            oneSteelMakeSinterCount = steelMakeSinterMapper.selectCount(new LambdaQueryWrapper<SteelMakeSinter>().eq(SteelMakeSinter::getType,"2"));
         }else if ("1".equals(dataType)){
             oneSteelMakeSinterCount = steelMakeSinterMapper.selectCount(new LambdaQueryWrapper<SteelMakeSinter>().eq(SteelMakeSinter::getType,"2").eq(SteelMakeSinter::getTypePosition,"27"));
         }else if ("2".equals(dataType)){
@@ -677,7 +677,7 @@ public class ExternalDataServiceImpl implements IExternalDataService {
 //        List<SteelRolling> steelRollingsOne = steelRollingMapper.selectList(new LambdaQueryWrapper<SteelRolling>().eq(SteelRolling::getType,"2"));
         List<SteelRolling> steelRollingsTwo = new ArrayList<>();
         if ("0".equals(dataType)){
-            steelRollingsTwo = steelRollingMapper.selectList(new LambdaQueryWrapper<SteelRolling>().eq(SteelRolling::getType,"3").isNull(SteelRolling::getTypePosition));
+            steelRollingsTwo = steelRollingMapper.selectList(new LambdaQueryWrapper<SteelRolling>().eq(SteelRolling::getType,"3"));
         }else if ("1".equals(dataType)){
             steelRollingsTwo = steelRollingMapper.selectList(new LambdaQueryWrapper<SteelRolling>().eq(SteelRolling::getType,"3").eq(SteelRolling::getTypePosition,"27"));
         }else if ("2".equals(dataType)){
@@ -692,7 +692,7 @@ public class ExternalDataServiceImpl implements IExternalDataService {
         });
         Long oneSteelRollingCount = 0l;
         if ("0".equals(dataType)){
-            oneSteelRollingCount = steelRollingMapper.selectCount(new LambdaQueryWrapper<SteelRolling>().eq(SteelRolling::getType,"2").isNull(SteelRolling::getTypePosition));
+            oneSteelRollingCount = steelRollingMapper.selectCount(new LambdaQueryWrapper<SteelRolling>().eq(SteelRolling::getType,"2"));
         }else if ("1".equals(dataType)){
             oneSteelRollingCount = steelRollingMapper.selectCount(new LambdaQueryWrapper<SteelRolling>().eq(SteelRolling::getType,"2").eq(SteelRolling::getTypePosition, "27"));
         }else if ("2".equals(dataType)){
@@ -736,7 +736,7 @@ public class ExternalDataServiceImpl implements IExternalDataService {
             connection = DriverManager.getConnection(url.toString(), configSql.getUsername(), configSql.getPassword());
             String sql = "";
             if ("0".equals(dataType)){
-                sql = "select `id`,address,`number` from detector where gas = 'CO' and type_position is null and address not in ('5浅脱硫排水器','1#浅脱硫排水器','2#浅脱硫排水器','3#浅脱硫排水器','4#浅脱硫排水器','1#浅脱硫门口','2#浅脱硫门口','5#热值分析仪','4#热值分析仪','柜前U型水封2层平台','柜前U型水封','U型水封放散平台','1#、2#高炉Z37-4e','1#、2#高炉Z37-1e') and type = '"+type+"'";
+                sql = "select `id`,address,`number` from detector where gas = 'CO' and address not in ('5浅脱硫排水器','1#浅脱硫排水器','2#浅脱硫排水器','3#浅脱硫排水器','4#浅脱硫排水器','1#浅脱硫门口','2#浅脱硫门口','5#热值分析仪','4#热值分析仪','柜前U型水封2层平台','柜前U型水封','U型水封放散平台','1#、2#高炉Z37-4e','1#、2#高炉Z37-1e') and type = '"+type+"'";
             }else if ("1".equals(dataType)){
                 sql = "select `id`,address,`number` from detector where gas = 'CO' and type_position = '27' and address not in ('5浅脱硫排水器','1#浅脱硫排水器','2#浅脱硫排水器','3#浅脱硫排水器','4#浅脱硫排水器','1#浅脱硫门口','2#浅脱硫门口','5#热值分析仪','4#热值分析仪','柜前U型水封2层平台','柜前U型水封','U型水封放散平台','1#、2#高炉Z37-4e','1#、2#高炉Z37-1e') and type = '"+type+"'";
             }else if ("2".equals(dataType)){

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/events/service/impl/LeanEventsHostServiceImpl.java

@@ -11,9 +11,9 @@ import org.jeecg.modules.events.service.ILeanEventsHostService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 精益事件设备启停配置表
@@ -29,34 +29,53 @@ public class LeanEventsHostServiceImpl extends ServiceImpl<LeanEventsHostMapper,
 
     @Override
     public void edit(LeanEventsHostEditParam leanEventsHostEditParam) {
-        if(oConvertUtils.listIsNotEmpty(leanEventsHostEditParam.getLeanEventsHosts())){
-            LambdaQueryWrapper<LeanEventsHost> deleteQuery = new LambdaQueryWrapper<LeanEventsHost>().eq(LeanEventsHost::getEventsId, leanEventsHostEditParam.getLeanEventsHosts().get(0).getEventsId());
+        if (oConvertUtils.listIsNotEmpty(leanEventsHostEditParam.getLeanEventsHosts())) {
+            List<LeanEventsHost> leanEventsHostList = leanEventsHostEditParam.getLeanEventsHosts();
+            LambdaQueryWrapper<LeanEventsHost> deleteQuery = new LambdaQueryWrapper<LeanEventsHost>().eq(LeanEventsHost::getEventsId, leanEventsHostList.get(0).getEventsId());
             baseMapper.delete(deleteQuery);
-            leanEventsHostEditParam.getLeanEventsHosts().forEach(leanEventsHost -> {
-                baseMapper.insert(leanEventsHost);
+            leanEventsHostList.forEach(x -> {
+                if (oConvertUtils.isNotEmpty(x.getDeviceInformationList())) {
+                    baseMapper.insert(x);
+                }
             });
         }
     }
 
     @Override
     public List<LeanEventsHost> getConfig(String id) {
-
-
-
         LambdaQueryWrapper<LeanEventsHost> query = new LambdaQueryWrapper<LeanEventsHost>().eq(LeanEventsHost::getEventsId, id);
         List<LeanEventsHost> leanEventsHosts = baseMapper.selectList(query);
         leanEventsHosts.forEach(leanEventsHost -> {
-            String deviceTitle = deviceInformationMapper.selectById(leanEventsHost.getDeviceInformationId()).getDeviceTitle();
-            leanEventsHost.setDeviceInformationId(leanEventsHost.getDeviceInformationId()+"|"+deviceTitle);
+            // 检查设备信息 ID 是否包含特定字符串，若不包含则进行处理；(false：峰平谷)
+            if (!containsAny(leanEventsHost.getDeviceInformationId(), "tops", "peaks", "flat", "valleys")) {
+                // 根据设备信息 ID 查询设备标题并赋值到主设备Id
+                String deviceTitle = deviceInformationMapper.selectById(leanEventsHost.getDeviceInformationId()).getDeviceTitle();
+                leanEventsHost.setDeviceInformationId(leanEventsHost.getDeviceInformationId() + "|" + deviceTitle);
+            }
+            // 处理辅设备标题列表
             List<String> deviceChildTites = Arrays.asList(leanEventsHost.getDeviceInformationList().split(","));
-            List<String> resChildTites = new ArrayList<>();
-            deviceChildTites.forEach(deviceChildTite->{
-                String deviceName = deviceInformationMapper.selectById(deviceChildTite).getDeviceTitle();
-                resChildTites.add(deviceChildTite.concat("|"+deviceName));
-            });
-            leanEventsHost.setDeviceInformationList(String.join(",",resChildTites));
+            List<String> resChildTites = deviceInformationMapper.selectBatchIds(deviceChildTites)
+                    .stream()
+                    .map(x -> x.getId() + "|" + x.getDeviceTitle())
+                    .collect(Collectors.toList());
+            // 更新 LeanEventsHost 对象的辅设备配置信息ID集
+            leanEventsHost.setDeviceInformationList(String.join(",", resChildTites));
         });
         return leanEventsHosts;
     }
 
+    /**
+     * 检查字符串是否包含多个子字符串中的任意一个
+     * @param str
+     * @param substrings
+     * @return
+     */
+    private boolean containsAny(String str, String... substrings) {
+        for (String substring : substrings) {
+            if (str.contains(substring)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/systemConfig/peaksAndValleysTimeConfig/entity/PeaksAndValleysTimeConfig.java

@@ -1,18 +1,19 @@
 package org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.entity;
 
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
 
 /**
  * @Description: 峰平谷时段配置
@@ -65,6 +66,7 @@ public class PeaksAndValleysTimeConfig implements Serializable {
     private java.util.Date endTime;
 	/**峰平谷类型*/
 	@Excel(name = "峰平谷类型", width = 15)
-    @ApiModelProperty(value = "峰平谷类型(0:峰 1:平 2:谷)")
+    @ApiModelProperty(value = "峰平谷类型(尖：tops 峰:peaks 平:flat 谷:valleys)")
+    @Dict(dicCode = "fpg_type")
     private String type;
 }

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/systemConfig/peaksAndValleysTimeConfig/service/impl/PeaksAndValleysTimeConfigServiceImpl.java

@@ -23,16 +23,16 @@ public class PeaksAndValleysTimeConfigServiceImpl extends ServiceImpl<PeaksAndVa
         PeaksAndValleysTimeConfigParam res = new PeaksAndValleysTimeConfigParam();
         //获取尖
         res.setTops(baseMapper.selectList(new LambdaQueryWrapper<PeaksAndValleysTimeConfig>()
-                .eq(PeaksAndValleysTimeConfig::getType,"4").orderByAsc(PeaksAndValleysTimeConfig::getStartTime)));
+                .eq(PeaksAndValleysTimeConfig::getType,"tops").orderByAsc(PeaksAndValleysTimeConfig::getStartTime)));
         //获取峰
         res.setPeaks(baseMapper.selectList(new LambdaQueryWrapper<PeaksAndValleysTimeConfig>()
-                .eq(PeaksAndValleysTimeConfig::getType,"0").orderByAsc(PeaksAndValleysTimeConfig::getStartTime)));
+                .eq(PeaksAndValleysTimeConfig::getType,"peaks").orderByAsc(PeaksAndValleysTimeConfig::getStartTime)));
         //获取平
         res.setFlat(baseMapper.selectList(new LambdaQueryWrapper<PeaksAndValleysTimeConfig>()
-                .eq(PeaksAndValleysTimeConfig::getType,"1").orderByAsc(PeaksAndValleysTimeConfig::getStartTime)));
+                .eq(PeaksAndValleysTimeConfig::getType,"flat").orderByAsc(PeaksAndValleysTimeConfig::getStartTime)));
         //获取谷
         res.setValleys(baseMapper.selectList(new LambdaQueryWrapper<PeaksAndValleysTimeConfig>()
-                .eq(PeaksAndValleysTimeConfig::getType,"2").orderByAsc(PeaksAndValleysTimeConfig::getStartTime)));
+                .eq(PeaksAndValleysTimeConfig::getType,"valleys").orderByAsc(PeaksAndValleysTimeConfig::getStartTime)));
         return res;
     }