From baf19e2baaede841cc510ab2a5bdd8e402b71500 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 23 八月 2024 14:12:21 +0800
Subject: [PATCH] 摄像头位置同步调整
---
src/main/resources/application-uat.yml | 2
src/main/java/com/fzzy/api/entity/ApiConfs.java | 10 ++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java | 42 +++++-----
src/main/resources/application-pro2.yml | 26 +++--
src/main/resources/application-pro5329.yml | 57 ++++++++++++++
src/main/resources/application-pro.yml | 24 +++--
src/main/java/com/fzzy/api/view/ApiConfs.view.xml | 22 +++++
7 files changed, 136 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/ApiConfs.java b/src/main/java/com/fzzy/api/entity/ApiConfs.java
index db1f44e..4762287 100644
--- a/src/main/java/com/fzzy/api/entity/ApiConfs.java
+++ b/src/main/java/com/fzzy/api/entity/ApiConfs.java
@@ -165,7 +165,15 @@
@PropertyDef(label = "缁熶竴缂栫爜涓婁紶")
@Column(name = "GB_CODING_TAG_", length = 200)
private String gbCodingTag;
-
+
+ @PropertyDef(label = "椤甸潰涓殑鍧愭爣")
+ @Column(name = "POS_X_", precision = 20, scale = 6)
+ private Double posX = 0.0;
+
+ @PropertyDef(label = "椤甸潰涓殑鍧愭爣")
+ @Column(name = "POS_Y_", precision = 20, scale = 6)
+ private Double posY = 0.0;
+
@Transient
@PropertyDef(label = "妯℃嫙寰楀垎")
private int grade;
diff --git a/src/main/java/com/fzzy/api/view/ApiConfs.view.xml b/src/main/java/com/fzzy/api/view/ApiConfs.view.xml
index bc98d40..d8be0be 100644
--- a/src/main/java/com/fzzy/api/view/ApiConfs.view.xml
+++ b/src/main/java/com/fzzy/api/view/ApiConfs.view.xml
@@ -237,6 +237,14 @@
<Property name="dataType">int</Property>
<Property name="label">妯℃嫙寰楀垎</Property>
</PropertyDef>
+ <PropertyDef name="posX">
+ <Property name="dataType">double</Property>
+ <Property name="label">楦熺灠鍥綳杞村儚绱�</Property>
+ </PropertyDef>
+ <PropertyDef name="posY">
+ <Property name="dataType">double</Property>
+ <Property name="label">楦熺灠鍥綴杞村儚绱�</Property>
+ </PropertyDef>
</DataType>
</Model>
<View layout="regionPadding:10">
@@ -436,7 +444,6 @@
<Property name="property">appCode</Property>
<Editor/>
</AutoFormElement>
-
<AutoFormElement>
<Property name="name">deptId</Property>
<Property name="property">deptId</Property>
@@ -462,7 +469,6 @@
<Property name="labelWidth">125</Property>
<Editor/>
</AutoFormElement>
-
<AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">apiUrl</Property>
<Property name="property">apiUrl</Property>
@@ -499,6 +505,18 @@
<Property name="labelWidth">125</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">posX</Property>
+ <Property name="property">posX</Property>
+ <Property name="labelWidth">125</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">posY</Property>
+ <Property name="property">posY</Property>
+ <Property name="labelWidth">125</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
</Children>
</FieldSet>
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java
index 4e2a138..547ba0c 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java
@@ -1,21 +1,16 @@
package com.fzzy.async.fzzy40.impl;
import com.fzzy.api.Constant;
-import com.fzzy.api.entity.Api1101;
-import com.fzzy.api.entity.Api1102;
-import com.fzzy.api.entity.Api1111;
-import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.entity.*;
import com.fzzy.api.utils.ContextUtil;
-import com.fzzy.api.view.repository.Api1101Rep;
-import com.fzzy.api.view.repository.Api1102Rep;
-import com.fzzy.api.view.repository.Api1111Rep;
-import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.api.view.repository.*;
import com.fzzy.async.fzzy40.entity.Fz40SecCamera;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1111Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
import java.util.Date;
import java.util.List;
@@ -36,6 +31,8 @@
private Api1111Rep api1111Rep;
@Autowired
private ApiLogRep apiLogRep;
+ @Autowired
+ private ApiConfsRep apiConfsRep;
/**
* 鍚屾鐩戞帶鎺ュ彛
@@ -58,6 +55,7 @@
apiLog.setId(ContextUtil.getUUID());
try {
List<Fz40SecCamera> list = fzzy40Sync1111Rep.listCamera(deptId, start, end);
+ List<ApiConfs> apiConfs = apiConfsRep.getDataByKqdm(kqdm);
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒扮洃鎺т俊鎭�------------------");
@@ -80,15 +78,15 @@
apiData.setSpjksbmc(api1102.getKqmc() + "-" + sysData.getName());
apiData.setSpjksbid(api1102.getXzqhdm() + "00401327" + String.valueOf(num).substring(1));
- if(sysData.getId().contains(api1102.getXzqhdm())){
+ if (sysData.getId().contains(api1102.getXzqhdm())) {
apiData.setSpjksbid(sysData.getId());
}
- apiData.setSpjksbxdwz("(" + Math.round(sysData.getPosX()*1000) + "," + Math.round(sysData.getPosY()*1000) + ")");
+ apiData.setSpjksbxdwz("(" + Math.round(sysData.getPosX() * apiConfs.get(0).getPosX()) + "," + Math.round(sysData.getPosY() * apiConfs.get(0).getPosY()) + ")");
apiData.setBz(sysData.getRemark());
//瑙嗛鐩戞帶绫诲瀷鍜岀偣浣嶇被鍨�
- apiData.setSpjklx(StringUtils.isEmpty(sysData.getSpjklx())?"3":sysData.getSpjklx());
- apiData.setSpdwlx(StringUtils.isEmpty(sysData.getSpdwlx())?"7":sysData.getSpdwlx());
+ apiData.setSpjklx(StringUtils.isEmpty(sysData.getSpjklx()) ? "3" : sysData.getSpjklx());
+ apiData.setSpdwlx(StringUtils.isEmpty(sysData.getSpdwlx()) ? "7" : sysData.getSpdwlx());
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
apiData.setZhgxsj(new Date());
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
@@ -96,38 +94,38 @@
apiData.setCzbz(Constant.CZBZ_I);
listApi1111 = api1111Rep.getApi1111ById(apiData.getSpjksbid());
- if(null != listApi1111 && listApi1111.size() > 0){
+ if (null != listApi1111 && listApi1111.size() > 0) {
apiData.setCzbz(listApi1111.get(0).getCzbz());
- if(StringUtils.isNotEmpty(listApi1111.get(0).getSpjklx())){
+ if (StringUtils.isNotEmpty(listApi1111.get(0).getSpjklx())) {
apiData.setSpjklx(listApi1111.get(0).getSpjklx());
}
- if(StringUtils.isNotEmpty(listApi1111.get(0).getSpdwlx())){
+ if (StringUtils.isNotEmpty(listApi1111.get(0).getSpdwlx())) {
apiData.setSpdwlx(listApi1111.get(0).getSpdwlx());
}
- if(StringUtils.isNotEmpty(listApi1111.get(0).getHkCameraIndexCode())){
+ if (StringUtils.isNotEmpty(listApi1111.get(0).getHkCameraIndexCode())) {
apiData.setHkCameraIndexCode(listApi1111.get(0).getHkCameraIndexCode());
}
- if(StringUtils.isNotEmpty(listApi1111.get(0).getCfdm())){
+ if (StringUtils.isNotEmpty(listApi1111.get(0).getCfdm())) {
apiData.setCfdm(listApi1111.get(0).getCfdm());
}
- if(StringUtils.isNotEmpty(listApi1111.get(0).getAjdm())){
+ if (StringUtils.isNotEmpty(listApi1111.get(0).getAjdm())) {
apiData.setAjdm(listApi1111.get(0).getAjdm());
}
- if(StringUtils.isNotEmpty(listApi1111.get(0).getSpjksbwzys())){
+ if (StringUtils.isNotEmpty(listApi1111.get(0).getSpjksbwzys())) {
apiData.setSpjksbwzys(listApi1111.get(0).getSpjksbwzys());
}
- if(StringUtils.isNotEmpty(listApi1111.get(0).getBz())){
+ if (StringUtils.isNotEmpty(listApi1111.get(0).getBz())) {
apiData.setBz(listApi1111.get(0).getBz());
}
apiData.setCzbz(listApi1111.get(0).getCzbz());
- }else {
+ } else {
apiData.setCzbz(Constant.CZBZ_I);
}
apiData.setBizId(sysData.getId());
//淇濆瓨鏁版嵁
api1111Rep.save(apiData);
- num ++;
+ num++;
log.info("1111---鍚屾鏁版嵁锛歿}", apiData.toString());
}
} catch (Exception e) {
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index 5758bdf..3625350 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -1,6 +1,6 @@
-########################## 骞夸笢娼槼 - 澶х背浠ｅ偍搴� ##########################
+########################## 瀹佸鐭冲槾灞辩孩鏋滃瓙绮簱 ##########################
server:
- port: 8091
+ port: 8090
jetty:
max-http-post-size: 209715200
tomcat:
@@ -9,16 +9,16 @@
datasource:
#涓绘暟鎹簮
primary:
- url: jdbc:mysql://127.0.0.1:3306/igds_api_2?useUnicode=true&characterEncoding=utf-8
+ url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
+ driver-class-name: com.mysql.jdbc.Driver
username: root
password: Abc123..
- driver-class-name: com.mysql.jdbc.Driver
#娆℃暟鎹簮
secondary:
- url: jdbc:mysql://127.0.0.1:3306/igds_master_v40?useUnicode=true&characterEncoding=utf-8
+ url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
+ driver-class-name: com.mysql.jdbc.Driver
username: root
password: Abc123..
- driver-class-name: com.mysql.jdbc.Driver
jpa:
#涓籮pa閰嶇疆
primary:
@@ -38,7 +38,7 @@
dialect: org.hibernate.dialect.MySQL5InnoDBDialect
# Redis鐩稿叧閰嶇疆
redis:
- database: 0
+ database: 1
host: 127.0.0.1
port: 6379
password: Abc123..
@@ -51,7 +51,11 @@
timeout: 6000
igds:
default:
- companyId: 5317
-
+ companyId: 5306
file-path: D:/IGDS-API/FILE/
- img-path: D:/IGDS/FILE/
\ No newline at end of file
+ img-path: D:/IGDS/FILE/
+ # 鐪佸钩鍙癛SA瀵嗛挜瀵逛俊鎭�
+ #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsoiS5Q5CKAT9w5EbZXCxJO/5J2iV3i2HrTW/YcGs2EGeQsQc97EWPdFE1SPXGH5p9TO8nCFRJScj4WeeKUVcuRpzR7czQQ+c6kf6cR9LLQrAiGEMQSk13j/5UsJho23IQDGKWoH18f5aPdX8tJn/o4aR6mMxUY9jdaSKEBck1TQIDAQAB
+ # 鍖虹骇骞冲彴RSA瀵嗛挜瀵逛俊鎭�
+ #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCMsCJyl6EkjUEfB9Otl0bNmFD0Gr3g/v8DYnoq66EIviDNKT+bo5Aj6BRFngns1aCy1uyWgC5/+PIQ3sxs25nWXxFBYXy7cTiGwCCPfnmmI3rkXRGqRo6uh9K3BsucSE0kyhB8Eq76bQ6BPa5XpMyyq8V2oN2i0LLYpDhV97j3BwIDAQAB
+ #绉侀挜锛歁IICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIywInKXoSSNQR8H062XRs2YUPQaveD+/wNieirroQi+IM0pP5ujkCPoFEWeCezVoLLW7JaALn/48hDezGzbmdZfEUFhfLtxOIbAII9+eaYjeuRdEapGjq6H0rcGy5xITSTKEHwSrvptDoE9rlekzLKrxXag3aLQstikOFX3uPcHAgMBAAECgYAOZvWPz4/ygvdYqt9zlNntsBsRci9f+hq3CPzCqg55K6WF+yQE1dCqrFZu7gfME+54gGIF4idgeGanbXd16WEtFslEJlFKGk3cF62gaX5Y/nZ4zS65CLTjQ650j6SJ7OC2QYjIejTWhJD0k1tSazXdzV70nP+X3DbGyyO3Rm+juQJBANMCi+9RnzcGvltN/AdWD0DgshRBNrqrHtDkmzRFSkFwIqVSL5J7qRvntjhSstQIBB5KCosCmwRYKxGWQ9Ou420CQQCqrz2byBz3w2pkEfPY3rv7T4zE/2CHC74XtW9sEUTieYaxqIKlnwJacactzx4ZOAg21dGCoqOG9Y9RIpH2mMfDAkEAlAucXIt61qOfmPXtFsSVrSI5LybWHEAFPfC2yAS5ZZIkbLNt9ytV6eM3oOq81zDMmue93+wzEOg/R3aTHgj9PQJALNGxUsu8V473y+ku596s6/PamgwZE70QoHcjF/R86x9QMCx4ifb0Dj3T0WKWm7ar6YJB7pS4bgLjLEHwpBlAMwJAUUG2NhfGXFxfyFOC+5BzFTEr7EdSeHPXJl7dIWmRHncHsv8Nl2yvWsIOfDOYKS3ynptMgeSZaJPnXhvFdX0TnQ==
diff --git a/src/main/resources/application-pro2.yml b/src/main/resources/application-pro2.yml
index c9f82f8..a9641e5 100644
--- a/src/main/resources/application-pro2.yml
+++ b/src/main/resources/application-pro2.yml
@@ -1,6 +1,6 @@
-########################## 骞夸笢娼槼 - 澶х背浠ｅ偍搴� ##########################
+########################## 瀹佸鐭冲槾灞辩孩鏋滃瓙绮簱 ##########################
server:
- port: 8095
+ port: 8091
jetty:
max-http-post-size: 209715200
tomcat:
@@ -9,16 +9,16 @@
datasource:
#涓绘暟鎹簮
primary:
- url: jdbc:mysql://127.0.0.1:3306/igds_api_2?useUnicode=true&characterEncoding=utf-8
+ url: jdbc:mysql://127.0.0.1:3306/igds_api_gb?useUnicode=true&characterEncoding=utf-8
+ driver-class-name: com.mysql.jdbc.Driver
username: root
password: Abc123..
- driver-class-name: com.mysql.jdbc.Driver
#娆℃暟鎹簮
secondary:
- url: jdbc:mysql://127.0.0.1:3306/igds_master_v40?useUnicode=true&characterEncoding=utf-8
+ url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
+ driver-class-name: com.mysql.jdbc.Driver
username: root
password: Abc123..
- driver-class-name: com.mysql.jdbc.Driver
jpa:
#涓籮pa閰嶇疆
primary:
@@ -38,7 +38,7 @@
dialect: org.hibernate.dialect.MySQL5InnoDBDialect
# Redis鐩稿叧閰嶇疆
redis:
- database: 5
+ database: 3
host: 127.0.0.1
port: 6379
password: Abc123..
@@ -51,7 +51,11 @@
timeout: 6000
igds:
default:
- companyId: 5317
-
- file-path: D:/IGDS-API/FILE/
- img-path: D:/IGDS/FILE/
\ No newline at end of file
+ companyId: 5306
+ file-path: D:/IGDS-API/FILE-GB/
+ img-path: D:/IGDS/FILE/
+ # 鐪佸钩鍙癛SA瀵嗛挜瀵逛俊鎭�
+ #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsoiS5Q5CKAT9w5EbZXCxJO/5J2iV3i2HrTW/YcGs2EGeQsQc97EWPdFE1SPXGH5p9TO8nCFRJScj4WeeKUVcuRpzR7czQQ+c6kf6cR9LLQrAiGEMQSk13j/5UsJho23IQDGKWoH18f5aPdX8tJn/o4aR6mMxUY9jdaSKEBck1TQIDAQAB
+ # 鍖虹骇骞冲彴RSA瀵嗛挜瀵逛俊鎭�
+ #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCMsCJyl6EkjUEfB9Otl0bNmFD0Gr3g/v8DYnoq66EIviDNKT+bo5Aj6BRFngns1aCy1uyWgC5/+PIQ3sxs25nWXxFBYXy7cTiGwCCPfnmmI3rkXRGqRo6uh9K3BsucSE0kyhB8Eq76bQ6BPa5XpMyyq8V2oN2i0LLYpDhV97j3BwIDAQAB
+ #绉侀挜锛歁IICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIywInKXoSSNQR8H062XRs2YUPQaveD+/wNieirroQi+IM0pP5ujkCPoFEWeCezVoLLW7JaALn/48hDezGzbmdZfEUFhfLtxOIbAII9+eaYjeuRdEapGjq6H0rcGy5xITSTKEHwSrvptDoE9rlekzLKrxXag3aLQstikOFX3uPcHAgMBAAECgYAOZvWPz4/ygvdYqt9zlNntsBsRci9f+hq3CPzCqg55K6WF+yQE1dCqrFZu7gfME+54gGIF4idgeGanbXd16WEtFslEJlFKGk3cF62gaX5Y/nZ4zS65CLTjQ650j6SJ7OC2QYjIejTWhJD0k1tSazXdzV70nP+X3DbGyyO3Rm+juQJBANMCi+9RnzcGvltN/AdWD0DgshRBNrqrHtDkmzRFSkFwIqVSL5J7qRvntjhSstQIBB5KCosCmwRYKxGWQ9Ou420CQQCqrz2byBz3w2pkEfPY3rv7T4zE/2CHC74XtW9sEUTieYaxqIKlnwJacactzx4ZOAg21dGCoqOG9Y9RIpH2mMfDAkEAlAucXIt61qOfmPXtFsSVrSI5LybWHEAFPfC2yAS5ZZIkbLNt9ytV6eM3oOq81zDMmue93+wzEOg/R3aTHgj9PQJALNGxUsu8V473y+ku596s6/PamgwZE70QoHcjF/R86x9QMCx4ifb0Dj3T0WKWm7ar6YJB7pS4bgLjLEHwpBlAMwJAUUG2NhfGXFxfyFOC+5BzFTEr7EdSeHPXJl7dIWmRHncHsv8Nl2yvWsIOfDOYKS3ynptMgeSZaJPnXhvFdX0TnQ==
diff --git a/src/main/resources/application-pro5329.yml b/src/main/resources/application-pro5329.yml
new file mode 100644
index 0000000..40a7227
--- /dev/null
+++ b/src/main/resources/application-pro5329.yml
@@ -0,0 +1,57 @@
+########################## 骞夸笢浣涘北绂呭煄鍖� ##########################
+server:
+ port: 8095
+ jetty:
+ max-http-post-size: 209715200
+ tomcat:
+ max-http-post-size: 209715200
+spring:
+ datasource:
+ #涓绘暟鎹簮
+ primary:
+ url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
+ username: root
+ password: Abc123..
+ driver-class-name: com.mysql.jdbc.Driver
+ #娆℃暟鎹簮
+ secondary:
+ url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
+ username: root
+ password: Abc123..
+ driver-class-name: com.mysql.jdbc.Driver
+ jpa:
+ #涓籮pa閰嶇疆
+ primary:
+ show-sql: true
+ properties:
+ hibernate:
+ hbm2ddl:
+ auto: update
+ dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+ #娆pa閰嶇疆
+ secondary:
+ show-sql: true
+ properties:
+ hibernate:
+ hbm2ddl:
+ auto: none
+ dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+ # Redis鐩稿叧閰嶇疆
+ redis:
+ database: 5
+ host: 127.0.0.1
+ port: 6379
+ password: Abc123..
+ # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
+ pool:
+ max-active: 200
+ max-wait: -1
+ max-idle: 10
+ min-idle: 0
+ timeout: 6000
+igds:
+ default:
+ companyId: 5317
+
+ file-path: D:/IGDS-API/FILE/
+ img-path: D:/IGDS/FILE/
\ No newline at end of file
diff --git a/src/main/resources/application-uat.yml b/src/main/resources/application-uat.yml
index 9ffc78e..599e194 100644
--- a/src/main/resources/application-uat.yml
+++ b/src/main/resources/application-uat.yml
@@ -14,7 +14,7 @@
driver-class-name: com.mysql.jdbc.Driver
#娆℃暟鎹簮
secondary:
- url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
+ url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
username: root
password: Abc123..
driver-class-name: com.mysql.jdbc.Driver
--
Gitblit v1.9.3