计量单位字典代码提交

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);
+    }
+
+
+
 }

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;
+}

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();
 }

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;
+    }
 }