From 0c264f29e3f46cb76a0280d52254672b4d571696 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 07 八月 2023 19:48:35 +0800
Subject: [PATCH] 推送基础信息
---
src/main/java/com/fzzy/whjl/dto/WhjlApi1103.java | 12
src/main/java/com/fzzy/whjl/view/pr/WhjlApi1102PR.java | 52 +
src/main/java/com/fzzy/whjl/view/pr/WhjlApi1111PR.java | 53 +
src/main/java/com/fzzy/whjl/dto/WhjlApi1106.java | 11
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java | 94 ++
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1101.java | 8
src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultDepot.java | 156 ++++
src/main/java/com/fzzy/whjl/view/pr/WhjlApi1106PR.java | 52 +
src/main/java/com/fzzy/whjl/dto/WhjlApi1111.java | 11
pom.xml | 645 ++++++++--------
src/main/java/com/fzzy/whjl/view/pr/WhjlApi1107PR.java | 54 +
src/main/java/com/fzzy/whjl/view/pr/WhjlApi1103PR.java | 52 +
src/main/java/com/fzzy/whjl/view/pr/WhjlApi1105PR.java | 53 +
src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultDevice.java | 82 ++
src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1111Rep.java | 24
src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultBuilding.java | 107 ++
src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultGranary.java | 80 ++
src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1105Rep.java | 25
src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1106Rep.java | 24
src/main/java/com/fzzy/whjl/dto/WhjlApi1107.java | 12
src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1107Rep.java | 25
src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultUser.java | 104 ++
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1103.java | 90 ++
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1111.java | 113 ++
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1106.java | 98 ++
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1105.java | 100 ++
src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService11.java | 25
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1102.java | 104 ++
src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1103Rep.java | 24
src/main/java/com/fzzy/whjl/dto/WhjlApi1105.java | 11
src/main/java/com/fzzy/whjl/dto/WhjlApi1102.java | 10
31 files changed, 1,980 insertions(+), 331 deletions(-)
diff --git a/pom.xml b/pom.xml
index 603fa57..614858b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,362 +1,383 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.fzzy</groupId>
- <artifactId>igds-api</artifactId>
- <version>0.0.2-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>igds-api</name>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.fzzy</groupId>
+ <artifactId>igds-api</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>igds-api</name>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <spring.boot.version>2.1.2.RELEASE</spring.boot.version>
- <spring.version>5.1.1.RELEASE</spring.version>
- <dorado.version>7.6.0-SNAPSHOT</dorado.version>
- <druid.version>1.2.8</druid.version>
- <mysql.version>5.1.45</mysql.version>
- <fastjson.version>2.0.10</fastjson.version>
- <lombok.version>1.18.22</lombok.version>
- <spring.security>3.1.4.RELEASE</spring.security>
- </properties>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <spring.boot.version>2.1.2.RELEASE</spring.boot.version>
+ <spring.version>5.1.1.RELEASE</spring.version>
+ <dorado.version>7.6.0-SNAPSHOT</dorado.version>
+ <druid.version>1.2.8</druid.version>
+ <mysql.version>5.1.45</mysql.version>
+ <fastjson.version>2.0.10</fastjson.version>
+ <lombok.version>1.18.22</lombok.version>
+ <spring.security>3.1.4.RELEASE</spring.security>
+ </properties>
- <dependencies>
+ <dependencies>
- <!-- DORADO7涓棿浠� -->
- <dependency>
- <groupId>com.bstek.dorado</groupId>
- <artifactId>dorado-core</artifactId>
- <version>${dorado.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>javassist</artifactId>
- <groupId>javassist</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
-
- <dependency>
- <groupId>com.bstek.dorado</groupId>
- <artifactId>dorado-uploader</artifactId>
- <version>1.0.20</version>
- <exclusions>
- <exclusion>
- <artifactId>slf4j-jcl</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>slf4j-log4j12</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>slf4j-jdk14</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
-
- <dependency>
+ <!-- DORADO7涓棿浠� -->
+ <dependency>
+ <groupId>com.bstek.dorado</groupId>
+ <artifactId>dorado-core</artifactId>
+ <version>${dorado.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>javassist</artifactId>
+ <groupId>javassist</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+
+ <dependency>
+ <groupId>com.bstek.dorado</groupId>
+ <artifactId>dorado-uploader</artifactId>
+ <version>1.0.20</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>slf4j-jcl</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>slf4j-jdk14</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+
+ <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.9.8</version>
-<!-- <scope>runtime</scope>-->
+ <!-- <scope>runtime</scope>-->
</dependency>
-
+
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.9.8</version>
-<!-- <scope>runtime</scope>-->
+ <version>2.9.8</version>
+ <!-- <scope>runtime</scope>-->
</dependency>
- <!-- springBoot -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-jpa</artifactId>
- <version>${spring.boot.version}</version>
- </dependency>
+ <!-- springBoot -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-jpa</artifactId>
+ <version>${spring.boot.version}</version>
+ </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- <version>${spring.boot.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>jackson-databind</artifactId>
- <groupId>com.fasterxml.jackson.core</groupId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <version>${spring.boot.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jackson-databind</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <!-- REDIS -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-redis</artifactId>
- <version>${spring.boot.version}</version>
- </dependency>
+ <!-- REDIS -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-redis</artifactId>
+ <version>${spring.boot.version}</version>
+ </dependency>
- <!-- thymeleaf -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-thymeleaf</artifactId>
- <version>${spring.boot.version}</version>
- </dependency>
+ <!-- thymeleaf -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-thymeleaf</artifactId>
+ <version>${spring.boot.version}</version>
+ </dependency>
- <dependency>
- <groupId>net.sourceforge.nekohtml</groupId>
- <artifactId>nekohtml</artifactId>
- <version>1.9.22</version>
- </dependency>
+ <dependency>
+ <groupId>net.sourceforge.nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <version>1.9.22</version>
+ </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.4.01</version>
- </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.4.01</version>
+ </dependency>
- <!-- Security -->
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <version>${spring.security}</version>
- </dependency>
+ <!-- Security -->
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>${spring.security}</version>
+ </dependency>
- <!-- druid -->
- <!-- <dependency> -->
- <!-- <groupId>com.alibaba</groupId> -->
- <!-- <artifactId>druid-spring-boot-starter</artifactId> -->
- <!-- <version>${druid.version}</version> -->
- <!-- </dependency> -->
+ <!-- druid -->
+ <!-- <dependency> -->
+ <!-- <groupId>com.alibaba</groupId> -->
+ <!-- <artifactId>druid-spring-boot-starter</artifactId> -->
+ <!-- <version>${druid.version}</version> -->
+ <!-- </dependency> -->
- <!-- mysql杩炴帴 -->
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql.version}</version>
- </dependency>
+ <!-- mysql杩炴帴 -->
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>${mysql.version}</version>
+ </dependency>
- <!-- JSON-->
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
- <version>${fastjson.version}</version>
- </dependency>
-
+ <!-- JSON-->
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
+ <version>${fastjson.version}</version>
+ </dependency>
- <!-- lombok -->
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
- </dependency>
+ <!-- lombok -->
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </dependency>
- <!-- 鐧婚檰楠岃瘉鐮� -->
- <dependency>
- <groupId>com.github.whvcse</groupId>
- <artifactId>easy-captcha</artifactId>
- <version>1.6.2</version>
- </dependency>
+ <!-- 鐧婚檰楠岃瘉鐮� -->
+ <dependency>
+ <groupId>com.github.whvcse</groupId>
+ <artifactId>easy-captcha</artifactId>
+ <version>1.6.2</version>
+ </dependency>
- <!-- 鐨偆鍖� -->
- <dependency>
- <groupId>dorado.skins</groupId>
- <artifactId>sky</artifactId>
- <version>2.0.0</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/src/main/resources/lib/dorado-skin-sky-2.0.2.jar</systemPath>
- </dependency>
-
- <!-- 闆嗘垚httpclient -->
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.4.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.4.1</version>
- </dependency>
-
- <!-- 鍥藉瘑 -->
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <version>1.70</version>
- </dependency>
-
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-ext-jdk15on</artifactId>
- <version>1.70</version>
- </dependency>
+ <!-- 鐨偆鍖� -->
+ <dependency>
+ <groupId>dorado.skins</groupId>
+ <artifactId>sky</artifactId>
+ <version>2.0.0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/src/main/resources/lib/dorado-skin-sky-2.0.2.jar</systemPath>
+ </dependency>
- <dependency>
- <groupId>cn.lxem</groupId>
- <artifactId>scde</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/src/main/resources/lib/RulesModel-1.0.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>cn.lxem</groupId>
- <artifactId>scde</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/src/main/resources/lib/SM2Crypto-1.0.jar</systemPath>
- </dependency>
+ <!-- 闆嗘垚httpclient -->
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.4.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.4.1</version>
+ </dependency>
+
+ <!-- 鍥藉瘑 -->
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>1.70</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-ext-jdk15on</artifactId>
+ <version>1.70</version>
+ </dependency>
+
+ <dependency>
+ <groupId>cn.lxem</groupId>
+ <artifactId>scde</artifactId>
+ <version>1.0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/src/main/resources/lib/RulesModel-1.0.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>cn.lxem</groupId>
+ <artifactId>scde</artifactId>
+ <version>1.0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/src/main/resources/lib/SM2Crypto-1.0.jar</systemPath>
+ </dependency>
+
+ <!-- BDF2-->
+ <dependency>
+ <groupId>com.bstek.bdf2</groupId>
+ <artifactId>bdf2-orm-hibernate4</artifactId>
+ <version>2.1.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <!--骞夸笢鐪佸钩鍙板鎺� -->
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-core</artifactId>
- <version>3.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-soap</artifactId>
- <version>3.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-xml</artifactId>
- <version>3.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>3.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
- <version>3.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-policy</artifactId>
- <version>3.2.2</version>
- </dependency>
-
-<!-- <dependency>-->
-<!-- <groupId>org.apache.cxf</groupId>-->
-<!-- <artifactId>cxf-spring-boot-autoconfigure</artifactId>-->
-<!-- <version>3.2.2</version>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>org.apache.cxf</groupId>-->
-<!-- <artifactId>cxf-spring-boot-starter-jaxws</artifactId>-->
-<!-- <version>3.2.2</version>-->
-<!-- </dependency>-->
+ <!--骞夸笢鐪佸钩鍙板鎺� -->
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-core</artifactId>
+ <version>3.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-soap</artifactId>
+ <version>3.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-xml</artifactId>
+ <version>3.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>3.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>3.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-policy</artifactId>
+ <version>3.2.2</version>
+ </dependency>
+
+ <!-- <dependency>-->
+ <!-- <groupId>org.apache.cxf</groupId>-->
+ <!-- <artifactId>cxf-spring-boot-autoconfigure</artifactId>-->
+ <!-- <version>3.2.2</version>-->
+ <!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>org.apache.cxf</groupId>-->
+ <!-- <artifactId>cxf-spring-boot-starter-jaxws</artifactId>-->
+ <!-- <version>3.2.2</version>-->
+ <!-- </dependency>-->
-
- </dependencies>
+ </dependencies>
-
-
- <build>
- <plugins>
- <!-- 璁剧疆缂栬瘧鐗堟湰 -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>repackage</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <build>
+ <plugins>
+ <!-- 璁剧疆缂栬瘧鐗堟湰 -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>src/main/java</directory>
- </resource>
- <resource>
- <directory>src/main/resources/lib</directory>
- <targetPath>BOOT-INF/lib/</targetPath>
- <includes>
- <include>**/*.jar</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <targetPath>BOOT-INF/classes/</targetPath>
- </resource>
- </resources>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/java</directory>
+ </resource>
+ <resource>
+ <directory>src/main/resources/lib</directory>
+ <targetPath>BOOT-INF/lib/</targetPath>
+ <includes>
+ <include>**/*.jar</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <targetPath>BOOT-INF/classes/</targetPath>
+ </resource>
+ </resources>
- <finalName>igds-api</finalName>
+ <finalName>igds-api</finalName>
- </build>
+ </build>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-framework-bom</artifactId>
- <version>${spring.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-framework-bom</artifactId>
+ <version>${spring.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
- <repositories>
- <repository>
- <id>sonatype</id>
- <url>https://oss.sonatype.org/content/groups/public/</url>
- </repository>
- <repository>
- <id>bsdn-maven-repository</id>
- <url>http://nexus.bsdn.org/content/groups/public/</url>
- </repository>
- </repositories>
+ <repositories>
+ <repository>
+ <id>sonatype</id>
+ <url>https://oss.sonatype.org/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>bsdn-maven-repository</id>
+ <url>http://nexus.bsdn.org/content/groups/public/</url>
+ </repository>
+ </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>spring-snapshots</id>
- <url>http://repo.spring.io/snapshot</url>
- </pluginRepository>
- <pluginRepository>
- <id>spring-milestones</id>
- <url>http://repo.spring.io/milestone</url>
- </pluginRepository>
- </pluginRepositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>spring-snapshots</id>
+ <url>http://repo.spring.io/snapshot</url>
+ </pluginRepository>
+ <pluginRepository>
+ <id>spring-milestones</id>
+ <url>http://repo.spring.io/milestone</url>
+ </pluginRepository>
+ </pluginRepositories>
</project>
diff --git a/src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService11.java b/src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService11.java
index 26032d0..a19ca9a 100644
--- a/src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService11.java
+++ b/src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService11.java
@@ -3,18 +3,17 @@
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.SyncProtocol;
import com.fzzy.api.service.SyncService11;
-import com.fzzy.async.whhpjl.impl.Fz40ToWhjlSync1101;
+import com.fzzy.async.whhpjl.impl.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
import java.util.Date;
/**
* @Desc: 鍩虹淇℃伅鍚屾
- *
* @author: czt
* @update-time: 2023/08/04
- *
*/
@Slf4j
@Component
@@ -23,6 +22,16 @@
@Autowired
private Fz40ToWhjlSync1101 fz40ToWhjlSync1101;
+ @Autowired
+ private Fz40ToWhjlSync1102 fz40ToWhjlSync1102;
+ @Autowired
+ private Fz40ToWhjlSync1103 fz40ToWhjlSync1103;
+ @Autowired
+ private Fz40ToWhjlSync1105 fz40ToWhjlSync1105;
+ @Autowired
+ private Fz40ToWhjlSync1106 fz40ToWhjlSync1106;
+ @Autowired
+ private Fz40ToWhjlSync1107 fz40ToWhjlSync1107;
@Override
public String getProtocol() {
@@ -42,15 +51,15 @@
//TODO 鍚屾鍐涘伐绔欑偣淇℃伅
-
+ fz40ToWhjlSync1102.syncData(kqdm, deptId, start, end);
//TODO 鍚屾鍐涚伯浜哄憳淇℃伅
-
+ fz40ToWhjlSync1103.syncData(kqdm, deptId, start, end);
//TODO 鍚屾浠撴埧淇℃伅
-
+ fz40ToWhjlSync1105.syncData(kqdm, deptId, start, end);
//TODO 鍚屾寤掗棿淇℃伅
-
+ fz40ToWhjlSync1106.syncData(kqdm, deptId, start, end);
//TODO 鍚屾璐т綅淇℃伅
-
+ fz40ToWhjlSync1107.syncData(kqdm, deptId, start, end);
//TODO 鍚屾浠撳偍璁惧淇℃伅
}
diff --git a/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultBuilding.java b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultBuilding.java
new file mode 100644
index 0000000..6cab1cc
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultBuilding.java
@@ -0,0 +1,107 @@
+package com.fzzy.async.whhpjl.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author:YAN
+ */
+@Data
+@Entity
+@Table(name = "D_BUILDING")
+public class Fz40WhjlDefaultBuilding implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ @Column(name = "ID_", length = 50)
+ @PropertyDef(label = "浠撴埧缂栫爜")
+ private String id;
+
+ @Id
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "ggm", length = 50)
+ @PropertyDef(label = "鍥借鐮�")
+ private String ggm;
+
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炲簱鐐�")
+ private String deptId;
+
+ @Column(name = "NAME_", length = 50)
+ @PropertyDef(label = "寤虹瓚鍚嶇О")
+ private String name;
+
+ @Column(name = "STORAGE_")
+ @PropertyDef(label = "璁捐鍌ㄩ噺", description = "鍗曚綅锛欿G")
+ private Double storage;
+
+ @Column(name = "USER_DATE_")
+ @PropertyDef(label = "浣跨敤鏃ユ湡")
+ private Date userDate;
+
+ @Column(name = "HEIGHT_", precision = 16, scale = 2)
+ @PropertyDef(label = "浠撴埧楂樺害", description = "鍗曚綅锛氱背")
+ private Double height;
+
+ @Column(name = "LENGTH_", precision = 16, scale = 2)
+ @PropertyDef(label = "浠撴埧闀垮害", description = "鍗曚綅锛氱背")
+ private Double length;
+
+ @Column(name = "WIDTH_", precision = 16, scale = 2)
+ @PropertyDef(label = "浠撴埧瀹藉害", description = "鍗曚綅锛氱背")
+ private Double width;
+
+ @Column(name = "DIAMETER_", precision = 16, scale = 2)
+ @PropertyDef(label = "绛掍粨鐩村緞", description = "鍗曚綅锛氱背")
+ private Double diameter;
+
+ @Column(name = "VOLUME_", precision = 16, scale = 2)
+ @PropertyDef(label = "绛掍粨浣撶Н", description = "鍗曚綅锛氱珛鏂圭背")
+ private Double volume;
+
+ @Column(name = "DOOR_NUM_")
+ @PropertyDef(label = "浠撻棬鏁�")
+ private Integer doorNum;
+
+ @Column(name = "GROUND_", length = 20)
+ @PropertyDef(label = "鍦伴潰缁撴瀯")
+ private String ground;
+
+ @Column(name = "WALL_", length = 20)
+ @PropertyDef(label = "澧欎綋缁撴瀯")
+ private String wall;
+
+ @Column(name = "ROOF_", length = 20)
+ @PropertyDef(label = "灞嬮《缁撴瀯")
+ private String roof;
+
+ @Column(name = "ROOF_TRUSS_", length = 20)
+ @PropertyDef(label = "灞嬫灦缁撴瀯")
+ private String roofTruss;
+
+ @Column(name = "CREATE_DATE_")
+ @PropertyDef(label = "寤洪�犳棩鏈�")
+ private Date createDate;
+
+ @Column(name = "LON_", precision = 16, scale = 4)
+ @PropertyDef(label = "缁忓害")
+ private Double lon;
+
+ @Column(name = "LAT_", precision = 16, scale = 4)
+ @PropertyDef(label = "绾害")
+ private Double lat;
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultDepot.java b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultDepot.java
new file mode 100644
index 0000000..7eb4a5e
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultDepot.java
@@ -0,0 +1,156 @@
+package com.fzzy.async.whhpjl.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author:YAN
+ */
+@Data
+@Entity
+@Table(name = "D_DEPOT")
+public class Fz40WhjlDefaultDepot implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+
+ @Id
+ @Column(name = "ID_", length = 50)
+ @PropertyDef(label = "璐т綅缂栧彿")
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @Column(name = "NAME_", length = 50)
+ @PropertyDef(label = "璐т綅鍚嶇О")
+ private String name;
+
+ @Column(name = "BUILDING_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炰粨鎴�")
+ private String buildingId;
+
+ @Column(name = "GRANARY_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炲粧闂�")
+ private String granaryId;
+
+ @Column(name = "DEPOT_TYPE_", length = 10)
+ @PropertyDef(label = "浠撳簱绫诲瀷", description = "鏍规嵁鍥芥爣閰嶇疆绫诲瀷锛屽钩鎴夸粨銆佺珛绛掍粨銆佹祬鍦嗕粨銆佸偍娌圭綈")
+ private String depotType;
+
+ @Column(name = "DEPOT_STATUS_", length = 10)
+ @PropertyDef(label = "浠撳簱鐘舵��", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
+ private String depotStatus;
+
+ @Column(name = "STORE_TYPE_", length = 6)
+ @PropertyDef(label = "鍌ㄧ伯鏂瑰紡", description = "涓庡簱瀛樿〃鍏宠仈")
+ private String storeType;
+
+ @Column(name = "STORAGE_MAX_")
+ @PropertyDef(label = "璁捐鍌ㄩ噺", description = "鍗曚綅锛氬惃")
+ private Double storageMax;
+
+ @Column(name = "STORAGE_REAL_", insertable = true)
+ @PropertyDef(label = "瀹為檯鍌ㄩ噺", description = "鍗曚綅锛欿G锛岄�氳繃搴撳瓨鍙樻洿")
+ private Double storageReal;
+
+ @Column(name = "FOOD_TYPE_", length = 10)
+ @PropertyDef(label = "绮鎬ц川", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
+ private String foodType;
+
+ @Column(name = "FOOD_VARIETY_", length = 10)
+ @PropertyDef(label = "绮鍝佺", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
+ private String foodVariety;
+
+ @Column(name = "FOOD_LEVEL_", length = 10)
+ @PropertyDef(label = "绮绛夌骇", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
+ private String foodLevel;
+
+ @Column(name = "FOOD_LOCATION_", length = 50)
+ @PropertyDef(label = "绮浜у湴", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
+ private String foodLocation;
+
+ @Column(name = "FOOD_YEAR_", length = 10)
+ @PropertyDef(label = "绮骞翠唤", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
+ private String foodYear;
+
+ @Column(name = "PER_WET_")
+ @PropertyDef(label = "姘村垎", description = "鐧惧垎姣旓紝榛樿涓虹┖锛屾潵婧愯川妫�淇℃伅")
+ private Double perWet;
+
+ @Column(name = "PER_IMPURITY_")
+ @PropertyDef(label = "鏉傝川", description = "鐧惧垎姣旓紝榛樿涓虹┖锛屾潵婧愯川妫�淇℃伅")
+ private Double perImpurity;
+
+ @Column(name = "BULK_WEIGHT_")
+ @PropertyDef(label = "瀹归噸 g/L", description = "瀹归噸 g/L")
+ private Double bulkWeight;
+
+ @Column(name = "STORE_KEEPER_", length = 30)
+ @PropertyDef(label = "淇濈鍛樿处鍙�")
+ private String storeKeeper;
+
+ @Column(name = "STORE_KEEPER_NAME_", length = 50)
+ @PropertyDef(label = "淇濈鍛�", description = "涓枃鍚嶇О")
+ private String storeKeeperName;
+
+ @Column(name = "STORE_DATE_")
+ @PropertyDef(label = "鍏ュ簱鏃堕棿", description = "榛樿绌猴紝閫氳繃搴撳瓨鍙樻洿")
+ private Date storeDate;
+
+ @Column(name = "CHECK_DATE_")
+ @PropertyDef(label = "鏈�鍚庤川妫�鏃堕棿", description = "榛樿绌猴紝鏉ユ簮璐ㄦ淇℃伅")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date checkDate;
+
+ @Column(name = "REMARK_", length = 200)
+ @PropertyDef(label = "澶囨敞", description = "澶囨敞淇℃伅")
+ private String remark;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+ private Date updateTime;
+
+ // ------------鍏朵粬灞炴�т俊鎭�------------//
+ @Transient
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVarietyName;
+
+ @Transient
+ @PropertyDef(label = "绮鎬ц川")
+ private String foodTypeName;
+
+ @Transient
+ @PropertyDef(label = "浠撳簱绫诲瀷")
+ private String depotTypeName;
+
+ @Transient
+ @PropertyDef(label = "浠撳簱绫诲瀷")
+ private String depotStatusName;
+
+ @Transient
+ @PropertyDef(label = "绮绛夌骇")
+ private String foodLevelName;
+
+ @Transient
+ @PropertyDef(label = "X鍧愭爣", description = "涓夌淮妯″瀷涓潗鏍囷紝椤甸潰鏃犻渶缁存姢")
+ private Double posX;
+
+ @Transient
+ @PropertyDef(label = "Y鍧愭爣", description = "涓夌淮妯″瀷涓潗鏍囷紝椤甸潰鏃犻渶缁存姢")
+ private Double posY;
+
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultDevice.java b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultDevice.java
new file mode 100644
index 0000000..458451a
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultDevice.java
@@ -0,0 +1,82 @@
+package com.fzzy.async.whhpjl.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 璁惧淇℃伅
+ *
+ * @Author:YAN
+ */
+@Data
+@Entity
+@Table(name = "D_DEVICE")
+public class Fz40WhjlDefaultDevice implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ @Column(name = "kqdm", length = 40)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜", description = "")
+ private String companyId;
+
+ @Column(name = "dwdm", length = 18)
+ @PropertyDef(label = "鍗曚綅浠ｇ爜")
+ private String dwdm;
+
+ @Column(name = "kqmc", length = 256)
+ @PropertyDef(label = "搴撳尯鍚嶇О")
+ private int kqmc;
+
+ @Column(name = "sbbh", length = 20)
+ @PropertyDef(label = "璁惧缂栧彿")
+ private String sbbh;
+
+ @Column(name = "sbyqmc", length = 50)
+ @PropertyDef(label = "璁惧浠櫒鍚嶇О")
+ private String sbyqmc;
+
+ @Column(name = "sbyqdm", length = 8)
+ @PropertyDef(label = "璁惧浠櫒浠ｇ爜")
+ private String sbyqdm;
+
+ @Column(name = "sbggxh", length = 50)
+ @PropertyDef(label = "璁惧瑙勬牸鍨嬪彿")
+ private String sbggxh;
+
+ @Column(name = "sccj", length = 256)
+ @PropertyDef(label = "鐢熶骇鍘傚")
+ private String sccj;
+
+ @Column(name = "scrq")
+ @PropertyDef(label = "鐢熶骇鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date scrq;
+
+ @Column(name = "sbms", length = 50)
+ @PropertyDef(label = "璁惧鎻忚堪")
+ private String sbms;
+
+ @Column(name = "sbzt", length = 1)
+ @PropertyDef(label = "璁惧鐘舵��")
+ private String sbzt;
+
+ @Column(name = "jdsj")
+ @PropertyDef(label = "妫�瀹氭椂闂�")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date jdsj;
+
+ @Column(name = "jddw", length = 256)
+ @PropertyDef(label = "妫�瀹氬崟浣�")
+ private String jddw;
+
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultGranary.java b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultGranary.java
new file mode 100644
index 0000000..8e5d6a1
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultGranary.java
@@ -0,0 +1,80 @@
+package com.fzzy.async.whhpjl.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 寤掗棿淇℃伅
+ *
+ * @Author:YAN
+ */
+@Data
+@Entity
+@Table(name = "D_GRANARY")
+public class Fz40WhjlDefaultGranary implements Serializable {
+
+ private static final long serialVersionUID = 9157617424050247565L;
+
+ @Id
+ @PropertyDef(label = "寤掗棿浠ｇ爜")
+ @Column(name = "ajdh", length = 28)
+ private String ajdh;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @PropertyDef(label = "寤掗棿鍚嶇О")
+ @Column(name = "ajmc", length = 100)
+ private String ajmc;
+
+ @PropertyDef(label = "浠撴埧(鎴栨补缃�)缂栫爜")
+ @Column(name = "cfbh", length = 25)
+ private String cfbh;
+
+ @PropertyDef(label = "寤掗棿闀垮害")
+ @Column(name = "ajcd", precision = 8, scale = 4)
+ private double ajcd;
+
+ @PropertyDef(label = "寤掗棿瀹藉害")
+ @Column(name = "ajkd", precision = 8, scale = 4)
+ private double ajkd;
+
+ @PropertyDef(label = "寤掗棿楂樺害")
+ @Column(name = "ajgd", precision = 8, scale = 4)
+ private double ajgd;
+
+ @PropertyDef(label = "寤掗棿璁捐浠撳")
+ @Column(name = "ajsjcr", precision = 20, scale = 3)
+ private double ajsjcr;
+
+ @PropertyDef(label = "寤掗棿鑱旂郴鐢佃瘽")
+ @Column(name = "ajlxdh", length = 20)
+ private String ajlxdh;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "寤掗棿鍚敤鏃ユ湡")
+ @Column(name = "ajqyrq")
+ private Date ajqyrq;
+
+ @PropertyDef(label = "寤掗棿鐘舵��")
+ @Column(name = "ajzt", length = 1)
+ private String ajzt;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+ private Date updateTime;
+
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultUser.java b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultUser.java
new file mode 100644
index 0000000..50932d5
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultUser.java
@@ -0,0 +1,104 @@
+package com.fzzy.async.whhpjl.entity;
+
+import com.bstek.bdf2.core.business.IDept;
+import com.bstek.bdf2.core.business.IPosition;
+import com.bstek.bdf2.core.model.Group;
+import com.bstek.bdf2.core.model.Role;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 绯荤粺鐢ㄦ埛琛�
+ *
+ * @Author:YAN
+ */
+@Data
+@Entity
+@Table(name = "BDF2_USER")
+public class Fz40WhjlDefaultUser implements Serializable {
+ private static final long serialVersionUID = -1363793377621174845L;
+
+ @Id
+ @Column(name = "USERNAME_", length = 60)
+ private String username;
+
+ @Column(name = "COMPANY_ID_", length = 60, nullable = false)
+ private String companyId;
+
+ @Column(name = "PASSWORD_", length = 70, nullable = false, updatable = false)
+ private String password;
+
+ @Column(name = "SALT_", length = 10, nullable = false, updatable = false)
+ private String salt;
+
+ @Column(name = "CNAME_", length = 60, nullable = false)
+ private String cname;
+
+ @Column(name = "ENAME_", length = 60)
+ private String ename;
+
+ @Column(name = "MALE_", nullable = false)
+ private boolean male = true;
+
+ @Column(name = "ENABLED_", nullable = false)
+ private boolean enabled = true;
+
+ @Column(name = "ADMINISTRATOR_", nullable = false)
+ private boolean administrator = false;
+
+ @Column(name = "BIRTHDAY_")
+ private Date birthday;
+
+ @Column(name = "MOBILE_", length = 20)
+ private String mobile;
+
+ @Column(name = "EMAIL_", length = 60)
+ private String email;
+
+ @Column(name = "CREATE_DATE_")
+ private Date createDate;
+
+
+ // 閮ㄩ棬璇存槑
+ @Transient
+ private String deptName;
+
+ @Transient
+ private String deptId;
+
+ // 瑙掕壊
+ @Transient
+ private String roleName;
+
+ @Transient
+ private String roleId;
+
+ /**
+ * 鐢ㄤ簬BDF2绯荤粺
+ */
+ @Transient
+ private List<IDept> depts;
+
+ /**
+ * 鐢ㄤ簬BDF2绯荤粺
+ */
+ @Transient
+ private List<Role> roles;
+
+ /**
+ * 鐢ㄤ簬BDF2绯荤粺
+ */
+ @Transient
+ private List<IPosition> positions;
+
+ /**
+ * 鐢ㄤ簬BDF2绯荤粺
+ */
+ @Transient
+ private List<Group> groups;
+
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1101.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1101.java
index 8d11116..0a4d30e 100644
--- a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1101.java
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1101.java
@@ -15,6 +15,7 @@
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;
@@ -23,7 +24,6 @@
*
* @author: czt
* @update-time: 2023/08/04
- *
*/
@Slf4j
@Component
@@ -52,7 +52,7 @@
apiLog.setType(ApiLog.TYPE_SYNC);
apiLog.setKqdm(deptId);
apiLog.setUploadTime(new Date());
- apiLog.setInteId(Constant.API_CODE_1111);
+ apiLog.setInteId(Constant.API_CODE_1101);
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
@@ -86,8 +86,8 @@
apiData.setQywd(sysData.getLat()); //浼佷笟绾害
apiData.setQyxzqhmc(sysData.getCountry()); //浼佷笟琛屾斂鍖哄垝鍚嶇О
apiData.setQyxzqhdm(sysData.getCountry()); //浼佷笟琛屾斂鍖哄垝浠ｇ爜
- apiData.setSfyx("鏄�"); //浼佷笟琛屾斂鍖哄垝浠ｇ爜
- if(StringUtils.isNotEmpty(sysData.getVal()) && "0".equals(sysData.getVal())){
+ apiData.setSfyx("鏄�"); //鏄惁鍚敤
+ if (StringUtils.isNotEmpty(sysData.getVal()) && "0".equals(sysData.getVal())) {
apiData.setSfyx("鍚�");
}
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1102.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1102.java
new file mode 100644
index 0000000..1ad2e12
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1102.java
@@ -0,0 +1,104 @@
+package com.fzzy.async.whhpjl.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDept;
+import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1101Rep;
+import com.fzzy.whjl.dto.WhjlApi1102;
+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;
+
+/**
+ * 鍐涗緵绔欑偣淇℃伅
+ *
+ * @Author:YAN
+ */
+@Slf4j
+@Component
+public class Fz40ToWhjlSync1102 {
+
+ @Autowired
+ private Fz40ToWhjlSync1101Rep fz40ToWhjlSync1101Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍐涗緵绔欑偣淇℃伅
+ *
+ * @param kqdm
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1102鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1102);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz40WhjlDefaultDept> list = fz40ToWhjlSync1101Rep.listApi1101(deptId.substring(0, 4));
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒板崟浣嶄俊鎭�------------------");
+ return;
+ }
+ WhjlApi1102 apiData;
+ for (Fz40WhjlDefaultDept sysData : list) {
+ apiData = new WhjlApi1102();
+ apiData.setJlqybh(sysData.getRegisterCode()); //鍐涚伯浼佷笟缂栧彿
+ apiData.setJlqymc(sysData.getName()); //鍐涚伯浼佷笟鍚嶇О
+ apiData.setJgzdbh(sysData.getCode()); //鍐涗緵绔欑偣缂栧彿
+ apiData.setXzqhbm(sysData.getCountry()); //鎵�灞炶鏀垮尯鍒掔紪鐮�
+ apiData.setXzqhmc(sysData.getCountry()); //浼佷笟琛屾斂鍖哄垝鍚嶇О
+ apiData.setJgzdmc(sysData.getName()); //鍐涗緵绔欑偣鍚嶇О
+ apiData.setJgzdjc(sysData.getName()); //鍐涗緵绔欑偣绠�绉�
+ apiData.setQyszbm(sysData.getNature()); //浼佷笟鎬ц川缂栫爜
+ apiData.setJgzdlb("1"); //鍐涗緵绔欑偣绫诲埆 -1-淇濋殰鍩哄湴
+ apiData.setJcrq(sysData.getCreateDate()); //寤烘垚鏃ユ湡
+ apiData.setSjcr(sysData.getStorage()); //璁捐浠撳
+ apiData.setMj(sysData.getArea()); //闈㈢Н
+ apiData.setLxr(sysData.getContact()); //鑱旂郴浜�
+ apiData.setDh(sysData.getPhone()); //鐢佃瘽
+ apiData.setCz(sysData.getFax()); //浼犵湡
+ apiData.setDz(sysData.getAddress()); //鍦板潃
+ apiData.setYzbm(sysData.getPostCode()); //閭斂缂栫爜
+ apiData.setJd(sysData.getLon()); //缁忓害
+ apiData.setWd(sysData.getLat()); //绾害
+ apiData.setCYRS(null); //浠庝笟浜烘暟
+ apiData.setCLS(null); //杞﹁締鏁�
+ apiData.setCplcfmj(null); //鎴愬搧绮粨鎴块潰绉�
+ apiData.setCplzxnl(null); //鎴愬搧绮鍗歌兘鍔�
+ apiData.setSfyx("鏄�"); //鏄惁鍚敤
+ if (StringUtils.isNotEmpty(sysData.getVal()) && "0".equals(sysData.getVal())) {
+ apiData.setSfyx("鍚�");
+ }
+
+
+ apiData.setBizId(sysData.getId());
+ apiData.setUpdateTime(new Date());
+
+ //TODO 鎸佷箙鍖栦繚瀛樺緟瀹炵幇
+
+
+ log.info("1102---鍐涗緵绔欑偣-鍚屾鏁版嵁锛歿}", apiData.toString());
+ }
+
+ } catch (Exception e) {
+ log.error("---1102鍐涗緵绔欑偣-鍚屾鏁版嵁鎵ц澶辫触----{}", e.getMessage());
+ apiLog.setResult("1102鍐涗緵绔欑偣淇℃伅鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1103.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1103.java
new file mode 100644
index 0000000..d04b1bb
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1103.java
@@ -0,0 +1,90 @@
+package com.fzzy.async.whhpjl.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDept;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultUser;
+import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1103Rep;
+import com.fzzy.whjl.dto.WhjlApi1103;
+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;
+
+/**
+ * 鍐涘伐浜哄憳淇℃伅
+ *
+ * @Author:YAN
+ */
+@Slf4j
+@Component
+public class Fz40ToWhjlSync1103 {
+ @Autowired
+ private Fz40ToWhjlSync1103Rep fz40ToWhjlSync1103Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍐涘伐浜哄憳淇℃伅
+ *
+ * @param kqdm
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+
+ log.info("-------------1103鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1103);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz40WhjlDefaultUser> list = fz40ToWhjlSync1103Rep.listApi1103(deptId.substring(0, 4));
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒板崟浣嶄俊鎭�------------------");
+ return;
+ }
+ WhjlApi1103 apiData;
+ for (Fz40WhjlDefaultUser sysData : list) {
+ apiData = new WhjlApi1103();
+ apiData.setRybh(sysData.getUsername()); //浜哄憳缂栧彿
+ apiData.setJlqybh(""); //鍐涚伯浼佷笟缂栧彿
+ apiData.setJlqymc(""); //鍐涚伯浼佷笟鍚嶇О
+ apiData.setJgzdbh(""); //鍐涗緵绔欑偣缂栧彿
+ apiData.setJlqymc(""); //鍐涗緵绔欑偣鍚嶇О
+ apiData.setRyxm(sysData.getCname()); //浜哄憳濮撳悕
+ apiData.setSfzhm(""); //韬唤璇佺紪鐮�
+ apiData.setLxdh(sysData.getMobile()); //鑱旂郴鐢佃瘽
+ apiData.setXl("鏈"); //瀛﹀巻
+ apiData.setLxdz(""); //鑱旂郴鍦板潃
+ apiData.setSfyx("鏄�");
+ if (!sysData.isEnabled()) {
+ apiData.setSfyx("鍚�");
+ }
+
+ apiData.setUpdateTime(new Date());
+
+ //TODO 鎸佷箙鍖栦繚瀛樺緟瀹炵幇
+
+
+ log.info("1103---鍐涘伐浜哄憳-鍚屾鏁版嵁锛歿}", apiData.toString());
+ }
+
+ } catch (Exception e) {
+ log.error("---1103鍐涘伐浜哄憳-鍚屾鏁版嵁鎵ц澶辫触----{}", e.getMessage());
+ apiLog.setResult("1103鍐涘伐浜哄憳淇℃伅鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1105.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1105.java
new file mode 100644
index 0000000..3ae69f8
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1105.java
@@ -0,0 +1,100 @@
+package com.fzzy.async.whhpjl.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultBuilding;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultUser;
+import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1103Rep;
+import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1105Rep;
+import com.fzzy.whjl.dto.WhjlApi1105;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 浠撴埧淇℃伅
+ *
+ * @Author:YAN
+ */
+@Slf4j
+@Component
+public class Fz40ToWhjlSync1105 {
+ @Autowired
+ private Fz40ToWhjlSync1105Rep fz40ToWhjlSync1105Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 浠撴埧淇℃伅
+ *
+ * @param kqdm
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1105鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1105);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+
+ try {
+ List<Fz40WhjlDefaultBuilding> list = fz40ToWhjlSync1105Rep.listApi1105(deptId.substring(0, 4));
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒板崟浣嶄俊鎭�------------------");
+ return;
+ }
+ WhjlApi1105 apiData;
+ for (Fz40WhjlDefaultBuilding sysData : list) {
+ apiData = new WhjlApi1105();
+ apiData.setCfbh(sysData.getId()); //浠撴埧缂栧彿
+ apiData.setJlqybh(""); //鍐涚伯浼佷笟缂栧彿
+ apiData.setJlqymc(""); //鍐涚伯浼佷笟鍚嶇О
+ apiData.setJgzdbh(""); //鍐涗緵绔欑偣缂栧彿
+ apiData.setJlqymc(""); //鍐涗緵绔欑偣鍚嶇О
+ apiData.setCfmc(sysData.getName()); //浠撴埧鍚嶇О
+ apiData.setCflx("10101"); //浠撴埧绫诲瀷 10101-骞虫柟浠�
+ apiData.setCfjg(sysData.getWall()); //浠撴埧缁撴瀯
+ apiData.setJzlx(""); //寤虹瓚绫诲瀷
+ apiData.setCfcdzj(sysData.getLength() == 0.0 || sysData.getLength() == null ? sysData.getDiameter() : sysData.getLength()); //浠撴埧闀垮害(鐩村緞)
+ apiData.setCfkd(sysData.getWidth()); //浠撴埧瀹藉害
+ apiData.setCfgd(sysData.getHeight()); //浠撴埧楂樺害
+ apiData.setCfsjcr(null); //浠撴埧璁捐浠撳
+ apiData.setCfsjcrO1(null); //浠撴埧瀹為檯浠撳
+ apiData.setLxdh(null); //鑱旂郴鐢佃瘽
+ apiData.setCfjd(sysData.getLon()); //浠撴埧缁忓害
+ apiData.setCfwd(sysData.getLat()); //浠撴埧绾害
+ apiData.setQyrq(sysData.getCreateDate()); //鍚敤鏃ユ湡
+ apiData.setCfzt(""); //浠撴埧鐘舵��
+ apiData.setCfsyzt(""); //浠撴埧浣跨敤鐘舵��
+ apiData.setZp(null); //缃╂
+ apiData.setJyd(null); //绠�鏄撳洡
+ apiData.setJyc(null); //绠�鏄撲粨
+ apiData.setSfyx("鏄�"); //鏄惁鏈夋晥
+
+ apiData.setUpdateTime(new Date());
+
+ //TODO 鎸佷箙鍖栦繚瀛樺緟瀹炵幇
+
+
+ log.info("1105---浠撴埧-鍚屾鏁版嵁锛歿}", apiData.toString());
+ }
+
+ } catch (Exception e) {
+ log.error("---1105浠撴埧-鍚屾鏁版嵁鎵ц澶辫触----{}", e.getMessage());
+ apiLog.setResult("1105浠撴埧淇℃伅鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1106.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1106.java
new file mode 100644
index 0000000..2e3a579
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1106.java
@@ -0,0 +1,98 @@
+package com.fzzy.async.whhpjl.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultBuilding;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultGranary;
+import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1105Rep;
+import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1106Rep;
+import com.fzzy.whjl.dto.WhjlApi1105;
+import com.fzzy.whjl.dto.WhjlApi1106;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 寤掗棿淇℃伅
+ *
+ * @Author:YAN
+ */
+@Slf4j
+@Component
+public class Fz40ToWhjlSync1106 {
+ @Autowired
+ private Fz40ToWhjlSync1106Rep fz40ToWhjlSync1106Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 寤掗棿淇℃伅
+ *
+ * @param kqdm
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1106鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1106);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+
+ try {
+ List<Fz40WhjlDefaultGranary> list = fz40ToWhjlSync1106Rep.listApi1106(deptId.substring(0, 4));
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒板崟浣嶄俊鎭�------------------");
+ return;
+ }
+ WhjlApi1106 apiData;
+ for (Fz40WhjlDefaultGranary sysData : list) {
+ apiData = new WhjlApi1106();
+ apiData.setAjbh(sysData.getAjdh()); //寤掗棿缂栧彿
+ apiData.setJlqybh(""); //鍐涚伯浼佷笟缂栧彿
+ apiData.setJlqymc(""); //鍐涚伯浼佷笟鍚嶇О
+ apiData.setJgzdbh(""); //鍐涗緵绔欑偣缂栧彿
+ apiData.setJlqymc(""); //鍐涗緵绔欑偣鍚嶇О
+ apiData.setSscfbh(sysData.getCfbh()); //浠撴埧缂栧彿
+ apiData.setSscfmc(""); //浠撴埧鍚嶇О
+ apiData.setAjmc(sysData.getAjmc()); //寤掗棿鍚嶇О
+ apiData.setAjcd(sysData.getAjcd()); //寤掗棿闀垮害
+ apiData.setAjkd(sysData.getAjkd()); //寤掗棿瀹藉害
+ apiData.setAjgd(sysData.getAjgd()); //寤掗棿楂樺害
+ apiData.setAjsjcr(sysData.getAjsjcr()); //寤掗棿璁捐浠撳
+ apiData.setAjsjcr01(null); //寤掗棿瀹為檯浠撳
+ apiData.setAjlxdh(sysData.getAjlxdh()); //寤掗棿鑱旂郴鐢佃瘽
+ apiData.setAjjd(null); //寤掗棿缁忓害
+ apiData.setAjwd(null); //寤掗棿绾害
+ apiData.setAjqyrq(sysData.getAjqyrq()); //寤掗棿鍚敤鏃ユ湡
+ apiData.setAjzt(sysData.getAjzt()); //寤掗棿鐘舵��
+ apiData.setAjsyzt(""); //寤掗棿浣跨敤鐘舵��
+ apiData.setSfyx(""); //鏄惁鏈夋晥
+
+
+ apiData.setUpdateTime(new Date());
+
+ //TODO 鎸佷箙鍖栦繚瀛樺緟瀹炵幇
+
+
+ log.info("1106---寤掗棿-鍚屾鏁版嵁锛歿}", apiData.toString());
+ }
+
+ } catch (Exception e) {
+ log.error("---1106寤掗棿-鍚屾鏁版嵁鎵ц澶辫触----{}", e.getMessage());
+ apiLog.setResult("1106寤掗棿淇℃伅鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java
new file mode 100644
index 0000000..9a153c6
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java
@@ -0,0 +1,94 @@
+package com.fzzy.async.whhpjl.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDepot;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultGranary;
+import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1106Rep;
+import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1107Rep;
+import com.fzzy.whjl.dto.WhjlApi1106;
+import com.fzzy.whjl.dto.WhjlApi1107;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐т綅淇℃伅
+ *
+ * @Author:YAN
+ */
+@Slf4j
+@Component
+public class Fz40ToWhjlSync1107 {
+
+ @Autowired
+ private Fz40ToWhjlSync1107Rep fz40ToWhjlSync1107Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 璐т綅淇℃伅
+ *
+ * @param kqdm
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1107鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1107);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+
+ try {
+ List<Fz40WhjlDefaultDepot> list = fz40ToWhjlSync1107Rep.listApi1107(deptId.substring(0, 4));
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒板崟浣嶄俊鎭�------------------");
+ return;
+ }
+ WhjlApi1107 apiData;
+ for (Fz40WhjlDefaultDepot sysData : list) {
+ apiData = new WhjlApi1107();
+ apiData.setHwbh(sysData.getId()); //璐т綅缂栧彿
+ apiData.setJlqybh(""); //鍐涚伯浼佷笟缂栧彿
+ apiData.setJlqymc(""); //鍐涚伯浼佷笟鍚嶇О
+ apiData.setJgzdbh(""); //鍐涗緵绔欑偣缂栧彿
+ apiData.setJlqymc(""); //鍐涗緵绔欑偣鍚嶇О
+ apiData.setSscfbh(sysData.getBuildingId()); //浠撴埧缂栧彿
+ apiData.setSscfmc(""); //浠撴埧鍚嶇О
+ apiData.setSsajbh(sysData.getGranaryId()); //寤掗棿缂栧彿
+ apiData.setAjmc(""); //寤掗棿鍚嶇О
+ apiData.setHwmc(sysData.getName()); //璐т綅鍚嶇О
+ apiData.setHwqyrq(sysData.getStoreDate()); //璐т綅鍚敤鏃ユ湡
+ apiData.setHwzt(sysData.getDepotStatus()); //璐т綅鐘舵��
+ apiData.setClfs(sysData.getStoreType()); //鍌ㄧ伯鏂瑰紡
+ apiData.setHwrl(sysData.getStorageMax()); //璐т綅瀹归噺
+ apiData.setSfyx(""); //鏄惁鏈夋晥
+
+
+ apiData.setUpdateTime(new Date());
+
+ //TODO 鎸佷箙鍖栦繚瀛樺緟瀹炵幇
+
+
+ log.info("1107---璐т綅-鍚屾鏁版嵁锛歿}", apiData.toString());
+ }
+
+ } catch (Exception e) {
+ log.error("---1107璐т綅-鍚屾鏁版嵁鎵ц澶辫触----{}", e.getMessage());
+ apiLog.setResult("1107璐т綅淇℃伅鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1111.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1111.java
new file mode 100644
index 0000000..14c3d47
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1111.java
@@ -0,0 +1,113 @@
+package com.fzzy.async.whhpjl.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDepot;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDevice;
+import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1107Rep;
+import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1111Rep;
+import com.fzzy.whjl.dto.WhjlApi1107;
+import com.fzzy.whjl.dto.WhjlApi1111;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 浠撳偍璁惧淇℃伅
+ *
+ * @Author:YAN
+ */
+@Slf4j
+@Component
+public class Fz40ToWhjlSync1111 {
+
+ @Autowired
+ private Fz40ToWhjlSync1111Rep fz40ToWhjlSync1111Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 浠撳偍璁惧淇℃伅
+ *
+ * @param kqdm
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1111鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1111);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+
+ try {
+ List<Fz40WhjlDefaultDevice> list = fz40ToWhjlSync1111Rep.listApi1111(deptId.substring(0, 4));
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒板崟浣嶄俊鎭�------------------");
+ return;
+ }
+ WhjlApi1111 apiData;
+ for (Fz40WhjlDefaultDevice sysData : list) {
+ apiData = new WhjlApi1111();
+ apiData.setSbbh(sysData.getSbyqdm()); //璁惧缂栧彿
+ apiData.setJlqybh(""); //鍐涚伯浼佷笟缂栧彿
+ apiData.setJlqymc(""); //鍐涚伯浼佷笟鍚嶇О
+ apiData.setJgzdbh(""); //鍐涗緵绔欑偣缂栧彿
+ apiData.setJlqymc(""); //鍐涗緵绔欑偣鍚嶇О
+ apiData.setCfbh(""); //浠撴埧缂栧彿
+ apiData.setSscfmc(""); //浠撴埧鍚嶇О
+ apiData.setSblxbh(""); //璁惧绫诲瀷缂栧彿
+ apiData.setSbmc(""); //璁惧鍚嶇О
+ apiData.setSbzt(sysData.getSbzt()); //璁惧鐘舵��
+ apiData.setGgxh(sysData.getSbggxh()); //瑙勬牸鍨嬪彿
+ apiData.setZzdw(sysData.getSccj()); //鍒堕�犲崟浣�
+ apiData.setCgsj(null); //閲囪喘鏃堕棿
+ apiData.setGl(""); //鍔熺巼
+ apiData.setCl(""); //浜ч噺
+ apiData.setWxcc(""); //澶栧舰灏哄
+ apiData.setZygn(""); //涓昏鍔熻兘
+ apiData.setBgfzrmc(""); //淇濈璐熻矗浜�
+ apiData.setWhgzrmc(""); //缁存姢璐熻矗浜�
+ apiData.setCzfzrmc(""); //鎿嶄綔璐熻矗浜�
+ apiData.setZynhyq(""); //涓昏淇濈瑕佹眰
+ apiData.setXgrq(sysData.getJdsj()); //淇敼鏃ユ湡
+ apiData.setTbrmc(""); //濉〃浜哄悕绉�
+ apiData.setSfytkk(""); //鏄惁浜戝彴鍙帶
+ apiData.setIpdz(""); //IP鍦板潃
+ apiData.setGldk(null); //绠＄悊绔彛
+ apiData.setSdkdk(""); //Sdk绔彛
+ apiData.setZh(""); //甯愬彿
+ apiData.setMm(""); //瀵嗙爜
+ apiData.setRstpdz(null); //Rtsp鍦板潃
+ apiData.setRtspdk(""); //rtsp绔彛
+ apiData.setSbxlh(""); //璁惧搴忓垪鍙�
+ apiData.setJklx(""); //鐩戞帶绫诲瀷
+ apiData.setSfyx(""); //鏄惁鏈夋晥
+
+
+ apiData.setUpdateTime(new Date());
+
+ //TODO 鎸佷箙鍖栦繚瀛樺緟瀹炵幇
+
+
+ log.info("1111---浠撳偍璁惧-鍚屾鏁版嵁锛歿}", apiData.toString());
+ }
+
+ } catch (Exception e) {
+ log.error("---1111浠撳偍璁惧-鍚屾鏁版嵁鎵ц澶辫触----{}", e.getMessage());
+ apiLog.setResult("1111浠撳偍璁惧淇℃伅鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1103Rep.java b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1103Rep.java
new file mode 100644
index 0000000..9d3155c
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1103Rep.java
@@ -0,0 +1,24 @@
+package com.fzzy.async.whhpjl.repository;
+
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDept;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultUser;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * 鍐涘伐浜哄憳淇℃伅
+ *
+ * @Author:YAN
+ */
+public interface Fz40ToWhjlSync1103Rep extends JpaRepository<Fz40WhjlDefaultUser, String> {
+ /**
+ * 鑾峰彇鍐涘伐浜哄憳淇℃伅
+ *
+ * @return
+ */
+ @Query("from Fz40WhjlDefaultUser where companyId=:companyId ")
+ List<Fz40WhjlDefaultUser> listApi1103(@Param("companyId") String companyId);
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1105Rep.java b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1105Rep.java
new file mode 100644
index 0000000..68b0a60
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1105Rep.java
@@ -0,0 +1,25 @@
+package com.fzzy.async.whhpjl.repository;
+
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultBuilding;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultUser;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * 浠撴埧淇℃伅
+ *
+ * @Author:YAN
+ */
+public interface Fz40ToWhjlSync1105Rep extends JpaRepository<Fz40WhjlDefaultBuilding, String> {
+ /**
+ * 鑾峰彇浠撴埧淇℃伅
+ *
+ * @return
+ */
+ @Query("from Fz40WhjlDefaultBuilding where companyId=:companyId ")
+ List<Fz40WhjlDefaultBuilding> listApi1105(@Param("companyId") String companyId);
+
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1106Rep.java b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1106Rep.java
new file mode 100644
index 0000000..f336041
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1106Rep.java
@@ -0,0 +1,24 @@
+package com.fzzy.async.whhpjl.repository;
+
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultBuilding;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultGranary;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * 寤掗棿淇℃伅
+ *
+ * @Author:YAN
+ */
+public interface Fz40ToWhjlSync1106Rep extends JpaRepository<Fz40WhjlDefaultGranary, String> {
+ /**
+ * 鑾峰彇寤掗棿淇℃伅
+ *
+ * @return
+ */
+ @Query("from Fz40WhjlDefaultGranary where companyId=:companyId ")
+ List<Fz40WhjlDefaultGranary> listApi1106(@Param("companyId") String companyId);
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1107Rep.java b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1107Rep.java
new file mode 100644
index 0000000..090b258
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1107Rep.java
@@ -0,0 +1,25 @@
+package com.fzzy.async.whhpjl.repository;
+
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDepot;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultGranary;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * 璐т綅淇℃伅
+ *
+ * @Author:YAN
+ */
+public interface Fz40ToWhjlSync1107Rep extends JpaRepository<Fz40WhjlDefaultDepot, String> {
+
+ /**
+ * 鑾峰彇璐т綅淇℃伅
+ *
+ * @return
+ */
+ @Query("from Fz40WhjlDefaultDepot where companyId=:companyId ")
+ List<Fz40WhjlDefaultDepot> listApi1107(@Param("companyId") String companyId);
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1111Rep.java b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1111Rep.java
new file mode 100644
index 0000000..9b7e881
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1111Rep.java
@@ -0,0 +1,24 @@
+package com.fzzy.async.whhpjl.repository;
+
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDepot;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDevice;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * 浠撳偍璁惧淇℃伅
+ *
+ * @Author:YAN
+ */
+public interface Fz40ToWhjlSync1111Rep extends JpaRepository<Fz40WhjlDefaultDevice, String> {
+ /**
+ * 鑾峰彇浠撳偍璁惧淇℃伅
+ *
+ * @return
+ */
+ @Query("from Fz40WhjlDefaultDevice where companyId=:companyId ")
+ List<Fz40WhjlDefaultDevice> listApi1111(@Param("companyId") String companyId);
+}
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1102.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1102.java
index 203c547..84f52ae 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1102.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1102.java
@@ -1,5 +1,6 @@
package com.fzzy.whjl.dto;
+import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -46,5 +47,14 @@
private String sfyx; //鏄惁鍚敤
private String bz; //澶囨敞
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @JSONField(serialize = false)
+ private String bizId; //涓氬姟ID
+ @JSONField(serialize = false)
+ private Date updateTime; //鏈�鍚庢洿鏂版椂闂�
+ @JSONField(serialize = false)
+ private String czbz; //鎿嶄綔鏍囧織
+ @JSONField(serialize = false)
+ private String kqdm; //搴撳尯浠ｇ爜
}
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1103.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1103.java
index f9f5403..e00624f 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1103.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1103.java
@@ -1,9 +1,11 @@
package com.fzzy.whjl.dto;
+import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.util.Date;
/**
* 鍐涚伯浼佷笟-鍐涘伐浜哄憳淇℃伅
@@ -32,4 +34,14 @@
private String sfyx; //鏄惁鍚敤
private String bz; //澶囨敞
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @JSONField(serialize = false)
+ private String bizId; //涓氬姟ID
+ @JSONField(serialize = false)
+ private Date updateTime; //鏈�鍚庢洿鏂版椂闂�
+ @JSONField(serialize = false)
+ private String czbz; //鎿嶄綔鏍囧織
+ @JSONField(serialize = false)
+ private String kqdm; //搴撳尯浠ｇ爜
+
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1105.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1105.java
index 4e04091..92db109 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1105.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1105.java
@@ -1,5 +1,6 @@
package com.fzzy.whjl.dto;
+import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -46,4 +47,14 @@
private String sfyx; //鏄惁鏈夋晥
private String bz; //澶囨敞
+
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @JSONField(serialize = false)
+ private String bizId; //涓氬姟ID
+ @JSONField(serialize = false)
+ private Date updateTime; //鏈�鍚庢洿鏂版椂闂�
+ @JSONField(serialize = false)
+ private String czbz; //鎿嶄綔鏍囧織
+ @JSONField(serialize = false)
+ private String kqdm; //搴撳尯浠ｇ爜
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1106.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1106.java
index 80a3aa9..5a3ee84 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1106.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1106.java
@@ -1,5 +1,6 @@
package com.fzzy.whjl.dto;
+import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -42,4 +43,14 @@
private String sfyx; //鏄惁鏈夋晥
private String bz; //澶囨敞
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @JSONField(serialize = false)
+ private String bizId; //涓氬姟ID
+ @JSONField(serialize = false)
+ private Date updateTime; //鏈�鍚庢洿鏂版椂闂�
+ @JSONField(serialize = false)
+ private String czbz; //鎿嶄綔鏍囧織
+ @JSONField(serialize = false)
+ private String kqdm; //搴撳尯浠ｇ爜
+
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1107.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1107.java
index 8022300..72e6f06 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1107.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1107.java
@@ -1,5 +1,6 @@
package com.fzzy.whjl.dto;
+import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -36,6 +37,15 @@
private Double hwrl; //璐т綅瀹归噺
private String sfyx; //鏄惁鏈夋晥
private String bz; //澶囨敞
-
+
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @JSONField(serialize = false)
+ private String bizId; //涓氬姟ID
+ @JSONField(serialize = false)
+ private Date updateTime; //鏈�鍚庢洿鏂版椂闂�
+ @JSONField(serialize = false)
+ private String czbz; //鎿嶄綔鏍囧織
+ @JSONField(serialize = false)
+ private String kqdm; //搴撳尯浠ｇ爜
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1111.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1111.java
index c838e0d..63814c5 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1111.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1111.java
@@ -1,5 +1,6 @@
package com.fzzy.whjl.dto;
+import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -56,4 +57,14 @@
private String sfyx; //鏄惁鏈夋晥
private String bz; //澶囨敞
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @JSONField(serialize = false)
+ private String bizId; //涓氬姟ID
+ @JSONField(serialize = false)
+ private Date updateTime; //鏈�鍚庢洿鏂版椂闂�
+ @JSONField(serialize = false)
+ private String czbz; //鎿嶄綔鏍囧織
+ @JSONField(serialize = false)
+ private String kqdm; //搴撳尯浠ｇ爜
+
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1102PR.java b/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1102PR.java
index e0fe1c2..ae8eebf 100644
--- a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1102PR.java
+++ b/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1102PR.java
@@ -3,7 +3,16 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiPushManager;
+import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1102;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
@@ -15,6 +24,12 @@
*/
@Component
public class WhjlApi1102PR {
+
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+
/**
* 鑾峰彇鍒楄〃淇℃伅
* whjlApi1102PR#listData
@@ -59,6 +74,41 @@
*/
@Expose
public String pushData(List<WhjlApi1102> items) {
- return null;
+ ResponseDto responseDto;
+ String result = "";
+
+ String kqdm = items.get(0).getKqdm();
+ ApiConfs apiConf = apiCommonService.getConf(kqdm);
+
+ if (null == apiConf) {
+ return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ }
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1102);
+
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ if (null == apiService) {
+ return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ }
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ responseDto = apiService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ WhjlApi1102 d;
+ for (WhjlApi1102 data : items) {
+ d = new WhjlApi1102();
+ BeanUtils.copyProperties(data, d);
+ if ("i".equals(d.getCzbz())) {
+ d.setCzbz("u");
+ //TODO 鏇存柊鐘舵�侊紝寰呭疄鐜�
+
+ }
+ }
+ result += responseDto.toString();
+ }
+ return result;
}
}
diff --git a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1103PR.java b/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1103PR.java
index b340457..4c7ed75 100644
--- a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1103PR.java
+++ b/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1103PR.java
@@ -3,7 +3,16 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiPushManager;
+import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1103;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
@@ -15,6 +24,12 @@
*/
@Component
public class WhjlApi1103PR {
+
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+
/**
* 鑾峰彇鍒楄〃淇℃伅
* whjlApi1103PR#listData
@@ -59,6 +74,41 @@
*/
@Expose
public String pushData(List<WhjlApi1103> items) {
- return null;
+ ResponseDto responseDto;
+ String result = "";
+
+ String kqdm = items.get(0).getKqdm();
+ ApiConfs apiConf = apiCommonService.getConf(kqdm);
+
+ if (null == apiConf) {
+ return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ }
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1103);
+
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ if (null == apiService) {
+ return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ }
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ responseDto = apiService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ WhjlApi1103 d;
+ for (WhjlApi1103 data : items) {
+ d = new WhjlApi1103();
+ BeanUtils.copyProperties(data, d);
+ if ("i".equals(d.getCzbz())) {
+ d.setCzbz("u");
+ //TODO 鏇存柊鐘舵�侊紝寰呭疄鐜�
+
+ }
+ }
+ result += responseDto.toString();
+ }
+ return result;
}
}
diff --git a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1105PR.java b/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1105PR.java
index eb2df9b..9694aec 100644
--- a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1105PR.java
+++ b/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1105PR.java
@@ -3,7 +3,17 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiPushManager;
+import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.whjl.WhjlConstant;
+import com.fzzy.whjl.dto.WhjlApi1103;
import com.fzzy.whjl.dto.WhjlApi1105;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
@@ -15,6 +25,12 @@
*/
@Component
public class WhjlApi1105PR {
+
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+
/**
* 鑾峰彇鍒楄〃淇℃伅
* whjlApi1105PR#listData
@@ -59,6 +75,41 @@
*/
@Expose
public String pushData(List<WhjlApi1105> items) {
- return null;
+ ResponseDto responseDto;
+ String result = "";
+
+ String kqdm = items.get(0).getKqdm();
+ ApiConfs apiConf = apiCommonService.getConf(kqdm);
+
+ if (null == apiConf) {
+ return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ }
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1105);
+
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ if (null == apiService) {
+ return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ }
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ responseDto = apiService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ WhjlApi1105 d;
+ for (WhjlApi1105 data : items) {
+ d = new WhjlApi1105();
+ BeanUtils.copyProperties(data, d);
+ if ("i".equals(d.getCzbz())) {
+ d.setCzbz("u");
+ //TODO 鏇存柊鐘舵�侊紝寰呭疄鐜�
+
+ }
+ }
+ result += responseDto.toString();
+ }
+ return result;
}
}
diff --git a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1106PR.java b/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1106PR.java
index 62769b7..a114ef8 100644
--- a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1106PR.java
+++ b/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1106PR.java
@@ -3,7 +3,16 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiPushManager;
+import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1106;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
@@ -15,6 +24,12 @@
*/
@Component
public class WhjlApi1106PR {
+
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+
/**
* 鑾峰彇鍒楄〃淇℃伅
* whjlApi1106PR#listData
@@ -59,6 +74,41 @@
*/
@Expose
public String pushData(List<WhjlApi1106> items) {
- return null;
+ ResponseDto responseDto;
+ String result = "";
+
+ String kqdm = items.get(0).getKqdm();
+ ApiConfs apiConf = apiCommonService.getConf(kqdm);
+
+ if (null == apiConf) {
+ return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ }
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1106);
+
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ if (null == apiService) {
+ return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ }
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ responseDto = apiService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ WhjlApi1106 d;
+ for (WhjlApi1106 data : items) {
+ d = new WhjlApi1106();
+ BeanUtils.copyProperties(data, d);
+ if ("i".equals(d.getCzbz())) {
+ d.setCzbz("u");
+ //TODO 鏇存柊鐘舵�侊紝寰呭疄鐜�
+
+ }
+ }
+ result += responseDto.toString();
+ }
+ return result;
}
}
diff --git a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1107PR.java b/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1107PR.java
index fd06d32..a1a10e0 100644
--- a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1107PR.java
+++ b/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1107PR.java
@@ -3,7 +3,17 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiPushManager;
+import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.whjl.WhjlConstant;
+import com.fzzy.whjl.dto.WhjlApi1106;
import com.fzzy.whjl.dto.WhjlApi1107;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
@@ -15,6 +25,13 @@
*/
@Component
public class WhjlApi1107PR {
+
+
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+
/**
* 鑾峰彇鍒楄〃淇℃伅
* whjlApi1107PR#listData
@@ -59,6 +76,41 @@
*/
@Expose
public String pushData(List<WhjlApi1107> items) {
- return null;
+ ResponseDto responseDto;
+ String result = "";
+
+ String kqdm = items.get(0).getKqdm();
+ ApiConfs apiConf = apiCommonService.getConf(kqdm);
+
+ if (null == apiConf) {
+ return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ }
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1107);
+
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ if (null == apiService) {
+ return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ }
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ responseDto = apiService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ WhjlApi1107 d;
+ for (WhjlApi1107 data : items) {
+ d = new WhjlApi1107();
+ BeanUtils.copyProperties(data, d);
+ if ("i".equals(d.getCzbz())) {
+ d.setCzbz("u");
+ //TODO 鏇存柊鐘舵�侊紝寰呭疄鐜�
+
+ }
+ }
+ result += responseDto.toString();
+ }
+ return result;
}
}
diff --git a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1111PR.java b/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1111PR.java
index a4bcea4..4095f3c 100644
--- a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1111PR.java
+++ b/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1111PR.java
@@ -3,7 +3,16 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiPushManager;
+import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1111;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
@@ -15,6 +24,13 @@
*/
@Component
public class WhjlApi1111PR {
+
+
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+
/**
* 鑾峰彇鍒楄〃淇℃伅
* whjlApi1111PR#listData
@@ -59,6 +75,41 @@
*/
@Expose
public String pushData(List<WhjlApi1111> items) {
- return null;
+ ResponseDto responseDto;
+ String result = "";
+
+ String kqdm = items.get(0).getKqdm();
+ ApiConfs apiConf = apiCommonService.getConf(kqdm);
+
+ if (null == apiConf) {
+ return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ }
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1111);
+
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ if (null == apiService) {
+ return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ }
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ responseDto = apiService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ WhjlApi1111 d;
+ for (WhjlApi1111 data : items) {
+ d = new WhjlApi1111();
+ BeanUtils.copyProperties(data, d);
+ if ("i".equals(d.getCzbz())) {
+ d.setCzbz("u");
+ //TODO 鏇存柊鐘舵�侊紝寰呭疄鐜�
+
+ }
+ }
+ result += responseDto.toString();
+ }
+ return result;
}
}
--
Gitblit v1.9.3