数据同步问题修改

YYC

2023-09-07 a6b22395d5b137d684c83d9197c40f596f689ded

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

@@ -56,7 +56,7 @@
     * @param start
     * @param end
     */
    public void syncData(String deptId, Date start, Date end) {
    public void syncData(String kqdm, String deptId, Date start, Date end) {
        log.info("-------------1023接口设备信息开始同步------------------");

        //同步数据，只记录失败的信息
@@ -81,10 +81,10 @@
            for (Fz4DrugLogApply data : list) {
                //储粮粮情明细表
                String tbrq = "";
                if(null != data.getTbrq()){
                if (null != data.getTbrq()) {
                    tbrq = DateFormatUtils.format(data.getTbrq(), "yyyyMMdd");
                }
                List<Fz40DrugLogDtl> dtls = drugLogDtlRep.listDrugLogDtl(data.getXzbm()+data.getDeptId()+tbrq);
                List<Fz40DrugLogDtl> dtls = drugLogDtlRep.listDrugLogDtl(data.getXzbm() + data.getDeptId() + tbrq);
                for (Fz40DrugLogDtl dtl : dtls) {
                    GdApi1023Dtl gdApi1023Dtl = new GdApi1023Dtl();
                    BeanUtils.copyProperties(dtl, gdApi1023Dtl);
@@ -97,13 +97,13 @@
                    gdApi1023Dtl.setZz(dtl.getPerImpurity());
                    dtlList.add(gdApi1023Dtl);
                }
                List<Fz40DrugLogWay> ways = drugLogWayRep.listDrugLogWay(data.getXzbm()+data.getDeptId()+tbrq);
                List<Fz40DrugLogWay> ways = drugLogWayRep.listDrugLogWay(data.getXzbm() + data.getDeptId() + tbrq);
                for (Fz40DrugLogWay way : ways) {
                    GdApi1023Way gdApi1023Way = new GdApi1023Way();
                    BeanUtils.copyProperties(way, gdApi1023Way);
                    wayList.add(gdApi1023Way);
                }
                List<Fz40DrugLogPeople> peoples = drugLogPeopleRep.listDrugLogPeople(data.getXzbm()+data.getDeptId()+tbrq);
                List<Fz40DrugLogPeople> peoples = drugLogPeopleRep.listDrugLogPeople(data.getXzbm() + kqdm + tbrq);
                for (Fz40DrugLogPeople people : peoples) {
                    GdApi1023People gdApi1023People = new GdApi1023People();
                    BeanUtils.copyProperties(people, gdApi1023People);
@@ -112,9 +112,9 @@
                }

                GdApi1023 gdApi1023 = new GdApi1023();
                BeanUtils.copyProperties(data , gdApi1023);
                BeanUtils.copyProperties(data, gdApi1023);
                gdApi1023.setXzbm(data.getXzbm());
                gdApi1023.setKqdm(data.getDeptId());
                gdApi1023.setKqdm(kqdm);
                gdApi1023.setYjmc(data.getDrugName());
                gdApi1023.setYjlx(data.getDrugType());
                gdApi1023.setZhgxsj(data.getUpdateTime());
@@ -126,14 +126,14 @@
                //持久化保存，单独存入非国标接口表
                ApiInfoData infoData = new ApiInfoData();
                infoData.setId(ContextUtil.getUUID());
                infoData.setKqdm(data.getDeptId());
                infoData.setKqdm(kqdm);
                infoData.setInteType(Constant.API_CATEGORY_13);
                infoData.setInteId(ApiCodeConstant.API_1023);
                infoData.setBizType(PushProtocol.SB_GD_2022.getCode());
                infoData.setUpdateTime(data.getUpdateTime());
                infoData.setDataId(data.getXzbm() + data.getDeptId() + DateFormatUtils.format(data.getTbrq(), "yyMMdd"));
                infoData.setDataId(kqdm + DateFormatUtils.format(data.getTbrq(), "yyMMdd") + data.getXzbm());

                List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByDataId(data.getXzbm() + data.getDeptId() + DateFormatUtils.format(data.getTbrq(), "yyMMdd"));
                List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByDataId(DateFormatUtils.format(data.getTbrq(), "yyMMdd") + kqdm + data.getXzbm());
                if (null == apiInfoList || apiInfoList.isEmpty()) {
                    gdApi1023.setCzbz(Constant.CZBZ_I);
                    infoData.setCzbz(Constant.CZBZ_I);