考核积分修改、点位导出修改

fuliqi

2024-12-25 7fa07718de92093c6315c5cb37bbc8dd7cdafa3c

 ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java

@@ -35,6 +35,7 @@
import com.ycl.utils.SecurityUtils;
import com.ycl.utils.poi.EasyExcelImportUtils;
import com.ycl.utils.uuid.IdUtils;
import constant.CheckConstants;
import constant.PointHeaderConstant;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
@@ -136,9 +137,14 @@
        YwPoint entity = baseMapper.selectById(form.getId());
        Assert.notNull(entity, "记录不存在");
        BeanUtils.copyProperties(form, entity);
        if (form.getUnitId() != null) {
            entity.setUnitId(Long.valueOf(form.getUnitId()));
        }else {
            entity.setUnitId(null);
        }
        Date now = new Date();
        entity.setUpdateTime(now);
        baseMapper.updateById(entity);
        baseMapper.myUpdateById(entity);
        return Result.ok("修改成功");
    }

@@ -195,7 +201,11 @@
        Assert.notNull(entity, "记录不存在");
        YwPointVO vo = YwPointVO.getVoByEntity(entity, null);
        if (Objects.nonNull(entity.getDeptId())) {
            vo.setDeptIds(sysDeptMapper.selectParents(entity.getDeptId()));
            //TODO:方法待完善 简单处理
            List<Long> deptIds = sysDeptMapper.selectParents(entity.getDeptId());
            deptIds.remove(deptIds.size()-1);
            deptIds.add(entity.getDeptId());
            vo.setDeptIds(deptIds);
        }
        return Result.ok().data(vo);
    }
@@ -260,9 +270,12 @@
        headers.add(PointHeaderConstant.ID);
        headers.add(PointHeaderConstant.Point_Name);
        headers.add(PointHeaderConstant.Serial_Number);
        headers.add(PointHeaderConstant.Area);
        headers.add(PointHeaderConstant.IP);
        headers.add(PointHeaderConstant.Province_Tag);
        headers.add(PointHeaderConstant.Area);
        headers.add(PointHeaderConstant.Unit);
        headers.add(PointHeaderConstant.Province_Tag_Video);
        headers.add(PointHeaderConstant.Province_Tag_Car);
        headers.add(PointHeaderConstant.Province_Tag_Face);
        headers.add(PointHeaderConstant.Impotrant_Command_Image);
        headers.add(PointHeaderConstant.Dept_Tag);
        List<String> headersList = new LinkedList<>();
@@ -279,9 +292,12 @@
            list.add(export.getId());
            list.add(export.getPointName());
            list.add(export.getSerialNumber());
            list.add(export.getArea());
            list.add(export.getPointIP());
            list.add(export.getProvinceTagString());
            list.add(export.getArea());
            list.add(export.getUnitName());
            list.add(export.getProvinceTagVideoString());
            list.add(export.getProvinceTagCarString());
            list.add(export.getProvinceTagFaceString());
            list.add(export.getImportantCommandImageTagString());
            list.add(export.getDeptTagString());
            for (String header : headersList) {
@@ -336,7 +352,9 @@
            pointExport.setPointName(map.get(PointHeaderConstant.Point_Name));
            pointExport.setPointIP(map.get(PointHeaderConstant.IP));
            pointExport.setSerialNumber(map.get(PointHeaderConstant.Serial_Number));
            pointExport.setProvinceTag("是".equals(map.get(PointHeaderConstant.Province_Tag)));
            pointExport.setProvinceTagVideo("是".equals(map.get(PointHeaderConstant.Province_Tag_Video)));
            pointExport.setProvinceTagCar("是".equals(map.get(PointHeaderConstant.Province_Tag_Car)));
            pointExport.setProvinceTagFace("是".equals(map.get(PointHeaderConstant.Province_Tag_Face)));
            pointExport.setImportantCommandImageTag("是".equals(map.get(PointHeaderConstant.Impotrant_Command_Image)));
            pointExport.setDeptTag("是".equals(map.get(PointHeaderConstant.Dept_Tag)));
            List<DynamicColumnVO> dynamics = new ArrayList<>();
@@ -381,11 +399,15 @@
        List<YwPoint> pointList = dataList.stream().map(item -> {
            YwPoint point = new YwPoint();
            point.setImportantCommandImageTag(item.getImportantCommandImageTag());
            point.setProvinceTag(item.getProvinceTag());
            point.setProvinceTagVideo(item.getProvinceTagVideo());
            point.setProvinceTagCar(item.getProvinceTagCar());
            point.setProvinceTagFace(item.getProvinceTagFace());
            point.setDeptTag(item.getDeptTag());
            if (needUpdateUnit) {
                if (Objects.nonNull(unitId)) {
                    point.setUnitId(Long.valueOf(unitId));
                } else {
                    point.setUnitId(null);
                }
                point.setStartTime(startTime);
                point.setEndTime(endTime);
@@ -399,7 +421,7 @@
            point.setSerialNumber(item.getSerialNumber());
            return point;
        }).collect(Collectors.toList());
        this.waitAllFinishAndGetResult(pointList);
        this.waitAllFinishAndGetResult(pointList, needUpdateUnit);
    }

    @Override
@@ -418,50 +440,42 @@
        }
        //根据label_value和ref_id判断是否是同一数据
        for (PointExport pointExport : dataList) {
            //得到excel中动态列名作为key的map
            Map<String, DynamicColumnVO> exportMap = pointExport.getDynamicData().stream().collect(Collectors.toMap(DynamicColumnVO::getLabelValue, Function.identity()));
            //查出数据库中这个点位的动态列
            List<DynamicColumnVO> dynamicColumnVOS = dynamicVOMap.get(pointExport.getId());
            if (!CollectionUtils.isEmpty(dynamicColumnVOS)) {
                //遍历数据库中这个点位的动态列，并根据动态列名找出excel中的值
                for (DynamicColumnVO vo : dynamicColumnVOS) {
                    DynamicColumnVO dynamicColumnVO = exportMap.get(vo.getLabelValue());
                    //存在说明excel有这个数据，将数据库这个数据的值改为excel的值
                    if (dynamicColumnVO.getColumnValue() != null) {
                        DynamicColumnValue entity = new DynamicColumnValue();
                        entity.setColumnValue(dynamicColumnVO.getColumnValue());
                        entity.setDynamicColumnId(vo.getId());
                        entity.setRefId(vo.getRefId());
                        entity.setId(vo.getValueId());
                        updateList.add(entity);
            //数据库中的动态列
            List<DynamicColumnVO> dynamicColumnVOS = dynamicVOMap.getOrDefault(pointExport.getId(), Collections.emptyList());
            Map<String, DynamicColumnVO> databaseMap = dynamicColumnVOS.stream()
                    .collect(Collectors.toMap(DynamicColumnVO::getLabelValue, Function.identity()));

            for (DynamicColumnVO excelVo : pointExport.getDynamicData()) {
                String labelValue = excelVo.getLabelValue();
                DynamicColumnVO databaseVo = databaseMap.get(labelValue);
                //如果excel值不为空判定为新增或修改
                if (excelVo.getColumnValue() != null) {
                    Integer dynamicId = dictionary.get(labelValue);
                    DynamicColumnValue entity = new DynamicColumnValue();
                    entity.setColumnValue(excelVo.getColumnValue());
                    entity.setRefId(pointExport.getId());
                    //数据库找不到为新增否则为修改
                    if (databaseVo != null) {
                        entity.setDynamicColumnId(databaseVo.getId());
                        entity.setId(databaseVo.getValueId());
                        updateList.add(entity);
                    } else {
                        //不存在则取消标签，删除
                        deleteList.add(vo.getValueId());
                    }
                }
            } else {
                //数据库里查不到excel里面的这个点位动态列，全为新增
                List<DynamicColumnVO> dynamicData = pointExport.getDynamicData();
                for (DynamicColumnVO excelData : dynamicData) {
                    if(excelData.getColumnValue()!=null) {
                        Integer dynamicId = dictionary.get(excelData.getLabelValue());
                        DynamicColumnValue entity = new DynamicColumnValue();
                        entity.setColumnValue(excelData.getColumnValue());
                        entity.setDynamicColumnId(dynamicId);
                        entity.setRefId(pointExport.getId());
                        insertList.add(entity);
                    }
                } else if (databaseVo != null) {
                    //excel里为空但是数据库存在 删除
                    deleteList.add(databaseVo.getValueId());
                }
            }
        }
        //mybaits方法
        //插入
        if(!CollectionUtils.isEmpty(insertList)) dynamicColumnMapper.saveBatch(insertList);
        if (!CollectionUtils.isEmpty(insertList)) dynamicColumnMapper.saveBatch(insertList);
        //更新
        if(!CollectionUtils.isEmpty(updateList)) dynamicColumnMapper.updateBatch(updateList);
        if (!CollectionUtils.isEmpty(updateList)) dynamicColumnMapper.updateBatch(updateList);
        //删除
        if(!CollectionUtils.isEmpty(deleteList)) dynamicColumnMapper.deleteBatch(deleteList);
        if (!CollectionUtils.isEmpty(deleteList)) dynamicColumnMapper.deleteBatch(deleteList);
    }

    /**
@@ -476,15 +490,15 @@
        return baseMapper.selectOne(new LambdaQueryWrapper<>(YwPoint.class).eq(YwPoint::getSerialNumber, serialNumber).eq(YwPoint::getDeleted, "0"));
    }

    public void waitAllFinishAndGetResult(List<YwPoint> dataList) {
    public void waitAllFinishAndGetResult(List<YwPoint> dataList, Boolean needUpdateUnit) {
        Date startTime = new Date();
        this.baseMapper.updatePoint(dataList);
        this.baseMapper.updatePoint(dataList, needUpdateUnit);
        Date endTime = new Date();
        log.error("总共耗时：" + (endTime.getTime() - startTime.getTime()));
    }

    @Override
    public <T extends BaseResult> void setDeviceTagByGB(List<T> dataList) {
    public <T extends BaseResult> void setDeviceTagByGB(List<T> dataList,Short category) {
        List<String> gbList = dataList.stream().map(BaseResult::getNo).collect(Collectors.toList());
        List<CheckTagVO> pointList = baseMapper.getTagsByGB(gbList);
        Map<String, CheckTagVO> pointMap = pointList.stream().collect(Collectors.toMap(CheckTagVO::getNo, item -> item));
@@ -492,6 +506,20 @@
            CheckTagVO tag = pointMap.get(data.getNo());
            if (Objects.nonNull(tag)) {
                BeanUtils.copyProperties(tag, data);
                //通过设备类型打省厅标签
                if(CheckConstants.Rule_Category_Video.equals(category)){
                    data.setProvinceTag(tag.getProvinceTagVideo());
                }else if(CheckConstants.Rule_Category_Car.equals(category)){
                    data.setProvinceTag(tag.getProvinceTagCar());
                }else if(CheckConstants.Rule_Category_Face.equals(category)){
                    data.setProvinceTag(tag.getProvinceTagFace());
                }else if(CheckConstants.Rule_Category_Or.equals(category)){
                    if(tag.getProvinceTagVideo() || tag.getProvinceTagCar() || tag.getProvinceTagFace()) {
                        data.setProvinceTag(Boolean.TRUE);
                    }else {
                        data.setProvinceTag(Boolean.FALSE);
                    }
                }
            }
        }
    }