优化上海接口信息

CZT

2023-11-11 111f952ebe91c261fa418be96226e1fa01865e3b

优化上海接口信息

 src/main/java/com/fzzy/api/view/repository/Api1210Rep.java

@@ -22,4 +22,7 @@

    @Query("from Api1210 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
    List<Api1210> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);

    @Query("from Api1210 where lsxzzbdh=:lsxzzbdh ")
    List<Api1210> getDataById(@Param("lsxzzbdh") String lsxzzbdh);
}

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

@@ -122,7 +122,7 @@
                    }
                }
                if (StringUtils.isNotEmpty(listInoutNotice.get(0).getPlanId())) {
                    List<Api1404> api1404List = api1404Rep.getDataByBizId(listInoutNotice.get(0).getContractId());
                    List<Api1404> api1404List = api1404Rep.getDataByBizId(listInoutNotice.get(0).getPlanId());
                    if(null != api1404List && api1404List.size() > 0){
                        apiData.setJhmxh(api1404List.get(0).getJhmxdh());
                    }

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

@@ -65,7 +65,7 @@

            Api1210 apiData;
            Api1105 api1105;

            List<Api1210> api1210List;
            for (Fz40InoutVarietyChange sysData : list) {
                //获取货位信息
                api1105 = commonService.getApi1105Cache(sysData.getDepotId());
@@ -82,7 +82,7 @@
                apiData.setLspzdm(mappingCode);
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
                apiData.setHzqlsxzdm(mappingCode);
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getNewFoodType());
                apiData.setHzhlsxzdm(mappingCode);
                apiData.setHzrq(sysData.getChangeTime());
                apiData.setCcshr(sysData.getCcshr());
@@ -91,13 +91,18 @@
                apiData.setKjshr(sysData.getKjshr());
                apiData.setLdshr(sysData.getLdshr());
                apiData.setBz(sysData.getRemark());
                apiData.setCzbz(Constant.CZBZ_I);
                apiData.setZhgxsj(sysData.getUpdateTime());
                apiData.setZhgxsj(new Date());

                //业务id、库区编码、同步时间
                apiData.setBizId(sysData.getId());
                apiData.setKqdm(kqdm);
                apiData.setSyncTime(new Date());
                api1210List = api1210Rep.getDataById(apiData.getLsxzzbdh());
                if(null == api1210List || api1210List.isEmpty()){
                    apiData.setCzbz(Constant.CZBZ_I);
                }else {
                    apiData.setCzbz(api1210List.get(0).getCzbz());
                }
                //保存数据
                api1210Rep.save(apiData);


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

@@ -64,8 +64,6 @@
                sh2023Api1311 = new SH2023Api1311();
                sh2023Api1311.setSpjksbid(api1102.getXzqhdm() + "00401327" + String.valueOf(num).substring(1));
                sh2023Api1311.setTdbh(sysData.getChanNum());
                sh2023Api1311.setTdmc(sysData.getChanNum() + "号通道");
                sh2023Api1311.setJksbbm(sysData.getId());
                sh2023Api1311.setJksbmc(sysData.getName());
                sh2023Api1311.setKqdm(kqdm);

@@ -73,7 +71,6 @@
                sh2023Api1311.setJkcs(getBrandId(sysData.getBrand()));

                sh2023Api1311.setJkxh(sysData.getSn());
                sh2023Api1311.setJkxlh(sysData.getSn());

                sh2023Api1311.setSpjklx(StringUtils.isEmpty(sysData.getSpjklx()) ? "3" : sysData.getSpjklx());
                sh2023Api1311.setSblxbm("1");

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

@@ -15,14 +15,6 @@
        <Property name="label">通道编号</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="tdmc">
        <Property name="label">通道名称</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="jksbbm">
        <Property></Property>
        <Property name="label">监控设备编码</Property>
      </PropertyDef>
      <PropertyDef name="jksbmc">
        <Property name="label">监控设备名称</Property>
      </PropertyDef>
@@ -71,10 +63,6 @@
      <PropertyDef name="jkxh">
        <Property></Property>
        <Property name="label">监控型号</Property>
      </PropertyDef>
      <PropertyDef name="jkxlh">
        <Property></Property>
        <Property name="label">监控序列号</Property>
      </PropertyDef>
      <PropertyDef name="spjklx">
        <Property></Property>

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

@@ -173,6 +173,10 @@
     */
    public static String API_CODE_CWBBXX = "cwbbxx";
    /**
     * 接口编码-1041 财务报表信息接口
     */
    public static String API_CODE_QYXYXX = "qyxyxx";
    /**
     * 接口编码-1042 文件上传接口
     */
    public static String API_CODE_WJSC = "upload";

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

@@ -668,7 +668,7 @@
            case "1112":
                return ApiCodeConstant.API_CODE_RYXX;
            case "1113":
                return "";
                return ApiCodeConstant.API_CODE_QYXYXX;
            case "1201":
                return ApiCodeConstant.API_CODE_HTXX;
            case "1202":

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

@@ -399,6 +399,7 @@
            BeanUtils.copyProperties(apiData, api1204);
            api1204.setBjw(ShAreaBjw.getBjw(code));

            //TODO 查询合同获取批次号
            //设置批次号
            api1204.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJssj(), "yyyy"));


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

@@ -29,12 +29,6 @@
    @PropertyDef(label = "通道编号")
    private Integer tdbh;

    @PropertyDef(label = "通道名称")
    private String tdmc;

    @PropertyDef(label = "监控设备编码")
    private String jksbbm;

    @PropertyDef(label = "监控设备名称")
    private String jksbmc;

@@ -50,9 +44,6 @@

    @PropertyDef(label = "监控型号")
    private String jkxh;

    @PropertyDef(label = "监控序列号")
    private String jkxlh;

    /**
     * 1:仓内，2:业务，