fix

zhanzhiqin

2022-04-15 c9586d61be8ae3411c6428a2cc2588c11f97db2c

fix

 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);
}

 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);
}



 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);


}

 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);
}



 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);
}

 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

 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>

 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>

 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>

 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

 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);

 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;
    }


 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) {

 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;
    }

 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();
        }