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

- 将 IoT 设备主机地址从 jichengshanshui.com.cn 更改为 fangshanparking.com - 更新应用配置中多个 API 接口的域名地址 - 修改 SSO 单点登录相关 URL 配置 - 更新微信公众号接口调用地址 - 替换资源服务器下载链接域名 - 修改生产环境社交登录回调地址 - 更新 UAA 认证服务器基础 URL - 替换 JustAuth 第三方认证源的授权地址

config(servers): 更新服务器配置中的域名地址
- 将 IoT 设备主机地址从 jichengshanshui.com.cn 更改为 fangshanparking.com - 更新应用配置中多个 API 接口的域名地址 - 修改 SSO 单点登录相关 URL 配置 - 更新微信公众号接口调用地址 - 替换资源服务器下载链接域名 - 修改生产环境社交登录回调地址 - 更新 UAA 认证服务器基础 URL - 替换 JustAuth 第三方认证源的授权地址
王彪总
1 parent ced9e764
Showing 5 changed files with 33 additions and 12 deletions
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/appmodule/AppAppModuleController.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/MainInfoController.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java
@@ -102,7 +102,7 @@
             </foreach>
         </if>
-        order by a.id desc
+        order by a.create_time desc
     </select>
     <select id="appInspectionPlanCommitListByPlanNo" resultType="com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanCommitRespVO">
@@ -94,7 +94,7 @@
                 #{deptId}
             </foreach>
         </if>
-        order by c.id desc
+        order by c.create_time desc
     </select>
    <select id="appMaintainPlanCommitDetailPage"  resultMap="BaseResultMap">
@@ -44,6 +44,11 @@ public class AppAppModuleController {
      * 园林巡查员角色ID
      */
     private static final Long ROLE_ID_PATROL = 178L;
+
+    /**
+     * 园林巡查员角色ID
+     */
+    private static final Long ROLE_ID_PATROL_ZX = 202L;
     /**
      * 全域督察员角色ID
      */
@@ -64,28 +69,28 @@ public class AppAppModuleController {
     public CommonResult<List<AppModuleVO>> getAppModuleList(AppModuleListReqVO reqVO) {
         // 获取当前登录用户ID
         Long userId = SecurityFrameworkUtils.getLoginUserId();
-        
+
         // 查询用户可见的模块列表
         List<AppModuleDO> list = appModuleService.getVisibleAppModuleList(userId, reqVO);
-        
+
         // 如果用户同时拥有园林巡查员(178)和全域督察员(183)角色，则隐藏巡查工单菜单，只显示督查工单菜单
         if (userId != null) {
             Set<Long> roleIds = permissionService.getUserRoleIdListByUserId(userId);
-            if (roleIds.contains(ROLE_ID_PATROL) && roleIds.contains(ROLE_ID_INSPECTOR)) {
+            if (roleIds.contains(ROLE_ID_PATROL_ZX) && roleIds.contains(ROLE_ID_INSPECTOR)) {
                 log.info("[getAppModuleList] 用户({})同时拥有巡查员和督察员角色，隐藏巡查工单菜单", userId);
                 list.removeIf(module -> MODULE_ID_PATROL_WORKORDER.equals(module.getId()));
             }
         }
-        
+
         // 填充统计数据（根据extra中的statisticKey配置）
 //        appModuleService.fillModuleStatistics(list, userId);
-        
+
         // 转换为 VO 列表并构建树
         List<AppModuleVO> modules = AppModuleConvert.INSTANCE.convertAppList(list);
         List<AppModuleVO> moduleTree = buildModuleTree(modules);
-        
+
         // MapStruct 转换已通过 @AfterMapping 自动填充 statisticCount
-        
+
         return success(moduleTree);
     }
@@ -197,8 +197,21 @@ public class MainInfoController {
         Map<String, BpmUserSimpleReqDTO>  bpmTaskRespVOS =  bpmTaskApi.getLastTaskMapByProcessInstanceId(processInstanceIdList);
-        // 5. 转换并返回结果
-        return success(MainInfoConvert.INSTANCE.buildMainInfoPage(pageResult, attachmentMap, bpmTaskRespVOS));
+        // 5. 查询单位名称
+        Map<Long, String> companyNameMap = pageResult.getList().stream()
+                .map(MainInfoDO::getCompanyId)
+                .filter(Objects::nonNull)
+                .distinct()
+                .collect(Collectors.toMap(
+                        companyId -> companyId,
+                        companyId -> {
+                            DeptDO dept = deptService.getDept(companyId);
+                            return dept != null ? dept.getName() : "";
+                        }
+                ));
+
+        // 6. 转换并返回结果
+        return success(MainInfoConvert.INSTANCE.buildMainInfoPage(pageResult, attachmentMap, bpmTaskRespVOS, companyNameMap));
     }
     @GetMapping("/export-excel")
@@ -25,7 +25,7 @@ public interface MainInfoConvert {
     MainInfoConvert INSTANCE = Mappers.getMapper(MainInfoConvert.class);
-    default PageResult<AdminMainInfoRespVO> buildMainInfoPage(PageResult<MainInfoDO> pageResult, Map<String, AttachmentDO> attachmentMap, Map<String, BpmUserSimpleReqDTO>  bpmTaskRespVOS ) {
+    default PageResult<AdminMainInfoRespVO> buildMainInfoPage(PageResult<MainInfoDO> pageResult, Map<String, AttachmentDO> attachmentMap, Map<String, BpmUserSimpleReqDTO>  bpmTaskRespVOS, Map<Long, String> companyNameMap) {
         List<AdminMainInfoRespVO> mainInfoVOList = CollectionUtils.convertList(pageResult.getList(), mainInfoDO -> {
             AdminMainInfoRespVO mainInfoVo = BeanUtils.toBean(mainInfoDO, AdminMainInfoRespVO.class);
             if (attachmentMap != null && !attachmentMap.isEmpty()) {
@@ -48,6 +48,9 @@ public interface MainInfoConvert {
                     }
                 }
             }
+            if (companyNameMap != null && mainInfoDO.getCompanyId() != null) {
+                mainInfoVo.setCompanyName(companyNameMap.getOrDefault(mainInfoDO.getCompanyId(), ""));
+            }
             return mainInfoVo;
         });
         return new PageResult<>(mainInfoVOList, pageResult.getTotal());