WS
2023-08-17 404689ed75b3782630e577ed4212b0997580d29e
提交熏蒸 通风 数据上报
已修改5个文件
99 ■■■■■ 文件已修改
src/main/java/com/fzzy/api/view/repository/Api1305Rep.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/view/repository/Api1306Rep.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/push/gd2022/GD2022PushService13.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/push/impl/ComPushService13.java 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/view/repository/Api1305Rep.java
@@ -4,9 +4,12 @@
import com.fzzy.api.entity.Api1306;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
@@ -14,4 +17,13 @@
    @Query("from Api1305 where tfzydh=:tfzydh ")
    List<Api1305> getDataById(@Param("tfzydh") String tfzydh);
    @Transactional
    @Modifying
    @Query("update Api1305 set czbz =:czbz where tfzydh=:tfzydh")
    void updateStatus(@Param("tfzydh") String tfzydh, @Param("czbz") String czbz);
    @Query("from Api1305 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
    List<Api1305> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
src/main/java/com/fzzy/api/view/repository/Api1306Rep.java
@@ -1,12 +1,16 @@
package com.fzzy.api.view.repository;
import com.fzzy.api.entity.Api1203;
import com.fzzy.api.entity.Api1305;
import com.fzzy.api.entity.Api1306;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
@@ -15,4 +19,12 @@
    @Query("from Api1306 where xzzydh=:xzzydh ")
    List<Api1306> getDataById(@Param("xzzydh") String xzzydh);
    @Transactional
    @Modifying
    @Query("update Api1306 set czbz =:czbz where xzzydh=:xzzydh")
    void updateStatus(@Param("xzzydh") String xzzydh, @Param("czbz") String czbz);
    @Query("from Api1306 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
    List<Api1306> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
@@ -50,13 +50,13 @@
        //质检同步
        fzzySync1310.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd());
        //通风作业信息同步  TODO
        //通风作业信息同步
        fzzySync1305.syncData(param.getDeptId(), param.getStart(), param.getEnd());
        //熏蒸作业信息同步  TODO
        //熏蒸作业信息同步
        fzzySync1306.syncData(param.getDeptId(), param.getStart(), param.getEnd());
        //熏蒸备案数据同步   TODO--待定
        //熏蒸备案数据同步
    }
src/main/java/com/fzzy/push/gd2022/GD2022PushService13.java
@@ -43,6 +43,12 @@
        //质检
        pushService.pushData1310(apiRemoteService, param);
        //通风
        pushService.pushData1305(apiRemoteService, param);
        //熏蒸
        pushService.pushData1306(apiRemoteService, param);
    }
}
src/main/java/com/fzzy/push/impl/ComPushService13.java
@@ -5,10 +5,7 @@
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.Api1302Rep;
import com.fzzy.api.view.repository.Api1303Rep;
import com.fzzy.api.view.repository.Api1304Rep;
import com.fzzy.api.view.repository.Api1310Rep;
import com.fzzy.api.view.repository.*;
import com.fzzy.push.shjdjw2023.ShjdjwApiRemoteService2023;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +28,10 @@
    private Api1303Rep apiRep1303;
    @Autowired
    private Api1304Rep apiRep1304;
    @Autowired
    private Api1305Rep apiRep1305;
     @Autowired
    private Api1306Rep apiRep1306;
    @Autowired
    private Api1310Rep apiRep1310;
@@ -89,6 +90,60 @@
        }
    }
    public void pushData1305(ApiRemoteService apiRemoteService, ApiParam param) {
        //获取需要推送的数据
        List<Api1305> items = apiRep1305.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
        if (null == items || items.isEmpty()) {
            log.info("-------------没有通风作业数据需要推送-----------");
            return;
        }
        param.setInteCategory(Constant.API_CATEGORY_13);
        param.setInteId(Constant.API_CODE_1305);
        ResponseDto responseDto;
        for (Api1305 data : items) {
            param.setBizId(data.getBizId());
            responseDto = apiRemoteService.pushData(param, data);
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    apiRep1305.updateStatus(data.getTfzydh(), Constant.CZBZ_U);
                }
            }
        }
    }
    public void pushData1306(ApiRemoteService apiRemoteService, ApiParam param) {
        //获取需要推送的数据
        List<Api1306> items = apiRep1306.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
        if (null == items || items.isEmpty()) {
            log.info("-------------没有熏蒸作业数据需要推送-----------");
            return;
        }
        param.setInteCategory(Constant.API_CATEGORY_13);
        param.setInteId(Constant.API_CODE_1306);
        ResponseDto responseDto;
        for (Api1306 data : items) {
            param.setBizId(data.getBizId());
            responseDto = apiRemoteService.pushData(param, data);
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    apiRep1306.updateStatus(data.getXzzydh(), Constant.CZBZ_U);
                }
            }
        }
    }
    public void pushData1303(ApiRemoteService apiRemoteService, ApiParam param) {
        //获取需要推送的数据