26 
@Service

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

@ -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
Näytä tiedosto 

@ -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
Näytä tiedosto 

@ -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
Näytä tiedosto 

@ -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
Näytä tiedosto 

@ -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
Näytä tiedosto 

@ -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
Näytä tiedosto 

@ -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
Näytä tiedosto 

@ -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
Näytä tiedosto 

@ -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
Näytä tiedosto 

@ -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
Näytä tiedosto 

@ -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
Näytä tiedosto 

@ -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
Näytä tiedosto 

@ -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
Näytä tiedosto 

@ -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
Näytä tiedosto 

@ -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
Näytä tiedosto 

@ -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
Näytä tiedosto 

@ -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
Näytä tiedosto 

@ -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
Näytä tiedosto 

@ -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
Näytä tiedosto 

@ -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

ipu/android-share - Nuosi Git Service
Etusivu Tutki Apua
Kirjaudu sisään
ipu
/
android-share
Tarkkaile 6
Äänestä 0
Fork 0
Koodi Ongelmat 1 Pull-pyynnöt 1 Commitit 1193 Julkaisut 4 Wiki
Puu: 4eca3daa83
Branchit Tagit

1193 Commitit (4eca3daa835113004765363d77b079501a97440d)

Tekijä SHA1 Viesti Päivämäärä
  leijie 4eca3daa83 openTemplate方法变更引起的新增参数 8 vuotta sitten
  leijie 82ae3df025 更新视频压缩储存 8 vuotta sitten
  leijie 61ee8311be 暂时注释掉插件入口 8 vuotta sitten
  leijie d2b3aafcc2 自定义dislpay网络连接错误提示 8 vuotta sitten
  leijie 67e14af1d4 压缩后的视频 取名变更 8 vuotta sitten
  leijie ba24b2691d 新增物理按键监听&&demo(basic页面为例) 8 vuotta sitten
  leijie 0533c5719a 新增loadpage&loadTemplate到action配置 8 vuotta sitten
  leijie d605f3174c 更新loadPage&loadTemplate功能&demo 8 vuotta sitten
  leijie 2cf809f4f5 Merge branch 'master' of http://10.1.235.20:3000/ipu/android-share 8 vuotta sitten
  huangbo a48d02848f 回复display-server的pom.xml文件 8 vuotta sitten
  leijie 07ddc1ca89 更新提交pom.xml 8 vuotta sitten
  leijie f5fd318d92 ipu-voice-lib新增armeabi 8 vuotta sitten
  kevin a0cba594e4 update 8 vuotta sitten
  leijie f655d0ee9d 新增判断是否同一视图逻辑；新增loadTemplate与loadPage； 8 vuotta sitten
  kevin e4a73df1d3 更新内容： 8 vuotta sitten
  leijie b98e051315 iframe子页面部署地址改变 8 vuotta sitten
  leijie b4aaa44347 init ipu-voice-lib 8 vuotta sitten
  leijie 9348214802 修复分享文字无法刷新文字bug 8 vuotta sitten
  leijie 75d9d5c47b 更新百度地图key值 8 vuotta sitten
  leijie d11af9ec61 修复加载ffmpeg加载问题和bug 8 vuotta sitten
  leijie ed20315b77 云吧bug修复 8 vuotta sitten
  leijie 58b9478f14 删除快捷入口插件标签 8 vuotta sitten
  leijie 55dff86e8b 更新wade-mobile(动态plugin代码更新) 8 vuotta sitten
  leijie 575c71c6f4 Merge branch 'master' of http://10.1.235.20:3000/ipu/android-share 8 vuotta sitten
  leijie 1c41c47162 mail项目优化 8 vuotta sitten
  huangbo d81ff7bcf6 指定一下maven-dependency-plugin的版本 8 vuotta sitten
  leijie 5eabf9a36e 移除快捷入口源码 8 vuotta sitten
  leijie fefacac107 初始化快捷入口lib 8 vuotta sitten
  leijie 922c74a2fc display新增ipu快捷菜单入口demo 8 vuotta sitten
  leijie d376d3392b 修改判断扇形半径的逻辑位置 8 vuotta sitten
  leijie 86ff00b18b 初始化新版ipu快捷菜单入口 8 vuotta sitten
  huangbo c2df860a37 pom优化 8 vuotta sitten
  chengwb3 8fc4df2280 使用私服后，maven优化第一部分提交 8 vuotta sitten
  chengwb3 773e1331da 提交后，待测试 8 vuotta sitten
  leijie b5e9544149 Merge branch 'master' of http://10.1.235.20:3000/ipu/android-share 8 vuotta sitten
  leijie e6daf2a2c8 新增cpu-count.jar & 更新wade-mobile.jar & 引入插码 8 vuotta sitten
  wangyj18 13bc0d2e28 Merge branch 'master' of http://10.1.235.20:3000/ipu/android-share.git 8 vuotta sitten
  wangyj18 80434a2ecd 更新.classpath 8 vuotta sitten
  huangbo cb4af08773 Android SDK升级 8 vuotta sitten
  huangbo 804002d20c Android4.0.3升级为Android5.1.1 8 vuotta sitten
  leijie 29a5cb0c17 Merge branch 'master' of http://10.1.235.20:3000/ipu/android-share 8 vuotta sitten
  leijie 99e7fad68a project.properties 8 vuotta sitten
  leijie 3c9346536c display配置修改 8 vuotta sitten
  huangbo 3534b1a71f Merge branch 'master' of http://10.1.235.20:3000/ipu/android-share.git 8 vuotta sitten
  huangbo d69a4d0fa6 统计分析插码 8 vuotta sitten
  leijie 697e11c8a6 Merge branch 'master' of http://10.1.235.20:3000/ipu/android-share 8 vuotta sitten
  leijie b408a07332 更新alertdialog properties 8 vuotta sitten
  leijie 58f5279bf8 高德地图定位成功展示js方法修改 8 vuotta sitten
  huangbo b8d20489df ipu-alertdialog更新 8 vuotta sitten
  leijie 6eb2aac276 更新wade-mobile.jar 8 vuotta sitten