From b14972c333b5cb95eafbc1e60c9908dcf2576c76 Mon Sep 17 00:00:00 2001
From: xiachao <xiachao@qq.com>
Date: Tue, 24 Sep 2024 15:01:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E9=87=8F=E5=8D=95=E4=BD=8D=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/IotCarbonUnitDictController.java   | 13 ++++++++++++-
 .../carbontrack/dict/dto/IotCarbonUnitDto.java    | 14 ++++++++++++++
 .../dict/service/IotCarbonUnitDictService.java    |  3 +++
 .../impl/IotCarbonUnitDictServiceImpl.java        | 15 +++++++++++++++
 4 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 modules/carbon-track/src/main/java/com/thing/carbontrack/dict/dto/IotCarbonUnitDto.java

diff --git a/modules/carbon-track/src/main/java/com/thing/carbontrack/dict/controller/IotCarbonUnitDictController.java b/modules/carbon-track/src/main/java/com/thing/carbontrack/dict/controller/IotCarbonUnitDictController.java
index d4ee3c4..84bb9be 100644
--- a/modules/carbon-track/src/main/java/com/thing/carbontrack/dict/controller/IotCarbonUnitDictController.java
+++ b/modules/carbon-track/src/main/java/com/thing/carbontrack/dict/controller/IotCarbonUnitDictController.java
@@ -1,5 +1,6 @@
 package com.thing.carbontrack.dict.controller;
 
+import com.thing.carbontrack.dict.dto.IotCarbonUnitDto;
 import com.thing.carbontrack.dict.service.IotCarbonUnitDictService;
 import com.thing.common.core.web.response.Result;
 import io.swagger.v3.oas.annotations.Operation;
@@ -19,7 +20,7 @@ import java.util.List;
 * @since 3.0 2024-09-23
 */
 @RestController
-@RequestMapping("v2/dict/iotcarbonunitdict")
+@RequestMapping("v2/carbonDict")
 @Tag(name="计量单位字典")
 @RequiredArgsConstructor
 public class IotCarbonUnitDictController {
@@ -44,4 +45,14 @@ public class IotCarbonUnitDictController {
     }
 
 
+
+    @GetMapping("listInfo")
+    @Operation(summary="树结构列表")
+    public Result<List<IotCarbonUnitDto>> listInfo(){
+        List<IotCarbonUnitDto> info = iotCarbonUnitDictService.listInfo();
+        return new Result< List<IotCarbonUnitDto>>().ok(info);
+    }
+
+
+
 }
\ No newline at end of file
diff --git a/modules/carbon-track/src/main/java/com/thing/carbontrack/dict/dto/IotCarbonUnitDto.java b/modules/carbon-track/src/main/java/com/thing/carbontrack/dict/dto/IotCarbonUnitDto.java
new file mode 100644
index 0000000..7d99d9a
--- /dev/null
+++ b/modules/carbon-track/src/main/java/com/thing/carbontrack/dict/dto/IotCarbonUnitDto.java
@@ -0,0 +1,14 @@
+package com.thing.carbontrack.dict.dto;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class IotCarbonUnitDto {
+
+    private String pNAME;
+
+    private List<String> cList;
+}
diff --git a/modules/carbon-track/src/main/java/com/thing/carbontrack/dict/service/IotCarbonUnitDictService.java b/modules/carbon-track/src/main/java/com/thing/carbontrack/dict/service/IotCarbonUnitDictService.java
index 4dbcba5..548aea4 100644
--- a/modules/carbon-track/src/main/java/com/thing/carbontrack/dict/service/IotCarbonUnitDictService.java
+++ b/modules/carbon-track/src/main/java/com/thing/carbontrack/dict/service/IotCarbonUnitDictService.java
@@ -1,5 +1,6 @@
 package com.thing.carbontrack.dict.service;
 
+import com.thing.carbontrack.dict.dto.IotCarbonUnitDto;
 import com.thing.carbontrack.dict.entity.IotCarbonUnitDictEntity;
 import com.thing.common.orm.service.IBaseService;
 
@@ -16,4 +17,6 @@ public interface IotCarbonUnitDictService extends IBaseService<IotCarbonUnitDict
     List<String> getList();
 
     List<String> listByPName(String pName);
+
+    List<IotCarbonUnitDto> listInfo();
 }
\ No newline at end of file
diff --git a/modules/carbon-track/src/main/java/com/thing/carbontrack/dict/service/impl/IotCarbonUnitDictServiceImpl.java b/modules/carbon-track/src/main/java/com/thing/carbontrack/dict/service/impl/IotCarbonUnitDictServiceImpl.java
index e94edaa..a77a521 100644
--- a/modules/carbon-track/src/main/java/com/thing/carbontrack/dict/service/impl/IotCarbonUnitDictServiceImpl.java
+++ b/modules/carbon-track/src/main/java/com/thing/carbontrack/dict/service/impl/IotCarbonUnitDictServiceImpl.java
@@ -2,12 +2,14 @@ package com.thing.carbontrack.dict.service.impl;
 
 import com.mybatisflex.core.query.QueryColumn;
 import com.mybatisflex.core.query.QueryWrapper;
+import com.thing.carbontrack.dict.dto.IotCarbonUnitDto;
 import com.thing.carbontrack.dict.entity.IotCarbonUnitDictEntity;
 import com.thing.carbontrack.dict.mapper.IotCarbonUnitDictMapper;
 import com.thing.carbontrack.dict.service.IotCarbonUnitDictService;
 import com.thing.common.orm.service.impl.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -47,4 +49,17 @@ public class IotCarbonUnitDictServiceImpl extends BaseServiceImpl<IotCarbonUnitD
         wrapper.eq("p_name",pName);
         return this.listAs(wrapper,String.class);
     }
+
+    @Override
+    public List<IotCarbonUnitDto> listInfo() {
+        List<IotCarbonUnitDto> resultList = new ArrayList<>();
+        List<String> pNames = this.getList();
+        pNames.forEach(temp->{
+            IotCarbonUnitDto dto = new IotCarbonUnitDto();
+            dto.setPNAME(temp);
+            dto.setCList(this.listByPName(temp));
+            resultList.add(dto);
+        });
+        return resultList;
+    }
 }
\ No newline at end of file