24
	private static final ILogger logger = IpuLoggerFactory.createLogger(NorthboundInterfaceUtil.class);
24
	private Logger logger = LoggerFactory.getLogger(NorthboundInterfaceUtil.class);
25 25
26 26
	@Value("${aap.iot.userCode}")
27 27
	private String userCode;

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

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

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

@ -1,8 +1,7 @@
1 1
package com.ai.bss.security_protection.server.controller;
2 2
3
import com.ai.bss.security_protection.server.service.interfaces.AreaInRecordService;
4
import com.ai.ipu.data.JMap;
5
import com.github.pagehelper.PageInfo;
3
import java.util.Date;
4
6 5
import org.slf4j.Logger;
7 6
import org.slf4j.LoggerFactory;
8 7
import org.springframework.beans.factory.annotation.Autowired;
@ -10,7 +9,9 @@ import org.springframework.stereotype.Controller;
10 9
import org.springframework.web.bind.annotation.RequestMapping;
11 10
import org.springframework.web.bind.annotation.ResponseBody;
12 11
13
import java.util.Date;
12
import com.ai.bss.security_protection.server.service.interfaces.AreaInRecordService;
13
import com.ai.ipu.data.JMap;
14
import com.github.pagehelper.PageInfo;
14 15
15 16
/**
16 17
 * 考勤管理
@ -18,10 +19,10 @@ import java.util.Date;
18 19
@Controller
19 20
@RequestMapping("/areaInOutRecordManage")
20 21
public class AreaInOutRecordController {
21
	Logger logger = LoggerFactory.getLogger(AreaInOutRecordController.class);
22
	private Logger logger = LoggerFactory.getLogger(AreaInOutRecordController.class);
22 23
23 24
	@Autowired
24
	AreaInRecordService areaInRecordService;
25
	private AreaInRecordService areaInRecordService;
25 26
26 27
	/**
27 28
	 * 分页查询考勤统计分析

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

@ -1,8 +1,7 @@
1 1
package com.ai.bss.security_protection.server.controller;
2 2
3
import com.ai.bss.security_protection.server.service.interfaces.AreaInRecordService;
4
import com.ai.ipu.data.JMap;
5
import com.github.pagehelper.PageInfo;
3
import java.util.Date;
4
6 5
import org.slf4j.Logger;
7 6
import org.slf4j.LoggerFactory;
8 7
import org.springframework.beans.factory.annotation.Autowired;
@ -10,7 +9,9 @@ import org.springframework.stereotype.Controller;
10 9
import org.springframework.web.bind.annotation.RequestMapping;
11 10
import org.springframework.web.bind.annotation.ResponseBody;
12 11
13
import java.util.Date;
12
import com.ai.bss.security_protection.server.service.interfaces.AreaInRecordService;
13
import com.ai.ipu.data.JMap;
14
import com.github.pagehelper.PageInfo;
14 15
15 16
/**
16 17
 * 异常考勤
@ -18,10 +19,10 @@ import java.util.Date;
18 19
@Controller
19 20
@RequestMapping("/areaInOutRecordManage")
20 21
public class abnormalAttendanceController {
21
	Logger logger = LoggerFactory.getLogger(abnormalAttendanceController.class);
22
	private Logger logger = LoggerFactory.getLogger(abnormalAttendanceController.class);
22 23
23 24
	@Autowired
24
	AreaInRecordService areaInRecordService;
25
	private AreaInRecordService areaInRecordService;
25 26
26 27
	/**
27 28
	 * 分页查询考勤统计分析

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

@ -1,8 +1,7 @@
1 1
package com.ai.bss.security_protection.server.controller;
2 2
3
import com.ai.bss.security_protection.server.service.interfaces.AreaInRecordService;
4
import com.ai.ipu.data.JMap;
5
import com.github.pagehelper.PageInfo;
3
import java.util.Date;
4
6 5
import org.slf4j.Logger;
7 6
import org.slf4j.LoggerFactory;
8 7
import org.springframework.beans.factory.annotation.Autowired;
@ -10,7 +9,9 @@ import org.springframework.stereotype.Controller;
10 9
import org.springframework.web.bind.annotation.RequestMapping;
11 10
import org.springframework.web.bind.annotation.ResponseBody;
12 11
13
import java.util.Date;
12
import com.ai.bss.security_protection.server.service.interfaces.AreaInRecordService;
13
import com.ai.ipu.data.JMap;
14
import com.github.pagehelper.PageInfo;
14 15
15 16
/**
16 17
 * 异常考勤
@ -18,10 +19,10 @@ import java.util.Date;
18 19
@Controller
19 20
@RequestMapping("/areaInOutRecordManage")
20 21
public class attendanceConfigurationController {
21
	Logger logger = LoggerFactory.getLogger(attendanceConfigurationController.class);
22
	private Logger logger = LoggerFactory.getLogger(attendanceConfigurationController.class);
22 23
23 24
	@Autowired
24
	AreaInRecordService areaInRecordService;
25
	private AreaInRecordService areaInRecordService;
25 26
26 27
	/**
27 28
	 * 分页查询考勤统计分析

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

@ -1,8 +1,7 @@
1 1
package com.ai.bss.security_protection.server.controller;
2 2
3
import com.ai.bss.security_protection.server.service.interfaces.AreaInRecordService;
4
import com.ai.ipu.data.JMap;
5
import com.github.pagehelper.PageInfo;
3
import java.util.Date;
4
6 5
import org.slf4j.Logger;
7 6
import org.slf4j.LoggerFactory;
8 7
import org.springframework.beans.factory.annotation.Autowired;
@ -10,7 +9,9 @@ import org.springframework.stereotype.Controller;
10 9
import org.springframework.web.bind.annotation.RequestMapping;
11 10
import org.springframework.web.bind.annotation.ResponseBody;
12 11
13
import java.util.Date;
12
import com.ai.bss.security_protection.server.service.interfaces.AreaInRecordService;
13
import com.ai.ipu.data.JMap;
14
import com.github.pagehelper.PageInfo;
14 15
15 16
/**
16 17
 * 考勤报表
@ -18,10 +19,10 @@ import java.util.Date;
18 19
@Controller
19 20
@RequestMapping("/areaInOutRecordManage")
20 21
public class attendanceReportController {
21
	Logger logger = LoggerFactory.getLogger(attendanceReportController.class);
22
	private Logger logger = LoggerFactory.getLogger(attendanceReportController.class);
22 23
23 24
	@Autowired
24
	AreaInRecordService areaInRecordService;
25
	private AreaInRecordService areaInRecordService;
25 26
26 27
	/**
27 28
	 * 分页查询考勤统计分析

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

@ -1,8 +1,7 @@
1 1
package com.ai.bss.security_protection.server.controller;
2 2
3
import com.ai.bss.security_protection.server.service.interfaces.AreaInRecordService;
4
import com.ai.ipu.data.JMap;
5
import com.github.pagehelper.PageInfo;
3
import java.util.Date;
4
6 5
import org.slf4j.Logger;
7 6
import org.slf4j.LoggerFactory;
8 7
import org.springframework.beans.factory.annotation.Autowired;
@ -10,7 +9,9 @@ import org.springframework.stereotype.Controller;
10 9
import org.springframework.web.bind.annotation.RequestMapping;
11 10
import org.springframework.web.bind.annotation.ResponseBody;
12 11
13
import java.util.Date;
12
import com.ai.bss.security_protection.server.service.interfaces.AreaInRecordService;
13
import com.ai.ipu.data.JMap;
14
import com.github.pagehelper.PageInfo;
14 15
15 16
/**
16 17
 * 异常考勤
@ -18,10 +19,10 @@ import java.util.Date;
18 19
@Controller
19 20
@RequestMapping("/areaInOutRecordManage")
20 21
public class attendanceRulesController {
21
	Logger logger = LoggerFactory.getLogger(attendanceRulesController.class);
22
	private Logger logger = LoggerFactory.getLogger(attendanceRulesController.class);
22 23
23 24
	@Autowired
24
	AreaInRecordService areaInRecordService;
25
	private AreaInRecordService areaInRecordService;
25 26
26 27
	/**
27 28
	 * 分页查询考勤统计分析

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

@ -1,8 +1,7 @@
1 1
package com.ai.bss.security_protection.server.controller;
2 2
3
import com.ai.bss.security_protection.server.service.interfaces.AreaInRecordService;
4
import com.ai.ipu.data.JMap;
5
import com.github.pagehelper.PageInfo;
3
import java.util.Date;
4
6 5
import org.slf4j.Logger;
7 6
import org.slf4j.LoggerFactory;
8 7
import org.springframework.beans.factory.annotation.Autowired;
@ -10,7 +9,9 @@ import org.springframework.stereotype.Controller;
10 9
import org.springframework.web.bind.annotation.RequestMapping;
11 10
import org.springframework.web.bind.annotation.ResponseBody;
12 11
13
import java.util.Date;
12
import com.ai.bss.security_protection.server.service.interfaces.AreaInRecordService;
13
import com.ai.ipu.data.JMap;
14
import com.github.pagehelper.PageInfo;
14 15
15 16
/**
16 17
 * 假勤管理
@ -18,10 +19,10 @@ import java.util.Date;
18 19
@Controller
19 20
@RequestMapping("/areaInOutRecordManage")
20 21
public class vacationAttendanceManageController {
21
	Logger logger = LoggerFactory.getLogger(vacationAttendanceManageController.class);
22
	private Logger logger = LoggerFactory.getLogger(vacationAttendanceManageController.class);
22 23
23 24
	@Autowired
24
	AreaInRecordService areaInRecordService;
25
	private AreaInRecordService areaInRecordService;
25 26
26 27
	/**
27 28
	 * 分页查询考勤统计分析

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

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

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

@ -1,5 +1,17 @@
1 1
package com.ai.bss.location.rescue.controller;
2 2
3
import java.util.HashMap;
4
import java.util.List;
5
import java.util.Map;
6
7
import javax.servlet.http.HttpServletRequest;
8
9
import org.springframework.beans.factory.annotation.Autowired;
10
import org.springframework.stereotype.Controller;
11
import org.springframework.web.bind.annotation.RequestBody;
12
import org.springframework.web.bind.annotation.RequestMapping;
13
import org.springframework.web.bind.annotation.ResponseBody;
14
3 15
import com.ai.abc.api.model.CommonRequest;
4 16
import com.ai.abc.api.model.CommonResponse;
5 17
import com.ai.bss.components.common.model.PageBean;
@ -7,16 +19,6 @@ import com.ai.bss.location.rescue.service.interfaces.AttendanceManageService;
7 19
import com.ai.bss.location.rescue.util.EbcConstant;
8 20
import com.ai.sso.util.LoginUserInfoUtil;
9 21
import com.alibaba.fastjson.JSONObject;
10
import org.springframework.beans.factory.annotation.Autowired;
11
import org.springframework.stereotype.Controller;
12
import org.springframework.web.bind.annotation.RequestBody;
13
import org.springframework.web.bind.annotation.RequestMapping;
14
import org.springframework.web.bind.annotation.ResponseBody;
15
16
import javax.servlet.http.HttpServletRequest;
17
import java.util.HashMap;
18
import java.util.List;
19
import java.util.Map;
20 22
21 23
/**
22 24
 * @Auther: 王超

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

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

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

@ -1,22 +1,11 @@
1 1
package com.ai.bss.location.rescue.controller;
2 2
3
import java.io.InputStream;
4
import java.util.ArrayList;
5 3
import java.util.HashMap;
6 4
import java.util.List;
7 5
import java.util.Map;
8 6
9 7
import javax.servlet.http.HttpServletRequest;
10 8
11
import com.ai.bss.location.rescue.util.ImportExcelUtil;
12
13
import com.ai.sso.util.LoginUserInfoUtil;
14
import com.alibaba.fastjson.JSONObject;
15
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
16
import org.apache.poi.ss.usermodel.Cell;
17
import org.apache.poi.ss.usermodel.Sheet;
18
19
import org.apache.poi.ss.usermodel.Workbook;
20 9
import org.slf4j.Logger;
21 10
import org.slf4j.LoggerFactory;
22 11
import org.springframework.beans.factory.annotation.Autowired;
@ -25,15 +14,18 @@ import org.springframework.web.bind.annotation.RequestBody;
25 14
import org.springframework.web.bind.annotation.RequestMapping;
26 15
import org.springframework.web.bind.annotation.RequestParam;
27 16
import org.springframework.web.bind.annotation.ResponseBody;
17
import org.springframework.web.multipart.MultipartFile;
28 18
29 19
import com.ai.abc.api.model.CommonRequest;
30 20
import com.ai.abc.api.model.CommonResponse;
31 21
import com.ai.bss.components.common.model.PageBean;
32 22
import com.ai.bss.location.rescue.service.interfaces.EquipmentManageService;
33 23
import com.ai.bss.location.rescue.util.EbcConstant;
24
import com.ai.bss.location.rescue.util.ImportExcelUtil;
34 25
import com.ai.bss.work.tool.model.ResourceTool;
35 26
import com.ai.bss.work.tool.model.ResourceToolType;
36
import org.springframework.web.multipart.MultipartFile;
27
import com.ai.sso.util.LoginUserInfoUtil;
28
import com.alibaba.fastjson.JSONObject;
37 29
38 30
/**
39 31
 * 设备管理
@ -41,7 +33,7 @@ import org.springframework.web.multipart.MultipartFile;
41 33
@Controller
42 34
@RequestMapping("/equipment")
43 35
public class EquipmentManageController {
44
    Logger logger = LoggerFactory.getLogger(EquipmentManageController.class);
36
    private Logger logger = LoggerFactory.getLogger(EquipmentManageController.class);
45 37
46 38
    @Autowired
47 39
    private EquipmentManageService equipmentManageService;

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

@ -1,21 +1,19 @@
1 1
package com.ai.bss.location.rescue.controller;
2 2
3
import com.ai.abc.api.model.CommonResponse;
4
import com.ai.bss.location.rescue.model.User;
5
import com.ai.bss.location.rescue.service.interfaces.LoginService;
3
import java.util.Map;
4
5
import javax.servlet.http.Cookie;
6
import javax.servlet.http.HttpServletRequest;
7
import javax.servlet.http.HttpServletResponse;
8
6 9
import org.springframework.beans.factory.annotation.Autowired;
7 10
import org.springframework.stereotype.Controller;
8 11
import org.springframework.web.bind.annotation.RequestBody;
9 12
import org.springframework.web.bind.annotation.RequestMapping;
10 13
import org.springframework.web.bind.annotation.ResponseBody;
11 14
12
import javax.servlet.http.Cookie;
13
import javax.servlet.http.HttpServletRequest;
14
import javax.servlet.http.HttpServletResponse;
15
import java.util.ArrayList;
16
import java.util.HashMap;
17
import java.util.List;
18
import java.util.Map;
15
import com.ai.bss.location.rescue.model.User;
16
import com.ai.bss.location.rescue.service.interfaces.LoginService;
19 17
20 18
/**
21 19
 * @Auther: 王超

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

@ -34,7 +34,7 @@ import com.alibaba.fastjson.JSONObject;
34 34
35 35
@Service
36 36
public class AlarmManagementServiceImpl implements AlarmManagementService {
37
	Logger logger = LoggerFactory.getLogger(AlarmManagementServiceImpl.class);
37
    private Logger logger = LoggerFactory.getLogger(AlarmManagementServiceImpl.class);
38 38
39 39
	@Autowired
40 40
	private RescueCommand rescueCommand;

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

@ -1,5 +1,13 @@
1 1
package com.ai.bss.location.rescue.service.impl;
2 2
3
import java.text.ParseException;
4
import java.util.HashMap;
5
import java.util.List;
6
import java.util.Map;
7
8
import org.springframework.beans.factory.annotation.Autowired;
9
import org.springframework.stereotype.Service;
10
3 11
import com.ai.abc.api.model.CommonRequest;
4 12
import com.ai.abc.api.model.CommonResponse;
5 13
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
@ -8,13 +16,6 @@ import com.ai.bss.location.rescue.service.interfaces.AttendanceManageService;
8 16
import com.ai.bss.location.rescue.service.interfaces.CharSpecService;
9 17
import com.ai.bss.location.rescue.util.EbcConstant;
10 18
import com.ai.bss.worker.service.api.AttendanceStatusQuery;
11
import org.springframework.beans.factory.annotation.Autowired;
12
import org.springframework.stereotype.Service;
13
14
import java.text.ParseException;
15
import java.util.HashMap;
16
import java.util.List;
17
import java.util.Map;
18 19
19 20
/**
20 21
 * @Auther: 王超

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

@ -6,14 +6,14 @@ import java.util.Iterator;
6 6
import java.util.List;
7 7
import java.util.Map;
8 8
9
import com.ai.bss.characteristic.spec.model.CharacteristicSpec;
10
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
11
import com.ai.bss.characteristic.spec.service.api.CharacteristicSpecService;
12
import com.ai.bss.characteristic.spec.service.api.CharacteristicSpecValueService;
13 9
import org.springframework.beans.factory.annotation.Autowired;
14 10
import org.springframework.stereotype.Service;
15 11
import org.springframework.util.CollectionUtils;
16 12
13
import com.ai.bss.characteristic.spec.model.CharacteristicSpec;
14
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
15
import com.ai.bss.characteristic.spec.service.api.CharacteristicSpecService;
16
import com.ai.bss.characteristic.spec.service.api.CharacteristicSpecValueService;
17 17
import com.ai.bss.location.rescue.service.interfaces.CharSpecService;
18 18
import com.ailk.org.apache.commons.lang3.StringUtils;
19 19

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

@ -6,7 +6,8 @@ import java.util.HashMap;
6 6
import java.util.List;
7 7
import java.util.Map;
8 8
9
import com.ai.sso.util.LoginUserInfoUtil;
9
import javax.servlet.http.HttpServletRequest;
10
10 11
import org.slf4j.Logger;
11 12
import org.slf4j.LoggerFactory;
12 13
import org.springframework.beans.factory.annotation.Autowired;
@ -31,14 +32,13 @@ import com.ai.bss.worker.model.EmployeeTerminalRela;
31 32
import com.ai.bss.worker.model.EmployeeTerminalRelaDto;
32 33
import com.ai.bss.worker.service.api.EmployeeTerminalRelaCommand;
33 34
import com.ai.bss.worker.service.api.EmployeeTerminalRelaQuery;
35
import com.ai.sso.util.LoginUserInfoUtil;
34 36
import com.alibaba.fastjson.JSON;
35 37
import com.alibaba.fastjson.JSONObject;
36 38
37
import javax.servlet.http.HttpServletRequest;
38
39 39
@Service
40 40
public class DeviceManageServiceImpl implements DeviceManageService {
41
    Logger logger = LoggerFactory.getLogger(DeviceManageServiceImpl.class);
41
	private Logger logger = LoggerFactory.getLogger(DeviceManageServiceImpl.class);
42 42
43 43
    @Autowired
44 44
    private EmployeeTerminalRelaQuery employeeTerminalRelaQuery;

+ 1 - 1
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;
28 28
29 29
@Service
30 30
public class EquipmentManageServiceImpl<EquipmentManageDao> implements EquipmentManageService {
31
	Logger logger = LoggerFactory.getLogger(EquipmentManageServiceImpl.class);
31
	private Logger logger = LoggerFactory.getLogger(EquipmentManageServiceImpl.class);
32 32
33 33
	@Autowired
34 34
	private ResourceToolCommand resourceToolCommand;

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

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

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

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

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

@ -1,21 +1,22 @@
1 1
package com.ai.bss.location.rescue.service.impl;
2 2
3
import com.ai.abc.api.model.CommonResponse;
4
import com.ai.bss.location.rescue.model.User;
5
import com.ai.bss.location.rescue.service.interfaces.LoginService;
6
import com.ai.bss.location.rescue.util.HttpServiceUtil;
7
import com.alibaba.fastjson.JSON;
3
import java.nio.charset.Charset;
4
import java.util.HashMap;
5
import java.util.List;
6
import java.util.Map;
7
8
import javax.servlet.http.Cookie;
9
import javax.servlet.http.HttpServletRequest;
10
8 11
import org.slf4j.Logger;
9 12
import org.slf4j.LoggerFactory;
10 13
import org.springframework.beans.factory.annotation.Value;
11 14
import org.springframework.stereotype.Service;
12 15
13
import javax.servlet.http.Cookie;
14
import javax.servlet.http.HttpServletRequest;
15
import java.nio.charset.Charset;
16
import java.util.HashMap;
17
import java.util.List;
18
import java.util.Map;
16
import com.ai.bss.location.rescue.model.User;
17
import com.ai.bss.location.rescue.service.interfaces.LoginService;
18
import com.ai.bss.location.rescue.util.HttpServiceUtil;
19
import com.alibaba.fastjson.JSON;
19 20
20 21
/**
21 22
 * @Auther: 王超
@ -26,7 +27,7 @@ import java.util.Map;
26 27
@Service
27 28
public class LoginServiceImpl implements LoginService {
28 29
29
    Logger logger = LoggerFactory.getLogger(LoginServiceImpl.class);
30
	private Logger logger = LoggerFactory.getLogger(LoginServiceImpl.class);
30 31
31 32
    @Value("${uspa.login.vercode}")
32 33
    private String verCode;

+ 0 - 3
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;
3 3
import java.util.List;
4 4
import java.util.Map;
5 5
6
import org.slf4j.Logger;
7
import org.slf4j.LoggerFactory;
8 6
import org.springframework.beans.factory.annotation.Autowired;
9 7
import org.springframework.stereotype.Service;
10 8
@ -25,7 +23,6 @@ import com.ai.bss.worker.service.api.EmployeeTerminalRelaQuery;
25 23
26 24
@Service
27 25
public class WorkEmployeeServiceImpl implements WorkEmployeeService {
28
	Logger logger = LoggerFactory.getLogger(WorkEmployeeServiceImpl.class);
29 26
30 27
	@Autowired
31 28
	private UserDtoQuery userDtoQuery;

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

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

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

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

+ 3 - 1
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;
14 14
 * 2020-10-21
15 15
 */
16 16
public class MirrorManagement {
17
	private static final Logger logger = LoggerFactory.getLogger(MirrorManagement.class);
17
	private static Logger logger = LoggerFactory.getLogger(MirrorManagement.class);
18 18
19 19
	// 定位topic
20 20
	public static final String TOPIC_LOCATION = "personnel";
@ -27,6 +27,7 @@ public class MirrorManagement {
27 27
28 28
		if (!EventChannelTool.isExistSubscriber(topic)) {
29 29
			// 如果没有订阅 先不管
30
			logger.debug("未推送镜屏数据,原因是没有订阅:topic="+topic);
30 31
			return;
31 32
		}
32 33
@ -39,5 +40,6 @@ public class MirrorManagement {
39 40
			}
40 41
		};
41 42
		publisher.publish(topic, publisherEvent);
43
		logger.debug("推送镜屏数据成功");
42 44
	}
43 45
}

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

@ -4,8 +4,6 @@ import org.slf4j.Logger;
4 4
import org.slf4j.LoggerFactory;
5 5
import org.springframework.beans.factory.annotation.Autowired;
6 6
import org.springframework.beans.factory.annotation.Value;
7
import org.springframework.scheduling.annotation.Scheduled;
8
import org.springframework.stereotype.Component;
9 7
10 8
import com.ai.abc.api.model.CommonRequest;
11 9
import com.ai.abc.api.model.CommonResponse;
@ -14,7 +12,7 @@ import com.ai.bss.position.service.api.EntityPositionCommand;
14 12
15 13
//@Component
16 14
public class TimingTask {
17
	Logger logger = LoggerFactory.getLogger(TimingTask.class);
15
	private Logger logger = LoggerFactory.getLogger(TimingTask.class);
18 16
19 17
	@Autowired
20 18
	private EntityPositionCommand entityPositionCommand;

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

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

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

@ -77,15 +77,6 @@ public class EbcConstant {
77 77
78 78
	// 考勤查询:月
79 79
	public static final String AREA_IN_OUT_RECORD_MONTH = "month";
80
	
81
	//当前登录者的STAFF_ID
82
	public static String USPA_USER_STAFF_ID="201613310867";
83
	//当前登录者ID
84
	public static String USPA_USER_CODE="wh";
85
	//当前登录者部门
86
	public static String USPA_USER_ORG_ID="1";
87
	//当前登录者部门
88
	public static String USPA_USER_ORG_CODE="0000";
89 80
90 81
	// 特征表获得职务code
91 82
	public static final String MAINJOBPOSITION = "mainJobPosition";

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

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

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

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

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

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

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

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

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

@ -8,25 +8,25 @@ import java.io.File;
8 8
 * @author chencai
9 9
 */
10 10
public class MonitorManageConsts {
11
    public static String FILE_TYPE_VIDEO = "videos";
12
    public static String FILE_TYPE_IMG = "images";
13
    public static String FILE_TYPE_SPLIT = "images";
11
    public static final String FILE_TYPE_VIDEO = "videos";
12
    public static final String FILE_TYPE_IMG = "images";
13
    public static final String FILE_TYPE_SPLIT = "images";
14 14
15
    public static String IdenResultType = "";
15
    public static final String IdenResultType = "";
16 16
17 17
//    aiIdenModel   AI匹配模型
18 18
    //安全帽识别
19
    public static String AI_MODEL_SAFETY_HELMET = "SAFETY_HELMET";
19
    public static final String AI_MODEL_SAFETY_HELMET = "SAFETY_HELMET";
20 20
    //人脸识别
21
    public static String AI_MODEL_FACE = "FACE";
21
    public static final String AI_MODEL_FACE = "FACE";
22 22
    //陌生人识别
23
    public static String AI_MODEL_STRANGER = "STRANGER";
23
    public static final String AI_MODEL_STRANGER = "STRANGER";
24 24
    //吸烟识别
25
    public static String AI_MODEL_SMOKE = "SMOKE";
25
    public static final String AI_MODEL_SMOKE = "SMOKE";
26 26
    //工作服识别
27
    public static String AI_MODEL_CLOTHING_CODE = "CLOTHING_CODE"; 
27
    public static final String AI_MODEL_CLOTHING_CODE = "CLOTHING_CODE"; 
28 28
    //仪表识别
29
    public static String AI_MODEL_INSTRUMENT = "INSTRUMENT";
29
    public static final String AI_MODEL_INSTRUMENT = "INSTRUMENT";
30 30
    
31 31
32 32
    //AI识别结果:正常
@ -50,15 +50,15 @@ public class MonitorManageConsts {
50 50
51 51
52 52
    //ai识别结果异常类型 身份异常
53
    public static String AI_ALARM_TYPE_STA = "STA";
53
    public static final String AI_ALARM_TYPE_STA = "STA";
54 54
    //ai识别结果异常类型 穿戴异常
55
    public static String AI_ALARM_TYPE_WEA ="WEA";
55
    public static final String AI_ALARM_TYPE_WEA ="WEA";
56 56
    //ai识别结果异常类型 潜在风险
57
    public static String AI_ALARM_TYPE_POT = "POT" ;
57
    public static final String AI_ALARM_TYPE_POT = "POT" ;
58 58
    //ai识别结果异常类型 违规违章
59
    public static String AI_ALARM_TYPE_VIO = "VIO" ;
59
    public static final String AI_ALARM_TYPE_VIO = "VIO" ;
60 60
//  ai识别结果异常类型          仪表异常
61
    public static String AI_ALARM_TYPE_INS = "INS" ;
61
    public static final String AI_ALARM_TYPE_INS = "INS" ;
62 62
63 63
64 64

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

@ -1,14 +1,13 @@
1 1
package com.ai.bss.monitorManage.controller;
2 2
3 3
4
import com.ai.bss.monitorManage.service.interfaces.MonitorManageService;
5
import org.slf4j.Logger;
6
import org.slf4j.LoggerFactory;
7 4
import org.springframework.beans.factory.annotation.Autowired;
8 5
import org.springframework.stereotype.Controller;
9 6
import org.springframework.web.bind.annotation.RequestMapping;
10 7
import org.springframework.web.bind.annotation.ResponseBody;
11 8
9
import com.ai.bss.monitorManage.service.interfaces.MonitorManageService;
10
12 11
/**
13 12
 * monitorManage
14 13
 */
@ -17,9 +16,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
17 16
public class MonitorManageController {
18 17
19 18
    @Autowired
20
    MonitorManageService monitorManageService;
21
22
    Logger logger = LoggerFactory.getLogger(MonitorManageController.class);
19
    private MonitorManageService monitorManageService;
23 20
24 21
//    /**
25 22
//     * 查询mock执行状态

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

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

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

@ -1,12 +1,9 @@
1 1
package com.ai.bss.security.protection.controller;
2 2
3 3
4
import com.ai.abc.api.model.CommonRequest;
5
import com.ai.abc.api.model.CommonResponse;
6
import com.ai.bss.components.common.model.PageBean;
7
import com.ai.bss.person.model.Organization;
8
import com.ai.bss.security.protection.service.interfaces.AttendanceCommonService;
9
import com.ai.bss.user.dto.UserDto;
4
import java.util.List;
5
import java.util.Map;
6
10 7
import org.springframework.beans.factory.annotation.Autowired;
11 8
import org.springframework.stereotype.Controller;
12 9
import org.springframework.web.bind.annotation.RequestBody;
@ -14,8 +11,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
14 11
import org.springframework.web.bind.annotation.RequestParam;
15 12
import org.springframework.web.bind.annotation.ResponseBody;
16 13
17
import java.util.List;
18
import java.util.Map;
14
import com.ai.abc.api.model.CommonRequest;
15
import com.ai.abc.api.model.CommonResponse;
16
import com.ai.bss.components.common.model.PageBean;
17
import com.ai.bss.person.model.Organization;
18
import com.ai.bss.security.protection.service.interfaces.AttendanceCommonService;
19
import com.ai.bss.user.dto.UserDto;
19 20
20 21
/**
21 22
 * 公共服务,包括部门、用户

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

@ -1,24 +1,21 @@
1 1
package com.ai.bss.security.protection.controller;
2 2
3 3
4
import com.ai.abc.api.model.CommonResponse;
5
import com.ai.bss.components.common.model.PageBean;
6
import com.ai.bss.security.protection.model.AttendanceReport;
7
import com.ai.bss.security.protection.service.interfaces.AttendanceReportService;
8
import com.ai.bss.security.protection.utils.EbcConstant;
4
import java.util.HashMap;
5
import java.util.Map;
9 6
10 7
import org.apache.commons.lang.StringUtils;
11
import org.slf4j.Logger;
12
import org.slf4j.LoggerFactory;
13 8
import org.springframework.beans.factory.annotation.Autowired;
14 9
import org.springframework.stereotype.Controller;
15 10
import org.springframework.web.bind.annotation.ModelAttribute;
16 11
import org.springframework.web.bind.annotation.RequestMapping;
17 12
import org.springframework.web.bind.annotation.ResponseBody;
18 13
19
import java.util.HashMap;
20
import java.util.List;
21
import java.util.Map;
14
import com.ai.abc.api.model.CommonResponse;
15
import com.ai.bss.components.common.model.PageBean;
16
import com.ai.bss.security.protection.model.AttendanceReport;
17
import com.ai.bss.security.protection.service.interfaces.AttendanceReportService;
18
import com.ai.bss.security.protection.utils.EbcConstant;
22 19
23 20
/**
24 21
 * 考勤报表
@ -26,10 +23,8 @@ import java.util.Map;
26 23
@Controller
27 24
@RequestMapping("/attendanceReport")
28 25
public class AttendanceReportController {
29
	Logger logger = LoggerFactory.getLogger(AttendanceReportController.class);
30
31 26
	@Autowired
32
	AttendanceReportService attendanceReportService;
27
	private AttendanceReportService attendanceReportService;
33 28
34 29
	/**
35 30
	 * 分页查询考勤报表日报

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

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

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

@ -1,20 +1,16 @@
1 1
package com.ai.bss.security.protection.controller;
2 2
3
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
4
import com.ai.bss.security.protection.service.interfaces.AreaInRecordService;
5
import com.ai.bss.security.protection.service.interfaces.CharSpecService;
6
import com.github.pagehelper.PageInfo;
7
import org.slf4j.Logger;
8
import org.slf4j.LoggerFactory;
3
import java.util.List;
4
import java.util.Map;
5
9 6
import org.springframework.beans.factory.annotation.Autowired;
10 7
import org.springframework.stereotype.Controller;
11 8
import org.springframework.web.bind.annotation.RequestMapping;
12 9
import org.springframework.web.bind.annotation.RequestParam;
13 10
import org.springframework.web.bind.annotation.ResponseBody;
14 11
15
import java.util.Date;
16
import java.util.List;
17
import java.util.Map;
12
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
13
import com.ai.bss.security.protection.service.interfaces.CharSpecService;
18 14
19 15
/**
20 16
 * 获取字典表属性
@ -22,10 +18,8 @@ import java.util.Map;
22 18
@Controller
23 19
@RequestMapping("/charSpec")
24 20
public class CharSpecController {
25
	Logger logger = LoggerFactory.getLogger(CharSpecController.class);
26
27 21
	@Autowired
28
	CharSpecService charSpecService;
22
	private CharSpecService charSpecService;
29 23
30 24
	/**
31 25
	 * 根据特征属性编码获取对应的属性值

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

@ -4,7 +4,6 @@ import java.util.ArrayList;
4 4
import java.util.List;
5 5
import java.util.Map;
6 6
7
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
8 7
import org.apache.commons.lang.StringUtils;
9 8
import org.springframework.beans.factory.annotation.Autowired;
10 9
import org.springframework.stereotype.Controller;
@ -16,6 +15,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
16 15
import org.springframework.web.multipart.MultipartFile;
17 16
18 17
import com.ai.abc.api.model.CommonResponse;
18
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
19 19
import com.ai.bss.components.common.model.PageBean;
20 20
import com.ai.bss.person.model.Organization;
21 21
import com.ai.bss.security.protection.model.AttendanceReport;

+ 0 - 4
security-protection-service/src/main/java/com/ai/bss/security/protection/controller/InAndOutRecordController.java

@ -5,8 +5,6 @@ import java.util.HashMap;
5 5
import java.util.List;
6 6
import java.util.Map;
7 7
8
import org.slf4j.Logger;
9
import org.slf4j.LoggerFactory;
10 8
import org.springframework.beans.factory.annotation.Autowired;
11 9
import org.springframework.stereotype.Controller;
12 10
import org.springframework.web.bind.annotation.ModelAttribute;
@ -26,8 +24,6 @@ import com.ai.bss.security.protection.utils.EbcConstant;
26 24
@Controller
27 25
@RequestMapping("/inAndOutRecord")
28 26
public class InAndOutRecordController {
29
	Logger logger = LoggerFactory.getLogger(InAndOutRecordController.class);
30
31 27
	@Autowired
32 28
	private AiIdenLogManageService aiIdenLogManageService;
33 29

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

@ -1,18 +1,20 @@
1 1
package com.ai.bss.security.protection.controller;
2 2
3 3
4
import com.ai.bss.security.protection.model.User;
5
import com.ai.bss.security.protection.service.interfaces.LoginService;
4
import java.util.Map;
5
6
import javax.servlet.http.Cookie;
7
import javax.servlet.http.HttpServletRequest;
8
import javax.servlet.http.HttpServletResponse;
9
6 10
import org.springframework.beans.factory.annotation.Autowired;
7 11
import org.springframework.stereotype.Controller;
8 12
import org.springframework.web.bind.annotation.RequestBody;
9 13
import org.springframework.web.bind.annotation.RequestMapping;
10 14
import org.springframework.web.bind.annotation.ResponseBody;
11 15
12
import javax.servlet.http.Cookie;
13
import javax.servlet.http.HttpServletRequest;
14
import javax.servlet.http.HttpServletResponse;
15
import java.util.Map;
16
import com.ai.bss.security.protection.model.User;
17
import com.ai.bss.security.protection.service.interfaces.LoginService;
16 18
17 19
/**
18 20
 * @Auther: 王超

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

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

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

@ -1,17 +1,10 @@
1 1
package com.ai.bss.security.protection.controller;
2 2
3
import com.ai.abc.api.model.CommonResponse;
4
import com.ai.bss.components.common.model.PageBean;
5
import com.ai.bss.security.protection.model.AiQuery;
6
7
import com.ai.bss.security.protection.service.interfaces.SysConfigAiTaskService;
8
import com.ai.bss.security.protection.utils.EbcConstant;
9
import com.ai.bss.security.protection.utils.IDUtils;
10
import com.ai.bss.work.safety.model.AiModel;
11
import com.ai.bss.work.safety.model.AiTask;
3
import java.util.Arrays;
4
import java.util.HashMap;
5
import java.util.List;
6
import java.util.Map;
12 7
13
import org.slf4j.Logger;
14
import org.slf4j.LoggerFactory;
15 8
import org.springframework.beans.factory.annotation.Autowired;
16 9
import org.springframework.stereotype.Controller;
17 10
import org.springframework.web.bind.annotation.ModelAttribute;
@ -19,10 +12,14 @@ import org.springframework.web.bind.annotation.RequestBody;
19 12
import org.springframework.web.bind.annotation.RequestMapping;
20 13
import org.springframework.web.bind.annotation.ResponseBody;
21 14
22
import java.util.Arrays;
23
import java.util.HashMap;
24
import java.util.List;
25
import java.util.Map;
15
import com.ai.abc.api.model.CommonResponse;
16
import com.ai.bss.components.common.model.PageBean;
17
import com.ai.bss.security.protection.model.AiQuery;
18
import com.ai.bss.security.protection.service.interfaces.SysConfigAiTaskService;
19
import com.ai.bss.security.protection.utils.EbcConstant;
20
import com.ai.bss.security.protection.utils.IDUtils;
21
import com.ai.bss.work.safety.model.AiModel;
22
import com.ai.bss.work.safety.model.AiTask;
26 23
27 24
/**
28 25
 * 系统配置-AI任务
@ -30,10 +27,8 @@ import java.util.Map;
30 27
@Controller
31 28
@RequestMapping("/sysConfigAiTask")
32 29
public class SysConfigAiTaskController {
33
	Logger logger = LoggerFactory.getLogger(SysConfigAiTaskController.class);
34
35 30
	@Autowired
36
	SysConfigAiTaskService sysConfigAiTaskService;
31
	private SysConfigAiTaskService sysConfigAiTaskService;
37 32
38 33
	/**
39 34
	 * 分页查询AI任务

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

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

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

@ -1,13 +1,17 @@
1 1
package com.ai.bss.security.protection.controller;
2 2
3
import org.springframework.beans.factory.annotation.Autowired;
4
import org.springframework.stereotype.Controller;
5
import org.springframework.web.bind.annotation.ModelAttribute;
6
import org.springframework.web.bind.annotation.RequestBody;
7
import org.springframework.web.bind.annotation.RequestMapping;
8
import org.springframework.web.bind.annotation.RequestParam;
9
import org.springframework.web.bind.annotation.ResponseBody;
10
3 11
import com.ai.abc.api.model.CommonResponse;
4 12
import com.ai.bss.security.protection.service.interfaces.WorkShiftService;
5 13
import com.ai.bss.work.task.model.common.WorkShift;
6 14
import com.alibaba.fastjson.JSONObject;
7
import org.springframework.beans.factory.annotation.Autowired;
8
import org.springframework.boot.jackson.JsonObjectSerializer;
9
import org.springframework.stereotype.Controller;
10
import org.springframework.web.bind.annotation.*;
11 15
12 16
@Controller
13 17
@RequestMapping("/workShift")

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

@ -6,8 +6,6 @@ import java.util.List;
6 6
import java.util.Map;
7 7
8 8
import org.apache.commons.lang.StringUtils;
9
import org.slf4j.Logger;
10
import org.slf4j.LoggerFactory;
11 9
import org.springframework.beans.factory.annotation.Autowired;
12 10
import org.springframework.stereotype.Service;
13 11
import org.springframework.util.CollectionUtils;
@ -31,8 +29,6 @@ import com.ai.bss.user.service.api.UserDtoQuery;
31 29
32 30
@Service
33 31
public class EmployeeManagementServiceImpl implements EmployeeManagementService {
34
	Logger logger = LoggerFactory.getLogger(EmployeeManagementServiceImpl.class);
35
36 32
	@Autowired
37 33
	private UserDtoQuery userDtoQuery;
38 34

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

@ -1,21 +1,23 @@
1 1
package com.ai.bss.security.protection.service.impl;
2 2
3 3
4
import com.ai.bss.security.protection.model.User;
5
import com.ai.bss.security.protection.service.interfaces.LoginService;
6
import com.ai.bss.security.protection.utils.HttpServiceUtil;
7
import com.alibaba.fastjson.JSON;
4
import java.nio.charset.Charset;
5
import java.util.HashMap;
6
import java.util.List;
7
import java.util.Map;
8
9
import javax.servlet.http.Cookie;
10
import javax.servlet.http.HttpServletRequest;
11
8 12
import org.slf4j.Logger;
9 13
import org.slf4j.LoggerFactory;
10 14
import org.springframework.beans.factory.annotation.Value;
11 15
import org.springframework.stereotype.Service;
12 16
13
import javax.servlet.http.Cookie;
14
import javax.servlet.http.HttpServletRequest;
15
import java.nio.charset.Charset;
16
import java.util.HashMap;
17
import java.util.List;
18
import java.util.Map;
17
import com.ai.bss.security.protection.model.User;
18
import com.ai.bss.security.protection.service.interfaces.LoginService;
19
import com.ai.bss.security.protection.utils.HttpServiceUtil;
20
import com.alibaba.fastjson.JSON;
19 21
20 22
/**
21 23
 * @Auther: 王超
@ -26,7 +28,7 @@ import java.util.Map;
26 28
@Service
27 29
public class LoginServiceImpl implements LoginService {
28 30
29
    Logger logger = LoggerFactory.getLogger(LoginServiceImpl.class);
31
	private Logger logger = LoggerFactory.getLogger(LoginServiceImpl.class);
30 32
31 33
    @Value("${uspa.login.vercode}")
32 34
    private String verCode;

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

@ -99,14 +99,4 @@ public class EbcConstant {
99 99
	//审核状态:未生效(未审核通过)
100 100
	public static final String AUDIT_STATUS_DIS="3";
101 101
	
102
	
103
	// 当前登录者的STAFF_ID
104
	public static String USPA_USER_STAFF_ID = "201613310867";
105
	// 当前登录者ID
106
	public static String USPA_USER_CODE = "wh";
107
	// 当前登录者部门
108
	public static String USPA_USER_ORG_ID = "1";
109
	// 当前登录者部门
110
	public static String USPA_USER_ORG_CODE = "0000";
111
112 102
}

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

@ -1,6 +1,18 @@
1 1
package com.ai.bss.security.protection.utils;
2 2
3
import com.alibaba.fastjson.JSONObject;
3
import java.io.BufferedReader;
4
import java.io.IOException;
5
import java.io.InputStream;
6
import java.io.InputStreamReader;
7
import java.io.UnsupportedEncodingException;
8
import java.net.HttpURLConnection;
9
import java.net.URL;
10
import java.net.URLEncoder;
11
import java.nio.charset.Charset;
12
import java.util.Iterator;
13
import java.util.Map;
14
import java.util.Set;
15
4 16
import org.apache.http.HttpEntity;
5 17
import org.apache.http.HttpStatus;
6 18
import org.apache.http.client.ClientProtocolException;
@ -20,14 +32,7 @@ import org.slf4j.Logger;
20 32
import org.slf4j.LoggerFactory;
21 33
import org.springframework.util.CollectionUtils;
22 34
23
import java.io.*;
24
import java.net.HttpURLConnection;
25
import java.net.URL;
26
import java.net.URLEncoder;
27
import java.nio.charset.Charset;
28
import java.util.Iterator;
29
import java.util.Map;
30
import java.util.Set;
35
import com.alibaba.fastjson.JSONObject;
31 36
32 37
/**
33 38
 * http服务请求工具类
@ -35,7 +40,7 @@ import java.util.Set;
35 40
 * @author chencai
36 41
 */
37 42
public class HttpServiceUtil {
38
	static Logger log = LoggerFactory.getLogger(HttpServiceUtil.class);
43
	private static Logger log = LoggerFactory.getLogger(HttpServiceUtil.class);
39 44
40 45
	private static final String HTTP_CONTENT_TYPE_JSON = "application/json; charset=utf-8";
41 46

common-ui - Nuosi Git Service

AIoT前端公共UI

liuyang b53d9d73ad create: 创建common-ui工程 2 年之前
..
Drawer.vue b53d9d73ad create: 创建common-ui工程 2 年之前