修改监控图片文件夹的问题

ebc-mock-service/src/main/java/com/ai/bss/mock/constants/MockConstant.java

@@ -4,8 +4,6 @@ import java.util.HashMap;
import java.util.Map;
public class MockConstant {
    public static Map MACK_STATUS = new HashMap();
	
    public static final String SPLIT_DASH = "-";
}

ebc-mock-service/src/main/java/com/ai/bss/mock/service/impl/MockManageServiceImpl.java

@@ -1,24 +1,26 @@
package com.ai.bss.mock.service.impl;
import com.ai.bss.mock.constants.MockConstant;
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 com.ai.bss.mock.model.MockScenarioData;
import com.ai.bss.mock.repository.MockScenarioDataRepository;
import com.ai.bss.mock.service.interfaces.MockManageService;
import com.ai.bss.mock.service.interfaces.MockProcess;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@Service
public class MockManageServiceImpl implements MockManageService {
	protected static Map MACK_STATUS = new HashMap();
	
    @Autowired
    private MockScenarioDataRepository mockScenarioDataRepository;
    @Autowired
@@ -29,7 +31,7 @@ public class MockManageServiceImpl implements MockManageService {
    @Override
    public Map findMockStatusByScenarioId()  {
        List<Long> result = new ArrayList(MockConstant.MACK_STATUS.keySet());
        List<Long> result = new ArrayList(MACK_STATUS.keySet());
        Map  tempmap = new HashMap();
        for(Long sid:result){
            tempmap.put(sid,"场景 "+sid+" 执行中...");
@@ -39,7 +41,7 @@ public class MockManageServiceImpl implements MockManageService {
    @Override
    public String  startMackData(Long sId,  Long frequency,String topic0,String topic1)  {
        //        验证场景是否正在执行
        if(MockConstant.MACK_STATUS.get(sId)!=null){
        if(MACK_STATUS.get(sId)!=null){
            return "场景" + sId + " 正在执行,请耐心等待...";
        }
        //根据场景ID从数据库中查询模拟数据
@@ -50,7 +52,7 @@ public class MockManageServiceImpl implements MockManageService {
            return "场景" + sId + " 没有配置模拟 ，请在数据库中添加数据再执行...";
        }
        //记录场景执行状态
        MockConstant.MACK_STATUS.put(sId,frequency);
        MACK_STATUS.put(sId,frequency);
        //异步执行模拟场景 通过IOT-DMP连接服务模拟
//        mockProcess.processMock(sId,mockScenarioDataList,frequency);
@@ -63,7 +65,7 @@ public class MockManageServiceImpl implements MockManageService {
    @Override
    public String  stopMackData(Long sId){
        MockConstant.MACK_STATUS.remove(sId);
        MACK_STATUS.remove(sId);
        return "场景" + sId + " 终止执行...";
    }

ebc-mock-service/src/main/java/com/ai/bss/mock/service/impl/MockProcessImpl.java

@@ -1,6 +1,19 @@
package com.ai.bss.mock.service.impl;
import com.ai.bss.mock.constants.MockConstant;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import com.ai.bss.mock.model.Data;
import com.ai.bss.mock.model.DataPoint;
import com.ai.bss.mock.model.EBCData;
@@ -9,24 +22,15 @@ import com.ai.bss.mock.service.interfaces.MockProcess;
import com.ai.bss.mock.utils.KafkaProducerConfig;
import com.ai.bss.mock.utils.tcp.IpuTcpLongConnectClient;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@Service
public class MockProcessImpl implements MockProcess {
	private static Logger logger = LoggerFactory.getLogger(MockProcessImpl.class);
//    EBC设备tcp连接服务地址
    private static final String HOST = "47.105.130.83";
    private static final int PORT = 8042;
@@ -34,7 +38,6 @@ public class MockProcessImpl implements MockProcess {
//    private static String kafkaServers = "47.105.160.21:9090";
    private static String kafkaServers = "10.19.90.34:9090";
    @Value("${kafka.producer.servers}")
    private static String servers;
@@ -44,9 +47,10 @@ public class MockProcessImpl implements MockProcess {
        try {
            IpuTcpLongConnectClient.getInstance(HOST, PORT).sendMockData(sId,mockScenarioDataList, frequency);
            MockConstant.MACK_STATUS.remove(sId);
            MockManageServiceImpl.MACK_STATUS.remove(sId);
        }catch (Exception e){
            e.printStackTrace();
        	logger.error("processMock is error:"+e.getMessage());
            //e.printStackTrace();
        }
    }
@@ -68,9 +72,10 @@ public class MockProcessImpl implements MockProcess {
            }
            MockConstant.MACK_STATUS.remove(sId);
            MockManageServiceImpl.MACK_STATUS.remove(sId);
        }catch (Exception e){
            e.printStackTrace();
        	logger.error("processMockKafka is error:"+e.getMessage());
            //e.printStackTrace();
        }
    }
@@ -183,7 +188,8 @@ public class MockProcessImpl implements MockProcess {
//            kafkaTemplateMap.put(kafkaServers,kafkaTemplate);
//        }
        System.out.println(servers);
        //System.out.println(servers);
        logger.info(servers);
        try {
            for(DataPoint dataPoint:dataPointList){
//                Object result = kafkaTemplate.send(dataPoint.getPushTopic(), JSONObject.toJSONString(dataPoint)).get();
@@ -194,11 +200,13 @@ public class MockProcessImpl implements MockProcess {
            }
        } catch (InterruptedException e) {
            e.printStackTrace();
        	logger.error("sendKafkamsg is error:"+e.getMessage());
            //e.printStackTrace();
            return false;
        } catch (Exception e) {
            e.printStackTrace();
            log.error(e.getMessage());
        	logger.error("sendKafkamsg is error:"+e.getMessage());
            //e.printStackTrace();
            //log.error(e.getMessage());
            return false;
        }
@@ -227,8 +235,9 @@ public class MockProcessImpl implements MockProcess {
//            e.printStackTrace();
//            return false;
        } catch (Exception e) {
            e.printStackTrace();
            log.error(e.getMessage());
        	logger.error("sendKafkaDataPoint is error:"+e.getMessage());
            //e.printStackTrace();
            //log.error(e.getMessage());
            return false;
        }

ebc-mock-service/src/main/java/com/ai/bss/mock/utils/makedata/MakeBeidouData.java

@@ -1,13 +1,19 @@
package com.ai.bss.mock.utils.makedata;
import com.ai.bss.mock.utils.HexStringUtil;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.ai.bss.mock.utils.HexStringUtil;
public class MakeBeidouData {
	private static Logger logger = LoggerFactory.getLogger(MakeBeidouData.class);
	
	/**
	 * 
	 * @param deviceId 设备ID
@@ -88,7 +94,8 @@ public class MakeBeidouData {
		        + getHex(date.get(Calendar.MINUTE)) + getHex(date.get(Calendar.SECOND));
		     return time;
		} catch (Exception e) {
			System.out.println(e.getMessage());
			logger.error("getHexDate is error:"+e.getMessage());
			//System.out.println(e.getMessage());
		}
		return "";
	}
@@ -141,7 +148,7 @@ public class MakeBeidouData {
		return result;
	}
	
	
	/*
	public void test1111() {
		int deviceId = 318414; // 设备id
		int type = 4; // 0 定位；1 自动报警；2手动报警；4离线
@@ -191,7 +198,9 @@ public class MakeBeidouData {
		sb.append("00");
		sb.append(xorCheck(sb.toString()));
		System.out.println(sb.toString());
		logger.info(sb.toString());
		//System.out.println(sb.toString());
	}
	*/
	
}

ebc-mock-service/src/main/java/com/ai/bss/mock/utils/tcp/IpuTcpLongConnectClient.java

@@ -1,10 +1,13 @@
package com.ai.bss.mock.utils.tcp;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.ai.bss.mock.model.MockScenarioData;
import com.ai.bss.mock.utils.tcp.message.MessageGenerationManager;
import java.util.List;
/**
 * Ipu Tcp长连接测试
 *
@@ -13,6 +16,9 @@ import java.util.List;
 **/
@SuppressWarnings("unused")
public class IpuTcpLongConnectClient {
	private Logger logger = LoggerFactory.getLogger(IpuTcpLongConnectClient.class);
	
    private static IpuTcpLongConnectClient ipuClient;
    private TcpLongConnectClient nettyClient;
@@ -33,14 +39,18 @@ public class IpuTcpLongConnectClient {
     * @throws Exception 
     */
    public void test() throws Exception {
        nettyClient.test();
        //nettyClient.test();
    	logger.info("test");
    }
    
    /**
     * Tcp长连接方式发送消息
     * @throws Exception
     */
    public void sendMockData(Long sId,List<MockScenarioData> mockScenarioDataList,Long frequency) throws Exception {
        nettyClient.sendMockData(sId,mockScenarioDataList,frequency);
        //nettyClient.sendMockData(sId,mockScenarioDataList,frequency);
    	logger.info("sendMockData");
    }
    
}

ebc-mock-service/src/main/java/com/ai/bss/mock/utils/tcp/TcpLongConnectClient.java

@@ -55,6 +55,7 @@ class TcpLongConnectClient {
		channel = channelFuture.channel();
	}
	/*
	public void test() throws Exception {
		EventLoopGroup eventLoopGroup = new NioEventLoopGroup();
		bootstrap = new Bootstrap();
@@ -86,7 +87,7 @@ class TcpLongConnectClient {
				String sendMessage = null;
				String deviceId=null;
				String type=null; //类型(0 定位；1 自动报警；2手动报警；4离线) 
				String type=""; //类型(0 定位；1 自动报警；2手动报警；4离线) 
				String longitudeDouble=null;
				String latitudeDouble=null; 
				String dateString=null;
@@ -191,8 +192,10 @@ class TcpLongConnectClient {
			}
		}
		log.info("发送成功，共发送"+count+"条数据");
	}
	public void sendMockData(Long sId,List<MockScenarioData> mockScenarioDataList,Long frequency) throws Exception {
	}*/
	
	/*public void sendMockData(Long sId,List<MockScenarioData> mockScenarioDataList,Long frequency) throws Exception {
		EventLoopGroup eventLoopGroup = new NioEventLoopGroup();
		bootstrap = new Bootstrap();
		bootstrap.group(eventLoopGroup);
@@ -267,7 +270,7 @@ class TcpLongConnectClient {
						TimeUnit.MILLISECONDS.sleep(frequency*1000);
					}catch (Exception e) {
						e.printStackTrace();
						//e.printStackTrace();
						log.error("数据错误，请重新输入");
					}
				}
@@ -283,4 +286,5 @@ class TcpLongConnectClient {
		}
		log.info("发送成功，共发送"+count+"条数据");
	}
	*/
}

ebc-mock-service/src/main/java/com/ai/bss/mock/utils/tcp/TcpLongConnectClientHandler.java

@@ -30,8 +30,8 @@ class TcpLongConnectClientHandler extends ChannelInboundHandlerAdapter {
    @Override
    public void channelInactive(ChannelHandlerContext ctx) {
    	log.debug("连接断开");
    	System.out.println("连接断开");
    	log.info("连接断开");
    	//System.out.println("连接断开");
		/*LOGGER.debug("连接断开，10s之后尝试重新连接服务器。");
		try {
		    TimeUnit.MILLISECONDS.sleep(SLEEP_TIME);

ebc-sea-platform/src/main/java/com/ai/bss/location_rescuers/server/dao/impl/AreaInOutRecordDaoImpl.java

@@ -28,12 +28,10 @@ public class AreaInOutRecordDaoImpl extends AbstractBizDao implements AreaInOutR
	}
	@Override
	public PageInfo queryPageDayAreaInOutRecord(JMap params, int pageNum, int pageSize) throws Exception {
	public List<Map<String, Object>> queryPageDayAreaInOutRecord(JMap params, int pageNum, int pageSize) throws Exception {
		PageHelper.startPage(pageNum,pageSize);
		ISqlMgmtDao dao1 = SqlMgmtDaoFactory.createFileSqlMgmtDao(connName);
		List<Map<String, Object>> equipmentList= dao1.executeSelect("ipu.AreaInOutRecordDao", "queryPageDayAreaInOutRecord", params);
		PageInfo pageInfo = new PageInfo(equipmentList);
		return pageInfo;
		return dao1.executeSelect("ipu.AreaInOutRecordDao", "queryPageDayAreaInOutRecord", params);
	}
	@Override

ebc-sea-platform/src/main/java/com/ai/bss/location_rescuers/server/dao/impl/UserManageDaoImpl.java

@@ -1,26 +1,30 @@
package com.ai.bss.location_rescuers.server.dao.impl;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import com.ai.bss.location_rescuers.server.dao.interfaces.UserManageDao;
import com.ai.ipu.data.JList;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonList;
import com.ai.ipu.data.impl.JsonMap;
import com.ai.bss.location_rescuers.server.dao.interfaces.UserManageDao;
import com.ai.ipu.sql.mgmt.ISqlMgmtDao;
import com.ai.ipu.sql.mgmt.SqlMgmtDaoFactory;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Component
public class UserManageDaoImpl implements UserManageDao {
	private static Logger logger = LoggerFactory.getLogger(UserManageDaoImpl.class);
    
    private String connName = "ebc";
    @Override
@@ -38,7 +42,8 @@ public class UserManageDaoImpl implements UserManageDao {
            mapTagXyList.forEach((mapTagXy)->{
                if(mapTag.get("MAP_TAG_ID")==mapTagXy.get("MAP_TAG_ID")){
                    arrayList.add(mapTagXy);
                    System.out.println(arrayList.toString());
                    //System.out.println(arrayList.toString());
                    logger.info(arrayList.toString());
                }
            });
            mapTag.put("EBC_MAP_TAG_XY",arrayList);

ebc-sea-platform/src/main/java/com/ai/bss/location_rescuers/server/dao/interfaces/AreaInOutRecordDao.java

@@ -43,7 +43,7 @@ public interface AreaInOutRecordDao {
	 * @return
	 * @throws Exception
	 */
	PageInfo queryPageDayAreaInOutRecord(JMap params, int pageNum, int pageSize) throws Exception;
	List<Map<String, Object>> queryPageDayAreaInOutRecord(JMap params, int pageNum, int pageSize) throws Exception;
	/**
	 * 分页查询日进出围栏日志

ebc-sea-platform/src/main/java/com/ai/bss/location_rescuers/server/service/impl/AreaInOutRecordServiceImpl.java

@@ -1,6 +1,7 @@
package com.ai.bss.location_rescuers.server.service.impl;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -9,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ai.bss.location_rescuers.server.dao.interfaces.AreaInOutRecordDao;
import com.ai.bss.location_rescuers.server.dao.interfaces.MapTagManageDao;
import com.ai.bss.location_rescuers.server.enums.UserEnums;
import com.ai.bss.location_rescuers.server.service.interfaces.AreaInOutRecordService;
import com.ai.bss.location_rescuers.server.util.DateUtil;
@@ -21,28 +21,24 @@ import com.github.pagehelper.PageInfo;
public class AreaInOutRecordServiceImpl implements AreaInOutRecordService {
	@Autowired
	AreaInOutRecordDao areaInOutRecordDao;
	@Autowired
	MapTagManageDao mapTagManageDao;
	private AreaInOutRecordDao areaInOutRecordDao;
	@Override
	public PageInfo queryPageAreaInOutRecord(JMap params, int pageNum, int pageSize) throws Exception {
		//调用uspa接口分页模糊查询姓名、职务 现在暂用枚举
		List<Map<String, Object>> userList = UserEnums.getAllUserList();
		PageInfo pageInfo=null;
		List<Map<String, Object>> areaInOutRecordList =null;
		if(EbcConstant.AREA_IN_OUT_RECORD_DAY.equals(params.get("mark"))){
			 pageInfo = areaInOutRecordDao.queryPageDayAreaInOutRecord(params, pageNum, pageSize);
			areaInOutRecordList = areaInOutRecordDao.queryPageDayAreaInOutRecord(params, pageNum, pageSize);
		}else if(EbcConstant.AREA_IN_OUT_RECORD_WEEK.equals(params.get("mark"))){
			areaInOutRecordDao.queryPageWeekAreaInOutRecord(params, pageNum, pageSize);
			areaInOutRecordList = areaInOutRecordDao.queryPageWeekAreaInOutRecord(params, pageNum, pageSize);
		}else if(EbcConstant.AREA_IN_OUT_RECORD_MONTH.equals(params.get("mark"))){
			areaInOutRecordDao.queryPageMonthAreaInOutRecord(params, pageNum, pageSize);
			areaInOutRecordList = areaInOutRecordDao.queryPageMonthAreaInOutRecord(params, pageNum, pageSize);
		}else {
			return null;
			areaInOutRecordList = new ArrayList<Map<String,Object>>();
		}
		List<Map<String,Object>> pageInfoList = pageInfo.getList();
		for(Map<String,Object> areaInOutRecord:pageInfoList ){
		for(Map<String,Object> areaInOutRecord:areaInOutRecordList ){
			for(Map<String,Object> userMap: userList){
				if((int)areaInOutRecord.get("EMPLOYEE_ID")==(int)userMap.get("id")){
					areaInOutRecord.put("userName",userMap.get("userName"));
@@ -51,7 +47,7 @@ public class AreaInOutRecordServiceImpl implements AreaInOutRecordService {
			}
		}
		PageInfo pageInfo = new PageInfo(areaInOutRecordList);
		return pageInfo;
	}

ebc-sea-platform/src/main/java/com/ai/bss/location_rescuers/server/service/impl/ExportToExcelServiceImpl.java

@@ -21,18 +21,16 @@ import com.ai.bss.location_rescuers.server.service.interfaces.ExportService;
import com.ai.bss.location_rescuers.server.service.interfaces.MapTagManageService;
import com.ai.bss.location_rescuers.server.util.ExcelFormatUtil;
import com.ai.ipu.data.JMap;
import com.github.pagehelper.PageInfo;
@Service
public class ExportToExcelServiceImpl implements ExportService {
    @Autowired
    MapTagManageService mapTagManageService;
    /**
     * slf4j 日志 logger
     */
	/**
	 * slf4j 日志 logger
	 */
	private Logger logger = LoggerFactory.getLogger(ExportToExcelServiceImpl.class);
    @Autowired
    private MapTagManageService mapTagManageService;
    /**
     * 导出地图管理信息到excel
@@ -48,8 +46,10 @@ public class ExportToExcelServiceImpl implements ExportService {
            params1.put("pageSize",0 );
            // 查询数据
            //PageInfo pageInfo = mapTagManageService.queryMapTagInfo(object1);
            PageInfo pageInfo =null;
            List<JMap> mapTagList = pageInfo.getList();
            //PageInfo pageInfo =null;
            //List<JMap> mapTagList = pageInfo.getList();
            List<Object> mapTagList = mapTagManageService.queryPageMapTagInfo(object1,1,100).getJList("dataList");
            
            //设置表格名字
            String strName="地图标记导出表.xls";
@@ -75,7 +75,7 @@ public class ExportToExcelServiceImpl implements ExportService {
                logger.info(">>>>>>>>>>>>>>>>>>>>开始遍历数据组装单元格内容>>>>>>>>>>");
                for (int i = 0; i < mapTagList.size(); i++) {
                    Map mapTagJMap = mapTagList.get(i);
                    Map mapTagJMap = (Map)mapTagList.get(i);
                    SXSSFRow row = sheet.createRow(i + 1);
                    int j = 0;
@@ -113,10 +113,13 @@ public class ExportToExcelServiceImpl implements ExportService {
            params1.put("pageNum",0 );
            params1.put("pageSize",0 );
            
            // 查询数据
            //PageInfo pageInfo = mapTagManageService.queryMapTagInfo(object1);
            PageInfo pageInfo=null;
            List<JMap> mapTagList = pageInfo.getList();
            //PageInfo pageInfo = mapTagManageService.queryPageMapTagInfo(object1);
            //PageInfo pageInfo=null;
            //List<JMap> mapTagList = pageInfo.getList();
            List<Object> mapTagList = mapTagManageService.queryPageMapTagInfo(object1,1,100).getJList("dataList");
            
            //设置表格名字
            String strName="地图标记导出表.xls";
@@ -142,7 +145,7 @@ public class ExportToExcelServiceImpl implements ExportService {
                logger.info(">>>>>>>>>>>>>>>>>>>>开始遍历数据组装单元格内容>>>>>>>>>>");
                for (int i = 0; i < mapTagList.size(); i++) {
                    Map mapTagJMap = mapTagList.get(i);
                    Map mapTagJMap = (Map)mapTagList.get(i);
                    SXSSFRow row = sheet.createRow(i + 1);
                    int j = 0;

ebc-sea-platform/src/main/java/com/ai/bss/location_rescuers/server/util/DateUtil.java

@@ -162,20 +162,21 @@ public class DateUtil {
	 */
	public static int compareDate(String dateStr0, String dateStr1) throws ParseException {
		if (dateStr0 == null || "".equals(dateStr0)) {
			if (dateStr1 == null || "".equals(dateStr1)) {
				return 0;
			} else {
				return -1;
			}
			return (dateStr1 == null || "".equals(dateStr1))?0:-1;
		}else if (dateStr1 == null || "".equals(dateStr1)) {
			return 1;
		}
		if (dateStr1 == null || "".equals(dateStr1)) {
		Date date0 = convertDate(dateStr0);
		Date date1 = convertDate(dateStr1);
		
		if (date0 == null) {
			return date1 == null?0:-1;
		}else if (date1 == null) {
			return 1;
		}
		Date date1 = convertDate(dateStr0);
		Date date2 = convertDate(dateStr1);
		int result = date1.compareTo(date2);
		
		int result = date0.compareTo(date1);
		return result;
	}

ebc-sea-platform/src/main/java/com/ai/bss/location_rescuers/server/util/ExcelFormatUtil.java

@@ -5,6 +5,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.Map;
@@ -156,7 +157,7 @@ public class ExcelFormatUtil {
            header.add("Content-Disposition", "attachment;filename*=utf-8'zh_cn'" + URLEncoder.encode(fileName, "UTF-8"));
            logger.info(">>>>>>>>>>>>>>>>>>>>结束下载文件-无记录>>>>>>>>>>");
            logger.info(">>>>>>>>>>结束导出excel>>>>>>>>>>");
            return new ResponseEntity<>(string.getBytes(), header, HttpStatus.OK);
            return new ResponseEntity<>(string.getBytes(Charset.forName("UTF-8")), header, HttpStatus.OK);
        }
    }

ebc-sea-platform/src/main/java/com/ai/bss/security_protection/server/service/impl/AreaInRecordServiceImpl.java

@@ -1,38 +1,33 @@
package com.ai.bss.security_protection.server.service.impl;
import com.ai.bss.location_rescuers.server.util.DateUtil;
import com.ai.bss.security_protection.server.service.interfaces.AreaInRecordService;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ai.bss.location_rescuers.server.util.DateUtil;
import com.ai.bss.security_protection.server.dao.interfaces.AreaInOutRecordDao;
import com.ai.bss.security_protection.server.enums.UserEnums;
import com.ai.bss.security_protection.server.service.interfaces.AreaInRecordService;
import com.ai.ipu.data.JMap;
import com.github.pagehelper.PageInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Service
public class AreaInRecordServiceImpl implements AreaInRecordService {
	@Autowired
    AreaInOutRecordDao areaInOutRecordDao;
    private AreaInOutRecordDao areaInOutRecordDao;
	@Override
	public PageInfo queryPageAreaInOutRecord(JMap params, int pageNum, int pageSize) throws Exception {
		//调用uspa接口分页模糊查询姓名、职务 现在暂用枚举
		List<Map<String, Object>> userList = UserEnums.getAllUserList();
		PageInfo pageInfo=null;
			areaInOutRecordDao.queryPageMonthAreaInOutRecord(params, pageNum, pageSize);
		List<Map<String, Object>> dataList=areaInOutRecordDao.queryPageMonthAreaInOutRecord(params, pageNum, pageSize);
		List<Map<String,Object>> pageInfoList = pageInfo.getList();
		for(Map<String,Object> areaInOutRecord:pageInfoList ){
		for(Map<String,Object> areaInOutRecord:dataList ){
			for(Map<String,Object> userMap: userList){
				if((int)areaInOutRecord.get("EMPLOYEE_ID")==(int)userMap.get("id")){
					areaInOutRecord.put("userName",userMap.get("userName"));
@@ -42,7 +37,7 @@ public class AreaInRecordServiceImpl implements AreaInRecordService {
		}
		return pageInfo;
		return new PageInfo(dataList);
	}
	@Override

location-rescue-service/src/main/java/com/ai/bss/location/rescue/controller/TrackManagementController.java

@@ -70,7 +70,7 @@ public class TrackManagementController {
	public CommonResponse<Map<String, Object>> querySingleEmployeeTrace(@RequestBody Map<String, String> request)
			throws Exception {
		if (request == null || request.get("entityId") == null || request.get("timeType") == null) {
			CommonResponse.fail("502", "查询失败");
			return CommonResponse.fail("502", "查询失败");
		}
		// 当前页码
@@ -130,7 +130,7 @@ public class TrackManagementController {
	public CommonResponse<List<Map<String, Object>>> queryMoreEmployeeTrace(@RequestBody Map<String, String> request)
			throws Exception {
		if (request == null || request.get("entityId") == null || request.get("timeType") == null) {
			CommonResponse.fail("502", "查询失败");
			return CommonResponse.fail("502", "查询失败");
		}
		// 当前页码

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

@@ -5,8 +5,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -34,8 +32,6 @@ import com.alibaba.fastjson.JSONObject;
@Service
public class AlarmManagementServiceImpl implements AlarmManagementService {
    private Logger logger = LoggerFactory.getLogger(AlarmManagementServiceImpl.class);
	@Autowired
	private RescueCommand rescueCommand;

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

@@ -25,12 +25,10 @@ import com.ai.bss.worker.service.api.AttendanceStatusQuery;
@Service
public class AttendanceManageServiceImpl implements AttendanceManageService {
    @Autowired
    CharSpecService charSpecService;
    private CharSpecService charSpecService;
    @Autowired
    AttendanceStatusQuery attendanceStatusQuery;
    private AttendanceStatusQuery attendanceStatusQuery;
    @Override
    public CommonResponse<PageBean<Map<String, Object>>> queryAttendanceInfo(CommonRequest<HashMap<String, Object>> conditionMap) {

location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/task/AlarmMirrorTask.java

@@ -33,7 +33,7 @@ public class AlarmMirrorTask implements EntityAlarmHandle {
	 */
	@Override
	public CommonResponse<Map<String, Object>> alarmHandle(CommonRequest<WorkTask> workTask) {
		logger.debug("实时报警接收镜屏数据: " + JSON.toJSONString(workTask));
		logger.debug("====================实时报警接收镜屏数据: " + JSON.toJSONString(workTask));
		try {
			String charValueSet = workTask.getData().getCharValueSet();
			JSONObject alarmJsonObj = JSONObject.parseObject(charValueSet);

location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/task/LocationMirrorTask.java

@@ -23,7 +23,7 @@ public class LocationMirrorTask implements EntityPositionChangeHandle {
	private Logger logger = LoggerFactory.getLogger(LocationMirrorTask.class);
	@Autowired
	LocationManagementService locationManagementService;
	private LocationManagementService locationManagementService;
	/**
	 * 镜屏推送实体位置变动信息
@@ -33,21 +33,25 @@ public class LocationMirrorTask implements EntityPositionChangeHandle {
	 */
	@Override
	public CommonResponse<Map<String, Object>> entityPositionChange(CommonRequest<LoadMapViewParam> commonRequest) {
		logger.debug("人员定位接收镜屏数据: " + JSON.toJSONString(commonRequest));
		logger.debug("====================人员定位接收镜屏数据");
		try {
			Map<String, Object> resultMap = new HashMap<String, Object>();
			if (commonRequest != null && commonRequest.getData() != null) {
				logger.info("人员定位接收镜屏数据: " + JSON.toJSONString(commonRequest));
				resultMap.put("aggregatedMapAreaList", locationManagementService
						.getMapAreaAllStatus(commonRequest.getData().getAggregatedMapAreaList()));
				resultMap.put("unaggregatedEntityPositionList", locationManagementService
						.getEmployeeAllStatus(commonRequest.getData().getUnaggregatedEntityPositionList()));
				resultMap.put("currentEntityPosition",commonRequest.getData().getCurrentEntityPosition());
				
			} else {
				logger.error("人员定位接收镜屏数据为空: " + JSON.toJSONString(commonRequest));
				resultMap.put("aggregatedMapAreaList", new ArrayList<MapArea>());
				resultMap.put("unaggregatedEntityPositionList", new ArrayList<EntityPosition>());
				resultMap.put("currentEntityPosition",new EntityPosition());
			}
			resultMap.put("currentEntityPosition",commonRequest.getData().getCurrentEntityPosition());
			resultMap.put("countMap", locationManagementService.loadEmployeeStatusCount());
			String msg = JSON.toJSONString(CommonResponse.ok(resultMap));

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/controller/MonitorManageController.java

@@ -46,14 +46,22 @@ public class MonitorManageController {
//    }
    /**
     * 监听图片
     * 开启监听图片
     */
    @ResponseBody
    @RequestMapping("/loadPicture")
    public Object loadPicture() throws InterruptedException {
         monitorManageService.loadPictureFromDirectory();
         return "OK";
        String result = monitorManageService.loadPictureFromDirectory();
         return result;
    }
    /**
     * 关闭监听图片
     */
    @ResponseBody
    @RequestMapping("/closeListening")
    public Object closeListening() {
    	String result = monitorManageService.closeListeningPicture();
        return result;
    }
}

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

@@ -6,9 +6,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.bss.monitorManage.model.FaceResultDto;
import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.kafka.core.KafkaTemplate;
@@ -22,6 +23,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.FaceResultDto;
import com.ai.bss.monitorManage.model.IdenResultDto;
import com.ai.bss.monitorManage.model.MonitorVideoLogDto;
import com.ai.bss.monitorManage.service.interfaces.FileManageService;
@@ -37,11 +39,11 @@ import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import javax.sound.sampled.Line;
@Slf4j
@Service
public class KafkaProcessImpl implements KafkaProcess {
	private Logger logger = LoggerFactory.getLogger(KafkaProcessImpl.class);
	
//    EBC设备tcp连接服务地址
	private static final String HOST = "47.105.130.83";
	private static final int PORT = 8042;
@@ -82,7 +84,8 @@ public class KafkaProcessImpl implements KafkaProcess {
				sendKafkaDataPoint(topic, msg);
			}
		} catch (Exception e) {
			e.printStackTrace();
			logger.error("processKafka1 is error:"+e.getMessage());
			//e.printStackTrace();
		}
	}
@@ -92,7 +95,8 @@ public class KafkaProcessImpl implements KafkaProcess {
		try {
			sendKafkaDataPoint(topic, msg);
		} catch (Exception e) {
			e.printStackTrace();
			logger.error("processKafka2 is error:"+e.getMessage());
			//e.printStackTrace();
		}
	}
@@ -343,7 +347,7 @@ public class KafkaProcessImpl implements KafkaProcess {
			// AI模型
//			aiIdenLogDto.setAiIdenModel(MonitorManageConsts.AI_MODEL_CLOTHING_CODE);
		} catch (Exception e) {
			log.error("AI处理异常，帽子识别");
			log.error("帽子识别AI处理异常:"+e.getMessage());
		}
		return aiIdenLogDto;
	}
@@ -385,7 +389,7 @@ public class KafkaProcessImpl implements KafkaProcess {
				log.info("AI人数识别结果：没有人");
			}
		} catch (Exception e) {
			log.error("AI处理异常，人数识别");
			log.error("人数识别AI处理异常:"+e.getMessage());
		}
		return isHuman;
	}
@@ -445,7 +449,7 @@ public class KafkaProcessImpl implements KafkaProcess {
			}
		} catch (Exception e) {
			log.error("AI处理异常，人脸识别");
			log.error("人脸识别AI处理异常:"+e.getMessage());
		}
		return aiIdenLogDto;
	}
@@ -508,7 +512,7 @@ public class KafkaProcessImpl implements KafkaProcess {
			log.info("消息推送完成");
		} catch (Exception e) {
			log.error("AI处理异常，陌生人识别");
			log.error("陌生人识别AI处理异常:"+e.getMessage());
		}
		return aiIdenLogDto;
	}
@@ -561,7 +565,7 @@ public class KafkaProcessImpl implements KafkaProcess {
            	log.error("吸烟识别异常");
			}
        }catch(Exception e){
        log.error("AI处理异常，吸烟识别");
        log.error("吸烟识别AI处理异常:"+e.getMessage());
        }
        return aiIdenLogDto;
    }
@@ -618,7 +622,7 @@ private AiIdenLogDto workClothesDetect(AiIdenLogDto aiIdenLogDto, String aifileP
		}
	}catch(Exception e){
	log.error("AI处理异常，工作服识别");
	log.error("工作服识别AI处理异常:"+e.getMessage());
	}
	return aiIdenLogDto;
}
@@ -651,7 +655,7 @@ private AiIdenLogDto instrumentDetect(AiIdenLogDto aiIdenLogDto, String aifilePa
			log.info("异常返回，异常原因为:"+jsonObjectpredictions.getString("Errors"));
		}
	}catch(Exception e){
		log.error("AI处理异常，仪表识别");
		log.error("仪表识别AI处理异常:"+e.getMessage());
	}
	return aiIdenLogDto;
}
@@ -675,7 +679,7 @@ private AiIdenLogDto instrumentDetect(AiIdenLogDto aiIdenLogDto, String aifilePa
			resourceToolInfoList = JSON.parseArray(resultData.getString("data"), Map.class);
			log.debug("getResourceToolAllInfo method return result: " + resultData.getString("data"));
		} catch (Exception e) {
			log.error("getResourceToolAllInfo is error");
			log.error("getResourceToolAllInfo is error:"+e.getMessage());
		}
		return resourceToolInfoList;

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

@@ -1,50 +1,70 @@
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.KafkaProcess;
import com.ai.bss.monitorManage.service.interfaces.ListeningFileDirectoryService;
import com.ai.bss.monitorManage.utils.FileUtils;
import com.mzlion.core.lang.StringUtils;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.file.FileSystems;
import java.nio.file.Paths;
import java.nio.file.StandardWatchEventKinds;
import java.nio.file.WatchEvent;
import java.nio.file.WatchKey;
import java.nio.file.WatchService;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Timer;
import java.util.TimerTask;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileItemFactory;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.commons.CommonsMultipartFile;
import java.io.*;
import java.nio.file.*;
import java.util.*;
import com.ai.bss.monitorManage.constant.MonitorManageConsts;
import com.ai.bss.monitorManage.service.interfaces.KafkaProcess;
import com.ai.bss.monitorManage.service.interfaces.ListeningFileDirectoryService;
import com.ai.bss.monitorManage.utils.FileUtils;
import com.mzlion.core.lang.StringUtils;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@Service
public class ListeningFileDirectoryServiceImpl  implements ListeningFileDirectoryService {
    @Value("${camera.filePath}")
    private String baseFilePath;
    @Autowired
    private FileManageService fileManageService;
    //@Autowired
    //private FileManageService fileManageService;
    @Autowired
    private KafkaProcess kafkaProcess;
    
    private static Map<String,Timer> timerMap=new HashMap<String,Timer>();
    
    private String taskName="pictureTask";
    @Override
    public void getFile(String filePath)  {
//        if(){
        System.out.println("filePath:   " + filePath);
        //System.out.println("filePath:   " + filePath);
    	log.info("filePath:   " + filePath);
//        final Timer timer = new Timer();
        new Timer().schedule(new TimerTask() {
    	
    	timerMap.put(taskName,new Timer());
    	
    	timerMap.get(taskName).schedule(new TimerTask() {
            @Override
            public void run() {
                WatchKey key;
                System.out.println("filePath:   " + filePath);
                //System.out.println("filePath:   " + filePath);
                log.info("filePath:   " + filePath);
                String mapKey = "";
                try {
                    if(!StringUtils.isEmpty(filePath )){
@@ -53,14 +73,17 @@ public class ListeningFileDirectoryServiceImpl  implements ListeningFileDirector
                        List fileList = new ArrayList();
                        while (true) {
                            File file = new File(filePath);//path为监听文件夹
                            System.out.println("等待图片加载！");
                            //System.out.println("等待图片加载！");
                            log.info("等待图片加载！");
                            key = watchService.take();//没有文件增加时，阻塞在这里
                            int i = 0;
                            String[] fileContent = new String[3600];
                            for (WatchEvent<?> event : key.pollEvents()) {
                                String fileName = filePath+MonitorManageConsts.getSystemSeparator()+event.context();
                                System.out.println("增加文件的文件夹路径== :"+fileName);
                                System.out.println("增加文件的名称== :"+event.context());
                                //System.out.println("增加文件的文件夹路径== :"+fileName);
                                //System.out.println("增加文件的名称== :"+event.context());
                                log.info("增加文件的文件夹路径== :"+fileName);
                                log.info("增加文件的名称== :"+event.context());
//                                mapKey = filePath.replace(baseFilePath+ MonitorManageConsts.getSystemSeparator(),"");
                                mapKey = filePath.replace(baseFilePath+ MonitorManageConsts.getSystemSeparator(),"");
                                mapKey = mapKey.replace(MonitorManageConsts.getSystemSeparator(),"~!@");
@@ -89,7 +112,6 @@ public class ListeningFileDirectoryServiceImpl  implements ListeningFileDirector
                                }
//                                Path filePath = (Path) event.context();
////                                //输出新增文件名
//
@@ -105,14 +127,14 @@ public class ListeningFileDirectoryServiceImpl  implements ListeningFileDirector
                        }
                    }
                }catch (Exception e) {
                    // TODO Auto-generated catch block
                    e.printStackTrace();
                	log.error("getFile is error :"+e.getMessage());    
                    //e.printStackTrace();
                }
            }
        }, 2000 , 3000);//第一个数字2000表示，2000ms以后开启定时器,第二个数字3000，表示3000ms后运行一次run
        //}, 2000 , 3000);//第一个数字2000表示，2000ms以后开启定时器,第二个数字3000，表示3000ms后运行一次run
        }, 500 , 500); //1秒钟扫描一次
    }
    /*
    创建FileItem
     */
@@ -130,8 +152,23 @@ public class ListeningFileDirectoryServiceImpl  implements ListeningFileDirector
            os.close();
            fis.close();
        } catch (IOException e) {
            e.printStackTrace();
        	log.error("createFileItem is error :"+e.getMessage());       
        }
        return item;
    }
    
    /**
     * 移除定时器
     * @param taskName
     */
    @Override
    public void removeTimer(){
        try{
        	timerMap.get(taskName).cancel();
        	timerMap.remove(taskName);           
        }catch(Exception e){
           log.error("removeTimer is error :"+e.getMessage());       
        }
    }
}

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

@@ -1,59 +1,34 @@
package com.ai.bss.monitorManage.service.impl;
import cn.hutool.json.JSONUtil;
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;
import com.ai.bss.monitorManage.service.interfaces.ListeningFileDirectoryService;
import com.ai.bss.monitorManage.service.interfaces.MonitorManageService;
import com.ai.bss.monitorManage.utils.DateUtils;
import com.ai.bss.monitorManage.utils.FileUtils;
import com.ai.bss.monitorManage.utils.SecurityProtectionMinioConfig;
import com.alibaba.druid.sql.visitor.functions.Lcase;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileItemFactory;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.logging.log4j.util.Strings;
import java.io.File;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.commons.CommonsMultipartFile;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.*;
import com.ai.bss.monitorManage.service.interfaces.ListeningFileDirectoryService;
import com.ai.bss.monitorManage.service.interfaces.MonitorManageService;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@Service
public class MonitorManageServiceImpl implements MonitorManageService {
	private final static String SPLIT_CHAR = "_";
	
	//private final static String SPLIT_CHAR = "_";
//	private static String bucketName =  "";
	@Autowired
	private FileManageService fileManageService;
	//@Autowired
	//private FileManageService fileManageService;
	@Autowired
	private ListeningFileDirectoryService listeningFileDirectoryService;
	@Autowired
	private KafkaProcess kafkaProcess;
	//@Autowired
	//private KafkaProcess kafkaProcess;
	@Autowired
	private EbcAiService ebcAiService;
	//@Autowired
	//private EbcAiService ebcAiService;
	@Value("${camera.filePath}")
	private String baseFilePath;
@@ -64,17 +39,23 @@ public class MonitorManageServiceImpl implements MonitorManageService {
	@Value("${kafka.topic.aivideo}")
	private String topicAiVideo;
	@Autowired
	private SecurityProtectionMinioConfig minioConfig;
	//@Autowired
	//private SecurityProtectionMinioConfig minioConfig;
	private static boolean isBeginFlag=false;
	@Override
	public void loadPictureFromDirectory() throws InterruptedException {
		//监听文件目录，加载文件
		loadFileList();
	public String loadPictureFromDirectory() throws InterruptedException {
		if (!isBeginFlag) {
			//监听文件目录，加载文件
			loadFileList();
			isBeginFlag=true;
			log.info("图片监听开启成功");
			return "开启成功";
		}
		
		log.info("图片监听无法重复开启");
		return "无法重复开启";
	}
	private void loadFileList(){
@@ -96,10 +77,22 @@ public class MonitorManageServiceImpl implements MonitorManageService {
					break;
				}
				File[] camerafiles = deviceFile.listFiles();
				System.out.println("deviceFilePath()   " + deviceFile.getPath());
				//System.out.println("deviceFilePath()   " + deviceFile.getPath());
				log.info("deviceFilePath()  " + deviceFile.getPath());
				listeningFileDirectoryService.getFile(deviceFile.getPath());
			}
		}
	}
	
	/**
	 * 关闭监听
	 */
	public String closeListeningPicture() {
		listeningFileDirectoryService.removeTimer();
		
		isBeginFlag=false;
		log.info("图片监听关闭成功");
		return "关闭成功";
	}
}

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/service/interfaces/ListeningFileDirectoryService.java

@@ -4,4 +4,6 @@ package com.ai.bss.monitorManage.service.interfaces;
public interface ListeningFileDirectoryService {
    void getFile(String filePath) ;
    
    void removeTimer();
}

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/service/interfaces/MonitorManageService.java

@@ -2,5 +2,16 @@ package com.ai.bss.monitorManage.service.interfaces;
public interface MonitorManageService {
    void loadPictureFromDirectory() throws InterruptedException;
	/**
	 * 开启监听
	 * @return
	 * @throws InterruptedException
	 */
    String loadPictureFromDirectory() throws InterruptedException;
    
    /**
     * 关闭监听
     * @return
     */
    String closeListeningPicture();
}

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

@@ -52,7 +52,8 @@ public class UploadFileServiceImpl implements UploadFileService {
			minioService.putObject(bucketName, meFile, minioFileName);
		} catch (Exception e) {
			log.error("文件上传异常");
			e.printStackTrace();
			//e.printStackTrace();
			return "";
		}
		log.info("文件上传结束，minioFileName: " + minioFileName);
@@ -84,7 +85,8 @@ public class UploadFileServiceImpl implements UploadFileService {
			fileUrl = minioService.getObjectUrl(bucketName, minioFileName);
		} catch (Exception e) {
			log.error("获取到文件的url路径异常，minioFileName: " + minioFileName);
			e.printStackTrace();
			//e.printStackTrace();
			return "";
		}
		if (StringUtils.isEmpty(fileUrl)) {
@@ -238,7 +240,8 @@ public class UploadFileServiceImpl implements UploadFileService {
			result = minioService.removeObject(bucketName, minioFileName);
		} catch (Exception e) {
			log.error("删除上传异常");
			e.printStackTrace();
			//e.printStackTrace();
			return false;
		}
		log.info("删除文件，minioFileName: " + minioFileName);

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

@@ -278,7 +278,8 @@ public class WorkOrderManagementServiceImpl implements WorkOrderManagementServic
				|| CollectionUtils.isEmpty(resultResponse.getData().getData().get(0))
				|| resultResponse.getData().getData().get(0).get("id") == null) {
			log.error("员工不存在");
			new BaseException("员工不存在");
			//new BaseException("员工不存在");
			return CommonResponse.fail("504","员工不存在");
		}
		String employOrgId = String.valueOf(resultResponse.getData().getData().get(0).get("id"));
		log.info("输出参数：{}", JSON.toJSONString(resultResponse, SerializerFeature.PrettyFormat));