From 0788d84223af98d3cb258788019b0665b6da2a1e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 16 八月 2024 15:27:13 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml | 28 ++++++++++++++
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java | 14 ++++++
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/SiteMapper.java | 12 ++++++
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java | 44 ++++++++++++++++++++++
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java | 16 ++++++++
5 files changed, 113 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
index aa1eb3b..44c9356 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
@@ -86,7 +86,19 @@
public AjaxResult<List<Site>> getSiteList1(){
return AjaxResult.success(siteService.list(new QueryWrapper<>()));
}
- @ApiOperation(value = "获取站点分页列表", tags = {"小程序-站点管理"})
+
+ @PostMapping("/getSiteListGun")
+ @ApiOperation(value = "获取站点列表 不分页", tags = {"管理后台-接口信息使用"})
+ public AjaxResult<List<Site>> getSiteListGun(){
+ return AjaxResult.success(siteService.getSiteListGun());
+ }
+
+ @PostMapping("/getSiteListParkLot")
+ @ApiOperation(value = "获取站点列表不分页", tags = {"管理后台-停车场绑定"})
+ public AjaxResult<List<Site>> getSiteListParkLot(){
+ return AjaxResult.success(siteService.getSiteListParkLot());
+ }
+ @ApiOperation(value = "获取站点分页列表", tags = {"小程序-站点管理-首页"})
@PostMapping("/pageList")
public AjaxResult<PageInfo<SiteVO>> pageList(@Validated @RequestBody SiteQuery query){
return AjaxResult.success(siteService.pageList(query));
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/SiteMapper.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/SiteMapper.java
index 0305c89..1603912 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/SiteMapper.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/SiteMapper.java
@@ -41,4 +41,16 @@
*/
SiteDetailVO getDetailById(@Param("siteId")Integer siteId);
+ /**
+ * 获取站点列表不分页 管理后台-停车场绑定
+ * @return
+ */
+ List<Site> getSiteListParkLot(@Param("ids")Set<Integer> ids);
+
+ /**
+ * 获取站点列表不分页接口信息使用
+ * @param ids
+ * @return
+ */
+ List<Site> getSiteListGun(@Param("ids")Set<Integer> ids);
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java
index 4a8dd0e..4145a21 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java
@@ -13,6 +13,8 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
+import java.util.List;
+
/**
* @author zhibing.pu
* @Date 2024/8/7 19:54
@@ -73,4 +75,18 @@
* @return
*/
SiteDetailVO getDetailById(Integer siteId);
+
+ /**
+ * 获取站点列表不分页 管理后台-停车场绑定
+ * @return
+ */
+ List<Site> getSiteListParkLot();
+
+
+ /**
+ * 获取站点列表不分页接口信息使用
+ * @return
+ */
+ List<Site> getSiteListGun();
+
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
index fe3d696..a427ee1 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
@@ -229,6 +229,50 @@
return this.baseMapper.getDetailById(siteId);
}
+ @Override
+ public List<Site> getSiteListParkLot() {
+ Set<Integer> ids = null;
+ //校验合作商权限
+ SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
+ Integer roleType = sysUser.getRoleType();
+ Integer objectId = sysUser.getObjectId();
+ //合作商
+ if(roleType == 2){
+ ids = partnerService.authSite(objectId, SiteMenu.SITE_LIST);
+ }else{
+ //非管理员需要根据角色和用户配置查询允许的站点数据
+ if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
+ List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
+ List<Integer> data1 = roleSiteClient.getSiteIds(sysUser.getRoleId()).getData();
+ data.addAll(data1);
+ ids = new HashSet<>(data);
+ }
+ }
+ return this.baseMapper.getSiteListParkLot(ids);
+ }
+
+ @Override
+ public List<Site> getSiteListGun() {
+ Set<Integer> ids = null;
+ //校验合作商权限
+ SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
+ Integer roleType = sysUser.getRoleType();
+ Integer objectId = sysUser.getObjectId();
+ //合作商
+ if(roleType == 2){
+ ids = partnerService.authSite(objectId, SiteMenu.SITE_LIST);
+ }else{
+ //非管理员需要根据角色和用户配置查询允许的站点数据
+ if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
+ List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
+ List<Integer> data1 = roleSiteClient.getSiteIds(sysUser.getRoleId()).getData();
+ data.addAll(data1);
+ ids = new HashSet<>(data);
+ }
+ }
+ return this.baseMapper.getSiteListGun(ids);
+ }
+
/**
* 设置站点计费策略
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml
index 79ce0b7..2d141d8 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml
@@ -178,4 +178,32 @@
SELECT <include refid="Base_Column_List"></include>
FROM t_site WHERE id = #{siteId} AND del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()}
</select>
+ <select id="getSiteListParkLot" resultType="com.ruoyi.chargingPile.api.model.Site">
+ select ts.id, ts.partner_id, ts.code, ts.`name`, ts.site_type, ts.business_category, ts.status,tpl.id AS parkingLotId
+ from t_site ts
+ left join t_parking_lot tpl on (ts.id = tpl.site_id)
+ <where>
+ <if test="null != ids and ids.size()>0">
+ AND ts.id IN
+ <foreach collection="ids" item="id" index="index" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+ AND ts.del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()}
+ AND tpl.id IS NULL
+ </where>
+ </select>
+ <select id="getSiteListGun" resultType="com.ruoyi.chargingPile.api.model.Site">
+ select <include refid="Base_Column_List"></include>
+ from t_site
+ <where>
+ <if test="null != ids and ids.size()>0">
+ AND id IN
+ <foreach collection="ids" item="id" index="index" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+ AND del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()}
+ </where>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.7.1