Merge remote-tracking branch 'origin/master'

location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/impl/LocationManagementServiceImpl.java

@@ -236,7 +236,7 @@ public class LocationManagementServiceImpl implements LocationManagementService
			String maxStatus = getEntityPositionStatus(entityPosition);
			// 获取人员状态：如果为救援人员，则显示为正常人员
			//maxStatus = EntityPosition.TAG_TYPE_RESCUE.equals(maxStatus) ? EntityPosition.TAG_TYPE_NORMAL : maxStatus;
			maxStatus = EntityPosition.TAG_TYPE_RESCUE.equals(maxStatus) ? EntityPosition.TAG_TYPE_NORMAL : maxStatus;
			ebcEntityPosition.setLocationStatus(maxStatus);
			ebcEntityPosition.setCharValueSet(null);

location-rescue-service/src/main/java/com/ai/bss/location/rescue/util/EbcConstant.java

@@ -40,7 +40,7 @@ public class EbcConstant {
	public static final String BUSINESS_SPEC_EMPLOYEE_POSITION="mainJobPosition";
	
	//静态常量: 报警类型
	public static final String BUSINESS_SPEC_MAP_AREA_TYPE="ALARM_TYPE";
	public static final String BUSINESS_SPEC_MAP_AREA_TYPE="LOCATION_ALARM_TYPE";
		
	//静态常量: 海图参数
	public static final String BUSINESS_SPEC_SEA_MAP_PARAM="SEA_MAP_PARAM";

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

@@ -15,17 +15,15 @@ import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.components.minio.service.MinioService;
import com.ai.bss.security.protection.model.SecurityProtectionMinioConfig;
import com.ai.bss.security.protection.service.interfaces.CharSpecService;
import com.ai.bss.security.protection.service.interfaces.ResourceToolManageService;
import com.ai.bss.security.protection.service.interfaces.UploadFileService;
import com.ai.bss.security.protection.utils.EbcConstant;
import com.ai.bss.work.tool.model.ResourceTool;
import com.ai.bss.work.tool.service.api.ResourceToolCommand;
import com.ai.bss.work.tool.service.api.ResourceToolQuery;
import cn.hutool.core.lang.UUID;
@Service
public class ResourceToolManageServiceImpl implements ResourceToolManageService {
@@ -36,7 +34,7 @@ public class ResourceToolManageServiceImpl implements ResourceToolManageService
	private ResourceToolQuery resourceToolQuery;
	@Autowired
	private MinioService minioService;
	private UploadFileService uploadFileService;
	@Autowired
	private SecurityProtectionMinioConfig minioConfig;
@@ -118,9 +116,9 @@ public class ResourceToolManageServiceImpl implements ResourceToolManageService
			resultMap.put("toolPictureUrl", "");
			resultMap.put("isExistPicture", "0");
		} else {
			String pictureUrl = minioService.getObjectUrl(minioConfig.getBucketWorkToolImage(),
					resultMap.get("pictureUrl").toString());
			resultMap.put("toolPictureUrl", pictureUrl);
			String toolPictureUrl = uploadFileService.getFileUrl(resultMap.get("pictureUrl").toString(),
					minioConfig.getBucketWorkToolImage());
			resultMap.put("toolPictureUrl", toolPictureUrl);
			resultMap.put("isExistPicture", "1");
		}
@@ -159,21 +157,18 @@ public class ResourceToolManageServiceImpl implements ResourceToolManageService
	@Override
	public Map<String, String> uploadResourceToolPicture(MultipartFile meFile, String pictureUrl) throws Exception {
		/*if (StringUtils.isNotBlank(pictureUrl) && !"#".equals(pictureUrl)) {
		if (StringUtils.isNotBlank(pictureUrl) && !"#".equals(pictureUrl)) {
		 	//删除照片
			minioService.removeObject(minioConfig.getBucketWorkToolImage(), pictureUrl);
		}*/
			uploadFileService.removeFile(pictureUrl);
		}
		//上传
		String fileName = meFile.getOriginalFilename();
		String fileType = fileName.substring(fileName.lastIndexOf("."), fileName.length());
		String minioFileName = UUID.fastUUID().toString() + fileType;
		minioService.putObject(minioConfig.getBucketWorkToolImage(), meFile, minioFileName);
		// 上传
		String minioFileName = uploadFileService.uploadFile(meFile, minioConfig.getBucketWorkToolImage());
		//获取照片的url地址
		String toolPictureUrl = minioService.getObjectUrl(minioConfig.getBucketWorkToolImage(), minioFileName);
		// 获取照片的url地址
		String toolPictureUrl = uploadFileService.getFileUrl(minioFileName);
		//返回信息
		// 返回信息
		Map<String, String> resultMap = new HashMap<String, String>();
		resultMap.put("pictureUrl", minioFileName);
		resultMap.put("toolPictureUrl", toolPictureUrl);

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

@@ -0,0 +1,129 @@
package com.ai.bss.security.protection.service.impl;
import javax.naming.NameNotFoundException;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import com.ai.bss.components.minio.service.MinioService;
import com.ai.bss.security.protection.service.interfaces.UploadFileService;
import cn.hutool.core.lang.UUID;
import lombok.extern.slf4j.Slf4j;
@Service
@Slf4j
public class UploadFileServiceImpl implements UploadFileService {
	private static final String SPLIT_CHAR = "_";
	@Autowired
	private MinioService minioService;
	@Override
	public String uploadFile(MultipartFile meFile, String bucketName) throws Exception {
		if (meFile == null || StringUtils.isEmpty(meFile.getOriginalFilename())) {
			log.error("上传的文件为空");
			throw new NullPointerException("meFile is null");
		}
		if (StringUtils.isEmpty(bucketName)) {
			log.error("上传文件的桶为空");
			throw new NullPointerException("bucketName is null");
		}
		String fileName = meFile.getOriginalFilename();
		log.info("准备上传文件: " + fileName);
		String fileType = fileName.substring(fileName.lastIndexOf("."), fileName.length());
		String minioFileName = bucketName + SPLIT_CHAR + UUID.fastUUID().toString().replace("-", "") + fileType;
		try {
			minioService.putObject(bucketName, meFile, minioFileName);
		} catch (Exception e) {
			log.error("文件上传异常");
			e.printStackTrace();
		}
		log.info("文件上传结束，minioFileName: " + minioFileName);
		return minioFileName;
	}
	@Override
	public String getFileUrl(String minioFileName) throws Exception {
		if (StringUtils.isEmpty(minioFileName)) {
			return "";
		}
		if (minioFileName.lastIndexOf(SPLIT_CHAR) < 1) {
			log.error("获取文件url异常，minioFileName:" + minioFileName);
			throw new NameNotFoundException("minioFileName is error");
		}
		String bucketName = minioFileName.substring(0, minioFileName.lastIndexOf(SPLIT_CHAR));
		return getFileUrl(minioFileName, bucketName);
	}
	@Override
	public String getFileUrl(String minioFileName, String bucketName) throws Exception {
		if (StringUtils.isEmpty(minioFileName)) {
			return "";
		}
		if (StringUtils.isEmpty(bucketName)) {
			log.error("上传文件的桶为空");
			throw new NullPointerException("bucketName is null");
		}
		String fileUrl = "";
		try {
			fileUrl = minioService.getObjectUrl(bucketName, minioFileName);
		} catch (Exception e) {
			log.error("获取到文件的url路径异常，minioFileName: " + minioFileName);
			e.printStackTrace();
		}
		if (StringUtils.isEmpty(fileUrl)) {
			log.info("未获取到文件的url路径，minioFileName: " + minioFileName);
		}
		// log.debug("获得文件的url路径，minioFileName: " + minioFileName + ",bucketName:" + bucketName + ",url:" + fileUrl);
		return fileUrl;
	}
	@Override
	public boolean removeFile(String minioFileName) throws Exception {
		if (StringUtils.isEmpty(minioFileName)) {
			return false;
		}
		if (minioFileName.lastIndexOf(SPLIT_CHAR) < 1) {
			log.error("删除文件异常，minioFileName:" + minioFileName);
			throw new NameNotFoundException("minioFileName is error");
		}
		String bucketName = minioFileName.substring(0, minioFileName.lastIndexOf(SPLIT_CHAR));
		return removeFile(minioFileName, bucketName);
	}
	@Override
	public boolean removeFile(String minioFileName, String bucketName) throws Exception {
		if (StringUtils.isEmpty(minioFileName)) {
			return false;
		}
		if (StringUtils.isEmpty(bucketName)) {
			log.error("删除文件的桶为空");
			throw new NullPointerException("bucketName is null");
		}
		boolean result = false;
		try {
			result = minioService.removeObject(bucketName, minioFileName);
		} catch (Exception e) {
			log.error("删除上传异常");
			e.printStackTrace();
		}
		log.info("删除文件，minioFileName: " + minioFileName);
		return result;
	}
}

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

@@ -0,0 +1,45 @@
package com.ai.bss.security.protection.service.interfaces;
import org.springframework.web.multipart.MultipartFile;
public interface UploadFileService {
	/**
	 * 上传文件
	 * @param meFile 上传的文件
	 * @param bucketName 存储文件的桶名(文件夹)
	 * @return minioFileName minio文件标识
	 */
	String uploadFile(MultipartFile meFile, String bucketName) throws Exception;
	/**
	 * 获取文件的url地址
	 * @param minioFileName minio文件标识
	 * @return
	 */
	String getFileUrl(String minioFileName) throws Exception;
	/**
	 * 获取文件的url地址
	 * @param minioFileName minio文件标识
	 * @param bucketName 存储文件的桶名(文件夹)
	 * @return
	 */
	String getFileUrl(String minioFileName, String bucketName) throws Exception;
	/**
	 * 移除文件
	 * @param minioFileName minio文件标识
	 * @return
	 * @throws Exception
	 */
	boolean removeFile(String minioFileName) throws Exception;
	/**
	 * 移除文件
	 * @param minioFileName minio文件标识
	 * @param bucketName 存储文件的桶名(文件夹)
	 * @return
	 * @throws Exception
	 */
	boolean removeFile(String minioFileName, String bucketName) throws Exception;
}

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

@@ -0,0 +1,54 @@
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

@@ -0,0 +1,54 @@
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

@@ -0,0 +1,54 @@
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;
/**
 * AI任务执行结果日志创建
 * @author konghl@asiainfo.com
 * 2020-12-14
 */
@Component
@Slf4j
public class AIResultRecordKafkaTask {
	@Autowired
	private AiTaskCommand aiTaskCommand;
	@KafkaListener(containerFactory = "kafkaBatchListener6", 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<AiIdenLog> runningResult = aiTaskCommand.createAiIdenLog(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/resources/application.properties

@@ -27,10 +27,9 @@ spring.main.allow-bean-definition-overriding=true
#kafka
#kafka.bootstrap-servers=47.105.160.21:9090
kafka.bootstrap-servers=10.19.90.34:9090
kafka.topic.deviceLocation=Topic_IoT_DeviceLocation_111
kafka.topic.alarm=Topic_IoT_IndividualAlarm_111
#kafka.topic.deviceLocation=DeviceLocationA
#kafka.topic.alarm=IndividualAlarmA
kafka.topic.aitask=topic_ai_task
kafka.topic.aialarm=topic_ai_alarm
kafka.topic.aiattendance=topic_ai_attendance
kafka.producer.batch-size=16785
kafka.producer.retries=1
kafka.producer.buffer-memory=33554432