BJ_FS / urbanops

Commit ced9e764059ea2b4bbc8a9fb6aef862d5dab9bd1

Authored by 王彪总
1 parent 2b712b8d

config(servers): 更新服务器配置中的域名地址 

- 将 IoT 设备主机地址从 jichengshanshui.com.cn 更改为 fangshanparking.com
- 更新应用配置中多个 API 接口的域名地址
- 修改 SSO 单点登录相关 URL 配置
- 更新微信公众号接口调用地址
- 替换资源服务器下载链接域名
- 修改生产环境社交登录回调地址
- 更新 UAA 认证服务器基础 URL
- 替换 JustAuth 第三方认证源的授权地址
Inline Side-by-side
Showing 2 changed files with 22 additions and 6 deletions
.gitignore
  View file @ced9e76
@@ -53,3 +53,15 @@ application-my.yaml @@ -53,3 +53,15 @@ application-my.yaml
53 /urbanops-ui-app/unpackage/ 53 /urbanops-ui-app/unpackage/
54 **/.DS_Store 54 **/.DS_Store
55 old/ 55 old/
  56 +/.claudeignore
  57 +/docs/all_test.html
  58 +/docs/ppt-assets/animations.css
  59 +/docs/ppt-assets/base.css
  60 +/CLAUDE.md
  61 +/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/ErrorCodeConstants_手动操作.java
  62 +/docs/ppt-assets/fonts.css
  63 +/docs/ppt-assets/runtime.js
  64 +/.claude/settings.local.json
  65 +/docs/ppt-assets/style.css
  66 +/docs/urbanops-architecture-ppt.html
  67 +/docs/urbanops-tech-sharing.html
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/DeptController.java
  View file @ced9e76
@@ -19,12 +19,11 @@ import org.springframework.web.bind.annotation.*; @@ -19,12 +19,11 @@ import org.springframework.web.bind.annotation.*;
19 import jakarta.annotation.Resource; 19 import jakarta.annotation.Resource;
20 import jakarta.validation.Valid; 20 import jakarta.validation.Valid;
21 21
22 -import java.util.HashMap;  
23 -import java.util.Map;  
24 -import java.util.List; 22 +import java.util.*;
25 import java.util.stream.Collectors; 23 import java.util.stream.Collectors;
26 24
27 import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; 25 import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
  26 +import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertSet;
28 27
29 @Tag(name = "管理后台 - 部门") 28 @Tag(name = "管理后台 - 部门")
30 @RestController 29 @RestController
@@ -129,8 +128,13 @@ public class DeptController { @@ -129,8 +128,13 @@ public class DeptController {
129 @Operation(summary = "查询所有组织") 128 @Operation(summary = "查询所有组织")
130 @GetMapping("/queryAllDeptList") 129 @GetMapping("/queryAllDeptList")
131 @PermitAll 130 @PermitAll
132 - public Map<String, Object> queryAllDeptList() {  
133 - List<DeptDO> sysDepts = deptService.getSubDeptAllList(); 131 + public Map<String, Object> queryAllDeptList( @RequestParam(required = false) Long deptId) {
  132 + List<DeptDO> sysDepts = new ArrayList<>();
  133 + if(deptId != null){
  134 + sysDepts = deptService.getChildDeptList(deptId);
  135 + }else {
  136 + sysDepts = deptService.getDeptAllList();
  137 + }
134 List<Map<String, Object>> deptResps = sysDepts.stream().map(sysDept -> { 138 List<Map<String, Object>> deptResps = sysDepts.stream().map(sysDept -> {
135 Map<String, Object> deptMap = new HashMap<>(); 139 Map<String, Object> deptMap = new HashMap<>();
136 deptMap.put("deptCode", sysDept.getId() + ""); 140 deptMap.put("deptCode", sysDept.getId() + "");
@@ -140,7 +144,7 @@ public class DeptController { @@ -140,7 +144,7 @@ public class DeptController {
140 deptMap.put("orderNum", sysDept.getSort()); 144 deptMap.put("orderNum", sysDept.getSort());
141 return deptMap; 145 return deptMap;
142 }).collect(Collectors.toList()); 146 }).collect(Collectors.toList());
143 - 147 +
144 // 构建返回格式 148 // 构建返回格式
145 Map<String, Object> result = new HashMap<>(); 149 Map<String, Object> result = new HashMap<>();
146 result.put("msg", "操作成功"); 150 result.put("msg", "操作成功");