feat(equipment): 添加设备结构字典文本

- 在 EquipmentController 中添加了设备结构的字典文本映射
- 优化了 OperationDailyController 中的代码格式和逻辑
- 调整了污泥浓度公司的判断逻辑，使用上下限值进行比较

@@ -42,11 +42,12 @@ public class OperationDailyController {
     public Result<Map<String, OperationDailyVO>> operationDaily(String dateTIme) {
         Result<Map<String,OperationDailyVO>> result = new Result<>();
         Map<String,OperationDailyVO>  dataMap = new HashMap<>();
-
-        //  System.out.println("sql = "+sql);
-        OperationDailyVO   njOperationDaily   = getOperationDailyVOB( "1892199062790823936", dateTIme);//南京
-        OperationDailyVO   whOperationDaily   = getOperationDailyVOB( "1892199890272477184", dateTIme);//武汉
-        OperationDailyVO   efhbOperationDaily   = getOperationDailyVOB( "1818215543140909056", dateTIme);//恩菲环保
+        //南京
+        OperationDailyVO njOperationDaily = getOperationDailyVOB( "1892199062790823936", dateTIme);
+        //武汉
+        OperationDailyVO whOperationDaily = getOperationDailyVOB( "1892199890272477184", dateTIme);
+        //恩菲环保
+        OperationDailyVO efhbOperationDaily = getOperationDailyVOB( "1818215543140909056", dateTIme);
 
         dataMap.put("njData",njOperationDaily);
         dataMap.put("whData",whOperationDaily);
@@ -96,17 +97,18 @@ public class OperationDailyController {
         operationDailyVO.setWnDepartName( ConvertUtils.getString(dataMap.get("depart_name"),"无").replaceAll(",","，") );
 
         // 6 污泥浓度公司
+        String mlssUpper = "7000";
+        String mlssLower = "3000";
         String dataViewName9bff = ReportViewUtil.buildView(ReportConstant.view9bff,"AYHGMLSS,BYHGMLSS,CYHGMLSS,DYHGMLSS,EYHGMLSS,FYHGMLSS", departIds, dateTIme,dateTIme);
         sql = "select  ifnull(GROUP_CONCAT(d.depart_name),'无') depart_name  from (";
         sql += "select aaa.depart_id ,";
-        sql +=" CASE   WHEN  (ifnull(aaa.AYHGMLSS,0)  - ifnull(bbb.mlss,99999999.99)) > 0  THEN 1 ";
-        sql += " WHEN (ifnull(aaa.BYHGMLSS,0)  - ifnull(bbb.mlss,99999999.99) ) >0 THEN 1  ";
-        sql += " WHEN (ifnull(aaa.CYHGMLSS,0)  - ifnull(bbb.mlss,99999999.99) ) >0 THEN 1 ";
-        sql +=" WHEN (ifnull(aaa.DYHGMLSS,0) - ifnull(bbb.mlss,99999999.99))>0  THEN 1 ";
-        sql += "  WHEN (ifnull(aaa.EYHGMLSS,0)  - ifnull(bbb.mlss,99999999.99) ) >0 THEN 1  ";
-        sql += " WHEN (ifnull(aaa.FYHGMLSS,0) - ifnull(bbb.mlss,99999999.99))>0  THEN 1 " +
-                " ELSE 0  END AS result  from " +dataViewName9bff+ " aaa";
-        sql += " left join sys_factory_info bbb on bbb.depart_id = aaa.depart_id ) ccc   ";
+        sql += " CASE WHEN ( ifnull( aaa.AYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.AYHGMLSS, 0 ) < "+mlssLower+" ) THEN 1 ";
+        sql += " WHEN ( ifnull( aaa.BYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.BYHGMLSS, 0 ) < "+mlssLower+" ) THEN 1  ";
+        sql += " WHEN ( ifnull( aaa.CYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.CYHGMLSS, 0 ) < "+mlssLower+" ) THEN 1 ";
+        sql += " WHEN ( ifnull( aaa.DYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.DYHGMLSS, 0 ) < "+mlssLower+" ) THEN 1 ";
+        sql += " WHEN ( ifnull( aaa.EYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.EYHGMLSS, 0 ) < "+mlssLower+" ) THEN 1  ";
+        sql += " WHEN ( ifnull( aaa.FYHGMLSS, 0 ) > "+mlssUpper+" OR ifnull( aaa.FYHGMLSS, 0 ) < "+mlssLower+" ) THEN 1 " +
+                " ELSE 0  END AS result  from " +dataViewName9bff+ " aaa ) ccc   ";
         sql += "  left join sys_depart d on ccc.depart_id = d.id  where ccc.result = 1";
         dataMap =  commonSqlService.queryForMap(sql);
         operationDailyVO.setMlssDepartName( ConvertUtils.getString(dataMap.get("depart_name"),"无").replaceAll(",","，") );
@@ -192,11 +194,13 @@ public class OperationDailyController {
             String dataViewName6643HB = ReportViewUtil.buildView(ReportConstant.view6643,"GSL", departIds, previousDay,previousDay);
             sql = "select round(sum(ifnull(aaa.GSL,0))/10000,2) GSL from "+dataViewName6643+"aaa ";
             dataMap =  commonSqlService.queryForMap(sql);
-            operationDailyVO.setScgsl( ConvertUtils.getString(dataMap.get("GSL"),"0") );//日报生产供水量
+            //日报生产供水量
+            operationDailyVO.setScgsl( ConvertUtils.getString(dataMap.get("GSL"),"0") );
 
             sql = "select round(sum(ifnull(aaa.GSL,0))/10000,2) GSL from "+dataViewName6643HB+"aaa ";
             dataMap =  commonSqlService.queryForMap(sql);
-            operationDailyVO.setIncreaseScgsl( ConvertUtils.getString(dataMap.get("GSL"),"0")  );//供水量较昨日增加
+            //供水量较昨日增加
+            operationDailyVO.setIncreaseScgsl( ConvertUtils.getString(dataMap.get("GSL"),"0")  );
         }
         return operationDailyVO;
     }

@@ -622,6 +622,7 @@ public class EquipmentController {
         map.put("departId_dictText","depart_id");
         map.put("equipmentType_dictText","equipment_type");
         map.put("equipmentStatus_dictText","equipment_status");
+        map.put("structures_dictText","structures");
         map.put("equipmentHealthStatus_dictText","equipment_health_status");
         if(map.get(filedCode)!=null){
             return map.get(filedCode);