增加合同、计划数据同步时的附件信息同步

CZT

2024-01-30 f58c03f4c98b3664f22a3ec4e920fb2a42473ab9

增加合同、计划数据同步时的附件信息同步

 src/main/java/com/fzzy/api/utils/FileUtils.java

@@ -110,4 +110,18 @@
        }
        return basePath;
    }

    public String getCommonFilePath(Date date) {
        if (null == date)
            date = new Date();

        String basePath = configData.getImgPath() + "COMMON/"
                + DateFormatUtils.format(date, "yyyyMM") + "/";

        File file = new File(basePath);
        if (!file.exists()) {
            file.mkdirs();
        }
        return basePath;
    }
}

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

@@ -227,4 +227,18 @@
    @PropertyDef(label = "更新时间")
    private Date updateTime;

    /**
     * --------附件--------
     **/
    @Column(name = "FILE_ID_", length = 30)
    @PropertyDef(label = "附件id")
    private String fileId;

    @Column(name = "FILE_NAME_", length = 50)
    @PropertyDef(label = "附件名称")
    private String fileName;

    @Column(name = "FILE_TIME_")
    @PropertyDef(label = "附件上传时间")
    private Date fileTime;
}

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

@@ -84,4 +84,19 @@
    @PropertyDef(label = "备注")
    private String remark;

    /**
     * --------附件--------
     **/
    @Column(name = "FILE_ID_", length = 30)
    @PropertyDef(label = "附件id")
    private String fileId;

    @Column(name = "FILE_NAME_", length = 50)
    @PropertyDef(label = "附件名称")
    private String fileName;

    @Column(name = "FILE_TIME_")
    @PropertyDef(label = "附件上传时间")
    private Date fileTime;

}

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

@@ -1,14 +1,12 @@
package com.fzzy.async.fzzy40.impl;

import com.fzzy.api.Constant;
import com.fzzy.api.entity.Api1102;
import com.fzzy.api.entity.Api1201;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1201Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.api.utils.FileUtils;
import com.fzzy.api.view.repository.*;
import com.fzzy.async.fzzy40.entity.Fz40InoutContract;
import com.fzzy.async.fzzy40.entity.Fz40InoutCustomer;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1201Rep;
@@ -17,7 +15,6 @@
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -35,6 +32,12 @@
    private Fzzy40Sync1201Rep fzzySync1201Rep;
    @Autowired
    private ApiTriggerService apiTriggerService;
    @Autowired
    private ApiConfsRep apiConfsRep;
    @Autowired
    private FileUtils fileUtil;
    @Autowired
    private Api1109Rep api1109Rep;
    @Autowired
    private Api1201Rep api1201Rep;
    @Autowired
@@ -63,7 +66,7 @@
        apiLog.setStatus(99);
        apiLog.setId(ContextUtil.getUUID());
        try {
            List<Fz40InoutContract> list = fzzySync1201Rep.listContract(deptId);
            List<Fz40InoutContract> list = fzzySync1201Rep.listContract(deptId, start, end);

            if (null == list || list.isEmpty()) {
                log.debug("-------------没有获取到合同信息------------------");
@@ -76,6 +79,8 @@
            Api1201 apiData;
            List<Api1201> api1201List;
            List<Fz40InoutCustomer> listCustomer;
            Api1109 api1109;
            List<Api1109> api1109List;
            for (Fz40InoutContract sysData : list) {

                apiData = new Api1201();
@@ -150,9 +155,48 @@

                //保存数据
                api1201Rep.save(apiData);
                log.info("1201---合同同步数据：{}", apiData.toString());

                //若附件id不为空，则判断是否为上海协议，上海协议时，需同时同步合同附件信息
                if(StringUtils.isNotEmpty(sysData.getFileId())){
                    //若为上海省平台协议，则需同时同步合同附件信息
                    List<ApiConfs> apiConfs = apiConfsRep.getDataByKqdm(kqdm);
                    if(null != apiConfs && PushProtocol.SB_SH_2023.getCode().equals(apiConfs.get(0).getPushProtocol())){
                        api1109 = new Api1109();
                        //主键id
                        api1109.setId(apiData.getHth());
                        //文件路径
                        api1109.setWjdz(fileUtil.getCommonFilePath(sysData.getFileTime()) + sysData.getFileId());

                log.info("1201---同步数据：{}", apiData.toString());
                        String kzm = "pdf"; //扩展名：默认为pdf
                        String[] split = sysData.getFileId().split("\\.");
                        if(split.length > 0){
                            kzm = split[split.length -1];
                        }

                        //文件名称(合同号+扩展名)
                        api1109.setWjmc(apiData.getHth() + "." + kzm);
                        //文件类型
                        api1109.setWjlx("6"); //6-合同文件(pdf,jpg)
                        api1109.setYwdh(apiData.getHth()); //6-合同文件(pdf,jpg)
                        //操作标志及最后更新时间
                        api1109.setZhgxsj(new Date());

                        //业务id、库区编码、同步时间
                        api1109.setBizId(apiData.getHth());
                        api1109.setKqdm(kqdm);
                        api1109.setSyncTime(new Date());
                        api1109List = api1109Rep.getDataByBizId(api1109.getBizId());
                        if (null == api1109List || api1109List.isEmpty()) {
                            api1109.setCzbz(Constant.CZBZ_I);
                        } else {
                            api1109.setCzbz(api1109List.get(0).getCzbz());
                        }
                        //保存数据
                        api1109Rep.save(api1109);
                        log.info("1201---合同附件信息同步：{}", api1109.toString());
                    }
                }
            }
        } catch (Exception e) {
            log.error("---合同同步执行失败----{}", e);

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

@@ -120,7 +120,7 @@
                api1307Rep.save(apiData);
                log.info("1307---同步数据：{}", apiData.toString());

                //若为上海省平台协议，则需同事同步文件信息
                //若为上海省平台协议，则需同时同步文件信息
                List<ApiConfs> apiConfs = apiConfsRep.getDataByKqdm(kqdm);
                if(null != apiConfs && PushProtocol.SB_SH_2023.getCode().equals(apiConfs.get(0).getPushProtocol())){
                    api1109 = new Api1109();

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

@@ -1,16 +1,16 @@
package com.fzzy.async.fzzy40.impl;

import com.fzzy.api.Constant;
import com.fzzy.api.entity.Api1101;
import com.fzzy.api.entity.Api1403;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.entity.*;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.utils.FileUtils;
import com.fzzy.api.view.repository.Api1101Rep;
import com.fzzy.api.view.repository.Api1403Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy40.entity.Fz40InoutPlan;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1403Rep;
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;
@@ -28,6 +28,8 @@

    @Autowired
    private Fzzy40Sync1403Rep fzzy40Sync1403Rep;
    @Autowired
    private FileUtils fileUtil;
    @Autowired
    private Api1101Rep api1101Rep;
    @Autowired
@@ -70,18 +72,28 @@
                api1403.setKszxrq(fz35Plan.getBeginTime());
                api1403.setJzzxrq(fz35Plan.getEndTime());
                api1101List = api1101Rep.findPushData(kqdm);
                if(null != api1101List && api1101List.size() > 0){
                if (null != api1101List && api1101List.size() > 0) {
                    api1403.setJhxddw(api1101List.get(0).getDwdm());
                }
                api1403.setJhxdsj(fz35Plan.getCreateTime());
                api1403.setManageWay("1"); //默认直储
                api1403.setRotationType("1"); //默认静态轮换

                //若附件id不为空，则判断是否为广东省平台协议，广东省平台协议时，需同时同步计划附件信息
                if (StringUtils.isNotEmpty(fz35Plan.getFileId())) {
                    //文件路径
                    api1403.setWjdz(fileUtil.getCommonFilePath(fz35Plan.getFileTime()) + fz35Plan.getFileId());
                    //文件名称
                    api1403.setFileName(fz35Plan.getFileName());
                }

                api1403.setZhgxsj(new Date());
                api1403.setKqdm(kqdm);
                api1403.setBizId(fz35Plan.getId());
                api1403List = api1403Rep.getDataByLhjhdh(api1403.getLhjhdh());
                if(null == api1403List || api1403List.isEmpty()){
                if (null == api1403List || api1403List.isEmpty()) {
                    api1403.setCzbz(Constant.CZBZ_I);
                }else {
                } else {
                    api1403.setCzbz(api1403List.get(0).getCzbz());
                }
                api1403Rep.save(api1403);

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

@@ -4,6 +4,8 @@
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;

import java.util.Date;
import java.util.List;

/**
@@ -18,8 +20,6 @@
     * @param end
     * @return
     */
//    @Query("from Fz40InoutContract where deptId=:deptId and updateTime >=:start and updateTime <:end order by updateTime ")
//    List<Fz40InoutContract> listContract(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
    @Query("from Fz40InoutContract where deptId=:deptId order by updateTime ")
    List<Fz40InoutContract> listContract(@Param("deptId") String deptId);
    @Query("from Fz40InoutContract where deptId=:deptId and updateTime >=:start and updateTime <:end order by updateTime ")
    List<Fz40InoutContract> listContract(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
}