dao/src/main/resources/mapper/LedPlayerEntityMapper.xml
@@ -107,6 +107,7 @@ AND (t3.user_id = #{userId} OR t3.client_id = #{userId}) </if> </where> GROUP BY t1.id </select>
@@ -6,6 +6,7 @@ import com.sandu.common.object.BaseConditionVO; import com.sandu.common.service.impl.BaseServiceImpl; import com.sandu.ximon.admin.manager.iot.rrpc.enums.AtmoFunctionCode; import com.sandu.ximon.admin.security.SecurityUtils; import com.sandu.ximon.admin.utils.RedisUtils; import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils; import com.sandu.ximon.dao.bo.AirEquipmentNongGengBo; @@ -66,6 +67,12 @@ // airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, SecurityUtils.getUserId()); // } if (SecurityUtils.getClientId() == null) { airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, null); } else { airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, SecurityUtils.getUserId()); } return null; // return airEquipmentBos; } ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
@@ -257,8 +257,10 @@ poles.forEach( pole -> { pole.setClientId(-1L); pole.setUserId(-1L); } ); //删除 flag = SpringContextHolder.getBean(PoleService.class).updateBatchById(poles); //删除失败回滚数据 if (!flag) { ximon-admin/src/main/java/com/sandu/ximon/admin/service/ErrorMsgService.java
@@ -3,16 +3,13 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.sandu.common.domain.CommonPage; import com.sandu.common.execption.BusinessException; import com.sandu.common.object.BaseConditionVO; import com.sandu.ximon.admin.dto.ErrorMsgDto; import com.sandu.ximon.admin.utils.ListPagingUtils; import com.sandu.ximon.dao.bo.C3ReportErrorBo; import com.sandu.ximon.dao.bo.LightReportErrorBo; import com.sandu.ximon.dao.domain.C3mCharging; import com.sandu.ximon.dao.domain.Light; import lombok.AllArgsConstructor; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -53,10 +50,13 @@ errorMsgDto.setErrorTime(lightReportError.getCreateTime()); errorMsgDto.setDeviceType(1); Light one = lightService.getOne(Wrappers.lambdaQuery(Light.class).eq(Light::getDeviceCode, lightReportError.getDeviceCode())); System.out.println(lightReportError.getDeviceCode() + " ---code "); if (one != null) { errorMsgDto.setDeviceJson(JSON.toJSONString(one)); errorMsgDtoList.add(errorMsgDto); } else { errorMsgDto.setDeviceJson("系统未找到设备数据"); } errorMsgDtoList.add(errorMsgDto); } } commonPage.setList(errorMsgDtoList); @@ -93,6 +93,7 @@ /** * 大气 * * @param baseConditionVO * @return */ ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlatformFileService.java
@@ -14,7 +14,10 @@ import com.sandu.ximon.admin.param.PlatformFilePermissionParam; import com.sandu.ximon.admin.security.SecurityUtils; import com.sandu.ximon.dao.bo.PlatformFileListBo; import com.sandu.ximon.dao.domain.*; import com.sandu.ximon.dao.domain.Admin; import com.sandu.ximon.dao.domain.Client; import com.sandu.ximon.dao.domain.PlatformFile; import com.sandu.ximon.dao.domain.PlatformFileUser; import com.sandu.ximon.dao.enums.AdministratorEnums; import com.sandu.ximon.dao.mapper.PlatformFileMapper; import lombok.AllArgsConstructor; @@ -90,7 +93,7 @@ throw new BusinessException("删除时参数不能为空!"); } List<PlatformFile> platformFiles = listByIds(param.getFileIds()); if (platformFiles == null && platformFiles.size() == 0) { if (platformFiles == null || platformFiles.size() == 0) { throw new BusinessException("未找到文件!"); } @@ -122,7 +125,7 @@ .list(Wrappers.lambdaQuery(PlatformFileUser.class).eq(PlatformFileUser::getUserId, SecurityUtils.getUserId())); List<Long> fileIdList = platformFileUsers.stream().map(PlatformFileUser::getFileId).collect(Collectors.toList()); if(fileIdList.size() == 0){ if (fileIdList.size() == 0) { fileIdList.add(-1L); } PageHelper.startPage(vo.getPageNo(), vo.getPageSize()); ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
@@ -425,20 +425,19 @@ DeviceOnLineCountVO c3m = new DeviceOnLineCountVO(); c3mChargings.forEach( device -> { // RedisUtils.getBean().set(C3mRedisConstant.C3_STATUS.getCode() + heartbeatReportInnerFrame.getHeartBeatDataPackage().getC3Mac() // , heartbeatReportInnerFrame.getHeartBeatDataPackage(), 300L); String s = redisUtils.get(C3mRedisConstant.C3_STATUS.getCode() + device.getC3Mac()); RedisDeviceStatus redisDeviceStatus = new RedisDeviceStatus(); redisDeviceStatus.setDeviceId(device.getC3Id().toString()); if (s != null) { A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage heartBeatDataPackage = JSON.parseObject(s, A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage.class); // 充电桩口状态位 1.空闲 2.充电中 3.充电中断，等待服务器确认 4.充电结束，等待服务器确认 5.有故障 6.与充电桩对接中 if ("5".equals(heartBeatDataPackage.getStatusBit())) { //在线 onLine.getAndIncrement(); } else { //故障 onLine.getAndIncrement(); error.getAndIncrement(); } else { //在线 onLine.getAndIncrement(); } } else { //离线 @@ -728,24 +727,24 @@ * @param param * @return */ public List<Pole> isBind(List<Pole> list, PoleStatesParam param) { List<Pole> bindList = new ArrayList<>();//已绑定客户 List<Pole> unbindList = new ArrayList<>();//未绑定客户 list.forEach(bindwarpper -> { // Long clientId = bindwarpper.getClientId(); if (bindwarpper.getClientId() == null) {//判断是否绑定 unbindList.add(bindwarpper); } else { bindList.add(bindwarpper); } }); if (param.getBingStates() == 0) { return bindList; } else if (param.getBingStates() == 1) { return unbindList; } return list; } // public List<Pole> isBind(List<Pole> list, PoleStatesParam param) { // List<Pole> bindList = new ArrayList<>();//已绑定客户 // List<Pole> unbindList = new ArrayList<>();//未绑定客户 // list.forEach(bindwarpper -> { //// Long clientId = bindwarpper.getClientId(); // if (bindwarpper.getClientId() == null) {//判断是否绑定 // unbindList.add(bindwarpper); // } else { // bindList.add(bindwarpper); // } // }); // if (param.getBingStates() == 0) { // return bindList; // } else if (param.getBingStates() == 1) { // return unbindList; // } // return list; // } public List<Pole> isTrue(List<Pole> list, PoleStatesParam param) { //实体灯杆 @@ -1128,22 +1127,15 @@ public List<Pole> getOwnerPole(BaseConditionVO baseConditionVO, String keyword, Long cilentId) { LambdaQueryWrapper<Pole> eq; // if(SecurityUtils.getClientId()!=null){ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize()); if (clientService.findClientId(cilentId)) { eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getUserId, cilentId); eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, cilentId); } else { PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize()); eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, cilentId).or(pole -> { pole.eq(Pole::getUserId, cilentId); }); } // }else { // PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize()); // eq = Wrappers.lambdaQuery(Pole.class); // } PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize()); if (!keyword.isEmpty()) { eq.like(Pole::getPoleName, keyword).or(code -> { code.like(Pole::getPoleCode, keyword); @@ -1151,6 +1143,7 @@ deviceCode.like(Pole::getDeviceCode, keyword); }); } PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize()); List<Pole> list; list = list(eq); setCount(list);
