fix:巡检对象支持更多类型

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/obj/services/impl/ObjectServiceImpl.java

@@ -127,16 +127,6 @@ public class ObjectServiceImpl extends BaseServiceImpl<InspectObjectMapper, Obje
 			if (StringUtil.isBlank(entity.getDescription())) {
 				throw new ServiceException("巡检点象描述不能为空!");
 			}
-			if (StringUtil.isNotBlank(entity.getSupportAutoVideo())) {
-				if (entity.getSupportAutoVideo().equals("0")
-						|| entity.getSupportAutoVideo().equals("1")
-						|| entity.getSupportAutoVideo().equals("2")
-						|| entity.getSupportAutoVideo().equals("3")
-						|| entity.getSupportAutoVideo().equals("4")) {
-				} else {
-					throw new ServiceException("巡检点类型只支持数字： 0普通巡检，1视频自动巡检，2机器人巡检，3防汛巡检，4特殊巡检");
-				}
-			}
 		}
 		return super.save(entity);
 	}

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/obj/web/ObjectController.java

@@ -74,15 +74,6 @@ public class ObjectController extends BladeController {
 
 	}
 
-//	@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)
@@ -90,9 +81,6 @@ public class ObjectController extends BladeController {
 	public R<IPage<ObjectEntity>> list(ObjectListQueryVO object, Query query, BladeUser bladeUser) {
 		IPage<ObjectEntity> pages = Condition.getPage(query);
 		ObjectEntity entity = new ObjectEntity();
-//		if(!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)){
-//			entity.setTenantId(bladeUser.getTenantId());
-//		}
 		entity.setCreateDept(Long.valueOf(bladeUser.getDeptId()));
 
 		entity.setCode(object.getCode());
@@ -136,7 +124,6 @@ public class ObjectController extends BladeController {
 		object.setCode(obj.getCode());
 		object.setType(obj.getType());
 		object.setRealId(obj.getRealId());
-//		object.setTenantId(bladeUser.getTenantId());
 		object.setCreateDept(Long.valueOf(bladeUser.getDeptId()));
 		pages.setRecords(otherObjectService.getUnbindListPage(pages,object));
 		return R.data(pages);

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/task/controller/TaskController.java

@@ -105,14 +105,9 @@ public class TaskController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperation(value = "分页显示任务列表", notes = "传入task")
 	public R<IPage<TaskVo>> list(TaskListQuery task, Query query) {
-//		CacheUtil.put("test#2","inspect","test","12");
-//		LambdaQueryWrapper<TaskEntity> queryWrapper = Condition.getQueryWrapper(new TaskEntity(),task);
-//		queryWrapper.orderByDesc(TaskEntity::getUpdateTime);
-//		IPage<TaskEntity> pages = taskService.page(Condition.getPage(query), queryWrapper);
 		IPage<TaskVo> pages = Condition.getPage(query);
 		if(!AuthUtil.isAdministrator()){
 			task.setCurUserId(AuthUtil.getUserId());
-			//task.setTenantId(AuthUtil.getTenantId());
 		}
 		List<TaskVo> list = taskService.getListPage(pages,task);
 		pages.setRecords(list);
@@ -127,7 +122,6 @@ public class TaskController extends BladeController {
 	public R<IPage<TaskVo>> listByDutyId(Long dutyId, Query query) {
 		TaskListQuery task = new TaskListQuery();
 		task.setDutyId(dutyId);
-//		task.setTenantId(AuthUtil.getTenantId());
 		IPage<TaskVo> pages = Condition.getPage(query);
 		List<TaskVo> list = taskService.getListPage(pages,task);
 		pages.setRecords(list);
@@ -142,7 +136,6 @@ public class TaskController extends BladeController {
 	public R<IPage<TaskVo>> robotList(TaskListQuery task, Query query) {
 		IPage<TaskVo> pages = Condition.getPage(query);
 		task.setAutoVideo(PlanContants.InspectTypeEnum.ROBOT.getVal());
-//		task.setTenantId(AuthUtil.getTenantId());
 		List<TaskVo> list = taskService.getListPageAuth(pages,task);
 		pages.setRecords(list);
 		return R.data(pages);