增加移动场景工作工具服务

security-protection-service/src/main/java/com/ai/bss/security/protection/controller/MonitorSceneTerminalController.java

@@ -25,50 +25,58 @@ public class MonitorSceneTerminalController {
     * 新增场景与设备的对应关系
     * @param monitorSceneTerminalRel
     * @return
     * @throws Exception
     */
    @ResponseBody
    @RequestMapping("/createMonitorSceneTerminalRel")
    public CommonResponse createMonitorSceneTerminalRel(@RequestBody MonitorSceneTerminalRel monitorSceneTerminalRel) throws Exception {
    public CommonResponse createMonitorSceneTerminalRel(@RequestBody MonitorSceneTerminalRel monitorSceneTerminalRel)  {
        return monitorSceneTerminalService.createMonitorSceneTerminalRel(monitorSceneTerminalRel);
    }
    /**
     * 修改场景与设备的对应关系
     * @param monitorSceneTerminalRel
     * @return
     */
    @ResponseBody
    @RequestMapping("/modifyMonitorSceneTerminalRel")
    public CommonResponse modifyMonitorSceneTerminalRel(@RequestBody MonitorSceneTerminalRel monitorSceneTerminalRel)  {
        return monitorSceneTerminalService.modifyMonitorSceneTerminalRel(monitorSceneTerminalRel);
    }
    /**
     * 删除场景与设备的对应关系
     * @param monitorSceneTerminalRelId
     * @return
     * @throws Exception
     */
    @ResponseBody
    @RequestMapping("/deleteMonitorSceneTerminalRelByRelId")
    public CommonResponse deleteMonitorSceneTerminalRelByRelId(@RequestParam Long monitorSceneTerminalRelId) throws Exception {
    public CommonResponse deleteMonitorSceneTerminalRelByRelId(@RequestParam Long monitorSceneTerminalRelId)  {
         monitorSceneTerminalService.deleteMonitorSceneTerminalRelByRelId(monitorSceneTerminalRelId);
        return CommonResponse.OK_VOID;
    }
    /**
     * 查询班次列表
     * 查询场景与设备的对应关系
     * @return
     * @throws Exception
     */
    @ResponseBody
    @RequestMapping("/queryMonitorSceneTerminalRel")
    public CommonResponse queryMonitorSceneTerminalRel(@RequestParam Long monitorSceneId) throws Exception {
    public CommonResponse queryMonitorSceneTerminalRel(@RequestParam Long monitorSceneId)  {
        return monitorSceneTerminalService.queryMonitorSceneTerminalRel(monitorSceneId);
    }
    /**
     * 查询班次列表
     * 场景设备显示位置移动
     * @return
     * @throws Exception
     */
    @ResponseBody
    @RequestMapping("/moveMonitorSceneTerminalRelIndex")
    public CommonResponse moveMonitorSceneTerminalRelIndex(@RequestBody MonitorSceneTerminalRel monitorSceneTerminalRel) throws Exception {
    public CommonResponse moveMonitorSceneTerminalRelIndex(@RequestBody MonitorSceneTerminalRel monitorSceneTerminalRel)  {
        return monitorSceneTerminalService.moveMonitorSceneTerminalRelIndex(monitorSceneTerminalRel);
    }

security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/MonitorSceneTerminalServiceImpl.java

@@ -8,7 +8,6 @@ import com.ai.bss.security.protection.service.interfaces.MonitorSceneTerminalSer
import com.ai.bss.work.safety.model.MonitorSceneTerminalRel;
import com.ai.bss.work.safety.service.api.MonitorSceneCommand;
import com.ai.bss.work.safety.service.api.MonitorSceneQuery;
import junit.framework.Assert;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -40,6 +39,26 @@ public class MonitorSceneTerminalServiceImpl implements MonitorSceneTerminalServ
    }
    @Override
    public CommonResponse<MonitorSceneTerminalRel> modifyMonitorSceneTerminalRel(MonitorSceneTerminalRel monitorSceneTerminalRel) {
        if(monitorSceneTerminalRel.getMonitorSceneTerminalRelId()==null){
            new BaseException("monitorSceneTerminalRelId 不能为空");
        }
        if(monitorSceneTerminalRel.getMonitorSceneId()==null){
            new BaseException("monitorSceneId不能为空");
        }
        if(monitorSceneTerminalRel.getResourceToolId()==null){
            new BaseException("resourceToolId 不能为空");
        }
        log.info("monitorSceneTerminalRelRequest: \n{}", JsonUtils.toJSONStringByDateFormat(new CommonRequest<>(monitorSceneTerminalRel), true));
        monitorSceneCommand.updateMonitorSceneTerminalRelById(new CommonRequest<>(monitorSceneTerminalRel));
        CommonResponse<MonitorSceneTerminalRel> commonResponse = monitorSceneQuery.loadMonitorSceneTerminalRelById(new CommonRequest<>(monitorSceneTerminalRel.getMonitorSceneTerminalRelId()));
        log.info("result: \n{}", JsonUtils.toJSONStringByDateFormat(commonResponse, true));
        return commonResponse;
    }
    @Override
    public void deleteMonitorSceneTerminalRelByRelId(Long monitorSceneTerminalRelId) {
        CommonResponse deleteResult = monitorSceneCommand.deleteMonitorSceneTerminalRelByRelId(
@@ -54,7 +73,6 @@ public class MonitorSceneTerminalServiceImpl implements MonitorSceneTerminalServ
        CommonResponse deleteResult = monitorSceneCommand.deleteMonitorSceneTerminalRelByWorkToolId(
                new CommonRequest<>(workToolIds));
        log.info("deleteResult: \n{}", JsonUtils.toJSONStringByDateFormat(deleteResult, true));
        Assert.assertTrue(deleteResult.isSuccess());
    }
@@ -68,7 +86,7 @@ public class MonitorSceneTerminalServiceImpl implements MonitorSceneTerminalServ
    @Override
    public CommonResponse<List<MonitorSceneTerminalRel>> moveMonitorSceneTerminalRelIndex(MonitorSceneTerminalRel monitorSceneTerminalRel) {
        CommonResponse<MonitorSceneTerminalRel> moveResult = monitorSceneCommand.moveMonitorSceneTerminalRelIndex(new CommonRequest<>(monitorSceneTerminalRel));
        monitorSceneCommand.moveMonitorSceneTerminalRelIndex(new CommonRequest<>(monitorSceneTerminalRel));
        CommonResponse<List<MonitorSceneTerminalRel>> monitorSceneTerminalRelListResponse = monitorSceneQuery.loadMonitorSceneTerminalRel(new CommonRequest<>(monitorSceneTerminalRel.getMonitorSceneId()));
        log.info("monitorSceneTerminalRelListResponse: \n{}", JsonUtils.toJSONStringByDateFormat(monitorSceneTerminalRelListResponse, true));

security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/MonitorSceneTerminalService.java

@@ -8,9 +8,21 @@ import java.util.List;
public interface MonitorSceneTerminalService {
    /**
     * 新增场景与设备的对应关系
     * @param monitorSceneTerminalRel
     * @return
     */
    CommonResponse<MonitorSceneTerminalRel>  createMonitorSceneTerminalRel(MonitorSceneTerminalRel monitorSceneTerminalRel);
    /**
     * 修改场景与设备的对应关系
     * @param monitorSceneTerminalRel
     * @return
     */
    CommonResponse<MonitorSceneTerminalRel>  modifyMonitorSceneTerminalRel(MonitorSceneTerminalRel monitorSceneTerminalRel);
    /**
     * 场景设备关系删除（按场景设备关系ID删除）
     *
     * @param monitorSceneTerminalRelId 场景设备关系ID列表