add

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-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/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/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/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/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-hzyy.yml

@@ -0,0 +1,148 @@
+# 数据源配置
+spring:
+    # redis 配置
+    redis:
+        # 地址
+        host: 192.168.0.209
+        # 端口，默认为6379
+        port: 6379
+        # 数据库索引
+        database: 0
+        # 密码
+        password: Ylrztek250218!3@.
+        # 连接超时时间
+        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.163: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.163: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-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-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/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/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/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/QwAutoTagsController.java

@@ -1,6 +1,7 @@
 package com.fs.company.controller.qw;
 
 
+import com.alibaba.fastjson.JSON;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
@@ -13,14 +14,16 @@ import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import com.fs.qw.domain.QwAutoTags;
 import com.fs.qw.param.QwAutoTagsParam;
+import com.fs.qw.param.QwAutoTagsRulesTags;
+import com.fs.qw.param.QwTagSearchParam;
 import com.fs.qw.service.IQwAutoTagsService;
+import com.fs.qw.service.IQwTagService;
 import com.fs.qw.vo.QwAutoTagsVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * 自动打标签主Controller
@@ -38,6 +41,8 @@ public class QwAutoTagsController extends BaseController
     @Autowired
     private TokenService tokenService;
 
+    @Autowired
+    private IQwTagService iQwTagService;
     /**
      * 查询自动打标签主列表
      */
@@ -49,6 +54,22 @@ public class QwAutoTagsController extends BaseController
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         qwAutoTags.setCompanyId( loginUser.getCompany().getCompanyId());
         List<QwAutoTagsVO> list = qwAutoTagsService.selectQwAutoTagsListVO(qwAutoTags);
+        list.forEach(item->{
+
+            QwTagSearchParam param = new QwTagSearchParam();
+
+            Set<String> combinedTagsSet = new HashSet<>();
+            List<QwAutoTagsRulesTags> qwAutoTagsRulesTagsList = JSON.parseArray(item.getRulesTags(), QwAutoTagsRulesTags.class);
+            for (QwAutoTagsRulesTags rulesTags : qwAutoTagsRulesTagsList) {
+                List<String> tagsItem = rulesTags.getTags();
+
+                combinedTagsSet.addAll(tagsItem);
+            }
+
+            param.setTagIds(new ArrayList<>(combinedTagsSet));
+            item.setTagIdsName(iQwTagService.selectQwTagListByTagIds(param));
+
+        });
         return getDataTable(list);
     }
 

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

@@ -11,13 +11,18 @@ import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import com.fs.qw.domain.QwAutoTagsLogs;
 import com.fs.qw.param.QwAutoTagsLogsParams;
+import com.fs.qw.param.QwTagSearchParam;
 import com.fs.qw.service.IQwAutoTagsLogsService;
+import com.fs.qw.service.IQwTagService;
 import com.fs.qw.vo.QwAutoTagsLogsVO;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 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.Objects;
 
 /**
  * 自动打标签的日志Controller
@@ -36,6 +41,9 @@ public class QwAutoTagsLogsController extends BaseController
     @Autowired
     private TokenService tokenService;
 
+    @Autowired
+    private IQwTagService iQwTagService;
+
     /**
      * 查询自动打标签的日志列表
      */
@@ -47,6 +55,22 @@ public class QwAutoTagsLogsController extends BaseController
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         params.setCompanyId( loginUser.getCompany().getCompanyId());
         List<QwAutoTagsLogsVO> list = qwAutoTagsLogsService.selectQwAutoTagsLogsListVO(params);
+        list.forEach(item->{
+
+            if (!Objects.equals(item.getEffectiveRules(), "[]") && item.getEffectiveRules()!=null) {
+                QwTagSearchParam param = new QwTagSearchParam();
+                Gson gson = new Gson();
+                List<String> tagIds = gson.fromJson(
+                        item.getEffectiveRules(),
+                        new TypeToken<List<String>>() {
+                        }.getType()
+                );
+
+                param.setTagIds(tagIds);
+
+                item.setTagIdsName(iQwTagService.selectQwTagListByTagIds(param));
+            }
+        });
         return getDataTable(list);
     }
 

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,16 +18,17 @@ 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.domain.QwTag;
 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.service.IQwTagService;
 import com.fs.qw.vo.QwExternalContactVO;
 import com.fs.qw.vo.QwFsUserVO;
 import com.github.pagehelper.PageHelper;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import io.swagger.annotations.ApiOperation;
 import org.codehaus.jettison.json.JSONException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,9 +36,12 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
-import static com.fs.his.utils.PhoneUtil.*;
+import static com.fs.his.utils.PhoneUtil.decryptAutoPhoneMk;
+import static com.fs.his.utils.PhoneUtil.encryptPhone;
 
 /**
  * 企业微信客户Controller
@@ -61,6 +64,9 @@ public class QwExternalContactController extends BaseController
     @Autowired
     private ICrmCustomerService crmCustomerService;
 
+    @Autowired
+    private IQwTagService iQwTagService;
+
     @Autowired
     private IQwExternalContactInfoService qwExternalContactInfoService;
     /**
@@ -74,6 +80,23 @@ public class QwExternalContactController extends BaseController
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         qwExternalContact.setCompanyId(loginUser.getCompany().getCompanyId());
         List<QwExternalContactVO> list = qwExternalContactService.selectQwExternalContactListVO(qwExternalContact);
+        list.forEach(item->{
+
+            if (!Objects.equals(item.getTagIds(), "[]") && item.getTagIds()!=null) {
+                QwTagSearchParam param = new QwTagSearchParam();
+                Gson gson = new Gson();
+                List<String> tagIds = gson.fromJson(
+                        item.getTagIds(),
+                        new TypeToken<List<String>>() {
+                        }.getType()
+                );
+
+                param.setTagIds(tagIds);
+
+                item.setTagIdsName(iQwTagService.selectQwTagListByTagIds(param));
+            }
+        });
+
         return getDataTable(list);
     }
 
@@ -107,6 +130,23 @@ public class QwExternalContactController extends BaseController
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         qwExternalContact.setCompanyId(loginUser.getCompany().getCompanyId());
         List<QwExternalContactVO> list = qwExternalContactService.selectQwExternalContactListVO(qwExternalContact);
+        list.forEach(item->{
+
+            if (!Objects.equals(item.getTagIds(), "[]") && item.getTagIds()!=null) {
+                QwTagSearchParam param = new QwTagSearchParam();
+                Gson gson = new Gson();
+                List<String> tagIds = gson.fromJson(
+                        item.getTagIds(),
+                        new TypeToken<List<String>>() {
+                        }.getType()
+                );
+
+                param.setTagIds(tagIds);
+
+                item.setTagIdsName(iQwTagService.selectQwTagListByTagIds(param));
+            }
+        });
+
         return getDataTable(list);
     }
 
@@ -213,7 +253,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 +274,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;
 
 /**
@@ -124,17 +122,16 @@ public class QwSopLogsController extends BaseController
 
 
     /**
-     * 修改企业微信SOP  定时任务-只修改完课的补发
+     * 修改企业微信SOP  定时任务补发
      */
     @PreAuthorize("@ss.hasPermi('qw:sopLogs:editCourse')")
-    @Log(title = "修改企业微信SOP只修改完课", businessType = BusinessType.UPDATE)
+    @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);
     }

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

@@ -18,8 +18,6 @@ import com.fs.company.domain.Company;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.mapper.CompanyUserMapper;
 import com.fs.company.service.ICompanyUserService;
-
-import com.fs.company.vo.OptionVO;
 import com.fs.fastGpt.domain.FastGptRole;
 import com.fs.fastGpt.mapper.FastGptRoleMapper;
 import com.fs.framework.manager.AsyncManager;
@@ -30,7 +28,6 @@ import com.fs.qw.domain.QwExternalContact;
 import com.fs.qw.domain.QwUser;
 import com.fs.qw.mapper.QwCompanyMapper;
 import com.fs.qw.mapper.QwExternalContactMapper;
-import com.fs.qw.mapper.QwUserMapper;
 import com.fs.qw.param.*;
 import com.fs.qw.service.IQwDeptService;
 import com.fs.qw.service.IQwExternalContactService;
@@ -44,8 +41,6 @@ import com.fs.qwApi.domain.inner.FollowInfo;
 import com.fs.qwApi.param.QwExternalListParam;
 import com.fs.qwApi.service.QwApiService;
 import com.fs.voice.utils.StringUtil;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -56,7 +51,10 @@ import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -110,7 +108,6 @@ public class QwUserController extends BaseController
         qwUser.setCompanyId(loginUser.getCompany().getCompanyId());
 
         List<QwUserVO> list = qwUserService.selectQwUserListStaffVO(qwUser);
-
         return getDataTable(list);
     }
 
@@ -714,23 +711,4 @@ public class QwUserController extends BaseController
        }
         return R.ok();
     }
-
-    /**
-     * 根据名称模糊查询企微用户列表
-     * @param name      名称
-     * @param pageNum   当前页
-     * @param pageSize  每页条数
-     * @return AjaxResult
-     */
-    @GetMapping("/getQwUserListLikeName")
-    public AjaxResult getQwUserListLikeName(@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("qwUserName", name);
-
-        PageHelper.startPage(pageNum, pageSize);
-        List<OptionVO> list = qwUserService.selectQwUserListByMap(params);
-        return AjaxResult.success(new PageInfo<>(list));
-    }
 }

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

@@ -1,30 +1,22 @@
 package com.fs.company.controller.qw;
 
-import java.util.List;
-
-import com.fs.common.utils.ServletUtils;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
-import com.fs.qw.param.QwUserVideoParam;
-import com.fs.qw.vo.QwUserVideoVO;
-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.common.utils.poi.ExcelUtil;
+import com.fs.framework.security.LoginUser;
+import com.fs.framework.service.TokenService;
 import com.fs.qw.domain.QwUserVideo;
+import com.fs.qw.param.QwUserVideoParam;
 import com.fs.qw.service.IQwUserVideoService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
+import com.fs.qw.vo.QwUserVideoVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 企业微信的视频号Controller

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

@@ -1,44 +1,24 @@
 package com.fs.company.controller.qw;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-import com.alibaba.fastjson.JSON;
-import com.fs.common.utils.ServletUtils;
-import com.fs.course.mapper.FsCourseWatchLogMapper;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
-import com.fs.qw.domain.QwExternalContact;
-import com.fs.qw.domain.QwExternalContactInfo;
-import com.fs.qw.mapper.QwExternalContactMapper;
-import com.fs.qw.param.QwWorkTaskListParam;
-import com.fs.qw.service.IQwExternalContactCrmService;
-import com.fs.qw.service.IQwExternalContactService;
-import com.fs.qw.vo.QwWorkTaskAllListVO;
-import com.fs.qw.vo.QwWorkTaskListVO;
-import com.fs.qwApi.domain.QwExternalContactRemarkResult;
-import com.fs.qwApi.param.QwExternalContactRemarkParam;
-import com.fs.qwApi.service.QwApiService;
-import io.lettuce.core.ScriptOutputType;
-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.common.utils.poi.ExcelUtil;
+import com.fs.framework.security.LoginUser;
+import com.fs.framework.service.TokenService;
 import com.fs.qw.domain.QwWorkTask;
+import com.fs.qw.param.QwWorkTaskListParam;
 import com.fs.qw.service.IQwWorkTaskService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
+import com.fs.qw.vo.QwWorkTaskListVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * 企微任务看板Controller
@@ -54,8 +34,6 @@ public class QwWorkTaskController extends BaseController
     private IQwWorkTaskService qwWorkTaskService;
     @Autowired
     private TokenService tokenService;
-    @Autowired
-    private FsCourseWatchLogMapper fsCourseWatchLogMapper;
     /**
      * 查询企微任务看板列表
      */
@@ -68,36 +46,9 @@ public class QwWorkTaskController extends BaseController
         qwWorkTask.setCompanyId(loginUser.getCompany().getCompanyId());
         qwWorkTask.setCompanyUserId(loginUser.getUser().getUserId());
         List<QwWorkTaskListVO> list = qwWorkTaskService.selectQwWorkTaskListVO(qwWorkTask);
-        System.out.println(list);
-        for (QwWorkTaskListVO qwWorkTaskListVO : list) {
-            qwWorkTaskListVO.setLogs(fsCourseWatchLogMapper.selectFsCourseWatchLog7DayByExtId(qwWorkTaskListVO.getExtId()));
-        }
-        return getDataTable(list);
-    }
-
-    @GetMapping("/glList")
-    public TableDataInfo glList(QwWorkTaskListParam qwWorkTask)
-    {
-        startPage();
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        qwWorkTask.setCompanyId(loginUser.getCompany().getCompanyId());
-        List<QwWorkTaskListVO> list = qwWorkTaskService.selectQwWorkTaskListVO(qwWorkTask);
-        for (QwWorkTaskListVO qwWorkTaskListVO : list) {
-            qwWorkTaskListVO.setLogs(fsCourseWatchLogMapper.selectFsCourseWatchLog7DayByExtId(qwWorkTaskListVO.getExtId()));
-        }
         return getDataTable(list);
     }
 
-    @GetMapping("/allList")
-    public TableDataInfo allList(QwWorkTaskListParam qwWorkTask)
-    {
-        startPage();
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        qwWorkTask.setCompanyId(loginUser.getCompany().getCompanyId());
-        List<QwWorkTaskAllListVO> list = qwWorkTaskService.selectQwWorkTaskAllListVO(qwWorkTask);
-        System.out.println(list);
-        return getDataTable(list);
-    }
     /**
      * 导出企微任务看板列表
      */
@@ -131,12 +82,7 @@ public class QwWorkTaskController extends BaseController
     {
         return toAjax(qwWorkTaskService.insertQwWorkTask(qwWorkTask));
     }
-    @Autowired
-    QwApiService qwApiService;
-    @Autowired
-    IQwExternalContactService qwExternalContactService;
-    @Autowired
-    QwExternalContactMapper qwExternalContactMapper;
+
     /**
      * 修改企微任务看板
      */
@@ -147,55 +93,12 @@ public class QwWorkTaskController extends BaseController
     {
         QwWorkTask task = new QwWorkTask();
         task.setId(qwWorkTask.getId());
-        task.setStatus(1);
-        task.setTrackType(qwWorkTask.getTrackType());
-        task.setDescription(qwWorkTask.getDescription());
-        task.setUpdateTime(new Date());
-        if (task.getDescription()!=null&& !task.getDescription().isEmpty()){
-
-            QwExternalContact qwExternalContact = qwExternalContactService.selectQwExternalContactById(qwWorkTask.getExtId());
-            if (qwExternalContact!=null){
-                QwExternalContactRemarkParam param = new QwExternalContactRemarkParam();
-                param.setUserid(qwExternalContact.getUserId());
-                param.setExternal_userid(qwExternalContact.getExternalUserId());
-                param.setDescription(task.getDescription());
-
-                QwExternalContactRemarkResult qwExternalContactRemarkResult = qwApiService.externalcontactRemark(param, qwExternalContact.getCorpId());
-                logger.info("QwExternalContactRemarkResult206：" + qwExternalContactRemarkResult);
-                if (qwExternalContactRemarkResult.getErrcode() == 0) {
-                    QwExternalContact ext = new QwExternalContact();
-                    ext.setId(qwExternalContact.getId());
-                    ext.setDescription(task.getDescription());
-                    qwExternalContactMapper.updateQwExternalContact(ext);
-                }
-            }
-        }
-        return toAjax(qwWorkTaskService.updateQwWorkTask(task));
-    }
-    @PreAuthorize("@ss.hasPermi('qw:QwWorkTask:edit')")
-    @Log(title = "企微任务看板处理", businessType = BusinessType.UPDATE)
-    @PutMapping("/edit2")
-    public AjaxResult edit2(@RequestBody QwWorkTask qwWorkTask)
-    {
-        QwWorkTask task = new QwWorkTask();
-        task.setId(qwWorkTask.getId());
-        task.setStatus(1);
-        task.setUpdateTime(new Date());
-        task.setTrackType(2);
-        return toAjax(qwWorkTaskService.updateQwWorkTask(task));
-    }
-    @PreAuthorize("@ss.hasPermi('qw:QwWorkTask:edit')")
-    @Log(title = "企微任务看板处理", businessType = BusinessType.UPDATE)
-    @PutMapping("/edit3")
-    public AjaxResult edit3(@RequestBody QwWorkTask qwWorkTask)
-    {
-        QwWorkTask task = new QwWorkTask();
-        task.setId(qwWorkTask.getId());
+        task.setRemark(qwWorkTask.getRemark());
         task.setStatus(1);
         task.setUpdateTime(new Date());
-        task.setTrackType(3);
         return toAjax(qwWorkTaskService.updateQwWorkTask(task));
     }
+
     /**
      * 删除企微任务看板
      */

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

@@ -7,13 +7,11 @@ 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.mapper.QwUserMapper;
 import com.fs.qw.param.SopUserLogsVO;
+import com.fs.qw.service.IQwUserService;
 import com.fs.sop.domain.SopUserLogs;
-import com.fs.sop.params.BatchSopUserLogsInfoParam;
 import com.fs.sop.params.SopUserLogsParam;
 import com.fs.sop.service.ISopUserLogsService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +35,9 @@ public class SopUserLogsController extends BaseController
     @Autowired
     private TokenService tokenService;
 
+    @Autowired
+    private QwUserMapper qwUserMapper;
+
     /**
      * 查询sopUserLogs列表
      */
@@ -46,6 +47,9 @@ public class SopUserLogsController extends BaseController
     {
         startPage();
         List<SopUserLogsVO> list = sopUserLogsService.selectSopUserLogsList(sopUserLogs);
+        list.forEach(item->{
+            item.setQwUserName(qwUserMapper.selectQwUserByQwUserIdAndCorpId(item.getQwUserId(), item.getCorpId()));
+        });
         return getDataTable(list);
     }
 

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

@@ -8,26 +8,28 @@ 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;
 import com.fs.qw.param.QwExternalContactVOTime;
+import com.fs.qw.param.QwTagSearchParam;
 import com.fs.qw.param.SopExternalContactInfo;
-import com.fs.qw.param.SopExternalContactInfoEx;
 import com.fs.qw.service.IQwExternalContactService;
+import com.fs.qw.service.IQwTagService;
 import com.fs.sop.domain.SopUserLogsInfo;
 import com.fs.sop.params.BatchSopUserLogsInfoParam;
 import com.fs.sop.params.SendUserLogsInfoMsgParam;
-import com.fs.sop.params.SopUserLogsInfoInComVO;
 import com.fs.sop.service.ISopUserLogsInfoService;
-import com.fs.sop.vo.SopUserLogsInfoVOE;
 import com.fs.voice.utils.StringUtil;
+import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.reflect.TypeToken;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 /**
@@ -46,56 +48,139 @@ public class SopUserLogsInfoController extends BaseController
     @Autowired
     private IQwExternalContactService iQwExternalContactService;
 
+    @Autowired
+    private IQwTagService iQwTagService;
+
+    private static final Gson GSON = new Gson();
+
     /**
      * 查询sopUserLogsInfo列表
      */
     @PreAuthorize("@ss.hasPermi('qw:sop:list')")
     @GetMapping("/list")
     public TableDataInfo list(SopUserLogsInfo sopUserLogsInfo)
-    {
-        startPage();
+    {startPage();
         List<SopUserLogsInfo> list = sopUserLogsInfoService.selectSopUserLogsInfoList(sopUserLogsInfo);
 
-        if (!list.isEmpty()){
-
-            List<Long> externalIdList = list.stream()
-                    .map(SopUserLogsInfo::getExternalId) // 提取 externalId
-                    .filter(Objects::nonNull) // 过滤掉 null 值，防止 NullPointerException
-                    .collect(Collectors.toList()); // 收集到 List
-
-            List<QwExternalContactVOTime> qwExternalContactVOTimes = iQwExternalContactService.selectQwExternalContactListVOByIds(externalIdList);
+        if (!list.isEmpty()) {
+            // 使用并行流提取externalId
+            List<Long> externalIdList = list.parallelStream()
+                    .map(SopUserLogsInfo::getExternalId)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toList());
 
+            List<QwExternalContactVOTime> qwExternalContactVOTimes =
+                    iQwExternalContactService.selectQwExternalContactListVOByIds(externalIdList);
 
-            // 先将 qwExternalContactVOTimes 转换为 Map，key 为 id，value 为 ExternalContactInfo（包含 createTime 和 tagIds）
+            // 构建联系人信息映射
             Map<Long, SopExternalContactInfo> externalContactInfoMap = qwExternalContactVOTimes.stream()
                     .collect(Collectors.toMap(
                             QwExternalContactVOTime::getId,
-                            item -> new SopExternalContactInfo(item.getCreateTime(), item.getTagIds(),item.getRemark())
+                            item -> new SopExternalContactInfo(item.getCreateTime(), item.getTagIds(), item.getRemark())
                     ));
 
-            // 遍历 list，赋值 inComTime 和 tagIds
+            // 设置联系信息
             list.forEach(item -> {
-                SopExternalContactInfo info = externalContactInfoMap.getOrDefault(item.getExternalId(), new SopExternalContactInfo("无进线时间", "无标签","无备注"));
+                SopExternalContactInfo info = externalContactInfoMap.getOrDefault(
+                        item.getExternalId(),
+                        new SopExternalContactInfo("无进线时间", "无标签", "无备注"));
                 item.setInComTime(info.getCreateTime());
                 item.setTagIds(info.getTagIds());
                 item.setRemark(info.getRemark());
             });
-
         }
 
-        if ((sopUserLogsInfo.getTagIds() != null && !sopUserLogsInfo.getTagIds().isEmpty())
-                || !StringUtil.strIsNullOrEmpty(sopUserLogsInfo.getRemark())) {
+        // 优化过滤条件
+        boolean isRemarkEmpty = StringUtil.strIsNullOrEmpty(sopUserLogsInfo.getRemark());
+        Predicate<SopUserLogsInfo> tagFilter = item ->
+                sopUserLogsInfo.getTagIds() == null ||
+                        sopUserLogsInfo.getTagIds().isEmpty() ||
+                        item.getTagIds().contains(sopUserLogsInfo.getTagIds());
+
+        Predicate<SopUserLogsInfo> remarkFilter = item ->
+                isRemarkEmpty ||
+                        item.getRemark().contains(sopUserLogsInfo.getRemark());
+
+        if (sopUserLogsInfo.getTagIds() != null || !isRemarkEmpty) {
             list = list.stream()
-                    .filter(item ->
-                            (sopUserLogsInfo.getTagIds() == null || sopUserLogsInfo.getTagIds().isEmpty() || item.getTagIds().contains(sopUserLogsInfo.getTagIds()))
-                                    && (StringUtil.strIsNullOrEmpty(sopUserLogsInfo.getRemark()) || item.getRemark().contains(sopUserLogsInfo.getRemark()))
-                    )
+                    .filter(tagFilter.and(remarkFilter))
                     .collect(Collectors.toList());
         }
 
+        // 处理标签名称
+        list.parallelStream().forEach(item -> {
+            if (item.getTagIds() != null && !item.getTagIds().equals("[]") && !item.getTagIds().equals("无标签")) {
+                List<String> tagIds = GSON.fromJson(item.getTagIds(), new TypeToken<List<String>>() {}.getType());
+                QwTagSearchParam param = new QwTagSearchParam();
+                param.setTagIds(tagIds);
+                item.setTagIdsName(iQwTagService.selectQwTagListByTagIds(param));
+            }
+        });
+
         return getDataTable(list);
+//        startPage();
+//        List<SopUserLogsInfo> list = sopUserLogsInfoService.selectSopUserLogsInfoList(sopUserLogsInfo);
+//
+//
+//        if (!list.isEmpty()){
+//
+//            List<Long> externalIdList = list.stream()
+//                    .map(SopUserLogsInfo::getExternalId) // 提取 externalId
+//                    .filter(Objects::nonNull) // 过滤掉 null 值，防止 NullPointerException
+//                    .collect(Collectors.toList()); // 收集到 List
+//
+//            List<QwExternalContactVOTime> qwExternalContactVOTimes = iQwExternalContactService.selectQwExternalContactListVOByIds(externalIdList);
+//
+//
+//            // 先将 qwExternalContactVOTimes 转换为 Map，key 为 id，value 为 ExternalContactInfo（包含 createTime 和 tagIds）
+//            Map<Long, SopExternalContactInfo> externalContactInfoMap = qwExternalContactVOTimes.stream()
+//                    .collect(Collectors.toMap(
+//                            QwExternalContactVOTime::getId,
+//                            item -> new SopExternalContactInfo(item.getCreateTime(), item.getTagIds(),item.getRemark())
+//                    ));
+//
+//            // 遍历 list，赋值 inComTime 和 tagIds
+//            list.forEach(item -> {
+//                SopExternalContactInfo info = externalContactInfoMap.getOrDefault(item.getExternalId(), new SopExternalContactInfo("无进线时间", "无标签","无备注"));
+//                item.setInComTime(info.getCreateTime());
+//                item.setTagIds(info.getTagIds());
+//                item.setRemark(info.getRemark());
+//            });
+//
+//        }
+//
+//        if ((sopUserLogsInfo.getTagIds() != null && !sopUserLogsInfo.getTagIds().isEmpty())
+//                || !StringUtil.strIsNullOrEmpty(sopUserLogsInfo.getRemark())) {
+//            list = list.stream()
+//                    .filter(item ->
+//                            (sopUserLogsInfo.getTagIds() == null || sopUserLogsInfo.getTagIds().isEmpty() || item.getTagIds().contains(sopUserLogsInfo.getTagIds()))
+//                                    && (StringUtil.strIsNullOrEmpty(sopUserLogsInfo.getRemark()) || item.getRemark().contains(sopUserLogsInfo.getRemark()))
+//                    )
+//                    .collect(Collectors.toList());
+//        }
+//
+//
+//        list.forEach(item->{
+//
+//            if (!Objects.equals(item.getTagIds(), "[]") && !Objects.equals(item.getTagIds(), "无标签") && item.getTagIds()!=null) {
+//                QwTagSearchParam param = new QwTagSearchParam();
+//                Gson gson = new Gson();
+//                List<String> tagIds = gson.fromJson(
+//                        item.getTagIds(),
+//                        new TypeToken<List<String>>() {
+//                        }.getType()
+//                );
+//
+//                param.setTagIds(tagIds);
+//
+//                item.setTagIdsName(iQwTagService.selectQwTagListByTagIds(param));
+//            }
+//        });
+//
+//        return getDataTable(list);
     }
 
+
 //    /**
 //     * 导出sopUserLogsInfo列表
 //     */

fs-company/src/main/java/com/fs/company/controller/store/FsCityController.java

@@ -17,7 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**

fs-company/src/main/java/com/fs/company/controller/store/FsDrugReportController.java

@@ -7,13 +7,15 @@ import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.framework.security.LoginUser;
-import com.fs.his.domain.FsDrugReport;
 import com.fs.his.param.FsDrugReportParam;
 import com.fs.his.service.IFsDrugReportService;
 import com.fs.his.vo.FsDrugReportListVO;
 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/store/FsDrugReportCountController.java

@@ -7,13 +7,15 @@ import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.framework.security.LoginUser;
-import com.fs.his.domain.FsDrugReportCount;
 import com.fs.his.param.FsDrugReportCountParam;
 import com.fs.his.service.IFsDrugReportCountService;
 import com.fs.his.vo.FsDrugReportCountListVO;
 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/store/FsExportTaskController.java

@@ -5,8 +5,6 @@ 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.SecurityUtils;
-import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.framework.security.LoginUser;
 import com.fs.his.domain.FsExportTask;
 import com.fs.his.service.IFsExportTaskService;

fs-company/src/main/java/com/fs/company/controller/store/FsFollowController.java

@@ -5,10 +5,8 @@ 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.SecurityUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.framework.security.LoginUser;
-
 import com.fs.his.domain.FsFollow;
 import com.fs.his.param.FsFollowParam;
 import com.fs.his.service.IFsFollowService;

fs-company/src/main/java/com/fs/company/controller/store/FsHealthDataController.java

@@ -12,7 +12,10 @@ import com.fs.his.service.IFsHealthDataService;
 import com.fs.his.vo.FsHealthDataListVO;
 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/store/FsHealthLifeController.java

@@ -12,7 +12,10 @@ import com.fs.his.service.IFsHealthLifeService;
 import com.fs.his.vo.FsHealthLifeListVO;
 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/store/FsInquiryOrderController.java

@@ -9,7 +9,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.StringUtils;
-import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.security.SecurityUtils;
 import com.fs.his.domain.FsExportTask;
@@ -24,8 +23,6 @@ import com.fs.his.service.IFsExportTaskService;
 import com.fs.his.service.IFsInquiryOrderLogsService;
 import com.fs.his.service.IFsInquiryOrderService;
 import com.fs.his.utils.PhoneUtil;
-import com.fs.his.vo.FsInquiryFeedbackExportListVO;
-import com.fs.his.vo.FsInquiryOrderExeclListVO;
 import com.fs.his.vo.FsInquiryOrderListVO;
 import com.fs.his.vo.FsInquiryOrderVO;
 import io.swagger.annotations.ApiOperation;

fs-company/src/main/java/com/fs/company/controller/store/FsInquiryOrderReportController.java

@@ -8,8 +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.ParseUtils;
-import com.fs.common.utils.SecurityUtils;
-import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.framework.security.LoginUser;
 import com.fs.his.domain.FsExportTask;
 import com.fs.his.domain.FsInquiryDisease;
@@ -17,7 +15,6 @@ import com.fs.his.domain.FsInquiryOrderReport;
 import com.fs.his.param.FsIllnessLibraryNameParam;
 import com.fs.his.param.FsInquiryOrderReportParam;
 import com.fs.his.service.*;
-import com.fs.his.service.impl.FsInquiryDiseaseServiceImpl;
 import com.fs.his.utils.PhoneUtil;
 import com.fs.his.vo.FsInquiryDiseaseVO;
 import com.fs.his.vo.FsInquiryOrderReportListVO;

fs-company/src/main/java/com/fs/company/controller/store/FsPackageController.java

@@ -6,22 +6,17 @@ 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.vo.OptionVO;
 import com.fs.his.domain.FsPackage;
 import com.fs.his.param.FsPackageParam;
 import com.fs.his.service.IFsPackageService;
 import com.fs.his.vo.FsPackageExcelVO;
 import com.fs.his.vo.FsPackageListVO;
 import com.fs.his.vo.OptionsVO;
-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 java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 套餐包Controller
@@ -117,38 +112,4 @@ public class FsPackageController extends BaseController
         List<FsPackageListVO> list = fsPackageService.selectFsPackageListVByName(packageName);
         return AjaxResult.success(list);
     }
-
-    /**
-     * 根据secondName模糊查询列表
-     * @param name 别名
-     * @return list
-     */
-    @GetMapping("/getPackageListLikeSecondName")
-    public AjaxResult getPackageListLikeSecondName(@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("secondName", name);
-
-        PageHelper.startPage(pageNum, pageSize);
-        List<OptionVO> list = fsPackageService.selectFsPackageListByMap(params);
-        return AjaxResult.success(new PageInfo<>(list));
-    }
-
-    /**
-     * 根据套餐名称模糊查询列表
-     * @param name 名称
-     * @return list
-     */
-    @GetMapping("/getPackageListLikeName")
-    public AjaxResult getPackageListLikeName(@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("packageName", name);
-
-        PageHelper.startPage(pageNum, pageSize);
-        List<OptionVO> list = fsPackageService.selectFsPackageListByMap(params);
-        return AjaxResult.success(new PageInfo<>(list));
-    }
 }

fs-company/src/main/java/com/fs/company/controller/store/FsPackageOrderController.java

@@ -9,21 +9,17 @@ import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ParseUtils;
 import com.fs.common.utils.StringUtils;
-import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.security.SecurityUtils;
 import com.fs.his.domain.FsExportTask;
 import com.fs.his.domain.FsPackageOrder;
 import com.fs.his.param.FsPackageOrderAddParam;
-import com.fs.his.param.FsPackageOrderCreateParam;
 import com.fs.his.param.FsPackageOrderParam;
 import com.fs.his.service.IFsExportTaskService;
 import com.fs.his.service.IFsPackageOrderService;
 import com.fs.his.utils.PhoneUtil;
-import com.fs.his.vo.FsPackageOrderExcelVO;
 import com.fs.his.vo.FsPackageOrderListVO;
 import com.fs.his.vo.FsPackageOrderVO;
-import com.fs.his.vo.FsStoreOrderVO;
 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/store/FsPatientController.java

@@ -3,7 +3,6 @@ package com.fs.company.controller.store;
 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.exception.CustomException;
@@ -13,19 +12,15 @@ import com.fs.framework.security.SecurityUtils;
 import com.fs.his.domain.FsPatient;
 import com.fs.his.service.IFsPatientService;
 import com.fs.his.vo.FsPatientVO;
-import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
-import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.regex.Pattern;
 
 /**
@@ -248,34 +243,4 @@ public class FsPatientController extends BaseController
     {
         return toAjax(fsPatientService.deleteFsPatientByPatientIds(patientIds));
     }
-
-    /**
-     * 根据患者名称查询列表
-     * @param name  名称
-     * @return  list
-     */
-    @GetMapping("/getPatientListLikeName")
-    public AjaxResult getPatientListLikeName(@RequestParam(required = false) String name) {
-        Map<String, Object> params = new HashMap<>();
-        params.put("patientName", name);
-
-        PageHelper.startPage(1, 10);
-        List<FsPatient> list = fsPatientService.selectFsPatientListByMap(params);
-        return AjaxResult.success(list);
-    }
-
-    /**
-     * 根据患者电话查询列表
-     * @param tel  电话
-     * @return  list
-     */
-    @GetMapping("/getPatientListLikeTel")
-    public AjaxResult getPatientListLikeTel(@RequestParam(required = false) String tel) {
-        Map<String, Object> params = new HashMap<>();
-        params.put("tel", tel);
-
-        PageHelper.startPage(1, 10);
-        List<FsPatient> list = fsPatientService.selectFsPatientListByMap(params);
-        return AjaxResult.success(list);
-    }
 }

fs-company/src/main/java/com/fs/company/controller/store/FsPrescribeController.java

@@ -17,7 +17,6 @@ import com.fs.his.vo.FsMessageFeedbackExportListVO;
 import com.fs.his.vo.FsPrescribeExcelListVO;
 import com.fs.his.vo.FsPrescribeListVO;
 import com.fs.his.vo.FsPrescribeVO;
-import com.fs.im.service.IImService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;

fs-company/src/main/java/com/fs/company/controller/store/FsStoreAfterSalesController.java

@@ -5,9 +5,7 @@ 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.ParseUtils;
 import com.fs.common.utils.StringUtils;
-import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.security.SecurityUtils;
 import com.fs.his.domain.FsExportTask;
@@ -15,9 +13,7 @@ import com.fs.his.domain.FsStoreAfterSales;
 import com.fs.his.param.FsStoreAfterSalesParam;
 import com.fs.his.service.IFsExportTaskService;
 import com.fs.his.service.IFsStoreAfterSalesService;
-import com.fs.his.vo.FsStoreAfterSalesExcelVO;
 import com.fs.his.vo.FsStoreAfterSalesListVO;
-import com.fs.his.vo.FsStoreAfterSalesVO;
 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/store/FsStoreOrderBillLogController.java

@@ -16,11 +16,9 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-import static com.fs.his.utils.PhoneUtil.encryptPhone;
-
 /**
  * 订单开票记录Controller
- * 
+ *
  * @author fs
  * @date 2025-01-07
  */

fs-company/src/main/java/com/fs/company/controller/store/FsStoreOrderController.java

@@ -1,7 +1,6 @@
 package com.fs.company.controller.store;
 
 import cn.hutool.core.util.StrUtil;
-import com.fs.common.BeanCopyUtils;
 import com.fs.common.annotation.DataScope;
 import com.fs.common.annotation.Log;
 import com.fs.common.annotation.RepeatSubmit;
@@ -10,11 +9,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.ParseUtils;
 import com.fs.common.utils.StringUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.crm.service.ICrmCustomerService;
-import com.fs.crm.service.impl.CrmCustomerServiceImpl;
 import com.fs.erp.dto.ErpOrderQueryRequert;
 import com.fs.erp.dto.ErpOrderQueryResponse;
 import com.fs.erp.service.IErpOrderService;
@@ -31,14 +28,15 @@ import com.fs.his.service.IFsExportTaskService;
 import com.fs.his.service.IFsExpressService;
 import com.fs.his.service.IFsStoreOrderService;
 import com.fs.his.utils.PhoneUtil;
-import com.fs.his.vo.*;
+import com.fs.his.vo.FsStoreOrderListVO;
+import com.fs.his.vo.FsStoreOrderVO;
+import com.fs.his.vo.FsStoreProductDeliverExcelVO;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 

fs-company/src/main/java/com/fs/company/controller/store/FsUserAddressController.java

@@ -12,7 +12,6 @@ import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.his.domain.FsUserAddress;
 import com.fs.his.dto.AddressInfoDTO;
 import com.fs.his.service.IFsUserAddressService;
-import com.tencentcloudapi.kms.v20190118.models.GetParametersForImportRequest;
 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/store/FsUserController.java

@@ -5,7 +5,6 @@ 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.StringUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.security.SecurityUtils;
@@ -16,15 +15,14 @@ import com.fs.his.service.IFsUserService;
 import com.fs.his.vo.FsUserExportListVO;
 import com.fs.his.vo.FsUserVO;
 import com.fs.his.vo.UserVo;
-import com.fs.qwApi.domain.QwWorkExternalSendApp;
-import com.fs.qwApi.service.QwWorkApiService;
 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 static com.fs.his.utils.PhoneUtil.*;
+import static com.fs.his.utils.PhoneUtil.decryptAutoPhoneMk;
+import static com.fs.his.utils.PhoneUtil.encryptPhone;
 
 /**
  * 用户Controller

fs-company/src/main/java/com/fs/company/utils/AudioUtils.java

@@ -3,7 +3,11 @@ package com.fs.company.utils;
 import com.fs.common.exception.ServiceException;
 import com.fs.system.oss.CloudStorageService;
 import com.fs.system.oss.OSSFactory;
-import java.io.*;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.file.Files;

fs-company/src/main/java/com/fs/company/utils/MD5PasswordEncoder.java

@@ -1,6 +1,7 @@
 package com.fs.company.utils;
 
 import org.springframework.security.crypto.password.PasswordEncoder;
+
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 

fs-company/src/main/java/com/fs/framework/config/SecurityConfig.java

@@ -117,7 +117,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/baiduBack/**").anonymous()
                 .antMatchers("/msg/**/**").anonymous()
                 .antMatchers("/msg").anonymous()
-                .antMatchers("/common/test").anonymous()
                 .antMatchers("/common/getId**").anonymous()
                 .antMatchers("/common/uploadOSS**").anonymous()
                 .antMatchers("/common/uploadWang**").anonymous()

fs-company/src/main/resources/application-druid-hzyy.yml

@@ -0,0 +1,148 @@
+# 数据源配置
+spring:
+    # redis 配置
+    redis:
+        # 地址
+        host: 192.168.0.209
+        # 端口，默认为6379
+        port: 6379
+        # 数据库索引
+        database: 0
+        # 密码
+        password: Ylrztek250218!3@.
+        # 连接超时时间
+        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.163: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.163: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-company/src/main/resources/application.yml

@@ -26,14 +26,14 @@ server:
     # tomcat的URI编码
     uri-encoding: UTF-8
     # tomcat最大线程数，默认为200
-    max-threads: 1200
+    max-threads: 800
     # Tomcat启动初始化的线程数，默认值25
     min-spare-threads: 30
 
 # 日志配置
 logging:
   level:
-    com.fs: debug
+    com.fs: info
     org.springframework: warn
 
 # Spring配置
@@ -43,8 +43,9 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
+    active: druid
+#    active: druid-myhk
 #    active: dev
-    active: dev
     include: config
   # 文件上传
   servlet:

fs-doctor-app/src/main/java/com/fs/app/controller/InquiryOrderController.java

@@ -4,8 +4,6 @@ package com.fs.app.controller;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import cn.jiguang.common.resp.APIConnectionException;
-import cn.jiguang.common.resp.APIRequestException;
 import com.alibaba.fastjson.JSON;
 import com.fs.app.annotation.Login;
 import com.fs.app.param.InquiryOrderMsgListParam;
@@ -184,7 +182,7 @@ public class InquiryOrderController extends  AppBaseController {
     @Login
     @ApiOperation("接单")
     @PostMapping("/receiveOrder")
-    public R receiveOrder(@Validated @RequestBody FsInquiryOrderReceiveParam param, HttpServletRequest request) throws APIConnectionException, APIRequestException {
+    public R receiveOrder(@Validated @RequestBody FsInquiryOrderReceiveParam param, HttpServletRequest request){
         param.setDoctorId(Long.parseLong(getDoctorId()));
         return inquiryOrderService.receiveOrder(param);
     }