Merge branch '20210223' of http://114.135.61.188:53000/UIMS/Code into 20210223

operation_manager/src/main/resources/mapper/evaluation/EvaluationItemMapper.xml

@@ -104,7 +104,7 @@
             </if>
 
             <if test="evaluationItem.companyOrgId!=null and evaluationItem.deptOrgId == null">
-               and a.COMPANY_ORG_ID = #{evaluationItem.companyOrgId}
+               and a.COMPANY_ORG_ID = #{evaluationItem.companyOrgId} and a.DEPT_ORG_ID is null
             </if>
             <if test="evaluationItem.name != null  and evaluationItem.name != ''">
                 and a.name LIKE concat('%',#{evaluationItem.name},'%')

sms_water/src/main/java/com/huaxu/dto/SetupMethod.java

@@ -8,7 +8,11 @@ import java.util.Date;
 
 @Data
 public class SetupMethod {
+
     private String deviceId;
+    private String deviceMode;
+    private String deviceType;
+    private String manufacturer;
     private String method;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     private Date receiveTime;

sms_water/src/main/java/com/huaxu/service/DeviceSetupMethodService.java

@@ -10,10 +10,7 @@ import com.huaxu.common.HttpRequest;
 import com.huaxu.common.JacksonUtil;
 import com.huaxu.dao.DeviceSetupMethodMapper;
 import com.huaxu.dto.SetupMethod;
-import com.huaxu.entity.DeviceEntity;
-import com.huaxu.entity.DeviceSetupMethodEntity;
-import com.huaxu.entity.DeviceSetupRecordEntity;
-import com.huaxu.entity.ParmSettingEntity;
+import com.huaxu.entity.*;
 import com.huaxu.model.LoginUser;
 import com.huaxu.util.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +49,8 @@ public class DeviceSetupMethodService extends ServiceImpl<DeviceSetupMethodMappe
     private  String setSetupUrl;
     @Autowired
     private ParmSettingService parmSettingService;
+    @Autowired
+    private DeviceTypeService deviceTypeService;
 
     /**
      * 查列表
@@ -134,11 +133,16 @@ public class DeviceSetupMethodService extends ServiceImpl<DeviceSetupMethodMappe
         List<DeviceSetupMethodEntity> deviceSetupMethodEntities = deviceSetupMethodMapper.findList(info);
         //查询到操作方法后执行操作
         if (deviceSetupMethodEntities.size() > 0) {
+            //查询设备型号
+            DeviceTypeEntity deviceTypeEntity = deviceTypeService.findDeviceTypeById(Long.valueOf(deviceEntity.getDeviceTypeId()));
             String method = deviceSetupMethodEntities.get(0).getMethod();
             methodParms = deviceSetupMethodEntities.get(0).getParams();
             SetupMethod setupMethod = new SetupMethod();
             setupMethod.setMethod(method);
             setupMethod.setUnitIdentifier(deviceEntity.getDeviceCode());
+            setupMethod.setDeviceMode(deviceTypeEntity.getDeviceMode());
+            setupMethod.setDeviceType(deviceTypeEntity.getDeviceType());
+            setupMethod.setManufacturer(deviceTypeEntity.getManufacturerId());
             setupMethod.setReceiveTime(new Date());
             //封装指令
             String[] parm = parms.split(",");