FIX 拓元建模申请

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

@@ -1,6 +1,7 @@
 package com.xy.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -135,4 +136,8 @@ public class DeviceInfo {
      */
     private String thirdResult;
 
+
+    @ApiModelProperty("货道数量")
+    private Integer aisleNum;
+
 }

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

@@ -18,10 +18,7 @@ import com.xy.dto.DeviceCreateIdsDto;
 import com.xy.dto.DeviceQualityDto;
 import com.xy.dto.DeviceRegisterDto;
 import com.xy.dto.be.MercDto;
-import com.xy.entity.DeviceCreateIds;
-import com.xy.entity.DeviceRegister;
-import com.xy.entity.DeviceSysinfo;
-import com.xy.entity.MqttUser;
+import com.xy.entity.*;
 import com.xy.mapper.DeviceCreateIdsMapper;
 import com.xy.mapper.DeviceRegisterMapper;
 import com.xy.service.be.MercService;
@@ -75,6 +72,8 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
 
     private MercService mercService;
 
+    private DeviceInfoServiceImpl deviceInfoService;
+
     @PostMapping("save")
     @ApiOperation("添加")
     @Transactional(rollbackFor = Exception.class)
@@ -126,6 +125,9 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
                     .setShowStatus(true)
             ).getData();
             JMap<Long, DeviceQualityDto.Vo> map = new JArrayList<>(vos).toMap(DeviceQualityDto.Vo::getDeviceId).cover();
+            List<DeviceInfo> deviceInfos = deviceInfoService.listByIds(deviceIds);
+            JMap<Long, DeviceInfo> deviceInfoJMaps = new JArrayList<>(deviceInfos).toMap(DeviceInfo::getDeviceId).cover();
+
             //查询机器ID号
             List<DeviceCreateIds> deviceCreateIds = deviceCreateIdsService.list(new LambdaQueryWrapper<DeviceCreateIds>()
                     .in(DeviceCreateIds::getDeviceId, deviceIds)
@@ -150,6 +152,11 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
                 if (Emptys.check(vo)) {
                     deviceRegister.setFactoryState(vo.getFactoryState()).setQualityState(vo.getQualityState());
                 }
+                DeviceInfo deviceInfo = deviceInfoJMaps.get(deviceRegister.getDeviceId());
+                if (Emptys.check(deviceInfo)) {
+                    //货道数反显
+                    deviceRegister.setAisleNum(deviceInfo.getAisleNum());
+                }
                 //机器ID号商户信息
                 DeviceCreateIds deviceCreateIdsInfo = deviceCreateIdsJMaps.get(deviceRegister.getDeviceId());
                 if (Emptys.check(deviceCreateIdsInfo)) {

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

@@ -218,6 +218,10 @@ public class DeviceInfoDto {
 
         @ApiModelProperty("算法ID")
         private Long algorithmId;
+        
+        @ApiModelProperty("货道数量")
+        private Integer aisleNum;
+
     }
 
 
@@ -567,6 +571,9 @@ public class DeviceInfoDto {
     @Accessors(chain = true)
     public static class Vo {
 
+        @ApiModelProperty("货道数量")
+        private Integer aisleNum;
+
         @ApiModelProperty("通电状态")
         private Integer sysPower;
 
@@ -1159,6 +1166,9 @@ public class DeviceInfoDto {
         @ApiModelProperty("通电状态")
         private Integer sysPower;
 
+        @ApiModelProperty("货道数量")
+        private Integer aisleNum;
+
     }
 
 

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

@@ -108,6 +108,9 @@ public class DeviceRegisterDto {
         @ApiModelProperty("设备ID")
         private Long deviceId;
 
+        @ApiModelProperty("货道数量")
+        private Integer aisleNum;
+
         @ApiModelProperty("注册序号")
         private Integer registerNum;