#BladeUser修改

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/areamonthly/feign/TaskFeignClient.java

@@ -1,22 +1,20 @@
 package com.hnac.hzinfo.inspect.areamonthly.feign;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.vo.VoteChartVo;
-
 import com.hnac.hzinfo.inspect.areamonthly.vo.EventListVO;
 import com.hnac.hzinfo.inspect.areamonthly.vo.TaskListQuery;
 import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectVO;
 import com.hnac.hzinfo.inspect.areamonthly.vo.TaskVo;
 import com.hnac.hzinfo.inspect.task.entity.TaskEntity;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -54,8 +52,7 @@ public interface TaskFeignClient {
 
     @GetMapping(value = "/task/event/list")
     @ApiOperation(value = "任务查看弹窗下面的列表  巡检情况列表信息分页", notes = "传入taskId")
-    R<BladePage<EventListVO>> eventList(@RequestParam("taskId") Long taskId, @SpringQueryMap Query query,
+    R<BladePage<EventListVO>> eventList(@RequestParam("taskId") Long taskId, @SpringQueryMap Query query);
-                                        @SpringQueryMap BladeUser bladeUser);
 
 
     /**

hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/controller/FdpDiagnoseController.java

@@ -4,7 +4,6 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.hnac.hzims.common.logs.utils.StringUtils;
 import com.hnac.hzims.fdp.dto.StatisticStatusDTO;
 import com.hnac.hzims.fdp.proxy.IDiagnoseProxy;
-import com.hnac.hzims.fdp.request.DiagnoseFaultAllReq;
 import com.hnac.hzims.fdp.request.DiagnoseFaultReq;
 import com.hnac.hzims.fdp.request.DiagnoseNextstepReq;
 import com.hnac.hzims.fdp.response.DiagnoseNextstepResp;
@@ -13,11 +12,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-
-import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.system.entity.Dept;
 import org.springblade.system.feign.ISysClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/service/impl/PresonManagementServiceImpl.java

@@ -18,9 +18,7 @@ import com.hnac.hzims.common.logs.utils.StringUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.log.exception.ServiceException;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
@@ -31,7 +29,6 @@ import org.springblade.system.feign.ISysClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.xml.ws.WebServiceException;
 import java.lang.reflect.Field;
 import java.util.List;
 import java.util.stream.Collectors;

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ContentController.java

@@ -14,8 +14,8 @@ import com.hnac.hzinfo.inspect.obj.services.ProjectContentService;
 import com.hnac.hzinfo.inspect.obj.services.impl.ContentServiceImpl;
 import com.hnac.hzinfo.inspect.obj.utils.CodeUtils;
 import com.hnac.hzinfo.inspect.obj.vo.ContentBatchVo;
-import com.hnac.hzinfo.inspect.utils.Condition;
 import com.hnac.hzinfo.inspect.obj.vo.ContentListQueryVO;
+import com.hnac.hzinfo.inspect.utils.Condition;
 import com.hnac.hzinfo.log.annotation.Business;
 import com.hnac.hzinfo.log.annotation.Operate;
 import com.hnac.hzinfo.log.contants.BusinessType;
@@ -25,10 +25,9 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
-import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -58,10 +57,10 @@ public class ContentController {
 	@GetMapping("/list")
 	@ApiOperation(value = "巡检内容列表", notes = "巡检内容列表")
 	@Operate(label="查询巡检内容分页列表",type = BusinessType.QUERY,ignore = false)
-	public R<IPage<ContentEntity>> list(ContentListQueryVO content, Query query, BladeUser bladeUser) {
+	public R<IPage<ContentEntity>> list(ContentListQueryVO content, Query query) {
 		LambdaQueryWrapper<ContentEntity> queryWrapper = Condition.getQueryWrapper(new ContentEntity(),content);
 		queryWrapper.orderByDesc(ContentEntity::getUpdateTime);
-		IPage<ContentEntity> pages = contentService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.eq(ContentEntity::getTenantId, bladeUser.getTenantId()) : queryWrapper);
+		IPage<ContentEntity> pages = contentService.page(Condition.getPage(query), (!AuthUtil.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.eq(ContentEntity::getTenantId, AuthUtil.getTenantId()) : queryWrapper);
 		return R.data(pages);
 	}
 

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectController.java

@@ -33,6 +33,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.CollectionUtil;
@@ -80,25 +81,15 @@ public class ObjectController extends BladeController {
 		return R.data(detail);
 	}
 
-//	@GetMapping("/list")
-//	@ApiOperationSupport(order = 2)
-//	@ApiOperation(value = "巡检对象列表", notes = "巡检对象列表")
-//	public R<IPage<ObjectEntity>> list(ObjectListQueryVO object, Query query, BladeUser bladeUser) {
-//		LambdaQueryWrapper<ObjectEntity> queryWrapper = Condition.getQueryWrapper(new ObjectEntity(),object);
-//		queryWrapper.orderByDesc(ObjectEntity::getUpdateTime);
-//		IPage<ObjectEntity> pages = objectService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.eq(ObjectEntity::getTenantId, bladeUser.getTenantId()) : queryWrapper);
-//		return R.data(pages);
-//	}
-
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "巡检对象列表", notes = "巡检对象列表")
 	@Operate(label="查询巡检对象分页列表",type = BusinessType.QUERY,ignore = false)
-	public R<IPage<ObjectEntity>> list(ObjectListQueryVO object, Query query, BladeUser bladeUser) {
+	public R<IPage<ObjectEntity>> list(ObjectListQueryVO object, Query query) {
 		IPage<ObjectEntity> pages = Condition.getPage(query);
 		ObjectEntity entity = new ObjectEntity();
-		if(!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)){
+		if(!AuthUtil.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)){
-			entity.setTenantId(bladeUser.getTenantId());
+			entity.setTenantId(AuthUtil.getTenantId());
 		}
 		entity.setCode(object.getCode());
 		entity.setName(object.getName());
@@ -113,10 +104,10 @@ public class ObjectController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "其他巡检对象列表-分页", notes = "其他巡检对象列表,分页")
 	@Operate(label="查询其他巡检对象分页列表",type = BusinessType.QUERY,ignore = false)
-	public R<IPage<OtherObjectEntity>> otherListPage(OtherObjectListQueryVO object, Query query, BladeUser bladeUser) {
+	public R<IPage<OtherObjectEntity>> otherListPage(OtherObjectListQueryVO object, Query query) {
 		LambdaQueryWrapper<OtherObjectEntity> queryWrapper = Condition.getQueryWrapper(new OtherObjectEntity(),object);
 		queryWrapper.orderByDesc(OtherObjectEntity::getRealId);
-		IPage<OtherObjectEntity> pages = otherObjectService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.eq(OtherObjectEntity::getTenantId, bladeUser.getTenantId()) : queryWrapper);
+		IPage<OtherObjectEntity> pages = otherObjectService.page(Condition.getPage(query), (!AuthUtil.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.eq(OtherObjectEntity::getTenantId, AuthUtil.getTenantId()) : queryWrapper);
 		return R.data(pages);
 	}
 
@@ -124,10 +115,10 @@ public class ObjectController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "其他巡检对象列表", notes = "其他巡检对象列表,不分页")
 	@Operate(label="查询其他巡检对象列表",type = BusinessType.QUERY,ignore = false)
-	public R<List<OtherObjectEntity>> otherList(OtherObjectListQueryVO object, BladeUser bladeUser) {
+	public R<List<OtherObjectEntity>> otherList(OtherObjectListQueryVO object) {
 		LambdaQueryWrapper<OtherObjectEntity> queryWrapper = Condition.getQueryWrapper(new OtherObjectEntity(),object);
 		queryWrapper.orderByDesc(OtherObjectEntity::getRealId);
-		List<OtherObjectEntity> list = otherObjectService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.eq(OtherObjectEntity::getTenantId, bladeUser.getTenantId()) : queryWrapper);
+		List<OtherObjectEntity> list = otherObjectService.list((!AuthUtil.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.eq(OtherObjectEntity::getTenantId, AuthUtil.getTenantId()) : queryWrapper);
 		return R.data(list);
 	}
 
@@ -135,14 +126,14 @@ public class ObjectController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "获获取未绑定的其他来源对象", notes = "获获取未绑定的其他来源对象,分页")
 	@Operate(label="查询未绑定的其他来源对象",type = BusinessType.QUERY,ignore = false)
-	public R<IPage<OtherObjectEntity>> otherUnbindList(OtherObjectListQueryVO obj, Query query, BladeUser bladeUser) {
+	public R<IPage<OtherObjectEntity>> otherUnbindList(OtherObjectListQueryVO obj, Query query) {
 		IPage<OtherObjectEntity> pages = Condition.getPage(query);
 		OtherObjectEntity object = new OtherObjectEntity();
 		object.setName(obj.getName());
 		object.setCode(obj.getCode());
 		object.setType(obj.getType());
 		object.setRealId(obj.getRealId());
-		object.setTenantId(bladeUser.getTenantId());
+		object.setTenantId(AuthUtil.getTenantId());
 		pages.setRecords(otherObjectService.getUnbindListPage(pages,object));
 		return R.data(pages);
 	}

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectUserController.java

@@ -15,14 +15,12 @@ import com.hnac.hzinfo.inspect.obj.vo.ObjectUserListQuery;
 import com.hnac.hzinfo.inspect.obj.vo.ObjectUserListVO;
 import com.hnac.hzinfo.inspect.obj.vo.ObjectUserListVO.ObjectUserListVOBuilder;
 import com.hnac.hzinfo.inspect.obj.vo.UserVO;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
@@ -63,26 +61,28 @@ public class ObjectUserController {
 			businessType = BusinessType.GENCODE,
 			action = "查询巡检对象人员管理列表")
 	@ApiOperation(value = "巡检对象用户列表", notes = "巡检对象用户列表(跨服务查询)")
-	public R<IPage<ObjectUserListVO>> list(ObjectUserListQuery content, Query query, BladeUser bladeUser) {
+	public R<IPage<ObjectUserListVO>> list(ObjectUserListQuery content, Query query) {
-		if(!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)){
+		if(!AuthUtil.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)){
 			content.setTenantId(AuthUtil.getTenantId());
 		}
 		List<ObjectUserListQuery> objectUserEntityList = objectUserService.getPageList(content);
-		if(objectUserEntityList.size()==0){
+		if(objectUserEntityList.isEmpty()){
 			return R.data(Condition.getPage(query));
 		}
-		R<List<User>> r = userClient.userListByCodeAndNameAndAccount(bladeUser.getTenantId(),content.getUserCode(),content.getUserName(),content.getLoginName());
+		R<List<User>> r = userClient.userListByCodeAndNameAndAccount(AuthUtil.getTenantId(),content.getUserCode(),content.getUserName(),content.getLoginName());
 		if(!r.isSuccess()){
 			log.error(r.getMsg());
 			throw new ServiceException("调用用户服务失败");
 		}
-		List<User> userList = r.getData();//TODO 根据查询条件获取所有用户不分页
+		//TODO 根据查询条件获取所有用户不分页
-		if(userList.size()==0){
+		List<User> userList = r.getData();
+		if(userList.isEmpty()){
 			log.warn("没有符合条件的用户....");
 			return R.data(Condition.getPage(query));
 		}
 		Map<Long,User> userMap = userList.stream().collect(Collectors.toMap(User::getId, Function.identity()));
-		List<ObjectUserListVO> list = Lists.newArrayList();//所有符合条件的，不分页
+		//所有符合条件的，不分页
+		List<ObjectUserListVO> list = Lists.newArrayList();
 		for(ObjectUserListQuery objectUserEntity:objectUserEntityList){
 			ObjectUserListVOBuilder builder = ObjectUserListVO.builder()
 				.id(objectUserEntity.getId())

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ProjectController.java

@@ -20,14 +20,12 @@ import com.hnac.hzinfo.inspect.obj.services.impl.ProjectContentServiceImpl;
 import com.hnac.hzinfo.inspect.obj.utils.CodeUtils;
 import com.hnac.hzinfo.inspect.obj.vo.ProjectListQueryVO;
 import com.hnac.hzinfo.inspect.obj.vo.ProjectVO;
-import com.hnac.hzinfo.inspect.obj.wrapper.ProjectWrapper;
 import com.hnac.hzinfo.inspect.utils.Condition;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.apache.ibatis.annotations.Mapper;
 import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.CollectionUtil;
@@ -39,13 +37,11 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * 巡检项目
@@ -73,10 +69,10 @@ public class ProjectController {
 	@OperationAnnotation(moduleName = "巡检管理",title = "巡检配置",operatorType = OperatorType.MOBILE,businessType =
 			BusinessType.GENCODE,
 			action = "查询巡检项目管理列表")
-	public R<IPage<ProjectEntity>> list(ProjectListQueryVO project, Query query, BladeUser bladeUser) {
+	public R<IPage<ProjectEntity>> list(ProjectListQueryVO project, Query query) {
 		LambdaQueryWrapper<ProjectEntity> queryWrapper = Condition.getQueryWrapper(new ProjectEntity(),project);
 		queryWrapper.orderByDesc(ProjectEntity::getUpdateTime);
-		IPage<ProjectEntity> pages = projectService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.eq(ProjectEntity::getTenantId, bladeUser.getTenantId()) : queryWrapper);
+		IPage<ProjectEntity> pages = projectService.page(Condition.getPage(query), (!AuthUtil.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.eq(ProjectEntity::getTenantId, AuthUtil.getTenantId()) : queryWrapper);
 		pages.getRecords().forEach(entity->{
 			QueryWrapper<ProjectContentEntity> qw = new QueryWrapper<>();
 			qw.lambda().eq(ProjectContentEntity::getProjectId, entity.getId());

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/TemplateController.java

@@ -10,12 +10,9 @@ import com.hnac.hzinfo.inspect.obj.entity.ObjectTemplateEntity;
 import com.hnac.hzinfo.inspect.obj.entity.TemplateEntity;
 import com.hnac.hzinfo.inspect.obj.entity.TemplateProjectEntity;
 import com.hnac.hzinfo.inspect.obj.services.ObjectTemplateService;
-import com.hnac.hzinfo.inspect.obj.services.ProjectContentService;
-import com.hnac.hzinfo.inspect.obj.services.TemplateProjectService;
 import com.hnac.hzinfo.inspect.obj.services.TemplateService;
 import com.hnac.hzinfo.inspect.obj.services.impl.TemplateProjectServiceImpl;
 import com.hnac.hzinfo.inspect.obj.utils.CodeUtils;
-import com.hnac.hzinfo.inspect.obj.vo.ProjectContentDto;
 import com.hnac.hzinfo.inspect.obj.vo.TemplateListQueryVO;
 import com.hnac.hzinfo.inspect.plan.entity.PlanObjectTemplateEntity;
 import com.hnac.hzinfo.inspect.plan.service.IPlanObjectTemplateService;
@@ -30,13 +27,11 @@ import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.SpringUtil;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -74,10 +69,10 @@ public class TemplateController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "巡检模板列表分页", notes = "传入巡检模板")
 	@Operate(label="查询巡检模板分页列表",type = BusinessType.QUERY,ignore = false)
-	public R<IPage<TemplateEntity>> list(TemplateListQueryVO inspectionTemplate, Query query, BladeUser bladeUser) {
+	public R<IPage<TemplateEntity>> list(TemplateListQueryVO inspectionTemplate, Query query) {
 		LambdaQueryWrapper<TemplateEntity> queryWrapper = Condition.getQueryWrapper(new TemplateEntity(),inspectionTemplate);
 		queryWrapper.orderByDesc(TemplateEntity::getUpdateTime);
-		IPage<TemplateEntity> pages = templateService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.eq(TemplateEntity::getTenantId, bladeUser.getTenantId()) : queryWrapper);
+		IPage<TemplateEntity> pages = templateService.page(Condition.getPage(query), (!AuthUtil.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.eq(TemplateEntity::getTenantId, AuthUtil.getTenantId()) : queryWrapper);
 		return R.data(pages);
 	}
 

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/InspectOfflineServiceImpl.java

@@ -39,10 +39,8 @@ import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.io.IOUtils;
-
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseEntity;
-
 import org.springblade.core.oss.model.BladeFile;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/PlanController.java

@@ -3,7 +3,6 @@ package com.hnac.hzinfo.inspect.plan.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
 import com.hnac.hzinfo.inspect.Constants;
 import com.hnac.hzinfo.inspect.obj.utils.CodeUtils;
 import com.hnac.hzinfo.inspect.plan.entity.PlanEntity;
@@ -21,7 +20,7 @@ import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.Func;
@@ -68,7 +67,7 @@ public class PlanController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页显示计划列表", notes = "传入plan")
 	@Operate(label = "巡检计划列表分页查询",type = BusinessType.QUERY,ignore = false)
-	public R<IPage<PlanEntity>> list(PlanListQueryVO plan, Query query, BladeUser bladeUser) {
+	public R<IPage<PlanEntity>> list(PlanListQueryVO plan, Query query) {
 		LambdaQueryWrapper<PlanEntity> queryWrapper = Condition.getQueryWrapper(new PlanEntity(),plan);
 		if(plan.getStartTime()!=null){
 			queryWrapper.ge(PlanEntity::getStartTime,plan.getStartTime());
@@ -83,7 +82,8 @@ public class PlanController extends BladeController {
 			queryWrapper.eq(PlanEntity::getCreateDept,plan.getCreateDept());
 		}
 		queryWrapper.orderByDesc(PlanEntity::getUpdateTime);
-		IPage<PlanEntity> pages = planService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.eq(PlanEntity::getTenantId, bladeUser.getTenantId()) : queryWrapper);
+
+		IPage<PlanEntity> pages = planService.page(Condition.getPage(query), (!AuthUtil.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.eq(PlanEntity::getTenantId, AuthUtil.getTenantId()) : queryWrapper);
 		return R.data(pages);
 	}
 

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/EventController.java

@@ -11,20 +11,28 @@ import com.hnac.hzinfo.inspect.obj.entity.ObjectEntity;
 import com.hnac.hzinfo.inspect.obj.entity.ProjectEntity;
 import com.hnac.hzinfo.inspect.obj.services.ObjectService;
 import com.hnac.hzinfo.inspect.obj.services.ProjectService;
-import com.hnac.hzinfo.inspect.task.entity.*;
+import com.hnac.hzinfo.inspect.task.entity.EventAttachmentEntity;
-import com.hnac.hzinfo.inspect.task.service.*;
+import com.hnac.hzinfo.inspect.task.entity.EventEntity;
-import com.hnac.hzinfo.inspect.task.vo.*;
+import com.hnac.hzinfo.inspect.task.entity.EventRecordEntity;
+import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectContentEntity;
+import com.hnac.hzinfo.inspect.task.service.IEventAttachmentService;
+import com.hnac.hzinfo.inspect.task.service.IEventRecordService;
+import com.hnac.hzinfo.inspect.task.service.IEventService;
+import com.hnac.hzinfo.inspect.task.service.ITaskObjectProjectContentService;
+import com.hnac.hzinfo.inspect.task.vo.EventAddVO;
+import com.hnac.hzinfo.inspect.task.vo.EventDetailVO;
+import com.hnac.hzinfo.inspect.task.vo.EventRecordDetailVO;
+import com.hnac.hzinfo.inspect.task.vo.ProblemVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.flow.core.constant.ProcessConstant;
 import org.springblade.flow.core.feign.IFlowClient;
@@ -54,10 +62,10 @@ public class EventController{
      */
 	@RequestMapping(value = "/list", method = {RequestMethod.GET, RequestMethod.POST})
 	@ApiOperation(value = "任务查看弹窗下面的列表  巡检情况列表信息分页", notes = "传入taskId")
-    public R<IPage<EventListVO>>  list(Long taskId, Query query, BladeUser bladeUser) {
+    public R<IPage<EventListVO>>  list(Long taskId, Query query) {
 		LambdaQueryWrapper<EventEntity> queryWrapper = Wrappers.<EventEntity>lambdaQuery().eq(EventEntity::getTaskId,taskId).orderByDesc(EventEntity::getCreateTime);
-		IPage<EventEntity> pages = eventService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ?
+		IPage<EventEntity> pages = eventService.page(Condition.getPage(query), (!AuthUtil.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ?
-			queryWrapper.eq(EventEntity::getTenantId, bladeUser.getTenantId()).orderByDesc(EventEntity::getCreateTime) : queryWrapper);
+			queryWrapper.eq(EventEntity::getTenantId, AuthUtil.getTenantId()).orderByDesc(EventEntity::getCreateTime) : queryWrapper);
 		IPage<EventListVO> resultPages = new Page<>(pages.getCurrent(), pages.getSize(),pages.getTotal());
 
 		Map<Long,String> objectNames = Maps.newHashMap();
@@ -66,7 +74,7 @@ public class EventController{
 		pages.getRecords().forEach(entity->{
 			//对象名
 			String objectName = objectNames.get(entity.getObjectId());
-			if(StringUtil.isEmpty(objectName)){
+			if(StringUtil.isBlank(objectName)){
 				ObjectEntity objectEntity = objectService.getById(entity.getObjectId());
 				if(objectEntity!=null){
 					objectName = objectEntity.getName();
@@ -75,7 +83,7 @@ public class EventController{
 			}
 			//项目名
 			String projectName = projectNames.get(entity.getProjectId());
-			if(StringUtil.isEmpty(projectName)){
+			if(StringUtil.isBlank(projectName)){
 				ProjectEntity projectEntity = projectService.getById(entity.getProjectId());
 				if(projectEntity!=null){
 					projectName = projectEntity.getName();

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/EventServiceImpl.java

@@ -180,7 +180,6 @@ public class EventServiceImpl extends ServiceImpl<TaskEventMapper, EventEntity>
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public boolean addTaskEventAuto(EventAddVO eventVO){
-		//logger.info("addTaskEventAuto:eventVO:"+eventVO.getProjectId(),"传参为："+ JSON.toJSONString(eventVO));
 		BladeUser user = AuthUtil.getUser();
 
 		//第一次登记时，需领用任务

hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessStatisticsServiceImpl.java

@@ -5,6 +5,7 @@ import cn.afterturn.easypoi.excel.entity.ExportParams;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hnac.hzims.common.logs.utils.StringUtils;
 import com.hnac.hzims.operational.access.dto.OperAccessStatisticsDTO;
 import com.hnac.hzims.operational.access.entity.OperAccessStatisticsEntity;
@@ -14,9 +15,6 @@ import com.hnac.hzims.operational.access.service.IOperAccessStatisticsService;
 import com.hnac.hzims.operational.access.vo.OperAccessStatisticsVO;
 import com.hnac.hzims.operational.access.wrapper.OperAccessStatisticsWrapper;
 import org.apache.poi.ss.usermodel.Workbook;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;

hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessTaskDetailServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hnac.hzims.common.logs.utils.StringUtils;
 import com.hnac.hzims.operational.access.dto.OperAccessTaskDetailDTO;
 import com.hnac.hzims.operational.access.entity.OperAccessTaskDetailEntity;
@@ -11,14 +12,11 @@ import com.hnac.hzims.operational.access.mapper.OperAccessTaskDetailMapper;
 import com.hnac.hzims.operational.access.service.IOperAccessTaskDetailService;
 import com.hnac.hzims.operational.access.vo.OperAccessTaskDetailVO;
 import com.hnac.hzims.operational.access.wrapper.OperAccessTaskDetailWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.system.user.cache.UserCache;
-import org.springblade.system.user.entity.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,9 +32,9 @@ public class OperAccessTaskDetailServiceImpl extends ServiceImpl<OperAccessTaskD
 	@Override
 	public R doSave(OperAccessTaskDetailDTO req) {
 		BladeUser user = AuthUtil.getUser();
-		if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getUserName())){
+		if (ObjectUtil.isNotEmpty(user)&& StringUtils.isNotEmpty(user.getRealName())){
-			req.setCreateUserName(user.getUserName());
+			req.setCreateUserName(user.getRealName());
-			req.setUpdateUserName(user.getUserName());
+			req.setUpdateUserName(user.getRealName());
 		}
 		return R.status(super.save(req));
 	}

hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java

@@ -529,83 +529,6 @@ public class StAlamRecordServiceImpl extends ServiceImpl<StAlarmRecordMapper, St
 		return list.stream().filter(o-> code.equals(o.getCode())).collect(Collectors.toList());
 	}
 
-	/**
-	 * 获取当天的告警列表
-	 *
-	 * @param
-	 * @return
-	 * @Param date  时间
-	 *//*
-	@Override
-	public R<SoeBodyVo> getDaySoeList(BladeUser user, String date) {
-		SoeBodyVo vo = new SoeBodyVo();
-
-		DateTimeFormatter df = DateTimeFormatter.ofPattern(DateUtil.PATTERN_DATETIME);
-		//获取用户权限站点数据
-		//List<StationEntity> station = stationService.getStationByUserAuth(AuthUtil.getUser());
-		//不根据权限来获取站点
-		List<StationEntity> station = stationService.getStationByType(null, null);
-		List<String> stationIds = station.stream().map(StationEntity::getCode).collect(Collectors.toList());
-		Map<String, StationEntity> stationIdKey = stationService.getKeyStringValueStation(true);
-
-		List<StAlarmRecordEntity> list = this.list();
-		List<String> realList = list.stream().map(StAlarmRecordEntity::getRealId).collect(Collectors.toList());
-
-		R<List<FdpMonitorEntity>> all = fdpMonitorClient.getAll();
-		String types = "2,3,5,6";
-		SoeQueryConditionByStation soeQueryConditionByStation = new SoeQueryConditionByStation();
-		if (Func.isNotBlank(date)) {
-			soeQueryConditionByStation.setBeginTime(LocalDateTime.parse(date, df));
-		} else {
-			soeQueryConditionByStation.setBeginTime(LocalDateTime.parse(DateUtil.format(new Date(), DateUtil.PATTERN_DATE) + " 00:00:00", df));
-		}
-		soeQueryConditionByStation.setEndTime(LocalDateTime.now());
-		soeQueryConditionByStation.setNeedPage(false);
-		soeQueryConditionByStation.setStationIds(stationIds);
-		soeQueryConditionByStation.setTypes(Arrays.asList(types.split(",")));
-		List<SoeDataVo> collect = new ArrayList<>();
-		R<BladePage<SoeData>> byStationsAndTime = soeClient.getByStationsAndTime(soeQueryConditionByStation);
-		if (byStationsAndTime.isSuccess() && ObjectUtil.isNotEmpty(byStationsAndTime.getData())) {
-			List<SoeData> data = byStationsAndTime.getData().getRecords();
-			if (CollectionUtil.isNotEmpty(data)) {
-				SoeDataVo soeVo = data.stream().filter(o -> !realList.contains(o.getRealId())).map(iter -> {
-					SoeDataVo soeDataVo = new SoeDataVo();
-					BeanUtil.copyProperties(iter, soeDataVo);
-					return soeDataVo;
-				}).sorted(Comparator.comparing(SoeData::getTs, Comparator.reverseOrder())).collect(Collectors.toList()).get(0);
-
-				vo.setDate(DateUtil.format(soeVo.getTs(), DateUtil.PATTERN_DATETIME));
-
-				collect = data.stream().filter(o -> !realList.contains(o.getRealId()) && !DateUtil.format(o.getTs(), DateUtil.PATTERN_DATETIME).equals(date)).map(iter -> {
-					SoeDataVo soeDataVo = new SoeDataVo();
-					BeanUtil.copyProperties(iter, soeDataVo);
-					return soeDataVo;
-				}).sorted(Comparator.comparing(SoeData::getSoeType, Comparator.comparingInt(Integer::parseInt)).thenComparing(SoeData::getTs, Comparator.reverseOrder())).collect(Collectors.toList());
-
-				if (CollectionUtil.isNotEmpty(collect)) {
-					for (SoeDataVo iter : collect) {
-						if (all.isSuccess() && CollectionUtil.isNotEmpty(all.getData()) && ("5".equals(iter.getSoeType()) || "6".equals(iter.getSoeType()))) {
-							List<FdpMonitorEntity> data1 = all.getData();
-							List<FdpMonitorEntity> collect1 = data1.stream().filter(o -> o.getImsRealIds().contains(iter.getRealId())).collect(Collectors.toList());
-							if (CollectionUtil.isNotEmpty(collect1)) {
-								iter.setIsBinding(true);
-							}
-						}
-						StationEntity stationEntity = stationIdKey.get(iter.getStation());
-						if (ObjectUtil.isNotEmpty(stationEntity)) {
-							iter.setStationName(stationEntity.getName());
-							iter.setServeType(stationEntity.getServeType());
-						}
-						iter.setContent(iter.getSoeExplain());
-						iter.setSoeType(array[Integer.valueOf(iter.getSoeType())]);
-					}
-				}
-			}
-
-		}
-		vo.setSoeList(collect);
-		return R.data(vo);
-	}*/
 	@Override
 	public IPage<StAlarmRecordVo> doPageList(IPage<StAlarmRecordVo> page, StAlarmRecordVo vo) {
 		List<StAlarmRecordVo> stAlarmRecordVos = this.baseMapper.selectPageList(page, vo);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/DutyGroupGeneratingCapacityServiceImpl.java

@@ -1,15 +1,14 @@
 package com.hnac.hzims.operational.duty.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hnac.hzims.equipment.entity.PlanGenerationEntity;
 import com.hnac.hzims.equipment.feign.IPlanGenertionClient;
 import com.hnac.hzims.operational.duty.entity.DutyGroupGeneratingCapacityEntity;
 import com.hnac.hzims.operational.duty.entity.ImsDutyGroupEntity;
-import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity;
 import com.hnac.hzims.operational.duty.mapper.DutyGroupGeneratingCapacityMapper;
 import com.hnac.hzims.operational.duty.service.IDutyGroupGeneratingCapacityService;
 import com.hnac.hzims.operational.duty.service.IImsDutyGroupService;
-import com.hnac.hzims.operational.duty.service.IImsDutyMainService;
 import com.hnac.hzims.operational.duty.vo.GroupGenerationVo;
 import com.hnac.hzims.operational.duty.vo.StationDutyGroupGenerationVo;
 import com.hnac.hzims.operational.station.entity.ImsDeptEntity;
@@ -18,13 +17,10 @@ import com.hnac.hzims.operational.station.service.IImsDeptService;
 import com.hnac.hzims.operational.station.service.IStationService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.system.user.cache.UserCache;
 import org.springframework.stereotype.Service;
 
 import java.util.*;

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyClassTypeServiceImpl.java

@@ -1,24 +1,19 @@
 package com.hnac.hzims.operational.duty.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hnac.hzims.operational.duty.entity.ImsDutyClassTypeEntity;
 import com.hnac.hzims.operational.duty.mapper.ImsDutyClassMapper;
 import com.hnac.hzims.operational.duty.mapper.ImsDutyClassTypeMapper;
 import com.hnac.hzims.operational.duty.service.IImsDutyClassTypeService;
-import com.hnac.hzims.operational.duty.vo.ImsDutyClassVO;
 import org.apache.commons.lang3.StringUtils;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.core.secure.BladeUser;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.ObjectUtil;
-import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainWorkBenchServiceImpl.java

@@ -3,7 +3,9 @@ package com.hnac.hzims.operational.main.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hnac.hzims.common.logs.utils.StringUtils;
+import com.hnac.hzims.operational.main.constant.HomePageConstant;
 import com.hnac.hzims.operational.main.entity.MainWorkBenchEntity;
 import com.hnac.hzims.operational.main.mapper.MainWorkBenchMapper;
 import com.hnac.hzims.operational.main.service.IMainWorkBenchService;
@@ -12,12 +14,8 @@ import com.hnac.hzims.operational.main.vo.MainWorkBenchExtendVo;
 import com.hnac.hzims.operational.main.vo.MainWorkBenchVO;
 import com.hnac.hzims.operational.main.vo.RoutingParamVo;
 import com.hnac.hzims.operational.main.wrapper.MainWorkBenchWrapper;
-import com.hnac.hzims.operational.main.constant.HomePageConstant;
 import com.hnac.hzims.operational.station.entity.StationEntity;
 import com.hnac.hzims.operational.station.service.IStationService;
-import org.apache.commons.collections4.MapUtils;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -27,11 +25,12 @@ import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.feign.ISysClient;
-import org.springblade.system.user.cache.UserCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Service
@@ -170,11 +169,8 @@ public class MainWorkBenchServiceImpl extends ServiceImpl<MainWorkBenchMapper, M
 		Optional<Dept> optionalDept = deptByCurrentUser.getData().stream().min(Comparator.comparing(Dept::getDeptCategory));
 		Integer deptCategory = optionalDept.isPresent() ? optionalDept.map(Dept::getDeptCategory).orElse(null) : null;
 		Dept dept = optionalDept.orElse(null);
-		//Integer deptCategory = deptByCurrentUser.getData().stream().min(Comparator.comparing(Dept::getDeptCategory)).get().getDeptCategory();
 		// 所属机构
 		List<Long> deptList = deptByCurrentUser.getData().stream().map(Dept::getId).collect(Collectors.toList());
-		// 最大权限机构
-		//Dept dept = deptByCurrentUser.getData().stream().min(Comparator.comparing(Dept::getDeptCategory)).get();
 		// 当前用户
 		BladeUser user = AuthUtil.getUser();
 		// 查询路由列表

hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/MonthReportServiceImpl.java

@@ -99,21 +99,4 @@ public class MonthReportServiceImpl extends ServiceImpl<MonthReportMapper, OperM
 			}
 	}
 
-
-//	@Override
-//	public PersonalMonthReportVO getPersonalMonthReport(String month) throws Exception {
-//		PersonalMonthReportVO personalMonthReportVO = new PersonalMonthReportVO();
-//		BladeUser user = AuthUtil.getUser();
-//		if(month.equals(YearMonth.now().toString())){
-//			personalMonthReportVO = operPersonalMonthReportService.getPersonalMonthReport(month,user.getUserId());
-//		}
-//		else{
-//			OperMonthReportEntity operMonthReportEntity = this.getOne(new LambdaQueryWrapper<OperMonthReportEntity>(){{
-//				eq(OperMonthReportEntity::getMonth,month);
-//				eq(OperMonthReportEntity::getUserId,user.getUserId());
-//			}});
-//			personalMonthReportVO = ObjectUtil.isNotEmpty(operMonthReportEntity) ? (PersonalMonthReportVO) ObjectHelper.byte2obj(operMonthReportEntity.getObject()) : null;
-//		}
-//		return personalMonthReportVO;
-//	}
 }

hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationController.java

@@ -166,12 +166,7 @@ public class StationController extends BladeController {
         List<StationEntity> list = stationService.list(new LambdaQueryWrapper<StationEntity>() {{
             in(StationEntity::getType, Func.toStrList(type));
         }});
-		/*BladeUser user = AuthUtil.getUser();
+		return R.data(list);
-		if(user.getAccount().equals("admin")){
-			return R.data(stationService.doListByTypes());
-		}
-		List<StationEntity> list = mainSystemMonitoringService.classifyUserDataScopeType(null, null, Func.toStrList(type));*/
-        return R.data(list);
     }