设备增加屏幕类型

device-api-service/src/main/java/com/xy/service/DeviceRegisterServiceImpl.java

@@ -185,7 +185,6 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
         //修改系统信息
         deviceSysinfoService.update(new LambdaUpdateWrapper<DeviceSysinfo>()
                 .set(DeviceSysinfo::getDeviceSn, updateSn.getDeviceSn())
-                .set(Emptys.check(updateSn.getScreenType()), DeviceSysinfo::getScreenType, updateSn.getScreenType())
                 .eq(DeviceSysinfo::getDeviceId, deviceId));
         //修改mqtt认证
         mqttUserService.update(new LambdaUpdateWrapper<MqttUser>()
@@ -268,17 +267,6 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
                 return;
             }
             data.setDeviceTypeValue(deviceTypeValue);
-            String screenType = data.getScreenType();
-            Integer screenTypeValue = screenType.equals("无屏幕") ? 1
-                    : screenType.equals("触摸屏") ? 2
-                    : screenType.equals("微信刷脸屏") ? 3
-                    : screenType.equals("支付宝刷脸屏") ? 4
-                    : screenType.equals("百度刷脸屏") ? 5
-                    : null;
-            if (screenTypeValue == null) {
-                return;
-            }
-            data.setScreenTypeValue(screenTypeValue);
             sns.add(data);
         }
 
@@ -309,8 +297,7 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
                                 .setDeviceId(deviceId)
                                 .setDeviceSn(uploadSaveBySn.getSn())
                                 .setDevicePc(uploadSaveBySn.getDevicePc())
-                                .setAssetNo(uploadSaveBySn.getAssetNo())
-                                .setScreenType(uploadSaveBySn.getScreenTypeValue());
+                                .setAssetNo(uploadSaveBySn.getAssetNo());
                         R r = deviceRegisterService.save(save);
                         if (r.getCode() == R.Enum.FAIL.getCode()) {
                             log.error("{},{}", uploadSaveBySn.getSn(), r.getMsg());
@@ -336,11 +323,6 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
          */
         private String deviceType;
 
-        /**
-         * 屏幕类型
-         */
-        private String screenType;
-
         /**
          * 资产编号
          */
@@ -356,9 +338,5 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
          */
         private Integer deviceTypeValue;
 
-        /**
-         * 屏幕类型值
-         */
-        private Integer screenTypeValue;
     }
 }

device-api-service/src/main/java/com/xy/service/factory/device/impl/open/OpenDeviceFactoryImpl.java

@@ -98,8 +98,7 @@ public class OpenDeviceFactoryImpl implements DeviceFactory {
         DeviceSysinfo deviceSysinfo = new DeviceSysinfo()
                 .setDeviceId(deviceRegister.getDeviceId())
                 .setDeviceSn(deviceRegister.getDeviceSn())
-                .setCreateTime(deviceRegister.getCreateTime())
-                .setScreenType(save.getScreenType());
+                .setCreateTime(deviceRegister.getCreateTime());
         DeviceStatus deviceStatus = new DeviceStatus().setDeviceId(deviceRegister.getDeviceId());
         DeviceRegister deviceRegisterById = deviceRegisterService.getById(deviceRegister.getDeviceId());
         //新增

device-api/src/main/java/com/xy/dto/DeviceRegisterDto.java

@@ -36,10 +36,6 @@ public class DeviceRegisterDto {
         @ApiModelProperty(value = "资产编号", required = true)
         private String assetNo;
 
-        @NotBlank(message = "screenType不能为空")
-        @ApiModelProperty(value = "屏幕类型", required = true)
-        private Integer screenType;
-
 
         @ApiModelProperty(value = "设备类型", hidden = true)
         private Integer deviceType;
@@ -54,9 +50,6 @@ public class DeviceRegisterDto {
         @ApiModelProperty("设备ID")
         private Long deviceId;
 
-        @ApiModelProperty("屏幕类型")
-        private Integer screenType;
-
         @ApiModelProperty("设备sn")
         private String deviceSn;
     }