fix(设备告警): 错误SQL处理

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentAlarmController.java

@@ -29,6 +29,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author keyong
@@ -148,7 +149,8 @@ public class EquipmentAlarmController extends AbstractBaseController {
         queryRequests.add(request8);
         CommonRequest request9 = new CommonRequest();
         request9.setName("buildIds");
-        request9.setValue(ObjectUtils.isEmpty(buildIds) ? null : buildIds);
+        buildIds = ObjectUtils.isEmpty(buildIds) ? null : buildIds.stream().map(v -> v.replace("[", "").replace("]", "")).collect(Collectors.toList());
+        request9.setValue(buildIds);
         queryRequests.add(request9);
         CommonRequest request10 = new CommonRequest();
         request10.setName("id");

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml

@@ -241,12 +241,8 @@
             <if test="param.system != null and param.system != ''">
                 AND find_in_set(#{param.system},wles.system_id)
             </if>
-            <if test="param.buildIds!=null">
---                 AND wlesal.build_id IN
-                AND wles.warehouse_structure_id IN
-                <foreach item="item" collection="param.buildIds" separator=","
-                         open="(" close=")" index="">#{item}
-                </foreach>
+            <if test="param.buildIds!=null and param.buildIds.size() > 0">
+                AND find_in_set(#{param.buildIds}, wles.warehouse_structure_id)
             </if>
             <if test="param.id!=null and param.id!=''">AND wlesal.equipment_specific_id = #{param.id}</if>
             <if test="param.cleanStatus != null and param.cleanStatus != '' and param.cleanStatus == 1">AND