Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/constant/MonitorManageConsts.java

@@ -53,6 +53,20 @@ public class MonitorManageConsts {
        return File.separator;
    }
    //ai识别结果异常类型 身份异常
    public static String AI_ALARM_TYPE_STA = "STA";
    //ai识别结果异常类型 穿戴异常
    public static String AI_ALARM_TYPE_WEA ="WEA";
    //ai识别结果异常类型 潜在风险
    public static String AI_ALARM_TYPE_POT = "POT" ;
    //ai识别结果异常类型 违规违章
    public static String AI_ALARM_TYPE_VIO = "VIO" ;
//  ai识别结果异常类型          仪表异常
    public static String AI_ALARM_TYPE_INS = "INS" ;
    public static void main(String[] args){
        System.out.println(File.separator);
    }

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/service/impl/MonitorManageServiceImpl.java

@@ -213,7 +213,7 @@ public class MonitorManageServiceImpl implements MonitorManageService {
					if(aiClassName.equals("none")){
						idenResultDto =new IdenResultDto();
						idenResultDto.setAlarmEmployeeRoleId(MonitorManageConsts.alarmEmployeeRoleId);
						idenResultDto.setAlarmType("none_hat");
						idenResultDto.setAlarmType(MonitorManageConsts.AI_ALARM_TYPE_WEA);
						idenResultDto.setAlarmMemo("未戴帽子");
						aiIdenLogDto.setIdenResultType(MonitorManageConsts.AI_IDENTIFY_RESULT_ALARM);
						idenResultDtoList.add(idenResultDto);

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

@@ -1,14 +1,17 @@
package com.ai.bss.security.protection.controller;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.security.protection.service.interfaces.MonitorSceneTerminalService;
import com.ai.bss.security.protection.service.interfaces.WorkShiftService;
import com.ai.bss.work.safety.model.MonitorSceneTerminalRel;
import com.ai.bss.work.task.model.common.WorkShift;
import com.alibaba.fastjson.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.Map;
/**
 * 场景设备关联关系
@@ -71,6 +74,17 @@ public class MonitorSceneTerminalController {
    }
    /**
     * 查询场景与设备的对应关系
     * @return
     */
    @ResponseBody
    @RequestMapping("/queryMonitorSceneTerminalRelForPage")
    public CommonResponse<PageBean<Map<String,Object>>> queryMonitorSceneTerminalRelForPage(@RequestParam Map paramsMap)  {
        return monitorSceneTerminalService.queryMonitorSceneTerminalRelForPage(paramsMap);
    }
    /**
     * 场景设备显示位置移动
     * @return
     */

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

@@ -3,16 +3,19 @@ package com.ai.bss.security.protection.service.impl;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.abc.exception.BaseException;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.components.common.util.JsonUtils;
import com.ai.bss.security.protection.service.interfaces.MonitorSceneTerminalService;
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 lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
@Slf4j
@Service
@@ -82,6 +85,26 @@ public class MonitorSceneTerminalServiceImpl implements MonitorSceneTerminalServ
        log.info("monitorSceneCommonResponse: \n{}", JsonUtils.toJSONStringByDateFormat(monitorSceneCommonResponse, true));
        return monitorSceneCommonResponse;
    }
    @Override
    public CommonResponse<PageBean<Map<String, Object>>> queryMonitorSceneTerminalRelForPage(Map<String,String> paramMap) {
        if(StringUtils.isEmpty(paramMap.get("monitorSceneId"))){
            return CommonResponse.fail("1","monitorSceneId不能为空");
        }
        String monitorSceneId = paramMap.get("monitorSceneId");
        Integer pageNumber = paramMap.get("pageNumber")==null?1:Integer.parseInt(paramMap.get("pageNumber"));
        Integer pageSize = paramMap.get("pageSize")==null?10:Integer.parseInt(paramMap.get("pageSize"));
        CommonRequest<Long> request = CommonRequest.<Long>builder().data(3L).build();
        request.setPageNumber(pageNumber);
        request.setPageSize(pageSize);
        CommonResponse<PageBean<Map<String, Object>>> result = monitorSceneQuery.selectSceneTerminalRelByPage(request);
        return result;
//        CommonResponse<List<MonitorSceneTerminalRel>> monitorSceneCommonResponse = monitorSceneQuery.loadMonitorSceneTerminalRel(new CommonRequest<>(monitorSceneId));
//        log.info("monitorSceneCommonResponse: \n{}", JsonUtils.toJSONStringByDateFormat(monitorSceneCommonResponse, true));
//        return monitorSceneCommonResponse;
    }
    @Override
    public CommonResponse<List<MonitorSceneTerminalRel>> moveMonitorSceneTerminalRelIndex(MonitorSceneTerminalRel monitorSceneTerminalRel) {

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

@@ -1,9 +1,11 @@
package com.ai.bss.security.protection.service.interfaces;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.work.safety.model.MonitorSceneTerminalRel;
import java.util.List;
import java.util.Map;
public interface MonitorSceneTerminalService {
@@ -44,6 +46,8 @@ public interface MonitorSceneTerminalService {
     */
    CommonResponse<List<MonitorSceneTerminalRel>> queryMonitorSceneTerminalRel(Long monitorSceneId);
    CommonResponse<PageBean<Map<String, Object>>> queryMonitorSceneTerminalRelForPage(Map<String,String> paramMap);
    /**
     * 场景设备显示位置移动
     *