From 7af11da07988e252a0e6d8aefef1c575aab3764a Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 07 九月 2023 18:08:48 +0800
Subject: [PATCH] 上海同步数据---视频监控信息
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2103.java | 23 +++--
src/main/java/com/fzzy/async/fzzy40/entity/Fz40SecCamera.java | 11 ++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1311.java | 6 -
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java | 4 +
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2101.java | 2
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java | 130 ++++++++++++++++++++++++++++++++
src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java | 1
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1311Rep.java | 24 ++++++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java | 2
9 files changed, 180 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
index 79f87bb..adba87b 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
@@ -32,6 +32,8 @@
@Autowired
private Fzzy40Sync1023 fzzySync1023;
@Autowired
+ private Fzzy40Sync1311 fzzySync1311;
+ @Autowired
private Fzzy40Sync2103 fzzy40Sync2103;
@Override
@@ -48,6 +50,8 @@
//骞夸笢鐪佸钩鍙�2022鐗堬紝闇�瑕佸悓姝ョ啅钂稿妗堜俊鎭�
//鐔忚捀澶囨鏁版嵁鍚屾
fzzySync1023.syncData(param.getDeptId(), param.getStart(), param.getEnd());
+ //瑙嗛鐩戞帶淇℃伅鍚屾
+ fzzySync1311.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
}
if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.equals(param.getPushProtocol())) {
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40SecCamera.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40SecCamera.java
index d9b0949..8c4b1cc 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40SecCamera.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40SecCamera.java
@@ -2,6 +2,7 @@
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
@@ -42,7 +43,7 @@
@Column(name = "TYPE_", length = 10)
@PropertyDef(label = "璁惧绫诲瀷")
private String type;
-
+
@Column(name = "PLAY_TYPE_", length = 40)
@PropertyDef(label = "鎾斁鏂瑰紡")
private String playType;
@@ -50,6 +51,10 @@
@Column(name = "SNAP_TYPE_", length = 25)
@PropertyDef(label = "鎶撴媿鏂瑰紡")
private String snapType;
+
+ @Column(name = "azwzlx", length = 2)
+ @PropertyDef(label = "瀹夎浣嶇疆绫诲瀷")
+ private String azwzlx;
@Column(name = "NAME_", length = 50)
@PropertyDef(label = "鍚嶇О")
@@ -92,11 +97,11 @@
private String remark;
@PropertyDef(label = "椤甸潰涓殑鍧愭爣")
- @Column(name = "POS_X_",updatable = false)
+ @Column(name = "POS_X_", updatable = false)
private double posX;
@PropertyDef(label = "椤甸潰涓殑鍧愭爣")
- @Column(name = "POS_Y_",updatable = false)
+ @Column(name = "POS_Y_", updatable = false)
private double posY;
@Column(name = "SCREEN_SHOW_", length = 1)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java
new file mode 100644
index 0000000..97bfb6f
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java
@@ -0,0 +1,130 @@
+package com.fzzy.async.fzzy40.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.ApiInfoData;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy40.entity.Fz40SecCamera;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1311Rep;
+import com.fzzy.push.sh2023.SH2023Constant;
+import com.fzzy.push.sh2023.dto.SH2023Api1311;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.weaver.ConcreteTypeMunger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 瑙嗛鐩戞帶
+ *
+ * @Author:YAN
+ */
+@Component
+@Slf4j
+public class Fzzy40Sync1311 {
+ @Autowired
+ private ApiLogRep apiLogRep;
+ @Autowired
+ private Fzzy40Sync1311Rep fzzy40Sync1311Rep;
+ @Autowired
+ private ApiCommonService commonService;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1311鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ //鍚屾鏁版嵁
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(SH2023Constant.SH_2023_API_CODE_1311);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz40SecCamera> list = fzzy40Sync1311Rep.findDateByDeptId(deptId);
+ if (list.isEmpty() || null == list) {
+ log.debug("-------------娌℃湁鑾峰彇鍒拌棰戠洃鎺т俊鎭�------------------");
+ return;
+ }
+ SH2023Api1311 sh2023Api1311;
+ List<ApiInfoData> apiInfoDataList;
+ String dataID;
+ int num = 1;
+ String secType = "01,02,03,04,05";
+ for (Fz40SecCamera sysData : list) {
+ dataID = kqdm.substring(3, 8) + "01401327" + String.format("%06d", num++);
+ List<ApiInfoData> apiInfoData = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_1311, dataID);
+ if (null != apiInfoData && apiInfoData.size() > 0) {
+ continue;
+ }
+ sh2023Api1311 = new SH2023Api1311();
+ sh2023Api1311.setSxtbh(dataID);
+ sh2023Api1311.setTdbh(sysData.getChanNum());
+ sh2023Api1311.setTdmc(sysData.getChanNum() + "鍙烽�氶亾");
+ sh2023Api1311.setJksbmc(sysData.getName());
+ sh2023Api1311.setKqdm(kqdm);
+ if (sysData.getBrand().equals("01")) {
+ sh2023Api1311.setJkcs("2");
+ } else if (sysData.getBrand().equals("02")) {
+ sh2023Api1311.setJkcs("1");
+ } else {
+ sh2023Api1311.setJkcs("9");
+ }
+ sh2023Api1311.setJkxlh(sysData.getSn());
+ if (sysData.getAzwzlx().equals("08")) {
+ sh2023Api1311.setSpjklx("1");
+ } else if (secType.indexOf(sysData.getAzwzlx()) >= 0) {
+ sh2023Api1311.setSpjklx("2");
+ } else {
+ sh2023Api1311.setSpjklx("3");
+ }
+ sh2023Api1311.setSblxbm("1");
+ sh2023Api1311.setAzwzlx(sysData.getAzwzlx());
+ sh2023Api1311.setZsqy("Y");
+ sh2023Api1311.setJkjlxbm(sysData.getType().substring(1));
+ sh2023Api1311.setSbipdz(sysData.getIpIn());
+ sh2023Api1311.setSbdkh(sysData.getPortInV());
+ sh2023Api1311.setSbdlmc(sysData.getLoginId());
+ sh2023Api1311.setSbdlmm(sysData.getPwd());
+ sh2023Api1311.setBz(sysData.getRemark());
+ sh2023Api1311.setZhgxsj(sysData.getUpdateTime());
+
+ //鎸佷箙鍖栦繚瀛橈紝鍗曠嫭瀛樺叆闈炲浗鏍囨帴鍙ｈ〃
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(ContextUtil.getUUID());
+ infoData.setKqdm(kqdm);
+ infoData.setInteType(Constant.API_CATEGORY_13);
+ infoData.setInteId(SH2023Constant.SH_2023_API_CODE_1311);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(dataID);
+ infoData.setRemarks("瑙嗛鐩戞帶淇℃伅");
+ //璁剧疆鎿嶄綔鏍囧織
+ apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_1311, infoData.getDataId());
+ if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
+ infoData.setCzbz(Constant.CZBZ_I);
+ } else {
+ infoData.setCzbz(apiInfoDataList.get(0).getCzbz());
+ }
+
+
+ infoData.setData(JSON.toJSONString(sh2023Api1311));
+ apiInfoDataRep.save(infoData);
+
+
+ log.info("1311---甯傚偍妫�鏂ゅ崟-鍚屾鏁版嵁锛歿}", sh2023Api1311);
+ }
+
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e);
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2101.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2101.java
index 69617e1..eecdd8c 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2101.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2101.java
@@ -128,7 +128,7 @@
infoData.setRemarks("甯傚偍妫�鏂ゅ崟");
//璁剧疆鎿嶄綔鏍囧織
- apiInfoDataList = apiInfoDataRep.getDataByDataId(infoData.getDataId());
+ apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, infoData.getDataId());
if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
infoData.setCzbz(Constant.CZBZ_I);
sh2023Api2101.setCzbz(Constant.CZBZ_I);
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2103.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2103.java
index 6d50dcb..421b69c 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2103.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2103.java
@@ -23,6 +23,7 @@
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -80,7 +81,7 @@
List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
String bjw = "";
- if(null != api1102List && api1102List.size() > 0){
+ if (null != api1102List && api1102List.size() > 0) {
bjw = ShAreaBjw.getBjw(api1102List.get(0).getXzqhdm());
}
@@ -95,7 +96,7 @@
for (Fz40Depot fz40Depot : list) {
//鏍规嵁浠撳簱缂栫爜鑾峰彇閰嶇疆淇℃伅
depotConfList = fzzy40SyncDepotConfRep.findDataByDepotId(fz40Depot.getId());
- if(null == depotConfList || depotConfList.isEmpty()){
+ if (null == depotConfList || depotConfList.isEmpty()) {
continue;
}
//鑾峰彇璐т綅淇℃伅
@@ -115,7 +116,7 @@
// 1-3-5
// 8-8-8
//绛掍粨瑙勫垯
- if(StringUtils.isNotEmpty(depotConf.getCableCir())){
+ if (StringUtils.isNotEmpty(depotConf.getCableCir())) {
sh2023Api2103.setDlqs(String.valueOf(strs.length));
sh2023Api2103.setDlhs(null);
sh2023Api2103.setDlls(null);
@@ -125,21 +126,21 @@
String[] cableCir = depotConf.getCableCir().split("-");
int num1 = 0; //璧峰鏍�
int num2 = 0; //鎴鏍�
- for(int i = 0; i < cableCir.length; i ++){
+ for (int i = 0; i < cableCir.length; i++) {
sh2023Api2103.setDlcs(cableCir[i]);
sh2023Api2103Item = new SH2023Api2103Item();
sh2023Api2103Item.setQh(i + 1 + "");
- if(i == 0){
+ if (i == 0) {
num1 += 1;
- }else {
+ } else {
num1 = num2 + 1;
}
num2 += Integer.valueOf(strs[i]);
sh2023Api2103Item.setQsdlbh(num1 + "");
sh2023Api2103Item.setJsdlbh(num2 + "");
sh2023Api2103Item.setCs(cableCir[i]);
- sh2023Api2103Item.setYbj((i + 1)*4 + "");
+ sh2023Api2103Item.setYbj((i + 1) * 4 + "");
sh2023Api2103Item.setRowId(i + "");
listItem.add(sh2023Api2103Item);
}
@@ -147,13 +148,13 @@
}
sh2023Api2103.setScqd("1");
- sh2023Api2103.setSczd(Integer.valueOf(strs[1])*Integer.valueOf(strs[2]) + "");
+ sh2023Api2103.setSczd(Integer.valueOf(strs[1]) * Integer.valueOf(strs[2]) + "");
sh2023Api2103.setZcqd("1");
- sh2023Api2103.setZczd(Integer.valueOf(strs[1])*Integer.valueOf(strs[2]) + "");
+ sh2023Api2103.setZczd(Integer.valueOf(strs[1]) * Integer.valueOf(strs[2]) + "");
sh2023Api2103.setXcqd("1");
- sh2023Api2103.setXczd(Integer.valueOf(strs[1])*Integer.valueOf(strs[2]) + "");
+ sh2023Api2103.setXczd(Integer.valueOf(strs[1]) * Integer.valueOf(strs[2]) + "");
sh2023Api2103.setYxfwqsc("1");
sh2023Api2103.setYxfwjsc(strs[0]);
@@ -172,7 +173,7 @@
infoData.setRemarks("绮儏璁惧閰嶇疆淇℃伅");
//璁剧疆鎿嶄綔鏍囧織
- apiInfoDataList = apiInfoDataRep.getDataByDataId(infoData.getDataId());
+ apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2103, infoData.getDataId());
if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
infoData.setCzbz(Constant.CZBZ_I);
} else {
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java
index 9ce5adb..91a8217 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java
@@ -121,7 +121,7 @@
infoData.setRemarks("甯傚偍椹宠繍鍗�");
//璁剧疆鎿嶄綔鏍囧織
- apiInfoDataList = apiInfoDataRep.getDataByDataId(infoData.getDataId());
+ apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, infoData.getDataId());
if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
infoData.setCzbz(Constant.CZBZ_I);
sh2023Api2104.setCzbz(Constant.CZBZ_I);
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1311Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1311Rep.java
new file mode 100644
index 0000000..b32fcab
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1311Rep.java
@@ -0,0 +1,24 @@
+package com.fzzy.async.fzzy40.repository;
+
+import com.fzzy.async.fzzy40.entity.Fz40Quality;
+import com.fzzy.async.fzzy40.entity.Fz40SecCamera;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author:YAN
+ */
+public interface Fzzy40Sync1311Rep extends JpaRepository<Fz40SecCamera, String> {
+ /**
+ * 鏍规嵁鏃堕棿娈垫煡璇㈢伯鎯呮暟鎹�
+ *
+ * @param deptId
+ * @return
+ */
+ @Query("from Fz40SecCamera where deptId =:deptId ")
+ List<Fz40SecCamera> findDateByDeptId(@Param("deptId") String deptId);
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java
index 17b1ef9..e47a34e 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java
@@ -331,7 +331,6 @@
List<SH2023Api1311> list = new ArrayList<>();
for (ApiInfoData infoData : items) {
shApi1311 = JSONObject.parseObject(infoData.getData(), SH2023Api1311.class);
- shApi1311.setCzbz(infoData.getCzbz());
shApi1311.setZhgxsj(infoData.getUpdateTime());
list.add(shApi1311);
}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1311.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1311.java
index eca0939..beb7b97 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1311.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1311.java
@@ -117,12 +117,6 @@
@PropertyDef(label = "澶囨敞")
private String bz;
- @PropertyDef(label = "鏍囪浣�")
- private String bjw;
-
- @PropertyDef(label = "鎿嶄綔鏍囧織")
- private String czbz;
-
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
private Date zhgxsj;
--
Gitblit v1.9.3