优化3.5版本同步时，操作标志的状态

陈战涛

2023-05-25 7494eb35eb0e6a3f33dff907133e59f677800003

优化3.5版本同步时，操作标志的状态

 src/main/java/com/fzzy/api/view/pr/Api1109PR.java

@@ -135,7 +135,7 @@
            result += responseDto.toString();
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(d.getCzbz())) {
                    api1109Rep.updateStatus(data.getKqdm(), Constant.CZBZ_U);
                    api1109Rep.updateStatus(data.getId(), Constant.CZBZ_U);
                }
            }
        }

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

@@ -21,4 +21,7 @@
    @Modifying
    @Query("update Api1209 set czbz =:czbz where sydh=:sydh")
    void updateStatus(@Param("sydh") String sydh, @Param("czbz") String czbz);

    @Query("from Api1209 where sydh=:sydh ")
    List<Api1209> getDataBySydh(@Param("sydh") String sydh);
}

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

@@ -21,4 +21,7 @@
    @Modifying
    @Query("update Api1302 set czbz =:czbz where wsdjcdh=:wsdjcdh")
    void updateStatus(@Param("wsdjcdh") String wsdjcdh, @Param("czbz") String czbz);

    @Query("from Api1302 where wsdjcdh=:wsdjcdh ")
    List<Api1302> getDataByWsdjcdh(@Param("wsdjcdh") String wsdjcdh);
}

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

@@ -20,4 +20,7 @@
    @Modifying
    @Query("update Api1303 set czbz =:czbz where hcjcdh=:id")
    void updateStatus(@Param("id") String id, @Param("czbz") String czbz);

    @Query("from Api1303 where hcjcdh=:hcjcdh ")
    List<Api1303> getDataByHcjcdh(@Param("hcjcdh") String hcjcdh);
}

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

@@ -21,4 +21,7 @@
    @Modifying
    @Query("update Api1304 set czbz =:czbz where qtndjcdh=:id")
    void updateStatus(@Param("id") String id, @Param("czbz") String czbz);

    @Query("from Api1304 where qtndjcdh=:qtndjcdh ")
    List<Api1304> getDataByQtndjcdh(@Param("qtndjcdh") String qtndjcdh);
}

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

@@ -22,4 +22,6 @@
    @Query("update Api1310 set czbz =:czbz where zjbgdh=:id")
    void updateStatus(@Param("id") String id, @Param("czbz") String czbz);

    @Query("from Api1310 where zjbgdh=:zjbgdh ")
    List<Api1310> getDataByZjbgdh(@Param("zjbgdh") String zjbgdh);
}

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

@@ -20,4 +20,7 @@
    @Modifying
    @Query("update Api1403 set czbz =:czbz where lhjhdh=:id")
    void updateStatus(@Param("id") String id, @Param("czbz") String czbz);

    @Query("from Api1403 where lhjhdh=:lhjhdh ")
    List<Api1403> getDataByLhjhdh(@Param("lhjhdh") String lhjhdh);
}

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

@@ -21,4 +21,7 @@
    @Query("update Api1404 set czbz =:czbz where jhmxdh=:id")
    void updateStatus(@Param("id") String id, @Param("czbz") String czbz);


    @Query("from Api1404 where jhmxdh=:jhmxdh ")
    List<Api1404> getDataByJhmxdh(@Param("jhmxdh") String jhmxdh);
}

 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/entity/Fz35CheckItem.java

@@ -3,10 +3,7 @@
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 javax.persistence.*;
import java.io.Serializable;

/**
@@ -21,6 +18,7 @@
@Data
@Entity
@Table(name = "D_CHECK_ITEM")
@IdClass(Fz35CheckItemKey.class)
public class Fz35CheckItem implements Serializable {

    /**
@@ -33,10 +31,12 @@
    @PropertyDef(label = "检测编码")
    private String checkId;

    @Id
    @Column(name = "COMPANY_ID_", length = 10)
    @PropertyDef(label = "组织编码")
    private String companyId;

    @Id
    @Column(name = "STANDARD_ID_", length = 40)
    @PropertyDef(label = "检测项编码")
    private String standardId;

 src/main/java/com/fzzy/async/fzzy35/entity/Fz35CheckItemKey.java

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

import lombok.AllArgsConstructor;
import lombok.Data;

import java.io.Serializable;

@Data
@AllArgsConstructor
public class Fz35CheckItemKey implements Serializable {
        private String checkId;
        private String companyId;
        private String standardId;

    public Fz35CheckItemKey(){
            super();
        }
    }

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

@@ -132,6 +132,8 @@
                    api1109List = api1109Rep.getDataByBizId(apiData.getBizId());
                    if(null == api1109List || api1109List.isEmpty()){
                        apiData.setCzbz(Constant.CZBZ_I);
                    }else {
                        apiData.setCzbz(api1109List.get(0).getCzbz());
                    }

                    //保存数据

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

@@ -132,6 +132,8 @@
                api1201List = api1201Rep.getDataById(apiData.getHth());
                if(null == api1201List || api1201List.isEmpty()){
                    apiData.setCzbz(Constant.CZBZ_I);
                }else {
                    apiData.setCzbz(api1201List.get(0).getCzbz());
                }

                //保存数据

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

@@ -83,7 +83,7 @@
            Calendar c = Calendar.getInstance();
            for (Fz35InoutRecord sysData : list) {
                //判断净重是否大于0，等于0表示不合格，不进行同步上传
                if(sysData.getRecordWeight() == 0){
                if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
                    continue;
                }
                //获取货位信息
@@ -186,6 +186,8 @@
                api1202List = api1202Rep.getDataById(apiData.getRkywdh());
                if(null == api1202List || api1202List.isEmpty()){
                    apiData.setCzbz(Constant.CZBZ_I);
                }else {
                    apiData.setCzbz(api1202List.get(0).getCzbz());
                }
                //保存数据
                api1202Rep.save(apiData);

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

@@ -13,6 +13,7 @@
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1202Rep;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1203Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -87,12 +88,12 @@
            List<Api1203> api1203List;
            for (Fz35InoutRecord sysData : list) {
                //判断净重是否大于0，等于0表示不合格，不进行同步上传
                if(sysData.getRecordWeight() == 0){
                if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
                    continue;
                }
                fz35CheckItems = null;
                //获取入库质检信息
                fz35CheckItems = fzzySync1203Rep.listInoutCheckItem(sysData.getCheckId());
                fz35CheckItems = fzzySync1203Rep.listInoutCheckItem(sysData.getCheckId(), deptId.substring(0, 4));
                if (null == fz35CheckItems || fz35CheckItems.isEmpty()) {
                    log.info("-------------没有获取到当前入库质检信息--------------");
                    continue;
@@ -127,16 +128,19 @@
                    if (gbCheckList == null || gbCheckList.isEmpty()) {
                        continue;
                    }
                    if (StringUtils.isEmpty(fz35CheckItem.getValue())) {
                        continue;
                    }
                    jyxm += gbCheckList.get(0).getCode() + ",";
                    jyz += fz35CheckItem.getValue() + ",";
                    zkj += "0.0,";
                    zkl += "0.0,";
                    zkj += ",0.0";
                    zkl += ",0.0";
                }

                apiData.setJyxm(jyxm);
                apiData.setJyz(jyz);
                apiData.setZkj(zkj);
                apiData.setZkl(zkl);
                apiData.setZkj(zkj.substring(1));
                apiData.setZkl(zkl.substring(1));
                if("UNPASS".equals(sysData.getCheckStatus())){
                    apiData.setJyjg("0");
                }
@@ -165,6 +169,8 @@
                api1203List = api1203Rep.getDataById(apiData.getRkjydh());
                if(null == api1203List || api1203List.isEmpty()){
                    apiData.setCzbz(Constant.CZBZ_I);
                }else {
                    apiData.setCzbz(api1203List.get(0).getCzbz());
                }

                //保存数据

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

@@ -82,7 +82,7 @@
        Calendar c = Calendar.getInstance();
        for (Fz35InoutRecord sysData : list) {
            //判断净重是否大于0，等于0表示不合格，不进行同步上传
            if(sysData.getRecordWeight() == 0){
            if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
                continue;
            }
            //获取货位信息
@@ -169,6 +169,8 @@
            api1205List = api1205Rep.getDataById(apiData.getCkywdh());
            if(null == api1205List || api1205List.isEmpty()){
                apiData.setCzbz(Constant.CZBZ_I);
            }else {
                apiData.setCzbz(api1205List.get(0).getCzbz());
            }
            //保存数据
            api1205Rep.save(apiData);

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

@@ -14,7 +14,6 @@
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

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

@@ -147,6 +146,8 @@
                api1208List = api1208Rep.getDataById(api1105.getHwdm());
                if(null == api1208List || api1208List.isEmpty()){
                    apiData.setCzbz(Constant.CZBZ_I);
                }else {
                    apiData.setCzbz(api1208List.get(0).getCzbz());
                }
                apiData.setId(api1105.getHwdm());
                //保存数据

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

@@ -73,6 +73,7 @@

            Api1209 apiData;
            Api1105 api1105;
            List<Api1209> api1209List;
            for (Fz35MLossOver sysData : list) {

                //获取货位信息
@@ -104,7 +105,6 @@
                apiData.setSysfzc("0");

                //操作标志及最后更新时间
                apiData.setCzbz(Constant.CZBZ_I);
                apiData.setZhgxsj(new Date());

                //业务id、库区编码、同步时间
@@ -112,6 +112,13 @@
                apiData.setKqdm(kqdm);
                apiData.setSyncTime(new Date());

                api1209List = api1209Rep.getDataBySydh(apiData.getSydh());
                if(null == api1209List || api1209List.isEmpty()){
                    apiData.setCzbz(Constant.CZBZ_I);
                }else {
                    apiData.setCzbz(api1209List.get(0).getCzbz());
                }

                //保存数据
                api1209Rep.save(apiData);
            }

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

@@ -16,7 +16,6 @@
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

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

@@ -71,7 +70,7 @@
            Date syncTime = new Date();
            Api1302 api1302;
            Api1105 api1105;
            //int index = 10001;
            List<Api1302> api1302List;
            for (Fz35Grain fz35Grain : list) {
                //获取货位信息
                api1105 = commonService.getApi1105Cache(fz35Grain.getDepotId());
@@ -113,15 +112,19 @@
                    api1302.setLssdzjh(getHumPointList2(fz35Grain.getPoints(), fz35Grain.getCable(), fz35Grain.getCableCir()));
                }

                api1302.setCzbz(Constant.CZBZ_I);
                api1302.setZhgxsj(syncTime);

                api1302.setBizId(fz35Grain.getBatchId());
                api1302.setKqdm(api1105.getKqdm());
                api1302.setSyncTime(syncTime);
                api1302List = api1302Rep.getDataByWsdjcdh(api1302.getWsdjcdh());
                if(null == api1302List || api1302List.isEmpty()){
                    api1302.setCzbz(Constant.CZBZ_I);
                }else {
                    api1302.setCzbz(api1302List.get(0).getCzbz());
                }
                log.info("1302---同步数据：" + api1302.toString());
                api1302Rep.save(api1302);
               // index++;
            }

        } catch (Exception e) {

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

@@ -68,7 +68,7 @@
            Date syncTime = new Date();
            Api1303 api1303;
            Api1105 api1105;

            List<Api1303> api1303List;
            for (Fz35Pest fz35Pest : list) {
                //获取货位信息
                api1105 = commonService.getApi1105Cache(fz35Pest.getDepotId());
@@ -102,12 +102,17 @@
                    api1303.setCldjpd("533");
                }

                api1303.setCzbz(Constant.CZBZ_I);
                api1303.setZhgxsj(syncTime);

                api1303.setBizId(fz35Pest.getBatchId());
                api1303.setKqdm(api1105.getKqdm());
                api1303.setSyncTime(syncTime);
                api1303List = api1303Rep.getDataByHcjcdh(api1303.getHcjcdh());
                if(null == api1303List || api1303List.isEmpty()){
                    api1303.setCzbz(Constant.CZBZ_I);
                }else {
                    api1303.setCzbz(api1303List.get(0).getCzbz());
                }
                api1303Rep.save(api1303);
            }


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

@@ -13,10 +13,8 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

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


/**
 * è™«å®³æ£€æµ‹æ•°æ®åŒæ­¥
@@ -64,7 +62,7 @@
            Date syncTime = new Date();
            Api1304 api1304;
            Api1105 api1105;
           // int index = 10001;
            List<Api1304> api1304List;
            for (Fz35Gas fz35Gas : list) {
                //获取货位信息
                api1105 = commonService.getApi1105Cache(fz35Gas.getDepotId());
@@ -80,14 +78,18 @@

                api1304 = updateGasInfo(api1304, fz35Gas.getPoints());

                api1304.setCzbz(Constant.CZBZ_I);
                api1304.setZhgxsj(syncTime);

                api1304.setBizId(fz35Gas.getBatchId());
                api1304.setKqdm(api1105.getKqdm());
                api1304.setSyncTime(syncTime);
                api1304List = api1304Rep.getDataByQtndjcdh(api1304.getQtndjcdh());
                if(null == api1304List || api1304List.isEmpty()){
                    api1304.setCzbz(Constant.CZBZ_I);
                }else {
                    api1304.setCzbz(api1304List.get(0).getCzbz());
                }
                api1304Rep.save(api1304);
             //   index++;
            }
        } catch (Exception e) {
            log.error("---同步失败----{}", e);

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

@@ -22,7 +22,7 @@
/**
 * è´¨æ£€åŒæ­¥
 *
 * @author chen
 * @author czt
 * @date 2023-05-14 19:51
 */
@Slf4j
@@ -71,6 +71,7 @@
            List<GbCheckItem> gbCheckList;
            String jyxm;
            String jyxmz;
            List<Api1310> api1310List;
            for (Fz35Quality fz35Quality : list) {
                api1105 = commonService.getApi1105Cache(fz35Quality.getDepotId());
                if (null == api1105) {
@@ -92,7 +93,7 @@
                //检测项，检测值
                jyxm = "";
                jyxmz = "";
                fz35CheckItems = fzzySync1203Rep.listInoutCheckItem(fz35Quality.getId());
                fz35CheckItems = fzzySync1203Rep.listInoutCheckItem(fz35Quality.getId(), deptId.substring(0, 4));
                if (null != fz35CheckItems && fz35CheckItems.size() > 0) {

                    for (Fz35CheckItem fz35CheckItem : fz35CheckItems) {
@@ -122,9 +123,15 @@
                api1310.setYpdj(StringUtils.isEmpty(fz35Quality.getCheckLevel())?"0": fz35Quality.getCheckLevel());
                api1310.setSfzcccnx(StringUtils.isEmpty(fz35Quality.getNormalYear())?"0": fz35Quality.getNormalYear());
                api1310.setBz(fz35Quality.getRemark());
                api1310.setCzbz(Constant.CZBZ_I);
                api1310.setZhgxsj(new Date());

                api1310List = api1310Rep.getDataByZjbgdh(api1310.getZjbgdh());
                if(null == api1310List || api1310List.isEmpty()){
                    api1310.setCzbz(Constant.CZBZ_I);
                }else {
                    api1310.setCzbz(api1310List.get(0).getCzbz());
                }

                api1310Rep.save(api1310);
            }
        } catch (Exception e) {

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

@@ -4,7 +4,6 @@
import com.fzzy.api.entity.*;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.*;
import com.fzzy.async.fzzy35.entity.Fz35CheckItem;
import com.fzzy.async.fzzy35.entity.Fz35Plan;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1403Rep;
import lombok.extern.slf4j.Slf4j;
@@ -57,6 +56,7 @@

            Api1403 api1403;
            List<Api1101> api1101List;
            List<Api1403> api1403List;
            for (Fz35Plan fz35Plan : list) {
                api1403 = new Api1403();
                api1403.setLhjhdh(fz35Plan.getId());
@@ -70,10 +70,16 @@
                    api1403.setJhxddw(api1101List.get(0).getDwdm());
                }
                api1403.setJhxdsj(fz35Plan.getCreateTime());
                api1403.setCzbz(Constant.CZBZ_I);

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

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

@@ -64,6 +64,7 @@
            Api1404 api1404;
            List<Fz35PlanDetail> fz35PlanDetails;
            Api1105 api1105;
            List<Api1404> api1404List;
            for (Fz35Plan fz35Plan : list) {

                fz35PlanDetails = fzzy35Sync1404Rep.findDate(fz35Plan.getId());
@@ -85,10 +86,15 @@
                    api1404.setLhhwdm(fz35PlanDetail.getDepotId());
                    api1404.setLhsl(fz35PlanDetail.getPlanNum());
                    api1404.setLhlx(fz35PlanDetail.getType());
                    api1404.setCzbz(Constant.CZBZ_I);
                    api1404.setZhgxsj(new Date());
                    api1404.setKqdm(kqdm);
                    api1404.setBizId(fz35PlanDetail.getId());
                    api1404List = api1404Rep.getDataByJhmxdh(api1404.getJhmxdh());
                    if(null == api1404List || api1404List.isEmpty()){
                        api1404.setCzbz(Constant.CZBZ_I);
                    }else {
                        api1404.setCzbz(api1404List.get(0).getCzbz());
                    }
                    api1404Rep.save(api1404);
                }
            }

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

@@ -18,6 +18,6 @@
     * @param checkId
     * @return
     */
    @Query("from Fz35CheckItem where checkId=:checkId order by standardId")
    List<Fz35CheckItem> listInoutCheckItem(@Param("checkId") String checkId);
    @Query("from Fz35CheckItem where checkId=:checkId and companyId=:companyId order by standardId")
    List<Fz35CheckItem> listInoutCheckItem(@Param("checkId") String checkId, @Param("companyId") String companyId);
}

 src/main/resources/application-pro.yml

@@ -52,5 +52,6 @@
igds:
  default:
    companyId: 5303
  file-path: C:/app/igds-api/

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

 src/main/resources/application-pro5303.yml

@@ -52,5 +52,5 @@
igds:
  default:
    companyId: 5303
  file-path: C:/app/igds-api/
  file-path: D:/IGDS-API/FILE/
  img-path: D:/IGDS/FILE/