修改产品

iot-module/iot-module-manage/iot-module-manage-biz/src/main/java/com/middle/platform/manage/biz/controller/IotProductController.java

@@ -51,6 +51,14 @@ public class IotProductController {
         return Result.ok(iotProductService.save(iotProductPara), "保存成功");
     }
 
+    /**
+     * 修改产品
+     */
+    @PostMapping("/update")
+    public Result<Object> update(@RequestBody @Validated IotProductUpdate iotProductPara) {
+        return Result.ok(iotProductService.update(iotProductPara), "保存成功");
+    }
+
     /**
      * 删除产品
      *
@@ -159,8 +167,8 @@ public class IotProductController {
      * @param iotUrlPara
      * @return
      */
-    @PostMapping("/update")
-    public Result<Object> update(@RequestBody @Valid IotUrlPara iotUrlPara) {
+    @PostMapping("/updateUrl")
+    public Result<Object> updateUrl(@RequestBody @Valid IotUrlPara iotUrlPara) {
         return Result.ok(iotUrlService.update(iotUrlPara), "修改成功");
     }
 

iot-module/iot-module-manage/iot-module-manage-biz/src/main/java/com/middle/platform/manage/biz/domain/req/IotProductPara.java

@@ -12,10 +12,6 @@ import lombok.Setter;
 @Getter
 @Setter
 public class IotProductPara {
-    /**
-     * id
-     */
-    private Long id;
 
     /**
      * 产品名称

iot-module/iot-module-manage/iot-module-manage-biz/src/main/java/com/middle/platform/manage/biz/domain/req/IotProductUpdate.java

@@ -15,6 +15,7 @@ public class IotProductUpdate {
     /**
      * id
      */
+    @NotNull(message = "id不能为空")
     private Long id;
 
     /**
@@ -37,18 +38,6 @@ public class IotProductUpdate {
     @NotNull(message = "联网类型不能为空")
     private String networkType;
 
-    /**
-     * 上报协议 1-mqtt 2-http 3-coap 4-tcp 5-udp
-     */
-    @NotNull(message = "上报协议不能为空")
-    private String reportProtocol;
-
-    /**
-     * 数据格式
-     */
-    @NotNull(message = "数据格式不能为空")
-    private String dataFormat;
-
     /**
      * 认证方式
      */

iot-module/iot-module-manage/iot-module-manage-biz/src/main/java/com/middle/platform/manage/biz/service/IotProductService.java

@@ -112,9 +112,6 @@ public class IotProductService {
      * @return
      */
     public Object update(IotProductUpdate iotProductPara) {
-        if (Objects.isNull(iotProductPara.getId())) {
-            throw new BusinessException("id不能为空");
-        }
         IotProduct iotProduct = new IotProduct();
         iotProduct.setId(iotProductPara.getId());
         iotProduct.setName(iotProductPara.getName());
@@ -123,10 +120,8 @@ public class IotProductService {
         iotProduct.setVendors(iotProductPara.getVendors());
         iotProduct.setAuthType(iotProductPara.getAuthType());
         iotProduct.setTag(iotProductPara.getTag());
-        iotProduct.setSize(0);
         iotProduct.setRemark(iotProductPara.getRemark());
         iotProductMapper.updateById(iotProduct);
-
         return true;
     }