Merge remote-tracking branch 'origin/test' into test

device-api-service/src/main/java/com/xy/entity/DeviceSysinfo.java

@@ -136,4 +136,8 @@ public class DeviceSysinfo {
      */
     private LocalDateTime createTime;
 
+    /**
+     * 屏幕类型
+     */
+    private Integer screenType;
 }

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

@@ -70,8 +70,6 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
 
     private DeviceCreateIdsServiceImpl deviceCreateIdsService;
 
-    private AlipayDeviceService alipayDeviceService;
-
     @PostMapping("save")
     @ApiOperation("添加")
     @Transactional(rollbackFor = Exception.class)
@@ -187,6 +185,7 @@ 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>()
@@ -209,7 +208,7 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
         ThreadPoolUtils.excPoll(DeviceThreadPoolConfig.DEVICE_COMMON_POLL, 1)
                 .execute(() -> {
                     try {
-                        EasyExcel.read(file.getInputStream(), UploadSaveBySn.class, new UploadSaveBySnListener(deviceCreateIdsService, this, alipayDeviceService)).sheet().doRead();
+                        EasyExcel.read(file.getInputStream(), UploadSaveBySn.class, new UploadSaveBySnListener(deviceCreateIdsService, this)).sheet().doRead();
                     } catch (IOException e) {
                         log.error("", e);
                     }
@@ -242,8 +241,6 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
 
         private final DeviceRegisterServiceImpl deviceRegisterService;
 
-        private final AlipayDeviceService alipayDeviceService;
-
         private JList<UploadSaveBySn> sns = new JArrayList<>();
 
         /**
@@ -271,6 +268,17 @@ 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);
         }
 
@@ -301,7 +309,8 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
                                 .setDeviceId(deviceId)
                                 .setDeviceSn(uploadSaveBySn.getSn())
                                 .setDevicePc(uploadSaveBySn.getDevicePc())
-                                .setAssetNo(uploadSaveBySn.getAssetNo());
+                                .setAssetNo(uploadSaveBySn.getAssetNo())
+                                .setScreenType(uploadSaveBySn.getScreenTypeValue());
                         R r = deviceRegisterService.save(save);
                         if (r.getCode() == R.Enum.FAIL.getCode()) {
                             log.error("{},{}", uploadSaveBySn.getSn(), r.getMsg());
@@ -327,6 +336,11 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
          */
         private String deviceType;
 
+        /**
+         * 屏幕类型
+         */
+        private String screenType;
+
         /**
          * 资产编号
          */
@@ -341,5 +355,10 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
          * 设备类型值
          */
         private Integer deviceTypeValue;
+
+        /**
+         * 屏幕类型值
+         */
+        private Integer screenTypeValue;
     }
 }

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

@@ -6,6 +6,7 @@ import com.xy.annotation.LogOperate;
 import com.xy.device.EnumEnvParams;
 import com.xy.dto.MqttUserDto;
 import com.xy.entity.DeviceInfo;
+import com.xy.entity.DeviceSysinfo;
 import com.xy.entity.MqttUser;
 import com.xy.entity.SysDictRedis;
 import com.xy.enums.LogEnum;
@@ -44,6 +45,8 @@ public class MqttUserServiceImpl extends ServiceImpl<MqttUserMapper, MqttUser> i
 
     private DeviceInfoServiceImpl deviceInfoService;
 
+    private DeviceSysinfoServiceImpl deviceSysinfoService;
+
     @PostMapping("obj")
     @ApiOperation("对象查询")
     @LogOperate(logType = LogEnum.LogType.V2, optType = LogEnum.OptType.V3, logContent = "mqtt认证查询")
@@ -53,12 +56,14 @@ public class MqttUserServiceImpl extends ServiceImpl<MqttUserMapper, MqttUser> i
             return R.ok().setLogMsg("结果=false,sn=" + obj.getSn());
         }
         DeviceInfo deviceInfo = deviceInfoService.getById(mqttUser.getDeviceId());
+        DeviceSysinfo deviceSysinfo = deviceSysinfoService.getById(mqttUser.getDeviceId());
         Map<String, SysDictRedis> map = SysDictUtils.get(EnumEnvParams.Code.CODE.getCode());
         SysDictRedis mqttUrl = map.get(EnumEnvParams.MQTT_URL.getCode());
         SysDictRedis serverUrl = map.get(EnumEnvParams.SERVER_URL.getCode());
         MqttUserDto.ObjVo objVo = copy(MqttUserDto.ObjVo.class, mqttUser)
                 .setAlgorithmId(deviceInfo.getAlgorithmId())
-                .setDeviceType(deviceInfo.getDeviceType());
+                .setDeviceType(deviceInfo.getDeviceType())
+                .setScreenType(deviceSysinfo.getScreenType());
         objVo.setServerTime(System.currentTimeMillis());
         objVo.setIpAddress(mqttUrl.getValue());
         objVo.setServerUrl(serverUrl.getValue());

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

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

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

@@ -36,9 +36,14 @@ 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;
+
     }
 
     @Data
@@ -49,6 +54,9 @@ public class DeviceRegisterDto {
         @ApiModelProperty("设备ID")
         private Long deviceId;
 
+        @ApiModelProperty("屏幕类型")
+        private Integer screenType;
+
         @ApiModelProperty("设备sn")
         private String deviceSn;
     }

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

@@ -125,6 +125,8 @@ public class DeviceSysinfoDto {
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime createTime;
 
+        @ApiModelProperty("屏幕类型")
+        private Integer screenType;
     }
 
 

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

@@ -83,5 +83,8 @@ public class MqttUserDto {
 
         @ApiModelProperty("设备类型")
         private Integer deviceType;
+
+        @ApiModelProperty("屏幕类型")
+        private Integer screenType;
     }
 }