Browse Source

变更需求

wangyangyang 4 years ago
parent
commit
f1a8a4d756

+ 1 - 1
sms_water/src/main/java/com/huaxu/config/ResourceServerConfig.java

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

+ 4 - 5
sms_water/src/main/java/com/huaxu/controller/DeviceParmController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huaxu.dto.DeviceParmInfoDto;
+import com.huaxu.dto.RequestParmDto;
 import com.huaxu.entity.DeviceParmEntity;
 import com.huaxu.model.AjaxMessage;
 import com.huaxu.model.Pagination;
@@ -56,11 +57,9 @@ public class DeviceParmController {
     @RequestMapping(value="batchSaveEdit" , method = RequestMethod.POST)
     @ApiOperation(value = "批量保存设备参数信息(场景参数绑定页面)")
     public AjaxMessage<Integer> batchSaveEdit(
-            @ApiParam(value = "场景ID",required = true) @RequestParam Long sceneId,
-            @ApiParam(value = "设备ID",required = true) @RequestParam Long deviceId,
-            @ApiParam(value = "设备参数信息") @RequestBody List<DeviceParmInfoDto> deviceParmInfos){
-        deviceParmService.batchSaveEdit(sceneId,deviceId,deviceParmInfos);
-        return new AjaxMessage<>(ResultStatus.OK,1 );
+            @ApiParam(value = "设备参数信息") @RequestBody RequestParmDto requestParmDto) {
+        deviceParmService.batchSaveEdit(requestParmDto.getSceneId(), requestParmDto.getDeviceId(), requestParmDto.getDeviceParmInfos());
+        return new AjaxMessage<>(ResultStatus.OK, 1);
     }
 
     @RequestMapping(value="selectPage" , method = RequestMethod.GET)

+ 18 - 0
sms_water/src/main/java/com/huaxu/dto/RequestParmDto.java

@@ -0,0 +1,18 @@
+package com.huaxu.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("参数信息")
+public class RequestParmDto {
+    @ApiModelProperty("场景信息")
+    private Long sceneId;
+    @ApiModelProperty("设备信息")
+    private Long deviceId;
+    @ApiModelProperty("参数信息")
+    List<DeviceParmInfoDto> deviceParmInfos;
+}