优化 设备优化

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

@@ -28,6 +28,7 @@ public class MachineAttrDto extends PageDto implements Serializable {
     private String valueName;
     private String specName;
     private String listShow;
+    private String domain;
 
 
     private Date createTime;
@@ -123,4 +124,12 @@ public class MachineAttrDto extends PageDto implements Serializable {
     public void setListShow(String listShow) {
         this.listShow = listShow;
     }
+
+    public String getDomain() {
+        return domain;
+    }
+
+    public void setDomain(String domain) {
+        this.domain = domain;
+    }
 }

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

@@ -52,6 +52,7 @@ public class MachineDto extends PageDto implements Serializable {
     private String direction;//设备方向
     private String directionName;
     private String typeId;
+    private String domain;
 
     private List<MachineAttrDto> machineAttrs;
 
@@ -319,4 +320,12 @@ public class MachineDto extends PageDto implements Serializable {
     public void setTypeId(String typeId) {
         this.typeId = typeId;
     }
+
+    public String getDomain() {
+        return domain;
+    }
+
+    public void setDomain(String domain) {
+        this.domain = domain;
+    }
 }

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

@@ -97,6 +97,9 @@
         <if test="machineId !=null and machineId != ''">
             and t.machine_id= #{machineId}
         </if>
+        <if test="domain !=null and domain != ''">
+            and s.domain= #{domain}
+        </if>
         <if test="machineIds !=null ">
             and t.machine_id in
             <foreach collection="machineIds" item="item" index="index" open="(" close=")" separator=",">

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

@@ -57,9 +57,9 @@ import java.util.List;
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
  */
 @Java110Cmd(serviceCode = "machine.listMachines")
-public class ListMachineCmd extends Cmd {
+public class ListMachinesCmd extends Cmd {
 
-    private static Logger logger = LoggerFactory.getLogger(ListMachineCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(ListMachinesCmd.class);
     @Autowired
     private IMachineInnerServiceSMO machineInnerServiceSMOImpl;
 

service-common/src/main/java/com/java110/common/smo/impl/MachineInnerServiceSMOImpl.java

@@ -65,6 +65,7 @@ public class MachineInnerServiceSMOImpl extends BaseServiceSMO implements IMachi
         MachineAttrDto machineAttrDto = new MachineAttrDto();
         machineAttrDto.setMachineIds(machineIds.toArray(new String[machineIds.size()]));
         machineAttrDto.setCommunityId(machines.get(0).getCommunityId());
+        machineAttrDto.setDomain(machineDto.getDomain());
         List<MachineAttrDto> machineAttrDtos = machineAttrInnerServiceSMOImpl.queryMachineAttrs(machineAttrDto);
 
         List<MachineAttrDto> tMachineAttrDtos = null;