src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1404.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -601,17 +601,32 @@ list.add(api1401); } return JSON.toJSONString(list); }else if (SH2023Constant.SH_2023_API_CODE_1401.equals(inteId)) { SH2023Api1401 api1401; } else if (SH2023Constant.SH_2023_API_CODE_1403.equals(inteId)) { SH2023Api1403 api1403; //æå转æ¢ä¸ºjson List<SH2023Api1401> list = new ArrayList<>(); List<SH2023Api1403> list = new ArrayList<>(); //ædata转åælistéå List<Api1401> api1401List = castList(data, Api1401.class); for (Api1401 apiData : api1401List) { api1401 = new SH2023Api1401(); BeanUtils.copyProperties(apiData, api1401); api1401.setBjw(ShAreaBjw.getBjw(code)); list.add(api1401); List<Api1403> api1403List = castList(data, Api1403.class); for (Api1403 apiData : api1403List) { api1403 = new SH2023Api1403(); BeanUtils.copyProperties(apiData, api1403); api1403.setJhzxdw(apiData.getJhxddw()); api1403.setJhzxdwmc(apiData.getJhxddwmc()); list.add(api1403); } return JSON.toJSONString(list); } else if (SH2023Constant.SH_2023_API_CODE_1404.equals(inteId)) { SH2023Api1404 api1404; //æå转æ¢ä¸ºjson List<SH2023Api1404> list = new ArrayList<>(); //ædata转åælistéå List<Api1404> api1404List = castList(data, Api1404.class); for (Api1404 apiData : api1404List) { api1404 = new SH2023Api1404(); BeanUtils.copyProperties(apiData, api1404); //TODO æç»ç¶æ list.add(api1404); } return JSON.toJSONString(list); } else { src/main/java/com/fzzy/push/sh2023/SH2023PushService14.java
@@ -6,9 +6,12 @@ import com.fzzy.api.dto.ResponseDto; import com.fzzy.api.entity.Api1310; import com.fzzy.api.entity.Api1401; import com.fzzy.api.entity.Api1403; import com.fzzy.api.service.ApiRemoteService; import com.fzzy.api.service.PushService11; import com.fzzy.api.view.repository.Api1401Rep; import com.fzzy.api.view.repository.Api1403Rep; import com.fzzy.api.view.repository.Api1404Rep; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -30,6 +33,10 @@ private SH2023ApiRemoteService apiRemoteService; @Autowired private Api1401Rep api1401Rep; @Autowired private Api1403Rep api1403Rep; @Autowired private Api1404Rep api1404Rep; @Override public String getProtocol() { @@ -87,7 +94,26 @@ * 1403 è½®æ¢è®¡åä¿¡æ¯ */ public void pushData1403(ApiRemoteService apiRemoteService, ApiParam param) { //TODO //è·åå¨å¤è§æ¨¡ List<Api1403> list = api1403Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd()); if (null == list || list.isEmpty()) { log.error("-----䏿µ·å¸å¹³å°2023çï¼æªè·åå°å¨å¤è§æ¨¡ï¼ä¸æ¨é-----"); return; } param.setInteId(SH2023Constant.SH_2023_API_CODE_1403); //æ¨éï¼æ°æ®ä¸ºéåå½¢å¼ ResponseDto responseDto = apiRemoteService.pushData(param, list); if (responseDto.getSuccess() == 0) { //æ¨éæåï¼æ´æ°æ°æ®ä¸ä¼ ç¶æ for (Api1403 data : list) { if (Constant.CZBZ_I.equals(data.getCzbz())) { data.setCzbz(Constant.CZBZ_U); //æ´æ°ç¶æ api1403Rep.save(data); } } } } @@ -95,7 +121,27 @@ * 1404 è½®æ¢è®¡åæç»ä¿¡æ¯ */ public void pushData1404(ApiRemoteService apiRemoteService, ApiParam param) { //TODO ///è·åå¨å¤è§æ¨¡ List<Api1401> list = api1401Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd()); if (null == list || list.isEmpty()) { log.error("-----䏿µ·å¸å¹³å°2023çï¼æªè·åå°å¨å¤è§æ¨¡ï¼ä¸æ¨é-----"); return; } param.setInteId(SH2023Constant.SH_2023_API_CODE_1401); //æ¨éï¼æ°æ®ä¸ºéåå½¢å¼ ResponseDto responseDto = apiRemoteService.pushData(param, list); if (responseDto.getSuccess() == 0) { //æ¨éæåï¼æ´æ°æ°æ®ä¸ä¼ ç¶æ for (Api1401 data : list) { if (Constant.CZBZ_I.equals(data.getCzbz())) { data.setCzbz(Constant.CZBZ_U); //æ´æ°ç¶æ api1401Rep.save(data); } } } } src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,61 @@ package com.fzzy.push.sh2023.dto; import com.alibaba.fastjson.annotation.JSONField; import com.bstek.dorado.annotation.PropertyDef; import lombok.Data; import lombok.EqualsAndHashCode; import javax.persistence.Column; import java.io.Serializable; import java.util.Date; /** * æ¥å£è¡¨-è½®æ¢è®¡åä¿¡æ¯ * * @author chen * @date 2022-09-02 16:03 */ @Data @EqualsAndHashCode(callSuper = false) public class SH2023Api1403 implements Serializable { /** * */ private static final long serialVersionUID = 1L; @PropertyDef(label = "è½®æ¢è®¡ååå·") private String lhjhdh; @PropertyDef(label = "计åæå·") private String jhwh; @PropertyDef(label = "计ååç§°") private String jhmc; @PropertyDef(label = "计å年度") private String jhnd; @PropertyDef(label = "å¼å§æ§è¡æ¥æ") private Date kszxrq; @PropertyDef(label = "æªæ¢æ§è¡æ¥æ") private Date jzzxrq; @PropertyDef(label = "è®¡åæ§è¡åä½") private String jhzxdw; @PropertyDef(label = "è®¡åæ§è¡åä½åç§°") private String jhzxdwmc; @JSONField(format = "yyyy-MM-dd") @PropertyDef(label = "计åä¸è¾¾æ¶é´") private Date jhxdsj; @JSONField(format = "yyyy-MM-dd HH:mm:ss") @PropertyDef(label = "æåæ´æ°æ¶é´") private Date zhgxsj; } src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1404.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,62 @@ package com.fzzy.push.sh2023.dto; import com.alibaba.fastjson.annotation.JSONField; import com.bstek.dorado.annotation.PropertyDef; import lombok.Data; import lombok.EqualsAndHashCode; import javax.persistence.Column; import java.io.Serializable; import java.util.Date; /** * æ¥å£è¡¨-è½®æ¢è®¡åæç»ä¿¡æ¯ * * @author chen * @date 2022-09-02 16:03 */ @Data @EqualsAndHashCode(callSuper = false) public class SH2023Api1404 implements Serializable { /** * */ private static final long serialVersionUID = 1L; @PropertyDef(label = "计åæç»åå·") private String jhmxdh; @PropertyDef(label = "è½®æ¢è®¡ååå·") private String lhjhdh; @PropertyDef(label = "ç²®é£åç§ä»£ç ") private String lspzdm; @PropertyDef(label = "ç²®é£ç级代ç ") private String lsdjdm; @PropertyDef(label = "ç²®é£æ§è´¨ä»£ç ") private String lsxzdm; @PropertyDef(label = "æ¶è·å¹´åº¦") private String shnd; @PropertyDef(label = "è½®æ¢è´§ä½ä»£ç ") private String lhhwdm; @PropertyDef(label = "è½®æ¢æ°é") private Double lhsl; @PropertyDef(label = "è½®æ¢ç±»å") private String lhlx; @PropertyDef(label = "æç»ç¶æ" , description = "0ï¼ä½åºï¼1ï¼ææ") private String mxzt; @JSONField(format = "yyyy-MM-dd HH:mm:ss") @PropertyDef(label = "æåæ´æ°æ¶é´") private Date zhgxsj; }