diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TermSetController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TermSetController.java index e4bdaba..8ffc5b0 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TermSetController.java +++ b/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 alarmMark(@RequestBody @Validated TerminalIdVo vo) { - ServiceBody serviceBody = termSetService.alarmMark(vo); + public ResponseReult alarmMark(@RequestBody @Validated VoiceCtrlVo vo) { + ServiceBody serviceBody = termSetService.alarmMark(vo); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/VoiceCtrlVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/VoiceCtrlVo.java new file mode 100644 index 0000000..8d813a1 --- /dev/null +++ b/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; + + +} diff --git a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/config/CustomSecurityConfig.java b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/config/CustomSecurityConfig.java index 71944bf..64b641e 100644 --- a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/config/CustomSecurityConfig.java +++ b/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") diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TermSetServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TermSetServiceImpl.java index a169c6f..7e7f58d 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TermSetServiceImpl.java +++ b/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 alarmMark(TerminalIdVo vo) { + public ServiceBody 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 diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TermSetService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TermSetService.java index 8ec13d9..a57ca12 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TermSetService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TermSetService.java @@ -17,7 +17,7 @@ public interface TermSetService { * * @return */ - ServiceBody alarmMark(TerminalIdVo vo); + ServiceBody alarmMark(VoiceCtrlVo vo); ServiceBody selectPhotoTimeGet(TerminalIdVo vo);