From c9586d61be8ae3411c6428a2cc2588c11f97db2c Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 15 四月 2022 18:15:16 +0800
Subject: [PATCH] fix
---
dao/src/main/java/com/sandu/ximon/dao/mapper/AirDataMapper.java | 2
dao/src/main/resources/mapper/WaterQualityDataMapper.xml | 4 +-
dao/src/main/resources/mapper/C3mChargingMapper.xml | 3 +
dao/src/main/resources/mapper/LightPoleHeelingMapper.xml | 3 +
dao/src/main/java/com/sandu/ximon/dao/mapper/WaterQualityDataMapper.java | 2
dao/src/main/resources/mapper/AirEquipmentMapper.xml | 4 +-
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java | 12 ++++--
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java | 11 ++++-
dao/src/main/java/com/sandu/ximon/dao/mapper/C3mChargingMapper.java | 2
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java | 10 +++-
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java | 8 +++
dao/src/main/java/com/sandu/ximon/dao/mapper/AirEquipmentMapper.java | 2
dao/src/main/java/com/sandu/ximon/dao/mapper/LightPoleHeelingMapper.java | 2
dao/src/main/resources/mapper/AirDataMapper.xml | 4 +-
ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityDataService.java | 8 +++-
15 files changed, 54 insertions(+), 23 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/AirDataMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/AirDataMapper.java
index 2df825f..a5377da 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/AirDataMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/AirDataMapper.java
@@ -15,7 +15,7 @@
public interface AirDataMapper extends BaseMapper<AirData> {
List<String> listAirEquipmentMAC();
- List<Long> listAirId(String keyword, Long clientId);
+ List<Long> listAirId(String keyword, Long userid);
List<AirDataBo> listAirDataByIds(List<Long> airIdList);
}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/AirEquipmentMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/AirEquipmentMapper.java
index 8358148..9f8b7e3 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/AirEquipmentMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/AirEquipmentMapper.java
@@ -12,7 +12,7 @@
*/
@Mapper
public interface AirEquipmentMapper extends BaseMapper<AirEquipment> {
- List<AirEquipmentBo> listAirEquipmentByIds(String keyword, Long clientId);
+ List<AirEquipmentBo> listAirEquipmentByIds(String keyword, Long userid);
}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/C3mChargingMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/C3mChargingMapper.java
index 8563b5f..ae51d2e 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/C3mChargingMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/C3mChargingMapper.java
@@ -16,7 +16,7 @@
C3mCharging getAllByC3Mac(String c3Mac);
- List<C3ChargingBo> listC3mChargingDto(String keyword);
+ List<C3ChargingBo> listC3mChargingDto(String keyword, Long userid);
}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/LightPoleHeelingMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/LightPoleHeelingMapper.java
index 2ee7ee7..e651a00 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/LightPoleHeelingMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/LightPoleHeelingMapper.java
@@ -8,7 +8,7 @@
@Mapper
public interface LightPoleHeelingMapper extends BaseMapper<LightPoleHeeling> {
- List<LightPoleHeeling> listLightPoleHeeling(String keyword, Integer processingState);
+ List<LightPoleHeeling> listLightPoleHeeling(String keyword, Integer processingState, Long userid);
}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/WaterQualityDataMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/WaterQualityDataMapper.java
index 83744af..8a04a06 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/WaterQualityDataMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/WaterQualityDataMapper.java
@@ -9,7 +9,7 @@
@Mapper
public interface WaterQualityDataMapper extends BaseMapper<WaterQualityData> {
- List<Long> listWaterQualityDataId(String keyword, Long clientId);
+ List<Long> listWaterQualityDataId(String keyword, Long userid);
List<WaterQualityDataBo> listWaterQualityDataByIds(List<Long> WaterQualityDataIdList);
}
diff --git a/dao/src/main/resources/mapper/AirDataMapper.xml b/dao/src/main/resources/mapper/AirDataMapper.xml
index aae87cf..bea20d9 100644
--- a/dao/src/main/resources/mapper/AirDataMapper.xml
+++ b/dao/src/main/resources/mapper/AirDataMapper.xml
@@ -53,8 +53,8 @@
<if test="keyword != null and keyword != ''">
AND t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
</if>
- <if test="clientId != null">
- AND t3.client_id = #{clientId}
+ <if test="userid != null">
+ AND (t3.user_id = #{userid} OR t3.client_id = #{userid})
</if>
</where>
GROUP BY
diff --git a/dao/src/main/resources/mapper/AirEquipmentMapper.xml b/dao/src/main/resources/mapper/AirEquipmentMapper.xml
index 8885f98..d17c0f8 100644
--- a/dao/src/main/resources/mapper/AirEquipmentMapper.xml
+++ b/dao/src/main/resources/mapper/AirEquipmentMapper.xml
@@ -29,8 +29,8 @@
<if test="keyword != null and keyword != ''">
AND t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
</if>
- <if test="clientId != null">
- AND t3.client_id = #{clientId}
+ <if test="userid != null">
+ AND (t3.user_id = #{userid} OR t3.client_id = #{userid})
</if>
</where>
</select>
diff --git a/dao/src/main/resources/mapper/C3mChargingMapper.xml b/dao/src/main/resources/mapper/C3mChargingMapper.xml
index 8a6686b..9178683 100644
--- a/dao/src/main/resources/mapper/C3mChargingMapper.xml
+++ b/dao/src/main/resources/mapper/C3mChargingMapper.xml
@@ -37,6 +37,9 @@
<if test="keyword != null and keyword != ''">
AND (t1.c3_name LIKE CONCAT(CONCAT('%', #{keyword}), '%') OR (t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')))
</if>
+ <if test="userid != null">
+ AND (t3.user_id = #{userid} OR t3.client_id = #{userid})
+ </if>
</where>
</select>
</mapper>
diff --git a/dao/src/main/resources/mapper/LightPoleHeelingMapper.xml b/dao/src/main/resources/mapper/LightPoleHeelingMapper.xml
index c0dd9aa..63dd51c 100644
--- a/dao/src/main/resources/mapper/LightPoleHeelingMapper.xml
+++ b/dao/src/main/resources/mapper/LightPoleHeelingMapper.xml
@@ -37,6 +37,9 @@
<if test="processingState != null and processingState != 2">
AND t1.processing_state = #{processingState}
</if>
+ <if test="userid != null">
+ AND (t3.user_id = #{userid} OR t3.client_id = #{userid})
+ </if>
</where>
</select>
diff --git a/dao/src/main/resources/mapper/WaterQualityDataMapper.xml b/dao/src/main/resources/mapper/WaterQualityDataMapper.xml
index 955cc2e..0fd455c 100644
--- a/dao/src/main/resources/mapper/WaterQualityDataMapper.xml
+++ b/dao/src/main/resources/mapper/WaterQualityDataMapper.xml
@@ -46,8 +46,8 @@
<if test="keyword != null and keyword != ''">
AND t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
</if>
- <if test="clientId != null">
- AND t3.client_id = #{clientId}
+ <if test="userid != null">
+ AND (t3.user_id = #{userid} OR t3.client_id = #{userid})
</if>
</where>
GROUP BY
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java
index efe3bc9..5a6e7d6 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java
@@ -48,10 +48,14 @@
* 鏌ヨ澶ф皵鏁版嵁(妯＄硦鏌ヨ)
*/
public List<AirDataBo> listAirDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
- Long clientId = SecurityUtils.getClientId();
- PageHelper.startPage(baseConditionVO.getPageNo(),baseConditionVO.getPageSize());
- List<Long> listAirId = baseMapper.listAirId(keyword,clientId);
- if(CollUtil.isEmpty(listAirId)){
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ List<Long> listAirId;
+ if (SecurityUtils.getClientId() == null) {
+ listAirId = baseMapper.listAirId(keyword, null);
+ } else {
+ listAirId = baseMapper.listAirId(keyword, SecurityUtils.getUserId());
+ }
+ if (CollUtil.isEmpty(listAirId)) {
return CollUtil.newArrayList();
}
List<AirDataBo> airDataBos = baseMapper.listAirDataByIds(listAirId);
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
index 0decb36..30f920b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
@@ -34,10 +34,14 @@
* 妯＄硦鏌ヨ
*/
public List<AirEquipmentBo> listAirEquipmentByKeyword(BaseConditionVO baseConditionVO, String keyword) {
- Long clientId = SecurityUtils.getClientId();
- PageHelper.startPage(baseConditionVO.getPageNo(),baseConditionVO.getPageSize());
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ List<AirEquipmentBo> airEquipmentBos;
+ if (SecurityUtils.getClientId() == null) {
+ airEquipmentBos = airEquipmentMapper.listAirEquipmentByIds(keyword, null);
+ }else{
+ airEquipmentBos = airEquipmentMapper.listAirEquipmentByIds(keyword, SecurityUtils.getUserId());
+ }
- List<AirEquipmentBo> airEquipmentBos = airEquipmentMapper.listAirEquipmentByIds(keyword,clientId);
return airEquipmentBos;
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
index 5f5ad5a..f42f3dc 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
@@ -19,6 +19,7 @@
import com.sandu.ximon.admin.param.C3ChargingAddParam;
import com.sandu.ximon.admin.param.C3ChargingParam;
import com.sandu.ximon.admin.param.PoleBindingParam;
+import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.LogUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.dao.bo.C3ChargingBo;
@@ -193,7 +194,12 @@
c3ChargingParam.setKeyword(c3ChargingParam.getKeyword().trim());
}
- List<C3ChargingBo> c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword());
+ List<C3ChargingBo> c3ChargingBoList;
+ if(SecurityUtils.getClientId() == null){
+ c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword(), null);
+ }else{
+ c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword(), SecurityUtils.getUserId());
+ }
for (C3ChargingBo one : c3ChargingBoList) {
String s = RedisUtils.getBean().get(C3mRedisConstant.C3_STATUS.getCode() + one.getC3Mac());
if (s != null) {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java
index e6165e2..60a41e8 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java
@@ -13,6 +13,7 @@
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.param.LightPoleHeelingListParam;
+import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.Light;
import com.sandu.ximon.dao.domain.LightPoleHeeling;
import com.sandu.ximon.dao.domain.LightPoleHeelingEquipment;
@@ -43,8 +44,14 @@
lightPoleHeelingListParam.setKeyword(lightPoleHeelingListParam.getKeyword().trim());
}
- List<LightPoleHeeling> lightPoleHeelings
- = lightPoleHeelingMapper.listLightPoleHeeling(lightPoleHeelingListParam.getKeyword(), lightPoleHeelingListParam.getProcessingState());
+ List<LightPoleHeeling> lightPoleHeelings;
+ if (SecurityUtils.getClientId() == null) {
+ lightPoleHeelings = lightPoleHeelingMapper.listLightPoleHeeling(lightPoleHeelingListParam.getKeyword()
+ , lightPoleHeelingListParam.getProcessingState(), null);
+ } else {
+ lightPoleHeelings = lightPoleHeelingMapper.listLightPoleHeeling(lightPoleHeelingListParam.getKeyword()
+ , lightPoleHeelingListParam.getProcessingState(), SecurityUtils.getUserId());
+ }
return lightPoleHeelings;
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityDataService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityDataService.java
index 92cc163..c29d11d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityDataService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityDataService.java
@@ -29,9 +29,13 @@
* 妯＄硦鏌ヨ
*/
public List<WaterQualityDataBo> listWaterQualityDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
- Long clientId = SecurityUtils.getClientId();
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- List<Long> waterQualityDataId = waterQualityDataMapper.listWaterQualityDataId(keyword, clientId);
+ List<Long> waterQualityDataId;
+ if(SecurityUtils.getClientId() == null){
+ waterQualityDataId = waterQualityDataMapper.listWaterQualityDataId(keyword, null);
+ }else{
+ waterQualityDataId = waterQualityDataMapper.listWaterQualityDataId(keyword, SecurityUtils.getUserId());
+ }
if (CollUtil.isEmpty(waterQualityDataId)) {
return CollUtil.newArrayList();
}
--
Gitblit v1.9.3