Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-31 fd35f223b7f40ee9ee4a9307384b54a96d7956a2

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java

@@ -482,13 +482,14 @@
      Set<Integer> siteIds = new HashSet<>();
      if(0 == query.getSiteId()){
         SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
         R<Integer> admin = sysUserClient.isAdmin(SecurityUtils.getUserId());
         Integer roleType = sysUser.getRoleType();
         Integer objectId = sysUser.getObjectId();
         if(2 == roleType){
            siteIds = partnerService.authSite(objectId, SiteMenu.SITE_LIST);
         }else{
            //非管理员需要根据角色和用户配置查询允许的站点数据
            if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
            if(admin.getData()!=1){
               List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
                    List<SysUserRoleVo> data2 = sysUserRoleClient.getRoleByUserId(sysUser.getUserId()).getData();
                    List<Integer> data1 = roleSiteClient.getSiteIds(data2.get(0).getRoleId()).getData();
@@ -585,30 +586,39 @@
    */
   @Override
   public void updateStatus() {
      List<TChargingPile> list = this.list(new LambdaQueryWrapper<TChargingPile>().eq(TChargingPile::getDelFlag, 0));
      Map<String, Object> charging_pile_online = redisService.getCacheMap("charging_pile_online");
      for (TChargingPile chargingPile : list) {
         Long time = (Long) charging_pile_online.get(chargingPile.getCode());
      Map<String, Object> charging_gun_online = redisService.getCacheMap("charging_gun_online");
      Set<String> keySet = charging_gun_online.keySet();
      List<TChargingGun> list = new ArrayList<>();
      if(keySet.size() > 0){
         list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getDelFlag, 0).in(TChargingGun::getFullNumber, keySet));
      }
      for (TChargingGun chargingGun : list) {
         Long time = (Long) charging_gun_online.get(chargingGun.getFullNumber());
         if(null != time && System.currentTimeMillis() - time > 60000){
            TChargingPile chargingPile1 = new TChargingPile();
            chargingPile1.setId(chargingPile.getId());
            chargingPile1.setStatus(2);
            this.updateById(chargingPile1);
            List<TChargingGun> list1 = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getChargingPileId, chargingPile.getId()));
            for (TChargingGun chargingGun : list1) {
               TChargingGun chargingGun1 = new TChargingGun();
               chargingGun1.setId(chargingGun.getId());
               chargingGun1.setStatus(1);
               chargingGunService.updateById(chargingGun1);
            TChargingGun chargingGun1 = new TChargingGun();
            chargingGun1.setId(chargingGun.getId());
            chargingGun1.setStatus(1);
            chargingGunService.updateById(chargingGun1);
				
            //桩处于正常，桩所属的枪都处于非正常，修改桩状态为异常
            TChargingPile chargingPile = this.getById(chargingGun.getChargingPileId());
            List<TChargingGun> list1 = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getChargingPileId, chargingPile.getId()).eq(TChargingGun::getDelFlag, 0));
            int size = list1.stream().filter(s -> s.getStatus() == 1 || s.getStatus() == 7).collect(Collectors.toList()).size();
            if(chargingPile.getStatus() == 1 && list1.size() == size){
               TChargingPile chargingPile1 = new TChargingPile();
               chargingPile1.setId(chargingGun.getChargingPileId());
               chargingPile1.setStatus(2);
               this.updateById(chargingPile1);
            }
            
            //添加记录
            TFaultMessage faultMessage = faultMessageService.getOne(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingPileId, chargingPile.getId())
                  .eq(TFaultMessage::getStatus, 1).eq(TFaultMessage::getDelFlag, 0).isNull(TFaultMessage::getEndTime));
            TFaultMessage faultMessage = faultMessageService.getOne(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingPileId, chargingGun.getChargingPileId())
                  .eq(TFaultMessage::getChargingGunId, chargingGun.getId()).eq(TFaultMessage::getStatus, 1).eq(TFaultMessage::getDelFlag, 0).isNull(TFaultMessage::getEndTime));
            if(null == faultMessage){
               faultMessage = new TFaultMessage();
               faultMessage.setSiteId(chargingPile.getSiteId());
               faultMessage.setChargingPileId(chargingPile.getId());
               faultMessage.setSiteId(chargingGun.getSiteId());
               faultMessage.setChargingPileId(chargingGun.getChargingPileId());
               faultMessage.setChargingGunId(chargingGun.getId());
               faultMessage.setStatus(1);
               faultMessage.setDownTime(LocalDateTime.now());
               faultMessage.setCreateTime(LocalDateTime.now());