推送基础信息

YYC

2023-08-07 0c264f29e3f46cb76a0280d52254672b4d571696

推送基础信息

 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>

 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 åŒæ­¥ä»“储设备信息

    }

 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 = "单位：KG")
    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;
}

 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 = "单位：KG，通过库存变更")
    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;

}

 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;

}

 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;

}

 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;

}

 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("否");
                }


 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);
        }
    }
}

 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);
        }
    }
}

 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);
        }
    }
}

 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);
        }
    }
}

 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);
        }
    }
}

 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);
        }
    }
}

 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);
}

 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);

}

 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);
}

 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);
}

 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);
}

 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;  //库区代码

}

 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;  //库区代码

}

 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;  //库区代码
}

 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;  //库区代码

}

 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;  //库区代码

}

 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;  //库区代码

}

 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;
    }
}

 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;
    }
}

 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;
    }
}

 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;
    }
}

 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;
    }
}

 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;
    }
}