优化4.0版本-出入库及合同同步

CZT

2023-08-14 3b4b16061d0373e3eb5c6473586c6c6edd9393de

优化4.0版本-出入库及合同同步

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

@@ -117,7 +117,7 @@
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_BANK, sysData.getBank());
                apiData.setBfkhh(mappingCode == null ? "999" : mappingCode);

                apiData.setBfzh(StringUtils.isEmpty(sysData.getBankAccount()) ? "1000000000000000000" : sysData.getBankAccount());
                apiData.setBfzh(StringUtils.isEmpty(sysData.getBankAccount()) ? "100000000000000000" : sysData.getBankAccount());

                apiData.setWcrq(sysData.getEndTime());

@@ -125,9 +125,7 @@

                apiData.setSyncTime(new Date());
                apiData.setBizId(sysData.getId());

                apiLog.setDataId(apiData.getBizId());
                apiLog.setKqdm(kqdm);
                apiData.setKqdm(kqdm);

                api1201List = api1201Rep.getDataById(apiData.getHth());
                if(null == api1201List || api1201List.isEmpty()){

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

@@ -101,7 +101,7 @@
                apiData.setBizId(sysData.getId());


                api1212List = api1212Rep.getDataById(sysData.getKhbh());
                api1212List = api1212Rep.getDataById(sysData.getId());
                if(null == api1212List || api1212List.isEmpty()){
                    apiData.setCzbz(Constant.CZBZ_I);
                }else {

 src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1212Rep.java

@@ -1,12 +1,9 @@
package com.fzzy.async.fzzy35.repository;

import com.fzzy.async.fzzy35.entity.Fz35InoutCustomer;
import com.fzzy.async.fzzy35.entity.Fz35MContract;
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;

/**
@@ -22,7 +19,4 @@
    @Query("from Fz35InoutCustomer where deptId=:deptId order by id ")
    List<Fz35InoutCustomer> listInoutCustomer(@Param("deptId") String deptId);


    @Query("from Fz35InoutCustomer where khbh=:khbh ")
    List<Fz35InoutCustomer> getDataById(@Param("khbh") String khbh);
}

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

@@ -42,9 +42,9 @@
        Date end = param.getEnd();

        //客户同步
//        fzzySync1212.syncData(kqdm, deptId, start, end);
        fzzySync1212.syncData(kqdm, deptId, start, end);
        //合同同步
//        fzzySync1201.syncData(kqdm, deptId, start, end);
        fzzySync1201.syncData(kqdm, deptId, start, end);

        //粮食入库同步
        fzzySync1202.syncData(kqdm, deptId, start, end);

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

@@ -10,11 +10,14 @@
import com.fzzy.api.view.repository.Api1201Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy40.entity.Fz40InoutContract;
import com.fzzy.async.fzzy40.entity.Fz40InoutCustomer;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1201Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1212Rep;
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.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -26,6 +29,8 @@
@Component
public class Fzzy40Sync1201 {

    @Autowired
    private Fzzy40Sync1212Rep fzzySync1212Rep;
    @Autowired
    private Fzzy40Sync1201Rep fzzySync1201Rep;
    @Autowired
@@ -70,42 +75,48 @@

            Api1201 apiData;
            List<Api1201> api1201List;
            List<Fz40InoutCustomer> listCustomer;
            for (Fz40InoutContract sysData : list) {

                apiData = new Api1201();
                //单位代码（ 1101 接口的单位代 码） +自定义编码
                apiData.setHth(api1201.getDwdm() + sysData.getId());
                apiData.setHtmc(sysData.getName());
                apiData.setHtmc(sysData.getName().trim());
                apiData.setDwdm(api1201.getDwdm());

                //业务类型
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HT_YWLX, sysData.getType());
                apiData.setYwlx(mappingCode);
                apiData.setYwlx(sysData.getType());
                //客户类型
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_KHLX, sysData.getCustomerType());
                apiData.setKhlx(mappingCode);
                apiData.setKhlx(sysData.getCustomerType());

                apiData.setKhtyshxydm(StringUtils.isEmpty(sysData.getCustomerId()) ? "100000000000000000" :sysData.getCustomerId());
                //企业客户，需要设置信用码
                if ("1".equals(sysData.getCustomerType())) {
                    listCustomer = fzzySync1212Rep.getDataById(sysData.getCustomerId());
                    if (null == listCustomer || listCustomer.isEmpty()) {
                        continue;
                    }
                    apiData.setKhtyshxydm(listCustomer.get(0).getKhbh());
                }


                apiData.setKhmc(sysData.getCustomerName());
                apiData.setFddbr(sysData.getCustomerSignUser());
                apiData.setFddbr(StringUtils.isEmpty(sysData.getCustomerSignUser()) ? null : sysData.getCustomerSignUser());

                apiData.setQdrq(sysData.getSigningTime());

                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
                apiData.setLspzdm(mappingCode);

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

                //单价：元/公斤-->元/吨
                apiData.setHtdj(sysData.getPrice() == null ? 0.0 : sysData.getPrice()*1000);
                //单价：元/吨
                apiData.setHtdj(sysData.getPrice() == null ? 0.0 : sysData.getPrice());
                apiData.setYdgxlssl(sysData.getContactAmount() == null ? 0.0 : sysData.getContactAmount());

                apiData.setHtzje(new BigDecimal(sysData.getMoney()));

                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_JSYHTYZX, "");
                apiData.setJsyhtyzx(mappingCode);
                apiData.setJsyhtyzx(StringUtils.isEmpty(sysData.getJsyhtyzx()) ? "1" : sysData.getJsyhtyzx());

                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_BANK, sysData.getCustomerBank());
                apiData.setKhfkhh(mappingCode);
@@ -117,7 +128,7 @@
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_BANK, sysData.getBank());
                apiData.setBfkhh(mappingCode == null ? "999" : mappingCode);

                apiData.setBfzh(StringUtils.isEmpty(sysData.getBankAccount()) ? "1000000000000000000" : sysData.getBankAccount());
                apiData.setBfzh(StringUtils.isEmpty(sysData.getBankAccount()) ? "100000000000000000" : sysData.getBankAccount());

                apiData.setWcrq(sysData.getEndTime());

@@ -125,9 +136,7 @@

                apiData.setSyncTime(new Date());
                apiData.setBizId(sysData.getId());

                apiLog.setDataId(apiData.getBizId());
                apiLog.setKqdm(kqdm);
                apiData.setKqdm(kqdm);

                api1201List = api1201Rep.getDataById(apiData.getHth());
                if(null == api1201List || api1201List.isEmpty()){

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

@@ -65,6 +65,7 @@
        apiLog.setInteId(Constant.API_CODE_1202);
        apiLog.setStatus(99);
        apiLog.setId(ContextUtil.getUUID());
        String sfzh = "";
        try {
            //获取粮食入库记录信息，根据流程完成时间获取
            List<Fz40InoutRecord> list = fzzySync1202Rep.listInoutRecord(deptId, INOUT_TYPE_IN, start, end);
@@ -94,7 +95,12 @@
                }
                apiData = new Api1202();


                apiData.setRkywdh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));
                //判断业务时间与单据号是否匹配
                if(!DateFormatUtils.format(sysData.getCompleteTime(),"yyMMdd").equals(sysData.getId().substring(4, 10))){
                    apiData.setRkywdh(Constant.INOUT_TYPE_14 + DateFormatUtils.format(sysData.getCompleteTime(),"yyMMdd") + sysData.getId().substring(10));
                }

                //货位代码
                apiData.setHwdm(api1105.getHwdm());
@@ -115,7 +121,7 @@
                    apiData.setHth(api1105.getHwdm().substring(0,18) + apiData.getRkywdh());
                }

                apiData.setXxdz(sysData.getUserAddress());
                apiData.setXxdz(StringUtils.isEmpty(sysData.getUserAddress()) ? "详细地址":sysData.getUserAddress());

                //运输工具，若为空，则默认给1-汽车
                apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1":sysData.getTransType());
@@ -183,11 +189,13 @@
                }else {
                    apiData.setCzbz(api1202List.get(0).getCzbz());
                }
                sfzh = apiData.getSfzh();
                //保存数据
                api1202Rep.save(apiData);
                log.info("1202---同步数据：{}", apiData.toString());
            }
        } catch (Exception e) {
            System.out.println(sfzh);
            log.error("---同步失败----{}", e);
            apiLog.setResult("同步失败：" + e.getMessage());
            apiLogRep.save(apiLog);

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

@@ -97,7 +97,7 @@
                apiData.setBizId(sysData.getId());


                api1212List = api1212Rep.getDataById(sysData.getKhbh());
                api1212List = api1212Rep.getDataById(sysData.getId());
                if(null == api1212List || api1212List.isEmpty()){
                    apiData.setCzbz(Constant.CZBZ_I);
                }else {

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

@@ -4,7 +4,6 @@
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;

/**
@@ -13,14 +12,13 @@
public interface Fzzy40Sync1212Rep extends JpaRepository<Fz40InoutCustomer, String> {

    /**
     * 根据信息获取客户信息
     * 根据信息获取客户单位信息
     *
     * @param start
     * @param end
     * @return
     */
//    @Query("from Fz40InoutCustomer where deptId=:deptId and updateTime >=:start and updateTime <:end order by updateTime ")
//    List<Fz40InoutCustomer> listInoutCustomer(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
    @Query("from Fz40InoutCustomer where deptId=:deptId order by updateTime ")
    @Query("from Fz40InoutCustomer where deptId=:deptId order by id ")
    List<Fz40InoutCustomer> listInoutCustomer(@Param("deptId") String deptId);

    @Query("from Fz40InoutCustomer where id=:id order by id ")
    List<Fz40InoutCustomer> getDataById(@Param("id") String id);
}

 src/main/resources/application-dev.yml

@@ -8,7 +8,7 @@
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8
      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_1?useUnicode=true&useSSL=false&characterEncoding=utf-8 #港口新仓
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_2?useUnicode=true&useSSL=false&characterEncoding=utf-8 #关埠老仓
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_3?useUnicode=true&useSSL=false&characterEncoding=utf-8 #直属仓库
@@ -22,7 +22,7 @@
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_10?useUnicode=true&useSSL=false&characterEncoding=utf-8 #和平粮所
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8  #广东韶关
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8   #惠州惠新
      url: jdbc:mysql://127.0.0.1:3306/igds_api_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8   #惠州惠新
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8   #武汉黄陂军粮
      username: root
      password: Abc123..
@@ -32,10 +32,10 @@
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8
      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8  #惠州惠新
      url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8  #惠州惠新
#      url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8  #武汉黄陂军粮
      username: root
      password: Abc123..

 src/main/resources/application-pro.yml

@@ -1,6 +1,6 @@
##########################  大湾区   ##########################
##########################  广东惠州惠阳   ##########################
server:
  port: 8081
  port: 8090
  jetty:
    max-http-post-size: 209715200
  tomcat:
@@ -38,7 +38,7 @@
          dialect: org.hibernate.dialect.MySQL5InnoDBDialect
  # Redis相关配置
  redis:
    database: 0
    database: 1
    host: 127.0.0.1
    port: 6379
    password: Abc123..
@@ -51,6 +51,7 @@
      timeout: 6000
igds:
  default:
    companyId: 5016
  file-path: C:/app/igds-api/
    companyId: 5326

  file-path: D:/IGDS-API/FILE/
  img-path: D:/IGDS/FILE/