fix(jg):三环设备认领

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/ShCarEquDto.java

@@ -33,7 +33,7 @@ public class ShCarEquDto {
     @TableField("CAR_ID")
     private String carId;
 
-    @ApiModelProperty(value = "设备编号")
+    @ApiModelProperty(value = "设备型号")
     @TableField("SEQUENCE_CODE")
     private String sequenceCode;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/ShCarEqu.java

@@ -41,7 +41,7 @@ public class ShCarEqu {
     private String carId;
 
     /**
-     * 设备编号
+     * 设备型号
      */
     @TableField(value = "\"SEQUENCE_CODE\"")
     private String sequenceCode;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/ShCarEquVo.java

@@ -32,6 +32,11 @@ public class ShCarEquVo {
     private String equCode;
 
     /**
+     * 设备型号
+     */
+    private String equType;
+
+    /**
      * 制造日期
      */
     private Date produceDate;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/ShCarEquServiceImpl.java

@@ -77,7 +77,14 @@ public class ShCarEquServiceImpl extends BaseService<ShCarEqu, ShCarEqu, ShCarEq
         queryWrapper.eq(ShCarEqu::getCarId, carId);
         List<ShCarEqu> list = this.list(queryWrapper);
         // 将设备列表转换为前端可识别bean
-        List<ShCarEquVo> collect = list.stream().map(shCarEqu -> new ShCarEquVo(shCarEqu)).collect(Collectors.toList());
+        List<ShCarEquVo> collect = list.stream()
+                .map(shCarEqu -> {
+                    ShCarEquVo shCarEquVo = new ShCarEquVo(shCarEqu);
+                    shCarEquVo.setUseInnerCode(shCarDto.getCarNumber());
+                    shCarEquVo.setEquType(shCarEqu.getSequenceCode());
+                    return shCarEquVo;
+                })
+                .collect(Collectors.toList());
         // 封装返回VO
         return new CarAndEquVo(shCarDto, collect);
     }