删除无效的引用

ebc-mock-service/src/main/java/com/ai/bss/mock/controller/MockController.java

@@ -1,8 +1,8 @@
package com.ai.bss.mock.controller;
import com.ai.bss.mock.constants.MockConstant;
import com.ai.bss.mock.service.interfaces.MockManageService;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.Map;
import com.ai.bss.mock.service.interfaces.MockManageService;
/**
 * mock
@@ -21,9 +21,9 @@ import java.util.Map;
public class MockController {
    @Autowired
    MockManageService mockManageService;
    private MockManageService mockManageService;
    Logger logger = LoggerFactory.getLogger(MockController.class);
    private Logger logger = LoggerFactory.getLogger(MockController.class);
    /**
     * 查询mock执行状态

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

@@ -29,7 +29,6 @@ import java.util.concurrent.TimeUnit;
 **/
@Slf4j
class TcpLongConnectClient {
//	private static final ILogger LOGGER = IpuLoggerFactory.createLogger(TcpLongConnectClient.class);
	// private static final int PERIOD = 1;
	static final long PER_SLEEP_TIME = 2000L;
	// private static final int SEND_TIMES = 6;

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

@@ -16,7 +16,6 @@ import lombok.extern.slf4j.Slf4j;
 **/
@Slf4j
class TcpLongConnectClientHandler extends ChannelInboundHandlerAdapter {
//    private static final ILogger LOGGER = IpuLoggerFactory.createLogger(TcpLongConnectClientHandler.class);
    private static final long SLEEP_TIME = 10 * 1000L;
    private final TcpLongConnectClient tcpLongConnectClient;

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

@@ -15,7 +15,6 @@ import java.util.Map;
 **/
@SuppressWarnings("unused")
public class MessageGenerationManager {
//    private static final ILogger LOGGER = IpuLoggerFactory.createLogger(MessageGenerationManager.class);
    private static final String SPLIT_DASH = MockConstant.SPLIT_DASH;
    private static final Map<String, IMessageGeneration> INSTANCES = new HashMap<>();
    private static IMessageGeneration defaultMessageGeneration;

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

@@ -1,15 +1,14 @@
package com.ai.bss.location_rescuers.server;
import com.ai.ipu.server.connect.ConnectServerStart;
import com.ai.ipu.server.connect.util.ConnectServerManager;
import com.ai.ipu.server.stomp.WebSocketStompServer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.ai.ipu.basic.reflect.ReflectUtil;
import com.ai.ipu.basic.util.IpuBaseException;
import com.ai.ipu.restful.boot.IpuRestApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;
import com.ai.ipu.server.connect.ConnectServerStart;
import com.ai.ipu.server.connect.util.ConnectServerManager;
import com.ai.ipu.server.stomp.WebSocketStompServer;
/**
@@ -21,8 +20,8 @@ import org.springframework.context.annotation.ComponentScan;
public class EbcSeaPlatformStart {
	
	private final static String EXCEPTION_MESSAGES_CONFIG = "exception_messages";
	private static final Logger logger = LoggerFactory.getLogger(EbcSeaPlatformStart.class);
	private static final String EXCEPTION_MESSAGES_CONFIG = "exception_messages";
	private static Logger logger = LoggerFactory.getLogger(EbcSeaPlatformStart.class);
	public static void main(String[] args) {
		/*注册异常信息编码配置*/

ebc-sea-platform/src/main/java/com/ai/bss/location_rescuers/server/config/MyCorsFilter.java

@@ -2,7 +2,6 @@ package com.ai.bss.location_rescuers.server.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Component;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;

ebc-sea-platform/src/main/java/com/ai/bss/location_rescuers/server/controller/AreaInOutRecordManageController.java

@@ -1,8 +1,7 @@
package com.ai.bss.location_rescuers.server.controller;
import com.ai.bss.location_rescuers.server.service.interfaces.AreaInOutRecordService;
import com.ai.bss.location_rescuers.server.util.EbcConstant;
import com.github.pagehelper.PageInfo;
import java.util.Date;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -10,9 +9,10 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ai.bss.location_rescuers.server.service.interfaces.AreaInOutRecordService;
import com.ai.bss.location_rescuers.server.util.EbcConstant;
import com.ai.ipu.data.JMap;
import java.util.Date;
import com.github.pagehelper.PageInfo;
/**
 * 考勤管理
@@ -20,10 +20,10 @@ import java.util.Date;
@Controller
@RequestMapping("/areaInOutRecord")
public class AreaInOutRecordManageController {
	Logger logger = LoggerFactory.getLogger(AreaInOutRecordManageController.class);
	 private Logger logger = LoggerFactory.getLogger(AreaInOutRecordManageController.class);
	@Autowired
	AreaInOutRecordService areaInOutRecordService;
	private AreaInOutRecordService areaInOutRecordService;
	/**
	 * 分页查询考勤统计分析

ebc-sea-platform/src/main/java/com/ai/bss/location_rescuers/server/controller/DeviceManageController.java

@@ -3,8 +3,6 @@ package com.ai.bss.location_rescuers.server.controller;
import java.util.List;
import java.util.Map;
import com.ai.bss.location_rescuers.server.service.interfaces.DeviceManageService;
import com.ai.bss.location_rescuers.server.util.EbcConstant;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,9 +10,11 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ai.bss.location_rescuers.server.service.interfaces.DeviceManageService;
import com.ai.bss.location_rescuers.server.util.EbcConstant;
import com.ai.bss.location_rescuers.server.util.NorthboundInterfaceConstant;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.ai.bss.location_rescuers.server.util.NorthboundInterfaceConstant;
/**
 * 终端管理
@@ -22,10 +22,10 @@ import com.ai.bss.location_rescuers.server.util.NorthboundInterfaceConstant;
@Controller
@RequestMapping("/device")
public class DeviceManageController {
	Logger logger = LoggerFactory.getLogger(DeviceManageController.class);
	private Logger logger = LoggerFactory.getLogger(DeviceManageController.class);
	@Autowired
	DeviceManageService deviceManageService;
	private DeviceManageService deviceManageService;
	/**
	 * 分页查询终端信息

ebc-sea-platform/src/main/java/com/ai/bss/location_rescuers/server/controller/EquipmentManageController.java

@@ -10,10 +10,9 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ai.bss.location_rescuers.server.service.interfaces.EquipmentManageService;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.ai.bss.location_rescuers.server.service.interfaces.EquipmentManageService;
import com.ai.bss.location_rescuers.server.service.interfaces.ExportService;
import com.github.pagehelper.PageInfo;
/**
@@ -22,13 +21,10 @@ import com.github.pagehelper.PageInfo;
@Controller
@RequestMapping("/equipment")
public class EquipmentManageController {
	Logger logger = LoggerFactory.getLogger(EquipmentManageController.class);
	@Autowired
	ExportService exportService;
	private Logger logger = LoggerFactory.getLogger(EquipmentManageController.class);
	@Autowired
	EquipmentManageService equipmentManageService;
	private EquipmentManageService equipmentManageService;
	/**
	 * 分页查询设备信息

ebc-sea-platform/src/main/java/com/ai/bss/location_rescuers/server/controller/ExportToExcelController.java

@@ -1,15 +1,16 @@
package com.ai.bss.location_rescuers.server.controller;
import com.ai.ipu.data.JMap;
import com.ai.bss.location_rescuers.server.service.interfaces.ExportService;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.ai.bss.location_rescuers.server.service.interfaces.ExportService;
import com.ai.ipu.data.JMap;
/**
 * 导出信息到excel

ebc-sea-platform/src/main/java/com/ai/bss/location_rescuers/server/controller/GisParamController.java

@@ -2,12 +2,12 @@ package com.ai.bss.location_rescuers.server.controller;
import java.util.Map;
import com.ai.bss.location_rescuers.server.service.interfaces.GisParamService;
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.bss.location_rescuers.server.service.interfaces.GisParamService;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;

ebc-sea-platform/src/main/java/com/ai/bss/location_rescuers/server/controller/MapTagManageController.java

@@ -3,15 +3,13 @@ package com.ai.bss.location_rescuers.server.controller;
import java.util.List;
import java.util.Map;
import com.ai.bss.location_rescuers.server.service.interfaces.MapTagManageService;
import com.ai.bss.location_rescuers.server.util.EbcConstant;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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.bss.location_rescuers.server.service.interfaces.MapTagManageService;
import com.ai.bss.location_rescuers.server.util.EbcConstant;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
@@ -22,10 +20,8 @@ import com.ai.ipu.data.impl.JsonMap;
@RequestMapping("/mapTag")
public class MapTagManageController {
	Logger logger = LoggerFactory.getLogger(MapTagManageController.class);
	@Autowired
	MapTagManageService mapTagManageService;
	private MapTagManageService mapTagManageService;
	/**
	 * 分页查询围栏信息

ebc-sea-platform/src/main/java/com/ai/bss/location_rescuers/server/controller/ReceiveSubscribeController.java

@@ -2,8 +2,8 @@ package com.ai.bss.location_rescuers.server.controller;
import java.math.BigDecimal;
import com.ai.bss.location_rescuers.server.service.interfaces.ReceiveSubscribeService;
import com.ai.bss.location_rescuers.server.util.EbcConstant;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
@@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ai.ipu.basic.log.ILogger;
import com.ai.ipu.basic.log.IpuLoggerFactory;
import com.ai.bss.location_rescuers.server.service.interfaces.ReceiveSubscribeService;
import com.ai.bss.location_rescuers.server.util.EbcConstant;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.alibaba.fastjson.JSONObject;
@@ -25,10 +25,11 @@ import com.alibaba.fastjson.JSONObject;
@Controller
@RequestMapping("/receiveSubscribe")
public class ReceiveSubscribeController {
	private static final ILogger logger = IpuLoggerFactory.createLogger(ReceiveSubscribeController.class);
	private Logger logger = LoggerFactory.getLogger(ReceiveSubscribeController.class);
	
	@Autowired
	ReceiveSubscribeService receiveSubscribeService;
	private ReceiveSubscribeService receiveSubscribeService;
	/**
	 * 接收定位消息

ebc-sea-platform/src/main/java/com/ai/bss/location_rescuers/server/controller/RescueController.java

@@ -3,15 +3,15 @@ package com.ai.bss.location_rescuers.server.controller;
import java.util.List;
import java.util.Map;
import com.ai.bss.location_rescuers.server.service.interfaces.RescueService;
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.bss.location_rescuers.server.service.interfaces.RescueService;
import com.ai.bss.location_rescuers.server.util.EbcConstant;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.ai.bss.location_rescuers.server.util.EbcConstant;
/**
 * 报警救援

ebc-sea-platform/src/main/java/com/ai/bss/location_rescuers/server/controller/TrackAnalysisController.java

@@ -1,29 +1,26 @@
package com.ai.bss.location_rescuers.server.controller;
import com.ai.bss.location_rescuers.server.util.EbcConstant;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.ai.bss.location_rescuers.server.service.interfaces.TrackAnalysisService;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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.bss.location_rescuers.server.service.interfaces.TrackAnalysisService;
import com.ai.bss.location_rescuers.server.util.EbcConstant;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.github.pagehelper.PageInfo;
/**
 * 轨迹分析
 */
@Controller
@RequestMapping("/trackAnalysis")
public class TrackAnalysisController {
    
    @Autowired
    TrackAnalysisService trackAnalysisService;
    private TrackAnalysisService trackAnalysisService;
    Logger logger = LoggerFactory.getLogger(TrackAnalysisController.class);
    /**
     * 查询轨迹分析信息
     */

ebc-sea-platform/src/main/java/com/ai/bss/location_rescuers/server/controller/TrackController.java

@@ -1,17 +1,16 @@
package com.ai.bss.location_rescuers.server.controller;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.ai.bss.location_rescuers.server.service.interfaces.TrackService;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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.bss.location_rescuers.server.service.interfaces.TrackService;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.github.pagehelper.PageInfo;
/**
 * 历史轨迹
 */
@@ -20,9 +19,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
public class TrackController {
    @Autowired
    TrackService trackService;
    private TrackService trackService;
    Logger logger = LoggerFactory.getLogger(TrackController.class);
    /**
     * 查询历史轨迹查询
     */

ebc-sea-platform/src/main/java/com/ai/bss/location_rescuers/server/controller/UserManageController.java

@@ -1,10 +1,5 @@
package com.ai.bss.location_rescuers.server.controller;
import com.ai.bss.location_rescuers.server.service.interfaces.ExportService;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.ai.bss.location_rescuers.server.service.interfaces.UserManageService;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,6 +7,12 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ai.bss.location_rescuers.server.service.interfaces.ExportService;
import com.ai.bss.location_rescuers.server.service.interfaces.UserManageService;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.github.pagehelper.PageInfo;
/**
 * 用户信息
@@ -19,15 +20,14 @@ import org.springframework.web.bind.annotation.ResponseBody;
@Controller
@RequestMapping("/user")
public class UserManageController {
	private Logger logger = LoggerFactory.getLogger(UserManageController.class);
    @Autowired
    ExportService exportService;
    private ExportService exportService;
    @Autowired
    UserManageService userManageService;
    private UserManageService userManageService;
    Logger logger = LoggerFactory.getLogger(UserManageController.class);
    /**
     * 查询用户信息
     */

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

@@ -9,6 +9,9 @@ import java.util.Map;
import com.ai.bss.location_rescuers.server.enums.ProductEnums;
import com.ai.bss.location_rescuers.server.util.EbcConstant;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -27,7 +30,7 @@ import com.alibaba.fastjson.JSONObject;
@Component
public class DeviceManageDaoImpl extends AbstractBizDao implements DeviceManageDao {
	private static final ILogger logger = IpuLoggerFactory.createLogger(DeviceManageDaoImpl.class);
	private Logger logger = LoggerFactory.getLogger(DeviceManageDaoImpl.class);
	
	private String connName = "ebc";
	

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

@@ -21,7 +21,7 @@ import com.github.pagehelper.PageInfo;
@Component
public class EquipmentManageDaoImpl extends AbstractBizDao implements EquipmentManageDao {
    public static String connName = "ebc";
    public static final String connName = "ebc";
    private String equipmentTableName = "LR_FACILITY"; //设施表
	public EquipmentManageDaoImpl() throws IOException {

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

@@ -1,21 +1,21 @@
package com.ai.bss.location_rescuers.server.service.impl;
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.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.EbcConstant;
import com.ai.bss.location_rescuers.server.util.DateUtil;
import com.github.pagehelper.PageInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ai.bss.location_rescuers.server.util.EbcConstant;
import com.ai.ipu.data.JMap;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
import com.github.pagehelper.PageInfo;
@Service
public class AreaInOutRecordServiceImpl implements AreaInOutRecordService {

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

@@ -6,35 +6,35 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.bss.location_rescuers.server.dao.interfaces.RescueDao;
import com.ai.bss.location_rescuers.server.enums.UserEnums;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ai.ipu.common.date.TimeUtil;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.ai.bss.location_rescuers.server.dao.interfaces.AreaInOutRecordDao;
import com.ai.bss.location_rescuers.server.dao.interfaces.DeviceManageDao;
import com.ai.bss.location_rescuers.server.dao.interfaces.RescueDao;
import com.ai.bss.location_rescuers.server.enums.UserEnums;
import com.ai.bss.location_rescuers.server.service.interfaces.DeviceManageService;
import com.ai.bss.location_rescuers.server.util.DateUtil;
import com.ai.bss.location_rescuers.server.util.EbcConstant;
import com.ai.ipu.common.date.TimeUtil;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.alibaba.fastjson.JSON;
@Service
public class DeviceManageServiceImpl implements DeviceManageService {
	Logger logger = LoggerFactory.getLogger(DeviceManageServiceImpl.class);
	private Logger logger = LoggerFactory.getLogger(DeviceManageServiceImpl.class);
	@Autowired
	DeviceManageDao deviceManageDao;
	private DeviceManageDao deviceManageDao;
	@Autowired
	RescueDao rescueDao;
	private RescueDao rescueDao;
	@Autowired
	AreaInOutRecordDao areaInOutRecordDao;
	private AreaInOutRecordDao areaInOutRecordDao;
	@Override
	public JMap queryPageDeviceInfo(JMap params, int pageNum, int pageSize) throws Exception {

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

@@ -4,26 +4,26 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import com.ai.bss.location_rescuers.server.dao.interfaces.EquipmentManageDao;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ai.ipu.data.JMap;
import com.ai.bss.location_rescuers.server.dao.interfaces.DeviceManageDao;
import com.ai.bss.location_rescuers.server.dao.interfaces.EquipmentManageDao;
import com.ai.bss.location_rescuers.server.service.interfaces.EquipmentManageService;
import com.ai.ipu.data.JMap;
import com.github.pagehelper.PageInfo;
@Service
public class EquipmentManageServiceImpl implements EquipmentManageService {
	Logger logger = LoggerFactory.getLogger(EquipmentManageServiceImpl.class);
	private Logger logger = LoggerFactory.getLogger(EquipmentManageServiceImpl.class);
	@Autowired
	EquipmentManageDao equipmentManageDao;
	private EquipmentManageDao equipmentManageDao;
	@Autowired
	DeviceManageDao deviceManageDao;
	private DeviceManageDao deviceManageDao;
	@Override
	public PageInfo queryEquipmentInfo(JMap params) throws Exception {

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

@@ -1,10 +1,11 @@
package com.ai.bss.location_rescuers.server.service.impl;
import com.ai.ipu.data.JMap;
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.github.pagehelper.PageInfo;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.xssf.streaming.SXSSFCell;
import org.apache.poi.xssf.streaming.SXSSFRow;
@@ -16,10 +17,11 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
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 {
@@ -29,7 +31,7 @@ public class ExportToExcelServiceImpl implements ExportService {
    /**
     * slf4j 日志 logger
     */
    Logger logger = LoggerFactory.getLogger(ExportToExcelServiceImpl.class);
	private Logger logger = LoggerFactory.getLogger(ExportToExcelServiceImpl.class);
    /**

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

@@ -4,18 +4,18 @@ import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.Map;
import com.ai.bss.location_rescuers.server.util.HttpServiceUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import com.ai.bss.location_rescuers.server.service.interfaces.GisParamService;
import com.ai.bss.location_rescuers.server.util.HttpServiceUtil;
import com.alibaba.fastjson.JSON;
@Service
public class GisParamServiceImpl implements GisParamService {
	Logger logger = LoggerFactory.getLogger(GisParamServiceImpl.class);
	private Logger logger = LoggerFactory.getLogger(GisParamServiceImpl.class);
	@Value("${aap.gis.userName}")
	private String gisUserName;

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

@@ -6,9 +6,9 @@ import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ai.ipu.data.JMap;
import com.ai.bss.location_rescuers.server.dao.interfaces.MapTagManageDao;
import com.ai.bss.location_rescuers.server.service.interfaces.MapTagManageService;
import com.ai.ipu.data.JMap;
@Service
public class MapTagManageServiceImpl implements MapTagManageService {

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

@@ -5,46 +5,46 @@ import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import com.ai.bss.location_rescuers.server.service.interfaces.ReceiveSubscribeService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ai.ipu.basic.log.ILogger;
import com.ai.ipu.basic.log.IpuLoggerFactory;
import com.ai.ipu.data.JMap;
import com.ai.ipu.database.conn.SqlSessionManager;
import com.ai.bss.location_rescuers.server.dao.interfaces.DeviceManageDao;
import com.ai.bss.location_rescuers.server.dao.interfaces.MapTagManageDao;
import com.ai.bss.location_rescuers.server.service.interfaces.ReceiveSubscribeService;
import com.ai.bss.location_rescuers.server.service.iotdata.ManageIotInAreaData;
import com.ai.bss.location_rescuers.server.service.iotdata.ManageIotNewAlarmData;
import com.ai.bss.location_rescuers.server.service.iotdata.ManageIotNoCloseAlarmData;
import com.ai.bss.location_rescuers.server.service.iotdata.ManageIotNoInAreaData;
import com.ai.bss.location_rescuers.server.service.iotdata.ManageIotToolData;
import com.ai.ipu.data.JMap;
import com.ai.ipu.database.conn.SqlSessionManager;
@Service
public class ReceiveSubscribeServiceImpl implements ReceiveSubscribeService {
	private static final ILogger logger = IpuLoggerFactory.createLogger(ReceiveSubscribeServiceImpl.class);
	private Logger logger = LoggerFactory.getLogger(ReceiveSubscribeServiceImpl.class);
	@Autowired
	ManageIotToolData manageIotToolData;
	private ManageIotToolData manageIotToolData;
	@Autowired
	ManageIotNoInAreaData manageIotNoInAreaData;
	private ManageIotNoInAreaData manageIotNoInAreaData;
	@Autowired
	ManageIotInAreaData manageIotInAreaData;
	private ManageIotInAreaData manageIotInAreaData;
	@Autowired
	ManageIotNoCloseAlarmData manageIotNoCloseAlarmData;
	private ManageIotNoCloseAlarmData manageIotNoCloseAlarmData;
	@Autowired
	ManageIotNewAlarmData manageIotNewAlarmData;
	private ManageIotNewAlarmData manageIotNewAlarmData;
	@Autowired
	MapTagManageDao mapTagManageDao;
	private MapTagManageDao mapTagManageDao;
	@Autowired
	DeviceManageDao deviceManageDao;
	private DeviceManageDao deviceManageDao;
	private ExecutorService cachedThreadPool = Executors.newCachedThreadPool();

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

@@ -5,24 +5,24 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.bss.location_rescuers.server.dao.interfaces.RescueDao;
import com.ai.bss.location_rescuers.server.service.interfaces.RescueService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ai.ipu.data.JMap;
import com.ai.bss.location_rescuers.server.dao.interfaces.DeviceManageDao;
import com.ai.bss.location_rescuers.server.dao.interfaces.RescueDao;
import com.ai.bss.location_rescuers.server.service.interfaces.RescueService;
import com.ai.bss.location_rescuers.server.util.DateUtil;
import com.ai.bss.location_rescuers.server.util.EbcConstant;
import com.ai.ipu.data.JMap;
@Service
public class RescueServiceImpl implements RescueService {
	Logger logger = LoggerFactory.getLogger(RescueServiceImpl.class);
	private Logger logger = LoggerFactory.getLogger(RescueServiceImpl.class);
	@Autowired
	RescueDao rescueDao;
	private RescueDao rescueDao;
	@Autowired
	DeviceManageDao deviceManageDao;

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

@@ -1,28 +1,29 @@
package com.ai.bss.location_rescuers.server.service.impl;
import com.ai.bss.location_rescuers.server.enums.UserEnums;
import com.ai.ipu.data.JMap;
import com.ai.bss.location_rescuers.server.dao.interfaces.TrackAnalysisDao;
import com.ai.bss.location_rescuers.server.service.interfaces.TrackAnalysisService;
import com.ai.bss.location_rescuers.server.util.DateUtil;
import com.github.pagehelper.PageInfo;
import java.text.SimpleDateFormat;
import java.util.Date;
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 java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
import com.ai.bss.location_rescuers.server.dao.interfaces.TrackAnalysisDao;
import com.ai.bss.location_rescuers.server.enums.UserEnums;
import com.ai.bss.location_rescuers.server.service.interfaces.TrackAnalysisService;
import com.ai.bss.location_rescuers.server.util.DateUtil;
import com.ai.ipu.data.JMap;
import com.github.pagehelper.PageInfo;
@Service
public class TrackAnalysisServiceImpl implements TrackAnalysisService {
    Logger logger = LoggerFactory.getLogger(TrackAnalysisServiceImpl.class);
	private Logger logger = LoggerFactory.getLogger(TrackAnalysisServiceImpl.class);
    @Autowired
    TrackAnalysisDao trackAnalysisDao;
    private TrackAnalysisDao trackAnalysisDao;
    @Override
    public PageInfo queryTrackAnalysisInfo(JMap params,int pageNum,int pageSize) throws Exception {

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

@@ -1,21 +1,22 @@
package com.ai.bss.location_rescuers.server.service.impl;
import com.ai.ipu.data.JMap;
import com.ai.bss.location_rescuers.server.dao.interfaces.TrackDao;
import com.ai.bss.location_rescuers.server.service.interfaces.TrackService;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ai.bss.location_rescuers.server.dao.interfaces.TrackDao;
import com.ai.bss.location_rescuers.server.service.interfaces.TrackService;
import com.ai.ipu.data.JMap;
import com.github.pagehelper.PageInfo;
@Service
public class TrackServiceImpl implements TrackService {
    Logger logger = LoggerFactory.getLogger(TrackServiceImpl.class);
	private Logger logger = LoggerFactory.getLogger(TrackServiceImpl.class);
    @Autowired
    TrackDao trackDao;
    private TrackDao trackDao;
    @Override
    public PageInfo queryTrackInfo(JMap params) throws Exception {

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

@@ -1,20 +1,21 @@
package com.ai.bss.location_rescuers.server.service.impl;
import com.ai.ipu.data.JMap;
import com.ai.bss.location_rescuers.server.dao.interfaces.UserManageDao;
import com.ai.bss.location_rescuers.server.service.interfaces.UserManageService;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ai.bss.location_rescuers.server.dao.interfaces.UserManageDao;
import com.ai.bss.location_rescuers.server.service.interfaces.UserManageService;
import com.ai.ipu.data.JMap;
import com.github.pagehelper.PageInfo;
@Service
public class UserManageServiceImpl implements UserManageService {
    Logger logger = LoggerFactory.getLogger(UserManageServiceImpl.class);
	private Logger logger = LoggerFactory.getLogger(UserManageServiceImpl.class);
    @Autowired
    UserManageDao userManageDao;
    private UserManageDao userManageDao;
    @Override
    public PageInfo queryUserInfo(JMap params) throws Exception {

ebc-sea-platform/src/main/java/com/ai/bss/location_rescuers/server/service/iotdata/ManageIotInAreaData.java

@@ -8,23 +8,23 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import com.ai.bss.location_rescuers.server.dao.interfaces.AreaInOutRecordDao;
import com.ai.bss.location_rescuers.server.util.EbcConstant;
import com.ai.bss.location_rescuers.server.util.MirrorSendDateUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.ai.ipu.basic.log.ILogger;
import com.ai.ipu.basic.log.IpuLoggerFactory;
import com.ai.ipu.data.JMap;
import com.ai.bss.location_rescuers.server.dao.interfaces.AreaInOutRecordDao;
import com.ai.bss.location_rescuers.server.util.DateUtil;
import com.ai.bss.location_rescuers.server.util.EbcConstant;
import com.ai.bss.location_rescuers.server.util.MirrorSendDateUtil;
import com.ai.ipu.data.JMap;
@Component
public class ManageIotInAreaData {
	private static final ILogger logger = IpuLoggerFactory.createLogger(ManageIotInAreaData.class);
	private Logger logger = LoggerFactory.getLogger(ManageIotInAreaData.class);
	@Autowired
	AreaInOutRecordDao areaInOutRecordDao;
	private AreaInOutRecordDao areaInOutRecordDao;
	public boolean executeReceiveIotData(JMap params, List<Map<String, Object>> currentAreaInfoList) throws Exception {
		// 查询人员之前所在围栏信息

ebc-sea-platform/src/main/java/com/ai/bss/location_rescuers/server/service/iotdata/ManageIotNewAlarmData.java

@@ -4,26 +4,26 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.bss.location_rescuers.server.dao.interfaces.MapTagManageDao;
import com.ai.bss.location_rescuers.server.dao.interfaces.RescueDao;
import com.ai.bss.location_rescuers.server.util.EbcConstant;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.ai.ipu.basic.log.ILogger;
import com.ai.ipu.basic.log.IpuLoggerFactory;
import com.ai.ipu.data.JMap;
import com.ai.bss.location_rescuers.server.dao.interfaces.MapTagManageDao;
import com.ai.bss.location_rescuers.server.dao.interfaces.RescueDao;
import com.ai.bss.location_rescuers.server.util.EbcConstant;
import com.ai.bss.location_rescuers.server.util.MirrorSendDateUtil;
import com.ai.ipu.data.JMap;
@Component
public class ManageIotNewAlarmData {
	private static final ILogger logger = IpuLoggerFactory.createLogger(ManageIotNewAlarmData.class);
	private Logger logger = LoggerFactory.getLogger(ManageIotNewAlarmData.class);
	@Autowired
	RescueDao rescueDao;
	private RescueDao rescueDao;
	@Autowired
	MapTagManageDao mapTagManageDao;
	private MapTagManageDao mapTagManageDao;
	public boolean executeReceiveIotData(JMap params, Map<String, Object> bindInfoMap) throws Exception {
		logger.debug("新增报警信息");

ebc-sea-platform/src/main/java/com/ai/bss/location_rescuers/server/service/iotdata/ManageIotNoCloseAlarmData.java

@@ -5,20 +5,20 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.bss.location_rescuers.server.dao.interfaces.RescueDao;
import com.ai.bss.location_rescuers.server.util.EbcConstant;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.ai.ipu.basic.log.ILogger;
import com.ai.ipu.basic.log.IpuLoggerFactory;
import com.ai.ipu.data.JMap;
import com.ai.bss.location_rescuers.server.dao.interfaces.RescueDao;
import com.ai.bss.location_rescuers.server.util.DateUtil;
import com.ai.bss.location_rescuers.server.util.EbcConstant;
import com.ai.bss.location_rescuers.server.util.MirrorSendDateUtil;
import com.ai.ipu.data.JMap;
@Component
public class ManageIotNoCloseAlarmData {
	private static final ILogger logger = IpuLoggerFactory.createLogger(ManageIotNoCloseAlarmData.class);
	private Logger logger = LoggerFactory.getLogger(ManageIotNoCloseAlarmData.class);
	@Autowired
	RescueDao rescueDao;

ebc-sea-platform/src/main/java/com/ai/bss/location_rescuers/server/service/iotdata/ManageIotNoInAreaData.java

@@ -4,22 +4,22 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import com.ai.bss.location_rescuers.server.dao.interfaces.AreaInOutRecordDao;
import com.ai.bss.location_rescuers.server.util.EbcConstant;
import com.ai.bss.location_rescuers.server.util.MirrorSendDateUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.ai.ipu.basic.log.ILogger;
import com.ai.ipu.basic.log.IpuLoggerFactory;
import com.ai.bss.location_rescuers.server.dao.interfaces.AreaInOutRecordDao;
import com.ai.bss.location_rescuers.server.util.EbcConstant;
import com.ai.bss.location_rescuers.server.util.MirrorSendDateUtil;
import com.ai.ipu.data.JMap;
@Component
public class ManageIotNoInAreaData {
	private static final ILogger logger = IpuLoggerFactory.createLogger(ManageIotNoInAreaData.class);
	private Logger logger = LoggerFactory.getLogger(ManageIotNoInAreaData.class);
	@Autowired
	AreaInOutRecordDao areaInOutRecordDao;
	private AreaInOutRecordDao areaInOutRecordDao;
	public boolean executeReceiveIotData(JMap params) throws Exception {
		// 推送镜屏数据

ebc-sea-platform/src/main/java/com/ai/bss/location_rescuers/server/service/iotdata/ManageIotToolData.java

@@ -2,21 +2,21 @@ package com.ai.bss.location_rescuers.server.service.iotdata;
import java.util.Map;
import com.ai.bss.location_rescuers.server.dao.interfaces.DeviceManageDao;
import com.ai.bss.location_rescuers.server.util.MirrorSendDateUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.ai.ipu.basic.log.ILogger;
import com.ai.ipu.basic.log.IpuLoggerFactory;
import com.ai.bss.location_rescuers.server.dao.interfaces.DeviceManageDao;
import com.ai.bss.location_rescuers.server.util.MirrorSendDateUtil;
import com.ai.ipu.data.JMap;
@Component
public class ManageIotToolData {
	private static final ILogger logger = IpuLoggerFactory.createLogger(ManageIotToolData.class);
	private Logger logger = LoggerFactory.getLogger(ManageIotToolData.class);
	@Autowired
	DeviceManageDao deviceManageDao;
	private DeviceManageDao deviceManageDao;
	public boolean executeReceiveIotData(JMap params) throws Exception {
		Map<String, Object> bindInfoMap = deviceManageDao.queryOneBindShip(params.getString("deviceId"), null);

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

@@ -1,6 +1,13 @@
package com.ai.bss.location_rescuers.server.util;
import com.ai.ipu.common.date.TimeUtil;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
import java.util.HashMap;
import java.util.Map;
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
import org.apache.poi.hssf.usermodel.HSSFFont;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -19,20 +26,14 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.util.StringUtils;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
import java.util.HashMap;
import java.util.Map;
import com.ai.ipu.common.date.TimeUtil;
public class ExcelFormatUtil {
    /**
     * slf4j 日志 logger
     */
    public static Logger logger = LoggerFactory.getLogger(ExcelFormatUtil.class);
	 private static Logger logger = LoggerFactory.getLogger(ExcelFormatUtil.class);
    /**
     * 设置报表头样式
     * @param workbook

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

@@ -43,7 +43,7 @@ import lombok.extern.slf4j.Slf4j;
 */
@Slf4j
public class HttpServiceUtil {
	static Logger log = LoggerFactory.getLogger(HttpServiceUtil.class);
	private static Logger log = LoggerFactory.getLogger(HttpServiceUtil.class);
	private static final String HTTP_CONTENT_TYPE_JSON = "application/json; charset=utf-8";

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

@@ -1,13 +1,13 @@
package com.ai.bss.location_rescuers.server.util;
import com.ai.ipu.basic.log.ILogger;
import com.ai.ipu.basic.log.IpuLoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.ai.ipu.data.JMap;
import com.ai.ipu.server.connect.ps.EventChannelTool;
import com.ai.ipu.server.connect.ps.EventChannelTool.PublisherEvent;
import com.ai.ipu.server.connect.ps.ISubscriber;
import com.ai.ipu.server.connect.ps.impl.Publisher;
import com.ai.bss.location_rescuers.server.service.iotdata.ManageIotNoInAreaData;
import com.alibaba.fastjson.JSON;
/**
@@ -16,7 +16,7 @@ import com.alibaba.fastjson.JSON;
 * 2020-10-21
 */
public class MirrorSendDateUtil {
	private static final ILogger logger = IpuLoggerFactory.createLogger(ManageIotNoInAreaData.class);
	private static Logger logger = LoggerFactory.getLogger(MirrorSendDateUtil.class);
	// 人员定位topic
	public static final String topic_personnel = "personnel";

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

@@ -7,11 +7,11 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import com.ai.ipu.basic.log.ILogger;
import com.ai.ipu.basic.log.IpuLoggerFactory;
import com.alibaba.fastjson.JSON;
/**
@@ -21,7 +21,7 @@ import com.alibaba.fastjson.JSON;
@Component
public class NorthboundInterfaceUtil {
	private static final ILogger logger = IpuLoggerFactory.createLogger(NorthboundInterfaceUtil.class);
	private Logger logger = LoggerFactory.getLogger(NorthboundInterfaceUtil.class);
	@Value("${aap.iot.userCode}")
	private String userCode;

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

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
@Component
public class SpringUtil implements ApplicationContextAware {
	private static final Logger logger = LoggerFactory.getLogger(SpringUtil.class);
	private Logger logger = LoggerFactory.getLogger(SpringUtil.class);
	private static ApplicationContext applicationContext;
	private static void setApplicationcontext(ApplicationContext applicationContext) {

ebc-sea-platform/src/main/java/com/ai/bss/security_protection/server/controller/AreaInOutRecordController.java

@@ -1,8 +1,7 @@
package com.ai.bss.security_protection.server.controller;
import com.ai.bss.security_protection.server.service.interfaces.AreaInRecordService;
import com.ai.ipu.data.JMap;
import com.github.pagehelper.PageInfo;
import java.util.Date;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +9,9 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.Date;
import com.ai.bss.security_protection.server.service.interfaces.AreaInRecordService;
import com.ai.ipu.data.JMap;
import com.github.pagehelper.PageInfo;
/**
 * 考勤管理
@@ -18,10 +19,10 @@ import java.util.Date;
@Controller
@RequestMapping("/areaInOutRecordManage")
public class AreaInOutRecordController {
	Logger logger = LoggerFactory.getLogger(AreaInOutRecordController.class);
	private Logger logger = LoggerFactory.getLogger(AreaInOutRecordController.class);
	@Autowired
	AreaInRecordService areaInRecordService;
	private AreaInRecordService areaInRecordService;
	/**
	 * 分页查询考勤统计分析

ebc-sea-platform/src/main/java/com/ai/bss/security_protection/server/controller/abnormalAttendanceController.java

@@ -1,8 +1,7 @@
package com.ai.bss.security_protection.server.controller;
import com.ai.bss.security_protection.server.service.interfaces.AreaInRecordService;
import com.ai.ipu.data.JMap;
import com.github.pagehelper.PageInfo;
import java.util.Date;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +9,9 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.Date;
import com.ai.bss.security_protection.server.service.interfaces.AreaInRecordService;
import com.ai.ipu.data.JMap;
import com.github.pagehelper.PageInfo;
/**
 * 异常考勤
@@ -18,10 +19,10 @@ import java.util.Date;
@Controller
@RequestMapping("/areaInOutRecordManage")
public class abnormalAttendanceController {
	Logger logger = LoggerFactory.getLogger(abnormalAttendanceController.class);
	private Logger logger = LoggerFactory.getLogger(abnormalAttendanceController.class);
	@Autowired
	AreaInRecordService areaInRecordService;
	private AreaInRecordService areaInRecordService;
	/**
	 * 分页查询考勤统计分析

ebc-sea-platform/src/main/java/com/ai/bss/security_protection/server/controller/attendanceConfigurationController.java

@@ -1,8 +1,7 @@
package com.ai.bss.security_protection.server.controller;
import com.ai.bss.security_protection.server.service.interfaces.AreaInRecordService;
import com.ai.ipu.data.JMap;
import com.github.pagehelper.PageInfo;
import java.util.Date;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +9,9 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.Date;
import com.ai.bss.security_protection.server.service.interfaces.AreaInRecordService;
import com.ai.ipu.data.JMap;
import com.github.pagehelper.PageInfo;
/**
 * 异常考勤
@@ -18,10 +19,10 @@ import java.util.Date;
@Controller
@RequestMapping("/areaInOutRecordManage")
public class attendanceConfigurationController {
	Logger logger = LoggerFactory.getLogger(attendanceConfigurationController.class);
	private Logger logger = LoggerFactory.getLogger(attendanceConfigurationController.class);
	@Autowired
	AreaInRecordService areaInRecordService;
	private AreaInRecordService areaInRecordService;
	/**
	 * 分页查询考勤统计分析

ebc-sea-platform/src/main/java/com/ai/bss/security_protection/server/controller/attendanceReportController.java

@@ -1,8 +1,7 @@
package com.ai.bss.security_protection.server.controller;
import com.ai.bss.security_protection.server.service.interfaces.AreaInRecordService;
import com.ai.ipu.data.JMap;
import com.github.pagehelper.PageInfo;
import java.util.Date;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +9,9 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.Date;
import com.ai.bss.security_protection.server.service.interfaces.AreaInRecordService;
import com.ai.ipu.data.JMap;
import com.github.pagehelper.PageInfo;
/**
 * 考勤报表
@@ -18,10 +19,10 @@ import java.util.Date;
@Controller
@RequestMapping("/areaInOutRecordManage")
public class attendanceReportController {
	Logger logger = LoggerFactory.getLogger(attendanceReportController.class);
	private Logger logger = LoggerFactory.getLogger(attendanceReportController.class);
	@Autowired
	AreaInRecordService areaInRecordService;
	private AreaInRecordService areaInRecordService;
	/**
	 * 分页查询考勤统计分析

ebc-sea-platform/src/main/java/com/ai/bss/security_protection/server/controller/attendanceRulesController.java

@@ -1,8 +1,7 @@
package com.ai.bss.security_protection.server.controller;
import com.ai.bss.security_protection.server.service.interfaces.AreaInRecordService;
import com.ai.ipu.data.JMap;
import com.github.pagehelper.PageInfo;
import java.util.Date;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +9,9 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.Date;
import com.ai.bss.security_protection.server.service.interfaces.AreaInRecordService;
import com.ai.ipu.data.JMap;
import com.github.pagehelper.PageInfo;
/**
 * 异常考勤
@@ -18,10 +19,10 @@ import java.util.Date;
@Controller
@RequestMapping("/areaInOutRecordManage")
public class attendanceRulesController {
	Logger logger = LoggerFactory.getLogger(attendanceRulesController.class);
	private Logger logger = LoggerFactory.getLogger(attendanceRulesController.class);
	@Autowired
	AreaInRecordService areaInRecordService;
	private AreaInRecordService areaInRecordService;
	/**
	 * 分页查询考勤统计分析

ebc-sea-platform/src/main/java/com/ai/bss/security_protection/server/controller/vacationAttendanceManageController.java

@@ -1,8 +1,7 @@
package com.ai.bss.security_protection.server.controller;
import com.ai.bss.security_protection.server.service.interfaces.AreaInRecordService;
import com.ai.ipu.data.JMap;
import com.github.pagehelper.PageInfo;
import java.util.Date;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +9,9 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.Date;
import com.ai.bss.security_protection.server.service.interfaces.AreaInRecordService;
import com.ai.ipu.data.JMap;
import com.github.pagehelper.PageInfo;
/**
 * 假勤管理
@@ -18,10 +19,10 @@ import java.util.Date;
@Controller
@RequestMapping("/areaInOutRecordManage")
public class vacationAttendanceManageController {
	Logger logger = LoggerFactory.getLogger(vacationAttendanceManageController.class);
	private Logger logger = LoggerFactory.getLogger(vacationAttendanceManageController.class);
	@Autowired
	AreaInRecordService areaInRecordService;
	private AreaInRecordService areaInRecordService;
	/**
	 * 分页查询考勤统计分析

location-rescue-service/src/main/java/com/ai/bss/location/rescue/config/MyCorsFilter.java

@@ -56,7 +56,7 @@ public class MyCorsFilter {
        registrationBean.setUrlPatterns(Arrays.asList("/*"));
        Map<String, String> initParameters = new HashMap<String,String>();
        initParameters.put("impl-classname","com.ai.sso.external.DefaultPopedomImpl");
        initParameters.put("ALLOWPATH","gif;jpg;jpeg;png;login;checkLogin;genVerificationCode;logout;");
        initParameters.put("ALLOWPATH","gif;jpg;jpeg;png;login;checkLogin;genVerificationCode;logout;stomp;");
        registrationBean.setInitParameters(initParameters);
        return registrationBean;
    }

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

@@ -7,8 +7,6 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import com.ai.sso.util.LoginUserInfoUtil;
import com.alibaba.fastjson.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
@@ -23,7 +21,9 @@ import com.ai.bss.location.rescue.util.EbcConstant;
import com.ai.bss.position.model.EntityPosition;
import com.ai.bss.work.rescue.model.WorkTaskRescue;
import com.ai.bss.work.task.model.common.WorkTask;
import com.ai.sso.util.LoginUserInfoUtil;
import com.ailk.org.apache.commons.lang3.StringUtils;
import com.alibaba.fastjson.JSONObject;
/**
 * 报警救援管理

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

@@ -1,5 +1,17 @@
package com.ai.bss.location.rescue.controller;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
@@ -7,16 +19,6 @@ import com.ai.bss.location.rescue.service.interfaces.AttendanceManageService;
import com.ai.bss.location.rescue.util.EbcConstant;
import com.ai.sso.util.LoginUserInfoUtil;
import com.alibaba.fastjson.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * @Auther: 王超

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

@@ -4,6 +4,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
@@ -17,8 +19,6 @@ import com.ai.bss.location.rescue.service.interfaces.DeviceManageService;
import com.ai.bss.location.rescue.util.EbcConstant;
import com.ai.bss.location.rescue.util.NorthboundInterfaceConstant;
import javax.servlet.http.HttpServletRequest;
/**
 * 终端管理
 */

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

@@ -1,22 +1,11 @@
package com.ai.bss.location.rescue.controller;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import com.ai.bss.location.rescue.util.ImportExcelUtil;
import com.ai.sso.util.LoginUserInfoUtil;
import com.alibaba.fastjson.JSONObject;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,15 +14,18 @@ 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 org.springframework.web.multipart.MultipartFile;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.location.rescue.service.interfaces.EquipmentManageService;
import com.ai.bss.location.rescue.util.EbcConstant;
import com.ai.bss.location.rescue.util.ImportExcelUtil;
import com.ai.bss.work.tool.model.ResourceTool;
import com.ai.bss.work.tool.model.ResourceToolType;
import org.springframework.web.multipart.MultipartFile;
import com.ai.sso.util.LoginUserInfoUtil;
import com.alibaba.fastjson.JSONObject;
/**
 * 设备管理
@@ -41,7 +33,7 @@ import org.springframework.web.multipart.MultipartFile;
@Controller
@RequestMapping("/equipment")
public class EquipmentManageController {
    Logger logger = LoggerFactory.getLogger(EquipmentManageController.class);
    private Logger logger = LoggerFactory.getLogger(EquipmentManageController.class);
    @Autowired
    private EquipmentManageService equipmentManageService;

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

@@ -1,21 +1,19 @@
package com.ai.bss.location.rescue.controller;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.location.rescue.model.User;
import com.ai.bss.location.rescue.service.interfaces.LoginService;
import java.util.Map;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.bss.location.rescue.model.User;
import com.ai.bss.location.rescue.service.interfaces.LoginService;
/**
 * @Auther: 王超

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

@@ -34,7 +34,7 @@ import com.alibaba.fastjson.JSONObject;
@Service
public class AlarmManagementServiceImpl implements AlarmManagementService {
	Logger logger = LoggerFactory.getLogger(AlarmManagementServiceImpl.class);
    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

@@ -1,5 +1,13 @@
package com.ai.bss.location.rescue.service.impl;
import java.text.ParseException;
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.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
@@ -8,13 +16,6 @@ import com.ai.bss.location.rescue.service.interfaces.AttendanceManageService;
import com.ai.bss.location.rescue.service.interfaces.CharSpecService;
import com.ai.bss.location.rescue.util.EbcConstant;
import com.ai.bss.worker.service.api.AttendanceStatusQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.ParseException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * @Auther: 王超

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

@@ -6,14 +6,14 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import com.ai.bss.characteristic.spec.model.CharacteristicSpec;
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
import com.ai.bss.characteristic.spec.service.api.CharacteristicSpecService;
import com.ai.bss.characteristic.spec.service.api.CharacteristicSpecValueService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import com.ai.bss.characteristic.spec.model.CharacteristicSpec;
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
import com.ai.bss.characteristic.spec.service.api.CharacteristicSpecService;
import com.ai.bss.characteristic.spec.service.api.CharacteristicSpecValueService;
import com.ai.bss.location.rescue.service.interfaces.CharSpecService;
import com.ailk.org.apache.commons.lang3.StringUtils;

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

@@ -6,7 +6,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.sso.util.LoginUserInfoUtil;
import javax.servlet.http.HttpServletRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,14 +32,13 @@ import com.ai.bss.worker.model.EmployeeTerminalRela;
import com.ai.bss.worker.model.EmployeeTerminalRelaDto;
import com.ai.bss.worker.service.api.EmployeeTerminalRelaCommand;
import com.ai.bss.worker.service.api.EmployeeTerminalRelaQuery;
import com.ai.sso.util.LoginUserInfoUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import javax.servlet.http.HttpServletRequest;
@Service
public class DeviceManageServiceImpl implements DeviceManageService {
    Logger logger = LoggerFactory.getLogger(DeviceManageServiceImpl.class);
	private Logger logger = LoggerFactory.getLogger(DeviceManageServiceImpl.class);
    @Autowired
    private EmployeeTerminalRelaQuery employeeTerminalRelaQuery;

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

@@ -28,7 +28,7 @@ import com.ai.bss.work.tool.service.api.ResourceToolQuery;
@Service
public class EquipmentManageServiceImpl<EquipmentManageDao> implements EquipmentManageService {
	Logger logger = LoggerFactory.getLogger(EquipmentManageServiceImpl.class);
	private Logger logger = LoggerFactory.getLogger(EquipmentManageServiceImpl.class);
	@Autowired
	private ResourceToolCommand resourceToolCommand;

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

@@ -18,7 +18,7 @@ import com.alibaba.fastjson.JSON;
@Service
public class GisParamServiceImpl implements GisParamService {
	Logger logger = LoggerFactory.getLogger(GisParamServiceImpl.class);
	private Logger logger = LoggerFactory.getLogger(GisParamServiceImpl.class);
	@Value("${aap.gis.userName:EBC_PPRS}")
	private String gisUserName;

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

@@ -13,7 +13,6 @@ import org.springframework.util.CollectionUtils;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.components.common.util.ComponentReflectionUtils;
import com.ai.bss.location.rescue.model.EbcEntityPosition;
import com.ai.bss.location.rescue.model.EbcMapArea;
@@ -32,7 +31,7 @@ import com.alibaba.fastjson.JSONObject;
@Service
public class LocationManagementServiceImpl implements LocationManagementService {
	Logger logger = LoggerFactory.getLogger(LocationManagementServiceImpl.class);
	private Logger logger = LoggerFactory.getLogger(LocationManagementServiceImpl.class);
	@Autowired
	private MapAreaQuery mapAreaQuery;

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

@@ -1,21 +1,22 @@
package com.ai.bss.location.rescue.service.impl;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.location.rescue.model.User;
import com.ai.bss.location.rescue.service.interfaces.LoginService;
import com.ai.bss.location.rescue.util.HttpServiceUtil;
import com.alibaba.fastjson.JSON;
import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.bss.location.rescue.model.User;
import com.ai.bss.location.rescue.service.interfaces.LoginService;
import com.ai.bss.location.rescue.util.HttpServiceUtil;
import com.alibaba.fastjson.JSON;
/**
 * @Auther: 王超
@@ -26,7 +27,7 @@ import java.util.Map;
@Service
public class LoginServiceImpl implements LoginService {
    Logger logger = LoggerFactory.getLogger(LoginServiceImpl.class);
	private Logger logger = LoggerFactory.getLogger(LoginServiceImpl.class);
    @Value("${uspa.login.vercode}")
    private String verCode;
@@ -69,7 +70,7 @@ public class LoginServiceImpl implements LoginService {
        try {
            HashMap<String, Object> paramsMap = new HashMap<>();
            paramsMap.put("root_module","0000");
            paramsMap.put("root_module","00000004");
            paramsMap.put("userCode",user.getUserCode());
            Map<String, String> headerMap=new HashMap<>();

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

@@ -3,8 +3,6 @@ package com.ai.bss.location.rescue.service.impl;
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;
@@ -25,7 +23,6 @@ import com.ai.bss.worker.service.api.EmployeeTerminalRelaQuery;
@Service
public class WorkEmployeeServiceImpl implements WorkEmployeeService {
	Logger logger = LoggerFactory.getLogger(WorkEmployeeServiceImpl.class);
	@Autowired
	private UserDtoQuery userDtoQuery;

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

@@ -20,7 +20,7 @@ import com.alibaba.fastjson.JSONObject;
@Component
public class AlarmMirrorTask implements EntityAlarmHandle {
	Logger logger = LoggerFactory.getLogger(AlarmMirrorTask.class);
	private Logger logger = LoggerFactory.getLogger(AlarmMirrorTask.class);
	@Autowired
	private CharSpecService charSpecService;

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

@@ -20,7 +20,7 @@ import com.alibaba.fastjson.JSON;
@Component
public class LocationMirrorTask implements EntityPositionChangeHandle {
	Logger logger = LoggerFactory.getLogger(LocationMirrorTask.class);
	private Logger logger = LoggerFactory.getLogger(LocationMirrorTask.class);
	@Autowired
	LocationManagementService locationManagementService;

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

@@ -14,7 +14,7 @@ import com.ai.ipu.server.connect.ps.impl.Publisher;
 * 2020-10-21
 */
public class MirrorManagement {
	private static final Logger logger = LoggerFactory.getLogger(MirrorManagement.class);
	private static Logger logger = LoggerFactory.getLogger(MirrorManagement.class);
	// 定位topic
	public static final String TOPIC_LOCATION = "personnel";
@@ -27,6 +27,7 @@ public class MirrorManagement {
		if (!EventChannelTool.isExistSubscriber(topic)) {
			// 如果没有订阅 先不管
			logger.debug("未推送镜屏数据，原因是没有订阅：topic="+topic);
			return;
		}
@@ -39,5 +40,6 @@ public class MirrorManagement {
			}
		};
		publisher.publish(topic, publisherEvent);
		logger.debug("推送镜屏数据成功");
	}
}

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

@@ -4,8 +4,6 @@ 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.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
@@ -14,7 +12,7 @@ import com.ai.bss.position.service.api.EntityPositionCommand;
//@Component
public class TimingTask {
	Logger logger = LoggerFactory.getLogger(TimingTask.class);
	private Logger logger = LoggerFactory.getLogger(TimingTask.class);
	@Autowired
	private EntityPositionCommand entityPositionCommand;

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

@@ -4,7 +4,7 @@ import com.ai.ipu.cache.CacheFactory;
import com.ai.ipu.cache.ICache;
public class CacheUtil {
    //private static final Logger logger = LoggerFactory.getLogger(CacheUtil.class);
    //private Logger logger = LoggerFactory.getLogger(CacheUtil.class);
    private static final String CACHE_NAME = "ssn";

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

@@ -77,15 +77,6 @@ public class EbcConstant {
	// 考勤查询：月
	public static final String AREA_IN_OUT_RECORD_MONTH = "month";
	
	//当前登录者的STAFF_ID
	public static String USPA_USER_STAFF_ID="201613310867";
	//当前登录者ID
	public static String USPA_USER_CODE="wh";
	//当前登录者部门
	public static String USPA_USER_ORG_ID="1";
	//当前登录者部门
	public static String USPA_USER_ORG_CODE="0000";
	// 特征表获得职务code
	public static final String MAINJOBPOSITION = "mainJobPosition";

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

@@ -40,7 +40,7 @@ import com.alibaba.fastjson.JSONObject;
 * @author chencai
 */
public class HttpServiceUtil {
	static Logger log = LoggerFactory.getLogger(HttpServiceUtil.class);
	private static Logger log = LoggerFactory.getLogger(HttpServiceUtil.class);
	private static final String HTTP_CONTENT_TYPE_JSON = "application/json; charset=utf-8";

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

@@ -1,10 +1,5 @@
package com.ai.bss.location.rescue.util;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import java.io.IOException;
import java.io.InputStream;
import java.text.DecimalFormat;
@@ -12,6 +7,13 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
public class ImportExcelUtil {

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

@@ -21,7 +21,7 @@ import com.alibaba.fastjson.JSONObject;
@Component
public class NorthboundInterfaceUtil {
    private static final Logger logger = LoggerFactory.getLogger(NorthboundInterfaceUtil.class);
    private Logger logger = LoggerFactory.getLogger(NorthboundInterfaceUtil.class);
    @Value("${aap.iot.userCode:IOT_ADMIN}")
    private String userCode;

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

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
@Component
public class SpringUtil implements ApplicationContextAware {
	private static final Logger logger = LoggerFactory.getLogger(SpringUtil.class);
	private Logger logger = LoggerFactory.getLogger(SpringUtil.class);
	private static ApplicationContext applicationContext;
	private static void setApplicationcontext(ApplicationContext applicationContext) {

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

@@ -8,25 +8,25 @@ import java.io.File;
 * @author chencai
 */
public class MonitorManageConsts {
    public static String FILE_TYPE_VIDEO = "videos";
    public static String FILE_TYPE_IMG = "images";
    public static String FILE_TYPE_SPLIT = "images";
    public static final String FILE_TYPE_VIDEO = "videos";
    public static final String FILE_TYPE_IMG = "images";
    public static final String FILE_TYPE_SPLIT = "images";
    public static String IdenResultType = "";
    public static final String IdenResultType = "";
//    aiIdenModel   AI匹配模型
    //安全帽识别
    public static String AI_MODEL_SAFETY_HELMET = "SAFETY_HELMET";
    public static final String AI_MODEL_SAFETY_HELMET = "SAFETY_HELMET";
    //人脸识别
    public static String AI_MODEL_FACE = "FACE";
    public static final String AI_MODEL_FACE = "FACE";
    //陌生人识别
    public static String AI_MODEL_STRANGER = "STRANGER";
    public static final String AI_MODEL_STRANGER = "STRANGER";
    //吸烟识别
    public static String AI_MODEL_SMOKE = "SMOKE";
    public static final String AI_MODEL_SMOKE = "SMOKE";
    //工作服识别
    public static String AI_MODEL_CLOTHING_CODE = "CLOTHING_CODE"; 
    public static final String AI_MODEL_CLOTHING_CODE = "CLOTHING_CODE"; 
    //仪表识别
    public static String AI_MODEL_INSTRUMENT = "INSTRUMENT";
    public static final String AI_MODEL_INSTRUMENT = "INSTRUMENT";
    
    //AI识别结果:正常
@@ -50,15 +50,15 @@ public class MonitorManageConsts {
    //ai识别结果异常类型 身份异常
    public static String AI_ALARM_TYPE_STA = "STA";
    public static final String AI_ALARM_TYPE_STA = "STA";
    //ai识别结果异常类型 穿戴异常
    public static String AI_ALARM_TYPE_WEA ="WEA";
    public static final String AI_ALARM_TYPE_WEA ="WEA";
    //ai识别结果异常类型 潜在风险
    public static String AI_ALARM_TYPE_POT = "POT" ;
    public static final String AI_ALARM_TYPE_POT = "POT" ;
    //ai识别结果异常类型 违规违章
    public static String AI_ALARM_TYPE_VIO = "VIO" ;
    public static final String AI_ALARM_TYPE_VIO = "VIO" ;
//  ai识别结果异常类型          仪表异常
    public static String AI_ALARM_TYPE_INS = "INS" ;
    public static final String AI_ALARM_TYPE_INS = "INS" ;

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

@@ -1,14 +1,13 @@
package com.ai.bss.monitorManage.controller;
import com.ai.bss.monitorManage.service.interfaces.MonitorManageService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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.bss.monitorManage.service.interfaces.MonitorManageService;
/**
 * monitorManage
 */
@@ -17,9 +16,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
public class MonitorManageController {
    @Autowired
    MonitorManageService monitorManageService;
    Logger logger = LoggerFactory.getLogger(MonitorManageController.class);
    private MonitorManageService monitorManageService;
//    /**
//     * 查询mock执行状态

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

@@ -9,8 +9,6 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -35,10 +33,8 @@ import com.alibaba.fastjson.JSONObject;
@Controller
@RequestMapping("/aiAlarmManage")
public class AiAlarmManageController {
	Logger logger = LoggerFactory.getLogger(AiAlarmManageController.class);
	@Autowired
	AiAlarmManageService aiAlarmManageService;
	private AiAlarmManageService aiAlarmManageService;
	/**
	* 分页查询AI报警（监控报警任务综合查询 ）

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

@@ -1,12 +1,9 @@
package com.ai.bss.security.protection.controller;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.person.model.Organization;
import com.ai.bss.security.protection.service.interfaces.AttendanceCommonService;
import com.ai.bss.user.dto.UserDto;
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.RequestBody;
@@ -14,8 +11,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
import java.util.Map;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.person.model.Organization;
import com.ai.bss.security.protection.service.interfaces.AttendanceCommonService;
import com.ai.bss.user.dto.UserDto;
/**
 * 公共服务，包括部门、用户

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

@@ -1,24 +1,21 @@
package com.ai.bss.security.protection.controller;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.security.protection.model.AttendanceReport;
import com.ai.bss.security.protection.service.interfaces.AttendanceReportService;
import com.ai.bss.security.protection.utils.EbcConstant;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.security.protection.model.AttendanceReport;
import com.ai.bss.security.protection.service.interfaces.AttendanceReportService;
import com.ai.bss.security.protection.utils.EbcConstant;
/**
 * 考勤报表
@@ -26,10 +23,8 @@ import java.util.Map;
@Controller
@RequestMapping("/attendanceReport")
public class AttendanceReportController {
	Logger logger = LoggerFactory.getLogger(AttendanceReportController.class);
	@Autowired
	AttendanceReportService attendanceReportService;
	private AttendanceReportService attendanceReportService;
	/**
	 * 分页查询考勤报表日报

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

@@ -1,9 +1,7 @@
package com.ai.bss.security.protection.controller;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.security.protection.dto.AttendanceRuleDto;
import com.ai.bss.security.protection.service.interfaces.AreaInRecordService;
import com.ai.bss.security.protection.service.interfaces.AttendanceRulesService;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -11,7 +9,10 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.Map;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.security.protection.dto.AttendanceRuleDto;
import com.ai.bss.security.protection.service.interfaces.AreaInRecordService;
import com.ai.bss.security.protection.service.interfaces.AttendanceRulesService;
/**
 * 考勤规则

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

@@ -1,20 +1,16 @@
package com.ai.bss.security.protection.controller;
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
import com.ai.bss.security.protection.service.interfaces.AreaInRecordService;
import com.ai.bss.security.protection.service.interfaces.CharSpecService;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.Date;
import java.util.List;
import java.util.Map;
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
import com.ai.bss.security.protection.service.interfaces.CharSpecService;
/**
 * 获取字典表属性
@@ -22,10 +18,8 @@ import java.util.Map;
@Controller
@RequestMapping("/charSpec")
public class CharSpecController {
	Logger logger = LoggerFactory.getLogger(CharSpecController.class);
	@Autowired
	CharSpecService charSpecService;
	private CharSpecService charSpecService;
	/**
	 * 根据特征属性编码获取对应的属性值

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

@@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -16,6 +15,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
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.person.model.Organization;
import com.ai.bss.security.protection.model.AttendanceReport;

security-protection-service/src/main/java/com/ai/bss/security/protection/controller/InAndOutRecordController.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.Controller;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -26,8 +24,6 @@ import com.ai.bss.security.protection.utils.EbcConstant;
@Controller
@RequestMapping("/inAndOutRecord")
public class InAndOutRecordController {
	Logger logger = LoggerFactory.getLogger(InAndOutRecordController.class);
	@Autowired
	private AiIdenLogManageService aiIdenLogManageService;

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

@@ -1,18 +1,20 @@
package com.ai.bss.security.protection.controller;
import com.ai.bss.security.protection.model.User;
import com.ai.bss.security.protection.service.interfaces.LoginService;
import java.util.Map;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Map;
import com.ai.bss.security.protection.model.User;
import com.ai.bss.security.protection.service.interfaces.LoginService;
/**
 * @Auther: 王超

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

@@ -1,9 +1,7 @@
package com.ai.bss.security.protection.controller;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.security.protection.service.interfaces.MonitorSceneTerminalService;
import com.ai.bss.work.safety.model.MonitorSceneTerminalRel;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
@@ -11,7 +9,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.Map;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.security.protection.service.interfaces.MonitorSceneTerminalService;
import com.ai.bss.work.safety.model.MonitorSceneTerminalRel;
/**
 * 场景设备关联关系

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

@@ -1,17 +1,10 @@
package com.ai.bss.security.protection.controller;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.security.protection.model.AiQuery;
import com.ai.bss.security.protection.service.interfaces.SysConfigAiTaskService;
import com.ai.bss.security.protection.utils.EbcConstant;
import com.ai.bss.security.protection.utils.IDUtils;
import com.ai.bss.work.safety.model.AiModel;
import com.ai.bss.work.safety.model.AiTask;
import java.util.Arrays;
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.Controller;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -19,10 +12,14 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.security.protection.model.AiQuery;
import com.ai.bss.security.protection.service.interfaces.SysConfigAiTaskService;
import com.ai.bss.security.protection.utils.EbcConstant;
import com.ai.bss.security.protection.utils.IDUtils;
import com.ai.bss.work.safety.model.AiModel;
import com.ai.bss.work.safety.model.AiTask;
/**
 * 系统配置-AI任务
@@ -30,10 +27,8 @@ import java.util.Map;
@Controller
@RequestMapping("/sysConfigAiTask")
public class SysConfigAiTaskController {
	Logger logger = LoggerFactory.getLogger(SysConfigAiTaskController.class);
	@Autowired
	SysConfigAiTaskService sysConfigAiTaskService;
	private SysConfigAiTaskService sysConfigAiTaskService;
	/**
	 * 分页查询AI任务

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

@@ -4,8 +4,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.sso.util.LoginUserInfoUtil;
import com.alibaba.fastjson.JSONObject;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -20,8 +20,8 @@ import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.security.protection.service.interfaces.WorkOrderManagementService;
import com.ai.bss.security.protection.utils.EbcConstant;
import com.ai.bss.work.task.model.common.WorkEvent;
import javax.servlet.http.HttpServletRequest;
import com.ai.sso.util.LoginUserInfoUtil;
import com.alibaba.fastjson.JSONObject;
/**
 * 工单管理

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

@@ -1,13 +1,17 @@
package com.ai.bss.security.protection.controller;
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.service.interfaces.WorkShiftService;
import com.ai.bss.work.task.model.common.WorkShift;
import com.alibaba.fastjson.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.jackson.JsonObjectSerializer;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
@Controller
@RequestMapping("/workShift")

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

@@ -6,8 +6,6 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
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;
@@ -31,8 +29,6 @@ import com.ai.bss.user.service.api.UserDtoQuery;
@Service
public class EmployeeManagementServiceImpl implements EmployeeManagementService {
	Logger logger = LoggerFactory.getLogger(EmployeeManagementServiceImpl.class);
	@Autowired
	private UserDtoQuery userDtoQuery;

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

@@ -1,21 +1,23 @@
package com.ai.bss.security.protection.service.impl;
import com.ai.bss.security.protection.model.User;
import com.ai.bss.security.protection.service.interfaces.LoginService;
import com.ai.bss.security.protection.utils.HttpServiceUtil;
import com.alibaba.fastjson.JSON;
import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.bss.security.protection.model.User;
import com.ai.bss.security.protection.service.interfaces.LoginService;
import com.ai.bss.security.protection.utils.HttpServiceUtil;
import com.alibaba.fastjson.JSON;
/**
 * @Auther: 王超
@@ -26,7 +28,7 @@ import java.util.Map;
@Service
public class LoginServiceImpl implements LoginService {
    Logger logger = LoggerFactory.getLogger(LoginServiceImpl.class);
	private Logger logger = LoggerFactory.getLogger(LoginServiceImpl.class);
    @Value("${uspa.login.vercode}")
    private String verCode;

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

@@ -99,14 +99,4 @@ public class EbcConstant {
	//审核状态：未生效(未审核通过)
	public static final String AUDIT_STATUS_DIS="3";
	
	
	// 当前登录者的STAFF_ID
	public static String USPA_USER_STAFF_ID = "201613310867";
	// 当前登录者ID
	public static String USPA_USER_CODE = "wh";
	// 当前登录者部门
	public static String USPA_USER_ORG_ID = "1";
	// 当前登录者部门
	public static String USPA_USER_ORG_CODE = "0000";
}

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

@@ -1,6 +1,18 @@
package com.ai.bss.security.protection.utils;
import com.alibaba.fastjson.JSONObject;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
import java.nio.charset.Charset;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import org.apache.http.HttpEntity;
import org.apache.http.HttpStatus;
import org.apache.http.client.ClientProtocolException;
@@ -20,14 +32,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.CollectionUtils;
import java.io.*;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
import java.nio.charset.Charset;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import com.alibaba.fastjson.JSONObject;
/**
 * http服务请求工具类
@@ -35,7 +40,7 @@ import java.util.Set;
 * @author chencai
 */
public class HttpServiceUtil {
	static Logger log = LoggerFactory.getLogger(HttpServiceUtil.class);
	private static Logger log = LoggerFactory.getLogger(HttpServiceUtil.class);
	private static final String HTTP_CONTENT_TYPE_JSON = "application/json; charset=utf-8";