摄像头位置同步调整

YYC

2024-08-23 baf19e2baaede841cc510ab2a5bdd8e402b71500

摄像头位置同步调整

 src/main/java/com/fzzy/api/entity/ApiConfs.java

@@ -166,6 +166,14 @@
    @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;

 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">鸟瞰图X轴像素</Property>
      </PropertyDef>
      <PropertyDef name="posY">
        <Property name="dataType">double</Property>
        <Property name="label">鸟瞰图Y轴像素</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>

 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("-------------没有获取到监控信息------------------");
@@ -84,7 +82,7 @@
                    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());

 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:
    #主jpa配置
    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/
  # çœå¹³å°RSA密钥对信息
  #公钥：MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsoiS5Q5CKAT9w5EbZXCxJO/5J2iV3i2HrTW/YcGs2EGeQsQc97EWPdFE1SPXGH5p9TO8nCFRJScj4WeeKUVcuRpzR7czQQ+c6kf6cR9LLQrAiGEMQSk13j/5UsJho23IQDGKWoH18f5aPdX8tJn/o4aR6mMxUY9jdaSKEBck1TQIDAQAB
  # åŒºçº§å¹³å°RSA密钥对信息
  #公钥：MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCMsCJyl6EkjUEfB9Otl0bNmFD0Gr3g/v8DYnoq66EIviDNKT+bo5Aj6BRFngns1aCy1uyWgC5/+PIQ3sxs25nWXxFBYXy7cTiGwCCPfnmmI3rkXRGqRo6uh9K3BsucSE0kyhB8Eq76bQ6BPa5XpMyyq8V2oN2i0LLYpDhV97j3BwIDAQAB
  #私钥：MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIywInKXoSSNQR8H062XRs2YUPQaveD+/wNieirroQi+IM0pP5ujkCPoFEWeCezVoLLW7JaALn/48hDezGzbmdZfEUFhfLtxOIbAII9+eaYjeuRdEapGjq6H0rcGy5xITSTKEHwSrvptDoE9rlekzLKrxXag3aLQstikOFX3uPcHAgMBAAECgYAOZvWPz4/ygvdYqt9zlNntsBsRci9f+hq3CPzCqg55K6WF+yQE1dCqrFZu7gfME+54gGIF4idgeGanbXd16WEtFslEJlFKGk3cF62gaX5Y/nZ4zS65CLTjQ650j6SJ7OC2QYjIejTWhJD0k1tSazXdzV70nP+X3DbGyyO3Rm+juQJBANMCi+9RnzcGvltN/AdWD0DgshRBNrqrHtDkmzRFSkFwIqVSL5J7qRvntjhSstQIBB5KCosCmwRYKxGWQ9Ou420CQQCqrz2byBz3w2pkEfPY3rv7T4zE/2CHC74XtW9sEUTieYaxqIKlnwJacactzx4ZOAg21dGCoqOG9Y9RIpH2mMfDAkEAlAucXIt61qOfmPXtFsSVrSI5LybWHEAFPfC2yAS5ZZIkbLNt9ytV6eM3oOq81zDMmue93+wzEOg/R3aTHgj9PQJALNGxUsu8V473y+ku596s6/PamgwZE70QoHcjF/R86x9QMCx4ifb0Dj3T0WKWm7ar6YJB7pS4bgLjLEHwpBlAMwJAUUG2NhfGXFxfyFOC+5BzFTEr7EdSeHPXJl7dIWmRHncHsv8Nl2yvWsIOfDOYKS3ynptMgeSZaJPnXhvFdX0TnQ==

 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:
    #主jpa配置
    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/
    companyId: 5306
  file-path: D:/IGDS-API/FILE-GB/
  img-path: D:/IGDS/FILE/
  # çœå¹³å°RSA密钥对信息
  #公钥：MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsoiS5Q5CKAT9w5EbZXCxJO/5J2iV3i2HrTW/YcGs2EGeQsQc97EWPdFE1SPXGH5p9TO8nCFRJScj4WeeKUVcuRpzR7czQQ+c6kf6cR9LLQrAiGEMQSk13j/5UsJho23IQDGKWoH18f5aPdX8tJn/o4aR6mMxUY9jdaSKEBck1TQIDAQAB
  # åŒºçº§å¹³å°RSA密钥对信息
  #公钥：MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCMsCJyl6EkjUEfB9Otl0bNmFD0Gr3g/v8DYnoq66EIviDNKT+bo5Aj6BRFngns1aCy1uyWgC5/+PIQ3sxs25nWXxFBYXy7cTiGwCCPfnmmI3rkXRGqRo6uh9K3BsucSE0kyhB8Eq76bQ6BPa5XpMyyq8V2oN2i0LLYpDhV97j3BwIDAQAB
  #私钥：MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIywInKXoSSNQR8H062XRs2YUPQaveD+/wNieirroQi+IM0pP5ujkCPoFEWeCezVoLLW7JaALn/48hDezGzbmdZfEUFhfLtxOIbAII9+eaYjeuRdEapGjq6H0rcGy5xITSTKEHwSrvptDoE9rlekzLKrxXag3aLQstikOFX3uPcHAgMBAAECgYAOZvWPz4/ygvdYqt9zlNntsBsRci9f+hq3CPzCqg55K6WF+yQE1dCqrFZu7gfME+54gGIF4idgeGanbXd16WEtFslEJlFKGk3cF62gaX5Y/nZ4zS65CLTjQ650j6SJ7OC2QYjIejTWhJD0k1tSazXdzV70nP+X3DbGyyO3Rm+juQJBANMCi+9RnzcGvltN/AdWD0DgshRBNrqrHtDkmzRFSkFwIqVSL5J7qRvntjhSstQIBB5KCosCmwRYKxGWQ9Ou420CQQCqrz2byBz3w2pkEfPY3rv7T4zE/2CHC74XtW9sEUTieYaxqIKlnwJacactzx4ZOAg21dGCoqOG9Y9RIpH2mMfDAkEAlAucXIt61qOfmPXtFsSVrSI5LybWHEAFPfC2yAS5ZZIkbLNt9ytV6eM3oOq81zDMmue93+wzEOg/R3aTHgj9PQJALNGxUsu8V473y+ku596s6/PamgwZE70QoHcjF/R86x9QMCx4ifb0Dj3T0WKWm7ar6YJB7pS4bgLjLEHwpBlAMwJAUUG2NhfGXFxfyFOC+5BzFTEr7EdSeHPXJl7dIWmRHncHsv8Nl2yvWsIOfDOYKS3ynptMgeSZaJPnXhvFdX0TnQ==

 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:
    #主jpa配置
    primary:
      show-sql: true
      properties:
        hibernate:
          hbm2ddl:
            auto: update
          dialect: org.hibernate.dialect.MySQL5InnoDBDialect
    #次jpa配置
    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/

 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