优化调整上报信息

CZT

2023-11-08 7ab13e3b8f4ab768dd68b1bd8e1f8bbce31fb8a6

优化调整上报信息

 src/main/java/com/fzzy/api/entity/Api1209.java

@@ -34,7 +34,7 @@

    @Id
    @PropertyDef(label = "损溢单号" )
    @Column(name = "sydh", length = 41)
    @Column(name = "sydh", length = 60)
    private String sydh;

    @PropertyDef(label = "货位代码" )

 src/main/java/com/fzzy/api/view/Api1207.view.xml

@@ -49,7 +49,11 @@
      </PropertyDef>
      <PropertyDef name="dcdw">
        <Property></Property>
        <Property name="label">倒仓单位</Property>
        <Property name="label">倒出单位</Property>
      </PropertyDef>
      <PropertyDef name="drdw">
        <Property></Property>
        <Property name="label">倒入单位</Property>
      </PropertyDef>
      <PropertyDef name="lspzdm">
        <Property></Property>
@@ -358,6 +362,11 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">drdw</Property>
            <Property name="property">drdw</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">lspzdm</Property>
            <Property name="property">lspzdm</Property>
            <Editor/>

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java

@@ -107,10 +107,7 @@
                if(StringUtils.isEmpty(sysData.getFoodVariety())){
                    continue;
                }
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
                if(StringUtils.isEmpty(mappingCode)){
                    mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
                }
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
                apiData.setLspzdm(mappingCode);

                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java

@@ -139,10 +139,7 @@
                apiData.setDjsj(sysData.getRegisterTime());

                //粮食品种
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
                if(StringUtils.isEmpty(mappingCode)){
                    mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
                }
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
                apiData.setLspzdm(mappingCode);

                //粮食性质

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java

@@ -132,10 +132,7 @@
            apiData.setDjsj(sysData.getRegisterTime());

            //粮食品种
            String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
            if(StringUtils.isEmpty(mappingCode)){
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
            }
            String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
            apiData.setLspzdm(mappingCode);

            //粮食等级

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java

@@ -90,10 +90,7 @@
                apiData.setTzdh(sysData.getNoticeId());
                apiData.setDcdw(kqdm);
                apiData.setDrdw(kqdm);
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
                if(StringUtils.isEmpty(mappingCode)){
                    mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
                }
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
                apiData.setLspzdm(mappingCode);
                apiData.setDchwdm(api1105Out.getHwdm());
                apiData.setDrhwdm(api1105In.getHwdm());

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java

@@ -87,10 +87,7 @@
                apiData.setHwdm(api1105.getHwdm());

                //粮食品种
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40DepotStore.getFoodVariety());
                if(StringUtils.isEmpty(mappingCode)){
                    mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40DepotStore.getFoodVariety().substring(0, 3));
                }
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40DepotStore.getFoodVariety().substring(0, 3));
                apiData.setLspzdm(mappingCode);

                //粮食性质

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java

@@ -78,10 +78,7 @@
                apiData.setLssl(sysData.getNumber());
                apiData.setHzsl(sysData.getChangeNumber());
                apiData.setBzwh(sysData.getApprovalId());
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
                if(StringUtils.isEmpty(mappingCode)){
                    mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
                }
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
                apiData.setLspzdm(mappingCode);
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
                apiData.setHzqlsxzdm(mappingCode);

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java

@@ -93,10 +93,7 @@
                api1310.setHwdm(api1105.getHwdm());
                api1310.setKqdm(kqdm);
                //粮食品种
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40Quality.getFoodVariety());
                if(StringUtils.isEmpty(mappingCode)){
                    mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40Quality.getFoodVariety().substring(0, 3));
                }
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40Quality.getFoodVariety().substring(0, 3));
                api1310.setLspzdm(mappingCode);

                //粮食等级

 src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java

@@ -9,6 +9,8 @@
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.Api1101Rep;
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1404Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.push.gd2022.dto.*;
@@ -49,7 +51,10 @@
    private ApiCommonService apiCommonService;
    @Autowired
    private Api1404Rep api1404Rep;

    @Autowired
    private Api1101Rep api1101Rep;
    @Autowired
    private Api1102Rep api1102Rep;
    @Autowired
    private ApiLogRep apiLogRep;

@@ -346,6 +351,14 @@
        if (Constant.API_CODE_1111.equals(inteId)) {
            Gd2022Api1111 api1111 = new Gd2022Api1111();
            BeanUtils.copyProperties(data, api1111);
            List<Api1102> api1102List = api1102Rep.findPushData(api1111.getKqdm());
            if(null != api1102List && api1102List.size() > 0){
                api1111.setKqmc(api1102List.get(0).getKqmc());
            }
            List<Api1101> api1101List = api1101Rep.findDataByDwdm(api1111.getDwdm());
            if(null != api1101List && api1101List.size() > 0){
                api1111.setDwmc(api1101List.get(0).getDwmc());
            }
            return JSON.toJSONString(api1111);
        }
        if (Constant.API_CODE_1208.equals(inteId)) {

 src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1111.java

@@ -58,6 +58,12 @@
    @PropertyDef(label = "廒间代码" )
    private String ajdm;

    @PropertyDef(label = "单位名称" )
    private String dwmc;

    @PropertyDef(label = "库区名称" )
    private String kqmc;

    @PropertyDef(label = "最后更新时间" )
    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    private Date zhgxsj;