点位去掉类型

fuliqi

2024-08-07 748a94912543e37633d527bf1343fb78213dab0b

点位去掉类型

 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("荣县", "510321",203),
    FSX("富顺县", "510322",101),
    GXQ("高新区", "510399",210),
    DAQ("大安区", "510304", 102),
    YTQ("沿滩区", "510311", 211),
    RX("荣县", "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;
    }

}

 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;


 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一机一档到数据库
    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);
        //数据库monitor表数据
        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:解析区域、补充deptId
        //TODO:解析重点点位
        //重点点位集合字典(解析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);
        }

        //解析deptId
        //区域行政编码
        String areaCode = result.getSBBM().substring(0, 6);
        Integer deptId = AreaDeptEnum.fromCode(areaCode).getDeptId();
        if (deptId != null) {
            ywPoint.setDeptId(Long.valueOf(deptId + ""));
        }
        return ywPoint;
    }


 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