广东省平台v5.1-增加封仓确认单和出清确认单

czt

2024-06-29 18967104565d14fc04d848aa8cb54653b84b19ce

 src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2101PR.java

@@ -9,7 +9,6 @@
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.Api1204;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
import com.fzzy.api.service.ApiCommonService;
@@ -17,13 +16,10 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1101;
import com.fzzy.push.sh2023.SH2023Constant;
import com.fzzy.push.sh2023.dto.SH2023Api2101;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
@@ -38,7 +34,6 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;

/**
 * 上海市接口-2101 检斤单
@@ -118,15 +113,22 @@
        if (null == data.getPch() || data.getPch() == "") {
            data.setPch(data.getHwdm() + DateFormatUtils.format(data.getJjrq(), "yyyy"));
        }
        ApiInfoData infoData = new ApiInfoData();
        infoData.setId(data.getJjdh());
        infoData.setKqdm(data.getKqdm());
        infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2101);
        infoData.setUpdateTime(new Date());
        infoData.setDataId(data.getJjdh());
        infoData.setData(JSON.toJSONString(data));
        infoData.setCzbz(data.getCzbz());
        infoData.setRemarks("备注信息");
        ApiInfoData infoData;
        List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getJjdh(),data.getKqdm());
        if (apiInfoList.size() != 0) {
            infoData = apiInfoList.get(0);
            infoData.setData(JSON.toJSONString(data));
        } else {
            infoData = new ApiInfoData();
            infoData.setId(ContextUtil.getUUID());
            infoData.setKqdm(data.getKqdm());
            infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2101);
            infoData.setUpdateTime(new Date());
            infoData.setDataId(data.getJjdh());
            infoData.setData(JSON.toJSONString(data));
            infoData.setCzbz(data.getCzbz());
            infoData.setRemarks("备注信息");
        }

        apiInfoDataRep.save(infoData);
    }
@@ -136,19 +138,21 @@
     */
    @Expose
    public void delData(SH2023Api2101 data) {
        apiInfoDataRep.deleteById(data.getJjdh());
        List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getJjdh(),data.getKqdm());
        apiInfoDataRep.deleteById(apiInfoList.get(0).getId());
    }

    /**
     * sHApi2101PR#delUpdate
     */
    @Expose
    public String delUpdate(SH2023Api2101 entity) {
        if (null == entity) {
    public String delUpdate(SH2023Api2101 data) {
        if (null == data) {
            return "无数据执行";
        }
        entity.setCzbz(Constant.CZBZ_D);
        apiInfoDataRep.updateStatus(entity.getJjdh(), JSON.toJSONString(entity), Constant.CZBZ_D);
        List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getJjdh(),data.getKqdm());
        data.setCzbz(Constant.CZBZ_D);
        apiInfoDataRep.updateStatus(apiInfoList.get(0).getId(), JSON.toJSONString(data), Constant.CZBZ_D);
        return null;
    }

@@ -177,23 +181,16 @@
        responseDto = apiService.pushData(param, apiConf, items);
        if (responseDto.getSuccess() == 0) {
            //推送成功，更新数据上传状态

            ApiInfoData infoData;
            for (SH2023Api2101 data : items) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {

                    infoData = new ApiInfoData();
                    infoData.setId(data.getJjdh());
                    infoData.setKqdm(data.getKqdm());
                    infoData.setInteType("21");
                    infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2101);
                    infoData.setUpdateTime(new Date());
                    infoData.setDataId(data.getJjdh());

                    //推送成功，更新数据上传状态
                    List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, data.getJjdh(),data.getKqdm());
                    data.setCzbz(Constant.CZBZ_U);
                    infoData = apiInfoList.get(0);
                    infoData.setUpdateTime(new Date());
                    infoData.setCzbz(Constant.CZBZ_U);
                    infoData.setData(JSON.toJSONString(data));

                    apiInfoDataRep.save(infoData);
                }
            }