Browse Source

设备产品

yq 2 years ago
parent
commit
65812edaa7

+ 1 - 1
service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/DmpProductAttributeController.java

@@ -76,7 +76,7 @@ public class DmpProductAttributeController {
      * @param ids
      * @return
      */
-    @PutMapping("updateBatchBind")
+    @PostMapping("updateBatchBind")
     public ApiResult<Void> updateBatchBind(@RequestParam("ids[]") List<Integer> ids){
         dmpProductAttributeService.updateBatchBind(ids);
         return ApiResult.success();

+ 2 - 1
service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDeviceInfoServiceImpl.java

@@ -187,7 +187,8 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
             }
             List<DmpDeviceInfo> deviceInfos = BeanMapperUtils.mapList(dmpDeviceExportVOS, DmpDeviceExportVO.class, DmpDeviceInfo.class);
             long count = deviceInfos.stream()
-                    .peek(device -> device.setProductId(productId))
+                    .peek(device -> {device.setProductId(productId);
+                    device.setDeviceId(UUIDUtils.uuid());})
                     .filter(device -> StringUtils.isBlank(device.getDeviceName()) ||
                     StringUtils.isBlank(device.getDeviceName())
                     || StringUtils.isBlank(device.getDeviceCode())

+ 1 - 1
service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpProductAttributeServiceImpl.java

@@ -106,7 +106,7 @@ public class DmpProductAttributeServiceImpl extends AbstractCrudService<DmpProdu
     }
 
     @Override
-    public void updateBatchBind(List<Integer> ids) {
+    public void  updateBatchBind(List<Integer> ids) {
         LambdaUpdateWrapper<DmpProductAttribute> updateWrapper = Wrappers.lambdaUpdate();
         updateWrapper
                 .set(DmpProductAttribute::getBindStatus,2)

+ 0 - 1
service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/DmpDeviceExportVO.java

@@ -14,7 +14,6 @@ public class DmpDeviceExportVO {
     /**
      * 产品ID
      */
-    @Excel(name = "用户名称",width = 14)
     private Integer productId;
 
     /**