From e6e02ec4e9c4f9ac0d66e97f5f3755687c88cfe6 Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期二, 04 四月 2023 17:36:28 +0800
Subject: [PATCH] 名称调整
---
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/SiteMapper.xml | 5 +++--
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/Site.java | 11 +++++++++++
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/SiteController.java | 15 +++++++++++----
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/SiteServiceImpl.java | 6 +++---
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/SiteMapper.java | 3 ++-
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/ISiteService.java | 2 +-
6 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/SiteController.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/SiteController.java
index afe79ca..204c715 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/SiteController.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/SiteController.java
@@ -35,13 +35,20 @@
@RequestMapping(value = "/base/site/querySite", method = RequestMethod.POST)
@ApiOperation(value = "获取起点和终点的站点", tags = {"用户端-跨城"}, notes = "")
@ApiImplicitParams({
- @ApiImplicitParam(value = "起点站点id", name = "startSiteId", required = false, dataType = "int")
+ @ApiImplicitParam(value = "起点站点id", name = "startSiteId", required = false, dataType = "int"),
+ @ApiImplicitParam(value = "类型", name = "startSiteId", required = false, dataType = "int")
})
- public ResultUtil<List<SiteWarpper>> querySite(Integer startSiteId){
+ public ResultUtil<List<SiteWarpper>> querySite(Integer startSiteId,Integer type) {
try {
- List<SiteWarpper> list = siteService.querySite(startSiteId);
+ if(type == 3){
+ type = 1;
+ }
+ if(type == 4){
+ type = 2;
+ }
+ List<SiteWarpper> list = siteService.querySite(startSiteId, type);
return ResultUtil.success(list);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/SiteMapper.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/SiteMapper.java
index 713bc5f..b7d0511 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/SiteMapper.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/SiteMapper.java
@@ -12,8 +12,9 @@
/**
* 根据起点站点获取线路相关的终点站点
+ *
* @param startSiteId
* @return
*/
- List<Map<String, Object>> querySite(@Param("startSiteId") Integer startSiteId);
+ List<Map<String, Object>> querySite(@Param("startSiteId") Integer startSiteId, @Param("type") Integer type);
}
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/SiteMapper.xml b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/SiteMapper.xml
index 6c06303..cb2ef2b 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/SiteMapper.xml
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/SiteMapper.xml
@@ -23,10 +23,11 @@
<select id="querySite" resultType="map">
select * from
(
- select id as id, `name` as `name`, provinceCode as cityCode, province as cityName from t_site where province like '%市' and state = 1
+ select id as id, `name` as `name`, provinceCode as cityCode, province as cityName,type from t_site where province like '%市' and state = 1
UNION ALL
- select id as id, `name` as `name`, cityCode as cityCode, city as cityName from t_site where province not like '%市' and state = 1
+ select id as id, `name` as `name`, cityCode as cityCode, city as cityName,type from t_site where province not like '%市' and state = 1
) as a where 1 = 1
+ and type = ${type}
<if test="null != startSiteId">
and a.id in(select siteId from t_line_site where lineId in(select lineId from t_line_site where siteId = #{startSiteId} and type = 1) and type = 2)
</if>
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/Site.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/Site.java
index 1019186..84646fd 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/Site.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/Site.java
@@ -69,6 +69,17 @@
@TableField("insertUserId")
private Integer insertUserId;
+ @TableField("type")
+ private Integer type;
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
public Integer getId() {
return id;
}
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/ISiteService.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/ISiteService.java
index c701187..c33aeb5 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/ISiteService.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/ISiteService.java
@@ -15,7 +15,7 @@
* @return
* @throws Exception
*/
- List<SiteWarpper> querySite(Integer startSiteId) throws Exception;
+ List<SiteWarpper> querySite(Integer startSiteId,Integer type) throws Exception;
/**
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/SiteServiceImpl.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/SiteServiceImpl.java
index bf29d11..85706ba 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/SiteServiceImpl.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/SiteServiceImpl.java
@@ -34,12 +34,12 @@
* @throws Exception
*/
@Override
- public List<SiteWarpper> querySite(Integer startSiteId) throws Exception {
+ public List<SiteWarpper> querySite(Integer startSiteId,Integer type) throws Exception {
List<Map<String, Object>> sites = null;
if(null == startSiteId){
- sites = siteMapper.querySite(null);
+ sites = siteMapper.querySite(null,type);
}else{
- sites = siteMapper.querySite(startSiteId);
+ sites = siteMapper.querySite(startSiteId,type);
}
Set<String> set = new HashSet<>();
for(Map<String, Object> site : sites) {
--
Gitblit v1.7.1