From 39004678a36c17fcea0674b54675a76c2d3b0528 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 19 四月 2024 16:29:39 +0800
Subject: [PATCH] 增加雷达报警和视频巡检引导类型上报
---
ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java | 61 ++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 13 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java b/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
index b164ead..5471e9b 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
@@ -1,26 +1,22 @@
package com.ruoyi.app.task.controller;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
-import com.alibaba.fastjson2.JSONObject;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.ruoyi.alarm.steal.domain.ArdAlarmStealelec;
-import com.ruoyi.app.task.domain.AppParam;
-import com.ruoyi.app.task.domain.ArdAppTaskDetail;
-import com.ruoyi.app.task.domain.WellParam;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.app.task.domain.*;
+import com.ruoyi.common.core.domain.DeptUserTree;
+import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.utils.pagehelper.JpaPageHelper;
-import com.ruoyi.utils.pagehelper.JpaPageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.catalina.security.SecurityUtil;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -28,11 +24,9 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.app.task.domain.ArdAppTask;
import com.ruoyi.app.task.service.IArdAppTaskService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
-import org.springframework.web.multipart.MultipartFile;
/**
* app浠诲姟绠＄悊Controller
@@ -46,6 +40,11 @@
public class ArdAppTaskController extends BaseController {
@Autowired
private IArdAppTaskService ardAppTaskService;
+ @Autowired
+ private ISysUserService sysUserService;
+
+ @Autowired
+ private ISysDeptService sysDeptService;
/**
@@ -180,4 +179,40 @@
return success(ardAppTaskService.likeWell(wellParam));
}
+ @ApiOperation("鎸囨尌绔�-鏌ヨ鏍戝舰缁勭粐鏋舵瀯")
+ @GetMapping(value = "/treeDept")
+ public AjaxResult treeDept() {
+ //鏌ヨ鐢ㄦ埛ID
+ String usersId = SecurityUtils.getUserId();
+ //鏍规嵁userId鏌ヨ閮ㄩ棬Id
+ SysUser sysUser = sysUserService.selectUserById(usersId);
+ //鏍规嵁褰撳墠deptId鎴栬�呭綋鍓嶅強鎵�灞炰笅绾х殑鎵�鏈塪eptId
+ List<Long> deptList = sysDeptService.deptIdBySub(sysUser.getDeptId());
+ //鏌ヨ鎵�鏈夐儴闂ㄤ俊鎭�
+ List<SysDept> sysDeptList = sysDeptService.allByUser(deptList);
+ List<DeptUserTree> deptUserTrees = new ArrayList<>();
+ for (int i = 0; i < sysDeptList.size(); i++) {
+ SysDept sysDept = sysDeptList.get(i);
+ DeptUserTree deptUserTree = new DeptUserTree();
+ deptUserTree.setAncestors(sysDept.getAncestors());
+ deptUserTree.setDeptId(sysDept.getDeptId());
+ deptUserTree.setDeptName(sysDept.getDeptName());
+ deptUserTree.setParentId(sysDept.getParentId());
+ deptUserTrees.add(deptUserTree);
+ QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("dept_id",sysDept.getDeptId());
+ List<SysUser> users = sysUserService.userByDept(sysDept.getDeptId());
+ for (int j = 0; j < users.size(); j++) {
+ SysUser user = users.get(j);
+ DeptUserTree deptUserTree1 = new DeptUserTree();
+ deptUserTree1.setDeptId(user.getDeptId());
+ deptUserTree1.setUserId(user.getUserId());
+ deptUserTree1.setNickName(user.getNickName());
+ deptUserTree1.setParentId(user.getDeptId());
+ deptUserTrees.add(deptUserTree1);
+ }
+ }
+ return success(sysDeptService.deptUserTree(deptUserTrees));
+ }
+
}
--
Gitblit v1.9.3