From 97be33990c1a082e5e55b33b8b88bb7360537d54 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 21 九月 2023 13:49:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java | 84 +++++++++++++++---------------------------
1 files changed, 30 insertions(+), 54 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java b/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java
index 1f3aab1..9fd511f 100644
--- a/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java
+++ b/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java
@@ -61,6 +61,7 @@
@ApiOperation("鏍规嵁鏉冮檺鑾峰彇璁惧鍒楄〃")
@GetMapping("getEquipmentListByUser")
public Results getEquipmentListByUser(){
+ //鏌ヨ鐢ㄦ埛ID
String usersId = SecurityUtils.getUserId();
//鏍规嵁userId鏌ヨ閮ㄩ棬Id
SysUser sysUser = sysUserService.selectUserById(usersId);
@@ -77,13 +78,10 @@
return Results.succeed("娌℃湁璁惧淇℃伅");
}
Map<String, Object> mapResult = (Map<String, Object>) JSON.parse((String) result);
- JSONArray jsonArray = new JSONArray();
- //ancestors瀛楁鏈�闀跨殑鏁版嵁
- String longest = "";
//绛夌骇
int count0 = 0,count1 = 0,count2 = 0;
//瑁呮暟鎹�
- List<HealthVo> healthVos = new ArrayList<>();
+ List<TreeDeptWell> treeDeptWells = new ArrayList<>();
if ((int) mapResult.get("code") == 200) {
List<Map<String, Object>> listResult = (List<Map<String, Object>>) JSON.parse((String) mapResult.get("resdata"));
//寰幆寰楀埌鏉冮檺涓嬪尮閰嶆暟鎹�
@@ -91,27 +89,25 @@
String equipNumber = (String) listResult.get(i).get("EquipNumber");
if(equipNumber!=null){
for (int j = 0; j < list.size(); j++) {
- String ancestors = list.get(j).getAncestors();
- if (ancestors.length() > longest.length()) {
- longest = ancestors;
- }
String wellId = list.get(j).getWellId();
if(wellId!=null){
if(wellId.equals(equipNumber)){
//杩斿洖璁惧鏁版嵁
- HealthVo healthVo = new HealthVo();
- healthVo.setId((Integer) listResult.get(i).get("id"));
- healthVo.setEquipName((String) listResult.get(i).get("EquipName"));
- healthVo.setEquipNumber((String) listResult.get(i).get("EquipNumber"));
- healthVo.setEquipLevel((String) listResult.get(i).get("EquipLevel"));
- healthVo.setEquipKey((String) listResult.get(i).get("EquipKey"));
- healthVo.setMeasureDate((String) listResult.get(i).get("MeasureDate"));
- healthVo.setLongitude(list.get(j).getLongitude());
- healthVo.setLatitude(list.get(j).getLatitude());
- healthVo.setAltitude(list.get(j).getAltitude());
- healthVo.setDeptId(list.get(j).getDeptId());
- healthVo.setAncestors(list.get(j).getAncestors());
- healthVos.add(healthVo);
+ TreeDeptWell treeDeptWell = new TreeDeptWell();
+ treeDeptWell.setId((Integer) listResult.get(i).get("id"));
+ treeDeptWell.setEquipName((String) listResult.get(i).get("EquipName"));
+ treeDeptWell.setEquipNumber((String) listResult.get(i).get("EquipNumber"));
+ treeDeptWell.setEquipLevel((String) listResult.get(i).get("EquipLevel"));
+ treeDeptWell.setEquipKey((String) listResult.get(i).get("EquipKey"));
+ treeDeptWell.setMeasureDate((String) listResult.get(i).get("MeasureDate"));
+ treeDeptWell.setLongitude(list.get(j).getLongitude());
+ treeDeptWell.setLatitude(list.get(j).getLatitude());
+ treeDeptWell.setAltitude(list.get(j).getAltitude());
+ treeDeptWell.setDeptId(list.get(j).getDeptId());
+ treeDeptWell.setAncestors(list.get(j).getAncestors());
+ treeDeptWell.setParentId(list.get(j).getParentId());
+ treeDeptWell.setDeptName(list.get(j).getDeptName());
+ treeDeptWells.add(treeDeptWell);
if(listResult.get(i).get("EquipLevel").equals("0")){
count0++;
}else if(listResult.get(i).get("EquipLevel").equals("1")){
@@ -142,42 +138,34 @@
}
}
//鎶婇儴闂ㄥ眰绾у拰鏁版嵁缁撳悎
- List<TreeDeptWell> treeDeptWells = new ArrayList<>();
+// List<TreeDeptWell> treeDeptWells = new ArrayList<>();
for (int i = 0; i < sysDepts.size(); i++) {
+ //閮ㄩ棬ID
SysDept sysDept = sysDepts.get(i);
Long deptId = sysDept.getDeptId();
- List<HealthVo> deptHealths = new ArrayList<>();
- for (int j = 0; j < healthVos.size(); j++) {
- HealthVo healthVo = healthVos.get(j);
+ for (int j = 0; j < treeDeptWells.size(); j++) {
+ //璁惧鐨勯儴闂↖D
+ TreeDeptWell healthVo = treeDeptWells.get(j);
Long healthDeptId = healthVo.getDeptId();
if(deptId.equals(healthDeptId)){
- deptHealths.add(healthVo);
//鐖剁骇缁撴瀯璧嬪��
String thisAncestors = healthVo.getAncestors();
List<String> ancestorsA = Arrays.asList(thisAncestors.split(","));
ancestorsA.removeAll(userParentId);
-// for (int k = 0; k < userParentId.size(); k++) {
-// String a = userParentId.get(k);
-// for (int l = 0; l < ancestorsA.size(); l++) {
-// String b = ancestorsA.get(l);
-// if(a.equals(b)){
-// ancestorsA.remove(b);
-// }
-// }
-// }
for (int k = 0; k < ancestorsA.size(); k++) {
Long ancestor = Long.parseLong(ancestorsA.get(k));
//寰幆鏈�缁圠ist鍒ゆ柇鏄惁鏈夎鏁版嵁鐨勭埗绾э紝濡傛灉娌℃湁灏卞～杩涘幓
boolean wellTrue = false;
if(ancestor==0){
+ //鐖剁被闆嗗悎涓�0鍒欐槸鏈�椤剁骇涓婇潰娌℃湁
wellTrue = true;
}else {
- if(treeDeptWells.size()>0){
- for (int l = 0; l < treeDeptWells.size(); l++) {
- Long treeId = treeDeptWells.get(l).getDeptId();
- if(ancestor.equals(treeId)){
- wellTrue = true;
- }
+ for (int l = 0; l < treeDeptWells.size(); l++) {
+ //濡傛灉璇ョ埗绫婚泦鍚堝湪缁撴瀯涓凡缁忓瓨鍦ㄥ苟涓斾笉鏄澶囨暟鎹氨涓嶇敤閲嶅娣诲姞浜�
+ Long treeId = treeDeptWells.get(l).getDeptId();
+ Integer id = treeDeptWells.get(l).getId();
+ if(ancestor.equals(treeId) && id==null){
+ wellTrue = true;
}
}
}
@@ -187,26 +175,14 @@
treeDeptWell.setDeptId(ancestor);
treeDeptWell.setAncestors(sysDept1.getAncestors());
treeDeptWell.setDeptName(sysDept1.getDeptName());
- treeDeptWell.setOrderNum(sysDept1.getOrderNum());
treeDeptWell.setParentId(sysDept1.getParentId());
treeDeptWells.add(treeDeptWell);
}
}
}
}
- if(deptHealths.size()>0){
- //鏈夎澶囧睍绀�
- TreeDeptWell treeDeptWell = new TreeDeptWell();
- treeDeptWell.setDeptId(deptId);
- treeDeptWell.setAncestors(sysDept.getAncestors());
- treeDeptWell.setDeptName(sysDept.getDeptName());
- treeDeptWell.setOrderNum(sysDept.getOrderNum());
- treeDeptWell.setParentId(sysDept.getParentId());
- treeDeptWell.setWell(deptHealths);
- treeDeptWells.add(treeDeptWell);
- }
}
- List<TreeSelectWell> tree = sysDeptService.wellTree(treeDeptWells);
+ List<TreeDeptWell> tree = sysDeptService.wellTree(treeDeptWells);
TreeSelectWellJson treeSelectWellJson = new TreeSelectWellJson();
treeSelectWellJson.setWellList(tree);
treeSelectWellJson.setCount0(count0);
--
Gitblit v1.9.3