BJ_FS / urbanops

Commit ecdb17f0e7ad98bd350e5fb7c7011dda61e60520

Authored by wangqian
2 parents ae00707d 439339f0

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

Inline Side-by-side
Showing 7 changed files with 110 additions and 20 deletions
... ... @@ -20,13 +20,13 @@
20 20 <module>urbanops-module-workorder</module>
21 21 <!-- <module>urbanops-module-member</module>-->
22 22 <module>urbanops-module-bpm</module>
23   - <module>urbanops-module-report</module>
  23 +<!-- <module>urbanops-module-report</module>-->
24 24 <module>urbanops-module-api</module>
25 25 <!-- <module>urbanops-module-mp</module>-->
26 26 <!-- <module>urbanops-module-pay</module>-->
27 27 <!-- <module>urbanops-module-mall</module>-->
28 28 <!-- <module>urbanops-module-crm</module>-->
29   - <module>urbanops-module-erp</module>
  29 +<!-- <module>urbanops-module-erp</module>-->
30 30 <!-- <module>urbanops-module-ai</module>-->
31 31 <!-- <module>urbanops-module-iot</module>-->
32 32 </modules>
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java
  View file @ecdb17f
... ... @@ -14,6 +14,7 @@ import jakarta.validation.*;
14 14 import jakarta.servlet.http.*;
15 15 import java.util.*;
16 16 import java.io.IOException;
  17 +import java.util.stream.Collectors;
17 18  
18 19 import com.zteits.urbanops.framework.common.pojo.PageParam;
19 20 import com.zteits.urbanops.framework.common.pojo.PageResult;
... ... @@ -121,4 +122,21 @@ public class RoadController {
121 122 BeanUtils.toBean(list, RoadRespVO.class));
122 123 }
123 124  
124   -}
125 125 \ No newline at end of file
  126 + @Operation(summary = "物联网查询道路")
  127 + @GetMapping("/queryAllRoadList")
  128 + public CommonResult<List<SysRoadRespVO>> queryAllRoadList(@RequestParam(required = false)String roadName,@RequestParam(required = false)String deptCode,@RequestParam(required = false)String companyCode) {
  129 + RoadListReqVO reqVO = new RoadListReqVO();
  130 + reqVO.setRoadName(roadName);
  131 + reqVO.setCompanyId(Long.valueOf(deptCode));
  132 + reqVO.setBusiLine(companyCode);
  133 + List<RoadDO> roadList = roadService.getRoadList(reqVO);
  134 + List<SysRoadRespVO> deptResps = roadList.stream().map(manager -> {
  135 + SysRoadRespVO sysDeptResp = new SysRoadRespVO();
  136 + sysDeptResp.setRoadCode(manager.getId()+"");
  137 + sysDeptResp.setRoadName(manager.getRoadName());
  138 + return sysDeptResp;
  139 + }).collect(Collectors.toList());
  140 + return success(deptResps);
  141 + }
  142 +
  143 +}
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/SysRoadRespVO.java 0 → 100644
  View file @ecdb17f
  1 +package com.zteits.urbanops.module.garden.controller.admin.road.vo;
  2 +
  3 +import lombok.Data;
  4 +
  5 +import java.io.Serializable;
  6 +
  7 +/**
  8 + *
  9 + * @author smartiot
  10 + * @date 2025-07-22
  11 + */
  12 +@Data
  13 +public class SysRoadRespVO implements Serializable {
  14 + private static final long serialVersionUID = 1L;
  15 +
  16 + /**
  17 + * 编码
  18 + */
  19 + private String roadCode;
  20 +
  21 + /**
  22 + * 名称
  23 + */
  24 + private String roadName;
  25 +}
... ...
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/DeptController.java
  View file @ecdb17f
... ... @@ -4,11 +4,7 @@ package com.zteits.urbanops.module.system.controller.admin.dept;
4 4 import com.zteits.urbanops.framework.common.enums.CommonStatusEnum;
5 5 import com.zteits.urbanops.framework.common.pojo.CommonResult;
6 6 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
7   -import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO;
8   -import com.zteits.urbanops.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
9   -import com.zteits.urbanops.module.system.controller.admin.dept.vo.dept.DeptRespVO;
10   -import com.zteits.urbanops.module.system.controller.admin.dept.vo.dept.DeptSaveReqVO;
11   -import com.zteits.urbanops.module.system.controller.admin.dept.vo.dept.DeptSimpleRespVO;
  7 +import com.zteits.urbanops.module.system.controller.admin.dept.vo.dept.*;
12 8 import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
13 9 import com.zteits.urbanops.module.system.service.dept.DeptService;
14 10 import com.zteits.urbanops.module.system.util.tree.Dept;
... ... @@ -22,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
22 18 import jakarta.annotation.Resource;
23 19 import jakarta.validation.Valid;
24 20 import java.util.List;
  21 +import java.util.stream.Collectors;
25 22  
26 23 import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
27 24  
... ... @@ -125,4 +122,20 @@ public class DeptController {
125 122 return success(list);
126 123 }
127 124  
  125 + @Operation(summary = "查询所有组织")
  126 + @GetMapping("/queryAllDeptList")
  127 + public CommonResult<List<SysDeptRespVO>> queryAllDeptList(@RequestParam(required = false)String companyCode) {
  128 + List<DeptDO> sysDepts = deptService.getSubDeptAllList();
  129 + List<SysDeptRespVO> deptResps = sysDepts.stream().map(sysDept -> {
  130 + SysDeptRespVO sysDeptResp = new SysDeptRespVO();
  131 + sysDeptResp.setDeptCode(sysDept.getId()+"");
  132 + sysDeptResp.setDeptName(sysDept.getName());
  133 + sysDeptResp.setParentDeptCode(sysDept.getParentId()+"");
  134 + sysDeptResp.setOrderNum(sysDept.getSort());
  135 + sysDeptResp.setStatus(sysDept.getStatus().toString());
  136 + return sysDeptResp;
  137 + }).collect(Collectors.toList());
  138 + return success(deptResps);
  139 + }
  140 +
128 141 }
... ...
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/vo/dept/SysDeptRespVO.java 0 → 100644
  View file @ecdb17f
  1 +package com.zteits.urbanops.module.system.controller.admin.dept.vo.dept;
  2 +
  3 +import lombok.Data;
  4 +
  5 +/**
  6 + * @since 2025-07-26
  7 + */
  8 +@Data
  9 +public class SysDeptRespVO {
  10 + /**
  11 + * 部门编码
  12 + */
  13 + private String deptCode;
  14 +
  15 + /**
  16 + * 部门名称
  17 + */
  18 + private String deptName;
  19 +
  20 + /**
  21 + * 父部门编码
  22 + */
  23 + private String parentDeptCode;
  24 +
  25 + /**
  26 + * 显示顺序
  27 + */
  28 + private Integer orderNum;
  29 +
  30 + /**
  31 + * 部门状态（0正常 1停用）
  32 + */
  33 + private String status;
  34 +}
... ...
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/appmodule/AppModuleServiceImpl.java
  View file @ecdb17f
... ... @@ -56,7 +56,7 @@ public class AppModuleServiceImpl implements AppModuleService {
56 56 // 校验父模块存在
57 57 validateParentModule(createReqVO.getParentId(), null);
58 58 // 校验模块名称唯一性
59   - validateModuleName(createReqVO.getParentId(), createReqVO.getName(), null);
  59 +// validateModuleName(createReqVO.getParentId(), createReqVO.getName(), null);
60 60  
61 61 // 插入到数据库
62 62 AppModuleDO module = BeanUtils.toBean(createReqVO, AppModuleDO.class);
... ... @@ -75,7 +75,7 @@ public class AppModuleServiceImpl implements AppModuleService {
75 75 // 校验父模块存在
76 76 validateParentModule(updateReqVO.getParentId(), updateReqVO.getId());
77 77 // 校验模块名称唯一性
78   - validateModuleName(updateReqVO.getParentId(), updateReqVO.getName(), updateReqVO.getId());
  78 +// validateModuleName(updateReqVO.getParentId(), updateReqVO.getName(), updateReqVO.getId());
79 79  
80 80 // 更新到数据库
81 81 AppModuleDO updateObj = BeanUtils.toBean(updateReqVO, AppModuleDO.class);
... ...
urbanops-server/pom.xml
  View file @ecdb17f
... ... @@ -58,11 +58,11 @@
58 58 <!-- </dependency>-->
59 59  
60 60 <!-- 数据报表。默认注释，保证编译速度 -->
61   - <dependency>
62   - <groupId>com.zteits.boot</groupId>
63   - <artifactId>urbanops-module-report</artifactId>
64   - <version>${revision}</version>
65   - </dependency>
  61 +<!-- <dependency>-->
  62 +<!-- <groupId>com.zteits.boot</groupId>-->
  63 +<!-- <artifactId>urbanops-module-report</artifactId>-->
  64 +<!-- <version>${revision}</version>-->
  65 +<!-- </dependency>-->
66 66 <!-- 工作流。默认注释，保证编译速度 -->
67 67 <dependency>
68 68 <groupId>com.zteits.boot</groupId>
... ... @@ -113,11 +113,11 @@
113 113 <!-- </dependency>-->
114 114  
115 115 <!-- ERP 相关模块。默认注释，保证编译速度 -->
116   - <dependency>
117   - <groupId>com.zteits.boot</groupId>
118   - <artifactId>urbanops-module-erp</artifactId>
119   - <version>${revision}</version>
120   - </dependency>
  116 +<!-- <dependency>-->
  117 +<!-- <groupId>com.zteits.boot</groupId>-->
  118 +<!-- <artifactId>urbanops-module-erp</artifactId>-->
  119 +<!-- <version>${revision}</version>-->
  120 +<!-- </dependency>-->
121 121  
122 122 <!-- AI 大模型相关模块。默认注释，保证编译速度 -->
123 123 <!-- <dependency>-->
... ...