Merge branch 'master' into prod

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/DeviceCreateIdsServiceImpl.java

@@ -215,7 +215,7 @@ public class DeviceCreateIdsServiceImpl extends ServiceImpl<DeviceCreateIdsMappe
             updateDeviceCreateIds.add(deviceCreateIds.setLastExportQrCodeTime(now));
         });
         updateBatchById(updateDeviceCreateIds);
-        QRCodeUtils.create(deviceIds, 400, 400, "back1.png", deviceIdInfos).download(deviceIds);
+        QRCodeUtils.create(deviceIds, 400, 400, "back1.png", deviceIdInfos).download(deviceIdInfos);
     }
 
     @SneakyThrows

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)
@@ -209,7 +207,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 +240,6 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
 
         private final DeviceRegisterServiceImpl deviceRegisterService;
 
-        private final AlipayDeviceService alipayDeviceService;
-
         private JList<UploadSaveBySn> sns = new JArrayList<>();
 
         /**
@@ -341,5 +337,6 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
          * 设备类型值
          */
         private Integer deviceTypeValue;
+
     }
 }

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,11 +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());
+                .setAlgorithmId(deviceInfo.getAlgorithmId())
+                .setDeviceType(deviceInfo.getDeviceType())
+                .setScreenType(deviceSysinfo.getScreenType());
         objVo.setServerTime(System.currentTimeMillis());
         objVo.setIpAddress(mqttUrl.getValue());
         objVo.setServerUrl(serverUrl.getValue());

device-api-service/src/main/resources/mapper/DeviceInfoMapper.xml

@@ -51,6 +51,7 @@
             <result column="is_have_freeze" property="isHaveFreeze"/>
             <result column="is_have_heat" property="isHaveHeat"/>
             <result column="device_model" property="deviceModel"/>
+            <result column="screen_type" property="screenType"/>
         </association>
         <association property="deviceStatus" javaType="com.xy.dto.DeviceStatusDto$Vo">
             <result column="sys_start_time" property="sysStartTime"/>
@@ -179,6 +180,7 @@
         sysinfo.is_have_freeze,
         sysinfo.is_have_heat,
         sysinfo.device_model,
+        sysinfo.screen_type,
         status.sys_start_time,
         status.sys_cur_time,
         status.sys_power,
@@ -258,6 +260,9 @@
                 </otherwise>
             </choose>
         </if>
+        <if test="queryPage.keyword != null and queryPage.keyword != ''">
+            and CONCAT(IFNULL(info.device_name, ''), IFNULL(info.device_id, '')) LIKE CONCAT('%',#{queryPage.keyword},'%')
+        </if>
         <if test="queryPage.showStatus != null">
             and info.show_status = #{queryPage.showStatus}
         </if>

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

@@ -395,6 +395,9 @@ public class DeviceInfoDto {
         @ApiModelProperty("缺货状态")
         private Integer stockStatus;
 
+        @ApiModelProperty("搜索词")
+        private String keyword;
+
         /**
          * 设备ID
          */

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

@@ -39,6 +39,7 @@ public class DeviceRegisterDto {
 
         @ApiModelProperty(value = "设备类型", hidden = true)
         private Integer deviceType;
+
     }
 
     @Data

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

@@ -80,5 +80,11 @@ public class MqttUserDto {
 
         @ApiModelProperty("算法id")
         private Long algorithmId;
+
+        @ApiModelProperty("设备类型")
+        private Integer deviceType;
+
+        @ApiModelProperty("屏幕类型")
+        private Integer screenType;
     }
 }