From c8aaafaaf4b6ff674149db115a97e40ead5927bf Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 08 七月 2024 16:57:00 +0800
Subject: [PATCH] 车辆挂接电磁锁bug修改提交
---
ard-work/src/main/java/com/ruoyi/plan/controller/ArdEplanController.java | 55 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 14 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..6e8904a 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
@@ -64,12 +64,7 @@
{
startPage();
List<ArdEplan> list = ardEplanService.selectArdEplanList(ardEplan);
- List<Map<String,Object>> result = new ArrayList();
for(ArdEplan para : list){
- Map<String,Object> map = new HashMap();
- map.put("id",para.getId());
- map.put("name",para.getName());
- map.put("time",para.getTime());
String info = para.getInfo();
String[] infoArr = info.split(";");
List<Map<String,String>> infoList = new ArrayList();
@@ -81,20 +76,16 @@
infoMap.put("text",str.split(",")[3]);
infoList.add(infoMap);
}
- map.put("obj",infoList);
- map.put("userId",para.getUserId());
- map.put("deptId",para.getDeptId());
- map.put("createBy",para.getCreateBy());
- result.add(map);
+ para.setInfoList(infoList);
}
- return getDataTable(result);
+ return getDataTable(list);
}
/**
* 瀵煎嚭搴旀�ラ妗堝垪琛�
*/
- @PreAuthorize("@ss.hasPermi('plan:eplan:export')")
+ /*@PreAuthorize("@ss.hasPermi('plan:eplan:export')")
@Log(title = "搴旀�ラ妗�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ArdEplan ardEplan)
@@ -102,16 +93,42 @@
List<ArdEplan> list = ardEplanService.selectArdEplanList(ardEplan);
ExcelUtil<ArdEplan> util = new ExcelUtil<ArdEplan>(ArdEplan.class);
util.exportExcel(response, list, "搴旀�ラ妗堟暟鎹�");
- }
+ }*/
/**
* 鑾峰彇搴旀�ラ妗堣缁嗕俊鎭�
*/
- @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 +191,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 +230,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