src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/fzzy/async/fzzy40/entity/Fz40Quality.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1310Rep.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
@@ -6,6 +6,7 @@ import com.fzzy.async.fzzy40.impl.Fzzy40Sync1302; import com.fzzy.async.fzzy40.impl.Fzzy40Sync1303; import com.fzzy.async.fzzy40.impl.Fzzy40Sync1304; import com.fzzy.async.fzzy40.impl.Fzzy40Sync1310; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -25,6 +26,8 @@ private Fzzy40Sync1303 fzzySync1303; @Autowired private Fzzy40Sync1304 fzzySync1304; @Autowired private Fzzy40Sync1310 fzzySync1310; @Override public String getProtocol() { @@ -34,16 +37,17 @@ @Override public void syncData(ApiParam param) { //æ¸©æ¹¿åº¦æ£æµæ°æ®åæ¥ TODO //æ¸©æ¹¿åº¦æ£æµæ°æ®åæ¥ fzzySync1302.syncData(param.getDeptId(), param.getStart(), param.getEnd()); //è«å®³æ£æµåæ¥ TODO //è«å®³æ£æµåæ¥ fzzySync1303.syncData(param.getDeptId(), param.getStart(), param.getEnd()); //æ°ä½æ£æµåæ¥ TODO //æ°ä½æ£æµåæ¥ fzzySync1304.syncData(param.getDeptId(), param.getStart(), param.getEnd()); //è´¨æ£åæ¥ TODO //è´¨æ£åæ¥ fzzySync1310.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd()); //éé£ä½ä¸ä¿¡æ¯åæ¥ TODO src/main/java/com/fzzy/async/fzzy40/entity/Fz40Quality.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,149 @@ package com.fzzy.async.fzzy40.entity; import com.alibaba.fastjson.annotation.JSONField; import com.bstek.dorado.annotation.PropertyDef; import lombok.Data; import javax.persistence.*; import java.io.Serializable; import java.util.Date; /** * è´¨é管çï¼2023å¹´5æ26æ¥ æ ¹æ®æ°å½ç²®è§ä¼åè°æ´ * * @author chen */ @Data @Entity @Table(name = "D_M_QUALITY") public class Fz40Quality implements Serializable { private static final long serialVersionUID = 1L; @Id @Column(name = "ID_", length = 40) @PropertyDef(label = "主é®ID", description = "ZJ+æ£éªç±»å«+å¹´ææ¥æ¶åç§") private String id; @Column(name = "COMPANY_ID_", length = 10) @PropertyDef(label = "ç»ç»ç¼ç ") private String companyId; @Column(name = "DEPT_ID_", length = 40) @PropertyDef(label = "åºåºç¼ç ") private String deptId; @Column(name = "DEPOT_ID_", length = 50) @PropertyDef(label = "ä»åºç¼ç ") private String depotId; @Column(name = "FOOD_VARIETY_", length = 10) @PropertyDef(label = "ç²®é£åç§") private String foodVariety; @Column(name = "FOOD_LEVEL_", length = 10) @PropertyDef(label = "ç²®é£ç级") private String foodLevel; @PropertyDef(label = "å ¥åºæ¥æ") @Column(name = "STORE_DATE_") private Date storeDate; @Column(name = "TYPE_", length = 10) @PropertyDef(label = "æ£éªç±»å«", description = "01ï¼å ¥ä»éªæ¶ 02ï¼åºä»æ£éª 03ï¼3 ææ«æ®æ£04ï¼9 ææ«æ®æ£ 05ï¼å ¥ä»åæ£ 06ï¼æåº¦æ£æ¥ 07ï¼3 ææ«åºå æ®æ¥ 08ï¼9 ææ«åºå æ®æ¥") private String type; @Column(name = "TIME_") @PropertyDef(label = "æ£éªæ¶é´") private Date time; @Column(name = "USER_", length = 50) @PropertyDef(label = "æ£éªäºº", description = "æ£éªäººåå§åï¼è¥æå¤ä¸ªä¿ç®¡å") private String user; @Column(name = "UNIT_", length = 50) @PropertyDef(label = "æ£éªåä½") private String unit; @Column(name = "STANDARD_", length = 4) @PropertyDef(label = "æ£éªä¾æ®", description = "1-彿 ï¼0-å ¶ä»") private String standard; @PropertyDef(label = "ææ ç±»å«", description = "1: è´¨éææ æ£éª2ï¼å¨ååè´¨æ£éª3ï¼é£åå®å ¨æ£éª 妿忶æ£éªäºå¤ä¸ªï¼ç¨#éå¼ï¼ä¾å¦ï¼1#2#3") @Column(name = "zblb", length = 8) private String zblb; @Column(name = "RESULT_", length = 40) @PropertyDef(label = "æ£éªç»è®º", description = "1ãè´¨éææ å¡«å/è¾¾æ /ä¸è¾¾æ 2ãå¨ååè´¨ææ å¡«åâå®åâã轻度ä¸å®åâãâé度ä¸å®åâ3ãé£åå®å ¨ææ å¡«åâåæ ¼âãä¸åæ ¼â å¤é¡¹ææ æ¶ä»¥#åéï¼ä¾å¦ï¼è¾¾æ |综åå¤å®#å®å#åæ ¼ ") private String result; @JSONField(format = "yyyy-MM-dd") @PropertyDef(label = "ç¾åæ¥æ") @Column(name = "qfrq") private Date qfrq; @JSONField(format = "yyyy-MM-dd HH:mm:ss") @PropertyDef(label = "æ¥ååºå ·æ¶é´") @Column(name = "bgcjsj") private Date bgcjsj; @PropertyDef(label = "å®¡æ ¸äººå§å") @Column(name = "shrxm", length = 64) private String shrxm; @PropertyDef(label = "æ¦æ ·åç¼å·") @Column(name = "qydbh", length = 64) private String qydbh; @Column(name = "CHECK_TIME_") @PropertyDef(label = "æ¦æ ·æ¶é´", required = true) private Date checkTime; @Column(name = "CHECK_AREA_", length = 50) @PropertyDef(label = "æ¦æ ·åºå") private String checkArea; @Column(name = "CHECK_USER_", length = 50) @PropertyDef(label = "æ¦æ ·äºº", required = true) private String checkUser; @PropertyDef(label = "çç£äººå§å") @Column(name = "jdrxm", length = 64) private String jdrxm; @PropertyDef(label = "æ ·åç¼å·") @Column(name = "ypbh", length = 64) private String ypbh; @PropertyDef(label = "æ ·åæ°é", required = true) @Column(name = "ypsl", precision = 20, scale = 6) private double ypsl; @PropertyDef(label = "代表æ°é") @Column(name = "dbsl", precision = 20, scale = 6) private double dbsl; @PropertyDef(label = "æ ·åç级") @Column(name = "ypdj", length = 2) private String ypdj; @Column(name = "NORMAL_YEAR_", length = 10) @PropertyDef(label = "æ¯å¦æ£å¸¸åå¨å¹´é") private String normalYear; @Column(name = "REMARK_", length = 200) @PropertyDef(label = "夿³¨", description = "夿³¨ä¿¡æ¯") private String remark; @Column(name = "UPDATE_TIME_") @PropertyDef(label = "æ°æ®æ´æ°æ¶é´") private Date updateTime; // // /** // * åéªé¡¹ç®æç» // */ // @Transient // private List<CheckItemData> checkItems; } src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,153 @@ package com.fzzy.async.fzzy40.impl; import com.fzzy.api.Constant; import com.fzzy.api.entity.Api1105; import com.fzzy.api.entity.Api1310; import com.fzzy.api.entity.ApiLog; import com.fzzy.api.entity.GbCheckItem; import com.fzzy.api.service.ApiCommonService; import com.fzzy.api.utils.ContextUtil; import com.fzzy.api.view.repository.Api1310Rep; import com.fzzy.api.view.repository.ApiLogRep; import com.fzzy.api.view.repository.GbCheckItemRep; import com.fzzy.async.fzzy40.entity.Fz40CheckItem; import com.fzzy.async.fzzy40.entity.Fz40Quality; import com.fzzy.async.fzzy40.repository.Fzzy40Sync1203Rep; import com.fzzy.async.fzzy40.repository.Fzzy40Sync1310Rep; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.time.DateFormatUtils; 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; /** * è´¨æ£åæ¥ * * @author czt * @date 2023-05-14 19:51 */ @Slf4j @Component public class Fzzy40Sync1310 { @Autowired private Fzzy40Sync1310Rep fzzySync1310Rep; @Autowired private Fzzy40Sync1203Rep fzzySync1203Rep; @Autowired private GbCheckItemRep gbCheckItemRep; @Autowired private ApiCommonService commonService; @Autowired private Api1310Rep api1310Rep; @Autowired private ApiLogRep apiLogRep; /** * 忥并å°è£ ä¿åè´¨æ£æ°æ® * * @param deptId ç³»ç»å¯¹åºåºåºç¼ç * @param start èµ·å§æ¶é´ * @param end æªæ¢æ¶é´ */ public void syncData(String kqdm, String deptId, Date start, Date end) { log.info("-------------1310æ¥å£æ°æ®å¼å§åæ¥------------------"); //åæ¥æ°æ®ï¼åªè®°å½å¤±è´¥çä¿¡æ¯ ApiLog apiLog = new ApiLog(); apiLog.setType(ApiLog.TYPE_SYNC); apiLog.setKqdm(deptId); apiLog.setUploadTime(new Date()); apiLog.setInteId(Constant.API_CODE_1304); apiLog.setStatus(99); apiLog.setId(ContextUtil.getUUID()); try { List<Fz40Quality> list = fzzySync1310Rep.findDateByTime(start, end); if (null == list || list.isEmpty()) { return; } Api1310 api1310; Api1105 api1105; List<Fz40CheckItem> fz40CheckItems; List<GbCheckItem> gbCheckList; StringBuilder jyxm; StringBuilder jyxmz; List<Api1310> api1310List; int index = 10001; for (Fz40Quality fz40Quality : list) { api1105 = commonService.getApi1105Cache(fz40Quality.getDepotId()); if (null == api1105) { continue; } api1310 = new Api1310(); api1310.setZjbgdh(fz40Quality.getType() + DateFormatUtils.format(fz40Quality.getTime(), "yyyyMMdd") + String.valueOf(index).substring(1)); api1310.setHwdm(api1105.getHwdm()); api1310.setKqdm(kqdm); api1310.setLspzdm(fz40Quality.getFoodVariety()); api1310.setLsdjdm(fz40Quality.getFoodLevel()); api1310.setRkrq(DateUtils.addDays(fz40Quality.getTime(), -30)); api1310.setJylb(fz40Quality.getType()); api1310.setJysj(fz40Quality.getTime()); api1310.setJydw(fz40Quality.getUser()); api1310.setJyr(fz40Quality.getUser()); api1310.setJyyj(fz40Quality.getStandard()); api1310.setZblb("2"); //æ£æµé¡¹ï¼æ£æµå¼ jyxm = new StringBuilder(); jyxmz = new StringBuilder(); fz40CheckItems = fzzySync1203Rep.listInoutCheckItem(fz40Quality.getId(), deptId.substring(0, 4)); if (null != fz40CheckItems && fz40CheckItems.size() > 0) { for (Fz40CheckItem fz40CheckItem : fz40CheckItems) { if(StringUtils.isEmpty(fz40CheckItem.getValue())){ continue; } gbCheckList = gbCheckItemRep.findByBizCode(fz40CheckItem.getStandardId()); if (gbCheckList == null || gbCheckList.isEmpty()) { continue; } jyxm.append(",").append(gbCheckList.get(0).getCode()); jyxmz.append(",").append(fz40CheckItem.getValue()); } } api1310.setJyxm(jyxm.toString().substring(1)); api1310.setJyxmz(jyxmz.toString().substring(1)); api1310.setZbjgpd(fz40Quality.getResult()); api1310.setQfrq(fz40Quality.getTime()); api1310.setBgcjsj(fz40Quality.getTime()); api1310.setShrxm(fz40Quality.getCheckUser()); api1310.setQysj(fz40Quality.getCheckTime()); api1310.setQyqy(fz40Quality.getCheckArea()); api1310.setQyrxm(fz40Quality.getCheckUser()); api1310.setJdrxm(fz40Quality.getCheckUser()); api1310.setYpsl(fz40Quality.getYpsl()); api1310.setDbsl(fz40Quality.getDbsl()); api1310.setYpdj(StringUtils.isEmpty(fz40Quality.getYpdj())?"0": fz40Quality.getYpdj()); api1310.setSfzcccnx(StringUtils.isEmpty(fz40Quality.getNormalYear())?"0": fz40Quality.getNormalYear()); api1310.setBz(fz40Quality.getRemark()); 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); index ++; } } catch (Exception e) { log.error("---åæ¥å¤±è´¥----{}", e); apiLog.setResult("åæ¥å¤±è´¥ï¼" + e.getMessage()); apiLogRep.save(apiLog); } } } src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1310Rep.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,27 @@ package com.fzzy.async.fzzy40.repository; import com.fzzy.async.fzzy40.entity.Fz40Quality; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import java.util.Date; import java.util.List; /** * æ¥è¯¢è´¨æ£æ°æ® * * @author chen * @date 2023-05-14 19:55 */ public interface Fzzy40Sync1310Rep extends JpaRepository<Fz40Quality, String> { /** * æ ¹æ®æ¶é´æ®µæ¥è¯¢ç²®æ æ°æ® * @param start * @param end * @return */ @Query("from Fz40Quality where time >=:start and time <:end order by time ") List<Fz40Quality> findDateByTime(@Param("start") Date start, @Param("end") Date end); }