调整上海接口-船运时调整每车为一条数据

CZT

2023-10-19 da0dfffe0c57ed3ca0c66b24a68ccc64da0873c9

调整上海接口-船运时调整每车为一条数据

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

@@ -2,8 +2,18 @@

import com.fzzy.api.entity.ApiConfs;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import java.util.List;


public interface ApiConfsRep extends JpaRepository<ApiConfs, String> {

    /**
     * æ ¹æ®åº“区编码获取配置信息
     * @param kqdm
     * @return
     */
    @Query("from ApiConfs where kqdm =:kqdm ")
    List<ApiConfs> getDataByKqdm(@Param("kqdm") String kqdm);
}

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

@@ -103,10 +103,13 @@

                apiData.setQdrq(sysData.getSigningTime());

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

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

                //单价：元/吨

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

@@ -91,11 +91,9 @@
                if(StringUtils.isNotEmpty(sysData.getCardId())){
                    apiData.setLxrsfzh(sysData.getCardId());
                }
                if(StringUtils.isNotEmpty(sysData.getYzbm())){
                    apiData.setYzbm(sysData.getYzbm());
                }
                apiData.setYzbm(StringUtils.isEmpty(sysData.getYzbm()) ? "000000" :sysData.getYzbm());
                apiData.setDzyx(StringUtils.isEmpty(sysData.getDzyx()) ? "" :sysData.getDzyx());
//                apiData.setKhfkhh(StringUtils.isEmpty(sysData.getBank()) ? "" :sysData.getBank());
                apiData.setKhfkhh(StringUtils.isEmpty(sysData.getBank()) ? "999" :sysData.getBank());
                apiData.setKhfzh(StringUtils.isEmpty(sysData.getBankNum()) ? "" :sysData.getBankNum());
                apiData.setZhgxsj(sysData.getUpdateTime() == null ? new Date() : sysData.getUpdateTime());
                apiData.setBizId(sysData.getId());

 src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java

@@ -85,7 +85,7 @@
        fzzySync1207.syncData(kqdm, deptId, start, end);

        //出入库文件信息同步
        fzzySync1109.syncData(kqdm, deptId, start, end);
//        fzzySync1109.syncData(kqdm, deptId, start, end);

        //粮食库存同步
        fzzySync1208.syncData(kqdm, deptId, start, end);
@@ -94,13 +94,13 @@
        fzzySync1210.syncData(kqdm, deptId, start, end);

        /*-----各省独有接口信息同步-----*/
        if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.getCode().equals(param.getPushProtocol())) {
            //上海市平台2023版，需要同步市储检斤单，同步市储驳运单
            //同步市储检斤单
            fzzySync2101.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
            //同步市储驳运单
            fzzySync2104.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
        }
//        if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.getCode().equals(param.getPushProtocol())) {
//            //上海市平台2023版，需要同步市储检斤单，同步市储驳运单
//            //同步市储检斤单
//            fzzySync2101.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
//            //同步市储驳运单
//            fzzySync2104.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
//        }
        //账面库存信息同步  TODO

    }

 src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java

@@ -51,7 +51,7 @@
            //熏蒸备案数据同步
            fzzySync1023.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
        }
        if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.equals(param.getPushProtocol())) {
        if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.getCode().equals(param.getPushProtocol())) {
            //上海市平台2023版，需要同步粮情设备配置信息

            //同步粮情设备配置信息

 src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutRecordItem.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,101 @@
package com.fzzy.async.fzzy40.entity;

import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.util.Date;

/**
 * å‡ºå…¥åº“流水字表
 * @author
 */
@Data
@Entity
@Table(name = "D_INOUT_RECORD_ITEM")
public class Fz40InoutRecordItem {

    @Id
    @Column(name = "ID_", length = 40)
    @PropertyDef(label = "主键id", description = "根据一定的规则生成")
    private String id;

    @Column(name = "RECORD_ID_", length = 40)
    @PropertyDef(label = "流水Id")
    private String recordId;

    @Column(name = "DEPOT_ID_", length = 50)
    @PropertyDef(label = "装卸仓库")
    private String depotId;

    @Column(name = "CAR_NUM_", length = 20)
    @PropertyDef(label = "船运车辆序号")
    private String carNum;

    @Column(name = "CAR_NAME_", length = 20)
    @PropertyDef(label = "船运车辆名称")
    private String carName;

    @Column(name = "TYPE_", length = 10)
    @PropertyDef(label = "出入库类型", description = "出库，入库")
    private String type;

    @Column(name = "PROGRESS_", length = 20)
    @PropertyDef(label = "流程进度")
    private String progress;

    @Column(name = "RECORD_STATUS_", length = 10)
    @PropertyDef(label = "数据状态", description = "数据状态，正常，异常（2小时内重复出入库等），补录")
    private String recordStatus;

    @Column(name = "DE_")
    @PropertyDef(label = "扣重", description = "单位KG")
    private Double de = 0.0;

    @Column(name = "FULL_WEIGHT_")
    @PropertyDef(label = "满车称重", description = "入库时候表示第一次称重，出库时候表示第二次称重，单位KG")
    private Double fullWeight = 0.0;

    @Column(name = "FULL_WEIGHT_TIME_")
    @PropertyDef(label = "满车称重时间")
    private Date fullWeightTime;

    @Column(name = "FULL_WEIGHT_USER_", length = 40)
    @PropertyDef(label = "满车称重人")
    private String fullWeightUser;

    @Column(name = "EMPTY_WEIGHT_")
    @PropertyDef(label = "空车称重", description = "入库时表示第二次称重，出库时候表示第一次称重，单位KG")
    private Double emptyWeight = 0.0;

    @Column(name = "EMPTY_WEIGHT_TIME_")
    @PropertyDef(label = "空车称重时间")
    private Date emptyWeightTime;

    @Column(name = "EMPTY_WEIGHT_USER_")
    @PropertyDef(label = "空车称重人")
    private String emptyWeightUser;

    @Column(name = "NET_WEIGHT_")
    @PropertyDef(label = "净重", description = "单位KG")
    private Double netWeight = 0.0;

    @Column(name = "SETTLE_WEIGHT_")
    @PropertyDef(label = "结算净重", description = "扣重后净重，结算净重，单位KG")
    private Double settleWeight = 0.0;

    @Column(name = "RECORD_WEIGHT_")
    @PropertyDef(label = "入库重量", description = "扣重后净重，结算净重，补包括增重，单位KG")
    private Double recordWeight = 0.0;

    @Column(name = "CREATE_TIME_")
    @PropertyDef(label = "创建时间")
    private Date createTime;

    // å¤‡æ³¨
    @Column(name = "REMARKS_", length = 200)
    @PropertyDef(label = "备注信息")
    private String remarks;
}

 src/main/java/com/fzzy/async/fzzy40/entity/Fz40Quality.java

@@ -118,11 +118,11 @@

    @PropertyDef(label = "样品数量", required = true)
    @Column(name = "ypsl", precision = 20, scale = 6)
    private double ypsl;
    private Double ypsl;

    @PropertyDef(label = "代表数量")
    @Column(name = "dbsl", precision = 20, scale = 6)
    private double dbsl;
    private Double dbsl;

    @PropertyDef(label = "样品等级")
    @Column(name = "ypdj", length = 2)
@@ -139,11 +139,5 @@
    @Column(name = "UPDATE_TIME_")
    @PropertyDef(label = "数据更新时间")
    private Date updateTime;
//
//    /**
//     * åŒ–验项目明细
//     */
//    @Transient
//    private List<CheckItemData> checkItems;

}

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

@@ -104,10 +104,13 @@

                apiData.setQdrq(sysData.getSigningTime());

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

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

                //单价：元/吨

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

@@ -12,7 +12,9 @@
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy40.entity.Fz40InoutNoticeIn;
import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
import com.fzzy.async.fzzy40.entity.Fz40InoutRecordItem;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1202Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40SyncInoutRecordItemRep;
import com.fzzy.async.fzzy40.repository.Fzzy40SyncNoticeInRep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -21,6 +23,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;

@@ -38,6 +41,8 @@

    @Autowired
    private Fzzy40Sync1202Rep fzzySync1202Rep;
    @Autowired
    private Fzzy40SyncInoutRecordItemRep fzzy40SyncInoutRecordItemRep;
    @Autowired
    private Fzzy40SyncNoticeInRep fzzySyncNoticeInRep;
    @Autowired
@@ -80,7 +85,11 @@
            Api1105 api1105;
            List<Fz40InoutNoticeIn> listInoutNotice;
            List<Api1202> api1202List;
            List<Fz40InoutRecordItem> listInoutRecordItem;
            for (Fz40InoutRecord sysData : list) {
                if(sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")){
                    continue;
                }
                if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
                    sysData.setRecordWeight(sysData.getSettleWeight());
                }
@@ -97,20 +106,10 @@

                apiData.setRkywdh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));

                //判断业务时间与单据号是否匹配，若不匹配，则更改业务时间为单据号所在的时间
                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
                Date time = dateFormat.parse(sysData.getId().substring(2, 10));
                int numDay = DateUtil.difDay(DateUtil.getCurZero(sysData.getCompleteTime()), DateUtil.getCurZero(time));
                if(numDay != 0){
                    sysData.setFullWeightTime(DateUtils.addDays(sysData.getFullWeightTime(), numDay));
                    sysData.setEmptyWeightTime(DateUtils.addDays(sysData.getEmptyWeightTime(), numDay));
                    sysData.setCompleteTime(DateUtils.addDays(sysData.getCompleteTime(), numDay));
                }

                //货位代码
                apiData.setHwdm(api1105.getHwdm());
                apiData.setYwlx(Constant.INOUT_TYPE_2);
                apiData.setYwrq(sysData.getCompleteTime());
                apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[] { "yyyyMMdd" }));
                apiData.setCyr(sysData.getUserName());

                //默认一个随便值
@@ -119,11 +118,15 @@
                apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId().trim());

                //获取合同号
                apiData.setHth(api1105.getHwdm().substring(0,18) + apiData.getRkywdh());
                listInoutNotice = fzzySyncNoticeInRep.listInoutNoticeInById(sysData.getNoticeId());
                if(null != listInoutNotice && listInoutNotice.size() >0){
                    apiData.setHth(api1105.getHwdm().substring(0,18) + listInoutNotice.get(0).getContractId());
                }else {
                    apiData.setHth(api1105.getHwdm().substring(0,18) + apiData.getRkywdh());
                    if(StringUtils.isNotEmpty(listInoutNotice.get(0).getContractId())){
                        apiData.setHth(api1105.getHwdm().substring(0,18) + listInoutNotice.get(0).getContractId());
                    }
                    if(StringUtils.isNotEmpty(listInoutNotice.get(0).getPlanId())){
                        apiData.setJhmxh(listInoutNotice.get(0).getPlanId());
                    }
                }

                apiData.setXxdz(StringUtils.isEmpty(sysData.getUserAddress()) ? "详细地址":sysData.getUserAddress());
@@ -137,7 +140,7 @@
                apiData.setDjsj(sysData.getRegisterTime());

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

                //粮食性质
@@ -200,9 +203,29 @@
                }else {
                    apiData.setCzbz(api1202List.get(0).getCzbz());
                }
                //判断是否为船运
                if(StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")){
                    listInoutRecordItem = fzzy40SyncInoutRecordItemRep.findDataByRecordId(sysData.getId());
                    if(null == listInoutRecordItem || listInoutRecordItem.isEmpty()){
                        api1202Rep.save(apiData);
                        continue;
                    }

                //保存数据
                api1202Rep.save(apiData);
                    int idNum = Integer.valueOf(sysData.getId().substring(12))*100 + 10001;
                    for (Fz40InoutRecordItem fz40InoutRecordItem : listInoutRecordItem) {
                        apiData.setRkywdh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4,10) + String.valueOf(idNum).substring(1));
                        apiData.setMz(fz40InoutRecordItem.getFullWeight());
                        apiData.setPz(fz40InoutRecordItem.getEmptyWeight());
                        apiData.setJz(fz40InoutRecordItem.getSettleWeight());

                        api1202Rep.save(apiData);
                        idNum ++;
                    }
                }else {
                    //保存数据
                    api1202Rep.save(apiData);
                }

                log.info("1202---同步数据：{}", apiData.toString());
            }
        } catch (Exception e) {

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

@@ -11,8 +11,10 @@
import com.fzzy.api.view.repository.GbCheckItemRep;
import com.fzzy.async.fzzy40.entity.Fz40CheckItem;
import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
import com.fzzy.async.fzzy40.entity.Fz40InoutRecordItem;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1202Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1203Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40SyncInoutRecordItemRep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
@@ -36,6 +38,8 @@

    @Autowired
    private Fzzy40Sync1202Rep fzzySync1202Rep;
    @Autowired
    private Fzzy40SyncInoutRecordItemRep fzzy40SyncInoutRecordItemRep;
    @Autowired
    private Fzzy40Sync1203Rep fzzySync1203Rep;
    @Autowired
@@ -86,11 +90,25 @@
            String zkl;
            List<Api1203> api1203List;
            List<Api1202> api1102List;
            List<Fz40InoutRecordItem> listInoutRecordItem;
            List<String> listIds;
            for (Fz40InoutRecord sysData : list) {
                //查询粮食入库信息，若为空则不进行同步上传
                api1102List = api1202Rep.getDataByBizId(sysData.getId());
                if(null == api1102List || api1102List.isEmpty()){
                    continue;
                listIds = new ArrayList<>();
                //判断是否为船运
                if(StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")){
                    listInoutRecordItem = fzzy40SyncInoutRecordItemRep.findDataByRecordId(sysData.getId());
                    if(null != listInoutRecordItem && listInoutRecordItem.size() > 0){
                        int idNum = Integer.valueOf(sysData.getId().substring(12))*100 + 10001;

                        for (Fz40InoutRecordItem fz40InoutRecordItem : listInoutRecordItem) {
                            listIds.add(Constant.INOUT_TYPE_14 + sysData.getId().substring(4,10) + String.valueOf(idNum).substring(1));
                            idNum ++;
                        }
                    }else {
                        listIds.add(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));
                    }
                }else {
                    listIds.add(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));
                }

                //获取入库质检信息
@@ -100,91 +118,98 @@
                    continue;
                }

                apiData = new Api1203();

                apiData.setRkjydh(api1102List.get(0).getRkywdh());
                //货位代码
                apiData.setHwdm(api1102List.get(0).getHwdm());
                apiData.setRkywdh(api1102List.get(0).getRkywdh());
                if(null == sysData.getFullWeightTime()){
                    sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 5));
                }

                //判断业务时间与单据号是否匹配，若不匹配，则更改业务时间为单据号所在的时间
                SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
                Date time = dateFormat.parse(apiData.getRkjydh().substring(2, 8));
                int numDay = DateUtil.difDay(DateUtil.getCurZero(sysData.getRegisterTime()), DateUtil.getCurZero(time));
                if(numDay != 0){
                    sysData.setRegisterTime(DateUtils.addDays(sysData.getRegisterTime(), numDay));
                }

                apiData.setQysj(sysData.getRegisterTime());
                apiData.setQyrxm(sysData.getCheckUser());
                //扦样方式 2-智能随机
                apiData.setQyfs("2");

                //检测项，检测值，增扣价及增扣量
                jyxm = "";
                jyz = "";
                zkj = "";
                zkl = "";
                for (Fz40CheckItem fz40CheckItem : fz40CheckItems) {
                    gbCheckList = gbCheckItemRep.findByBizCode(fz40CheckItem.getStandardId());

                    if (gbCheckList == null || gbCheckList.isEmpty()) {
                for (String listId : listIds) {
                    //查询粮食入库信息，若为空则不进行同步上传
                    api1102List = api1202Rep.getDataById(listId);
                    if(null == api1102List || api1102List.isEmpty()){
                        continue;
                    }
                    if (StringUtils.isEmpty(fz40CheckItem.getValue())) {
                        continue;

                    apiData = new Api1203();

                    apiData.setRkjydh(api1102List.get(0).getRkywdh());
                    //货位代码
                    apiData.setHwdm(api1102List.get(0).getHwdm());
                    apiData.setRkywdh(api1102List.get(0).getRkywdh());
                    if(null == sysData.getFullWeightTime()){
                        sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 5));
                    }
                    jyxm += gbCheckList.get(0).getCode() + ",";
                    jyz += fz40CheckItem.getValue() + ",";
                    zkj += ",0.0";
                    zkl += ",0.0";

                    //判断业务时间与单据号是否匹配，若不匹配，则更改业务时间为单据号所在的时间
                    SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
                    Date time = dateFormat.parse(apiData.getRkjydh().substring(2, 8));
                    int numDay = DateUtil.difDay(DateUtil.getCurZero(sysData.getRegisterTime()), DateUtil.getCurZero(time));
                    if(numDay != 0){
                        sysData.setRegisterTime(DateUtils.addDays(sysData.getRegisterTime(), numDay));
                    }

                    apiData.setQysj(sysData.getRegisterTime());
                    apiData.setQyrxm(sysData.getCheckUser());
                    //扦样方式 2-智能随机
                    apiData.setQyfs("2");

                    //检测项，检测值，增扣价及增扣量
                    jyxm = "";
                    jyz = "";
                    zkj = "";
                    zkl = "";
                    for (Fz40CheckItem fz40CheckItem : fz40CheckItems) {
                        gbCheckList = gbCheckItemRep.findByBizCode(fz40CheckItem.getStandardId());

                        if (gbCheckList == null || gbCheckList.isEmpty()) {
                            continue;
                        }
                        if (StringUtils.isEmpty(fz40CheckItem.getValue())) {
                            continue;
                        }
                        jyxm += gbCheckList.get(0).getCode() + ",";
                        jyz += fz40CheckItem.getValue() + ",";
                        zkj += ",0.0";
                        zkl += ",0.0";
                    }

                    apiData.setJyxm(jyxm);
                    apiData.setJyz(jyz);
                    apiData.setZkj(StringUtils.isEmpty(zkj)?"":zkj.substring(1));
                    apiData.setZkl(StringUtils.isEmpty(zkl)?"":zkl.substring(1));
                    if("UNPASS".equals(sysData.getCheckStatus())){
                        apiData.setJyjg("0");
                    }
                    if("PASS".equals(sysData.getCheckStatus())){
                        apiData.setJyjg("1");
                    }
                    apiData.setJyrxm(sysData.getCheckUser());
                    apiData.setJysj(DateUtils.addMinutes(sysData.getRegisterTime(), 30));

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

                    //保管员复核
                    apiData.setBgyfh(apiData.getJyjg());

                    //粮食等级
                    mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, sysData.getFoodLevel());
                    apiData.setLsdd(mappingCode);

                    //操作标志及最后更新时间
                    apiData.setZhgxsj(sysData.getCompleteTime());

                    //业务id、库区编码、同步时间
                    apiData.setBizId(sysData.getId());
                    apiData.setKqdm(kqdm);
                    apiData.setSyncTime(new Date());

                    api1203List = api1203Rep.getDataById(apiData.getRkjydh());
                    if(null == api1203List || api1203List.isEmpty()){
                        apiData.setCzbz(Constant.CZBZ_I);
                    }else {
                        apiData.setCzbz(api1203List.get(0).getCzbz());
                    }

                    api1203Rep.save(apiData);
                    log.info("1203---同步数据：{}", apiData.toString());
                }

                apiData.setJyxm(jyxm);
                apiData.setJyz(jyz);
                apiData.setZkj(zkj.substring(1));
                apiData.setZkl(zkl.substring(1));
                if("UNPASS".equals(sysData.getCheckStatus())){
                    apiData.setJyjg("0");
                }
                if("PASS".equals(sysData.getCheckStatus())){
                    apiData.setJyjg("1");
                }
                apiData.setJyrxm(sysData.getCheckUser());
                apiData.setJysj(DateUtils.addMinutes(sysData.getRegisterTime(), 30));

                //粮食品种
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
                apiData.setLspzdm(mappingCode);

                //保管员复核
                apiData.setBgyfh(apiData.getJyjg());

                //粮食等级
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, sysData.getFoodLevel());
                apiData.setLsdd(mappingCode);

                //操作标志及最后更新时间
                apiData.setZhgxsj(sysData.getCompleteTime());

                //业务id、库区编码、同步时间
                apiData.setBizId(sysData.getId());
                apiData.setKqdm(kqdm);
                apiData.setSyncTime(new Date());

                api1203List = api1203Rep.getDataById(apiData.getRkjydh());
                if(null == api1203List || api1203List.isEmpty()){
                    apiData.setCzbz(Constant.CZBZ_I);
                }else {
                    apiData.setCzbz(api1203List.get(0).getCzbz());
                }

                //保存数据
                api1203Rep.save(apiData);
                log.info("1203---同步数据：{}", apiData.toString());
            }
        } catch (Exception e) {
            log.error("---同步失败----{}", e);

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

@@ -12,7 +12,9 @@
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy40.entity.Fz40InoutNoticeOut;
import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
import com.fzzy.async.fzzy40.entity.Fz40InoutRecordItem;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1202Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40SyncInoutRecordItemRep;
import com.fzzy.async.fzzy40.repository.Fzzy40SyncNoticeOutRep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -37,6 +39,8 @@
    private final static String INOUT_TYPE_OUT = "OUT";
    @Autowired
    private Fzzy40Sync1202Rep fzzySync1202Rep;
    @Autowired
    private Fzzy40SyncInoutRecordItemRep fzzy40SyncInoutRecordItemRep;
    @Autowired
    private Fzzy40SyncNoticeOutRep fzzySyncNoticeOutRep;
    @Autowired
@@ -80,7 +84,11 @@
        Api1105 api1105;
        List<Fz40InoutNoticeOut> listInoutNotice;
        List<Api1205> api1205List;
        List<Fz40InoutRecordItem> listInoutRecordItem;
        for (Fz40InoutRecord sysData : list) {
            if(sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")){
                continue;
            }
            if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
                sysData.setRecordWeight(sysData.getSettleWeight());
            }
@@ -95,15 +103,6 @@
            }
            apiData = new Api1205();
            apiData.setCkywdh(Constant.INOUT_TYPE_15 + sysData.getId().substring(4));
            //判断业务时间与单据号是否匹配，若不匹配，则更改业务时间为单据号所在的时间
            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
            Date time = dateFormat.parse(sysData.getId().substring(2, 10));
            int numDay = DateUtil.difDay(DateUtil.getCurZero(sysData.getCompleteTime()), DateUtil.getCurZero(time));
            if(numDay != 0){
                sysData.setFullWeightTime(DateUtils.addDays(sysData.getFullWeightTime(), numDay));
                sysData.setEmptyWeightTime(DateUtils.addDays(sysData.getEmptyWeightTime(), numDay));
                sysData.setCompleteTime(DateUtils.addDays(sysData.getCompleteTime(), numDay));
            }

            //货位代码
            apiData.setHwdm(api1105.getHwdm());
@@ -112,16 +111,19 @@
            //通知单号
            apiData.setCktzdh(sysData.getNoticeId());

            apiData.setYwrq(sysData.getRegisterTime());
            apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[] { "yyyyMMdd" }));

            //获取合同号
            apiData.setHth(api1105.getHwdm().substring(0,18) + apiData.getCkywdh());
            listInoutNotice = fzzySyncNoticeOutRep.listInoutNoticeOutById(sysData.getNoticeId());
            if(null != listInoutNotice && listInoutNotice.size() >0){
                apiData.setHth(api1105.getHwdm().substring(0,18) + listInoutNotice.get(0).getContractId());
            }else {
                apiData.setHth(api1105.getHwdm().substring(0,18) + apiData.getCkywdh());
                if(StringUtils.isNotEmpty(listInoutNotice.get(0).getContractId())){
                    apiData.setHth(api1105.getHwdm().substring(0,18) + listInoutNotice.get(0).getContractId());
                }
                if(StringUtils.isNotEmpty(listInoutNotice.get(0).getPlanId())){
                    apiData.setJhmxh(listInoutNotice.get(0).getPlanId());
                }
            }


            //运输工具，若为空，则默认给1-汽车
            apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1":sysData.getTransType());
@@ -131,7 +133,7 @@
            apiData.setDjsj(sysData.getRegisterTime());

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

            //粮食等级
@@ -188,8 +190,27 @@
            }else {
                apiData.setCzbz(api1205List.get(0).getCzbz());
            }
            //保存数据
            api1205Rep.save(apiData);
            //判断是否为船运
            if(StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")){
                listInoutRecordItem = fzzy40SyncInoutRecordItemRep.findDataByRecordId(sysData.getId());
                if(null == listInoutRecordItem || listInoutRecordItem.isEmpty()){
                    api1205Rep.save(apiData);
                    continue;
                }

                int idNum = Integer.valueOf(sysData.getId().substring(12))*100 + 10001;
                for (Fz40InoutRecordItem fz40InoutRecordItem : listInoutRecordItem) {
                    apiData.setCkywdh(Constant.INOUT_TYPE_15 + sysData.getId().substring(4,10) + String.valueOf(idNum).substring(1));
                    apiData.setMz(fz40InoutRecordItem.getFullWeight());
                    apiData.setPz(fz40InoutRecordItem.getEmptyWeight());
                    apiData.setJz(fz40InoutRecordItem.getSettleWeight());
                    api1205Rep.save(apiData);
                    idNum ++;
                }
            }else {
                //保存数据
                api1205Rep.save(apiData);
            }
        }
        } catch (Exception e) {
            log.error("---同步失败----{}", e);

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

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

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

                //粮食性质

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

@@ -87,9 +87,7 @@
                if(StringUtils.isNotEmpty(sysData.getCardId())){
                    apiData.setLxrsfzh(sysData.getCardId());
                }
                if(StringUtils.isNotEmpty(sysData.getYzbm())){
                    apiData.setYzbm(sysData.getYzbm());
                }
                apiData.setYzbm(StringUtils.isEmpty(sysData.getYzbm()) ? "000000" :sysData.getYzbm());
                apiData.setDzyx(StringUtils.isEmpty(sysData.getDzyx()) ? "" :sysData.getDzyx());
                apiData.setKhfkhh(StringUtils.isEmpty(sysData.getBank()) ? "999" :sysData.getBank());
                apiData.setKhfzh(StringUtils.isEmpty(sysData.getBankNum()) ? "" :sysData.getBankNum());

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

@@ -13,6 +13,7 @@
import com.fzzy.push.sh2023.SH2023Constant;
import com.fzzy.push.sh2023.dto.SH2023Api1311;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Date;
@@ -74,12 +75,14 @@
                    sh2023Api1311.setJkcs("9");
                }
                sh2023Api1311.setJkxlh(sysData.getSn());
                if (sysData.getAzwzlx().equals("08")) {
                    sh2023Api1311.setSpjklx("1");
                } else if (secType.indexOf(sysData.getAzwzlx()) >= 0) {
                    sh2023Api1311.setSpjklx("2");
                } else {
                    sh2023Api1311.setSpjklx("3");
                if(StringUtils.isNotEmpty(sysData.getAzwzlx())){
                    if (sysData.getAzwzlx().equals("08")) {
                        sh2023Api1311.setSpjklx("1");
                    } else if (secType.indexOf(sysData.getAzwzlx()) >= 0) {
                        sh2023Api1311.setSpjklx("2");
                    } else {
                        sh2023Api1311.setSpjklx("3");
                    }
                }
                sh2023Api1311.setSblxbm("1");
                sh2023Api1311.setAzwzlx(sysData.getAzwzlx());

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

@@ -2,13 +2,11 @@

import com.alibaba.fastjson.JSON;
import com.fzzy.api.Constant;
import com.fzzy.api.entity.Api1102;
import com.fzzy.api.entity.Api1105;
import com.fzzy.api.entity.ApiInfoData;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.ApiConfsRep;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy40.entity.Fz40Depot;
@@ -45,9 +43,9 @@
    @Autowired
    private ApiCommonService commonService;
    @Autowired
    private Api1102Rep api1102Rep;
    @Autowired
    private ApiLogRep apiLogRep;
    @Autowired
    private ApiConfsRep apiConfsRep;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;

@@ -72,17 +70,17 @@
        apiLog.setStatus(99);
        apiLog.setId(ContextUtil.getUUID());
        try {
            //由于depotConf表中没有库区编码，先查询仓库表
            List<Fz40Depot> list = fzzy40SyncDepotRep.listDepotList(deptId);

            if (null == list || list.isEmpty()) {
                log.info("2103---粮情设备配置同步数据：没有查询到仓库信息");
                return;
            }

            List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
            List<ApiConfs> apiConf = apiConfsRep.getDataByKqdm(kqdm);
            String bjw = "";
            if (null != api1102List && api1102List.size() > 0) {
                bjw = ShAreaBjw.getBjw(api1102List.get(0).getXzqhdm());
            if (null != apiConf && apiConf.size() > 0) {
                bjw = apiConf.get(0).getUserName();
            }

            SH2023Api2103 sh2023Api2103;
@@ -116,10 +114,11 @@
                // 1-3-5
                // 8-8-8
                //筒仓规则
                sh2023Api2103.setDlqs("0");
                if (StringUtils.isNotEmpty(depotConf.getCableCir())) {
                    sh2023Api2103.setDlqs(String.valueOf(strs.length));
                    sh2023Api2103.setDlhs(null);
                    sh2023Api2103.setDlls(null);
                    sh2023Api2103.setDlhs("0");
                    sh2023Api2103.setDlls("0");

                    //电缆圈排列详情
                    listItem = new ArrayList<>();
@@ -176,8 +175,10 @@
                apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2103, infoData.getDataId(),kqdm);
                if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
                    infoData.setCzbz(Constant.CZBZ_I);
                    sh2023Api2103.setCzbz(Constant.CZBZ_I);
                } else {
                    infoData.setCzbz(apiInfoDataList.get(0).getCzbz());
                    sh2023Api2103.setCzbz(apiInfoDataList.get(0).getCzbz());
                }

                infoData.setData(JSON.toJSONString(sh2023Api2103));

 src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1310Rep.java

@@ -11,7 +11,7 @@
/**
 * æŸ¥è¯¢è´¨æ£€æ•°æ®
 *
 * @author chen
 * @author czt
 * @date 2023-05-14 19:55
 */
public interface Fzzy40Sync1310Rep extends JpaRepository<Fz40Quality, String> {
@@ -22,6 +22,6 @@
     * @param end
     * @return
     */
    @Query("from Fz40Quality where time >=:start and time <:end order by time ")
    @Query("from Fz40Quality where updateTime >=:start and updateTime <:end order by updateTime ")
    List<Fz40Quality> findDateByTime(@Param("start") Date start, @Param("end") Date end);
}

 src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40SyncInoutRecordItemRep.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
package com.fzzy.async.fzzy40.repository;

import com.fzzy.async.fzzy40.entity.Fz40InoutRecordItem;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import java.util.List;

/**
 * æŸ¥è¯¢èˆ¹è¿æµæ°´å­è¡¨ä¿¡æ¯
 *
 * @author czt
 *
 * @date 2023-08-21
 */
public interface Fzzy40SyncInoutRecordItemRep extends JpaRepository<Fz40InoutRecordItem, String> {

    /**
     * æ ¹æ®ä»“库编码获取粮情参数配置信息
     * @param recordId
     * @return
     */
    @Query("from Fz40InoutRecordItem where recordId =:recordId order by createTime ")
    List<Fz40InoutRecordItem> findDataByRecordId(@Param("recordId") String recordId);
}

 src/main/java/com/fzzy/async/sh2021/package-info.java

ÎļþÒÑɾ³ý

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

@@ -125,6 +125,14 @@
        <Property name="dataType">Date</Property>
        <Property name="label">最后更新时间</Property>
      </PropertyDef>
      <PropertyDef name="czbz">
        <Property name="label">操作标志</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;CZBZ&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <Reference name="sh2023Api2103Items">
        <Property name="dataType">[dtItem]</Property>
        <Property name="dataProvider">sHApi2103PR#itemList</Property>
@@ -361,6 +369,10 @@
        <Property name="property">bjw</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="czbz">
        <Property name="property">czbz</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="zhgxsj">
        <Property name="property">zhgxsj</Property>
        <Property name="align">center</Property>
@@ -416,6 +428,21 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">bjw</Property>
                <Property name="property">bjw</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">czbz</Property>
                <Property name="property">czbz</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">dlcs</Property>
                <Property name="property">dlcs</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">dlhs</Property>
                <Property name="property">dlhs</Property>
                <Editor/>
@@ -426,23 +453,8 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">dlcs</Property>
                <Property name="property">dlcs</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">dlqs</Property>
                <Property name="property">dlqs</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">scqd</Property>
                <Property name="property">scqd</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">sczd</Property>
                <Property name="property">sczd</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
@@ -451,18 +463,28 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">zczd</Property>
                <Property name="property">zczd</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">xcqd</Property>
                <Property name="property">xcqd</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">sczd</Property>
                <Property name="property">sczd</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">zczd</Property>
                <Property name="property">zczd</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">xczd</Property>
                <Property name="property">xczd</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">dlqs</Property>
                <Property name="property">dlqs</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
@@ -475,11 +497,7 @@
                <Property name="property">yxfwjsc</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">bjw</Property>
                <Property name="property">bjw</Property>
                <Editor/>
              </AutoFormElement>

              <AutoFormElement>
                <Property name="name">zhgxsj</Property>
                <Property name="property">zhgxsj</Property>

 src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2103PR.java

@@ -158,7 +158,7 @@

    @Expose
    public String pushData(List<SH2023Api2103> items) {
        ResponseDto responseDto;

        String result = "";

        String kqdm = items.get(0).getHwdm().substring(0, 21);
@@ -169,7 +169,7 @@
        }

        //封装参数
        ApiParam param = new ApiParam(apiConf, "21", SH2023Constant.SH_2023_API_CODE_2103);
        ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_13, SH2023Constant.SH_2023_API_CODE_2103);

        //获取实现接口
        ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -177,14 +177,11 @@
            return "系统没有当前推送协议配置，执行失败";
        }

        //推送，数据为集合形式
        responseDto = apiService.pushData(param, apiConf, items);
        if (responseDto.getSuccess() == 0) {
            //推送成功，更新数据上传状态

            ApiInfoData infoData;
            for (SH2023Api2103 data : items) {

        ResponseDto responseDto;
        ApiInfoData infoData;
        for (SH2023Api2103 data : items) {
            responseDto = apiService.pushData(param, apiConf, data);
            if (responseDto.getSuccess() == 0) {
                infoData = new ApiInfoData();
                infoData.setId(data.getHwdm());
                infoData.setKqdm(data.getHwdm().substring(0, 21));
@@ -195,13 +192,10 @@

                infoData.setCzbz(Constant.CZBZ_U);
                infoData.setData(JSON.toJSONString(data));

                apiInfoDataRep.save(infoData);

            }
            result += responseDto.toString();
        }
        return result;
    }

}

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

@@ -621,27 +621,40 @@
            return api1404;
        }
        if (SH2023Constant.SH_2023_API_CODE_2101.equals(inteId)) {
            //设置空属性为默认值
            changeObject(data);
            return data;
        }
        if (SH2023Constant.SH_2023_API_CODE_2102.equals(inteId)) {
            //设置空属性为默认值
            changeObject(data);
            return data;
        }
        if (SH2023Constant.SH_2023_API_CODE_2103.equals(inteId)) {
            SH2023Api2103 api2103 = new SH2023Api2103();
            BeanUtils.copyProperties(data, api2103);
            List<SH2023Api2103Item> listItems = castList(api2103.getDlqplxq(), SH2023Api2103Item.class);
            api2103.setSh2023Api2103Items(listItems);
            return api2103;
            SH2023Api2103 apiData = new SH2023Api2103();
            BeanUtils.copyProperties(data, apiData);
            //设置空属性为默认值
            changeObject(apiData);
            return apiData;
        }
        if (SH2023Constant.SH_2023_API_CODE_2104.equals(inteId)) {
            //设置空属性为默认值
            changeObject(data);
            return data;
        }
        if (SH2023Constant.SH_2023_API_CODE_2203.equals(inteId)) {

            //设置空属性为默认值
            changeObject(data);
            return data;
        }
        if (SH2023Constant.SH_2023_API_CODE_2204.equals(inteId)) {
            //设置空属性为默认值
            changeObject(data);
            return data;
        }
        //设置空属性为默认值
        changeObject(data);
        return data;
    }


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

@@ -440,26 +440,26 @@
     */
    public void pushData2101(ApiRemoteService apiRemoteService, ApiParam param) {
        //获取 æ£€æ–¤å•ä¿¡æ¯
        List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(SH2023Constant.SH_2023_API_CODE_2101);

        param.setInteCategory(Constant.API_CATEGORY_12);
        param.setInteId(SH2023Constant.SH_2023_API_CODE_2101);

        ResponseDto responseDto;
        SH2023Api2101 shApi2101;
        for (ApiInfoData infoData : items) {
            shApi2101 = JSONObject.parseObject(infoData.getData(), SH2023Api2101.class);
            shApi2101.setCzbz(infoData.getCzbz());
            shApi2101.setZhgxsj(infoData.getUpdateTime());
            param.setBizId(infoData.getDataId());
            responseDto = apiRemoteService.pushData(param, shApi2101);
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(infoData.getCzbz())) {
                    infoData.setCzbz(Constant.CZBZ_U);
                    apiInfoDataRep.save(infoData);
                }
            }
        }
//        List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(SH2023Constant.SH_2023_API_CODE_2101);
//
//        param.setInteCategory(Constant.API_CATEGORY_12);
//        param.setInteId(SH2023Constant.SH_2023_API_CODE_2101);
//
//        ResponseDto responseDto;
//        SH2023Api2101 shApi2101;
//        for (ApiInfoData infoData : items) {
//            shApi2101 = JSONObject.parseObject(infoData.getData(), SH2023Api2101.class);
//            shApi2101.setCzbz(infoData.getCzbz());
//            shApi2101.setZhgxsj(infoData.getUpdateTime());
//            param.setBizId(infoData.getDataId());
//            responseDto = apiRemoteService.pushData(param, shApi2101);
//            if (responseDto.getSuccess() == 0) {
//                if (Constant.CZBZ_I.equals(infoData.getCzbz())) {
//                    infoData.setCzbz(Constant.CZBZ_U);
//                    apiInfoDataRep.save(infoData);
//                }
//            }
//        }
    }

    /**
@@ -475,26 +475,26 @@
     */
    public void pushData2104(ApiRemoteService apiRemoteService, ApiParam param) {
        //获取 æ£€æ–¤å•ä¿¡æ¯
        List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(SH2023Constant.SH_2023_API_CODE_2104);
//        List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(SH2023Constant.SH_2023_API_CODE_2104);

        param.setInteCategory(Constant.API_CATEGORY_12);
        param.setInteId(SH2023Constant.SH_2023_API_CODE_2104);

        ResponseDto responseDto;
        SH2023Api2104 shApi2104;
        for (ApiInfoData infoData : items) {
            shApi2104 = JSONObject.parseObject(infoData.getData(), SH2023Api2104.class);
            shApi2104.setCzbz(infoData.getCzbz());
            shApi2104.setZhgxsj(infoData.getUpdateTime());

            param.setBizId(infoData.getDataId());
            responseDto = apiRemoteService.pushData(param, shApi2104);
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(infoData.getCzbz())) {
                    infoData.setCzbz(Constant.CZBZ_U);
                    apiInfoDataRep.save(infoData);
                }
            }
        }
//        param.setInteCategory(Constant.API_CATEGORY_12);
//        param.setInteId(SH2023Constant.SH_2023_API_CODE_2104);
//
//        ResponseDto responseDto;
//        SH2023Api2104 shApi2104;
//        for (ApiInfoData infoData : items) {
//            shApi2104 = JSONObject.parseObject(infoData.getData(), SH2023Api2104.class);
//            shApi2104.setCzbz(infoData.getCzbz());
//            shApi2104.setZhgxsj(infoData.getUpdateTime());
//
//            param.setBizId(infoData.getDataId());
//            responseDto = apiRemoteService.pushData(param, shApi2104);
//            if (responseDto.getSuccess() == 0) {
//                if (Constant.CZBZ_I.equals(infoData.getCzbz())) {
//                    infoData.setCzbz(Constant.CZBZ_U);
//                    apiInfoDataRep.save(infoData);
//                }
//            }
//        }
    }
}

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

@@ -205,27 +205,27 @@
     */
    public void pushData2203(ApiRemoteService apiRemoteService, ApiParam param) {
        //获取交易中心合同
        List<Api1201> list = api1201Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == list || list.isEmpty()) {
            log.error("-----上海市平台2023版：未获取到轮换计划明细，不推送-----");
            return;
        }
        param.setInteCategory(Constant.API_CATEGORY_14);
        param.setInteId(SH2023Constant.SH_2023_API_CODE_2203);

        ResponseDto responseDto;
        for (Api1201 data : list) {
            param.setBizId(data.getBizId());
            responseDto = apiRemoteService.pushData(param, data);
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    data.setCzbz(Constant.CZBZ_U);
                    //更新状态
                    api1201Rep.save(data);
                }
            }
        }
//        List<Api1201> list = api1201Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
//
//        if (null == list || list.isEmpty()) {
//            log.error("-----上海市平台2023版：未获取到轮换计划明细，不推送-----");
//            return;
//        }
//        param.setInteCategory(Constant.API_CATEGORY_14);
//        param.setInteId(SH2023Constant.SH_2023_API_CODE_2203);
//
//        ResponseDto responseDto;
//        for (Api1201 data : list) {
//            param.setBizId(data.getBizId());
//            responseDto = apiRemoteService.pushData(param, data);
//            if (responseDto.getSuccess() == 0) {
//                if (Constant.CZBZ_I.equals(data.getCzbz())) {
//                    data.setCzbz(Constant.CZBZ_U);
//                    //更新状态
//                    api1201Rep.save(data);
//                }
//            }
//        }
    }

    /**
@@ -233,27 +233,27 @@
     */
    public void pushData2204(ApiRemoteService apiRemoteService, ApiParam param) {
        //获取定化水检验
        List<Api1310> list = api1310Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());

        if (null == list || list.isEmpty()) {
            log.error("-----上海市平台2023版：未获取到定化水检验，不推送-----");
            return;
        }
        param.setInteCategory(Constant.API_CATEGORY_14);
        param.setInteId(SH2023Constant.SH_2023_API_CODE_2204);

        ResponseDto responseDto;
        for (Api1310 data : list) {
            param.setBizId(data.getBizId());
            responseDto = apiRemoteService.pushData(param, data);
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {

                    data.setCzbz(Constant.CZBZ_U);
                    //更新状态
                    api1310Rep.save(data);
                }
            }
        }
//        List<Api1310> list = api1310Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
//
//        if (null == list || list.isEmpty()) {
//            log.error("-----上海市平台2023版：未获取到定化水检验，不推送-----");
//            return;
//        }
//        param.setInteCategory(Constant.API_CATEGORY_14);
//        param.setInteId(SH2023Constant.SH_2023_API_CODE_2204);
//
//        ResponseDto responseDto;
//        for (Api1310 data : list) {
//            param.setBizId(data.getBizId());
//            responseDto = apiRemoteService.pushData(param, data);
//            if (responseDto.getSuccess() == 0) {
//                if (Constant.CZBZ_I.equals(data.getCzbz())) {
//
//                    data.setCzbz(Constant.CZBZ_U);
//                    //更新状态
//                    api1310Rep.save(data);
//                }
//            }
//        }
    }
}

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

@@ -75,7 +75,7 @@
    private Date zhgxsj;

    @Transient
    @JsonIgnore
    @JSONField(serialize = false)
    private List<SH2023Api2103Item> sh2023Api2103Items;

}