zyp

README.en.md

@@ -1,36 +0,0 @@
-# his_java
-
-#### Description
-问诊平台
-
-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Instructions
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Contribution
-
-1.  Fork the repository
-2.  Create Feat_xxx branch
-3.  Commit your code
-4.  Create Pull Request
-
-
-#### Gitee Feature
-
-1.  You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2.  Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3.  Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4.  The most valuable open source project [GVP](https://gitee.com/gvp)
-5.  The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6.  The most popular members  [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

README.md

@@ -1,37 +1,3 @@
-# his_java
+# myhk_his_java
 
-#### 介绍
-问诊平台
-
-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 使用说明
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 参与贡献
-
-1.  Fork 本仓库
-2.  新建 Feat_xxx 分支
-3.  提交代码
-4.  新建 Pull Request
-
-
-#### 特技
-
-1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2.  Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
-3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
-4.  [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目
-5.  Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6.  Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
+木易华康后端项目

fs-ad-api/src/main/java/com/fs/app/controller/AdCallbackController.java

@@ -17,8 +17,6 @@ import com.fs.baidu.vo.ad.AdYouKuClickCallbackVo;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.R;
 import com.fs.common.utils.StringUtils;
-import com.fs.qw.domain.QwWorkLink;
-import com.fs.qw.service.IQwWorkLinkService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -43,7 +41,6 @@ public class AdCallbackController extends BaseController {
     private final IBdAccountService bdAccountService;
     private final IAdSiteService adSiteService;
     private final IAdAccountService adAccountService;
-    private final IQwWorkLinkService qwWorkLinkService;
 
     //百度-页面点击接口
 //    @GetMapping("/callback")
@@ -72,12 +69,6 @@ public class AdCallbackController extends BaseController {
     @GetMapping("/getTemplateById")
     public R getTemplateById(Long id){
         AdSite site = adSiteService.getById(id);
-        if(site.getWorkId() != null){
-            QwWorkLink byId = qwWorkLinkService.getById(site.getWorkId());
-            if(byId != null){
-                site.setWorkUrl(byId.getUrl());
-            }
-        }
         AdHtmlTemplate htmlUrl = adHtmlTemplateMapper.selectById(site.getTemplateId());
         if(htmlUrl == null){
             return R.error("错误编号");

fs-company/src/main/resources/application-druid-jz.yml → fs-ad-api/src/main/resources/application-druid-myhk.yml

@@ -2,16 +2,14 @@
 spring:
     # redis 配置
     redis:
-        # 地址
-        host: 127.0.0.1
-        # 端口，默认为6379
+        host: 172.27.0.6
         port: 6379
         # 数据库索引
         database: 0
         # 密码
-        password:
+        password: myhk888777666.
         # 连接超时时间
-        timeout: 20s
+        timeout: 10s
         lettuce:
             pool:
                 # 连接池中的最小空闲连接
@@ -23,25 +21,25 @@ spring:
                 # #连接池最大阻塞等待时间（使用负值表示没有限制）
                 max-wait: -1ms
     datasource:
-        #        clickhouse:
-        #            type: com.alibaba.druid.pool.DruidDataSource
-        #            driverClassName: com.clickhouse.jdbc.ClickHouseDriver
-        #            url: jdbc:clickhouse://cc-2vc8zzo26w0l7m2l6.public.clickhouse.ads.aliyuncs.com/sop?compress=0&use_server_time_zone=true&use_client_time_zone=false&timezone=Asia/Shanghai
-        #            username: rt_2024
-        #            password: Yzx_19860213
-        #            initialSize: 10
-        #            maxActive: 100
-        #            minIdle: 10
-        #            maxWait: 6000
+        clickhouse:
+            type: com.alibaba.druid.pool.DruidDataSource
+            driverClassName: com.clickhouse.jdbc.ClickHouseDriver
+            url: jdbc:clickhouse://1.14.104.71:8123/sop_test?compress=0&use_server_time_zone=true&use_client_time_zone=false&timezone=Asia/Shanghai
+            username: rt_2024
+            password: Yzx_19860213
+            initialSize: 10
+            maxActive: 100
+            minIdle: 10
+            maxWait: 6000
         mysql:
             type: com.alibaba.druid.pool.DruidDataSource
             driverClassName: com.mysql.cj.jdbc.Driver
             druid:
                 # 主库数据源
                 master:
-                    url: jdbc:mysql://192.168.0.137:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://172.27.0.17:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: root
-                    password: Ylrztek250218!3@.
+                    password: myhk888777666.
                 # 从库数据源
                 slave:
                     # 从数据源开关/默认关闭
@@ -94,9 +92,9 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                    url: jdbc:mysql://192.168.0.137:3306/sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://172.27.0.17:3306/fs_his_sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: root
-                    password: Ylrztek250218!3@.
+                    password: myhk888777666.
                 # 初始连接数
                 initialSize: 5
                 # 最小连接池数量
@@ -143,6 +141,7 @@ rocketmq:
         access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
         secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey
     consumer:
-        group: test-group
+        group: voice-group
         access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
         secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey
+

fs-ad-api/src/main/resources/application.yml

@@ -43,8 +43,8 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: dev
-#    active: druid-yjf
+#    active: dev
+    active: druid-yjf
     include: config
   mvc:
     async:

fs-admin/pom.xml

@@ -84,10 +84,6 @@
             <version>0.4.6</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

fs-admin/src/main/java/com/fs/ad/controller/StatisticsController.java

@@ -1,10 +1,7 @@
 package com.fs.ad.controller;
 
 import com.fs.baidu.api.BaiduApis;
-import com.fs.baidu.domain.BdAccount;
-import com.fs.baidu.domain.BdApi;
 import com.fs.baidu.enums.BdTimeUnit;
-import com.fs.baidu.mapper.BdApiMapper;
 import com.fs.baidu.param.QueryReportDataParam;
 import com.fs.baidu.service.IBdAccountService;
 import com.fs.bdAdv.param.FsAdvSemStatisticsByDayParam;
@@ -33,7 +30,6 @@ public class StatisticsController extends BaseController {
     private final IFsAdvSemService fsAdvSemService;
     private final IBdAccountService bdAccountService;
     private final BaiduApis baiduApis;
-    private final BdApiMapper bdApiMapper;
 
     @GetMapping("/conversionStatistics")
     public R conversionStatistics(ConversionStatisticsParam param){
@@ -69,11 +65,8 @@ public class StatisticsController extends BaseController {
         param.setEndDate(endDate);
         param.setPage(page);
         param.setRowCount(rowCount);
-        param.setTimeUnit(BdTimeUnit.SUMMARY);
-        BdAccount account = bdAccountService.getById(id);
-        BdApi byId = bdApiMapper.selectById(account.getApiId());
-        return baiduApis.getReportData(byId.getAccessToken(), account.getAccountName(), param);
-//        return R.ok();
+        param.setTimeUnit(BdTimeUnit.DAY);
+        return baiduApis.getReportData(bdAccountService.getById(id), param);
     }
 
     @GetMapping("/bdDataStatic")

fs-admin/src/main/java/com/fs/ad/controller/task/BaiduTask.java

@@ -1,22 +1,17 @@
 package com.fs.ad.controller.task;
 
-import com.fs.ad.service.IBdReportDataService;
 import com.fs.qw.service.IQwWorkUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import java.time.LocalDate;
-
 @Slf4j
 @Component("baiduTask")
 public class BaiduTask {
 
     @Autowired
     private IQwWorkUserService qwWorkUserService;
-    @Autowired
-    private IBdReportDataService bdReportDataService;
 
     /**
      * 同步完企微客户，然后对加微的数据信息筛选并上传给百度进行投流优化
@@ -25,9 +20,6 @@ public class BaiduTask {
         qwWorkUserService.uploadBd();
 //        qwWorkUserService.uploadYk();
     }
-    public void syncReportData(){
-        bdReportDataService.syncReportData(LocalDate.now().minusDays(1));
-    }
 
 
 }

fs-admin/src/main/java/com/fs/aiob/controller/AiobBackController.java

@@ -1,47 +0,0 @@
-package com.fs.aiob.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.fs.aicall.utils.AiobApiUtils;
-import com.fs.aicall.vo.*;
-import com.fs.aiob.domain.AiobBaiduTask;
-import com.fs.aiob.service.IAiobBaiduTaskService;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.domain.R;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.PubFun;
-import com.fs.common.utils.poi.ExcelUtil;
-import lombok.AllArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 百度AI外呼任务Controller
- * 
- * @author fs
- * @date 2025-03-20
- */
-@RestController
-@RequestMapping("/aiob/back")
-@AllArgsConstructor
-public class AiobBackController extends BaseController {
-
-    private final IAiobBaiduTaskService aiobBaiduTaskService;
-
-    @PostMapping
-    public void back(@RequestBody AiobBackVo vo){
-        if(vo.getCallbackType() != null){
-            if(vo.getCallbackType() == 0){
-                aiobBaiduTaskService.back(JSON.parseObject(vo.getData(), AiobCalleData.class));
-            }
-            if(vo.getCallbackType() == 2){
-                aiobBaiduTaskService.updateStatus(JSON.parseObject(vo.getData(), AiobTaskData.class));
-            }
-        }
-    }
-
-}

fs-admin/src/main/java/com/fs/aiob/controller/AiobBaiduCallApiController.java

@@ -1,103 +0,0 @@
-package com.fs.aiob.controller;
-
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.enums.BusinessType;
-import com.fs.aiob.domain.AiobBaiduCallApi;
-import com.fs.aiob.service.IAiobBaiduCallApiService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
-
-/**
- * 百度外呼接口配置Controller
- * 
- * @author fs
- * @date 2025-03-20
- */
-@RestController
-@RequestMapping("/aiob/AiobBaiduCallApi")
-public class AiobBaiduCallApiController extends BaseController
-{
-    @Autowired
-    private IAiobBaiduCallApiService aiobBaiduCallApiService;
-
-    /**
-     * 查询百度外呼接口配置列表
-     */
-    @PreAuthorize("@ss.hasPermi('aiob:AiobBaiduCallApi:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(AiobBaiduCallApi aiobBaiduCallApi)
-    {
-        startPage();
-        List<AiobBaiduCallApi> list = aiobBaiduCallApiService.selectAiobBaiduCallApiList(aiobBaiduCallApi);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出百度外呼接口配置列表
-     */
-    @PreAuthorize("@ss.hasPermi('aiob:AiobBaiduCallApi:export')")
-    @Log(title = "百度外呼接口配置", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(AiobBaiduCallApi aiobBaiduCallApi)
-    {
-        List<AiobBaiduCallApi> list = aiobBaiduCallApiService.selectAiobBaiduCallApiList(aiobBaiduCallApi);
-        ExcelUtil<AiobBaiduCallApi> util = new ExcelUtil<AiobBaiduCallApi>(AiobBaiduCallApi.class);
-        return util.exportExcel(list, "百度外呼接口配置数据");
-    }
-
-    /**
-     * 获取百度外呼接口配置详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('aiob:AiobBaiduCallApi:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(aiobBaiduCallApiService.selectAiobBaiduCallApiById(id));
-    }
-
-    /**
-     * 新增百度外呼接口配置
-     */
-    @PreAuthorize("@ss.hasPermi('aiob:AiobBaiduCallApi:add')")
-    @Log(title = "百度外呼接口配置", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody AiobBaiduCallApi aiobBaiduCallApi)
-    {
-        return toAjax(aiobBaiduCallApiService.insertAiobBaiduCallApi(aiobBaiduCallApi));
-    }
-
-    /**
-     * 修改百度外呼接口配置
-     */
-    @PreAuthorize("@ss.hasPermi('aiob:AiobBaiduCallApi:edit')")
-    @Log(title = "百度外呼接口配置", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody AiobBaiduCallApi aiobBaiduCallApi)
-    {
-        return toAjax(aiobBaiduCallApiService.updateAiobBaiduCallApi(aiobBaiduCallApi));
-    }
-
-    /**
-     * 删除百度外呼接口配置
-     */
-    @PreAuthorize("@ss.hasPermi('aiob:AiobBaiduCallApi:remove')")
-    @Log(title = "百度外呼接口配置", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(aiobBaiduCallApiService.deleteAiobBaiduCallApiByIds(ids));
-    }
-}

fs-admin/src/main/java/com/fs/aiob/controller/AiobBaiduEncryptionController.java

@@ -1,103 +0,0 @@
-package com.fs.aiob.controller;
-
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.enums.BusinessType;
-import com.fs.aiob.domain.AiobBaiduEncryption;
-import com.fs.aiob.service.IAiobBaiduEncryptionService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
-
-/**
- * 百度AI外呼加密Controller
- * 
- * @author fs
- * @date 2025-03-20
- */
-@RestController
-@RequestMapping("/aiob/AiobBaiduEncryption")
-public class AiobBaiduEncryptionController extends BaseController
-{
-    @Autowired
-    private IAiobBaiduEncryptionService aiobBaiduEncryptionService;
-
-    /**
-     * 查询百度AI外呼加密列表
-     */
-    @PreAuthorize("@ss.hasPermi('aiob:AiobBaiduEncryption:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(AiobBaiduEncryption aiobBaiduEncryption)
-    {
-        startPage();
-        List<AiobBaiduEncryption> list = aiobBaiduEncryptionService.selectAiobBaiduEncryptionList(aiobBaiduEncryption);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出百度AI外呼加密列表
-     */
-    @PreAuthorize("@ss.hasPermi('aiob:AiobBaiduEncryption:export')")
-    @Log(title = "百度AI外呼加密", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(AiobBaiduEncryption aiobBaiduEncryption)
-    {
-        List<AiobBaiduEncryption> list = aiobBaiduEncryptionService.selectAiobBaiduEncryptionList(aiobBaiduEncryption);
-        ExcelUtil<AiobBaiduEncryption> util = new ExcelUtil<AiobBaiduEncryption>(AiobBaiduEncryption.class);
-        return util.exportExcel(list, "百度AI外呼加密数据");
-    }
-
-    /**
-     * 获取百度AI外呼加密详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('aiob:AiobBaiduEncryption:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(aiobBaiduEncryptionService.selectAiobBaiduEncryptionById(id));
-    }
-
-    /**
-     * 新增百度AI外呼加密
-     */
-    @PreAuthorize("@ss.hasPermi('aiob:AiobBaiduEncryption:add')")
-    @Log(title = "百度AI外呼加密", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody AiobBaiduEncryption aiobBaiduEncryption)
-    {
-        return toAjax(aiobBaiduEncryptionService.insertAiobBaiduEncryption(aiobBaiduEncryption));
-    }
-
-    /**
-     * 修改百度AI外呼加密
-     */
-    @PreAuthorize("@ss.hasPermi('aiob:AiobBaiduEncryption:edit')")
-    @Log(title = "百度AI外呼加密", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody AiobBaiduEncryption aiobBaiduEncryption)
-    {
-        return toAjax(aiobBaiduEncryptionService.updateAiobBaiduEncryption(aiobBaiduEncryption));
-    }
-
-    /**
-     * 删除百度AI外呼加密
-     */
-    @PreAuthorize("@ss.hasPermi('aiob:AiobBaiduEncryption:remove')")
-    @Log(title = "百度AI外呼加密", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(aiobBaiduEncryptionService.deleteAiobBaiduEncryptionByIds(ids));
-    }
-}

fs-admin/src/main/java/com/fs/aiob/controller/AiobBaiduTaskController.java

@@ -1,137 +0,0 @@
-package com.fs.aiob.controller;
-
-import java.util.List;
-
-import com.fs.aicall.domain.TaskInfo;
-import com.fs.aicall.utils.AiobApiUtils;
-import com.fs.aicall.vo.RobotVo;
-import com.fs.common.core.domain.R;
-import com.fs.common.utils.PubFun;
-import lombok.AllArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.enums.BusinessType;
-import com.fs.aiob.domain.AiobBaiduTask;
-import com.fs.aiob.service.IAiobBaiduTaskService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
-
-/**
- * 百度AI外呼任务Controller
- * 
- * @author fs
- * @date 2025-03-20
- */
-@RestController
-@RequestMapping("/aiob/AiobBaiduTask")
-@AllArgsConstructor
-public class AiobBaiduTaskController extends BaseController {
-
-    private final IAiobBaiduTaskService aiobBaiduTaskService;
-    private final AiobApiUtils aiobApiUtils;
-
-    /**
-     * 查询百度AI外呼任务列表
-     */
-    @PreAuthorize("@ss.hasPermi('aiob:AiobBaiduTask:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(AiobBaiduTask aiobBaiduTask)
-    {
-        startPage();
-        List<AiobBaiduTask> list = aiobBaiduTaskService.selectAiobBaiduTaskList(aiobBaiduTask);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出百度AI外呼任务列表
-     */
-    @PreAuthorize("@ss.hasPermi('aiob:AiobBaiduTask:export')")
-    @Log(title = "百度AI外呼任务", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(AiobBaiduTask aiobBaiduTask)
-    {
-        List<AiobBaiduTask> list = aiobBaiduTaskService.selectAiobBaiduTaskList(aiobBaiduTask);
-        ExcelUtil<AiobBaiduTask> util = new ExcelUtil<AiobBaiduTask>(AiobBaiduTask.class);
-        return util.exportExcel(list, "百度AI外呼任务数据");
-    }
-
-    /**
-     * 获取百度AI外呼任务详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('aiob:AiobBaiduTask:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(aiobBaiduTaskService.selectAiobBaiduTaskById(id));
-    }
-
-    /**
-     * 新增百度AI外呼任务
-     */
-    @PreAuthorize("@ss.hasPermi('aiob:AiobBaiduTask:add')")
-    @Log(title = "百度AI外呼任务", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody AiobBaiduTask aiobBaiduTask)
-    {
-        return toAjax(aiobBaiduTaskService.insertAiobBaiduTask(aiobBaiduTask));
-    }
-
-    /**
-     * 修改百度AI外呼任务
-     */
-    @PreAuthorize("@ss.hasPermi('aiob:AiobBaiduTask:edit')")
-    @Log(title = "百度AI外呼任务", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody AiobBaiduTask aiobBaiduTask)
-    {
-        return toAjax(aiobBaiduTaskService.updateAiobBaiduTask(aiobBaiduTask));
-    }
-
-    /**
-     * 删除百度AI外呼任务
-     */
-    @PreAuthorize("@ss.hasPermi('aiob:AiobBaiduTask:remove')")
-    @Log(title = "百度AI外呼任务", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(aiobBaiduTaskService.deleteAiobBaiduTaskByIds(ids));
-    }
-    /**
-     * 获取机器人列表
-     */
-	@GetMapping("/robotList")
-    public R robotList(){
-        List<RobotVo> robotList = aiobApiUtils.getRobotList();
-        return R.ok().put("data", PubFun.listToMapByGroupList(robotList, RobotVo::getIndustryName));
-    }
-
-
-    /**
-     * 启动任务
-     */
-    @GetMapping("/startRobotic")
-    public R startRobotic(String taskId){
-        aiobBaiduTaskService.changeStatus(taskId, 2);
-        return R.ok();
-    }
-    /**
-     * 停止任务
-     */
-    @GetMapping("/stopRobotic")
-    public R stopRobotic(String taskId){
-        aiobBaiduTaskService.changeStatus(taskId, 3);
-        return R.ok();
-    }
-}

fs-admin/src/main/java/com/fs/company/controller/CompanyController.java

@@ -58,7 +58,7 @@ public class CompanyController extends BaseController
     /**
      * 查询企业列表
      */
-//    @PreAuthorize("@ss.hasPermi('company:company:list')")
+    @PreAuthorize("@ss.hasPermi('company:company:list')")
     @GetMapping("/list")
     public TableDataInfo list(CompanyParam param)
     {

fs-admin/src/main/java/com/fs/company/controller/CompanyVoiceRoboticController.java

@@ -197,12 +197,4 @@ public class CompanyVoiceRoboticController extends BaseController
         companyVoiceRoboticService.dispenseWx(id);
         return R.ok();
     }
-    /**
-     * 外呼回调
-     */
-	@PostMapping("/addScheme")
-    public R addWx(@RequestBody CompanyVoiceRobotic companyVoiceRobotic){
-        companyVoiceRoboticService.addWx(companyVoiceRobotic);
-        return R.ok();
-    }
 }

fs-admin/src/main/java/com/fs/course/controller/FsCourseRedPacketRetryController.java

@@ -1,103 +0,0 @@
-package com.fs.course.controller;
-
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.enums.BusinessType;
-import com.fs.course.domain.FsCourseRedPacketRetry;
-import com.fs.course.service.IFsCourseRedPacketRetryService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
-
-/**
- * 课程红包失败重试记录Controller
- * 
- * @author fs
- * @date 2025-03-18
- */
-@RestController
-@RequestMapping("/course/courseRedPacketRetry")
-public class FsCourseRedPacketRetryController extends BaseController
-{
-    @Autowired
-    private IFsCourseRedPacketRetryService fsCourseRedPacketRetryService;
-
-    /**
-     * 查询课程红包失败重试记录列表
-     */
-    @PreAuthorize("@ss.hasPermi('course:courseRedPacketRetry:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsCourseRedPacketRetry fsCourseRedPacketRetry)
-    {
-        startPage();
-        List<FsCourseRedPacketRetry> list = fsCourseRedPacketRetryService.selectFsCourseRedPacketRetryList(fsCourseRedPacketRetry);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出课程红包失败重试记录列表
-     */
-    @PreAuthorize("@ss.hasPermi('course:courseRedPacketRetry:export')")
-    @Log(title = "课程红包失败重试记录", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsCourseRedPacketRetry fsCourseRedPacketRetry)
-    {
-        List<FsCourseRedPacketRetry> list = fsCourseRedPacketRetryService.selectFsCourseRedPacketRetryList(fsCourseRedPacketRetry);
-        ExcelUtil<FsCourseRedPacketRetry> util = new ExcelUtil<FsCourseRedPacketRetry>(FsCourseRedPacketRetry.class);
-        return util.exportExcel(list, "课程红包失败重试记录数据");
-    }
-
-    /**
-     * 获取课程红包失败重试记录详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('course:courseRedPacketRetry:query')")
-    @GetMapping(value = "/{logId}")
-    public AjaxResult getInfo(@PathVariable("logId") Long logId)
-    {
-        return AjaxResult.success(fsCourseRedPacketRetryService.selectFsCourseRedPacketRetryByLogId(logId));
-    }
-
-    /**
-     * 新增课程红包失败重试记录
-     */
-    @PreAuthorize("@ss.hasPermi('course:courseRedPacketRetry:add')")
-    @Log(title = "课程红包失败重试记录", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsCourseRedPacketRetry fsCourseRedPacketRetry)
-    {
-        return toAjax(fsCourseRedPacketRetryService.insertFsCourseRedPacketRetry(fsCourseRedPacketRetry));
-    }
-
-    /**
-     * 修改课程红包失败重试记录
-     */
-    @PreAuthorize("@ss.hasPermi('course:courseRedPacketRetry:edit')")
-    @Log(title = "课程红包失败重试记录", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsCourseRedPacketRetry fsCourseRedPacketRetry)
-    {
-        return toAjax(fsCourseRedPacketRetryService.updateFsCourseRedPacketRetry(fsCourseRedPacketRetry));
-    }
-
-    /**
-     * 删除课程红包失败重试记录
-     */
-    @PreAuthorize("@ss.hasPermi('course:courseRedPacketRetry:remove')")
-    @Log(title = "课程红包失败重试记录", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{logIds}")
-    public AjaxResult remove(@PathVariable Long[] logIds)
-    {
-        return toAjax(fsCourseRedPacketRetryService.deleteFsCourseRedPacketRetryByLogIds(logIds));
-    }
-}

fs-admin/src/main/java/com/fs/course/controller/FsUserVideoController.java

@@ -209,6 +209,7 @@ public class FsUserVideoController extends BaseController
             url = storage.uploadSuffix(inputStream, suffix);
         }  catch (Exception e) {
             // 记录错误日志
+            log.error("上传封面图失败:{}",e.getMessage(),e);
             return R.error("上传封面图失败");
         } finally {
             // 清理临时文件

fs-admin/src/main/java/com/fs/course/controller/MarketPushController.java

@@ -1,103 +0,0 @@
-package com.fs.course.controller;
-
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.enums.BusinessType;
-import com.fs.course.domain.MarketPush;
-import com.fs.course.service.IMarketPushService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
-
-/**
- * 营销活动推送Controller
- * 
- * @author fs
- * @date 2025-03-25
- */
-@RestController
-@RequestMapping("/push/push")
-public class MarketPushController extends BaseController
-{
-    @Autowired
-    private IMarketPushService marketPushService;
-
-    /**
-     * 查询营销活动推送列表
-     */
-    @PreAuthorize("@ss.hasPermi('push:push:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(MarketPush marketPush)
-    {
-        startPage();
-        List<MarketPush> list = marketPushService.selectMarketPushList(marketPush);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出营销活动推送列表
-     */
-    @PreAuthorize("@ss.hasPermi('push:push:export')")
-    @Log(title = "营销活动推送", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(MarketPush marketPush)
-    {
-        List<MarketPush> list = marketPushService.selectMarketPushList(marketPush);
-        ExcelUtil<MarketPush> util = new ExcelUtil<MarketPush>(MarketPush.class);
-        return util.exportExcel(list, "营销活动推送数据");
-    }
-
-    /**
-     * 获取营销活动推送详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('push:push:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(marketPushService.selectMarketPushById(id));
-    }
-
-    /**
-     * 新增营销活动推送
-     */
-    @PreAuthorize("@ss.hasPermi('push:push:add')")
-    @Log(title = "营销活动推送", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody MarketPush marketPush)
-    {
-        return toAjax(marketPushService.insertMarketPush(marketPush));
-    }
-
-    /**
-     * 修改营销活动推送
-     */
-    @PreAuthorize("@ss.hasPermi('push:push:edit')")
-    @Log(title = "营销活动推送", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody MarketPush marketPush)
-    {
-        return toAjax(marketPushService.updateMarketPush(marketPush));
-    }
-
-    /**
-     * 删除营销活动推送
-     */
-    @PreAuthorize("@ss.hasPermi('push:push:remove')")
-    @Log(title = "营销活动推送", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(marketPushService.deleteMarketPushByIds(ids));
-    }
-}

fs-admin/src/main/java/com/fs/his/task/AppPushMsgTask.java

@@ -1,164 +0,0 @@
-package com.fs.his.task;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
-import com.fs.common.utils.DateUtils;
-import com.fs.common.utils.StringUtils;
-import com.fs.gtPush.domain.UniPushLog;
-import com.fs.gtPush.domain.PushResult;
-import com.fs.gtPush.service.UniPushLogService;
-import com.fs.gtPush.service.uniPush2Service;
-import com.fs.gtPush.utils.PushUtils;
-import com.fs.his.enums.FsStoreOrderStatusEnum;
-import com.fs.his.enums.PushLogDesTypeEnum;
-import com.fs.his.enums.PushLogTypeEnum;
-import com.fs.his.service.IFsPackageOrderService;
-import com.fs.his.service.IFsStoreOrderService;
-import com.fs.his.vo.FsStoreOrderAndUserVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import com.fs.gtPush.domain.PushReqBean;
-
-import java.util.*;
-
-@Component("appPushMsgTask")
-public class AppPushMsgTask {
-    @Autowired
-    private IFsStoreOrderService orderService;
-    @Autowired
-    private UniPushLogService logService;
-    @Autowired
-    private uniPush2Service uniPush2Service;
-    @Autowired
-    private IFsPackageOrderService packageOrderService;
-
-    //订单 通知类型
-    //1.订单未支付
-    public void unPayPush() {
-        //处方
-        unPayPushList(PushLogTypeEnum.ORDER_STORE.getValue());
-        //服务包
-        unPayPushList(PushLogTypeEnum.ORDER_PACKAGE.getValue());
-
-
-    }
-
-    /**
-     * 查询列表发送
-     *
-     * @param type
-     */
-    private void unPayPushList(Float type) {
-        //查询已通知的订单
-        UniPushLog uniPushLog = new UniPushLog();
-        uniPushLog.setType(type);
-        uniPushLog.setDesType(PushLogDesTypeEnum.ORDER_UN_PAY.getValue());
-        uniPushLog.setPushRes(1);
-        List<UniPushLog> uniPushLogs = logService.selectUniPushLogList(uniPushLog);
-        List<FsStoreOrderAndUserVo> orderList = null;
-        if (Objects.equals(type, PushLogTypeEnum.ORDER_STORE.getValue())) {
-            //查询超时未支付订单
-            orderList = orderService.selectOrderListAndUser(
-                    FsStoreOrderStatusEnum.STATUS_1.getValue(),//未支付
-                    10,//10分钟
-                    uniPushLogs);
-        } else if (Objects.equals(type, PushLogTypeEnum.ORDER_PACKAGE.getValue())) {
-            //查询超时未支付服务包订单
-            orderList = packageOrderService.selectOrderListAndUser(
-                    FsStoreOrderStatusEnum.STATUS_1.getValue(),//未支付
-                    10,//10分钟
-                    uniPushLogs);
-        } else {
-            return;
-        }
-
-        pushOrderList(orderList, type);
-    }
-
-    /**
-     * 拆分发送
-     *
-     * @param orderList
-     * @param type
-     */
-    private void pushOrderList(List<FsStoreOrderAndUserVo> orderList, Float type) {
-        //官方要求一次不大于1000
-        if (orderList != null && !orderList.isEmpty()) {
-            ArrayList<List<FsStoreOrderAndUserVo>> arrayList = new ArrayList<>();
-            //分片
-            while (true) {
-                if (orderList.size() > 1000) {
-                    List<FsStoreOrderAndUserVo> tempList = orderList.subList(0, 1000);
-                    arrayList.add(tempList);
-                    orderList = orderList.subList(1000, orderList.size());
-                } else {
-                    if (!orderList.isEmpty()) {
-                        arrayList.add(orderList);
-                    }
-                    break;
-                }
-            }
-            arrayList.forEach(list -> pushUnPayMsg(list, type));
-        }
-    }
-
-    /**
-     * 发送未支付通知
-     *
-     * @param orderList
-     * @param type
-     */
-    private void pushUnPayMsg(List<FsStoreOrderAndUserVo> orderList, Float type) {
-        if (orderList != null && !orderList.isEmpty()) {
-            //cids
-            List<String> cids = new ArrayList<>();
-            ArrayList<UniPushLog> addLogs = new ArrayList<>();
-            orderList.forEach(order -> {
-                UniPushLog pushAddLog = new UniPushLog();
-                pushAddLog.setJpushId(order.getJpushId());
-                pushAddLog.setType(order.getType() == null ? PushLogTypeEnum.ORDER.getValue() : order.getType());
-                pushAddLog.setDesType(PushLogDesTypeEnum.ORDER_UN_PAY.getValue());
-                pushAddLog.setUserId(order.getUserId());
-                pushAddLog.setBusinessId(order.getOrderId());
-                pushAddLog.setPushMsg(
-                        "{" +
-                                "\"push_clientid\":\"" + order.getJpushId() +
-                                "\",\"title\":\"" + PushLogDesTypeEnum.ORDER_UN_PAY.getDesc() +
-                                "\",\"content\":\"您有订单未支付\"" +
-                                "\",\"force_notification\":true\"" +
-                                "\",\"category\":{\"harmony\":\"EXPRESS\", \"huawei\":\"EXPRESS\", \"vivo\":\"ORDER\"}" +
-                                "\",\"payload\":{\"url\":\"订单详情页\"}"
-                        + "}"
-                );
-                pushAddLog.setCreateTime(DateUtils.getNowDate());
-                addLogs.add(pushAddLog);
-                cids.add(order.getJpushId());
-            });
-
-            HashMap<String, Object> map = new HashMap<>();
-            HashMap<String, Object> map2 = new HashMap<>();
-            if (Objects.equals(type, PushLogTypeEnum.ORDER_STORE.getValue())) {
-                map.put("url", "/pages/store/storeOrderList?status=1"); //处方
-            } else if (Objects.equals(type, PushLogTypeEnum.ORDER_PACKAGE.getValue())) {
-                map.put("url", "/pages/store/packageOrderList?status=1"); //服务包
-            }
-
-            Map<String, Object> xmConfig = new HashMap<>();
-            String channel = "113892"; //订单
-            xmConfig.put("/extra.channel_id", channel);
-            map2.put("XM", xmConfig);
-
-
-            PushReqBean pushReqBean = new PushReqBean(cids, PushLogDesTypeEnum.ORDER_UN_PAY.getDesc(), "您有订单未支付", map, map2);
-            PushResult pushResult = uniPush2Service.pushMessage(pushReqBean);
-            ArrayList<UniPushLog> logs = PushUtils.returnArrayMsg(pushResult, addLogs);
-            //更新日志结果
-            logService.saveBatch(logs, 1000);
-
-        }
-    }
-
-
-    //健康管理
-    //营销
-}

fs-admin/src/main/java/com/fs/his/task/OrderTask.java

@@ -1,111 +0,0 @@
-package com.fs.his.task;
-
-import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSON;
-import com.fs.course.service.IFsUserCourseOrderService;
-import com.fs.his.config.StoreConfig;
-import com.fs.his.domain.FsPackageOrder;
-import com.fs.his.domain.FsStoreOrder;
-import com.fs.his.param.FsPackageOrderCancelParam;
-import com.fs.his.service.IFsPackageOrderService;
-import com.fs.his.service.IFsStoreOrderService;
-import com.fs.system.domain.SysConfig;
-import com.fs.system.service.ISysConfigService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Consumer;
-
-@Slf4j
-@Component("orderTask")
-public class OrderTask {
-    @Autowired
-    private IFsStoreOrderService orderService;
-    @Autowired
-    private ISysConfigService sysConfigService;
-    @Autowired
-    private IFsUserCourseOrderService userCourseOrderService;
-    @Autowired
-    private IFsPackageOrderService packageOrderService;
-
-    @Autowired
-    private ThreadPoolTaskExecutor threadPoolTaskExecutor;
-
-
-    public void cancelOrder(){
-        //查询超时订单
-        SysConfig sysConfig= sysConfigService.selectConfigByConfigKey("his.store");
-        StoreConfig config= JSONUtil.toBean(sysConfig.getConfigValue(),StoreConfig.class);
-        Integer unPayTime = config.getUnPayTime(); //分钟
-        if (unPayTime == null){
-            return ;
-        }
-        //1.处方订单
-        //查询超时未支付订单
-        List<FsStoreOrder> orderList = orderService.selectOutTimeOrderList(unPayTime);
-        //取消订单
-        List<CompletableFuture<Void>> orderFutures = cancelOrdersAsync(orderList, order -> {
-            orderService.cancelOrder(order.getOrderId());
-        });
-
-//        //2.课程订单
-//        //查询超时未支付订单
-//        List<FsUserCourseOrder> courseOrderlist = userCourseOrderService.selectOutTimeOrderList(unPayTime);
-//        //取消订单
-//        courseOrderlist.forEach(order->{
-//            userCourseOrderService.cancelOrder(order.getOrderId());
-//        });
-        //3.服务包订单
-        //查询超时未支付订单
-        List<FsPackageOrder> packageOrderList = packageOrderService.selectOutTimeOrderList(unPayTime);
-        //取消订单
-        List<CompletableFuture<Void>> packageOrderFutures = cancelOrdersAsync(packageOrderList, order -> {
-            FsPackageOrderCancelParam param = new FsPackageOrderCancelParam();
-            param.setOrderId(order.getOrderId());
-            packageOrderService.cancel(param);
-        });
-
-        // 等待所有任务完成
-        waitForAllTasksToComplete(orderFutures);
-        waitForAllTasksToComplete(packageOrderFutures);
-    }
-
-    /**
-     * 异步取消订单
-     * @param orders 订单列表
-     * @param cancelAction 取消订单的逻辑
-     * @param <T> 订单类型
-     * @return CompletableFuture列表
-     */
-    private <T> List<CompletableFuture<Void>> cancelOrdersAsync(List<T> orders, Consumer<T> cancelAction) {
-        List<CompletableFuture<Void>> futures = new ArrayList<>();
-        for (T order : orders) {
-            CompletableFuture<Void> future = CompletableFuture.runAsync(() -> {
-                try {
-                    cancelAction.accept(order);
-                } catch (Exception e) {
-                    // 记录异常日志
-                    System.err.println("Failed to cancel order: " + order + ", Error: " + e.getMessage());
-                }
-            }, threadPoolTaskExecutor);
-            futures.add(future);
-        }
-        return futures;
-    }
-
-    /**
-     * 等待所有任务完成
-     * @param futures CompletableFuture列表
-     */
-    private void waitForAllTasksToComplete(List<CompletableFuture<Void>> futures) {
-        CompletableFuture<Void> allFutures = CompletableFuture.allOf(
-                futures.toArray(new CompletableFuture[0])
-        );
-        allFutures.join(); // 等待所有任务完成
-    }
-}

fs-admin/src/main/java/com/fs/his/task/Task.java

@@ -29,10 +29,8 @@ import com.fs.company.vo.RedPacketMoneyVO;
 import com.fs.core.config.WxMaConfiguration;
 import com.fs.course.mapper.FsCourseRedPacketLogMapper;
 import com.fs.course.service.IFsCourseWatchLogService;
-import com.fs.course.service.IMarketPushService;
 import com.fs.crm.param.SmsSendParam;
 import com.fs.erp.domain.ErpDeliverys;
-import com.fs.erp.domain.ErpOrder;
 import com.fs.erp.domain.ErpOrderQuery;
 import com.fs.erp.dto.*;
 import com.fs.erp.service.IErpOrderService;
@@ -68,7 +66,6 @@ import com.fs.qw.mapper.QwAppContactWayMapper;
 import com.fs.qw.mapper.QwExternalContactTransferLogMapper;
 import com.fs.qw.service.IQwAppContactWayService;
 import com.fs.qw.service.IQwExternalContactTransferLogService;
-import com.fs.qw.service.IQwWorkTaskService;
 import com.fs.qw.service.impl.QwAppContactWayServiceImpl;
 import com.fs.qwApi.Result.QwSendMsgResult;
 import com.fs.qwApi.param.QwSendMsgParam;
@@ -123,8 +120,6 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 
@@ -215,39 +210,18 @@ public class Task {
     @Autowired
     private IFsCourseWatchLogService fsCourseWatchLogService;
 
-    @Autowired
-    private IQwWorkTaskService qwWorkTaskService;
-
-    @Autowired
-    private IMarketPushService marketPushService;
-
     public void tt() throws Exception
     {
-        fsCourseWatchLogService.saveClickHouseAndDel();
-    }
 
-    public void qwWorkTask1() throws Exception
-    {
-        qwWorkTaskService.addQwWorkByCourse4();
-        qwWorkTaskService.addQwWorkByCourseLastTime();
-    }
-    public void qwWorkTask2() throws Exception
-    {
-        qwWorkTaskService.addQwWorkByCourse();
-        qwWorkTaskService.addQwWorkByFirstCourse();
-    }
-    public void qwWorkTask3() throws Exception
-    {
-        qwWorkTaskService.addQwWorkByConversionDay();
-    }
-    public void qwWorkTask4() throws Exception
-    {
-        qwWorkTaskService.delQwWorkTaskByOver();
+
     }
+
+
     public void addPrescribeImg() throws Exception
     {
        List<Long> ids= fsPrescribeService.selectFsPrescribeByPrescribeIdByOrderType();
         for (Long id : ids) {
+            System.out.println(id);
             fsPrescribeService.PrescribeStoreImg(id);
         }
     }
@@ -326,35 +300,31 @@ public class Task {
     public void deliveryOp()
     {
         List<FsStoreOrder> orders = fsStoreOrderMapper.selectOmsOrderdeliveryOp();
-        ExecutorService executorService = Executors.newFixedThreadPool(50);
         for(FsStoreOrder order:orders){
-            executorService.submit(() ->  ErpOrderDelivery(order.getExtendOrderId(),order.getOrderCode()));
-        }
-        executorService.shutdown(); // 关闭线程池，等待所有任务完成
-    }
 
-    private void ErpOrderDelivery(String extendOrderId, String orderCode) {
-        ErpOrderQueryRequert request=new ErpOrderQueryRequert();
-        request.setCode(extendOrderId);
-        ErpOrderQueryResponse response=erpOrderService.getOrder(request);
-        if(response.getOrders()!=null&& !response.getOrders().isEmpty()){
-            for(ErpOrderQuery orderQuery : response.getOrders()){
-                if(orderQuery.getDeliverys()!=null&& !orderQuery.getDeliverys().isEmpty()){
-                    for(ErpDeliverys delivery:orderQuery.getDeliverys()){
-                        if(delivery.getDelivery()&& StringUtils.isNotEmpty(delivery.getMail_no())){
-                            //更新商订单状态 删除REDIS
-                            fsStoreOrderService.deliveryOrder(orderCode,delivery.getMail_no(),delivery.getExpress_code(),delivery.getExpress_name());
-                            redisCache.deleteObject("delivery"+":"+extendOrderId);
+            ErpOrderQueryRequert request=new ErpOrderQueryRequert();
+
+            request.setCode(order.getExtendOrderId());
+            ErpOrderQueryResponse response=erpOrderService.getOrder(request);
+            if(response.getOrders()!=null&&response.getOrders().size()>0){
+                for(ErpOrderQuery orderQuery : response.getOrders()){
+                    if(orderQuery.getDeliverys()!=null&&orderQuery.getDeliverys().size()>0){
+                        for(ErpDeliverys delivery:orderQuery.getDeliverys()){
+                            if(delivery.getDelivery()&& StringUtils.isNotEmpty(delivery.getMail_no())){
+                                //更新商订单状态 删除REDIS
+                                fsStoreOrderService.deliveryOrder(order.getOrderCode(),delivery.getMail_no(),delivery.getExpress_code(),delivery.getExpress_name());
+                                redisCache.deleteObject("delivery"+":"+order.getExtendOrderId());
+                            }
                         }
-                    }
 
+                    }
                 }
             }
         }
-    }
 
 
 
+    }
 
     public void CreateOmsAndHis()
     {

fs-admin/src/main/java/com/fs/live/controller/LiveVideoController.java

@@ -68,16 +68,6 @@ public class LiveVideoController extends BaseController
         return AjaxResult.success(liveVideoService.selectLiveVideoByVideoId(videoId));
     }
 
-    /**
-     * 获取直播视频详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveVideo:query')")
-    @GetMapping(value = "/liveVideoByLiveId/{liveId}")
-    public AjaxResult getLiveVideoByLiveId(@PathVariable("liveId") Long liveId)
-    {
-        return AjaxResult.success(liveVideoService.selectLiveVideoByLiveId(liveId));
-    }
-
     /**
      * 新增直播视频
      */

fs-admin/src/main/java/com/fs/live/controller/LiveWatchUserController.java

@@ -1,13 +1,16 @@
 package com.fs.live.controller;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-
-import com.fs.live.vo.LiveWatchUserVO;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
@@ -42,16 +45,6 @@ public class LiveWatchUserController extends BaseController
         return getDataTable(list);
     }
 
-    @PreAuthorize("@ss.hasPermi('live:liveWatchUser:list')")
-    @GetMapping("/watchUserList")
-    public TableDataInfo watchUserList(@RequestParam Long liveId) {
-        Map<String, Object> params = new HashMap<>();
-        params.put("liveId", liveId);
-        startPage();
-        List<LiveWatchUserVO> onLineUserList = liveWatchUserService.selectWatchUserList(params);
-        return getDataTable(onLineUserList);
-    }
-
     /**
      * 导出直播间观看用户列表
      */
@@ -107,15 +100,4 @@ public class LiveWatchUserController extends BaseController
     {
         return toAjax(liveWatchUserService.deleteLiveWatchUserByIds(ids));
     }
-
-    /**
-     * 修改直播间用户禁言状态
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveWatchUser:edit')")
-    @Log(title = "直播间观看用户", businessType = BusinessType.UPDATE)
-    @PutMapping("/changeUserState")
-    public AjaxResult changeUserState(@RequestParam Long liveId, @RequestParam Long userId) {
-        return toAjax(liveWatchUserService.changeUserState(liveId, userId));
-    }
-
 }

fs-admin/src/main/java/com/fs/qw/controller/QwSopController.java

@@ -13,7 +13,6 @@ import com.fs.course.mapper.FsUserCourseMapper;
 import com.fs.course.mapper.FsUserCourseVideoMapper;
 import com.fs.his.vo.OptionsVO;
 import com.fs.qw.domain.QwSopUpdateStatus;
-import com.fs.qw.param.QwLoginParam;
 import com.fs.qw.service.IQwUserService;
 import com.fs.sop.domain.QwSop;
 import com.fs.sop.params.QwSopAutoTime;
@@ -48,28 +47,6 @@ public class QwSopController extends BaseController
     private FsUserCourseMapper fsUserCourseMapper;
     @Autowired
     private FsUserCourseVideoMapper fsUserCourseVideoMapper;
-
-
-    /**
-     * 登录企业微信(全部发起登录)
-     */
-    @PreAuthorize("@ss.hasPermi('qw:user:loginAll')")
-    @GetMapping("/loginQwAll")
-    public R loginQwAll(){
-        return qwUserService.loginQwAll();
-    }
-
-
-    /**
-     * 登录企业微信(全部发起退出登录)
-     */
-    @PreAuthorize("@ss.hasPermi('qw:user:qwLoginOutAll')")
-    @GetMapping("/qwLoginOutAll")
-    public R qwLoginOutAll(){
-        return qwUserService.qwLoginOutAll();
-    }
-
-
     /**
      * 查询企微sop列表
      */

fs-admin/src/main/java/com/fs/qw/controller/QwWorkShortLinkController.java

@@ -1,113 +0,0 @@
-package com.fs.qw.controller;
-
-import java.util.List;
-
-import com.fs.common.core.domain.R;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.enums.BusinessType;
-import com.fs.qw.domain.QwWorkShortLink;
-import com.fs.qw.service.IQwWorkShortLinkService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
-
-/**
- * 企微获客链接短链Controller
- * 
- * @author fs
- * @date 2025-03-27
- */
-@RestController
-@RequestMapping("/qw/QwWorkShortLink")
-public class QwWorkShortLinkController extends BaseController
-{
-    @Autowired
-    private IQwWorkShortLinkService qwWorkShortLinkService;
-
-    /**
-     * 查询企微获客链接短链列表
-     */
-    @PreAuthorize("@ss.hasPermi('qw:QwWorkShortLink:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(QwWorkShortLink qwWorkShortLink)
-    {
-        startPage();
-        List<QwWorkShortLink> list = qwWorkShortLinkService.selectQwWorkShortLinkList(qwWorkShortLink);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出企微获客链接短链列表
-     */
-    @PreAuthorize("@ss.hasPermi('qw:QwWorkShortLink:export')")
-    @Log(title = "企微获客链接短链", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(QwWorkShortLink qwWorkShortLink)
-    {
-        List<QwWorkShortLink> list = qwWorkShortLinkService.selectQwWorkShortLinkList(qwWorkShortLink);
-        ExcelUtil<QwWorkShortLink> util = new ExcelUtil<QwWorkShortLink>(QwWorkShortLink.class);
-        return util.exportExcel(list, "企微获客链接短链数据");
-    }
-
-    /**
-     * 获取企微获客链接短链详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('qw:QwWorkShortLink:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(qwWorkShortLinkService.selectQwWorkShortLinkById(id));
-    }
-
-    /**
-     * 新增企微获客链接短链
-     */
-    @PreAuthorize("@ss.hasPermi('qw:QwWorkShortLink:add')")
-    @Log(title = "企微获客链接短链", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody QwWorkShortLink qwWorkShortLink)
-    {
-        return toAjax(qwWorkShortLinkService.insertQwWorkShortLink(qwWorkShortLink));
-    }
-
-    /**
-     * 修改企微获客链接短链
-     */
-    @PreAuthorize("@ss.hasPermi('qw:QwWorkShortLink:edit')")
-    @Log(title = "企微获客链接短链", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody QwWorkShortLink qwWorkShortLink)
-    {
-        return toAjax(qwWorkShortLinkService.updateQwWorkShortLink(qwWorkShortLink));
-    }
-
-    /**
-     * 删除企微获客链接短链
-     */
-    @PreAuthorize("@ss.hasPermi('qw:QwWorkShortLink:remove')")
-    @Log(title = "企微获客链接短链", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(qwWorkShortLinkService.deleteQwWorkShortLinkByIds(ids));
-    }
-
-    /**
-     * 删除企微获客链接短链
-     */
-	@GetMapping("/getUrl")
-    public R getUrl(String no){
-        return R.ok().put("url", qwWorkShortLinkService.getUrl(no));
-    }
-}

fs-admin/src/main/java/com/fs/qw/qwTask/qwTask.java

@@ -1,22 +1,15 @@
 package com.fs.qw.qwTask;
 
-import com.fs.course.service.IFsUserCourseService;
-import com.fs.qw.mapper.QwCompanyMapper;
 import com.fs.qw.service.IQwExternalContactService;
 import com.fs.qw.service.IQwGroupMsgService;
-import com.fs.qw.service.impl.QwUserServiceImpl;
-import com.fs.qw.vo.QwOptionsVO;
 import com.fs.sop.service.impl.QwSopLogsServiceImpl;
 import com.fs.sop.service.impl.QwSopServiceImpl;
 import com.fs.sop.service.ISopUserLogsService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 @Component("qwTask")
 public class qwTask {
 
@@ -33,26 +26,11 @@ public class qwTask {
     private ISopUserLogsService sopUserLogsService;
     @Autowired
     private IQwExternalContactService qwExternalContactService;
-    @Autowired
-    private QwUserServiceImpl qwUserServiceImpl;
-    @Autowired
-    QwCompanyMapper qwCompanyMapper;
-
-    @Autowired
-    private IFsUserCourseService iFsUserCourseService;
-
     //正在使用
     public void qwExternalContact()
     {
         qwExternalContactService.qwExternalContactSync();
     }
-    public void syncQwUser()
-    {  List<QwOptionsVO> vos = qwCompanyMapper.selectQwCompanyListOptionsVO();
-        for (QwOptionsVO vo : vos) {
-            qwUserServiceImpl.syncQwUser(vo.getCorpId());
-        }
-
-    }
     //正在使用
     public void qwExternalContactAddAndDel()
     {
@@ -121,13 +99,4 @@ public class qwTask {
     public void updateQwSopLogsBySendStatusTask(){
         qwSopLogsService.updateQwSopLogsBySendStatus();
     }
-
-    /**
-     * 2天跑一次 将 课程的封面 上传企业微信 并上传到redis
-     */
-    public void processQwSopCourseMaterialTimer() {
-
-        iFsUserCourseService.processQwSopCourseMaterialTimer();
-
-    }
 }

fs-admin/src/main/resources/application-dev.yml

@@ -23,17 +23,17 @@ spring:
                 # #连接池最大阻塞等待时间（使用负值表示没有限制）
                 max-wait: -1ms
     datasource:
-        clickhouse:
-            type: com.alibaba.druid.pool.DruidDataSource
-            #            driverClassName: ru.yandex.clickhouse.ClickHouseDriver
-            driverClassName: com.clickhouse.jdbc.ClickHouseDriver
-            url: jdbc:clickhouse://1.14.104.71:8123/sop_test?compress=0&use_server_time_zone=true&use_client_time_zone=false&timezone=Asia/Shanghai
-            username: default
-            password: rt2024
-            initialSize: 10
-            maxActive: 100
-            minIdle: 10
-            maxWait: 6000
+#        clickhouse:
+#            type: com.alibaba.druid.pool.DruidDataSource
+#            #            driverClassName: ru.yandex.clickhouse.ClickHouseDriver
+#            driverClassName: com.clickhouse.jdbc.ClickHouseDriver
+#            url: jdbc:clickhouse://1.14.104.71:8123/sop_test?compress=0&use_server_time_zone=true&use_client_time_zone=false&timezone=Asia/Shanghai
+#            username: default
+#            password: rt2024
+#            initialSize: 10
+#            maxActive: 100
+#            minIdle: 10
+#            maxWait: 6000
         mysql:
             type: com.alibaba.druid.pool.DruidDataSource
             driverClassName: com.mysql.cj.jdbc.Driver
@@ -89,54 +89,7 @@ spring:
                     wall:
                         config:
                             multi-statement-allow: true
-        sop:
-            type: com.alibaba.druid.pool.DruidDataSource
-            driverClassName: com.mysql.cj.jdbc.Driver
-            druid:
-                # 主库数据源
-                master:
-                    url: jdbc:mysql://42.194.245.189:3306/test_his_sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                    username: root
-                    password: YJF_2024
-                # 初始连接数
-                initialSize: 5
-                # 最小连接池数量
-                minIdle: 10
-                # 最大连接池数量
-                maxActive: 20
-                # 配置获取连接等待超时的时间
-                maxWait: 60000
-                # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-                timeBetweenEvictionRunsMillis: 60000
-                # 配置一个连接在池中最小生存的时间，单位是毫秒
-                minEvictableIdleTimeMillis: 300000
-                # 配置一个连接在池中最大生存的时间，单位是毫秒
-                maxEvictableIdleTimeMillis: 900000
-                # 配置检测连接是否有效
-                validationQuery: SELECT 1 FROM DUAL
-                testWhileIdle: true
-                testOnBorrow: false
-                testOnReturn: false
-                webStatFilter:
-                    enabled: true
-                statViewServlet:
-                    enabled: true
-                    # 设置白名单，不填则允许所有访问
-                    allow:
-                    url-pattern: /druid/*
-                    # 控制台管理用户名和密码
-                    login-username: fs
-                    login-password: 123456
-                filter:
-                    stat:
-                        enabled: true
-                        # 慢SQL记录
-                        log-slow-sql: true
-                        slow-sql-millis: 1000
-                        merge-sql: true
-                    wall:
-                        config:
-                            multi-statement-allow: true
+
 
 rocketmq:
     name-server: rmq-1243b25nj.rocketmq.gz.public.tencenttdmq.com:8080 # RocketMQ NameServer 地址

fs-admin/src/main/resources/application-druid-dev.yml

@@ -1,103 +0,0 @@
-# 数据源配置
-spring:
-    # redis 配置
-    redis:
-        # 地址
-        host: localhost
-        # 端口，默认为6379
-        port: 6379
-        # 数据库索引
-        database: 0
-        # 密码
-        password:
-        # 连接超时时间
-        timeout: 20s
-        lettuce:
-            pool:
-                # 连接池中的最小空闲连接
-                min-idle: 0
-                # 连接池中的最大空闲连接
-                max-idle: 8
-                # 连接池的最大数据库连接数
-                max-active: 8
-                # #连接池最大阻塞等待时间（使用负值表示没有限制）
-                max-wait: -1ms
-    datasource:
-        #        clickhouse:
-        #            type: com.alibaba.druid.pool.DruidDataSource
-        #            #            driverClassName: ru.yandex.clickhouse.ClickHouseDriver
-        #            driverClassName: com.clickhouse.jdbc.ClickHouseDriver
-        #            url: jdbc:clickhouse://1.14.104.71:8123/sop_test?compress=0&use_server_time_zone=true&use_client_time_zone=false&timezone=Asia/Shanghai
-        #            username: default
-        #            password: rt2024
-        #            initialSize: 10
-        #            maxActive: 100
-        #            minIdle: 10
-        #            maxWait: 6000
-        mysql:
-            type: com.alibaba.druid.pool.DruidDataSource
-            driverClassName: com.mysql.cj.jdbc.Driver
-            druid:
-                # 主库数据源
-                master:
-                    url: jdbc:mysql://42.194.245.189:3306/rt_fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                    username: root
-                    password: YJF_2024
-                # 从库数据源
-                slave:
-                    # 从数据源开关/默认关闭
-                    enabled: false
-                    url:
-                    username:
-                    password:
-                # 初始连接数
-                initialSize: 5
-                # 最小连接池数量
-                minIdle: 10
-                # 最大连接池数量
-                maxActive: 20
-                # 配置获取连接等待超时的时间
-                maxWait: 60000
-                # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-                timeBetweenEvictionRunsMillis: 60000
-                # 配置一个连接在池中最小生存的时间，单位是毫秒
-                minEvictableIdleTimeMillis: 300000
-                # 配置一个连接在池中最大生存的时间，单位是毫秒
-                maxEvictableIdleTimeMillis: 900000
-                # 配置检测连接是否有效
-                validationQuery: SELECT 1 FROM DUAL
-                testWhileIdle: true
-                testOnBorrow: false
-                testOnReturn: false
-                webStatFilter:
-                    enabled: true
-                statViewServlet:
-                    enabled: true
-                    # 设置白名单，不填则允许所有访问
-                    allow:
-                    url-pattern: /druid/*
-                    # 控制台管理用户名和密码
-                    login-username: fs
-                    login-password: 123456
-                filter:
-                    stat:
-                        enabled: true
-                        # 慢SQL记录
-                        log-slow-sql: true
-                        slow-sql-millis: 1000
-                        merge-sql: true
-                    wall:
-                        config:
-                            multi-statement-allow: true
-
-
-rocketmq:
-    name-server: rmq-1243b25nj.rocketmq.gz.public.tencenttdmq.com:8080 # RocketMQ NameServer 地址
-    producer:
-        group: my-producer-group
-        access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
-        secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey
-    consumer:
-        group: test-group
-        access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
-        secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey

fs-admin/src/main/resources/application-druid-jz.yml

@@ -1,148 +0,0 @@
-# 数据源配置
-spring:
-    # redis 配置
-    redis:
-        # 地址
-        host: 127.0.0.1
-        # 端口，默认为6379
-        port: 6379
-        # 数据库索引
-        database: 0
-        # 密码
-        password:
-        # 连接超时时间
-        timeout: 20s
-        lettuce:
-            pool:
-                # 连接池中的最小空闲连接
-                min-idle: 0
-                # 连接池中的最大空闲连接
-                max-idle: 8
-                # 连接池的最大数据库连接数
-                max-active: 8
-                # #连接池最大阻塞等待时间（使用负值表示没有限制）
-                max-wait: -1ms
-    datasource:
-        #        clickhouse:
-        #            type: com.alibaba.druid.pool.DruidDataSource
-        #            driverClassName: com.clickhouse.jdbc.ClickHouseDriver
-        #            url: jdbc:clickhouse://cc-2vc8zzo26w0l7m2l6.public.clickhouse.ads.aliyuncs.com/sop?compress=0&use_server_time_zone=true&use_client_time_zone=false&timezone=Asia/Shanghai
-        #            username: rt_2024
-        #            password: Yzx_19860213
-        #            initialSize: 10
-        #            maxActive: 100
-        #            minIdle: 10
-        #            maxWait: 6000
-        mysql:
-            type: com.alibaba.druid.pool.DruidDataSource
-            driverClassName: com.mysql.cj.jdbc.Driver
-            druid:
-                # 主库数据源
-                master:
-                    url: jdbc:mysql://192.168.0.137:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                    username: root
-                    password: Ylrztek250218!3@.
-                # 从库数据源
-                slave:
-                    # 从数据源开关/默认关闭
-                    enabled: false
-                    url:
-                    username:
-                    password:
-                # 初始连接数
-                initialSize: 5
-                # 最小连接池数量
-                minIdle: 10
-                # 最大连接池数量
-                maxActive: 20
-                # 配置获取连接等待超时的时间
-                maxWait: 60000
-                # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-                timeBetweenEvictionRunsMillis: 60000
-                # 配置一个连接在池中最小生存的时间，单位是毫秒
-                minEvictableIdleTimeMillis: 300000
-                # 配置一个连接在池中最大生存的时间，单位是毫秒
-                maxEvictableIdleTimeMillis: 900000
-                # 配置检测连接是否有效
-                validationQuery: SELECT 1 FROM DUAL
-                testWhileIdle: true
-                testOnBorrow: false
-                testOnReturn: false
-                webStatFilter:
-                    enabled: true
-                statViewServlet:
-                    enabled: true
-                    # 设置白名单，不填则允许所有访问
-                    allow:
-                    url-pattern: /druid/*
-                    # 控制台管理用户名和密码
-                    login-username: fs
-                    login-password: 123456
-                filter:
-                    stat:
-                        enabled: true
-                        # 慢SQL记录
-                        log-slow-sql: true
-                        slow-sql-millis: 1000
-                        merge-sql: true
-                    wall:
-                        config:
-                            multi-statement-allow: true
-        sop:
-            type: com.alibaba.druid.pool.DruidDataSource
-            driverClassName: com.mysql.cj.jdbc.Driver
-            druid:
-                # 主库数据源
-                master:
-                    url: jdbc:mysql://192.168.0.137:3306/sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                    username: root
-                    password: Ylrztek250218!3@.
-                # 初始连接数
-                initialSize: 5
-                # 最小连接池数量
-                minIdle: 10
-                # 最大连接池数量
-                maxActive: 20
-                # 配置获取连接等待超时的时间
-                maxWait: 60000
-                # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-                timeBetweenEvictionRunsMillis: 60000
-                # 配置一个连接在池中最小生存的时间，单位是毫秒
-                minEvictableIdleTimeMillis: 300000
-                # 配置一个连接在池中最大生存的时间，单位是毫秒
-                maxEvictableIdleTimeMillis: 900000
-                # 配置检测连接是否有效
-                validationQuery: SELECT 1 FROM DUAL
-                testWhileIdle: true
-                testOnBorrow: false
-                testOnReturn: false
-                webStatFilter:
-                    enabled: true
-                statViewServlet:
-                    enabled: true
-                    # 设置白名单，不填则允许所有访问
-                    allow:
-                    url-pattern: /druid/*
-                    # 控制台管理用户名和密码
-                    login-username: fs
-                    login-password: 123456
-                filter:
-                    stat:
-                        enabled: true
-                        # 慢SQL记录
-                        log-slow-sql: true
-                        slow-sql-millis: 1000
-                        merge-sql: true
-                    wall:
-                        config:
-                            multi-statement-allow: true
-rocketmq:
-    name-server: rmq-1243b25nj.rocketmq.gz.public.tencenttdmq.com:8080 # RocketMQ NameServer 地址
-    producer:
-        group: my-producer-group
-        access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
-        secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey
-    consumer:
-        group: test-group
-        access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
-        secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey

fs-qw-api-msg/src/main/resources/application-druid-jz.yml → fs-admin/src/main/resources/application-druid-myhk.yml

@@ -2,16 +2,14 @@
 spring:
     # redis 配置
     redis:
-        # 地址
-        host: 127.0.0.1
-        # 端口，默认为6379
+        host: 172.27.0.6
         port: 6379
         # 数据库索引
         database: 0
         # 密码
-        password:
+        password: myhk888777666.
         # 连接超时时间
-        timeout: 20s
+        timeout: 10s
         lettuce:
             pool:
                 # 连接池中的最小空闲连接
@@ -23,25 +21,25 @@ spring:
                 # #连接池最大阻塞等待时间（使用负值表示没有限制）
                 max-wait: -1ms
     datasource:
-        #        clickhouse:
-        #            type: com.alibaba.druid.pool.DruidDataSource
-        #            driverClassName: com.clickhouse.jdbc.ClickHouseDriver
-        #            url: jdbc:clickhouse://cc-2vc8zzo26w0l7m2l6.public.clickhouse.ads.aliyuncs.com/sop?compress=0&use_server_time_zone=true&use_client_time_zone=false&timezone=Asia/Shanghai
-        #            username: rt_2024
-        #            password: Yzx_19860213
-        #            initialSize: 10
-        #            maxActive: 100
-        #            minIdle: 10
-        #            maxWait: 6000
+        clickhouse:
+            type: com.alibaba.druid.pool.DruidDataSource
+            driverClassName: com.clickhouse.jdbc.ClickHouseDriver
+            url: jdbc:clickhouse://1.14.104.71:8123/sop_test?compress=0&use_server_time_zone=true&use_client_time_zone=false&timezone=Asia/Shanghai
+            username: rt_2024
+            password: Yzx_19860213
+            initialSize: 10
+            maxActive: 100
+            minIdle: 10
+            maxWait: 6000
         mysql:
             type: com.alibaba.druid.pool.DruidDataSource
             driverClassName: com.mysql.cj.jdbc.Driver
             druid:
                 # 主库数据源
                 master:
-                    url: jdbc:mysql://192.168.0.137:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://172.27.0.17:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: root
-                    password: Ylrztek250218!3@.
+                    password: myhk888777666.
                 # 从库数据源
                 slave:
                     # 从数据源开关/默认关闭
@@ -94,9 +92,9 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                    url: jdbc:mysql://192.168.0.137:3306/sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://172.27.0.17:3306/fs_his_sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: root
-                    password: Ylrztek250218!3@.
+                    password: myhk888777666.
                 # 初始连接数
                 initialSize: 5
                 # 最小连接池数量
@@ -143,6 +141,7 @@ rocketmq:
         access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
         secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey
     consumer:
-        group: test-group
+        group: voice-group
         access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
         secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey
+

fs-admin/src/main/resources/application.yml

@@ -42,11 +42,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-#    active: druid-ylrz
-#    active: druid-yjf
-#    active: druid-dev
-#    active: druid
-    active: dev
+    active: druid
     include: config
   mvc:
     async:

fs-admin/src/test/java/com/fs/qw/qwTask/QwTaskTest.java

@@ -1,40 +0,0 @@
-package com.fs.qw.qwTask;
-
-import com.fs.FSApplication;
-import com.fs.wxwork.dto.*;
-import com.fs.wxwork.enums.DeverTypeEnum;
-import com.fs.wxwork.service.WxWorkService;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(value = SpringRunner.class)
-@SpringBootTest(classes = FSApplication.class)
-@Slf4j
-public class QwTaskTest {
-    @Autowired
-    private WxWorkService wxWorkService;
-    @Test
-    public void test() {
-//        WxWorkInitDTO wxWorkInitDTO = new WxWorkInitDTO();
-//        wxWorkInitDTO.setDeverType(DeverTypeEnum.IPAD.getValue());
-//        WxWorkResponseDTO<WxWorkInitRespDTO> initResp = wxWorkService.init(wxWorkInitDTO);
-//        log.info("initResp:{}", initResp);
-
-        // uuid: 486cd174a7bc7a81e94915df22958827
-        //登录企业微信
-        WxWorkGetQrCodeDTO wxWorkGetQrCodeDTO = new WxWorkGetQrCodeDTO();
-        wxWorkGetQrCodeDTO.setUuid("bf94b22b34e75317f6e3ff5065a46104");
-
-        WxWorkResponseDTO<WxWorkGetQrCodeRespDTO> qrCode = wxWorkService.getQrCode(wxWorkGetQrCodeDTO);
-        log.info("qrCode:{}", qrCode);
-//        WxWorkSendTextMsgDTO wxWorkSendTextMsgDTO = new WxWorkSendTextMsgDTO();
-//        wxWorkSendTextMsgDTO.setUuid(initResp.getData().getUuid());
-
-//        wxWorkService.SendTextMsg()
-
-    }
-}

fs-common/pom.xml

@@ -123,6 +123,11 @@
             <artifactId>hutool-all</artifactId>
             <version>5.3.3</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.10</version>
+        </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>

fs-common/src/main/java/com/fs/common/core/domain/ResponseResult.java

@@ -0,0 +1,100 @@
+package com.fs.common.core.domain;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fs.common.enums.BizResponseEnum;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+
+/**
+ * @author 曹丽芹
+ */
+@Getter
+@Setter
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ResponseResult<T> {
+    /**
+     * 自定义异常码
+     */
+    private Integer code;
+
+    /**
+     * 自定义异常信息
+     */
+    private String msg;
+
+    /**
+     * 响应数据
+     */
+    private T data;
+
+    /**
+     * 额外数据
+     */
+    private Object ext;
+
+    public ResponseResult() {
+    }
+
+    public ResponseResult(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public ResponseResult(BizResponseEnum exceptionEnum) {
+        this.code = exceptionEnum.getCode();
+        this.msg = exceptionEnum.getMsg();
+    }
+
+    public ResponseResult(Integer code, String msg, Object ext) {
+        this.code = code;
+        this.msg = msg;
+        this.ext = ext;
+    }
+
+    public ResponseResult(BizResponseEnum exceptionEnum, Object ext) {
+        this.code = exceptionEnum.getCode();
+        this.msg = exceptionEnum.getMsg();
+        this.ext = ext;
+    }
+
+    public ResponseResult(Integer code, String msg, T data, Object ext) {
+        this.code = code;
+        this.msg = msg;
+        this.data = data;
+        this.ext = ext;
+    }
+
+    public static <T> ResponseResult<T> ok() {
+        return ResponseResult.ok(null);
+    }
+
+    public static <T> ResponseResult<T> ok(T data) {
+        ResponseResult<T> ok = new ResponseResult<>();
+        ok.setCode(200);
+        ok.setMsg("success");
+        ok.setData(data);
+        return ok;
+    }
+
+    public static <T> ResponseResult<T> fail(BizResponseEnum exceptionEnum) {
+        return ResponseResult.fail(exceptionEnum, null);
+    }
+
+    public static <T> ResponseResult<T> fail(BizResponseEnum exceptionEnum, Object ext) {
+        ResponseResult<T> ok = new ResponseResult<>();
+        ok.setCode(exceptionEnum.getCode());
+        ok.setMsg(exceptionEnum.getMsg());
+        ok.setExt(ext);
+        return ok;
+    }
+
+    public static <T> ResponseResult<T> fail(Integer code, String msg) {
+        ResponseResult<T> ok = new ResponseResult<>();
+        ok.setCode(code);
+        ok.setMsg(msg);
+        return ok;
+    }
+}

fs-common/src/main/java/com/fs/common/core/redis/RedisCache.java

@@ -24,19 +24,6 @@ public class RedisCache
 {
     @Autowired
     public RedisTemplate redisTemplate;
-    /**
-     * 递增 key 对应的数值
-     *
-     * @param key 缓存键
-     * @param delta 增量
-     * @return 递增后的值
-     */
-    public Long increment(final String key, final long delta) {
-        return redisTemplate.opsForValue().increment(key, delta);
-    }
-    public Long incrementCacheValue(final String key, final long delta) {
-        return redisTemplate.opsForValue().increment(key, delta);
-    }
 
     /**
      * 缓存基本的对象，Integer、String、实体类等
@@ -87,18 +74,6 @@ public class RedisCache
         return redisTemplate.expire(key, timeout, unit);
     }
 
-    /**
-     * 当 key 不存在时设置值
-     *
-     * @param key   缓存键
-     * @param value 缓存值
-     * @param timeout 过期时间
-     * @param unit 时间单位
-     * @return true: 设置成功，false: key 已存在
-     */
-    public boolean setIfAbsent(final String key, final Object value, long timeout, TimeUnit unit) {
-        return Boolean.TRUE.equals(redisTemplate.opsForValue().setIfAbsent(key, value, timeout, unit));
-    }
     /**
      * 获得缓存的基本对象。
      *

fs-common/src/main/java/com/fs/common/enums/BizResponseEnum.java

@@ -0,0 +1,20 @@
+package com.fs.common.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum BizResponseEnum {
+    SUCCESS(200, "操作成功"),
+    FAIL(500, "操作失败"),
+    PARAM_ERROR(400, "参数错误"),
+    DATA_NOT_EXIST(1002, "数据不存在");
+
+    private final Integer code;
+    private final String msg;
+
+    BizResponseEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+}

fs-common/src/main/java/com/fs/common/utils/PubFun.java

@@ -232,7 +232,7 @@ public class PubFun {
 
 
     public static <T, A> List<A> listToNewList(List<T> list, Function<T, A> function){
-        return list.stream().filter(Objects::nonNull).map(function).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+        return list.stream().filter(Objects::nonNull).map(function).distinct().collect(Collectors.toList());
     }
     public static <T extends BaseEntityTow> List<Long> listGetIds(List<T> list){
         return list.stream().filter(Objects::nonNull).map(BaseEntityTow::getId).distinct().collect(Collectors.toList());

fs-company-app/src/main/resources/application-dev.yml

@@ -10,8 +10,8 @@ spring:
 #                url: jdbc:mysql://42.194.245.189:3306/test_fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #                url: jdbc:mysql://127.0.0.1:3306/rt_fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: YJF_2024
-#                password: 123456
+#                password: YJF_2024
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

fs-company/src/main/java/com/fs/company/controller/baidu/Conversion.java

@@ -4,7 +4,10 @@ import com.fs.baiduApi.BaiduApiService;
 import com.fs.baiduApi.Param.ConversionType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.List;

fs-company/src/main/java/com/fs/company/controller/common/CommonController.java

@@ -1,7 +1,5 @@
 package com.fs.company.controller.common;
 
-import com.fs.company.utils.AudioUtils;
-import com.fs.company.vo.WangUploadVO;
 import com.fs.common.config.FSConfig;
 import com.fs.common.constant.Constants;
 import com.fs.common.core.domain.AjaxResult;
@@ -10,12 +8,13 @@ import com.fs.common.exception.file.OssException;
 import com.fs.common.utils.StringUtils;
 import com.fs.common.utils.file.FileUploadUtils;
 import com.fs.common.utils.file.FileUtils;
+import com.fs.company.utils.AudioUtils;
+import com.fs.company.vo.WangUploadVO;
 import com.fs.framework.config.ServerConfig;
 import com.fs.his.domain.FsExportTask;
 import com.fs.his.service.IFsExportTaskService;
 import com.fs.qw.service.IQwWorkTaskService;
 import com.fs.qwApi.service.QwApiService;
-//import com.fs.sop.service.TestTwoService;
 import com.fs.system.oss.CloudStorageService;
 import com.fs.system.oss.OSSFactory;
 import org.slf4j.Logger;
@@ -66,15 +65,13 @@ public class CommonController
     @Autowired
     private IQwWorkTaskService qwWorkTaskService;
 
-    @PostMapping("/common/testDelQwWork")
+    @PostMapping("common/test")
     public R test() throws Exception
     {
         qwWorkTaskService.delQwWorkTaskByOver();
-//        qwWorkTaskService.addQwWorkByFirstCourse();
- //       qwWorkTaskService.addQwWorkByCourse();
-//        qwWorkTaskService.addQwWorkByCourse4();
+      //  qwWorkTaskService.addQwWorkByFirstCourse();
+//        qwWorkTaskService.addQwWorkByCourse();
 //        qwWorkTaskService.addQwWorkByConversionDay();
-   //     qwWorkTaskService.addQwWorkByCourseLastTime();
       return R.ok();
     }
     /**

fs-company/src/main/java/com/fs/company/controller/common/IndexController.java

@@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

fs-company/src/main/java/com/fs/company/controller/common/Test.java

@@ -1,39 +1,19 @@
 package com.fs.company.controller.common;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fs.ad.enums.AdUploadType;
 import com.fs.common.annotation.DataSource;
-import com.fs.common.config.FSConfig;
 import com.fs.common.enums.DataSourceType;
-import com.fs.common.utils.PubFun;
-import com.fs.common.utils.StringUtils;
-import com.fs.common.utils.file.FileUtils;
-import com.fs.framework.datasource.DynamicDataSourceContextHolder;
 import com.fs.qw.vo.AdUploadVo;
-import com.fs.qw.vo.QwSopTempSetting;
-import com.fs.qw.vo.QwSopTempSetting2;
-import com.fs.sop.domain.QwSopTemp;
-import com.fs.sop.domain.QwSopTempContent;
-import com.fs.sop.domain.QwSopTempDay;
-import com.fs.sop.domain.QwSopTempRules;
 import com.fs.sop.service.IQwSopTempContentService;
 import com.fs.sop.service.IQwSopTempDayService;
 import com.fs.sop.service.IQwSopTempRulesService;
 import com.fs.sop.service.IQwSopTempService;
-import com.fs.sop.vo.TempRulesVo;
 import lombok.AllArgsConstructor;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
-import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.*;
-import java.util.stream.Collectors;
-
 @RestController
 @AllArgsConstructor
 public class Test {

fs-company/src/main/java/com/fs/company/controller/company/CompanyController.java

@@ -12,12 +12,10 @@ import com.fs.company.service.ICompanyService;
 import com.fs.company.service.ICompanySmsService;
 import com.fs.company.service.ICompanyVoiceService;
 import com.fs.company.vo.CompanyNameVO;
-import com.fs.company.vo.CompanyVO;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import com.fs.his.vo.OptionsVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

fs-company/src/main/java/com/fs/company/controller/company/CompanyMoneyLogsController.java

@@ -6,17 +6,10 @@ import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.ParseUtils;
-import com.fs.common.utils.SecurityUtils;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.StringUtils;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.company.domain.CompanyMoneyLogs;
 import com.fs.company.param.CompanyMoneyLogsParam;
 import com.fs.company.service.ICompanyMoneyLogsService;
-import com.fs.company.vo.CompanyMoneyLogsExport1VO;
-import com.fs.company.vo.CompanyMoneyLogsExport2VO;
-import com.fs.company.vo.CompanyMoneyLogsExportVO;
 import com.fs.company.vo.CompanyMoneyLogsVO;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;

fs-company/src/main/java/com/fs/company/controller/company/CompanyRechargeController.java

@@ -7,14 +7,13 @@ import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
-
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.company.domain.Company;
 import com.fs.company.domain.CompanyRecharge;
-import com.fs.company.util.OrderUtils;
 import com.fs.company.service.ICompanyRechargeService;
 import com.fs.company.service.ICompanyService;
+import com.fs.company.util.OrderUtils;
 import com.fs.company.vo.CompanyRechargeVO;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;

fs-company/src/main/java/com/fs/company/controller/company/CompanySmsController.java

@@ -7,7 +7,6 @@ import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
-
 import com.fs.common.service.ISmsService;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;

fs-company/src/main/java/com/fs/company/controller/company/CompanyTcmConsumeController.java

@@ -11,7 +11,6 @@ import com.fs.company.domain.CompanyTcmConsume;
 import com.fs.company.service.ICompanyTcmConsumeService;
 import com.fs.company.service.ICompanyTcmScheduleService;
 import com.fs.company.vo.CompanyTcmConsumeVO;
-
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;

fs-company/src/main/java/com/fs/company/controller/company/CompanyTcmReportController.java

@@ -1,11 +1,9 @@
 package com.fs.company.controller.company;
 
-import com.fs.common.annotation.DataScope;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
-
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
@@ -19,7 +17,6 @@ import com.fs.company.service.ICompanyTcmScheduleService;
 import com.fs.company.vo.CompanyReportExportVO;
 import com.fs.company.vo.CompanyTcmReportListVO;
 import com.fs.company.vo.CompanyTcmStatisticsExportVO;
-
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;

fs-company/src/main/java/com/fs/company/controller/company/CompanyUserCardController.java

@@ -17,7 +17,6 @@ import com.fs.company.param.CompanyUserCardQueryParam;
 import com.fs.company.service.ICompanyUserCardService;
 import com.fs.company.utils.http.HttpUtils;
 import com.fs.crm.param.SmsSendBatchParam;
-import com.fs.crm.param.SmsSendUserParam;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import io.swagger.annotations.ApiOperation;

fs-company/src/main/java/com/fs/company/controller/company/CompanyUserController.java

@@ -22,20 +22,19 @@ import com.fs.company.service.ICompanyService;
 import com.fs.company.service.ICompanyUserService;
 import com.fs.company.vo.CompanyUserQwListVO;
 import com.fs.company.vo.CompanyUserVO;
-import com.fs.company.vo.OptionVO;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.security.SecurityUtils;
 import com.fs.framework.service.TokenService;
 import com.fs.qw.vo.CompanyUserQwVO;
 import com.fs.qw.vo.QwUserVO;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
 import java.util.stream.Collectors;
 
 
@@ -315,22 +314,5 @@ public class CompanyUserController extends BaseController
         return companyUserService.updateCompanyUserAreaList(param);
     }
 
-    /**
-     * 根据销售名称模糊查询
-     * @param name  名称
-     * @return  list
-     */
-    @GetMapping("/getCompanyUserListLikeName")
-    public R getCompanyUserListLikeName(@RequestParam(required = false) String name,
-                                        @RequestParam(required = false, defaultValue = "1") Integer pageNum,
-                                        @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
-        Map<String,Object> params = new HashMap<>();
-        params.put("nickName", name);
-        params.put("companyId", SecurityUtils.getLoginUser().getCompany().getCompanyId());
-
-        PageHelper.startPage(pageNum, pageSize);
-        List<OptionVO> companyUserList = companyUserService.selectCompanyUserListByMap(params);
-        return R.ok().put("data", new PageInfo<>(companyUserList));
-    }
 
 }

fs-company/src/main/java/com/fs/company/controller/company/CompanyVoiceCallerController.java

@@ -6,7 +6,6 @@ import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.DateUtils;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.company.domain.Company;

fs-company/src/main/java/com/fs/company/controller/company/CompanyVoicePackageOrderController.java

@@ -8,15 +8,12 @@ import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
-
 import com.fs.company.domain.CompanyVoicePackage;
 import com.fs.company.param.CompanyPackageBuyParam;
-
 import com.fs.company.param.CompanyVoicePackageOrderListParam;
 import com.fs.company.service.ICompanyVoicePackageOrderService;
 import com.fs.company.service.ICompanyVoicePackageService;
 import com.fs.company.vo.CompanyVoicePackageOrderListVO;
-
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;

fs-company/src/main/java/com/fs/company/controller/company/CompanyVoiceRoboticController.java

@@ -12,11 +12,9 @@ import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.SecurityUtils;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.StringUtils;
 import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.company.domain.CompanyUser;
 import com.fs.company.domain.CompanyVoiceRobotic;
 import com.fs.company.domain.CompanyVoiceRoboticCallees;
 import com.fs.company.domain.CompanyVoiceRoboticWx;
@@ -36,7 +34,7 @@ import java.util.stream.Collectors;
 
 /**
  * 机器人外呼任务Controller
- * 
+ *
  * @author fs
  * @date 2024-12-04
  */

fs-company/src/main/java/com/fs/company/controller/company/CompanyWxUserController.java

@@ -1,39 +1,30 @@
 package com.fs.company.controller.company;
 
-import java.util.List;
-
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
+import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
+import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
-import com.fs.qw.domain.QwExternalContact;
 import com.fs.qw.param.CompanyWxUserAddGroupParam;
-import com.fs.qw.param.QwExternalContactAddTagParam;
+import com.fs.wxUser.domain.CompanyWxUser;
 import com.fs.wxUser.param.CompanyWxUserBindFsUserParam;
 import com.fs.wxUser.param.CompanyWxUserParam;
+import com.fs.wxUser.service.ICompanyWxUserService;
 import com.fs.wxUser.vo.CompanyWxUserVO;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.enums.BusinessType;
-import com.fs.wxUser.domain.CompanyWxUser;
-import com.fs.wxUser.service.ICompanyWxUserService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 个微用户Controller
- * 
+ *
  * @author fs
  * @date 2024-10-22
  */

fs-company/src/main/java/com/fs/company/controller/company/CompanyWxUserGroupController.java

@@ -3,14 +3,12 @@ package com.fs.company.controller.company;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
-import com.fs.qw.domain.QwExternalContact;
 import com.fs.wxUser.domain.CompanyWxUserGroup;
 import com.fs.wxUser.service.ICompanyWxUserGroupService;
 import org.springframework.beans.factory.annotation.Autowired;

fs-company/src/main/java/com/fs/company/controller/company/FsDoctorController.java

@@ -1,35 +1,23 @@
 package com.fs.company.controller.company;
 
-import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.DateUtils;
-import com.fs.common.utils.SecurityUtils;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.utils.sign.Md5Utils;
-import com.fs.company.vo.OptionVO;
-import com.fs.his.domain.FsDoctor;
 import com.fs.his.param.FsDoctorParam;
-import com.fs.his.param.FsDoctorPriceParam;
-import com.fs.his.param.FsUpdateFollowParam;
 import com.fs.his.service.IFsDoctorService;
 import com.fs.his.utils.RedisCacheUtil;
 import com.fs.his.vo.FsDoctorListVO;
 import com.fs.his.vo.FsDoctorVO;
 import com.fs.his.vo.OptionsVO;
 import com.fs.his.vo.UserVo;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Base64;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 医生管理Controller
@@ -132,22 +120,7 @@ public class FsDoctorController extends BaseController
         return AjaxResult.success("成功",base64);
     }
 
-    /**
-     * 根据医生名称模糊查询
-     * @param name  名称
-     * @return  list
-     */
-    @GetMapping("/getDoctorListLikeName")
-    public AjaxResult getDoctorListLikeName(@RequestParam(required = false) String name,
-                                            @RequestParam(required = false, defaultValue = "1") Integer pageNum,
-                                            @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
-        Map<String, Object> params = new HashMap<>();
-        params.put("doctorName", name);
-
-        PageHelper.startPage(pageNum, pageSize);
-        List<OptionVO> list = fsDoctorService.selectDoctorListByMap(params);
-        return AjaxResult.success(new PageInfo<>(list));
-    }
+
 
 
 }

fs-company/src/main/java/com/fs/company/controller/company/FsStoreStatisticsController.java

@@ -16,7 +16,6 @@ import com.fs.company.vo.FsStoreProductStatisticsVO;
 import com.fs.framework.service.TokenService;
 import com.fs.his.service.IFsStoreOrderService;
 import com.fs.his.service.IFsStorePaymentService;
-import com.fs.his.vo.ChartProdVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;

fs-company/src/main/java/com/fs/company/controller/company/SysDictDataController.java

@@ -11,7 +11,10 @@ import com.fs.system.service.ISysDictDataService;
 import com.fs.system.service.ISysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 

fs-company/src/main/java/com/fs/company/controller/company/SysDictTypeController.java

@@ -7,11 +7,13 @@ import com.fs.common.core.domain.entity.SysDictType;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.poi.ExcelUtil;
-
 import com.fs.system.service.ISysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 

fs-company/src/main/java/com/fs/company/controller/course/FsCourseFinishTempController.java

@@ -1,29 +1,21 @@
 package com.fs.company.controller.course;
 
-import java.security.Security;
-import java.util.List;
-
-import com.fs.course.vo.FsCourseFinishTempListVO;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.security.SecurityUtils;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.course.domain.FsCourseFinishTemp;
 import com.fs.course.service.IFsCourseFinishTempService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
+import com.fs.course.vo.FsCourseFinishTempListVO;
+import com.fs.framework.security.LoginUser;
+import com.fs.framework.security.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 完课模板Controller
@@ -45,10 +37,9 @@ public class FsCourseFinishTempController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(FsCourseFinishTemp fsCourseFinishTemp)
     {
-        startPage();
-
         LoginUser loginUser = SecurityUtils.getLoginUser();
         fsCourseFinishTemp.setCompanyId(loginUser.getCompany().getCompanyId());
+        startPage();
         List<FsCourseFinishTempListVO> list = fsCourseFinishTempService.selectFsCourseFinishTempListVO(fsCourseFinishTemp);
         return getDataTable(list);
     }
@@ -74,8 +65,7 @@ public class FsCourseFinishTempController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-//        return AjaxResult.success(fsCourseFinishTempService.selectFsCourseFinishTempById(id));
-        return AjaxResult.success(fsCourseFinishTempService.selectFsCourseFinishTempByIdVO(id));
+        return AjaxResult.success(fsCourseFinishTempService.selectFsCourseFinishTempById(id));
     }
 
     /**

fs-company/src/main/java/com/fs/company/controller/course/FsCourseWatchLogController.java

@@ -19,9 +19,7 @@ import com.fs.course.vo.FsCourseWatchLogListVO;
 import com.fs.course.vo.FsCourseWatchLogStatisticsListVO;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
-import com.fs.qw.domain.QwWatchLog;
 import com.fs.qw.param.QwWatchLogStatisticsListParam;
-import com.fs.qw.param.SopUserLogsVO;
 import com.fs.qw.service.IQwWatchLogService;
 import com.fs.qw.vo.QwWatchLogAllStatisticsListVO;
 import com.fs.qw.vo.QwWatchLogStatisticsListVO;
@@ -32,7 +30,6 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 短链课程看课记录Controller

fs-company/src/main/java/com/fs/company/controller/course/FsUserCourseController.java

@@ -1,30 +1,24 @@
 package com.fs.company.controller.course;
 
-import java.util.List;
-
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
+import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
+import com.fs.course.domain.FsUserCourse;
 import com.fs.course.param.FsUserCourseParam;
+import com.fs.course.service.IFsUserCourseService;
 import com.fs.course.vo.FsUserCourseListPVO;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import com.fs.his.vo.OptionsVO;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.enums.BusinessType;
-import com.fs.course.domain.FsUserCourse;
-import com.fs.course.service.IFsUserCourseService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 课程Controller

fs-company/src/main/java/com/fs/company/controller/course/FsUserCourseVideoController.java

@@ -1,32 +1,25 @@
 package com.fs.company.controller.course;
 
-import java.util.List;
-
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
+import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.course.domain.FsUserCourseVideo;
 import com.fs.course.mapper.FsUserCourseVideoMapper;
 import com.fs.course.param.FsUserCourseVideoParam;
+import com.fs.course.service.IFsUserCourseVideoService;
 import com.fs.course.vo.FsUserCourseVideoVO;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.enums.BusinessType;
-import com.fs.course.domain.FsUserCourseVideo;
-import com.fs.course.service.IFsUserCourseVideoService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 课堂视频Controller

fs-company/src/main/java/com/fs/company/controller/crm/CrmCustomerController.java

@@ -11,11 +11,10 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.StringUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.company.domain.CompanyUser;
-import com.fs.company.util.OrderUtils;
 import com.fs.company.service.ICompanyUserService;
+import com.fs.company.util.OrderUtils;
 import com.fs.crm.domain.CrmCustomer;
 import com.fs.crm.param.*;
-import com.fs.crm.param.CrmCompanyLineCustomerImportParam;
 import com.fs.crm.service.ICrmCustomerService;
 import com.fs.crm.service.ICrmCustomerUserService;
 import com.fs.crm.vo.*;

fs-company/src/main/java/com/fs/company/controller/fastGpt/FastGptChatKeywordController.java

@@ -1,32 +1,24 @@
 package com.fs.company.controller.fastGpt;
 
-import java.util.List;
-
-import com.fs.common.utils.ServletUtils;
-import com.fs.fastGpt.service.IFastGptChatKeywordService;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.ServletUtils;
 import com.fs.fastGpt.domain.FastGptChatKeyword;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
+import com.fs.fastGpt.service.IFastGptChatKeywordService;
+import com.fs.framework.security.LoginUser;
+import com.fs.framework.service.TokenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 关键字Controller
- * 
+ *
  * @author fs
  * @date 2024-09-30
  */

fs-company/src/main/java/com/fs/company/controller/fastGpt/FastGptChatMsgController.java

@@ -1,38 +1,29 @@
 package com.fs.company.controller.fastGpt;
 
-import java.util.List;
-
-import com.fs.chat.domain.ChatMsg;
-import com.fs.chat.domain.ChatMsgLogs;
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.fastGpt.domain.FastGptChatMsg;
 import com.fs.fastGpt.domain.FastGptChatMsgLogs;
 import com.fs.fastGpt.param.FastGptChatMsgListCParam;
 import com.fs.fastGpt.service.IFastGptChatMsgLogsService;
+import com.fs.fastGpt.service.IFastGptChatMsgService;
 import com.fs.fastGpt.vo.FastGptChatMsgListCVO;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.enums.BusinessType;
-import com.fs.fastGpt.domain.FastGptChatMsg;
-import com.fs.fastGpt.service.IFastGptChatMsgService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 聊天记录Controller
- * 
+ *
  * @author fs
  * @date 2024-10-10
  */

fs-company/src/main/java/com/fs/company/controller/fastGpt/FastGptChatMsgLogsController.java

@@ -1,40 +1,31 @@
 package com.fs.company.controller.fastGpt;
 
-import java.util.List;
-
-import com.fs.chat.param.ChatMsgLogsListCParam;
-import com.fs.chat.vo.ChatMsgLogsListCVO;
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
+import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.fastGpt.domain.FastGptChatMsgLogs;
 import com.fs.fastGpt.param.FastGptChatMsgLogsListParam;
+import com.fs.fastGpt.service.IFastGptChatMsgLogsService;
 import com.fs.fastGpt.vo.FastGptChatMsgLogsListCVO;
 import com.fs.fastGpt.vo.FastGptChatMsgLogsVO;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.enums.BusinessType;
-import com.fs.fastGpt.domain.FastGptChatMsgLogs;
-import com.fs.fastGpt.service.IFastGptChatMsgLogsService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 聊天记录日志Controller
- * 
+ *
  * @author fs
  * @date 2024-10-10
  */

fs-company/src/main/java/com/fs/company/controller/fastGpt/FastGptChatSessionController.java

@@ -1,36 +1,27 @@
 package com.fs.company.controller.fastGpt;
 
-import java.util.List;
-
-import com.fs.chat.vo.ChatMsgVO;
-import com.fs.chat.vo.ChatSessionCVO;
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
+import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.fastGpt.domain.FastGptChatSession;
 import com.fs.fastGpt.param.FastGptChatSessionParam;
 import com.fs.fastGpt.service.IFastGptChatMsgService;
+import com.fs.fastGpt.service.IFastGptChatSessionService;
 import com.fs.fastGpt.vo.FastGptChatMsgCVO;
 import com.fs.fastGpt.vo.FastGptChatSessionCVO;
 import com.fs.fastGpt.vo.FastGptChatSessionListCVO;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.enums.BusinessType;
-import com.fs.fastGpt.domain.FastGptChatSession;
-import com.fs.fastGpt.service.IFastGptChatSessionService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 对话关系Controller
@@ -105,7 +96,7 @@ public class FastGptChatSessionController extends BaseController
     }
 
     /**
-     * 修改对话关系 
+     * 修改对话关系
      */
     @PreAuthorize("@ss.hasPermi('fastGpt:fastGptChatSession:edit')")
     @Log(title = "对话关系", businessType = BusinessType.UPDATE)

fs-company/src/main/java/com/fs/company/controller/fastGpt/FastGptCollectionController.java

@@ -8,7 +8,6 @@ import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
-import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.fastGpt.domain.FastGptCollection;
 import com.fs.fastGpt.service.IFastGptCollectionService;
 import com.fs.framework.security.LoginUser;
@@ -22,7 +21,7 @@ import java.util.List;
 
 /**
  * 集合Controller
- * 
+ *
  * @author fs
  * @date 2024-09-30
  */

fs-company/src/main/java/com/fs/company/controller/fastGpt/FastGptCollentionDataController.java

@@ -8,14 +8,11 @@ import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
-import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.fastGpt.domain.FastGptCollentionData;
 import com.fs.fastGpt.service.IFastGptCollentionDataService;
-import com.fs.fastgptApi.param.AddDataToCollectionBatchParam;
 import com.fs.fastgptApi.param.FastGptCollentionDataParam;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
-import org.bouncycastle.pqc.crypto.util.PQCOtherInfoGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -25,7 +22,7 @@ import java.util.List;
 
 /**
  * 集合里数据Controller
- * 
+ *
  * @author fs
  * @date 2024-09-30
  */

fs-company/src/main/java/com/fs/company/controller/fastGpt/FastGptDatasetController.java

@@ -1,14 +1,12 @@
 package com.fs.company.controller.fastGpt;
 
 
-import com.fs.chat.domain.ChatRole;
+import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
-import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.fastGpt.domain.FastGptDataset;
 import com.fs.fastGpt.service.IFastGptDatasetService;
 import com.fs.framework.security.LoginUser;
@@ -16,7 +14,7 @@ import com.fs.framework.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import com.fs.common.annotation.Log;
+
 import java.util.List;
 
 /**

fs-company/src/main/java/com/fs/company/controller/fastGpt/FastGptRoleController.java

@@ -1,43 +1,24 @@
 package com.fs.company.controller.fastGpt;
 
-import java.util.List;
-
-import cn.hutool.json.JSONUtil;
-import com.fs.chat.config.QwConfig;
-import com.fs.chat.domain.ChatRole;
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
+import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
-import com.fs.company.domain.CompanyConfig;
-import com.fs.company.service.ICompanyConfigService;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.fastGpt.domain.FastGptRole;
+import com.fs.fastGpt.service.IFastGptRoleService;
 import com.fs.fastGpt.vo.FastGptRoleVO;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import com.fs.his.vo.OptionsVO;
-import com.fs.qw.vo.QwOptionsVO;
-import com.fs.wx.kf.dto.WeixinKfAddEditAccountDTO;
-import com.fs.wx.kf.dto.WeixinKuGetAccountUrlDTO;
-import com.fs.wx.kf.service.IWeixinKfService;
-import com.fs.wx.kf.vo.WeixinKfAddEditAccountVO;
-import com.fs.wx.kf.vo.WeixinKfGetAccountUrlVO;
-import org.springframework.beans.BeanUtils;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.enums.BusinessType;
-import com.fs.fastGpt.domain.FastGptRole;
-import com.fs.fastGpt.service.IFastGptRoleService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 应用Controller

fs-company/src/main/java/com/fs/company/controller/fastGpt/FastGptRoleTagController.java

@@ -1,24 +1,18 @@
 package com.fs.company.controller.fastGpt;
 
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.fastGpt.domain.FastGptRoleTag;
 import com.fs.fastGpt.service.IFastGptRoleTagService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * AI的标签Controller

fs-company/src/main/java/com/fs/company/controller/fastGpt/FastgptTagController.java

@@ -1,24 +1,18 @@
 package com.fs.company.controller.fastGpt;
 
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.fastGpt.domain.FastgptTag;
 import com.fs.fastGpt.service.IFastgptTagService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * ai标签Controller

fs-company/src/main/java/com/fs/company/controller/fastGpt/FastgptTagGroupController.java

@@ -1,24 +1,18 @@
 package com.fs.company.controller.fastGpt;
 
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.fastGpt.domain.FastgptTagGroup;
 import com.fs.fastGpt.service.IFastgptTagGroupService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * ai标签组Controller

fs-company/src/main/java/com/fs/company/controller/live/LiveAnchorController.java

@@ -1,122 +0,0 @@
-package com.fs.company.controller.live;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.company.domain.Company;
-import com.fs.company.domain.CompanyUser;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.security.SecurityUtils;
-import com.fs.live.domain.LiveAnchor;
-import com.fs.live.service.ILiveAnchorService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 主播Controller
- * 
- * @author fs
- * @date 2025-01-17
- */
-@RestController
-@RequestMapping("/live/liveAnchor")
-public class LiveAnchorController extends BaseController
-{
-    @Autowired
-    private ILiveAnchorService liveAnchorService;
-
-    /**
-     * 查询主播列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveAnchor:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(LiveAnchor liveAnchor)
-    {
-        // 设置企业ID 企业用户ID
-        setCompanyId(liveAnchor);
-
-        startPage();
-        List<LiveAnchor> list = liveAnchorService.selectLiveAnchorList(liveAnchor);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出主播列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveAnchor:export')")
-    @Log(title = "主播", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(LiveAnchor liveAnchor)
-    {
-        // 设置企业ID 企业用户ID
-        setCompanyId(liveAnchor);
-
-        List<LiveAnchor> list = liveAnchorService.selectLiveAnchorList(liveAnchor);
-        ExcelUtil<LiveAnchor> util = new ExcelUtil<LiveAnchor>(LiveAnchor.class);
-        return util.exportExcel(list, "主播数据");
-    }
-
-    /**
-     * 获取主播详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveAnchor:query')")
-    @GetMapping(value = "/{anchorId}")
-    public AjaxResult getInfo(@PathVariable("anchorId") Long anchorId)
-    {
-        CompanyUser user = SecurityUtils.getLoginUser().getUser();
-        return AjaxResult.success(liveAnchorService.selectLiveAnchorByAnchorIdAndCompanyIdAndCompanyUserId(anchorId, user.getCompanyId(), user.getUserId()));
-    }
-
-    /**
-     * 新增主播
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveAnchor:add')")
-    @Log(title = "主播", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody LiveAnchor liveAnchor)
-    {
-        // 设置企业ID 企业用户ID
-        setCompanyId(liveAnchor);
-        return toAjax(liveAnchorService.insertLiveAnchor(liveAnchor));
-    }
-
-    /**
-     * 修改主播
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveAnchor:edit')")
-    @Log(title = "主播", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody LiveAnchor liveAnchor)
-    {
-        return toAjax(liveAnchorService.updateLiveAnchor(liveAnchor));
-    }
-
-    /**
-     * 删除主播
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveAnchor:remove')")
-    @Log(title = "主播", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{anchorIds}")
-    public AjaxResult remove(@PathVariable Long[] anchorIds)
-    {
-        return toAjax(liveAnchorService.deleteLiveAnchorByAnchorIds(anchorIds));
-    }
-
-    /**
-     * 设置企业ID 企业用户ID
-     * @param liveAnchor 主播信息
-     */
-    private void setCompanyId(LiveAnchor liveAnchor) {
-        // 设置企业ID 企业用户ID
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        CompanyUser user = loginUser.getUser();
-        liveAnchor.setCompanyId(user.getCompanyId());
-        liveAnchor.setCompanyUserId(user.getUserId());
-    }
-}

fs-company/src/main/java/com/fs/company/controller/live/LiveController.java

@@ -1,135 +0,0 @@
-package com.fs.company.controller.live;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.company.domain.CompanyUser;
-import com.fs.framework.security.SecurityUtils;
-import com.fs.live.domain.Live;
-import com.fs.live.service.ILiveService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 直播Controller
- * 
- * @author fs
- * @date 2025-01-17
- */
-@RestController
-@RequestMapping("/live/live")
-public class LiveController extends BaseController
-{
-    @Autowired
-    private ILiveService liveService;
-
-    /**
-     * 查询直播列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:live:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(Live live)
-    {
-        // 设置企业ID和企业用户ID
-        setCompanyId(live);
-
-        startPage();
-        List<Live> list = liveService.selectLiveList(live);
-        return getDataTable(list);
-    }
-
-    /**
-     * 查询直播列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:live:selectLiveToStudent')")
-    @PostMapping("/selectLiveToStudent")
-    public TableDataInfo selectLiveToStudent(@RequestBody Map<String,String> param)
-    {
-        startPage();
-        String liveName = param.get("liveName");
-        String status = param.get("status");
-        String startTime = param.get("startTime");
-        String finishTime = param.get("finishTime");
-        List<Live> list = liveService.selectLiveToStudent(liveName,status,startTime,finishTime);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出直播列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:live:export')")
-    @Log(title = "直播", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(Live live)
-    {
-        // 设置企业ID和企业用户ID
-        setCompanyId(live);
-
-        List<Live> list = liveService.selectLiveList(live);
-        ExcelUtil<Live> util = new ExcelUtil<Live>(Live.class);
-        return util.exportExcel(list, "直播数据");
-    }
-
-    /**
-     * 获取直播详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('live:live:query')")
-    @GetMapping(value = "/{liveId}")
-    public AjaxResult getInfo(@PathVariable("liveId") Long liveId)
-    {
-        CompanyUser user = SecurityUtils.getLoginUser().getUser();
-        return AjaxResult.success(liveService.selectLiveByLiveIdAndCompanyIdAndCompanyUserId(liveId, user.getCompanyId(), user.getUserId()));
-    }
-
-    /**
-     * 新增直播
-     */
-    @PreAuthorize("@ss.hasPermi('live:live:add')")
-    @Log(title = "直播", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody Live live)
-    {
-        // 设置企业ID和企业用户ID
-        setCompanyId(live);
-        return toAjax(liveService.insertLive(live));
-    }
-
-    /**
-     * 修改直播
-     */
-    @PreAuthorize("@ss.hasPermi('live:live:edit')")
-    @Log(title = "直播", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody Live live)
-    {
-        return toAjax(liveService.updateLive(live));
-    }
-
-    /**
-     * 删除直播
-     */
-    @PreAuthorize("@ss.hasPermi('live:live:remove')")
-    @Log(title = "直播", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{liveIds}")
-    public AjaxResult remove(@PathVariable Long[] liveIds)
-    {
-        return toAjax(liveService.deleteLiveByLiveIds(liveIds));
-    }
-
-    /**
-     * 设置企业ID和企业用户ID
-     * @param live 直播间
-     */
-    private void setCompanyId(Live live) {
-        CompanyUser user = SecurityUtils.getLoginUser().getUser();
-        live.setCompanyId(user.getCompanyId());
-        live.setCompanyUserId(user.getUserId());
-    }
-}

fs-company/src/main/java/com/fs/company/controller/live/LiveDataController.java

@@ -1,159 +0,0 @@
-package com.fs.company.controller.live;
-
-import java.util.*;
-
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.security.SecurityUtils;
-import com.fs.framework.service.TokenService;
-import com.fs.live.vo.ColumnsConfigVo;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.enums.BusinessType;
-import com.fs.live.domain.LiveData;
-import com.fs.live.service.ILiveDataService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * 直播数据Controller
- *
- * @author fs
- * @date 2025-03-05
- */
-@RestController
-@RequestMapping("/liveData/liveData")
-public class LiveDataController extends BaseController
-{
-    @Autowired
-    private ILiveDataService liveDataService;
-    @Autowired
-    private TokenService tokenService;
-
-    /**
-     * 查询直播数据列表
-     */
-    @PreAuthorize("@ss.hasPermi('liveData:liveData:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(LiveData liveData)
-    {
-        startPage();
-        List<LiveData> list = liveDataService.selectLiveDataList(liveData);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出直播数据列表
-     */
-    @PreAuthorize("@ss.hasPermi('liveData:liveData:export')")
-    @Log(title = "直播数据", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(LiveData liveData)
-    {
-        List<LiveData> list = liveDataService.selectLiveDataList(liveData);
-        ExcelUtil<LiveData> util = new ExcelUtil<LiveData>(LiveData.class);
-        return util.exportExcel(list, "直播数据数据");
-    }
-
-    /**
-     * 获取直播数据详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('liveData:liveData:query')")
-    @GetMapping(value = "/{liveId}")
-    public AjaxResult getInfo(@PathVariable("liveId") Long liveId)
-    {
-        return AjaxResult.success(liveDataService.selectLiveDataByLiveId(liveId));
-    }
-
-    /**
-     * 新增直播数据
-     */
-    @PreAuthorize("@ss.hasPermi('liveData:liveData:add')")
-    @Log(title = "直播数据", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody LiveData liveData)
-    {
-        return toAjax(liveDataService.insertLiveData(liveData));
-    }
-
-    /**
-     * 修改直播数据
-     */
-    @PreAuthorize("@ss.hasPermi('liveData:liveData:edit')")
-    @Log(title = "直播数据", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody LiveData liveData)
-    {
-        return toAjax(liveDataService.updateLiveData(liveData));
-    }
-
-    /**
-     * 删除直播数据
-     */
-    @PreAuthorize("@ss.hasPermi('liveData:liveData:remove')")
-    @Log(title = "直播数据", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{liveIds}")
-    public AjaxResult remove(@PathVariable Long[] liveIds)
-    {
-        return toAjax(liveDataService.deleteLiveDataByLiveIds(liveIds));
-    }
-
-    /**
-     * 直播数据页面近期直播卡片数据
-     */
-    @PreAuthorize("@ss.hasPermi('liveData:liveData:recentLive')")
-    @GetMapping("/recentLive")
-    public AjaxResult recentLive(){
-        return AjaxResult.success(liveDataService.getRecentLive());
-    }
-
-    /**
-     * 查询直播top榜数据
-     */
-    @PreAuthorize("@ss.hasPermi('liveData:liveData:getLiveTop')")
-    @GetMapping("/getLiveTop")
-    public AjaxResult getLiveTop(String rankType){
-        System.out.println(rankType);
-        return AjaxResult.success(liveDataService.getLiveTop(rankType));
-    }
-    /**
-     * 查询直播趋势数据
-     * @param
-     * @param
-     * @return
-     */
-    @PreAuthorize("@ss.hasPermi('liveData:liveData:getTrendData')")
-    @PostMapping("/getTrendData")
-    public AjaxResult getTrendData(@RequestBody Map<String,String> queryParams) {
-        String type = queryParams.get("type");
-        String date = queryParams.get("date");
-        String category = queryParams.get("category");
-        return AjaxResult.success(liveDataService.getTrendData(type, date,category));
-    }
-    /*@PreAuthorize("@ss.hasPermi('liveData:liveData:columns')")
-    @GetMapping("/columns")
-    public AjaxResult getTableColumns(HttpServletRequest request, HttpServletResponse response) {
-        LoginUser loginUser = tokenService.getLoginUser(request);
-        //LoginUser loginUser = SecurityUtils.getLoginUser();
-        Long userId = loginUser.getUser().getUserId();
-        List<ColumnsConfigVo> columnsConfig = liveDataService.getColumnsConfig(userId.toString());
-       return AjaxResult.success(columnsConfig);
-    }*/
-
-    @PostMapping("/updateColumns")
-    public AjaxResult updateColumns(@RequestBody List<ColumnsConfigVo> columns, HttpServletRequest request) {
-        LoginUser loginUser = tokenService.getLoginUser(request);
-        Long userId = loginUser.getUser().getUserId();
-        liveDataService.saveColumnsConfig(userId.toString(), columns);
-        return AjaxResult.success("列配置已保存");
-    }
-
-
-
-}

fs-company/src/main/java/com/fs/company/controller/live/LiveGoodsController.java

@@ -1,122 +0,0 @@
-package com.fs.company.controller.live;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.company.domain.CompanyUser;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.security.SecurityUtils;
-import com.fs.live.domain.LiveAnchor;
-import com.fs.live.domain.LiveGoods;
-import com.fs.live.service.ILiveGoodsService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 直播商品Controller
- * 
- * @author fs
- * @date 2025-01-17
- */
-@RestController
-@RequestMapping("/live/liveGoods")
-public class LiveGoodsController extends BaseController
-{
-    @Autowired
-    private ILiveGoodsService liveGoodsService;
-
-    /**
-     * 查询直播商品列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveGoods:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(LiveGoods liveGoods)
-    {
-        // 设置企业ID和企业用户ID
-        setCompanyId(liveGoods);
-
-        startPage();
-        List<LiveGoods> list = liveGoodsService.selectLiveGoodsList(liveGoods);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出直播商品列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveGoods:export')")
-    @Log(title = "直播商品", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(LiveGoods liveGoods)
-    {
-        // 设置企业ID和企业用户ID
-        setCompanyId(liveGoods);
-
-        List<LiveGoods> list = liveGoodsService.selectLiveGoodsList(liveGoods);
-        ExcelUtil<LiveGoods> util = new ExcelUtil<LiveGoods>(LiveGoods.class);
-        return util.exportExcel(list, "直播商品数据");
-    }
-
-    /**
-     * 获取直播商品详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveGoods:query')")
-    @GetMapping(value = "/{goodsId}")
-    public AjaxResult getInfo(@PathVariable("goodsId") Long goodsId)
-    {
-        CompanyUser user = SecurityUtils.getLoginUser().getUser();
-        return AjaxResult.success(liveGoodsService.selectLiveGoodsByGoodsIdAndCompanyIdAndCompanyUserId(goodsId, user.getCompanyId(), user.getUserId()));
-    }
-
-    /**
-     * 新增直播商品
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveGoods:add')")
-    @Log(title = "直播商品", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody LiveGoods liveGoods)
-    {
-        // 设置企业ID和企业用户ID
-        setCompanyId(liveGoods);
-        return toAjax(liveGoodsService.insertLiveGoods(liveGoods));
-    }
-
-    /**
-     * 修改直播商品
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveGoods:edit')")
-    @Log(title = "直播商品", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody LiveGoods liveGoods)
-    {
-        return toAjax(liveGoodsService.updateLiveGoods(liveGoods));
-    }
-
-    /**
-     * 删除直播商品
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveGoods:remove')")
-    @Log(title = "直播商品", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{goodsIds}")
-    public AjaxResult remove(@PathVariable Long[] goodsIds)
-    {
-        return toAjax(liveGoodsService.deleteLiveGoodsByGoodsIds(goodsIds));
-    }
-
-    /**
-     * 设置企业ID 企业用户ID
-     * @param liveGoods 直播商品
-     */
-    private void setCompanyId(LiveGoods liveGoods) {
-        // 设置企业ID 企业用户ID
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        CompanyUser user = loginUser.getUser();
-        liveGoods.setCompanyId(user.getCompanyId());
-        liveGoods.setCompanyUserId(user.getUserId());
-    }
-}

fs-company/src/main/java/com/fs/company/controller/live/LiveGoodsOrderController.java

@@ -1,118 +0,0 @@
-package com.fs.company.controller.live;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.company.domain.CompanyUser;
-import com.fs.framework.security.SecurityUtils;
-import com.fs.live.domain.LiveGoodsOrder;
-import com.fs.live.service.ILiveGoodsOrderService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 订单Controller
- * 
- * @author fs
- * @date 2025-01-17
- */
-@RestController
-@RequestMapping("/live/liveOrder")
-public class LiveGoodsOrderController extends BaseController
-{
-    @Autowired
-    private ILiveGoodsOrderService liveGoodsOrderService;
-
-    /**
-     * 查询订单列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveOrder:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(LiveGoodsOrder liveGoodsOrder)
-    {
-        // 设置企业ID和企业用户ID
-        setCompanyId(liveGoodsOrder);
-
-        startPage();
-        List<LiveGoodsOrder> list = liveGoodsOrderService.selectLiveGoodsOrderList(liveGoodsOrder);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出订单列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveOrder:export')")
-    @Log(title = "订单", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(LiveGoodsOrder liveGoodsOrder)
-    {
-        // 设置企业ID和企业用户ID
-        setCompanyId(liveGoodsOrder);
-
-        List<LiveGoodsOrder> list = liveGoodsOrderService.selectLiveGoodsOrderList(liveGoodsOrder);
-        ExcelUtil<LiveGoodsOrder> util = new ExcelUtil<LiveGoodsOrder>(LiveGoodsOrder.class);
-        return util.exportExcel(list, "订单数据");
-    }
-
-    /**
-     * 获取订单详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveOrder:query')")
-    @GetMapping(value = "/{orderId}")
-    public AjaxResult getInfo(@PathVariable("orderId") Long orderId)
-    {
-        CompanyUser user = SecurityUtils.getLoginUser().getUser();
-        return AjaxResult.success(liveGoodsOrderService.selectLiveGoodsOrderByOrderIdAndCompanyIdAndCompanyUserId(orderId, user.getCompanyId(), user.getUserId()));
-    }
-
-    /**
-     * 新增订单
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveOrder:add')")
-    @Log(title = "订单", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody LiveGoodsOrder liveGoodsOrder)
-    {
-        // 设置企业ID和企业用户ID
-        setCompanyId(liveGoodsOrder);
-        return toAjax(liveGoodsOrderService.insertLiveGoodsOrder(liveGoodsOrder));
-    }
-
-    /**
-     * 修改订单
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveOrder:edit')")
-    @Log(title = "订单", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody LiveGoodsOrder liveGoodsOrder)
-    {
-        return toAjax(liveGoodsOrderService.updateLiveGoodsOrder(liveGoodsOrder));
-    }
-
-    /**
-     * 删除订单
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveOrder:remove')")
-    @Log(title = "订单", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{orderIds}")
-    public AjaxResult remove(@PathVariable Long[] orderIds)
-    {
-        return toAjax(liveGoodsOrderService.deleteLiveGoodsOrderByOrderIds(orderIds));
-    }
-
-    /**
-     * 设置企业ID和企业用户ID
-     * @param liveGoodsOrder 直播商品订单
-     */
-    private void setCompanyId(LiveGoodsOrder liveGoodsOrder) {
-        CompanyUser user = SecurityUtils.getLoginUser().getUser();
-        liveGoodsOrder.setCompanyId(user.getCompanyId());
-        liveGoodsOrder.setCompanyUserId(user.getUserId());
-    }
-}

fs-company/src/main/java/com/fs/company/controller/live/LiveGoodsOrderItemsController.java

@@ -1,116 +0,0 @@
-package com.fs.company.controller.live;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.company.domain.CompanyUser;
-import com.fs.framework.security.SecurityUtils;
-import com.fs.live.domain.LiveGoodsOrderItems;
-import com.fs.live.service.ILiveGoodsOrderItemsService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 订单商品Controller
- * 
- * @author fs
- * @date 2025-01-17
- */
-@RestController
-@RequestMapping("/live/liveOrderitems")
-public class LiveGoodsOrderItemsController extends BaseController
-{
-    @Autowired
-    private ILiveGoodsOrderItemsService liveGoodsOrderItemsService;
-
-    /**
-     * 查询订单商品列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveOrderitems:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(LiveGoodsOrderItems liveGoodsOrderItems)
-    {
-        // 设置企业ID和企业用户ID
-        setCompanyId(liveGoodsOrderItems);
-
-        startPage();
-        List<LiveGoodsOrderItems> list = liveGoodsOrderItemsService.selectLiveGoodsOrderItemsList(liveGoodsOrderItems);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出订单商品列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveOrderitems:export')")
-    @Log(title = "订单商品", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(LiveGoodsOrderItems liveGoodsOrderItems)
-    {
-        // 设置企业ID和企业用户ID
-        setCompanyId(liveGoodsOrderItems);
-
-        List<LiveGoodsOrderItems> list = liveGoodsOrderItemsService.selectLiveGoodsOrderItemsList(liveGoodsOrderItems);
-        ExcelUtil<LiveGoodsOrderItems> util = new ExcelUtil<LiveGoodsOrderItems>(LiveGoodsOrderItems.class);
-        return util.exportExcel(list, "订单商品数据");
-    }
-
-    /**
-     * 获取订单商品详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveOrderitems:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        CompanyUser user = SecurityUtils.getLoginUser().getUser();
-        return AjaxResult.success(liveGoodsOrderItemsService.selectLiveGoodsOrderItemsByIdAndCompanyIdAndCompanyUserId(id, user.getCompanyId(), user.getUserId()));
-    }
-
-    /**
-     * 新增订单商品
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveOrderitems:add')")
-    @Log(title = "订单商品", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody LiveGoodsOrderItems liveGoodsOrderItems)
-    {
-        return toAjax(liveGoodsOrderItemsService.insertLiveGoodsOrderItems(liveGoodsOrderItems));
-    }
-
-    /**
-     * 修改订单商品
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveOrderitems:edit')")
-    @Log(title = "订单商品", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody LiveGoodsOrderItems liveGoodsOrderItems)
-    {
-        return toAjax(liveGoodsOrderItemsService.updateLiveGoodsOrderItems(liveGoodsOrderItems));
-    }
-
-    /**
-     * 删除订单商品
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveOrderitems:remove')")
-    @Log(title = "订单商品", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(liveGoodsOrderItemsService.deleteLiveGoodsOrderItemsByIds(ids));
-    }
-
-    /**
-     * 设置企业ID和企业用户ID
-     * @param liveGoodsOrderItems 直播订单商品
-     */
-    private void setCompanyId(LiveGoodsOrderItems liveGoodsOrderItems) {
-        CompanyUser user = SecurityUtils.getLoginUser().getUser();
-        liveGoodsOrderItems.setCompanyId(user.getCompanyId());
-        liveGoodsOrderItems.setCompanyUserId(user.getUserId());
-    }
-}

fs-company/src/main/java/com/fs/company/controller/live/LiveMsgController.java

@@ -1,101 +0,0 @@
-package com.fs.company.controller.live;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.company.domain.CompanyUser;
-import com.fs.framework.security.SecurityUtils;
-import com.fs.live.domain.LiveMsg;
-import com.fs.live.service.ILiveMsgService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 直播讨论Controller
- * 
- * @author fs
- * @date 2025-01-17
- */
-@RestController
-@RequestMapping("/live/liveMsg")
-public class LiveMsgController extends BaseController
-{
-    @Autowired
-    private ILiveMsgService liveMsgService;
-
-    /**
-     * 查询直播讨论列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveMsg:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(LiveMsg liveMsg)
-    {
-        startPage();
-        List<LiveMsg> list = liveMsgService.selectLiveMsgList(liveMsg);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出直播讨论列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveMsg:export')")
-    @Log(title = "直播讨论", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(LiveMsg liveMsg)
-    {
-        List<LiveMsg> list = liveMsgService.selectLiveMsgList(liveMsg);
-        ExcelUtil<LiveMsg> util = new ExcelUtil<LiveMsg>(LiveMsg.class);
-        return util.exportExcel(list, "直播讨论数据");
-    }
-
-    /**
-     * 获取直播讨论详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveMsg:query')")
-    @GetMapping(value = "/{msgId}")
-    public AjaxResult getInfo(@PathVariable("msgId") Long msgId)
-    {
-        CompanyUser user = SecurityUtils.getLoginUser().getUser();
-        return AjaxResult.success(liveMsgService.selectLiveMsgByMsgId(msgId));
-    }
-
-    /**
-     * 新增直播讨论
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveMsg:add')")
-    @Log(title = "直播讨论", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody LiveMsg liveMsg)
-    {
-        return toAjax(liveMsgService.insertLiveMsg(liveMsg));
-    }
-
-    /**
-     * 修改直播讨论
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveMsg:edit')")
-    @Log(title = "直播讨论", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody LiveMsg liveMsg)
-    {
-        return toAjax(liveMsgService.updateLiveMsg(liveMsg));
-    }
-
-    /**
-     * 删除直播讨论
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveMsg:remove')")
-    @Log(title = "直播讨论", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{msgIds}")
-    public AjaxResult remove(@PathVariable Long[] msgIds)
-    {
-        return toAjax(liveMsgService.deleteLiveMsgByMsgIds(msgIds));
-    }
-
-}

fs-company/src/main/java/com/fs/company/controller/live/LiveQuestionBankController.java

@@ -1,74 +0,0 @@
-package com.fs.company.controller.live;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.framework.security.SecurityUtils;
-import com.fs.live.domain.LiveQuestionBank;
-import com.fs.live.service.ILiveQuestionBankService;
-import lombok.AllArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@RestController
-@RequestMapping("/live/liveQuestionBank")
-@AllArgsConstructor
-public class LiveQuestionBankController extends BaseController {
-
-    private final ILiveQuestionBankService liveQuestionBankService;
-
-    /**
-     * 查询题库列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveQuestionBank:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(@RequestParam(required = false) String title) {
-        startPage();
-        List<LiveQuestionBank> list = liveQuestionBankService.selectLiveQuestionBankList(title);
-        return getDataTable(list);
-    }
-
-    /**
-     * 新增题
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveQuestionBank:add')")
-    @Log(title = "题库", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody LiveQuestionBank liveQuestionBank) {
-        return toAjax(liveQuestionBankService.insertLiveQuestionBank(liveQuestionBank, SecurityUtils.getUsername()));
-    }
-
-    /**
-     * 获取题目详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveQuestionBank:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(liveQuestionBankService.getById(id));
-    }
-
-    /**
-     * 修改题目
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveQuestionBank:edit')")
-    @Log(title = "题库", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody LiveQuestionBank liveQuestionBank) {
-        return toAjax(liveQuestionBankService.updateLiveQuestionBank(liveQuestionBank, SecurityUtils.getUsername()));
-    }
-
-    /**
-     * 删除题目
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveQuestionBank:remove')")
-    @Log(title = "题库", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(liveQuestionBankService.deleteLiveQuestionBankByIds(ids));
-    }
-
-}

fs-company/src/main/java/com/fs/company/controller/live/LiveQuestionController.java

@@ -1,118 +0,0 @@
-package com.fs.company.controller.live;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.company.domain.CompanyUser;
-import com.fs.framework.security.SecurityUtils;
-import com.fs.live.domain.LiveQuestion;
-import com.fs.live.service.ILiveQuestionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 问答Controller
- * 
- * @author fs
- * @date 2025-01-17
- */
-@RestController
-@RequestMapping("/live/liveQuestion")
-public class LiveQuestionController extends BaseController
-{
-    @Autowired
-    private ILiveQuestionService liveQuestionService;
-
-    /**
-     * 查询问答列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveQuestion:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(LiveQuestion liveQuestion)
-    {
-        // 设置企业ID和企业用户ID
-        setCompanyId(liveQuestion);
-
-        startPage();
-        List<LiveQuestion> list = liveQuestionService.selectLiveQuestionList(liveQuestion);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出问答列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveQuestion:export')")
-    @Log(title = "问答", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(LiveQuestion liveQuestion)
-    {
-        // 设置企业ID和企业用户ID
-        setCompanyId(liveQuestion);
-
-        List<LiveQuestion> list = liveQuestionService.selectLiveQuestionList(liveQuestion);
-        ExcelUtil<LiveQuestion> util = new ExcelUtil<LiveQuestion>(LiveQuestion.class);
-        return util.exportExcel(list, "问答数据");
-    }
-
-    /**
-     * 获取问答详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveQuestion:query')")
-    @GetMapping(value = "/{questionId}")
-    public AjaxResult getInfo(@PathVariable("questionId") Long questionId)
-    {
-        CompanyUser user = SecurityUtils.getLoginUser().getUser();
-        return AjaxResult.success(liveQuestionService.selectLiveQuestionByQuestionIdAndCompanyIdAndCompanyUserId(questionId, user.getCompanyId(), user.getUserId()));
-    }
-
-    /**
-     * 新增问答
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveQuestion:add')")
-    @Log(title = "问答", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody LiveQuestion liveQuestion)
-    {
-        // 设置企业ID和企业用户ID
-        setCompanyId(liveQuestion);
-        return toAjax(liveQuestionService.insertLiveQuestion(liveQuestion));
-    }
-
-    /**
-     * 修改问答
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveQuestion:edit')")
-    @Log(title = "问答", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody LiveQuestion liveQuestion)
-    {
-        return toAjax(liveQuestionService.updateLiveQuestion(liveQuestion));
-    }
-
-    /**
-     * 删除问答
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveQuestion:remove')")
-    @Log(title = "问答", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{questionIds}")
-    public AjaxResult remove(@PathVariable Long[] questionIds)
-    {
-        return toAjax(liveQuestionService.deleteLiveQuestionByQuestionIds(questionIds));
-    }
-
-    /**
-     * 设置企业ID和企业用户ID
-     * @param liveQuestion  问答
-     */
-    private void setCompanyId(LiveQuestion liveQuestion) {
-        CompanyUser user = SecurityUtils.getLoginUser().getUser();
-        liveQuestion.setCompanyId(user.getCompanyId());
-        liveQuestion.setCompanyUserId(user.getUserId());
-    }
-}

fs-company/src/main/java/com/fs/company/controller/live/LiveQuestionLiveController.java

@@ -1,65 +0,0 @@
-package com.fs.company.controller.live;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.framework.security.SecurityUtils;
-import com.fs.live.service.ILiveQuestionLiveService;
-import com.fs.live.vo.LiveQuestionLiveVO;
-import lombok.AllArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@RestController
-@RequestMapping("/live/liveQuestionLive")
-@AllArgsConstructor
-public class LiveQuestionLiveController extends BaseController {
-
-    private final ILiveQuestionLiveService liveQuestionLiveService;
-
-    /**
-     * 查询直播间题库列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveConfig:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(@RequestParam Long liveId) {
-        startPage();
-        List<LiveQuestionLiveVO> list = liveQuestionLiveService.selectLiveQuestionLiveList(liveId);
-        return getDataTable(list);
-    }
-
-    /**
-     * 查询直播间题库列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveConfig:list')")
-    @GetMapping("/optionList")
-    public TableDataInfo optionList(@RequestParam Long liveId, @RequestParam(required = false) String title) {
-        startPage();
-        List<LiveQuestionLiveVO> list = liveQuestionLiveService.selectLiveQuestionOptionList(liveId, title);
-        return getDataTable(list);
-    }
-
-    /**
-     * 新增题
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveConfig:list')")
-    @Log(title = "直播间题库", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestParam Long liveId, @RequestParam List<Long> questionIds) {
-        return toAjax(liveQuestionLiveService.insertLiveQuestion(liveId, questionIds, SecurityUtils.getUsername()));
-    }
-
-    /**
-     * 删除题目
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveConfig:list')")
-    @Log(title = "直播间题库", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{liveId}")
-    public AjaxResult remove(@PathVariable Long liveId, @RequestParam List<Long> ids) {
-        return toAjax(liveQuestionLiveService.deleteLiveQuestionByIds(liveId, ids));
-    }
-}

fs-company/src/main/java/com/fs/company/controller/live/LiveStudentDataController.java

@@ -1,115 +0,0 @@
-package com.fs.company.controller.live;
-
-import java.util.List;
-
-import com.fs.live.param.LiveStudentDataQueryParam;
-import com.github.pagehelper.PageHelper;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.enums.BusinessType;
-import com.fs.live.domain.LiveStudentData;
-import com.fs.live.service.ILiveStudentDataService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
-
-/**
- * 直播间学员数据Controller
- * 
- * @author fs
- * @date 2025-03-11
- */
-@RestController
-@RequestMapping("/live/studentData")
-public class LiveStudentDataController extends BaseController
-{
-    @Autowired
-    private ILiveStudentDataService liveStudentDataService;
-
-    /**
-     * 查询直播间学员数据列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:studentData:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(LiveStudentData liveStudentData)
-    {
-        startPage();
-        List<LiveStudentData> list = liveStudentDataService.selectLiveStudentDataList(liveStudentData);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出直播间学员数据列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:studentData:export')")
-    @Log(title = "直播间学员数据", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(LiveStudentData liveStudentData)
-    {
-        List<LiveStudentData> list = liveStudentDataService.selectLiveStudentDataList(liveStudentData);
-        ExcelUtil<LiveStudentData> util = new ExcelUtil<LiveStudentData>(LiveStudentData.class);
-        return util.exportExcel(list, "直播间学员数据数据");
-    }
-
-    /**
-     * 获取直播间学员数据详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('live:studentData:query')")
-    @GetMapping(value = "/{liveId}")
-    public AjaxResult getInfo(@PathVariable("liveId") Long liveId)
-    {
-        return AjaxResult.success(liveStudentDataService.selectLiveStudentDataByLiveId(liveId));
-    }
-
-    /**
-     * 新增直播间学员数据
-     */
-    @PreAuthorize("@ss.hasPermi('live:studentData:add')")
-    @Log(title = "直播间学员数据", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody LiveStudentData liveStudentData)
-    {
-        return toAjax(liveStudentDataService.insertLiveStudentData(liveStudentData));
-    }
-
-    /**
-     * 修改直播间学员数据
-     */
-    @PreAuthorize("@ss.hasPermi('live:studentData:edit')")
-    @Log(title = "直播间学员数据", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody LiveStudentData liveStudentData)
-    {
-        return toAjax(liveStudentDataService.updateLiveStudentData(liveStudentData));
-    }
-
-    /**
-     * 删除直播间学员数据
-     */
-    @PreAuthorize("@ss.hasPermi('live:studentData:remove')")
-    @Log(title = "直播间学员数据", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{liveIds}")
-    public AjaxResult remove(@PathVariable Long[] liveIds)
-    {
-        return toAjax(liveStudentDataService.deleteLiveStudentDataByLiveIds(liveIds));
-    }
-
-    @PreAuthorize("@ss.hasPermi('live:studentData:queryStudentData')")
-    @PostMapping("/queryStudentData")
-    public TableDataInfo queryStudentData(@RequestBody LiveStudentDataQueryParam param)
-    {
-        startPage();
-        List<LiveStudentData> liveStudentData = liveStudentDataService.queryStudentData(param);
-        return getDataTable(liveStudentData);
-    }
-}

fs-company/src/main/java/com/fs/company/controller/live/LiveVideoController.java

@@ -1,112 +0,0 @@
-package com.fs.company.controller.live;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.company.domain.CompanyUser;
-import com.fs.framework.security.SecurityUtils;
-import com.fs.live.domain.LiveVideo;
-import com.fs.live.service.ILiveVideoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 直播视频Controller
- * 
- * @author fs
- * @date 2025-01-17
- */
-@RestController
-@RequestMapping("/live/liveVideo")
-public class LiveVideoController extends BaseController
-{
-    @Autowired
-    private ILiveVideoService liveVideoService;
-
-    /**
-     * 查询直播视频列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveVideo:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(LiveVideo liveVideo)
-    {
-        startPage();
-        List<LiveVideo> list = liveVideoService.selectLiveVideoList(liveVideo);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出直播视频列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveVideo:export')")
-    @Log(title = "直播视频", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(LiveVideo liveVideo)
-    {
-        List<LiveVideo> list = liveVideoService.selectLiveVideoList(liveVideo);
-        ExcelUtil<LiveVideo> util = new ExcelUtil<LiveVideo>(LiveVideo.class);
-        return util.exportExcel(list, "直播视频数据");
-    }
-
-    /**
-     * 获取直播视频详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveVideo:query')")
-    @GetMapping(value = "/{videoId}")
-    public AjaxResult getInfo(@PathVariable("videoId") Long videoId)
-    {
-        return AjaxResult.success(liveVideoService.selectLiveVideoByLiveId(videoId));
-    }
-
-    /**
-     * 获取直播视频详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveVideo:query')")
-    @GetMapping(value = "/liveVideoByLiveId/{liveId}")
-    public AjaxResult getLiveVideoByLiveId(@PathVariable("liveId") Long liveId)
-    {
-        return AjaxResult.success(liveVideoService.selectLiveVideoByLiveId(liveId));
-    }
-
-    /**
-     * 新增直播视频
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveVideo:add')")
-    @Log(title = "直播视频", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody LiveVideo liveVideo)
-    {
-        return toAjax(liveVideoService.insertLiveVideo(liveVideo));
-    }
-
-    /**
-     * 修改直播视频
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveVideo:edit')")
-    @Log(title = "直播视频", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody LiveVideo liveVideo)
-    {
-        return toAjax(liveVideoService.updateLiveVideo(liveVideo));
-    }
-
-    /**
-     * 删除直播视频
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveVideo:remove')")
-    @Log(title = "直播视频", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{videoIds}")
-    public AjaxResult remove(@PathVariable Long[] videoIds)
-    {
-        return toAjax(liveVideoService.deleteLiveVideoByVideoIds(videoIds));
-    }
-
-}

fs-company/src/main/java/com/fs/company/controller/live/LiveWatchUserController.java

@@ -1,124 +0,0 @@
-package com.fs.company.controller.live;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.company.domain.CompanyUser;
-import com.fs.framework.security.SecurityUtils;
-import com.fs.live.domain.LiveWatchUser;
-import com.fs.live.service.ILiveWatchUserService;
-import com.fs.live.vo.LiveWatchUserVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 直播间观看用户Controller
- * 
- * @author fs
- * @date 2025-01-18
- */
-@RestController
-@RequestMapping("/live/liveWatchUser")
-public class LiveWatchUserController extends BaseController
-{
-    @Autowired
-    private ILiveWatchUserService liveWatchUserService;
-
-    /**
-     * 查询直播间观看用户列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveWatchUser:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(LiveWatchUser liveWatchUser)
-    {
-        startPage();
-        List<LiveWatchUser> list = liveWatchUserService.selectLiveWatchUserList(liveWatchUser);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('live:liveWatchUser:list')")
-    @GetMapping("/watchUserList")
-    public TableDataInfo watchUserList(@RequestParam Long liveId) {
-        Map<String, Object> params = new HashMap<>();
-        params.put("liveId", liveId);
-
-        startPage();
-        List<LiveWatchUserVO> onLineUserList = liveWatchUserService.selectWatchUserList(params);
-        return getDataTable(onLineUserList);
-    }
-
-    /**
-     * 导出直播间观看用户列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveWatchUser:export')")
-    @Log(title = "直播间观看用户", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(LiveWatchUser liveWatchUser)
-    {
-        List<LiveWatchUser> list = liveWatchUserService.selectLiveWatchUserList(liveWatchUser);
-        ExcelUtil<LiveWatchUser> util = new ExcelUtil<LiveWatchUser>(LiveWatchUser.class);
-        return util.exportExcel(list, "直播间观看用户数据");
-    }
-
-    /**
-     * 获取直播间观看用户详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveWatchUser:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(liveWatchUserService.selectLiveWatchUserById(id));
-    }
-
-    /**
-     * 新增直播间观看用户
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveWatchUser:add')")
-    @Log(title = "直播间观看用户", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody LiveWatchUser liveWatchUser)
-    {
-        return toAjax(liveWatchUserService.insertLiveWatchUser(liveWatchUser));
-    }
-
-    /**
-     * 修改直播间观看用户
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveWatchUser:edit')")
-    @Log(title = "直播间观看用户", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody LiveWatchUser liveWatchUser)
-    {
-        return toAjax(liveWatchUserService.updateLiveWatchUser(liveWatchUser));
-    }
-
-    /**
-     * 删除直播间观看用户
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveWatchUser:remove')")
-    @Log(title = "直播间观看用户", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(liveWatchUserService.deleteLiveWatchUserByIds(ids));
-    }
-
-    /**
-     * 修改直播间用户禁言状态
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveWatchUser:edit')")
-    @Log(title = "直播间观看用户", businessType = BusinessType.UPDATE)
-    @PutMapping("/changeUserState")
-    public AjaxResult changeUserState(@RequestParam Long liveId, @RequestParam Long userId) {
-        return toAjax(liveWatchUserService.changeUserState(liveId, userId));
-    }
-
-}

fs-company/src/main/java/com/fs/company/controller/qw/FsAppContactWayController.java

@@ -1,29 +1,22 @@
 package com.fs.company.controller.qw;
 
-import java.util.List;
-
-import com.fs.common.annotation.RepeatSubmit;
-import com.fs.common.utils.ServletUtils;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.fs.common.annotation.Log;
+import com.fs.common.annotation.RepeatSubmit;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.ServletUtils;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.framework.security.LoginUser;
+import com.fs.framework.service.TokenService;
 import com.fs.qw.domain.FsAppContactWay;
 import com.fs.qw.service.IFsAppContactWayService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * app客服活码上架Controller

fs-company/src/main/java/com/fs/company/controller/qw/QwContactWayController.java

@@ -14,11 +14,9 @@ import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import com.fs.his.vo.OptionsVO;
 import com.fs.qw.domain.QwContactWay;
-import com.fs.qw.domain.QwInformation;
 import com.fs.qw.param.QwStatisticsParam;
 import com.fs.qw.service.IQwContactWayService;
 import com.fs.qw.service.IQwInformationService;
-import com.fs.qw.vo.QwOptionsVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

fs-company/src/main/java/com/fs/company/controller/qw/QwExternalContactController.java

@@ -9,7 +9,6 @@ import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.StringUtils;
 import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.company.domain.Company;
 import com.fs.course.param.FsUserCourseListUParam;
 import com.fs.course.service.IFsUserCourseStudyService;
 import com.fs.course.vo.FsUserCourseStudyListUVO;
@@ -19,13 +18,10 @@ import com.fs.crm.vo.CrmMyCustomerListQueryVO;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import com.fs.his.service.IFsUserService;
-import com.fs.his.utils.PhoneUtil;
 import com.fs.qw.domain.QwExternalContact;
-import com.fs.qw.domain.QwExternalContactInfo;
 import com.fs.qw.param.*;
 import com.fs.qw.service.IQwExternalContactInfoService;
 import com.fs.qw.service.IQwExternalContactService;
-import com.fs.qw.service.impl.QwExternalContactInfoServiceImpl;
 import com.fs.qw.vo.QwExternalContactVO;
 import com.fs.qw.vo.QwFsUserVO;
 import com.github.pagehelper.PageHelper;
@@ -38,7 +34,8 @@ import org.springframework.web.bind.annotation.*;
 import java.io.IOException;
 import java.util.List;
 
-import static com.fs.his.utils.PhoneUtil.*;
+import static com.fs.his.utils.PhoneUtil.decryptAutoPhoneMk;
+import static com.fs.his.utils.PhoneUtil.encryptPhone;
 
 /**
  * 企业微信客户Controller
@@ -213,7 +210,7 @@ public class QwExternalContactController extends BaseController
      * 修改企业微信客户
      */
     @PreAuthorize("@ss.hasPermi('qw:externalContact:edit')")
-    @Log(title = "修改企业微信客户call", businessType = BusinessType.UPDATE)
+    @Log(title = "企业微信客户", businessType = BusinessType.UPDATE)
     @PutMapping("/call")
     public AjaxResult callEdit(@RequestBody QwExternalContact qwExternalContact)
     {
@@ -234,7 +231,7 @@ public class QwExternalContactController extends BaseController
     }
 
     @PreAuthorize("@ss.hasPermi('qw:externalContact:edit')")
-    @Log(title = "企业微信客户状态", businessType = BusinessType.UPDATE)
+    @Log(title = "企业微信客户", businessType = BusinessType.UPDATE)
     @PutMapping("/editStatus")
     public AjaxResult editStatus(@RequestBody QwExternalContact qwExternalContact)
     {

fs-company/src/main/java/com/fs/company/controller/qw/QwExternalContactInfoController.java

@@ -1,24 +1,18 @@
 package com.fs.company.controller.qw;
 
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.qw.domain.QwExternalContactInfo;
 import com.fs.qw.service.IQwExternalContactInfoService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 外部联系人信息表Controller

fs-company/src/main/java/com/fs/company/controller/qw/QwMaterialController.java

@@ -11,7 +11,6 @@ import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import com.fs.qw.domain.QwMaterial;
-import com.fs.qw.domain.QwUser;
 import com.fs.qw.param.QwMaterialParam;
 import com.fs.qw.service.IQwMaterialService;
 import com.fs.qw.service.IQwUserService;

fs-company/src/main/java/com/fs/company/controller/qw/QwMsgController.java

@@ -1,40 +1,33 @@
 package com.fs.company.controller.qw;
 
-import java.util.Collections;
-import java.util.List;
-
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
+import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.StringUtils;
+import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
-import com.fs.qw.param.QwSessionParam;
+import com.fs.qw.domain.QwMsg;
 import com.fs.qw.domain.QwUser;
 import com.fs.qw.param.QwMsgSendParam;
+import com.fs.qw.param.QwSessionParam;
+import com.fs.qw.service.IQwMsgService;
 import com.fs.qw.vo.QwContactListVO;
 import com.fs.qw.vo.QwMessageListVO;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.enums.BusinessType;
-import com.fs.qw.domain.QwMsg;
-import com.fs.qw.service.IQwMsgService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Collections;
+import java.util.List;
 
 /**
  * 企微聊天记录Controller

fs-company/src/main/java/com/fs/company/controller/qw/QwSessionController.java

@@ -1,24 +1,18 @@
 package com.fs.company.controller.qw;
 
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.qw.domain.QwSession;
 import com.fs.qw.service.IQwSessionService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 企微会话Controller

fs-company/src/main/java/com/fs/company/controller/qw/QwSopController.java

@@ -1,6 +1,5 @@
 package com.fs.company.controller.qw;
 
-import com.fs.aiChat.param.QwSopParam;
 import com.fs.common.annotation.Log;
 import com.fs.common.annotation.RepeatSubmit;
 import com.fs.common.core.controller.BaseController;
@@ -17,7 +16,6 @@ import com.fs.framework.service.TokenService;
 import com.fs.his.vo.OptionsVO;
 import com.fs.qw.domain.QwSopUpdateStatus;
 import com.fs.qw.service.IQwUserService;
-import com.fs.qw.vo.QwOptionsVO;
 import com.fs.sop.domain.QwSop;
 import com.fs.sop.params.QwSopAutoTime;
 import com.fs.sop.params.QwSopEditQwUserParam;
@@ -29,7 +27,6 @@ import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 

fs-company/src/main/java/com/fs/company/controller/qw/QwSopLogsController.java

@@ -15,8 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 /**
@@ -122,19 +120,6 @@ public class QwSopLogsController extends BaseController
         return toAjax(iQwSopLogsService.updateQwSopLogs(QwSopLogs));
     }
 
-
-    /**
-     * 修改企业微信SOP  定时任务-只修改完课的补发
-     */
-    @PreAuthorize("@ss.hasPermi('qw:sopLogs:editCourse')")
-    @Log(title = "修改企业微信SOP只修改完课", businessType = BusinessType.UPDATE)
-    @PutMapping("/editCourseQwSopLogs/{ids}")
-    public AjaxResult editCourseQwSopLogs(@PathVariable String[] ids)
-    {
-        return toAjax(iQwSopLogsService.editCourseQwSopLogs(ids));
-    }
-
-
     /**
      * 删除企业微信SOP
      */

fs-company/src/main/java/com/fs/company/controller/qw/QwSopTempController.java

@@ -1,22 +1,17 @@
 package com.fs.company.controller.qw;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.fs.common.annotation.DataSource;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
-import com.fs.common.enums.DataSourceType;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.framework.datasource.DynamicDataSourceContextHolder;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import com.fs.qw.vo.SortDayVo;
 import com.fs.sop.domain.QwSopTemp;
 import com.fs.sop.domain.QwSopTempDay;
-import com.fs.sop.domain.QwSopTempRules;
 import com.fs.sop.params.QwSopShareTempParam;
 import com.fs.sop.service.IQwSopTempService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -147,13 +142,13 @@ public class QwSopTempController extends BaseController
         return toAjax(update);
     }
     @PreAuthorize("@ss.hasPermi('qw:sopTemp:edit')")
-    @Log(title = "添加修改sop模板天数", businessType = BusinessType.UPDATE)
+    @Log(title = "addOrUpdateSop模板规则", businessType = BusinessType.UPDATE)
     @PostMapping("/addOrUpdateSetting")
     public AjaxResult addOrUpdateSetting(@RequestBody QwSopTempDay day){
         return AjaxResult.success(qwSopTempService.addOrUpdateSetting(day));
     }
     @PreAuthorize("@ss.hasPermi('qw:sopTemp:edit')")
-    @Log(title = "删除sop模板天", businessType = BusinessType.DELETE)
+    @Log(title = "sop模板规则delRules", businessType = BusinessType.DELETE)
     @GetMapping("/delRules")
     public AjaxResult delRules(Long id){
         qwSopTempService.delRules(id);
@@ -181,11 +176,4 @@ public class QwSopTempController extends BaseController
     public AjaxResult dayList(String id){
         return AjaxResult.success(qwSopTempService.dayList(id));
     }
-    // 更新模板图片
-    @PreAuthorize("@ss.hasPermi('qw:sopTemp:edit')")
-    @GetMapping("/updateImage")
-    public AjaxResult updateImage(String id){
-        qwSopTempService.updateImage(id);
-        return AjaxResult.success();
-    }
 }

fs-company/src/main/java/com/fs/company/controller/qw/QwTagController.java

@@ -3,7 +3,6 @@ package com.fs.company.controller.qw;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.poi.ExcelUtil;

fs-company/src/main/java/com/fs/company/controller/qw/QwTagGroupController.java

@@ -6,9 +6,7 @@ import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import com.fs.qw.domain.QwTagGroup;
 import com.fs.qw.service.IQwTagGroupService;
@@ -57,6 +55,7 @@ public class QwTagGroupController extends BaseController
     public TableDataInfo allList(QwTagGroup qwTagGroup)
     {
         startPage();
+
         List<QwTagGroupListVO> list = qwTagGroupService.selectQwTagGroupListVO(qwTagGroup);
         return getDataTable(list);
     }