From de3d8be611f31118ae5dee533d22bb054670d21b Mon Sep 17 00:00:00 2001
From: 艾金辉 <1144154118@qq.com>
Date: 星期一, 24 七月 2023 12:45:46 +0800
Subject: [PATCH] mybatisplus
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
index 71d6c11..c6a6492 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
@@ -1,15 +1,14 @@
package com.ruoyi.sy.controller;
-import java.text.Collator;
-import java.util.*;
import java.util.*;
import javax.annotation.PostConstruct;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.client.ARDCarGPSLogInClient;
import com.ruoyi.client.ARDCarSYGPSClient;
+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.uuid.IdUtils;
import com.ruoyi.sy.domain.ArdSyUser;
@@ -60,6 +59,12 @@
@Autowired
private IArdSyUserService iArdSyUserService;
+
+ @Autowired
+ private ISysUserService sysUserService;
+
+ @Autowired
+ private ISysDeptService sysDeptService;
private ArdSyCarController ardSyCarController;
@@ -388,13 +393,31 @@
break;
}
}
-// for(Map<String,String> m : list0){
-// for(Map<String,String> ma : list1){
+ //鏍规嵁userId鏌ヨ閮ㄩ棬Id
+ SysUser sysUser = sysUserService.selectUserById(usersId);
+ Long deptId = sysUser.getDeptId();
+ //鏍规嵁褰撳墠deptId鎴栬�呭綋鍓嶅強鎵�灞炰笅绾х殑鎵�鏈塪eptId
+ List<Long> deptList = sysDeptService.deptIdBySub(deptId);
+ //鏍规嵁dept闆嗗悎鏌ヨ鍑烘墍鏈夊搴旂殑杞﹁締鍒楄〃
+ List<ArdSyCar> carList = ardSyCarService.carIdByDeptList(deptList);
+ //瀵规瘮鎶婂尮閰嶅埌鐨勬暟鎹坊鍔犲埌list涓�
+ for(Map<String,String> m : list){
+ String carId = m.get("carId");
+ for (int i = 0; i < carList.size(); i++) {
+ ArdSyCar ardSyCar = carList.get(i);
+ if(carId.equals(ardSyCar.getCarId())){
+ m.put("carModel",ardSyCar.getCarModel());
+ m.put("carTypeArd",ardSyCar.getCarType());
+ m.put("carBrand",ardSyCar.getCarBrand());
+ m.put("carPicture",ardSyCar.getCarPicture());
+ }
+ }
+// for(Map<String,String> ma :){
// if(m.get("carId").equals(ma.get("carId"))){
// m.put("stateCn", ma.get("carState"));
// }
// }
-// }
+ }
// Collections.sort((List)result0.get("list"),new Comparator<Map<String, Object>>() {
// @Override
// public int compare(Map<String, Object> o1, Map<String, Object> o2) {
--
Gitblit v1.9.3