Merge remote-tracking branch 'origin/dev' into dev

wangqian
2 parents ae00707d 439339f0
Showing 7 changed files with 110 additions and 20 deletions
pom.xml
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/SysRoadRespVO.java
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/DeptController.java
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/vo/dept/SysDeptRespVO.java
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/appmodule/AppModuleServiceImpl.java
urbanops-server/pom.xml
@@ -20,13 +20,13 @@
         <module>urbanops-module-workorder</module>
 <!--        <module>urbanops-module-member</module>-->
         <module>urbanops-module-bpm</module>
-        <module>urbanops-module-report</module>
+<!--        <module>urbanops-module-report</module>-->
         <module>urbanops-module-api</module>
 <!--        <module>urbanops-module-mp</module>-->
 <!--        <module>urbanops-module-pay</module>-->
 <!--        <module>urbanops-module-mall</module>-->
 <!--        <module>urbanops-module-crm</module>-->
-        <module>urbanops-module-erp</module>
+<!--        <module>urbanops-module-erp</module>-->
 <!--        <module>urbanops-module-ai</module>-->
 <!--        <module>urbanops-module-iot</module>-->
     </modules>
@@ -14,6 +14,7 @@ import jakarta.validation.*;
 import jakarta.servlet.http.*;
 import java.util.*;
 import java.io.IOException;
+import java.util.stream.Collectors;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
@@ -121,4 +122,21 @@ public class RoadController {
                         BeanUtils.toBean(list, RoadRespVO.class));
     }
-}
 \ No newline at end of file
+    @Operation(summary = "物联网查询道路")
+    @GetMapping("/queryAllRoadList")
+    public CommonResult<List<SysRoadRespVO>> queryAllRoadList(@RequestParam(required = false)String roadName,@RequestParam(required = false)String deptCode,@RequestParam(required = false)String companyCode) {
+        RoadListReqVO reqVO = new RoadListReqVO();
+        reqVO.setRoadName(roadName);
+        reqVO.setCompanyId(Long.valueOf(deptCode));
+        reqVO.setBusiLine(companyCode);
+        List<RoadDO> roadList = roadService.getRoadList(reqVO);
+        List<SysRoadRespVO> deptResps = roadList.stream().map(manager -> {
+            SysRoadRespVO sysDeptResp = new SysRoadRespVO();
+            sysDeptResp.setRoadCode(manager.getId()+"");
+            sysDeptResp.setRoadName(manager.getRoadName());
+            return sysDeptResp;
+        }).collect(Collectors.toList());
+        return success(deptResps);
+    }
+
+}
+package com.zteits.urbanops.module.garden.controller.admin.road.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * @author smartiot
+ * @date 2025-07-22
+ */
+@Data
+public class SysRoadRespVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编码
+     */
+    private String roadCode;
+
+    /**
+     * 名称
+     */
+    private String roadName;
+}
@@ -4,11 +4,7 @@ package com.zteits.urbanops.module.system.controller.admin.dept;
 import com.zteits.urbanops.framework.common.enums.CommonStatusEnum;
 import com.zteits.urbanops.framework.common.pojo.CommonResult;
 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
-import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO;
-import com.zteits.urbanops.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
-import com.zteits.urbanops.module.system.controller.admin.dept.vo.dept.DeptRespVO;
-import com.zteits.urbanops.module.system.controller.admin.dept.vo.dept.DeptSaveReqVO;
-import com.zteits.urbanops.module.system.controller.admin.dept.vo.dept.DeptSimpleRespVO;
+import com.zteits.urbanops.module.system.controller.admin.dept.vo.dept.*;
 import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
 import com.zteits.urbanops.module.system.service.dept.DeptService;
 import com.zteits.urbanops.module.system.util.tree.Dept;
@@ -22,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import java.util.List;
+import java.util.stream.Collectors;
 import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
@@ -125,4 +122,20 @@ public class DeptController {
         return success(list);
     }
+    @Operation(summary = "查询所有组织")
+    @GetMapping("/queryAllDeptList")
+    public CommonResult<List<SysDeptRespVO>>  queryAllDeptList(@RequestParam(required = false)String companyCode) {
+        List<DeptDO> sysDepts = deptService.getSubDeptAllList();
+        List<SysDeptRespVO> deptResps = sysDepts.stream().map(sysDept -> {
+            SysDeptRespVO sysDeptResp = new SysDeptRespVO();
+            sysDeptResp.setDeptCode(sysDept.getId()+"");
+            sysDeptResp.setDeptName(sysDept.getName());
+            sysDeptResp.setParentDeptCode(sysDept.getParentId()+"");
+            sysDeptResp.setOrderNum(sysDept.getSort());
+            sysDeptResp.setStatus(sysDept.getStatus().toString());
+            return sysDeptResp;
+        }).collect(Collectors.toList());
+        return success(deptResps);
+    }
+
 }
+package com.zteits.urbanops.module.system.controller.admin.dept.vo.dept;
+
+import lombok.Data;
+
+/**
+ * @since 2025-07-26
+ */
+@Data
+public class SysDeptRespVO {
+    /**
+     * 部门编码
+     */
+    private String deptCode;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 父部门编码
+     */
+    private String parentDeptCode;
+
+    /**
+     * 显示顺序
+     */
+    private Integer orderNum;
+
+    /**
+     * 部门状态（0正常 1停用）
+     */
+    private String status;
+}
@@ -56,7 +56,7 @@ public class AppModuleServiceImpl implements AppModuleService {
         // 校验父模块存在
         validateParentModule(createReqVO.getParentId(), null);
         // 校验模块名称唯一性
-        validateModuleName(createReqVO.getParentId(), createReqVO.getName(), null);
+//        validateModuleName(createReqVO.getParentId(), createReqVO.getName(), null);
         // 插入到数据库
         AppModuleDO module = BeanUtils.toBean(createReqVO, AppModuleDO.class);
@@ -75,7 +75,7 @@ public class AppModuleServiceImpl implements AppModuleService {
         // 校验父模块存在
         validateParentModule(updateReqVO.getParentId(), updateReqVO.getId());
         // 校验模块名称唯一性
-        validateModuleName(updateReqVO.getParentId(), updateReqVO.getName(), updateReqVO.getId());
+//        validateModuleName(updateReqVO.getParentId(), updateReqVO.getName(), updateReqVO.getId());
         // 更新到数据库
         AppModuleDO updateObj = BeanUtils.toBean(updateReqVO, AppModuleDO.class);
@@ -58,11 +58,11 @@
 <!--        </dependency>-->
         <!-- 数据报表。默认注释，保证编译速度 -->
-        <dependency>
-            <groupId>com.zteits.boot</groupId>
-            <artifactId>urbanops-module-report</artifactId>
-            <version>${revision}</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.zteits.boot</groupId>-->
+<!--            <artifactId>urbanops-module-report</artifactId>-->
+<!--            <version>${revision}</version>-->
+<!--        </dependency>-->
         <!-- 工作流。默认注释，保证编译速度 -->
         <dependency>
             <groupId>com.zteits.boot</groupId>
@@ -113,11 +113,11 @@
 <!--        </dependency>-->
         <!-- ERP 相关模块。默认注释，保证编译速度 -->
-        <dependency>
-            <groupId>com.zteits.boot</groupId>
-            <artifactId>urbanops-module-erp</artifactId>
-            <version>${revision}</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.zteits.boot</groupId>-->
+<!--            <artifactId>urbanops-module-erp</artifactId>-->
+<!--            <version>${revision}</version>-->
+<!--        </dependency>-->
         <!-- AI 大模型相关模块。默认注释，保证编译速度 -->
 <!--        <dependency>-->