页面修改

YYC

2023-09-11 9ad231b419cfb6c07385d06eb68961126651af2f

页面修改

 src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java

@@ -80,8 +80,6 @@
        //熏蒸作业信息同步
        fzzySync1306.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());

        fzzySync1023.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());

    }

}

 src/main/java/com/fzzy/otherview/sh2023/ShApi2101.view.xml

@@ -182,34 +182,6 @@
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="value">黄浦区</Property>
                <Property name="key">huangpu</Property>
              </Entity>
              <Entity>
                <Property name="value">徐汇区</Property>
                <Property name="key">xuhui</Property>
              </Entity>
              <Entity>
                <Property name="value">长宁区</Property>
                <Property name="key">changning</Property>
              </Entity>
              <Entity>
                <Property name="value">静安区</Property>
                <Property name="key">jingan</Property>
              </Entity>
              <Entity>
                <Property name="value">普陀区</Property>
                <Property name="key">putuo</Property>
              </Entity>
              <Entity>
                <Property name="value">虹口区</Property>
                <Property name="key">hongkou</Property>
              </Entity>
              <Entity>
                <Property name="value">杨浦区</Property>
                <Property name="key">yangpu</Property>
              </Entity>
              <Entity>
                <Property name="value">闵行区</Property>
                <Property name="key">minhang</Property>
              </Entity>

 src/main/java/com/fzzy/otherview/sh2023/ShApi2102.view.xml

@@ -69,34 +69,6 @@
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="value">黄浦区</Property>
                <Property name="key">huangpu</Property>
              </Entity>
              <Entity>
                <Property name="value">徐汇区</Property>
                <Property name="key">xuhui</Property>
              </Entity>
              <Entity>
                <Property name="value">长宁区</Property>
                <Property name="key">changning</Property>
              </Entity>
              <Entity>
                <Property name="value">静安区</Property>
                <Property name="key">jingan</Property>
              </Entity>
              <Entity>
                <Property name="value">普陀区</Property>
                <Property name="key">putuo</Property>
              </Entity>
              <Entity>
                <Property name="value">虹口区</Property>
                <Property name="key">hongkou</Property>
              </Entity>
              <Entity>
                <Property name="value">杨浦区</Property>
                <Property name="key">yangpu</Property>
              </Entity>
              <Entity>
                <Property name="value">闵行区</Property>
                <Property name="key">minhang</Property>
              </Entity>

 src/main/java/com/fzzy/otherview/sh2023/ShApi2103.view.xml

@@ -82,34 +82,6 @@
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="value">黄浦区</Property>
                <Property name="key">huangpu</Property>
              </Entity>
              <Entity>
                <Property name="value">徐汇区</Property>
                <Property name="key">xuhui</Property>
              </Entity>
              <Entity>
                <Property name="value">长宁区</Property>
                <Property name="key">changning</Property>
              </Entity>
              <Entity>
                <Property name="value">静安区</Property>
                <Property name="key">jingan</Property>
              </Entity>
              <Entity>
                <Property name="value">普陀区</Property>
                <Property name="key">putuo</Property>
              </Entity>
              <Entity>
                <Property name="value">虹口区</Property>
                <Property name="key">hongkou</Property>
              </Entity>
              <Entity>
                <Property name="value">杨浦区</Property>
                <Property name="key">yangpu</Property>
              </Entity>
              <Entity>
                <Property name="value">闵行区</Property>
                <Property name="key">minhang</Property>
              </Entity>
@@ -186,27 +158,27 @@
    <DataType name="dtItem">
      <Property name="creationType">com.fzzy.push.sh2023.dto.SH2023Api2103Item</Property>
      <PropertyDef name="qh">
        <Property/>
        <Property></Property>
        <Property name="label">圈号</Property>
      </PropertyDef>
      <PropertyDef name="qsdlbh">
        <Property/>
        <Property></Property>
        <Property name="label">起始电缆编号</Property>
      </PropertyDef>
      <PropertyDef name="jsdlbh">
        <Property/>
        <Property></Property>
        <Property name="label">结束电缆编号</Property>
      </PropertyDef>
      <PropertyDef name="cs">
        <Property/>
        <Property></Property>
        <Property name="label">各圈总层数</Property>
      </PropertyDef>
      <PropertyDef name="ybj">
        <Property/>
        <Property></Property>
        <Property name="label">圈半径</Property>
      </PropertyDef>
      <PropertyDef name="rowId">
        <Property/>
        <Property></Property>
        <Property name="label">序号</Property>
      </PropertyDef>
    </DataType>

 src/main/java/com/fzzy/otherview/sh2023/ShApi2104.view.xml

@@ -6,11 +6,11 @@
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.push.sh2023.dto.SH2023Api2104</Property>
      <PropertyDef name="bydh">
        <Property/>
        <Property></Property>
        <Property name="label">驳运单号</Property>
      </PropertyDef>
      <PropertyDef name="kqdm">
        <Property/>
        <Property></Property>
        <Property name="label">库区代码</Property>
      </PropertyDef>
      <PropertyDef name="jzrq">
@@ -18,23 +18,23 @@
        <Property name="label">记账日期</Property>
      </PropertyDef>
      <PropertyDef name="khmc">
        <Property/>
        <Property></Property>
        <Property name="label">客户编号</Property>
      </PropertyDef>
      <PropertyDef name="psplan">
        <Property/>
        <Property></Property>
        <Property name="label">来粮预报号/提货单号</Property>
      </PropertyDef>
      <PropertyDef name="hth">
        <Property/>
        <Property></Property>
        <Property name="label">合同号</Property>
      </PropertyDef>
      <PropertyDef name="cch">
        <Property/>
        <Property></Property>
        <Property name="label">车船号</Property>
      </PropertyDef>
      <PropertyDef name="lspzdm">
        <Property/>
        <Property></Property>
        <Property name="label">品种大类</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;LSPZ&quot;)}</Property>
@@ -43,7 +43,7 @@
        </Property>
      </PropertyDef>
      <PropertyDef name="lsxzdm">
        <Property/>
        <Property></Property>
        <Property name="label">粮食性质代码</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;LSXZ&quot;)}</Property>
@@ -52,7 +52,7 @@
        </Property>
      </PropertyDef>
      <PropertyDef name="lldm">
        <Property/>
        <Property></Property>
        <Property name="label">来粮代码</Property>
      </PropertyDef>
      <PropertyDef name="jz">
@@ -60,7 +60,7 @@
        <Property name="label">净重</Property>
      </PropertyDef>
      <PropertyDef name="czbz">
        <Property/>
        <Property></Property>
        <Property name="label">数据状态</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;CZBZ&quot;)}</Property>
@@ -73,7 +73,7 @@
        <Property name="label">最后更新时间</Property>
      </PropertyDef>
      <PropertyDef name="pch">
        <Property/>
        <Property></Property>
        <Property name="label">批次号</Property>
      </PropertyDef>
      <PropertyDef name="bjw">
@@ -84,34 +84,6 @@
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="value">黄浦区</Property>
                <Property name="key">huangpu</Property>
              </Entity>
              <Entity>
                <Property name="value">徐汇区</Property>
                <Property name="key">xuhui</Property>
              </Entity>
              <Entity>
                <Property name="value">长宁区</Property>
                <Property name="key">changning</Property>
              </Entity>
              <Entity>
                <Property name="value">静安区</Property>
                <Property name="key">jingan</Property>
              </Entity>
              <Entity>
                <Property name="value">普陀区</Property>
                <Property name="key">putuo</Property>
              </Entity>
              <Entity>
                <Property name="value">虹口区</Property>
                <Property name="key">hongkou</Property>
              </Entity>
              <Entity>
                <Property name="value">杨浦区</Property>
                <Property name="key">yangpu</Property>
              </Entity>
              <Entity>
                <Property name="value">闵行区</Property>
                <Property name="key">minhang</Property>
@@ -363,7 +335,7 @@
    </ToolBar>
    <Dialog id="dialogMain">
      <Property name="width">80%</Property>
      <Property name="caption">到仓信息</Property>
      <Property name="caption">市储驳运单信息</Property>
      <Property name="iconClass">fa fa-sliders</Property>
      <Property name="closeable">false</Property>
      <Buttons>

 src/main/java/com/fzzy/otherview/sh2023/ShApi2203.view.xml

@@ -6,11 +6,11 @@
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.push.sh2023.dto.SH2023Api2203</Property>
      <PropertyDef name="htbh">
        <Property/>
        <Property></Property>
        <Property name="label">合同号</Property>
      </PropertyDef>
      <PropertyDef name="bdh">
        <Property/>
        <Property></Property>
        <Property name="label">标的号</Property>
      </PropertyDef>
      <PropertyDef name="cjrq">
@@ -18,7 +18,7 @@
        <Property name="label">成交日期</Property>
      </PropertyDef>
      <PropertyDef name="jyzt">
        <Property/>
        <Property></Property>
        <Property name="label">交易状态</Property>
        <Property name="mapping">
          <Property name="keyProperty">key</Property>
@@ -26,8 +26,8 @@
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key"/>
                <Property name="value"/>
                <Property name="key"></Property>
                <Property name="value"></Property>
              </Entity>
              <Entity>
                <Property name="key">00</Property>
@@ -82,7 +82,7 @@
        </Property>
      </PropertyDef>
      <PropertyDef name="lsxz">
        <Property/>
        <Property></Property>
        <Property name="label">粮食性质</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;LSXZ&quot;)}</Property>
@@ -91,11 +91,11 @@
        </Property>
      </PropertyDef>
      <PropertyDef name="lspzdl">
        <Property/>
        <Property></Property>
        <Property name="label">粮食品种大类</Property>
      </PropertyDef>
      <PropertyDef name="lspzmx">
        <Property/>
        <Property></Property>
        <Property name="label">粮食品种明细</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;LSPZ&quot;)}</Property>
@@ -104,19 +104,19 @@
        </Property>
      </PropertyDef>
      <PropertyDef name="scnf">
        <Property/>
        <Property></Property>
        <Property name="label">生产年份</Property>
      </PropertyDef>
      <PropertyDef name="kd">
        <Property/>
        <Property></Property>
        <Property name="label">库点</Property>
      </PropertyDef>
      <PropertyDef name="bmfqc">
        <Property/>
        <Property></Property>
        <Property name="label">买方全称</Property>
      </PropertyDef>
      <PropertyDef name="smfqc">
        <Property/>
        <Property></Property>
        <Property name="label">卖方全称</Property>
      </PropertyDef>
      <PropertyDef name="cjsl">
@@ -150,13 +150,13 @@
        <Property name="displayFormat">#0.00元</Property>
      </PropertyDef>
      <PropertyDef name="smfsxf">
        <Property/>
        <Property></Property>
        <Property name="label">卖方手续费</Property>
        <Property name="dataType">Double</Property>
        <Property name="displayFormat">#0.00元</Property>
      </PropertyDef>
      <PropertyDef name="lx">
        <Property/>
        <Property></Property>
        <Property name="label">采购/销售类型</Property>
        <Property name="mapping">
          <Property name="keyProperty">key</Property>
@@ -176,7 +176,7 @@
        </Property>
      </PropertyDef>
      <PropertyDef name="bmfxzqh">
        <Property/>
        <Property></Property>
        <Property name="label">买方行政区划</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;gbAreaPR#listAll&quot;).getResult()}</Property>
@@ -185,7 +185,7 @@
        </Property>
      </PropertyDef>
      <PropertyDef name="smfxzqh">
        <Property/>
        <Property></Property>
        <Property name="label">卖方行政区划</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;gbAreaPR#listAll&quot;).getResult()}</Property>
@@ -194,11 +194,11 @@
        </Property>
      </PropertyDef>
      <PropertyDef name="hwmc">
        <Property/>
        <Property></Property>
        <Property name="label">货位名称</Property>
      </PropertyDef>
      <PropertyDef name="jyxzqh">
        <Property/>
        <Property></Property>
        <Property name="label">交易行政区划</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;gbAreaPR#listAll&quot;).getResult()}</Property>
@@ -207,7 +207,7 @@
        </Property>
      </PropertyDef>
      <PropertyDef name="czbz">
        <Property/>
        <Property></Property>
        <Property name="label">操作标志</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;CZBZ&quot;)}</Property>
@@ -447,7 +447,7 @@
    </ToolBar>
    <Dialog id="dialogMain">
      <Property name="width">80%</Property>
      <Property name="caption">到仓信息</Property>
      <Property name="caption">交易中心合同</Property>
      <Property name="iconClass">fa fa-sliders</Property>
      <Property name="closeable">false</Property>
      <Buttons>

 src/main/java/com/fzzy/otherview/sh2023/ShApi2204.view.xml

@@ -6,15 +6,15 @@
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.push.sh2023.dto.SH2023Api2204</Property>
      <PropertyDef name="zjbgdh">
        <Property/>
        <Property></Property>
        <Property name="label">质检报告单号</Property>
      </PropertyDef>
      <PropertyDef name="hwdm">
        <Property/>
        <Property></Property>
        <Property name="label">货位代码</Property>
      </PropertyDef>
      <PropertyDef name="lsxzdm">
        <Property/>
        <Property></Property>
        <Property name="label">粮食性质代码</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;LSXZ&quot;)}</Property>
@@ -23,7 +23,7 @@
        </Property>
      </PropertyDef>
      <PropertyDef name="lspzdm">
        <Property/>
        <Property></Property>
        <Property name="label">粮食品种代码</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;LSPZ&quot;)}</Property>
@@ -32,7 +32,7 @@
        </Property>
      </PropertyDef>
      <PropertyDef name="lsdjdm">
        <Property/>
        <Property></Property>
        <Property name="label">粮食等级代码</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;LSDJ&quot;)}</Property>
@@ -45,11 +45,11 @@
        <Property name="label">检验时间</Property>
      </PropertyDef>
      <PropertyDef name="jyr">
        <Property/>
        <Property></Property>
        <Property name="label">检验人</Property>
      </PropertyDef>
      <PropertyDef name="jyyj">
        <Property/>
        <Property></Property>
        <Property name="label">检验依据</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;JYYJ&quot;)}</Property>
@@ -72,15 +72,15 @@
        <Property name="label">扦样时间</Property>
      </PropertyDef>
      <PropertyDef name="lldm">
        <Property/>
        <Property></Property>
        <Property name="label">来粮代码</Property>
      </PropertyDef>
      <PropertyDef name="bz">
        <Property/>
        <Property></Property>
        <Property name="label">备注</Property>
      </PropertyDef>
      <PropertyDef name="czbz">
        <Property/>
        <Property></Property>
        <Property name="label">操作标志</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;CZBZ&quot;)}</Property>
@@ -100,34 +100,6 @@
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="value">黄浦区</Property>
                <Property name="key">huangpu</Property>
              </Entity>
              <Entity>
                <Property name="value">徐汇区</Property>
                <Property name="key">xuhui</Property>
              </Entity>
              <Entity>
                <Property name="value">长宁区</Property>
                <Property name="key">changning</Property>
              </Entity>
              <Entity>
                <Property name="value">静安区</Property>
                <Property name="key">jingan</Property>
              </Entity>
              <Entity>
                <Property name="value">普陀区</Property>
                <Property name="key">putuo</Property>
              </Entity>
              <Entity>
                <Property name="value">虹口区</Property>
                <Property name="key">hongkou</Property>
              </Entity>
              <Entity>
                <Property name="value">杨浦区</Property>
                <Property name="key">yangpu</Property>
              </Entity>
              <Entity>
                <Property name="value">闵行区</Property>
                <Property name="key">minhang</Property>
@@ -169,7 +141,7 @@
        </Property>
      </PropertyDef>
      <PropertyDef name="pch">
        <Property/>
        <Property></Property>
        <Property name="label">批次号</Property>
      </PropertyDef>
    </DataType>
@@ -398,7 +370,7 @@
    </ToolBar>
    <Dialog id="dialogMain">
      <Property name="width">80%</Property>
      <Property name="caption">到仓信息</Property>
      <Property name="caption">定化水检验</Property>
      <Property name="iconClass">fa fa-sliders</Property>
      <Property name="closeable">false</Property>
      <Buttons>

 src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2101PR.java

@@ -17,8 +17,10 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.otherview.gd2022.dto.GdApi1023;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1101;
import com.fzzy.push.gd2022.ApiCodeConstant;
import com.fzzy.push.sh2023.SH2023Constant;
import com.fzzy.push.sh2023.dto.SH2023Api2101;
import org.apache.commons.lang.StringUtils;
@@ -118,15 +120,22 @@
        if (null == data.getPch() || data.getPch() == "") {
            data.setPch(data.getHwdm() + DateFormatUtils.format(data.getJjrq(), "yyyy"));
        }
        ApiInfoData infoData = new ApiInfoData();
        infoData.setId(data.getJjdh());
        infoData.setKqdm(data.getKqdm());
        infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2101);
        infoData.setUpdateTime(new Date());
        infoData.setDataId(data.getJjdh());
        infoData.setData(JSON.toJSONString(data));
        infoData.setCzbz(data.getCzbz());
        infoData.setRemarks("备注信息");
        ApiInfoData infoData;
        List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getJjdh());
        if (apiInfoList.size() != 0) {
            infoData = apiInfoList.get(0);
            infoData.setData(JSON.toJSONString(data));
        } else {
            infoData = new ApiInfoData();
            infoData.setId(ContextUtil.getUUID());
            infoData.setKqdm(data.getKqdm());
            infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2101);
            infoData.setUpdateTime(new Date());
            infoData.setDataId(data.getJjdh());
            infoData.setData(JSON.toJSONString(data));
            infoData.setCzbz(data.getCzbz());
            infoData.setRemarks("备注信息");
        }

        apiInfoDataRep.save(infoData);
    }
@@ -136,19 +145,21 @@
     */
    @Expose
    public void delData(SH2023Api2101 data) {
        apiInfoDataRep.deleteById(data.getJjdh());
        List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getJjdh());
        apiInfoDataRep.deleteById(apiInfoList.get(0).getId());
    }

    /**
     * sHApi2101PR#delUpdate
     */
    @Expose
    public String delUpdate(SH2023Api2101 entity) {
        if (null == entity) {
    public String delUpdate(SH2023Api2101 data) {
        if (null == data) {
            return "无数据执行";
        }
        entity.setCzbz(Constant.CZBZ_D);
        apiInfoDataRep.updateStatus(entity.getJjdh(), JSON.toJSONString(entity), Constant.CZBZ_D);
        List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getJjdh());
        data.setCzbz(Constant.CZBZ_D);
        apiInfoDataRep.updateStatus(apiInfoList.get(0).getId(), JSON.toJSONString(data), Constant.CZBZ_D);
        return null;
    }

@@ -177,23 +188,16 @@
        responseDto = apiService.pushData(param, apiConf, items);
        if (responseDto.getSuccess() == 0) {
            //推送成功，更新数据上传状态

            ApiInfoData infoData;
            for (SH2023Api2101 data : items) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {

                    infoData = new ApiInfoData();
                    infoData.setId(data.getJjdh());
                    infoData.setKqdm(data.getKqdm());
                    infoData.setInteType("21");
                    infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2101);
                    infoData.setUpdateTime(new Date());
                    infoData.setDataId(data.getJjdh());

                    //推送成功，更新数据上传状态
                    List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getJjdh());
                    data.setCzbz(Constant.CZBZ_U);
                    infoData = apiInfoList.get(0);
                    infoData.setUpdateTime(new Date());
                    infoData.setCzbz(Constant.CZBZ_U);
                    infoData.setData(JSON.toJSONString(data));

                    apiInfoDataRep.save(infoData);
                }
            }

 src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2104PR.java

@@ -111,17 +111,22 @@
     */
    @DataResolver
    public void saveData(SH2023Api2104 data) {

        ApiInfoData infoData = new ApiInfoData();
        infoData.setId(data.getBydh());
        infoData.setKqdm(data.getKqdm());
        infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2104);
        infoData.setUpdateTime(new Date());
        infoData.setDataId(data.getBydh());
        infoData.setData(JSON.toJSONString(data));
        infoData.setCzbz(data.getCzbz());
        infoData.setRemarks("备注信息");

        ApiInfoData infoData;
        List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getBydh());
        if (apiInfoList.size() != 0) {
            infoData = apiInfoList.get(0);
            infoData.setData(JSON.toJSONString(data));
        } else {
            infoData = new ApiInfoData();
            infoData.setId(ContextUtil.getUUID());
            infoData.setKqdm(data.getKqdm());
            infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2104);
            infoData.setUpdateTime(new Date());
            infoData.setDataId(data.getBydh());
            infoData.setData(JSON.toJSONString(data));
            infoData.setCzbz(data.getCzbz());
            infoData.setRemarks("备注信息");
        }
        apiInfoDataRep.save(infoData);
    }

@@ -130,19 +135,21 @@
     */
    @Expose
    public void delData(SH2023Api2104 data) {
        apiInfoDataRep.deleteById(data.getBydh());
        List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, data.getBydh());
        apiInfoDataRep.deleteById(apiInfoList.get(0).getId());
    }

    /**
     * sHApi2104PR#delUpdate
     */
    @Expose
    public String delUpdate(SH2023Api2104 entity) {
        if (null == entity) {
    public String delUpdate(SH2023Api2104 data) {
        if (null == data) {
            return "无数据执行";
        }
        entity.setCzbz(Constant.CZBZ_D);
        apiInfoDataRep.updateStatus(entity.getBydh(), JSON.toJSONString(entity), Constant.CZBZ_D);
        List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, data.getBydh());
        data.setCzbz(Constant.CZBZ_D);
        apiInfoDataRep.updateStatus(apiInfoList.get(0).getId(), JSON.toJSONString(data), Constant.CZBZ_D);
        return null;
    }

@@ -171,23 +178,16 @@
        responseDto = apiService.pushData(param, apiConf, items);
        if (responseDto.getSuccess() == 0) {
            //推送成功，更新数据上传状态

            ApiInfoData infoData;
            for (SH2023Api2104 data : items) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {

                    infoData = new ApiInfoData();
                    infoData.setId(data.getBydh());
                    infoData.setKqdm(data.getKqdm());
                    infoData.setInteType("21");
                    infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2104);
                    infoData.setUpdateTime(new Date());
                    infoData.setDataId(data.getBydh());

                    //推送成功，更新数据上传状态
                    List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, data.getBydh());
                    data.setCzbz(Constant.CZBZ_U);
                    infoData = apiInfoList.get(0);
                    infoData.setUpdateTime(new Date());
                    infoData.setCzbz(Constant.CZBZ_U);
                    infoData.setData(JSON.toJSONString(data));

                    apiInfoDataRep.save(infoData);
                }
            }

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

@@ -5,13 +5,6 @@
 */
public enum ShAreaBjw {

    BJW_310101("310101", "黄浦区", "huangpu"),
    BJW_310104("310104", "徐汇区", "xuhui"),
    BJW_310105("310105", "长宁区", "changning"),
    BJW_310106("310106", "静安区", "jingan"),
    BJW_310107("310107", "普陀区", "putuo"),
    BJW_310109("310109", "虹口区", "hongkou"),
    BJW_310110("310110", "杨浦区", "yangpu"),
    BJW_310112("310112", "闵行区", "minhang"),
    BJW_310113("310113", "宝山区", "baoshan"),
    BJW_310114("310114", "嘉定区", "jiading"),
@@ -47,13 +40,6 @@
    public static String getName(String code) {
        if (null == code) return null;

        if (ShAreaBjw.BJW_310101.getCode().equals(code)) return ShAreaBjw.BJW_310101.getName();
        if (ShAreaBjw.BJW_310104.getCode().equals(code)) return ShAreaBjw.BJW_310104.getName();
        if (ShAreaBjw.BJW_310105.getCode().equals(code)) return ShAreaBjw.BJW_310105.getName();
        if (ShAreaBjw.BJW_310106.getCode().equals(code)) return ShAreaBjw.BJW_310106.getName();
        if (ShAreaBjw.BJW_310107.getCode().equals(code)) return ShAreaBjw.BJW_310107.getName();
        if (ShAreaBjw.BJW_310109.getCode().equals(code)) return ShAreaBjw.BJW_310109.getName();
        if (ShAreaBjw.BJW_310110.getCode().equals(code)) return ShAreaBjw.BJW_310110.getName();
        if (ShAreaBjw.BJW_310112.getCode().equals(code)) return ShAreaBjw.BJW_310112.getName();
        if (ShAreaBjw.BJW_310113.getCode().equals(code)) return ShAreaBjw.BJW_310113.getName();
        if (ShAreaBjw.BJW_310114.getCode().equals(code)) return ShAreaBjw.BJW_310114.getName();
@@ -70,13 +56,6 @@
    public static String getBjw(String code) {
        if (null == code) return null;

        if (ShAreaBjw.BJW_310101.getCode().equals(code)) return ShAreaBjw.BJW_310101.getBjw();
        if (ShAreaBjw.BJW_310104.getCode().equals(code)) return ShAreaBjw.BJW_310104.getBjw();
        if (ShAreaBjw.BJW_310105.getCode().equals(code)) return ShAreaBjw.BJW_310105.getBjw();
        if (ShAreaBjw.BJW_310106.getCode().equals(code)) return ShAreaBjw.BJW_310106.getBjw();
        if (ShAreaBjw.BJW_310107.getCode().equals(code)) return ShAreaBjw.BJW_310107.getBjw();
        if (ShAreaBjw.BJW_310109.getCode().equals(code)) return ShAreaBjw.BJW_310109.getBjw();
        if (ShAreaBjw.BJW_310110.getCode().equals(code)) return ShAreaBjw.BJW_310110.getBjw();
        if (ShAreaBjw.BJW_310112.getCode().equals(code)) return ShAreaBjw.BJW_310112.getBjw();
        if (ShAreaBjw.BJW_310113.getCode().equals(code)) return ShAreaBjw.BJW_310113.getBjw();
        if (ShAreaBjw.BJW_310114.getCode().equals(code)) return ShAreaBjw.BJW_310114.getBjw();