部署资源添加分辨率字典

common-lib/src/main/java/com/mortals/xhx/common/pdu/DeviceReq.java

@@ -139,5 +139,9 @@ public class DeviceReq implements Serializable {
      *  设备分辨率
      */
     private String resolution;
+    /**
+     *  设备分辨率值
+     */
+    private String resolutionValue;
 
 }

device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java

@@ -894,8 +894,9 @@ public class DeviceApiController {
         deviceEntity.setCreateUserId(1L);
         deviceEntity.setCreateTime(new Date());
         deviceEntity.setSwitchSend(false);
-        if(!ObjectUtils.isEmpty(req.getResolution())){
+        if(!ObjectUtils.isEmpty(req.getResolution())&&!ObjectUtils.isEmpty(req.getResolutionValue())){
             deviceEntity.setResolution(req.getResolution());
+            deviceEntity.setResolutionValue(req.getResolutionValue());
         }
         deviceService.save(deviceEntity);
 
@@ -941,8 +942,9 @@ public class DeviceApiController {
         deviceEntity.setLeadingOfficial(req.getLeadingOfficial());
         deviceEntity.setDeviceInFloor(req.getDeviceInFloor());
         deviceEntity.setDeviceInBuilding(req.getDeviceInBuilding());
-        if(!ObjectUtils.isEmpty(req.getResolution())){
+        if(!ObjectUtils.isEmpty(req.getResolution())&&!ObjectUtils.isEmpty(req.getResolutionValue())){
             deviceEntity.setResolution(req.getResolution());
+            deviceEntity.setResolutionValue(req.getResolutionValue());
         }
         deviceService.update(deviceEntity);
     }