加入设备属性管理

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

@@ -22,6 +22,10 @@ public class MachineAttrDto extends PageDto implements Serializable {
     private String communityId;
     private String value;
 
+    private String valueName;
+    private String specName;
+    private String listShow;
+
 
     private Date createTime;
 
@@ -92,4 +96,28 @@ public class MachineAttrDto extends PageDto implements Serializable {
     public void setMachineIds(String[] machineIds) {
         this.machineIds = machineIds;
     }
+
+    public String getValueName() {
+        return valueName;
+    }
+
+    public void setValueName(String valueName) {
+        this.valueName = valueName;
+    }
+
+    public String getSpecName() {
+        return specName;
+    }
+
+    public void setSpecName(String specName) {
+        this.specName = specName;
+    }
+
+    public String getListShow() {
+        return listShow;
+    }
+
+    public void setListShow(String listShow) {
+        this.listShow = listShow;
+    }
 }

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

@@ -77,8 +77,13 @@
     <!-- 查询设备属性信息 add by wuxw 2018-07-03 -->
     <select id="getMachineAttrInfo" parameterType="Map" resultType="Map">
         select t.machine_id,t.machine_id machineId,t.attr_id,t.attr_id attrId,t.spec_cd,t.spec_cd
-        specCd,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.value
+        specCd,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.value,
+        s.spec_name specName,
+        v.value_name valueName,
+        s.list_show listShow
         from machine_attrs t
+        left join attr_spec s on t.spec_cd = s.spec_cd and s.status_cd = '0' and s.table_name = 'machine_attr'
+        left join attr_value v on t.`value` = v.`value` and t.spec_cd = v.spec_cd and v.status_cd = '0'
         where 1 =1
         <if test="machineId !=null and machineId != ''">
             and t.machine_id= #{machineId}

service-api/src/main/java/com/java110/api/bmo/machine/impl/MachineBMOImpl.java

@@ -5,8 +5,8 @@ import com.java110.api.bmo.ApiBaseBMO;
 import com.java110.api.bmo.machine.IMachineBMO;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.intf.common.IMachineInnerServiceSMO;
 import com.java110.dto.machine.MachineDto;
+import com.java110.intf.common.IMachineInnerServiceSMO;
 import com.java110.po.machine.MachinePo;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.util.Assert;
@@ -59,6 +59,7 @@ public class MachineBMOImpl extends ApiBaseBMO implements IMachineBMO {
 
         MachinePo machinePo = BeanConvertUtil.covertBean(businessMachine, MachinePo.class);
         super.insert(dataFlowContext, machinePo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_MACHINE);
+        paramInJson.put("machineId", businessMachine.getString("machineId"));
 
     }
 

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

@@ -12,6 +12,7 @@ import com.java110.intf.common.IMachineAttrInnerServiceSMO;
 import com.java110.intf.common.IMachineInnerServiceSMO;
 import com.java110.intf.user.IUserInnerServiceSMO;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -71,6 +72,9 @@ public class MachineInnerServiceSMOImpl extends BaseServiceSMO implements IMachi
             tMachineAttrDtos = new ArrayList<>();
 
             for (MachineAttrDto tMachineAttrDto : machineAttrDtos) {
+                if (StringUtil.isEmpty(tMachineAttrDto.getValueName())) {
+                    tMachineAttrDto.setValueName(tMachineAttrDto.getValue());
+                }
                 if (tMachineDto.getMachineId().equals(tMachineAttrDto.getMachineId())) {
                     tMachineAttrDtos.add(tMachineAttrDto);
                 }