#20230510 欣影管理平台装置信息查询代码

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

@@ -33,8 +33,8 @@ public class TermSetController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/alarmMark")
     @Log(title = "声光报警", type = "查询")
-    public ResponseReult<Integer> alarmMark(@RequestBody @Validated TerminalIdVo vo) {
-        ServiceBody<Integer> serviceBody = termSetService.alarmMark(vo);
+    public ResponseReult<String> alarmMark(@RequestBody @Validated VoiceCtrlVo vo) {
+        ServiceBody<String> serviceBody = termSetService.alarmMark(vo);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
         } else {

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

@@ -0,0 +1,22 @@
+package com.shxy.xymanager_common.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel(value = "声光报警设置对象", description = "声光报警设置对象描述")
+public class VoiceCtrlVo {
+
+    @NotNull(message = "监测装置ID")
+    @ApiModelProperty(value = "监测装置ID", example = "123455")
+    private String cmdId;
+
+    @NotNull(message = "声光报警开关 0:关闭 1:开启")
+    @ApiModelProperty(value = "声光报警开关", example = "123455")
+    private short ctrl;
+
+
+}

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

@@ -20,7 +20,6 @@ public class CustomSecurityConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(this.jwtInterceptor)
-                .excludePathPatterns("/*")
                 .excludePathPatterns("/login")
                 .excludePathPatterns("/userList")
                 .excludePathPatterns("/swagger-ui.html")

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TermSetServiceImpl.java

@@ -8,6 +8,7 @@ import com.shxy.xymanager_common.exception.Asserts;
 import com.shxy.xymanager_common.model.ResolutionModel;
 import com.shxy.xymanager_common.util.ProcessExecUtils;
 import com.shxy.xymanager_common.vo.TerminalIdVo;
+import com.shxy.xymanager_common.vo.VoiceCtrlVo;
 import com.shxy.xymanager_dao.dao.TerminalResolutionDao;
 import com.shxy.xymanager_service.service.TermSetService;
 import lombok.extern.slf4j.Slf4j;
@@ -30,11 +31,11 @@ public class TermSetServiceImpl implements TermSetService {
     private TerminalResolutionDao terminalResolutionDao;
 
     @Override
-    public ServiceBody<Integer> alarmMark(TerminalIdVo vo) {
+    public ServiceBody<String> alarmMark(VoiceCtrlVo vo) {
 
-        String cmd =Constants.CMD+"imgparams --cmdid="+vo.getCmdId()+ "\t" + "--reqid="+ Constants.REQUEST_ID+ "\t"+ "--clientid=10--flag=0 --rf=7";
+        String cmd =Constants.CMD+"voice --cmdid="+vo.getCmdId()+ "\t" + "--ctrl="+ vo.getCtrl();
         ProcessExecUtils.exec(cmd);
-        return Asserts.success(1);
+        return Asserts.success("设置成功");
     }
 
     @Override

xymanager_service/src/main/java/com/shxy/xymanager_service/service/TermSetService.java

@@ -17,7 +17,7 @@ public interface TermSetService {
      *
      * @return
      */
-    ServiceBody<Integer> alarmMark(TerminalIdVo vo);
+    ServiceBody<String> alarmMark(VoiceCtrlVo vo);
 
     ServiceBody<Integer> selectPhotoTimeGet(TerminalIdVo vo);