调整上海市2023接口架构

CZT

2023-08-17 430263f4f653dc02b3d65720e218d68b4a32b33b

调整上海市2023接口架构

 src/main/java/com/fzzy/api/data/ApiParam.java

@@ -36,6 +36,9 @@

    private String bizId;

    //指令ID，用于上级平台发送指令获取数据的情况
    private String orderid;


    public ApiParam() {
        super();

 src/main/java/com/fzzy/api/data/PushProtocol.java

@@ -17,7 +17,8 @@
    SB_HN_2022("SB_HN_2022", "河南省平台2022版"),
    SB_WHJL_2023("SB_WHJL_2023", "武汉军粮平台2023版"),
    HB_FZZY_JG_2022("HB_FZZY_JG_2022", "风正致远监管2022版本"),
    SB_SHJdJW_2023("SB_SHJdJW_2023", "上海嘉定纪委监管平台2023版");
    SB_SHJdJW_2023("SB_SHJdJW_2023", "上海嘉定纪委监管平台2023版"),
    SB_SH_2023("SB_SH_2023", "上海市平台2023版");


    private String code;

 src/main/java/com/fzzy/api/utils/RSAUtils.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,242 @@
package com.fzzy.api.utils;


import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.ArrayUtils;

import javax.crypto.Cipher;
import java.io.ByteArrayOutputStream;
import java.nio.charset.StandardCharsets;
import java.security.*;
import java.security.interfaces.RSAPrivateKey;
import java.security.interfaces.RSAPublicKey;
import java.security.spec.PKCS8EncodedKeySpec;
import java.security.spec.X509EncodedKeySpec;
import java.util.Base64;
import java.util.HashMap;
import java.util.Map;

@Slf4j
public class RSAUtils {
    public static final String KEY_ALGORITHM = "RSA";

    private static final String PUBLIC_KEY = "RSAPublicKey";

    private static final String PRIVATE_KEY = "RSAPrivateKey";

    private static final String CHARSET = "utf-8";

    private static final int KEYSIZE = 2048;// å¯†é’¥ä½æ•°
    private static final int RESERVE_BYTES = 11;
    private static final String ECB_PADDING = "RSA/ECB/PKCS1Padding";

    // 2048 bits çš„ RSA å¯†é’¥å¯¹ï¼Œæœ€å¤§è§£å¯†å¯†æ–‡å¤§å°
    private static final int MAX_DECRYPT_BLOCK = KEYSIZE / 8;

    // 2048 bits çš„ RSA å¯†é’¥å¯¹ï¼Œæœ€å¤§åŠ å¯†æ˜Žæ–‡å¤§å°
    private static final int MAX_ENCRYPT_BLOCK = MAX_DECRYPT_BLOCK - RESERVE_BYTES;

    // ç”Ÿæˆå¯†é’¥å¯¹
    public static Map<String, Object> initKey(int keysize) throws Exception {
        KeyPairGenerator keyPairGen = KeyPairGenerator.getInstance(KEY_ALGORITHM);
        // è®¾ç½®å¯†é’¥å¯¹çš„ bit æ•°ï¼Œè¶Šå¤§è¶Šå®‰å…¨
        keyPairGen.initialize(keysize);
        KeyPair keyPair = keyPairGen.generateKeyPair();

        // èŽ·å–公钥
        RSAPublicKey publicKey = (RSAPublicKey) keyPair.getPublic();
        // èŽ·å–私钥
        RSAPrivateKey privateKey = (RSAPrivateKey) keyPair.getPrivate();
        Map<String, Object> keyMap = new HashMap<>(2);
        keyMap.put(PUBLIC_KEY, publicKey);
        keyMap.put(PRIVATE_KEY, privateKey);
        return keyMap;
    }

    // èŽ·å–公钥字符串
    public static String getPublicKeyStr(Map<String, Object> keyMap) {
        // èŽ·å¾— map ä¸­çš„公钥对象，转为 key å¯¹è±¡
        Key key = (Key) keyMap.get(PUBLIC_KEY);
        // ç¼–码返回字符串
        return encryptBASE64(key.getEncoded());
    }

    // èŽ·å–私钥字符串
    public static String getPrivateKeyStr(Map<String, Object> keyMap) {
        // èŽ·å¾— map ä¸­çš„私钥对象，转为 key å¯¹è±¡
        Key key = (Key) keyMap.get(PRIVATE_KEY);
        // ç¼–码返回字符串
        return encryptBASE64(key.getEncoded());
    }

    // èŽ·å–公钥
    public static PublicKey getPublicKey(String publicKeyString) throws Exception {
        byte[] publicKeyByte = Base64.getDecoder().decode(publicKeyString);
        X509EncodedKeySpec keySpec = new X509EncodedKeySpec(publicKeyByte);
        KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM);
        return keyFactory.generatePublic(keySpec);
    }

    // èŽ·å–私钥
    public static PrivateKey getPrivateKey(String privateKeyString) throws Exception {
        byte[] privateKeyByte = Base64.getDecoder().decode(privateKeyString);
        PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(privateKeyByte);
        KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM);
        return keyFactory.generatePrivate(keySpec);
    }

    /**
     * BASE64 ç¼–码返回加密字符串
     *
     * @param key éœ€è¦ç¼–码的字节数组
     * @return ç¼–码后的字符串
     */
    public static String encryptBASE64(byte[] key) {
        return new String(Base64.getEncoder().encode(key));
    }

    /**
     * BASE64 è§£ç ï¼Œè¿”回字节数组
     *
     * @param key å¾…解码的字符串
     * @return è§£ç åŽçš„字节数组
     */
    public static byte[] decryptBASE64(String key) {
        return Base64.getDecoder().decode(key);
    }

    /**
     * å…¬é’¥åŠ å¯†
     *
     * @param text         å¾…加密的明文字符串
     * @param publicKeyStr å…¬é’¥
     * @return åŠ å¯†åŽçš„密文
     */
    public static String encrypt(String text, String publicKeyStr) {
        try {
            log.info("明文字符串为:[{}]", text);
            Cipher cipher = Cipher.getInstance(KEY_ALGORITHM);
            cipher.init(Cipher.ENCRYPT_MODE, getPublicKey(publicKeyStr));

            // URLEncoder编码解决中文乱码问题
            byte[] data = text.getBytes(StandardCharsets.UTF_8);
            // åŠ å¯†æ—¶è¶…过117字节就报错。为此采用分段加密的办法来加密
            byte[] enBytes = null;
            for (int i = 0; i < data.length; i += MAX_ENCRYPT_BLOCK) {
                // æ³¨æ„è¦ä½¿ç”¨2的倍数，否则会出现加密后的内容再解密时为乱码
                byte[] doFinal = cipher.doFinal(ArrayUtils.subarray(data, i, i + MAX_ENCRYPT_BLOCK));
                enBytes = ArrayUtils.addAll(enBytes, doFinal);
            }
            return Base64.getEncoder().encodeToString(enBytes);
        } catch (Exception e) {
            throw new RuntimeException("加密字符串[" + text + "]时遇到异常", e);
        }
    }

    /**
     * ç§é’¥è§£å¯†
     *
     * @param secretText    å¾…解密的密文字符串
     * @param privateKeyStr ç§é’¥
     * @return è§£å¯†åŽçš„明文
     */
    public static String decrypt(String secretText, String privateKeyStr) {
        try {
            // ç”Ÿæˆç§é’¥
            Cipher cipher = Cipher.getInstance(KEY_ALGORITHM);
            cipher.init(Cipher.DECRYPT_MODE, getPrivateKey(privateKeyStr));
            // å¯†æ–‡è§£ç 
            byte[] data = Base64.getDecoder().decode(secretText);

            // è¿”回UTF-8编码的解密信息
            int inputLen = data.length;
            ByteArrayOutputStream out = new ByteArrayOutputStream();
            int offSet = 0;
            byte[] cache;
            int i = 0;
            // å¯¹æ•°æ®åˆ†æ®µè§£å¯†
            while (inputLen - offSet > 0) {
                if (inputLen - offSet > MAX_DECRYPT_BLOCK) {
                    cache = cipher.doFinal(data, offSet, MAX_DECRYPT_BLOCK);
                } else {
                    cache = cipher.doFinal(data, offSet, inputLen - offSet);
                }
                out.write(cache, 0, cache.length);
                i++;
                offSet = i * MAX_DECRYPT_BLOCK;
            }
            out.close();
            return out.toString(CHARSET);
        } catch (Exception e) {
            throw new RuntimeException("解密字符串[" + secretText + "]时遇到异常", e);
        }
    }

    /**
     * ç§é’¥åŠ å¯†
     *
     * @param text
     * @param privateInfoStr
     * @return
     */
    public static String encryptData(String text, String privateInfoStr) {
        try {
            log.info("明文字符串为:[{}]", text);
            Cipher cipher = Cipher.getInstance(ECB_PADDING);
            cipher.init(Cipher.ENCRYPT_MODE, getPrivateKey(privateInfoStr));

            // URLEncoder编码解决中文乱码问题
            byte[] data = text.getBytes(StandardCharsets.UTF_8);
            byte[] enBytes = null;
            for (int i = 0; i < data.length; i += MAX_ENCRYPT_BLOCK) {
                // æ³¨æ„è¦ä½¿ç”¨2的倍数，否则会出现加密后的内容再解密时为乱码
                byte[] doFinal = cipher.doFinal(ArrayUtils.subarray(data, i, i + MAX_ENCRYPT_BLOCK));
                enBytes = ArrayUtils.addAll(enBytes, doFinal);
            }
            return Base64.getEncoder().encodeToString(enBytes);
        } catch (Exception e) {
            throw new RuntimeException("加密字符串[" + text + "]时遇到异常", e);
        }
    }

    /**
     * å…¬é’¥è§£å¯†
     *
     * @param secretText
     * @param publicInfoStr
     * @return
     */
    public static String decryptData(String secretText, String publicInfoStr) {
        try {
            //解密
            Cipher cipher = Cipher.getInstance(ECB_PADDING);
            cipher.init(Cipher.DECRYPT_MODE, getPublicKey(publicInfoStr));

            // å¯†æ–‡è§£ç 
            byte[] data = Base64.getDecoder().decode(secretText);

            // è¿”回UTF-8编码的解密信息
            int inputLen = data.length;
            ByteArrayOutputStream out = new ByteArrayOutputStream();
            int offSet = 0;
            byte[] cache;
            int i = 0;
            // å¯¹æ•°æ®åˆ†æ®µè§£å¯†
            while (inputLen - offSet > 0) {
                if (inputLen - offSet > MAX_DECRYPT_BLOCK) {
                    cache = cipher.doFinal(data, offSet, MAX_DECRYPT_BLOCK);
                } else {
                    cache = cipher.doFinal(data, offSet, inputLen - offSet);
                }
                out.write(cache, 0, cache.length);
                i++;
                offSet = i * MAX_DECRYPT_BLOCK;
            }
            out.close();
            return out.toString(CHARSET);
        } catch (Exception e) {
            throw new RuntimeException("解密字符串[" + secretText + "]时遇到异常", e);
        }
    }

}

 src/main/java/com/fzzy/api/view/Api1114-1.view.xml

 src/main/java/com/fzzy/api/view/Api1114-2.view.xml

 src/main/java/com/fzzy/api/view/Api1114-3.view.xml

 src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1101.java

@@ -9,8 +9,8 @@
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.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1101;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1101;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;

 src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1102.java

@@ -9,8 +9,8 @@
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.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1102;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1102;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;

 src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1103.java

@@ -7,11 +7,10 @@
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiInfoDataRep;
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.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1103;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1103;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

 src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1105.java

@@ -9,8 +9,8 @@
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultBuild;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1105Rep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1105;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1105;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

 src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1106.java

@@ -9,8 +9,8 @@
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultGranary;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1106Rep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1106;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1106;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

 src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java

@@ -8,12 +8,9 @@
import com.fzzy.api.view.repository.ApiInfoDataRep;
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.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1106;
import com.fzzy.whjl.dto.WhjlApi1107;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1107;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

 src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1111.java

@@ -9,8 +9,8 @@
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDevice;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1111Rep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1111;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1111;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

 src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1204.java

@@ -9,8 +9,8 @@
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultCustomer;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1204Rep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1204;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1204;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

 src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1207.java

@@ -8,10 +8,9 @@
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultContract;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultCustomer;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1207Rep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1207;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1207;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

 src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1214.java

@@ -7,11 +7,10 @@
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultContract;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultInoutRecord;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1214Rep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1214;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1214;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

 src/main/java/com/fzzy/conf/JpaConfigPrimary.java

@@ -20,7 +20,7 @@
@Configuration
@EnableTransactionManagement
@EnableJpaRepositories(
        basePackages = {"com.fzzy.api.*.repository", "com.fzzy.sys.repository", "com.fzzy.whjl.*.repository"},
        basePackages = {"com.fzzy.api.*.repository", "com.fzzy.sys.repository", "com.fzzy.otherview.*.repository"},
        entityManagerFactoryRef = "primaryEntityManagerFactory",
        transactionManagerRef = "primaryTransactionManager"
)

 src/main/java/com/fzzy/otherview/gd2022/package-info.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,4 @@
/**
 * å¹¿ä¸œçœå¹³å°2022版-独有接口
 */
package com.fzzy.otherview.gd2022;

 src/main/java/com/fzzy/otherview/gd2022/xzba1023.view.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<ViewConfig>
  <Arguments/>
  <Context/>
  <Model>

  </Model>
  <View layout="regionPadding:10">

  </View>
</ViewConfig>

 src/main/java/com/fzzy/otherview/sh2023/package-info.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,4 @@
/**
 * ä¸Šæµ·å¸‚平台2022版-独有接口
 */
package com.fzzy.otherview.sh2023;

 src/main/java/com/fzzy/otherview/whhpjl/ApiListWhjl.view.xml

 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1101.view.xml

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/view/WhjlApi1101.view.xml ÐÞ¸Ä
@@ -4,7 +4,7 @@
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.whjl.dto.WhjlApi1101</Property>
      <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1101</Property>
      <PropertyDef name="jlqybh">
        <Property></Property>
        <Property name="label">军粮企业编号</Property>

 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1102.view.xml

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/view/WhjlApi1102.view.xml ÐÞ¸Ä
@@ -4,7 +4,7 @@
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.whjl.dto.WhjlApi1102</Property>
      <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1102</Property>
      <PropertyDef name="jgzdbh">
        <Property></Property>
        <Property name="label">军供站点编号</Property>

 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1103.view.xml

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/view/WhjlApi1103.view.xml ÐÞ¸Ä
@@ -4,7 +4,7 @@
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.whjl.dto.WhjlApi1103</Property>
      <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1103</Property>
      <PropertyDef name="rybh">
        <Property></Property>
        <Property name="label">人员编号</Property>

 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1104.view.xml

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/view/WhjlApi1104.view.xml ÐÞ¸Ä
@@ -4,7 +4,7 @@
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.whjl.dto.WhjlApi1104</Property>
      <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1104</Property>
      <PropertyDef name="lydbh">
        <Property></Property>
        <Property name="label">粮油店编号</Property>

 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1105.view.xml

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/view/WhjlApi1105.view.xml ÐÞ¸Ä
@@ -4,7 +4,7 @@
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.whjl.dto.WhjlApi1105</Property>
      <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1105</Property>
      <PropertyDef name="cfbh">
        <Property></Property>
        <Property name="label">仓房编号</Property>

 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1106.view.xml

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/view/WhjlApi1106.view.xml ÐÞ¸Ä
@@ -4,7 +4,7 @@
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.whjl.dto.WhjlApi1106</Property>
      <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1106</Property>
      <PropertyDef name="ajbh">
        <Property></Property>
        <Property name="label">廒间编号</Property>

 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1107.view.xml

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/view/WhjlApi1107.view.xml ÐÞ¸Ä
@@ -4,7 +4,7 @@
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.whjl.dto.WhjlApi1107</Property>
      <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1107</Property>
      <PropertyDef name="hwbh">
        <Property></Property>
        <Property name="label">货位编号</Property>

 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1111.view.xml

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/view/WhjlApi1111.view.xml ÐÞ¸Ä
@@ -4,7 +4,7 @@
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.whjl.dto.WhjlApi1111</Property>
      <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1111</Property>
      <PropertyDef name="sbbh">
        <Property></Property>
        <Property name="label">设备编号</Property>

 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1204.view.xml

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/view/WhjlApi1204.view.xml ÐÞ¸Ä
@@ -4,7 +4,7 @@
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.whjl.dto.WhjlApi1204</Property>
      <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1204</Property>
      <PropertyDef name="khbh">
        <Property></Property>
        <Property name="label">客户编号</Property>

 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1207.view.xml

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/view/WhjlApi1207.view.xml ÐÞ¸Ä
@@ -4,7 +4,7 @@
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.whjl.dto.WhjlApi1207</Property>
      <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1207</Property>
      <PropertyDef name="htid">
        <Property></Property>
        <Property name="label">合同ID</Property>
@@ -177,7 +177,7 @@
      </Reference>
    </DataType>
    <DataType name="dtItem">
      <Property name="creationType">com.fzzy.whjl.dto.WhjlQDItem</Property>
      <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlQDItem</Property>
      <PropertyDef name="htspid">
        <Property></Property>
        <Property name="label">合同商品ID</Property>

 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1214.view.xml

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/view/WhjlApi1214.view.xml ÐÞ¸Ä
@@ -4,7 +4,7 @@
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.whjl.dto.WhjlApi1214</Property>
      <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1214</Property>
      <PropertyDef name="crkid">
        <Property/>
        <Property name="label">出入库记录ID</Property>

 src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/WhjlConstant.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl;
package com.fzzy.otherview.whhpjl;

/**
 * æ­¦æ±‰å†›ç²®çœå¹³å°--全局静态类

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1101.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/dto/WhjlApi1101.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.dto;
package com.fzzy.otherview.whhpjl.dto;

import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1102.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/dto/WhjlApi1102.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.dto;
package com.fzzy.otherview.whhpjl.dto;

import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1103.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/dto/WhjlApi1103.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.dto;
package com.fzzy.otherview.whhpjl.dto;

import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1104.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/dto/WhjlApi1104.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.dto;
package com.fzzy.otherview.whhpjl.dto;

import lombok.Data;
import lombok.EqualsAndHashCode;

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1105.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/dto/WhjlApi1105.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.dto;
package com.fzzy.otherview.whhpjl.dto;

import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1106.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/dto/WhjlApi1106.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.dto;
package com.fzzy.otherview.whhpjl.dto;

import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1107.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/dto/WhjlApi1107.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.dto;
package com.fzzy.otherview.whhpjl.dto;

import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1108.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/dto/WhjlApi1108.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.dto;
package com.fzzy.otherview.whhpjl.dto;

import lombok.Data;
import lombok.EqualsAndHashCode;

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/dto/WhjlApi1109.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.dto;
package com.fzzy.otherview.whhpjl.dto;

import lombok.Data;
import lombok.EqualsAndHashCode;

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1110.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/dto/WhjlApi1110.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.dto;
package com.fzzy.otherview.whhpjl.dto;

import lombok.Data;
import lombok.EqualsAndHashCode;

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1111.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/dto/WhjlApi1111.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.dto;
package com.fzzy.otherview.whhpjl.dto;

import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1112.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/dto/WhjlApi1112.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.dto;
package com.fzzy.otherview.whhpjl.dto;

import lombok.Data;
import lombok.EqualsAndHashCode;

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1113.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/dto/WhjlApi1113.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.dto;
package com.fzzy.otherview.whhpjl.dto;

import lombok.Data;
import lombok.EqualsAndHashCode;

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/dto/WhjlApi1114.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.dto;
package com.fzzy.otherview.whhpjl.dto;

import lombok.Data;
import lombok.EqualsAndHashCode;

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1204.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/dto/WhjlApi1204.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.dto;
package com.fzzy.otherview.whhpjl.dto;

import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1207.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/dto/WhjlApi1207.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.dto;
package com.fzzy.otherview.whhpjl.dto;

import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1208.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/dto/WhjlApi1208.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.dto;
package com.fzzy.otherview.whhpjl.dto;

import lombok.Data;
import lombok.EqualsAndHashCode;

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1209.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/dto/WhjlApi1209.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.dto;
package com.fzzy.otherview.whhpjl.dto;

import lombok.Data;
import lombok.EqualsAndHashCode;

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1210.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/dto/WhjlApi1210.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.dto;
package com.fzzy.otherview.whhpjl.dto;

import lombok.Data;
import lombok.EqualsAndHashCode;

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1214.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/dto/WhjlApi1214.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.dto;
package com.fzzy.otherview.whhpjl.dto;

import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1302.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/dto/WhjlApi1302.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.dto;
package com.fzzy.otherview.whhpjl.dto;

import lombok.Data;
import lombok.EqualsAndHashCode;

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1303.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/dto/WhjlApi1303.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.dto;
package com.fzzy.otherview.whhpjl.dto;

import lombok.Data;
import lombok.EqualsAndHashCode;

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1304.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/dto/WhjlApi1304.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.dto;
package com.fzzy.otherview.whhpjl.dto;

import lombok.Data;
import lombok.EqualsAndHashCode;

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlCheckItm.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/dto/WhjlCheckItm.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.dto;
package com.fzzy.otherview.whhpjl.dto;

import lombok.Data;
import lombok.EqualsAndHashCode;

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlQDItem.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/dto/WhjlQDItem.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.dto;
package com.fzzy.otherview.whhpjl.dto;

import lombok.Data;
import lombok.EqualsAndHashCode;

 src/main/java/com/fzzy/otherview/whhpjl/package-info.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,4 @@
/**
 * æ­¦æ±‰å†›ç²®çœå¹³å°
 */
package com.fzzy.otherview.whhpjl;

 src/main/java/com/fzzy/otherview/whhpjl/pr/ApiListWhjlPR.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/view/pr/ApiListWhjlPR.java ÐÞ¸Ä
@@ -1,12 +1,12 @@
package com.fzzy.whjl.view.pr;
package com.fzzy.otherview.whhpjl.pr;

import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.entity.ApiList;
import com.fzzy.api.entity.ApiTrigger;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.view.repository.ApiListWhjlRep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.repository.ApiListWhjlRep;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1101PR.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/view/pr/WhjlApi1101PR.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.view.pr;
package com.fzzy.otherview.whhpjl.pr;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -14,8 +14,8 @@
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1101;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1101;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.ArrayList;

 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1102PR.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/view/pr/WhjlApi1102PR.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.view.pr;
package com.fzzy.otherview.whhpjl.pr;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -14,8 +14,8 @@
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1102;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1102;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;


 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1103PR.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/view/pr/WhjlApi1103PR.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.view.pr;
package com.fzzy.otherview.whhpjl.pr;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -14,9 +14,8 @@
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1103;
import org.springframework.beans.BeanUtils;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1103;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;


 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1104PR.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/view/pr/WhjlApi1104PR.java ÐÞ¸Ä
@@ -1,10 +1,9 @@
package com.fzzy.whjl.view.pr;
package com.fzzy.otherview.whhpjl.pr;

import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.whjl.dto.WhjlApi1103;
import com.fzzy.whjl.dto.WhjlApi1104;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1104;
import org.springframework.stereotype.Component;

import java.util.List;

 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1105PR.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/view/pr/WhjlApi1105PR.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.view.pr;
package com.fzzy.otherview.whhpjl.pr;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -14,9 +14,8 @@
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1105;
import org.springframework.beans.BeanUtils;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1105;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;


 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1106PR.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/view/pr/WhjlApi1106PR.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.view.pr;
package com.fzzy.otherview.whhpjl.pr;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -14,9 +14,8 @@
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1106;
import org.springframework.beans.BeanUtils;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1106;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;


 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1107PR.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/view/pr/WhjlApi1107PR.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.view.pr;
package com.fzzy.otherview.whhpjl.pr;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -14,8 +14,8 @@
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1107;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1107;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;


 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1111PR.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/view/pr/WhjlApi1111PR.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.view.pr;
package com.fzzy.otherview.whhpjl.pr;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -14,8 +14,8 @@
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1111;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1111;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;


 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1204PR.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/view/pr/WhjlApi1204PR.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.view.pr;
package com.fzzy.otherview.whhpjl.pr;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -14,9 +14,8 @@
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1111;
import com.fzzy.whjl.dto.WhjlApi1204;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1204;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;


 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1207PR.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/view/pr/WhjlApi1207PR.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.view.pr;
package com.fzzy.otherview.whhpjl.pr;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -14,9 +14,9 @@
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1207;
import com.fzzy.whjl.dto.WhjlQDItem;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1207;
import com.fzzy.otherview.whhpjl.dto.WhjlQDItem;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;


 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1214PR.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/view/pr/WhjlApi1214PR.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.view.pr;
package com.fzzy.otherview.whhpjl.pr;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -14,9 +14,8 @@
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1214;
import com.fzzy.whjl.dto.WhjlQDItem;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1214;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;


 src/main/java/com/fzzy/otherview/whhpjl/pr/package-info.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,4 @@
/**
 * æ­¦æ±‰å†›ç²®çœå¹³å°
 */
package com.fzzy.otherview.whhpjl.pr;

 src/main/java/com/fzzy/otherview/whhpjl/repository/ApiListWhjlRep.java

ÎļþÃû´Ó src/main/java/com/fzzy/whjl/view/repository/ApiListWhjlRep.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.fzzy.whjl.view.repository;
package com.fzzy.otherview.whhpjl.repository;

import com.fzzy.api.entity.ApiList;
import org.springframework.data.jpa.repository.JpaRepository;

 src/main/java/com/fzzy/otherview/whhpjl/repository/package-info.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,4 @@
/**
 * æ­¦æ±‰å†›ç²®çœå¹³å°
 */
package com.fzzy.otherview.whhpjl.repository;

 src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,152 @@
package com.fzzy.push.sh2023;

import com.alibaba.fastjson.JSON;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.Api1102;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.push.sh2023.dto.SH2023ReqDto;
import com.fzzy.push.sh2023.dto.SH2023RespDto;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;

/**
 * ä¸Šæµ·å¸‚平台2023版-上传数据服务类
 *
 * @author czt
 * @date 2023/08/17
 */
@Slf4j
@Data
@Service
public class SH2023ApiRemoteService implements ApiRemoteService {

    @Autowired
    private RedisUtil redisUtil;
    @Autowired
    private ApiCommonService apiCommonService;
    @Autowired
    private ApiTriggerService apiTriggerService;
    @Autowired
    private ApiLogRep apiLogRep;
    @Autowired
    private Api1102Rep api1102Rep;

    @Override
    public String getProtocol() {
        return PushProtocol.SB_SH_2023.getCode();
    }

    @Override
    public ResponseDto pushData(ApiParam param, Object data) {
        return pushData(param, null, data);
    }

    @Override
    public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {
        String inteId = param.getInteId();
        String kqdm = param.getKqdm();

        try {
            if (null == conf) {
                conf = apiCommonService.getConf(kqdm);
            }

            //添加日志
            ApiLog apiLog = new ApiLog();
            apiLog.setId(ContextUtil.getUUID());
            apiLog.setInteId(inteId);
            String jsonData = getJsonData(inteId, data);
            log.info("接口数据信息=" + jsonData);

            if (StringUtils.isEmpty(inteId)) {
                ResponseDto responseDto = new ResponseDto(99, "没有获取到接口");
                apiLog.setStatus(99);
                apiLog.setResult("没有获取到接口");
                apiLogRep.save(apiLog);
                return responseDto;
            }
            apiLog.setData(jsonData);
            apiLog.setKqdm(kqdm);
            apiLog.setUploadTime(new Date());

            if (conf == null) {
                ResponseDto responseDto = new ResponseDto(99, "没有获取到上传配置");
                apiLog.setStatus(99);
                apiLog.setResult("没有获取到上传配置");
                apiLogRep.save(apiLog);
                return responseDto;
            }

            //封装推送数据
            SH2023ReqDto reqData = new SH2023ReqDto();
            reqData.setId(ContextUtil.getUUID());
            //获取身份ID，即行政区划码
            List<Api1102> api1102List = api1102Rep.findPushData(conf.getKqdm());
            if(null == api1102List || api1102List.isEmpty()){
                ResponseDto responseDto = new ResponseDto(99, "没有获取到身份ID");
                apiLog.setStatus(99);
                apiLog.setResult("没有获取到身份ID");
                apiLogRep.save(apiLog);
                return responseDto;
            }
            reqData.setUid(api1102List.get(0).getXzqhdm());
            //指令id
            reqData.setOrderid(param.getOrderid());
            //身份签名，对地区行政区划代码_当天日期进行MD5算法签名
            reqData.setAccess_token(RSAUtils.encryptData(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"),conf.getPublicKey()));
            //数据总条数
            List<Object> list  = (List<Object>)data;
            reqData.setDatalength(list.size());
            //数据进行SM4加密
            reqData.setData(jsonData);
            //摘要，数据主体的MD5值
            reqData.setDigst(MyMD5Util.encrypt(jsonData));

            SH2023RespDto responseDto = SH2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, reqData, conf);
            apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
            apiLog.setResult(responseDto.getResult());
            apiLogRep.save(apiLog);
            ResponseDto resd = new ResponseDto();
            resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
            resd.setMsg(responseDto.getResult());

            return resd;
        } catch (Exception e) {
            log.error(e.getMessage(), e);
            return new ResponseDto(99, e.getMessage());
        }
    }

    /**
     * è°ƒæ•´æ•°æ®å°è£…，获取json数据
     *
     * @param inteId
     * @param data
     * @return
     * @throws Exception
     */
    private String getJsonData(String inteId, Object data) {
        //具体根据接口进行封装
        if ("1101".equals(inteId)) {
            return JSON.toJSONString(data);
        } else {
            return JSON.toJSONString(data);
        }
    }

}

 src/main/java/com/fzzy/push/sh2023/SH2023Constant.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,206 @@
package com.fzzy.push.sh2023;

/**
 * ä¸Šæµ·å¸‚平台2023版-接口-常量
 */
public class SH2023Constant {

    /**
     * æŽ¥å£ç¼–码-1101 å•ä½ä¿¡æ¯æ•°æ®æŽ¥å£
     */
    public static String SH_2023_API_CODE_1101 = "1101";
    /**
     * æŽ¥å£ç¼–码-1102 åº“区信息数据接口
     */
    public static String SH_2023_API_CODE_1102 = "1102";
    /**
     * æŽ¥å£ç¼–码-1103 ä»“房信息数据接口
     */
    public static String SH_2023_API_CODE_1103 = "1103";
    /**
     * æŽ¥å£ç¼–码-1104 å»’间信息数据接口
     */
    public static String SH_2023_API_CODE_1104 = "1104";
    /**
     * æŽ¥å£ç¼–码-1105 è´§ä½ä¿¡æ¯æ•°æ®æŽ¥å£
     */
    public static String SH_2023_API_CODE_1105 = "1105";
    /**
     * æŽ¥å£ç¼–码-1106 æ²¹ç½ä¿¡æ¯æ•°æ®æŽ¥å£
     */
    public static String SH_2023_API_CODE_1106 = "1106";
    /**
     * æŽ¥å£ç¼–码-1107 è®¾å¤‡ä¿¡æ¯æ•°æ®æŽ¥å£
     */
    public static String SH_2023_API_CODE_1107 = "1107";
    /**
     * æŽ¥å£ç¼–码-1108 è¯å‰‚信息数据接口
     */
    public static String SH_2023_API_CODE_1108 = "1108";
    /**
     * æŽ¥å£ç¼–码-1109 æ–‡ä»¶ä¿¡æ¯æ•°æ®æŽ¥å£
     */
    public static String SH_2023_API_CODE_1109 = "1109";
    /**
     * æŽ¥å£ç¼–码-1110 åº“区图仓房点位标注数据接口
     */
    public static String SH_2023_API_CODE_1110 = "1110";
    /**
     * æŽ¥å£ç¼–码-1111 åº“区图视频监控设备点位标注数据接口
     */
    public static String SH_2023_API_CODE_1111 = "1111";
    /**
     * æŽ¥å£ç¼–码-1112 äººå‘˜ä¿¡æ¯æ•°æ®æŽ¥å£
     */
    public static String SH_2023_API_CODE_1112 = "1112";
    /**
     * æŽ¥å£ç¼–码-1113 ä¼ä¸šä¿¡ç”¨ä¿¡æ¯æ•°æ®æŽ¥å£
     */
    public static String SH_2023_API_CODE_1113 = "1113";
    /**
     * æŽ¥å£ç¼–码-1114 è´¢åŠ¡æŠ¥è¡¨æ•°æ®æŽ¥å£
     */
    public static String SH_2023_API_CODE_1114 = "1114";

    /**
     * æŽ¥å£ç¼–码-1201 åˆåŒä¿¡æ¯æ•°æ®æŽ¥å£
     */
    public static String SH_2023_API_CODE_1201 = "1201";
    /**
     * æŽ¥å£ç¼–码-1202 ç²®é£Ÿå…¥åº“信息数据接口
     */
    public static String SH_2023_API_CODE_1202 = "1202";
    /**
     * æŽ¥å£ç¼–码-1203 ç²®é£Ÿå…¥åº“检验信息数据接口
     */
    public static String SH_2023_API_CODE_1203 = "1203";
    /**
     * æŽ¥å£ç¼–码-1204 ç²®é£Ÿå…¥åº“结算信息数据口
     */
    public static String SH_2023_API_CODE_1204 = "1204";
    /**
     * æŽ¥å£ç¼–码-1205 ç²®é£Ÿå‡ºåº“信息数据接口
     */
    public static String SH_2023_API_CODE_1205 = "1205";
    /**
     * æŽ¥å£ç¼–码-1206 ç²®é£Ÿå‡ºåº“结算信息数据接口
     */
    public static String SH_2023_API_CODE_1206 = "1206";
    /**
     * æŽ¥å£ç¼–码-1207 å€’仓倒出数据接口
     */
    public static String SH_2023_API_CODE_1207 = "1207";
    /**
     * æŽ¥å£ç¼–码-1208 ç²®é£Ÿåº“存数据接口
     */
    public static String SH_2023_API_CODE_1208 = "1208";
    /**
     * æŽ¥å£ç¼–码-1209 æŸæº¢å•æ•°æ®æŽ¥å£
     */
    public static String SH_2023_API_CODE_1209 = "1209";
    /**
     * æŽ¥å£ç¼–码-1210 ç²®é£Ÿæ€§è´¨è½¬å˜å•æ•°æ®æŽ¥å£
     */
    public static String SH_2023_API_CODE_1210 = "1210";
    /**
     * æŽ¥å£ç¼–码-1211 è´¦é¢åº“存数据接口
     */
    public static String SH_2023_API_CODE_1211 = "1211";
    /**
     * æŽ¥å£ç¼–码-1212 å®¢æˆ·ä¿¡æ¯æ•°æ®æŽ¥å£
     */
    public static String SH_2023_API_CODE_1212 = "1212";

    /**
     * æŽ¥å£ç¼–码-1301 å®‰å…¨ç®¡ç†æ•°æ®æŽ¥å£
     */
    public static String SH_2023_API_CODE_1301 = "1301";
    /**
     * æŽ¥å£ç¼–码-1302 æ¸©æ¹¿åº¦æ£€æµ‹æ•°æ®æŽ¥å£
     */
    public static String SH_2023_API_CODE_1302 = "1302";
    /**
     * æŽ¥å£ç¼–码-1303 å®³è™«æ£€æµ‹æ•°æ®æŽ¥å£
     */
    public static String SH_2023_API_CODE_1303 = "1303";
    /**
     * æŽ¥å£ç¼–码-1304 æ°”体检测数据接口
     */
    public static String SH_2023_API_CODE_1304 = "1304";
    /**
     * æŽ¥å£ç¼–码-1305 é€šé£Žä½œä¸šæ•°æ®æŽ¥å£
     */
    public static String SH_2023_API_CODE_1305 = "1305";
    /**
     * æŽ¥å£ç¼–码-1306 ç†è’¸ä½œä¸šæ•°æ®æŽ¥å£
     */
    public static String SH_2023_API_CODE_1306 = "1306";
    /**
     * æŽ¥å£ç¼–码-1307 ä»“内视频图像数据接口
     */
    public static String SH_2023_API_CODE_1307 = "1307";
    /**
     * æŽ¥å£ç¼–码-1308 è§†é¢‘监控异常事件告警基本信息数据接口
     */
    public static String SH_2023_API_CODE_1308 = "1308";
    /**
     * æŽ¥å£ç¼–码-1309 è¿è§„预警信息数据接口
     */
    public static String SH_2023_API_CODE_1309 = "1309";
    /**
     * æŽ¥å£ç¼–码-1310 è´¨æ£€æ•°æ®æŽ¥å£
     */
    public static String SH_2023_API_CODE_1310 = "1310";
    /**
     * æŽ¥å£ç¼–码-1311 =视频监控接口
     */
    public static String SH_2023_API_CODE_1311 = "1311";

    /**
     * æŽ¥å£ç¼–码-1401 å‚¨å¤‡è§„模数据接口
     */
    public static String SH_2023_API_CODE_1401 = "1401";
    /**
     * æŽ¥å£ç¼–码-1402 å‚¨å¤‡è®¡åˆ’信息数据接口
     */
    public static String SH_2023_API_CODE_1402 = "1402";
    /**
     * æŽ¥å£ç¼–码-1403 è½®æ¢è®¡åˆ’信息数据接口
     */
    public static String SH_2023_API_CODE_1403 = "1403";
    /**
     * æŽ¥å£ç¼–码-1404 è½®æ¢è®¡åˆ’明细信息数据接口
     */
    public static String SH_2023_API_CODE_1404 = "1404";
    /**
     * æŽ¥å£ç¼–码-1405 é¡¹ç›®ä¿¡æ¯æ•°æ®æŽ¥å£
     */
    public static String SH_2023_API_CODE_1405 = "1405";

    /**
     * æŽ¥å£ç¼–码-2101 æ£€æ–¤å•æ•°æ®æŽ¥å£
     */
    public static String SH_2023_API_CODE_2101 = "2101";
    /**
     * æŽ¥å£ç¼–码-2102 å€’仓倒入数据接口
     */
    public static String SH_2023_API_CODE_2102 = "2102";
    /**
     * æŽ¥å£ç¼–码-2103 ç²®æƒ…设备配置数据接口
     */
    public static String SH_2023_API_CODE_2103 = "2103";
    /**
     * æŽ¥å£ç¼–码-2104 å¸‚储驳运单信息数据接口
     */
    public static String SH_2023_API_CODE_2104 = "2104";
    /**
     * æŽ¥å£ç¼–码-2203 äº¤æ˜“中心合同信心数据接口
     */
    public static String SH_2023_API_CODE_2203 = "2203";
    /**
     * æŽ¥å£ç¼–码-2204 å®šåŒ–水检验
     */
    public static String SH_2023_API_CODE_2204 = "2204";


}

 src/main/java/com/fzzy/push/sh2023/SH2023HttpClientUtil.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,89 @@
package com.fzzy.push.sh2023;

import com.alibaba.fastjson.JSON;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.push.sh2023.dto.SH2023ReqDto;
import com.fzzy.push.sh2023.dto.SH2023RespDto;
import lombok.extern.slf4j.Slf4j;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.HttpURLConnection;
import java.net.URL;

/**
 * ä¸Šæµ·å¸‚平台2023版-上传数据服务类
 * @author czt
 * @date 2023/08/17
 */
@Slf4j
public class SH2023HttpClientUtil {

    /**
     * post formData
     * @param url
     * @return
     * @throws Exception
     */
    @SuppressWarnings("resource")
    public static SH2023RespDto postPushData(String url, SH2023ReqDto reqData , ApiConfs apiConfs) throws Exception {
        log.info("---------接口请求地址：" +url+ "----------参数：" + reqData.toString() +"---------");
        BufferedReader in = null;
        URL urls = new URL(url);
        HttpURLConnection connection = null;
        OutputStream outputStream = null;
        String rs = "";
        SH2023RespDto responseDto;
        try {

            connection = (HttpURLConnection) urls.openConnection();
            connection.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
            connection.setDoOutput(true);
            connection.setDoInput(true);
            connection.setRequestProperty("Accept-Language", "zh-CN,zh;q=0.8");
            connection.setRequestProperty("Accept", "*/*");
            connection.setRequestProperty("Range", "bytes=" + "");
            connection.setConnectTimeout(20000);
            connection.setReadTimeout(30000);
            connection.setRequestMethod("POST");

            outputStream = connection.getOutputStream();
            outputStream.write(reqData.toString().getBytes("UTF-8"));
            try {
                connection.connect();
                if (connection.getResponseCode() == 200) {
                    in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
                    String line = "";
                    while ((line = in.readLine()) != null) {
                        rs += line;
                    }
                }else{
                    log.error("http状态：" + connection.getResponseCode());
                    log.error("http消息：" + connection.getResponseMessage());
                }

            } catch (Exception e) {
                System.out.println("发生异常");
                log.error(e.getMessage(),e);
                rs = null;
                return new SH2023RespDto(99,e.getMessage());
            }
            log.info("---------接口返回：" + rs +"---------");
            responseDto = JSON.parseObject(rs,SH2023RespDto.class);
            if(responseDto == null )   return new SH2023RespDto(99,"接口请求发生未知错误");
            return responseDto;
        } finally {
            try {
                outputStream.close();
                if (in != null){
                    in.close();
                }
            } catch (Exception e) {
            }
            outputStream = null;
            if (connection != null)
                connection.disconnect();
            connection = null;
        }
    }
}

 src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,39 @@
package com.fzzy.push.sh2023;

import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.service.PushService11;
import com.fzzy.push.impl.ComPushService11;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

/**
 * ä¸Šæµ·å¸‚平台2023版-基础数据上传
 *
 * @author czt
 * @date 2023/08/17
 */
@Slf4j
@Component
public class SH2023PushService11 implements PushService11 {


    @Autowired
    private ComPushService11 pushService;

    @Override
    public String getProtocol() {
        return PushProtocol.SB_SH_2023.getCode();
    }

    @Override
    public void pushData(ApiParam param) {
        log.info("------->>>>基础信息 æŽ¥å£æ¨¡å—上报开始");

        //推送单位信息


        log.info("------->>>>基础信息 æŽ¥å£æ¨¡å—上报结束");
    }
}

 src/main/java/com/fzzy/push/sh2023/dto/SH2023ReqDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,48 @@
package com.fzzy.push.sh2023.dto;

import lombok.Data;
import java.io.Serializable;

/**
 * ä¸Šæµ·2023版省平台-推送数据封装
 * @author czt
 * @date 2023/08/17
 */
@Data
public class SH2023ReqDto implements Serializable {

    /**
     * æŠ¥æ–‡æ ‡è¯†id
     */
    private String id;

    /**
     * èº«ä»½id
     */
    private String uid;

    /**
     * æŒ‡ä»¤id
     */
    private String orderid;

    /**
     * èº«ä»½ç­¾å
     */
    private String access_token;

    /**
     * æ•°æ®æ€»æ¡æ•°
     */
    private Integer datalength;

    /**
     * ä¸Šä¼ æ•°æ®(集合形式)
     */
    private String data;

    /**
     * æ•°æ®æ‘˜è¦
     */
    private String digst;
}

 src/main/java/com/fzzy/push/sh2023/dto/SH2023RespDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,30 @@
package com.fzzy.push.sh2023.dto;

import lombok.Data;
import java.io.Serializable;

/**
 * ä¸ŠæŠ¥åé¦ˆ
 * @author czt
 * @date 2023/08/17
 */
@Data
public class SH2023RespDto<T> implements Serializable {
    /**
     *
     */
    private static final long serialVersionUID = -6714158228489303453L;

    private int code ;

    private String result;


    public SH2023RespDto() {
    }

    public SH2023RespDto(int code, String result) {
        this.code = code;
        this.result = result;
    }
}

 src/main/java/com/fzzy/push/sh2023/package-info.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
/**
 * @Desc: ä¸Šæµ·2023版接口
 *
 * @author: czt
 * @update-time: 2023/08/17
 *
 */
package com.fzzy.push.sh2023;

 src/main/java/com/fzzy/push/shyz/package-info.java

ÎļþÒÑɾ³ý

 src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java

@@ -15,7 +15,7 @@
import com.fzzy.api.view.repository.*;
import com.fzzy.push.whhpjl.dto.WhjlReqDto;
import com.fzzy.push.whhpjl.dto.WhjlRespDto;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -92,8 +92,8 @@
            WhjlReqDto reqData = new WhjlReqDto();
            reqData.setId(ContextUtil.getUUID());
            reqData.setUid(conf.getKqdm());
            //TODO æŒ‡ä»¤id待确认
            reqData.setOrderid("");
            //指令ID
            reqData.setOrderid(param.getOrderid());
            reqData.setAppcode(conf.getUserName());
            reqData.setTimestamp(ContextUtil.getCurTimeMillis());
            List<Object> list  = (List<Object>)data;

 src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java

@@ -1,6 +1,5 @@
package com.fzzy.push.whhpjl;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
@@ -10,15 +9,12 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.PushService11;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.*;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**

 src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java

@@ -9,11 +9,10 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.PushService11;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1101;
import com.fzzy.whjl.dto.WhjlApi1204;
import com.fzzy.whjl.dto.WhjlApi1207;
import com.fzzy.whjl.dto.WhjlApi1214;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1204;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1207;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1214;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

 src/main/java/com/fzzy/whjl/package-info.java

ÎļþÒÑɾ³ý

 src/main/java/com/fzzy/whjl/view/pr/package-info.java

ÎļþÒÑɾ³ý

 src/main/java/com/fzzy/whjl/view/repository/package-info.java

ÎļþÒÑɾ³ý

 src/main/resources/templates/home/home-whjl.html

@@ -81,7 +81,7 @@

                        <dl class="layui-nav-child">
                            <dd class="layui-this">
                                <a lay-href="com.fzzy.whjl.view.ApiListWhjl.d">接口列表</a>
                                <a lay-href="com.fzzy.otherview.whhpjl.ApiListWhjl.d">接口列表</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.api.view.ApiConfs.d">接口配置</a>
@@ -109,46 +109,46 @@
                        </a>
                        <dl class="layui-nav-child">
                            <dd>
                                <a lay-href="com.fzzy.whjl.view.WhjlApi1101.d">军粮企业信息</a>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1101.d">军粮企业信息</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.whjl.view.WhjlApi1102.d">军供站点信息</a>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1102.d">军供站点信息</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.whjl.view.WhjlApi1103.d">军粮人员信息</a>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1103.d">军粮人员信息</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.whjl.view.WhjlApi1104.d">放心粮油店</a>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1104.d">放心粮油店</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.whjl.view.WhjlApi1105.d">仓房信息</a>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1105.d">仓房信息</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.whjl.view.WhjlApi1106.d">廒间信息</a>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1106.d">廒间信息</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.whjl.view.WhjlApi1107.d">货位信息</a>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1107.d">货位信息</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.whjl.view.WhjlApi1108.d">仓储设施电子档案</a>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1108.d">仓储设施电子档案</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.whjl.view.WhjlApi1109.d">仓储设施维护记录</a>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1109.d">仓储设施维护记录</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.whjl.view.WhjlApi1110.d">仓储设备报废记录</a>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1110.d">仓储设备报废记录</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.whjl.view.WhjlApi1111.d">仓储设备信息</a>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1111.d">仓储设备信息</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.whjl.view.WhjlApi1112.d">仓储设备维护记录</a>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1112.d">仓储设备维护记录</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.whjl.view.WhjlApi1113.d">仓储设备维修记录</a>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1113.d">仓储设备维修记录</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.whjl.view.WhjlApi1114.d">仓储设备报废记录</a>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1114.d">仓储设备报废记录</a>
                            </dd>
                        </dl>
                    </li>
@@ -163,22 +163,22 @@
                        </a>
                        <dl class="layui-nav-child">
                            <dd>
                                <a lay-href="com.fzzy.whjl.view.WhjlApi1204.d">客户信息</a>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1204.d">客户信息</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.whjl.view.WhjlApi1207.d">合同信息</a>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1207.d">合同信息</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.whjl.view.WhjlApi1208.d">库存台账</a>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1208.d">库存台账</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.whjl.view.WhjlApi1209.d">库存台账产品批次</a>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1209.d">库存台账产品批次</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.whjl.view.WhjlApi1210.d">库存台账出入记录</a>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1210.d">库存台账出入记录</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.whjl.view.WhjlApi1214.d">出入库记录</a>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1214.d">出入库记录</a>
                            </dd>
                        </dl>
                    </li>
@@ -193,13 +193,13 @@
                        </a>
                        <dl class="layui-nav-child">
                            <dd>
                                <a lay-href="com.fzzy.whjl.view.WhjlApi1302.d">质检报告</a>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1302.d">质检报告</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.whjl.view.WhjlApi1303.d">粮情检测记录</a>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1303.d">粮情检测记录</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.whjl.view.WhjlApi1304.d">能耗记录</a>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1304.d">能耗记录</a>
                            </dd>
                        </dl>
                    </li>
@@ -216,16 +216,16 @@
                        </a>
                        <dl class="layui-nav-child">
                            <!--                            <dd>-->
                            <!--                                <a lay-href="com.fzzy.whjl.view.WhjlApi1401.d">库存台账</a>-->
                            <!--                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1401.d">库存台账</a>-->
                            <!--                            </dd>-->
                            <!--                            <dd>-->
                            <!--                                <a lay-href="com.fzzy.whjl.view.WhjlApi1402.d">库存台账产品批次</a>-->
                            <!--                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1402.d">库存台账产品批次</a>-->
                            <!--                            </dd>-->
                            <!--                            <dd>-->
                            <!--                                <a lay-href="com.fzzy.whjl.view.WhjlApi1403.d">库存台账出入记录</a>-->
                            <!--                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1403.d">库存台账出入记录</a>-->
                            <!--                            </dd>-->
                            <!--                            <dd>-->
                            <!--                                <a lay-href="com.fzzy.whjl.view.WhjlApi1406.d">出入库记录</a>-->
                            <!--                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1406.d">出入库记录</a>-->
                            <!--                            </dd>-->
                        </dl>
                    </li>
@@ -262,7 +262,7 @@
                 lay-filter="layadmin-layout-tabs">
                <ul class="layui-tab-title" id="LAY_app_tabsheader">
                    <li lay-id="ApiList"
                        lay-attr="com.fzzy.whjl.view.ApiListWhjl.d" class="layui-this"><i
                        lay-attr="com.fzzy.otherview.whhpjl.ApiListWhjl.d" class="layui-this"><i
                            class="layui-icon layui-icon-home"></i></li>
                </ul>
            </div>
@@ -271,7 +271,7 @@
        <!-- ä¸»ä½“内容 -->
        <div class="layui-body" id="LAY_app_body">
            <div class="layadmin-tabsbody-item layui-show">
                <iframe src="com.fzzy.whjl.view.ApiListWhjl.d" frameborder="0"
                <iframe src="com.fzzy.otherview.whhpjl.ApiListWhjl.d" frameborder="0"
                        class="layadmin-iframe"></iframe>
            </div>
        </div>

 src/main/resources/templates/home/home.html

@@ -50,7 +50,7 @@
                        </dd>
                        <hr>
                        <dd>
                            <a href="#" target="_self" >退出</a>
                            <a href="#" target="_self">退出</a>
                        </dd>
                    </dl>
                </li>
@@ -100,13 +100,13 @@

                    <li data-name="component" class="layui-nav-item">
                        <a class="one" href="javascript:;" lay-tips="" lay-direction="2">
                        <!--                        <i class="layui-icon layui-icon-component"></i>-->
                        <div class="g-icon">
                            <img th:src="@{/static/lib/layuiadmin/style/images/icon2.png}">
                        </div>
                        <cite>基础信息</cite>
                        <span class="layui-nav-more"></span>
                    </a>
                            <!--                        <i class="layui-icon layui-icon-component"></i>-->
                            <div class="g-icon">
                                <img th:src="@{/static/lib/layuiadmin/style/images/icon2.png}">
                            </div>
                            <cite>基础信息</cite>
                            <span class="layui-nav-more"></span>
                        </a>
                        <dl class="layui-nav-child">
                            <dd>
                                <a lay-href="com.fzzy.api.view.Api1101.d">单位信息</a>
@@ -147,13 +147,21 @@
                            <dd>
                                <a lay-href="com.fzzy.api.view.Api1113.d">企业信用信息</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.api.view.Api1114-1.d">财务报表-资产负债</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.api.view.Api114-2.d">财务报表-现金流量信息</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.api.view.Api1114-3.d">财务报表-利润信息</a>
                            </dd>
                        </dl>
                    </li>

                    <li data-name="template" class="layui-nav-item"><a class="one"
                                                                       href="javascript:;" lay-tips=""
                                                                       lay-direction="2">
                        <!--                        <i class="layui-icon layui-icon-template"></i>-->
                        <div class="g-icon">
                            <img th:src="@{/static/lib/layuiadmin/style/images/icon1.png}">
                        </div>
@@ -202,13 +210,13 @@

                    <li data-name="template" class="layui-nav-item">
                        <a class="one" href="javascript:;" lay-tips="" lay-direction="2">
                        <!-- <i class="layui-icon layui-icon-template"></i>-->
                        <div class="g-icon">
                            <img th:src="@{/static/lib/layuiadmin/style/images/icon4.png}">
                        </div>
                        <cite>粮食管理</cite>
                        <span class="layui-nav-more"></span>
                    </a>
                            <!-- <i class="layui-icon layui-icon-template"></i>-->
                            <div class="g-icon">
                                <img th:src="@{/static/lib/layuiadmin/style/images/icon4.png}">
                            </div>
                            <cite>粮食管理</cite>
                            <span class="layui-nav-more"></span>
                        </a>
                        <dl class="layui-nav-child">
                            <dd>
                                <a lay-href="com.fzzy.api.view.Api1301.d">安全管理</a>
@@ -275,22 +283,15 @@

                    <li data-name="template" class="layui-nav-item">
                        <a class="one" href="javascript:;" lay-tips="" lay-direction="2">
                            <!-- <i class="layui-icon layui-icon-template"></i>-->
                            <div class="g-icon">
                                <img th:src="@{/static/lib/layuiadmin/style/images/icon3.png}">
                            </div>
                            <cite>财务管理</cite>
                            <cite>其他接口</cite>
                            <span class="layui-nav-more"></span>
                        </a>
                        <dl class="layui-nav-child">
                            <dd>
                                <a lay-href="com.fzzy.api.view.Api1501.d">资产负债信息</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.api.view.Api1502.d">现金流量信息</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.api.view.Api1503.d">利润信息</a>
                                <a lay-href="com.fzzy.otherview.gd2022.xzba1023.d">广东-熏蒸备案</a>
                            </dd>
                        </dl>
                    </li>