From 1f712d545d8cfd4e9dac74d22a67ebf599df1577 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 06 十月 2023 11:24:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/plan/controller/ArdEplanController.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/plan/controller/ArdEplanController.java b/ard-work/src/main/java/com/ruoyi/plan/controller/ArdEplanController.java
index 2d4feae..fb6bd28 100644
--- a/ard-work/src/main/java/com/ruoyi/plan/controller/ArdEplanController.java
+++ b/ard-work/src/main/java/com/ruoyi/plan/controller/ArdEplanController.java
@@ -107,11 +107,37 @@
/**
* 鑾峰彇搴旀�ラ妗堣缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('plan:eplan:query')")
+ /*@PreAuthorize("@ss.hasPermi('plan:eplan:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id)
{
return success(ardEplanService.selectArdEplanById(id));
+ }*/
+ @PreAuthorize("@ss.hasPermi('plan:eplan:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") String id)
+ {
+ ArdEplan result = ardEplanService.selectArdEplanById(id);
+ Map<String,Object> map = new HashMap();
+ map.put("id",result.getId());
+ map.put("name",result.getName());
+ map.put("time",result.getTime());
+ String info = result.getInfo();
+ String[] infoArr = info.split(";");
+ List<Map<String,String>> infoList = new ArrayList();
+ for(String str : infoArr){
+ Map<String,String> infoMap = new HashMap();
+ infoMap.put("longitude",str.split(",")[0]);
+ infoMap.put("latitude",str.split(",")[1]);
+ infoMap.put("altitude",str.split(",")[2]);
+ infoMap.put("text",str.split(",")[3]);
+ infoList.add(infoMap);
+ }
+ map.put("obj",infoList);
+ map.put("userId",result.getUserId());
+ map.put("deptId",result.getDeptId());
+ map.put("createBy",result.getCreateBy());
+ return success(map);
}
/**
@@ -174,6 +200,10 @@
@PutMapping
public AjaxResult edit(@RequestBody Map<String,Object> para)
{
+ ArdEplan result = ardEplanService.selectArdEplanById((String) para.get("id"));
+ if(!result.getDeptId().equals(String.valueOf((Integer) para.get("deptId")))){
+ return toAjax(0);//闈炴湰閮ㄩ棬棰勬鏃犳硶鏇存敼
+ }
ArdEplan ardEplan = new ArdEplan();
ardEplan.setId((String) para.get("id"));
ardEplan.setName((String) para.get("name"));
@@ -209,6 +239,12 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids)
{
+ ArdEplan result = ardEplanService.selectArdEplanById(ids[0]);
+ String userId = SecurityUtils.getUserId();
+ SysUser sysUser = userService.selectUserById(userId);
+ if(!result.getDeptId().equals(String.valueOf(sysUser.getDeptId()))){
+ return toAjax(0);//闈炴湰閮ㄩ棬棰勬鏃犳硶鍒犻櫎
+ }
return toAjax(ardEplanService.deleteArdEplanByIds(ids));
}
}
--
Gitblit v1.9.3