java/mx_charging_pile.git

			@@ -24,6 +24,7 @@
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.core.utils.StringUtils;
			import com.ruoyi.common.core.web.domain.AjaxResult;
			import com.ruoyi.common.core.web.domain.BasePojo;
			import com.ruoyi.common.core.web.page.PageInfo;
			import com.ruoyi.common.redis.service.RedisService;
			import com.ruoyi.common.security.utils.SecurityUtils;
			@@ -482,13 +483,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();
			@@ -516,7 +518,7 @@
			if(status == 5 \|\| status == 6){
			gunMonitoring.setStatus(3);
			}
			if(status == 4){
			if(status == 4 \|\| status == 7){
			Integer id = gunMonitoring.getId();
			TChargingOrder chargingOrder = chargingOrderClient.getOrderDetailByGunId(id).getData();
			if(null != chargingOrder){
			@@ -575,6 +577,13 @@
			}
			}
			}
			//test
			// if (status==1\|\|status==7){
			// TFaultMessage one = faultMessageService.lambdaQuery().eq(TFaultMessage::getChargingGunId, gunMonitoring.getId()).orderByDesc(TFaultMessage::getCreateTime).last("limit 1").one();
			// if (one!=null) {
			// gunMonitoring.setFaultCause(one.getContent());
			// }
			// }
			}
			return pageInfo.setRecords(chargingGunMonitoring);
			}