From 05248ded0723bf87f6f7b815d1f0adbbfc7795c7 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期一, 07 八月 2023 16:20:33 +0800
Subject: [PATCH] 巡检计划修改
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java | 83 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 72 insertions(+), 11 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
index c9054d5..18d3b7e 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
@@ -1,15 +1,24 @@
package com.ruoyi.app.patrolplan.controller;
import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
+import com.ruoyi.alarmpoints.well.service.IArdAlarmpointsWellService;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpoint;
import com.ruoyi.app.patrolplan.service.IArdAppPatrolpointService;
import com.ruoyi.app.patrolplan.service.IArdAppPatroluserService;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -53,6 +62,15 @@
@Resource
IArdAppPatroluserService ardAppPatroluserService;
+ @Resource
+ ISysUserService sysUserService;
+
+ @Resource
+ ISysDeptService sysDeptService;
+
+ @Resource
+ IArdAlarmpointsWellService wellService;
+
/**
* 鏌ヨapp宸℃璁″垝鍒楄〃
*/
@@ -61,6 +79,14 @@
@ApiOperation("鏌ヨ鍏ㄩ儴宸℃鍒楄〃鍙婃悳绱㈢瓫閫�")
public Results list(ArdAppPatrolplan ardAppPatrolplan)
{
+ String userId = SecurityUtils.getUserId();
+ ardAppPatrolplan.setUserId(userId);
+ if(ardAppPatrolplan.getPageNum()==null || ardAppPatrolplan.getPageNum() == 0){
+ ardAppPatrolplan.setPageNum(1);
+ }
+ if(ardAppPatrolplan.getPageSize()==null || ardAppPatrolplan.getPageSize() == 0){
+ ardAppPatrolplan.setPageSize(10);
+ }
PageHelper.startPage(ardAppPatrolplan.getPageNum(),ardAppPatrolplan.getPageSize());
List<ArdAppPatrolplan> list = ardAppPatrolplanService.selectArdAppPatrolplanList(ardAppPatrolplan);
return Results.succeed(new PageInfo<>(list));
@@ -96,7 +122,7 @@
*/
@PreAuthorize("@ss.hasPermi('app:appPatrolplan:userByPlanId')")
@GetMapping(value = "userByPlanId/{id}")
- @ApiOperation("鏍规嵁宸℃ID鏌ヨ宸℃浜�")
+ @ApiOperation("鏍规嵁宸℃ID鏌ヨ宸℃浜哄憳")
public Results userByPlanId(@PathVariable String id)
{
return ardAppPatroluserService.userByPlanId(id);
@@ -109,21 +135,54 @@
@Log(title = "app宸℃璁″垝", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
@ApiOperation("鍒犻櫎app宸℃璁″垝")
- public Results remove(@PathVariable String id)
+ //public Results remove(@PathVariable String id)
+ public AjaxResult remove(@PathVariable String id)
{
- return ardAppPatrolplanService.deleteArdApp(id);
+ //return ardAppPatrolplanService.deleteArdApp(id);
+ return toAjax(ardAppPatrolplanService.deleteArdApp(id));
}
+ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:allPlanUser')")
+ @PostMapping("allPlanUser")
+ @ApiOperation("鏌ヨ鏉冮檺涓嬪叏閮ㄤ汉鍛樺拰鍏磋叮鐐�")
+ public Results allPlanUser()
+ {
+ JSONObject jsonObject = new JSONObject();
+ String userId = SecurityUtils.getUserId();
+ //鏍规嵁userId鏌ヨ閮ㄩ棬Id
+ SysUser sysUser = sysUserService.selectUserById(userId);
+ //鏍规嵁褰撳墠deptId鎴栬�呭綋鍓嶅強鎵�灞炰笅绾х殑鎵�鏈塪eptId
+ List<Long> deptList = sysDeptService.deptIdBySub(sysUser.getDeptId());
+ //鏍规嵁deptId鍒楄〃鑾峰彇鍒版墍鏈夌敤鎴�
+ List<SysUser> sysUserList = sysUserService.userByDeptList(deptList);
+ jsonObject.put("user",sysUserList);
+ //鏍规嵁deptId鍒楄〃鑾峰彇鍒版墍鏈夊叴瓒ｇ偣
+ List<ArdAlarmpointsWell> wellList = wellService.wellByDeptList(deptList);
+ jsonObject.put("well",wellList);
+ return Results.succeed(jsonObject);
+ }
/**
- * 鏂板app宸℃璁″垝
+ * 鏂板app宸℃璁″垝鍙婁汉鍛樼偣浣�
*/
- @PreAuthorize("@ss.hasPermi('app:appPatrolplan:add')")
+ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:insertArdAppPatrolplan')")
@Log(title = "app宸℃璁″垝", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody ArdAppPatrolplan ardAppPatrolplan)
+ @PostMapping("/insertArdAppPatrolplan")
+ @ApiOperation("鏂板app宸℃璁″垝鍙婁汉鍛樼偣浣�")
+ public AjaxResult addArdAppPatrolplan(@RequestBody Map<String,Object> para)
{
- return toAjax(ardAppPatrolplanService.insertArdAppPatrolplan(ardAppPatrolplan));
+ return toAjax(ardAppPatrolplanService.insertArdAppPatrolplan(para));
+ }
+
+ /**
+ * 鏌ヨ鍗曟潯鏁版嵁
+ */
+ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:oneById')")
+ @PostMapping("/oneById/{id}")
+ @ApiOperation("鏌ヨ鍗曟潯鏁版嵁")
+ public Results oneById(@PathVariable String id)
+ {
+ return ardAppPatrolplanService.oneById(id);
}
/**
@@ -131,10 +190,12 @@
*/
@PreAuthorize("@ss.hasPermi('app:appPatrolplan:edit')")
@Log(title = "app宸℃璁″垝", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody ArdAppPatrolplan ardAppPatrolplan)
+ @ApiOperation("淇敼鍗曟潯鏁版嵁")
+ @PutMapping("upd")
+ public Results edit(@RequestBody Map<String,Object> para)
{
- return toAjax(ardAppPatrolplanService.updateArdAppPatrolplan(ardAppPatrolplan));
+ return ardAppPatrolplanService.updateArdAppPatrolplan(para);
}
+
}
--
Gitblit v1.9.3