From 7ee7953112f324b30d5d7cefc0d6f3207a424259 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 03 Apr 2024 16:46:15 +0800
Subject: [PATCH] 代码优化
---
src/main/java/org/springblade/modules/sms/entity/SmsRecordEntity.java | 2
src/main/java/org/springblade/modules/sms/wrapper/SmsRecordWrapper.java | 7 +-
src/main/java/org/springblade/modules/police/service/impl/PolicTrajectoryPointServiceImpl.java | 11 +--
src/main/java/org/springblade/modules/sms/mapper/SmsRecordMapper.java | 8 +-
src/main/java/org/springblade/modules/sms/mapper/SmsRecordMapper.xml | 8 +-
src/main/java/org/springblade/modules/police/entity/PolicTrajectoryPointEntity.java | 2
src/main/java/org/springblade/modules/police/dto/PolicTrajectoryPointDTO.java | 4
src/main/java/org/springblade/modules/sms/service/impl/SmsRecordServiceImpl.java | 11 +--
src/main/java/org/springblade/modules/police/controller/PolicTrajectoryPointController.java | 11 +--
src/main/java/org/springblade/modules/police/vo/PolicTrajectoryPointVO.java | 7 +-
src/main/java/org/springblade/modules/police/wrapper/PolicTrajectoryPointWrapper.java | 6 +-
src/main/java/org/springblade/modules/sms/service/impl/SmsSendServiceImpl.java | 4
src/main/java/org/springblade/modules/sms/vo/SmsRecordVO.java | 5 -
src/main/java/org/springblade/modules/sms/dto/SmsRecordDTO.java | 4
src/main/java/org/springblade/modules/sms/service/ISmsRecordService.java | 7 +-
src/main/java/org/springblade/modules/police/service/IPolicTrajectoryPointService.java | 7 +-
src/main/java/org/springblade/modules/police/mapper/PolicTrajectoryPointMapper.xml | 22 +++++-
src/main/java/org/springblade/modules/sms/controller/SmsRecordController.java | 11 +--
src/main/java/org/springblade/modules/police/mapper/PolicTrajectoryPointMapper.java | 11 ++-
19 files changed, 78 insertions(+), 70 deletions(-)
diff --git a/src/main/java/org/springblade/modules/policTrajectoryPoint/controller/PolicTrajectoryPointController.java b/src/main/java/org/springblade/modules/police/controller/PolicTrajectoryPointController.java
similarity index 90%
rename from src/main/java/org/springblade/modules/policTrajectoryPoint/controller/PolicTrajectoryPointController.java
rename to src/main/java/org/springblade/modules/police/controller/PolicTrajectoryPointController.java
index ee3f75e..a6013d2 100644
--- a/src/main/java/org/springblade/modules/policTrajectoryPoint/controller/PolicTrajectoryPointController.java
+++ b/src/main/java/org/springblade/modules/police/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;
/**
diff --git a/src/main/java/org/springblade/modules/policTrajectoryPoint/dto/PolicTrajectoryPointDTO.java b/src/main/java/org/springblade/modules/police/dto/PolicTrajectoryPointDTO.java
similarity index 88%
rename from src/main/java/org/springblade/modules/policTrajectoryPoint/dto/PolicTrajectoryPointDTO.java
rename to src/main/java/org/springblade/modules/police/dto/PolicTrajectoryPointDTO.java
index 6224b80..517c79b 100644
--- a/src/main/java/org/springblade/modules/policTrajectoryPoint/dto/PolicTrajectoryPointDTO.java
+++ b/src/main/java/org/springblade/modules/police/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;
diff --git a/src/main/java/org/springblade/modules/policTrajectoryPoint/entity/PolicTrajectoryPointEntity.java b/src/main/java/org/springblade/modules/police/entity/PolicTrajectoryPointEntity.java
similarity index 97%
rename from src/main/java/org/springblade/modules/policTrajectoryPoint/entity/PolicTrajectoryPointEntity.java
rename to src/main/java/org/springblade/modules/police/entity/PolicTrajectoryPointEntity.java
index ca14e8b..3eeba29 100644
--- a/src/main/java/org/springblade/modules/policTrajectoryPoint/entity/PolicTrajectoryPointEntity.java
+++ b/src/main/java/org/springblade/modules/police/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;
diff --git a/src/main/java/org/springblade/modules/policTrajectoryPoint/mapper/PolicTrajectoryPointMapper.java b/src/main/java/org/springblade/modules/police/mapper/PolicTrajectoryPointMapper.java
similarity index 81%
rename from src/main/java/org/springblade/modules/policTrajectoryPoint/mapper/PolicTrajectoryPointMapper.java
rename to src/main/java/org/springblade/modules/police/mapper/PolicTrajectoryPointMapper.java
index d64ef72..b9a1773 100644
--- a/src/main/java/org/springblade/modules/policTrajectoryPoint/mapper/PolicTrajectoryPointMapper.java
+++ b/src/main/java/org/springblade/modules/police/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);
/**
* 查询用户轨迹记录
*
diff --git a/src/main/java/org/springblade/modules/policTrajectoryPoint/mapper/PolicTrajectoryPointMapper.xml b/src/main/java/org/springblade/modules/police/mapper/PolicTrajectoryPointMapper.xml
similarity index 60%
rename from src/main/java/org/springblade/modules/policTrajectoryPoint/mapper/PolicTrajectoryPointMapper.xml
rename to src/main/java/org/springblade/modules/police/mapper/PolicTrajectoryPointMapper.xml
index 8c50d0f..d5aa79d 100644
--- a/src/main/java/org/springblade/modules/policTrajectoryPoint/mapper/PolicTrajectoryPointMapper.xml
+++ b/src/main/java/org/springblade/modules/police/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>
diff --git a/src/main/java/org/springblade/modules/policTrajectoryPoint/service/IPolicTrajectoryPointService.java b/src/main/java/org/springblade/modules/police/service/IPolicTrajectoryPointService.java
similarity index 82%
rename from src/main/java/org/springblade/modules/policTrajectoryPoint/service/IPolicTrajectoryPointService.java
rename to src/main/java/org/springblade/modules/police/service/IPolicTrajectoryPointService.java
index d9014f7..f248ad4 100644
--- a/src/main/java/org/springblade/modules/policTrajectoryPoint/service/IPolicTrajectoryPointService.java
+++ b/src/main/java/org/springblade/modules/police/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;
/**
diff --git a/src/main/java/org/springblade/modules/policTrajectoryPoint/service/impl/PolicTrajectoryPointServiceImpl.java b/src/main/java/org/springblade/modules/police/service/impl/PolicTrajectoryPointServiceImpl.java
similarity index 76%
rename from src/main/java/org/springblade/modules/policTrajectoryPoint/service/impl/PolicTrajectoryPointServiceImpl.java
rename to src/main/java/org/springblade/modules/police/service/impl/PolicTrajectoryPointServiceImpl.java
index 6527a55..4be9e54 100644
--- a/src/main/java/org/springblade/modules/policTrajectoryPoint/service/impl/PolicTrajectoryPointServiceImpl.java
+++ b/src/main/java/org/springblade/modules/police/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;
diff --git a/src/main/java/org/springblade/modules/policTrajectoryPoint/vo/PolicTrajectoryPointVO.java b/src/main/java/org/springblade/modules/police/vo/PolicTrajectoryPointVO.java
similarity index 85%
rename from src/main/java/org/springblade/modules/policTrajectoryPoint/vo/PolicTrajectoryPointVO.java
rename to src/main/java/org/springblade/modules/police/vo/PolicTrajectoryPointVO.java
index 3a49144..bcd0cd9 100644
--- a/src/main/java/org/springblade/modules/policTrajectoryPoint/vo/PolicTrajectoryPointVO.java
+++ b/src/main/java/org/springblade/modules/police/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;
+
}
diff --git a/src/main/java/org/springblade/modules/policTrajectoryPoint/wrapper/PolicTrajectoryPointWrapper.java b/src/main/java/org/springblade/modules/police/wrapper/PolicTrajectoryPointWrapper.java
similarity index 88%
rename from src/main/java/org/springblade/modules/policTrajectoryPoint/wrapper/PolicTrajectoryPointWrapper.java
rename to src/main/java/org/springblade/modules/police/wrapper/PolicTrajectoryPointWrapper.java
index 9a0b949..befae75 100644
--- a/src/main/java/org/springblade/modules/policTrajectoryPoint/wrapper/PolicTrajectoryPointWrapper.java
+++ b/src/main/java/org/springblade/modules/police/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;
/**
diff --git a/src/main/java/org/springblade/modules/smsRecord/controller/SmsRecordController.java b/src/main/java/org/springblade/modules/sms/controller/SmsRecordController.java
similarity index 91%
rename from src/main/java/org/springblade/modules/smsRecord/controller/SmsRecordController.java
rename to src/main/java/org/springblade/modules/sms/controller/SmsRecordController.java
index e0a2dc4..21bd2f3 100644
--- a/src/main/java/org/springblade/modules/smsRecord/controller/SmsRecordController.java
+++ b/src/main/java/org/springblade/modules/sms/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;
/**
diff --git a/src/main/java/org/springblade/modules/smsRecord/dto/SmsRecordDTO.java b/src/main/java/org/springblade/modules/sms/dto/SmsRecordDTO.java
similarity index 90%
rename from src/main/java/org/springblade/modules/smsRecord/dto/SmsRecordDTO.java
rename to src/main/java/org/springblade/modules/sms/dto/SmsRecordDTO.java
index e869aa0..01b28df 100644
--- a/src/main/java/org/springblade/modules/smsRecord/dto/SmsRecordDTO.java
+++ b/src/main/java/org/springblade/modules/sms/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;
diff --git a/src/main/java/org/springblade/modules/smsRecord/entity/SmsRecordEntity.java b/src/main/java/org/springblade/modules/sms/entity/SmsRecordEntity.java
similarity index 98%
rename from src/main/java/org/springblade/modules/smsRecord/entity/SmsRecordEntity.java
rename to src/main/java/org/springblade/modules/sms/entity/SmsRecordEntity.java
index 518e55e..8ccaa5d 100644
--- a/src/main/java/org/springblade/modules/smsRecord/entity/SmsRecordEntity.java
+++ b/src/main/java/org/springblade/modules/sms/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;
diff --git a/src/main/java/org/springblade/modules/smsRecord/mapper/SmsRecordMapper.java b/src/main/java/org/springblade/modules/sms/mapper/SmsRecordMapper.java
similarity index 87%
rename from src/main/java/org/springblade/modules/smsRecord/mapper/SmsRecordMapper.java
rename to src/main/java/org/springblade/modules/sms/mapper/SmsRecordMapper.java
index 5000b10..1c6c1b8 100644
--- a/src/main/java/org/springblade/modules/smsRecord/mapper/SmsRecordMapper.java
+++ b/src/main/java/org/springblade/modules/sms/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;
diff --git a/src/main/java/org/springblade/modules/smsRecord/mapper/SmsRecordMapper.xml b/src/main/java/org/springblade/modules/sms/mapper/SmsRecordMapper.xml
similarity index 89%
rename from src/main/java/org/springblade/modules/smsRecord/mapper/SmsRecordMapper.xml
rename to src/main/java/org/springblade/modules/sms/mapper/SmsRecordMapper.xml
index b64d166..a726cca 100644
--- a/src/main/java/org/springblade/modules/smsRecord/mapper/SmsRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/sms/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>
diff --git a/src/main/java/org/springblade/modules/smsRecord/service/ISmsRecordService.java b/src/main/java/org/springblade/modules/sms/service/ISmsRecordService.java
similarity index 85%
rename from src/main/java/org/springblade/modules/smsRecord/service/ISmsRecordService.java
rename to src/main/java/org/springblade/modules/sms/service/ISmsRecordService.java
index 009564c..3b22475 100644
--- a/src/main/java/org/springblade/modules/smsRecord/service/ISmsRecordService.java
+++ b/src/main/java/org/springblade/modules/sms/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;
/**
diff --git a/src/main/java/org/springblade/modules/smsRecord/service/impl/SmsRecordServiceImpl.java b/src/main/java/org/springblade/modules/sms/service/impl/SmsRecordServiceImpl.java
similarity index 82%
rename from src/main/java/org/springblade/modules/smsRecord/service/impl/SmsRecordServiceImpl.java
rename to src/main/java/org/springblade/modules/sms/service/impl/SmsRecordServiceImpl.java
index c31d250..9a68423 100644
--- a/src/main/java/org/springblade/modules/smsRecord/service/impl/SmsRecordServiceImpl.java
+++ b/src/main/java/org/springblade/modules/sms/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;
diff --git a/src/main/java/org/springblade/modules/sms/service/impl/SmsSendServiceImpl.java b/src/main/java/org/springblade/modules/sms/service/impl/SmsSendServiceImpl.java
index 099010b..23d6f0a 100644
--- a/src/main/java/org/springblade/modules/sms/service/impl/SmsSendServiceImpl.java
+++ b/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;
diff --git a/src/main/java/org/springblade/modules/smsRecord/vo/SmsRecordVO.java b/src/main/java/org/springblade/modules/sms/vo/SmsRecordVO.java
similarity index 87%
rename from src/main/java/org/springblade/modules/smsRecord/vo/SmsRecordVO.java
rename to src/main/java/org/springblade/modules/sms/vo/SmsRecordVO.java
index 226c7ae..a3876d9 100644
--- a/src/main/java/org/springblade/modules/smsRecord/vo/SmsRecordVO.java
+++ b/src/main/java/org/springblade/modules/sms/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;
diff --git a/src/main/java/org/springblade/modules/smsRecord/wrapper/SmsRecordWrapper.java b/src/main/java/org/springblade/modules/sms/wrapper/SmsRecordWrapper.java
similarity index 90%
rename from src/main/java/org/springblade/modules/smsRecord/wrapper/SmsRecordWrapper.java
rename to src/main/java/org/springblade/modules/sms/wrapper/SmsRecordWrapper.java
index 0424d1f..f9c25d6 100644
--- a/src/main/java/org/springblade/modules/smsRecord/wrapper/SmsRecordWrapper.java
+++ b/src/main/java/org/springblade/modules/sms/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;
/**
--
Gitblit v1.9.3