Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,67 @@
package com.ai.bss.security.protection.controller;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.security.protection.service.interfaces.HomePageService;
import com.ai.bss.security.protection.utils.DateUtil;
/**
 * 首页报表
 * @author konghl@asiainfo.com
 * 2020-12-15
 */
@Controller
@RequestMapping("/homePage")
public class HomePageController {
	@Autowired
	HomePageService homePageService;
	/**
	 * 获取当日出勤数据
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryAttendanceChart")
	public CommonResponse<Map<String, Object>> queryAttendanceChart() throws Exception {
		Map<String, Object> resutList = homePageService.queryAttendanceChart();
		return CommonResponse.ok(resutList);
	}
	/**
	 * 获取所有的告警分析数据
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryAlarmAnalysisChart")
	public CommonResponse<List<Map<String, Object>>> queryAlarmAnalysisChart() throws Exception {
		Map<String, String> params = new HashMap<String, String>();
		return homePageService.queryAlarmAnalysisList(params, 5);
	}
	/**
	 * 获取近24小时的告警分析数据
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryAlarmAnalysisTopList")
	public CommonResponse<List<Map<String, Object>>> queryAlarmAnalysisTopList() throws Exception {
		Map<String, String> params = new HashMap<String, String>();
		params.put("beginTime", DateUtil.dateAddDay(DateUtil.getSysDateTime(), -1));
		params.put("endTime", DateUtil.getSysDateTime());
		return homePageService.queryAlarmAnalysisList(params, 4);
	}
}

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

@@ -0,0 +1,129 @@
package com.ai.bss.security.protection.controller;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.ModelAttribute;
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 com.ai.abc.api.model.CommonResponse;
import com.ai.bss.security.protection.model.AttendanceReport;
import com.ai.bss.security.protection.service.interfaces.MonitorVideoLogManageService;
import com.ai.bss.security.protection.utils.DateUtil;
import com.ai.bss.work.safety.model.MonitorVideoLog;
/**
 * 监控视频日志管理
 * @author konghl@asiainfo.com
 * 2020-12-10
 */
@Controller
@RequestMapping("/monitorVideoLog")
public class MonitorVideoLogManageController {
	@Autowired
	private MonitorVideoLogManageService monitorVideoLogManageService;
	/**
	 * 查询监控视频日志(按时间段)
	 * @param attendanceReport
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryMonitorVideoLog")
	public CommonResponse<List<MonitorVideoLog>> queryMonitorVideoLog(@ModelAttribute AttendanceReport attendanceReport)
			throws Exception {
		MonitorVideoLog monitorVideoLogCondition = new MonitorVideoLog();
		monitorVideoLogCondition.setResourceToolId(attendanceReport.getId());
		monitorVideoLogCondition.setBeginTime(DateUtil.convertDate(attendanceReport.getBeginDay()));
		monitorVideoLogCondition.setEndTime(DateUtil.convertDate(attendanceReport.getEndDay()));
		return monitorVideoLogManageService.queryMonitorVideoLogByTime(monitorVideoLogCondition);
	}
	/**
	 * 查询单个监控视频日志
	 * @param resourceToolId
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryOneMonitorVideoLog")
	public CommonResponse<MonitorVideoLog> queryOneMonitorVideoLog(@RequestParam String monitorVideoLogId)
			throws Exception {
		if (StringUtils.isEmpty(monitorVideoLogId)) {
			return CommonResponse.fail("500", "操作失败");
		}
		return monitorVideoLogManageService.queryMonitorVideoLogById(Long.valueOf(monitorVideoLogId));
	}
	/**
	 * 创建监控视频日志
	 * @param monitorVideoLog
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/createMonitorVideoLog")
	public CommonResponse<MonitorVideoLog> createMonitorVideoLog(@RequestBody MonitorVideoLog monitorVideoLog)
			throws Exception {
		if (monitorVideoLog == null || StringUtils.isEmpty(monitorVideoLog.getVideoUrl())
				|| StringUtils.isEmpty(monitorVideoLog.getResourceToolId())) {
			return CommonResponse.fail("500", "新增失败");
		}
		return monitorVideoLogManageService.createMonitorVideoLog(monitorVideoLog);
	}
	/**
	 * 修改监控视频日志
	 * @param resourceTool
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/modifyMonitorVideoLog")
	public CommonResponse<MonitorVideoLog> modifyMonitorVideoLog(@RequestBody MonitorVideoLog monitorVideoLog)
			throws Exception {
		if (monitorVideoLog == null || monitorVideoLog.getMonitorVideoLogId() == null
				|| StringUtils.isEmpty(monitorVideoLog.getVideoUrl())
				|| StringUtils.isEmpty(monitorVideoLog.getResourceToolId())) {
			return CommonResponse.fail("500", "修改失败");
		}
		return monitorVideoLogManageService.modifyMonitorVideoLog(monitorVideoLog);
	}
	/**
	 * 删除设备视频记录
	 * @param resourceToolId
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/deleteMonitorVideoLog")
	public CommonResponse<Void> deleteMonitorVideoLog(@RequestParam String monitorVideoLogId) throws Exception {
		if (StringUtils.isEmpty(monitorVideoLogId)) {
			return CommonResponse.fail("500", "删除失败");
		}
		String[] monitorSceneIdArray = monitorVideoLogId.split(",");
		List<Long> monitorVideoLogIdList = new ArrayList<Long>();
		for (String monitorSceneIdString : monitorSceneIdArray) {
			if (!StringUtils.isBlank(monitorSceneIdString)) {
				monitorVideoLogIdList.add(Long.valueOf(monitorSceneIdString));
			}
		}
		return monitorVideoLogManageService.deleteMonitorVideoLog(monitorVideoLogIdList);
	}
}

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

@@ -8,6 +8,7 @@ import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,6 +23,8 @@ import com.ai.bss.security.protection.service.interfaces.ResourceToolManageServi
import com.ai.bss.security.protection.utils.EbcConstant;
import com.ai.bss.work.tool.model.ResourceTool;
import edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault;
/**
 * 设备管理
 * @author konghl@asiainfo.com
@@ -82,7 +85,13 @@ public class ResourceToolManageController {
			return CommonResponse.fail("500", "操作失败");
		}
		return ResourceToolManageService.queryOneResourceTool(resourceToolId);
		Map<String, Object> resultMap= ResourceToolManageService.queryResourceToolById(resourceToolId);
		
		if (resultMap==null) {
			return CommonResponse.fail("504", "获取设备信息失败");
		}
		
		return CommonResponse.ok(resultMap);
	}
	/**

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

@@ -1,8 +1,11 @@
package com.ai.bss.security.protection.controller;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -18,7 +21,7 @@ public class UploadFileController {
	private UploadFileService uploadFileService;
	/**
	 * 上传设备照片
	 * 获取单个文件地址
	 * @param meFile
	 * @return
	 * @throws Exception
@@ -35,4 +38,21 @@ public class UploadFileController {
		return CommonResponse.ok(minioFileUrl);
	}
	/**
	 * 获取多个文件地址
	 * @param meFile
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/getListFileUrl")
	public CommonResponse<List<String>> getListFileUrl(@RequestParam List<String> fileNameList) throws Exception {
		if (CollectionUtils.isEmpty(fileNameList)) {
			return CommonResponse.fail("501", "获取失败");
		}
		List<String> minioFileUrlList = uploadFileService.getFileUrlForList(fileNameList);
		return CommonResponse.ok(minioFileUrlList);
	}
}

security-protection-service/src/main/java/com/ai/bss/security/protection/model/SecurityProtectionMinioConfig.java

@@ -14,11 +14,13 @@ import lombok.Data;
@Data
@Component
@ConfigurationProperties(prefix = "myminio")
@ConfigurationProperties(prefix = "spminio")
public class SecurityProtectionMinioConfig {
	private String bucketWorkToolImage;
	private String bucketToolImage;
	private String bucketWorkToolView;
	private String bucketAiVideo;
	
	private String bucketAiImage;
}

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

@@ -0,0 +1,104 @@
package com.ai.bss.security.protection.service.impl;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.security.protection.service.interfaces.CharSpecService;
import com.ai.bss.security.protection.service.interfaces.HomePageService;
import com.ai.bss.security.protection.utils.EbcConstant;
import com.ai.bss.work.attendance.service.api.AttendanceChartQuery;
import com.ai.bss.work.safety.service.api.AiTaskQuery;
@Service
public class HomePageServiceImpl implements HomePageService {
	@Autowired
	private AttendanceChartQuery attendanceChartQuery;
	@Autowired
	private AiTaskQuery aiTaskQuery;
	@Autowired
	private CharSpecService charSpecService;
	@Override
	public Map<String, Object> queryAttendanceChart() throws Exception {
		CommonRequest<Void> request = new CommonRequest<Void>(null);
		CommonResponse<Map<String, Integer>> Response = attendanceChartQuery.queryAttendanceChart(request);
		int totalNum = Response.getData().get("workEmployeeSize");
		int attendanceNum = Response.getData().get("currentDayAttendanceSize");
		int leaveNum = Response.getData().get("currentDayLeaveSize");
		int absenteeismNum = totalNum - attendanceNum - leaveNum;
		absenteeismNum = absenteeismNum < 0 ? 0 : absenteeismNum;
		Map<String, Object> resultMap = new HashMap<String, Object>();
		List<Map<String, Object>> dataList = new ArrayList<Map<String, Object>>();
		Map<String, Object> attendanceMap = new HashMap<String, Object>();
		attendanceMap.put("value", attendanceNum);
		attendanceMap.put("name", "在岗");
		dataList.add(attendanceMap);
		Map<String, Object> absenteeismMap = new HashMap<String, Object>();
		absenteeismMap.put("value", absenteeismNum);
		absenteeismMap.put("name", "缺勤");
		dataList.add(absenteeismMap);
		Map<String, Object> leaveMap = new HashMap<String, Object>();
		leaveMap.put("value", leaveNum);
		leaveMap.put("name", "请假");
		dataList.add(leaveMap);
		resultMap.put("totalSize", totalNum);
		resultMap.put("dataList", dataList);
		return resultMap;
	}
	@Override
	public CommonResponse<List<Map<String, Object>>> queryAlarmAnalysisList(Map<String, String> params, int dataSize)
			throws Exception {
		CommonRequest<Map<String, String>> request = new CommonRequest<Map<String, String>>(params);
		CommonResponse<List<Map<String, Object>>> response = aiTaskQuery.safetyAlarmAnalysis(request);
		if (CollectionUtils.isEmpty(response.getData())) {
			return CommonResponse.ok(new ArrayList<Map<String, Object>>());
		}
		Map<String, String> allAiAlarmTypeMap = charSpecService.getCharSpecMap(EbcConstant.BUSINESS_SPEC_AI_ALARM_TYPE);
		List<Map<String, Object>> resultList = new ArrayList<Map<String, Object>>();
		int otherNum = 0;
		for (int i = 0; i < response.getData().size(); i++) {
			int num = Integer.valueOf(response.getData().get(i).get("cn").toString());
			if (i >= dataSize) {
				// 其他
				otherNum += num;
				continue;
			}
			Map<String, Object> dataMap = new HashMap<String, Object>();
			dataMap.put("value", num);
			dataMap.put("name", allAiAlarmTypeMap.get(response.getData().get(i).get("alarmTypeCode").toString()));
			resultList.add(dataMap);
		}
		if (otherNum > 0) {
			Map<String, Object> dataMap = new HashMap<String, Object>();
			dataMap.put("value", otherNum);
			dataMap.put("name", "其他");
			resultList.add(dataMap);
		}
		return CommonResponse.ok(resultList);
	}
}

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

@@ -0,0 +1,55 @@
package com.ai.bss.security.protection.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.security.protection.service.interfaces.MonitorVideoLogManageService;
import com.ai.bss.work.safety.model.MonitorVideoLog;
import com.ai.bss.work.safety.service.api.MonitorSceneCommand;
import com.ai.bss.work.safety.service.api.MonitorSceneQuery;
@Service
public class MonitorVideoLogManageServiceImpl implements MonitorVideoLogManageService {
	@Autowired
	private MonitorSceneQuery monitorSceneQuery;
	@Autowired
	private MonitorSceneCommand monitorSceneCommand;
	@Override
	public CommonResponse<List<MonitorVideoLog>> queryMonitorVideoLogByTime(MonitorVideoLog monitorVideoLogCondition)
			throws Exception {
		CommonRequest<MonitorVideoLog> request = new CommonRequest<MonitorVideoLog>(monitorVideoLogCondition);
		return monitorSceneQuery.queryMonitorVideoLogByTime(request);
	}
	@Override
	public CommonResponse<MonitorVideoLog> queryMonitorVideoLogById(Long monitorVideoLogId) throws Exception {
		CommonRequest<Long> request = new CommonRequest<Long>(monitorVideoLogId);
		return monitorSceneQuery.loadMonitorVideoLog(request);
	}
	@Override
	public CommonResponse<MonitorVideoLog> createMonitorVideoLog(MonitorVideoLog monitorVideoLog) throws Exception {
		CommonRequest<MonitorVideoLog> request = new CommonRequest<MonitorVideoLog>(monitorVideoLog);
		return monitorSceneCommand.createMonitorVideoLog(request);
	}
	@Override
	public CommonResponse<MonitorVideoLog> modifyMonitorVideoLog(MonitorVideoLog monitorVideoLog) throws Exception {
		CommonRequest<MonitorVideoLog> request = new CommonRequest<MonitorVideoLog>(monitorVideoLog);
		return monitorSceneCommand.modifyMonitorVideoLog(request);
	}
	@Override
	public CommonResponse<Void> deleteMonitorVideoLog(List<Long> monitorVideoLogIdList) throws Exception {
		CommonRequest<List<Long>> request = new CommonRequest<List<Long>>(monitorVideoLogIdList);
		return monitorSceneCommand.deleteMonitorVideoLog(request);
	}
}

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

@@ -89,19 +89,25 @@ public class ResourceToolManageServiceImpl implements ResourceToolManageService
	}
	@Override
	public CommonResponse<Map<String, Object>> queryOneResourceTool(String resourceToolId) throws Exception {
	public Map<String, Object> queryResourceToolById(String resourceToolId) throws Exception {
		if (StringUtils.isEmpty(resourceToolId)) {
			return null;
		}
		HashMap<String, Object> params = new HashMap<String, Object>();
		// 查询监控设备
		params.put("isMonitorSceneTool", "1");
		params.put("resourceToolId", resourceToolId);
		CommonRequest<HashMap<String, Object>> conditionMap = new CommonRequest<HashMap<String, Object>>(params, 1, 10);
		CommonResponse<PageBean<Map<String, Object>>> response = resourceToolQuery
				.queryWorkToolByConditions(conditionMap);
		if (CollectionUtils.isEmpty(response.getData().getData())
				|| CollectionUtils.isEmpty(response.getData().getData().get(0))) {
			return CommonResponse.fail("504", "获取设备信息失败");
			return null;
		}
		Map<String, Object> resultMap = response.getData().getData().get(0);
		List<CharacteristicSpecValue> characteristicSpecList = charSpecService
@@ -117,16 +123,44 @@ public class ResourceToolManageServiceImpl implements ResourceToolManageService
			resultMap.put("isExistPicture", "0");
		} else {
			String toolPictureUrl = uploadFileService.getFileUrl(resultMap.get("pictureUrl").toString(),
					minioConfig.getBucketWorkToolImage());
					minioConfig.getBucketToolImage());
			resultMap.put("toolPictureUrl", toolPictureUrl);
			resultMap.put("isExistPicture", "1");
		}
		return CommonResponse.ok(resultMap);
		return resultMap;
	}
	@Override
	public CommonResponse<ResourceTool> createResourceTool(ResourceTool resourceTool) {
	public Map<String, Object> queryResourceToolByCode(String resourceToolCode) throws Exception {
		if (StringUtils.isEmpty(resourceToolCode)) {
			return null;
		}
		HashMap<String, Object> params = new HashMap<String, Object>();
		// 查询监控设备
		params.put("isMonitorSceneTool", "1");
		params.put("resourceToolCode", resourceToolCode);
		CommonRequest<HashMap<String, Object>> conditionMap = new CommonRequest<HashMap<String, Object>>(params, 1, 10);
		CommonResponse<PageBean<Map<String, Object>>> response = resourceToolQuery
				.queryWorkToolByConditions(conditionMap);
		if (CollectionUtils.isEmpty(response.getData().getData())
				|| CollectionUtils.isEmpty(response.getData().getData().get(0))) {
			return null;
		}
		return response.getData().getData().get(0);
	}
	@Override
	public CommonResponse<ResourceTool> createResourceTool(ResourceTool resourceTool) throws Exception {
		Map<String, Object> resourceToolMap=queryResourceToolByCode(resourceTool.getResourceToolName());
		if (resourceToolMap!=null) {
			return CommonResponse.fail("502", "设备编号已存在");
		}
		
		if (StringUtils.isEmpty(resourceTool.getPictureUrl())) {
			resourceTool.setPictureUrl("#");
		}
@@ -138,13 +172,13 @@ public class ResourceToolManageServiceImpl implements ResourceToolManageService
	}
	@Override
	public CommonResponse<ResourceTool> modifyResourceTool(ResourceTool resourceTool) {
	public CommonResponse<ResourceTool> modifyResourceTool(ResourceTool resourceTool) throws Exception  {
		CommonRequest<ResourceTool> request = new CommonRequest<ResourceTool>(resourceTool);
		return resourceToolCommand.saveWorkToolWithNoMapArea(request);
	}
	@Override
	public CommonResponse<Void> deleteResourceTool(List<String> resourceToolIds) {
	public CommonResponse<Void> deleteResourceTool(List<String> resourceToolIds) throws Exception  {
		CommonRequest<List<String>> request = new CommonRequest<List<String>>(resourceToolIds);
		CommonResponse<ResourceTool> response = resourceToolCommand.deleteWorkTool(request);
@@ -159,14 +193,14 @@ public class ResourceToolManageServiceImpl implements ResourceToolManageService
	public Map<String, String> uploadResourceToolPicture(MultipartFile meFile, String pictureUrl) throws Exception {
		/*if (StringUtils.isNotBlank(pictureUrl) && !"#".equals(pictureUrl)) {
		 	//删除照片
			uploadFileService.removeFile(pictureUrl, minioConfig.getBucketWorkToolImage());
			uploadFileService.removeFile(pictureUrl, minioConfig.getBucketToolImage());
		}*/
		// 上传
		String minioFileName = uploadFileService.uploadFile(meFile, minioConfig.getBucketWorkToolImage());
		String minioFileName = uploadFileService.uploadFile(meFile, minioConfig.getBucketToolImage());
		// 获取照片的url地址
		String toolPictureUrl = uploadFileService.getFileUrl(minioFileName, minioConfig.getBucketWorkToolImage());
		String toolPictureUrl = uploadFileService.getFileUrl(minioFileName, minioConfig.getBucketToolImage());
		// 返回信息
		Map<String, String> resultMap = new HashMap<String, String>();

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

@@ -91,6 +91,34 @@ public class UploadFileServiceImpl implements UploadFileService {
	}
	@Override
	public List<String> getFileUrlForList(List<String> minioFileNameList) throws Exception {
		if (CollectionUtils.isEmpty(minioFileNameList)) {
			log.debug("批量获取文件的url为空");
			return null;
		}
		String minioFileName = minioFileNameList.get(0);
		return getFileUrlForList(minioFileNameList, getBucketName(minioFileName));
	}
	@Override
	public List<String> getFileUrlForList(List<String> minioFileNameList, String bucketName) throws Exception {
		if (CollectionUtils.isEmpty(minioFileNameList)) {
			log.debug("批量获取文件的url为空");
			return null;
		}
		if (StringUtils.isEmpty(bucketName)) {
			log.error("删除文件的桶为空");
			throw new NullPointerException("bucketName is null");
		}
		List<String> urlList = minioService.getObjectsUrl(bucketName, minioFileNameList);
		return urlList;
	}
	@Override
	public List<Map<String, Object>> getFileUrlForListMap(List<Map<String, Object>> minioFileListMap, String mapkey,
			String minioFileUrlKey) throws Exception {
		if (CollectionUtils.isEmpty(minioFileListMap)) {
@@ -171,4 +199,5 @@ public class UploadFileServiceImpl implements UploadFileService {
		return bucketName;
	}
}

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

@@ -0,0 +1,31 @@
package com.ai.bss.security.protection.service.interfaces;
import java.util.List;
import java.util.Map;
import com.ai.abc.api.model.CommonResponse;
/**
 * 首页报表
 * @author konghl@asiainfo.com
 * 2020-12-15
 */
public interface HomePageService {
	/**
	 * 获取当日出勤数据
	 * @return
	 * @throws Exception
	 */
	Map<String, Object> queryAttendanceChart() throws Exception;
	/**
	 * 获取告警分析数据
	 * @param params
	 * @param dataSize
	 * @return
	 * @throws Exception
	 */
	CommonResponse<List<Map<String, Object>>> queryAlarmAnalysisList(Map<String, String> params, int dataSize)
			throws Exception;
}

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

@@ -0,0 +1,55 @@
package com.ai.bss.security.protection.service.interfaces;
import java.util.List;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.work.safety.model.MonitorVideoLog;
/**
 * 监控视频日志管理
 * @author konghl@asiainfo.com
 * 2020-12-15
 */
public interface MonitorVideoLogManageService {
	/**
	 * 按时间段查询监控视频日志
	 * @param monitorVideoLogCondition
	 * @return
	 * @throws Exception
	 */
	CommonResponse<List<MonitorVideoLog>> queryMonitorVideoLogByTime(MonitorVideoLog monitorVideoLogCondition)
			throws Exception;
	/**
	 * 根据视频日志ID查询监控视频日志
	 * @param monitorVideoLogId
	 * @return
	 * @throws Exception
	 */
	CommonResponse<MonitorVideoLog> queryMonitorVideoLogById(Long monitorVideoLogId) throws Exception;
	/**
	 * 创建监控视频日志
	 * @param monitorVideoLog
	 * @return
	 * @throws Exception
	 */
	CommonResponse<MonitorVideoLog> createMonitorVideoLog(MonitorVideoLog monitorVideoLog) throws Exception;
	/**
	 * 修改监控视频日志
	 * @param monitorVideoLog
	 * @return
	 * @throws Exception
	 */
	CommonResponse<MonitorVideoLog> modifyMonitorVideoLog(MonitorVideoLog monitorVideoLog) throws Exception;
	/**
	 * 删除设备视频记录
	 * @param monitorVideoLogIdList
	 * @return
	 * @throws Exception
	 */
	CommonResponse<Void> deleteMonitorVideoLog(List<Long> monitorVideoLogIdList) throws Exception;
}

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

@@ -36,32 +36,43 @@ public interface ResourceToolManageService {
	List<Map<String, String>> queryResourceToolType();
	/**
	 * 设备Id查询单个设备
	 * 根据设备Id设备Id查询设备
	 * @param resourceToolId
	 * @return
	 */
	CommonResponse<Map<String, Object>> queryOneResourceTool(String resourceToolId) throws Exception;
	Map<String, Object> queryResourceToolById(String resourceToolId) throws Exception;
	/**
	 * 根据设备CODE查询设备
	 * @param resourceToolCode
	 * @return
	 * @throws Exception
	 */
	Map<String, Object> queryResourceToolByCode(String resourceToolCode) throws Exception;
	/**
	 * 创建设备信息
	 * @param resourceTool
	 * @return
	 * @throws Exception
	 */
	CommonResponse<ResourceTool> createResourceTool(ResourceTool resourceTool);
	CommonResponse<ResourceTool> createResourceTool(ResourceTool resourceTool) throws Exception ;
	/**
	 * 修改设备信息
	 * @param resourceTool
	 * @return
	 * @throws Exception
	 */
	CommonResponse<ResourceTool> modifyResourceTool(ResourceTool resourceTool);
	CommonResponse<ResourceTool> modifyResourceTool(ResourceTool resourceTool) throws Exception ;
	/**
	 * 删除设备信息
	 * @param resourceToolIds
	 * @return
	 * @throws Exception
	 */
	CommonResponse<Void> deleteResourceTool(List<String> resourceToolIds);
	CommonResponse<Void> deleteResourceTool(List<String> resourceToolIds) throws Exception ;
	/**
	 * 上传设备照片

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

@@ -31,6 +31,23 @@ public interface UploadFileService {
	/**
	 * 批量获取文件的url地址
	 * @param minioFileNameList minio文件标识集合
	 * @return
	 * @throws Exception
	 */
	List<String> getFileUrlForList(List<String> minioFileNameList) throws Exception;
	/**
	 * 批量获取文件的url地址
	 * @param minioFileNameList minio文件标识集合
	 * @param bucketName 存储文件的桶名(文件夹)
	 * @return
	 * @throws Exception
	 */
	List<String> getFileUrlForList(List<String> minioFileNameList, String bucketName) throws Exception;
	/**
	 * 批量获取文件的url地址
	 * @param minioFileListMap 数据列表
	 * @param mapkey 数据列表中minioFileName的key
	 * @param minioFileUrlKey 数据列表中minioFileUrl的key

security-protection-service/src/main/java/com/ai/bss/security/protection/service/task/AIAlarmKafkaTask.java

@@ -1,54 +0,0 @@
package com.ai.bss.security.protection.service.task;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.junit.Assert;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.kafka.annotation.KafkaListener;
import org.springframework.kafka.support.Acknowledgment;
import org.springframework.stereotype.Component;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.abc.util.JsonUtils;
import com.ai.bss.work.safety.model.AiIdenLog;
import com.ai.bss.work.safety.service.api.AiTaskCommand;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import lombok.extern.slf4j.Slf4j;
/**
 * 监控报警事件触发违规处理
 * @author konghl@asiainfo.com
 * 2020-12-14
 */
@Component
@Slf4j
public class AIAlarmKafkaTask {
	@Autowired
	private AiTaskCommand aiTaskCommand;
	@KafkaListener(containerFactory = "kafkaBatchListener3", topics = "${kafka.topic.aialarm:topic_ai_alarm}", groupId = "alarm_group")
	public void alarmListener(ConsumerRecord<String, String> records, Acknowledgment ack) throws Throwable {
		try {
			log.info("----------------AI监控触发违规信息消费开始---------------------------");
			String message = records.value();
			log.info("已接AI报违规消息，消息为：" + message);
			CommonRequest<AiIdenLog> aiIdenLogRequest = JSON.parseObject(message,
					new TypeReference<CommonRequest<AiIdenLog>>() {
					});
			CommonResponse runningResult = aiTaskCommand.aiIdenLogTriggerEvent(aiIdenLogRequest);
			log.info("runningResult: \n{}", JsonUtils.toJSONStringByDateFormat(runningResult, true));
			Assert.assertTrue(runningResult.isSuccess());
		} catch (Exception e) {
			log.error("kafka消费异常" + e.getMessage(), e);
		} finally {
			ack.acknowledge();// 手动提交偏移量
		}
	}
}

security-protection-service/src/main/java/com/ai/bss/security/protection/service/task/AIAttendanceKafkaTask.java

@@ -1,54 +0,0 @@
package com.ai.bss.security.protection.service.task;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.junit.Assert;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.kafka.annotation.KafkaListener;
import org.springframework.kafka.support.Acknowledgment;
import org.springframework.stereotype.Component;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.abc.util.JsonUtils;
import com.ai.bss.work.safety.model.AiIdenLog;
import com.ai.bss.work.safety.service.api.AiTaskCommand;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import lombok.extern.slf4j.Slf4j;
/**
 * 人脸识别事件触发考勤
 * @author konghl@asiainfo.com
 * 2020-12-14
 */
@Component
@Slf4j
public class AIAttendanceKafkaTask {
	@Autowired
	private AiTaskCommand aiTaskCommand;
	@KafkaListener(containerFactory = "kafkaBatchListener3", topics = "${kafka.topic.alarm:Topic_IoT_IndividualAlarm}", groupId = "alarm_group")
	public void alarmListener(ConsumerRecord<String, String> records, Acknowledgment ack) throws Throwable {
		try {
			log.info("----------------AI人脸识别触发考勤信息消费开始---------------------------");
			String message = records.value();
			log.info("已接AI考勤信息，消息为：" + message);
			CommonRequest<AiIdenLog> aiIdenLogRequest = JSON.parseObject(message,
					new TypeReference<CommonRequest<AiIdenLog>>() {
					});
			CommonResponse runningResult = aiTaskCommand.aiIdenLogTriggerEvent(aiIdenLogRequest);
			log.info("runningResult: \n{}", JsonUtils.toJSONStringByDateFormat(runningResult, true));
			Assert.assertTrue(runningResult.isSuccess());
		} catch (Exception e) {
			log.error("kafka消费异常" + e.getMessage(), e);
		} finally {
			ack.acknowledge();// 手动提交偏移量
		}
	}
}

security-protection-service/src/main/java/com/ai/bss/security/protection/service/task/AIResultRecordKafkaTask.java

@@ -1,24 +1,31 @@
package com.ai.bss.security.protection.service.task;
import java.util.List;
import java.util.Map;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.junit.Assert;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.kafka.annotation.KafkaListener;
import org.springframework.kafka.support.Acknowledgment;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.abc.util.JsonUtils;
import com.ai.bss.security.protection.service.interfaces.ResourceToolManageService;
import com.ai.bss.work.safety.model.AiIdenLog;
import com.ai.bss.work.safety.service.api.AiTaskCommand;
import com.ai.bss.work.safety.service.api.MonitorSceneQuery;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import lombok.extern.slf4j.Slf4j;
/**
 * AI任务执行结果日志创建
 * 创建AI任务执行结果日志
 * @author konghl@asiainfo.com
 * 2020-12-14
 */
@@ -29,7 +36,13 @@ public class AIResultRecordKafkaTask {
	@Autowired
	private AiTaskCommand aiTaskCommand;
	@KafkaListener(containerFactory = "kafkaBatchListener6", topics = "${kafka.topic.alarm:Topic_IoT_IndividualAlarm}", groupId = "alarm_group")
	@Autowired
	private ResourceToolManageService resourceToolManageService;
	
	@Autowired
	private MonitorSceneQuery monitorSceneQuery;
	@KafkaListener(containerFactory = "kafkaBatchListener6", topics = "${kafka.topic.aitask:topic_ai_task}", groupId = "ai_group")
	public void alarmListener(ConsumerRecord<String, String> records, Acknowledgment ack) throws Throwable {
		try {
			log.info("----------------AI任务执行结果信息消费开始---------------------------");
@@ -37,11 +50,41 @@ public class AIResultRecordKafkaTask {
			String message = records.value();
			log.info("已接AI任务执行结果消息，消息为：" + message);
			CommonRequest<AiIdenLog> aiIdenLogRequest = JSON.parseObject(message,
					new TypeReference<CommonRequest<AiIdenLog>>() {
					});
			JSONObject messageJson = JSONObject.parseObject(message);
			Map<String, Object> resourceToolMap = resourceToolManageService
					.queryResourceToolByCode(messageJson.getString("resourceToolCode"));
			CommonResponse<AiIdenLog> runningResult = aiTaskCommand.createAiIdenLog(aiIdenLogRequest);
			if (resourceToolMap == null) {
				log.error("AI任务执行结果的设备CODE不存在:  resourceToolCode=" + messageJson.getString("resourceToolCode"));
				throw new NullPointerException("resourceToolCode not exist");
			}
			
			String resourceToolId=String.valueOf(resourceToolMap.get("resourceToolId"));
			
			CommonResponse<List<Map<String, Object>>> sceneTerminalRelResponse =monitorSceneQuery.selectSceneTerminalRel(new CommonRequest<Long>(Long.valueOf(resourceToolId)));
			if (sceneTerminalRelResponse == null||CollectionUtils.isEmpty(sceneTerminalRelResponse.getData())) {
				log.error("AI任务执行结果的关联场景不存在:  resourceToolId=" + resourceToolId);
				throw new NullPointerException("sceneTerminalRel not exist");
			}
			Map<String,Object> sceneTerminalRelMap=sceneTerminalRelResponse.getData().get(0);
			
			
			AiIdenLog aiIdenLog = JSON.parseObject(message, new TypeReference<AiIdenLog>() {
			});
			aiIdenLog.setResourceToolId(resourceToolId);
			aiIdenLog.setResourceToolName(String.valueOf(resourceToolMap.get("resourceToolName")));
			aiIdenLog.setMonitorSceneId(String.valueOf(sceneTerminalRelMap.get("monitorSceneId")));
			aiIdenLog.setMonitorSceneName(String.valueOf(sceneTerminalRelMap.get("monitorSceneName")));
			aiIdenLog.setEffectType(String.valueOf(sceneTerminalRelMap.get("effectType")));
			aiIdenLog.setTerminalPosition(String.valueOf(sceneTerminalRelMap.get("place")));
			
			
			
			
			
			CommonResponse<AiIdenLog> runningResult = aiTaskCommand.createAiIdenLog(new CommonRequest<AiIdenLog>(aiIdenLog));
			log.info("runningResult: \n{}", JsonUtils.toJSONStringByDateFormat(runningResult, true));
			Assert.assertTrue(runningResult.isSuccess());
@@ -51,4 +94,5 @@ public class AIResultRecordKafkaTask {
			ack.acknowledge();// 手动提交偏移量
		}
	}
}

security-protection-service/src/main/java/com/ai/bss/security/protection/service/task/AIVideoKafkaTask.java

@@ -0,0 +1,70 @@
package com.ai.bss.security.protection.service.task;
import java.util.Map;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.junit.Assert;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.kafka.annotation.KafkaListener;
import org.springframework.kafka.support.Acknowledgment;
import org.springframework.stereotype.Component;
import com.ai.abc.api.model.CommonResponse;
import com.ai.abc.util.JsonUtils;
import com.ai.bss.security.protection.service.interfaces.MonitorVideoLogManageService;
import com.ai.bss.security.protection.service.interfaces.ResourceToolManageService;
import com.ai.bss.work.safety.model.MonitorVideoLog;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import lombok.extern.slf4j.Slf4j;
/**
 * 创建AI监控视频日志
 * @author konghl@asiainfo.com
 * 2020-12-14
 */
@Component
@Slf4j
public class AIVideoKafkaTask {
	@Autowired
	private MonitorVideoLogManageService monitorVideoLogManageService;
	@Autowired
	private ResourceToolManageService resourceToolManageService;
	@KafkaListener(containerFactory = "kafkaBatchListener6", topics = "${kafka.topic.aivideo:topic_ai_video}", groupId = "ai_group")
	public void alarmListener(ConsumerRecord<String, String> records, Acknowledgment ack) throws Throwable {
		try {
			log.info("----------------AI监控视频日志消费开始---------------------------");
			String message = records.value();
			log.info("已接AI监控视频日志消息，消息为：" + message);
			JSONObject messageJson = JSONObject.parseObject(message);
			Map<String, Object> resourceToolMap = resourceToolManageService
					.queryResourceToolByCode(messageJson.getString("resourceToolCode"));
			if (resourceToolMap==null) {
				log.error("AI监控视频日志的设备CODE不存在: " + messageJson.getString("resourceToolCode"));
				throw new NullPointerException("resourceToolCode not exist");
			}
			
			MonitorVideoLog monitorVideoLog = JSON.parseObject(message, new TypeReference<MonitorVideoLog>() {
			});
			monitorVideoLog.setResourceToolId(String.valueOf(resourceToolMap.get("resourceToolId")));
			CommonResponse<MonitorVideoLog> runningResult = monitorVideoLogManageService
					.createMonitorVideoLog(monitorVideoLog);
			log.info("kafka aivideo runningResult: \n{}", JsonUtils.toJSONStringByDateFormat(runningResult, true));
			Assert.assertTrue(runningResult.isSuccess());
		} catch (Exception e) {
			log.error("AI监控视频日志消息的kafka消费异常: " + e.getMessage(), e);
		} finally {
			ack.acknowledge();// 手动提交偏移量
		}
	}
}

security-protection-service/src/main/java/com/ai/bss/security/protection/utils/EbcConstant.java

@@ -39,6 +39,12 @@ public class EbcConstant {
	// 考勤查询：月
	public static final String AREA_IN_OUT_RECORD_MONTH = "month";
	//AI识别结果：违规
	public static final String AI_IDENTIFY_RESULT_ALARM= "AI_IDENTIFY_RESULT_ALARM";
	
	//AI识别结果：考勤
	public static final String AI_IDENTIFY_RESULT_ATTENDANCE= "AI_IDENTIFY_RESULT_ATTENDANCE";
	
	// 静态常量: 工单类型
	public static final String BUSINESS_SPEC_WORK_ORDER_TYPE = "WORK_ORDER_TYPE";
	
@@ -47,6 +53,15 @@ public class EbcConstant {
	
	// 静态常量: 监控场景类型
	public static final String BUSINESS_SPEC_MONITOR_SCENE_TYPE = "MONITOR_SCENE_TYPE";
	
	// 静态常量: AI报警类型
	public static final String BUSINESS_SPEC_AI_ALARM_TYPE = "AI_ALARM_TYPE";
	
	// 静态常量: AI任务状态
	public static final String BUSINESS_SPEC_AI_TASK_STATUS = "AI_TASK_STATUS";
	
	// 静态常量: AI匹配模型
	public static final String BUSINESS_SPEC_AI_MATCHER_MODE = "AI_MATCHER_MODE";
	
	// 当前登录者的STAFF_ID

security-protection-service/src/main/resources/application.properties

@@ -28,8 +28,7 @@ spring.main.allow-bean-definition-overriding=true
#kafka.bootstrap-servers=47.105.160.21:9090
kafka.bootstrap-servers=10.19.90.34:9090
kafka.topic.aitask=topic_ai_task
kafka.topic.aialarm=topic_ai_alarm
kafka.topic.aiattendance=topic_ai_attendance
kafka.topic.aivideo=topic_ai_video
kafka.producer.batch-size=16785
kafka.producer.retries=1
kafka.producer.buffer-memory=33554432
@@ -51,13 +50,20 @@ minio.port=19000
minio.accessKey=minioadmin
minio.secretKey=minioadmin
minio.secure=false
minio.bucketHeaderImage=prod-dev
minio.faceAddServiceUrl=http://10.21.10.28:9018/api/face/add
minio.face-del-service-url=http://10.21.10.28:9018/api/face/del
minio.face-recog-service-url=http://10.21.10.28:9018/api/face/recog
myminio.bucketWorkToolImage=tool-image
myminio.bucketWorkToolView=tool-view
# \u4eba\u8138\u8bc6\u522b
minio.bucketHeaderImage=prod-dev
# \u8bbe\u5907\u9ed8\u8ba4\u7167\u7247
spminio.bucketToolImage=tool-image
# \u76d1\u63a7\u89c6\u9891
spminio.bucketAiVideo=ai-video
# \u76d1\u63a7\u89c6\u9891\u622a\u56fe
spminio.bucketAiImage=ai-image
# CACHE
#spring.cache.type=ehcache