From 2db1a7b1019297a3ba9f098f44488d1ee07addc7 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 19 六月 2023 09:06:06 +0800
Subject: [PATCH] 电子巡更
---
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5602.java | 27 ++++
igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoVideo.java | 22 +++
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5601.java | 59 +++++++++
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5501.java | 2
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5604.java | 52 ++++++++
igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoPatrol.java | 23 +++
igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoEnergy.java | 4
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5503.java | 30 +++-
igds-api-phone/src/main/java/com/ld/igds/phone35/constant/Phone35Constant.java | 24 ++-
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5603.java | 27 ++++
igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml | 30 ++++
igds-api-phone/src/main/java/com/ld/igds/phone35/mapper/Phone35Mapper.java | 17 ++
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java | 25 ++++
13 files changed, 321 insertions(+), 21 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 c125a68..e6a52c8 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
@@ -11,17 +11,17 @@
public class Phone35Constant {
public static final String BEAN_ID = "phone.phoneConstant";
/**
- *绮儏浠撳簱鍒楄〃
+ * 绮儏浠撳簱鍒楄〃
*/
- public static final String PHONE_DEPOT_GRAIN="grain";
- public static final String PHONE_DEPOT_PEST="pest";
- public static final String PHONE_DEPOT_GAS="gas";
+ public static final String PHONE_DEPOT_GRAIN = "grain";
+ public static final String PHONE_DEPOT_PEST = "pest";
+ public static final String PHONE_DEPOT_GAS = "gas";
/**
* 鍊间粨鎻愪氦
*/
- public static final String PHONE_INOUT_START="start";
- public static final String PHONE_INOUT_END="end";
+ public static final String PHONE_INOUT_START = "start";
+ public static final String PHONE_INOUT_END = "end";
/**
* 鐧诲綍
*/
@@ -88,10 +88,18 @@
public static final String API_PHONE_5502 = "5502";
public static final String API_PHONE_5503 = "5503";
- /* ======= 瑙嗛鐩戞帶 ====== */
+
+ /* ======= 鐢靛瓙宸℃洿 ====== */
public static final String API_PHONE_5601 = "5601";
public static final String API_PHONE_5602 = "5602";
+ public static final String API_PHONE_5603 = "5603";
+
+ /* ======= 瑙嗛鐩戞帶 ====== */
+
+ public static final String API_PHONE_5604 = "5604";
+ public static final String API_PHONE_5605 = "5605";
+ public static final String API_PHONE_5606 = "5606";
/* ======= 宸ュ崟绠＄悊 ====== */
@@ -100,7 +108,7 @@
public static final String API_PHONE_5703 = "5703";
public static final String API_PHONE_5704 = "5704";
- /* ======= 鐢靛瓙宸℃洿 ====== */
+ /* ======= 棰勮绠＄悊 ====== */
public static final String API_PHONE_5801 = "5801";
public static final String API_PHONE_5802 = "5802";
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoEnergy.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoEnergy.java
index 71a9a25..54c5c4e 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoEnergy.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoEnergy.java
@@ -19,8 +19,8 @@
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
- private double ep;
- private double eq;
+ private double startEs;
+ private double endEs;
private double es;
}
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
new file mode 100644
index 0000000..1235b43
--- /dev/null
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoPatrol.java
@@ -0,0 +1,23 @@
+package com.ld.igds.phone35.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author:YAN
+ */
+@Data
+public class DtoPatrol {
+
+ private String id;
+ private String userName;
+ private String longitude;
+ private String latitude;
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ private String base64Img;
+
+}
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoVideo.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoVideo.java
new file mode 100644
index 0000000..89296dd
--- /dev/null
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoVideo.java
@@ -0,0 +1,22 @@
+package com.ld.igds.phone35.dto;
+
+import lombok.Data;
+
+/**
+ * 鐩戞帶瑙嗛鍝嶅簲灏佽
+ *
+ * @Author:YAN
+ */
+@Data
+public class DtoVideo {
+
+ private String id;
+ private String name;
+ private String type;
+ private String status;
+ private String playType;
+
+ private String playAddr;
+ private String playIframe;
+
+}
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 5156d18..0456ffe 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,6 +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 org.apache.ibatis.annotations.Param;
@@ -70,4 +71,20 @@
* @return
*/
List<DtoEnergy> getEnergy(@Param("param") Phone35DepotCommonParam param);
+
+ /**
+ * 鐢靛瓙宸￠�诲垪琛�
+ *
+ * @param param
+ * @return
+ */
+ List<DtoPatrol> getPatrol(@Param("param") Phone35DepotCommonParam param);
+
+ /**
+ * 鐩戞帶璁惧鍒楄〃
+ *
+ * @param param
+ * @return
+ */
+ List<DtoVideo> getCamera(@Param("param") Phone35CommonParam param);
}
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5501.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5501.java
index c3139c1..fc7166e 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5501.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5501.java
@@ -19,6 +19,8 @@
import java.util.List;
/**
+ * 瀹炴椂閰嶇數
+ *
* @Author:YAN
*/
@Service
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5503.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5503.java
index b272758..eeb8091 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5503.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5503.java
@@ -23,6 +23,8 @@
import java.util.Map;
/**
+ * 浠撳簱鑳借�楁煡璇�
+ *
* @Author:YAN
*/
@Service
@@ -52,19 +54,29 @@
if (null == param.getStartTime()) {
return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
}
- param.setEndTime(DateUtil.getNextZero(param.getEndTime()));
+ if (null != param.getEndTime()) {
+ param.setEndTime(DateUtil.getNextZero(param.getEndTime()));
+ }
param.setCompanyId(phone35AuthUser.getCompanyId());
List<DtoEnergy> energyList = phone35Mapper.getEnergy(param);
Map<String, DtoEnergy> energyMap = new HashMap<>();
+ DtoEnergy dtoEnergy;
for (DtoEnergy data : energyList) {
- //todo
-// if (null == energyMap.get(data.getDepotId())) {
-// String depotName = phone35Util.getDepotName(phone35AuthUser.getCompanyId(), data.getDepotId());
-// data.setDepotName(depotName);
-// energyMap.put(data.getDepotId(), data);
-// }
+ if (null == energyMap.get(data.getDepotId())) {
+ String depotName = phone35Util.getDepotName(phone35AuthUser.getCompanyId(), data.getDepotId());
+ data.setDepotName(depotName);
+ data.setEndEs(data.getEs());
+ data.setStartEs(data.getEs());
+ energyMap.put(data.getDepotId(), data);
+ } else {
+ dtoEnergy = energyMap.get(data.getDepotId());
+ dtoEnergy.setStartEs(data.getEs());
+ dtoEnergy.setEpSum(data.getEpSum() + dtoEnergy.getEpSum());
+ dtoEnergy.setEqSum(data.getEqSum() + dtoEnergy.getEqSum());
+ dtoEnergy.setEsSum(data.getEsSum() + dtoEnergy.getEsSum());
+ }
}
- List<DtoEnergy> list = new ArrayList<>();
- return null;
+ List<DtoEnergy> list = new ArrayList<>(energyMap.values());
+ return PhoneRespUtil.success(list, req);
}
}
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
new file mode 100644
index 0000000..f5925d2
--- /dev/null
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5601.java
@@ -0,0 +1,59 @@
+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.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.Phone35DepotCommonParam;
+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.DateUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鐢靛瓙宸℃洿璁板綍
+ *
+ * @Author:YAN
+ */
+@Service
+public class Phone35ServiceImpl5601 implements Phone35Service {
+ @Autowired
+ private Phone35Mapper phone35Mapper;
+
+ @Override
+ public String getInterfaceId() {
+ return Phone35Constant.API_PHONE_5601;
+ }
+
+ @Override
+ public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
+ //杞寲瀵硅薄
+ Phone35DepotCommonParam param = JSONObject.parseObject(req.getData().toString(), Phone35DepotCommonParam.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.getDateTime())) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
+ }
+ Date date = DateUtils.parseDate(param.getDateTime(), "yyyy-MM-dd");
+ param.setStartTime(date);
+ param.setEndTime(DateUtil.getNextZero(date));
+ List<DtoPatrol> list = phone35Mapper.getPatrol(param);
+ return PhoneRespUtil.success(list, req);
+ }
+}
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
new file mode 100644
index 0000000..641fbbc
--- /dev/null
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5602.java
@@ -0,0 +1,27 @@
+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 Phone35ServiceImpl5602 implements Phone35Service {
+ @Override
+ public String getInterfaceId() {
+ return Phone35Constant.API_PHONE_5602;
+ }
+
+ @Override
+ public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
+ return null;
+ }
+}
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
new file mode 100644
index 0000000..9099705
--- /dev/null
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5603.java
@@ -0,0 +1,27 @@
+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 Phone35ServiceImpl5603 implements Phone35Service {
+ @Override
+ public String getInterfaceId() {
+ return Phone35Constant.API_PHONE_5603;
+ }
+
+ @Override
+ public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
+ return null;
+ }
+}
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
new file mode 100644
index 0000000..53da3d6
--- /dev/null
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5604.java
@@ -0,0 +1,52 @@
+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.DtoVideo;
+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.Phone35CommonParam;
+import com.ld.igds.phone35.param.Phone35DepotCommonParam;
+import com.ld.igds.phone35.param.Phone35Request;
+import com.ld.igds.phone35.service.Phone35Service;
+import com.ld.igds.phone35.util.PhoneRespUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 鐩戞帶璁惧鍒楄〃 D_SEC_CAMERA
+ *
+ * @Author:YAN
+ */
+@Service
+public class Phone35ServiceImpl5604 implements Phone35Service {
+ @Autowired
+ private Phone35Mapper phone35Mapper;
+
+ @Override
+ public String getInterfaceId() {
+ return Phone35Constant.API_PHONE_5604;
+ }
+
+ @Override
+ public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
+
+ //杞寲瀵硅薄
+ Phone35CommonParam param = JSONObject.parseObject(req.getData().toString(), Phone35CommonParam.class);
+ if (null == param) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
+ }
+ //鍙傛暟楠岃瘉
+ if (StringUtils.isEmpty(param.getDeptId())) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
+ }
+ param.setCompanyId(phone35AuthUser.getCompanyId());
+ List<DtoVideo> list = phone35Mapper.getCamera(param);
+ return PhoneRespUtil.success(list, req);
+ }
+}
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
new file mode 100644
index 0000000..8cfcfbf
--- /dev/null
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java
@@ -0,0 +1,25 @@
+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;
+
+/**
+ * 鐩戞帶鎾斁
+ *
+ * @Author:YAN
+ */
+public class Phone35ServiceImpl5605 implements Phone35Service {
+ @Override
+ public String getInterfaceId() {
+ return Phone35Constant.API_PHONE_5605;
+ }
+
+ @Override
+ public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
+ return null;
+ }
+}
diff --git a/igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml b/igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml
index a8c6f85..f1d0bbd 100644
--- a/igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml
+++ b/igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml
@@ -116,8 +116,6 @@
SELECT EP_INC_ AS epSum,
EQ_INC_ AS eqSum,
ES_INC_ AS esSum,
- EP_ AS ep,
- EQ_ AS eq,
ES_ AS es,
DEPOT_ID_ AS depotId,
UPDATE_TIME_ AS updateTime
@@ -134,4 +132,32 @@
</where>
ORDER BY UPDATE_TIME_ desc
</select>
+ <!-- 鐢靛瓙宸℃洿璁板綍-->
+ <select id="getPatrol" resultType="com.ld.igds.phone35.dto.DtoPatrol">
+ SELECT ID_ AS id,
+ USER_NAME_ AS userName,
+ LONGITUDE_ As longitude,
+ LATITUDE_ AS latitude,
+ IMG_NAME_ AS base64Img,
+ 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.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>
+ <!-- 鐩戞帶璁惧鍒楄〃-->
+ <select id="getCamera" resultType="com.ld.igds.phone35.dto.DtoVideo">
+
+ SELECT ID_ AS id,
+ TYPE_ AS type,
+ PLAY_TYPE_ AS playType,
+ NAME_ AS name
+ FROM D_SEC_CAMERA
+ WHERE COMPANY_ID_ = #{param.companyId}
+ AND DEPT_ID_ = #{param.deptId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3