上海嘉定纪委接口优化1

陈战涛

2023-05-25 e6535ab931a79cce25b3c15b47ce59dcb66e69e9

上海嘉定纪委接口优化1

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

@@ -29,7 +29,7 @@
    private static final long serialVersionUID = 1L;

    @Id
    @PropertyDef(label = "轮换计划单号" )
    @PropertyDef(label = "轮换计划单号", description = "单位编码 + 4位年份 + 3位顺序号")
    @Column(name = "lhjhdh", length = 25)
    private String lhjhdh;


 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1310.java

@@ -69,8 +69,8 @@
            Api1105 api1105;
            List<Fz35CheckItem> fz35CheckItems;
            List<GbCheckItem> gbCheckList;
            String jyxm;
            String jyxmz;
            StringBuilder jyxm;
            StringBuilder jyxmz;
            List<Api1310> api1310List;
            for (Fz35Quality fz35Quality : list) {
                api1105 = commonService.getApi1105Cache(fz35Quality.getDepotId());
@@ -91,8 +91,8 @@
                api1310.setJyyj(fz35Quality.getStandard());
                api1310.setZblb("2");
                //检测项，检测值
                jyxm = "";
                jyxmz = "";
                jyxm = new StringBuilder();
                jyxmz = new StringBuilder();
                fz35CheckItems = fzzySync1203Rep.listInoutCheckItem(fz35Quality.getId(), deptId.substring(0, 4));
                if (null != fz35CheckItems && fz35CheckItems.size() > 0) {

@@ -102,12 +102,12 @@
                        if (gbCheckList == null || gbCheckList.isEmpty()) {
                            continue;
                        }
                        jyxm += gbCheckList.get(0).getCode() + ",";
                        jyxmz += fz35CheckItem.getValue() + ",";
                        jyxm.append(gbCheckList.get(0).getCode()).append(",");
                        jyxmz.append(fz35CheckItem.getValue()).append(",");
                    }
                }
                api1310.setJyxm(jyxm);
                api1310.setJyxmz(jyxmz);
                api1310.setJyxm(jyxm.toString());
                api1310.setJyxmz(jyxmz.toString());

                api1310.setZbjgpd(fz35Quality.getResult());
                api1310.setQfrq(fz35Quality.getTime());

 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1403.java

@@ -15,7 +15,7 @@
/**
 * 轮换计划同步
 *
 * @author chen
 * @author czt
 * @date 2023-05-14 19:51
 */
@Slf4j
@@ -59,7 +59,7 @@
            List<Api1403> api1403List;
            for (Fz35Plan fz35Plan : list) {
                api1403 = new Api1403();
                api1403.setLhjhdh(fz35Plan.getId());
                api1403.setLhjhdh(kqdm.substring(0, 18) + fz35Plan.getId().split("_")[1] + fz35Plan.getId().split("_")[2]);
                api1403.setJhwh(fz35Plan.getReferenceNumber());
                api1403.setJhmc(fz35Plan.getName());
                api1403.setJhnd(fz35Plan.getYear());

 src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService13.java

@@ -33,7 +33,7 @@
    public void pushData(ApiParam param) {
        log.info("------->>>>粮食管理 接口模块上报开始");

        //TODO 质检信息
        //质检信息
        pushService.pushData1310(apiRemoteService, param);
        log.info("------->>>>粮食管理 接口模块上报结束");
    }

 src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023PushService14.java

@@ -32,9 +32,9 @@
    public void pushData(ApiParam param) {
        log.info("------->>>>行政管理 接口模块上报开始");

        //TODO 轮换计划信息
        //轮换计划信息
        pushService.pushData1403(apiRemoteService, param);
        //TODO 轮换计划完成信息
        //轮换计划完成信息
        pushService.pushData1404(apiRemoteService, param);
        log.info("------->>>>行政管理 接口模块上报结束");
    }

 src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java

@@ -214,29 +214,30 @@
        return JSON.toJSONString(dto);
    }

    private ShjdjwApi1404 copyApi1404(Api1404 data) {
    private ShjdjwApi1404 copyApi1404(Api1404 api1404) {
        ShjdjwApi1404 shjdjwApi1404 = new ShjdjwApi1404();
        Api1404 api1404 = data;

        BeanUtils.copyProperties(api1404, shjdjwApi1404);

        //查询单位信息
        List<Api1101> listApi1101 = api1101Rep.findPushData(api1404.getKqdm());
        if (null != listApi1101 || listApi1101.size() > 0) {
        if (null != listApi1101 && listApi1101.size() > 0) {
            shjdjwApi1404.setDwmc(listApi1101.get(0).getDwmc());
        }

        //TODO 计划年度 计划数量 已执行数量 执行比例 招标/竞价比例
        shjdjwApi1404.setJhnd("0");
        shjdjwApi1404.setJhsl("0");
        shjdjwApi1404.setYzxsl("0");
        shjdjwApi1404.setZxbl("0");
        shjdjwApi1404.setZbjjbl("0");
        //TODO 计划年度 计划数量 已执行数量 执行比例 招标/竞价比例

        return shjdjwApi1404;
    }

    private ShjdjwApi1203 copyApi1203(Api1203 data) {
    private ShjdjwApi1203 copyApi1203(Api1203 api1203) {
        ShjdjwApi1203 shjdjwApi1203 = new ShjdjwApi1203();
        Api1203 api1203 = data;

        BeanUtils.copyProperties(api1203, shjdjwApi1203);

        shjdjwApi1203.setQydbh(api1203.getRkjydh());
@@ -250,52 +251,59 @@
        return shjdjwApi1203;
    }

    private ShjdjwApi1310 copyApi1310(Api1310 data) {
    private ShjdjwApi1310 copyApi1310(Api1310 api1310) {
        ShjdjwApi1310 shjdjwApi1310 = new ShjdjwApi1310();
        Api1310 api1310 = data;

        BeanUtils.copyProperties(api1310, shjdjwApi1310);

        shjdjwApi1310.setZjbgdbh(api1310.getZjbgdh());
        shjdjwApi1310.setPznm(api1310.getLspzdm());
        shjdjwApi1310.setSkdjbm(api1310.getLsdjdm());
        shjdjwApi1310.setJylbbm(api1310.getJylb());
        shjdjwApi1310.setJyjl(api1310.getJyxmz());
        if(StringUtils.isNotEmpty(shjdjwApi1310.getJyxm())){
            String[] split = shjdjwApi1310.getJyxm().split(",");
            StringBuilder jyjl = new StringBuilder();
            for (String s : split) {
                jyjl.append(",合格");
            }
            shjdjwApi1310.setJyjl(jyjl.toString().substring(1));
        }

        shjdjwApi1310.setZlzbjgpd(api1310.getZbjgpd());
        //查询单位信息
        List<Api1101> listApi1101 = api1101Rep.findPushData(api1310.getKqdm());
        if (null != listApi1101 || listApi1101.size() > 0) {
        if (null != listApi1101 && listApi1101.size() > 0) {
            shjdjwApi1310.setDwmc(listApi1101.get(0).getDwmc());
        }

        //查询仓房信息
        List<Api1103> listApi1103 = api1103Rep.findPushDataByCfdm(api1310.getHwdm().substring(0, 25));
        if (null != listApi1103 || listApi1103.size() > 0) {
        if (null != listApi1103 && listApi1103.size() > 0) {
            shjdjwApi1310.setCfmc(listApi1103.get(0).getCfmc());
        }

        //查询廒间信息
        List<Api1104> listApi1104 = api1104Rep.findDataByAjdh(api1310.getHwdm().substring(0, 28));
        if (null != listApi1104 || listApi1104.size() > 0) {
        if (null != listApi1104 && listApi1104.size() > 0) {
            shjdjwApi1310.setAjmc(listApi1104.get(0).getAjmc());
        }

        //查询库区信息
        List<Api1102> listApi1102 = api1102Rep.findPushData(api1310.getKqdm());
        if (null != listApi1102 || listApi1102.size() > 0) {
        if (null != listApi1102 && listApi1102.size() > 0) {
            shjdjwApi1310.setKdmc(listApi1102.get(0).getKqmc());
        }
        //查询粮食库存
        List<Api1208> listApi1208 = api1208Rep.getDataByHwdm(api1310.getHwdm());
        if (null != listApi1208 || listApi1208.size() > 0) {
        if (null != listApi1208 && listApi1208.size() > 0) {
            shjdjwApi1310.setKdmc(listApi1208.get(0).getLsxzdm());
        }
        shjdjwApi1310.setPch("0");
        return shjdjwApi1310;
    }

    private ShjdjwApi1209 copyApi1209(Api1209 data) {
    private ShjdjwApi1209 copyApi1209(Api1209 api1209) {
        ShjdjwApi1209 shjdjwApi1209 = new ShjdjwApi1209();
        Api1209 api1209 = data;

        BeanUtils.copyProperties(api1209, shjdjwApi1209);

@@ -306,12 +314,12 @@
        shjdjwApi1209.setSysl(api1209.getJzsysl());
        //查询单位信息
        List<Api1101> listApi1101 = api1101Rep.findPushData(api1209.getKqdm());
        if (null != listApi1101 || listApi1101.size() > 0) {
        if (null != listApi1101 && listApi1101.size() > 0) {
            shjdjwApi1209.setDwmc(listApi1101.get(0).getDwmc());
        }
        //查询库区信息
        List<Api1102> listApi1102 = api1102Rep.findPushData(api1209.getKqdm());
        if (null != listApi1102 || listApi1102.size() > 0) {
        if (null != listApi1102 && listApi1102.size() > 0) {
            shjdjwApi1209.setKdmc(listApi1102.get(0).getKqmc());
        }

@@ -323,9 +331,8 @@
        return shjdjwApi1209;
    }

    private ShjdjwApi1208 copyApi1208(Api1208 data) {
    private ShjdjwApi1208 copyApi1208(Api1208 api1208) {
        ShjdjwApi1208 shjdjwApi1208 = new ShjdjwApi1208();
        Api1208 api1208 = data;

        BeanUtils.copyProperties(api1208, shjdjwApi1208);

@@ -336,19 +343,19 @@

        //查询单位信息
        List<Api1101> listApi1101 = api1101Rep.findPushData(api1208.getKqdm());
        if (null != listApi1101 || listApi1101.size() > 0) {
        if (null != listApi1101 && listApi1101.size() > 0) {
            shjdjwApi1208.setDwmc(listApi1101.get(0).getDwmc());
        }

        //查询仓房信息
        List<Api1103> listApi1103 = api1103Rep.findPushDataByCfdm(api1208.getHwdm().substring(0, 25));
        if (null != listApi1103 || listApi1103.size() > 0) {
        if (null != listApi1103 && listApi1103.size() > 0) {
            shjdjwApi1208.setCfmc(listApi1103.get(0).getCfmc());
        }

        //查询廒间信息
        List<Api1104> listApi1104 = api1104Rep.findDataByAjdh(api1208.getHwdm().substring(0, 28));
        if (null != listApi1104 || listApi1104.size() > 0) {
        if (null != listApi1104 && listApi1104.size() > 0) {
            shjdjwApi1208.setAjmc(listApi1104.get(0).getAjmc());
        }

@@ -358,9 +365,8 @@
        return shjdjwApi1208;
    }

    private ShjdjwApi1205 copyApi1205(Api1205 data) {
    private ShjdjwApi1205 copyApi1205(Api1205 api1205) {
        ShjdjwApi1205 shjdjwApi1205 = new ShjdjwApi1205();
        Api1205 api1205 = data;

        BeanUtils.copyProperties(api1205, shjdjwApi1205);

@@ -375,13 +381,13 @@

        //查询单位信息
        List<Api1101> listApi1101 = api1101Rep.findPushData(api1205.getKqdm());
        if (null != listApi1101 || listApi1101.size() > 0) {
        if (null != listApi1101 && listApi1101.size() > 0) {
            shjdjwApi1205.setDwmc(listApi1101.get(0).getDwmc());
        }

        //查询仓房信息
        List<Api1103> listApi1103 = api1103Rep.findPushDataByCfdm(api1205.getHwdm().substring(0, 25));
        if (null != listApi1103 || listApi1103.size() > 0) {
        if (null != listApi1103 && listApi1103.size() > 0) {
            shjdjwApi1205.setCfmc(listApi1103.get(0).getCfmc());
        }

@@ -458,6 +464,9 @@
        shjdjwApi1202.setJydbh(api1202.getRkywdh());
        //轮换年度
        shjdjwApi1202.setLhnd(api1202.getShnd());
        //到库时间、离库时间
        shjdjwApi1202.setDksj(api1202.getDjsj());
        shjdjwApi1202.setLksj(api1202.getCmsj());
        //批次号
        shjdjwApi1202.setPch("0");
    }

 src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1205.java

@@ -80,7 +80,7 @@
    private Date mzjlsj;

    @PropertyDef(label = "净重")
    private String jz;
    private Double jz;

    @PropertyDef(label = "出门时间")
    @JSONField(format = "yyyy-MM-dd HH:mm:ss")