代码优化

linwe

2024-07-03 e9b990b1885c10d7b35f610a115feef56b3db016

代码优化

 src/main/java/org/springblade/modules/eCallEventTwo/controller/ECallEventTwoController.java

@@ -144,13 +144,13 @@
        // 创建居住证发送短信定时任务
        EcOrderParamDTO ecOrderParamDTO = new EcOrderParamDTO();
        // 获取当前日期时间
        LocalDateTime now = LocalDateTime.now();
        // 获取前一天的开始时间
        LocalDateTime yesterdayStart = now.minus(1, ChronoUnit.DAYS).with(LocalTime.MIN);
        // 获取前一天的结束时间
        LocalDateTime yesterdayEnd = now.minus(1, ChronoUnit.DAYS).with(LocalTime.MAX);
        ecOrderParamDTO.setEndTime(yesterdayEnd);
        ecOrderParamDTO.setStartTime(yesterdayStart);
        // LocalDateTime now = LocalDateTime.now();
        // // 获取前一天的开始时间
        // LocalDateTime yesterdayStart = now.minus(1, ChronoUnit.DAYS).with(LocalTime.MIN);
        // // 获取前一天的结束时间
        // LocalDateTime yesterdayEnd = now.minus(1, ChronoUnit.DAYS).with(LocalTime.MAX);
        // ecOrderParamDTO.setEndTime(yesterdayEnd);
        // ecOrderParamDTO.setStartTime(yesterdayStart);
        boolean b = ecOrderService.SynchronizeData(ecOrderParamDTO);
        return R.status(b);
    }

 src/main/java/org/springblade/modules/eCallEventTwo/mapper/EcCallEventTwoMapper.java

@@ -16,6 +16,7 @@
 */
package org.springblade.modules.eCallEventTwo.mapper;

import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
@@ -31,6 +32,7 @@
 * @author BladeX
 * @since 2024-05-15
 */
@DS("master")
public interface EcCallEventTwoMapper extends BaseMapper<ECallEventTwoEntity> {

    /**

 src/main/java/org/springblade/modules/eCallEventTwo/service/EcOrderService.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.modules.eCallEventTwo.dto.EcOrderDTO;
import org.springblade.modules.eCallEventTwo.dto.EcOrderParamDTO;
import org.springblade.modules.eCallEventTwo.entity.ECallEventTwoEntity;
import org.springblade.modules.eCallEventTwo.entity.EcOrder;
import org.springblade.modules.eCallEventTwo.vo.ECallEventTwoVO;

@@ -68,6 +69,13 @@
    boolean SynchronizeData(EcOrderParamDTO ecOrderParamDTO);

    /**
     * 批量同步工单
     * @param recordEntityList
     * @return
     */
    public boolean saveEcOrder(List<ECallEventTwoEntity> recordEntityList);

    /**
     * 单位考核指标
     * @return
     */

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

@@ -122,7 +122,9 @@

    public void processPages(int pageSize, EcOrderParamDTO ecOrderParamDTO) {
        QueryWrapper<EcOrder> ecOrderQueryWrapper = new QueryWrapper<>();
        ecOrderQueryWrapper.between("import_time", ecOrderParamDTO.getStartTime(), ecOrderParamDTO.getEndTime());
        if (ecOrderParamDTO.getStartTime() != null) {
            ecOrderQueryWrapper.between("import_time", ecOrderParamDTO.getStartTime(), ecOrderParamDTO.getEndTime());
        }
        long count = count(ecOrderQueryWrapper);
        int totalPages = (int) Math.ceil((double) count / pageSize); // 计算总页数

@@ -136,11 +138,18 @@
                // 点落面 设置警格网格信息
                setGridInfo(ecOrderEntity);
            });
            boolean b = ecOrderService.saveBatch(recordEntityList);
            boolean b = saveEcOrder(recordEntityList);
            System.out.println("更新第" + pageNum + "页" + b);
        }
    }

    @Override
    @DS("master")
    public boolean saveEcOrder(List<ECallEventTwoEntity> recordEntityList) {
        return ecOrderService.saveOrUpdateBatch(recordEntityList);
    }


    /**
     * 设置警格网格信息
     *

 src/main/java/org/springblade/modules/task/excel/TaskPlaceRectificationExcel.java

@@ -21,6 +21,7 @@
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springblade.modules.patrol.vo.PatrolRecordVO;
import org.springblade.modules.place.vo.PlacePoiLabelVO;
@@ -45,6 +46,12 @@
    @ExcelIgnore
    private List<PatrolRecordVO> patrolRecordVOList;

    @ExcelProperty(value = "街道名称")
    private String streetName;

    @ExcelProperty(value = "社区名称")
    private String communityName;

    @ExcelProperty(value = "场所标签")
    @ExcelIgnore
    private List<PlacePoiLabelVO> placePoiLabelVOList ;

 src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml

@@ -55,6 +55,14 @@
        LEFT JOIN jczz_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
        LEFT JOIN blade_region br on br.code = jpag.community_code
        where jtlre.is_deleted = 0
        <if test="taskLabelReportingEvent.streetName != null and taskLabelReportingEvent.streetName != ''">
            AND br.town_name like concat('%',#{taskLabelReportingEvent.streetName},'%')
        </if>

        <if test="taskLabelReportingEvent.communityName != null and taskLabelReportingEvent.communityName != ''">
            AND br.village_name like concat('%',#{taskLabelReportingEvent.communityName},'%')
        </if>

        <if test="taskLabelReportingEvent.userId != null and taskLabelReportingEvent.userId != ''">
            AND jtlre.user_id = #{taskLabelReportingEvent.userId}
        </if>

 src/main/java/org/springblade/modules/task/mapper/TaskPlaceRectificationMapper.xml

@@ -193,8 +193,8 @@
        jp.principal,
        jp.principal_phone,
        jp.nine_type,
        br.town_name,
        br.village_name,
        br.town_name streetName,
        br.village_name communityName,
        bu.`name`,
        jpe.legal_tel,
        jpe.legal_person,
@@ -224,6 +224,14 @@
            </if>
            <if test="taskPalce.endTime!=null and taskPalce.endTime!=''">
                and jtpr.create_time&lt;=#{taskPalce.endTime}
            </if>

            <if test="taskPalce.streetName!=null and taskPalce.streetName!=''">
                and br.town_name like concat('%',#{taskPalce.streetName},'%')
            </if>

            <if test="taskPalce.communityName!=null and taskPalce.communityName!=''">
                and br.village_name like concat('%',#{taskPalce.communityName},'%')
            </if>

            <if test="taskPalce.placeName!=null and taskPalce.placeName!=''">
@@ -466,8 +474,8 @@
        jp.principal,
        jp.principal_phone,
        jp.nine_type,
        br.town_name,
        br.village_name,
        br.town_name streetName,
        br.village_name communityName,
        bu.`name`,
        jpe.legal_tel,
        jpe.legal_person,