el="diff-18955a52ffadb4ae41ae1efd9af5d722475c4247R14">14
import com.ai.abc.exception.BaseException;
@ -13,15 +22,8 @@ import com.ai.bss.work.attendance.service.api.AttendanceQuery;
13 22
import com.ai.bss.work.attendance.service.api.inparam.AttendanceRuleParams;
14 23
import com.ai.bss.work.task.model.common.WorkShift;
15 24
import com.ai.bss.work.task.model.common.WorkTaskSpecPlan;
16
import lombok.extern.slf4j.Slf4j;
17
import org.apache.commons.lang.StringUtils;
18
import org.springframework.beans.factory.annotation.Autowired;
19
import org.springframework.stereotype.Service;
20 25
21
import java.text.SimpleDateFormat;
22
import java.util.Date;
23
import java.util.HashMap;
24
import java.util.Map;
26
import lombok.extern.slf4j.Slf4j;
25 27
26 28
@Slf4j
27 29
@Service

+ 7 - 7
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/InAndOutRecordServiceImpl.java

@ -1,5 +1,12 @@
1 1
package com.ai.bss.security.protection.service.impl;
2 2
3
import java.util.HashMap;
4
import java.util.List;
5
import java.util.Map;
6
7
import org.springframework.beans.factory.annotation.Autowired;
8
import org.springframework.stereotype.Service;
9
3 10
import com.ai.abc.api.model.CommonRequest;
4 11
import com.ai.abc.api.model.CommonResponse;
5 12
import com.ai.bss.components.common.model.PageBean;
@ -9,13 +16,6 @@ import com.ai.bss.user.service.api.EmployeeService;
9 16
import com.ai.bss.work.safety.service.api.AiTaskQuery;
10 17
import com.ai.bss.work.tool.service.api.ResourceToolQuery;
11 18
import com.alibaba.fastjson.JSON;
12
import org.apache.bcel.verifier.statics.LONG_Upper;
13
import org.springframework.beans.factory.annotation.Autowired;
14
import org.springframework.stereotype.Service;
15
16
import java.util.HashMap;
17
import java.util.List;
18
import java.util.Map;
19 19
20 20
/**
21 21
 * @Auther: 王超

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

@ -28,7 +28,7 @@ import com.alibaba.fastjson.JSON;
28 28
@Service
29 29
public class LoginServiceImpl implements LoginService {
30 30
31
	private Logger logger = LoggerFactory.getLogger(LoginServiceImpl.class);
31
	private static final Logger logger = LoggerFactory.getLogger(LoginServiceImpl.class);
32 32
33 33
    @Value("${uspa.login.vercode}")
34 34
    private String verCode;

+ 10 - 8
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/MonitorSceneTerminalServiceImpl.java

@ -1,5 +1,14 @@
1 1
package com.ai.bss.security.protection.service.impl;
2 2
3
import java.util.ArrayList;
4
import java.util.HashMap;
5
import java.util.List;
6
import java.util.Map;
7
8
import org.apache.commons.lang.StringUtils;
9
import org.springframework.beans.factory.annotation.Autowired;
10
import org.springframework.stereotype.Service;
11
3 12
import com.ai.abc.api.model.CommonRequest;
4 13
import com.ai.abc.api.model.CommonResponse;
5 14
import com.ai.abc.exception.BaseException;
@ -10,15 +19,8 @@ import com.ai.bss.work.safety.model.MonitorSceneTerminalRel;
10 19
import com.ai.bss.work.safety.service.api.AiTaskQuery;
11 20
import com.ai.bss.work.safety.service.api.MonitorSceneCommand;
12 21
import com.ai.bss.work.safety.service.api.MonitorSceneQuery;
13
import lombok.extern.slf4j.Slf4j;
14
import org.apache.commons.lang.StringUtils;
15
import org.springframework.beans.factory.annotation.Autowired;
16
import org.springframework.stereotype.Service;
17 22
18
import java.util.ArrayList;
19
import java.util.HashMap;
20
import java.util.List;
21
import java.util.Map;
23
import lombok.extern.slf4j.Slf4j;
22 24
23 25
@Slf4j
24 26
@Service

+ 5 - 6
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/MonitorVideoLogManageServiceImpl.java

@ -4,14 +4,8 @@ import java.io.ByteArrayInputStream;
4 4
import java.io.InputStream;
5 5
import java.util.ArrayList;
6 6
import java.util.Date;
7
import java.util.HashMap;
8 7
import java.util.List;
9
import java.util.Map;
10 8
11
import cn.hutool.core.lang.UUID;
12
import com.ai.bss.components.minio.service.MinioService;
13
import com.ai.bss.security.protection.model.SecurityProtectionMinioConfig;
14
import com.ai.bss.security.protection.service.interfaces.UploadFileService;
15 9
import org.apache.commons.lang.StringUtils;
16 10
import org.springframework.beans.factory.annotation.Autowired;
17 11
import org.springframework.stereotype.Service;
@ -20,14 +14,19 @@ import org.springframework.util.CollectionUtils;
20 14
import com.ai.abc.api.model.CommonRequest;
21 15
import com.ai.abc.api.model.CommonResponse;
22 16
import com.ai.bss.components.common.util.ComponentReflectionUtils;
17
import com.ai.bss.components.minio.service.MinioService;
23 18
import com.ai.bss.security.protection.model.EbcMonitorVideoLog;
19
import com.ai.bss.security.protection.model.SecurityProtectionMinioConfig;
24 20
import com.ai.bss.security.protection.service.interfaces.MonitorVideoLogManageService;
21
import com.ai.bss.security.protection.service.interfaces.UploadFileService;
25 22
import com.ai.bss.security.protection.utils.DateUtil;
26 23
import com.ai.bss.security.protection.utils.EbcConstant;
27 24
import com.ai.bss.work.safety.model.MonitorVideoLog;
28 25
import com.ai.bss.work.safety.service.api.MonitorSceneCommand;
29 26
import com.ai.bss.work.safety.service.api.MonitorSceneQuery;
30 27
28
import cn.hutool.core.lang.UUID;
29
31 30
@Service
32 31
public class MonitorVideoLogManageServiceImpl implements MonitorVideoLogManageService {
33 32

+ 6 - 7
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/SysConfigAiTaskServiceImpl.java

@ -1,21 +1,20 @@
1 1
package com.ai.bss.security.protection.service.impl;
2 2
3
import java.util.List;
4
import java.util.Map;
5
6
import org.springframework.beans.factory.annotation.Autowired;
7
import org.springframework.stereotype.Service;
8
3 9
import com.ai.abc.api.model.CommonRequest;
4 10
import com.ai.abc.api.model.CommonResponse;
5 11
import com.ai.bss.components.common.model.PageBean;
6
import com.ai.bss.security.protection.model.AiQuery;
7 12
import com.ai.bss.security.protection.service.interfaces.SysConfigAiTaskService;
8 13
import com.ai.bss.work.safety.model.AiModel;
9 14
import com.ai.bss.work.safety.model.AiTask;
10 15
import com.ai.bss.work.safety.service.api.AiTaskCommand;
11 16
import com.ai.bss.work.safety.service.api.AiTaskQuery;
12 17
import com.ai.bss.work.service.api.WorkTaskCommand;
13
import com.ai.bss.work.task.model.common.WorkTask;
14
import org.springframework.beans.factory.annotation.Autowired;
15
import org.springframework.stereotype.Service;
16
17
import java.util.List;
18
import java.util.Map;
19 18
20 19
/**
21 20
 * @Auther: 王超

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

@ -15,7 +15,6 @@ import org.springframework.web.multipart.MultipartFile;
15 15
16 16
import com.ai.abc.api.model.CommonRequest;
17 17
import com.ai.abc.api.model.CommonResponse;
18
import com.ai.abc.exception.BaseException;
19 18
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
20 19
import com.ai.bss.components.common.model.PageBean;
21 20
import com.ai.bss.components.common.util.JsonUtils;

+ 8 - 6
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/WorkShiftServiceImpl.java

@ -1,5 +1,12 @@
1 1
package com.ai.bss.security.protection.service.impl;
2 2
3
import java.util.ArrayList;
4
import java.util.List;
5
6
import org.apache.commons.lang.StringUtils;
7
import org.springframework.beans.factory.annotation.Autowired;
8
import org.springframework.stereotype.Service;
9
3 10
import com.ai.abc.api.model.CommonRequest;
4 11
import com.ai.abc.api.model.CommonResponse;
5 12
import com.ai.abc.exception.BaseException;
@ -11,13 +18,8 @@ import com.ai.bss.work.service.api.WorkTaskSpecPlanQuery;
11 18
import com.ai.bss.work.task.model.common.WorkShift;
12 19
import com.alibaba.fastjson.JSON;
13 20
import com.alibaba.fastjson.serializer.SerializerFeature;
14
import lombok.extern.slf4j.Slf4j;
15
import org.apache.commons.lang.StringUtils;
16
import org.springframework.beans.factory.annotation.Autowired;
17
import org.springframework.stereotype.Service;
18 21
19
import java.util.ArrayList;
20
import java.util.List;
22
import lombok.extern.slf4j.Slf4j;
21 23
22 24
@Slf4j
23 25
@Service

+ 5 - 6
security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/AiAlarmManageService.java

@ -1,16 +1,15 @@
1 1
package com.ai.bss.security.protection.service.interfaces;
2 2
3
import com.ai.abc.api.model.CommonRequest;
4
import com.ai.abc.api.model.CommonResponse;
5
import com.ai.bss.components.common.model.PageBean;
6
import com.ai.bss.work.safety.model.AiModel;
7
import com.ai.bss.work.task.model.common.WorkTask;
8
9 3
import java.util.List;
10 4
import java.util.Map;
11 5
12 6
import org.springframework.web.bind.annotation.RequestParam;
13 7
8
import com.ai.abc.api.model.CommonRequest;
9
import com.ai.abc.api.model.CommonResponse;
10
import com.ai.bss.components.common.model.PageBean;
11
import com.ai.bss.work.task.model.common.WorkTask;
12
14 13
public interface AiAlarmManageService {
15 14
	CommonResponse<PageBean<Map<String, Object>>> queryPageAiAlarm(Map<String, Object> params, int pageNumber,
16 15
			int pageSize)throws Exception;

+ 2 - 1
security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/AreaInRecordService.java

@ -1,8 +1,9 @@
1 1
package com.ai.bss.security.protection.service.interfaces;
2 2
3
import com.github.pagehelper.PageInfo;
4 3
import java.util.Map;
5 4
5
import com.github.pagehelper.PageInfo;
6
6 7
/**
7 8
 * 考勤管理
8 9
 * @author konghl@asiainfo.com

+ 3 - 3
security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/AttendanceCommonService.java

@ -1,14 +1,14 @@
1 1
package com.ai.bss.security.protection.service.interfaces;
2 2
3
import java.util.List;
4
import java.util.Map;
5
3 6
import com.ai.abc.api.model.CommonRequest;
4 7
import com.ai.abc.api.model.CommonResponse;
5 8
import com.ai.bss.components.common.model.PageBean;
6 9
import com.ai.bss.person.model.Organization;
7 10
import com.ai.bss.user.dto.UserDto;
8 11
9
import java.util.List;
10
import java.util.Map;
11
12 12
public interface AttendanceCommonService {
13 13
    /**
14 14
     * 人员列表分页查询

+ 2 - 4
security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/AttendanceReportService.java

@ -1,11 +1,9 @@
1 1
package com.ai.bss.security.protection.service.interfaces;
2 2
3
import java.util.Map;
4
3 5
import com.ai.abc.api.model.CommonResponse;
4 6
import com.ai.bss.components.common.model.PageBean;
5
import com.github.pagehelper.PageInfo;
6
7
import java.util.List;
8
import java.util.Map;
9 7
10 8
public interface AttendanceReportService {
11 9
    CommonResponse<PageBean<Map<String,Object>>> queryMonthlyAttendanceReport(Map<String, Object> params, int pageNumber, int pageSize);

+ 2 - 2
security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/AttendanceRulesService.java

@ -1,9 +1,9 @@
1 1
package com.ai.bss.security.protection.service.interfaces;
2 2
3
import com.ai.bss.security.protection.dto.AttendanceRuleDto;
4
5 3
import java.util.Map;
6 4
5
import com.ai.bss.security.protection.dto.AttendanceRuleDto;
6
7 7
public interface AttendanceRulesService {
8 8
9 9
    /**

+ 1 - 1
security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/EmployeeManagementService.java

@ -3,10 +3,10 @@ package com.ai.bss.security.protection.service.interfaces;
3 3
import java.util.List;
4 4
import java.util.Map;
5 5
6
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
7 6
import org.springframework.web.multipart.MultipartFile;
8 7
9 8
import com.ai.abc.api.model.CommonResponse;
9
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
10 10
import com.ai.bss.components.common.model.PageBean;
11 11
import com.ai.bss.person.model.Organization;
12 12
import com.ai.bss.user.dto.EmployeeDto;

+ 2 - 2
security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/InAndOutRecordService.java

@ -1,10 +1,10 @@
1 1
package com.ai.bss.security.protection.service.interfaces;
2 2
3
import java.util.Map;
4
3 5
import com.ai.abc.api.model.CommonResponse;
4 6
import com.ai.bss.components.common.model.PageBean;
5 7
6
import java.util.Map;
7
8 8
public interface InAndOutRecordService {
9 9
    CommonResponse<PageBean<Map<String, Object>>> queryPageInAndOutRecord(Map<String, Object> params, int pageNumber, int pageSize);
10 10

+ 3 - 2
security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/LoginService.java

@ -2,10 +2,11 @@ package com.ai.bss.security.protection.service.interfaces;
2 2
3 3
4 4
5
import com.ai.bss.security.protection.model.User;
5
import java.util.Map;
6 6
7 7
import javax.servlet.http.HttpServletRequest;
8
import java.util.Map;
8
9
import com.ai.bss.security.protection.model.User;
9 10
10 11
/**
11 12
 * @Auther: 王超

+ 3 - 3
security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/MonitorSceneTerminalService.java

@ -1,12 +1,12 @@
1 1
package com.ai.bss.security.protection.service.interfaces;
2 2
3
import java.util.List;
4
import java.util.Map;
5
3 6
import com.ai.abc.api.model.CommonResponse;
4 7
import com.ai.bss.components.common.model.PageBean;
5 8
import com.ai.bss.work.safety.model.MonitorSceneTerminalRel;
6 9
7
import java.util.List;
8
import java.util.Map;
9
10 10
public interface MonitorSceneTerminalService {
11 11
12 12
    /**

+ 3 - 6
security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/SysConfigAiTaskService.java

@ -1,15 +1,12 @@
1 1
package com.ai.bss.security.protection.service.interfaces;
2 2
3
import com.ai.abc.api.model.CommonRequest;
3
import java.util.List;
4
import java.util.Map;
5
4 6
import com.ai.abc.api.model.CommonResponse;
5 7
import com.ai.bss.components.common.model.PageBean;
6
import com.ai.bss.security.protection.model.AiQuery;
7 8
import com.ai.bss.work.safety.model.AiModel;
8 9
import com.ai.bss.work.safety.model.AiTask;
9
import com.ai.bss.work.task.model.common.WorkTask;
10
11
import java.util.List;
12
import java.util.Map;
13 10
14 11
public interface SysConfigAiTaskService {
15 12
    CommonResponse<PageBean<Map<String, Object>>> queryPageAiTask(Map<String, Object> params, int pageNumber, int pageSize);

+ 5 - 5
security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/WorkOrderManagementService.java

@ -1,13 +1,13 @@
1 1
package com.ai.bss.security.protection.service.interfaces;
2 2
3
import com.ai.abc.api.model.CommonResponse;
4
import com.ai.bss.components.common.model.PageBean;
5
import com.ai.bss.work.task.model.common.WorkEvent;
3
import java.util.List;
4
import java.util.Map;
6 5
7 6
import org.springframework.web.multipart.MultipartFile;
8 7
9
import java.util.List;
10
import java.util.Map;
8
import com.ai.abc.api.model.CommonResponse;
9
import com.ai.bss.components.common.model.PageBean;
10
import com.ai.bss.work.task.model.common.WorkEvent;
11 11
12 12
public interface WorkOrderManagementService {
13 13

+ 2 - 2
security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/WorkShiftService.java

@ -1,10 +1,10 @@
1 1
package com.ai.bss.security.protection.service.interfaces;
2 2
3
import java.util.List;
4
3 5
import com.ai.abc.api.model.CommonResponse;
4 6
import com.ai.bss.work.task.model.common.WorkShift;
5 7
6
import java.util.List;
7
8 8
public interface WorkShiftService {
9 9
10 10
    /**

+ 0 - 2
security-protection-service/src/main/java/com/ai/bss/security/protection/service/task/AiResultRecordKafkaTask.java

@ -6,10 +6,8 @@ import java.util.concurrent.FutureTask;
6 6
7 7
import org.apache.kafka.clients.consumer.ConsumerRecord;
8 8
import org.springframework.beans.factory.annotation.Autowired;
9
import org.springframework.core.task.TaskExecutor;
10 9
import org.springframework.kafka.annotation.KafkaListener;
11 10
import org.springframework.kafka.support.Acknowledgment;
12
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
13 11
import org.springframework.stereotype.Component;
14 12
import org.springframework.util.CollectionUtils;
15 13

+ 3 - 2
security-protection-service/src/main/java/com/ai/bss/security/protection/service/task/MirrorManagement.java

@ -1,11 +1,12 @@
1 1
package com.ai.bss.security.protection.service.task;
2 2
3
import org.slf4j.Logger;
4
import org.slf4j.LoggerFactory;
5
3 6
import com.ai.ipu.server.connect.ps.EventChannelTool;
4 7
import com.ai.ipu.server.connect.ps.EventChannelTool.PublisherEvent;
5 8
import com.ai.ipu.server.connect.ps.ISubscriber;
6 9
import com.ai.ipu.server.connect.ps.impl.Publisher;
7
import org.slf4j.Logger;
8
import org.slf4j.LoggerFactory;
9 10
10 11
/**
11 12
 * 镜屏推送消息

+ 2 - 14
security-protection-service/src/main/java/com/ai/bss/security/protection/service/task/MirrorSendAiDataThread.java

@ -1,21 +1,9 @@
1 1
package com.ai.bss.security.protection.service.task;
2 2
3
import com.ai.abc.api.model.CommonRequest;
4
import com.ai.abc.api.model.CommonResponse;
5
import com.ai.bss.security.protection.service.interfaces.CharSpecService;
6
import com.ai.bss.work.task.model.common.WorkTask;
7
import com.ai.bss.worker.service.api.EntityAlarmHandle;
8
import com.alibaba.fastjson.JSON;
9
import com.alibaba.fastjson.JSONObject;
10
import org.apache.commons.collections4.map.HashedMap;
3
import java.util.concurrent.Callable;
4
11 5
import org.slf4j.Logger;
12 6
import org.slf4j.LoggerFactory;
13
import org.springframework.beans.factory.annotation.Autowired;
14
import org.springframework.beans.factory.annotation.Qualifier;
15
import org.springframework.stereotype.Component;
16
17
import java.util.Map;
18
import java.util.concurrent.Callable;
19 7
20 8
public class MirrorSendAiDataThread implements Callable<Integer> {
21 9
	private Logger logger = LoggerFactory.getLogger(MirrorSendAiDataThread.class);

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

@ -40,7 +40,7 @@ import com.alibaba.fastjson.JSONObject;
40 40
 * @author chencai
41 41
 */
42 42
public class HttpServiceUtil {
43
	private static Logger log = LoggerFactory.getLogger(HttpServiceUtil.class);
43
	private static final 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

android-share - Nuosi Git Service

ipu的trunk版的android工程和服务端工程。

build.gradle 1.9KB

    apply plugin: 'com.android.application' android { compileSdkVersion 30 defaultConfig { applicationId "com.ai.ipu.superapp" minSdkVersion 16 targetSdkVersion 26 multiDexEnabled = true versionCode = 3 versionName = "1.0" ndk { abiFilters "armeabi-v7a", "x86", "mips", "armeabi" } } signingConfigs { release { keyAlias 'showshow' keyPassword 'showshow' storeFile file('showshow.keystore') storePassword 'showshow' } } buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' signingConfig signingConfigs.release } } repositories{ flatDir{ dirs '../ipu-mobile-common/libs','../ipu-mobile-libs/libs' } } } //apply plugin: 'replugin-host-gradle' //repluginHostConfig { // useAppCompat = true //} dependencies { implementation(name: 'ipu-mobile-framework', ext: 'aar') implementation project(':ipu-mobile-common') implementation project(':ipu-mobile-libs') // implementation project(':ipu-scan') // implementation project(':ipu-push-jpush') // implementation project(':ipu-map-gd') // implementation project(':ipu-mobile-framework') implementation(name:'ipu-scan-1.0', ext:'aar') implementation(name:'ipu-map-gd-1.0', ext:'aar') // implementation(name:'ipu-map-bd-1.0', ext:'aar') implementation(name:'ipu-push-jpush-1.0', ext:'aar') implementation(name:'ipu-customcamera-1.0', ext:'aar') implementation 'com.android.support:appcompat-v7:27.0.1' // implementation 'com.qihoo360.replugin:replugin-host-lib:2.3.1' implementation 'com.github.getActivity:XXPermissions:12.6' implementation 'com.android.support:appcompat-v7:23.0.1' //implementation 'com.qihoo360.replugin:replugin-host-lib:2.3.1' }