Merge pull request '实现前置增强逻辑，再实现“综合销售情况表” 动态分组逻辑' (#25) from dev_js_20260309 into master

Reviewed-on: #25

lidee-admin/src/main/resources/application-local.yaml

@@ -9,43 +9,33 @@ spring:
       datasource:
         master:
           # MYSQL数据库 主库，业务库
-#          url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
-          url: jdbc:mysql://192.168.126.128:33306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
           username: root
           password: root
         lideeyunji: # 从库，框架库
-#          url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
-          url: jdbc:mysql://192.168.126.128:33306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           username: root
           password: root
         slave: # 日志库单独
           lazy: true # 开启懒加载，保证启动速度
-#          url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
-          url: jdbc:mysql://192.168.126.128:33306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           username: root
           password: root
         oracle_gryybi: # 报表平台 oracle
+          driver-class-name: oracle.jdbc.driver.OracleDriver
           url: jdbc:oracle:thin:@//192.168.1.247:1521/gryy?oracle.jdbc.defaultNChar=true&oracle.jdbc.convertNcharLiterals=true
           username: GRYYBI
           password: xxb147258367
-#          driver-class-name: oracle.jdbc.OracleDriver
-          driver-class-name: oracle.jdbc.driver.OracleDriver
         erp_bi_data: # 报表平台 mysql
-#          url: jdbc:mysql://127.0.0.1:3306/erp_bi_data?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
-          url: jdbc:mysql://192.168.126.128:33306/erp_bi_data?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://127.0.0.1:3306/erp_bi_data?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           username: root
           password: root
 
-#  redis:
-#    host: 127.0.0.1 # 地址
-#    port: 6379 # 端口
-#    database: 2 # 数据库索引
-#    password: lidee@123 # 密码，建议生产环境开启
   redis:
-    host: 192.168.126.128 # 地址
+    host: 127.0.0.1 # 地址
     port: 6379 # 端口
     database: 2 # 数据库索引
-    password: 123456 # 密码，建议生产环境开启
+    password: lidee@123 # 密码，建议生产环境开启
 
 --- #################### 地代码平台相关配置 ####################
 

lidee-admin/src/main/resources/application-prod.yaml

@@ -9,18 +9,28 @@ spring:
       datasource:
         master:
           # MYSQL数据库 主库，业务库
-          url: jdbc:mysql://127.0.0.1:3306/gr_repoort?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
           username: root
           password: gryy@8888
         lideeyunji: # 从库，框架库
-          url: jdbc:mysql://127.0.0.1:3306/gr_repoort?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           username: root
           password: gryy@8888
         slave: # 日志库单独
           lazy: true # 开启懒加载，保证启动速度
-          url: jdbc:mysql://127.0.0.1:3306/gr_repoort?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           username: root
           password: gryy@8888
+        oracle_gryybi: # 报表平台 oracle
+          url: jdbc:oracle:thin:@//192.168.1.247:1521/gryy?oracle.jdbc.defaultNChar=true&oracle.jdbc.convertNcharLiterals=true
+          username: GRYYBI
+          password: xxb147258367
+          #          driver-class-name: oracle.jdbc.OracleDriver
+          driver-class-name: oracle.jdbc.driver.OracleDriver
+        erp_bi_data: # 报表平台 mysql
+          url: jdbc:mysql://127.0.0.1:3306/erp_bi_data?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          username: root
+          password: root
   redis:
     host: 127.0.0.1 # 地址
     port: 6379 # 端口

lidee-core/.flattened-pom.xml

@@ -78,5 +78,10 @@
       <artifactId>lidee-service-infra-api</artifactId>
       <version>${lidee.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.oracle.database.nls</groupId>
+      <artifactId>orai18n</artifactId>
+      <version>21.1.0.0</version>
+    </dependency>
   </dependencies>
 </project>

lidee-core/src/main/java/com/lideeyunji/core/framework/config/aspect/enhancereport/LideeYunJiReportEnhance.java

@@ -13,6 +13,7 @@ import com.lideeyunji.core.framework.config.aspect.enhancereport.model.EnhanceRe
 import com.lideeyunji.core.framework.config.aspect.enhancereport.model.EnhanceReportParam;
 import com.lideeyunji.core.framework.config.aspect.enhancereport.plugin.ReportAfterAdvicePlugin;
 import com.lideeyunji.core.framework.config.aspect.enhancereport.plugin.ReportBaseAdvicePlugin;
+import com.lideeyunji.core.framework.config.aspect.enhancereport.plugin.ReportBeforeAdvicePlugin;
 import com.lideeyunji.core.framework.config.aspect.enhancereport.plugin.ReportPluginManager;
 import com.lideeyunji.core.framework.entity.ReportEntity;
 import com.lideeyunji.core.framework.service.IReportService;
@@ -25,6 +26,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
@@ -113,6 +115,31 @@ public class LideeYunJiReportEnhance extends LideeYunJiBaseEnhance {
 
     }
 
+    @Before("@annotation(lideeyunJiReportEnhance)")
+    public void before(JoinPoint joinPoint, LideeyunJiReportEnhance lideeyunJiReportEnhance) throws Throwable {
+
+        //获取参数
+        BuildEnhanceReportContext buildEnhanceContext = this.getContextAndPlugins(joinPoint);
+        if (FuncBase.isEmpty(buildEnhanceContext)) {//没有增强
+            return ;
+        }
+
+        //增强列表
+        String javaClass = buildEnhanceContext.getJavaClass();
+        if (Func.isEmpty(javaClass)) {//无增强
+            return ;
+        }
+        //有增强，但是增强不是报表增强，直接返回原值
+        ReportBaseAdvicePlugin plugin = ReportPluginManager.getPlugin(javaClass);
+        if (!(plugin instanceof ReportBeforeAdvicePlugin)) {
+            return ;
+        }
+
+        EnhanceReportContext context = buildEnhanceContext.getContext();
+        //执行增强
+        ReportPluginManager.executePlugin(javaClass, context);
+    }
+
     private BuildEnhanceReportContext getContextAndPlugins(JoinPoint joinPoint) {
         Map<String, Object> paramMap = super.getJoinPointParam(joinPoint);
 

lidee-core/src/main/java/com/lideeyunji/core/framework/config/aspect/enhancereport/plugin/ReportBeforeAdvicePlugin.java

@@ -0,0 +1,9 @@
+
+package com.lideeyunji.core.framework.config.aspect.enhancereport.plugin;
+
+/**
+ * 报表统计 前置增强（报表统计专属）
+ */
+public interface ReportBeforeAdvicePlugin extends ReportBaseAdvicePlugin {
+
+}

lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/SaSetdtlSyncJob.java

@@ -13,8 +13,8 @@ import org.springframework.stereotype.Component;
  * 同步销售明细表
  * oracle gryybi GR_BI_SA_SETDTL --> mysql erp_bi_data GR_BI_SA_SETDTL
  */
-@Component
 @Slf4j
+@Component("SaSetdtlSyncJob")
 public class SaSetdtlSyncJob implements JobHandler {
 
     @Autowired

lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/anyToGrBiSasetdtl.java

@@ -60,9 +60,6 @@ public class anyToGrBiSasetdtl implements JobHandler {
             while (rs.next()) {
                //写入到数据中台表
 
-
-
-
                 System.out.println(rs.getString("SASETTLEDTLID"));
 
             }

lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkLineReportEnhance.java

@@ -0,0 +1,159 @@
+
+package com.lideeyunji.core.framework.enhance.example.report.xtsy;
+
+import com.lideeyunji.core.framework.config.aspect.enhancereport.model.EnhanceReportContext;
+import com.lideeyunji.core.framework.config.aspect.enhancereport.plugin.ReportBeforeAdvicePlugin;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 报表-系统首页-单表
+ */
+@Slf4j
+@Component("zhxsqkLineReportEnhance")
+public class zhxsqkLineReportEnhance implements ReportBeforeAdvicePlugin {
+
+    @Override
+    public void execute(EnhanceReportContext enhanceContext) {
+        log.info("进入=======>zhxsqkLineReportEnhance=======>execute");
+        Map<String, Object> params = enhanceContext.getParam().getParams();
+        if (params.containsKey("Group by")) {
+            List<String> groupFieldList = Arrays.asList(params.get("Group by").toString().split(","));
+            StringBuilder executePluginSql = new StringBuilder();
+            executePluginSql.append(" SELECT \n");
+            if (groupFieldList.contains("customname")) {   //客户名称
+                executePluginSql.append(" tbl_lgbsa.CUSTOMID, \n");
+                executePluginSql.append(" tbl_lgbsa.CUSTOMNAME, \n");
+            }
+            if (groupFieldList.contains("useyear")) {  //年
+                executePluginSql.append(" tbl_lgbsa.USEYEAR, \n");
+            }
+            if (groupFieldList.contains("usemonth")) { //月
+                executePluginSql.append(" tbl_lgbsa.USEMONTH, \n");
+            }
+            if (groupFieldList.contains("zonename")) { //业务区域
+                executePluginSql.append("  tbl_lgbsa.ZONEID, \n");
+                executePluginSql.append("  tbl_lgbsa.ZONENAME, \n");
+            }
+            if (groupFieldList.contains("saletypename")) { //销售类型
+                executePluginSql.append("  tbl_lgbsa.SALETYPEID, \n");
+                executePluginSql.append("  tbl_lgbsa.SALETYPENAME, \n");
+            }
+            if (groupFieldList.contains("salername")) {  //业务员
+                executePluginSql.append("  tbl_lgbsa.SALERID, \n");
+                executePluginSql.append("  tbl_lgbsa.SALERNAME, \n");
+            }
+            if (groupFieldList.contains("dosagename")) { //剂型
+                executePluginSql.append("  tbl_lgbsa.DOSAGEID, \n");
+                executePluginSql.append("  tbl_lgbsa.DOSAGENAME, \n");
+            }
+            executePluginSql.append("  max(CONCAT(USEYEAR, LPAD(USEMONTH, 2, '0'))) as ny, \n");  //年月
+            executePluginSql.append(" GROUP_CONCAT(DISTINCT tbl_lgbsa.PROVINCEID ORDER BY tbl_lgbsa.PROVINCEID  SEPARATOR ',') as PROVINCEID, \n");  //行政区域ID
+            executePluginSql.append(" GROUP_CONCAT(DISTINCT tbl_lgbsa.PROVINCENAME ORDER BY tbl_lgbsa.PROVINCEID  SEPARATOR ',') as PROVINCENAME, \n"); //行政区域名称
+            executePluginSql.append(" sum(tbl_lgbsa.MONTHSAQTY) as MONTHSAQTY, \n");  //本月销量
+            executePluginSql.append(" CONCAT(ROUND((SELECT SUM(MONTHSAQTY) FROM yunji_gr_bi_sa_agg)/100000000 ,2), '亿') AS monthsaqty_s, \n");
+            executePluginSql.append(" CONCAT(ROUND((SELECT SUM(THISSAQTY) FROM yunji_gr_bi_sa_agg)/100000000 ,2), '亿') AS thissaqty_s, \n");
+            executePluginSql.append(" CONCAT(ROUND((SELECT SUM(LASTSAQTY) FROM yunji_gr_bi_sa_agg)/100000000 ,2), '亿') AS lastsaqty_s, \n");
+            executePluginSql.append(" -- 原本带CAST的字段，简化写法（CONCAT会自动转为字符串） \n");
+            executePluginSql.append(" CONCAT(ROUND((SELECT SUM(MONTHSAMONEY) FROM yunji_gr_bi_sa_agg)/100000000 ,2), '亿') AS monthsamoney_s, \n");
+            executePluginSql.append(" CONCAT(ROUND((SELECT SUM(THISSAMONEY) FROM yunji_gr_bi_sa_agg)/100000000,2), '亿') AS thissamoney_s, \n");
+            executePluginSql.append(" CONCAT(ROUND((SELECT SUM(LASTSAMONEY) FROM yunji_gr_bi_sa_agg)/100000000,2), '亿') AS lastsamoney_s, \n");
+            executePluginSql.append(" max(tbl_lgbsa.THISSAQTY) as THISSAQTY, \n");
+            executePluginSql.append(" max(tbl_lgbsa.LASTSAQTY) as LASTSAQTY, \n");
+            executePluginSql.append(" -- 数量同比（原有） \n");
+            executePluginSql.append(" CASE \n");
+            executePluginSql.append(" WHEN (CASE WHEN sum(tbl_lgbsa.LASTSAQTY) = 0 THEN IF(sum(tbl_lgbsa.THISSAQTY) > 0, 100, 0) \n");
+            executePluginSql.append("         ELSE (sum(tbl_lgbsa.THISSAQTY) - sum(tbl_lgbsa.LASTSAQTY)) / sum(tbl_lgbsa.LASTSAQTY) * 100 END) > 0 THEN \n");
+            executePluginSql.append(" CONCAT('🟢 ', ROUND((CASE WHEN sum(tbl_lgbsa.LASTSAQTY) = 0 THEN IF(sum(tbl_lgbsa.THISSAQTY) > 0, 100, 0) \n");
+            executePluginSql.append("         ELSE (sum(tbl_lgbsa.THISSAQTY) - sum(tbl_lgbsa.LASTSAQTY)) / sum(tbl_lgbsa.LASTSAQTY) * 100 END), 2), '%') \n");
+            executePluginSql.append(" WHEN (CASE WHEN sum(tbl_lgbsa.LASTSAQTY) = 0 THEN IF(sum(tbl_lgbsa.THISSAQTY) > 0, 100, 0) \n");
+            executePluginSql.append("         ELSE (sum(tbl_lgbsa.THISSAQTY) - sum(tbl_lgbsa.LASTSAQTY)) / sum(tbl_lgbsa.LASTSAQTY) * 100 END) < 0 THEN \n");
+            executePluginSql.append(" CONCAT('🔴 ', ROUND((CASE WHEN sum(tbl_lgbsa.LASTSAQTY) = 0 THEN IF(sum(tbl_lgbsa.THISSAQTY) > 0, 100, 0) \n");
+            executePluginSql.append("         ELSE (sum(tbl_lgbsa.THISSAQTY) - sum(tbl_lgbsa.LASTSAQTY)) / sum(tbl_lgbsa.LASTSAQTY) * 100 END), 2), '%') \n");
+            executePluginSql.append("ELSE '0.00%' \n");
+            executePluginSql.append(" END AS saqty_yoy, \n");
+            executePluginSql.append("         max(tbl_lgbsa.MONTHSAMONEY) as MONTHSAMONEY, \n");
+            executePluginSql.append(" max(tbl_lgbsa.THISSAMONEY) as THISSAMONEY, \n");
+            executePluginSql.append(" max(tbl_lgbsa.LASTSAMONEY) as LASTSAMONEY, \n");
+            executePluginSql.append(" -- 销售金额同比（原有新增） \n");
+            executePluginSql.append(" CASE \n");
+            executePluginSql.append(" WHEN (CASE WHEN sum(tbl_lgbsa.LASTSAMONEY) = 0 THEN IF(sum(tbl_lgbsa.THISSAMONEY) > 0, 100, 0) \n");
+            executePluginSql.append("         ELSE (sum(tbl_lgbsa.THISSAMONEY) - sum(tbl_lgbsa.LASTSAMONEY)) / sum(tbl_lgbsa.LASTSAMONEY) * 100 END) > 0 THEN \n");
+            executePluginSql.append(" CONCAT('🟢 ', ROUND((CASE WHEN sum(tbl_lgbsa.LASTSAMONEY) = 0 THEN IF(sum(tbl_lgbsa.THISSAMONEY) > 0, 100, 0) \n");
+            executePluginSql.append("         ELSE (sum(tbl_lgbsa.THISSAMONEY) - sum(tbl_lgbsa.LASTSAMONEY)) / sum(tbl_lgbsa.LASTSAMONEY) * 100 END), 2), '%') \n");
+            executePluginSql.append(" WHEN (CASE WHEN sum(tbl_lgbsa.LASTSAMONEY) = 0 THEN IF(sum(tbl_lgbsa.THISSAMONEY) > 0, 100, 0) \n");
+            executePluginSql.append("         ELSE (sum(tbl_lgbsa.THISSAMONEY) - sum(tbl_lgbsa.LASTSAMONEY)) / sum(tbl_lgbsa.LASTSAMONEY) * 100 END) < 0 THEN \n");
+            executePluginSql.append(" CONCAT('🔴 ', ROUND((CASE WHEN sum(tbl_lgbsa.LASTSAMONEY) = 0 THEN IF(sum(tbl_lgbsa.THISSAMONEY) > 0, 100, 0) \n");
+            executePluginSql.append("         ELSE (sum(tbl_lgbsa.THISSAMONEY) - sum(tbl_lgbsa.LASTSAMONEY)) / sum(tbl_lgbsa.LASTSAMONEY) * 100 END), 2), '%') \n");
+            executePluginSql.append(" ELSE '0.00%' \n");
+            executePluginSql.append(" END AS samoney_yoy, \n");  //销售收入同比
+            executePluginSql.append(" max(tbl_lgbsa.MONTHPROFIT) as MONTHPROFIT, \n");  //本月毛利额(元)
+            executePluginSql.append(" max(tbl_lgbsa.THISPROFIT) as THISPROFIT, \n");  //本年毛利额(元)
+            executePluginSql.append(" max(tbl_lgbsa.LASTPROFIT) as LASTPROFIT, \n");  //上年毛利额(元)
+            executePluginSql.append(" -- 新增：毛利同比 \n");
+            executePluginSql.append("         CASE \n");
+            executePluginSql.append(" -- 正数：红色圆点emoji + 数值 + % \n");
+            executePluginSql.append("         WHEN (CASE WHEN sum(tbl_lgbsa.LASTPROFIT) = 0 THEN IF(sum(tbl_lgbsa.THISPROFIT) > 0, 100, 0) \n");
+            executePluginSql.append("                 ELSE (sum(tbl_lgbsa.THISPROFIT) - sum(tbl_lgbsa.LASTPROFIT)) / sum(tbl_lgbsa.LASTPROFIT) * 100 END) > 0 THEN \n");
+            executePluginSql.append(" CONCAT('🟢 ', ROUND((CASE WHEN sum(tbl_lgbsa.LASTPROFIT) = 0 THEN IF(sum(tbl_lgbsa.THISPROFIT) > 0, 100, 0) \n");
+            executePluginSql.append("         ELSE (sum(tbl_lgbsa.THISPROFIT) - sum(tbl_lgbsa.LASTPROFIT)) / sum(tbl_lgbsa.LASTPROFIT) * 100 END), 2), '%') \n");
+            executePluginSql.append(" -- 负数：绿色圆点emoji + 数值 + % \n");
+            executePluginSql.append("         WHEN (CASE WHEN sum(tbl_lgbsa.LASTPROFIT) = 0 THEN IF(sum(tbl_lgbsa.THISPROFIT) > 0, 100, 0) \n");
+            executePluginSql.append("                 ELSE (sum(tbl_lgbsa.THISPROFIT) - sum(tbl_lgbsa.LASTPROFIT)) / sum(tbl_lgbsa.LASTPROFIT) * 100 END) < 0 THEN \n");
+            executePluginSql.append(" CONCAT('🔴 ', ROUND((CASE WHEN sum(tbl_lgbsa.LASTPROFIT) = 0 THEN IF(sum(tbl_lgbsa.THISPROFIT) > 0, 100, 0) \n");
+            executePluginSql.append("         ELSE (sum(tbl_lgbsa.THISPROFIT) - sum(tbl_lgbsa.LASTPROFIT)) / sum(tbl_lgbsa.LASTPROFIT) * 100 END), 2), '%') \n");
+            executePluginSql.append(" -- 0值：直接显示 \n");
+            executePluginSql.append(" ELSE '0.00%' \n");
+            executePluginSql.append(" END AS profit_yoy, \n");  //毛利同比
+            executePluginSql.append(" sum(tbl_lgbsa.MONTHCOST) as MONTHCOST, \n");  //本月销售成本(元)
+            executePluginSql.append(" avg(tbl_lgbsa.PROFITCHANGE) as PROFITCHANGE, \n");  //毛利变动(元)
+            executePluginSql.append(" avg(tbl_lgbsa.PROFITGROWTH) as PROFITGROWTH, \n");  //毛利额增长率
+            executePluginSql.append(" avg(tbl_lgbsa.THISPROFITRATE) as THISPROFITRATE, \n"); //本年毛利率
+            executePluginSql.append(" avg(tbl_lgbsa.SAMONEYGROWTH) as SAMONEYGROWTH, \n"); //销售金额增长率
+            executePluginSql.append(" max(tbl_lgbsa.LASTPROFITSHARE), \n"); //上年毛利额占比
+            executePluginSql.append(" CONCAT(ROUND(avg(tbl_lgbsa.THISPROFITSHARE) * 100, 2), '%') AS THISPROFITSHARE, \n"); //本年毛利额占比
+            executePluginSql.append(" CONCAT(ROUND(avg(tbl_lgbsa.MONTHPROFITSHARE) * 100, 2), '%') AS MONTHPROFITSHARE, \n");  //本月毛利额占比
+            executePluginSql.append(" CONCAT(ROUND(avg(tbl_lgbsa.LASTSAMONEYSHARE) * 100, 2), '%') AS LASTSAMONEYSHARE, \n");  //上年销售金额占比
+            executePluginSql.append(" CONCAT(ROUND(avg(tbl_lgbsa.THISSAMONEYSHARE) * 100, 2), '%') AS THISSAMONEYSHARE, \n");  //本年销售金额占比
+            executePluginSql.append(" CONCAT(ROUND(avg(tbl_lgbsa.MONTHSAMONEYSHARE) * 100, 2), '%') AS MONTHSAMONEYSHARE \n");  //本月销售金额占比
+            executePluginSql.append(" FROM \n");
+            executePluginSql.append(" yunji_gr_bi_sa_agg tbl_lgbsa \n");
+            executePluginSql.append(" GROUP BY \n");
+            if (groupFieldList.contains("customname")) {
+                executePluginSql.append(" tbl_lgbsa.CUSTOMID,");
+                executePluginSql.append(" tbl_lgbsa.CUSTOMNAME,");
+            }
+            if (groupFieldList.contains("useyear")) {
+                executePluginSql.append(" tbl_lgbsa.USEYEAR,");
+            }
+            if (groupFieldList.contains("usemonth")) {
+                executePluginSql.append(" tbl_lgbsa.USEMONTH,");
+            }
+            if (groupFieldList.contains("zonename")) {
+                executePluginSql.append("  tbl_lgbsa.ZONEID,");
+                executePluginSql.append("  tbl_lgbsa.ZONENAME,");
+            }
+            if (groupFieldList.contains("saletypename")) {
+                executePluginSql.append("  tbl_lgbsa.SALETYPEID,");
+                executePluginSql.append("  tbl_lgbsa.SALETYPENAME,");
+            }
+            if (groupFieldList.contains("salername")) {
+                executePluginSql.append("  tbl_lgbsa.SALERID,");
+                executePluginSql.append("  tbl_lgbsa.SALERNAME,");
+            }
+            if (groupFieldList.contains("dosagename")) {
+                executePluginSql.append("  tbl_lgbsa.DOSAGEID,");
+                executePluginSql.append("  tbl_lgbsa.DOSAGENAME,");
+            }
+            executePluginSql.deleteCharAt(executePluginSql.length() - 1);
+            params.put("executePluginSql", executePluginSql.toString());
+//            params.remove("Group by");  // 原有的逻辑注释了，这里也注释
+            System.out.println(params);
+        }
+    }
+
+}

lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkPlugin.java

@@ -0,0 +1,21 @@
+
+package com.lideeyunji.core.framework.enhance.example.report.xtsy;
+
+import com.lideeyunji.core.framework.config.aspect.enhancereport.model.EnhanceReportContext;
+import com.lideeyunji.core.framework.config.aspect.enhancereport.plugin.ReportBeforeAdvicePlugin;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * 报表-系统首页-单表
+ */
+@Slf4j
+@Component("zhxsqkPlugin")
+public class zhxsqkPlugin implements ReportBeforeAdvicePlugin {
+
+
+    @Override
+    public void execute(EnhanceReportContext enhanceContext) {
+
+    }
+}

lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/FrameServiceImpl.java

@@ -1054,8 +1054,14 @@ public class FrameServiceImpl implements IFrameService {
         if (Func.isEmpty(dataSourceConfigModel) || Func.isEmpty(dataSourceConfigModel.getExecuteSql())) {
             return null;
         }
+        //默认从参数中取，参数中的是前置中塞的
+        Object sqlObj = params.get("executePluginSql");
+        if(sqlObj != null){
+            queryWrapper.setTableSql(sqlObj.toString());
+        }else{
             //直接执行数据源
             queryWrapper.setTableSql(dataSourceConfigModel.getExecuteSql());
+        }
 
         //处理占位符参数
         Func.replaceParam(dataSourceConfigModel.getExecuteSql(), params, null, lideeYunJiAdapter);

lidee-core/src/main/java/com/lideeyunji/core/framework/utils/Func.java

@@ -1147,10 +1147,10 @@ public class Func extends FuncBase {
                 });
             }
         }
-        if(params.containsKey("Group by")){
-            String[] str=params.get("Group by").toString().split(",");
-            wrapper.groupByColumns(str);
-        }
+//        if(params.containsKey("Group by")){
+//            String[] str=params.get("Group by").toString().split(",");
+//            wrapper.groupByColumns(str);
+//        }
 
 
     }

lidee-service/lidee-service-system-biz/.flattened-pom.xml

@@ -97,6 +97,11 @@
       <groupId>com.tencentcloudapi</groupId>
       <artifactId>tencentcloud-sdk-java-sms</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.github.yulichang</groupId>
+      <artifactId>mybatis-plus-join-boot-starter</artifactId>
+      <version>1.4.11</version>
+    </dependency>
     <dependency>
       <groupId>com.lideeyunji</groupId>
       <artifactId>lidee-module-api</artifactId>

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/AuthController.java

@@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil;
 import com.lideeyunji.service.system.config.convert.auth.AuthConvert;
 import com.lideeyunji.service.system.constant.ErrorCodeConstants;
 import com.lideeyunji.service.system.controller.vo.auth.*;
-import com.lideeyunji.service.system.controller.vo.auth.*;
 import com.lideeyunji.service.system.controller.vo.user.user.UserRespVO;
 import com.lideeyunji.service.system.entity.AdminUserDO;
 import com.lideeyunji.service.system.entity.MenuDO;
@@ -23,7 +22,6 @@ import com.lideeyunji.tool.framework.operatelog.core.annotations.OperateLog;
 import com.lideeyunji.tool.framework.security.config.SecurityProperties;
 import com.lideeyunji.tool.framework.security.core.util.SecurityFrameworkUtils;
 import com.lideeyunji.tool.framework.tenant.core.context.TenantContextHolder;
-import com.lideeyunji.service.system.service.*;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
@@ -165,8 +163,8 @@ public class AuthController {
     @Operation(tags = "根据token获取用户信息",summary = "根据token获取用户信息")
     @Parameter(name = "refreshToken", description = "根据token获取用户信息", required = true)
     @OperateLog(enable = false) // 避免 Post 请求被记录操作日志
-    public CommonResult<AuthLoginRespVO> getUerInfo(@RequestParam("refreshToken") String refreshToken) {
-        return success(authService.refreshToken(refreshToken));
+    public CommonResult<AdminUserDO> getUerInfo(@RequestParam("refreshToken") String refreshToken) {
+        return success(authService.getTokenTouserInfo(refreshToken));
     }
 
     @GetMapping("/get-permission-info")

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/OAuth2ClientController.java

@@ -73,7 +73,7 @@ public class OAuth2ClientController {
 
     @GetMapping("/myPage")
     @Operation(tags = "OAuth2.0管理",summary = "获得用户角色下 OAuth2 客户端分页")
-    @PreAuthorize("@ss.hasPermission('system:oauth2-client:query')")
+//    @PreAuthorize("@ss.hasPermission('system:oauth2-client:query')")
     public CommonResult<PageResult<OAuth2ClientRespVO>> getMyPage(@Valid OAuth2ClientPageReqVO pageVO) {
         PageResult<OAuth2ClientDO> pageResult = oAuth2ClientService.getMyPage(pageVO);
         return success(BeanUtils.toBean(pageResult, OAuth2ClientRespVO.class));

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/IAdminAuthService.java

@@ -78,4 +78,6 @@ public interface IAdminAuthService {
      */
     AuthLoginRespVO refreshToken(String refreshToken);
 
+    AdminUserDO getTokenTouserInfo(String refreshToken);
+
 }

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/IOAuth2TokenService.java

@@ -1,5 +1,6 @@
 package com.lideeyunji.service.system.service;
 
+import com.lideeyunji.service.system.entity.AdminUserDO;
 import com.lideeyunji.tool.framework.common.pojo.PageResult;
 import com.lideeyunji.service.system.controller.vo.oauth2.token.OAuth2AccessTokenPageReqVO;
 import com.lideeyunji.service.system.entity.OAuth2AccessTokenDO;
@@ -41,6 +42,10 @@ public interface IOAuth2TokenService {
      */
     OAuth2AccessTokenDO refreshAccessToken(String refreshToken, String clientId);
 
+    AdminUserDO getTokenTouserInfo(String refreshToken);
+
+
+
     /**
      * 获得访问令牌
      *

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/impl/AdminAuthServiceImpl.java

@@ -362,6 +362,15 @@ public class AdminAuthServiceImpl implements IAdminAuthService {
         return AuthConvert.INSTANCE.convert(accessTokenDO);
     }
 
+
+    @Override
+    public AdminUserDO getTokenTouserInfo(String refreshToken) {
+        AdminUserDO user= oauth2TokenService.getTokenTouserInfo(refreshToken);
+        return user;
+    }
+
+
+
     @Override
     public void logout(String token, Integer logType) {
         // 删除访问令牌

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/impl/OAuth2TokenServiceImpl.java

@@ -61,6 +61,7 @@ public class OAuth2TokenServiceImpl implements IOAuth2TokenService {
     @Lazy // 懒加载，避免循环依赖
     private IAdminUserService adminUserService;
 
+
     @Override
     public OAuth2AccessTokenDO createAccessToken(Long userId, Long lastLoginDeptId, Long lastLoginRoleId, Integer userType, String clientId, List<String> scopes) {
         return createAccessToken(userId, lastLoginDeptId, lastLoginRoleId, userType, clientId, scopes,false);
@@ -77,6 +78,16 @@ public class OAuth2TokenServiceImpl implements IOAuth2TokenService {
     }
 
 
+
+
+    @Override
+    public AdminUserDO getTokenTouserInfo(String refreshToken ) {
+        // 获得用户基本信息
+        OAuth2AccessTokenDO accessTokenDO=     oauth2AccessTokenMapper.selectByAccessToken(refreshToken);
+        AdminUserDO user = adminUserService.getUser(accessTokenDO.getUserId());
+        return  user;
+    }
+
     @Override
     public OAuth2AccessTokenDO refreshAccessToken(String refreshToken, String clientId) {
         boolean supAdmin = SecurityFrameworkUtils.isSupAdmin();
@@ -110,6 +121,12 @@ public class OAuth2TokenServiceImpl implements IOAuth2TokenService {
         return createOAuth2AccessToken(refreshTokenDO, clientDO, supAdmin);
     }
 
+
+
+
+
+
+
     @Override
     public OAuth2AccessTokenDO getAccessToken(String accessToken) {
         // 优先从 Redis 中获取