es-num"> 
@ -307,10 +319,12 @@ export default {
307 319 
    showAddDeviceModal () {
308 320 
      this.addDeviceModal = true
309 321 
    },
322 
    // 编辑新增用户信息
310 323 
    async editDeviceData (id) {
311 
      const res = await sysapi.getDeviceInfo(id)
324 
      const res = await sysapi.getOneEmployee({ params: { employeeId: id } })
312 325 
      if (res.status === 200) {
313 
        this.currentEditDevice = res.data
326 
        this.currentEditDevice = res.data.data
327 
        console.log(this.currentEditDevice)
314 328 
      } else {
315 329 
        this.$Message.danger('设备数据获取失败！')
316 330 
      }

+ 4 - 4
security-protection-platform/src/modules/videoSurveillance/components/ReplayDialog/index.vue
Целия файл 

@ -70,10 +70,10 @@ export default {
70 70 
      videoList: [],
71 71 
      // 视频播放器对象
72 72 
      $player: null,
73 
      // 开始时间
74 
      beginDay: '2020-12-19 20:14:00',
75 
      // 结束时间
76 
      endDay: '2020-12-19 20:14:59',
73 
      //   开始时间
74 
      beginDay: formatDateTime(new Date(+new Date() - 10 * 60 * 1000), 'yyyy-MM-dd hh:mm:ss'),
75 
      //   结束时间
76 
      endDay: formatDateTime(new Date(), 'yyyy-MM-dd hh:mm:ss'),
77 77 
      isShow: true,
78 78 
      playerOptions: {
79 79 
        playbackRates: [0.7, 1.0, 1.5, 2.0], // 播放速度

+ 27 - 7
security-protection-platform/src/modules/videoSurveillance/distinguishRecord/index.vue
Целия файл 

@ -44,10 +44,14 @@
44 44 
        </div>
45 45 
      </div>
46 46 
      <div class="img-viewer">
47 
        <div v-for="(item,index) in dataImg" :key="index" :src="item.idenPictureUrl" class="image-carousel">
48 
          <img :src="'http://10.19.90.34:19000/ai-image/'+item.idenPictureUrl" class="img-viewer-size" @click="getParticularsData(item.aiIdenLogId,index)">
49 
          <span :class="{'fileName' : index === fileNameIndex}" style="width: 132px;margin-right: 14px;text-align:center">{{ item.fileName }}</span>
50 
        </div>
47 
        <t-carousel dots="none" arrow="always" style="width: 100%">
48 
          <t-carousel-item v-for="(item1,index1) in dataImgList" :key="index1" style="width: 100%;padding-left: 10%">
49 
            <div v-for="(item, index) in item1" :key="index" :src="item.idenPictureUrl" class="image-carousel">
50 
              <img :src="'http://10.19.90.34:19000/ai-image/'+item.idenPictureUrl" class="img-viewer-size" @click="getParticularsData(item.aiIdenLogId,index)">
51 
              <span :class="{'fileName' : index === fileNameIndex}" style="width: 132px;margin-right: 14px;text-align:center">{{ item.fileName }}</span>
52 
            </div>
53 
          </t-carousel-item>
54 
        </t-carousel>
51 55 
      </div>
52 56 
    </div>
53 57 
  </div>
 
@ -65,6 +69,7 @@ export default {
65 69 
      devicePosition: '',
66 70 
      distinguishUrl: '',
67 71 
      dataImg: [],
72 
      dataImgList: [],
68 73 
      fileNameIndex: 0,
69 74 
      playerOptions: {
70 75 
        playbackRates: [0.7, 1.0, 1.5, 2.0], // 播放速度
 
@ -116,12 +121,13 @@ export default {
116 121 
      }
117 122 
      var flag = this.startreend(this.startDate, this.endDate)
118 123 
      if (flag) {
119 
        var data = { params: { beginDay: this.startDate, endDay: this.endDate, id: this.videoId }}
124 
        var data = { params: { beginDay: this.startDate, endDay: this.endDate, id: this.videoId, pageNumber: 1, pageSize: 10000 }}
120 125 
        sysapi.getDistinguishData(data).then(res => {
121 126 
          console.log(res.data)
122 127 
          this.dataImg = res.data.data
123 128 
          if (res.data.data.length > 0) {
124 129 
            this.getParticularsData(res.data.data[0].aiIdenLogId, 0)
130 
            this.dataImgList = this.arrayGroup(res.data.data, 10)
125 131 
          } else {
126 132 
            this.devicePosition = ''
127 133 
            this.defineResult = ''
 
@ -135,6 +141,14 @@ export default {
135 141 
        this.$Message.danger('开始时间不能在结束时间的后面')
136 142 
      }
137 143 
    },
144 
    arrayGroup(array, subGroupLength) {
145 
      let index = 0
146 
      let newArray = []
147 
      while(index < array.length) {
148 
        newArray.push(array.slice(index, index += subGroupLength))
149 
      }
150 
      return newArray
151 
    },
138 152 
    // 字符串更改为时间类型
139 153 
    stringtodate (date) {
140 154 
      date = date.substring(0, 19)
 
@ -240,16 +254,22 @@ export default {
240 254 
            display: flex;
241 255 
            .image-carousel{
242 256 
              display: flex;
257 
              width: 9%;
258 
              height: 80%;
243 259 
              flex-direction: column;
244 260 
              .img-viewer-size{
245 261 
                cursor:pointer;
246 
                width: 132px;
247 
                height: 88px;
262 
                width: 100%;
263 
                height: 100%;
248 264 
                margin-right: 14px;
265 
                padding-left: 2%;
249 266 
              }
250 267 
            }
251 268 
        }
252 269 
    }
270 
    .carousel-control-prev-icon{
271 
      color: #009bf3;
272 
    }
253 273 
}
254 274 
.fileName{
255 275 
  color: #009bf3;

+ 37 - 22
security-protection-platform/src/modules/videoSurveillance/index.vue
Целия файл 

@ -1,7 +1,7 @@
1 1 
<template>
2 2 
  <div class="page-main">
3 3 
    <t-button-group class="top-btn">
4 
      <t-button v-for="(item,index) in sceneList" :key="index" :value="item.monitorSceneId" :color="item.monitorSceneId === selectedMonitorScene ? 'primary' : 'secondary'" @click="tabClick(item.monitorSceneId)">
4 
      <t-button v-for="(item,index) in sceneList" :key="index" :value="item.monitorSceneId" :color="item.monitorSceneId === selectedMonitorScene ? 'primary' : 'secondary'" @click="tabClick(item.monitorSceneId, item.monitorViewLayout)">
5 5 
        {{ item.monitorSceneName }}
6 6 
      </t-button>
7 7 
    </t-button-group>
 
@ -125,7 +125,7 @@ export default {
125 125 
          btn1.className = 'aidicon aidicon-piechart-outline'
126 126 
          btn1.setAttribute('title', '视频回放')
127 127 
          btn1.addEventListener('click', () => {
128 
            this.handleReview(this.videoList[index].id)
128 
            this.handleReview(this.videoList[index].resourceToolId)
129 129 
          })
130 130 
          item.appendChild(txt)
131 131 
          item.appendChild(btn)
 
@ -141,20 +141,20 @@ export default {
141 141 
        if (element.id === this.gateFieldData) {
142 142 
          sysapi.getMonitorScene(this.organizationList[index].id).then((resp) => {
143 143 
            this.sceneList = resp.data.data || []
144 
            if (resp.data.data[0].monitorViewLayout === '1X1') {
145 
              this.viewLayoutSpan = 10
146 
              this.videoPageSize = 1
147 
            } else if (resp.data.data[0].monitorViewLayout === '2X2') {
148 
              this.viewLayoutSpan = 6
149 
              this.videoPageSize = 4
150 
            } else if (resp.data.data[0].monitorViewLayout === '3X3') {
151 
              this.viewLayoutSpan = 4
152 
              this.videoPageSize = 9
153 
            } else if (resp.data.data[0].monitorViewLayout === '4X4') {
154 
              this.viewLayoutSpan = 3
155 
              this.videoPageSize = 16
156 
            }
157 
            this.tabClick(this.sceneList[0].monitorSceneId)
144 
            // if (resp.data.data[0].monitorViewLayout === '1X1') {
145 
            //   this.viewLayoutSpan = 10
146 
            //   this.videoPageSize = 1
147 
            // } else if (resp.data.data[0].monitorViewLayout === '2X2') {
148 
            //   this.viewLayoutSpan = 6
149 
            //   this.videoPageSize = 4
150 
            // } else if (resp.data.data[0].monitorViewLayout === '3X3') {
151 
            //   this.viewLayoutSpan = 4
152 
            //   this.videoPageSize = 9
153 
            // } else if (resp.data.data[0].monitorViewLayout === '4X4') {
154 
            //   this.viewLayoutSpan = 3
155 
            //   this.videoPageSize = 16
156 
            // }
157 
            this.tabClick(this.sceneList[0].monitorSceneId, resp.data.data[0].monitorViewLayout)
158 158 
          })
159 159 
        }
160 160 
      })
 
@ -169,7 +169,6 @@ export default {
169 169 
      }
170 170 
      if (res.status === 200) {
171 171 
        this.replayList = res.data.data
172 
        console.log(this.replayList)
173 172 
      } else {
174 173 
        this.$Message.danger('视频列表数据获取失败！')
175 174 
      }
 
@ -181,7 +180,20 @@ export default {
181 180 
      this.showReplayDialog = true
182 181 
    },
183 182 
    // 切换场景
184 
    async tabClick (id) {
183 
    async tabClick (id, monitorViewLayout) {
184 
      if (monitorViewLayout === '1X1') {
185 
        this.viewLayoutSpan = 10
186 
        this.videoPageSize = 1
187 
      } else if (monitorViewLayout === '2X2') {
188 
        this.viewLayoutSpan = 6
189 
        this.videoPageSize = 4
190 
      } else if (monitorViewLayout === '3X3') {
191 
        this.viewLayoutSpan = 4
192 
        this.videoPageSize = 9
193 
      } else if (monitorViewLayout === '4X4') {
194 
        this.viewLayoutSpan = 3
195 
        this.videoPageSize = 16
196 
      }
185 197 
      this.selectedMonitorScene = id
186 198 
      this.paramsObj.page = 0
187 199 
      this.videoList = []
 
@ -207,11 +219,14 @@ export default {
207 219 
    },
208 220 
    // 获得风场大门数据
209 221 
    getVideoSurveillanceData () {
222 
      this.videoList = []
223 
      this.videoOptions = []
210 224 
      var id = this.tabId
211 225 
      this.paramsObj.page = this.videoCurrent
212 
      sysapi.getVideoSurveillanceData({ params: { monitorSceneId: id } }).then(res => {
213 
        this.videoList = res.data.data
214 
        for (let i in res.data.data) {
226 
      sysapi.getVideoSurveillanceDataForPage({ params: { monitorSceneId: id, pageNumber: this.videoCurrent, pageSize: this.videoPageSize } }).then(res => {
227 
        this.videoList = res.data.data.data
228 
        this.videoTotal = res.data.data.total
229 
        for (let i in res.data.data.data) {
215 230 
          let obj = {
216 231 
            autoplay: true, // 如果true,浏览器准备好时开始回放。
217 232 
            muted: true, // 默认情况下将会消除任何音频。
 
@ -229,7 +244,7 @@ export default {
229 244 
            sources: [{
230 245 
              withCredentials: false,
231 246 
              type: 'application/x-mpegURL', // 这里的种类支持很多种：基本视频格式、直播、流媒体等，具体可以参看git网址项目
232 
              src: res.data.data[i].videoUrl // url地址
247 
              src: res.data.data.data[i].videoUrl // url地址
233 248 
            }],
234 249 
            flash: { hls: { withCredentials: false } },
235 250 
            html5: { hls: { withCredentials: false } },

+ 2 - 1
security-protection-platform/src/routes.js
Целия файл 

@ -14,12 +14,13 @@ export const constantRoutes = [
14 14 
  {
15 15 
    path: '/',
16 16 
    component: Layout,
17 
    redirect: '/attendance/report',
17 
    redirect: '/dashboard',
18 18 
    hidden: true
19 19 
  },
20 20 
  {
21 21 
    name: 'dashboard',
22 22 
    path: '/dashboard',
23 
    redirect: '/',
23 24 
    component: () => import(/* webpackChunkName: "dashboard" */ './modules/dashboard'),
24 25 
    meta: { title: '首页', icon: 'home' },
25 26 
    children: [

+ 2 - 1
security-protection-service/src/main/java/com/ai/bss/security/protection/controller/AiIdenLogManageController.java
Целия файл 

@ -46,6 +46,7 @@ public class AiIdenLogManageController {
46 46 
		params.put("endTime", attendanceReport.getEndDay());
47 47 
		params.put("relateEmployeeNameAsLike", attendanceReport.getNameAsLike());
48 48 
		params.put("aiIdenModel", EbcConstant.AI_MODEL_FACE);
49 
		params.put("idenResultType", EbcConstant.AI_IDENTIFY_RESULT_ATTENDANCE);
49 50
50 51 
		return aiIdenLogManageService.queryPageAiIdenLog(params, pageNumber, pageSize);
51 52 
	}
 
@ -73,7 +74,7 @@ public class AiIdenLogManageController {
73 74 
		params.put("beginTime", attendanceReport.getBeginDay());
74 75 
		params.put("endTime", attendanceReport.getEndDay());
75 76 
		params.put("resourceToolId", attendanceReport.getId());
76 
		params.put("aiIdenModel", EbcConstant.AI_MODEL_CLOTHING_CODE);
77 
		params.put("idenResultType", EbcConstant.AI_IDENTIFY_RESULT_ALARM);
77 78
78 79 
		return aiIdenLogManageService.queryAllAiIdenLogPicture(params, pageNumber, pageSize);
79 80 
	}

+ 1 - 1
security-protection-service/src/main/java/com/ai/bss/security/protection/controller/InAndOutRecordController.java
Целия файл 

@ -75,7 +75,7 @@ public class InAndOutRecordController {
75 75 
	}
76 76
77 77 
	/**
78 
	 * 首页查询进出记录
78 
	 * 查询首页进出记录
79 79 
	 * @return
80 80 
	 * @throws Exception
81 81 
	 */

+ 2 - 3
security-protection-service/src/main/java/com/ai/bss/security/protection/controller/MonitorVideoLogManageController.java
Целия файл 

@ -49,7 +49,6 @@ public class MonitorVideoLogManageController {
49 49 
		return monitorVideoLogManageService.queryMonitorVideoLogByTime(monitorVideoLogCondition);
50 50 
	}
51 51
52
53 52 
	/**
54 53 
	 * 查询监控视频日志(按时间段)
55 54 
	 * @param attendanceReport
 
@ -76,7 +75,7 @@ public class MonitorVideoLogManageController {
76 75 
	 */
77 76 
	@ResponseBody
78 77 
	@RequestMapping("/queryOneMonitorVideoLog")
79 
	public CommonResponse<EbcMonitorVideoLog> queryOneMonitorVideoLog(@RequestParam String monitorVideoLogId)
78 
	public CommonResponse<String> queryOneMonitorVideoLog(@RequestParam String monitorVideoLogId)
80 79 
			throws Exception {
81 80 
		if (StringUtils.isEmpty(monitorVideoLogId)) {
82 81 
			return CommonResponse.fail("500", "操作失败");
 
@ -94,7 +93,7 @@ public class MonitorVideoLogManageController {
94 93 
	 */
95 94 
	@ResponseBody
96 95 
	@RequestMapping("/getMonitorVideoLogByPictureTime")
97 
	public CommonResponse<List<EbcMonitorVideoLog>> getMonitorVideoLogByPictureTime(@RequestParam String imageTime,@RequestParam String resourceToolId)
96 
	public CommonResponse<String> getMonitorVideoLogByPictureTime(@RequestParam String imageTime,@RequestParam String resourceToolId)
98 97 
			throws Exception {
99 98 
		if (StringUtils.isEmpty(imageTime)||StringUtils.isEmpty(resourceToolId)) {
100 99 
			return CommonResponse.fail("500", "获取视频失败");

+ 5 - 3
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/AiAlarmManageServiceImpl.java
Целия файл 

@ -164,17 +164,19 @@ public class AiAlarmManageServiceImpl implements AiAlarmManageService {
164 164 
		Map<String, String> pictureMap= uploadFileService.getFileUrlToMap(workTaskSafetyAlarmMap.get("idenPictureUrl"));
165 165
166 166 
		//视频信息
167 
		List<EbcMonitorVideoLog> logsList=monitorVideoLogManageService.getMonitorVideoLogByPictureTime(pictureMap.get("fileDateTimeStr"), workTaskSafetyAlarmMap.get("resourceToolId")).getData();
167 
		/*List<EbcMonitorVideoLog> logsList=monitorVideoLogManageService.getMonitorVideoLogByPictureTime(pictureMap.get("fileDateTimeStr"), workTaskSafetyAlarmMap.get("resourceToolId")).getData();
168 168 
		EbcMonitorVideoLog ebcMonitorVideoLog=null;
169 169 
		if (!CollectionUtils.isEmpty(logsList)) {
170 170 
			ebcMonitorVideoLog=logsList.get(0);
171 171 
			ebcMonitorVideoLog.setVideoFileUrl(uploadFileService.getFileUrl(ebcMonitorVideoLog.getVideoUrl()));
172 
		}
172 
		}*/
173 
		String videoFileUrl =monitorVideoLogManageService.getMonitorVideoLogByPictureTime(pictureMap.get("fileDateTimeStr"), workTaskSafetyAlarmMap.get("resourceToolId")).getData();
173 174
174 175 
		Map<String,Object> resultMap= new HashMap<String, Object>();
175 176 
		resultMap.put("alarmInfo", workTaskSafetyAlarmMap);
176 177 
		resultMap.put("pictureInfo", pictureMap);
177 
		resultMap.put("videoInfo", ebcMonitorVideoLog);
178 
		//resultMap.put("videoInfo", ebcMonitorVideoLog);
179 
		resultMap.put("videoInfo", videoFileUrl);
178 180 
		return CommonResponse.ok(resultMap);
179 181 
	}
180 182

+ 7 - 3
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/AiIdenLogManageServiceImpl.java
Целия файл 

@ -252,19 +252,23 @@ public class AiIdenLogManageServiceImpl implements AiIdenLogManageService {
252 252 
		Map<String, String> pictureMap = uploadFileService.getFileUrlToMap(aiIdenLog.getIdenPictureUrl());
253 253
254 254 
		// 视频信息
255 
		List<EbcMonitorVideoLog> logsList = monitorVideoLogManageService
255 
		/*List<EbcMonitorVideoLog> logsList = monitorVideoLogManageService
256 256 
				.getMonitorVideoLogByPictureTime(pictureMap.get("fileDateTimeStr"), aiIdenLog.getResourceToolId())
257 257 
				.getData();
258 258 
		EbcMonitorVideoLog ebcMonitorVideoLog = null;
259 259 
		if (!CollectionUtils.isEmpty(logsList)) {
260 260 
			ebcMonitorVideoLog = logsList.get(0);
261 261 
			ebcMonitorVideoLog.setVideoFileUrl(uploadFileService.getFileUrl(ebcMonitorVideoLog.getVideoUrl()));
262 
		}
262 
		}*/
263 
		String videoFileUrl =monitorVideoLogManageService
264 
				.getMonitorVideoLogByPictureTime(pictureMap.get("fileDateTimeStr"), aiIdenLog.getResourceToolId())
265 
				.getData();
263 266
264 267 
		Map<String, Object> resultMap = new HashMap<String, Object>();
265 268 
		resultMap.put("alarmInfo", aiIdenLogInfoMap);
266 269 
		resultMap.put("pictureInfo", pictureMap);
267 
		resultMap.put("videoInfo", ebcMonitorVideoLog);
270 
		//resultMap.put("videoInfo", ebcMonitorVideoLog);
271 
		resultMap.put("videoInfo", videoFileUrl);
268 272 
		return CommonResponse.ok(resultMap);
269 273 
	}
270 274

+ 5 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/EmployeeManagementServiceImpl.java
Целия файл 

@ -106,12 +106,17 @@ public class EmployeeManagementServiceImpl implements EmployeeManagementService
106 106 
		resultMap.put("organizationCode", response.getData().getOrganizeCode());
107 107 
		resultMap.put("organizationName", response.getData().getOrgName());
108 108 
		resultMap.put("age", response.getData().getAge());
109
109 110 
		resultMap.put("mainWirelessCall", response.getData().getMainWirelessCall());
110 111 
		resultMap.put("field1", response.getData().getField1()); // 头像标识
111 112 
		resultMap.put("field2", response.getData().getField2()); // 审核结果
112 113 
		resultMap.put("field3", response.getData().getField3()); // 审核意见
113 114 
		resultMap.put("field4", response.getData().getField4()); // 公司
114 115
116 
		if (response.getData().getBirthday()!=null) {
117 
			resultMap.put("birthday", String.valueOf(response.getData().getBirthday().getTime()));
118 
		}
119
115 120 
		resultMap.put("pictureUrl",
116 121 
				uploadFileService.getFileUrl(response.getData().getField1(), minioConfig.getBucketHeaderImage()));
117 122

+ 21 - 12
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/MonitorVideoLogManageServiceImpl.java
Целия файл 

@ -46,6 +46,7 @@ public class MonitorVideoLogManageServiceImpl implements MonitorVideoLogManageSe
46 46 
	private SecurityProtectionMinioConfig minioConfig;
47 47
48 48 
	@Override
49 
	@Deprecated
49 50 
	public CommonResponse<List<EbcMonitorVideoLog>> queryMonitorVideoLogByTime(MonitorVideoLog monitorVideoLogCondition)
50 51 
			throws Exception {
51 52 
		CommonRequest<MonitorVideoLog> request = new CommonRequest<MonitorVideoLog>(monitorVideoLogCondition);
 
@ -103,38 +104,46 @@ public class MonitorVideoLogManageServiceImpl implements MonitorVideoLogManageSe
103 104 
	}
104 105
105 106 
	@Override
106 
	public CommonResponse<EbcMonitorVideoLog> queryMonitorVideoLogById(Long monitorVideoLogId) throws Exception {
107 
	public CommonResponse<String> queryMonitorVideoLogById(Long monitorVideoLogId) throws Exception {
107 108 
		CommonRequest<Long> request = new CommonRequest<Long>(monitorVideoLogId);
108 109 
		CommonResponse<MonitorVideoLog> response = monitorSceneQuery.loadMonitorVideoLog(request);
109 110
110 111 
		if (response == null || response.getData() == null) {
111 112 
			return CommonResponse.fail("504", "监控视频不存在");
112 113 
		}
113
114 
		EbcMonitorVideoLog ebcMonitorVideoLog = getEbcMonitorVideoLog(response.getData());
115 
		return CommonResponse.ok(ebcMonitorVideoLog);
114
115 
		//EbcMonitorVideoLog ebcMonitorVideoLog = getEbcMonitorVideoLog(response.getData());
116 
		//return CommonResponse.ok(ebcMonitorVideoLog);
117 
		return queryMonitorVideoLogByTimeForM3u8(response.getData());
116 118 
	}
117 119
118 120 
	@Override
119 
	public CommonResponse<List<EbcMonitorVideoLog>> getMonitorVideoLogByPictureTime(String imageTime,
121 
	public CommonResponse<String> getMonitorVideoLogByPictureTime(String imageTime,
120 122 
			String resourceToolId) throws Exception {
121 
		Map<String, Object> conditionMap = new HashMap<String, Object>();
123 
		MonitorVideoLog monitorVideoLogCondition = new MonitorVideoLog();
124 
		monitorVideoLogCondition.setResourceToolId(resourceToolId);
125 
		monitorVideoLogCondition.setBeginTime(DateUtil.convertDate(imageTime));
126 
		monitorVideoLogCondition.setEndTime(DateUtil.convertDate(imageTime));
127
128 
		return queryMonitorVideoLogByTimeForM3u8(monitorVideoLogCondition);
129
130
131 
		/*Map<String, Object> conditionMap = new HashMap<String, Object>();
122 132 
		conditionMap.put("resourceToolId", resourceToolId);
123 133 
		conditionMap.put("imageTime", imageTime);
124 134 
		CommonRequest<Map<String, Object>> conditionMapRequest = new CommonRequest<Map<String, Object>>(conditionMap);
125 135 
		CommonResponse<List<MonitorVideoLog>> response = monitorSceneQuery.selectMonitorVideoLog(conditionMapRequest);
126
127 
		List<EbcMonitorVideoLog> list = new ArrayList<EbcMonitorVideoLog>();
136
128 137 
		if (response == null || CollectionUtils.isEmpty(response.getData())) {
129 
			return CommonResponse.ok(list);
138 
			return CommonResponse.ok("");
130 139 
		}
131
140
132 141 
		for (MonitorVideoLog monitorVideoLog : response.getData()) {
133 142 
			EbcMonitorVideoLog ebcMonitorVideoLog = getEbcMonitorVideoLog(monitorVideoLog);
134 143 
			list.add(ebcMonitorVideoLog);
135 144 
		}
136
137 
		return CommonResponse.ok(list);
145
146 
		return CommonResponse.ok(list);*/
138 147 
	}
139 148
140 149 
	/**

+ 1 - 1
security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/AiIdenLogManageService.java
Целия файл 

@ -45,7 +45,7 @@ public interface AiIdenLogManageService {
45 45 
	CommonResponse<Map<String, Object>> queryOneAiIdenLog(Long aiIdenLogId) throws Exception;
46 46
47 47 
	/**
48 
	 * 查询所有设备最后一个识别记录
48 
	 * 根据场景ID查询最后一条进出记录
49 49 
	 * @param params
50 50 
	 * @return
51 51 
	 * @throws Exception

+ 9 - 3
security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/MonitorVideoLogManageService.java
Целия файл 

@ -19,10 +19,16 @@ public interface MonitorVideoLogManageService {
19 19 
	 * @return
20 20 
	 * @throws Exception
21 21 
	 */
22 
	@Deprecated
22 23 
	CommonResponse<List<EbcMonitorVideoLog>> queryMonitorVideoLogByTime(MonitorVideoLog monitorVideoLogCondition)
23 24 
			throws Exception;
24 25
25
26 
	/**
27 
	 * 按时间段查询监控视频日志
28 
	 * @param monitorVideoLogCondition
29 
	 * @return
30 
	 * @throws Exception
31 
	 */
26 32 
	CommonResponse<String> queryMonitorVideoLogByTimeForM3u8(MonitorVideoLog monitorVideoLogCondition) throws Exception;
27 33
28 34 
	/**
 
@ -31,7 +37,7 @@ public interface MonitorVideoLogManageService {
31 37 
	 * @return
32 38 
	 * @throws Exception
33 39 
	 */
34 
	CommonResponse<EbcMonitorVideoLog> queryMonitorVideoLogById(Long monitorVideoLogId) throws Exception;
40 
	CommonResponse<String> queryMonitorVideoLogById(Long monitorVideoLogId) throws Exception;
35 41
36 42 
	/**
37 43 
	 * 根据设备图片时间查询视频日志
 
@ -40,7 +46,7 @@ public interface MonitorVideoLogManageService {
40 46 
	 * @return
41 47 
	 * @throws Exception
42 48 
	 */
43 
	CommonResponse<List<EbcMonitorVideoLog>> getMonitorVideoLogByPictureTime(String imageTime,String resourceToolId) throws Exception;
49 
	CommonResponse<String> getMonitorVideoLogByPictureTime(String imageTime,String resourceToolId) throws Exception;
44 50
45 51 
	/**
46 52 
	 * 创建监控视频日志

+ 3 - 9
security-protection-service/src/main/java/com/ai/bss/security/protection/utils/EbcConstant.java
Целия файл 

@ -75,6 +75,9 @@ public class EbcConstant {
75 75 
	//AI识别结果：考勤
76 76 
	public static final String AI_IDENTIFY_RESULT_ATTENDANCE= "ATT";
77 77
78 
	//AI匹配模型：人脸识别
79 
	public static final String AI_MODEL_FACE="FACE";
80
78 81 
	//场景关联设备的作用类别：进门识别
79 82 
	public static final String TERMINAL_EFFECT_TYPE_IN="IN";
80 83 
	
@ -93,15 +96,6 @@ public class EbcConstant {
93 96 
	//审核状态：未生效(未审核通过)
94 97 
	public static final String AUDIT_STATUS_DIS="3";
95 98
96 
	//AI匹配模型：着装违规识别
97 
	public static final String AI_MODEL_CLOTHING_CODE="CLOTHING_CODE";
98
99 
	//AI匹配模型：人脸识别
100 
	public static final String AI_MODEL_FACE="FACE";
101
102 
	//AI匹配模型：陌生人识别
103 
	public static final String AI_MODEL_STRANGER="STRANGER";
104
105 99
106 100 
	// 当前登录者的STAFF_ID
107 101 
	public static String USPA_USER_STAFF_ID = "201613310867";

android-share - Nuosi Git Service
Home Explore Help
Sign In
ipu
/
android-share
Watch 6
Star 0
Fork 0
Code Issues 1 Pull Requests 1 Commits 1483 Releases 4 Wiki

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

Tree: 3b751fd7a7
Branches Tags
android-share
/
display-client
/
mac.bak.classpath

mac.bak.classpath 466B
History Raw 

    <?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry kind="src" path="gen"/>
	<classpathentry kind="src" path="src"/>
	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
	<classpathentry kind="output" path="bin/classes"/>
</classpath>