src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/fzzy/async/fzzy40/entity/Fz40SecCamera.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2101.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2103.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1311Rep.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1311.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
@@ -32,6 +32,8 @@ @Autowired private Fzzy40Sync1023 fzzySync1023; @Autowired private Fzzy40Sync1311 fzzySync1311; @Autowired private Fzzy40Sync2103 fzzy40Sync2103; @Override @@ -48,6 +50,8 @@ //广ä¸çå¹³å°2022çï¼éè¦åæ¥çè¸å¤æ¡ä¿¡æ¯ //çè¸å¤æ¡æ°æ®åæ¥ fzzySync1023.syncData(param.getDeptId(), param.getStart(), param.getEnd()); //è§é¢çæ§ä¿¡æ¯åæ¥ fzzySync1311.syncData(param.getKqdm(), param.getDeptId(), param.getStart(), param.getEnd()); } if (StringUtils.isNotEmpty(param.getPushProtocol()) && PushProtocol.SB_SH_2023.equals(param.getPushProtocol())) { src/main/java/com/fzzy/async/fzzy40/entity/Fz40SecCamera.java
@@ -2,6 +2,7 @@ import com.bstek.dorado.annotation.PropertyDef; import lombok.Data; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; @@ -51,6 +52,10 @@ @PropertyDef(label = "æææ¹å¼") private String snapType; @Column(name = "azwzlx", length = 2) @PropertyDef(label = "å®è£ ä½ç½®ç±»å") private String azwzlx; @Column(name = "NAME_", length = 50) @PropertyDef(label = "åç§°") private String name; src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,130 @@ package com.fzzy.async.fzzy40.impl; import com.alibaba.fastjson.JSON; import com.fzzy.api.Constant; import com.fzzy.api.entity.ApiInfoData; import com.fzzy.api.entity.ApiLog; import com.fzzy.api.service.ApiCommonService; import com.fzzy.api.utils.ContextUtil; import com.fzzy.api.view.repository.ApiInfoDataRep; import com.fzzy.api.view.repository.ApiLogRep; import com.fzzy.async.fzzy40.entity.Fz40SecCamera; import com.fzzy.async.fzzy40.repository.Fzzy40Sync1311Rep; import com.fzzy.push.sh2023.SH2023Constant; import com.fzzy.push.sh2023.dto.SH2023Api1311; import lombok.extern.slf4j.Slf4j; import org.aspectj.weaver.ConcreteTypeMunger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.Date; import java.util.List; /** * è§é¢çæ§ * * @Author:YAN */ @Component @Slf4j public class Fzzy40Sync1311 { @Autowired private ApiLogRep apiLogRep; @Autowired private Fzzy40Sync1311Rep fzzy40Sync1311Rep; @Autowired private ApiCommonService commonService; @Autowired private ApiInfoDataRep apiInfoDataRep; public void syncData(String kqdm, String deptId, Date start, Date end) { log.info("-------------1311æ¥å£æ°æ®å¼å§åæ¥------------------"); //åæ¥æ°æ® ApiLog apiLog = new ApiLog(); apiLog.setType(ApiLog.TYPE_SYNC); apiLog.setKqdm(deptId); apiLog.setUploadTime(new Date()); apiLog.setInteId(SH2023Constant.SH_2023_API_CODE_1311); apiLog.setStatus(99); apiLog.setId(ContextUtil.getUUID()); try { List<Fz40SecCamera> list = fzzy40Sync1311Rep.findDateByDeptId(deptId); if (list.isEmpty() || null == list) { log.debug("-------------没æè·åå°è§é¢çæ§ä¿¡æ¯------------------"); return; } SH2023Api1311 sh2023Api1311; List<ApiInfoData> apiInfoDataList; String dataID; int num = 1; String secType = "01,02,03,04,05"; for (Fz40SecCamera sysData : list) { dataID = kqdm.substring(3, 8) + "01401327" + String.format("%06d", num++); List<ApiInfoData> apiInfoData = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_1311, dataID); if (null != apiInfoData && apiInfoData.size() > 0) { continue; } sh2023Api1311 = new SH2023Api1311(); sh2023Api1311.setSxtbh(dataID); sh2023Api1311.setTdbh(sysData.getChanNum()); sh2023Api1311.setTdmc(sysData.getChanNum() + "å·éé"); sh2023Api1311.setJksbmc(sysData.getName()); sh2023Api1311.setKqdm(kqdm); if (sysData.getBrand().equals("01")) { sh2023Api1311.setJkcs("2"); } else if (sysData.getBrand().equals("02")) { sh2023Api1311.setJkcs("1"); } else { sh2023Api1311.setJkcs("9"); } sh2023Api1311.setJkxlh(sysData.getSn()); if (sysData.getAzwzlx().equals("08")) { sh2023Api1311.setSpjklx("1"); } else if (secType.indexOf(sysData.getAzwzlx()) >= 0) { sh2023Api1311.setSpjklx("2"); } else { sh2023Api1311.setSpjklx("3"); } sh2023Api1311.setSblxbm("1"); sh2023Api1311.setAzwzlx(sysData.getAzwzlx()); sh2023Api1311.setZsqy("Y"); sh2023Api1311.setJkjlxbm(sysData.getType().substring(1)); sh2023Api1311.setSbipdz(sysData.getIpIn()); sh2023Api1311.setSbdkh(sysData.getPortInV()); sh2023Api1311.setSbdlmc(sysData.getLoginId()); sh2023Api1311.setSbdlmm(sysData.getPwd()); sh2023Api1311.setBz(sysData.getRemark()); sh2023Api1311.setZhgxsj(sysData.getUpdateTime()); //æä¹ åä¿åï¼åç¬åå ¥é彿 æ¥å£è¡¨ ApiInfoData infoData = new ApiInfoData(); infoData.setId(ContextUtil.getUUID()); infoData.setKqdm(kqdm); infoData.setInteType(Constant.API_CATEGORY_13); infoData.setInteId(SH2023Constant.SH_2023_API_CODE_1311); infoData.setUpdateTime(new Date()); infoData.setDataId(dataID); infoData.setRemarks("è§é¢çæ§ä¿¡æ¯"); //设置æä½æ å¿ apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_1311, infoData.getDataId()); if (null == apiInfoDataList || apiInfoDataList.isEmpty()) { infoData.setCzbz(Constant.CZBZ_I); } else { infoData.setCzbz(apiInfoDataList.get(0).getCzbz()); } infoData.setData(JSON.toJSONString(sh2023Api1311)); apiInfoDataRep.save(infoData); log.info("1311---å¸å¨æ£æ¤å-åæ¥æ°æ®ï¼{}", sh2023Api1311); } } catch (Exception e) { log.error("---åæ¥å¤±è´¥----{}", e); apiLog.setResult("åæ¥å¤±è´¥ï¼" + e.getMessage()); apiLogRep.save(apiLog); } } } src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2101.java
@@ -128,7 +128,7 @@ infoData.setRemarks("å¸å¨æ£æ¤å"); //设置æä½æ å¿ apiInfoDataList = apiInfoDataRep.getDataByDataId(infoData.getDataId()); apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2101, infoData.getDataId()); if (null == apiInfoDataList || apiInfoDataList.isEmpty()) { infoData.setCzbz(Constant.CZBZ_I); sh2023Api2101.setCzbz(Constant.CZBZ_I); src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2103.java
@@ -23,6 +23,7 @@ import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -172,7 +173,7 @@ infoData.setRemarks("ç²®æ 设å¤é 置信æ¯"); //设置æä½æ å¿ apiInfoDataList = apiInfoDataRep.getDataByDataId(infoData.getDataId()); apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2103, infoData.getDataId()); if (null == apiInfoDataList || apiInfoDataList.isEmpty()) { infoData.setCzbz(Constant.CZBZ_I); } else { src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2104.java
@@ -121,7 +121,7 @@ infoData.setRemarks("å¸å¨é©³è¿å"); //设置æä½æ å¿ apiInfoDataList = apiInfoDataRep.getDataByDataId(infoData.getDataId()); apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, infoData.getDataId()); if (null == apiInfoDataList || apiInfoDataList.isEmpty()) { infoData.setCzbz(Constant.CZBZ_I); sh2023Api2104.setCzbz(Constant.CZBZ_I); src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1311Rep.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,24 @@ package com.fzzy.async.fzzy40.repository; import com.fzzy.async.fzzy40.entity.Fz40Quality; import com.fzzy.async.fzzy40.entity.Fz40SecCamera; 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:YAN */ public interface Fzzy40Sync1311Rep extends JpaRepository<Fz40SecCamera, String> { /** * æ ¹æ®æ¶é´æ®µæ¥è¯¢ç²®æ æ°æ® * * @param deptId * @return */ @Query("from Fz40SecCamera where deptId =:deptId ") List<Fz40SecCamera> findDateByDeptId(@Param("deptId") String deptId); } src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java
@@ -331,7 +331,6 @@ List<SH2023Api1311> list = new ArrayList<>(); for (ApiInfoData infoData : items) { shApi1311 = JSONObject.parseObject(infoData.getData(), SH2023Api1311.class); shApi1311.setCzbz(infoData.getCzbz()); shApi1311.setZhgxsj(infoData.getUpdateTime()); list.add(shApi1311); } src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1311.java
@@ -117,12 +117,6 @@ @PropertyDef(label = "夿³¨") private String bz; @PropertyDef(label = "æ è®°ä½") private String bjw; @PropertyDef(label = "æä½æ å¿") private String czbz; @JSONField(format = "yyyy-MM-dd HH:mm:ss") @PropertyDef(label = "æåæ´æ°æ¶é´") private Date zhgxsj;