代码优化

lin

2024-04-03 7ee7953112f324b30d5d7cefc0d6f3207a424259

代码优化

 src/main/java/org/springblade/modules/police/controller/PolicTrajectoryPointController.java

File was renamed from src/main/java/org/springblade/modules/policTrajectoryPoint/controller/PolicTrajectoryPointController.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.policTrajectoryPoint.controller;
package org.springblade.modules.police.controller;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -23,17 +23,16 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;

import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.policTrajectoryPoint.entity.PolicTrajectoryPointEntity;
import org.springblade.modules.policTrajectoryPoint.vo.PolicTrajectoryPointVO;
import org.springblade.modules.policTrajectoryPoint.wrapper.PolicTrajectoryPointWrapper;
import org.springblade.modules.policTrajectoryPoint.service.IPolicTrajectoryPointService;
import org.springblade.modules.police.entity.PolicTrajectoryPointEntity;
import org.springblade.modules.police.vo.PolicTrajectoryPointVO;
import org.springblade.modules.police.wrapper.PolicTrajectoryPointWrapper;
import org.springblade.modules.police.service.IPolicTrajectoryPointService;
import org.springblade.core.boot.ctrl.BladeController;

/**

 src/main/java/org/springblade/modules/police/dto/PolicTrajectoryPointDTO.java

File was renamed from src/main/java/org/springblade/modules/policTrajectoryPoint/dto/PolicTrajectoryPointDTO.java
@@ -14,9 +14,9 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.policTrajectoryPoint.dto;
package org.springblade.modules.police.dto;

import org.springblade.modules.policTrajectoryPoint.entity.PolicTrajectoryPointEntity;
import org.springblade.modules.police.entity.PolicTrajectoryPointEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;


 src/main/java/org/springblade/modules/police/entity/PolicTrajectoryPointEntity.java

File was renamed from src/main/java/org/springblade/modules/policTrajectoryPoint/entity/PolicTrajectoryPointEntity.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.policTrajectoryPoint.entity;
package org.springblade.modules.police.entity;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;

 src/main/java/org/springblade/modules/police/mapper/PolicTrajectoryPointMapper.java

File was renamed from src/main/java/org/springblade/modules/policTrajectoryPoint/mapper/PolicTrajectoryPointMapper.java
@@ -14,11 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.policTrajectoryPoint.mapper;
package org.springblade.modules.police.mapper;

import org.springblade.modules.policTrajectoryPoint.dto.PolicTrajectoryPointDTO;
import org.springblade.modules.policTrajectoryPoint.entity.PolicTrajectoryPointEntity;
import org.springblade.modules.policTrajectoryPoint.vo.PolicTrajectoryPointVO;
import io.lettuce.core.dynamic.annotation.Param;
import org.springblade.modules.police.dto.PolicTrajectoryPointDTO;
import org.springblade.modules.police.entity.PolicTrajectoryPointEntity;
import org.springblade.modules.police.vo.PolicTrajectoryPointVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List;
@@ -38,7 +39,7 @@
     * @param policTrajectoryPoint
     * @return
     */
    List<PolicTrajectoryPointVO> selectPolicTrajectoryPointPage(IPage page, PolicTrajectoryPointVO policTrajectoryPoint);
    List<PolicTrajectoryPointVO> selectPolicTrajectoryPointPage(IPage page, @Param("policTrajectoryPoint") PolicTrajectoryPointVO policTrajectoryPoint);
    /**
     * 查询用户轨迹记录
     *

 src/main/java/org/springblade/modules/police/mapper/PolicTrajectoryPointMapper.xml

File was renamed from src/main/java/org/springblade/modules/policTrajectoryPoint/mapper/PolicTrajectoryPointMapper.xml
@@ -1,16 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.modules.policTrajectoryPoint.mapper.PolicTrajectoryPointMapper">
<mapper namespace="org.springblade.modules.police.mapper.PolicTrajectoryPointMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="policTrajectoryPointResultMap" type="org.springblade.modules.policTrajectoryPoint.entity.PolicTrajectoryPointEntity">
    <resultMap id="policTrajectoryPointResultMap" type="org.springblade.modules.police.entity.PolicTrajectoryPointEntity">
    </resultMap>


    <select id="selectPolicTrajectoryPointPage" resultMap="policTrajectoryPointResultMap">
        select * from jczz_polic_trajectory_point where is_deleted = 0
        select * from jczz_polic_trajectory_point
        <where>
            <if test="policTrajectoryPoint.id != null "> and id = #{policTrajectoryPoint.id}</if>
            <if test="policTrajectoryPoint.userId != null "> and user_id = #{policTrajectoryPoint.userId}</if>
            <if test="policTrajectoryPoint.latitude != null "> and latitude = #{policTrajectoryPoint.latitude}</if>
            <if test="policTrajectoryPoint.longitude != null "> and longitude = #{policTrajectoryPoint.longitude}</if>
            <if test="policTrajectoryPoint.createTimeStr != null and policTrajectoryPoint.createTimeStr != '' "> and DATE(create_time) = #{policTrajectoryPoint.createTimeStr}</if>
            <if test="policTrajectoryPoint.speed != null "> and speed = #{policTrajectoryPoint.speed}</if>
            <if test="policTrajectoryPoint.accuracy != null "> and accuracy = #{policTrajectoryPoint.accuracy}</if>
            <if test="policTrajectoryPoint.altitude != null "> and altitude = #{policTrajectoryPoint.altitude}</if>
            <if test="policTrajectoryPoint.verticalAccuracy != null "> and verticalAccuracy = #{policTrajectoryPoint.verticalAccuracy}</if>
            <if test="policTrajectoryPoint.horizontalAccuracy != null "> and horizontalAccuracy = #{policTrajectoryPoint.horizontalAccuracy}</if>
        </where>
    </select>
    <resultMap type="org.springblade.modules.policTrajectoryPoint.dto.PolicTrajectoryPointDTO" id="PolicTrajectoryPointDTOResult">
    <resultMap type="org.springblade.modules.police.dto.PolicTrajectoryPointDTO" id="PolicTrajectoryPointDTOResult">
        <result property="id"    column="id"    />
        <result property="userId"    column="user_id"    />
        <result property="latitude"    column="latitude"    />
@@ -45,7 +57,7 @@
        id = #{id}
    </select>

    <select id="selectPolicTrajectoryPointList" parameterType="org.springblade.modules.policTrajectoryPoint.dto.PolicTrajectoryPointDTO" resultMap="PolicTrajectoryPointDTOResult">
    <select id="selectPolicTrajectoryPointList" parameterType="org.springblade.modules.police.dto.PolicTrajectoryPointDTO" resultMap="PolicTrajectoryPointDTOResult">
        <include refid="selectPolicTrajectoryPoint"/>
        <where>
            <if test="id != null "> and id = #{id}</if>

 src/main/java/org/springblade/modules/police/service/IPolicTrajectoryPointService.java

File was renamed from src/main/java/org/springblade/modules/policTrajectoryPoint/service/IPolicTrajectoryPointService.java
@@ -14,12 +14,11 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.policTrajectoryPoint.service;
package org.springblade.modules.police.service;

import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.modules.policTrajectoryPoint.entity.PolicTrajectoryPointEntity;
import org.springblade.modules.policTrajectoryPoint.vo.PolicTrajectoryPointVO;
import org.springblade.core.mp.base.BaseService;
import org.springblade.modules.police.entity.PolicTrajectoryPointEntity;
import org.springblade.modules.police.vo.PolicTrajectoryPointVO;
import com.baomidou.mybatisplus.core.metadata.IPage;

/**

 src/main/java/org/springblade/modules/police/service/impl/PolicTrajectoryPointServiceImpl.java

File was renamed from src/main/java/org/springblade/modules/policTrajectoryPoint/service/impl/PolicTrajectoryPointServiceImpl.java
@@ -14,14 +14,13 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.policTrajectoryPoint.service.impl;
package org.springblade.modules.police.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.modules.policTrajectoryPoint.entity.PolicTrajectoryPointEntity;
import org.springblade.modules.policTrajectoryPoint.vo.PolicTrajectoryPointVO;
import org.springblade.modules.policTrajectoryPoint.mapper.PolicTrajectoryPointMapper;
import org.springblade.modules.policTrajectoryPoint.service.IPolicTrajectoryPointService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.police.entity.PolicTrajectoryPointEntity;
import org.springblade.modules.police.vo.PolicTrajectoryPointVO;
import org.springblade.modules.police.mapper.PolicTrajectoryPointMapper;
import org.springblade.modules.police.service.IPolicTrajectoryPointService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;


 src/main/java/org/springblade/modules/police/vo/PolicTrajectoryPointVO.java

File was renamed from src/main/java/org/springblade/modules/policTrajectoryPoint/vo/PolicTrajectoryPointVO.java
@@ -14,10 +14,9 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.policTrajectoryPoint.vo;
package org.springblade.modules.police.vo;

import org.springblade.modules.policTrajectoryPoint.entity.PolicTrajectoryPointEntity;
import org.springblade.core.tool.node.INode;
import org.springblade.modules.police.entity.PolicTrajectoryPointEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -32,4 +31,6 @@
public class PolicTrajectoryPointVO extends PolicTrajectoryPointEntity {
    private static final long serialVersionUID = 1L;

    private String createTimeStr;

}

 src/main/java/org/springblade/modules/police/wrapper/PolicTrajectoryPointWrapper.java

File was renamed from src/main/java/org/springblade/modules/policTrajectoryPoint/wrapper/PolicTrajectoryPointWrapper.java
@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.policTrajectoryPoint.wrapper;
package org.springblade.modules.police.wrapper;

import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.policTrajectoryPoint.entity.PolicTrajectoryPointEntity;
import org.springblade.modules.policTrajectoryPoint.vo.PolicTrajectoryPointVO;
import org.springblade.modules.police.entity.PolicTrajectoryPointEntity;
import org.springblade.modules.police.vo.PolicTrajectoryPointVO;
import java.util.Objects;

/**

 src/main/java/org/springblade/modules/sms/controller/SmsRecordController.java

File was renamed from src/main/java/org/springblade/modules/smsRecord/controller/SmsRecordController.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.smsRecord.controller;
package org.springblade.modules.sms.controller;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -23,17 +23,16 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;

import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.sms.entity.SmsRecordEntity;
import org.springblade.modules.sms.vo.SmsRecordVO;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.smsRecord.entity.SmsRecordEntity;
import org.springblade.modules.smsRecord.vo.SmsRecordVO;
import org.springblade.modules.smsRecord.wrapper.SmsRecordWrapper;
import org.springblade.modules.smsRecord.service.ISmsRecordService;
import org.springblade.modules.sms.wrapper.SmsRecordWrapper;
import org.springblade.modules.sms.service.ISmsRecordService;
import org.springblade.core.boot.ctrl.BladeController;

/**

 src/main/java/org/springblade/modules/sms/dto/SmsRecordDTO.java

File was renamed from src/main/java/org/springblade/modules/smsRecord/dto/SmsRecordDTO.java
@@ -14,9 +14,9 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.smsRecord.dto;
package org.springblade.modules.sms.dto;

import org.springblade.modules.smsRecord.entity.SmsRecordEntity;
import org.springblade.modules.sms.entity.SmsRecordEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;


 src/main/java/org/springblade/modules/sms/entity/SmsRecordEntity.java

File was renamed from src/main/java/org/springblade/modules/smsRecord/entity/SmsRecordEntity.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.smsRecord.entity;
package org.springblade.modules.sms.entity;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;

 src/main/java/org/springblade/modules/sms/mapper/SmsRecordMapper.java

File was renamed from src/main/java/org/springblade/modules/smsRecord/mapper/SmsRecordMapper.java
@@ -14,11 +14,11 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.smsRecord.mapper;
package org.springblade.modules.sms.mapper;

import org.springblade.modules.smsRecord.dto.SmsRecordDTO;
import org.springblade.modules.smsRecord.entity.SmsRecordEntity;
import org.springblade.modules.smsRecord.vo.SmsRecordVO;
import org.springblade.modules.sms.dto.SmsRecordDTO;
import org.springblade.modules.sms.entity.SmsRecordEntity;
import org.springblade.modules.sms.vo.SmsRecordVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List;

 src/main/java/org/springblade/modules/sms/mapper/SmsRecordMapper.xml

File was renamed from src/main/java/org/springblade/modules/smsRecord/mapper/SmsRecordMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.modules.smsRecord.mapper.SmsRecordMapper">
<mapper namespace="org.springblade.modules.sms.mapper.SmsRecordMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="smsRecordResultMap" type="org.springblade.modules.smsRecord.entity.SmsRecordEntity">
    <resultMap id="smsRecordResultMap" type="org.springblade.modules.sms.entity.SmsRecordEntity">
    </resultMap>


@@ -11,7 +11,7 @@
        select * from blade_sms_record where is_deleted = 0
    </select>

    <resultMap type="org.springblade.modules.smsRecord.dto.SmsRecordDTO" id="BladeSmsRecordDTOResult">
    <resultMap type="org.springblade.modules.sms.dto.SmsRecordDTO" id="BladeSmsRecordDTOResult">
        <result property="id"    column="id"    />
        <result property="templateId"    column="template_id"    />
        <result property="phone"    column="phone"    />
@@ -46,7 +46,7 @@
        id = #{id}
    </select>

    <select id="selectBladeSmsRecordList" parameterType="org.springblade.modules.smsRecord.dto.SmsRecordDTO" resultMap="BladeSmsRecordDTOResult">
    <select id="selectBladeSmsRecordList" parameterType="org.springblade.modules.sms.dto.SmsRecordDTO" resultMap="BladeSmsRecordDTOResult">
        <include refid="selectBladeSmsRecord"/>
        <where>
            <if test="id != null "> and id = #{id}</if>

 src/main/java/org/springblade/modules/sms/service/ISmsRecordService.java

File was renamed from src/main/java/org/springblade/modules/smsRecord/service/ISmsRecordService.java
@@ -14,12 +14,11 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.smsRecord.service;
package org.springblade.modules.sms.service;

import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.modules.smsRecord.entity.SmsRecordEntity;
import org.springblade.modules.smsRecord.vo.SmsRecordVO;
import org.springblade.core.mp.base.BaseService;
import org.springblade.modules.sms.entity.SmsRecordEntity;
import org.springblade.modules.sms.vo.SmsRecordVO;
import com.baomidou.mybatisplus.core.metadata.IPage;

/**

 src/main/java/org/springblade/modules/sms/service/impl/SmsRecordServiceImpl.java

File was renamed from src/main/java/org/springblade/modules/smsRecord/service/impl/SmsRecordServiceImpl.java
@@ -14,14 +14,13 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.smsRecord.service.impl;
package org.springblade.modules.sms.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.modules.smsRecord.entity.SmsRecordEntity;
import org.springblade.modules.smsRecord.vo.SmsRecordVO;
import org.springblade.modules.smsRecord.mapper.SmsRecordMapper;
import org.springblade.modules.smsRecord.service.ISmsRecordService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.sms.entity.SmsRecordEntity;
import org.springblade.modules.sms.vo.SmsRecordVO;
import org.springblade.modules.sms.mapper.SmsRecordMapper;
import org.springblade.modules.sms.service.ISmsRecordService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;


 src/main/java/org/springblade/modules/sms/service/impl/SmsSendServiceImpl.java

@@ -35,8 +35,8 @@
import org.springblade.modules.sms.mapper.SmsTemplateMapper;
import org.springblade.modules.sms.service.ISmsSendService;
import org.springblade.modules.sms.service.ISmsTemplateService;
import org.springblade.modules.smsRecord.entity.SmsRecordEntity;
import org.springblade.modules.smsRecord.service.ISmsRecordService;
import org.springblade.modules.sms.entity.SmsRecordEntity;
import org.springblade.modules.sms.service.ISmsRecordService;
import org.springblade.modules.task.entity.TaskResidencePermitApplyEntity;
import org.springblade.modules.task.service.ITaskResidencePermitApplyService;
import org.springframework.beans.factory.annotation.Autowired;

 src/main/java/org/springblade/modules/sms/vo/SmsRecordVO.java

File was renamed from src/main/java/org/springblade/modules/smsRecord/vo/SmsRecordVO.java
@@ -14,10 +14,9 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.smsRecord.vo;
package org.springblade.modules.sms.vo;

import org.springblade.modules.smsRecord.entity.SmsRecordEntity;
import org.springblade.core.tool.node.INode;
import org.springblade.modules.sms.entity.SmsRecordEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;


 src/main/java/org/springblade/modules/sms/wrapper/SmsRecordWrapper.java

File was renamed from src/main/java/org/springblade/modules/smsRecord/wrapper/SmsRecordWrapper.java
@@ -14,12 +14,13 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.smsRecord.wrapper;
package org.springblade.modules.sms.wrapper;

import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.smsRecord.entity.SmsRecordEntity;
import org.springblade.modules.smsRecord.vo.SmsRecordVO;
import org.springblade.modules.sms.entity.SmsRecordEntity;
import org.springblade.modules.sms.vo.SmsRecordVO;

import java.util.Objects;

/**