优化武汉接口

CZT

2023-10-27 dc66963d36e0a479e7334092241834b60bf8bbe2

优化武汉接口

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

@@ -281,12 +281,12 @@
          <Property name="property">cfzt</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="cfsyzt">
          <Property name="property">cfsyzt</Property>
        <DataColumn name="czbz">
          <Property name="property">czbz</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="sfyx">
          <Property name="property">sfyx</Property>
        <DataColumn name="updateTime">
          <Property name="property">updateTime</Property>
          <Property name="align">center</Property>
        </DataColumn>
      </DataGrid>

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

@@ -217,22 +217,6 @@
          <Property name="property">ygbh</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="jlqybh">
          <Property name="property">jlqybh</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="jlqymc">
          <Property name="property">jlqymc</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="jgzdbh">
          <Property name="property">jgzdbh</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="jgzdmc">
          <Property name="property">jgzdmc</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ygmc">
          <Property name="property">ygmc</Property>
          <Property name="align">center</Property>
@@ -261,12 +245,12 @@
          <Property name="property">ygzt</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ygsyzt">
          <Property name="property">ygsyzt</Property>
        <DataColumn name="czbz">
          <Property name="property">czbz</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="sfyx">
          <Property name="property">sfyx</Property>
        <DataColumn name="updateTime">
          <Property name="property">updateTime</Property>
          <Property name="align">center</Property>
        </DataColumn>
      </DataGrid>

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

@@ -257,12 +257,12 @@
          <Property name="property">ajzt</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ajsyzt">
          <Property name="property">ajsyzt</Property>
        <DataColumn name="czbz">
          <Property name="property">czbz</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="sfyx">
          <Property name="property">sfyx</Property>
        <DataColumn name="updateTime">
          <Property name="property">updateTime</Property>
          <Property name="align">center</Property>
        </DataColumn>
      </DataGrid>

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

@@ -237,12 +237,12 @@
          <Property name="property">clfs</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="hwrl">
          <Property name="property">hwrl</Property>
        <DataColumn name="czbz">
          <Property name="property">czbz</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="sfyx">
          <Property name="property">sfyx</Property>
        <DataColumn name="updateTime">
          <Property name="property">updateTime</Property>
          <Property name="align">center</Property>
        </DataColumn>
      </DataGrid>

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

@@ -206,23 +206,25 @@
    public static String API_CODE_FXLYD = "FXLYD";
    //接口编码-1105 仓房信息 --路径(CFXX)
    public static String API_CODE_CFXX = "CFXX";
    //接口编码-1106 廒间信息 --路径(AJXX)
    //接口编码-1106 仓房信息 --路径(YGXX)
    public static String API_CODE_YGXX = "YGXX";
    //接口编码-1107 廒间信息 --路径(AJXX)
    public static String API_CODE_AJXX = "AJXX";
    //接口编码-1107 货位信息 --路径(HWXX)
    //接口编码-1108 货位信息 --路径(HWXX)
    public static String API_CODE_HWXX = "HWXX";
    //接口编码-1108 仓储设施电子档案 --路径(CCSSDZDA)
    //接口编码-1109 仓储设施电子档案 --路径(CCSSDZDA)
    public static String API_CODE_CCSSDZDA = "CCSSDZDA";
    //接口编码-1109 仓储设施维护记录 --路径(CCSSWHJL)
    //接口编码-1110 仓储设施维护记录 --路径(CCSSWHJL)
    public static String API_CODE_CCSSWHJL = "CCSSWHJL";
    //接口编码-1110 仓储设备报废记录 --路径(CCSBBFJL)
    //接口编码-1111 仓储设备报废记录 --路径(CCSBBFJL)
    public static String API_CODE_CCSSBFJL = "CCSSBFJL";
    //接口编码-1111 仓储设备信息 --路径(CCSBXX)
    //接口编码-11112 仓储设备信息 --路径(CCSBXX)
    public static String API_CODE_CCSBXX = "CCSBXX";
    //接口编码-1112 仓储设备维护记录 --路径(CCSBWHJL)
    //接口编码-1113 仓储设备维护记录 --路径(CCSBWHJL)
    public static String API_CODE_CCSBWHJL = "CCSBWHJL";
    //接口编码-1113 仓储设备维修记录 --路径(CCSBWXJL)
    //接口编码-1114 仓储设备维修记录 --路径(CCSBWXJL)
    public static String API_CODE_CCSBWXJL = "CCSBWXJL";
    //接口编码-1114 仓储设备报废记录 --路径(CCSBBFJL)
    //接口编码-1115 仓储设备报废记录 --路径(CCSBBFJL)
    public static String API_CODE_CCSBBFJL = "CCSBBFJL";
    //接口编码-1201 副食供应商信息 --路径(FSGYSXX)
    public static String API_CODE_FSGYSXX = "FSGYSXX";

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

@@ -46,7 +46,7 @@
     */
    @DataProvider
    public List<WhjlApi1107> listData() {
        List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1106);
        List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1107);
        if (null == result || result.isEmpty()) {
            return null;
        }
@@ -76,7 +76,7 @@
        infoData.setId(data.getBizId());
        infoData.setKqdm(data.getKqdm());
        infoData.setInteType(WhjlConstant.API_CATEGORY_11);
        infoData.setInteId(WhjlConstant.API_CODE_1106);
        infoData.setInteId(WhjlConstant.API_CODE_1107);
        infoData.setUpdateTime(new Date());
        infoData.setDataId(data.getBizId());
        infoData.setData(JSON.toJSONString(data));
@@ -119,7 +119,7 @@
        }

        //封装参数
        ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1106);
        ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1107);

        //获取实现接口
        ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -135,10 +135,10 @@
                if (Constant.CZBZ_I.equals(data.getCzbz())) {

                    infoData = new ApiInfoData();
                    infoData.setId(data.getBizId());
                    infoData.setId(data.getAjbh());
                    infoData.setKqdm(data.getKqdm());
                    infoData.setInteType(WhjlConstant.API_CATEGORY_11);
                    infoData.setInteId(WhjlConstant.API_CODE_1106);
                    infoData.setInteId(WhjlConstant.API_CODE_1107);
                    infoData.setUpdateTime(new Date());
                    infoData.setDataId(data.getBizId());


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

@@ -47,7 +47,7 @@
     */
    @DataProvider
    public List<WhjlApi1108> listData() {
        List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1107);
        List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1108);
        if (null == result || result.isEmpty()) {
            return null;
        }
@@ -77,7 +77,7 @@
        infoData.setId(data.getBizId());
        infoData.setKqdm(data.getKqdm());
        infoData.setInteType(WhjlConstant.API_CATEGORY_11);
        infoData.setInteId(WhjlConstant.API_CODE_1107);
        infoData.setInteId(WhjlConstant.API_CODE_1108);
        infoData.setUpdateTime(new Date());
        infoData.setDataId(data.getBizId());
        infoData.setData(JSON.toJSONString(data));
@@ -120,7 +120,7 @@
        }

        //封装参数
        ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1107);
        ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1108);

        //获取实现接口
        ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -143,7 +143,7 @@
                    infoData.setId(data.getBizId());
                    infoData.setKqdm(data.getKqdm());
                    infoData.setInteType(WhjlConstant.API_CATEGORY_11);
                    infoData.setInteId(WhjlConstant.API_CODE_1107);
                    infoData.setInteId(WhjlConstant.API_CODE_1108);
                    infoData.setUpdateTime(new Date());
                    infoData.setDataId(data.getBizId());


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

@@ -47,7 +47,7 @@
     */
    @DataProvider
    public List<WhjlApi1112> listData() {
        List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1111);
        List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1112);
        if (null == result || result.isEmpty()) {
            return null;
        }
@@ -77,7 +77,7 @@
        infoData.setId(data.getBizId());
        infoData.setKqdm(data.getKqdm());
        infoData.setInteType(WhjlConstant.API_CATEGORY_11);
        infoData.setInteId(WhjlConstant.API_CODE_1111);
        infoData.setInteId(WhjlConstant.API_CODE_1112);
        infoData.setUpdateTime(new Date());
        infoData.setDataId(data.getBizId());
        infoData.setData(JSON.toJSONString(data));
@@ -120,7 +120,7 @@
        }

        //封装参数
        ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1111);
        ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1112);

        //获取实现接口
        ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -139,7 +139,7 @@
                    infoData.setId(data.getBizId());
                    infoData.setKqdm(data.getKqdm());
                    infoData.setInteType(WhjlConstant.API_CATEGORY_11);
                    infoData.setInteId(WhjlConstant.API_CODE_1111);
                    infoData.setInteId(WhjlConstant.API_CODE_1112);
                    infoData.setUpdateTime(new Date());
                    infoData.setDataId(data.getBizId());


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

@@ -159,22 +159,24 @@
            case "1105":
                return WhjlConstant.API_CODE_CFXX;
            case "1106":
                return WhjlConstant.API_CODE_AJXX;
                return WhjlConstant.API_CODE_YGXX;
            case "1107":
                return WhjlConstant.API_CODE_HWXX;
                return WhjlConstant.API_CODE_AJXX;
            case "1108":
                return WhjlConstant.API_CODE_CCSSDZDA;
                return WhjlConstant.API_CODE_HWXX;
            case "1109":
                return WhjlConstant.API_CODE_CCSSWHJL;
                return WhjlConstant.API_CODE_CCSSDZDA;
            case "1110":
                return WhjlConstant.API_CODE_CCSSBFJL;
                return WhjlConstant.API_CODE_CCSSWHJL;
            case "1111":
                return WhjlConstant.API_CODE_CCSBXX;
                return WhjlConstant.API_CODE_CCSSBFJL;
            case "1112":
                return WhjlConstant.API_CODE_CCSBWHJL;
                return WhjlConstant.API_CODE_CCSBXX;
            case "1113":
                return WhjlConstant.API_CODE_CCSBWXJL;
                return WhjlConstant.API_CODE_CCSBWHJL;
            case "1114":
                return WhjlConstant.API_CODE_CCSBWXJL;
            case "11145":
                return WhjlConstant.API_CODE_CCSBBFJL;
            case "1201":
                return WhjlConstant.API_CODE_FSGYSXX;

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

@@ -51,9 +51,9 @@
        // 推送仓房信息
        this.pushData1105(apiRemoteService, param);
        // 推送廒间信息
        this.pushData1106(apiRemoteService, param);
        // 推送货位信息
        this.pushData1107(apiRemoteService, param);
        // 推送货位信息
        this.pushData1108(apiRemoteService, param);
        // 推送仓储设备信息
        this.pushData1111(apiRemoteService, param);

@@ -215,16 +215,16 @@
    /**
     * 1106 廒间信息
     */
    private void pushData1106(ApiRemoteService apiRemoteService, ApiParam param) {
    private void pushData1107(ApiRemoteService apiRemoteService, ApiParam param) {

        //获取军工企业信息
        List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1106);
        List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1107);

        if (null == items || items.isEmpty()) {
            return;
        }
        param.setInteCategory(WhjlConstant.API_CATEGORY_11);
        param.setInteId(WhjlConstant.API_CODE_1106);
        param.setInteId(WhjlConstant.API_CODE_1107);
        List<WhjlApi1107> list = new ArrayList<>();
        WhjlApi1107 whjlApi1106;
        for (ApiInfoData infoData : items) {
@@ -253,16 +253,16 @@
    /**
     * 1107 货位信息
     */
    private void pushData1107(ApiRemoteService apiRemoteService, ApiParam param) {
    private void pushData1108(ApiRemoteService apiRemoteService, ApiParam param) {

        //获取军工企业信息
        List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1107);
        List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1108);

        if (null == items || items.isEmpty()) {
            return;
        }
        param.setInteCategory(WhjlConstant.API_CATEGORY_11);
        param.setInteId(WhjlConstant.API_CODE_1107);
        param.setInteId(WhjlConstant.API_CODE_1108);
        List<WhjlApi1108> list = new ArrayList<>();
        WhjlApi1108 whjlApi1107;
        for (ApiInfoData infoData : items) {