From f03c94b68738682ce9803b9bc89510e22bf43c41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E4=BF=8A=E5=BD=AA?= <937283697@qq.com> Date: Mon, 25 Nov 2024 17:44:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=91=E8=B5=B7=E6=9D=A5=EF=BC=81=EF=BC=81?= =?UTF-8?q?=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 ++ .../solarenergy/config/Swagger2config.java | 4 +- .../entity/vo/req/DataQueryGetVoReq.java | 2 +- .../entity/vo/req/StatisticQueryVoReq.java | 2 +- .../entity/vo/ret/DataBaseSeparation.java | 2 +- .../entity/vo/ret/DataSiteByStreamRet.java | 2 +- .../entity/vo/ret/DataSiteTree.java | 2 +- .../entity/vo/ret/StatisticQueryVoRet.java | 2 +- .../mapper/EasyExcelManageMapper.java | 2 +- .../mapper/GeoserverinfoBaseMapper.java | 2 +- .../mapper/GeoserverinfoMapper.java | 2 +- .../solarenergy/mapper/LegendTableMapper.java | 2 +- .../solarenergy/mapper/MapServiceMapper.java | 2 +- .../cuit/solarenergy/mapper/ModelMapper.java | 2 +- .../cuit/solarenergy/mapper/RoleMapper.java | 2 +- .../mapper/SatelliteDataMapper.java | 2 +- .../mapper/SatelliteInvDataMapper.java | 2 +- .../mapper/SatelliteSendDataMapper.java | 2 +- .../solarenergy/mapper/StreamBboxMapper.java | 2 +- .../solarenergy/mapper/SysUserMapper.java | 2 +- .../mapper/TDataOriginMethodMapper.java | 2 +- .../solarenergy/mapper/TDictDataMapper.java | 2 +- .../cuit/solarenergy/mapper/TMinioMapper.java | 2 +- .../mapper/TSamplingDataDetailsMapper.java | 2 +- .../mapper/TSamplingIndexMapper.java | 2 +- .../mapper/TSamplingSiteImageMapper.java | 2 +- .../mapper/TSiteBaseInfoMapper.java | 2 +- .../mapper/TStreamBaseInfoMapper.java | 2 +- .../mapper/TUavDomImageDataMapper.java | 2 +- .../cuit/solarenergy/mapper/TUserMapper.java | 2 +- .../mapper/TsSysAppidtokenMapper.java | 2 +- .../solarenergy/mapper/TsSysLogMapper.java | 2 +- .../solarenergy/mapper/UavDataMapper.java | 2 +- .../solarenergy/mapper/UavInvDataMapper.java | 2 +- .../solarenergy/mapper/UavSendDataMapper.java | 2 +- .../solarenergy/mapper/UserRoleMapper.java | 2 +- .../solarenergy/vo/WaterIndicatorsQuery.java | 2 +- src/main/resources/application.yml | 87 ++++++++++++++++++- .../mapper/GeoserverinfoBaseMapper.xml | 4 +- .../resources/mapper/GeoserverinfoMapper.xml | 6 +- .../resources/mapper/LegendTableMapper.xml | 4 +- .../resources/mapper/MapServiceMapper.xml | 4 +- src/main/resources/mapper/MenuMapper.xml | 2 +- src/main/resources/mapper/ModelMapper.xml | 4 +- src/main/resources/mapper/RoleMapper.xml | 10 +-- .../resources/mapper/SatelliteDataMapper.xml | 4 +- .../mapper/SatelliteInvDataMapper.xml | 6 +- .../mapper/SatelliteSendDataMapper.xml | 6 +- .../resources/mapper/StreamBboxMapper.xml | 4 +- src/main/resources/mapper/SysLogMapper.xml | 6 +- src/main/resources/mapper/SysOtherMapper.xml | 2 +- src/main/resources/mapper/SysUserMapper.xml | 8 +- .../mapper/TDataOriginMethodMapper.xml | 6 +- src/main/resources/mapper/TDictDataMapper.xml | 4 +- src/main/resources/mapper/TMinioMapper.xml | 6 +- .../mapper/TSamplingDataDetailsMapper.xml | 22 ++--- .../resources/mapper/TSamplingIndexMapper.xml | 14 +-- .../mapper/TSamplingSiteImageMapper.xml | 4 +- .../resources/mapper/TSiteBaseInfoMapper.xml | 22 ++--- .../mapper/TStreamBaseInfoMapper.xml | 8 +- .../mapper/TUavDomImageDataMapper.xml | 4 +- src/main/resources/mapper/TUserMapper.xml | 4 +- .../mapper/TsSysAppidtokenMapper.xml | 4 +- src/main/resources/mapper/TsSysLogMapper.xml | 4 +- src/main/resources/mapper/UavDataMapper.xml | 4 +- .../resources/mapper/UavInvDataMapper.xml | 6 +- .../resources/mapper/UavSendDataMapper.xml | 6 +- src/main/resources/mapper/UserMapper.xml | 4 +- src/main/resources/mapper/UserRoleMapper.xml | 4 +- 69 files changed, 227 insertions(+), 136 deletions(-) diff --git a/pom.xml b/pom.xml index 831acea..c9e3cf5 100644 --- a/pom.xml +++ b/pom.xml @@ -14,6 +14,12 @@ 2.6.13 + + com.squareup.okhttp3 + okhttp + 4.9.3 + + org.springframework.boot spring-boot-starter-web diff --git a/src/main/java/com/cuit/solarenergy/config/Swagger2config.java b/src/main/java/com/cuit/solarenergy/config/Swagger2config.java index 5398fb3..f843240 100644 --- a/src/main/java/com/cuit/solarenergy/config/Swagger2config.java +++ b/src/main/java/com/cuit/solarenergy/config/Swagger2config.java @@ -37,8 +37,8 @@ public class Swagger2config { } private ApiInfo apiInfo() { - return new ApiInfo("川藏铁路信息管理开发项目接口", - "川藏铁路信息管理开发项目接口RESTful API说明", + return new ApiInfo("太阳能信息管理开发项目接口", + "太阳能信息管理开发项目接口RESTful API说明", "1.0", null, new Contact("成都信息工程大学3S团队", "https://www.cuit.edu.cn", "cuitgis@qq.com"), diff --git a/src/main/java/com/cuit/solarenergy/entity/vo/req/DataQueryGetVoReq.java b/src/main/java/com/cuit/solarenergy/entity/vo/req/DataQueryGetVoReq.java index eaa7395..0d89d22 100644 --- a/src/main/java/com/cuit/solarenergy/entity/vo/req/DataQueryGetVoReq.java +++ b/src/main/java/com/cuit/solarenergy/entity/vo/req/DataQueryGetVoReq.java @@ -12,7 +12,7 @@ import static com.cuit.solarenergy.utils.DateUtil.DATE_FORMAT; /** * @BelongsProject: railway - * @BelongsPackage: com.cuit.railway.entity.vo.req + * @BelongsPackage: com.cuit.solarenergy.entity.vo.req * @Author: Luolw * @Date: 2023/8/4 10:01 * @Description: diff --git a/src/main/java/com/cuit/solarenergy/entity/vo/req/StatisticQueryVoReq.java b/src/main/java/com/cuit/solarenergy/entity/vo/req/StatisticQueryVoReq.java index af9399c..30aa61c 100644 --- a/src/main/java/com/cuit/solarenergy/entity/vo/req/StatisticQueryVoReq.java +++ b/src/main/java/com/cuit/solarenergy/entity/vo/req/StatisticQueryVoReq.java @@ -10,7 +10,7 @@ import java.util.List; /** * @BelongsProject: railway - * @BelongsPackage: com.cuit.railway.entity.vo.req + * @BelongsPackage: com.cuit.solarenergy.entity.vo.req * @Author: Luolw * @Date: 2023/8/5 14:57 * @Description: diff --git a/src/main/java/com/cuit/solarenergy/entity/vo/ret/DataBaseSeparation.java b/src/main/java/com/cuit/solarenergy/entity/vo/ret/DataBaseSeparation.java index 5b17204..9979e4d 100644 --- a/src/main/java/com/cuit/solarenergy/entity/vo/ret/DataBaseSeparation.java +++ b/src/main/java/com/cuit/solarenergy/entity/vo/ret/DataBaseSeparation.java @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; /** * @BelongsProject: railway - * @BelongsPackage: com.cuit.railway.entity.vo.ret + * @BelongsPackage: com.cuit.solarenergy.entity.vo.ret * @Author: Luolw * @Date: 2023/7/17 15:55 * @Description: diff --git a/src/main/java/com/cuit/solarenergy/entity/vo/ret/DataSiteByStreamRet.java b/src/main/java/com/cuit/solarenergy/entity/vo/ret/DataSiteByStreamRet.java index 97a0f73..5734271 100644 --- a/src/main/java/com/cuit/solarenergy/entity/vo/ret/DataSiteByStreamRet.java +++ b/src/main/java/com/cuit/solarenergy/entity/vo/ret/DataSiteByStreamRet.java @@ -11,7 +11,7 @@ import java.util.List; /** * @BelongsProject: railway - * @BelongsPackage: com.cuit.railway.entity.vo.ret + * @BelongsPackage: com.cuit.solarenergy.entity.vo.ret * @Author: Luolw * @Date: 2023/7/17 20:54 * @Description: diff --git a/src/main/java/com/cuit/solarenergy/entity/vo/ret/DataSiteTree.java b/src/main/java/com/cuit/solarenergy/entity/vo/ret/DataSiteTree.java index 01a7127..e607684 100644 --- a/src/main/java/com/cuit/solarenergy/entity/vo/ret/DataSiteTree.java +++ b/src/main/java/com/cuit/solarenergy/entity/vo/ret/DataSiteTree.java @@ -10,7 +10,7 @@ import java.util.List; /** * @BelongsProject: railway - * @BelongsPackage: com.cuit.railway.entity.vo.ret + * @BelongsPackage: com.cuit.solarenergy.entity.vo.ret * @Author: Luolw * @Date: 2023/7/18 10:24 * @Description: diff --git a/src/main/java/com/cuit/solarenergy/entity/vo/ret/StatisticQueryVoRet.java b/src/main/java/com/cuit/solarenergy/entity/vo/ret/StatisticQueryVoRet.java index e668cf7..a015473 100644 --- a/src/main/java/com/cuit/solarenergy/entity/vo/ret/StatisticQueryVoRet.java +++ b/src/main/java/com/cuit/solarenergy/entity/vo/ret/StatisticQueryVoRet.java @@ -14,7 +14,7 @@ import static com.cuit.solarenergy.utils.DateUtil.DATE_FORMAT; /** * @BelongsProject: railway - * @BelongsPackage: com.cuit.railway.entity.vo.ret + * @BelongsPackage: com.cuit.solarenergy.entity.vo.ret * @Author: Luolw * @Date: 2023/8/5 15:18 * @Description: diff --git a/src/main/java/com/cuit/solarenergy/mapper/EasyExcelManageMapper.java b/src/main/java/com/cuit/solarenergy/mapper/EasyExcelManageMapper.java index 36f7646..f78e398 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/EasyExcelManageMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/EasyExcelManageMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @BelongsProject: railway - * @BelongsPackage: com.cuit.railway.mapper + * @BelongsPackage: com.cuit.solarenergy.mapper * @Author: HouPJ * @Date: 2023/7/10 14:03 * @Description: TODO diff --git a/src/main/java/com/cuit/solarenergy/mapper/GeoserverinfoBaseMapper.java b/src/main/java/com/cuit/solarenergy/mapper/GeoserverinfoBaseMapper.java index 0050c10..6e197ac 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/GeoserverinfoBaseMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/GeoserverinfoBaseMapper.java @@ -11,7 +11,7 @@ import java.util.List; * @author cuitg * @description 针对表【t_geoserverinfo_base】的数据库操作Mapper * @createDate 2024-08-27 14:45:16 -* @Entity com.cuit.railway.entity.GeoserverinfoBase +* @Entity com.cuit.solarenergy.entity.GeoserverinfoBase */ @Mapper public interface GeoserverinfoBaseMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/mapper/GeoserverinfoMapper.java b/src/main/java/com/cuit/solarenergy/mapper/GeoserverinfoMapper.java index 808a63e..0fe949f 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/GeoserverinfoMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/GeoserverinfoMapper.java @@ -11,7 +11,7 @@ import java.util.LinkedList; * @author cuitg * @description 针对表【t_geoserverinfo】的数据库操作Mapper * @createDate 2023-07-25 16:21:45 -* @Entity com.cuit.railway.entity.Geoserverinfo +* @Entity com.cuit.solarenergy.entity.Geoserverinfo */ @Mapper public interface GeoserverinfoMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/mapper/LegendTableMapper.java b/src/main/java/com/cuit/solarenergy/mapper/LegendTableMapper.java index c69d8b1..1d23bd7 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/LegendTableMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/LegendTableMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * @author 田俊彪 * @description 针对表【legend_table(图例表)】的数据库操作Mapper * @createDate 2024-09-03 20:34:01 -* @Entity com.cuit.railway.entity.LegendTable +* @Entity com.cuit.solarenergy.entity.LegendTable */ @Mapper public interface LegendTableMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/mapper/MapServiceMapper.java b/src/main/java/com/cuit/solarenergy/mapper/MapServiceMapper.java index e556b22..f3aee9a 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/MapServiceMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/MapServiceMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * @author PYJ * @description 针对表【t_map_service(地图服务表)】的数据库操作Mapper * @createDate 2023-07-25 16:03:27 -* @Entity com.cuit.railway.entity.MapService +* @Entity com.cuit.solarenergy.entity.MapService */ @Mapper public interface MapServiceMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/mapper/ModelMapper.java b/src/main/java/com/cuit/solarenergy/mapper/ModelMapper.java index 4eac725..c624aa2 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/ModelMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/ModelMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * @author PYJ * @description 针对表【t_model(模型表)】的数据库操作Mapper * @createDate 2023-07-25 16:03:27 -* @Entity com.cuit.railway.entity.Model +* @Entity com.cuit.solarenergy.entity.Model */ @Mapper public interface ModelMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/mapper/RoleMapper.java b/src/main/java/com/cuit/solarenergy/mapper/RoleMapper.java index 681e5a5..3912494 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/RoleMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/RoleMapper.java @@ -13,7 +13,7 @@ import java.util.List; * @author PYJ * @description 针对表【sys_role(角色表)】的数据库操作Mapper * @createDate 2023-07-17 10:20:33 -* @Entity com.cuit.railway.entity.Role +* @Entity com.cuit.solarenergy.entity.Role */ @Mapper public interface RoleMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/mapper/SatelliteDataMapper.java b/src/main/java/com/cuit/solarenergy/mapper/SatelliteDataMapper.java index b903ea7..bb76251 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/SatelliteDataMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/SatelliteDataMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * @author cuitg * @description 针对表【t_satellite_data(卫星遥感原始影像表)】的数据库操作Mapper * @createDate 2023-08-07 12:40:03 -* @Entity com.cuit.railway.entity.SatelliteData +* @Entity com.cuit.solarenergy.entity.SatelliteData */ @Mapper public interface SatelliteDataMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/mapper/SatelliteInvDataMapper.java b/src/main/java/com/cuit/solarenergy/mapper/SatelliteInvDataMapper.java index 9812ad7..b7c3781 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/SatelliteInvDataMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/SatelliteInvDataMapper.java @@ -11,7 +11,7 @@ import java.util.List; * @author cuitg * @description 针对表【t_satellite_inv_data(卫星遥感反演数据集)】的数据库操作Mapper * @createDate 2023-08-07 13:20:30 -* @Entity com.cuit.railway.entity.SatelliteInvData +* @Entity com.cuit.solarenergy.entity.SatelliteInvData */ @Mapper public interface SatelliteInvDataMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/mapper/SatelliteSendDataMapper.java b/src/main/java/com/cuit/solarenergy/mapper/SatelliteSendDataMapper.java index 4fe02bf..c9d5190 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/SatelliteSendDataMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/SatelliteSendDataMapper.java @@ -12,7 +12,7 @@ import java.util.List; * @author cuitg * @description 针对表【t_satellite_send_data(卫星遥感数据发布表)】的数据库操作Mapper * @createDate 2023-08-07 09:26:51 -* @Entity com.cuit.railway.entity.SatelliteSendData +* @Entity com.cuit.solarenergy.entity.SatelliteSendData */ @Mapper public interface SatelliteSendDataMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/mapper/StreamBboxMapper.java b/src/main/java/com/cuit/solarenergy/mapper/StreamBboxMapper.java index 54d8595..9d97c8d 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/StreamBboxMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/StreamBboxMapper.java @@ -10,7 +10,7 @@ import java.util.List; * @author PYJ * @description 针对表【t_stream_bbox(流域bbox表)】的数据库操作Mapper * @createDate 2023-08-06 16:54:19 -* @Entity com.cuit.railway.entity.StreamBbox +* @Entity com.cuit.solarenergy.entity.StreamBbox */ @Mapper public interface StreamBboxMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/mapper/SysUserMapper.java b/src/main/java/com/cuit/solarenergy/mapper/SysUserMapper.java index 35f3a1f..9aa369b 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/SysUserMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/SysUserMapper.java @@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param; * @author PYJ * @description 针对表【ts_sys_user】的数据库操作Mapper * @createDate 2023-06-17 12:01:31 -* @Entity com.cuit.railway.entity.SysUser +* @Entity com.cuit.solarenergy.entity.SysUser */ @Mapper public interface SysUserMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/mapper/TDataOriginMethodMapper.java b/src/main/java/com/cuit/solarenergy/mapper/TDataOriginMethodMapper.java index 6928783..554f56c 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/TDataOriginMethodMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/TDataOriginMethodMapper.java @@ -10,7 +10,7 @@ import java.util.List; * @author PYJ * @description 针对表【t_data_origin_method(数据获取方式表)】的数据库操作Mapper * @createDate 2023-06-19 14:50:54 -* @Entity com.cuit.railway.vo.TDataOriginMethod +* @Entity com.cuit.solarenergy.vo.TDataOriginMethod */ @Mapper public interface TDataOriginMethodMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/mapper/TDictDataMapper.java b/src/main/java/com/cuit/solarenergy/mapper/TDictDataMapper.java index 3baed0a..2717a0a 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/TDictDataMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/TDictDataMapper.java @@ -10,7 +10,7 @@ import java.util.List; * @author PYJ * @description 针对表【t_dict_data(字典表)】的数据库操作Mapper * @createDate 2023-06-08 11:37:12 -* @Entity com.cuit.railway.entity.TDictData +* @Entity com.cuit.solarenergy.entity.TDictData */ @Mapper public interface TDictDataMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/mapper/TMinioMapper.java b/src/main/java/com/cuit/solarenergy/mapper/TMinioMapper.java index 2e48182..0cb82fe 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/TMinioMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/TMinioMapper.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * @author PYJ * @description 针对表【t_minio(minio表)】的数据库操作Mapper * @createDate 2023-07-22 13:18:52 -* @Entity com.cuit.railway.entity.TMinio +* @Entity com.cuit.solarenergy.entity.TMinio */ @Mapper public interface TMinioMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/mapper/TSamplingDataDetailsMapper.java b/src/main/java/com/cuit/solarenergy/mapper/TSamplingDataDetailsMapper.java index 3b56c6b..300b9b4 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/TSamplingDataDetailsMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/TSamplingDataDetailsMapper.java @@ -17,7 +17,7 @@ import java.util.List; * @author PYJ * @description 针对表【t_sampling_data_details(采样数据明细表)】的数据库操作Mapper * @createDate 2023-06-08 11:37:12 - * @Entity com.cuit.railway.entity.TSamplingDataDetails + * @Entity com.cuit.solarenergy.entity.TSamplingDataDetails */ @Mapper public interface TSamplingDataDetailsMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/mapper/TSamplingIndexMapper.java b/src/main/java/com/cuit/solarenergy/mapper/TSamplingIndexMapper.java index a1f5d3a..5ac5108 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/TSamplingIndexMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/TSamplingIndexMapper.java @@ -14,7 +14,7 @@ import java.util.List; * @author PYJ * @description 针对表【t_sampling_index(采样指标表)】的数据库操作Mapper * @createDate 2023-06-24 19:06:43 -* @Entity com.cuit.railway.entity.TSamplingIndex +* @Entity com.cuit.solarenergy.entity.TSamplingIndex */ @Mapper public interface TSamplingIndexMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/mapper/TSamplingSiteImageMapper.java b/src/main/java/com/cuit/solarenergy/mapper/TSamplingSiteImageMapper.java index 2912167..a8fdca9 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/TSamplingSiteImageMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/TSamplingSiteImageMapper.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * @author PYJ * @description 针对表【t_sampling_site_image(采样点照片、视频等影像)】的数据库操作Mapper * @createDate 2023-07-03 11:42:32 -* @Entity com.cuit.railway.entity.TSamplingSiteImage +* @Entity com.cuit.solarenergy.entity.TSamplingSiteImage */ @Mapper public interface TSamplingSiteImageMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/mapper/TSiteBaseInfoMapper.java b/src/main/java/com/cuit/solarenergy/mapper/TSiteBaseInfoMapper.java index a48e262..d74ae0b 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/TSiteBaseInfoMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/TSiteBaseInfoMapper.java @@ -19,7 +19,7 @@ import java.util.List; * @author PYJ * @description 针对表【t_site_base_info(站点基本信息表)】的数据库操作Mapper * @createDate 2023-06-08 11:37:12 -* @Entity com.cuit.railway.entity.TSiteBaseInfo +* @Entity com.cuit.solarenergy.entity.TSiteBaseInfo */ @Mapper public interface TSiteBaseInfoMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/mapper/TStreamBaseInfoMapper.java b/src/main/java/com/cuit/solarenergy/mapper/TStreamBaseInfoMapper.java index 2465d3f..b8ae431 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/TStreamBaseInfoMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/TStreamBaseInfoMapper.java @@ -12,7 +12,7 @@ import java.util.List; * @author PYJ * @description 针对表【t_stream_base_info(河流基本信息表)】的数据库操作Mapper * @createDate 2023-06-08 11:37:12 -* @Entity com.cuit.railway.entity.TStreamBaseInfo +* @Entity com.cuit.solarenergy.entity.TStreamBaseInfo */ @Mapper public interface TStreamBaseInfoMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/mapper/TUavDomImageDataMapper.java b/src/main/java/com/cuit/solarenergy/mapper/TUavDomImageDataMapper.java index b46bd54..b430259 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/TUavDomImageDataMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/TUavDomImageDataMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * @author PYJ * @description 针对表【t_uav_dom_image_data(无人机正射影像数据表)】的数据库操作Mapper * @createDate 2023-07-04 10:35:46 -* @Entity com.cuit.railway.entity.TUavDomImageData +* @Entity com.cuit.solarenergy.entity.TUavDomImageData */ @Mapper public interface TUavDomImageDataMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/mapper/TUserMapper.java b/src/main/java/com/cuit/solarenergy/mapper/TUserMapper.java index bb86544..a34dbb3 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/TUserMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/TUserMapper.java @@ -7,7 +7,7 @@ import com.cuit.solarenergy.entity.TUser; * @author PYJ * @description 针对表【t_user(用户表)】的数据库操作Mapper * @createDate 2023-06-12 10:07:46 -* @Entity com.cuit.railway.entity.TUser +* @Entity com.cuit.solarenergy.entity.TUser */ public interface TUserMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/mapper/TsSysAppidtokenMapper.java b/src/main/java/com/cuit/solarenergy/mapper/TsSysAppidtokenMapper.java index fc3cb5e..abc9265 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/TsSysAppidtokenMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/TsSysAppidtokenMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * @author PYJ * @description 针对表【ts_sys_appidtoken】的数据库操作Mapper * @createDate 2023-06-18 16:37:39 -* @Entity com.cuit.railway.entity.TsSysAppidtoken +* @Entity com.cuit.solarenergy.entity.TsSysAppidtoken */ @Mapper public interface TsSysAppidtokenMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/mapper/TsSysLogMapper.java b/src/main/java/com/cuit/solarenergy/mapper/TsSysLogMapper.java index cd0a231..2ca56f2 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/TsSysLogMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/TsSysLogMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * @author PYJ * @description 针对表【ts_sys_log】的数据库操作Mapper * @createDate 2023-06-18 17:14:41 -* @Entity com.cuit.railway.entity.sys.TsSysLog +* @Entity com.cuit.solarenergy.entity.sys.TsSysLog */ @Mapper public interface TsSysLogMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/mapper/UavDataMapper.java b/src/main/java/com/cuit/solarenergy/mapper/UavDataMapper.java index 59d8b52..d134af8 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/UavDataMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/UavDataMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * @author cuitg * @description 针对表【t_uav_data(无人机原始影像表)】的数据库操作Mapper * @createDate 2023-08-07 12:39:52 -* @Entity com.cuit.railway.entity.UavData +* @Entity com.cuit.solarenergy.entity.UavData */ @Mapper public interface UavDataMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/mapper/UavInvDataMapper.java b/src/main/java/com/cuit/solarenergy/mapper/UavInvDataMapper.java index 0ae7021..f1f8a73 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/UavInvDataMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/UavInvDataMapper.java @@ -11,7 +11,7 @@ import java.util.List; * @author cuitg * @description 针对表【t_uav_inv_data(无人机反演数据集)】的数据库操作Mapper * @createDate 2023-08-07 13:20:47 -* @Entity com.cuit.railway.entity.UavInvData +* @Entity com.cuit.solarenergy.entity.UavInvData */ @Mapper public interface UavInvDataMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/mapper/UavSendDataMapper.java b/src/main/java/com/cuit/solarenergy/mapper/UavSendDataMapper.java index 910d072..fd5b125 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/UavSendDataMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/UavSendDataMapper.java @@ -12,7 +12,7 @@ import java.util.List; * @author cuitg * @description 针对表【t_uav_send_data(无人机数据发布表)】的数据库操作Mapper * @createDate 2023-08-07 09:35:06 -* @Entity com.cuit.railway.entity.UavSendData +* @Entity com.cuit.solarenergy.entity.UavSendData */ @Mapper public interface UavSendDataMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/mapper/UserRoleMapper.java b/src/main/java/com/cuit/solarenergy/mapper/UserRoleMapper.java index ab46474..36c675c 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/UserRoleMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/UserRoleMapper.java @@ -10,7 +10,7 @@ import java.util.ArrayList; * @author PYJ * @description 针对表【sys_user_role(用户和角色对应关系表)】的数据库操作Mapper * @createDate 2023-07-17 10:20:33 -* @Entity com.cuit.railway.entity.UserRole +* @Entity com.cuit.solarenergy.entity.UserRole */ @Mapper public interface UserRoleMapper extends BaseMapper { diff --git a/src/main/java/com/cuit/solarenergy/vo/WaterIndicatorsQuery.java b/src/main/java/com/cuit/solarenergy/vo/WaterIndicatorsQuery.java index 935efef..7ba72fa 100644 --- a/src/main/java/com/cuit/solarenergy/vo/WaterIndicatorsQuery.java +++ b/src/main/java/com/cuit/solarenergy/vo/WaterIndicatorsQuery.java @@ -7,7 +7,7 @@ import lombok.*; /** * @BelongsProject: railway - * @BelongsPackage: com.cuit.railway.vo + * @BelongsPackage: com.cuit.solarenergy.vo * @Author: Luolw * @Date: 2023/6/20 11:50 * @Description: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7279dd1..8b1247c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 8080 + port: 8081 spring: datasource: @@ -7,3 +7,88 @@ spring: url: jdbc:mysql://119.3.125.28:3306/solarenergy?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true username: root password: Wyq@123123 + + servlet: + multipart: + enabled: true + # 设置单个文件大小 + max-file-size: 10240MB + # 设置单次请求文件的总大小 + max-request-size: 102400MB + mvc: + path match: + matching-strategy: ant_path_matcher + + # redis配置 + redis: + host: 1.92.75.33 #121.37.165.19 #localhost # + database: 0 + port: 5179 #6379 + password: Wzw@123! + +# mybatis-plus配置控制台打印完整带参数SQL语句 +mybatis-plus: + # mapper-locations: classpath:mappers/*.xml #只能一个地方定义，mybatis中定义 + type-aliases-package: com.cuit.railway.entity + configuration: + log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl #控制台打印 mybatis log日志 org.apache.ibatis.logging.slf4j.Slf4jImpl / org.apache.ibatis.logging.stdout.StdOutImpl + global-config: + banner: false + +# minio配置 +minio: + endpoint: http://1.92.75.33:8090 #http://minio:9000 #数据上传等 + visitPoint: http://1.92.75.33:8090 #共享访问 + accessKey: adminuser + secretKey: Hy@Minio!123 + bucketName: solarenergy + +knife4j: + enable: true + +# GeoServer相关配置 +mygeoserverconfig: + geoserverurl: http://1.92.75.33:8082/geoserver/ + geoserverapiurl: http://1.92.75.33:8082/geoserver/ + username: admin #adminuser + password: geoserver #Wzw@Geoserver + workspaces: cztl + geoserverpath: /opt/geoserver/data_dir/data + +## 删除GeoServer配置 +#DeleteGeoServerDataAndMap: +# #on或off +# onoff: on +# #保存数据的天数 +# days: 30 +# #工作空间 +# workspace: bd +# #删除的数据类型，多个类型以”;“分隔 +# dataType: 气象风险;综合风险;气象要素 +# +##删除临时文件 +##删除下载的历史数据（只支持目录删除） +#deleteTempFileConfig: +# #on或off true /false +# onoff: on +# #删除目录的父目录 +# path: CimissFiledownload +# #相隔天数 +# days: 61 +# #目录 只支持 yyyymmdd yyyymm yyyy 三种形式 +# pathformat: yyyymm + +#log日志配置 +# 说明： +# 1. 文件的命名和加载顺序有关 +# logback.xml早于application.yml加载，logback-spring.xml晚于application.yml加载， 如果logback配置需要使用application.yml中的属性，需要命名为logback-spring.xml +# 2. logback使用application.yml中的属性 +# 使用springProperty才可使用application.yml中的值 可以设置默认值 + + + +ditu: + type: tianditu + shading: http://t0.tianditu.gov.cn/ter_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=d8df755c0e92e90e756f0e87cfe51408 + note: http://t0.tianditu.gov.cn/cta_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cta&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=d8df755c0e92e90e756f0e87cfe51408 + latlonbbox: 95.47567196468714,29.902589952988784,95.48935024103598,29.910064346919626 \ No newline at end of file diff --git a/src/main/resources/mapper/GeoserverinfoBaseMapper.xml b/src/main/resources/mapper/GeoserverinfoBaseMapper.xml index c3566e3..5cf4e41 100644 --- a/src/main/resources/mapper/GeoserverinfoBaseMapper.xml +++ b/src/main/resources/mapper/GeoserverinfoBaseMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/src/main/resources/mapper/GeoserverinfoMapper.xml b/src/main/resources/mapper/GeoserverinfoMapper.xml index 947461b..9926d13 100644 --- a/src/main/resources/mapper/GeoserverinfoMapper.xml +++ b/src/main/resources/mapper/GeoserverinfoMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -22,7 +22,7 @@ url,createdate - SELECT geo.ID as id, geo.latlonbbox as latLonBbox, diff --git a/src/main/resources/mapper/LegendTableMapper.xml b/src/main/resources/mapper/LegendTableMapper.xml index 35ebf50..27fac23 100644 --- a/src/main/resources/mapper/LegendTableMapper.xml +++ b/src/main/resources/mapper/LegendTableMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/src/main/resources/mapper/MapServiceMapper.xml b/src/main/resources/mapper/MapServiceMapper.xml index 0c61e56..251a6a7 100644 --- a/src/main/resources/mapper/MapServiceMapper.xml +++ b/src/main/resources/mapper/MapServiceMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/src/main/resources/mapper/MenuMapper.xml b/src/main/resources/mapper/MenuMapper.xml index 5c57820..69e3c44 100644 --- a/src/main/resources/mapper/MenuMapper.xml +++ b/src/main/resources/mapper/MenuMapper.xml @@ -1,6 +1,6 @@ - + + - SELECT id AS id, user_name AS userName, @@ -45,7 +45,7 @@ del_flag = 0 - SELECT id AS id, user_name AS userName, diff --git a/src/main/resources/mapper/SatelliteDataMapper.xml b/src/main/resources/mapper/SatelliteDataMapper.xml index d812ef7..4d2389c 100644 --- a/src/main/resources/mapper/SatelliteDataMapper.xml +++ b/src/main/resources/mapper/SatelliteDataMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/src/main/resources/mapper/SatelliteInvDataMapper.xml b/src/main/resources/mapper/SatelliteInvDataMapper.xml index 1264d69..0f6ae22 100644 --- a/src/main/resources/mapper/SatelliteInvDataMapper.xml +++ b/src/main/resources/mapper/SatelliteInvDataMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -29,7 +29,7 @@ png_minio_id,is_deleted - SELECT MONTH ( t.register_time ) AS month, COUNT(*) AS count diff --git a/src/main/resources/mapper/SatelliteSendDataMapper.xml b/src/main/resources/mapper/SatelliteSendDataMapper.xml index a2f14cd..0dd9d67 100644 --- a/src/main/resources/mapper/SatelliteSendDataMapper.xml +++ b/src/main/resources/mapper/SatelliteSendDataMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -18,7 +18,7 @@ geoserver_info_id,png_minio_id,is_deleted - SELECT gi.id AS id, gi.latLonBbox AS latLonBbox, diff --git a/src/main/resources/mapper/StreamBboxMapper.xml b/src/main/resources/mapper/StreamBboxMapper.xml index 449ae77..213d38c 100644 --- a/src/main/resources/mapper/StreamBboxMapper.xml +++ b/src/main/resources/mapper/StreamBboxMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/src/main/resources/mapper/SysLogMapper.xml b/src/main/resources/mapper/SysLogMapper.xml index 51ba952..ebc4ccf 100644 --- a/src/main/resources/mapper/SysLogMapper.xml +++ b/src/main/resources/mapper/SysLogMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -24,7 +24,7 @@ module,opration,sys_type, op_type,is_valid - SELECT id, visit_time, diff --git a/src/main/resources/mapper/SysOtherMapper.xml b/src/main/resources/mapper/SysOtherMapper.xml index ee1d25a..0eb1257 100644 --- a/src/main/resources/mapper/SysOtherMapper.xml +++ b/src/main/resources/mapper/SysOtherMapper.xml @@ -2,7 +2,7 @@ - + + - SELECT tsu.id, tsu.loginname, diff --git a/src/main/resources/mapper/TDataOriginMethodMapper.xml b/src/main/resources/mapper/TDataOriginMethodMapper.xml index 2d04cf9..6c37b75 100644 --- a/src/main/resources/mapper/TDataOriginMethodMapper.xml +++ b/src/main/resources/mapper/TDataOriginMethodMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -14,7 +14,7 @@ type,typecode, dataoriginal, datacode - SELECT ori.type as type, ori.typecode as typecode, diff --git a/src/main/resources/mapper/TDictDataMapper.xml b/src/main/resources/mapper/TDictDataMapper.xml index 9ca94a7..b8e1ed5 100644 --- a/src/main/resources/mapper/TDictDataMapper.xml +++ b/src/main/resources/mapper/TDictDataMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/src/main/resources/mapper/TMinioMapper.xml b/src/main/resources/mapper/TMinioMapper.xml index 8ce0856..a52523a 100644 --- a/src/main/resources/mapper/TMinioMapper.xml +++ b/src/main/resources/mapper/TMinioMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -20,7 +20,7 @@ file_size,file_url,minio_id, file_name,is_deleted - SELECT * FROM diff --git a/src/main/resources/mapper/TSamplingDataDetailsMapper.xml b/src/main/resources/mapper/TSamplingDataDetailsMapper.xml index 631e7ce..3d9f9a3 100644 --- a/src/main/resources/mapper/TSamplingDataDetailsMapper.xml +++ b/src/main/resources/mapper/TSamplingDataDetailsMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -35,7 +35,7 @@ - SELECT siteimage.uav_minus as uavMinus, t_stream_base_info.stream_name as streamName, @@ -74,12 +74,12 @@ - + - SELECT aa.site_id, aa.create_time, @@ -119,7 +119,7 @@ - SELECT geo.ID AS geoId, u1.png_minio_id AS PngMinioId, @@ -162,7 +162,7 @@ - SELECT s.geoserver_info_id AS geoId, s.png_minio_id AS PngMinioId, @@ -200,7 +200,7 @@ - SELECT geo.ID AS geoId, s1.png_minio_id AS PngMinioId, @@ -245,7 +245,7 @@ - SELECT s.geoserver_info_id AS geoId, s.png_minio_id AS PngMinioId, @@ -279,7 +279,7 @@ - SELECT aa.site_id, aa.create_time, @@ -324,7 +324,7 @@ - SELECT YEAR ( create_time ) AS year, COUNT(*) AS count diff --git a/src/main/resources/mapper/TSamplingIndexMapper.xml b/src/main/resources/mapper/TSamplingIndexMapper.xml index 0ce3edc..193afbd 100644 --- a/src/main/resources/mapper/TSamplingIndexMapper.xml +++ b/src/main/resources/mapper/TSamplingIndexMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -20,7 +20,7 @@ t_sampling_index - SELECT d.register_time as createTime, s.geoserver_info_id as geoserverId @@ -37,7 +37,7 @@ - SELECT d.register_time as createTime, s.geoserver_info_id as geoserverId @@ -58,7 +58,7 @@ ORDER BY createTime asc - SELECT geo.ID as geoserverId, ind.name as indexName, @@ -82,7 +82,7 @@ ORDER BY indexName,createTime asc - SELECT geo.ID as geoserverId, ind.name as indexName, @@ -109,7 +109,7 @@ ORDER BY indexName,createTime asc - SELECT CONCAT( tsd.site_id, '-', tsi.`name` ) AS chartName, tsd.index_value AS chartValue, diff --git a/src/main/resources/mapper/TSamplingSiteImageMapper.xml b/src/main/resources/mapper/TSamplingSiteImageMapper.xml index 73025f0..41655e7 100644 --- a/src/main/resources/mapper/TSamplingSiteImageMapper.xml +++ b/src/main/resources/mapper/TSamplingSiteImageMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/src/main/resources/mapper/TSiteBaseInfoMapper.xml b/src/main/resources/mapper/TSiteBaseInfoMapper.xml index 590ded1..3f03594 100644 --- a/src/main/resources/mapper/TSiteBaseInfoMapper.xml +++ b/src/main/resources/mapper/TSiteBaseInfoMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -25,7 +25,7 @@ station_no = #{stationNo} - SELECT site_id, lon, lat, @@ -36,7 +36,7 @@ (SELECT `code` FROM t_sampling_index WHERE `name` = #{waterQualityParameter}) - SELECT site_id as siteId, index_value as indexValue, create_time as createTime @@ -48,7 +48,7 @@ ORDER BY site_id, create_time DESC - SELECT DISTINCT sit.lon AS lon, sit.lat AS lat, @@ -88,7 +88,7 @@ WHERE stream_code = (SELECT stream_code FROM t_stream_base_info WHERE stream_name = #{stream}) - SELECT DISTINCT site_id as siteId, index_value as indexValue, index_level as indexLevel, @@ -100,20 +100,20 @@ - SELECT station_no, lon, lat FROM t_site_base_info - SELECT DISTINCT site_id as siteId, lon as siteLon, lat as siteLat FROM t_sampling_data_details - SELECT si.station_no, si.stream_code, @@ -144,7 +144,7 @@ - SELECT site_id as siteId, index_value as indexValue FROM t_sampling_data_details @@ -155,7 +155,7 @@ - + diff --git a/src/main/resources/mapper/TStreamBaseInfoMapper.xml b/src/main/resources/mapper/TStreamBaseInfoMapper.xml index 3287631..1b9dbe3 100644 --- a/src/main/resources/mapper/TStreamBaseInfoMapper.xml +++ b/src/main/resources/mapper/TStreamBaseInfoMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -26,7 +26,7 @@ WHERE stream_code = #{streamCode} - SELECT stream_code as streamCode, stream_name as streamName FROM t_stream_base_info @@ -41,7 +41,7 @@ - SELECT st.stream_code, st.stream_name diff --git a/src/main/resources/mapper/TUavDomImageDataMapper.xml b/src/main/resources/mapper/TUavDomImageDataMapper.xml index 5e369da..82b2113 100644 --- a/src/main/resources/mapper/TUavDomImageDataMapper.xml +++ b/src/main/resources/mapper/TUavDomImageDataMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/src/main/resources/mapper/TUserMapper.xml b/src/main/resources/mapper/TUserMapper.xml index 645b53b..a1c08a3 100644 --- a/src/main/resources/mapper/TUserMapper.xml +++ b/src/main/resources/mapper/TUserMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/src/main/resources/mapper/TsSysAppidtokenMapper.xml b/src/main/resources/mapper/TsSysAppidtokenMapper.xml index 7e82967..661a34f 100644 --- a/src/main/resources/mapper/TsSysAppidtokenMapper.xml +++ b/src/main/resources/mapper/TsSysAppidtokenMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/src/main/resources/mapper/TsSysLogMapper.xml b/src/main/resources/mapper/TsSysLogMapper.xml index 2e184af..0636ebd 100644 --- a/src/main/resources/mapper/TsSysLogMapper.xml +++ b/src/main/resources/mapper/TsSysLogMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/src/main/resources/mapper/UavDataMapper.xml b/src/main/resources/mapper/UavDataMapper.xml index 27cce6c..9422a1e 100644 --- a/src/main/resources/mapper/UavDataMapper.xml +++ b/src/main/resources/mapper/UavDataMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/src/main/resources/mapper/UavInvDataMapper.xml b/src/main/resources/mapper/UavInvDataMapper.xml index 90fa9a3..87f629f 100644 --- a/src/main/resources/mapper/UavInvDataMapper.xml +++ b/src/main/resources/mapper/UavInvDataMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -29,7 +29,7 @@ png_minio_id,is_deleted - SELECT MONTH ( t.register_time ) AS month, COUNT(*) AS count diff --git a/src/main/resources/mapper/UavSendDataMapper.xml b/src/main/resources/mapper/UavSendDataMapper.xml index 58be650..b14bec5 100644 --- a/src/main/resources/mapper/UavSendDataMapper.xml +++ b/src/main/resources/mapper/UavSendDataMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -18,7 +18,7 @@ geoserver_info_id,png_minio_id,is_deleted - SELECT gi.id AS id, gi.latLonBbox AS latLonBbox, diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml index 05b84fa..0fa55ba 100644 --- a/src/main/resources/mapper/UserMapper.xml +++ b/src/main/resources/mapper/UserMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/src/main/resources/mapper/UserRoleMapper.xml b/src/main/resources/mapper/UserRoleMapper.xml index ecd996d..07edbf3 100644 --- a/src/main/resources/mapper/UserRoleMapper.xml +++ b/src/main/resources/mapper/UserRoleMapper.xml @@ -2,9 +2,9 @@ - + - +