处理一个社区多个派出所，社区编码添加了标识位

linwe

2024-06-28 0b7b8ede524a0b82563fa74ebe234b59c29463ab

处理一个社区多个派出所，社区编码添加了标识位

 src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java

@@ -1038,7 +1038,9 @@
                    // 查询对应的社区code
                    list = SysCache.getGridRegionChildCodesByDeptId(AuthUtil.getDeptId(), null, roleName);
                    if (null != list && list.size() > 0) {
                        boolean contains = list.contains(doorplateAddressVO.getNeiCode());
                        // 存在一个社区有多个派出所，所以社区有36110200201702 存后面添加两位，对比的时候要删除后面两位
                        List<String> collect = list.stream().map(s -> s.length() > 12 ? s.substring(0, s.length() - 2) : s).collect(Collectors.toList());
                        boolean contains = collect.contains(doorplateAddressVO.getNeiCode());
                        if (contains) {
                            doorplateAddressVO.setIsJur(1);
                        }

 src/main/java/org/springblade/modules/eCallEventTwo/service/impl/EcOrderServiceImpl.java

@@ -1,6 +1,7 @@
package org.springblade.modules.eCallEventTwo.service.impl;

import cn.hutool.core.convert.Convert;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -113,6 +114,7 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    @DS("slave_1")
    public boolean SynchronizeData(EcOrderParamDTO ecOrderParamDTO) {
        processPages(100, ecOrderParamDTO);
        return true;
@@ -121,13 +123,13 @@
    public void processPages(int pageSize, EcOrderParamDTO ecOrderParamDTO) {
        QueryWrapper<EcOrder> ecOrderQueryWrapper = new QueryWrapper<>();
        ecOrderQueryWrapper.between("import_time", ecOrderParamDTO.getStartTime(), ecOrderParamDTO.getEndTime());
        long count = baseMapper.selectCount(ecOrderQueryWrapper);
        long count = count(ecOrderQueryWrapper);
        int totalPages = (int) Math.ceil((double) count / pageSize); // 计算总页数

        for (int pageNum = 1; pageNum <= totalPages; pageNum++) {
            Page<EcOrder> page = new Page<>(pageNum, pageSize);
            QueryWrapper<EcOrder> objectQueryWrapper = new QueryWrapper<>();
            IPage<EcOrder> resultPage = baseMapper.selectPage(page, objectQueryWrapper);
            IPage<EcOrder> resultPage = page(page, objectQueryWrapper);
            List<EcOrder> records = resultPage.getRecords();
            List<ECallEventTwoEntity> recordEntityList = BeanUtil.copy(records, ECallEventTwoEntity.class);
            recordEntityList.forEach(ecOrderEntity -> {