合同考核调整+日志

fuliqi

2024-11-19 3380b0f6767308fa91bd55d68a96a48be5029aa7

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

@@ -3,6 +3,7 @@
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
@@ -135,9 +136,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("修改成功");
    }

@@ -260,6 +266,8 @@
        headers.add(PointHeaderConstant.Point_Name);
        headers.add(PointHeaderConstant.Serial_Number);
        headers.add(PointHeaderConstant.IP);
        headers.add(PointHeaderConstant.Area);
        headers.add(PointHeaderConstant.Unit);
        headers.add(PointHeaderConstant.Province_Tag);
        headers.add(PointHeaderConstant.Impotrant_Command_Image);
        headers.add(PointHeaderConstant.Dept_Tag);
@@ -278,6 +286,8 @@
            list.add(export.getPointName());
            list.add(export.getSerialNumber());
            list.add(export.getPointIP());
            list.add(export.getArea());
            list.add(export.getUnitName());
            list.add(export.getProvinceTagString());
            list.add(export.getImportantCommandImageTagString());
            list.add(export.getDeptTagString());
@@ -383,6 +393,8 @@
            if (needUpdateUnit) {
                if (Objects.nonNull(unitId)) {
                    point.setUnitId(Long.valueOf(unitId));
                } else {
                    point.setUnitId(null);
                }
                point.setStartTime(startTime);
                point.setEndTime(endTime);
@@ -396,7 +408,7 @@
            point.setSerialNumber(item.getSerialNumber());
            return point;
        }).collect(Collectors.toList());
        this.waitAllFinishAndGetResult(pointList);
        this.waitAllFinishAndGetResult(pointList, needUpdateUnit);
    }

    @Override
@@ -441,7 +453,7 @@
                //数据库里查不到excel里面的这个点位动态列，全为新增
                List<DynamicColumnVO> dynamicData = pointExport.getDynamicData();
                for (DynamicColumnVO excelData : dynamicData) {
                    if(excelData.getColumnValue()!=null) {
                    if (excelData.getColumnValue() != null) {
                        Integer dynamicId = dictionary.get(excelData.getLabelValue());
                        DynamicColumnValue entity = new DynamicColumnValue();
                        entity.setColumnValue(excelData.getColumnValue());
@@ -454,16 +466,28 @@
        }
        //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);
    }

    public void waitAllFinishAndGetResult(List<YwPoint> dataList) {
    /**
     * 根据设备编码查询点位信息
     *
     * @param serialNumber 序列号
     * @return {@link YwPoint }
     * @author
     */
    @Override
    public YwPoint selectBySerialNumber(String serialNumber) {
        return baseMapper.selectOne(new LambdaQueryWrapper<>(YwPoint.class).eq(YwPoint::getSerialNumber, serialNumber).eq(YwPoint::getDeleted, "0"));
    }

    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()));
    }