Merge remote-tracking branch 'origin/master' into dev

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java

@@ -121,7 +121,7 @@ public class TerminalController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/getTerminalStatus")
     @Log(title = "获取装置触发", type = "修改")
-    public ResponseReult<TerminalStatusModel> getTerminalStatus(@RequestParam("termId")Integer termId) {
+    public ResponseReult<TerminalStatusModel> getTerminalStatus(@RequestParam("termId") Integer termId) {
         ServiceBody<TerminalStatusModel> serviceBody = terminalService.getTerminalStatus(termId);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
@@ -173,7 +173,7 @@ public class TerminalController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/selectTerminalId")
     @Log(title = "图像装置ID查询", type = "修改")
-    public ResponseReult<TerminalIdModel> selectTerminalId(@RequestParam("requestId")Integer requestId) {
+    public ResponseReult<TerminalIdModel> selectTerminalId(@RequestParam("requestId") Integer requestId) {
         ServiceBody<TerminalIdModel> serviceBody = terminalService.selectTerminalId(requestId);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());

xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalIdUpdateVo.java

@@ -5,17 +5,14 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-@ApiModel(value = "装置信息对象", description = "设备信息对象描述")
+@ApiModel(value = "修改装置编号信息对象", description = "修改装置编号信息对象")
 public class TerminalIdUpdateVo {
-    @ApiModelProperty(value = "装置编号", example = "123456")
+    @ApiModelProperty(value = "装置编号1", example = "123456")
     private Integer termId;
 
-    @ApiModelProperty(value = "装置ID", example = "123456")
+    @ApiModelProperty(value = "装置ID2", example = "123456")
     private String cmdId;
 
-    @ApiModelProperty(value = "新装置ID", example = "123456")
+    @ApiModelProperty(value = "新装置ID33", example = "123456")
     private String newCmdId;
-
-
-
 }

xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalVo.java

@@ -19,7 +19,7 @@ public class TerminalVo {
     @ApiModelProperty(value = "杆塔编号", example = "123456")
     private Integer towerId;
 
-    @ApiModelProperty(value = "通道编号", example = "[{id:int , alias:dskafjl},{id,alias}]")
+    @ApiModelProperty(value = "通道编号", example = "")
     private List<Item> channelId;
 
     @ApiModelProperty(value = "sim卡号", example = "123456")

xymanager_framework/pom.xml

@@ -47,7 +47,6 @@
             </exclusions>
         </dependency>
 
-
         <!-- SpringBoot 拦截器 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

xymanager_framework/src/main/java/com/shxy/xymanager_framework/config/CustomSecurityConfig.java

@@ -29,9 +29,7 @@ public class CustomSecurityConfig implements WebMvcConfigurer {
                 .excludePathPatterns("/*/api-docs")
                 .excludePathPatterns("/error")
                 .excludePathPatterns("/test/**")
-                .excludePathPatterns("/cmaUserLogin")
-                .excludePathPatterns("/loginXcxuser")
-                .excludePathPatterns("/loginXcxuser");
+                .excludePathPatterns("/cmaUserLogin");
     }
 
     @Override