fit:事项优化(2)

assembly/src/main/resources/application-dev.yml

@@ -5,14 +5,14 @@ spring:
     dynamic:
       datasource:
         master:
-#          username: root
-#          password: Buguniao@123
-#          driver-class-name: com.mysql.cj.jdbc.Driver
-#          url: jdbc:mysql://localhost:3306/hotent_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true
           username: root
-          password: Chemicals_20181101!
+          password: Buguniao@123
           driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://1.71.91.48:3306/dj_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://localhost:3306/hotent_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true
+#          username: root
+#          password: Chemicals_20181101!
+#          driver-class-name: com.mysql.cj.jdbc.Driver
+#          url: jdbc:mysql://1.71.91.48:3306/dj_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&rewriteBatchedStatements=true
 
           druid:
             # filters: stat
@@ -26,7 +26,7 @@ spring:
             #public-key: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAIobgl5Uq9fEW2V6dLXqWJKDUZGAA3CCVasj1Yxge3STiWZ1plhxBUQgNgyRYeEUrUHzYPozfm0kL/zLlHMzcnUCAwEAAQ==
   redis:
     database: 1
-    host: localhost
+    host: 1.71.9.215
     port: 6379
     password:
 #    password: Buguniao@123
@@ -100,7 +100,6 @@ security:
       - /hystrix/*
       - /api/file/v1/*
       - /pricing/report/*
-      - /api/report/*
 
 #业务中台 配置信息
 qzSetting:
@@ -206,9 +205,9 @@ third:
 system:
   attachment:
     # Windows开发环境：使用绝对路径，确保目录存在
-    path: D:/fy/uploadPath
+#    path: D:/fy/uploadPath
 #     Linux生产环境：使用绝对路径（必须以file:开头或确保目录存在）
-#    path: /root/qingzong/upload
+    path: /root/qingzong/upload
 
 
 # OAuth2单点登录配置

assembly/src/main/resources/application-pro.yml

@@ -8,7 +8,7 @@ spring:
           username: fgw_dingjia
           password: Tgbx_000825
           driver-class-name: com.kingbase8.Driver
-          url: jdbc:kingbase8://22.167.93.46:54321/fgw_dingjia?currentSchema=hotent_fgw_jgtk_dev,productName=PostgreSQL,SYS_CATALOG,PUBLIC&zeroDateTimeBehavior=convertToNuLl&useUnicode=true&characterEncoding=utf-8
+          url: jdbc:kingbase8://22.167.93.46:54321/fgw_dingjia?currentSchema=fgw_dingjia,productName=PostgreSQL,SYS_CATALOG,PUBLIC&zeroDateTimeBehavior=convertToNuLl&useUnicode=true&characterEncoding=utf-8
           druid:
             filters: stat
             # druid oracle 验证语句

base/pom.xml

@@ -280,7 +280,7 @@
 		<dependency>
 			<groupId>cn.com.kingbase</groupId>
 			<artifactId>kingbase8</artifactId>
-			<version>8.6.0.jre7</version>
+			<version>8.6.0</version>
 		</dependency>
 
 

pricing/src/main/java/com/hotent/pricing/controller/task/FapMessageController.java

@@ -50,7 +50,7 @@ public class FapMessageController {
     }
 
     /**
-     * 新增通知 仅上级向下级发送，下级查看，省也可以下发通知给县。
+     * 发送消息（上下级互相发送）
      */
     @PostMapping
     public CommonResult<Void> saveMsg(@RequestBody FapMessage message) throws Exception {
@@ -59,7 +59,7 @@ public class FapMessageController {
     }
 
     /**
-     * 交流互动 省、市、县可以相互发送。
+     * 发送消息（上下级互相发送）
      */
     @PostMapping("/send")
     public CommonResult<Void> sendMsg(@RequestBody FapMessage messag) throws Exception {

pricing/src/main/java/com/hotent/pricing/manager/impl/FapMessageManagerImpl.java

@@ -1,5 +1,6 @@
 package com.hotent.pricing.manager.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hotent.base.util.AuthenticationUtil;
@@ -11,11 +12,10 @@ import com.hotent.pricing.manager.FapMessageHisoryManager;
 import com.hotent.base.manager.impl.BaseManagerImpl;
 import com.hotent.base.query.PageList;
 import com.hotent.pricing.model.entity.policy.FapFeeCatalog;
-import com.hotent.uc.manager.OrgUserManager;
+import com.hotent.uc.manager.*;
+import com.hotent.uc.model.UcGroupUser;
+import com.hotent.uc.model.UserGroup;
 import com.hotent.uc.util.ContextUtil;
-import com.hotent.uc.manager.UserManager;
-import com.hotent.uc.manager.OrgManager;
-import com.hotent.uc.manager.UserGroupManager;
 import com.hotent.uc.model.User;
 import com.hotent.uc.model.Org;
 import org.springframework.beans.BeanUtils;
@@ -44,8 +44,9 @@ public class FapMessageManagerImpl extends BaseManagerImpl<FapMessageDao, FapMes
     private OrgUserManager orgUserManager;
     @Autowired
     private OrgManager orgManager;
-    @Autowired(required = false)
-    private UserGroupManager userGroupManager;
+
+    @Autowired
+    private UcGroupUserManager ucGroupUserManager;
 
 
     @Override
@@ -100,6 +101,21 @@ public class FapMessageManagerImpl extends BaseManagerImpl<FapMessageDao, FapMes
                     break;
                 case "USER_GROUP":
                     // 用户组范围 - 获取用户组下的所有用户
+                    for (String groupId : scopeIds) {
+                        if (groupId.trim().isEmpty()) continue;
+                        List<UcGroupUser> ucGroupUsers = ucGroupUserManager.list(
+                              new LambdaQueryWrapper<>(UcGroupUser.class).eq(UcGroupUser::getGroupId, groupId)
+                        );
+                        if (ucGroupUsers != null && !ucGroupUsers.isEmpty()) {
+                            for (UcGroupUser ucGroupUser : ucGroupUsers) {
+                                User user = userManager.get(ucGroupUser.getUserId());
+                                FapMessage msg = createRecord(message, user);
+                                msgList.add(msg);
+                                FapMessageHistory history = createHistoryRecord(message, user);
+                                historyList.add(history);
+                            }
+                        }
+                    }
                     break;
                 case "USER":
                     // 用户范围 - 直接指定用户

pricing/src/main/java/com/hotent/pricing/manager/impl/FapPricingCatalogManagerImpl.java

@@ -64,6 +64,9 @@ public class FapPricingCatalogManagerImpl extends BaseManagerImpl<FapPricingCata
 			queryWrapper.eq("is_deleted", "0");
 			queryWrapper.orderByDesc("operation_time");
     		fapPricingCatalog.setOperationHistory( historyDao.selectList(queryWrapper));
+			List<FapPricingCatalog> list = new ArrayList<>();
+			list.add(fapPricingCatalog);
+			doCatalogAccessPermission(list);
     	}
 		return fapPricingCatalog;
 	}