上海省平台协议-增加数据相符性接口

czt

2024-06-28 54b61daf58037385cb8d46404b12a95786c7c8f3

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

@@ -4,6 +4,7 @@
import com.fzzy.api.Constant;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.*;
import com.fzzy.async.fzzy40.entity.*;
@@ -17,7 +18,6 @@
import com.fzzy.otherview.gd2022.dto.GdApi1023Way;
import com.fzzy.push.gd2022.ApiCodeConstant;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -35,6 +35,12 @@
@Component
public class Fzzy40Sync1023 {
    @Autowired
    private Api1101Rep api1101Rep;
    @Autowired
    private Api1102Rep api1102Rep;
    @Autowired
    private Api1105Rep api1105Rep;
    @Autowired
    private Fzzy40Sync1023Rep fzzy40Sync1023Rep;
    @Autowired
    private Fzzy40SyncDrugLogPeopleRep drugLogPeopleRep;
@@ -44,6 +50,8 @@
    private Fzzy40SyncDrugLogDtlRep drugLogDtlRep;
    @Autowired
    private ApiLogRep apiLogRep;
    @Autowired
    private ApiCommonService commonService;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;

@@ -91,7 +99,16 @@
                BeanUtils.copyProperties(data, gdApi1023);
                gdApi1023.setXzbm(data.getXzbm().substring(8));
                gdApi1023.setKqdm(kqdm);
                List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
                if (null != api1102List && api1102List.size() > 0) {
                    gdApi1023.setKqmc(api1102List.get(0).getKqmc());
                }

                gdApi1023.setDwdm(kqdm.substring(0, 18));
                List<Api1101> api1101List = api1101Rep.findPushData(kqdm);
                if (null != api1101List && api1101List.size() > 0) {
                    gdApi1023.setDwmc(api1101List.get(0).getDwmc());
                }
                gdApi1023.setYjmc(data.getDrugName());
                gdApi1023.setYjlx(data.getDrugType());
                gdApi1023.setLqrq(data.getLqsj());
@@ -99,33 +116,58 @@

                //储粮粮情明细表
                List<Fz40DrugLogDtl> dtls = drugLogDtlRep.listDrugLogDtl(data.getXzbm());
                if (null != dtls && dtls.size() > 0) {
                    dtlList = new ArrayList<>();
                    for (Fz40DrugLogDtl dtl : dtls) {
                        gdApi1023Dtl = new GdApi1023Dtl();
                        BeanUtils.copyProperties(dtl, gdApi1023Dtl);
                        gdApi1023Dtl.setCfdm(dtl.getDepotId());
                        gdApi1023Dtl.setLspzdm(dtl.getFoodVariety());
                        gdApi1023Dtl.setLsxzdm(dtl.getFoodType());
                        gdApi1023Dtl.setLsdjdm(dtl.getFoodLevel());
                        gdApi1023Dtl.setLssl(dtl.getNumber());
                        gdApi1023Dtl.setSf(dtl.getPerWet());
                        gdApi1023Dtl.setZz(dtl.getPerImpurity());
                        dtlList.add(gdApi1023Dtl);
                    }
                    gdApi1023.setDtls(dtlList);
                Api1105 api1105 = commonService.getApi1105Cache(data.getDepotId());
                gdApi1023Dtl = new GdApi1023Dtl();
                BeanUtils.copyProperties(data, gdApi1023Dtl);
                if (null != api1105) {
                    gdApi1023Dtl.setCfmc(api1105.getHwmc());
                    gdApi1023Dtl.setCfdm(api1105.getHwdm().substring(0,25));
                }

                List<Fz40DrugLogWay> ways = drugLogWayRep.listDrugLogWay(data.getXzbm());
                if (null != ways && ways.size() > 0) {
                    wayList = new ArrayList<>();
                    for (Fz40DrugLogWay way : ways) {
                        gdApi1023Way = new GdApi1023Way();
                        BeanUtils.copyProperties(way, gdApi1023Way);
                        wayList.add(gdApi1023Way);
                    }
                    gdApi1023.setWays(wayList);
                }
                gdApi1023Dtl.setLspzdm(data.getFoodVariety());
                gdApi1023Dtl.setLsxzdm(data.getFoodType());
                gdApi1023Dtl.setLsdjdm(data.getFoodLevel());
                gdApi1023Dtl.setLssl(data.getNumber());
                gdApi1023Dtl.setSf(data.getPerWet());
                gdApi1023Dtl.setZz(data.getPerImpurity());


                dtlList = new ArrayList<>();
                dtlList.add(gdApi1023Dtl);
                gdApi1023.setDtls(dtlList);
//                if (null != dtls && dtls.size() > 0) {
//                    dtlList = new ArrayList<>();
//                    for (Fz40DrugLogDtl dtl : dtls) {
//                        gdApi1023Dtl = new GdApi1023Dtl();
//                        BeanUtils.copyProperties(dtl, gdApi1023Dtl);
//                        gdApi1023Dtl.setCfdm(dtl.getDepotId());
//                        gdApi1023Dtl.setLspzdm(dtl.getFoodVariety());
//                        gdApi1023Dtl.setLsxzdm(dtl.getFoodType());
//                        gdApi1023Dtl.setLsdjdm(dtl.getFoodLevel());
//                        gdApi1023Dtl.setLssl(dtl.getNumber());
//                        gdApi1023Dtl.setSf(dtl.getPerWet());
//                        gdApi1023Dtl.setZz(dtl.getPerImpurity());
//                        dtlList.add(gdApi1023Dtl);
//                    }
//                    gdApi1023.setDtls(dtlList);
//                }


                gdApi1023Way = new GdApi1023Way();
                BeanUtils.copyProperties(data, gdApi1023Way);
                wayList = new ArrayList<>();
                wayList.add(gdApi1023Way);
                gdApi1023.setWays(wayList);
//                List<Fz40DrugLogWay> ways = drugLogWayRep.listDrugLogWay(data.getXzbm());
//                if (null != ways && ways.size() > 0) {
//                    wayList = new ArrayList<>();
//                    for (Fz40DrugLogWay way : ways) {
//                        gdApi1023Way = new GdApi1023Way();
//                        BeanUtils.copyProperties(way, gdApi1023Way);
//                        wayList.add(gdApi1023Way);
//                    }
//                    gdApi1023.setWays(wayList);
//                }

                List<Fz40DrugLogPeople> peoples = drugLogPeopleRep.listDrugLogPeople(data.getXzbm());
                if (null != peoples && peoples.size() > 0) {