Pārlūkot izejas kodu

Merge branch 'saas-api' of http://1.14.104.71:10880/txl/ylrz_saas_his_scrm into saas-api

云联一号 1 nedēļu atpakaļ
vecāks
revīzija
b9de6120f8
95 mainītis faili ar 174 papildinājumiem un 148 dzēšanām
  1. 1 0
      fs-company/src/main/java/com/fs/company/controller/companyWorkflow/CompanyWorkflowTagTemplateBindingController.java
  2. 1 0
      fs-company/src/main/java/com/fs/company/controller/knowledge/AiKnowledgeBaseController.java
  3. 1 0
      fs-company/src/main/java/com/fs/company/controller/knowledge/CompanyAiProviderController.java
  4. 1 0
      fs-company/src/main/java/com/fs/company/controller/tag/CompanyTagTemplateBindingController.java
  5. 1 0
      fs-company/src/main/java/com/fs/company/controller/workflow/LobsterApiRegistryController.java
  6. 1 0
      fs-company/src/main/java/com/fs/company/controller/workflow/LobsterBillingController.java
  7. 1 0
      fs-company/src/main/java/com/fs/company/controller/workflow/LobsterDeadLetterController.java
  8. 3 2
      fs-company/src/main/java/com/fs/company/controller/workflow/LobsterEventAuditController.java
  9. 1 0
      fs-company/src/main/java/com/fs/company/controller/workflow/LobsterOptimizationController.java
  10. 2 1
      fs-company/src/main/java/com/fs/company/controller/workflow/LobsterPromptController.java
  11. 3 2
      fs-company/src/main/java/com/fs/company/controller/workflow/LobsterSalesCorpusController.java
  12. 0 2
      fs-service/src/main/java/com/fs/aicall/mapper/CompanyBindAiModelMapper.java
  13. 0 2
      fs-service/src/main/java/com/fs/company/mapper/AdminAiModelMapper.java
  14. 0 2
      fs-service/src/main/java/com/fs/company/mapper/AdminAiSceneMapper.java
  15. 0 2
      fs-service/src/main/java/com/fs/company/mapper/AdminAiSceneModelMapper.java
  16. 0 2
      fs-service/src/main/java/com/fs/company/mapper/CompanyAiProviderMapper.java
  17. 0 1
      fs-service/src/main/java/com/fs/company/mapper/CompanyRechargeOrderMapper.java
  18. 0 2
      fs-service/src/main/java/com/fs/company/mapper/CompanyTrafficRecordLogMapper.java
  19. 0 2
      fs-service/src/main/java/com/fs/company/mapper/CompanyTrafficRecordMapper.java
  20. 1 1
      fs-service/src/main/java/com/fs/company/mapper/CompanyWorkflowLobsterEdgeMapper.java
  21. 1 1
      fs-service/src/main/java/com/fs/company/mapper/CompanyWorkflowLobsterVariableMapper.java
  22. 0 2
      fs-service/src/main/java/com/fs/company/mapper/LobsterComplianceRuleMapper.java
  23. 0 2
      fs-service/src/main/java/com/fs/company/mapper/LobsterConversationSummaryMapper.java
  24. 0 2
      fs-service/src/main/java/com/fs/company/mapper/LobsterModelConfigMapper.java
  25. 0 2
      fs-service/src/main/java/com/fs/company/mapper/LobsterNodeExecutionLogMapper.java
  26. 0 2
      fs-service/src/main/java/com/fs/company/mapper/LobsterWorkflowInstanceMapper.java
  27. 0 2
      fs-service/src/main/java/com/fs/company/mapper/LobsterWorkflowNodeTypeMapper.java
  28. 2 2
      fs-service/src/main/java/com/fs/company/service/impl/CompanyWorkflowLobsterServiceImpl.java
  29. 0 1
      fs-service/src/main/java/com/fs/course/mapper/HyWatchLogMapper.java
  30. 0 1
      fs-service/src/main/java/com/fs/erp/converter/ErpWdtToErpOrderMapper.java
  31. 0 1
      fs-service/src/main/java/com/fs/erp/mapper/FsErpFinishPushMapper.java
  32. 0 1
      fs-service/src/main/java/com/fs/erp/mapper/FsJstAftersalePushMapper.java
  33. 0 1
      fs-service/src/main/java/com/fs/erp/mapper/FsJstAftersalePushScrmMapper.java
  34. 0 1
      fs-service/src/main/java/com/fs/erp/mapper/FsJstCodPushMapper.java
  35. 0 1
      fs-service/src/main/java/com/fs/erp/mapper/FsJstCodPushScrmMapper.java
  36. 0 1
      fs-service/src/main/java/com/fs/his/mapper/RedPacketLogMapper.java
  37. 0 1
      fs-service/src/main/java/com/fs/live/mapper/LiveLotteryConfMapper.java
  38. 0 1
      fs-service/src/main/java/com/fs/live/mapper/LiveMiniprogramSubNotifyTaskMapper.java
  39. 0 1
      fs-service/src/main/java/com/fs/live/mapper/LiveRedConfMapper.java
  40. 0 2
      fs-service/src/main/java/com/fs/live/mapper/LiveUserGiftMapper.java
  41. 0 2
      fs-service/src/main/java/com/fs/live/mapper/LiveUserRedRecordMapper.java
  42. 0 2
      fs-service/src/main/java/com/fs/newAdv/mapper/AdvChannelMapper.java
  43. 0 2
      fs-service/src/main/java/com/fs/newAdv/mapper/AdvEventTypeMapper.java
  44. 0 2
      fs-service/src/main/java/com/fs/newAdv/mapper/AdvMiniConfigMapper.java
  45. 0 2
      fs-service/src/main/java/com/fs/newAdv/mapper/AdvProjectMapper.java
  46. 0 2
      fs-service/src/main/java/com/fs/newAdv/mapper/AdvertiserMapper.java
  47. 0 2
      fs-service/src/main/java/com/fs/newAdv/mapper/AlertLogMapper.java
  48. 0 2
      fs-service/src/main/java/com/fs/newAdv/mapper/ApiCallLogMapper.java
  49. 0 2
      fs-service/src/main/java/com/fs/newAdv/mapper/CallbackAccountMapper.java
  50. 0 2
      fs-service/src/main/java/com/fs/newAdv/mapper/CallbackLogMapper.java
  51. 0 2
      fs-service/src/main/java/com/fs/newAdv/mapper/ConversionLogMapper.java
  52. 0 2
      fs-service/src/main/java/com/fs/newAdv/mapper/ConversionTargetMapper.java
  53. 0 2
      fs-service/src/main/java/com/fs/newAdv/mapper/DomainMapper.java
  54. 0 2
      fs-service/src/main/java/com/fs/newAdv/mapper/LandingPageTemplateMapper.java
  55. 0 2
      fs-service/src/main/java/com/fs/newAdv/mapper/LeadMapper.java
  56. 0 2
      fs-service/src/main/java/com/fs/newAdv/mapper/PromotionAccountMapper.java
  57. 0 2
      fs-service/src/main/java/com/fs/newAdv/mapper/SiteMapper.java
  58. 0 2
      fs-service/src/main/java/com/fs/newAdv/mapper/SiteStatisticsMapper.java
  59. 0 2
      fs-service/src/main/java/com/fs/newAdv/mapper/SyncLogMapper.java
  60. 0 2
      fs-service/src/main/java/com/fs/newAdv/mapper/TrackingLinkMapper.java
  61. 0 2
      fs-service/src/main/java/com/fs/proxy/mapper/CompanySmsApiMapper.java
  62. 0 2
      fs-service/src/main/java/com/fs/proxy/mapper/CompanySmsApiPortMapper.java
  63. 0 2
      fs-service/src/main/java/com/fs/proxy/mapper/CompanySmsApiTenantMapper.java
  64. 0 2
      fs-service/src/main/java/com/fs/proxy/mapper/CompanySmsCardMapper.java
  65. 0 2
      fs-service/src/main/java/com/fs/proxy/mapper/CompanySmsCardMiddlewareMapper.java
  66. 0 2
      fs-service/src/main/java/com/fs/proxy/mapper/CompanySmsDeviceMapper.java
  67. 0 2
      fs-service/src/main/java/com/fs/proxy/mapper/CompanySmsPortAssignMapper.java
  68. 1 3
      fs-service/src/main/java/com/fs/proxy/mapper/ProxyServicePriceMapper.java
  69. 1 3
      fs-service/src/main/java/com/fs/proxy/mapper/ProxyWithdrawMapper.java
  70. 0 2
      fs-service/src/main/java/com/fs/proxy/mapper/ServiceFeeConfigMapper.java
  71. 0 2
      fs-service/src/main/java/com/fs/qw/mapper/QwAssignRuleMapper.java
  72. 0 2
      fs-service/src/main/java/com/fs/qw/mapper/QwAssignRuleUserMapper.java
  73. 0 2
      fs-service/src/main/java/com/fs/qw/mapper/QwCustomerLinkChannelMapper.java
  74. 0 2
      fs-service/src/main/java/com/fs/qw/mapper/QwCustomerLinkMapper.java
  75. 0 2
      fs-service/src/main/java/com/fs/qw/mapper/QwCustomerLinkUserMapper.java
  76. 0 2
      fs-service/src/main/java/com/fs/qw/mapper/QwGroupActualMapper.java
  77. 0 2
      fs-service/src/main/java/com/fs/qw/mapper/QwGroupLiveCodeMapper.java
  78. 0 1
      fs-service/src/main/java/com/fs/statis/mapper/FsStatisEveryDayWatchMapper.java
  79. 0 1
      fs-service/src/main/java/com/fs/statis/mapper/FsStatisPeriodWatchMapper.java
  80. 0 2
      fs-service/src/main/java/com/fs/statis/mapper/FsStatisQwTempParamMapper.java
  81. 0 2
      fs-service/src/main/java/com/fs/statis/mapper/FsStatisQwWatchMapper.java
  82. 0 1
      fs-service/src/main/java/com/fs/statis/mapper/FsStatisSalerWatchMapper.java
  83. 0 2
      fs-service/src/main/java/com/fs/statis/mapper/FsStatisTempFsuserMapper.java
  84. 0 2
      fs-service/src/main/java/com/fs/statis/mapper/FsStatisTempParamMapper.java
  85. 0 1
      fs-service/src/main/java/com/fs/statis/mapper/FsTempPeriodQueryMapper.java
  86. 0 2
      fs-service/src/main/java/com/fs/system/mapper/SysConfigMapper.java
  87. 0 2
      fs-service/src/main/java/com/fs/system/mapper/SysDictTypeMapper.java
  88. 0 1
      fs-service/src/main/java/com/fs/tag/mapper/FsTagUpdateQueueMapper.java
  89. 0 2
      fs-service/src/main/java/com/fs/tulin/mapper/TulinInfoSyncLogMapper.java
  90. 1 1
      fs-service/src/main/java/com/fs/wx/cp/config/WxCpConfiguration.java
  91. 0 1
      fs-service/src/main/java/com/fs/wx/order/mapper/FsWxExpressTaskMapper.java
  92. 1 1
      fs-service/src/main/resources/mapper/company/CompanyWorkflowLobsterEdgeMapper.xml
  93. 1 1
      fs-service/src/main/resources/mapper/company/CompanyWorkflowLobsterVariableMapper.xml
  94. 72 0
      fs-service/src/main/resources/mapper/company/LobsterModelConfigMapper.xml
  95. 77 0
      fs-service/src/main/resources/mapper/company/LobsterWorkflowNodeTypeMapper.xml

+ 1 - 0
fs-company/src/main/java/com/fs/company/controller/companyWorkflow/CompanyWorkflowTagTemplateBindingController.java

@@ -10,6 +10,7 @@ import com.fs.company.service.ICompanyTagTemplateBindingService;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;

+ 1 - 0
fs-company/src/main/java/com/fs/company/controller/knowledge/AiKnowledgeBaseController.java

@@ -12,6 +12,7 @@ import com.fs.company.service.AiKnowledgeBaseService;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.Serializable;

+ 1 - 0
fs-company/src/main/java/com/fs/company/controller/knowledge/CompanyAiProviderController.java

@@ -10,6 +10,7 @@ import com.fs.company.service.llm.MultiModelRouter;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 

+ 1 - 0
fs-company/src/main/java/com/fs/company/controller/tag/CompanyTagTemplateBindingController.java

@@ -10,6 +10,7 @@ import com.fs.company.service.ICompanyTagTemplateBindingService;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;

+ 1 - 0
fs-company/src/main/java/com/fs/company/controller/workflow/LobsterApiRegistryController.java

@@ -9,6 +9,7 @@ import com.fs.company.service.workflow.api.ApiRegistryService.ApiEndpoint;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 

+ 1 - 0
fs-company/src/main/java/com/fs/company/controller/workflow/LobsterBillingController.java

@@ -8,6 +8,7 @@ import com.fs.company.service.billing.BillingService;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

+ 1 - 0
fs-company/src/main/java/com/fs/company/controller/workflow/LobsterDeadLetterController.java

@@ -9,6 +9,7 @@ import com.fs.company.service.workflow.queue.DeadLetterQueue.DeadMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 

+ 3 - 2
fs-company/src/main/java/com/fs/company/controller/workflow/LobsterEventAuditController.java

@@ -9,6 +9,7 @@ import com.fs.company.service.workflow.event.WorkflowPatcher;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -17,10 +18,10 @@ import java.util.*;
 
 /**
  * 龙虾事件节点审核Controller
- * 
+ *
  * 表: lobster_event_node_audit
  * 页面: 节点审核 → 待审列表/通过/驳回
- * 
+ *
  * 关联: EventDecisionEngine AI决策后写入 → 运营审核通过 → WorkflowPatcher注入节点
  */
 @Profile("company")

+ 1 - 0
fs-company/src/main/java/com/fs/company/controller/workflow/LobsterOptimizationController.java

@@ -8,6 +8,7 @@ import com.fs.framework.security.LoginUser;
 import com.fs.common.utils.ServletUtils;
 import com.fs.framework.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 

+ 2 - 1
fs-company/src/main/java/com/fs/company/controller/workflow/LobsterPromptController.java

@@ -8,6 +8,7 @@ import com.fs.company.service.workflow.prompt.SystemPromptService;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -121,7 +122,7 @@ public class LobsterPromptController extends BaseController {
     @DeleteMapping("/{id}")
     public AjaxResult delete(@PathVariable Long id) {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        jdbcTemplate.update("UPDATE " + TABLE + " SET enabled=0, update_time=NOW() WHERE id=? AND company_id=?", 
+        jdbcTemplate.update("UPDATE " + TABLE + " SET enabled=0, update_time=NOW() WHERE id=? AND company_id=?",
                 id, loginUser.getCompany().getCompanyId());
         if (promptService != null) promptService.refreshCache();
         return AjaxResult.success("删除成功");

+ 3 - 2
fs-company/src/main/java/com/fs/company/controller/workflow/LobsterSalesCorpusController.java

@@ -11,6 +11,7 @@ import com.fs.company.service.workflow.learning.SalesCorpusAnalyzer.CorpusEntry;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -19,10 +20,10 @@ import java.util.*;
 
 /**
  * 龙虾销冠语料管理Controller
- * 
+ *
  * 表: lobster_learning_corpus
  * 页面: 销冠语料 → 录入/批量导入/AI分析/话术库查询
- * 
+ *
  * 核心价值: 租户上传销冠/金牌客服聊天话术 → AI分析提取沟通模式 → 进化引擎学习 → 全租户共享
  */
 @Profile("company")

+ 0 - 2
fs-service/src/main/java/com/fs/aicall/mapper/CompanyBindAiModelMapper.java

@@ -1,7 +1,6 @@
 package com.fs.aicall.mapper;
 
 import com.fs.aicall.domain.CompanyBindAiModel;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -12,7 +11,6 @@ import java.util.List;
  * @author ruoyi
  * @date 2026-03-20
  */
-@Mapper
 public interface CompanyBindAiModelMapper
 {
     /**

+ 0 - 2
fs-service/src/main/java/com/fs/company/mapper/AdminAiModelMapper.java

@@ -1,7 +1,6 @@
 package com.fs.company.mapper;
 
 import com.fs.company.domain.AdminAiModel;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -9,7 +8,6 @@ import java.util.List;
 /**
  * AdminAiModel Mapper
  */
-@Mapper
 public interface AdminAiModelMapper {
 
     List<AdminAiModel> selectList();

+ 0 - 2
fs-service/src/main/java/com/fs/company/mapper/AdminAiSceneMapper.java

@@ -1,7 +1,6 @@
 package com.fs.company.mapper;
 
 import com.fs.company.domain.AdminAiScene;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -9,7 +8,6 @@ import java.util.List;
 /**
  * AdminAiScene Mapper
  */
-@Mapper
 public interface AdminAiSceneMapper {
 
     List<AdminAiScene> selectList();

+ 0 - 2
fs-service/src/main/java/com/fs/company/mapper/AdminAiSceneModelMapper.java

@@ -1,7 +1,6 @@
 package com.fs.company.mapper;
 
 import com.fs.company.domain.AdminAiSceneModel;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -9,7 +8,6 @@ import java.util.List;
 /**
  * AdminAiSceneModel Mapper(场景-模型关联)
  */
-@Mapper
 public interface AdminAiSceneModelMapper {
 
     /** 按场景编码查询关联的模型列表(JOIN admin_ai_model),按pipeline_order排序 */

+ 0 - 2
fs-service/src/main/java/com/fs/company/mapper/CompanyAiProviderMapper.java

@@ -1,12 +1,10 @@
 package com.fs.company.mapper;
 
 import com.fs.company.domain.CompanyAiProvider;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-@Mapper
 public interface CompanyAiProviderMapper {
 
     List<CompanyAiProvider> selectList();

+ 0 - 1
fs-service/src/main/java/com/fs/company/mapper/CompanyRechargeOrderMapper.java

@@ -8,7 +8,6 @@ import java.util.List;
 /**
  * 公司充值订单表 Mapper
  */
-@Mapper
 public interface CompanyRechargeOrderMapper {
 
     /**

+ 0 - 2
fs-service/src/main/java/com/fs/company/mapper/CompanyTrafficRecordLogMapper.java

@@ -2,9 +2,7 @@ package com.fs.company.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.company.domain.CompanyTrafficRecordLog;
-import org.apache.ibatis.annotations.Mapper;
 
-@Mapper
 public interface CompanyTrafficRecordLogMapper extends BaseMapper<CompanyTrafficRecordLog> {
 
 }

+ 0 - 2
fs-service/src/main/java/com/fs/company/mapper/CompanyTrafficRecordMapper.java

@@ -3,13 +3,11 @@ package com.fs.company.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.company.domain.CompanyTrafficRecord;
 import com.fs.company.param.CompanyTrafficRecordQueryParam;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
-@Mapper
 public interface CompanyTrafficRecordMapper extends BaseMapper<CompanyTrafficRecord> {
 
     @Select("SELECT SUM(ctr.balance) FROM company_traffic_record ctr inner join company c on ctr.company_id = c.company_id and c.dept_id = #{deptId}")

+ 1 - 1
fs-service/src/main/java/com/fs/company/mapper/CompanyWorkflowLobsterEdgeMapper.java

@@ -13,5 +13,5 @@ public interface CompanyWorkflowLobsterEdgeMapper extends BaseMapper<CompanyWork
 
     List<CompanyWorkflowLobsterEdge> selectByWorkflowId(@Param("workflowId") Long workflowId);
 
-    int updateById(@Param("entity") CompanyWorkflowLobsterEdge entity);
+    int updateSelectiveById(@Param("entity") CompanyWorkflowLobsterEdge entity);
 }

+ 1 - 1
fs-service/src/main/java/com/fs/company/mapper/CompanyWorkflowLobsterVariableMapper.java

@@ -13,5 +13,5 @@ public interface CompanyWorkflowLobsterVariableMapper extends BaseMapper<Company
 
     List<CompanyWorkflowLobsterVariable> selectByWorkflowId(@Param("workflowId") Long workflowId);
 
-    int updateById(@Param("entity") CompanyWorkflowLobsterVariable entity);
+    int updateSelectiveById(@Param("entity") CompanyWorkflowLobsterVariable entity);
 }

+ 0 - 2
fs-service/src/main/java/com/fs/company/mapper/LobsterComplianceRuleMapper.java

@@ -1,12 +1,10 @@
 package com.fs.company.mapper;
 
 import com.fs.company.domain.LobsterComplianceRule;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-@Mapper
 public interface LobsterComplianceRuleMapper {
 
     List<LobsterComplianceRule> selectByCompanyId(@Param("companyId") Long companyId);

+ 0 - 2
fs-service/src/main/java/com/fs/company/mapper/LobsterConversationSummaryMapper.java

@@ -1,12 +1,10 @@
 package com.fs.company.mapper;
 
 import com.fs.company.domain.LobsterConversationSummary;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-@Mapper
 public interface LobsterConversationSummaryMapper {
 
     List<LobsterConversationSummary> selectByInstanceId(@Param("instanceId") Long instanceId, @Param("companyId") Long companyId);

+ 0 - 2
fs-service/src/main/java/com/fs/company/mapper/LobsterModelConfigMapper.java

@@ -1,7 +1,6 @@
 package com.fs.company.mapper;
 
 import com.fs.company.domain.LobsterModelConfig;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -9,7 +8,6 @@ import java.util.List;
 /**
  * 龙虾大模型配置Mapper
  */
-@Mapper
 public interface LobsterModelConfigMapper {
     
     /**

+ 0 - 2
fs-service/src/main/java/com/fs/company/mapper/LobsterNodeExecutionLogMapper.java

@@ -1,12 +1,10 @@
 package com.fs.company.mapper;
 
 import com.fs.company.domain.LobsterNodeExecutionLog;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-@Mapper
 public interface LobsterNodeExecutionLogMapper {
 
     List<LobsterNodeExecutionLog> selectByInstanceId(@Param("instanceId") Long instanceId, @Param("companyId") Long companyId);

+ 0 - 2
fs-service/src/main/java/com/fs/company/mapper/LobsterWorkflowInstanceMapper.java

@@ -1,12 +1,10 @@
 package com.fs.company.mapper;
 
 import com.fs.company.domain.LobsterWorkflowInstance;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-@Mapper
 public interface LobsterWorkflowInstanceMapper {
 
     List<LobsterWorkflowInstance> selectByCompanyId(@Param("companyId") Long companyId);

+ 0 - 2
fs-service/src/main/java/com/fs/company/mapper/LobsterWorkflowNodeTypeMapper.java

@@ -1,7 +1,6 @@
 package com.fs.company.mapper;
 
 import com.fs.company.domain.LobsterWorkflowNodeType;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -9,7 +8,6 @@ import java.util.List;
 /**
  * 龙虾工作流节点类型配置Mapper
  */
-@Mapper
 public interface LobsterWorkflowNodeTypeMapper {
     
     /**

+ 2 - 2
fs-service/src/main/java/com/fs/company/service/impl/CompanyWorkflowLobsterServiceImpl.java

@@ -586,7 +586,7 @@ public class CompanyWorkflowLobsterServiceImpl implements ICompanyWorkflowLobste
                 entity.setUpdateTime(now);
                 if (v.getId() != null) {
                     entity.setId(v.getId());
-                    variableMapper.updateById(entity);
+                    variableMapper.updateSelectiveById(entity);
                     newVarIds.add(v.getId());
                 } else {
                     entity.setCreateBy(userName);
@@ -658,7 +658,7 @@ public class CompanyWorkflowLobsterServiceImpl implements ICompanyWorkflowLobste
                 entity.setUpdateTime(now);
                 if (e.getId() != null) {
                     entity.setId(e.getId());
-                    edgeMapper.updateById(entity);
+                    edgeMapper.updateSelectiveById(entity);
                     newEdgeIds.add(e.getId());
                 } else {
                     entity.setCreateBy(userName);

+ 0 - 1
fs-service/src/main/java/com/fs/course/mapper/HyWatchLogMapper.java

@@ -8,7 +8,6 @@ import java.util.List;
 /**
  * 企微看课表数据库访问接口
  */
-@Mapper
 public interface HyWatchLogMapper {
 
     /**

+ 0 - 1
fs-service/src/main/java/com/fs/erp/converter/ErpWdtToErpOrderMapper.java

@@ -35,7 +35,6 @@ import java.util.List;
  * @author xdd
  * @since 2025-02-27
  */
-@Mapper
 public interface ErpWdtToErpOrderMapper {
 
     /**

+ 0 - 1
fs-service/src/main/java/com/fs/erp/mapper/FsErpFinishPushMapper.java

@@ -11,7 +11,6 @@ import java.util.List;
  * @author AutoGenerated
  * @date CurrentDateTime // 这里通常会是生成日期
  */
-@Mapper
 public interface FsErpFinishPushMapper {
 
     /**

+ 0 - 1
fs-service/src/main/java/com/fs/erp/mapper/FsJstAftersalePushMapper.java

@@ -8,7 +8,6 @@ import java.util.List;
 /**
  * 订阅物流Mapper
  */
-@Mapper
 public interface FsJstAftersalePushMapper {
 
     /**

+ 0 - 1
fs-service/src/main/java/com/fs/erp/mapper/FsJstAftersalePushScrmMapper.java

@@ -8,7 +8,6 @@ import java.util.List;
 /**
  * 订阅物流Mapper
  */
-@Mapper
 public interface FsJstAftersalePushScrmMapper {
 
     /**

+ 0 - 1
fs-service/src/main/java/com/fs/erp/mapper/FsJstCodPushMapper.java

@@ -5,7 +5,6 @@ import org.apache.ibatis.annotations.*;
 
 import java.util.List;
 
-@Mapper
 public interface FsJstCodPushMapper {
 
     /**

+ 0 - 1
fs-service/src/main/java/com/fs/erp/mapper/FsJstCodPushScrmMapper.java

@@ -5,7 +5,6 @@ import org.apache.ibatis.annotations.*;
 
 import java.util.List;
 
-@Mapper
 public interface FsJstCodPushScrmMapper {
 
     /**

+ 0 - 1
fs-service/src/main/java/com/fs/his/mapper/RedPacketLogMapper.java

@@ -8,7 +8,6 @@ import java.util.List;
 /**
  * 红包发放日志表 Mapper接口
  */
-@Mapper
 public interface RedPacketLogMapper {
 
     /**

+ 0 - 1
fs-service/src/main/java/com/fs/live/mapper/LiveLotteryConfMapper.java

@@ -15,7 +15,6 @@ import java.util.Set;
  * @author fs
  * @date 2025-07-17
  */
-@Mapper
 public interface LiveLotteryConfMapper {
     /**
      * 查询直播抽奖配置

+ 0 - 1
fs-service/src/main/java/com/fs/live/mapper/LiveMiniprogramSubNotifyTaskMapper.java

@@ -13,7 +13,6 @@ import java.util.List;
  * @version 1.0.0
  * @since 2025-03-10
  */
-@Mapper
 public interface LiveMiniprogramSubNotifyTaskMapper {
 
     /**

+ 0 - 1
fs-service/src/main/java/com/fs/live/mapper/LiveRedConfMapper.java

@@ -13,7 +13,6 @@ import org.apache.ibatis.annotations.*;
  * @author fs
  * @date 2025-07-17
  */
-@Mapper
 public interface LiveRedConfMapper {
     /**
      * 查询直播红包记录配置

+ 0 - 2
fs-service/src/main/java/com/fs/live/mapper/LiveUserGiftMapper.java

@@ -3,7 +3,6 @@ package com.fs.live.mapper;
 
 import com.fs.live.domain.LiveUserGift;
 import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 直播礼物记录配置Mapper接口
@@ -11,7 +10,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author fs
  * @date 2025-07-17
  */
-@Mapper
 public interface LiveUserGiftMapper {
 
 

+ 0 - 2
fs-service/src/main/java/com/fs/live/mapper/LiveUserRedRecordMapper.java

@@ -4,7 +4,6 @@ import java.util.List;
 
 import com.fs.live.domain.LiveUserRedRecord;
 import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Options;
 import org.apache.ibatis.annotations.Select;
 
@@ -14,7 +13,6 @@ import org.apache.ibatis.annotations.Select;
  * @author fs
  * @date 2025-07-17
  */
-@Mapper
 public interface LiveUserRedRecordMapper {
     /**
      * 查询直播用户红包记录

+ 0 - 2
fs-service/src/main/java/com/fs/newAdv/mapper/AdvChannelMapper.java

@@ -2,7 +2,6 @@ package com.fs.newAdv.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.newAdv.domain.AdvChannelEntity;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -12,7 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author zhangqin
  * @since 2025-11-27
  */
-@Mapper
 public interface AdvChannelMapper extends BaseMapper<AdvChannelEntity> {
 
 }

+ 0 - 2
fs-service/src/main/java/com/fs/newAdv/mapper/AdvEventTypeMapper.java

@@ -2,7 +2,6 @@ package com.fs.newAdv.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.newAdv.domain.AdvEventType;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 广告商表 Mapper接口
@@ -10,7 +9,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author zhangqin
  * @date 2025-11-03
  */
-@Mapper
 public interface AdvEventTypeMapper extends BaseMapper<AdvEventType> {
 
 }

+ 0 - 2
fs-service/src/main/java/com/fs/newAdv/mapper/AdvMiniConfigMapper.java

@@ -2,7 +2,6 @@ package com.fs.newAdv.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.newAdv.domain.AdvMiniConfig;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -12,7 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author zhangqin
  * @since 2025-12-19
  */
-@Mapper
 public interface AdvMiniConfigMapper extends BaseMapper<AdvMiniConfig> {
 
 }

+ 0 - 2
fs-service/src/main/java/com/fs/newAdv/mapper/AdvProjectMapper.java

@@ -2,7 +2,6 @@ package com.fs.newAdv.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.newAdv.domain.AdvProjectEntity;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -12,7 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author zhangqin
  * @since 2025-11-27
  */
-@Mapper
 public interface AdvProjectMapper extends BaseMapper<AdvProjectEntity> {
 
 }

+ 0 - 2
fs-service/src/main/java/com/fs/newAdv/mapper/AdvertiserMapper.java

@@ -2,7 +2,6 @@ package com.fs.newAdv.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.newAdv.domain.Advertiser;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 广告商表 Mapper接口
@@ -10,7 +9,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author zhangqin
  * @date 2025-11-03
  */
-@Mapper
 public interface AdvertiserMapper extends BaseMapper<Advertiser> {
 
 }

+ 0 - 2
fs-service/src/main/java/com/fs/newAdv/mapper/AlertLogMapper.java

@@ -2,7 +2,6 @@ package com.fs.newAdv.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.newAdv.domain.AlertLog;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 告警记录表 Mapper接口
@@ -10,7 +9,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author zhangqin
  * @date 2025-11-03
  */
-@Mapper
 public interface AlertLogMapper extends BaseMapper<AlertLog> {
 
 }

+ 0 - 2
fs-service/src/main/java/com/fs/newAdv/mapper/ApiCallLogMapper.java

@@ -2,7 +2,6 @@ package com.fs.newAdv.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.newAdv.domain.ApiCallLog;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * API调用日志表 Mapper接口
@@ -10,7 +9,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author zhangqin
  * @date 2025-11-03
  */
-@Mapper
 public interface ApiCallLogMapper extends BaseMapper<ApiCallLog> {
 
 }

+ 0 - 2
fs-service/src/main/java/com/fs/newAdv/mapper/CallbackAccountMapper.java

@@ -2,7 +2,6 @@ package com.fs.newAdv.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.newAdv.domain.CallbackAccount;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 回传账号表 Mapper接口
@@ -10,7 +9,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author zhangqin
  * @date 2025-11-03
  */
-@Mapper
 public interface CallbackAccountMapper extends BaseMapper<CallbackAccount> {
 
 }

+ 0 - 2
fs-service/src/main/java/com/fs/newAdv/mapper/CallbackLogMapper.java

@@ -2,7 +2,6 @@ package com.fs.newAdv.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.newAdv.domain.CallbackLog;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 第三方回调记录表 Mapper接口
@@ -10,7 +9,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author zhangqin
  * @date 2025-11-03
  */
-@Mapper
 public interface CallbackLogMapper extends BaseMapper<CallbackLog> {
 
 }

+ 0 - 2
fs-service/src/main/java/com/fs/newAdv/mapper/ConversionLogMapper.java

@@ -2,7 +2,6 @@ package com.fs.newAdv.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.newAdv.domain.ConversionLog;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -13,7 +12,6 @@ import java.util.List;
  * @author zhangqin
  * @date 2025-11-03
  */
-@Mapper
 public interface ConversionLogMapper extends BaseMapper<ConversionLog> {
 
     /**

+ 0 - 2
fs-service/src/main/java/com/fs/newAdv/mapper/ConversionTargetMapper.java

@@ -2,7 +2,6 @@ package com.fs.newAdv.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.newAdv.domain.ConversionTarget;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 转化目标表 Mapper接口
@@ -10,7 +9,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author zhangqin
  * @date 2025-11-03
  */
-@Mapper
 public interface ConversionTargetMapper extends BaseMapper<ConversionTarget> {
 
 }

+ 0 - 2
fs-service/src/main/java/com/fs/newAdv/mapper/DomainMapper.java

@@ -2,7 +2,6 @@ package com.fs.newAdv.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.newAdv.domain.DomainUrl;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 域名管理Mapper接口
@@ -10,7 +9,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author zhangqin
  * @date 2025-11-06
  */
-@Mapper
 public interface DomainMapper extends BaseMapper<DomainUrl> {
 
 }

+ 0 - 2
fs-service/src/main/java/com/fs/newAdv/mapper/LandingPageTemplateMapper.java

@@ -2,7 +2,6 @@ package com.fs.newAdv.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.newAdv.domain.LandingPageTemplate;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 投放页面模板Mapper接口
@@ -10,7 +9,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author zhangqin
  * @date 2025-11-06
  */
-@Mapper
 public interface LandingPageTemplateMapper extends BaseMapper<LandingPageTemplate> {
 
 }

+ 0 - 2
fs-service/src/main/java/com/fs/newAdv/mapper/LeadMapper.java

@@ -2,7 +2,6 @@ package com.fs.newAdv.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.newAdv.domain.Lead;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -13,7 +12,6 @@ import java.util.List;
  * @author zhangqin
  * @date 2025-11-05
  */
-@Mapper
 public interface LeadMapper extends BaseMapper<Lead> {
     /**
      * 查询当日加群的数量

+ 0 - 2
fs-service/src/main/java/com/fs/newAdv/mapper/PromotionAccountMapper.java

@@ -2,7 +2,6 @@ package com.fs.newAdv.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.newAdv.domain.PromotionAccount;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -13,7 +12,6 @@ import java.util.List;
  * @author zhangqin
  * @date 2025-11-03
  */
-@Mapper
 public interface PromotionAccountMapper extends BaseMapper<PromotionAccount> {
 
     /**

+ 0 - 2
fs-service/src/main/java/com/fs/newAdv/mapper/SiteMapper.java

@@ -2,7 +2,6 @@ package com.fs.newAdv.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.newAdv.domain.Site;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -13,7 +12,6 @@ import java.util.List;
  * @author zhangqin
  * @date 2025-11-03
  */
-@Mapper
 public interface SiteMapper extends BaseMapper<Site> {
 
     /**

+ 0 - 2
fs-service/src/main/java/com/fs/newAdv/mapper/SiteStatisticsMapper.java

@@ -2,7 +2,6 @@ package com.fs.newAdv.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.newAdv.domain.SiteStatistics;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
@@ -12,7 +11,6 @@ import org.apache.ibatis.annotations.Update;
  * @author zhangqin
  * @date 2025-11-03
  */
-@Mapper
 public interface SiteStatisticsMapper extends BaseMapper<SiteStatistics> {
 }
 

+ 0 - 2
fs-service/src/main/java/com/fs/newAdv/mapper/SyncLogMapper.java

@@ -2,7 +2,6 @@ package com.fs.newAdv.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.newAdv.domain.SyncLog;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 数据同步日志表 Mapper接口
@@ -10,7 +9,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author zhangqin
  * @date 2025-11-03
  */
-@Mapper
 public interface SyncLogMapper extends BaseMapper<SyncLog> {
 
 }

+ 0 - 2
fs-service/src/main/java/com/fs/newAdv/mapper/TrackingLinkMapper.java

@@ -2,7 +2,6 @@ package com.fs.newAdv.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.newAdv.domain.TrackingLink;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 监测链接表 Mapper接口
@@ -10,7 +9,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author zhangqin
  * @date 2025-11-03
  */
-@Mapper
 public interface TrackingLinkMapper extends BaseMapper<TrackingLink> {
 
 }

+ 0 - 2
fs-service/src/main/java/com/fs/proxy/mapper/CompanySmsApiMapper.java

@@ -1,11 +1,9 @@
 package com.fs.proxy.mapper;
 
 import com.fs.proxy.domain.CompanySmsApi;
-import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
-@Mapper
 public interface CompanySmsApiMapper {
 
     List<CompanySmsApi> selectSmsApiList(CompanySmsApi query);

+ 0 - 2
fs-service/src/main/java/com/fs/proxy/mapper/CompanySmsApiPortMapper.java

@@ -1,12 +1,10 @@
 package com.fs.proxy.mapper;
 
 import com.fs.proxy.domain.CompanySmsApiPort;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-@Mapper
 public interface CompanySmsApiPortMapper {
 
     List<CompanySmsApiPort> selectPortList(CompanySmsApiPort query);

+ 0 - 2
fs-service/src/main/java/com/fs/proxy/mapper/CompanySmsApiTenantMapper.java

@@ -1,13 +1,11 @@
 package com.fs.proxy.mapper;
 
 import com.fs.proxy.domain.CompanySmsApiTenant;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
 import java.util.List;
 
-@Mapper
 public interface CompanySmsApiTenantMapper {
 
     List<CompanySmsApiTenant> selectSmsApiTenantList(CompanySmsApiTenant query);

+ 0 - 2
fs-service/src/main/java/com/fs/proxy/mapper/CompanySmsCardMapper.java

@@ -1,12 +1,10 @@
 package com.fs.proxy.mapper;
 
 import com.fs.proxy.domain.CompanySmsCard;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-@Mapper
 public interface CompanySmsCardMapper {
 
     List<CompanySmsCard> selectCardList(CompanySmsCard query);

+ 0 - 2
fs-service/src/main/java/com/fs/proxy/mapper/CompanySmsCardMiddlewareMapper.java

@@ -1,12 +1,10 @@
 package com.fs.proxy.mapper;
 
 import com.fs.proxy.domain.CompanySmsCardMiddleware;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-@Mapper
 public interface CompanySmsCardMiddlewareMapper {
 
     List<CompanySmsCardMiddleware> selectMiddlewareList(CompanySmsCardMiddleware query);

+ 0 - 2
fs-service/src/main/java/com/fs/proxy/mapper/CompanySmsDeviceMapper.java

@@ -1,7 +1,6 @@
 package com.fs.proxy.mapper;
 
 import com.fs.proxy.domain.CompanySmsDevice;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -9,7 +8,6 @@ import java.util.List;
 /**
  * 设备管理 Mapper
  */
-@Mapper
 public interface CompanySmsDeviceMapper {
 
     List<CompanySmsDevice> selectDeviceList(CompanySmsDevice query);

+ 0 - 2
fs-service/src/main/java/com/fs/proxy/mapper/CompanySmsPortAssignMapper.java

@@ -1,12 +1,10 @@
 package com.fs.proxy.mapper;
 
 import com.fs.proxy.domain.CompanySmsPortAssign;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-@Mapper
 public interface CompanySmsPortAssignMapper {
 
     List<CompanySmsPortAssign> selectAssignList(CompanySmsPortAssign query);

+ 1 - 3
fs-service/src/main/java/com/fs/proxy/mapper/ProxyServicePriceMapper.java

@@ -1,7 +1,6 @@
 package com.fs.proxy.mapper;
 
 import com.fs.proxy.domain.ProxyServicePrice;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -9,7 +8,6 @@ import java.util.List;
 /**
  * 代理服务价格配置Mapper接口
  */
-@Mapper
 public interface ProxyServicePriceMapper {
 
     /**
@@ -84,4 +82,4 @@ public interface ProxyServicePriceMapper {
      * @return 结果
      */
     int deleteByProxyId(Long proxyId);
-}
+}

+ 1 - 3
fs-service/src/main/java/com/fs/proxy/mapper/ProxyWithdrawMapper.java

@@ -1,14 +1,12 @@
 package com.fs.proxy.mapper;
 
 import com.fs.proxy.domain.ProxyWithdraw;
-import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
 /**
  * 代理商提现Mapper接口
  */
-@Mapper
 public interface ProxyWithdrawMapper {
 
     /**
@@ -73,4 +71,4 @@ public interface ProxyWithdrawMapper {
      * @return 待审核数量
      */
     int countPendingWithdraw();
-}
+}

+ 0 - 2
fs-service/src/main/java/com/fs/proxy/mapper/ServiceFeeConfigMapper.java

@@ -1,11 +1,9 @@
 package com.fs.proxy.mapper;
 
 import com.fs.proxy.domain.ServiceFeeConfig;
-import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
-@Mapper
 public interface ServiceFeeConfigMapper {
 
     List<ServiceFeeConfig> selectAllFeeConfigs();

+ 0 - 2
fs-service/src/main/java/com/fs/qw/mapper/QwAssignRuleMapper.java

@@ -2,7 +2,6 @@ package com.fs.qw.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.qw.domain.QwAssignRule;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -12,7 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author zhangqin
  * @since 2025-11-28
  */
-@Mapper
 public interface QwAssignRuleMapper extends BaseMapper<QwAssignRule> {
 
 }

+ 0 - 2
fs-service/src/main/java/com/fs/qw/mapper/QwAssignRuleUserMapper.java

@@ -2,7 +2,6 @@ package com.fs.qw.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.qw.domain.QwAssignRuleUser;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -12,7 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author zhangqin
  * @since 2025-12-05
  */
-@Mapper
 public interface QwAssignRuleUserMapper extends BaseMapper<QwAssignRuleUser> {
 
 }

+ 0 - 2
fs-service/src/main/java/com/fs/qw/mapper/QwCustomerLinkChannelMapper.java

@@ -2,7 +2,6 @@ package com.fs.qw.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.qw.domain.QwCustomerLinkChannel;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -12,7 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author zhangqin
  * @since 2025-12-03
  */
-@Mapper
 public interface QwCustomerLinkChannelMapper extends BaseMapper<QwCustomerLinkChannel> {
 
 }

+ 0 - 2
fs-service/src/main/java/com/fs/qw/mapper/QwCustomerLinkMapper.java

@@ -2,7 +2,6 @@ package com.fs.qw.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.qw.domain.QwCustomerLink;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -12,7 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author zhangqin
  * @since 2025-12-03
  */
-@Mapper
 public interface QwCustomerLinkMapper extends BaseMapper<QwCustomerLink> {
 
 }

+ 0 - 2
fs-service/src/main/java/com/fs/qw/mapper/QwCustomerLinkUserMapper.java

@@ -2,7 +2,6 @@ package com.fs.qw.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.qw.domain.QwCustomerLinkUser;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -12,7 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author zhangqin
  * @since 2025-12-03
  */
-@Mapper
 public interface QwCustomerLinkUserMapper extends BaseMapper<QwCustomerLinkUser> {
 
 }

+ 0 - 2
fs-service/src/main/java/com/fs/qw/mapper/QwGroupActualMapper.java

@@ -2,7 +2,6 @@ package com.fs.qw.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.qw.domain.QwGroupActual;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -12,7 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author zhangqin
  * @since 2025-11-28
  */
-@Mapper
 public interface QwGroupActualMapper extends BaseMapper<QwGroupActual> {
 
 }

+ 0 - 2
fs-service/src/main/java/com/fs/qw/mapper/QwGroupLiveCodeMapper.java

@@ -2,7 +2,6 @@ package com.fs.qw.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.qw.domain.QwGroupLiveCode;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -12,7 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author zhangqin
  * @since 2025-11-28
  */
-@Mapper
 public interface QwGroupLiveCodeMapper extends BaseMapper<QwGroupLiveCode> {
 
 }

+ 0 - 1
fs-service/src/main/java/com/fs/statis/mapper/FsStatisEveryDayWatchMapper.java

@@ -10,7 +10,6 @@ import java.util.List;
 /**
  * 每日统计数据Mapper接口
  */
-@Mapper
 public interface FsStatisEveryDayWatchMapper {
 
     /**

+ 0 - 1
fs-service/src/main/java/com/fs/statis/mapper/FsStatisPeriodWatchMapper.java

@@ -14,7 +14,6 @@ import java.util.List;
  * @author AutoGenerator
  * @since now
  */
-@Mapper
 public interface FsStatisPeriodWatchMapper {
 
     /**

+ 0 - 2
fs-service/src/main/java/com/fs/statis/mapper/FsStatisQwTempParamMapper.java

@@ -2,7 +2,6 @@ package com.fs.statis.mapper;
 
 import com.fs.statis.domain.FsStatisQwTempParam;
 import org.apache.ibatis.annotations.Delete;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -11,7 +10,6 @@ import java.util.List;
  * Mapper interface for operations on the fs_statis_qw_temp_param table.
  * The method names should correspond to the 'id' attributes in FsStatisQwTempParamMapper.xml.
  */
-@Mapper // This annotation is commonly used with Spring Boot to mark it as a MyBatis mapper
 public interface FsStatisQwTempParamMapper {
 
     /**

+ 0 - 2
fs-service/src/main/java/com/fs/statis/mapper/FsStatisQwWatchMapper.java

@@ -3,13 +3,11 @@ package com.fs.statis.mapper;
 import com.fs.statis.domain.FsStatisQwWatch;
 import com.fs.statis.dto.FsStatisQwWatchWriteDataDTO;
 import com.fs.statis.dto.StatsWatchLogPageListDTO;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
 
-@Mapper
 public interface FsStatisQwWatchMapper {
 
     /**

+ 0 - 1
fs-service/src/main/java/com/fs/statis/mapper/FsStatisSalerWatchMapper.java

@@ -14,7 +14,6 @@ import java.util.List;
 /**
  * 销售观看统计Mapper接口
  */
-@Mapper
 public interface FsStatisSalerWatchMapper {
 
     /**

+ 0 - 2
fs-service/src/main/java/com/fs/statis/mapper/FsStatisTempFsuserMapper.java

@@ -2,7 +2,6 @@ package com.fs.statis.mapper;
 
 import com.fs.statis.domain.FsStatisTempFsuser;
 import org.apache.ibatis.annotations.Delete;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -13,7 +12,6 @@ import java.util.List;
  * @author YourName
  * @since YYYY-MM-DD
  */
-@Mapper
 public interface FsStatisTempFsuserMapper {
 
     /**

+ 0 - 2
fs-service/src/main/java/com/fs/statis/mapper/FsStatisTempParamMapper.java

@@ -4,11 +4,9 @@ import com.fs.common.annotation.DataSource;
 import com.fs.common.enums.DataSourceType;
 import com.fs.statis.domain.FsStatisTempParam;
 import org.apache.ibatis.annotations.Delete;
-import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
-@Mapper
 public interface FsStatisTempParamMapper {
 
     /**

+ 0 - 1
fs-service/src/main/java/com/fs/statis/mapper/FsTempPeriodQueryMapper.java

@@ -8,7 +8,6 @@ import java.util.List;
 /**
  * 临时期次查询Mapper接口
  */
-@Mapper
 public interface FsTempPeriodQueryMapper {
 
     /**

+ 0 - 2
fs-service/src/main/java/com/fs/system/mapper/SysConfigMapper.java

@@ -2,7 +2,6 @@ package com.fs.system.mapper;
 
 import java.util.List;
 import com.fs.system.domain.SysConfig;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
 /**
@@ -10,7 +9,6 @@ import org.apache.ibatis.annotations.Select;
  *
 
  */
-@Mapper
 public interface SysConfigMapper
 {
     /**

+ 0 - 2
fs-service/src/main/java/com/fs/system/mapper/SysDictTypeMapper.java

@@ -1,7 +1,6 @@
 package com.fs.system.mapper;
 
 import java.util.List;
-import org.apache.ibatis.annotations.Mapper;
 import com.fs.common.core.domain.entity.SysDictType;
 
 /**
@@ -9,7 +8,6 @@ import com.fs.common.core.domain.entity.SysDictType;
  * 
 
  */
-@Mapper
 public interface SysDictTypeMapper
 {
     /**

+ 0 - 1
fs-service/src/main/java/com/fs/tag/mapper/FsTagUpdateQueueMapper.java

@@ -8,7 +8,6 @@ import java.util.List;
 /**
  * 标签更新对列表 Mapper
  */
-@Mapper
 public interface FsTagUpdateQueueMapper {
 
     @Select("select * from fs_tag_update_queue where retry_count < 3 and status in (0,3) and (next_execute_time < now() or next_execute_time is null) limit 1000")

+ 0 - 2
fs-service/src/main/java/com/fs/tulin/mapper/TulinInfoSyncLogMapper.java

@@ -4,7 +4,6 @@ package com.fs.tulin.mapper;
 import com.fs.tulin.entity.PeriodInfo;
 import com.fs.tulin.entity.QwExUserInfo;
 import com.fs.tulin.entity.TulinInfoSyncLog;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -14,7 +13,6 @@ import java.util.List;
  * @author: Guos
  * @time: 2025/10/23 上午11:45
  */
-@Mapper
 public interface TulinInfoSyncLogMapper {
 
 

+ 1 - 1
fs-service/src/main/java/com/fs/wx/cp/config/WxCpConfiguration.java

@@ -62,7 +62,7 @@ public class WxCpConfiguration {
     @PostConstruct
     public void initServices() {
         if (!properties.isConfigValid()) {
-            log.error("企业微信配置不完整,无法初始化服务");
+            log.warn("企业微信配置不完整,跳过 WxCpService 初始化(可在租户库配置后动态创建)");
             return;
         }
 

+ 0 - 1
fs-service/src/main/java/com/fs/wx/order/mapper/FsWxExpressTaskMapper.java

@@ -8,7 +8,6 @@ import java.util.List;
 /**
  * 微信同步发货信息定时任务表 Mapper 接口
  */
-@Mapper
 public interface FsWxExpressTaskMapper {
 
     /**

+ 1 - 1
fs-service/src/main/resources/mapper/company/CompanyWorkflowLobsterEdgeMapper.xml

@@ -53,7 +53,7 @@
         order by sort_no asc
     </select>
 
-    <update id="updateById">
+    <update id="updateSelectiveById">
         update company_workflow_lobster_edge
         <trim prefix="set" suffixOverrides=",">
             <if test="entity.edgeKey != null">edge_key = #{entity.edgeKey},</if>

+ 1 - 1
fs-service/src/main/resources/mapper/company/CompanyWorkflowLobsterVariableMapper.xml

@@ -27,7 +27,7 @@
         order by id asc
     </select>
 
-    <update id="updateById">
+    <update id="updateSelectiveById">
         update company_workflow_lobster_variable
         <trim prefix="set" suffixOverrides=",">
             <if test="entity.varCode != null">var_code = #{entity.varCode},</if>

+ 72 - 0
fs-service/src/main/resources/mapper/company/LobsterModelConfigMapper.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fs.company.mapper.LobsterModelConfigMapper">
+
+    <resultMap type="com.fs.company.domain.LobsterModelConfig" id="LobsterModelConfigResult">
+        <id property="id" column="id"/>
+        <result property="companyId" column="company_id"/>
+        <result property="configType" column="config_type"/>
+        <result property="modelA" column="model_a"/>
+        <result property="modelB" column="model_b"/>
+        <result property="modelC" column="model_c"/>
+        <result property="industryType" column="industry_type"/>
+        <result property="paramsJson" column="params_json"/>
+        <result property="enabled" column="enabled"/>
+        <result property="createdAt" column="created_at"/>
+        <result property="updatedAt" column="updated_at"/>
+    </resultMap>
+
+    <sql id="selectColumns">
+        select id, company_id, config_type, model_a, model_b, model_c,
+               industry_type, params_json, enabled, created_at, updated_at
+        from lobster_model_config
+    </sql>
+
+    <select id="selectByCompanyAndType" resultMap="LobsterModelConfigResult">
+        <include refid="selectColumns"/>
+        where company_id = #{companyId}
+          and config_type = #{configType}
+        limit 1
+    </select>
+
+    <select id="selectAll" resultMap="LobsterModelConfigResult">
+        <include refid="selectColumns"/>
+        order by company_id, config_type
+    </select>
+
+    <select id="selectByCompanyId" resultMap="LobsterModelConfigResult">
+        <include refid="selectColumns"/>
+        where company_id = #{companyId}
+        order by config_type
+    </select>
+
+    <insert id="insert" parameterType="com.fs.company.domain.LobsterModelConfig" useGeneratedKeys="true" keyProperty="id">
+        insert into lobster_model_config (
+            company_id, config_type, model_a, model_b, model_c,
+            industry_type, params_json, enabled
+        ) values (
+            #{companyId}, #{configType}, #{modelA}, #{modelB}, #{modelC},
+            #{industryType}, #{paramsJson}, #{enabled}
+        )
+    </insert>
+
+    <update id="updateByPrimaryKey" parameterType="com.fs.company.domain.LobsterModelConfig">
+        update lobster_model_config
+        <set>
+            <if test="companyId != null">company_id = #{companyId},</if>
+            <if test="configType != null">config_type = #{configType},</if>
+            <if test="modelA != null">model_a = #{modelA},</if>
+            <if test="modelB != null">model_b = #{modelB},</if>
+            <if test="modelC != null">model_c = #{modelC},</if>
+            <if test="industryType != null">industry_type = #{industryType},</if>
+            <if test="paramsJson != null">params_json = #{paramsJson},</if>
+            <if test="enabled != null">enabled = #{enabled},</if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteByPrimaryKey">
+        delete from lobster_model_config where id = #{id}
+    </delete>
+
+</mapper>

+ 77 - 0
fs-service/src/main/resources/mapper/company/LobsterWorkflowNodeTypeMapper.xml

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fs.company.mapper.LobsterWorkflowNodeTypeMapper">
+
+    <resultMap type="com.fs.company.domain.LobsterWorkflowNodeType" id="LobsterWorkflowNodeTypeResult">
+        <result property="id" column="id"/>
+        <result property="nodeType" column="node_type"/>
+        <result property="nodeName" column="node_name"/>
+        <result property="codeName" column="code_name"/>
+        <result property="description" column="description"/>
+        <result property="category" column="category"/>
+        <result property="icon" column="icon"/>
+        <result property="color" column="color"/>
+        <result property="templateJson" column="template_json"/>
+        <result property="enabled" column="enabled"/>
+        <result property="sortOrder" column="sort_order"/>
+        <result property="createdAt" column="created_at"/>
+        <result property="updatedAt" column="updated_at"/>
+    </resultMap>
+
+    <sql id="selectColumns">
+        select id, node_type, node_name, code_name, description, category, icon, color,
+               template_json, enabled, sort_order, created_at, updated_at
+        from lobster_workflow_node_type
+    </sql>
+
+    <select id="selectByNodeType" resultMap="LobsterWorkflowNodeTypeResult">
+        <include refid="selectColumns"/>
+        where node_type = #{nodeType}
+    </select>
+
+    <select id="selectByCodeName" resultMap="LobsterWorkflowNodeTypeResult">
+        <include refid="selectColumns"/>
+        where code_name = #{codeName}
+    </select>
+
+    <select id="selectAllEnabled" resultMap="LobsterWorkflowNodeTypeResult">
+        <include refid="selectColumns"/>
+        where enabled = 1
+        order by sort_order, node_type
+    </select>
+
+    <select id="selectByCategory" resultMap="LobsterWorkflowNodeTypeResult">
+        <include refid="selectColumns"/>
+        where category = #{category} and enabled = 1
+        order by sort_order, node_type
+    </select>
+
+    <insert id="insert" parameterType="com.fs.company.domain.LobsterWorkflowNodeType" useGeneratedKeys="true" keyProperty="id">
+        insert into lobster_workflow_node_type (
+            node_type, node_name, code_name, description, category, icon, color,
+            template_json, enabled, sort_order
+        ) values (
+            #{nodeType}, #{nodeName}, #{codeName}, #{description}, #{category}, #{icon}, #{color},
+            #{templateJson}, #{enabled}, #{sortOrder}
+        )
+    </insert>
+
+    <update id="updateByPrimaryKey" parameterType="com.fs.company.domain.LobsterWorkflowNodeType">
+        update lobster_workflow_node_type
+        set node_type = #{nodeType},
+            node_name = #{nodeName},
+            code_name = #{codeName},
+            description = #{description},
+            category = #{category},
+            icon = #{icon},
+            color = #{color},
+            template_json = #{templateJson},
+            enabled = #{enabled},
+            sort_order = #{sortOrder}
+        where id = #{id}
+    </update>
+
+    <delete id="deleteByPrimaryKey">
+        delete from lobster_workflow_node_type where id = #{id}
+    </delete>
+</mapper>