From 748a94912543e37633d527bf1343fb78213dab0b Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 07 八月 2024 14:14:32 +0800 Subject: [PATCH] 点位去掉类型 --- ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 4 - ycl-common/src/main/java/enumeration/general/AreaDeptEnum.java | 23 ++++++++--- ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java | 3 - ycl-server/src/main/java/com/ycl/task/MonitorTask.java | 42 +++++++++++++++------ 4 files changed, 47 insertions(+), 25 deletions(-) diff --git a/ycl-common/src/main/java/enumeration/general/AreaDeptEnum.java b/ycl-common/src/main/java/enumeration/general/AreaDeptEnum.java index 28f55b3..5ec96c3 100644 --- a/ycl-common/src/main/java/enumeration/general/AreaDeptEnum.java +++ b/ycl-common/src/main/java/enumeration/general/AreaDeptEnum.java @@ -4,17 +4,16 @@ /** * 鍖哄煙鏋氫妇 - * */ @Getter public enum AreaDeptEnum { ZLJQ("鑷祦浜曞尯", "510302", 201), GJQ("璐′簳鍖�", "510303", 202), - DAQ("澶у畨鍖�", "510304",102), - YTQ("娌挎哗鍖�", "510311",211), - RX("鑽e幙", "510321",203), - FSX("瀵岄『鍘�", "510322",101), - GXQ("楂樻柊鍖�", "510399",210), + DAQ("澶у畨鍖�", "510304", 102), + YTQ("娌挎哗鍖�", "510311", 211), + RX("鑽e幙", "510321", 203), + FSX("瀵岄『鍘�", "510322", 101), + GXQ("楂樻柊鍖�", "510399", 210), ; private final String name; @@ -23,9 +22,19 @@ private final Integer deptId; - AreaDeptEnum(String name, String code,Integer deptId) { + AreaDeptEnum(String name, String code, Integer deptId) { this.name = name; this.code = code; this.deptId = deptId; } + + public static AreaDeptEnum fromCode(String code) { + for (AreaDeptEnum type : AreaDeptEnum.values()) { + if (type.getCode().equals(code) ) { + return type; + } + } + return null; + } + } diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java index 5514e75..dd863ca 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java @@ -55,9 +55,6 @@ @ApiModelProperty("澶囨敞") private String remark; - @ApiModelProperty("绫诲瀷") - private Short category; - @ApiModelProperty("璁惧缂栧彿") private String serialNumber; diff --git a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java index e53b548..bce6e07 100644 --- a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java +++ b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java @@ -14,6 +14,10 @@ import com.ycl.system.service.ISysDictDataService; import com.ycl.utils.DateUtils; import constant.RedisConstant; +import enumeration.general.AreaDeptEnum; +import enumeration.general.ImportantTagEnum; +import enumeration.general.PointStatus; +import enumeration.general.ProvinceTagEnum; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.MongoTemplate; @@ -44,21 +48,21 @@ private YwPointService ywPointService; @Autowired private RedisTemplate redisTemplate; + //鍚屾mongodb涓�鏈轰竴妗e埌鏁版嵁搴� public void synchronize() { Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); List<OneMachineFileResult> oneMachineFileResults = mongoTemplate.find(query, OneMachineFileResult.class); //鏁版嵁搴搈onitor琛ㄦ暟鎹� List<String> serialNumberInBase = monitorService.selectTMonitorList(null).stream().map(TMonitorVO::getSerialNumber).collect(Collectors.toList()); - //鍑嗗鎻掑叆鏁版嵁搴撶殑鏁版嵁 + //鍑嗗鎻掑叆璁惧琛ㄧ殑鏁版嵁 List<TMonitor> monitorList = new ArrayList<>(); + //鍑嗗鎻掑叆鐐逛綅琛ㄧ殑鏁版嵁 + List<YwPoint> ywPointList = new ArrayList<>(); //鏂扮殑鏁版嵁锛屽師鏁版嵁搴撲腑涓嶅瓨鍦ㄧ殑鏁版嵁 Set<TMonitor> newMonitorList = new HashSet<>(); //鐐逛綅鏁版嵁 Map<String, YwPoint> pointMap = ywPointService.list(new QueryWrapper<YwPoint>()).stream().collect(Collectors.toMap(YwPoint::getSerialNumber, Function.identity())); - //TODO:鎻掑叆鐐逛綅琛� - //TODO:瑙f瀽鍖哄煙銆佽ˉ鍏卍eptId - //TODO:瑙f瀽閲嶇偣鐐逛綅 //閲嶇偣鐐逛綅闆嗗悎瀛楀吀(瑙f瀽SXJCJQY瀛楁) SysDictData sysDictData = new SysDictData(); sysDictData.setDictType("platform_important_site"); @@ -66,15 +70,15 @@ List<String> importantSite = DictDataList.stream().map(SysDictData::getDictValue).collect(Collectors.toList()); for (OneMachineFileResult result : oneMachineFileResults) { TMonitor monitor = getMonitor(result); - YwPoint point = getPoint(result,pointMap,importantSite); + YwPoint point = getPoint(result, pointMap, importantSite); monitorList.add(monitor); //姣斿绛涢�夊嚭鏂扮殑鏁版嵁 - if(!CollectionUtils.isEmpty(serialNumberInBase) && !serialNumberInBase.contains(result.getSBBM())){ + if (!CollectionUtils.isEmpty(serialNumberInBase) && !serialNumberInBase.contains(result.getSBBM())) { newMonitorList.add(monitor); } } //鎻掑叆鏁版嵁搴� - if(!CollectionUtils.isEmpty(monitorList)){ + if (!CollectionUtils.isEmpty(monitorList)) { monitorService.deleteTMonitorById(null); monitorService.saveBatch(monitorList); } @@ -84,16 +88,30 @@ } - private YwPoint getPoint(OneMachineFileResult result, Map<String, YwPoint> pointMap,List<String> importantSite) { + private YwPoint getPoint(OneMachineFileResult result, Map<String, YwPoint> pointMap, List<String> importantSite) { YwPoint ywPoint = new YwPoint(); - if(pointMap.containsKey(result.getSBBM())){ + if (pointMap.containsKey(result.getSBBM())) { ywPoint = pointMap.get(result.getSBBM()); + }else { + ywPoint.setPointName(result.getSBMC()); + ywPoint.setStatus(PointStatus.WAIT.getDesc()); + ywPoint.setSerialNumber(result.getSBBM()); + ywPoint.setImportantTag(ImportantTagEnum.Normal); + ywPoint.setProvinceTag(ProvinceTagEnum.Normal); + ywPoint.setCreateTime(new Date()); + ywPoint.setUpdateTime(new Date()); } //姣斿鏄惁鏄噸鐐圭偣浣� - if(importantSite.contains(result.getSBBM())){ - + if (importantSite.contains(result.getSBBM())) { + ywPoint.setImportantTag(ImportantTagEnum.Important); } - + //瑙f瀽deptId + //鍖哄煙琛屾斂缂栫爜 + String areaCode = result.getSBBM().substring(0, 6); + Integer deptId = AreaDeptEnum.fromCode(areaCode).getDeptId(); + if (deptId != null) { + ywPoint.setDeptId(Long.valueOf(deptId + "")); + } return ywPoint; } diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml index 031607d..6395938 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml +++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml @@ -16,7 +16,6 @@ <result column="remark" property="remark" /> <result column="create_time" property="createTime" /> <result column="update_time" property="updateTime" /> - <result column="category" property="category" /> <result column="province_tag" property="provinceTag" /> <result column="important_tag" property="importantTag" /> </resultMap> @@ -40,8 +39,7 @@ typ.create_time, typ.update_time, typ.important_tag, - typ.province_tag, - typ.category + typ.province_tag FROM t_yw_point typ LEFT JOIN t_yw_unit tyu ON typ.unit_id = tyu.id AND tyu.deleted = 0 -- Gitblit v1.8.0