优化监控填写

java110-bean/src/main/java/com/java110/dto/machine/MachineDto.java

@@ -34,6 +34,7 @@ public class MachineDto extends PageDto implements Serializable {
     private String communityId;
     private String machineName;
     private String machineTypeCd;
+    private String[] machineTypeCds;
     private String locationType;
     private String machineTypeCdName;
     private String machineIp;
@@ -330,4 +331,12 @@ public class MachineDto extends PageDto implements Serializable {
     public void setDomain(String domain) {
         this.domain = domain;
     }
+
+    public String[] getMachineTypeCds() {
+        return machineTypeCds;
+    }
+
+    public void setMachineTypeCds(String[] machineTypeCds) {
+        this.machineTypeCds = machineTypeCds;
+    }
 }

java110-db/src/main/resources/mapper/common/MachineServiceDaoImplMapper.xml

@@ -195,6 +195,12 @@
         <if test="locationTypeCd !=null and locationTypeCd != ''">
             and t.location_type_cd= #{locationTypeCd}
         </if>
+        <if test="machineTypeCds != null ">
+            and t.machine_type_cd in
+            <foreach collection="machineTypeCds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="typeId !=null and typeId != ''">
             and t.type_id= #{typeId}
         </if>
@@ -321,6 +327,12 @@
         <if test="machineTypeCd !=null and machineTypeCd != ''">
             and t.machine_type_cd= #{machineTypeCd}
         </if>
+        <if test="machineTypeCds != null ">
+            and t.machine_type_cd in
+            <foreach collection="machineTypeCds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="machineIp !=null and machineIp != ''">
             and t.machine_ip= #{machineIp}
         </if>

service-common/src/main/java/com/java110/common/cmd/machine/ListMachinesCmd.java

@@ -90,6 +90,10 @@ public class ListMachinesCmd extends Cmd {
 
         MachineDto machineDto = BeanConvertUtil.covertBean(reqJson, MachineDto.class);
 
+        if (reqJson.containsKey("machineTypeCds") && !StringUtil.isEmpty(reqJson.getString("machineTypeCds"))) {
+            machineDto.setMachineTypeCds(reqJson.getString("machineTypeCds").split(","));
+        }
+
         int count = machineInnerServiceSMOImpl.queryMachinesCount(machineDto);
 
         List<ApiMachineDataVo> machines = null;