设备

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/device/ValveDto.java

@@ -0,0 +1,19 @@
+package com.zcxk.rmcp.api.dto.device;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author linqingwei
+ * @date 2021-08-26 9:38
+ */
+@Data
+public class ValveDto {
+    @ApiModelProperty(value="设备id")
+    private List<Long> ids;
+
+    @ApiModelProperty(value="0:关阀 1:开阀")
+    private Integer valveStatus;
+}

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/config/ResourceServerConfig.java

@@ -21,7 +21,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
             .and()
             .authorizeRequests()
             .antMatchers("/swagger-ui.html","/webjars/**", "/swagger-resources/**",
-                    "/file/**","/test/test","import/downloadFailFile",
+                    "/file/**","/test/test","/import/downloadFailFile",
                    "/v2/**")
             .permitAll() //配置不需要身份认证的请求路径
             .anyRequest().authenticated() //其他所有访问路径都需要身份认证

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/DeviceController.java

@@ -6,6 +6,7 @@ import com.zcxk.rmcp.api.dto.BasePageDto;
 import com.zcxk.rmcp.api.dto.device.DeviceDataDto;
 import com.zcxk.rmcp.api.dto.device.DeviceInputDto;
 import com.zcxk.rmcp.api.dto.device.DeviceQueryDto;
+import com.zcxk.rmcp.api.dto.device.ValveDto;
 import com.zcxk.rmcp.api.vo.*;
 import com.zcxk.rmcp.core.mongo.DeviceDataItem;
 import com.zcxk.rmcp.web.service.DeviceDataService;
@@ -140,10 +141,9 @@ public class DeviceController {
     @PostMapping("batchValve")
     @ApiOperation(value = "批量开关阀")
     public AjaxMessage<Void> batchValve(
-            @ApiParam(value = "设备id", required = true) @RequestBody(required = true) List<Long> ids,
-            @ApiParam(value = "0:关阀 1:开阀", required = true) @RequestParam(required = true) Integer valveStatus
+            @ApiParam(value = "阀门", required = true) @RequestBody(required = true) ValveDto dto
     ) {
-        deviceService.batchValve(ids,valveStatus);
+        deviceService.batchValve(dto);
         return AjaxMessage.success();
     }
 

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/excel/resolver/service/WaterDeviceHandleExcelService.java

@@ -114,7 +114,7 @@ public class WaterDeviceHandleExcelService implements HandleExcelService {
         message.setMessageId(UUID.randomUUID().toString());
         message.setMessageType(9);
         if(data.getFailNum().get() > 0) {
-            message.setUrl("/import/downloadFailFile?objId="+data.getImportFile().getId());
+            message.setUrl("/zoniot-rmcp-web/import/downloadFailFile?objId="+data.getImportFile().getId());
         }
         message.setMessageTemplateId(9);
         message.setChannel(0);

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/DeviceService.java

@@ -6,6 +6,7 @@ import com.zcxk.rmcp.api.dto.BasePageDto;
 import com.zcxk.rmcp.api.dto.device.DeviceDataDto;
 import com.zcxk.rmcp.api.dto.device.DeviceInputDto;
 import com.zcxk.rmcp.api.dto.device.DeviceQueryDto;
+import com.zcxk.rmcp.api.dto.device.ValveDto;
 import com.zcxk.rmcp.api.query.CommonQueryCondition;
 import com.zcxk.rmcp.api.vo.*;
 import com.zcxk.rmcp.core.entity.Device;
@@ -107,12 +108,11 @@ public interface DeviceService{
 
     /*
      * @description 批量开关阀门
-     * @param ids
-     * @param valveStatus
+     * @param dto
      * @return void
      * @author linqingwei
      **/
-    void batchValve(List<Long> ids, Integer valveStatus);
+    void batchValve(ValveDto dto);
 
     /**
      * @description  查询设备信息列表

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/DeviceServiceImpl.java

@@ -18,6 +18,7 @@ import com.zcxk.core.utils.export.EasyExcelUtil;
 import com.zcxk.rmcp.api.dto.BasePageDto;
 import com.zcxk.rmcp.api.dto.device.DeviceInputDto;
 import com.zcxk.rmcp.api.dto.device.DeviceQueryDto;
+import com.zcxk.rmcp.api.dto.device.ValveDto;
 import com.zcxk.rmcp.api.enums.DeviceStatusEnum;
 import com.zcxk.rmcp.api.enums.RmcpErrorEnum;
 import com.zcxk.rmcp.api.enums.ValveStatusEnum;
@@ -533,8 +534,8 @@ public class DeviceServiceImpl implements DeviceService{
     }
 
     @Override
-    public void batchValve(List<Long> ids, Integer valveStatus) {
-        log.info("begin batchValve ids:{},valveStatus:{}",ids,valveStatus);
+    public void batchValve(ValveDto dto) {
+        log.info("begin batchValve dto:{}",JSON.toJSON(dto));
         log.info("end batchValve");
     }