From c09ce992101f0c9eaae165389a7638566ac566a9 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 19 六月 2023 22:18:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5402.java | 28 ++
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5602.java | 40 +++
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5702.java | 28 ++
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5703.java | 28 ++
igds-api-phone/src/main/java/com/ld/igds/phone35/param/Phone35PatrolCommonParam.java | 24 ++
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5401.java | 2
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5606.java | 28 ++
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5601.java | 3
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5701.java | 28 ++
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5704.java | 28 ++
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5801.java | 2
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5604.java | 3
igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoPatrol.java | 5
igds-api-phone/src/main/java/com/ld/igds/phone35/constant/Phone35Constant.java | 6
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5403.java | 28 ++
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5607.java | 28 ++
igds-api-phone/src/main/java/com/ld/igds/phone35/param/Phone35VideoCommonParam.java | 12 +
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5603.java | 36 +++
igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml | 29 ++
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5608.java | 28 ++
igds-web/pom.xml | 102 +++++----
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5705.java | 28 ++
igds-api-phone/src/main/java/com/ld/igds/phone35/mapper/Phone35Mapper.java | 15 +
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java | 40 +++
24 files changed, 536 insertions(+), 63 deletions(-)
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/constant/Phone35Constant.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/constant/Phone35Constant.java
index e6a52c8..7dcb934 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/constant/Phone35Constant.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/constant/Phone35Constant.java
@@ -99,7 +99,12 @@
public static final String API_PHONE_5604 = "5604";
public static final String API_PHONE_5605 = "5605";
+
+ /* ======= 闂ㄧ绠＄悊 ====== */
+
public static final String API_PHONE_5606 = "5606";
+ public static final String API_PHONE_5607 = "5607";
+ public static final String API_PHONE_5608 = "5608";
/* ======= 宸ュ崟绠＄悊 ====== */
@@ -107,6 +112,7 @@
public static final String API_PHONE_5702 = "5702";
public static final String API_PHONE_5703 = "5703";
public static final String API_PHONE_5704 = "5704";
+ public static final String API_PHONE_5705 = "5705";
/* ======= 棰勮绠＄悊 ====== */
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoPatrol.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoPatrol.java
index 1235b43..06be4a8 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoPatrol.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoPatrol.java
@@ -6,6 +6,8 @@
import java.util.Date;
/**
+ * 鐢靛瓙宸￠��
+ *
* @Author:YAN
*/
@Data
@@ -17,7 +19,8 @@
private String latitude;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
-
+
private String base64Img;
+ private String imgName;
}
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/mapper/Phone35Mapper.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/mapper/Phone35Mapper.java
index 0456ffe..d98a70b 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/mapper/Phone35Mapper.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/mapper/Phone35Mapper.java
@@ -2,9 +2,7 @@
import com.ld.igds.phone35.dto.*;
-import com.ld.igds.phone35.param.Phone35CommonParam;
-import com.ld.igds.phone35.param.Phone35DepotCommonParam;
-import com.ld.igds.phone35.param.Phone35WarnCommonParam;
+import com.ld.igds.phone35.param.*;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -78,7 +76,14 @@
* @param param
* @return
*/
- List<DtoPatrol> getPatrol(@Param("param") Phone35DepotCommonParam param);
+ List<DtoPatrol> getPatrol(@Param("param") Phone35PatrolCommonParam param);
+
+ /**
+ * 鐢靛瓙鎵撳崱
+ *
+ * @param param
+ */
+ void addPatrolRecord(@Param("param") Phone35PatrolCommonParam param);
/**
* 鐩戞帶璁惧鍒楄〃
@@ -86,5 +91,5 @@
* @param param
* @return
*/
- List<DtoVideo> getCamera(@Param("param") Phone35CommonParam param);
+ List<DtoVideo> getCamera(@Param("param") Phone35VideoCommonParam param);
}
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/param/Phone35PatrolCommonParam.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/param/Phone35PatrolCommonParam.java
new file mode 100644
index 0000000..07d33ac
--- /dev/null
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/param/Phone35PatrolCommonParam.java
@@ -0,0 +1,24 @@
+package com.ld.igds.phone35.param;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鐢靛瓙宸￠��
+ *
+ * @Author:YAN
+ */
+@Data
+public class Phone35PatrolCommonParam extends Phone35CommonParam {
+
+ private String id;
+ private String longitude;
+ private String latitude;
+ private String imgName;
+ private Date createTime;
+ private String userName;
+
+
+ private String dateTime;
+}
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/param/Phone35VideoCommonParam.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/param/Phone35VideoCommonParam.java
new file mode 100644
index 0000000..a583a3a
--- /dev/null
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/param/Phone35VideoCommonParam.java
@@ -0,0 +1,12 @@
+package com.ld.igds.phone35.param;
+
+import lombok.Data;
+
+/**
+ * @Author:YAN
+ */
+@Data
+public class Phone35VideoCommonParam extends Phone35CommonParam {
+ private String id;
+ private String playType;
+}
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5401.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5401.java
index ef41691..b1d141c 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5401.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5401.java
@@ -6,12 +6,14 @@
import com.ld.igds.phone35.dto.PhoneResponse;
import com.ld.igds.phone35.param.Phone35Request;
import com.ld.igds.phone35.service.Phone35Service;
+import org.springframework.stereotype.Service;
/**
* 璁惧鎺у埗-璁惧鍒楄〃鎺ュ彛瀹炵幇
*
* @Author:YAN
*/
+@Service
public class Phone35ServiceImpl5401 implements Phone35Service {
@Override
public String getInterfaceId() {
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5402.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5402.java
new file mode 100644
index 0000000..cb8ae39
--- /dev/null
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5402.java
@@ -0,0 +1,28 @@
+package com.ld.igds.phone35.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ld.igds.phone35.constant.Phone35Constant;
+import com.ld.igds.phone35.dto.Phone35AuthUser;
+import com.ld.igds.phone35.dto.PhoneResponse;
+import com.ld.igds.phone35.param.Phone35Request;
+import com.ld.igds.phone35.service.Phone35Service;
+import org.springframework.stereotype.Service;
+
+/**
+ * 鎿嶄綔璁惧
+ *
+ * @Author:YAN
+ */
+@Service
+public class Phone35ServiceImpl5402 implements Phone35Service {
+ @Override
+ public String getInterfaceId() {
+ return Phone35Constant.API_PHONE_5402;
+ }
+
+ @Override
+ public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
+ //todo 鎿嶄綔璁惧
+ return null;
+ }
+}
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5403.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5403.java
new file mode 100644
index 0000000..f63565d
--- /dev/null
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5403.java
@@ -0,0 +1,28 @@
+package com.ld.igds.phone35.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ld.igds.phone35.constant.Phone35Constant;
+import com.ld.igds.phone35.dto.Phone35AuthUser;
+import com.ld.igds.phone35.dto.PhoneResponse;
+import com.ld.igds.phone35.param.Phone35Request;
+import com.ld.igds.phone35.service.Phone35Service;
+import org.springframework.stereotype.Service;
+
+/**
+ * 绌鸿皟鎺у埗
+ *
+ * @Author:YAN
+ */
+@Service
+public class Phone35ServiceImpl5403 implements Phone35Service {
+ @Override
+ public String getInterfaceId() {
+ return Phone35Constant.API_PHONE_5403;
+ }
+
+ @Override
+ public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
+ //todo 绌鸿皟鎺у埗
+ return null;
+ }
+}
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5601.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5601.java
index f5925d2..b51be7e 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5601.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5601.java
@@ -8,6 +8,7 @@
import com.ld.igds.phone35.dto.PhoneResponse;
import com.ld.igds.phone35.mapper.Phone35Mapper;
import com.ld.igds.phone35.param.Phone35DepotCommonParam;
+import com.ld.igds.phone35.param.Phone35PatrolCommonParam;
import com.ld.igds.phone35.param.Phone35Request;
import com.ld.igds.phone35.service.Phone35Service;
import com.ld.igds.phone35.util.PhoneRespUtil;
@@ -38,7 +39,7 @@
@Override
public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
//杞寲瀵硅薄
- Phone35DepotCommonParam param = JSONObject.parseObject(req.getData().toString(), Phone35DepotCommonParam.class);
+ Phone35PatrolCommonParam param = JSONObject.parseObject(req.getData().toString(), Phone35PatrolCommonParam.class);
if (null == param) {
return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
}
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5602.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5602.java
index 641fbbc..77a1887 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5602.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5602.java
@@ -1,12 +1,21 @@
package com.ld.igds.phone35.service.impl;
import com.alibaba.fastjson.JSONObject;
+import com.ld.igds.constant.RespCodeEnum;
import com.ld.igds.phone35.constant.Phone35Constant;
import com.ld.igds.phone35.dto.Phone35AuthUser;
import com.ld.igds.phone35.dto.PhoneResponse;
+import com.ld.igds.phone35.mapper.Phone35Mapper;
+import com.ld.igds.phone35.param.Phone35PatrolCommonParam;
import com.ld.igds.phone35.param.Phone35Request;
import com.ld.igds.phone35.service.Phone35Service;
+import com.ld.igds.phone35.util.PhoneRespUtil;
+import com.ld.igds.util.ContextUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.Date;
/**
* 鐢靛瓙宸℃洿鎵撳崱
@@ -15,6 +24,9 @@
*/
@Service
public class Phone35ServiceImpl5602 implements Phone35Service {
+ @Autowired
+ private Phone35Mapper phone35Mapper;
+
@Override
public String getInterfaceId() {
return Phone35Constant.API_PHONE_5602;
@@ -22,6 +34,32 @@
@Override
public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
- return null;
+ //杞寲瀵硅薄
+ Phone35PatrolCommonParam param = JSONObject.parseObject(req.getData().toString(), Phone35PatrolCommonParam.class);
+ if (null == param) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
+ }
+ //鍙傛暟楠岃瘉
+ if (StringUtils.isEmpty(param.getDeptId())) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
+ }
+ //鍙傛暟楠岃瘉
+ if (StringUtils.isEmpty(param.getLongitude())) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
+ }
+ //鍙傛暟楠岃瘉
+ if (StringUtils.isEmpty(param.getLatitude())) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
+ }
+ //鍙傛暟楠岃瘉
+ if (StringUtils.isEmpty(param.getUserName())) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
+ }
+
+ param.setCreateTime(new Date());
+ param.setId(ContextUtil.getUUID());
+ param.setCompanyId(phone35AuthUser.getCompanyId());
+ phone35Mapper.addPatrolRecord(param);
+ return PhoneRespUtil.success(null, req);
}
}
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5603.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5603.java
index 9099705..5b4dd55 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5603.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5603.java
@@ -1,12 +1,23 @@
package com.ld.igds.phone35.service.impl;
import com.alibaba.fastjson.JSONObject;
+import com.ld.igds.constant.RespCodeEnum;
+import com.ld.igds.file.CoreFileService;
import com.ld.igds.phone35.constant.Phone35Constant;
+import com.ld.igds.phone35.dto.DtoPatrol;
import com.ld.igds.phone35.dto.Phone35AuthUser;
import com.ld.igds.phone35.dto.PhoneResponse;
+import com.ld.igds.phone35.mapper.Phone35Mapper;
+import com.ld.igds.phone35.param.Phone35PatrolCommonParam;
import com.ld.igds.phone35.param.Phone35Request;
import com.ld.igds.phone35.service.Phone35Service;
+import com.ld.igds.phone35.util.PhoneRespUtil;
+import com.ld.igds.util.FfmpegUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* 宸℃洿鐓х墖鏌ョ湅
@@ -15,6 +26,12 @@
*/
@Service
public class Phone35ServiceImpl5603 implements Phone35Service {
+
+ @Autowired
+ private Phone35Mapper phone35Mapper;
+ @Autowired
+ private CoreFileService fileService;
+
@Override
public String getInterfaceId() {
return Phone35Constant.API_PHONE_5603;
@@ -22,6 +39,23 @@
@Override
public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
- return null;
+ //杞寲瀵硅薄
+ Phone35PatrolCommonParam param = JSONObject.parseObject(req.getData().toString(), Phone35PatrolCommonParam.class);
+ if (null == param) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
+ }
+ //鍙傛暟楠岃瘉
+ if (StringUtils.isEmpty(param.getId())) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
+ }
+ param.setCompanyId(phone35AuthUser.getCompanyId());
+ List<DtoPatrol> list = phone35Mapper.getPatrol(param);
+ DtoPatrol patrol = list.get(0);
+ if (StringUtils.isNotEmpty(patrol.getImgName())) {
+ String bathPath = fileService.getInoutFilePath(patrol.getCreateTime());
+ String imgData = FfmpegUtil.getImgStr(bathPath + patrol.getImgName());
+ patrol.setBase64Img(imgData);
+ }
+ return PhoneRespUtil.success(patrol, req);
}
}
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5604.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5604.java
index 53da3d6..50fa6c4 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5604.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5604.java
@@ -10,6 +10,7 @@
import com.ld.igds.phone35.param.Phone35CommonParam;
import com.ld.igds.phone35.param.Phone35DepotCommonParam;
import com.ld.igds.phone35.param.Phone35Request;
+import com.ld.igds.phone35.param.Phone35VideoCommonParam;
import com.ld.igds.phone35.service.Phone35Service;
import com.ld.igds.phone35.util.PhoneRespUtil;
import org.apache.commons.lang3.StringUtils;
@@ -37,7 +38,7 @@
public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
//杞寲瀵硅薄
- Phone35CommonParam param = JSONObject.parseObject(req.getData().toString(), Phone35CommonParam.class);
+ Phone35VideoCommonParam param = JSONObject.parseObject(req.getData().toString(), Phone35VideoCommonParam.class);
if (null == param) {
return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
}
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java
index 8cfcfbf..60ab6c5 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java
@@ -1,18 +1,31 @@
package com.ld.igds.phone35.service.impl;
import com.alibaba.fastjson.JSONObject;
+import com.ld.igds.camera.CameraUtil;
+import com.ld.igds.constant.RespCodeEnum;
import com.ld.igds.phone35.constant.Phone35Constant;
import com.ld.igds.phone35.dto.Phone35AuthUser;
import com.ld.igds.phone35.dto.PhoneResponse;
import com.ld.igds.phone35.param.Phone35Request;
+import com.ld.igds.phone35.param.Phone35VideoCommonParam;
import com.ld.igds.phone35.service.Phone35Service;
+import com.ld.igds.phone35.util.PhoneRespUtil;
+import com.ld.igds.sec.dto.SecCameraDto;
+import com.ld.igds.sec.manager.SecManager;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
/**
* 鐩戞帶鎾斁
*
* @Author:YAN
*/
+@Service
public class Phone35ServiceImpl5605 implements Phone35Service {
+ @Autowired
+ private SecManager securityManager;
+
@Override
public String getInterfaceId() {
return Phone35Constant.API_PHONE_5605;
@@ -20,6 +33,31 @@
@Override
public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
- return null;
+ //杞寲瀵硅薄
+ Phone35VideoCommonParam param = JSONObject.parseObject(req.getData().toString(), Phone35VideoCommonParam.class);
+ if (null == param) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
+ }
+ //鍙傛暟楠岃瘉
+ if (StringUtils.isEmpty(param.getId())) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
+ }
+ //鍙傛暟楠岃瘉
+ if (CameraUtil.PLAY_TYPE_DEFAULT.equals(param.getPlayType())) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1007, "绯荤粺鏈厤缃綋鍓嶆憚鍍忓ご鎾斁鏂瑰紡锛屼笉鎵ц棰勮");
+ }
+
+ SecCameraDto cameraParam = new SecCameraDto();
+ cameraParam.setId(param.getId());
+ cameraParam.setCompanyId(phone35AuthUser.getCompanyId());
+ cameraParam.setCompanyId(phone35AuthUser.getCompanyId());
+ SecCameraDto camera = securityManager.getPlayAddr(cameraParam);
+
+ if (camera == null) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1007, "鏈煡璇㈠埌鐩稿叧璁惧锛�");
+ }
+
+
+ return PhoneRespUtil.success(camera, req);
}
}
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5606.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5606.java
new file mode 100644
index 0000000..0a4a6d4
--- /dev/null
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5606.java
@@ -0,0 +1,28 @@
+package com.ld.igds.phone35.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ld.igds.phone35.constant.Phone35Constant;
+import com.ld.igds.phone35.dto.Phone35AuthUser;
+import com.ld.igds.phone35.dto.PhoneResponse;
+import com.ld.igds.phone35.param.Phone35Request;
+import com.ld.igds.phone35.service.Phone35Service;
+import org.springframework.stereotype.Service;
+
+/**
+ * 闂ㄧ璁惧鍒楄〃
+ *
+ * @Author:YAN
+ */
+@Service
+public class Phone35ServiceImpl5606 implements Phone35Service {
+ @Override
+ public String getInterfaceId() {
+ return Phone35Constant.API_PHONE_5606;
+ }
+
+ @Override
+ public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
+ //todo 闂ㄧ璁惧鍒楄〃
+ return null;
+ }
+}
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5607.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5607.java
new file mode 100644
index 0000000..52f6788
--- /dev/null
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5607.java
@@ -0,0 +1,28 @@
+package com.ld.igds.phone35.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ld.igds.phone35.constant.Phone35Constant;
+import com.ld.igds.phone35.dto.Phone35AuthUser;
+import com.ld.igds.phone35.dto.PhoneResponse;
+import com.ld.igds.phone35.param.Phone35Request;
+import com.ld.igds.phone35.service.Phone35Service;
+import org.springframework.stereotype.Service;
+
+/**
+ * 闂ㄧ璁惧鎿嶄綔
+ *
+ * @Author:YAN
+ */
+@Service
+public class Phone35ServiceImpl5607 implements Phone35Service {
+ @Override
+ public String getInterfaceId() {
+ return Phone35Constant.API_PHONE_5607;
+ }
+
+ @Override
+ public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
+ //todo 闂ㄧ璁惧鎿嶄綔
+ return null;
+ }
+}
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5608.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5608.java
new file mode 100644
index 0000000..88784db
--- /dev/null
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5608.java
@@ -0,0 +1,28 @@
+package com.ld.igds.phone35.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ld.igds.phone35.constant.Phone35Constant;
+import com.ld.igds.phone35.dto.Phone35AuthUser;
+import com.ld.igds.phone35.dto.PhoneResponse;
+import com.ld.igds.phone35.param.Phone35Request;
+import com.ld.igds.phone35.service.Phone35Service;
+import org.springframework.stereotype.Service;
+
+/**
+ * 闂ㄧ璁板綍
+ *
+ * @Author:YAN
+ */
+@Service
+public class Phone35ServiceImpl5608 implements Phone35Service {
+ @Override
+ public String getInterfaceId() {
+ return Phone35Constant.API_PHONE_5608;
+ }
+
+ @Override
+ public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
+ //todo -闂ㄧ璁板綍
+ return null;
+ }
+}
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5701.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5701.java
new file mode 100644
index 0000000..c115831
--- /dev/null
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5701.java
@@ -0,0 +1,28 @@
+package com.ld.igds.phone35.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ld.igds.phone35.constant.Phone35Constant;
+import com.ld.igds.phone35.dto.Phone35AuthUser;
+import com.ld.igds.phone35.dto.PhoneResponse;
+import com.ld.igds.phone35.param.Phone35Request;
+import com.ld.igds.phone35.service.Phone35Service;
+import org.springframework.stereotype.Service;
+
+/**
+ * 宸ュ崟鐢宠
+ *
+ * @Author:YAN
+ */
+@Service
+public class Phone35ServiceImpl5701 implements Phone35Service {
+ @Override
+ public String getInterfaceId() {
+ return Phone35Constant.API_PHONE_5701;
+ }
+
+ @Override
+ public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
+ //todo 宸ュ崟鐢宠
+ return null;
+ }
+}
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5702.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5702.java
new file mode 100644
index 0000000..716bc06
--- /dev/null
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5702.java
@@ -0,0 +1,28 @@
+package com.ld.igds.phone35.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ld.igds.phone35.constant.Phone35Constant;
+import com.ld.igds.phone35.dto.Phone35AuthUser;
+import com.ld.igds.phone35.dto.PhoneResponse;
+import com.ld.igds.phone35.param.Phone35Request;
+import com.ld.igds.phone35.service.Phone35Service;
+import org.springframework.stereotype.Service;
+
+/**
+ * 宸ュ崟璁板綍
+ *
+ * @Author:YAN
+ */
+@Service
+public class Phone35ServiceImpl5702 implements Phone35Service {
+ @Override
+ public String getInterfaceId() {
+ return Phone35Constant.API_PHONE_5702;
+ }
+
+ @Override
+ public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
+ //todo 宸ュ崟璁板綍
+ return null;
+ }
+}
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5703.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5703.java
new file mode 100644
index 0000000..efcf3c9
--- /dev/null
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5703.java
@@ -0,0 +1,28 @@
+package com.ld.igds.phone35.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ld.igds.phone35.constant.Phone35Constant;
+import com.ld.igds.phone35.dto.Phone35AuthUser;
+import com.ld.igds.phone35.dto.PhoneResponse;
+import com.ld.igds.phone35.param.Phone35Request;
+import com.ld.igds.phone35.service.Phone35Service;
+import org.springframework.stereotype.Service;
+
+/**
+ * 宸ュ崟瀹℃牳鍒楄〃
+ *
+ * @Author:YAN
+ */
+@Service
+public class Phone35ServiceImpl5703 implements Phone35Service {
+ @Override
+ public String getInterfaceId() {
+ return Phone35Constant.API_PHONE_5703;
+ }
+
+ @Override
+ public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
+ //todo 宸ュ崟瀹℃牳鍒楄〃
+ return null;
+ }
+}
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5704.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5704.java
new file mode 100644
index 0000000..0967767
--- /dev/null
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5704.java
@@ -0,0 +1,28 @@
+package com.ld.igds.phone35.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ld.igds.phone35.constant.Phone35Constant;
+import com.ld.igds.phone35.dto.Phone35AuthUser;
+import com.ld.igds.phone35.dto.PhoneResponse;
+import com.ld.igds.phone35.param.Phone35Request;
+import com.ld.igds.phone35.service.Phone35Service;
+import org.springframework.stereotype.Service;
+
+/**
+ * 宸ュ崟瀹℃牳
+ *
+ * @Author:YAN
+ */
+@Service
+public class Phone35ServiceImpl5704 implements Phone35Service {
+ @Override
+ public String getInterfaceId() {
+ return Phone35Constant.API_PHONE_5704;
+ }
+
+ @Override
+ public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
+ //todo 宸ュ崟瀹℃牳
+ return null;
+ }
+}
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5705.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5705.java
new file mode 100644
index 0000000..b905072
--- /dev/null
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5705.java
@@ -0,0 +1,28 @@
+package com.ld.igds.phone35.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ld.igds.phone35.constant.Phone35Constant;
+import com.ld.igds.phone35.dto.Phone35AuthUser;
+import com.ld.igds.phone35.dto.PhoneResponse;
+import com.ld.igds.phone35.param.Phone35Request;
+import com.ld.igds.phone35.service.Phone35Service;
+import org.springframework.stereotype.Service;
+
+/**
+ * 宸ュ崟绫诲瀷
+ *
+ * @Author:YAN
+ */
+@Service
+public class Phone35ServiceImpl5705 implements Phone35Service {
+ @Override
+ public String getInterfaceId() {
+ return Phone35Constant.API_PHONE_5705;
+ }
+
+ @Override
+ public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
+ //todo 宸ュ崟绫诲瀷 鏆傚畾鎺ュ彛涓�5705锛屽鏈夐渶瑕佹敼涓�6101
+ return null;
+ }
+}
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5801.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5801.java
index 92d9766..8980153 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5801.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5801.java
@@ -25,6 +25,8 @@
import java.util.List;
/**
+ * 棰勮鍒楄〃
+ *
* @Author:YAN
*/
@Service
diff --git a/igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml b/igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml
index f1d0bbd..0c98dde 100644
--- a/igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml
+++ b/igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml
@@ -103,7 +103,7 @@
UPDATE_TIME_ AS updateTime
FROM D_ENERGY
<where>
- <if test="param.companyId != null">AND COMPANY_ID_ = #{param.companyId}</if>
+ <if test="param.companyId != null and param.companyId != ''">AND COMPANY_ID_ = #{param.companyId}</if>
<if test="param.startTime != null and param.endTime != null">AND UPDATE_TIME_ between #{param.startTime}
and
#{param.endTime}
@@ -121,7 +121,7 @@
UPDATE_TIME_ AS updateTime
FROM D_ENERGY
<where>
- <if test="param.companyId != null">AND COMPANY_ID_ = #{param.companyId}</if>
+ <if test="param.companyId != null and param.companyId != ''">AND COMPANY_ID_ = #{param.companyId}</if>
<if test="param.depotId != null and param.depotId != ''">AND DEPOT_ID_ = #{param.depotId}</if>
<if test="param.startTime != null">AND
UPDATE_TIME_ <![CDATA[ > ]]>#{param.startTime,jdbcType=TIMESTAMP}
@@ -138,17 +138,38 @@
USER_NAME_ AS userName,
LONGITUDE_ As longitude,
LATITUDE_ AS latitude,
- IMG_NAME_ AS base64Img,
+ IMG_NAME_ AS imgName,
CREATE_TIME_ AS createTime
FROM D_SEC_PATROL_RECORD
<where>
- <if test="param.companyId != null and companyId != ''">AND COMPANY_ID_ = #{param.companyId}</if>
+ <if test="param.id != null and param.id != ''">AND ID_ = #{param.id}</if>
+ <if test="param.companyId != null and param.companyId != ''">AND COMPANY_ID_ = #{param.companyId}</if>
<if test="param.deptId != null and param.deptId != ''">AND DEPT_ID_ = #{param.deptId}</if>
<if test="param.startTime != null and param.endTime != null">AND CREATE_TIME_ between #{param.startTime}
and #{param.endTime}
</if>
</where>
</select>
+
+ <insert id="addPatrolRecord">
+ INSERT INTO D_SEC_PATROL_RECORD
+ (ID_,
+ COMPANY_ID_,
+ DEPT_ID_,
+ USER_NAME_,
+ CREATE_TIME_,
+ LONGITUDE_,
+ LATITUDE_,
+ IMG_NAME_)
+ VALUES (#{param.id},
+ #{param.companyId},
+ #{param.deptId},
+ #{param.userName},
+ #{param.createTime},
+ #{param.longitude},
+ #{param.latitude},
+ #{param.imgName})
+ </insert>
<!-- 鐩戞帶璁惧鍒楄〃-->
<select id="getCamera" resultType="com.ld.igds.phone35.dto.DtoVideo">
diff --git a/igds-web/pom.xml b/igds-web/pom.xml
index 90467d9..0201d50 100644
--- a/igds-web/pom.xml
+++ b/igds-web/pom.xml
@@ -119,6 +119,12 @@
<version>${igds.version}</version>
</dependency>
+ <!-- APP -鍙��-->
+ <dependency>
+ <groupId>com.ld.igds</groupId>
+ <artifactId>igds-api-phone</artifactId>
+ <version>${igds.version}</version>
+ </dependency>
<!-- 鍏朵粬閫氱敤鍝佺墝鍗忚 -->
<dependency>
<groupId>com.ld.igds</groupId>
@@ -214,54 +220,54 @@
</plugin>
<!-- YUI Compressor Maven鍘嬬缉鎻掍欢 寮�鍙戝寘涓嶅疄鐢�-->
-<!-- <plugin>-->
-<!-- <groupId>net.alchim31.maven</groupId>-->
-<!-- <artifactId>yuicompressor-maven-plugin</artifactId>-->
-<!-- <version>1.5.1</version>-->
-<!-- <executions>-->
-<!-- <execution>-->
-<!-- <goals>-->
-<!-- <goal>compress</goal>-->
-<!-- </goals>-->
-<!-- </execution>-->
-<!-- </executions>-->
-<!-- <configuration>-->
-<!-- <encoding>UTF-8</encoding>-->
-<!-- <!–涓嶆樉绀簀s鍙兘鐨勯敊璇� –>-->
-<!-- <jswarn>false</jswarn>-->
-<!-- <!–鏄惁娣锋穯 –>-->
-<!-- <nomunge>true</nomunge>-->
-<!-- <!–鑻ュ瓨鍦ㄥ凡鍘嬬缉鐨勬枃浠讹紝浼氬厛瀵规瘮婧愭枃浠舵槸鍚︽湁鏀瑰姩 鏈夋敼鍔ㄤ究鍘嬬缉锛屾棤鏀瑰姩灏变笉鍘嬬缉 –>-->
-<!-- <force>false</force>-->
-<!-- <!–鍦ㄦ寚瀹氱殑鍒楀彿鍚庢彃鍏ユ柊琛� –>-->
-<!-- <linebreakpos>-1</linebreakpos>-->
-<!-- <!–鍘嬬缉涔嬪墠鍏堟墽琛岃仛鍚堟枃浠舵搷浣� –>-->
-<!-- <preProcessAggregates>true</preProcessAggregates>-->
-<!-- <!–鍘嬬缉鍚庝繚瀛樻枃浠跺悗缂� 鏃犲悗缂� –>-->
-<!-- <nosuffix>true</nosuffix>-->
-<!-- <!–婧愮洰褰曪紝鍗抽渶鍘嬬缉鐨勬牴鐩綍 –>-->
-<!-- <sourceDirectory>src/main/resources</sourceDirectory>-->
-<!-- <!–杈撳嚭鐩綍锛屽嵆鍘嬬缉鍚庣殑鐩綍 –>-->
-<!-- <outputDirectory>target/classes</outputDirectory>-->
-<!-- <force>true</force>-->
-<!-- <!–鍘嬬缉js鍜宑ss鏂囦欢 –>-->
-<!-- <includes>-->
-<!-- <include>**/*.js</include>-->
-<!-- <include>**/*.css</include>-->
-<!-- </includes>-->
-<!-- <!– 浠ヤ笅鐩綍鍜屾枃浠朵笉浼氳鍘嬬缉 –>-->
-<!-- <excludes>-->
-<!-- <exclude>**/*.min.js</exclude>-->
-<!-- <exclude>**/*.min.css</exclude>-->
-<!-- <exclude>**/d7/**</exclude>-->
-<!-- <exclude>**/dorado-home/**</exclude>-->
-<!-- <exclude>**/bdf2/**</exclude>-->
-<!-- <exclude>**/css/**</exclude>-->
-<!-- <exclude>**/js/**</exclude>-->
-<!-- <exclude>**/plugins/**</exclude>-->
-<!-- </excludes>-->
-<!-- </configuration>-->
-<!-- </plugin>-->
+ <!-- <plugin>-->
+ <!-- <groupId>net.alchim31.maven</groupId>-->
+ <!-- <artifactId>yuicompressor-maven-plugin</artifactId>-->
+ <!-- <version>1.5.1</version>-->
+ <!-- <executions>-->
+ <!-- <execution>-->
+ <!-- <goals>-->
+ <!-- <goal>compress</goal>-->
+ <!-- </goals>-->
+ <!-- </execution>-->
+ <!-- </executions>-->
+ <!-- <configuration>-->
+ <!-- <encoding>UTF-8</encoding>-->
+ <!-- <!–涓嶆樉绀簀s鍙兘鐨勯敊璇� –>-->
+ <!-- <jswarn>false</jswarn>-->
+ <!-- <!–鏄惁娣锋穯 –>-->
+ <!-- <nomunge>true</nomunge>-->
+ <!-- <!–鑻ュ瓨鍦ㄥ凡鍘嬬缉鐨勬枃浠讹紝浼氬厛瀵规瘮婧愭枃浠舵槸鍚︽湁鏀瑰姩 鏈夋敼鍔ㄤ究鍘嬬缉锛屾棤鏀瑰姩灏变笉鍘嬬缉 –>-->
+ <!-- <force>false</force>-->
+ <!-- <!–鍦ㄦ寚瀹氱殑鍒楀彿鍚庢彃鍏ユ柊琛� –>-->
+ <!-- <linebreakpos>-1</linebreakpos>-->
+ <!-- <!–鍘嬬缉涔嬪墠鍏堟墽琛岃仛鍚堟枃浠舵搷浣� –>-->
+ <!-- <preProcessAggregates>true</preProcessAggregates>-->
+ <!-- <!–鍘嬬缉鍚庝繚瀛樻枃浠跺悗缂� 鏃犲悗缂� –>-->
+ <!-- <nosuffix>true</nosuffix>-->
+ <!-- <!–婧愮洰褰曪紝鍗抽渶鍘嬬缉鐨勬牴鐩綍 –>-->
+ <!-- <sourceDirectory>src/main/resources</sourceDirectory>-->
+ <!-- <!–杈撳嚭鐩綍锛屽嵆鍘嬬缉鍚庣殑鐩綍 –>-->
+ <!-- <outputDirectory>target/classes</outputDirectory>-->
+ <!-- <force>true</force>-->
+ <!-- <!–鍘嬬缉js鍜宑ss鏂囦欢 –>-->
+ <!-- <includes>-->
+ <!-- <include>**/*.js</include>-->
+ <!-- <include>**/*.css</include>-->
+ <!-- </includes>-->
+ <!-- <!– 浠ヤ笅鐩綍鍜屾枃浠朵笉浼氳鍘嬬缉 –>-->
+ <!-- <excludes>-->
+ <!-- <exclude>**/*.min.js</exclude>-->
+ <!-- <exclude>**/*.min.css</exclude>-->
+ <!-- <exclude>**/d7/**</exclude>-->
+ <!-- <exclude>**/dorado-home/**</exclude>-->
+ <!-- <exclude>**/bdf2/**</exclude>-->
+ <!-- <exclude>**/css/**</exclude>-->
+ <!-- <exclude>**/js/**</exclude>-->
+ <!-- <exclude>**/plugins/**</exclude>-->
+ <!-- </excludes>-->
+ <!-- </configuration>-->
+ <!-- </plugin>-->
</plugins>
--
Gitblit v1.9.3