修改AI处理结果

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

@@ -1,5 +1,7 @@
package com.ai.bss.monitorManage.constant;
import java.io.File;
/**
 * 公共常量类
 *
@@ -44,4 +46,14 @@ public class MonitorManageConsts {
    //AI识别结果：考勤
    public static final String AI_IDENTIFY_RESULT_ATTENDANCE= "ATT";
    public static final String alarmEmployeeRoleId= "201613310867";
    public static String getSystemSeparator(){
        return File.separator;
    }
    public static void main(String[] args){
        System.out.println(File.separator);
    }
}

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/model/AiIdenLogDto.java

@@ -2,6 +2,9 @@ package com.ai.bss.monitorManage.model;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
public class AiIdenLogDto {
    private static final long serialVersionUID = -1L;
@@ -28,7 +31,7 @@ public class AiIdenLogDto {
    /**
     * 识别结果详情
     */
    private String idenResult;
    private List<IdenResultDto> idenResult;
    /**
     * 识别图片抓拍时间
     */

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/model/IdenResultDto.java

@@ -0,0 +1,12 @@
package com.ai.bss.monitorManage.model;
import lombok.Data;
@Data
public class IdenResultDto {
    private String alarmType;
    private String alarmMemo;
    private String alarmEmployeeRoleId;
}

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

@@ -1,6 +1,7 @@
package com.ai.bss.monitorManage.service.impl;
import com.ai.bss.monitorManage.constant.MonitorManageConsts;
import com.ai.bss.monitorManage.service.interfaces.FileManageService;
import com.ai.bss.monitorManage.service.interfaces.ListeningFileDirectoryService;
import com.ai.bss.monitorManage.utils.FileUtils;
@@ -52,11 +53,12 @@ public class ListeningFileDirectoryServiceImpl  implements ListeningFileDirector
                            int i = 0;
                            String[] fileContent = new String[3600];
                            for (WatchEvent<?> event : key.pollEvents()) {
                                String fileName = filePath+"\\"+event.context();
                                String fileName = filePath+MonitorManageConsts.getSystemSeparator()+event.context();
                                System.out.println("增加文件的文件夹路径== :"+fileName);
                                System.out.println("增加文件的名称== :"+event.context());
                                mapKey = filePath.replace(baseFilePath+"\\","");
                                mapKey = mapKey.replace("\\","~!@");
//                                mapKey = filePath.replace(baseFilePath+ MonitorManageConsts.getSystemSeparator(),"");
                                mapKey = filePath.replace(baseFilePath+ MonitorManageConsts.getSystemSeparator(),"");
                                mapKey = mapKey.replace(MonitorManageConsts.getSystemSeparator(),"~!@");
                                if(FileUtils.fileMap.get(mapKey)==null){
                                    fileList = new ArrayList();
                                    fileList.add(fileName);

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

@@ -5,6 +5,7 @@ import com.ai.bss.components.common.util.ImageBase64Converter;
import com.ai.bss.components.ebcai.service.EbcAiService;
import com.ai.bss.monitorManage.constant.MonitorManageConsts;
import com.ai.bss.monitorManage.model.AiIdenLogDto;
import com.ai.bss.monitorManage.model.IdenResultDto;
import com.ai.bss.monitorManage.model.MonitorVideoLogDto;
import com.ai.bss.monitorManage.service.interfaces.FileManageService;
import com.ai.bss.monitorManage.service.interfaces.KafkaProcess;
@@ -139,7 +140,7 @@ public class MonitorManageServiceImpl implements MonitorManageService {
						filePath = iterator.next();
						aiIdenLogDto = new AiIdenLogDto();
						monitorVideoLogDto = new MonitorVideoLogDto();
						fileName = filePath.substring(filePath.lastIndexOf("\\")+1,filePath.length());
						fileName = filePath.substring(filePath.lastIndexOf(MonitorManageConsts.getSystemSeparator())+1,filePath.length());
						if(fileType.equals(MonitorManageConsts.FILE_TYPE_VIDEO)){
							bucketName = minioConfig.getBucketAiVideo();
							time = fileName.substring(5,19);
@@ -200,24 +201,44 @@ public class MonitorManageServiceImpl implements MonitorManageService {
			String aiResponseData = ebcAiService.helmetDetect(ImageBase64Converter.convertFileToBase64(aifilePath), Strings.EMPTY, Strings.EMPTY);
//			String aiResponseData = ebcAiService.helmetDetect(ImageBase64Converter.convertInputStreamToBase64(multipartFile.getInputStream()), Strings.EMPTY, Strings.EMPTY);
			JSONObject jsonObject = JSONObject.parseObject(aiResponseData);// JSONUtil.formatJsonStr(aiResponseData);
			IdenResultDto idenResultDto = null;
			List<IdenResultDto> idenResultDtoList = null;
			if(jsonObject.getString("Status").equals("Ok")){
				idenResultDtoList = new ArrayList<>();
				JSONArray jsonoArray = JSONArray.parseArray(jsonObject.getString("Result"));
				for(int i=0;i<jsonoArray.size();i++){
					JSONObject resultObj = JSONObject.parseObject(jsonoArray.get(i).toString());
					String aiClassName = resultObj.getString("class");
//										safety_hat表示安全帽；ordinart_hat表示普通帽子；chef_hat表示厨师帽；none表示未戴帽子
					if(aiClassName.equals("none")){
						aiIdenLogDto.setIdenResult("未戴帽子");
						idenResultDto =new IdenResultDto();
						idenResultDto.setAlarmEmployeeRoleId(MonitorManageConsts.alarmEmployeeRoleId);
						idenResultDto.setAlarmType("none_hat");
						idenResultDto.setAlarmMemo("未戴帽子");
						aiIdenLogDto.setIdenResultType(MonitorManageConsts.AI_IDENTIFY_RESULT_ALARM);
						idenResultDtoList.add(idenResultDto);
						aiIdenLogDto.setIdenResult(idenResultDtoList);
						aiIdenLogDto.setAiIdenModel(MonitorManageConsts.AI_MODEL_CLOTHING_CODE);
					}else{
						if(aiClassName.equals("safety_hat")){
							aiIdenLogDto.setIdenResult("安全帽");
							idenResultDto =new IdenResultDto();
							idenResultDto.setAlarmEmployeeRoleId(MonitorManageConsts.alarmEmployeeRoleId);
							idenResultDto.setAlarmType("safety_hat");
							idenResultDto.setAlarmMemo("安全帽");
						}else if(aiClassName.equals("ordinart_hat")){
							aiIdenLogDto.setIdenResult("普通帽子");
							idenResultDto =new IdenResultDto();
							idenResultDto.setAlarmEmployeeRoleId(MonitorManageConsts.alarmEmployeeRoleId);
							idenResultDto.setAlarmType("ordinart_hat");
							idenResultDto.setAlarmType("普通帽子");
						}else if(aiClassName.equals("chef_hat")){
							aiIdenLogDto.setIdenResult("厨师帽");
							idenResultDto =new IdenResultDto();
							idenResultDto.setAlarmEmployeeRoleId(MonitorManageConsts.alarmEmployeeRoleId);
							idenResultDto.setAlarmType("chef_hat");
							idenResultDto.setAlarmType("厨师帽");
						}
						idenResultDtoList.add(idenResultDto);
						aiIdenLogDto.setIdenResult(idenResultDtoList);
						aiIdenLogDto.setIdenResultType(MonitorManageConsts.AI_IDENTIFY_RESULT);
						aiIdenLogDto.setAiIdenModel(MonitorManageConsts.AI_MODEL_CLOTHING_CODE);
					}

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

@@ -49,7 +49,8 @@ public class AttendanceReportController {
		Map<String, Object> params = new HashMap<>();
		params.put("workDay",attendanceReport.getWorkDay());
		params.put("orgId",attendanceReport.getOrgCode());
		params.put("orgId",attendanceReport.getOrgId());
		params.put("orgCode",attendanceReport.getOrgCode());
		params.put("id",attendanceReport.getId());
		params.put("nameAsLike",attendanceReport.getNameAsLike());
		params.put("mainJobPositionId",attendanceReport.getMainJobPositionId());
@@ -80,7 +81,8 @@ public class AttendanceReportController {
		Map<String, Object> params = new HashMap<>();
		params.put("month",attendanceReport.getMonth());
		params.put("orgId",attendanceReport.getOrgCode());
		params.put("orgId",attendanceReport.getOrgId());
		params.put("orgCode",attendanceReport.getOrgCode());
		params.put("id",attendanceReport.getId());
		params.put("nameAsLike",attendanceReport.getNameAsLike());
		params.put("mainJobPositionId",attendanceReport.getMainJobPositionId());
@@ -104,7 +106,8 @@ public class AttendanceReportController {
		Map<String, Object> params = new HashMap<>();
		params.put("month",attendanceReport.getMonth());
		params.put("orgId",attendanceReport.getOrgCode());
		params.put("orgId",attendanceReport.getOrgId());
		params.put("orgCode",attendanceReport.getOrgCode());
		params.put("id",attendanceReport.getId());
		params.put("nameAsLike",attendanceReport.getNameAsLike());
		params.put("mainJobPositionId",attendanceReport.getMainJobPositionId());