陈战涛
2023-05-25 7594c1e78092208fb07acecbf4d9d57ba12af7d3
优化非正常状态的出入库数据下的文件信息不同步
已修改4个文件
76 ■■■■■ 文件已修改
src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-pro.yml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java
@@ -50,32 +50,32 @@
        Date end = param.getEnd();
//        //合同同步
//        fzzySync1201.syncData(kqdm, deptId, start, end);
//
//        //粮食入库同步
//        fzzySync1202.syncData(kqdm, deptId, start, end);
        //合同同步
        fzzySync1201.syncData(kqdm, deptId, start, end);
        //粮食入库同步
        fzzySync1202.syncData(kqdm, deptId, start, end);
        //粮食入库质检同步
        fzzySync1203.syncData(kqdm, deptId, start, end);
//        //粮食入库结算同步
//        fzzySync1204.syncData(kqdm, deptId, start, end);
//
//        //粮食出库同步
//        fzzySync1205.syncData(kqdm, deptId, start, end);
//
//        //粮食出库结算同步
//        fzzySync1206.syncData(kqdm, deptId, start, end);
//
//        //粮食损溢同步
//        fzzySync1209.syncData(kqdm, deptId, start, end);
//
//        //文件信息同步
//        fzzy35Sync1109.syncData(kqdm, deptId, start, end);
//
//        //粮食库存同步
//        fzzySync1208.syncData(kqdm, deptId, start, end);
        //粮食入库结算同步
        fzzySync1204.syncData(kqdm, deptId, start, end);
        //粮食出库同步
        fzzySync1205.syncData(kqdm, deptId, start, end);
        //粮食出库结算同步
        fzzySync1206.syncData(kqdm, deptId, start, end);
        //粮食损溢同步
        fzzySync1209.syncData(kqdm, deptId, start, end);
        //文件信息同步
        fzzy35Sync1109.syncData(kqdm, deptId, start, end);
        //粮食库存同步
        fzzySync1208.syncData(kqdm, deptId, start, end);
    }
}
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
@@ -2,19 +2,19 @@
import com.fzzy.api.Constant;
import com.fzzy.api.entity.Api1109;
import com.fzzy.api.entity.Api1201;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.utils.FileUtil;
import com.fzzy.api.view.repository.Api1109Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy35.entity.Fz35FileInfo;
import com.fzzy.async.fzzy35.entity.Fz35InoutRecord;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1109Rep;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1202Rep;
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.*;
/**
@@ -46,6 +46,8 @@
    @Autowired
    private Fzzy35Sync1109Rep fzzySync1109Rep;
    @Autowired
    private Fzzy35Sync1202Rep fzzySync1202Rep;
    @Autowired
    private Api1109Rep api1109Rep;
    @Autowired
@@ -85,10 +87,24 @@
            String wjlx;
            String wjmc;
            List<Api1109> api1109List;
            List<Fz35InoutRecord> listInout;
            for (Fz35FileInfo sysData : list) {
                if (StringUtils.isEmpty(sysData.getBizId())) {
                    continue;
                }
                //根据图片id查询对应出入库信息
                listInout = fzzySync1202Rep.listInoutRecordById(sysData.getBizId());
                if(null == listInout || listInout.isEmpty()){
                    continue;
                }
                //若出入库信息为删除或者错误状态,则不同步
                if("DEL".equals(listInout.get(0).getRecordStatus()) || "ERROR".equals(listInout.get(0).getRecordStatus())){
                    continue;
                }
                //若出入库信息中入库重量为空或为0,则不同步
                if(null == listInout.get(0).getRecordWeight() || listInout.get(0).getRecordWeight() == 0){
                    continue;
                }
                //只同步称重
                if(BIZ_TAG_WEIGHT_FULL.equals(sysData.getBizTag()) || BIZ_TAG_WEIGHT_EMPTY.equals(sysData.getBizTag())){
                    wjlx = "";
src/main/resources/application-pro.yml
@@ -1,4 +1,4 @@
##########################  上海嘉定   ##########################
##########################  广东潮阳   ##########################
server:
  port: 8090
  jetty:
@@ -11,13 +11,13 @@
    primary:
      url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
      username: root
      password: root
      password: Abc123..
      driver-class-name: com.mysql.jdbc.Driver
    #次数据源
    secondary:
      url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
      username: root
      password: root
      password: Abc123..
      driver-class-name: com.mysql.jdbc.Driver
  jpa:
    #主jpa配置
@@ -38,7 +38,7 @@
          dialect: org.hibernate.dialect.MySQL5InnoDBDialect
  # Redis相关配置
  redis:
    database: 1
    database: 0
    host: 127.0.0.1
    port: 6379
    password: Abc123..
@@ -51,7 +51,7 @@
      timeout: 6000
igds:
  default:
    companyId: 5303
    companyId: 5317
  file-path: D:/IGDS-API/FILE/
  img-path: D:/IGDS/FILE/
src/main/resources/application.yml
@@ -1,7 +1,7 @@
##########################  Server   ##########################
spring:
  profiles:
    active: dev
    active: pro
  application:
    name: igds-api
  main: