Merge remote-tracking branch 'origin/saas-api' into saas-api

fs-agent/src/main/java/com/fs/admin/controller/AdminAdController.java

@@ -3,7 +3,6 @@ package com.fs.admin.controller;
 import java.util.*;
 import org.springframework.context.annotation.Profile;
 
-import com.fs.admin.helper.AdminCrossTenantHelper;
 import com.fs.common.annotation.Excel;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
@@ -25,8 +24,6 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/admin/ad")
 public class AdminAdController extends BaseController {
 
-    @Autowired
-    private AdminCrossTenantHelper crossTenantHelper;
 
     @Log(title = "导出广告账户", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('admin:ad:list')")
@@ -34,32 +31,33 @@ public class AdminAdController extends BaseController {
     public AjaxResult export(@RequestParam(required = false) String accountName,
                              @RequestParam(required = false) Long companyId,
                              @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) -> {
-                    StringBuilder sql = new StringBuilder("SELECT * FROM ad_account WHERE 1=1");
-                    List<Object> params = new ArrayList<>();
-                    if (accountName != null && !accountName.isEmpty()) {
-                        sql.append(" AND account_name LIKE ?");
-                        params.add("%" + accountName + "%");
-                    }
-                    sql.append(" ORDER BY create_time DESC");
-                    return params.isEmpty()
-                            ? jdbc.queryForList(sql.toString())
-                            : jdbc.queryForList(sql.toString(), params.toArray());
-                });
-        List<AdExportVO> voList = new ArrayList<>();
-        for (Map<String, Object> m : allList) {
-            AdExportVO vo = new AdExportVO();
-            vo.setCompanyName(str(m.get("company_name")));
-            vo.setAccountName(str(m.get("account_name")));
-            vo.setPlatform(str(m.get("platform")));
-            vo.setStatus(str(m.get("status")));
-            vo.setCostAmount(str(m.get("cost_amount")));
-            vo.setCreateTime(str(m.get("create_time")));
-            voList.add(vo);
-        }
-        ExcelUtil<AdExportVO> util = new ExcelUtil<>(AdExportVO.class);
-        return util.exportExcel(voList, "广告账户数据");
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) -> {
+//                    StringBuilder sql = new StringBuilder("SELECT * FROM ad_account WHERE 1=1");
+//                    List<Object> params = new ArrayList<>();
+//                    if (accountName != null && !accountName.isEmpty()) {
+//                        sql.append(" AND account_name LIKE ?");
+//                        params.add("%" + accountName + "%");
+//                    }
+//                    sql.append(" ORDER BY create_time DESC");
+//                    return params.isEmpty()
+//                            ? jdbc.queryForList(sql.toString())
+//                            : jdbc.queryForList(sql.toString(), params.toArray());
+//                });
+//        List<AdExportVO> voList = new ArrayList<>();
+//        for (Map<String, Object> m : allList) {
+//            AdExportVO vo = new AdExportVO();
+//            vo.setCompanyName(str(m.get("company_name")));
+//            vo.setAccountName(str(m.get("account_name")));
+//            vo.setPlatform(str(m.get("platform")));
+//            vo.setStatus(str(m.get("status")));
+//            vo.setCostAmount(str(m.get("cost_amount")));
+//            vo.setCreateTime(str(m.get("create_time")));
+//            voList.add(vo);
+//        }
+//        ExcelUtil<AdExportVO> util = new ExcelUtil<>(AdExportVO.class);
+//        return util.exportExcel(voList, "广告账户数据");
+        throw new RuntimeException("not implemented");
     }
 
     private String str(Object o) { return o == null ? "" : o.toString(); }
@@ -79,19 +77,20 @@ public class AdminAdController extends BaseController {
     public TableDataInfo list(@RequestParam(required = false) String accountName,
                               @RequestParam(required = false) Long companyId,
                               @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) -> {
-                    StringBuilder sql = new StringBuilder("SELECT * FROM ad_account WHERE 1=1");
-                    List<Object> params = new ArrayList<>();
-                    if (accountName != null && !accountName.isEmpty()) {
-                        sql.append(" AND account_name LIKE ?");
-                        params.add("%" + accountName + "%");
-                    }
-                    sql.append(" ORDER BY create_time DESC LIMIT 200");
-                    return params.isEmpty()
-                            ? jdbc.queryForList(sql.toString())
-                            : jdbc.queryForList(sql.toString(), params.toArray());
-                });
-        return getDataTable(allList);
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) -> {
+//                    StringBuilder sql = new StringBuilder("SELECT * FROM ad_account WHERE 1=1");
+//                    List<Object> params = new ArrayList<>();
+//                    if (accountName != null && !accountName.isEmpty()) {
+//                        sql.append(" AND account_name LIKE ?");
+//                        params.add("%" + accountName + "%");
+//                    }
+//                    sql.append(" ORDER BY create_time DESC LIMIT 200");
+//                    return params.isEmpty()
+//                            ? jdbc.queryForList(sql.toString())
+//                            : jdbc.queryForList(sql.toString(), params.toArray());
+//                });
+//        return getDataTable(allList);
+        throw new RuntimeException("not implemented");
     }
 }

fs-agent/src/main/java/com/fs/admin/controller/AdminCrmController.java

@@ -3,7 +3,6 @@ package com.fs.admin.controller;
 import java.util.*;
 import org.springframework.context.annotation.Profile;
 
-import com.fs.admin.helper.AdminCrossTenantHelper;
 import com.fs.common.annotation.Excel;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
@@ -25,9 +24,6 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/admin/crm")
 public class AdminCrmController extends BaseController {
 
-    @Autowired
-    private AdminCrossTenantHelper crossTenantHelper;
-
     private String str(Object o) { return o == null ? "" : o.toString(); }
 
     @Data
@@ -45,30 +41,31 @@ public class AdminCrmController extends BaseController {
     public AjaxResult export(@RequestParam(required = false) String customerName,
                              @RequestParam(required = false) Long companyId,
                              @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) -> {
-                    StringBuilder sql = new StringBuilder("SELECT c.* FROM crm_customer c WHERE 1=1");
-                    List<Object> params = new ArrayList<>();
-                    if (customerName != null && !customerName.isEmpty()) {
-                        sql.append(" AND c.customer_name LIKE ?");
-                        params.add("%" + customerName + "%");
-                    }
-                    return params.isEmpty()
-                            ? jdbc.queryForList(sql.toString())
-                            : jdbc.queryForList(sql.toString(), params.toArray());
-                });
-        List<CrmExportVO> voList = new ArrayList<>();
-        for (Map<String, Object> m : allList) {
-            CrmExportVO vo = new CrmExportVO();
-            vo.setCompanyName(str(m.get("company_name")));
-            vo.setCustomerName(str(m.get("customer_name")));
-            vo.setCustomerPhone(str(m.get("customer_phone")));
-            vo.setStage(str(m.get("stage")));
-            vo.setCreateTime(str(m.get("create_time")));
-            voList.add(vo);
-        }
-        ExcelUtil<CrmExportVO> util = new ExcelUtil<>(CrmExportVO.class);
-        return util.exportExcel(voList, "CRM客户数据");
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) -> {
+//                    StringBuilder sql = new StringBuilder("SELECT c.* FROM crm_customer c WHERE 1=1");
+//                    List<Object> params = new ArrayList<>();
+//                    if (customerName != null && !customerName.isEmpty()) {
+//                        sql.append(" AND c.customer_name LIKE ?");
+//                        params.add("%" + customerName + "%");
+//                    }
+//                    return params.isEmpty()
+//                            ? jdbc.queryForList(sql.toString())
+//                            : jdbc.queryForList(sql.toString(), params.toArray());
+//                });
+//        List<CrmExportVO> voList = new ArrayList<>();
+//        for (Map<String, Object> m : allList) {
+//            CrmExportVO vo = new CrmExportVO();
+//            vo.setCompanyName(str(m.get("company_name")));
+//            vo.setCustomerName(str(m.get("customer_name")));
+//            vo.setCustomerPhone(str(m.get("customer_phone")));
+//            vo.setStage(str(m.get("stage")));
+//            vo.setCreateTime(str(m.get("create_time")));
+//            voList.add(vo);
+//        }
+//        ExcelUtil<CrmExportVO> util = new ExcelUtil<>(CrmExportVO.class);
+//        return util.exportExcel(voList, "CRM客户数据");
+        throw new RuntimeException("not implemented");
     }
 
     @PreAuthorize("@ss.hasPermi('admin:crm:list')")
@@ -76,19 +73,20 @@ public class AdminCrmController extends BaseController {
     public TableDataInfo list(@RequestParam(required = false) String customerName,
                               @RequestParam(required = false) Long companyId,
                               @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) -> {
-                    StringBuilder sql = new StringBuilder("SELECT c.* FROM crm_customer c WHERE 1=1");
-                    List<Object> params = new ArrayList<>();
-                    if (customerName != null && !customerName.isEmpty()) {
-                        sql.append(" AND c.customer_name LIKE ?");
-                        params.add("%" + customerName + "%");
-                    }
-                    sql.append(" LIMIT 200");
-                    return params.isEmpty()
-                            ? jdbc.queryForList(sql.toString())
-                            : jdbc.queryForList(sql.toString(), params.toArray());
-                });
-        return getDataTable(allList);
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) -> {
+//                    StringBuilder sql = new StringBuilder("SELECT c.* FROM crm_customer c WHERE 1=1");
+//                    List<Object> params = new ArrayList<>();
+//                    if (customerName != null && !customerName.isEmpty()) {
+//                        sql.append(" AND c.customer_name LIKE ?");
+//                        params.add("%" + customerName + "%");
+//                    }
+//                    sql.append(" LIMIT 200");
+//                    return params.isEmpty()
+//                            ? jdbc.queryForList(sql.toString())
+//                            : jdbc.queryForList(sql.toString(), params.toArray());
+//                });
+//        return getDataTable(allList);
+        throw new RuntimeException("not implemented");
     }
 }

fs-agent/src/main/java/com/fs/admin/controller/AdminLiveVideoController.java

@@ -3,7 +3,6 @@ package com.fs.admin.controller;
 import java.util.*;
 import org.springframework.context.annotation.Profile;
 
-import com.fs.admin.helper.AdminCrossTenantHelper;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.page.TableDataInfo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,9 +18,6 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/admin/liveVideo")
 public class AdminLiveVideoController extends BaseController {
 
-    @Autowired
-    private AdminCrossTenantHelper crossTenantHelper;
-
     /**
      * 查询所有租户的直播视频列表
      */
@@ -30,16 +26,17 @@ public class AdminLiveVideoController extends BaseController {
     public TableDataInfo list(@RequestParam(required = false) Long companyId,
                               @RequestParam(required = false) String companyName,
                               @RequestParam(required = false) String videoTitle) {
-        String sql = "SELECT id, title, live_id as liveId, play_url as playUrl, " +
-                "duration, status, create_time as createTime " +
-                "FROM live_video_record WHERE 1=1";
-        StringBuilder sb = new StringBuilder(sql);
-        if (videoTitle != null && !videoTitle.isEmpty()) {
-            sb.append(" AND title LIKE '%").append(videoTitle.replace("'", "''")).append("%'");
-        }
-        sb.append(" ORDER BY create_time DESC");
-
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(companyId, companyName, sb.toString());
-        return getDataTable(allList);
+//        String sql = "SELECT id, title, live_id as liveId, play_url as playUrl, " +
+//                "duration, status, create_time as createTime " +
+//                "FROM live_video_record WHERE 1=1";
+//        StringBuilder sb = new StringBuilder(sql);
+//        if (videoTitle != null && !videoTitle.isEmpty()) {
+//            sb.append(" AND title LIKE '%").append(videoTitle.replace("'", "''")).append("%'");
+//        }
+//        sb.append(" ORDER BY create_time DESC");
+//
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(companyId, companyName, sb.toString());
+//        return getDataTable(allList);
+        throw new RuntimeException("not implemented");
     }
 }

fs-agent/src/main/java/com/fs/admin/controller/AdminSopController.java

@@ -3,7 +3,6 @@ package com.fs.admin.controller;
 import java.util.*;
 import org.springframework.context.annotation.Profile;
 
-import com.fs.admin.helper.AdminCrossTenantHelper;
 import com.fs.common.annotation.Excel;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
@@ -25,9 +24,6 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/admin/sop")
 public class AdminSopController extends BaseController {
 
-    @Autowired
-    private AdminCrossTenantHelper crossTenantHelper;
-
     private String str(Object o) { return o == null ? "" : o.toString(); }
 
     @Data
@@ -45,31 +41,32 @@ public class AdminSopController extends BaseController {
     public AjaxResult export(@RequestParam(required = false) String sopName,
                              @RequestParam(required = false) Long companyId,
                              @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) -> {
-                    StringBuilder sql = new StringBuilder("SELECT qs.* FROM qw_sop qs WHERE 1=1");
-                    List<Object> params = new ArrayList<>();
-                    if (sopName != null && !sopName.isEmpty()) {
-                        sql.append(" AND qs.name LIKE ?");
-                        params.add("%" + sopName + "%");
-                    }
-                    sql.append(" ORDER BY qs.create_time DESC");
-                    return params.isEmpty()
-                            ? jdbc.queryForList(sql.toString())
-                            : jdbc.queryForList(sql.toString(), params.toArray());
-                });
-        List<SopExportVO> voList = new ArrayList<>();
-        for (Map<String, Object> m : allList) {
-            SopExportVO vo = new SopExportVO();
-            vo.setCompanyName(str(m.get("company_name")));
-            vo.setName(str(m.get("name")));
-            vo.setType(str(m.get("type")));
-            vo.setStatus(str(m.get("status")));
-            vo.setCreateTime(str(m.get("create_time")));
-            voList.add(vo);
-        }
-        ExcelUtil<SopExportVO> util = new ExcelUtil<>(SopExportVO.class);
-        return util.exportExcel(voList, "SOP数据");
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) -> {
+//                    StringBuilder sql = new StringBuilder("SELECT qs.* FROM qw_sop qs WHERE 1=1");
+//                    List<Object> params = new ArrayList<>();
+//                    if (sopName != null && !sopName.isEmpty()) {
+//                        sql.append(" AND qs.name LIKE ?");
+//                        params.add("%" + sopName + "%");
+//                    }
+//                    sql.append(" ORDER BY qs.create_time DESC");
+//                    return params.isEmpty()
+//                            ? jdbc.queryForList(sql.toString())
+//                            : jdbc.queryForList(sql.toString(), params.toArray());
+//                });
+//        List<SopExportVO> voList = new ArrayList<>();
+//        for (Map<String, Object> m : allList) {
+//            SopExportVO vo = new SopExportVO();
+//            vo.setCompanyName(str(m.get("company_name")));
+//            vo.setName(str(m.get("name")));
+//            vo.setType(str(m.get("type")));
+//            vo.setStatus(str(m.get("status")));
+//            vo.setCreateTime(str(m.get("create_time")));
+//            voList.add(vo);
+//        }
+//        ExcelUtil<SopExportVO> util = new ExcelUtil<>(SopExportVO.class);
+//        return util.exportExcel(voList, "SOP数据");
+        throw new RuntimeException("not implemented");
     }
 
     @PreAuthorize("@ss.hasPermi('admin:sop:list')")
@@ -77,20 +74,21 @@ public class AdminSopController extends BaseController {
     public TableDataInfo list(@RequestParam(required = false) String sopName,
                               @RequestParam(required = false) Long companyId,
                               @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) -> {
-                    StringBuilder sql = new StringBuilder("SELECT qs.* FROM qw_sop qs WHERE 1=1");
-                    List<Object> params = new ArrayList<>();
-                    if (sopName != null && !sopName.isEmpty()) {
-                        sql.append(" AND qs.name LIKE ?");
-                        params.add("%" + sopName + "%");
-                    }
-                    sql.append(" ORDER BY qs.create_time DESC LIMIT 200");
-                    return params.isEmpty()
-                            ? jdbc.queryForList(sql.toString())
-                            : jdbc.queryForList(sql.toString(), params.toArray());
-                });
-        return getDataTable(allList);
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) -> {
+//                    StringBuilder sql = new StringBuilder("SELECT qs.* FROM qw_sop qs WHERE 1=1");
+//                    List<Object> params = new ArrayList<>();
+//                    if (sopName != null && !sopName.isEmpty()) {
+//                        sql.append(" AND qs.name LIKE ?");
+//                        params.add("%" + sopName + "%");
+//                    }
+//                    sql.append(" ORDER BY qs.create_time DESC LIMIT 200");
+//                    return params.isEmpty()
+//                            ? jdbc.queryForList(sql.toString())
+//                            : jdbc.queryForList(sql.toString(), params.toArray());
+//                });
+//        return getDataTable(allList);
+        throw new RuntimeException("not implemented");
     }
 
     @PreAuthorize("@ss.hasPermi('admin:sop:list')")
@@ -98,19 +96,20 @@ public class AdminSopController extends BaseController {
     public TableDataInfo tempList(@RequestParam(required = false) String tempName,
                                   @RequestParam(required = false) Long companyId,
                                   @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) -> {
-                    StringBuilder sql = new StringBuilder("SELECT * FROM qw_sop_temp WHERE 1=1");
-                    List<Object> params = new ArrayList<>();
-                    if (tempName != null && !tempName.isEmpty()) {
-                        sql.append(" AND name LIKE ?");
-                        params.add("%" + tempName + "%");
-                    }
-                    sql.append(" ORDER BY create_time DESC LIMIT 200");
-                    return params.isEmpty()
-                            ? jdbc.queryForList(sql.toString())
-                            : jdbc.queryForList(sql.toString(), params.toArray());
-                });
-        return getDataTable(allList);
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) -> {
+//                    StringBuilder sql = new StringBuilder("SELECT * FROM qw_sop_temp WHERE 1=1");
+//                    List<Object> params = new ArrayList<>();
+//                    if (tempName != null && !tempName.isEmpty()) {
+//                        sql.append(" AND name LIKE ?");
+//                        params.add("%" + tempName + "%");
+//                    }
+//                    sql.append(" ORDER BY create_time DESC LIMIT 200");
+//                    return params.isEmpty()
+//                            ? jdbc.queryForList(sql.toString())
+//                            : jdbc.queryForList(sql.toString(), params.toArray());
+//                });
+//        return getDataTable(allList);
+        throw new RuntimeException("not implemented");
     }
 }

fs-agent/src/main/java/com/fs/admin/controller/AdminStoreOrderAdminController.java

@@ -3,7 +3,6 @@ package com.fs.admin.controller;
 import java.util.*;
 import org.springframework.context.annotation.Profile;
 
-import com.fs.admin.helper.AdminCrossTenantHelper;
 import com.fs.common.annotation.Excel;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
@@ -25,9 +24,6 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/admin/storeOrder")
 public class AdminStoreOrderAdminController extends BaseController {
 
-    @Autowired
-    private AdminCrossTenantHelper crossTenantHelper;
-
     private String str(Object o) { return o == null ? "" : o.toString(); }
 
     @Data
@@ -47,36 +43,37 @@ public class AdminStoreOrderAdminController extends BaseController {
     public AjaxResult export(@RequestParam(required = false) String orderNo,
                              @RequestParam(required = false) Long companyId,
                              @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) -> {
-                    StringBuilder sql = new StringBuilder(
-                            "SELECT o.order_id, o.order_no, o.order_amount, o.pay_type, " +
-                            "o.order_status, o.create_time, o.user_name " +
-                            "FROM fs_store_order_scrm o WHERE 1=1");
-                    List<Object> params = new ArrayList<>();
-                    if (orderNo != null && !orderNo.isEmpty()) {
-                        sql.append(" AND o.order_no LIKE ?");
-                        params.add("%" + orderNo + "%");
-                    }
-                    sql.append(" ORDER BY o.create_time DESC");
-                    return params.isEmpty()
-                            ? jdbc.queryForList(sql.toString())
-                            : jdbc.queryForList(sql.toString(), params.toArray());
-                });
-        List<StoreOrderExportVO> voList = new ArrayList<>();
-        for (Map<String, Object> m : allList) {
-            StoreOrderExportVO vo = new StoreOrderExportVO();
-            vo.setCompanyName(str(m.get("company_name")));
-            vo.setOrderNo(str(m.get("order_no")));
-            vo.setOrderAmount(str(m.get("order_amount")));
-            vo.setPayType(str(m.get("pay_type")));
-            vo.setOrderStatus(str(m.get("order_status")));
-            vo.setUserName(str(m.get("user_name")));
-            vo.setCreateTime(str(m.get("create_time")));
-            voList.add(vo);
-        }
-        ExcelUtil<StoreOrderExportVO> util = new ExcelUtil<>(StoreOrderExportVO.class);
-        return util.exportExcel(voList, "商城订单数据");
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) -> {
+//                    StringBuilder sql = new StringBuilder(
+//                            "SELECT o.order_id, o.order_no, o.order_amount, o.pay_type, " +
+//                            "o.order_status, o.create_time, o.user_name " +
+//                            "FROM fs_store_order_scrm o WHERE 1=1");
+//                    List<Object> params = new ArrayList<>();
+//                    if (orderNo != null && !orderNo.isEmpty()) {
+//                        sql.append(" AND o.order_no LIKE ?");
+//                        params.add("%" + orderNo + "%");
+//                    }
+//                    sql.append(" ORDER BY o.create_time DESC");
+//                    return params.isEmpty()
+//                            ? jdbc.queryForList(sql.toString())
+//                            : jdbc.queryForList(sql.toString(), params.toArray());
+//                });
+//        List<StoreOrderExportVO> voList = new ArrayList<>();
+//        for (Map<String, Object> m : allList) {
+//            StoreOrderExportVO vo = new StoreOrderExportVO();
+//            vo.setCompanyName(str(m.get("company_name")));
+//            vo.setOrderNo(str(m.get("order_no")));
+//            vo.setOrderAmount(str(m.get("order_amount")));
+//            vo.setPayType(str(m.get("pay_type")));
+//            vo.setOrderStatus(str(m.get("order_status")));
+//            vo.setUserName(str(m.get("user_name")));
+//            vo.setCreateTime(str(m.get("create_time")));
+//            voList.add(vo);
+//        }
+//        ExcelUtil<StoreOrderExportVO> util = new ExcelUtil<>(StoreOrderExportVO.class);
+//        return util.exportExcel(voList, "商城订单数据");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -87,22 +84,23 @@ public class AdminStoreOrderAdminController extends BaseController {
     public TableDataInfo list(@RequestParam(required = false) String orderNo,
                               @RequestParam(required = false) Long companyId,
                               @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) -> {
-                    StringBuilder sql = new StringBuilder(
-                            "SELECT o.order_id, o.order_no, o.order_amount, o.pay_type, " +
-                            "o.order_status, o.create_time, o.user_name " +
-                            "FROM fs_store_order_scrm o WHERE 1=1");
-                    List<Object> params = new ArrayList<>();
-                    if (orderNo != null && !orderNo.isEmpty()) {
-                        sql.append(" AND o.order_no LIKE ?");
-                        params.add("%" + orderNo + "%");
-                    }
-                    sql.append(" ORDER BY o.create_time DESC LIMIT 200");
-                    return params.isEmpty()
-                            ? jdbc.queryForList(sql.toString())
-                            : jdbc.queryForList(sql.toString(), params.toArray());
-                });
-        return getDataTable(allList);
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) -> {
+//                    StringBuilder sql = new StringBuilder(
+//                            "SELECT o.order_id, o.order_no, o.order_amount, o.pay_type, " +
+//                            "o.order_status, o.create_time, o.user_name " +
+//                            "FROM fs_store_order_scrm o WHERE 1=1");
+//                    List<Object> params = new ArrayList<>();
+//                    if (orderNo != null && !orderNo.isEmpty()) {
+//                        sql.append(" AND o.order_no LIKE ?");
+//                        params.add("%" + orderNo + "%");
+//                    }
+//                    sql.append(" ORDER BY o.create_time DESC LIMIT 200");
+//                    return params.isEmpty()
+//                            ? jdbc.queryForList(sql.toString())
+//                            : jdbc.queryForList(sql.toString(), params.toArray());
+//                });
+//        return getDataTable(allList);
+        throw new RuntimeException("not implemented");
     }
 }

fs-agent/src/main/java/com/fs/admin/controller/AdminVideoResourceController.java

@@ -3,7 +3,6 @@ package com.fs.admin.controller;
 import java.util.*;
 import org.springframework.context.annotation.Profile;
 
-import com.fs.admin.helper.AdminCrossTenantHelper;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.page.TableDataInfo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,8 +18,6 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/admin/videoResource")
 public class AdminVideoResourceController extends BaseController {
 
-    @Autowired
-    private AdminCrossTenantHelper crossTenantHelper;
 
     /**
      * 查询所有租户的视频资源列表
@@ -30,19 +27,20 @@ public class AdminVideoResourceController extends BaseController {
     public TableDataInfo list(@RequestParam(required = false) Long companyId,
                               @RequestParam(required = false) String companyName,
                               @RequestParam(required = false) String videoName) {
-        String sql = "SELECT video_id AS id, title AS videoName, upload_type AS videoType, " +
-                "video_url AS playUrl, duration, status, create_time AS createTime " +
-                "FROM fs_user_course_video WHERE 1=1";
-        StringBuilder sqlBuilder = new StringBuilder(sql);
-        List<Object> params = new ArrayList<>();
-        if (videoName != null && !videoName.isEmpty()) {
-            sqlBuilder.append(" AND title LIKE ?");
-            params.add("%" + videoName + "%");
-        }
-        sqlBuilder.append(" ORDER BY create_time DESC");
-
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, sqlBuilder.toString(), params.toArray());
-        return getDataTable(allList);
+//        String sql = "SELECT video_id AS id, title AS videoName, upload_type AS videoType, " +
+//                "video_url AS playUrl, duration, status, create_time AS createTime " +
+//                "FROM fs_user_course_video WHERE 1=1";
+//        StringBuilder sqlBuilder = new StringBuilder(sql);
+//        List<Object> params = new ArrayList<>();
+//        if (videoName != null && !videoName.isEmpty()) {
+//            sqlBuilder.append(" AND title LIKE ?");
+//            params.add("%" + videoName + "%");
+//        }
+//        sqlBuilder.append(" ORDER BY create_time DESC");
+//
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, sqlBuilder.toString(), params.toArray());
+//        return getDataTable(allList);
+        throw new RuntimeException("not implemented");
     }
 }

fs-agent/src/main/java/com/fs/admin/controller/ArticleAdminController.java

@@ -3,7 +3,6 @@ package com.fs.admin.controller;
 import java.util.*;
 import org.springframework.context.annotation.Profile;
 
-import com.fs.admin.helper.AdminCrossTenantHelper;
 import com.fs.common.annotation.Excel;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
@@ -25,8 +24,6 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/admin/article")
 public class ArticleAdminController extends BaseController {
 
-    @Autowired
-    private AdminCrossTenantHelper crossTenantHelper;
 
     private String str(Object o) { return o == null ? "" : o.toString(); }
 
@@ -46,35 +43,36 @@ public class ArticleAdminController extends BaseController {
     public AjaxResult export(@RequestParam(required = false) String articleTitle,
                              @RequestParam(required = false) Long companyId,
                              @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) -> {
-                    StringBuilder sql = new StringBuilder(
-                            "SELECT a.article_id, a.article_title, a.category_name, a.author, " +
-                            "a.create_time, a.status " +
-                            "FROM fs_article a WHERE 1=1");
-                    List<Object> params = new ArrayList<>();
-                    if (articleTitle != null && !articleTitle.isEmpty()) {
-                        sql.append(" AND a.article_title LIKE ?");
-                        params.add("%" + articleTitle + "%");
-                    }
-                    sql.append(" ORDER BY a.create_time DESC");
-                    return params.isEmpty()
-                            ? jdbc.queryForList(sql.toString())
-                            : jdbc.queryForList(sql.toString(), params.toArray());
-                });
-        List<ArticleExportVO> voList = new ArrayList<>();
-        for (Map<String, Object> m : allList) {
-            ArticleExportVO vo = new ArticleExportVO();
-            vo.setCompanyName(str(m.get("company_name")));
-            vo.setArticleTitle(str(m.get("article_title")));
-            vo.setCategoryName(str(m.get("category_name")));
-            vo.setAuthor(str(m.get("author")));
-            vo.setStatus(str(m.get("status")));
-            vo.setCreateTime(str(m.get("create_time")));
-            voList.add(vo);
-        }
-        ExcelUtil<ArticleExportVO> util = new ExcelUtil<>(ArticleExportVO.class);
-        return util.exportExcel(voList, "文章数据");
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) -> {
+//                    StringBuilder sql = new StringBuilder(
+//                            "SELECT a.article_id, a.article_title, a.category_name, a.author, " +
+//                            "a.create_time, a.status " +
+//                            "FROM fs_article a WHERE 1=1");
+//                    List<Object> params = new ArrayList<>();
+//                    if (articleTitle != null && !articleTitle.isEmpty()) {
+//                        sql.append(" AND a.article_title LIKE ?");
+//                        params.add("%" + articleTitle + "%");
+//                    }
+//                    sql.append(" ORDER BY a.create_time DESC");
+//                    return params.isEmpty()
+//                            ? jdbc.queryForList(sql.toString())
+//                            : jdbc.queryForList(sql.toString(), params.toArray());
+//                });
+//        List<ArticleExportVO> voList = new ArrayList<>();
+//        for (Map<String, Object> m : allList) {
+//            ArticleExportVO vo = new ArticleExportVO();
+//            vo.setCompanyName(str(m.get("company_name")));
+//            vo.setArticleTitle(str(m.get("article_title")));
+//            vo.setCategoryName(str(m.get("category_name")));
+//            vo.setAuthor(str(m.get("author")));
+//            vo.setStatus(str(m.get("status")));
+//            vo.setCreateTime(str(m.get("create_time")));
+//            voList.add(vo);
+//        }
+//        ExcelUtil<ArticleExportVO> util = new ExcelUtil<>(ArticleExportVO.class);
+//        return util.exportExcel(voList, "文章数据");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -85,23 +83,24 @@ public class ArticleAdminController extends BaseController {
     public TableDataInfo list(@RequestParam(required = false) String articleTitle,
                               @RequestParam(required = false) Long companyId,
                               @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) -> {
-                    StringBuilder sql = new StringBuilder(
-                            "SELECT a.article_id, a.article_title, a.category_name, a.author, " +
-                            "a.create_time, a.status " +
-                            "FROM fs_article a WHERE 1=1");
-                    List<Object> params = new ArrayList<>();
-                    if (articleTitle != null && !articleTitle.isEmpty()) {
-                        sql.append(" AND a.article_title LIKE ?");
-                        params.add("%" + articleTitle + "%");
-                    }
-                    sql.append(" ORDER BY a.create_time DESC LIMIT 200");
-                    return params.isEmpty()
-                            ? jdbc.queryForList(sql.toString())
-                            : jdbc.queryForList(sql.toString(), params.toArray());
-                });
-        return getDataTable(allList);
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) -> {
+//                    StringBuilder sql = new StringBuilder(
+//                            "SELECT a.article_id, a.article_title, a.category_name, a.author, " +
+//                            "a.create_time, a.status " +
+//                            "FROM fs_article a WHERE 1=1");
+//                    List<Object> params = new ArrayList<>();
+//                    if (articleTitle != null && !articleTitle.isEmpty()) {
+//                        sql.append(" AND a.article_title LIKE ?");
+//                        params.add("%" + articleTitle + "%");
+//                    }
+//                    sql.append(" ORDER BY a.create_time DESC LIMIT 200");
+//                    return params.isEmpty()
+//                            ? jdbc.queryForList(sql.toString())
+//                            : jdbc.queryForList(sql.toString(), params.toArray());
+//                });
+//        return getDataTable(allList);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -111,13 +110,14 @@ public class ArticleAdminController extends BaseController {
     @GetMapping("/pending")
     public TableDataInfo pendingList(@RequestParam(required = false) Long companyId,
                                      @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) ->
-                        jdbc.queryForList(
-                                "SELECT a.article_id, a.article_title, a.category_name, a.author, " +
-                                "a.create_time, a.status " +
-                                "FROM fs_article a WHERE a.status = 0 ORDER BY a.create_time DESC LIMIT 200"));
-        return getDataTable(allList);
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) ->
+//                        jdbc.queryForList(
+//                                "SELECT a.article_id, a.article_title, a.category_name, a.author, " +
+//                                "a.create_time, a.status " +
+//                                "FROM fs_article a WHERE a.status = 0 ORDER BY a.create_time DESC LIMIT 200"));
+//        return getDataTable(allList);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -127,14 +127,15 @@ public class ArticleAdminController extends BaseController {
     @GetMapping("/statistics")
     public AjaxResult statistics(@RequestParam(required = false) Long companyId,
                                  @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) ->
-                        jdbc.queryForList("SELECT article_id, status FROM fs_article"));
-        Map<String, Object> result = new HashMap<>();
-        result.put("totalCount", allList.size());
-        result.put("pendingCount", allList.stream().filter(r -> "0".equals(String.valueOf(r.get("status")))).count());
-        result.put("approvedCount", allList.stream().filter(r -> "1".equals(String.valueOf(r.get("status")))).count());
-        result.put("rejectedCount", allList.stream().filter(r -> "2".equals(String.valueOf(r.get("status")))).count());
-        return AjaxResult.success(result);
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) ->
+//                        jdbc.queryForList("SELECT article_id, status FROM fs_article"));
+//        Map<String, Object> result = new HashMap<>();
+//        result.put("totalCount", allList.size());
+//        result.put("pendingCount", allList.stream().filter(r -> "0".equals(String.valueOf(r.get("status")))).count());
+//        result.put("approvedCount", allList.stream().filter(r -> "1".equals(String.valueOf(r.get("status")))).count());
+//        result.put("rejectedCount", allList.stream().filter(r -> "2".equals(String.valueOf(r.get("status")))).count());
+//        return AjaxResult.success(result);
+        throw new RuntimeException("not implemented");
     }
 }

fs-agent/src/main/java/com/fs/admin/controller/CourseAdminController.java

@@ -3,7 +3,6 @@ package com.fs.admin.controller;
 import java.util.*;
 import org.springframework.context.annotation.Profile;
 
-import com.fs.admin.helper.AdminCrossTenantHelper;
 import com.fs.common.annotation.Excel;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
@@ -25,9 +24,6 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/admin/course")
 public class CourseAdminController extends BaseController {
 
-    @Autowired
-    private AdminCrossTenantHelper crossTenantHelper;
-
     private String str(Object o) { return o == null ? "" : o.toString(); }
 
     @Data
@@ -45,34 +41,35 @@ public class CourseAdminController extends BaseController {
     public AjaxResult export(@RequestParam(required = false) String courseName,
                              @RequestParam(required = false) Long companyId,
                              @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) -> {
-                    StringBuilder sql = new StringBuilder(
-                            "SELECT v.video_id, v.course_id, v.course_name, v.cover_url, " +
-                            "v.duration, v.play_count, v.create_time, v.status " +
-                            "FROM fs_user_course_video v WHERE 1=1");
-                    List<Object> params = new ArrayList<>();
-                    if (courseName != null && !courseName.isEmpty()) {
-                        sql.append(" AND v.course_name LIKE ?");
-                        params.add("%" + courseName + "%");
-                    }
-                    sql.append(" ORDER BY v.create_time DESC");
-                    return params.isEmpty()
-                            ? jdbc.queryForList(sql.toString())
-                            : jdbc.queryForList(sql.toString(), params.toArray());
-                });
-        List<CourseExportVO> voList = new ArrayList<>();
-        for (Map<String, Object> m : allList) {
-            CourseExportVO vo = new CourseExportVO();
-            vo.setCompanyName(str(m.get("company_name")));
-            vo.setCourseName(str(m.get("course_name")));
-            vo.setPlayCount(str(m.get("play_count")));
-            vo.setStatus(str(m.get("status")));
-            vo.setCreateTime(str(m.get("create_time")));
-            voList.add(vo);
-        }
-        ExcelUtil<CourseExportVO> util = new ExcelUtil<>(CourseExportVO.class);
-        return util.exportExcel(voList, "课程数据");
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) -> {
+//                    StringBuilder sql = new StringBuilder(
+//                            "SELECT v.video_id, v.course_id, v.course_name, v.cover_url, " +
+//                            "v.duration, v.play_count, v.create_time, v.status " +
+//                            "FROM fs_user_course_video v WHERE 1=1");
+//                    List<Object> params = new ArrayList<>();
+//                    if (courseName != null && !courseName.isEmpty()) {
+//                        sql.append(" AND v.course_name LIKE ?");
+//                        params.add("%" + courseName + "%");
+//                    }
+//                    sql.append(" ORDER BY v.create_time DESC");
+//                    return params.isEmpty()
+//                            ? jdbc.queryForList(sql.toString())
+//                            : jdbc.queryForList(sql.toString(), params.toArray());
+//                });
+//        List<CourseExportVO> voList = new ArrayList<>();
+//        for (Map<String, Object> m : allList) {
+//            CourseExportVO vo = new CourseExportVO();
+//            vo.setCompanyName(str(m.get("company_name")));
+//            vo.setCourseName(str(m.get("course_name")));
+//            vo.setPlayCount(str(m.get("play_count")));
+//            vo.setStatus(str(m.get("status")));
+//            vo.setCreateTime(str(m.get("create_time")));
+//            voList.add(vo);
+//        }
+//        ExcelUtil<CourseExportVO> util = new ExcelUtil<>(CourseExportVO.class);
+//        return util.exportExcel(voList, "课程数据");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -83,23 +80,24 @@ public class CourseAdminController extends BaseController {
     public TableDataInfo list(@RequestParam(required = false) String courseName,
                               @RequestParam(required = false) Long companyId,
                               @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) -> {
-                    StringBuilder sql = new StringBuilder(
-                            "SELECT v.video_id, v.course_id, v.course_name, v.cover_url, " +
-                            "v.duration, v.play_count, v.create_time, v.status " +
-                            "FROM fs_user_course_video v WHERE 1=1");
-                    List<Object> params = new ArrayList<>();
-                    if (courseName != null && !courseName.isEmpty()) {
-                        sql.append(" AND v.course_name LIKE ?");
-                        params.add("%" + courseName + "%");
-                    }
-                    sql.append(" ORDER BY v.create_time DESC LIMIT 200");
-                    return params.isEmpty()
-                            ? jdbc.queryForList(sql.toString())
-                            : jdbc.queryForList(sql.toString(), params.toArray());
-                });
-        return getDataTable(allList);
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) -> {
+//                    StringBuilder sql = new StringBuilder(
+//                            "SELECT v.video_id, v.course_id, v.course_name, v.cover_url, " +
+//                            "v.duration, v.play_count, v.create_time, v.status " +
+//                            "FROM fs_user_course_video v WHERE 1=1");
+//                    List<Object> params = new ArrayList<>();
+//                    if (courseName != null && !courseName.isEmpty()) {
+//                        sql.append(" AND v.course_name LIKE ?");
+//                        params.add("%" + courseName + "%");
+//                    }
+//                    sql.append(" ORDER BY v.create_time DESC LIMIT 200");
+//                    return params.isEmpty()
+//                            ? jdbc.queryForList(sql.toString())
+//                            : jdbc.queryForList(sql.toString(), params.toArray());
+//                });
+//        return getDataTable(allList);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -109,16 +107,17 @@ public class CourseAdminController extends BaseController {
     @GetMapping("/statistics")
     public AjaxResult statistics(@RequestParam(required = false) Long companyId,
                                  @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) ->
-                        jdbc.queryForList("SELECT video_id, status FROM fs_user_course_video"));
-        Map<String, Object> result = new HashMap<>();
-        result.put("totalCount", allList.size());
-        result.put("onlineCount", allList.stream().filter(r -> "0".equals(String.valueOf(r.get("status")))).count());
-        result.put("offlineCount", allList.stream().filter(r -> "1".equals(String.valueOf(r.get("status")))).count());
-        result.put("totalPlayCount", allList.stream()
-                .mapToLong(r -> r.get("play_count") != null ? ((Number) r.get("play_count")).longValue() : 0L)
-                .sum());
-        return AjaxResult.success(result);
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) ->
+//                        jdbc.queryForList("SELECT video_id, status FROM fs_user_course_video"));
+//        Map<String, Object> result = new HashMap<>();
+//        result.put("totalCount", allList.size());
+//        result.put("onlineCount", allList.stream().filter(r -> "0".equals(String.valueOf(r.get("status")))).count());
+//        result.put("offlineCount", allList.stream().filter(r -> "1".equals(String.valueOf(r.get("status")))).count());
+//        result.put("totalPlayCount", allList.stream()
+//                .mapToLong(r -> r.get("play_count") != null ? ((Number) r.get("play_count")).longValue() : 0L)
+//                .sum());
+//        return AjaxResult.success(result);
+        throw new RuntimeException("not implemented");
     }
 }

fs-agent/src/main/java/com/fs/admin/controller/LiveAdminController.java

@@ -3,7 +3,6 @@ package com.fs.admin.controller;
 import java.util.*;
 import org.springframework.context.annotation.Profile;
 
-import com.fs.admin.helper.AdminCrossTenantHelper;
 import com.fs.common.annotation.Excel;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
@@ -25,9 +24,6 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/admin/live")
 public class LiveAdminController extends BaseController {
 
-    @Autowired
-    private AdminCrossTenantHelper crossTenantHelper;
-
     private String str(Object o) { return o == null ? "" : o.toString(); }
 
     @Data
@@ -46,35 +42,36 @@ public class LiveAdminController extends BaseController {
     public AjaxResult export(@RequestParam(required = false) String liveName,
                              @RequestParam(required = false) Long companyId,
                              @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) -> {
-                    StringBuilder sql = new StringBuilder(
-                            "SELECT v.video_id, v.title, v.cover_url, v.live_status, " +
-                            "v.start_time, v.end_time, v.create_time " +
-                            "FROM live_video v WHERE 1=1");
-                    List<Object> params = new ArrayList<>();
-                    if (liveName != null && !liveName.isEmpty()) {
-                        sql.append(" AND v.title LIKE ?");
-                        params.add("%" + liveName + "%");
-                    }
-                    sql.append(" ORDER BY v.create_time DESC");
-                    return params.isEmpty()
-                            ? jdbc.queryForList(sql.toString())
-                            : jdbc.queryForList(sql.toString(), params.toArray());
-                });
-        List<LiveExportVO> voList = new ArrayList<>();
-        for (Map<String, Object> m : allList) {
-            LiveExportVO vo = new LiveExportVO();
-            vo.setCompanyName(str(m.get("company_name")));
-            vo.setTitle(str(m.get("title")));
-            vo.setLiveStatus(str(m.get("live_status")));
-            vo.setStartTime(str(m.get("start_time")));
-            vo.setEndTime(str(m.get("end_time")));
-            vo.setCreateTime(str(m.get("create_time")));
-            voList.add(vo);
-        }
-        ExcelUtil<LiveExportVO> util = new ExcelUtil<>(LiveExportVO.class);
-        return util.exportExcel(voList, "直播数据");
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) -> {
+//                    StringBuilder sql = new StringBuilder(
+//                            "SELECT v.video_id, v.title, v.cover_url, v.live_status, " +
+//                            "v.start_time, v.end_time, v.create_time " +
+//                            "FROM live_video v WHERE 1=1");
+//                    List<Object> params = new ArrayList<>();
+//                    if (liveName != null && !liveName.isEmpty()) {
+//                        sql.append(" AND v.title LIKE ?");
+//                        params.add("%" + liveName + "%");
+//                    }
+//                    sql.append(" ORDER BY v.create_time DESC");
+//                    return params.isEmpty()
+//                            ? jdbc.queryForList(sql.toString())
+//                            : jdbc.queryForList(sql.toString(), params.toArray());
+//                });
+//        List<LiveExportVO> voList = new ArrayList<>();
+//        for (Map<String, Object> m : allList) {
+//            LiveExportVO vo = new LiveExportVO();
+//            vo.setCompanyName(str(m.get("company_name")));
+//            vo.setTitle(str(m.get("title")));
+//            vo.setLiveStatus(str(m.get("live_status")));
+//            vo.setStartTime(str(m.get("start_time")));
+//            vo.setEndTime(str(m.get("end_time")));
+//            vo.setCreateTime(str(m.get("create_time")));
+//            voList.add(vo);
+//        }
+//        ExcelUtil<LiveExportVO> util = new ExcelUtil<>(LiveExportVO.class);
+//        return util.exportExcel(voList, "直播数据");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -85,23 +82,24 @@ public class LiveAdminController extends BaseController {
     public TableDataInfo list(@RequestParam(required = false) String liveName,
                               @RequestParam(required = false) Long companyId,
                               @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) -> {
-                    StringBuilder sql = new StringBuilder(
-                            "SELECT v.video_id, v.title, v.cover_url, v.live_status, " +
-                            "v.start_time, v.end_time, v.create_time " +
-                            "FROM live_video v WHERE 1=1");
-                    List<Object> params = new ArrayList<>();
-                    if (liveName != null && !liveName.isEmpty()) {
-                        sql.append(" AND v.title LIKE ?");
-                        params.add("%" + liveName + "%");
-                    }
-                    sql.append(" ORDER BY v.create_time DESC LIMIT 200");
-                    return params.isEmpty()
-                            ? jdbc.queryForList(sql.toString())
-                            : jdbc.queryForList(sql.toString(), params.toArray());
-                });
-        return getDataTable(allList);
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) -> {
+//                    StringBuilder sql = new StringBuilder(
+//                            "SELECT v.video_id, v.title, v.cover_url, v.live_status, " +
+//                            "v.start_time, v.end_time, v.create_time " +
+//                            "FROM live_video v WHERE 1=1");
+//                    List<Object> params = new ArrayList<>();
+//                    if (liveName != null && !liveName.isEmpty()) {
+//                        sql.append(" AND v.title LIKE ?");
+//                        params.add("%" + liveName + "%");
+//                    }
+//                    sql.append(" ORDER BY v.create_time DESC LIMIT 200");
+//                    return params.isEmpty()
+//                            ? jdbc.queryForList(sql.toString())
+//                            : jdbc.queryForList(sql.toString(), params.toArray());
+//                });
+//        return getDataTable(allList);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -111,11 +109,12 @@ public class LiveAdminController extends BaseController {
     @GetMapping("/statistics")
     public AjaxResult statistics(@RequestParam(required = false) Long companyId,
                                  @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) ->
-                        jdbc.queryForList("SELECT video_id, live_status FROM live_video"));
-        Map<String, Object> result = new HashMap<>();
-        result.put("totalCount", allList.size());
-        return AjaxResult.success(result);
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) ->
+//                        jdbc.queryForList("SELECT video_id, live_status FROM live_video"));
+//        Map<String, Object> result = new HashMap<>();
+//        result.put("totalCount", allList.size());
+//        return AjaxResult.success(result);
+        throw new RuntimeException("not implemented");
     }
 }

fs-agent/src/main/java/com/fs/admin/controller/LobsterAdminController.java

@@ -3,7 +3,6 @@ package com.fs.admin.controller;
 import java.util.*;
 import org.springframework.context.annotation.Profile;
 
-import com.fs.admin.helper.AdminCrossTenantHelper;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.page.TableDataInfo;
@@ -20,8 +19,6 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/admin/lobster")
 public class LobsterAdminController extends BaseController {
 
-    @Autowired
-    private AdminCrossTenantHelper crossTenantHelper;
 
     /**
      * 查询所有租户的工作流实例列表
@@ -30,13 +27,14 @@ public class LobsterAdminController extends BaseController {
     @GetMapping("/instance/list")
     public TableDataInfo instanceList(@RequestParam(required = false) Long companyId,
                                       @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) ->
-                        jdbc.queryForList(
-                                "SELECT i.id, i.instance_name, i.workflow_id, i.status, " +
-                                "i.company_id, i.create_time, i.update_time " +
-                                "FROM lobster_workflow_instance i ORDER BY i.create_time DESC LIMIT 200"));
-        return getDataTable(allList);
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) ->
+//                        jdbc.queryForList(
+//                                "SELECT i.id, i.instance_name, i.workflow_id, i.status, " +
+//                                "i.company_id, i.create_time, i.update_time " +
+//                                "FROM lobster_workflow_instance i ORDER BY i.create_time DESC LIMIT 200"));
+//        return getDataTable(allList);
+        throw new RuntimeException("Not implemented");
     }
 
     /**
@@ -46,14 +44,15 @@ public class LobsterAdminController extends BaseController {
     @GetMapping("/instance/stats")
     public AjaxResult instanceStats(@RequestParam(required = false) Long companyId,
                                     @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) ->
-                        jdbc.queryForList("SELECT id, status FROM lobster_workflow_instance"));
-        Map<String, Object> stats = new HashMap<>();
-        stats.put("totalInstances", allList.size());
-        stats.put("runningInstances", allList.stream().filter(i -> "RUNNING".equals(String.valueOf(i.get("status")))).count());
-        stats.put("completedInstances", allList.stream().filter(i -> "COMPLETED".equals(String.valueOf(i.get("status")))).count());
-        stats.put("failedInstances", allList.stream().filter(i -> "FAILED".equals(String.valueOf(i.get("status")))).count());
-        return AjaxResult.success(stats);
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) ->
+//                        jdbc.queryForList("SELECT id, status FROM lobster_workflow_instance"));
+//        Map<String, Object> stats = new HashMap<>();
+//        stats.put("totalInstances", allList.size());
+//        stats.put("runningInstances", allList.stream().filter(i -> "RUNNING".equals(String.valueOf(i.get("status")))).count());
+//        stats.put("completedInstances", allList.stream().filter(i -> "COMPLETED".equals(String.valueOf(i.get("status")))).count());
+//        stats.put("failedInstances", allList.stream().filter(i -> "FAILED".equals(String.valueOf(i.get("status")))).count());
+//        return AjaxResult.success(stats);
+        throw new RuntimeException("Not implemented");
     }
 }

fs-agent/src/main/java/com/fs/admin/controller/ProductAdminController.java

@@ -3,7 +3,6 @@ package com.fs.admin.controller;
 import java.util.*;
 import org.springframework.context.annotation.Profile;
 
-import com.fs.admin.helper.AdminCrossTenantHelper;
 import com.fs.common.annotation.Excel;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
@@ -25,9 +24,6 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/admin/product")
 public class ProductAdminController extends BaseController {
 
-    @Autowired
-    private AdminCrossTenantHelper crossTenantHelper;
-
     private String str(Object o) { return o == null ? "" : o.toString(); }
 
     @Data
@@ -47,36 +43,37 @@ public class ProductAdminController extends BaseController {
     public AjaxResult export(@RequestParam(required = false) String productName,
                              @RequestParam(required = false) Long companyId,
                              @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) -> {
-                    StringBuilder sql = new StringBuilder(
-                            "SELECT p.product_id, p.product_name, p.product_image, p.category_name, " +
-                            "p.price, p.stock, p.create_time, p.status " +
-                            "FROM fs_store_product p WHERE 1=1");
-                    List<Object> params = new ArrayList<>();
-                    if (productName != null && !productName.isEmpty()) {
-                        sql.append(" AND p.product_name LIKE ?");
-                        params.add("%" + productName + "%");
-                    }
-                    sql.append(" ORDER BY p.create_time DESC");
-                    return params.isEmpty()
-                            ? jdbc.queryForList(sql.toString())
-                            : jdbc.queryForList(sql.toString(), params.toArray());
-                });
-        List<ProductExportVO> voList = new ArrayList<>();
-        for (Map<String, Object> m : allList) {
-            ProductExportVO vo = new ProductExportVO();
-            vo.setCompanyName(str(m.get("company_name")));
-            vo.setProductName(str(m.get("product_name")));
-            vo.setCategoryName(str(m.get("category_name")));
-            vo.setPrice(str(m.get("price")));
-            vo.setStock(str(m.get("stock")));
-            vo.setStatus(str(m.get("status")));
-            vo.setCreateTime(str(m.get("create_time")));
-            voList.add(vo);
-        }
-        ExcelUtil<ProductExportVO> util = new ExcelUtil<>(ProductExportVO.class);
-        return util.exportExcel(voList, "商品数据");
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) -> {
+//                    StringBuilder sql = new StringBuilder(
+//                            "SELECT p.product_id, p.product_name, p.product_image, p.category_name, " +
+//                            "p.price, p.stock, p.create_time, p.status " +
+//                            "FROM fs_store_product p WHERE 1=1");
+//                    List<Object> params = new ArrayList<>();
+//                    if (productName != null && !productName.isEmpty()) {
+//                        sql.append(" AND p.product_name LIKE ?");
+//                        params.add("%" + productName + "%");
+//                    }
+//                    sql.append(" ORDER BY p.create_time DESC");
+//                    return params.isEmpty()
+//                            ? jdbc.queryForList(sql.toString())
+//                            : jdbc.queryForList(sql.toString(), params.toArray());
+//                });
+//        List<ProductExportVO> voList = new ArrayList<>();
+//        for (Map<String, Object> m : allList) {
+//            ProductExportVO vo = new ProductExportVO();
+//            vo.setCompanyName(str(m.get("company_name")));
+//            vo.setProductName(str(m.get("product_name")));
+//            vo.setCategoryName(str(m.get("category_name")));
+//            vo.setPrice(str(m.get("price")));
+//            vo.setStock(str(m.get("stock")));
+//            vo.setStatus(str(m.get("status")));
+//            vo.setCreateTime(str(m.get("create_time")));
+//            voList.add(vo);
+//        }
+//        ExcelUtil<ProductExportVO> util = new ExcelUtil<>(ProductExportVO.class);
+//        return util.exportExcel(voList, "商品数据");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -87,23 +84,24 @@ public class ProductAdminController extends BaseController {
     public TableDataInfo list(@RequestParam(required = false) String productName,
                               @RequestParam(required = false) Long companyId,
                               @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) -> {
-                    StringBuilder sql = new StringBuilder(
-                            "SELECT p.product_id, p.product_name, p.product_image, p.category_name, " +
-                            "p.price, p.stock, p.create_time, p.status " +
-                            "FROM fs_store_product p WHERE 1=1");
-                    List<Object> params = new ArrayList<>();
-                    if (productName != null && !productName.isEmpty()) {
-                        sql.append(" AND p.product_name LIKE ?");
-                        params.add("%" + productName + "%");
-                    }
-                    sql.append(" ORDER BY p.create_time DESC LIMIT 200");
-                    return params.isEmpty()
-                            ? jdbc.queryForList(sql.toString())
-                            : jdbc.queryForList(sql.toString(), params.toArray());
-                });
-        return getDataTable(allList);
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) -> {
+//                    StringBuilder sql = new StringBuilder(
+//                            "SELECT p.product_id, p.product_name, p.product_image, p.category_name, " +
+//                            "p.price, p.stock, p.create_time, p.status " +
+//                            "FROM fs_store_product p WHERE 1=1");
+//                    List<Object> params = new ArrayList<>();
+//                    if (productName != null && !productName.isEmpty()) {
+//                        sql.append(" AND p.product_name LIKE ?");
+//                        params.add("%" + productName + "%");
+//                    }
+//                    sql.append(" ORDER BY p.create_time DESC LIMIT 200");
+//                    return params.isEmpty()
+//                            ? jdbc.queryForList(sql.toString())
+//                            : jdbc.queryForList(sql.toString(), params.toArray());
+//                });
+//        return getDataTable(allList);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -113,13 +111,14 @@ public class ProductAdminController extends BaseController {
     @GetMapping("/pending")
     public TableDataInfo pendingList(@RequestParam(required = false) Long companyId,
                                      @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) ->
-                        jdbc.queryForList(
-                                "SELECT p.product_id, p.product_name, p.product_image, p.category_name, " +
-                                "p.price, p.stock, p.create_time, p.status " +
-                                "FROM fs_store_product p WHERE p.status = 0 ORDER BY p.create_time DESC LIMIT 200"));
-        return getDataTable(allList);
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) ->
+//                        jdbc.queryForList(
+//                                "SELECT p.product_id, p.product_name, p.product_image, p.category_name, " +
+//                                "p.price, p.stock, p.create_time, p.status " +
+//                                "FROM fs_store_product p WHERE p.status = 0 ORDER BY p.create_time DESC LIMIT 200"));
+//        return getDataTable(allList);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -129,14 +128,15 @@ public class ProductAdminController extends BaseController {
     @GetMapping("/statistics")
     public AjaxResult statistics(@RequestParam(required = false) Long companyId,
                                  @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) ->
-                        jdbc.queryForList("SELECT product_id, status FROM fs_store_product"));
-        Map<String, Object> result = new HashMap<>();
-        result.put("totalCount", allList.size());
-        result.put("pendingCount", allList.stream().filter(r -> "0".equals(String.valueOf(r.get("status")))).count());
-        result.put("onlineCount", allList.stream().filter(r -> "1".equals(String.valueOf(r.get("status")))).count());
-        result.put("rejectedCount", allList.stream().filter(r -> "2".equals(String.valueOf(r.get("status")))).count());
-        return AjaxResult.success(result);
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) ->
+//                        jdbc.queryForList("SELECT product_id, status FROM fs_store_product"));
+//        Map<String, Object> result = new HashMap<>();
+//        result.put("totalCount", allList.size());
+//        result.put("pendingCount", allList.stream().filter(r -> "0".equals(String.valueOf(r.get("status")))).count());
+//        result.put("onlineCount", allList.stream().filter(r -> "1".equals(String.valueOf(r.get("status")))).count());
+//        result.put("rejectedCount", allList.stream().filter(r -> "2".equals(String.valueOf(r.get("status")))).count());
+//        return AjaxResult.success(result);
+        throw new RuntimeException("not implemented");
     }
 }

fs-agent/src/main/java/com/fs/admin/controller/store/FsStoreAfterSalesScrmBridgeController.java

@@ -11,8 +11,6 @@ import com.fs.common.utils.ParseUtils;
 import com.fs.common.utils.StringUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.config.saas.ProjectConfig;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.security.SecurityUtils;
 import com.fs.his.domain.FsUser;
 import com.fs.his.service.IFsUserService;
 import com.fs.hisStore.domain.FsStoreAfterSalesItemScrm;
@@ -192,36 +190,40 @@ public class FsStoreAfterSalesScrmBridgeController extends BaseController
     @PostMapping("/audit1")
     public R audit1(@RequestBody FsStoreAfterSalesAudit1Param param)
     {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        param.setOperator(loginUser.getCompanyUser().getNickName());
-        return fsStoreAfterSalesService.audit1(param);
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        param.setOperator(loginUser.getCompanyUser().getNickName());
+//        return fsStoreAfterSalesService.audit1(param);
+        throw new RuntimeException("not implemented");
     }
 
     @PreAuthorize("@ss.hasPermi('store:storeAfterSales:audit2')")
     @PostMapping("/audit2")
     public R audit2(@RequestBody FsStoreAfterSalesAudit2Param param)
     {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        param.setOperator(loginUser.getCompanyUser().getNickName());
-        return fsStoreAfterSalesService.audit2(param);
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        param.setOperator(loginUser.getCompanyUser().getNickName());
+//        return fsStoreAfterSalesService.audit2(param);
+        throw new RuntimeException("not implemented");
     }
 
     @PreAuthorize("@ss.hasPermi('store:storeAfterSales:refund')")
     @PostMapping("/refund")
     public R refund(@RequestBody FsStoreAfterSalesRefundParam param)
     {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        param.setOperator(loginUser.getCompanyUser().getNickName());
-        return fsStoreAfterSalesService.refundMoney(param);
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        param.setOperator(loginUser.getCompanyUser().getNickName());
+//        return fsStoreAfterSalesService.refundMoney(param);
+        throw new RuntimeException("not implemented");
     }
 
     @PreAuthorize("@ss.hasPermi('store:storeAfterSales:cancel')")
     @PostMapping("/cancel")
     public R cancel(@RequestBody FsStoreAfterSalesCancelParam param) throws ParseException
     {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        param.setOperator(loginUser.getCompanyUser().getNickName());
-        return fsStoreAfterSalesService.cancel(param);
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        param.setOperator(loginUser.getCompanyUser().getNickName());
+//        return fsStoreAfterSalesService.cancel(param);
+        throw new RuntimeException("not implemented");
     }
 
     @GetMapping("/getStoreAfterSales")

fs-agent/src/main/java/com/fs/admin/controller/store/FsStoreOrderOfflineScrmBridgeController.java

@@ -10,8 +10,6 @@ import com.fs.common.utils.ParseUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.crm.domain.CrmCustomer;
 import com.fs.crm.service.ICrmCustomerService;
-import com.fs.framework.security.SecurityUtils;
-import com.fs.framework.security.LoginUser;
 import com.fs.hisStore.domain.FsStoreOrderOfflineScrm;
 import com.fs.hisStore.domain.FsStoreOrderOfflineItemScrm;
 import com.fs.hisStore.param.FsStoreOrderOfflineParam;
@@ -120,15 +118,16 @@ public class FsStoreOrderOfflineScrmBridgeController extends BaseController
     @PostMapping("/auditOrder/{orderId}")
     public R auditOrder(@PathVariable Long orderId)
     {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        FsStoreOrderOfflineScrm fsStoreOrderOffline = new FsStoreOrderOfflineScrm();
-        fsStoreOrderOffline.setOrderId(orderId);
-        fsStoreOrderOffline.setStatus(3L);
-        fsStoreOrderOffline.setAuditBy(loginUser.getCompanyUser().getNickName());
-        fsStoreOrderOffline.setAuditTime(new Date());
-        if (fsStoreOrderOfflineService.updateFsStoreOrderOffline(fsStoreOrderOffline) > 0){
-            return R.ok();
-        }
-        return R.error("审核失败");
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        FsStoreOrderOfflineScrm fsStoreOrderOffline = new FsStoreOrderOfflineScrm();
+//        fsStoreOrderOffline.setOrderId(orderId);
+//        fsStoreOrderOffline.setStatus(3L);
+//        fsStoreOrderOffline.setAuditBy(loginUser.getCompanyUser().getNickName());
+//        fsStoreOrderOffline.setAuditTime(new Date());
+//        if (fsStoreOrderOfflineService.updateFsStoreOrderOffline(fsStoreOrderOffline) > 0){
+//            return R.ok();
+//        }
+//        return R.error("审核失败");
+        throw new RuntimeException("not implemented");
     }
 }

fs-agent/src/main/java/com/fs/admin/controller/store/FsStoreOrderScrmBridgeController.java

@@ -28,9 +28,7 @@ import com.fs.erp.dto.ErpOrderQueryRequert;
 import com.fs.erp.dto.ErpOrderQueryResponse;
 import com.fs.erp.dto.df.DFConfigVo;
 import com.fs.erp.service.IErpOrderService;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.security.SecurityUtils;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.domain.FsDfAccount;
 import com.fs.his.domain.FsStoreOrderDf;
 import com.fs.his.domain.FsUser;
@@ -168,74 +166,75 @@ public class FsStoreOrderScrmBridgeController extends BaseController
     @PostMapping("/list")
     public TableDataInfo list(@RequestBody FsStoreOrderParam param)
     {
-        PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
-            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getPayTimeRange())) {
-            param.setPayTimeList(param.getPayTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
-            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getDeliverySendTimeRange())) {
-            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
-        }
-        param.setNotHealth(1);
-        List<FsStoreOrderVO> list = fsStoreOrderService.selectFsStoreOrderListVO(param);
-        TableDataInfo dataTable = getDataTable(list);
-        if (CloudHostUtils.hasCloudHostName("康年堂")) {
-            dataTable.setMsg("knt");
-        }
-        if (list != null) {
-            LoginUser loginUser = (LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-            for (FsStoreOrderVO vo : list) {
-                if (vo.getPhone() != null) {
-                    vo.setPhone(vo.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-                }
-                if (ObjectUtil.isNotEmpty(vo.getUserPhone())) {
-                    vo.setUserPhone(vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-                }
-                if (CloudHostUtils.hasCloudHostName("康年堂")) {
-                    FsStoreOrderDf df = fsStoreOrderDfService.selectFsStoreOrderDfByOrderId(vo.getId());
-                    if (df != null) {
-                        vo.setErpAccount(df.getLoginAccount());
-                    }
-                }
-                if ((loginUser.getPermissions().contains("his:storeAfterSales:finance")) || loginUser.getPermissions().contains("*:*:*") && (vo.getCost() != null && vo.getTotalNum() != null)) {
-                    vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
-                } else {
-                    vo.setPayPostage(BigDecimal.ZERO);
-                    vo.setCost(BigDecimal.ZERO);
-                    vo.setFPrice(BigDecimal.ZERO);
-                    vo.setPayDelivery(BigDecimal.ZERO);
-                    vo.setBarCode("");
-                    vo.setCateName("");
-                    vo.setBankTransactionId("");
-                }
-            }
-        }
-        FsStoreOrderListAndStatisticsVo vo = new FsStoreOrderListAndStatisticsVo();
-        BeanUtils.copyProperties(dataTable, vo);
-        if (dataTable.getTotal() > 0) {
-            Map<String, BigDecimal> statistics = fsStoreOrderService.selectFsStoreOrderStatistics(param);
-            if (statistics != null && statistics.size() >= 3) {
-                vo.setPayPriceTotal(statistics.get("pay_price").toString());
-                vo.setPayMoneyTotal(statistics.get("pay_money").toString());
-                vo.setPayRemainTotal(statistics.get("pay_remain").toString());
-            } else {
-                vo.setPayPriceTotal("0");
-                vo.setPayMoneyTotal("0");
-                vo.setPayRemainTotal("0");
-            }
-            String productStatistics = fsStoreOrderService.selectFsStoreOrderProductStatistics(param);
-            if (StringUtils.isNotBlank(productStatistics)) {
-                vo.setProductInfo(productStatistics);
-            } else {
-                vo.setProductInfo("");
-            }
-        }
-        return vo;
+//        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+//        if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
+//            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getPayTimeRange())) {
+//            param.setPayTimeList(param.getPayTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
+//            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getDeliverySendTimeRange())) {
+//            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
+//        }
+//        param.setNotHealth(1);
+//        List<FsStoreOrderVO> list = fsStoreOrderService.selectFsStoreOrderListVO(param);
+//        TableDataInfo dataTable = getDataTable(list);
+//        if (CloudHostUtils.hasCloudHostName("康年堂")) {
+//            dataTable.setMsg("knt");
+//        }
+//        if (list != null) {
+//            LoginUser loginUser = (LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//            for (FsStoreOrderVO vo : list) {
+//                if (vo.getPhone() != null) {
+//                    vo.setPhone(vo.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//                }
+//                if (ObjectUtil.isNotEmpty(vo.getUserPhone())) {
+//                    vo.setUserPhone(vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//                }
+//                if (CloudHostUtils.hasCloudHostName("康年堂")) {
+//                    FsStoreOrderDf df = fsStoreOrderDfService.selectFsStoreOrderDfByOrderId(vo.getId());
+//                    if (df != null) {
+//                        vo.setErpAccount(df.getLoginAccount());
+//                    }
+//                }
+//                if ((loginUser.getPermissions().contains("his:storeAfterSales:finance")) || loginUser.getPermissions().contains("*:*:*") && (vo.getCost() != null && vo.getTotalNum() != null)) {
+//                    vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
+//                } else {
+//                    vo.setPayPostage(BigDecimal.ZERO);
+//                    vo.setCost(BigDecimal.ZERO);
+//                    vo.setFPrice(BigDecimal.ZERO);
+//                    vo.setPayDelivery(BigDecimal.ZERO);
+//                    vo.setBarCode("");
+//                    vo.setCateName("");
+//                    vo.setBankTransactionId("");
+//                }
+//            }
+//        }
+//        FsStoreOrderListAndStatisticsVo vo = new FsStoreOrderListAndStatisticsVo();
+//        BeanUtils.copyProperties(dataTable, vo);
+//        if (dataTable.getTotal() > 0) {
+//            Map<String, BigDecimal> statistics = fsStoreOrderService.selectFsStoreOrderStatistics(param);
+//            if (statistics != null && statistics.size() >= 3) {
+//                vo.setPayPriceTotal(statistics.get("pay_price").toString());
+//                vo.setPayMoneyTotal(statistics.get("pay_money").toString());
+//                vo.setPayRemainTotal(statistics.get("pay_remain").toString());
+//            } else {
+//                vo.setPayPriceTotal("0");
+//                vo.setPayMoneyTotal("0");
+//                vo.setPayRemainTotal("0");
+//            }
+//            String productStatistics = fsStoreOrderService.selectFsStoreOrderProductStatistics(param);
+//            if (StringUtils.isNotBlank(productStatistics)) {
+//                vo.setProductInfo(productStatistics);
+//            } else {
+//                vo.setProductInfo("");
+//            }
+//        }
+//        return vo;
+        throw new RuntimeException("not implemented");
     }
 
     @PreAuthorize("@ss.hasPermi('store:storeOrder:payRemainList')")
@@ -396,59 +395,60 @@ public class FsStoreOrderScrmBridgeController extends BaseController
     @GetMapping("/exportItems")
     public AjaxResult exportItems(FsStoreOrderParam param)
     {
-        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())) {
-            param.setBeginTime(null);
-            param.setEndTime(null);
-        }
-        if (fsStoreOrderService.isEntityNull(param)) {
-            return AjaxResult.error("请筛选数据导出");
-        }
-        if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
-            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getPayTimeRange())) {
-            param.setPayTimeList(param.getPayTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
-            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getDeliverySendTimeRange())) {
-            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
-        }
-        param.setNotHealth(1);
-        List<FsStoreOrderItemExportVO> list = orderItemService.selectFsStoreOrderItemListExportVO(param);
-        if (list != null) {
-            SysRole sysRole = isCheckPermission();
-            LoginUser loginUser = (LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-            for (FsStoreOrderItemExportVO vo : list) {
-                if (vo.getUserPhone() != null && sysRole.getIsCheckPhone() != 1) {
-                    String phone = vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{1})", "$1****$2");
-                    vo.setUserPhone(phone);
-                }
-                if (vo.getUserAddress() != null && sysRole.getIsCheckAddress() != 1) {
-                    vo.setUserAddress(ParseUtils.parseAddress(vo.getUserAddress()));
-                }
-                if (!StringUtils.isEmpty(vo.getJsonInfo())) {
-                    try {
-                        StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getJsonInfo(), StoreOrderProductDTO.class);
-                        BeanUtil.copyProperties(orderProductDTO, vo);
-                    } catch (Exception e) {
-                    }
-                }
-                if ((loginUser.getPermissions().contains("his:storeAfterSales:finance") || loginUser.getPermissions().contains("*:*:*")) && !Objects.isNull(vo.getCost())) {
-                    vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
-                } else {
-                    vo.setPayPostage(BigDecimal.ZERO);
-                    vo.setCost(BigDecimal.ZERO);
-                    vo.setFPrice(BigDecimal.ZERO);
-                    vo.setBarCode("");
-                    vo.setCateName("");
-                    vo.setBankTransactionId("");
-                }
-            }
-        }
-        ExcelUtil<FsStoreOrderItemExportVO> util = new ExcelUtil<FsStoreOrderItemExportVO>(FsStoreOrderItemExportVO.class);
-        return util.exportExcel(list, "订单明细数据");
+//        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())) {
+//            param.setBeginTime(null);
+//            param.setEndTime(null);
+//        }
+//        if (fsStoreOrderService.isEntityNull(param)) {
+//            return AjaxResult.error("请筛选数据导出");
+//        }
+//        if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
+//            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getPayTimeRange())) {
+//            param.setPayTimeList(param.getPayTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
+//            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getDeliverySendTimeRange())) {
+//            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
+//        }
+//        param.setNotHealth(1);
+//        List<FsStoreOrderItemExportVO> list = orderItemService.selectFsStoreOrderItemListExportVO(param);
+//        if (list != null) {
+//            SysRole sysRole = isCheckPermission();
+//            LoginUser loginUser = (LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//            for (FsStoreOrderItemExportVO vo : list) {
+//                if (vo.getUserPhone() != null && sysRole.getIsCheckPhone() != 1) {
+//                    String phone = vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{1})", "$1****$2");
+//                    vo.setUserPhone(phone);
+//                }
+//                if (vo.getUserAddress() != null && sysRole.getIsCheckAddress() != 1) {
+//                    vo.setUserAddress(ParseUtils.parseAddress(vo.getUserAddress()));
+//                }
+//                if (!StringUtils.isEmpty(vo.getJsonInfo())) {
+//                    try {
+//                        StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getJsonInfo(), StoreOrderProductDTO.class);
+//                        BeanUtil.copyProperties(orderProductDTO, vo);
+//                    } catch (Exception e) {
+//                    }
+//                }
+//                if ((loginUser.getPermissions().contains("his:storeAfterSales:finance") || loginUser.getPermissions().contains("*:*:*")) && !Objects.isNull(vo.getCost())) {
+//                    vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
+//                } else {
+//                    vo.setPayPostage(BigDecimal.ZERO);
+//                    vo.setCost(BigDecimal.ZERO);
+//                    vo.setFPrice(BigDecimal.ZERO);
+//                    vo.setBarCode("");
+//                    vo.setCateName("");
+//                    vo.setBankTransactionId("");
+//                }
+//            }
+//        }
+//        ExcelUtil<FsStoreOrderItemExportVO> util = new ExcelUtil<FsStoreOrderItemExportVO>(FsStoreOrderItemExportVO.class);
+//        return util.exportExcel(list, "订单明细数据");
+        throw new RuntimeException("not implemented");
     }
 
     @PreAuthorize("@ss.hasPermi('store:storeOrder:exportItems:details')")
@@ -456,88 +456,89 @@ public class FsStoreOrderScrmBridgeController extends BaseController
     @GetMapping("/exportItemsDetails")
     public AjaxResult exportItemsDetails(FsStoreOrderParam param)
     {
-        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())) {
-            param.setBeginTime(null);
-            param.setEndTime(null);
-        }
-        if (fsStoreOrderService.isEntityNull(param)) {
-            return AjaxResult.error("请筛选数据导出");
-        }
-        if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
-            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getPayTimeRange())) {
-            param.setPayTimeList(param.getPayTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
-            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getDeliverySendTimeRange())) {
-            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
-        }
-        param.setNotHealth(1);
-        List<FsStoreOrderItemExportVO> list = orderItemService.selectFsStoreOrderItemListExportVO(param);
-        if ("北京卓美".equals(com.fs.config.saas.ProjectConfig.getFromDB(sysConfigMapper).getCloudHost().getCompanyName())) {
-            List<FsStoreOrderItemExportZMVO> zmvoList = list.stream()
-                    .map(vo -> {
-                        FsStoreOrderItemExportZMVO zmvo = new FsStoreOrderItemExportZMVO();
-                        try {
-                            BeanUtil.copyProperties(vo, zmvo);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                        return zmvo;
-                    })
-                    .collect(Collectors.toList());
-            if (zmvoList != null) {
-                LoginUser loginUser = (LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-                for (FsStoreOrderItemExportZMVO vo : zmvoList) {
-                    if (!StringUtils.isEmpty(vo.getJsonInfo())) {
-                        try {
-                            StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getJsonInfo(), StoreOrderProductDTO.class);
-                            BeanUtil.copyProperties(orderProductDTO, vo);
-                        } catch (Exception e) {
-                        }
-                    }
-                    if ((loginUser.getPermissions().contains("his:storeAfterSales:finance") || loginUser.getPermissions().contains("*:*:*")) && !Objects.isNull(vo.getCost())) {
-                        vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
-                    } else {
-                        vo.setPayPostage(BigDecimal.ZERO);
-                        vo.setCost(BigDecimal.ZERO);
-                        vo.setFPrice(BigDecimal.ZERO);
-                        vo.setBarCode("");
-                        vo.setCateName("");
-                        vo.setBankTransactionId("");
-                    }
-                }
-            }
-            ExcelUtil<FsStoreOrderItemExportZMVO> util = new ExcelUtil<FsStoreOrderItemExportZMVO>(FsStoreOrderItemExportZMVO.class);
-            return util.exportExcel(zmvoList, "订单明细数据");
-        }
-        if (list != null) {
-            LoginUser loginUser = (LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-            for (FsStoreOrderItemExportVO vo : list) {
-                if (!StringUtils.isEmpty(vo.getJsonInfo())) {
-                    try {
-                        StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getJsonInfo(), StoreOrderProductDTO.class);
-                        BeanUtil.copyProperties(orderProductDTO, vo);
-                    } catch (Exception e) {
-                    }
-                }
-                if ((loginUser.getPermissions().contains("his:storeAfterSales:finance") || loginUser.getPermissions().contains("*:*:*")) && !Objects.isNull(vo.getCost())) {
-                    vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
-                } else {
-                    vo.setPayPostage(BigDecimal.ZERO);
-                    vo.setCost(BigDecimal.ZERO);
-                    vo.setFPrice(BigDecimal.ZERO);
-                    vo.setBarCode("");
-                    vo.setCateName("");
-                    vo.setBankTransactionId("");
-                }
-            }
-        }
-        ExcelUtil<FsStoreOrderItemExportVO> util = new ExcelUtil<FsStoreOrderItemExportVO>(FsStoreOrderItemExportVO.class);
-        return util.exportExcel(list, "订单明细数据");
+//        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())) {
+//            param.setBeginTime(null);
+//            param.setEndTime(null);
+//        }
+//        if (fsStoreOrderService.isEntityNull(param)) {
+//            return AjaxResult.error("请筛选数据导出");
+//        }
+//        if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
+//            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getPayTimeRange())) {
+//            param.setPayTimeList(param.getPayTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
+//            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getDeliverySendTimeRange())) {
+//            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
+//        }
+//        param.setNotHealth(1);
+//        List<FsStoreOrderItemExportVO> list = orderItemService.selectFsStoreOrderItemListExportVO(param);
+//        if ("北京卓美".equals(com.fs.config.saas.ProjectConfig.getFromDB(sysConfigMapper).getCloudHost().getCompanyName())) {
+//            List<FsStoreOrderItemExportZMVO> zmvoList = list.stream()
+//                    .map(vo -> {
+//                        FsStoreOrderItemExportZMVO zmvo = new FsStoreOrderItemExportZMVO();
+//                        try {
+//                            BeanUtil.copyProperties(vo, zmvo);
+//                        } catch (Exception e) {
+//                            e.printStackTrace();
+//                        }
+//                        return zmvo;
+//                    })
+//                    .collect(Collectors.toList());
+//            if (zmvoList != null) {
+//                LoginUser loginUser = (LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//                for (FsStoreOrderItemExportZMVO vo : zmvoList) {
+//                    if (!StringUtils.isEmpty(vo.getJsonInfo())) {
+//                        try {
+//                            StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getJsonInfo(), StoreOrderProductDTO.class);
+//                            BeanUtil.copyProperties(orderProductDTO, vo);
+//                        } catch (Exception e) {
+//                        }
+//                    }
+//                    if ((loginUser.getPermissions().contains("his:storeAfterSales:finance") || loginUser.getPermissions().contains("*:*:*")) && !Objects.isNull(vo.getCost())) {
+//                        vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
+//                    } else {
+//                        vo.setPayPostage(BigDecimal.ZERO);
+//                        vo.setCost(BigDecimal.ZERO);
+//                        vo.setFPrice(BigDecimal.ZERO);
+//                        vo.setBarCode("");
+//                        vo.setCateName("");
+//                        vo.setBankTransactionId("");
+//                    }
+//                }
+//            }
+//            ExcelUtil<FsStoreOrderItemExportZMVO> util = new ExcelUtil<FsStoreOrderItemExportZMVO>(FsStoreOrderItemExportZMVO.class);
+//            return util.exportExcel(zmvoList, "订单明细数据");
+//        }
+//        if (list != null) {
+//            LoginUser loginUser = (LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//            for (FsStoreOrderItemExportVO vo : list) {
+//                if (!StringUtils.isEmpty(vo.getJsonInfo())) {
+//                    try {
+//                        StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getJsonInfo(), StoreOrderProductDTO.class);
+//                        BeanUtil.copyProperties(orderProductDTO, vo);
+//                    } catch (Exception e) {
+//                    }
+//                }
+//                if ((loginUser.getPermissions().contains("his:storeAfterSales:finance") || loginUser.getPermissions().contains("*:*:*")) && !Objects.isNull(vo.getCost())) {
+//                    vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
+//                } else {
+//                    vo.setPayPostage(BigDecimal.ZERO);
+//                    vo.setCost(BigDecimal.ZERO);
+//                    vo.setFPrice(BigDecimal.ZERO);
+//                    vo.setBarCode("");
+//                    vo.setCateName("");
+//                    vo.setBankTransactionId("");
+//                }
+//            }
+//        }
+//        ExcelUtil<FsStoreOrderItemExportVO> util = new ExcelUtil<FsStoreOrderItemExportVO>(FsStoreOrderItemExportVO.class);
+//        return util.exportExcel(list, "订单明细数据");
+        throw new RuntimeException("not implemented");
     }
 
     @GetMapping("/orderItemsNum")
@@ -867,12 +868,13 @@ public class FsStoreOrderScrmBridgeController extends BaseController
     @PostMapping("/editErpPhone")
     public AjaxResult editErpPhone(@RequestBody FsStoreOrderScrmSetErpPhoneParam param)
     {
-        param.setOpeName(SecurityUtils.getLoginUser().getUser().getNickName());
-        List<String> erpPhone = param.getErpPhone();
-        if (erpPhone == null || erpPhone.isEmpty()) {
-            return AjaxResult.error("请选择手机号");
-        }
-        return toAjax(fsStoreOrderService.batchUpdateErpByOrderIds(param));
+//        param.setOpeName(SecurityUtils.getLoginUser().getUser().getNickName());
+//        List<String> erpPhone = param.getErpPhone();
+//        if (erpPhone == null || erpPhone.isEmpty()) {
+//            return AjaxResult.error("请选择手机号");
+//        }
+//        return toAjax(fsStoreOrderService.batchUpdateErpByOrderIds(param));
+        throw new RuntimeException("not implemented");
     }
 
     @GetMapping("/getErpAccount")
@@ -892,54 +894,55 @@ public class FsStoreOrderScrmBridgeController extends BaseController
     @PostMapping(value = "/batchCreateErpOrder")
     public R batchCreateErpOrder(@RequestBody FsStoreOrderScrmSetErpPhoneParam param)
     {
-        String nickName = SecurityUtils.getLoginUser().getUser().getNickName();
-        String loginAccount = param.getLoginAccount();
-        if (StringUtils.isBlank(loginAccount)) {
-            return R.error("未选择推送erp账户");
-        }
-        FsStoreOrderDf df = getDFInfo(loginAccount);
-        if (df.getLoginAccount() == null) {
-            return R.error("未查询到所选erp账户");
-        }
-        List<Long> orderIds = param.getOrderIds();
-        if (orderIds == null || orderIds.isEmpty()) {
-            if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
-                param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-            }
-            if (!StringUtils.isEmpty(param.getPayTimeRange())) {
-                param.setPayTimeList(param.getPayTimeRange().split("--"));
-            }
-            if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
-                param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
-            }
-            if (!StringUtils.isEmpty(param.getDeliverySendTimeRange())) {
-                param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
-            }
-            param.setNotHealth(1);
-            List<FsStoreOrderVO> list = fsStoreOrderService.selectFsStoreOrderListVO(param);
-            orderIds = list.stream().map(FsStoreOrderVO::getId).collect(Collectors.toList());
-        }
-        if (orderIds.isEmpty()) {
-            return R.ok();
-        }
-        orderIds.forEach(orderId -> {
-            try {
-                df.setOrderId(orderId);
-                FsStoreOrderDf temp = fsStoreOrderDfService.selectFsStoreOrderDfByOrderId(df.getOrderId());
-                if (temp == null) {
-                    df.setParcelQuantity(param.getParcelQuantity());
-                    fsStoreOrderDfService.insertFsStoreOrderDf(df);
-                    fsStoreOrderLogsService.create(orderId, FsStoreOrderLogEnum.SET_PUSH_ACCOUNT.getValue(),
-                            nickName + " " + FsStoreOrderLogEnum.SET_PUSH_ACCOUNT.getDesc() + ":" + df.getLoginAccount());
-                }
-                fsStoreOrderService.createOmsOrder(orderId);
-                fsStoreOrderLogsService.create(orderId, FsStoreOrderLogEnum.PUSH_ORDER_ERP.getValue(),
-                        nickName + " " + FsStoreOrderLogEnum.PUSH_ORDER_ERP.getDesc() + ":" + df.getLoginAccount());
-            } catch (ParseException e) {
-                throw new RuntimeException(e);
-            }
-        });
-        return R.ok();
+//        String nickName = SecurityUtils.getLoginUser().getUser().getNickName();
+//        String loginAccount = param.getLoginAccount();
+//        if (StringUtils.isBlank(loginAccount)) {
+//            return R.error("未选择推送erp账户");
+//        }
+//        FsStoreOrderDf df = getDFInfo(loginAccount);
+//        if (df.getLoginAccount() == null) {
+//            return R.error("未查询到所选erp账户");
+//        }
+//        List<Long> orderIds = param.getOrderIds();
+//        if (orderIds == null || orderIds.isEmpty()) {
+//            if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
+//                param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//            }
+//            if (!StringUtils.isEmpty(param.getPayTimeRange())) {
+//                param.setPayTimeList(param.getPayTimeRange().split("--"));
+//            }
+//            if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
+//                param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
+//            }
+//            if (!StringUtils.isEmpty(param.getDeliverySendTimeRange())) {
+//                param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
+//            }
+//            param.setNotHealth(1);
+//            List<FsStoreOrderVO> list = fsStoreOrderService.selectFsStoreOrderListVO(param);
+//            orderIds = list.stream().map(FsStoreOrderVO::getId).collect(Collectors.toList());
+//        }
+//        if (orderIds.isEmpty()) {
+//            return R.ok();
+//        }
+//        orderIds.forEach(orderId -> {
+//            try {
+//                df.setOrderId(orderId);
+//                FsStoreOrderDf temp = fsStoreOrderDfService.selectFsStoreOrderDfByOrderId(df.getOrderId());
+//                if (temp == null) {
+//                    df.setParcelQuantity(param.getParcelQuantity());
+//                    fsStoreOrderDfService.insertFsStoreOrderDf(df);
+//                    fsStoreOrderLogsService.create(orderId, FsStoreOrderLogEnum.SET_PUSH_ACCOUNT.getValue(),
+//                            nickName + " " + FsStoreOrderLogEnum.SET_PUSH_ACCOUNT.getDesc() + ":" + df.getLoginAccount());
+//                }
+//                fsStoreOrderService.createOmsOrder(orderId);
+//                fsStoreOrderLogsService.create(orderId, FsStoreOrderLogEnum.PUSH_ORDER_ERP.getValue(),
+//                        nickName + " " + FsStoreOrderLogEnum.PUSH_ORDER_ERP.getDesc() + ":" + df.getLoginAccount());
+//            } catch (ParseException e) {
+//                throw new RuntimeException(e);
+//            }
+//        });
+//        return R.ok();
+        throw new RuntimeException("not implemented");
     }
 
     @ApiOperation("批量设置订单账户")
@@ -947,50 +950,51 @@ public class FsStoreOrderScrmBridgeController extends BaseController
     @PostMapping(value = "/batchSetErpOrder")
     public R batchSetErpOrder(@RequestBody FsStoreOrderScrmSetErpPhoneParam param)
     {
-        String nickName = SecurityUtils.getLoginUser().getUser().getNickName();
-        String loginAccount = param.getLoginAccount();
-        if (StringUtils.isBlank(loginAccount)) {
-            return R.error("未选择erp账户");
-        }
-        FsStoreOrderDf df = getDFInfo(loginAccount);
-        if (df.getLoginAccount() == null) {
-            return R.error("未查询到所选erp账户");
-        }
-        List<Long> orderIds = param.getOrderIds();
-        if (orderIds == null || orderIds.isEmpty()) {
-            if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
-                param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-            }
-            if (!StringUtils.isEmpty(param.getPayTimeRange())) {
-                param.setPayTimeList(param.getPayTimeRange().split("--"));
-            }
-            if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
-                param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
-            }
-            if (!StringUtils.isEmpty(param.getDeliverySendTimeRange())) {
-                param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
-            }
-            param.setNotHealth(1);
-            List<FsStoreOrderVO> list = fsStoreOrderService.selectFsStoreOrderListVO(param);
-            orderIds = list.stream().map(FsStoreOrderVO::getId).collect(Collectors.toList());
-        }
-        if (orderIds.isEmpty()) {
-            return R.ok();
-        }
-        orderIds.forEach(orderId -> {
-            df.setOrderId(orderId);
-            FsStoreOrderDf temp = fsStoreOrderDfService.selectFsStoreOrderDfByOrderId(df.getOrderId());
-            df.setParcelQuantity(param.getParcelQuantity());
-            if (temp != null) {
-                df.setUpdateTime(new Date());
-                fsStoreOrderDfService.updateFsStoreOrderDf(df);
-            } else {
-                fsStoreOrderDfService.insertFsStoreOrderDf(df);
-            }
-            fsStoreOrderLogsService.create(orderId, FsStoreOrderLogEnum.SET_PUSH_ACCOUNT.getValue(),
-                    nickName + " " + FsStoreOrderLogEnum.SET_PUSH_ACCOUNT.getDesc() + ":" + df.getLoginAccount());
-        });
-        return R.ok();
+//        String nickName = SecurityUtils.getLoginUser().getUser().getNickName();
+//        String loginAccount = param.getLoginAccount();
+//        if (StringUtils.isBlank(loginAccount)) {
+//            return R.error("未选择erp账户");
+//        }
+//        FsStoreOrderDf df = getDFInfo(loginAccount);
+//        if (df.getLoginAccount() == null) {
+//            return R.error("未查询到所选erp账户");
+//        }
+//        List<Long> orderIds = param.getOrderIds();
+//        if (orderIds == null || orderIds.isEmpty()) {
+//            if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
+//                param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//            }
+//            if (!StringUtils.isEmpty(param.getPayTimeRange())) {
+//                param.setPayTimeList(param.getPayTimeRange().split("--"));
+//            }
+//            if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
+//                param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
+//            }
+//            if (!StringUtils.isEmpty(param.getDeliverySendTimeRange())) {
+//                param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
+//            }
+//            param.setNotHealth(1);
+//            List<FsStoreOrderVO> list = fsStoreOrderService.selectFsStoreOrderListVO(param);
+//            orderIds = list.stream().map(FsStoreOrderVO::getId).collect(Collectors.toList());
+//        }
+//        if (orderIds.isEmpty()) {
+//            return R.ok();
+//        }
+//        orderIds.forEach(orderId -> {
+//            df.setOrderId(orderId);
+//            FsStoreOrderDf temp = fsStoreOrderDfService.selectFsStoreOrderDfByOrderId(df.getOrderId());
+//            df.setParcelQuantity(param.getParcelQuantity());
+//            if (temp != null) {
+//                df.setUpdateTime(new Date());
+//                fsStoreOrderDfService.updateFsStoreOrderDf(df);
+//            } else {
+//                fsStoreOrderDfService.insertFsStoreOrderDf(df);
+//            }
+//            fsStoreOrderLogsService.create(orderId, FsStoreOrderLogEnum.SET_PUSH_ACCOUNT.getValue(),
+//                    nickName + " " + FsStoreOrderLogEnum.SET_PUSH_ACCOUNT.getDesc() + ":" + df.getLoginAccount());
+//        });
+//        return R.ok();
+        throw new RuntimeException("not implemented");
     }
 
     @ApiOperation("批量审核订单")
@@ -1026,20 +1030,21 @@ public class FsStoreOrderScrmBridgeController extends BaseController
 
     private SysRole isCheckPermission()
     {
-        SysRole sysRole = new SysRole();
-        SysUser user = SecurityUtils.getLoginUser().getUser();
-        boolean flag = user.isAdmin();
-        if (flag) {
-            sysRole.setIsCheckPhone(1);
-            sysRole.setIsCheckAddress(1);
-        } else {
-            List<SysRole> roles = user.getRoles();
-            if (roles != null && !roles.isEmpty()) {
-                Long[] roleIds = roles.stream().map(SysRole::getRoleId).toArray(Long[]::new);
-                return sysRoleService.getIsCheckPermission(roleIds);
-            }
-        }
-        return sysRole;
+//        SysRole sysRole = new SysRole();
+//        SysUser user = SecurityUtils.getLoginUser().getUser();
+//        boolean flag = user.isAdmin();
+//        if (flag) {
+//            sysRole.setIsCheckPhone(1);
+//            sysRole.setIsCheckAddress(1);
+//        } else {
+//            List<SysRole> roles = user.getRoles();
+//            if (roles != null && !roles.isEmpty()) {
+//                Long[] roleIds = roles.stream().map(SysRole::getRoleId).toArray(Long[]::new);
+//                return sysRoleService.getIsCheckPermission(roleIds);
+//            }
+//        }
+//        return sysRole;
+        throw new RuntimeException("not implemented");
     }
 
     private FsStoreOrderDf getDFInfo(String loginAccount)

fs-agent/src/main/java/com/fs/billing/controller/WalletController.java

@@ -4,7 +4,6 @@ import com.fs.billing.dto.TenantBillingRequests;
 import com.fs.billing.service.BillingServices;
 import com.fs.common.core.domain.R;
 import com.fs.common.utils.SecurityUtils;
-import com.fs.framework.security.LoginUser;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.context.annotation.Profile;

fs-agent/src/main/java/com/fs/chat/controller/ChatMsgController.java

@@ -9,12 +9,11 @@ import com.fs.chat.vo.ChatMsgListCVO;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
-import com.fs.framework.security.LoginUser;
 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.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Profile;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -98,25 +97,26 @@ public class ChatMsgController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody ChatMsg chatMsg)
     {
-        if (chatMsg.getStatus()!=null){
-            return toAjax(chatMsgService.updateChatMsg(chatMsg));
-        }
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        ChatMsg map = chatMsgService.selectChatMsgByMsgId(chatMsg.getMsgId());
-        ChatMsgLogs logs = new ChatMsgLogs();
-        logs.setMsgId(chatMsg.getMsgId());
-        logs.setLogsType(2);
-        if (chatMsg.getContent()!=null&&!chatMsg.getContent().equals("")){
-            logs.setContent(chatMsg.getContent());
-        }
-        String userContent = chatMsgService.selectUserContent(map.getMsgId(), map.getUserId(),map.getRoleId());
-        logs.setSContent(map.getContent());
-        logs.setUserContent(userContent);
-        logs.setCreateBy(loginUser.getCompanyUser().getNickName());
-        logs.setCompanyId(0L);
-        chatMsgLogsService.insertChatMsgLogs(logs);
-
-        return toAjax(chatMsgService.updateChatMsg(chatMsg));
+//        if (chatMsg.getStatus()!=null){
+//            return toAjax(chatMsgService.updateChatMsg(chatMsg));
+//        }
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        ChatMsg map = chatMsgService.selectChatMsgByMsgId(chatMsg.getMsgId());
+//        ChatMsgLogs logs = new ChatMsgLogs();
+//        logs.setMsgId(chatMsg.getMsgId());
+//        logs.setLogsType(2);
+//        if (chatMsg.getContent()!=null&&!chatMsg.getContent().equals("")){
+//            logs.setContent(chatMsg.getContent());
+//        }
+//        String userContent = chatMsgService.selectUserContent(map.getMsgId(), map.getUserId(),map.getRoleId());
+//        logs.setSContent(map.getContent());
+//        logs.setUserContent(userContent);
+//        logs.setCreateBy(loginUser.getCompanyUser().getNickName());
+//        logs.setCompanyId(0L);
+//        chatMsgLogsService.insertChatMsgLogs(logs);
+//
+//        return toAjax(chatMsgService.updateChatMsg(chatMsg));
+        throw new RuntimeException("not implemented");
     }
 
     /**

fs-agent/src/main/java/com/fs/company/controller/aiSipCall/AiSipCallTaskController.java

@@ -12,8 +12,7 @@ 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.framework.web.service.TokenService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -56,24 +55,25 @@ public class AiSipCallTaskController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(AiSipCallTask aiSipCallTask)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (aiSipCallTask.getCompanyId() == null && loginUser.getCompany() != null) { aiSipCallTask.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        startPage();
-        List<AiSipCallTask> list = aiSipCallTaskService.selectAiSipCallTaskList(aiSipCallTask);
-        list.forEach(task -> {
-            CallTaskStatModel statModel = aiSipCallTaskService.statByBatchId(task.getBatchId());
-            task.setPhoneCount(statModel.getPhoneCount());
-            task.setCallCount(statModel.getCallCount());
-            task.setNoCallCount(statModel.getPhoneCount() - statModel.getCallCount());
-            task.setConnectCount(statModel.getConnectCount());
-            task.setNoConnectCount(statModel.getCallCount() - statModel.getConnectCount());
-            if (task.getCallCount() > 0) {
-                task.setRealConnectRate(task.getConnectCount()*1.0/task.getCallCount());
-            } else {
-                task.setRealConnectRate(0.0);
-            }
-        });
-        return getDataTable(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (aiSipCallTask.getCompanyId() == null && loginUser.getCompany() != null) { aiSipCallTask.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        startPage();
+//        List<AiSipCallTask> list = aiSipCallTaskService.selectAiSipCallTaskList(aiSipCallTask);
+//        list.forEach(task -> {
+//            CallTaskStatModel statModel = aiSipCallTaskService.statByBatchId(task.getBatchId());
+//            task.setPhoneCount(statModel.getPhoneCount());
+//            task.setCallCount(statModel.getCallCount());
+//            task.setNoCallCount(statModel.getPhoneCount() - statModel.getCallCount());
+//            task.setConnectCount(statModel.getConnectCount());
+//            task.setNoConnectCount(statModel.getCallCount() - statModel.getConnectCount());
+//            if (task.getCallCount() > 0) {
+//                task.setRealConnectRate(task.getConnectCount()*1.0/task.getCallCount());
+//            } else {
+//                task.setRealConnectRate(0.0);
+//            }
+//        });
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -84,11 +84,12 @@ public class AiSipCallTaskController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(AiSipCallTask aiSipCallTask)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (aiSipCallTask.getCompanyId() == null && loginUser.getCompany() != null) { aiSipCallTask.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        List<AiSipCallTask> list = aiSipCallTaskService.selectAiSipCallTaskList(aiSipCallTask);
-        ExcelUtil<AiSipCallTask> util = new ExcelUtil<>(AiSipCallTask.class);
-        return util.exportExcel(list, "aiSIP外呼任务数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (aiSipCallTask.getCompanyId() == null && loginUser.getCompany() != null) { aiSipCallTask.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        List<AiSipCallTask> list = aiSipCallTaskService.selectAiSipCallTaskList(aiSipCallTask);
+//        ExcelUtil<AiSipCallTask> util = new ExcelUtil<>(AiSipCallTask.class);
+//        return util.exportExcel(list, "aiSIP外呼任务数据");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -109,16 +110,17 @@ public class AiSipCallTaskController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody AiSipCallTask aiSipCallTask)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (aiSipCallTask.getCompanyId() == null && loginUser.getCompany() != null) { aiSipCallTask.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        aiSipCallTask.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-        aiSipCallTask.setCreateBy(loginUser.getCompanyUser().getUserName());
-        aiSipCallTask.setCreateTime(new Date());
-        // 外呼速率=1/接通率
-        if (null != aiSipCallTask.getConntectRate() && aiSipCallTask.getConntectRate() > 0) {
-            aiSipCallTask.setRate(aiSipCallTask.getConntectRate()/100.0);
-        }
-        return toAjax(aiSipCallTaskService.insertAiSipCallTask(aiSipCallTask));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (aiSipCallTask.getCompanyId() == null && loginUser.getCompany() != null) { aiSipCallTask.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        aiSipCallTask.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        aiSipCallTask.setCreateBy(loginUser.getCompanyUser().getUserName());
+//        aiSipCallTask.setCreateTime(new Date());
+//        // 外呼速率=1/接通率
+//        if (null != aiSipCallTask.getConntectRate() && aiSipCallTask.getConntectRate() > 0) {
+//            aiSipCallTask.setRate(aiSipCallTask.getConntectRate()/100.0);
+//        }
+//        return toAjax(aiSipCallTaskService.insertAiSipCallTask(aiSipCallTask));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -129,10 +131,11 @@ public class AiSipCallTaskController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody AiSipCallTask aiSipCallTask)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        aiSipCallTask.setUpdateBy(loginUser.getCompanyUser().getUserName());
-        aiSipCallTask.setUpdateTime(new Date());
-        return toAjax(aiSipCallTaskService.updateAiSipCallTask(aiSipCallTask));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        aiSipCallTask.setUpdateBy(loginUser.getCompanyUser().getUserName());
+//        aiSipCallTask.setUpdateTime(new Date());
+//        return toAjax(aiSipCallTaskService.updateAiSipCallTask(aiSipCallTask));
+        throw new RuntimeException("not implemented");
     }
 
     /**

fs-agent/src/main/java/com/fs/company/controller/aiSipCall/AiSipCallUserController.java

@@ -9,8 +9,7 @@ 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.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -81,14 +80,15 @@ public class AiSipCallUserController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody AiSipCallUser aiSipCallUser)
     {
-        if(aiSipCallUser.getCompanyUserId() == null){
-            com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-            if (aiSipCallUser.getCompanyId() == null && loginUser.getCompany() != null) { aiSipCallUser.setCompanyId(loginUser.getCompany().getCompanyId()); }
-            aiSipCallUser.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-            aiSipCallUser.setCreateBy(loginUser.getCompanyUser().getUserName());
-        }
-        aiSipCallUser.setCreateTime(new Date());
-        return toAjax(aiSipCallUserService.insertAiSipCallUser(aiSipCallUser));
+//        if(aiSipCallUser.getCompanyUserId() == null){
+//            com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//            if (aiSipCallUser.getCompanyId() == null && loginUser.getCompany() != null) { aiSipCallUser.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//            aiSipCallUser.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//            aiSipCallUser.setCreateBy(loginUser.getCompanyUser().getUserName());
+//        }
+//        aiSipCallUser.setCreateTime(new Date());
+//        return toAjax(aiSipCallUserService.insertAiSipCallUser(aiSipCallUser));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -99,10 +99,11 @@ public class AiSipCallUserController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody AiSipCallUser aiSipCallUser)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        aiSipCallUser.setUpdateBy(loginUser.getCompanyUser().getUserName());
-        aiSipCallUser.setUpdateTime(new Date());
-        return toAjax(aiSipCallUserService.updateAiSipCallUser(aiSipCallUser));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        aiSipCallUser.setUpdateBy(loginUser.getCompanyUser().getUserName());
+//        aiSipCallUser.setUpdateTime(new Date());
+//        return toAjax(aiSipCallUserService.updateAiSipCallUser(aiSipCallUser));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -131,15 +132,16 @@ public class AiSipCallUserController extends BaseController
     @GetMapping("/myCallUser")
     public AjaxResult myCallUser(AiSipCallUser aiSipCallUser)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        aiSipCallUser.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-        startPage();
-        List<AiSipCallUser> list = aiSipCallUserService.selectAiSipCallUserList(aiSipCallUser);
-        if(!list.isEmpty()){
-            return AjaxResult.success(list.get(0));
-        }else{
-            return AjaxResult.error("未创建sip角色");
-        }
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        aiSipCallUser.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        startPage();
+//        List<AiSipCallUser> list = aiSipCallUserService.selectAiSipCallUserList(aiSipCallUser);
+//        if(!list.isEmpty()){
+//            return AjaxResult.success(list.get(0));
+//        }else{
+//            return AjaxResult.error("未创建sip角色");
+//        }
+        throw new RuntimeException("not implemented");
     }
 
     /**

fs-agent/src/main/java/com/fs/company/controller/aicall/CcLlmAgentAccountController.java

@@ -20,8 +20,7 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.framework.datasource.DynamicDataSourceContextHolder;
 import com.fs.framework.datasource.TenantDataSourceManager;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.system.domain.SysConfig;
 import com.fs.system.mapper.SysConfigMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -116,8 +115,9 @@ public class CcLlmAgentAccountController extends BaseController
      * @return 公司ID
      */
     private Long getCurrentCompanyId() {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        return loginUser.getCompanyUser().getCompanyId();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        return loginUser.getCompanyUser().getCompanyId();
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -157,50 +157,51 @@ public class CcLlmAgentAccountController extends BaseController
     @ResponseBody
     public AjaxResult addSave(@RequestBody CcLlmAgentAccount ccLlmAgentAccount, HttpServletRequest request)
     {
-        if ("Coze".equalsIgnoreCase(ccLlmAgentAccount.getProviderClassName())) {
-            ccLlmAgentAccount.setAccountEntity("CozeAccount");
-        } else if ("LocalNlpChat".equalsIgnoreCase(ccLlmAgentAccount.getProviderClassName())) {
-            ccLlmAgentAccount.setAccountEntity("CozeAccount");
-        } else if ("JiutianWorkflow".equalsIgnoreCase(ccLlmAgentAccount.getProviderClassName())
-                || "JiutianAgent".equalsIgnoreCase(ccLlmAgentAccount.getProviderClassName())) {
-            ccLlmAgentAccount.setAccountEntity("JiutianAccount");
-        } else {
-            ccLlmAgentAccount.setAccountEntity("LlmAccount");
-        }
-        if (null == ccLlmAgentAccount.getKbCatId()) {
-            ccLlmAgentAccount.setKbCatId(-1);
-        }
-        if("DeepSeekChat".equalsIgnoreCase(ccLlmAgentAccount.getProviderClassName())){
-            JSONObject jsonObject = JSONObject.parseObject( ccLlmAgentAccount.getAccountJson());
-            if(null != jsonObject && jsonObject.containsKey("apiKey") && jsonObject.getString("apiKey").contains("**")){
-                SysConfig sysConfig = sysConfigMapper.selectConfigByConfigKey("cId.config");
-                if(null != sysConfig && StringUtils.isNotBlank(sysConfig.getConfigValue())){
-                    JSONObject configValue = JSONObject.parseObject(sysConfig.getConfigValue());
-                    jsonObject.put("apiKey", configValue.getString("apiKey"));
-                    ccLlmAgentAccount.setAccountJson(JSONObject.toJSONString(jsonObject));
-                }
-            }
-        }
-        
-        // 新增模型
-        int result = ccLlmAgentAccountService.insertCcLlmAgentAccount(ccLlmAgentAccount);
-
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(request);
-        // 根据 tenantId 切换数据源（先确保数据源已注册到 DynamicDataSource）
-        Long tenantId = loginUser.getTenantId();
-        if (tenantId != null) {
-            tenantDataSourceManager.ensureSwitchByTenantId(tenantId);
-        } else {
-            // 没有租户，回主库
-            DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
-        }
-        // 获取当前登录的公司ID
-        Long companyId = getCurrentCompanyId();
-        if (result > 0 && companyId != null) {
-            companyBindAiModelService.bindCompanyToModel(ccLlmAgentAccount.getId().longValue(), companyId);
-        }
-        
-        return toAjax(result);
+//        if ("Coze".equalsIgnoreCase(ccLlmAgentAccount.getProviderClassName())) {
+//            ccLlmAgentAccount.setAccountEntity("CozeAccount");
+//        } else if ("LocalNlpChat".equalsIgnoreCase(ccLlmAgentAccount.getProviderClassName())) {
+//            ccLlmAgentAccount.setAccountEntity("CozeAccount");
+//        } else if ("JiutianWorkflow".equalsIgnoreCase(ccLlmAgentAccount.getProviderClassName())
+//                || "JiutianAgent".equalsIgnoreCase(ccLlmAgentAccount.getProviderClassName())) {
+//            ccLlmAgentAccount.setAccountEntity("JiutianAccount");
+//        } else {
+//            ccLlmAgentAccount.setAccountEntity("LlmAccount");
+//        }
+//        if (null == ccLlmAgentAccount.getKbCatId()) {
+//            ccLlmAgentAccount.setKbCatId(-1);
+//        }
+//        if("DeepSeekChat".equalsIgnoreCase(ccLlmAgentAccount.getProviderClassName())){
+//            JSONObject jsonObject = JSONObject.parseObject( ccLlmAgentAccount.getAccountJson());
+//            if(null != jsonObject && jsonObject.containsKey("apiKey") && jsonObject.getString("apiKey").contains("**")){
+//                SysConfig sysConfig = sysConfigMapper.selectConfigByConfigKey("cId.config");
+//                if(null != sysConfig && StringUtils.isNotBlank(sysConfig.getConfigValue())){
+//                    JSONObject configValue = JSONObject.parseObject(sysConfig.getConfigValue());
+//                    jsonObject.put("apiKey", configValue.getString("apiKey"));
+//                    ccLlmAgentAccount.setAccountJson(JSONObject.toJSONString(jsonObject));
+//                }
+//            }
+//        }
+//
+//        // 新增模型
+//        int result = ccLlmAgentAccountService.insertCcLlmAgentAccount(ccLlmAgentAccount);
+//
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(request);
+//        // 根据 tenantId 切换数据源（先确保数据源已注册到 DynamicDataSource）
+//        Long tenantId = loginUser.getTenantId();
+//        if (tenantId != null) {
+//            tenantDataSourceManager.ensureSwitchByTenantId(tenantId);
+//        } else {
+//            // 没有租户，回主库
+//            DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+//        }
+//        // 获取当前登录的公司ID
+//        Long companyId = getCurrentCompanyId();
+//        if (result > 0 && companyId != null) {
+//            companyBindAiModelService.bindCompanyToModel(ccLlmAgentAccount.getId().longValue(), companyId);
+//        }
+//
+//        return toAjax(result);
+        throw new RuntimeException("not implemented");
     }
 
     /**

fs-agent/src/main/java/com/fs/company/controller/chat/ChatDatasetController.java

@@ -8,8 +8,7 @@ import com.fs.chat.service.IChatRoleService;
 import com.fs.chat.vo.ChatDatasetListCVO;
 import com.fs.common.core.domain.R;
 import com.fs.common.utils.ServletUtils;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.context.annotation.Profile;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,11 +56,12 @@ public class ChatDatasetController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(ChatDatasetCParam chatDataset)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (chatDataset.getCompanyId() == null && loginUser.getCompany() != null) { chatDataset.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<ChatDatasetListCVO> list = chatDatasetService.selectChatDatasetListCVO(chatDataset);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (chatDataset.getCompanyId() == null && loginUser.getCompany() != null) { chatDataset.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<ChatDatasetListCVO> list = chatDatasetService.selectChatDatasetListCVO(chatDataset);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -96,14 +96,15 @@ public class ChatDatasetController extends BaseController
     public R add(@RequestBody ChatDataset chatDataset)
     {
         //判断角色是否已创建知识库
-       if(chatDatasetService.check(chatDataset.getRoleId())>0){
-           return R.error("此客服角色已创建知识库");
-       }
-        String id=baiduAIService.createDataset(chatDataset.getDatasetName());
-        chatDataset.setExtId(id);
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (chatDataset.getCompanyId() == null && loginUser.getCompany() != null) { chatDataset.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        return chatDatasetService.insertChatDataset(chatDataset)>0?R.ok():R.error();
+//       if(chatDatasetService.check(chatDataset.getRoleId())>0){
+//           return R.error("此客服角色已创建知识库");
+//       }
+//        String id=baiduAIService.createDataset(chatDataset.getDatasetName());
+//        chatDataset.setExtId(id);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (chatDataset.getCompanyId() == null && loginUser.getCompany() != null) { chatDataset.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        return chatDatasetService.insertChatDataset(chatDataset)>0?R.ok():R.error();
+        throw new RuntimeException("not implemented");
     }
 
     /**

fs-agent/src/main/java/com/fs/company/controller/chat/ChatDatasetFileController.java

@@ -14,8 +14,7 @@ import com.fs.common.core.domain.R;
 import com.fs.common.exception.file.OssException;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.file.FileUploadUtils;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.dto.StoreOrderExpressExportDTO;
 import org.apache.poi.xwpf.usermodel.ParagraphAlignment;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;

fs-agent/src/main/java/com/fs/company/controller/chat/ChatKeywordController.java

@@ -2,9 +2,9 @@ package com.fs.company.controller.chat;
 
 import java.util.List;
 
+import com.fs.common.exception.CustomException;
 import com.fs.common.utils.ServletUtils;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.context.annotation.Profile;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,11 +47,12 @@ public class ChatKeywordController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(ChatKeyword chatKeyword)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (chatKeyword.getCompanyId() == null && loginUser.getCompany() != null) { chatKeyword.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<ChatKeyword> list = chatKeywordService.selectChatKeywordList(chatKeyword);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (chatKeyword.getCompanyId() == null && loginUser.getCompany() != null) { chatKeyword.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<ChatKeyword> list = chatKeywordService.selectChatKeywordList(chatKeyword);
+//        return getDataTable(list);
+        throw new CustomException("Not implemented");
     }
 
 
@@ -74,9 +75,10 @@ public class ChatKeywordController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody ChatKeyword chatKeyword)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (chatKeyword.getCompanyId() == null && loginUser.getCompany() != null) { chatKeyword.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        return toAjax(chatKeywordService.insertChatKeyword(chatKeyword));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (chatKeyword.getCompanyId() == null && loginUser.getCompany() != null) { chatKeyword.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        return toAjax(chatKeywordService.insertChatKeyword(chatKeyword));
+        throw new CustomException("Not implemented");
     }
 
     /**

fs-agent/src/main/java/com/fs/company/controller/chat/ChatMsgController.java

@@ -8,8 +8,7 @@ import com.fs.chat.param.ChatMsgListCParam;
 import com.fs.chat.service.IChatMsgLogsService;
 import com.fs.chat.vo.ChatMsgListCVO;
 import com.fs.common.utils.ServletUtils;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.context.annotation.Profile;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,11 +54,12 @@ public class ChatMsgController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(ChatMsgListCParam param)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<ChatMsgListCVO> list = chatMsgService.selectChatMsgListCVO(param);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<ChatMsgListCVO> list = chatMsgService.selectChatMsgListCVO(param);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -104,27 +104,28 @@ public class ChatMsgController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody ChatMsg chatMsg)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        ChatMsg map = chatMsgService.selectChatMsgByMsgId(chatMsg.getMsgId());
-        ChatMsgLogs logs = new ChatMsgLogs();
-        logs.setMsgId(chatMsg.getMsgId());
-        logs.setLogsType(2);
-        if (chatMsg.getContent()!=null&&!chatMsg.getContent().equals("")){
-            logs.setContent(chatMsg.getContent());
-        }
-        if (chatMsg.getStatus()!=null){
-            logs.setLogsType(1);
-        }
-        String userContent = chatMsgService.selectUserContent(map.getMsgId(), map.getUserId(),map.getRoleId());
-
-        logs.setSContent(map.getContent());
-        logs.setUserContent(userContent);
-        logs.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-        logs.setCreateBy(loginUser.getCompanyUser().getNickName());
-        if (logs.getCompanyId() == null && loginUser.getCompany() != null) { logs.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        chatMsgLogsService.insertChatMsgLogs(logs);
-
-        return toAjax(chatMsgService.updateChatMsg(chatMsg));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        ChatMsg map = chatMsgService.selectChatMsgByMsgId(chatMsg.getMsgId());
+//        ChatMsgLogs logs = new ChatMsgLogs();
+//        logs.setMsgId(chatMsg.getMsgId());
+//        logs.setLogsType(2);
+//        if (chatMsg.getContent()!=null&&!chatMsg.getContent().equals("")){
+//            logs.setContent(chatMsg.getContent());
+//        }
+//        if (chatMsg.getStatus()!=null){
+//            logs.setLogsType(1);
+//        }
+//        String userContent = chatMsgService.selectUserContent(map.getMsgId(), map.getUserId(),map.getRoleId());
+//
+//        logs.setSContent(map.getContent());
+//        logs.setUserContent(userContent);
+//        logs.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        logs.setCreateBy(loginUser.getCompanyUser().getNickName());
+//        if (logs.getCompanyId() == null && loginUser.getCompany() != null) { logs.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        chatMsgLogsService.insertChatMsgLogs(logs);
+//
+//        return toAjax(chatMsgService.updateChatMsg(chatMsg));
+        throw new RuntimeException("not implemented");
     }
 
     /**

fs-agent/src/main/java/com/fs/company/controller/chat/ChatMsgLogsController.java

@@ -7,9 +7,7 @@ import com.fs.chat.vo.ChatMsgLogsListCVO;
 import com.fs.chat.vo.ChatMsgLogsVO;
 import com.fs.common.core.domain.R;
 import com.fs.common.utils.ServletUtils;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
-import com.fs.his.vo.FsDoctorArticleListUVO;
+import com.fs.framework.web.service.TokenService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -63,12 +61,13 @@ public class ChatMsgLogsController extends BaseController
     @GetMapping("/logsList")
     public R list(ChatMsgLogsListCParam param)
     {
-        PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<ChatMsgLogsListCVO> list= chatMsgLogsService.selectChatMsgLogsListVO(param);
-        PageInfo<ChatMsgLogsListCVO> listPageInfo=new PageInfo<>(list);
-        return R.ok().put("data",listPageInfo);
+//        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<ChatMsgLogsListCVO> list= chatMsgLogsService.selectChatMsgLogsListVO(param);
+//        PageInfo<ChatMsgLogsListCVO> listPageInfo=new PageInfo<>(list);
+//        return R.ok().put("data",listPageInfo);
+        throw new RuntimeException("not implemented");
     }
 
     /**

fs-agent/src/main/java/com/fs/company/controller/chat/ChatRoleController.java

@@ -9,8 +9,7 @@ import com.fs.common.core.domain.R;
 import com.fs.common.utils.ServletUtils;
 import com.fs.company.domain.CompanyConfig;
 import com.fs.company.service.ICompanyConfigService;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.wx.kf.dto.WeixinKfAddEditAccountDTO;
 import com.fs.wx.kf.dto.WeixinKfDelAccountDTO;
 import com.fs.wx.kf.dto.WeixinKfGetFileDTO;
@@ -66,11 +65,12 @@ public class ChatRoleController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(ChatRole chatRole)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (chatRole.getCompanyId() == null && loginUser.getCompany() != null) { chatRole.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<ChatRole> list = chatRoleService.selectChatRoleList(chatRole);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (chatRole.getCompanyId() == null && loginUser.getCompany() != null) { chatRole.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<ChatRole> list = chatRoleService.selectChatRoleList(chatRole);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -105,40 +105,41 @@ public class ChatRoleController extends BaseController
     @PostMapping
     public R add(@RequestBody ChatRoleAddEditCParam param)
     {
-        WeixinKfAddEditAccountDTO dto=new WeixinKfAddEditAccountDTO();
-        dto.setName(param.getRoleName());
-        dto.setMedia_id(param.getKfMediaId());
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        CompanyConfig config=companyConfigService.selectCompanyConfigByKey(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null,"qw:config");
-        QwConfig qwConfig= JSONUtil.toBean(config.getConfigValue(), QwConfig.class);
-        WeixinKfAddEditAccountVO vo=weixinKfService.addAccount(qwConfig.getCorpId(),qwConfig.getSecret(),dto);
-        if(vo.getErrcode().equals(0)){
-            WeixinKuGetAccountUrlDTO urlDTO=new WeixinKuGetAccountUrlDTO();
-            urlDTO.setOpen_kfid(vo.getOpen_kfid());
-            WeixinKfGetAccountUrlVO urlVO=weixinKfService.getAccountUrl(qwConfig.getCorpId(),qwConfig.getSecret(),urlDTO);
-
-            ChatRole chatRole=new ChatRole();
-            BeanUtils.copyProperties(param,chatRole);
-            if (chatRole.getCompanyId() == null && loginUser.getCompany() != null) { chatRole.setCompanyId(loginUser.getCompany().getCompanyId()); }
-            chatRole.setKfId(vo.getOpen_kfid());
-            chatRole.setKfUrl(urlVO.getUrl());
-
-//            WeixinKfGetFileDTO getFileDTO=new WeixinKfGetFileDTO();
-//            getFileDTO.setMedia_id(param.getKfMediaId());
-//            String url=weixinKfService.getFile(qwConfig.getCorpId(),qwConfig.getSecret(),getFileDTO);
-            chatRole.setAvatar(param.getAvatar());
-
-            if(chatRoleService.insertChatRole(chatRole)>0){
-
-                return R.ok();
-            }
-            else{
-                return R.error();
-            }
-        }
-        else{
-            return R.error(vo.getErrmsg());
-        }
+//        WeixinKfAddEditAccountDTO dto=new WeixinKfAddEditAccountDTO();
+//        dto.setName(param.getRoleName());
+//        dto.setMedia_id(param.getKfMediaId());
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        CompanyConfig config=companyConfigService.selectCompanyConfigByKey(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null,"qw:config");
+//        QwConfig qwConfig= JSONUtil.toBean(config.getConfigValue(), QwConfig.class);
+//        WeixinKfAddEditAccountVO vo=weixinKfService.addAccount(qwConfig.getCorpId(),qwConfig.getSecret(),dto);
+//        if(vo.getErrcode().equals(0)){
+//            WeixinKuGetAccountUrlDTO urlDTO=new WeixinKuGetAccountUrlDTO();
+//            urlDTO.setOpen_kfid(vo.getOpen_kfid());
+//            WeixinKfGetAccountUrlVO urlVO=weixinKfService.getAccountUrl(qwConfig.getCorpId(),qwConfig.getSecret(),urlDTO);
+//
+//            ChatRole chatRole=new ChatRole();
+//            BeanUtils.copyProperties(param,chatRole);
+//            if (chatRole.getCompanyId() == null && loginUser.getCompany() != null) { chatRole.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//            chatRole.setKfId(vo.getOpen_kfid());
+//            chatRole.setKfUrl(urlVO.getUrl());
+//
+////            WeixinKfGetFileDTO getFileDTO=new WeixinKfGetFileDTO();
+////            getFileDTO.setMedia_id(param.getKfMediaId());
+////            String url=weixinKfService.getFile(qwConfig.getCorpId(),qwConfig.getSecret(),getFileDTO);
+//            chatRole.setAvatar(param.getAvatar());
+//
+//            if(chatRoleService.insertChatRole(chatRole)>0){
+//
+//                return R.ok();
+//            }
+//            else{
+//                return R.error();
+//            }
+//        }
+//        else{
+//            return R.error(vo.getErrmsg());
+//        }
+        throw new RuntimeException("not implemented");
 
     }
 
@@ -150,31 +151,32 @@ public class ChatRoleController extends BaseController
     @PutMapping
     public R edit(@RequestBody ChatRoleAddEditCParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        CompanyConfig config=companyConfigService.selectCompanyConfigByKey(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null,"qw:config");
-        QwConfig qwConfig= JSONUtil.toBean(config.getConfigValue(), QwConfig.class);
-        ChatRole chatRole=chatRoleService.selectChatRoleByRoleId(param.getRoleId());
-        WeixinKfAddEditAccountDTO dto=new WeixinKfAddEditAccountDTO();
-        dto.setOpen_kfid(chatRole.getKfId());
-        dto.setName(param.getRoleName());
-        dto.setMedia_id(param.getKfMediaId());
-        WeixinKfAddEditAccountVO vo=weixinKfService.editAccount(qwConfig.getCorpId(),qwConfig.getSecret(),dto);
-        if(vo.getErrcode().equals(0)){
-            BeanUtils.copyProperties(param,chatRole);
-//            WeixinKfGetFileDTO getFileDTO=new WeixinKfGetFileDTO();
-//            getFileDTO.setMedia_id(param.getKfMediaId());
-//            String url=weixinKfService.getFile(qwConfig.getCorpId(),qwConfig.getSecret(),getFileDTO);
-//            chatRole.setAvatar(url);
-            if(chatRoleService.updateChatRole(chatRole)>0){
-                return R.ok();
-            }
-            else{
-                return R.error();
-            }
-        }
-        else{
-            return R.error(vo.getErrmsg());
-        }
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        CompanyConfig config=companyConfigService.selectCompanyConfigByKey(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null,"qw:config");
+//        QwConfig qwConfig= JSONUtil.toBean(config.getConfigValue(), QwConfig.class);
+//        ChatRole chatRole=chatRoleService.selectChatRoleByRoleId(param.getRoleId());
+//        WeixinKfAddEditAccountDTO dto=new WeixinKfAddEditAccountDTO();
+//        dto.setOpen_kfid(chatRole.getKfId());
+//        dto.setName(param.getRoleName());
+//        dto.setMedia_id(param.getKfMediaId());
+//        WeixinKfAddEditAccountVO vo=weixinKfService.editAccount(qwConfig.getCorpId(),qwConfig.getSecret(),dto);
+//        if(vo.getErrcode().equals(0)){
+//            BeanUtils.copyProperties(param,chatRole);
+////            WeixinKfGetFileDTO getFileDTO=new WeixinKfGetFileDTO();
+////            getFileDTO.setMedia_id(param.getKfMediaId());
+////            String url=weixinKfService.getFile(qwConfig.getCorpId(),qwConfig.getSecret(),getFileDTO);
+////            chatRole.setAvatar(url);
+//            if(chatRoleService.updateChatRole(chatRole)>0){
+//                return R.ok();
+//            }
+//            else{
+//                return R.error();
+//            }
+//        }
+//        else{
+//            return R.error(vo.getErrmsg());
+//        }
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -185,30 +187,32 @@ public class ChatRoleController extends BaseController
 	@DeleteMapping("/{roleIds}")
     public R remove(@PathVariable Long[] roleIds)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        CompanyConfig config=companyConfigService.selectCompanyConfigByKey(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null,"qw:config");
-        QwConfig qwConfig= JSONUtil.toBean(config.getConfigValue(), QwConfig.class);
-
-        for(Long id:roleIds){
-            ChatRole chatRole=chatRoleService.selectChatRoleByRoleId(id);
-            WeixinKfDelAccountDTO dto=new WeixinKfDelAccountDTO();
-            dto.setOpen_kfid(chatRole.getKfId());
-            WeixinKfDelAccountVO vo=weixinKfService.delAccount(qwConfig.getCorpId(),qwConfig.getSecret(),dto);
-            if(vo.getErrcode().equals(0)){
-
-            }
-            chatRoleService.deleteChatRoleByRoleId(id);
-        }
-        return R.ok();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        CompanyConfig config=companyConfigService.selectCompanyConfigByKey(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null,"qw:config");
+//        QwConfig qwConfig= JSONUtil.toBean(config.getConfigValue(), QwConfig.class);
+//
+//        for(Long id:roleIds){
+//            ChatRole chatRole=chatRoleService.selectChatRoleByRoleId(id);
+//            WeixinKfDelAccountDTO dto=new WeixinKfDelAccountDTO();
+//            dto.setOpen_kfid(chatRole.getKfId());
+//            WeixinKfDelAccountVO vo=weixinKfService.delAccount(qwConfig.getCorpId(),qwConfig.getSecret(),dto);
+//            if(vo.getErrcode().equals(0)){
+//
+//            }
+//            chatRoleService.deleteChatRoleByRoleId(id);
+//        }
+//        return R.ok();
+        throw new RuntimeException("not implemented");
     }
 
     @GetMapping("/getAllRoleList")
     public R getAllRoleList()
     {
-        ChatRole chatRole=new ChatRole();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (chatRole.getCompanyId() == null && loginUser.getCompany() != null) { chatRole.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        List<ChatRole> list = chatRoleService.selectChatRoleList(chatRole);
-        return R.ok().put("data",list);
+//        ChatRole chatRole=new ChatRole();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (chatRole.getCompanyId() == null && loginUser.getCompany() != null) { chatRole.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        List<ChatRole> list = chatRoleService.selectChatRoleList(chatRole);
+//        return R.ok().put("data",list);
+        throw new RuntimeException("not implemented");
     }
 }

fs-agent/src/main/java/com/fs/company/controller/chat/ChatSessionController.java

@@ -10,8 +10,7 @@ import com.fs.chat.vo.ChatSessionCVO;
 import com.fs.chat.vo.ChatSessionListCVO;
 import com.fs.common.core.domain.R;
 import com.fs.common.utils.ServletUtils;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.context.annotation.Profile;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,11 +58,12 @@ public class ChatSessionController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(ChatSessionListCParam param)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<ChatSessionListCVO> list = chatSessionService.selectChatSessionListCVO(param);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<ChatSessionListCVO> list = chatSessionService.selectChatSessionListCVO(param);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**

fs-agent/src/main/java/com/fs/company/controller/chat/ChatUploadController.java

@@ -12,7 +12,6 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.file.FileUploadUtils;
 import com.fs.company.domain.CompanyConfig;
 import com.fs.company.service.ICompanyConfigService;
-import com.fs.framework.security.LoginUser;
 import com.fs.system.oss.CloudStorageService;
 import com.fs.system.oss.OSSFactory;
 import com.fs.wx.kf.dto.WeixinKfGetFileDTO;

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

@@ -16,8 +16,7 @@ import com.fs.company.utils.AudioUtils;
 import com.fs.company.vo.WangUploadVO;
 import com.fs.course.service.ITencentCloudCosService;
 import com.fs.framework.config.ServerConfig;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.domain.FsExportTask;
 import com.fs.his.dto.InquiryConfigDTO;
 import com.fs.his.service.IFsExportTaskService;
@@ -350,16 +349,17 @@ public class CommonController
     //分享会诊
     @PostMapping(value = "/common/sendInquiry")
     public AjaxResult sendInquiry(@RequestBody Map<String,String> map){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyUserId = loginUser.getCompanyUser().getUserId();
-        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-        String inquiryName = map.get("inquiryName");
-        String type = map.get("type");
-        String sendID = map.get("sendID");
-        String recvID = map.get("recvID");
-        String doctorId = map.get("doctorId");
-        OpenImResponseDTO inquirySelect = openIMService.sendInquiryUtil(sendID, recvID, 110, "inquirySelect", inquiryName, type,companyId,companyUserId,doctorId);
-        return AjaxResult.success(inquirySelect);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyUserId = loginUser.getCompanyUser().getUserId();
+//        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//        String inquiryName = map.get("inquiryName");
+//        String type = map.get("type");
+//        String sendID = map.get("sendID");
+//        String recvID = map.get("recvID");
+//        String doctorId = map.get("doctorId");
+//        OpenImResponseDTO inquirySelect = openIMService.sendInquiryUtil(sendID, recvID, 110, "inquirySelect", inquiryName, type,companyId,companyUserId,doctorId);
+//        return AjaxResult.success(inquirySelect);
+        throw new RuntimeException("not implemented");
     }
 
 

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

@@ -9,8 +9,7 @@ import com.fs.company.domain.CompanyUser;
 import com.fs.company.service.ICompanyUserService;
 import com.fs.crm.param.CrmCustomerStatisticsParam;
 import com.fs.crm.service.ICrmCustomerService;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.service.IFsStoreOrderService;
 import com.fs.his.service.IFsStorePaymentService;
 import com.fs.his.service.IFsStoreProductService;
@@ -99,46 +98,48 @@ public class IndexController
     @GetMapping("/getStoreOrderData")
     public R getStoreData()
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-
-        Long[] users=new Long[0];
-        TimeUtils.TimeEntity timeEntity=TimeUtils.parseTime("5",null,null);
-        timeEntity.setUserIds(users);
-        if (timeEntity.getCompanyId() == null && loginUser.getCompany() != null) { timeEntity.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        Integer cycleNum = timeEntity.getCycleNum();
-        Integer beginTime = timeEntity.getBeginTime();
-        List<Integer> timeList = new ArrayList<>();
-        for (int i = 1; i <= cycleNum; i++) {
-            timeList.add(beginTime);
-            beginTime = TimeUtils.formatTime(beginTime);
-        }
-        List<JSONObject> jsonObjectList = storeOrderService.selectFsStoreOrderCounts(timeEntity.toMap());
-        List<String> dates = jsonObjectList.stream().map(jsonObject -> jsonObject.getString("type")).collect(Collectors.toList());
-        List<Integer> orderCount = jsonObjectList.stream().map(jsonObject -> jsonObject.getInteger("orderCount")).collect(Collectors.toList());
-        List<Integer> payPrice = jsonObjectList.stream().map(jsonObject -> jsonObject.getInteger("payPrice")).collect(Collectors.toList());
-        return R.ok().put("dates",dates).put("orderCount",orderCount).put("payPrice",payPrice);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//
+//        Long[] users=new Long[0];
+//        TimeUtils.TimeEntity timeEntity=TimeUtils.parseTime("5",null,null);
+//        timeEntity.setUserIds(users);
+//        if (timeEntity.getCompanyId() == null && loginUser.getCompany() != null) { timeEntity.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        Integer cycleNum = timeEntity.getCycleNum();
+//        Integer beginTime = timeEntity.getBeginTime();
+//        List<Integer> timeList = new ArrayList<>();
+//        for (int i = 1; i <= cycleNum; i++) {
+//            timeList.add(beginTime);
+//            beginTime = TimeUtils.formatTime(beginTime);
+//        }
+//        List<JSONObject> jsonObjectList = storeOrderService.selectFsStoreOrderCounts(timeEntity.toMap());
+//        List<String> dates = jsonObjectList.stream().map(jsonObject -> jsonObject.getString("type")).collect(Collectors.toList());
+//        List<Integer> orderCount = jsonObjectList.stream().map(jsonObject -> jsonObject.getInteger("orderCount")).collect(Collectors.toList());
+//        List<Integer> payPrice = jsonObjectList.stream().map(jsonObject -> jsonObject.getInteger("payPrice")).collect(Collectors.toList());
+//        return R.ok().put("dates",dates).put("orderCount",orderCount).put("payPrice",payPrice);
+        throw new RuntimeException("not implemented");
     }
     @GetMapping("/getStorePaymentData")
     public R getStorePaymentData()
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-
-        Long[] users=new Long[0];
-        TimeUtils.TimeEntity timeEntity=TimeUtils.parseTime("5",null,null);
-        timeEntity.setUserIds(users);
-        if (timeEntity.getCompanyId() == null && loginUser.getCompany() != null) { timeEntity.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        Integer cycleNum = timeEntity.getCycleNum();
-        Integer beginTime = timeEntity.getBeginTime();
-        List<Integer> timeList = new ArrayList<>();
-        for (int i = 1; i <= cycleNum; i++) {
-            timeList.add(beginTime);
-            beginTime = TimeUtils.formatTime(beginTime);
-        }
-        List<JSONObject> jsonObjectList = paymentService.selectFsStorePaymentCounts(timeEntity.toMap());
-        List<String> dates = jsonObjectList.stream().map(jsonObject -> jsonObject.getString("type")).collect(Collectors.toList());
-        List<Integer> orderCount = jsonObjectList.stream().map(jsonObject -> jsonObject.getInteger("orderCount")).collect(Collectors.toList());
-        List<Integer> payMoney = jsonObjectList.stream().map(jsonObject -> jsonObject.getInteger("payMoney")).collect(Collectors.toList());
-        return R.ok().put("dates",dates).put("orderCount",orderCount).put("payMoney",payMoney);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//
+//        Long[] users=new Long[0];
+//        TimeUtils.TimeEntity timeEntity=TimeUtils.parseTime("5",null,null);
+//        timeEntity.setUserIds(users);
+//        if (timeEntity.getCompanyId() == null && loginUser.getCompany() != null) { timeEntity.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        Integer cycleNum = timeEntity.getCycleNum();
+//        Integer beginTime = timeEntity.getBeginTime();
+//        List<Integer> timeList = new ArrayList<>();
+//        for (int i = 1; i <= cycleNum; i++) {
+//            timeList.add(beginTime);
+//            beginTime = TimeUtils.formatTime(beginTime);
+//        }
+//        List<JSONObject> jsonObjectList = paymentService.selectFsStorePaymentCounts(timeEntity.toMap());
+//        List<String> dates = jsonObjectList.stream().map(jsonObject -> jsonObject.getString("type")).collect(Collectors.toList());
+//        List<Integer> orderCount = jsonObjectList.stream().map(jsonObject -> jsonObject.getInteger("orderCount")).collect(Collectors.toList());
+//        List<Integer> payMoney = jsonObjectList.stream().map(jsonObject -> jsonObject.getInteger("payMoney")).collect(Collectors.toList());
+//        return R.ok().put("dates",dates).put("orderCount",orderCount).put("payMoney",payMoney);
+        throw new RuntimeException("not implemented");
     }
 
 }

fs-agent/src/main/java/com/fs/company/controller/company/CompanyAiWorkflowController.java

@@ -4,9 +4,7 @@ import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.utils.ServletUtils;
-import com.fs.company.param.CompanyUserAiWorkflowTtsVoiceParam;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.domain.FsAiWorkflow;
 import com.fs.his.domain.FsAiWorkflowNode;
 import com.fs.his.service.IFsAiWorkflowService;
@@ -62,14 +60,15 @@ public class CompanyAiWorkflowController extends BaseController {
      */
 //    @GetMapping("/myNodes")
     public R getMyWorkflowNode() {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (loginUser == null || loginUser.getCompanyUser() == null) {
-            return R.error("用户信息错误");
-        }
-        Long companyUserId = loginUser.getCompanyUser().getUserId();
-        List<String> nodeTypes = Arrays.asList("start", "end", "ai_chat");
-        List<FsAiWorkflowNode> nodes = fsAiWorkflowService.selectWorkflowNodesByCompanyUserId(companyUserId, nodeTypes);
-        return R.ok().put("data", nodes);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (loginUser == null || loginUser.getCompanyUser() == null) {
+//            return R.error("用户信息错误");
+//        }
+//        Long companyUserId = loginUser.getCompanyUser().getUserId();
+//        List<String> nodeTypes = Arrays.asList("start", "end", "ai_chat");
+//        List<FsAiWorkflowNode> nodes = fsAiWorkflowService.selectWorkflowNodesByCompanyUserId(companyUserId, nodeTypes);
+//        return R.ok().put("data", nodes);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -77,13 +76,14 @@ public class CompanyAiWorkflowController extends BaseController {
      */
     @GetMapping("/myNodes")
     public R getMyWorkflowNodes() {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (loginUser == null || loginUser.getCompanyUser() == null) {
-            return R.error("用户信息错误");
-        }
-        Long companyUserId = loginUser.getCompanyUser().getUserId();
-        return R.ok().put("data", fsAiWorkflowService.getMyWorkflowNodes(companyUserId));
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (loginUser == null || loginUser.getCompanyUser() == null) {
+//            return R.error("用户信息错误");
+//        }
+//        Long companyUserId = loginUser.getCompanyUser().getUserId();
+//        return R.ok().put("data", fsAiWorkflowService.getMyWorkflowNodes(companyUserId));
+        throw new RuntimeException("not implemented");
     }
 
 //    @PostMapping("/ttsVoice")

fs-agent/src/main/java/com/fs/company/controller/company/CompanyConfigController.java

@@ -9,8 +9,7 @@ import com.fs.company.domain.CompanyConfig;
 import com.fs.company.param.SaveCompanyMiniAppParam;
 import com.fs.company.service.ICompanyConfigService;
 import com.fs.company.vo.CompanyMiniAppVO;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.system.domain.SysConfig;
 import com.fs.system.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,10 +46,11 @@ public class CompanyConfigController extends BaseController
     @PutMapping
     public R edit(@Validated @RequestBody CompanyConfig companyConfig)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyConfig.getCompanyId() == null && loginUser.getCompany() != null) { companyConfig.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        companyConfigService.updateCompanyConfig(companyConfig);
-        return R.ok("操作成功");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyConfig.getCompanyId() == null && loginUser.getCompany() != null) { companyConfig.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        companyConfigService.updateCompanyConfig(companyConfig);
+//        return R.ok("操作成功");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -71,17 +71,18 @@ public class CompanyConfigController extends BaseController
     @GetMapping(value = "/configKey/{configKey}")
     public R getConfigKey(@PathVariable String configKey)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        CompanyConfig config=companyConfigService.selectCompanyConfigByKey(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null,configKey);
-        if(config==null){
-            config=new CompanyConfig();
-            if (config.getCompanyId() == null && loginUser.getCompany() != null) { config.setCompanyId(loginUser.getCompany().getCompanyId()); };
-            config.setConfigKey(configKey);
-            config.setConfigType("N");
-            companyConfigService.insertCompanyConfig(config);
-
-        }
-        return R.ok().put("data",config);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        CompanyConfig config=companyConfigService.selectCompanyConfigByKey(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null,configKey);
+//        if(config==null){
+//            config=new CompanyConfig();
+//            if (config.getCompanyId() == null && loginUser.getCompany() != null) { config.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//            config.setConfigKey(configKey);
+//            config.setConfigType("N");
+//            companyConfigService.insertCompanyConfig(config);
+//
+//        }
+//        return R.ok().put("data",config);
+        throw new RuntimeException("not implemented");
 
     }
 
@@ -93,14 +94,15 @@ public class CompanyConfigController extends BaseController
     @GetMapping(value = "/getCompanyMiniAppList")
     public R getCompanyMiniAppList()
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if(null == loginUser) {
-            return R.error("用户信息错误");
-        }
-        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-        List<CompanyMiniAppVO> companyMiniAppList = companyConfigService.getCompanyMiniAppList(companyId);
-        SaveCompanyMiniAppParam param = companyConfigService.getCurrentCompanyMiniApp(companyId);
-        return R.ok().put("data",companyMiniAppList).put("current",param);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if(null == loginUser) {
+//            return R.error("用户信息错误");
+//        }
+//        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//        List<CompanyMiniAppVO> companyMiniAppList = companyConfigService.getCompanyMiniAppList(companyId);
+//        SaveCompanyMiniAppParam param = companyConfigService.getCurrentCompanyMiniApp(companyId);
+//        return R.ok().put("data",companyMiniAppList).put("current",param);
+        throw new RuntimeException("not implemented");
 
     }
 
@@ -112,18 +114,19 @@ public class CompanyConfigController extends BaseController
     @PostMapping(value = "/saveCompanyMiniApp")
     public R saveCompanyMiniApp(@RequestBody SaveCompanyMiniAppParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if(null == loginUser) {
-            return R.error("用户信息错误");
-        }
-        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-        param.setCompanyId(companyId);
-//        if(null == param.getCompanyId() || !companyId.equals(param.getCompanyId())) {
-//            return R.error("公司信息错误");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if(null == loginUser) {
+//            return R.error("用户信息错误");
 //        }
-        Long userId = loginUser.getCompanyUser().getUserId();
-        param.setUpdateBy(userId);
-        return companyConfigService.saveCompanyMiniApp(param);
+//        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//        param.setCompanyId(companyId);
+////        if(null == param.getCompanyId() || !companyId.equals(param.getCompanyId())) {
+////            return R.error("公司信息错误");
+////        }
+//        Long userId = loginUser.getCompanyUser().getUserId();
+//        param.setUpdateBy(userId);
+//        return companyConfigService.saveCompanyMiniApp(param);
+        throw new RuntimeException("not implemented");
 
     }
 

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

@@ -12,8 +12,7 @@ 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.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.vo.OptionsVO;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,40 +57,43 @@ public class CompanyController extends BaseController
     @GetMapping(value = "/getCompanyInfo")
     public R getCompanyInfo()
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Company company=companyService.selectCompanyById(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        return R.ok().put("data",company);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Company company=companyService.selectCompanyById(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        return R.ok().put("data",company);
+        throw new RuntimeException("not implemented");
     }
 
 
     @GetMapping(value = "/getCompanyVoice")
     public R getCompanyVoice()
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        CompanyVoice voice=companyVoiceService.selectCompanyVoiceByCompanyId(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        if(voice==null){
-            voice=new CompanyVoice();
-            voice.setTimes(0l);
-            voice.setTotalTimes(0l);
-            if (voice.getCompanyId() == null && loginUser.getCompany() != null) { voice.setCompanyId(loginUser.getCompany().getCompanyId()); };
-            companyVoiceService.insertCompanyVoice(voice);
-        }
-        return R.ok().put("data",voice);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        CompanyVoice voice=companyVoiceService.selectCompanyVoiceByCompanyId(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        if(voice==null){
+//            voice=new CompanyVoice();
+//            voice.setTimes(0l);
+//            voice.setTotalTimes(0l);
+//            if (voice.getCompanyId() == null && loginUser.getCompany() != null) { voice.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//            companyVoiceService.insertCompanyVoice(voice);
+//        }
+//        return R.ok().put("data",voice);
+        throw new RuntimeException("not implemented");
     }
 
     @GetMapping(value = "/getCompanySms")
     public R getCompanySms()
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        CompanySms sms=companySmsService.selectCompanySmsByCompanyId(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        if(sms==null){
-            sms=new CompanySms();
-            sms.setRemainSmsCount(0l);
-            sms.setTotalSmsCount(0l);
-            if (sms.getCompanyId() == null && loginUser.getCompany() != null) { sms.setCompanyId(loginUser.getCompany().getCompanyId()); };
-            companySmsService.insertCompanySms(sms);
-        }
-        return R.ok().put("data",sms);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        CompanySms sms=companySmsService.selectCompanySmsByCompanyId(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        if(sms==null){
+//            sms=new CompanySms();
+//            sms.setRemainSmsCount(0l);
+//            sms.setTotalSmsCount(0l);
+//            if (sms.getCompanyId() == null && loginUser.getCompany() != null) { sms.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//            companySmsService.insertCompanySms(sms);
+//        }
+//        return R.ok().put("data",sms);
+        throw new RuntimeException("not implemented");
     }
 
     @GetMapping("/getCompanyList")
@@ -113,9 +115,10 @@ public class CompanyController extends BaseController
     @ApiOperation("配置销售审核")
     @PostMapping(value = "/configUserCheck")
     public R configUserCheck(boolean userIsDefaultBlack) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        companyService.configUserCheck(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, userIsDefaultBlack ? 1 : 0);
-        return R.ok();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        companyService.configUserCheck(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, userIsDefaultBlack ? 1 : 0);
+//        return R.ok();
+        throw new RuntimeException("not implemented");
     }
 
     @GetMapping("/getCompanyListByCorId/{corpId}")

fs-agent/src/main/java/com/fs/company/controller/company/CompanyDeptController.java

@@ -9,9 +9,7 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.StringUtils;
 import com.fs.company.domain.CompanyDept;
 import com.fs.company.service.ICompanyDeptService;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.security.SecurityUtils;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -43,10 +41,11 @@ public class CompanyDeptController extends BaseController
     @GetMapping("/list")
     public AjaxResult list(CompanyDept dept)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (dept.getCompanyId() == null && loginUser.getCompany() != null) { dept.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<CompanyDept> depts = deptService.selectCompanyDeptList(dept);
-        return AjaxResult.success(depts);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (dept.getCompanyId() == null && loginUser.getCompany() != null) { dept.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<CompanyDept> depts = deptService.selectCompanyDeptList(dept);
+//        return AjaxResult.success(depts);
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -56,12 +55,13 @@ public class CompanyDeptController extends BaseController
     @GetMapping("/myDeptTreeselect")
     public AjaxResult myDeptTreeselect(CompanyDept dept)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (dept.getCompanyId() == null && loginUser.getCompany() != null) { dept.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        dept.setStatus("0");
-        dept.setParentId(loginUser.getCompanyUser().getDeptId());
-        List<CompanyDept> depts = deptService.selectCompanyDeptListByDeptAndParent(dept);
-        return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (dept.getCompanyId() == null && loginUser.getCompany() != null) { dept.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        dept.setStatus("0");
+//        dept.setParentId(loginUser.getCompanyUser().getDeptId());
+//        List<CompanyDept> depts = deptService.selectCompanyDeptListByDeptAndParent(dept);
+//        return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -71,21 +71,22 @@ public class CompanyDeptController extends BaseController
     @GetMapping("/list/exclude/{deptId}")
     public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        CompanyDept dept=new CompanyDept();
-        if (dept.getCompanyId() == null && loginUser.getCompany() != null) { dept.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        List<CompanyDept> depts = deptService.selectCompanyDeptList(dept);
-        Iterator<CompanyDept> it = depts.iterator();
-        while (it.hasNext())
-        {
-            CompanyDept d = (CompanyDept) it.next();
-            if (d.getDeptId().intValue() == deptId
-                    || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""))
-            {
-                it.remove();
-            }
-        }
-        return AjaxResult.success(depts);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        CompanyDept dept=new CompanyDept();
+//        if (dept.getCompanyId() == null && loginUser.getCompany() != null) { dept.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        List<CompanyDept> depts = deptService.selectCompanyDeptList(dept);
+//        Iterator<CompanyDept> it = depts.iterator();
+//        while (it.hasNext())
+//        {
+//            CompanyDept d = (CompanyDept) it.next();
+//            if (d.getDeptId().intValue() == deptId
+//                    || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""))
+//            {
+//                it.remove();
+//            }
+//        }
+//        return AjaxResult.success(depts);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -104,11 +105,12 @@ public class CompanyDeptController extends BaseController
     @GetMapping("/treeselect")
     public AjaxResult treeselect(CompanyDept dept)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (dept.getCompanyId() == null && loginUser.getCompany() != null) { dept.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        dept.setStatus("0");
-        List<CompanyDept> depts = deptService.selectCompanyDeptList(dept);
-        return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (dept.getCompanyId() == null && loginUser.getCompany() != null) { dept.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        dept.setStatus("0");
+//        List<CompanyDept> depts = deptService.selectCompanyDeptList(dept);
+//        return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
+        throw new RuntimeException("not implemented");
     }
     /**
      * 加载对应角色部门列表树
@@ -116,15 +118,16 @@ public class CompanyDeptController extends BaseController
     @GetMapping(value = "/roleDeptTreeselect/{roleId}")
     public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        CompanyDept dept=new CompanyDept();
-        if (dept.getCompanyId() == null && loginUser.getCompany() != null) { dept.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        dept.setStatus("0");
-        List<CompanyDept> depts = deptService.selectCompanyDeptList(dept);
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
-        ajax.put("depts", deptService.buildDeptTreeSelect(depts));
-        return ajax;
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        CompanyDept dept=new CompanyDept();
+//        if (dept.getCompanyId() == null && loginUser.getCompany() != null) { dept.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        dept.setStatus("0");
+//        List<CompanyDept> depts = deptService.selectCompanyDeptList(dept);
+//        AjaxResult ajax = AjaxResult.success();
+//        ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
+//        ajax.put("depts", deptService.buildDeptTreeSelect(depts));
+//        return ajax;
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -135,14 +138,15 @@ public class CompanyDeptController extends BaseController
     @PostMapping
     public AjaxResult add(@Validated @RequestBody CompanyDept dept)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (dept.getCompanyId() == null && loginUser.getCompany() != null) { dept.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
-        {
-            return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
-        }
-        dept.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(deptService.insertCompanyDept(dept));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (dept.getCompanyId() == null && loginUser.getCompany() != null) { dept.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
+//        {
+//            return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+//        }
+//        dept.setCreateBy(SecurityUtils.getUsername());
+//        return toAjax(deptService.insertCompanyDept(dept));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -152,19 +156,20 @@ public class CompanyDeptController extends BaseController
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody CompanyDept dept) {
-        if(dept.getParentId().equals(dept.getDeptId())) {
-            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
-        }
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (dept.getCompanyId() == null && loginUser.getCompany() != null) { dept.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
-            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
-        } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
-                && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0) {
-            return AjaxResult.error("该部门包含未停用的子部门！");
-        }
-        dept.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(deptService.updateCompanyDept(dept));
+//        if(dept.getParentId().equals(dept.getDeptId())) {
+//            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
+//        }
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (dept.getCompanyId() == null && loginUser.getCompany() != null) { dept.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
+//            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+//        } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
+//                && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0) {
+//            return AjaxResult.error("该部门包含未停用的子部门！");
+//        }
+//        dept.setUpdateBy(SecurityUtils.getUsername());
+//        return toAjax(deptService.updateCompanyDept(dept));
+        throw new RuntimeException("not implemented");
     }
 
     /**

fs-agent/src/main/java/com/fs/company/controller/company/CompanyDomainBindController.java

@@ -1,6 +1,8 @@
 package com.fs.company.controller.company;
 
 import java.util.List;
+
+import com.fs.framework.web.service.TokenService;
 import org.springframework.context.annotation.Profile;
 
 import cn.hutool.core.util.ObjectUtil;
@@ -8,8 +10,6 @@ import com.fs.common.core.domain.R;
 import com.fs.common.utils.ServletUtils;
 import com.fs.company.param.CompanyDomainBindParam;
 import com.fs.company.vo.CompanyDomainBindVo;
-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;
@@ -52,11 +52,12 @@ public class CompanyDomainBindController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(CompanyDomainBindParam companyDomainBind)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyDomainBind.getCompanyId() == null) { Long _cid = loginUser.getCompanyUser().getCompanyId(); if (_cid != null) companyDomainBind.setCompanyId(_cid); };
-        startPage();
-        List<CompanyDomainBindVo> list = companyDomainBindService.selectCompanyDomainBindList(companyDomainBind);
-        return getDataTable(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyDomainBind.getCompanyId() == null) { Long _cid = loginUser.getCompanyUser().getCompanyId(); if (_cid != null) companyDomainBind.setCompanyId(_cid); };
+//        startPage();
+//        List<CompanyDomainBindVo> list = companyDomainBindService.selectCompanyDomainBindList(companyDomainBind);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -67,11 +68,12 @@ public class CompanyDomainBindController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(CompanyDomainBindParam companyDomainBind)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyDomainBind.getCompanyId() == null) { Long _cid = loginUser.getCompanyUser().getCompanyId(); if (_cid != null) companyDomainBind.setCompanyId(_cid); };
-        List<CompanyDomainBindVo> list = companyDomainBindService.selectCompanyDomainBindList(companyDomainBind);
-        ExcelUtil<CompanyDomainBindVo> util = new ExcelUtil<CompanyDomainBindVo>(CompanyDomainBindVo.class);
-        return util.exportExcel(list, "域名绑定销售公司数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyDomainBind.getCompanyId() == null) { Long _cid = loginUser.getCompanyUser().getCompanyId(); if (_cid != null) companyDomainBind.setCompanyId(_cid); };
+//        List<CompanyDomainBindVo> list = companyDomainBindService.selectCompanyDomainBindList(companyDomainBind);
+//        ExcelUtil<CompanyDomainBindVo> util = new ExcelUtil<CompanyDomainBindVo>(CompanyDomainBindVo.class);
+//        return util.exportExcel(list, "域名绑定销售公司数据");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -130,8 +132,9 @@ public class CompanyDomainBindController extends BaseController
             return R.error("绑定失败，至少有一条分配人员信息！");
         }
 
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setUserId(loginUser.getCompanyUser().getUserId().toString());
-        return companyDomainBindService.domainBatchBinding(param);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setUserId(loginUser.getCompanyUser().getUserId().toString());
+//        return companyDomainBindService.domainBatchBinding(param);
+        throw new RuntimeException("not implemented");
     }
 }

fs-agent/src/main/java/com/fs/company/controller/company/CompanyDomainBindUserController.java

@@ -1,13 +1,13 @@
 package com.fs.company.controller.company;
 
 import java.util.List;
+
+import com.fs.framework.web.service.TokenService;
 import org.springframework.context.annotation.Profile;
 
 import com.fs.common.utils.ServletUtils;
 import com.fs.company.param.CompanyDomainBindUserParam;
 import com.fs.company.vo.CompanyDomainBindUserVo;
-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;
@@ -48,11 +48,12 @@ public class CompanyDomainBindUserController extends BaseController {
     @PreAuthorize("@ss.hasPermi('company:companyBindUser:list')")
     @GetMapping("/list")
     public TableDataInfo list(CompanyDomainBindUserParam companyDomainBindUser) {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyDomainBindUser.getCompanyId() == null) { Long _cid = loginUser.getCompanyUser().getCompanyId(); if (_cid != null) companyDomainBindUser.setCompanyId(_cid); };
-        List<CompanyDomainBindUserVo> list = companyDomainBindUserService.selectCompanyDomainBindUserList(companyDomainBindUser);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyDomainBindUser.getCompanyId() == null) { Long _cid = loginUser.getCompanyUser().getCompanyId(); if (_cid != null) companyDomainBindUser.setCompanyId(_cid); };
+//        List<CompanyDomainBindUserVo> list = companyDomainBindUserService.selectCompanyDomainBindUserList(companyDomainBindUser);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -62,11 +63,12 @@ public class CompanyDomainBindUserController extends BaseController {
     @Log(title = "企业域名分配中间表", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(CompanyDomainBindUserParam companyDomainBindUser) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyDomainBindUser.getCompanyId() == null) { Long _cid = loginUser.getCompanyUser().getCompanyId(); if (_cid != null) companyDomainBindUser.setCompanyId(_cid); };
-        List<CompanyDomainBindUserVo> list = companyDomainBindUserService.selectCompanyDomainBindUserList(companyDomainBindUser);
-        ExcelUtil<CompanyDomainBindUserVo> util = new ExcelUtil<CompanyDomainBindUserVo>(CompanyDomainBindUserVo.class);
-        return util.exportExcel(list, "企业域名分配中间表数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyDomainBindUser.getCompanyId() == null) { Long _cid = loginUser.getCompanyUser().getCompanyId(); if (_cid != null) companyDomainBindUser.setCompanyId(_cid); };
+//        List<CompanyDomainBindUserVo> list = companyDomainBindUserService.selectCompanyDomainBindUserList(companyDomainBindUser);
+//        ExcelUtil<CompanyDomainBindUserVo> util = new ExcelUtil<CompanyDomainBindUserVo>(CompanyDomainBindUserVo.class);
+//        return util.exportExcel(list, "企业域名分配中间表数据");
+        throw new RuntimeException("not implemented");
     }
 
     /**

fs-agent/src/main/java/com/fs/company/controller/company/CompanyInboundCallManageController.java

@@ -14,8 +14,7 @@ import com.fs.company.mapper.CompanyInboundBindMapper;
 import com.fs.company.mapper.EasyCallInboundLlmMapper;
 import com.fs.company.service.ICompanyInboundCallManageService;
 import com.fs.company.vo.easycall.*;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -58,24 +57,25 @@ public class CompanyInboundCallManageController extends BaseController {
     @PreAuthorize("@ss.hasPermi('inboundCallManage:list')")
     @GetMapping("/list")
     public TableDataInfo list(EasyCallInboundLlmVO vo) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        List<CompanyInboundBind> companyInboundBinds = companyInboundBindMapper.selectIdsByCompanyId(loginUser.getCompanyUser().getCompanyId());
-        if (null == companyInboundBinds || companyInboundBinds.isEmpty()) {
-            return getDataTable(null);
-        }
-        List<Long> ids = companyInboundBinds.stream().map(companyInboundBind -> companyInboundBind.getInboundLlmAccountId()).collect(Collectors.toList());
-        vo.setVisibleIds(ids);
-        startPage();
-        List<EasyCallInboundLlmVO> list = inboundCallManageService.selectInboundLlmList(vo);
-        TableDataInfo rspData = getDataTable(list);
-        // 填充关联数据
-        @SuppressWarnings("unchecked")
-        List<EasyCallInboundLlmVO> records = (List<EasyCallInboundLlmVO>) rspData.getRows();
-        for (EasyCallInboundLlmVO data : records) {
-            fillRelationData(data);
-        }
-        rspData.setRows(records);
-        return rspData;
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        List<CompanyInboundBind> companyInboundBinds = companyInboundBindMapper.selectIdsByCompanyId(loginUser.getCompanyUser().getCompanyId());
+//        if (null == companyInboundBinds || companyInboundBinds.isEmpty()) {
+//            return getDataTable(null);
+//        }
+//        List<Long> ids = companyInboundBinds.stream().map(companyInboundBind -> companyInboundBind.getInboundLlmAccountId()).collect(Collectors.toList());
+//        vo.setVisibleIds(ids);
+//        startPage();
+//        List<EasyCallInboundLlmVO> list = inboundCallManageService.selectInboundLlmList(vo);
+//        TableDataInfo rspData = getDataTable(list);
+//        // 填充关联数据
+//        @SuppressWarnings("unchecked")
+//        List<EasyCallInboundLlmVO> records = (List<EasyCallInboundLlmVO>) rspData.getRows();
+//        for (EasyCallInboundLlmVO data : records) {
+//            fillRelationData(data);
+//        }
+//        rspData.setRows(records);
+//        return rspData;
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -83,20 +83,21 @@ public class CompanyInboundCallManageController extends BaseController {
      */
     @GetMapping("/llmAccountList")
     public AjaxResult getLlmAccountList() {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        // 获取当前登录的公司ID
-        Long companyId = loginUser.getCompanyUser().getCompanyId();
-        List<Long> modelsId = new ArrayList<>();
-        if (companyId != null) {
-            List<Long> modelIds = companyBindAiModelService.selectModelIdsByCompanyId(companyId);
-            if (!modelIds.isEmpty()) {
-                modelsId = modelIds;
-            } else {
-                return AjaxResult.success();
-            }
-        }
-        List<EasyCallLlmAccountVO> list = inboundLlmMapper.selectLlmAccountList(modelsId);
-        return AjaxResult.success(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        // 获取当前登录的公司ID
+//        Long companyId = loginUser.getCompanyUser().getCompanyId();
+//        List<Long> modelsId = new ArrayList<>();
+//        if (companyId != null) {
+//            List<Long> modelIds = companyBindAiModelService.selectModelIdsByCompanyId(companyId);
+//            if (!modelIds.isEmpty()) {
+//                modelsId = modelIds;
+//            } else {
+//                return AjaxResult.success();
+//            }
+//        }
+//        List<EasyCallLlmAccountVO> list = inboundLlmMapper.selectLlmAccountList(modelsId);
+//        return AjaxResult.success(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -114,9 +115,10 @@ public class CompanyInboundCallManageController extends BaseController {
     @Log(title = "呼入大模型配置", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody EasyCallInboundLlmVO vo) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        vo.setCompanyId(loginUser.getCompanyUser().getCompanyId());
-        return toAjax(inboundCallManageService.insertInboundLlm(vo));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        vo.setCompanyId(loginUser.getCompanyUser().getCompanyId());
+//        return toAjax(inboundCallManageService.insertInboundLlm(vo));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -136,9 +138,10 @@ public class CompanyInboundCallManageController extends BaseController {
     @DeleteMapping("/{ids}")
     @PreAuthorize("@ss.hasPermi('inboundCallManage:delete')")
     public AjaxResult remove(@PathVariable String ids) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompanyUser().getCompanyId();
-        return toAjax(inboundCallManageService.deleteInboundLlmByIds(ids,companyId));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompanyUser().getCompanyId();
+//        return toAjax(inboundCallManageService.deleteInboundLlmByIds(ids,companyId));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -246,52 +249,53 @@ public class CompanyInboundCallManageController extends BaseController {
     @PreAuthorize("@ss.hasPermi('inboundCallManage:inboundCallRecord:list')")
     @GetMapping("/inboundCdrList")
     public TableDataInfo inboundCdrList(EasyCallInboundCdrVO vo) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompanyUser().getCompanyId();
-
-        // 通过CompanyInboundBind查询该公司绑定的呼入配置
-        List<CompanyInboundBind> binds = companyInboundBindMapper.selectIdsByCompanyId(companyId);
-        if (binds == null || binds.isEmpty()) {
-            return getDataTable(new ArrayList<>());
-        }
-
-        // 获取绑定配置的ID列表
-        List<Long> llmAccountIds = binds.stream()
-                .map(CompanyInboundBind::getInboundLlmAccountId)
-                .collect(Collectors.toList());
-
-        // 通过llmAccountIds查询对应的callee列表
-        EasyCallInboundLlmVO query = new EasyCallInboundLlmVO();
-        query.setVisibleIds(llmAccountIds);
-        List<EasyCallInboundLlmVO> llmConfigs = inboundCallManageService.selectInboundLlmList(query);
-        List<String> calleeList = llmConfigs.stream()
-                .map(EasyCallInboundLlmVO::getCallee)
-                .filter(StringUtils::isNotEmpty)
-                .distinct()
-                .collect(Collectors.toList());
-
-        if (calleeList.isEmpty()) {
-            return getDataTable(new ArrayList<>());
-        }
-
-        // 设置visibleCallees用于数据隔离
-        vo.setVisibleCallees(calleeList);
-
-        // 分页查询
-        startPage();
-        List<EasyCallInboundCdrVO> list = inboundCallManageService.selectInboundCdrList(vo);
-        TableDataInfo rspData = getDataTable(list);
-
-        // 处理录音URL
-        @SuppressWarnings("unchecked")
-        List<EasyCallInboundCdrVO> records = (List<EasyCallInboundCdrVO>) rspData.getRows();
-        for (EasyCallInboundCdrVO cdr : records) {
-            if (StringUtils.isNotEmpty(cdr.getWavFile())) {
-                cdr.setWavFileUrl("http://129.28.164.235:8899/recordings/files?filename=" + cdr.getWavFile());
-            }
-        }
-        rspData.setRows(records);
-        return rspData;
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompanyUser().getCompanyId();
+//
+//        // 通过CompanyInboundBind查询该公司绑定的呼入配置
+//        List<CompanyInboundBind> binds = companyInboundBindMapper.selectIdsByCompanyId(companyId);
+//        if (binds == null || binds.isEmpty()) {
+//            return getDataTable(new ArrayList<>());
+//        }
+//
+//        // 获取绑定配置的ID列表
+//        List<Long> llmAccountIds = binds.stream()
+//                .map(CompanyInboundBind::getInboundLlmAccountId)
+//                .collect(Collectors.toList());
+//
+//        // 通过llmAccountIds查询对应的callee列表
+//        EasyCallInboundLlmVO query = new EasyCallInboundLlmVO();
+//        query.setVisibleIds(llmAccountIds);
+//        List<EasyCallInboundLlmVO> llmConfigs = inboundCallManageService.selectInboundLlmList(query);
+//        List<String> calleeList = llmConfigs.stream()
+//                .map(EasyCallInboundLlmVO::getCallee)
+//                .filter(StringUtils::isNotEmpty)
+//                .distinct()
+//                .collect(Collectors.toList());
+//
+//        if (calleeList.isEmpty()) {
+//            return getDataTable(new ArrayList<>());
+//        }
+//
+//        // 设置visibleCallees用于数据隔离
+//        vo.setVisibleCallees(calleeList);
+//
+//        // 分页查询
+//        startPage();
+//        List<EasyCallInboundCdrVO> list = inboundCallManageService.selectInboundCdrList(vo);
+//        TableDataInfo rspData = getDataTable(list);
+//
+//        // 处理录音URL
+//        @SuppressWarnings("unchecked")
+//        List<EasyCallInboundCdrVO> records = (List<EasyCallInboundCdrVO>) rspData.getRows();
+//        for (EasyCallInboundCdrVO cdr : records) {
+//            if (StringUtils.isNotEmpty(cdr.getWavFile())) {
+//                cdr.setWavFileUrl("http://129.28.164.235:8899/recordings/files?filename=" + cdr.getWavFile());
+//            }
+//        }
+//        rspData.setRows(records);
+//        return rspData;
+        throw new RuntimeException("not implemented");
     }
 
     /**

fs-agent/src/main/java/com/fs/company/controller/company/CompanyIntegralController.java

@@ -8,8 +8,7 @@ import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.company.domain.CompanyDept;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.param.FsUserIntegralLogsParam;
 import com.fs.his.service.IFsUserIntegralLogsService;
 import com.fs.his.vo.FsUserIntegralLogsListVO;
@@ -89,9 +88,10 @@ public class CompanyIntegralController extends BaseController
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody CompanyDept dept)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (dept.getCompanyId() == null && loginUser.getCompany() != null) { dept.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        return toAjax(0);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (dept.getCompanyId() == null && loginUser.getCompany() != null) { dept.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        return toAjax(0);
+        throw new RuntimeException("not implemented");
     }
 
     /**

fs-agent/src/main/java/com/fs/company/controller/company/CompanyLoginController.java

@@ -3,6 +3,7 @@ package com.fs.company.controller.company;
 import com.alibaba.fastjson.JSONObject;
 import com.fs.common.constant.Constants;
 import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.domain.model.LoginBody;
 import com.fs.common.core.redis.RedisCache;
 import com.fs.common.exception.ServiceException;
 import com.fs.common.exception.user.CaptchaException;
@@ -16,11 +17,7 @@ import com.fs.company.domain.CompanyUser;
 import com.fs.company.service.ICompanyMenuService;
 import com.fs.framework.manager.AsyncManager;
 import com.fs.framework.manager.factory.AsyncFactory;
-import com.fs.framework.security.LoginBody;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.CompanyLoginService;
-import com.fs.framework.service.CompanyPermissionService;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.system.domain.SysConfig;
 import com.fs.system.service.ISysConfigService;
 import lombok.extern.slf4j.Slf4j;
@@ -46,15 +43,10 @@ import java.util.Set;
 @Slf4j
 public class CompanyLoginController
 {
-    @Autowired
-    private CompanyLoginService loginService;
 
     @Autowired
     private ICompanyMenuService menuService;
 
-    @Autowired
-    private CompanyPermissionService permissionService;
-
     @Autowired
     private TokenService tokenService;
     @Autowired
@@ -71,13 +63,14 @@ public class CompanyLoginController
     @PostMapping("/login")
     public AjaxResult login(@RequestBody LoginBody loginBody)
     {
-        // 登录时不验证密码格式，密码格式仅在注册/修改密码时验证
-        AjaxResult ajax = AjaxResult.success();
-        // 生成令牌
-        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
-                loginBody.getUuid(),loginBody.getTenantCode());
-        ajax.put(Constants.TOKEN, token);
-        return ajax;
+//        // 登录时不验证密码格式，密码格式仅在注册/修改密码时验证
+//        AjaxResult ajax = AjaxResult.success();
+//        // 生成令牌
+//        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+//                loginBody.getUuid(),loginBody.getTenantCode());
+//        ajax.put(Constants.TOKEN, token);
+//        return ajax;
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -89,19 +82,20 @@ public class CompanyLoginController
     @GetMapping("getInfo")
     public AjaxResult getInfo()
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        CompanyUser user = loginUser.getCompanyUser();
-        // 角色集合
-        Set<String> roles = permissionService.getRolePermission(user);
-        // 权限集合
-        Set<String> permissions = permissionService.getMenuPermission(user);
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("user", user);
-        ajax.put("roles", roles);
-        ajax.put("permissions", permissions);
-
-
-        return ajax;
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        CompanyUser user = loginUser.getCompanyUser();
+//        // 角色集合
+//        Set<String> roles = permissionService.getRolePermission(user);
+//        // 权限集合
+//        Set<String> permissions = permissionService.getMenuPermission(user);
+//        AjaxResult ajax = AjaxResult.success();
+//        ajax.put("user", user);
+//        ajax.put("roles", roles);
+//        ajax.put("permissions", permissions);
+//
+//
+//        return ajax;
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -112,11 +106,12 @@ public class CompanyLoginController
     @GetMapping("getRouters")
     public AjaxResult getRouters()
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        // 用户信息
-        CompanyUser user = loginUser.getCompanyUser();
-        List<CompanyMenu> menus = menuService.selectMenuTreeByUserId(user.getUserId(), loginUser.getCompanyUser().isAdmin());
-        return AjaxResult.success(menuService.buildMenus(menus));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        // 用户信息
+//        CompanyUser user = loginUser.getCompanyUser();
+//        List<CompanyMenu> menus = menuService.selectMenuTreeByUserId(user.getUserId(), loginUser.getCompanyUser().isAdmin());
+//        return AjaxResult.success(menuService.buildMenus(menus));
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -127,55 +122,60 @@ public class CompanyLoginController
     @GetMapping("getFirstLogin")
     public AjaxResult getFirstLogin()
     {
-        SysConfig config = configService.selectConfigByConfigKey("his.login");
-        if(config != null && config.getConfigValue() != null){
-            String configValue = config.getConfigValue();
-            JSONObject jsonObject = JSONObject.parseObject(configValue);
-            Boolean disabled = jsonObject.getBoolean("disabled");
-            if(disabled){
-                com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-                Long userId = redisCache.getCacheObject("newCompanyUser:" + loginUser.getCompanyUser().getCompanyId() + ":" + loginUser.getCompanyUser().getUserName());
-                if (loginUser.getCompanyUser().getUserId().equals(userId)) {
-                    return AjaxResult.success(true);
-                }
-            }
-        }
-        return AjaxResult.success(false);
+//        SysConfig config = configService.selectConfigByConfigKey("his.login");
+//        if(config != null && config.getConfigValue() != null){
+//            String configValue = config.getConfigValue();
+//            JSONObject jsonObject = JSONObject.parseObject(configValue);
+//            Boolean disabled = jsonObject.getBoolean("disabled");
+//            if(disabled){
+//                com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//                Long userId = redisCache.getCacheObject("newCompanyUser:" + loginUser.getCompanyUser().getCompanyId() + ":" + loginUser.getCompanyUser().getUserName());
+//                if (loginUser.getCompanyUser().getUserId().equals(userId)) {
+//                    return AjaxResult.success(true);
+//                }
+//            }
+//        }
+//        return AjaxResult.success(false);
+        throw new RuntimeException("not implemented");
     }
 
     @PostMapping("/checkIsNeedCheck")
     public boolean checkIsNeedCheck(@RequestBody LoginBody loginBody)
     {
 //        return false;
-        return loginService.checkIsNeedCheck(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getTenantCode());
+//        return loginService.checkIsNeedCheck(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getTenantCode());
+        throw new RuntimeException("not implemented");
     }
 
     @PostMapping("/getWechatQrCode")
     public AjaxResult getWechatQrCode(@RequestBody Map<String,String> params) throws Exception {
-        Map<String,String> qr = loginService.getWechatQrCode(params.get("username"));
-        return AjaxResult.success(qr);
+//        Map<String,String> qr = loginService.getWechatQrCode(params.get("username"));
+//        return AjaxResult.success(qr);
+        throw new RuntimeException("not implemented");
     }
 
     @GetMapping("/checkWechatScan")
     public AjaxResult checkWechatScan(@RequestParam String ticket) {
-        //log.info("触发轮询");
-        String token = loginService.checkWechatScan(ticket);
-        Map<String, String> stringStringMap = Collections.singletonMap(Constants.TOKEN, token);
-        if (token != null){
-            return AjaxResult.success(Constants.TOKEN, token);
-        }
-        return AjaxResult.success("waiting");
+//        //log.info("触发轮询");
+//        String token = loginService.checkWechatScan(ticket);
+//        Map<String, String> stringStringMap = Collections.singletonMap(Constants.TOKEN, token);
+//        if (token != null){
+//            return AjaxResult.success(Constants.TOKEN, token);
+//        }
+//        return AjaxResult.success("waiting");
+        throw new RuntimeException("not implemented");
     }
 
     @GetMapping("/callback")
     public String wechatCallback(@RequestParam String code, @RequestParam String state) {
-        try {
-            log.info("触发回调");
-            loginService.handleCallback(code, state);
-            return "success"; // 微信要求返回内容，显示给用户即可
-        } catch (Exception e) {
-            return "error";
-        }
+//        try {
+//            log.info("触发回调");
+//            loginService.handleCallback(code, state);
+//            return "success"; // 微信要求返回内容，显示给用户即可
+//        } catch (Exception e) {
+//            return "error";
+//        }
+        throw new RuntimeException("not implemented");
     }
 
 

fs-agent/src/main/java/com/fs/company/controller/company/CompanyLogininforController.java

@@ -10,8 +10,7 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.company.domain.CompanyLogininfor;
 import com.fs.company.service.ICompanyLogininforService;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -38,11 +37,12 @@ public class CompanyLogininforController extends BaseController
     @DataScope
     public TableDataInfo list(CompanyLogininfor logininfor)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        startPage();
-        if (logininfor.getCompanyId() == null && loginUser.getCompany() != null) { logininfor.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<CompanyLogininfor> list = logininforService.selectCompanyLogininforList(logininfor);
-        return getDataTable(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        startPage();
+//        if (logininfor.getCompanyId() == null && loginUser.getCompany() != null) { logininfor.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<CompanyLogininfor> list = logininforService.selectCompanyLogininforList(logininfor);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     @Log(title = "登录日志", businessType = BusinessType.EXPORT)
@@ -50,11 +50,12 @@ public class CompanyLogininforController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(CompanyLogininfor logininfor)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (logininfor.getCompanyId() == null && loginUser.getCompany() != null) { logininfor.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        List<CompanyLogininfor> list = logininforService.selectCompanyLogininforList(logininfor);
-        ExcelUtil<CompanyLogininfor> util = new ExcelUtil<CompanyLogininfor>(CompanyLogininfor.class);
-        return util.exportExcel(list, "登录日志");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (logininfor.getCompanyId() == null && loginUser.getCompany() != null) { logininfor.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        List<CompanyLogininfor> list = logininforService.selectCompanyLogininforList(logininfor);
+//        ExcelUtil<CompanyLogininfor> util = new ExcelUtil<CompanyLogininfor>(CompanyLogininfor.class);
+//        return util.exportExcel(list, "登录日志");
+        throw new RuntimeException("not implemented");
     }
 
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
@@ -70,8 +71,9 @@ public class CompanyLogininforController extends BaseController
     @DeleteMapping("/clean")
     public AjaxResult clean()
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        logininforService.cleanLogininfor(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        return AjaxResult.success();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        logininforService.cleanLogininfor(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        return AjaxResult.success();
+        throw new RuntimeException("not implemented");
     }
 }

fs-agent/src/main/java/com/fs/company/controller/company/CompanyMenuController.java

@@ -10,9 +10,7 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.StringUtils;
 import com.fs.company.domain.CompanyMenu;
 import com.fs.company.service.ICompanyMenuService;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.security.SecurityUtils;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -44,10 +42,11 @@ public class CompanyMenuController extends BaseController
     @GetMapping("/list")
     public AjaxResult list(CompanyMenu menu)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = loginUser.getCompanyUser().getUserId();
-        List<CompanyMenu> menus = menuService.selectMenuList(menu, userId,loginUser.getCompanyUser().getUserType());
-        return AjaxResult.success(menus);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = loginUser.getCompanyUser().getUserId();
+//        List<CompanyMenu> menus = menuService.selectMenuList(menu, userId,loginUser.getCompanyUser().getUserType());
+//        return AjaxResult.success(menus);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -66,10 +65,11 @@ public class CompanyMenuController extends BaseController
     @GetMapping("/treeselect")
     public AjaxResult treeselect(CompanyMenu menu)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = loginUser.getCompanyUser().getUserId();
-        List<CompanyMenu> menus = menuService.selectMenuList(menu, userId,loginUser.getCompanyUser().getUserType());
-        return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = loginUser.getCompanyUser().getUserId();
+//        List<CompanyMenu> menus = menuService.selectMenuList(menu, userId,loginUser.getCompanyUser().getUserType());
+//        return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -78,13 +78,14 @@ public class CompanyMenuController extends BaseController
     @GetMapping(value = "/roleMenuTreeselect/{roleId}")
     public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        CompanyMenu companyMenu = new CompanyMenu();
-        List<CompanyMenu> menus = menuService.selectMenuList(companyMenu,loginUser.getCompanyUser().getUserId(),loginUser.getCompanyUser().getUserType());
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
-        ajax.put("menus", menuService.buildMenuTreeSelect(menus));
-        return ajax;
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        CompanyMenu companyMenu = new CompanyMenu();
+//        List<CompanyMenu> menus = menuService.selectMenuList(companyMenu,loginUser.getCompanyUser().getUserId(),loginUser.getCompanyUser().getUserType());
+//        AjaxResult ajax = AjaxResult.success();
+//        ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
+//        ajax.put("menus", menuService.buildMenuTreeSelect(menus));
+//        return ajax;
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -95,13 +96,14 @@ public class CompanyMenuController extends BaseController
     @PostMapping
     public AjaxResult add(@Validated @RequestBody CompanyMenu menu)
     {
-       if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
-                && !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
-        {
-            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
-        }
-        menu.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(menuService.insertCompanyMenu(menu));
+//       if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
+//                && !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
+//        {
+//            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+//        }
+//        menu.setCreateBy(SecurityUtils.getUsername());
+//        return toAjax(menuService.insertCompanyMenu(menu));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -112,17 +114,18 @@ public class CompanyMenuController extends BaseController
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody CompanyMenu menu)
     {
-         if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
-                && !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
-        {
-            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
-        }
-        else if (menu.getMenuId().equals(menu.getParentId()))
-        {
-            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
-        }
-        menu.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(menuService.updateCompanyMenu(menu));
+//         if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
+//                && !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
+//        {
+//            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+//        }
+//        else if (menu.getMenuId().equals(menu.getParentId()))
+//        {
+//            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
+//        }
+//        menu.setUpdateBy(SecurityUtils.getUsername());
+//        return toAjax(menuService.updateCompanyMenu(menu));
+        throw new RuntimeException("not implemented");
     }
 
     /**

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

@@ -11,8 +11,7 @@ import com.fs.common.utils.StringUtils;
 import com.fs.company.param.CompanyMoneyLogsParam;
 import com.fs.company.service.ICompanyMoneyLogsService;
 import com.fs.company.vo.CompanyMoneyLogsVO;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.domain.FsExportTask;
 import com.fs.his.param.FsCompanyMoneyLogsExportParam;
 import com.fs.his.service.IFsExportTaskService;
@@ -53,29 +52,31 @@ public class CompanyMoneyLogsController extends BaseController
 
     public TableDataInfo list(CompanyMoneyLogsParam companyMoneyLogs)
     {
-        startPage();
-        if(!StringUtils.isEmpty(companyMoneyLogs.getCreateTimeRange())){
-            companyMoneyLogs.setCreateTimeList(companyMoneyLogs.getCreateTimeRange().split("--"));
-        }
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyMoneyLogs.getCompanyId() == null && loginUser.getCompany() != null) { companyMoneyLogs.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        if(companyMoneyLogs.getLogsType()!=null){
-            if(companyMoneyLogs.getLogsType()==3 || companyMoneyLogs.getLogsType()==4 || companyMoneyLogs.getLogsType()==5 || companyMoneyLogs.getLogsType()==6){
-                List<CompanyMoneyLogsVO> list = companyMoneyLogsService.selectCompanyMoneyLogsMallVOList(companyMoneyLogs);
-                return getDataTable(list);
-            }
-        }
-        List<CompanyMoneyLogsVO> list = companyMoneyLogsService.selectCompanyMoneyLogsVOList(companyMoneyLogs);
-        return getDataTable(list);
+//        startPage();
+//        if(!StringUtils.isEmpty(companyMoneyLogs.getCreateTimeRange())){
+//            companyMoneyLogs.setCreateTimeList(companyMoneyLogs.getCreateTimeRange().split("--"));
+//        }
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyMoneyLogs.getCompanyId() == null && loginUser.getCompany() != null) { companyMoneyLogs.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        if(companyMoneyLogs.getLogsType()!=null){
+//            if(companyMoneyLogs.getLogsType()==3 || companyMoneyLogs.getLogsType()==4 || companyMoneyLogs.getLogsType()==5 || companyMoneyLogs.getLogsType()==6){
+//                List<CompanyMoneyLogsVO> list = companyMoneyLogsService.selectCompanyMoneyLogsMallVOList(companyMoneyLogs);
+//                return getDataTable(list);
+//            }
+//        }
+//        List<CompanyMoneyLogsVO> list = companyMoneyLogsService.selectCompanyMoneyLogsVOList(companyMoneyLogs);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     @GetMapping("/getCompanyTotalMoneys")
     public R getCompanyTotalMoneys(CompanyMoneyLogsParam companyMoneyLogs)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyMoneyLogs.getCompanyId() == null && loginUser.getCompany() != null) { companyMoneyLogs.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        BigDecimal totalMoneys = companyMoneyLogsService.selectCompanyTotalMoneys(companyMoneyLogs);
-        return R.ok().put("totalMoneys",totalMoneys);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyMoneyLogs.getCompanyId() == null && loginUser.getCompany() != null) { companyMoneyLogs.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        BigDecimal totalMoneys = companyMoneyLogsService.selectCompanyTotalMoneys(companyMoneyLogs);
+//        return R.ok().put("totalMoneys",totalMoneys);
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -88,63 +89,64 @@ public class CompanyMoneyLogsController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(FsCompanyMoneyLogsExportParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        Long userId = loginUser.getCompanyUser().getUserId();
-        logger.info("tc>\n【导出企业账户记录】：{}",userId );
-        if(!StringUtils.isEmpty(param.getCreateTimeRange())){
-            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-        }
-
-        Integer exportType1 = exportTaskService.isExportType2(userId);
-        if (exportType1>0){
-            return AjaxResult.error("你已经有正在导出的任务");
-        }
-
-        if(param.getType()==0){
-            Integer count=companyMoneyLogsService.selectCompanyMoneyLogsExportCounts(param);
-            if (count>30000){
-                return AjaxResult.error("导出数据不可超过3w条");
-            }
-            FsExportTask task=new FsExportTask();
-            task.setTaskType(7);
-            task.setStatus(0);
-            task.setStartTime(new Date());
-            task.setRemark("药品订单导出");
-            task.setSysType(2);
-            task.setCompanyUserId(userId);
-            exportTaskService.insertFsExportTask(task);
-            param.setTaskId(task.getTaskId());
-            companyMoneyLogsService.exportData(param);
-            return new AjaxResult(200,"后台正在导出,请等待...任务ID:"+task.getTaskId(),task.getTaskId());
-        }
-        else if(param.getType().equals(1))
-        {
-            Integer count=companyMoneyLogsService.selectCompanyMoneyLogsExport1Counts(param);
-            if(count>30000){
-                return AjaxResult.error("导出数据已超出上限，最多可导出30000条数据");
-            }
-            FsExportTask task=new FsExportTask();
-            task.setTaskType(7);
-            task.setStatus(0);
-            task.setStartTime(new Date());
-            String remark = "导出订单明细";
-            if (param.getOrderType() != null) {
-                if (param.getOrderType() == 0) {
-                    remark = "导出商城订单明细";
-                } else if (param.getOrderType() == 1) {
-                    remark = "导出直播订单明细";
-                }
-            }
-            task.setRemark(remark);
-            task.setSysType(2);
-            task.setCompanyUserId(userId);
-            exportTaskService.insertFsExportTask(task);
-            param.setTaskId(task.getTaskId());
-            companyMoneyLogsService.exportData(param);
-            return new AjaxResult(200,"后台正在导出,请等待...任务ID:"+task.getTaskId(),task.getTaskId());
-        }
-        return new AjaxResult(500,"导出失败");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        Long userId = loginUser.getCompanyUser().getUserId();
+//        logger.info("tc>\n【导出企业账户记录】：{}",userId );
+//        if(!StringUtils.isEmpty(param.getCreateTimeRange())){
+//            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//        }
+//
+//        Integer exportType1 = exportTaskService.isExportType2(userId);
+//        if (exportType1>0){
+//            return AjaxResult.error("你已经有正在导出的任务");
+//        }
+//
+//        if(param.getType()==0){
+//            Integer count=companyMoneyLogsService.selectCompanyMoneyLogsExportCounts(param);
+//            if (count>30000){
+//                return AjaxResult.error("导出数据不可超过3w条");
+//            }
+//            FsExportTask task=new FsExportTask();
+//            task.setTaskType(7);
+//            task.setStatus(0);
+//            task.setStartTime(new Date());
+//            task.setRemark("药品订单导出");
+//            task.setSysType(2);
+//            task.setCompanyUserId(userId);
+//            exportTaskService.insertFsExportTask(task);
+//            param.setTaskId(task.getTaskId());
+//            companyMoneyLogsService.exportData(param);
+//            return new AjaxResult(200,"后台正在导出,请等待...任务ID:"+task.getTaskId(),task.getTaskId());
+//        }
+//        else if(param.getType().equals(1))
+//        {
+//            Integer count=companyMoneyLogsService.selectCompanyMoneyLogsExport1Counts(param);
+//            if(count>30000){
+//                return AjaxResult.error("导出数据已超出上限，最多可导出30000条数据");
+//            }
+//            FsExportTask task=new FsExportTask();
+//            task.setTaskType(7);
+//            task.setStatus(0);
+//            task.setStartTime(new Date());
+//            String remark = "导出订单明细";
+//            if (param.getOrderType() != null) {
+//                if (param.getOrderType() == 0) {
+//                    remark = "导出商城订单明细";
+//                } else if (param.getOrderType() == 1) {
+//                    remark = "导出直播订单明细";
+//                }
+//            }
+//            task.setRemark(remark);
+//            task.setSysType(2);
+//            task.setCompanyUserId(userId);
+//            exportTaskService.insertFsExportTask(task);
+//            param.setTaskId(task.getTaskId());
+//            companyMoneyLogsService.exportData(param);
+//            return new AjaxResult(200,"后台正在导出,请等待...任务ID:"+task.getTaskId(),task.getTaskId());
+//        }
+//        return new AjaxResult(500,"导出失败");
+        throw new RuntimeException("not implemented");
 
     }
 

fs-agent/src/main/java/com/fs/company/controller/company/CompanyOperlogController.java

@@ -10,8 +10,7 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.company.domain.CompanyOperLog;
 import com.fs.company.service.ICompanyOperLogService;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -40,11 +39,12 @@ public class CompanyOperlogController extends BaseController
     @DataScope
     public TableDataInfo list(CompanyOperLog operLog)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        startPage();
-        if (operLog.getCompanyId() == null && loginUser.getCompany() != null) { operLog.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<CompanyOperLog> list = operLogService.selectCompanyOperLogList(operLog);
-        return getDataTable(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        startPage();
+//        if (operLog.getCompanyId() == null && loginUser.getCompany() != null) { operLog.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<CompanyOperLog> list = operLogService.selectCompanyOperLogList(operLog);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     @Log(title = "操作日志", businessType = BusinessType.EXPORT)
@@ -52,11 +52,12 @@ public class CompanyOperlogController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(CompanyOperLog operLog)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (operLog.getCompanyId() == null && loginUser.getCompany() != null) { operLog.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        List<CompanyOperLog> list = operLogService.selectCompanyOperLogList(operLog);
-        ExcelUtil<CompanyOperLog> util = new ExcelUtil<CompanyOperLog>(CompanyOperLog.class);
-        return util.exportExcel(list, "操作日志");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (operLog.getCompanyId() == null && loginUser.getCompany() != null) { operLog.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        List<CompanyOperLog> list = operLogService.selectCompanyOperLogList(operLog);
+//        ExcelUtil<CompanyOperLog> util = new ExcelUtil<CompanyOperLog>(CompanyOperLog.class);
+//        return util.exportExcel(list, "操作日志");
+        throw new RuntimeException("not implemented");
     }
 
     @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
@@ -71,8 +72,9 @@ public class CompanyOperlogController extends BaseController
     @DeleteMapping("/clean")
     public AjaxResult clean()
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        operLogService.cleanOperLog(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        return AjaxResult.success();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        operLogService.cleanOperLog(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        return AjaxResult.success();
+        throw new RuntimeException("not implemented");
     }
 }

fs-agent/src/main/java/com/fs/company/controller/company/CompanyPostController.java

@@ -10,9 +10,7 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.company.domain.CompanyPost;
 import com.fs.company.service.ICompanyPostService;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.security.SecurityUtils;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -42,11 +40,12 @@ public class CompanyPostController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(CompanyPost post)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (post.getCompanyId() == null && loginUser.getCompany() != null) { post.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        startPage();
-        List<CompanyPost> list = postService.selectCompanyPostList(post);
-        return getDataTable(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (post.getCompanyId() == null && loginUser.getCompany() != null) { post.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        startPage();
+//        List<CompanyPost> list = postService.selectCompanyPostList(post);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
@@ -54,11 +53,12 @@ public class CompanyPostController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(CompanyPost post)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (post.getCompanyId() == null && loginUser.getCompany() != null) { post.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        List<CompanyPost> list = postService.selectCompanyPostList(post);
-        ExcelUtil<CompanyPost> util = new ExcelUtil<CompanyPost>(CompanyPost.class);
-        return util.exportExcel(list, "岗位数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (post.getCompanyId() == null && loginUser.getCompany() != null) { post.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        List<CompanyPost> list = postService.selectCompanyPostList(post);
+//        ExcelUtil<CompanyPost> util = new ExcelUtil<CompanyPost>(CompanyPost.class);
+//        return util.exportExcel(list, "岗位数据");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -79,14 +79,15 @@ public class CompanyPostController extends BaseController
     @PostMapping
     public AjaxResult add(@Validated @RequestBody CompanyPost post)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (post.getCompanyId() == null && loginUser.getCompany() != null) { post.setCompanyId(loginUser.getCompany().getCompanyId()); }
-       if (postService.checkPostCodeUnique(post)>0)
-        {
-            return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
-        }
-        post.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(postService.insertCompanyPost(post));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (post.getCompanyId() == null && loginUser.getCompany() != null) { post.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//       if (postService.checkPostCodeUnique(post)>0)
+//        {
+//            return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+//        }
+//        post.setCreateBy(SecurityUtils.getUsername());
+//        return toAjax(postService.insertCompanyPost(post));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -97,14 +98,15 @@ public class CompanyPostController extends BaseController
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody CompanyPost post)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (post.getCompanyId() == null && loginUser.getCompany() != null) { post.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
-        {
-            return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
-        }
-        post.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(postService.updateCompanyPost(post));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (post.getCompanyId() == null && loginUser.getCompany() != null) { post.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
+//        {
+//            return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+//        }
+//        post.setUpdateBy(SecurityUtils.getUsername());
+//        return toAjax(postService.updateCompanyPost(post));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -125,10 +127,11 @@ public class CompanyPostController extends BaseController
     @GetMapping("/optionselect")
     public AjaxResult optionselect()
     {
-        CompanyPost postMap=new CompanyPost();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (postMap.getCompanyId() == null && loginUser.getCompany() != null) { postMap.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<CompanyPost> posts = postService.selectCompanyPostList(postMap);
-        return AjaxResult.success(posts);
+//        CompanyPost postMap=new CompanyPost();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (postMap.getCompanyId() == null && loginUser.getCompany() != null) { postMap.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<CompanyPost> posts = postService.selectCompanyPostList(postMap);
+//        return AjaxResult.success(posts);
+        throw new RuntimeException("not implemented");
     }
 }

fs-agent/src/main/java/com/fs/company/controller/company/CompanyProfileController.java

@@ -13,9 +13,7 @@ import com.fs.common.utils.file.FileUploadUtils;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.param.CompanyUserEditParam;
 import com.fs.company.service.ICompanyUserService;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.security.SecurityUtils;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.im.config.ImTypeConfig;
 import com.fs.im.service.OpenIMService;
 import com.fs.system.service.ISysConfigService;
@@ -52,12 +50,13 @@ public class CompanyProfileController extends BaseController
     @GetMapping
     public AjaxResult profile()
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        CompanyUser user = loginUser.getCompanyUser();
-        AjaxResult ajax = AjaxResult.success(user);
-        ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
-        ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
-        return ajax;
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        CompanyUser user = loginUser.getCompanyUser();
+//        AjaxResult ajax = AjaxResult.success(user);
+//        ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
+//        ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
+//        return ajax;
+        throw new RuntimeException("Not implemented");
     }
 
 
@@ -69,25 +68,26 @@ public class CompanyProfileController extends BaseController
     @PutMapping
     public AjaxResult updateProfile(@RequestBody CompanyUserEditParam param)
     {
-        CompanyUser user=new CompanyUser();
-        BeanUtils.copyProperties(param,user);
-
-        if (userService.updateUserProfile(user) > 0)
-        {
-            //修改im用户信息
-            if (ImTypeConfig.IMTYPE== ImTypeEnum.OPENIM){
-                openIMService.updateUserInfo(user);
-            }
-            com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-            // 更新缓存用户信息
-            loginUser.getCompanyUser().setNickName(user.getNickName());
-            loginUser.getCompanyUser().setPhonenumber(user.getPhonenumber());
-            loginUser.getCompanyUser().setEmail(user.getEmail());
-            loginUser.getCompanyUser().setSex(user.getSex());
-            tokenService.setLoginUser(loginUser);
-            return AjaxResult.success();
-        }
-        return AjaxResult.error("修改个人信息异常，请联系管理员");
+//        CompanyUser user=new CompanyUser();
+//        BeanUtils.copyProperties(param,user);
+//
+//        if (userService.updateUserProfile(user) > 0)
+//        {
+//            //修改im用户信息
+//            if (ImTypeConfig.IMTYPE== ImTypeEnum.OPENIM){
+//                openIMService.updateUserInfo(user);
+//            }
+//            com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//            // 更新缓存用户信息
+//            loginUser.getCompanyUser().setNickName(user.getNickName());
+//            loginUser.getCompanyUser().setPhonenumber(user.getPhonenumber());
+//            loginUser.getCompanyUser().setEmail(user.getEmail());
+//            loginUser.getCompanyUser().setSex(user.getSex());
+//            tokenService.setLoginUser(loginUser);
+//            return AjaxResult.success();
+//        }
+//        return AjaxResult.error("修改个人信息异常，请联系管理员");
+        throw new RuntimeException("Not implemented");
     }
 
     /**
@@ -97,40 +97,41 @@ public class CompanyProfileController extends BaseController
     @PutMapping("/updatePwd")
     public AjaxResult updatePwd(String oldPassword, String newPassword)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        String userName = loginUser.getUsername();
-        String password = loginUser.getPassword();
-        if (!SecurityUtils.matchesPassword(oldPassword, password))
-        {
-            return AjaxResult.error("修改密码失败，旧密码错误");
-        }
-
-        if (!PatternUtils.checkPassword(newPassword)) {
-            return AjaxResult.error("新密码格式不正确,需包含字母、数字和特殊字符,长度为 8-20 位");
-        }
-
-        if (SecurityUtils.matchesPassword(newPassword, password))
-        {
-            return AjaxResult.error("新密码不能与旧密码相同");
-        }
-        if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0)
-        {
-            // 更新缓存用户密码
-            loginUser.getCompanyUser().setPassword(SecurityUtils.encryptPassword(newPassword));
-            tokenService.setLoginUser(loginUser);
-            cleanFirstLogin(loginUser);
-            return AjaxResult.success();
-        }
-        return AjaxResult.error("修改密码异常，请联系管理员");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        String userName = loginUser.getUsername();
+//        String password = loginUser.getPassword();
+//        if (!SecurityUtils.matchesPassword(oldPassword, password))
+//        {
+//            return AjaxResult.error("修改密码失败，旧密码错误");
+//        }
+//
+//        if (!PatternUtils.checkPassword(newPassword)) {
+//            return AjaxResult.error("新密码格式不正确,需包含字母、数字和特殊字符,长度为 8-20 位");
+//        }
+//
+//        if (SecurityUtils.matchesPassword(newPassword, password))
+//        {
+//            return AjaxResult.error("新密码不能与旧密码相同");
+//        }
+//        if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0)
+//        {
+//            // 更新缓存用户密码
+//            loginUser.getCompanyUser().setPassword(SecurityUtils.encryptPassword(newPassword));
+//            tokenService.setLoginUser(loginUser);
+//            cleanFirstLogin(loginUser);
+//            return AjaxResult.success();
+//        }
+//        return AjaxResult.error("修改密码异常，请联系管理员");
+        throw new RuntimeException("Not implemented");
     }
 
-    /**
-     * 去除首次登录的标志
-     * @param loginUser
-     */
-    private void cleanFirstLogin(LoginUser loginUser) {
-        redisCache.deleteObject("newCompanyUser:" + loginUser.getCompanyUser().getCompanyId() + ":" + loginUser.getCompanyUser().getUserName());
-    }
+//    /**
+//     * 去除首次登录的标志
+//     * @param loginUser
+//     */
+//    private void cleanFirstLogin(LoginUser loginUser) {
+//        redisCache.deleteObject("newCompanyUser:" + loginUser.getCompanyUser().getCompanyId() + ":" + loginUser.getCompanyUser().getUserName());
+//    }
 
     /**
      * 头像上传
@@ -139,20 +140,21 @@ public class CompanyProfileController extends BaseController
     @PostMapping("/avatar")
     public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws IOException
     {
-        if (!file.isEmpty())
-        {
-            com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-            String avatar = FileUploadUtils.upload(FSConfig.getAvatarPath(), file);
-            if (userService.updateUserAvatar(loginUser.getUsername(), avatar)>0)
-            {
-                AjaxResult ajax = AjaxResult.success();
-                ajax.put("imgUrl", avatar);
-                // 更新缓存用户头像
-                loginUser.getCompanyUser().setAvatar(avatar);
-                tokenService.setLoginUser(loginUser);
-                return ajax;
-            }
-        }
-        return AjaxResult.error("上传图片异常，请联系管理员");
+//        if (!file.isEmpty())
+//        {
+//            com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//            String avatar = FileUploadUtils.upload(FSConfig.getAvatarPath(), file);
+//            if (userService.updateUserAvatar(loginUser.getUsername(), avatar)>0)
+//            {
+//                AjaxResult ajax = AjaxResult.success();
+//                ajax.put("imgUrl", avatar);
+//                // 更新缓存用户头像
+//                loginUser.getCompanyUser().setAvatar(avatar);
+//                tokenService.setLoginUser(loginUser);
+//                return ajax;
+//            }
+//        }
+//        return AjaxResult.error("上传图片异常，请联系管理员");
+        throw new RuntimeException("Not implemented");
     }
 }

fs-agent/src/main/java/com/fs/company/controller/company/CompanyProfitController.java

@@ -19,8 +19,7 @@ import com.fs.company.service.ICompanyProfitLogsService;
 import com.fs.company.service.ICompanyProfitService;
 import com.fs.company.service.ICompanyService;
 import com.fs.company.vo.CompanyProfitVO;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
@@ -59,11 +58,12 @@ public class CompanyProfitController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(CompanyProfit companyProfit)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyProfit.getCompanyId() == null && loginUser.getCompany() != null) { companyProfit.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<CompanyProfitVO> list = companyProfitService.selectCompanyProfitListVO(companyProfit);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyProfit.getCompanyId() == null && loginUser.getCompany() != null) { companyProfit.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<CompanyProfitVO> list = companyProfitService.selectCompanyProfitListVO(companyProfit);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -74,11 +74,12 @@ public class CompanyProfitController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(CompanyProfit companyProfit)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyProfit.getCompanyId() == null && loginUser.getCompany() != null) { companyProfit.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        List<CompanyProfitVO> list = companyProfitService.selectCompanyProfitListVO(companyProfit);
-        ExcelUtil<CompanyProfitVO> util = new ExcelUtil<CompanyProfitVO>(CompanyProfitVO.class);
-        return util.exportExcel(list, "companyProfit");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyProfit.getCompanyId() == null && loginUser.getCompany() != null) { companyProfit.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        List<CompanyProfitVO> list = companyProfitService.selectCompanyProfitListVO(companyProfit);
+//        ExcelUtil<CompanyProfitVO> util = new ExcelUtil<CompanyProfitVO>(CompanyProfitVO.class);
+//        return util.exportExcel(list, "companyProfit");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -130,40 +131,41 @@ public class CompanyProfitController extends BaseController
     @RepeatSubmit
     public R profit(@RequestBody CompanyProfit companyProfit)
     {
-        if(companyProfit.getMoney().compareTo(new BigDecimal(0))<1){
-            return R.error("提现金额应大于0");
-        }
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Company company=companyService.selectCompanyByIdForUpdate(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        if(companyProfit.getMoney().compareTo(company.getMoney())==1){
-            return R.error("提现金额应小于等于帐户余额");
-        }
-        company.setMoney(company.getMoney().subtract(companyProfit.getMoney()));
-        CompanyProfit profit=new CompanyProfit();
-        BeanUtil.copyProperties(companyProfit,profit);
-        profit.setCompanyId(company.getCompanyId());
-        profit.setProfitStatus(1);
-        profit.setBalances(company.getMoney());
-        profit.setCreateTime(new Date());
-        companyProfitService.insertCompanyProfit(profit);
-        companyService.updateCompany(company);
-
-        CompanyMoneyLogs logs=new CompanyMoneyLogs();
-        logs.setCompanyId(company.getCompanyId());
-        logs.setMoney(companyProfit.getMoney().multiply(new BigDecimal(-1)));
-        logs.setLogsType(7);
-        logs.setBalance(company.getMoney());
-        logs.setRemark("提现:"+companyProfit.getMoney());
-        logs.setCreateTime(new Date());
-        logs.setBusinessId(profit.getProfitId().toString());
-        moneyLogsService.insertCompanyMoneyLogs(logs);
-        CompanyProfitLogs profitLogs=new CompanyProfitLogs();
-        profitLogs.setProfitId(profit.getProfitId());
-        profitLogs.setReason("申请提现");
-        profitLogs.setCreateTime(new Date());
-        profitLogs.setTitle("用户申请提现");
-        logsService.insertCompanyProfitLogs(profitLogs);
-        return R.ok("提交成功,等待后台审核");
+//        if(companyProfit.getMoney().compareTo(new BigDecimal(0))<1){
+//            return R.error("提现金额应大于0");
+//        }
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Company company=companyService.selectCompanyByIdForUpdate(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        if(companyProfit.getMoney().compareTo(company.getMoney())==1){
+//            return R.error("提现金额应小于等于帐户余额");
+//        }
+//        company.setMoney(company.getMoney().subtract(companyProfit.getMoney()));
+//        CompanyProfit profit=new CompanyProfit();
+//        BeanUtil.copyProperties(companyProfit,profit);
+//        profit.setCompanyId(company.getCompanyId());
+//        profit.setProfitStatus(1);
+//        profit.setBalances(company.getMoney());
+//        profit.setCreateTime(new Date());
+//        companyProfitService.insertCompanyProfit(profit);
+//        companyService.updateCompany(company);
+//
+//        CompanyMoneyLogs logs=new CompanyMoneyLogs();
+//        logs.setCompanyId(company.getCompanyId());
+//        logs.setMoney(companyProfit.getMoney().multiply(new BigDecimal(-1)));
+//        logs.setLogsType(7);
+//        logs.setBalance(company.getMoney());
+//        logs.setRemark("提现:"+companyProfit.getMoney());
+//        logs.setCreateTime(new Date());
+//        logs.setBusinessId(profit.getProfitId().toString());
+//        moneyLogsService.insertCompanyMoneyLogs(logs);
+//        CompanyProfitLogs profitLogs=new CompanyProfitLogs();
+//        profitLogs.setProfitId(profit.getProfitId());
+//        profitLogs.setReason("申请提现");
+//        profitLogs.setCreateTime(new Date());
+//        profitLogs.setTitle("用户申请提现");
+//        logsService.insertCompanyProfitLogs(profitLogs);
+//        return R.ok("提交成功,等待后台审核");
+        throw new RuntimeException("not implemented");
     }
     @PreAuthorize("@ss.hasPermi('company:companyProfit:cancel')")
     @PostMapping("/cancel")
@@ -171,31 +173,32 @@ public class CompanyProfitController extends BaseController
     @RepeatSubmit
     public R cancel(@RequestBody CompanyProfit companyProfit)
     {
-        CompanyProfit profit=companyProfitService.selectCompanyProfitById(companyProfit.getProfitId());
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Company company=companyService.selectCompanyByIdForUpdate(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        if(profit.getProfitStatus()!=1){
-            return R.error("非法操作");
-        }
-        profit.setProfitStatus(0);
-        companyProfitService.updateCompanyProfit(profit);
-        company.setMoney(company.getMoney().add(profit.getMoney()));
-        companyService.updateCompany(company);
-        CompanyMoneyLogs logs=new CompanyMoneyLogs();
-        logs.setCompanyId(company.getCompanyId());
-        logs.setMoney(profit.getMoney());
-        logs.setLogsType(9);
-        logs.setBalance(company.getMoney());
-        logs.setRemark("取消提现:"+profit.getMoney());
-        logs.setCreateTime(new Date());
-        logs.setBusinessId(profit.getProfitId().toString());
-        moneyLogsService.insertCompanyMoneyLogs(logs);
-        CompanyProfitLogs profitLogs=new CompanyProfitLogs();
-        profitLogs.setProfitId(profit.getProfitId());
-        profitLogs.setReason("取消提现");
-        profitLogs.setCreateTime(new Date());
-        profitLogs.setTitle("用户取消提现");
-        logsService.insertCompanyProfitLogs(profitLogs);
-        return R.ok("提交成功,等待后台审核");
+//        CompanyProfit profit=companyProfitService.selectCompanyProfitById(companyProfit.getProfitId());
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Company company=companyService.selectCompanyByIdForUpdate(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        if(profit.getProfitStatus()!=1){
+//            return R.error("非法操作");
+//        }
+//        profit.setProfitStatus(0);
+//        companyProfitService.updateCompanyProfit(profit);
+//        company.setMoney(company.getMoney().add(profit.getMoney()));
+//        companyService.updateCompany(company);
+//        CompanyMoneyLogs logs=new CompanyMoneyLogs();
+//        logs.setCompanyId(company.getCompanyId());
+//        logs.setMoney(profit.getMoney());
+//        logs.setLogsType(9);
+//        logs.setBalance(company.getMoney());
+//        logs.setRemark("取消提现:"+profit.getMoney());
+//        logs.setCreateTime(new Date());
+//        logs.setBusinessId(profit.getProfitId().toString());
+//        moneyLogsService.insertCompanyMoneyLogs(logs);
+//        CompanyProfitLogs profitLogs=new CompanyProfitLogs();
+//        profitLogs.setProfitId(profit.getProfitId());
+//        profitLogs.setReason("取消提现");
+//        profitLogs.setCreateTime(new Date());
+//        profitLogs.setTitle("用户取消提现");
+//        logsService.insertCompanyProfitLogs(profitLogs);
+//        return R.ok("提交成功,等待后台审核");
+        throw new RuntimeException("not implemented");
     }
 }

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

@@ -19,8 +19,7 @@ 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;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
@@ -55,12 +54,13 @@ public class CompanyRechargeController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(CompanyRecharge companyRecharge)
     {
-        startPage();
-        companyRecharge.setStatus(1);
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyRecharge.getCompanyId() == null && loginUser.getCompany() != null) { companyRecharge.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<CompanyRechargeVO> list = companyRechargeService.selectCompanyRechargeVOList(companyRecharge);
-        return getDataTable(list);
+//        startPage();
+//        companyRecharge.setStatus(1);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyRecharge.getCompanyId() == null && loginUser.getCompany() != null) { companyRecharge.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<CompanyRechargeVO> list = companyRechargeService.selectCompanyRechargeVOList(companyRecharge);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -71,11 +71,12 @@ public class CompanyRechargeController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(CompanyRecharge companyRecharge)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyRecharge.getCompanyId() == null && loginUser.getCompany() != null) { companyRecharge.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        List<CompanyRecharge> list = companyRechargeService.selectCompanyRechargeList(companyRecharge);
-        ExcelUtil<CompanyRecharge> util = new ExcelUtil<CompanyRecharge>(CompanyRecharge.class);
-        return util.exportExcel(list, "companyRecharge");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyRecharge.getCompanyId() == null && loginUser.getCompany() != null) { companyRecharge.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        List<CompanyRecharge> list = companyRechargeService.selectCompanyRechargeList(companyRecharge);
+//        ExcelUtil<CompanyRecharge> util = new ExcelUtil<CompanyRecharge>(CompanyRecharge.class);
+//        return util.exportExcel(list, "companyRecharge");
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -85,18 +86,19 @@ public class CompanyRechargeController extends BaseController
      */
     @PostMapping("/wxRecharge")
     public AjaxResult recharge(@RequestBody RechargeDTO dto){
-        CompanyRechargeOrder companyRechargeOrder;
-        try {
-            com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-
-            if (dto.getCompanyId() == null && loginUser.getCompany() != null) { dto.setCompanyId(loginUser.getCompany().getCompanyId()); };
-            dto.setUserId(loginUser.getCompanyUser().getUserId());
-            companyRechargeOrder = companyRechargeService.recharge(dto);
-        }catch (Exception e) {
-            logger.error("给公司充值失败",e);
-            return AjaxResult.error(e.getMessage());
-        }
-        return AjaxResult.success(companyRechargeOrder);
+//        CompanyRechargeOrder companyRechargeOrder;
+//        try {
+//            com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//
+//            if (dto.getCompanyId() == null && loginUser.getCompany() != null) { dto.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//            dto.setUserId(loginUser.getCompanyUser().getUserId());
+//            companyRechargeOrder = companyRechargeService.recharge(dto);
+//        }catch (Exception e) {
+//            logger.error("给公司充值失败",e);
+//            return AjaxResult.error(e.getMessage());
+//        }
+//        return AjaxResult.success(companyRechargeOrder);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -120,25 +122,26 @@ public class CompanyRechargeController extends BaseController
     @RepeatSubmit
     public R add(@RequestBody CompanyRecharge companyRecharge)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyRecharge.getCompanyId() == null && loginUser.getCompany() != null) { companyRecharge.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        companyRecharge.setRechargeNo(OrderUtils.getOrderNo());
-        companyRecharge.setCreateTime(new Date());
-        companyRecharge.setStatus(0);
-        if(companyRecharge.getMoney().compareTo(new BigDecimal(0))<1){
-            return R.error("充值金额必须大于0");
-        }
-        else
-        {
-            Company company=companyService.selectCompanyById(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-            companyRecharge.setBalance(company.getMoney());
-            if(companyRechargeService.insertCompanyRecharge(companyRecharge)>0){
-                return R.ok().put("rechargeNo",companyRecharge.getRechargeNo());
-            }
-            else {
-                return R.error("操作失败");
-            }
-        }
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyRecharge.getCompanyId() == null && loginUser.getCompany() != null) { companyRecharge.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        companyRecharge.setRechargeNo(OrderUtils.getOrderNo());
+//        companyRecharge.setCreateTime(new Date());
+//        companyRecharge.setStatus(0);
+//        if(companyRecharge.getMoney().compareTo(new BigDecimal(0))<1){
+//            return R.error("充值金额必须大于0");
+//        }
+//        else
+//        {
+//            Company company=companyService.selectCompanyById(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//            companyRecharge.setBalance(company.getMoney());
+//            if(companyRechargeService.insertCompanyRecharge(companyRecharge)>0){
+//                return R.ok().put("rechargeNo",companyRecharge.getRechargeNo());
+//            }
+//            else {
+//                return R.error("操作失败");
+//            }
+//        }
+        throw new RuntimeException("not implemented");
     }
     @PreAuthorize("@ss.hasPermi('company:companyRecharge:recharge')")
     @Log(title = "添加充值记录", businessType = BusinessType.INSERT)
@@ -147,20 +150,21 @@ public class CompanyRechargeController extends BaseController
     @RepeatSubmit
     public R recharge(@RequestBody CompanyRechargeParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        CompanyRecharge recharge=new CompanyRecharge();
-        String orderSn = IdUtil.getSnowflake(0, 0).nextIdStr();
-        recharge.setRechargeNo(orderSn);
-        if (recharge.getCompanyId() == null && loginUser.getCompany() != null) { recharge.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        recharge.setMoney(param.getMoney());
-        recharge.setCreateUserId(loginUser.getCompanyUser().getUserId());
-        recharge.setIsAudit(0);
-        recharge.setStatus(1);
-        recharge.setRemark(param.getRemark());
-        recharge.setPayType(3);
-        recharge.setImgs(param.getImgs());
-        companyRechargeService.insertCompanyRecharge(recharge);
-        return R.ok("提交成功,等待审核");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        CompanyRecharge recharge=new CompanyRecharge();
+//        String orderSn = IdUtil.getSnowflake(0, 0).nextIdStr();
+//        recharge.setRechargeNo(orderSn);
+//        if (recharge.getCompanyId() == null && loginUser.getCompany() != null) { recharge.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        recharge.setMoney(param.getMoney());
+//        recharge.setCreateUserId(loginUser.getCompanyUser().getUserId());
+//        recharge.setIsAudit(0);
+//        recharge.setStatus(1);
+//        recharge.setRemark(param.getRemark());
+//        recharge.setPayType(3);
+//        recharge.setImgs(param.getImgs());
+//        companyRechargeService.insertCompanyRecharge(recharge);
+//        return R.ok("提交成功,等待审核");
+        throw new RuntimeException("not implemented");
 
     }
 

fs-agent/src/main/java/com/fs/company/controller/company/CompanyRedPacketBalanceLogsController.java

@@ -18,8 +18,7 @@ import com.fs.company.service.ICompanyRechargeService;
 import com.fs.company.service.ICompanyRedPacketBalanceLogsService;
 import com.fs.company.service.impl.CompanyServiceImpl;
 import com.fs.core.utils.OrderCodeUtils;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
@@ -49,11 +48,12 @@ public class CompanyRedPacketBalanceLogsController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(CompanyRedPacketBalanceLogs companyRedPacketBalanceLogs)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyRedPacketBalanceLogs.getCompanyId() == null && loginUser.getCompany() != null) { companyRedPacketBalanceLogs.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<CompanyRedPacketBalanceLogs> list = companyRedPacketBalanceLogsService.selectCompanyRedPacketBalanceLogsList(companyRedPacketBalanceLogs);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyRedPacketBalanceLogs.getCompanyId() == null && loginUser.getCompany() != null) { companyRedPacketBalanceLogs.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<CompanyRedPacketBalanceLogs> list = companyRedPacketBalanceLogsService.selectCompanyRedPacketBalanceLogsList(companyRedPacketBalanceLogs);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -64,11 +64,12 @@ public class CompanyRedPacketBalanceLogsController extends BaseController {
     @GetMapping("/export")
     public AjaxResult export(CompanyRedPacketBalanceLogs companyRedPacketBalanceLogs)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyRedPacketBalanceLogs.getCompanyId() == null && loginUser.getCompany() != null) { companyRedPacketBalanceLogs.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        List<CompanyRedPacketBalanceLogs> list = companyRedPacketBalanceLogsService.selectCompanyRedPacketBalanceLogsList(companyRedPacketBalanceLogs);
-        ExcelUtil<CompanyRedPacketBalanceLogs> util = new ExcelUtil<CompanyRedPacketBalanceLogs>(CompanyRedPacketBalanceLogs.class);
-        return util.exportExcel(list, "企业红包余额记录数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyRedPacketBalanceLogs.getCompanyId() == null && loginUser.getCompany() != null) { companyRedPacketBalanceLogs.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        List<CompanyRedPacketBalanceLogs> list = companyRedPacketBalanceLogsService.selectCompanyRedPacketBalanceLogsList(companyRedPacketBalanceLogs);
+//        ExcelUtil<CompanyRedPacketBalanceLogs> util = new ExcelUtil<CompanyRedPacketBalanceLogs>(CompanyRedPacketBalanceLogs.class);
+//        return util.exportExcel(list, "企业红包余额记录数据");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -76,9 +77,10 @@ public class CompanyRedPacketBalanceLogsController extends BaseController {
      */
     @GetMapping("/redBalance")
     public R getCompanyRedPacketBalance(){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Company  company=companyService.selectCompanyById(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        return R.ok().put("data",company);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Company  company=companyService.selectCompanyById(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        return R.ok().put("data",company);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -95,24 +97,25 @@ public class CompanyRedPacketBalanceLogsController extends BaseController {
     @RepeatSubmit
     public R redRecharge(@RequestBody CompanyRechargeParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        CompanyRecharge redRecharge=new CompanyRecharge();
-        String orderSn =  OrderCodeUtils.getOrderSn();
-        if(StringUtils.isEmpty(orderSn)){
-            return R.error("订单生成失败，请重试");
-        }
-        redRecharge.setRechargeNo(orderSn);
-        redRecharge.setCompanyId(param.getCompanyId());
-        redRecharge.setMoney(param.getMoney());
-        redRecharge.setCreateUserId(loginUser.getCompanyUser().getUserId());
-        redRecharge.setIsAudit(0);
-        redRecharge.setStatus(1);
-        redRecharge.setRemark(param.getRemark());
-        redRecharge.setPayType(3);
-        redRecharge.setBusinessType(1);// 红包充值
-        redRecharge.setImgs(param.getImgs());// 红包充值
-        rechargeService.insertCompanyRecharge(redRecharge);
-        return R.ok("提交成功,等待审核");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        CompanyRecharge redRecharge=new CompanyRecharge();
+//        String orderSn =  OrderCodeUtils.getOrderSn();
+//        if(StringUtils.isEmpty(orderSn)){
+//            return R.error("订单生成失败，请重试");
+//        }
+//        redRecharge.setRechargeNo(orderSn);
+//        redRecharge.setCompanyId(param.getCompanyId());
+//        redRecharge.setMoney(param.getMoney());
+//        redRecharge.setCreateUserId(loginUser.getCompanyUser().getUserId());
+//        redRecharge.setIsAudit(0);
+//        redRecharge.setStatus(1);
+//        redRecharge.setRemark(param.getRemark());
+//        redRecharge.setPayType(3);
+//        redRecharge.setBusinessType(1);// 红包充值
+//        redRecharge.setImgs(param.getImgs());// 红包充值
+//        rechargeService.insertCompanyRecharge(redRecharge);
+//        return R.ok("提交成功,等待审核");
+        throw new RuntimeException("not implemented");
 
     }
 

fs-agent/src/main/java/com/fs/company/controller/company/CompanyRoleController.java

@@ -12,10 +12,7 @@ import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.company.domain.CompanyRole;
 import com.fs.company.service.ICompanyRoleService;
 import com.fs.company.service.ICompanyUserService;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.security.SecurityUtils;
-import com.fs.framework.service.CompanyPermissionService;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -41,9 +38,6 @@ public class CompanyRoleController extends BaseController
     @Autowired
     private TokenService tokenService;
 
-    @Autowired
-    private CompanyPermissionService permissionService;
-
     @Autowired
     private ICompanyUserService userService;
 
@@ -51,11 +45,12 @@ public class CompanyRoleController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(CompanyRole role)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (role.getCompanyId() == null && loginUser.getCompany() != null) { role.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        startPage();
-        List<CompanyRole> list = roleService.selectCompanyRoleList(role);
-        return getDataTable(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (role.getCompanyId() == null && loginUser.getCompany() != null) { role.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        startPage();
+//        List<CompanyRole> list = roleService.selectCompanyRoleList(role);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     @Log(title = "角色管理", businessType = BusinessType.EXPORT)
@@ -63,11 +58,12 @@ public class CompanyRoleController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(CompanyRole role)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (role.getCompanyId() == null && loginUser.getCompany() != null) { role.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        List<CompanyRole> list = roleService.selectCompanyRoleList(role);
-        ExcelUtil<CompanyRole> util = new ExcelUtil<CompanyRole>(CompanyRole.class);
-        return util.exportExcel(list, "角色数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (role.getCompanyId() == null && loginUser.getCompany() != null) { role.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        List<CompanyRole> list = roleService.selectCompanyRoleList(role);
+//        ExcelUtil<CompanyRole> util = new ExcelUtil<CompanyRole>(CompanyRole.class);
+//        return util.exportExcel(list, "角色数据");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -88,19 +84,20 @@ public class CompanyRoleController extends BaseController
     @PostMapping
     public AjaxResult add(@Validated @RequestBody CompanyRole role)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (role.getCompanyId() == null && loginUser.getCompany() != null) { role.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        role.setCreateTime(new Date());
-        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
-        {
-            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
-        }
-        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
-        {
-            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
-        }
-        role.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(roleService.insertRole(role));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (role.getCompanyId() == null && loginUser.getCompany() != null) { role.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        role.setCreateTime(new Date());
+//        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
+//        {
+//            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
+//        }
+//        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
+//        {
+//            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
+//        }
+//        role.setCreateBy(SecurityUtils.getUsername());
+//        return toAjax(roleService.insertRole(role));
+        throw new RuntimeException("not implemented");
 
     }
 
@@ -112,30 +109,31 @@ public class CompanyRoleController extends BaseController
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody CompanyRole role)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (role.getCompanyId() == null && loginUser.getCompany() != null) { role.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
-        {
-            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
-        }
-        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
-        {
-            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
-        }
-        role.setUpdateBy(SecurityUtils.getUsername());
-
-        if (roleService.updateRole(role) > 0)
-        {
-            // 更新缓存用户权限
-            if (StringUtils.isNotNull(loginUser.getCompanyUser()) && !loginUser.getCompanyUser().isAdmin())
-            {
-                loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getCompanyUser()));
-                loginUser.setCompanyUser(userService.selectUserByUserName(loginUser.getCompanyUser().getUserName()));
-                tokenService.setLoginUser(loginUser);
-            }
-            return AjaxResult.success();
-        }
-        return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (role.getCompanyId() == null && loginUser.getCompany() != null) { role.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
+//        {
+//            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
+//        }
+//        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
+//        {
+//            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
+//        }
+//        role.setUpdateBy(SecurityUtils.getUsername());
+//
+//        if (roleService.updateRole(role) > 0)
+//        {
+//            // 更新缓存用户权限
+//            if (StringUtils.isNotNull(loginUser.getCompanyUser()) && !loginUser.getCompanyUser().isAdmin())
+//            {
+//                loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getCompanyUser()));
+//                loginUser.setCompanyUser(userService.selectUserByUserName(loginUser.getCompanyUser().getUserName()));
+//                tokenService.setLoginUser(loginUser);
+//            }
+//            return AjaxResult.success();
+//        }
+//        return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -157,12 +155,13 @@ public class CompanyRoleController extends BaseController
     @PutMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody CompanyRole role)
     {
-        CompanyRole companyRole=roleService.selectCompanyRoleById(role.getRoleId());
-        if(companyRole.getRoleKey().equals("admin")){
-            return AjaxResult.error("管理员角色不能修改状态");
-        }
-        role.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(roleService.updateRoleStatus(role));
+//        CompanyRole companyRole=roleService.selectCompanyRoleById(role.getRoleId());
+//        if(companyRole.getRoleKey().equals("admin")){
+//            return AjaxResult.error("管理员角色不能修改状态");
+//        }
+//        role.setUpdateBy(SecurityUtils.getUsername());
+//        return toAjax(roleService.updateRoleStatus(role));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -184,10 +183,11 @@ public class CompanyRoleController extends BaseController
     @GetMapping("/optionselect")
     public AjaxResult optionselect()
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        CompanyRole role=new CompanyRole();
-        if (role.getCompanyId() == null && loginUser.getCompany() != null) { role.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        return AjaxResult.success(roleService.selectCompanyRoleList(role));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        CompanyRole role=new CompanyRole();
+//        if (role.getCompanyId() == null && loginUser.getCompany() != null) { role.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        return AjaxResult.success(roleService.selectCompanyRoleList(role));
+        throw new RuntimeException("not implemented");
     }
 
 

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

@@ -16,8 +16,7 @@ import com.fs.company.vo.CompanySmsListVO;
 import com.fs.crm.param.SmsSendBatchParam;
 import com.fs.crm.param.SmsSendParam;
 import com.fs.crm.param.SmsSendUserParam;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -119,52 +118,57 @@ public class CompanySmsController extends BaseController
     @RepeatSubmit
     @Transactional
     public R sendCustomerMsg(@Validated @RequestBody SmsSendParam param){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { if (param.getCompanyId() == null && loginUser.getCompany() != null) { if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }; }; };
-        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-        return smsService.sendSms(param);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { if (param.getCompanyId() == null && loginUser.getCompany() != null) { if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }; }; };
+//        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        return smsService.sendSms(param);
+        throw new RuntimeException("not implemented");
     }
 
     @PostMapping("/sendOrderMsg")
     @RepeatSubmit
     @Transactional
     public R sendOrderMsg(@Validated @RequestBody SmsSendUserParam param){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-        return smsService.sendOrderMsg(param);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        return smsService.sendOrderMsg(param);
+        throw new RuntimeException("not implemented");
     }
 
     @PostMapping("/sendPackageOrderMsg")
     @RepeatSubmit
     @Transactional
     public R sendPackageOrderMsg(@Validated @RequestBody SmsSendUserParam param){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-        return smsService.sendPackageOrderMsg(param);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        return smsService.sendPackageOrderMsg(param);
+        throw new RuntimeException("not implemented");
     }
 
     @ApiOperation("批量发送短信")
     @PostMapping("/sendCustomerBatchMsg")
     @RepeatSubmit
     public R sendCustomerBatchMsg(@Validated @RequestBody SmsSendBatchParam param){
-        if(param.getCustomerIds().length>500){
-            return R.error("批量短信一次最多500条");
-        }
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-        //return  R.ok();
-        return smsService.sendBatchSms(param);
+//        if(param.getCustomerIds().length>500){
+//            return R.error("批量短信一次最多500条");
+//        }
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        //return  R.ok();
+//        return smsService.sendBatchSms(param);
+        throw new RuntimeException("not implemented");
     }
 
 
     @GetMapping("/getCompanySmsCount")
     public R getCompanySmsCount( )
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        CompanySms companySms=companySmsService.selectCompanySmsByCompanyId(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        return R.ok().put("data",companySms);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        CompanySms companySms=companySmsService.selectCompanySmsByCompanyId(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        return R.ok().put("data",companySms);
+        throw new RuntimeException("not implemented");
     }
 }

fs-agent/src/main/java/com/fs/company/controller/company/CompanySmsLogsController.java

@@ -11,8 +11,7 @@ import com.fs.company.domain.CompanySmsLogs;
 import com.fs.company.param.CompanySmsLogsListQueryParam;
 import com.fs.company.service.ICompanySmsLogsService;
 import com.fs.company.vo.CompanySmsLogsListQueryVO;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -41,21 +40,22 @@ public class CompanySmsLogsController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(CompanySmsLogsListQueryParam param)
     {
-        startPage();
-
-
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<CompanySmsLogsListQueryVO> list = companySmsLogsService.selectCompanySmsLogsListQuery(param);
-        if (list != null) {
-            for (CompanySmsLogsListQueryVO vo : list) {
-                if(vo.getPhone()!=null){
-                    vo.setPhone(vo.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-                }
-
-            }
-        }
-        return getDataTable(list);
+//        startPage();
+//
+//
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<CompanySmsLogsListQueryVO> list = companySmsLogsService.selectCompanySmsLogsListQuery(param);
+//        if (list != null) {
+//            for (CompanySmsLogsListQueryVO vo : list) {
+//                if(vo.getPhone()!=null){
+//                    vo.setPhone(vo.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//                }
+//
+//            }
+//        }
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -66,19 +66,20 @@ public class CompanySmsLogsController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(CompanySmsLogsListQueryParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        List<CompanySmsLogsListQueryVO> list = companySmsLogsService.selectCompanySmsLogsListQuery(param);
-        if (list != null) {
-            for (CompanySmsLogsListQueryVO vo : list) {
-                if(vo.getPhone()!=null){
-                    vo.setPhone(vo.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-                }
-
-            }
-        }
-        ExcelUtil<CompanySmsLogsListQueryVO> util = new ExcelUtil<CompanySmsLogsListQueryVO>(CompanySmsLogsListQueryVO.class);
-        return util.exportExcel(list, "companySmsLogs");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        List<CompanySmsLogsListQueryVO> list = companySmsLogsService.selectCompanySmsLogsListQuery(param);
+//        if (list != null) {
+//            for (CompanySmsLogsListQueryVO vo : list) {
+//                if(vo.getPhone()!=null){
+//                    vo.setPhone(vo.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//                }
+//
+//            }
+//        }
+//        ExcelUtil<CompanySmsLogsListQueryVO> util = new ExcelUtil<CompanySmsLogsListQueryVO>(CompanySmsLogsListQueryVO.class);
+//        return util.exportExcel(list, "companySmsLogs");
+        throw new RuntimeException("not implemented");
     }
 
     /**

fs-agent/src/main/java/com/fs/company/controller/company/CompanySmsOrderController.java

@@ -11,8 +11,7 @@ import com.fs.company.domain.CompanySmsOrder;
 import com.fs.company.param.CompanySmsOrderListParam;
 import com.fs.company.service.ICompanySmsOrderService;
 import com.fs.company.vo.CompanySmsOrderListVO;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -42,11 +41,12 @@ public class CompanySmsOrderController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(CompanySmsOrderListParam companySmsOrder)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companySmsOrder.getCompanyId() == null && loginUser.getCompany() != null) { companySmsOrder.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<CompanySmsOrderListVO> list = companySmsOrderService.selectCompanySmsOrderList(companySmsOrder);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companySmsOrder.getCompanyId() == null && loginUser.getCompany() != null) { companySmsOrder.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<CompanySmsOrderListVO> list = companySmsOrderService.selectCompanySmsOrderList(companySmsOrder);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -57,11 +57,12 @@ public class CompanySmsOrderController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(CompanySmsOrderListParam companySmsOrder)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companySmsOrder.getCompanyId() == null && loginUser.getCompany() != null) { companySmsOrder.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        List<CompanySmsOrderListVO> list = companySmsOrderService.selectCompanySmsOrderList(companySmsOrder);
-        ExcelUtil<CompanySmsOrderListVO> util = new ExcelUtil<CompanySmsOrderListVO>(CompanySmsOrderListVO.class);
-        return util.exportExcel(list, "companySmsOrder");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companySmsOrder.getCompanyId() == null && loginUser.getCompany() != null) { companySmsOrder.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        List<CompanySmsOrderListVO> list = companySmsOrderService.selectCompanySmsOrderList(companySmsOrder);
+//        ExcelUtil<CompanySmsOrderListVO> util = new ExcelUtil<CompanySmsOrderListVO>(CompanySmsOrderListVO.class);
+//        return util.exportExcel(list, "companySmsOrder");
+        throw new RuntimeException("not implemented");
     }
 
     /**

fs-agent/src/main/java/com/fs/company/controller/company/CompanySmsPackageController.java

@@ -7,8 +7,7 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.company.domain.CompanySmsPackage;
 import com.fs.company.param.CompanySmsPackageBuyParam;
 import com.fs.company.service.ICompanySmsPackageService;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -58,10 +57,11 @@ public class CompanySmsPackageController extends BaseController
     @PostMapping("/buySmsPackage")
     public R buySmsPackage(@RequestBody CompanySmsPackageBuyParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        param.setCreateBy(loginUser.getCompanyUser().getNickName());
-        return companySmsPackageService.buySmsPackage(param);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        param.setCreateBy(loginUser.getCompanyUser().getNickName());
+//        return companySmsPackageService.buySmsPackage(param);
+        throw new RuntimeException("not implemented");
 
     }
 

fs-agent/src/main/java/com/fs/company/controller/company/CompanySmsTempController.java

@@ -12,8 +12,7 @@ import com.fs.company.domain.CompanySmsTemp;
 import com.fs.company.param.CompanySmsTempListQueryParam;
 import com.fs.company.service.ICompanySmsTempService;
 import com.fs.company.vo.CompanySmsTempListQueryVO;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -43,11 +42,12 @@ public class CompanySmsTempController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(CompanySmsTempListQueryParam companySmsTemp)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companySmsTemp.getCompanyId() == null && loginUser.getCompany() != null) { if (companySmsTemp.getCompanyId() == null && loginUser.getCompany() != null) { companySmsTemp.setCompanyId(loginUser.getCompany().getCompanyId()); }; };
-        List<CompanySmsTempListQueryVO> list = companySmsTempService.selectCompanySmsTempListQuery(companySmsTemp);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companySmsTemp.getCompanyId() == null && loginUser.getCompany() != null) { if (companySmsTemp.getCompanyId() == null && loginUser.getCompany() != null) { companySmsTemp.setCompanyId(loginUser.getCompany().getCompanyId()); }; };
+//        List<CompanySmsTempListQueryVO> list = companySmsTempService.selectCompanySmsTempListQuery(companySmsTemp);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -58,11 +58,12 @@ public class CompanySmsTempController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(CompanySmsTempListQueryParam companySmsTemp)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companySmsTemp.getCompanyId() == null && loginUser.getCompany() != null) { companySmsTemp.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        List<CompanySmsTempListQueryVO> list = companySmsTempService.selectCompanySmsTempListQuery(companySmsTemp);
-        ExcelUtil<CompanySmsTempListQueryVO> util = new ExcelUtil<CompanySmsTempListQueryVO>(CompanySmsTempListQueryVO.class);
-        return util.exportExcel(list, "companySmsTemp");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companySmsTemp.getCompanyId() == null && loginUser.getCompany() != null) { companySmsTemp.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        List<CompanySmsTempListQueryVO> list = companySmsTempService.selectCompanySmsTempListQuery(companySmsTemp);
+//        ExcelUtil<CompanySmsTempListQueryVO> util = new ExcelUtil<CompanySmsTempListQueryVO>(CompanySmsTempListQueryVO.class);
+//        return util.exportExcel(list, "companySmsTemp");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -83,11 +84,12 @@ public class CompanySmsTempController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CompanySmsTemp companySmsTemp)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        companySmsTemp.setStatus(0);
-        companySmsTemp.setIsAudit(0);
-        if (companySmsTemp.getCompanyId() == null && loginUser.getCompany() != null) { companySmsTemp.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        return toAjax(companySmsTempService.insertCompanySmsTemp(companySmsTemp));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        companySmsTemp.setStatus(0);
+//        companySmsTemp.setIsAudit(0);
+//        if (companySmsTemp.getCompanyId() == null && loginUser.getCompany() != null) { companySmsTemp.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        return toAjax(companySmsTempService.insertCompanySmsTemp(companySmsTemp));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -116,12 +118,13 @@ public class CompanySmsTempController extends BaseController
     @GetMapping("/getSmsTempList")
     public R getSmsTempList()
     {
-        CompanySmsTempListQueryParam maps=new CompanySmsTempListQueryParam();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (maps.getCompanyId() == null && loginUser.getCompany() != null) { maps.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        maps.setStatus(1);
-        maps.setIsAudit(1);
-        List<CompanySmsTempListQueryVO> list = companySmsTempService.selectCompanySmsTempListQuery(maps);
-        return R.ok().put("data",list);
+//        CompanySmsTempListQueryParam maps=new CompanySmsTempListQueryParam();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (maps.getCompanyId() == null && loginUser.getCompany() != null) { maps.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        maps.setStatus(1);
+//        maps.setIsAudit(1);
+//        List<CompanySmsTempListQueryVO> list = companySmsTempService.selectCompanySmsTempListQuery(maps);
+//        return R.ok().put("data",list);
+        throw new RuntimeException("not implemented");
     }
 }

fs-agent/src/main/java/com/fs/company/controller/company/CompanyStatisticsController.java

@@ -15,8 +15,7 @@ import com.fs.company.service.ICompanyUserService;
 import com.fs.company.service.ICompanyVoiceLogsService;
 import com.fs.company.vo.CompanySmsLogsStatisticsVO;
 import com.fs.company.vo.CompanyVoiceLogsStatisticsVO;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -139,52 +138,54 @@ public class CompanyStatisticsController extends BaseController
     @GetMapping("/myVoiceLogs")
     public R myVoiceLogs(CompanyStatisticsParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setUsers(new Long[]{loginUser.getCompanyUser().getUserId()});
-        if(param.getUsers()!=null&&param.getUsers().length>0){
-            List<CompanyVoiceLogsStatisticsVO> list= voiceLogsService.selectVoiceLogsStatisticsList(param);
-            if(list!=null){
-                for(CompanyVoiceLogsStatisticsVO vo:list){
-                    double f1 = new BigDecimal((float)vo.getCallSuccessCount()/vo.getCallCount()).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()*100;
-                    vo.setCallRate(f1);
-                }
-            }
-            TimeUtils.TimeEntity timeEntity= TimeUtils.parseTime(param.getType().toString(),param.getStartTime(),param.getEndTime());
-            timeEntity.setUserIds(param.getUsers());
-            Integer cycleNum = timeEntity.getCycleNum();
-            Integer beginTime = timeEntity.getBeginTime();
-            List<Integer> timeList = new ArrayList<>();
-            for (int i = 1; i <= cycleNum; i++) {
-                timeList.add(beginTime);
-                beginTime = TimeUtils.formatTime(beginTime);
-            }
-            List<JSONObject> jsonObjectList = voiceLogsService.selectVoiceLogsTotalCount(timeEntity.toMap());
-            List<String> dates = jsonObjectList.stream().map(jsonObject -> jsonObject.getString("type")).collect(Collectors.toList());
-            List<Integer> callCount = jsonObjectList.stream().map(jsonObject -> jsonObject.getInteger("callCount")).collect(Collectors.toList());
-            List<Integer> callSuccessCount = jsonObjectList.stream().map(jsonObject -> jsonObject.getInteger("callSuccessCount")).collect(Collectors.toList());
-            List<Integer> times = jsonObjectList.stream().map(jsonObject -> jsonObject.getInteger("times")).collect(Collectors.toList());
-            List<Integer> billingTime = jsonObjectList.stream().map(jsonObject -> jsonObject.getInteger("billingTime")).collect(Collectors.toList());
-            return R.ok().put("list",list).put("dates",dates).put("callCount",callCount).put("callSuccessCount",callSuccessCount).put("times",times).put("billingTime",billingTime);
-        }
-        else {
-            return R.ok("未查找到数据");
-        }
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setUsers(new Long[]{loginUser.getCompanyUser().getUserId()});
+//        if(param.getUsers()!=null&&param.getUsers().length>0){
+//            List<CompanyVoiceLogsStatisticsVO> list= voiceLogsService.selectVoiceLogsStatisticsList(param);
+//            if(list!=null){
+//                for(CompanyVoiceLogsStatisticsVO vo:list){
+//                    double f1 = new BigDecimal((float)vo.getCallSuccessCount()/vo.getCallCount()).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()*100;
+//                    vo.setCallRate(f1);
+//                }
+//            }
+//            TimeUtils.TimeEntity timeEntity= TimeUtils.parseTime(param.getType().toString(),param.getStartTime(),param.getEndTime());
+//            timeEntity.setUserIds(param.getUsers());
+//            Integer cycleNum = timeEntity.getCycleNum();
+//            Integer beginTime = timeEntity.getBeginTime();
+//            List<Integer> timeList = new ArrayList<>();
+//            for (int i = 1; i <= cycleNum; i++) {
+//                timeList.add(beginTime);
+//                beginTime = TimeUtils.formatTime(beginTime);
+//            }
+//            List<JSONObject> jsonObjectList = voiceLogsService.selectVoiceLogsTotalCount(timeEntity.toMap());
+//            List<String> dates = jsonObjectList.stream().map(jsonObject -> jsonObject.getString("type")).collect(Collectors.toList());
+//            List<Integer> callCount = jsonObjectList.stream().map(jsonObject -> jsonObject.getInteger("callCount")).collect(Collectors.toList());
+//            List<Integer> callSuccessCount = jsonObjectList.stream().map(jsonObject -> jsonObject.getInteger("callSuccessCount")).collect(Collectors.toList());
+//            List<Integer> times = jsonObjectList.stream().map(jsonObject -> jsonObject.getInteger("times")).collect(Collectors.toList());
+//            List<Integer> billingTime = jsonObjectList.stream().map(jsonObject -> jsonObject.getInteger("billingTime")).collect(Collectors.toList());
+//            return R.ok().put("list",list).put("dates",dates).put("callCount",callCount).put("callSuccessCount",callSuccessCount).put("times",times).put("billingTime",billingTime);
+//        }
+//        else {
+//            return R.ok("未查找到数据");
+//        }
+        throw new RuntimeException("not implemented");
     }
     @PreAuthorize("@ss.hasPermi('company:statistics:exportMyVoiceLogs')")
     @GetMapping("/exportMyVoiceLogs")
     public AjaxResult exportMyVoiceLogs(CompanyStatisticsParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setUsers(new Long[]{loginUser.getCompanyUser().getUserId()});
-        List<CompanyVoiceLogsStatisticsVO> list= voiceLogsService.selectVoiceLogsStatisticsList(param);
-        if(list!=null){
-            for(CompanyVoiceLogsStatisticsVO vo:list){
-                double f1 = new BigDecimal((float)vo.getCallSuccessCount()/vo.getCallCount()).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()*100;
-                vo.setCallRate(f1);
-            }
-        }
-        ExcelUtil<CompanyVoiceLogsStatisticsVO> util = new ExcelUtil<CompanyVoiceLogsStatisticsVO>(CompanyVoiceLogsStatisticsVO.class);
-        return util.exportExcel(list, "voiceLogs");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setUsers(new Long[]{loginUser.getCompanyUser().getUserId()});
+//        List<CompanyVoiceLogsStatisticsVO> list= voiceLogsService.selectVoiceLogsStatisticsList(param);
+//        if(list!=null){
+//            for(CompanyVoiceLogsStatisticsVO vo:list){
+//                double f1 = new BigDecimal((float)vo.getCallSuccessCount()/vo.getCallCount()).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()*100;
+//                vo.setCallRate(f1);
+//            }
+//        }
+//        ExcelUtil<CompanyVoiceLogsStatisticsVO> util = new ExcelUtil<CompanyVoiceLogsStatisticsVO>(CompanyVoiceLogsStatisticsVO.class);
+//        return util.exportExcel(list, "voiceLogs");
+        throw new RuntimeException("not implemented");
     }
 
 

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

@@ -11,8 +11,7 @@ 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 com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -47,11 +46,12 @@ public class CompanyTcmConsumeController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(CompanyTcmConsume companyTcmConsume)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyTcmConsume.getCompanyId() == null && loginUser.getCompany() != null) { companyTcmConsume.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<CompanyTcmConsumeVO> list = companyTcmConsumeService.selectCompanyTcmConsumeListVO(companyTcmConsume);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyTcmConsume.getCompanyId() == null && loginUser.getCompany() != null) { companyTcmConsume.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<CompanyTcmConsumeVO> list = companyTcmConsumeService.selectCompanyTcmConsumeListVO(companyTcmConsume);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -62,11 +62,12 @@ public class CompanyTcmConsumeController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(CompanyTcmConsume companyTcmConsume)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyTcmConsume.getCompanyId() == null && loginUser.getCompany() != null) { companyTcmConsume.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        List<CompanyTcmConsumeVO> list = companyTcmConsumeService.selectCompanyTcmConsumeListVO(companyTcmConsume);
-        ExcelUtil<CompanyTcmConsumeVO> util = new ExcelUtil<CompanyTcmConsumeVO>(CompanyTcmConsumeVO.class);
-        return util.exportExcel(list, "consume");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyTcmConsume.getCompanyId() == null && loginUser.getCompany() != null) { companyTcmConsume.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        List<CompanyTcmConsumeVO> list = companyTcmConsumeService.selectCompanyTcmConsumeListVO(companyTcmConsume);
+//        ExcelUtil<CompanyTcmConsumeVO> util = new ExcelUtil<CompanyTcmConsumeVO>(CompanyTcmConsumeVO.class);
+//        return util.exportExcel(list, "consume");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -87,13 +88,14 @@ public class CompanyTcmConsumeController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CompanyTcmConsume companyTcmConsume)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        companyTcmConsume.setCreateUserId(loginUser.getCompanyUser().getUserId());
-        if (companyTcmConsume.getCompanyId() == null && loginUser.getCompany() != null) { companyTcmConsume.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        if(companyTcmConsumeService.selectCompanyTcmConsumeBySchedule(companyTcmConsume.getCompanyId(),companyTcmConsume.getScheduleId())!=null){
-             return  AjaxResult.error("档期消费数据已存在");
-        }
-        return toAjax(companyTcmConsumeService.insertCompanyTcmConsume(companyTcmConsume));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        companyTcmConsume.setCreateUserId(loginUser.getCompanyUser().getUserId());
+//        if (companyTcmConsume.getCompanyId() == null && loginUser.getCompany() != null) { companyTcmConsume.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        if(companyTcmConsumeService.selectCompanyTcmConsumeBySchedule(companyTcmConsume.getCompanyId(),companyTcmConsume.getScheduleId())!=null){
+//             return  AjaxResult.error("档期消费数据已存在");
+//        }
+//        return toAjax(companyTcmConsumeService.insertCompanyTcmConsume(companyTcmConsume));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -104,9 +106,10 @@ public class CompanyTcmConsumeController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CompanyTcmConsume companyTcmConsume)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyTcmConsume.getCompanyId() == null && loginUser.getCompany() != null) { companyTcmConsume.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        return toAjax(companyTcmConsumeService.updateCompanyTcmConsume(companyTcmConsume));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyTcmConsume.getCompanyId() == null && loginUser.getCompany() != null) { companyTcmConsume.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        return toAjax(companyTcmConsumeService.updateCompanyTcmConsume(companyTcmConsume));
+        throw new RuntimeException("not implemented");
     }
 
     /**

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

@@ -17,8 +17,7 @@ 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 com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -52,20 +51,21 @@ public class CompanyTcmReportController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(CompanyTcmReportListQueryParam param)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId(loginUser.getCompany() != null ? String.valueOf(loginUser.getCompany().getCompanyId()) : null);
-        if(!loginUser.getCompanyUser().isAdmin()){
-            param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-        }
-        if(!StringUtils.isEmpty(param.getCreateTimeRange())){
-            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-        }
-        if(!StringUtils.isEmpty(param.getDateRange())){
-            param.setStartTimeList(param.getDateRange().split("--"));
-        }
-        List<CompanyTcmReportListVO> list = companyTcmReportService.selectCompanyTcmReportListVOList(param);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId(loginUser.getCompany() != null ? String.valueOf(loginUser.getCompany().getCompanyId()) : null);
+//        if(!loginUser.getCompanyUser().isAdmin()){
+//            param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        }
+//        if(!StringUtils.isEmpty(param.getCreateTimeRange())){
+//            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//        }
+//        if(!StringUtils.isEmpty(param.getDateRange())){
+//            param.setStartTimeList(param.getDateRange().split("--"));
+//        }
+//        List<CompanyTcmReportListVO> list = companyTcmReportService.selectCompanyTcmReportListVOList(param);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -76,62 +76,63 @@ public class CompanyTcmReportController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(CompanyTcmReportListQueryParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId(loginUser.getCompany() != null ? String.valueOf(loginUser.getCompany().getCompanyId()) : null);
-        if(!loginUser.getCompanyUser().isAdmin()){
-            param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-        }
-        List<CompanyReportExportVO> list = companyTcmReportService.selectCompanyReportExportVOList(param);
-        for(CompanyReportExportVO item:list){
-            item.setRegisterRate(String.format("%.3f", item.getRegisterNum().doubleValue()/item.getTotalNum().doubleValue()*100.0).toString()+"%");
-            item.setOnlineRate(String.format("%.3f", item.getOnlineNum().doubleValue()/item.getRegisterNum().doubleValue()*100.0).toString()+"%");
-            item.setFinishRate(String.format("%.3f", item.getFinishNum().doubleValue()/item.getRegisterNum().doubleValue()*100.0).toString()+"%");
-            if(item.getTargetMoney()!=null){
-                item.setTargetRate(String.format("%.3f", item.getTotalMoney().doubleValue()/item.getTargetMoney().doubleValue()*100.0).toString()+"%");
-            }else{
-                item.setTargetRate("0%");
-            }
-            if(item.getRound1Order()!=null){
-                item.setRound1Rate(getRoundRate(item.getRound1Order(),item.getTotalNum()));
-                item.setRound1Unit(new BigDecimal(getRoundUnit(item.getRound1Money(),item.getRound1Order())).setScale(3, RoundingMode.HALF_UP));
-            }
-            if(item.getRound2Order()!=null){
-                item.setRound2Rate(getRoundRate(item.getRound2Order(),item.getTotalNum()));
-                item.setRound2Unit(new BigDecimal(getRoundUnit(item.getRound2Money(),item.getRound2Order())).setScale(3, RoundingMode.HALF_UP));
-            }
-            if(item.getRound3Order()!=null){
-                item.setRound3Rate(getRoundRate(item.getRound3Order(),item.getTotalNum()));
-                item.setRound3Unit(new BigDecimal(getRoundUnit(item.getRound3Money(),item.getRound3Order())).setScale(3, RoundingMode.HALF_UP));
-            }
-            if(item.getRound4Order()!=null){
-                item.setRound4Rate(getRoundRate(item.getRound4Order(),item.getTotalNum()));
-                item.setRound4Unit(new BigDecimal(getRoundUnit(item.getRound4Money(),item.getRound4Order())).setScale(3, RoundingMode.HALF_UP));
-            }
-            if(item.getRound5Order()!=null){
-                item.setRound5Rate(getRoundRate(item.getRound5Order(),item.getTotalNum()));
-                item.setRound5Unit(new BigDecimal(getRoundUnit(item.getRound5Money(),item.getRound5Order())).setScale(3, RoundingMode.HALF_UP));
-            }
-            if(item.getRound6Order()!=null){
-                item.setRound6Rate(getRoundRate(item.getRound6Order(),item.getTotalNum()));
-                item.setRound6Unit(new BigDecimal(getRoundUnit(item.getRound6Money(),item.getRound6Order())).setScale(3, RoundingMode.HALF_UP));
-            }
-            if(item.getRound7Order()!=null) {
-                item.setRound7Rate(getRoundRate(item.getRound7Order(), item.getTotalNum()));
-                item.setRound7Unit(new BigDecimal(getRoundUnit(item.getRound7Money(), item.getRound7Order())).setScale(3, RoundingMode.HALF_UP));
-            }
-            if (item.getRound8Order() != null) {
-                item.setRound8Rate(getRoundRate(item.getRound8Order(), item.getTotalNum()));
-                item.setRound8Unit(new BigDecimal(getRoundUnit(item.getRound8Money(), item.getRound8Order())).setScale(3, RoundingMode.HALF_UP));
-            }
-            if (item.getRound9Order() != null) {
-                item.setRound9Rate(getRoundRate(item.getRound9Order(), item.getTotalNum()));
-                item.setRound9Unit(new BigDecimal(getRoundUnit(item.getRound9Money(), item.getRound9Order())).setScale(3, RoundingMode.HALF_UP));
-                //item.setRound9Rate(String.format("%.3f", item.getRound9Order().doubleValue()/item.getTotalNum()*100.0).toString()+"%");
-                //item.setRound9Unit(new BigDecimal(item.getRound9Money().doubleValue()/item.getRound9Order()*1.0).setScale(3, RoundingMode.HALF_UP));
-            }
-        }
-        ExcelUtil<CompanyReportExportVO> util = new ExcelUtil<CompanyReportExportVO>(CompanyReportExportVO.class);
-        return util.exportExcel(list, "statisticsScheduleReport");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId(loginUser.getCompany() != null ? String.valueOf(loginUser.getCompany().getCompanyId()) : null);
+//        if(!loginUser.getCompanyUser().isAdmin()){
+//            param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        }
+//        List<CompanyReportExportVO> list = companyTcmReportService.selectCompanyReportExportVOList(param);
+//        for(CompanyReportExportVO item:list){
+//            item.setRegisterRate(String.format("%.3f", item.getRegisterNum().doubleValue()/item.getTotalNum().doubleValue()*100.0).toString()+"%");
+//            item.setOnlineRate(String.format("%.3f", item.getOnlineNum().doubleValue()/item.getRegisterNum().doubleValue()*100.0).toString()+"%");
+//            item.setFinishRate(String.format("%.3f", item.getFinishNum().doubleValue()/item.getRegisterNum().doubleValue()*100.0).toString()+"%");
+//            if(item.getTargetMoney()!=null){
+//                item.setTargetRate(String.format("%.3f", item.getTotalMoney().doubleValue()/item.getTargetMoney().doubleValue()*100.0).toString()+"%");
+//            }else{
+//                item.setTargetRate("0%");
+//            }
+//            if(item.getRound1Order()!=null){
+//                item.setRound1Rate(getRoundRate(item.getRound1Order(),item.getTotalNum()));
+//                item.setRound1Unit(new BigDecimal(getRoundUnit(item.getRound1Money(),item.getRound1Order())).setScale(3, RoundingMode.HALF_UP));
+//            }
+//            if(item.getRound2Order()!=null){
+//                item.setRound2Rate(getRoundRate(item.getRound2Order(),item.getTotalNum()));
+//                item.setRound2Unit(new BigDecimal(getRoundUnit(item.getRound2Money(),item.getRound2Order())).setScale(3, RoundingMode.HALF_UP));
+//            }
+//            if(item.getRound3Order()!=null){
+//                item.setRound3Rate(getRoundRate(item.getRound3Order(),item.getTotalNum()));
+//                item.setRound3Unit(new BigDecimal(getRoundUnit(item.getRound3Money(),item.getRound3Order())).setScale(3, RoundingMode.HALF_UP));
+//            }
+//            if(item.getRound4Order()!=null){
+//                item.setRound4Rate(getRoundRate(item.getRound4Order(),item.getTotalNum()));
+//                item.setRound4Unit(new BigDecimal(getRoundUnit(item.getRound4Money(),item.getRound4Order())).setScale(3, RoundingMode.HALF_UP));
+//            }
+//            if(item.getRound5Order()!=null){
+//                item.setRound5Rate(getRoundRate(item.getRound5Order(),item.getTotalNum()));
+//                item.setRound5Unit(new BigDecimal(getRoundUnit(item.getRound5Money(),item.getRound5Order())).setScale(3, RoundingMode.HALF_UP));
+//            }
+//            if(item.getRound6Order()!=null){
+//                item.setRound6Rate(getRoundRate(item.getRound6Order(),item.getTotalNum()));
+//                item.setRound6Unit(new BigDecimal(getRoundUnit(item.getRound6Money(),item.getRound6Order())).setScale(3, RoundingMode.HALF_UP));
+//            }
+//            if(item.getRound7Order()!=null) {
+//                item.setRound7Rate(getRoundRate(item.getRound7Order(), item.getTotalNum()));
+//                item.setRound7Unit(new BigDecimal(getRoundUnit(item.getRound7Money(), item.getRound7Order())).setScale(3, RoundingMode.HALF_UP));
+//            }
+//            if (item.getRound8Order() != null) {
+//                item.setRound8Rate(getRoundRate(item.getRound8Order(), item.getTotalNum()));
+//                item.setRound8Unit(new BigDecimal(getRoundUnit(item.getRound8Money(), item.getRound8Order())).setScale(3, RoundingMode.HALF_UP));
+//            }
+//            if (item.getRound9Order() != null) {
+//                item.setRound9Rate(getRoundRate(item.getRound9Order(), item.getTotalNum()));
+//                item.setRound9Unit(new BigDecimal(getRoundUnit(item.getRound9Money(), item.getRound9Order())).setScale(3, RoundingMode.HALF_UP));
+//                //item.setRound9Rate(String.format("%.3f", item.getRound9Order().doubleValue()/item.getTotalNum()*100.0).toString()+"%");
+//                //item.setRound9Unit(new BigDecimal(item.getRound9Money().doubleValue()/item.getRound9Order()*1.0).setScale(3, RoundingMode.HALF_UP));
+//            }
+//        }
+//        ExcelUtil<CompanyReportExportVO> util = new ExcelUtil<CompanyReportExportVO>(CompanyReportExportVO.class);
+//        return util.exportExcel(list, "statisticsScheduleReport");
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -140,17 +141,18 @@ public class CompanyTcmReportController extends BaseController
     @GetMapping("/statisticsList")
     public TableDataInfo statisticsList(CompanyTcmReportListQueryParam param)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId(loginUser.getCompany() != null ? String.valueOf(loginUser.getCompany().getCompanyId()) : null);
-        if(!StringUtils.isEmpty(param.getCreateTimeRange())){
-            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-        }
-        if(param.getDeptId()!=null){
-            param.setDeptIdStr(param.getDeptId().toString());
-        }
-        List<CompanyTcmReportListVO> list = companyTcmReportService.selectCompanyTcmReportStatisticsVOList(param);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId(loginUser.getCompany() != null ? String.valueOf(loginUser.getCompany().getCompanyId()) : null);
+//        if(!StringUtils.isEmpty(param.getCreateTimeRange())){
+//            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//        }
+//        if(param.getDeptId()!=null){
+//            param.setDeptIdStr(param.getDeptId().toString());
+//        }
+//        List<CompanyTcmReportListVO> list = companyTcmReportService.selectCompanyTcmReportStatisticsVOList(param);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -162,80 +164,81 @@ public class CompanyTcmReportController extends BaseController
     @GetMapping("/exportCompany")
     public AjaxResult exportCompany(CompanyTcmReportListQueryParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId(loginUser.getCompany() != null ? String.valueOf(loginUser.getCompany().getCompanyId()) : null);
-        if(!StringUtils.isEmpty(param.getCreateTimeRange())){
-            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-        }
-        List<CompanyTcmStatisticsExportVO> list = companyTcmReportService.selectCompanyTcmStatisticsExportVOList(param);
-        for(CompanyTcmStatisticsExportVO item:list){
-            if(item.getTotalNum()!=null && item.getTotalNum().doubleValue()>0){
-                item.setRegisterRate(String.format("%.3f",getLongRate(item.getRegisterNum().doubleValue(),item.getTotalNum())*100.0).toString()+"%");
-                item.setOnlineRate(String.format("%.3f",getLongRate(item.getOnlineNum().doubleValue(),item.getTotalNum())*100.0).toString()+"%");
-                item.setFinishRate(String.format("%.3f", getLongRate(item.getFinishNum().doubleValue(),item.getTotalNum())*100.0).toString()+"%");
-                item.setRLine(new BigDecimal(getLongRate(item.getTotalMoney().doubleValue(),item.getTotalNum())*1.0).setScale(3, RoundingMode.HALF_UP));
-
-            }else{
-                item.setRegisterRate("0%");
-                item.setOnlineRate("0%");
-                item.setFinishRate("0%");
-                item.setRLine(new BigDecimal(0.0));
-            }
-            if(item.getCuCount()!=null && item.getCuCount().doubleValue()>0){
-                item.setPersonMoney(String.format("%.3f",getLongRate(item.getTotalMoney().doubleValue(),Long.valueOf(item.getCuCount()))*1.0).toString());
-            }else{
-                item.setCuCount(0);
-            }
-            if(item.getTargetMoney()!=null && item.getTargetMoney().doubleValue()>0){
-                item.setTargetRate(String.format("%.3f", item.getTotalMoney().doubleValue()/item.getTargetMoney().doubleValue()*100.0).toString()+"%");
-            }else{
-                item.setTargetRate("0%");
-            }
-            if(item.getMoney()!=null && item.getMoney().doubleValue()>0){
-                item.setZroi(new BigDecimal(item.getTotalMoney().doubleValue()/item.getMoney().doubleValue()*1.0).setScale(3, RoundingMode.HALF_UP));
-            }else{
-                item.setZroi(new BigDecimal(0.0));
-            }
-            if(item.getRound1Order()!=null){
-                item.setRound1Rate(getRoundRate(item.getRound1Order(),item.getTotalNum()));
-                item.setRound1Unit(new BigDecimal(getRoundUnit(item.getRound1Money(),item.getRound1Order())).setScale(3, RoundingMode.HALF_UP));
-            }
-            if(item.getRound2Order()!=null){
-                item.setRound2Rate(getRoundRate(item.getRound2Order(),item.getTotalNum()));
-                item.setRound2Unit(new BigDecimal(getRoundUnit(item.getRound2Money(),item.getRound2Order())).setScale(3, RoundingMode.HALF_UP));
-            }
-            if(item.getRound3Order()!=null){
-                item.setRound3Rate(getRoundRate(item.getRound3Order(),item.getTotalNum()));
-                item.setRound3Unit(new BigDecimal(getRoundUnit(item.getRound3Money(),item.getRound3Order())).setScale(3, RoundingMode.HALF_UP));
-            }
-            if(item.getRound4Order()!=null){
-                item.setRound4Rate(getRoundRate(item.getRound4Order(),item.getTotalNum()));
-                item.setRound4Unit(new BigDecimal(getRoundUnit(item.getRound4Money(),item.getRound4Order())).setScale(3, RoundingMode.HALF_UP));
-            }
-            if(item.getRound5Order()!=null){
-                item.setRound5Rate(getRoundRate(item.getRound5Order(),item.getTotalNum()));
-                item.setRound5Unit(new BigDecimal(getRoundUnit(item.getRound5Money(),item.getRound5Order())).setScale(3, RoundingMode.HALF_UP));
-            }
-            if(item.getRound6Order()!=null){
-                item.setRound6Rate(getRoundRate(item.getRound6Order(),item.getTotalNum()));
-                item.setRound6Unit(new BigDecimal(getRoundUnit(item.getRound6Money(),item.getRound6Order())).setScale(3, RoundingMode.HALF_UP));
-            }
-            if(item.getRound7Order()!=null) {
-                item.setRound7Rate(getRoundRate(item.getRound7Order(), item.getTotalNum()));
-                item.setRound7Unit(new BigDecimal(getRoundUnit(item.getRound7Money(), item.getRound7Order())).setScale(3, RoundingMode.HALF_UP));
-            }
-            if (item.getRound8Order() != null) {
-                item.setRound8Rate(getRoundRate(item.getRound8Order(), item.getTotalNum()));
-                item.setRound8Unit(new BigDecimal(getRoundUnit(item.getRound8Money(), item.getRound8Order())).setScale(3, RoundingMode.HALF_UP));
-            }
-            if (item.getRound9Order() != null) {
-                item.setRound9Rate(getRoundRate(item.getRound9Order(), item.getTotalNum()));
-                item.setRound9Unit(new BigDecimal(getRoundUnit(item.getRound9Money(), item.getRound9Order())).setScale(3, RoundingMode.HALF_UP));
-            }
-
-        }
-        ExcelUtil<CompanyTcmStatisticsExportVO> util = new ExcelUtil<CompanyTcmStatisticsExportVO>(CompanyTcmStatisticsExportVO.class);
-        return util.exportExcel(list, "statisticsScheduleReport");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId(loginUser.getCompany() != null ? String.valueOf(loginUser.getCompany().getCompanyId()) : null);
+//        if(!StringUtils.isEmpty(param.getCreateTimeRange())){
+//            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//        }
+//        List<CompanyTcmStatisticsExportVO> list = companyTcmReportService.selectCompanyTcmStatisticsExportVOList(param);
+//        for(CompanyTcmStatisticsExportVO item:list){
+//            if(item.getTotalNum()!=null && item.getTotalNum().doubleValue()>0){
+//                item.setRegisterRate(String.format("%.3f",getLongRate(item.getRegisterNum().doubleValue(),item.getTotalNum())*100.0).toString()+"%");
+//                item.setOnlineRate(String.format("%.3f",getLongRate(item.getOnlineNum().doubleValue(),item.getTotalNum())*100.0).toString()+"%");
+//                item.setFinishRate(String.format("%.3f", getLongRate(item.getFinishNum().doubleValue(),item.getTotalNum())*100.0).toString()+"%");
+//                item.setRLine(new BigDecimal(getLongRate(item.getTotalMoney().doubleValue(),item.getTotalNum())*1.0).setScale(3, RoundingMode.HALF_UP));
+//
+//            }else{
+//                item.setRegisterRate("0%");
+//                item.setOnlineRate("0%");
+//                item.setFinishRate("0%");
+//                item.setRLine(new BigDecimal(0.0));
+//            }
+//            if(item.getCuCount()!=null && item.getCuCount().doubleValue()>0){
+//                item.setPersonMoney(String.format("%.3f",getLongRate(item.getTotalMoney().doubleValue(),Long.valueOf(item.getCuCount()))*1.0).toString());
+//            }else{
+//                item.setCuCount(0);
+//            }
+//            if(item.getTargetMoney()!=null && item.getTargetMoney().doubleValue()>0){
+//                item.setTargetRate(String.format("%.3f", item.getTotalMoney().doubleValue()/item.getTargetMoney().doubleValue()*100.0).toString()+"%");
+//            }else{
+//                item.setTargetRate("0%");
+//            }
+//            if(item.getMoney()!=null && item.getMoney().doubleValue()>0){
+//                item.setZroi(new BigDecimal(item.getTotalMoney().doubleValue()/item.getMoney().doubleValue()*1.0).setScale(3, RoundingMode.HALF_UP));
+//            }else{
+//                item.setZroi(new BigDecimal(0.0));
+//            }
+//            if(item.getRound1Order()!=null){
+//                item.setRound1Rate(getRoundRate(item.getRound1Order(),item.getTotalNum()));
+//                item.setRound1Unit(new BigDecimal(getRoundUnit(item.getRound1Money(),item.getRound1Order())).setScale(3, RoundingMode.HALF_UP));
+//            }
+//            if(item.getRound2Order()!=null){
+//                item.setRound2Rate(getRoundRate(item.getRound2Order(),item.getTotalNum()));
+//                item.setRound2Unit(new BigDecimal(getRoundUnit(item.getRound2Money(),item.getRound2Order())).setScale(3, RoundingMode.HALF_UP));
+//            }
+//            if(item.getRound3Order()!=null){
+//                item.setRound3Rate(getRoundRate(item.getRound3Order(),item.getTotalNum()));
+//                item.setRound3Unit(new BigDecimal(getRoundUnit(item.getRound3Money(),item.getRound3Order())).setScale(3, RoundingMode.HALF_UP));
+//            }
+//            if(item.getRound4Order()!=null){
+//                item.setRound4Rate(getRoundRate(item.getRound4Order(),item.getTotalNum()));
+//                item.setRound4Unit(new BigDecimal(getRoundUnit(item.getRound4Money(),item.getRound4Order())).setScale(3, RoundingMode.HALF_UP));
+//            }
+//            if(item.getRound5Order()!=null){
+//                item.setRound5Rate(getRoundRate(item.getRound5Order(),item.getTotalNum()));
+//                item.setRound5Unit(new BigDecimal(getRoundUnit(item.getRound5Money(),item.getRound5Order())).setScale(3, RoundingMode.HALF_UP));
+//            }
+//            if(item.getRound6Order()!=null){
+//                item.setRound6Rate(getRoundRate(item.getRound6Order(),item.getTotalNum()));
+//                item.setRound6Unit(new BigDecimal(getRoundUnit(item.getRound6Money(),item.getRound6Order())).setScale(3, RoundingMode.HALF_UP));
+//            }
+//            if(item.getRound7Order()!=null) {
+//                item.setRound7Rate(getRoundRate(item.getRound7Order(), item.getTotalNum()));
+//                item.setRound7Unit(new BigDecimal(getRoundUnit(item.getRound7Money(), item.getRound7Order())).setScale(3, RoundingMode.HALF_UP));
+//            }
+//            if (item.getRound8Order() != null) {
+//                item.setRound8Rate(getRoundRate(item.getRound8Order(), item.getTotalNum()));
+//                item.setRound8Unit(new BigDecimal(getRoundUnit(item.getRound8Money(), item.getRound8Order())).setScale(3, RoundingMode.HALF_UP));
+//            }
+//            if (item.getRound9Order() != null) {
+//                item.setRound9Rate(getRoundRate(item.getRound9Order(), item.getTotalNum()));
+//                item.setRound9Unit(new BigDecimal(getRoundUnit(item.getRound9Money(), item.getRound9Order())).setScale(3, RoundingMode.HALF_UP));
+//            }
+//
+//        }
+//        ExcelUtil<CompanyTcmStatisticsExportVO> util = new ExcelUtil<CompanyTcmStatisticsExportVO>(CompanyTcmStatisticsExportVO.class);
+//        return util.exportExcel(list, "statisticsScheduleReport");
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -258,15 +261,16 @@ public class CompanyTcmReportController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CompanyTcmReport companyTcmReport)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyTcmReport.getCompanyId() == null && loginUser.getCompany() != null) { companyTcmReport.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        companyTcmReport.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-        int isOk=companyTcmReportService.insertCompanyTcmReport(companyTcmReport);
-        if(isOk>0){
-            return AjaxResult.success(companyTcmReport);
-        }else{
-            return  AjaxResult.error();
-        }
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyTcmReport.getCompanyId() == null && loginUser.getCompany() != null) { companyTcmReport.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        companyTcmReport.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        int isOk=companyTcmReportService.insertCompanyTcmReport(companyTcmReport);
+//        if(isOk>0){
+//            return AjaxResult.success(companyTcmReport);
+//        }else{
+//            return  AjaxResult.error();
+//        }
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -277,10 +281,11 @@ public class CompanyTcmReportController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CompanyTcmReport companyTcmReport)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyTcmReport.getCompanyId() == null && loginUser.getCompany() != null) { companyTcmReport.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        companyTcmReport.setUpdateUserId(loginUser.getCompanyUser().getUserId());
-        return toAjax(companyTcmReportService.updateCompanyTcmReport(companyTcmReport));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyTcmReport.getCompanyId() == null && loginUser.getCompany() != null) { companyTcmReport.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        companyTcmReport.setUpdateUserId(loginUser.getCompanyUser().getUserId());
+//        return toAjax(companyTcmReportService.updateCompanyTcmReport(companyTcmReport));
+        throw new RuntimeException("not implemented");
     }
 
 

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

@@ -17,8 +17,7 @@ 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.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -60,12 +59,13 @@ public class CompanyUserCardController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(CompanyUserCardQueryParam param)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-        List<CompanyUserCard> list = companyUserCardService.selectMyCardListQuery(param);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        List<CompanyUserCard> list = companyUserCardService.selectMyCardListQuery(param);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -99,19 +99,20 @@ public class CompanyUserCardController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CompanyUserCard companyUserCard)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        companyUserCard.setUserId(loginUser.getCompanyUser().getUserId());
-        if (companyUserCard.getCompanyId() == null && loginUser.getCompany() != null) { companyUserCard.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        companyUserCard.setCreateTime(new Date());
-        int rows=companyUserCardService.insertCompanyUserCard(companyUserCard);
-        if(rows>0){
-            String shorUrl=this.getShortUrlAction(companyUserCard.getId(),companyUserCard.getTitle());
-            companyUserCard.setShortUrl(shorUrl);
-            if(companyUserCardService.updateUserCardShortUrlById(companyUserCard.getId(),shorUrl)>0){
-                return toAjax(1);
-            }
-        }
-        return toAjax(0);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        companyUserCard.setUserId(loginUser.getCompanyUser().getUserId());
+//        if (companyUserCard.getCompanyId() == null && loginUser.getCompany() != null) { companyUserCard.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        companyUserCard.setCreateTime(new Date());
+//        int rows=companyUserCardService.insertCompanyUserCard(companyUserCard);
+//        if(rows>0){
+//            String shorUrl=this.getShortUrlAction(companyUserCard.getId(),companyUserCard.getTitle());
+//            companyUserCard.setShortUrl(shorUrl);
+//            if(companyUserCardService.updateUserCardShortUrlById(companyUserCard.getId(),shorUrl)>0){
+//                return toAjax(1);
+//            }
+//        }
+//        return toAjax(0);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -142,10 +143,11 @@ public class CompanyUserCardController extends BaseController
     @RepeatSubmit
     @Transactional
     public R sendCustomerBatchMsg(@Validated @RequestBody SmsSendBatchParam param){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-        return smsService.sendBatchSms(param);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        return smsService.sendBatchSms(param);
+        throw new RuntimeException("not implemented");
     }
 
 

fs-agent/src/main/java/com/fs/company/controller/company/CompanyUserChangeApplyController.java

@@ -8,7 +8,6 @@ import com.fs.common.utils.StringUtils;
 import com.fs.company.controller.param.CompanyUserChangeApplyAuditParam;
 import com.fs.company.service.ICompanyUserChangeApplyService;
 import com.fs.company.vo.CompanyUserChangeApplyVO;
-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.*;
@@ -37,13 +36,14 @@ public class CompanyUserChangeApplyController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(@RequestParam(required = false) Integer status)
     {
-        Map<String, Object> map = new HashMap<>();
-        map.put("status", status);
-        map.put("companyId", SecurityUtils.getLoginUser().getCompany() != null ? SecurityUtils.getLoginUser().getCompany().getCompanyId() : null);
-
-        startPage();
-        List<CompanyUserChangeApplyVO> list = companyUserChangeApplyService.selectApplyListByMap(map);
-        return getDataTable(list);
+//        Map<String, Object> map = new HashMap<>();
+//        map.put("status", status);
+//        map.put("companyId", SecurityUtils.getLoginUser().getCompany() != null ? SecurityUtils.getLoginUser().getCompany().getCompanyId() : null);
+//
+//        startPage();
+//        List<CompanyUserChangeApplyVO> list = companyUserChangeApplyService.selectApplyListByMap(map);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -63,16 +63,17 @@ public class CompanyUserChangeApplyController extends BaseController
     @PostMapping(value = "/audit")
     public AjaxResult audit(@Valid @RequestBody CompanyUserChangeApplyAuditParam param)
     {
-        if (param.getStatus() != 1 && param.getStatus() != 2) {
-            throw new ServiceException("审核类型不正确");
-        }
-
-        if (param.getStatus() == 2 && StringUtils.isBlank(param.getReason())) {
-            throw new ServiceException("拒绝理由不能为空");
-        }
-
-        companyUserChangeApplyService.audit(param.getId(), param.getStatus(), param.getReason(), SecurityUtils.getUsername());
-        return AjaxResult.success();
+//        if (param.getStatus() != 1 && param.getStatus() != 2) {
+//            throw new ServiceException("审核类型不正确");
+//        }
+//
+//        if (param.getStatus() == 2 && StringUtils.isBlank(param.getReason())) {
+//            throw new ServiceException("拒绝理由不能为空");
+//        }
+//
+//        companyUserChangeApplyService.audit(param.getId(), param.getStatus(), param.getReason(), SecurityUtils.getUsername());
+//        return AjaxResult.success();
+        throw new RuntimeException("not implemented");
     }
 
 }

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

@@ -31,9 +31,7 @@ import com.fs.config.saas.ProjectConfig;
 import com.fs.course.config.CourseConfig;
 import com.fs.framework.datasource.DynamicDataSourceContextHolder;
 import com.fs.framework.datasource.TenantDataSourceManager;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.security.SecurityUtils;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.utils.qrcode.QRCodeUtils;
 import com.fs.his.vo.OptionsVO;
 import com.fs.hisStore.domain.FsUserScrm;
@@ -140,11 +138,12 @@ public class CompanyUserController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(CompanyUser user)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (user.getCompanyId() == null && loginUser.getCompany() != null) { user.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        startPage();
-        List<CompanyUser> list = companyUserService.selectCompanyUserList(user);
-        return getDataTable(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (user.getCompanyId() == null && loginUser.getCompany() != null) { user.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        startPage();
+//        List<CompanyUser> list = companyUserService.selectCompanyUserList(user);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -155,117 +154,122 @@ public class CompanyUserController extends BaseController {
     @GetMapping("/deptList")
     public TableDataInfo deptList(CompanyUser user)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (user.getCompanyId() == null && loginUser.getCompany() != null) { user.setCompanyId(loginUser.getCompany().getCompanyId()); }
-
-        List<Long> combinedDpetList = new ArrayList<>();
-        //本部门
-        Long deptId = loginUser.getCompanyUser().getDeptId();
-        if (deptId!=null){
-            combinedDpetList.add(deptId);
-        }
-        //本部门的下级部门
-        List<Long> deptList = companyDeptService.selectCompanyDeptByParentId(deptId);
-        if (!deptList.isEmpty()){
-            combinedDpetList.addAll(deptList);
-        }
-
-        user.setDeptList(combinedDpetList);
-
-        startPage();
-        List<CompanyUser> list = companyUserService.selectCompanyUserList(user);
-        return getDataTable(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (user.getCompanyId() == null && loginUser.getCompany() != null) { user.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//
+//        List<Long> combinedDpetList = new ArrayList<>();
+//        //本部门
+//        Long deptId = loginUser.getCompanyUser().getDeptId();
+//        if (deptId!=null){
+//            combinedDpetList.add(deptId);
+//        }
+//        //本部门的下级部门
+//        List<Long> deptList = companyDeptService.selectCompanyDeptByParentId(deptId);
+//        if (!deptList.isEmpty()){
+//            combinedDpetList.addAll(deptList);
+//        }
+//
+//        user.setDeptList(combinedDpetList);
+//
+//        startPage();
+//        List<CompanyUser> list = companyUserService.selectCompanyUserList(user);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     @GetMapping("/getUserList")
     public R getUserList()
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        CompanyUser map=new CompanyUser();
-        if (map.getCompanyId() == null && loginUser.getCompany() != null) { map.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<CompanyUser> list = companyUserService.selectCompanyUserList(map);
-        return  R.ok().put("data",list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        CompanyUser map=new CompanyUser();
+//        if (map.getCompanyId() == null && loginUser.getCompany() != null) { map.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<CompanyUser> list = companyUserService.selectCompanyUserList(map);
+//        return  R.ok().put("data",list);
+        throw new RuntimeException("not implemented");
     }
     @GetMapping("/getList")
     public TableDataInfo getList(CompanyUser user)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (user.getCompanyId() == null && loginUser.getCompany() != null) { user.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        startPage();
-        List<CompanyUser> list = companyUserService.selectCompanyUserList(user);
-        return getDataTable(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (user.getCompanyId() == null && loginUser.getCompany() != null) { user.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        startPage();
+//        List<CompanyUser> list = companyUserService.selectCompanyUserList(user);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
     @GetMapping("/qwList")
     public TableDataInfo qwList(CompanyUserQwParam user) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (user.getCompanyId() == null && loginUser.getCompany() != null) { user.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        List<CompanyUserQwListVO> list = companyUserService.selectCompanyUserQwListVO(user);
-        if (!list.isEmpty()){
-            String json = configService.selectConfigByKey("course.config");
-            CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-            Long sendDelayTime = config.getSendDelayTime();
-            List<CompletableFuture<Void>> futures = new ArrayList<>();
-            for (CompanyUserQwListVO companyUserQwListVO : list) {
-                CompletableFuture<Void> future = CompletableFuture.runAsync(() -> {
-                    CompanyUserDelayTime companyUserDelayTime = companyUserDelayTimeService.selectCompanyUserDelayTimeByCompanyUser(companyUserQwListVO.getCompanyId(), companyUserQwListVO.getUserId());
-                    if (ObjectUtil.isEmpty(companyUserDelayTime)) {
-                        companyUserQwListVO.setSendDelayTime(sendDelayTime);
-                    } else {
-                        companyUserQwListVO.setSendDelayTime(companyUserDelayTime.getSendDelayTime());
-                    }
-                    //是否绑定
-                    if(QwStatusEnum.BOUND.getCode() == companyUserQwListVO.getQwStatus()){
-                        if(!StringUtil.strIsNullOrEmpty(companyUserQwListVO.getQwUserId())){
-                            Long[] ids = Arrays.stream(companyUserQwListVO.getQwUserId().split(","))
-                                    .map(Long::parseLong)
-                                    .toArray(Long[]::new);
-                            List<QwUserVO> qwUserVOS = qwUserService.selectQwUserVOByIds(ids);
-                            companyUserQwListVO.setQwUsers(qwUserVOS);
-                        }
-                    }
-                });
-                futures.add(future);
-            }
-            CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
-        }
-        return getDataTable(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (user.getCompanyId() == null && loginUser.getCompany() != null) { user.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        List<CompanyUserQwListVO> list = companyUserService.selectCompanyUserQwListVO(user);
+//        if (!list.isEmpty()){
+//            String json = configService.selectConfigByKey("course.config");
+//            CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//            Long sendDelayTime = config.getSendDelayTime();
+//            List<CompletableFuture<Void>> futures = new ArrayList<>();
+//            for (CompanyUserQwListVO companyUserQwListVO : list) {
+//                CompletableFuture<Void> future = CompletableFuture.runAsync(() -> {
+//                    CompanyUserDelayTime companyUserDelayTime = companyUserDelayTimeService.selectCompanyUserDelayTimeByCompanyUser(companyUserQwListVO.getCompanyId(), companyUserQwListVO.getUserId());
+//                    if (ObjectUtil.isEmpty(companyUserDelayTime)) {
+//                        companyUserQwListVO.setSendDelayTime(sendDelayTime);
+//                    } else {
+//                        companyUserQwListVO.setSendDelayTime(companyUserDelayTime.getSendDelayTime());
+//                    }
+//                    //是否绑定
+//                    if(QwStatusEnum.BOUND.getCode() == companyUserQwListVO.getQwStatus()){
+//                        if(!StringUtil.strIsNullOrEmpty(companyUserQwListVO.getQwUserId())){
+//                            Long[] ids = Arrays.stream(companyUserQwListVO.getQwUserId().split(","))
+//                                    .map(Long::parseLong)
+//                                    .toArray(Long[]::new);
+//                            List<QwUserVO> qwUserVOS = qwUserService.selectQwUserVOByIds(ids);
+//                            companyUserQwListVO.setQwUsers(qwUserVOS);
+//                        }
+//                    }
+//                });
+//                futures.add(future);
+//            }
+//            CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
+//        }
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     @GetMapping("/myQwList")
     public TableDataInfo myQwList(CompanyUserQwParam user) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-//        user.setCompanyId(loginUser.getCompany().getCompanyId());
-        user.setUserId(loginUser.getCompanyUser().getUserId());
-        List<CompanyUserQwListVO> list = companyUserService.selectCompanyUserQwListVO(user);
-        if (!list.isEmpty()){
-            String json = configService.selectConfigByKey("course.config");
-            CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-            Long sendDelayTime = config.getSendDelayTime();
-            List<CompletableFuture<Void>> futures = new ArrayList<>();
-            for (CompanyUserQwListVO companyUserQwListVO : list) {
-                CompletableFuture<Void> future = CompletableFuture.runAsync(() -> {
-                    CompanyUserDelayTime companyUserDelayTime = companyUserDelayTimeService.selectCompanyUserDelayTimeByCompanyUser(companyUserQwListVO.getCompanyId(), companyUserQwListVO.getUserId());
-                    if (ObjectUtil.isEmpty(companyUserDelayTime)) {
-                        companyUserQwListVO.setSendDelayTime(sendDelayTime);
-                    } else {
-                        companyUserQwListVO.setSendDelayTime(companyUserDelayTime.getSendDelayTime());
-                    }
-                    //是否绑定
-                    if(QwStatusEnum.BOUND.getCode() == companyUserQwListVO.getQwStatus()){
-                        if(!StringUtil.strIsNullOrEmpty(companyUserQwListVO.getQwUserId())){
-                            Long[] ids = Arrays.stream(companyUserQwListVO.getQwUserId().split(","))
-                                    .map(Long::parseLong)
-                                    .toArray(Long[]::new);
-                            List<QwUserVO> qwUserVOS = qwUserService.selectQwUserVOByIds(ids);
-                            companyUserQwListVO.setQwUsers(qwUserVOS);
-                        }
-                    }
-                });
-                futures.add(future);
-            }
-            CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
-        }
-        return getDataTable(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+////        user.setCompanyId(loginUser.getCompany().getCompanyId());
+//        user.setUserId(loginUser.getCompanyUser().getUserId());
+//        List<CompanyUserQwListVO> list = companyUserService.selectCompanyUserQwListVO(user);
+//        if (!list.isEmpty()){
+//            String json = configService.selectConfigByKey("course.config");
+//            CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//            Long sendDelayTime = config.getSendDelayTime();
+//            List<CompletableFuture<Void>> futures = new ArrayList<>();
+//            for (CompanyUserQwListVO companyUserQwListVO : list) {
+//                CompletableFuture<Void> future = CompletableFuture.runAsync(() -> {
+//                    CompanyUserDelayTime companyUserDelayTime = companyUserDelayTimeService.selectCompanyUserDelayTimeByCompanyUser(companyUserQwListVO.getCompanyId(), companyUserQwListVO.getUserId());
+//                    if (ObjectUtil.isEmpty(companyUserDelayTime)) {
+//                        companyUserQwListVO.setSendDelayTime(sendDelayTime);
+//                    } else {
+//                        companyUserQwListVO.setSendDelayTime(companyUserDelayTime.getSendDelayTime());
+//                    }
+//                    //是否绑定
+//                    if(QwStatusEnum.BOUND.getCode() == companyUserQwListVO.getQwStatus()){
+//                        if(!StringUtil.strIsNullOrEmpty(companyUserQwListVO.getQwUserId())){
+//                            Long[] ids = Arrays.stream(companyUserQwListVO.getQwUserId().split(","))
+//                                    .map(Long::parseLong)
+//                                    .toArray(Long[]::new);
+//                            List<QwUserVO> qwUserVOS = qwUserService.selectQwUserVOByIds(ids);
+//                            companyUserQwListVO.setQwUsers(qwUserVOS);
+//                        }
+//                    }
+//                });
+//                futures.add(future);
+//            }
+//            CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
+//        }
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     @Log(title = "用户管理导出", businessType = BusinessType.EXPORT)
@@ -273,11 +277,12 @@ public class CompanyUserController extends BaseController {
     @GetMapping("/export")
     public AjaxResult export(CompanyUser user)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (user.getCompanyId() == null && loginUser.getCompany() != null) { user.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        List<CompanyUser> list = companyUserService.selectCompanyUserList(user);
-        ExcelUtil<CompanyUser> util = new ExcelUtil<CompanyUser>(CompanyUser.class);
-        return util.exportExcel(list, "用户数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (user.getCompanyId() == null && loginUser.getCompany() != null) { user.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        List<CompanyUser> list = companyUserService.selectCompanyUserList(user);
+//        ExcelUtil<CompanyUser> util = new ExcelUtil<CompanyUser>(CompanyUser.class);
+//        return util.exportExcel(list, "用户数据");
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -327,27 +332,28 @@ public class CompanyUserController extends BaseController {
     @GetMapping(value = { "/", "/{userId}" })
     public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
     {
-        AjaxResult ajax = AjaxResult.success();
-        CompanyRole companyRoleMap=new CompanyRole();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyRoleMap.getCompanyId() == null && loginUser.getCompany() != null) { companyRoleMap.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<CompanyRole> roles = roleService.selectCompanyRoleList(companyRoleMap);
-
-        ajax.put("roles", CompanyUser.isAdmin(loginUser.getCompanyUser().getUserType()) ? roles : roles.stream().filter(r -> r.getRoleKey()!="admin").collect(Collectors.toList()));
-
-        CompanyPost postMap=new CompanyPost();
-        if (postMap.getCompanyId() == null && loginUser.getCompany() != null) { postMap.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        ajax.put("posts", postService.selectCompanyPostList(postMap));
-        if (StringUtils.isNotNull(userId))
-        {
-            CompanyUser companyUser=companyUserService.selectCompanyUserById(userId);
-            ajax.put(AjaxResult.DATA_TAG, companyUser);
-            ajax.put("postIds", postService.selectPostListByUserId(userId));
-            ajax.put("roleIds", roleService.selectRoleListByUserId(userId));
-
-
-        }
-        return ajax;
+//        AjaxResult ajax = AjaxResult.success();
+//        CompanyRole companyRoleMap=new CompanyRole();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyRoleMap.getCompanyId() == null && loginUser.getCompany() != null) { companyRoleMap.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<CompanyRole> roles = roleService.selectCompanyRoleList(companyRoleMap);
+//
+//        ajax.put("roles", CompanyUser.isAdmin(loginUser.getCompanyUser().getUserType()) ? roles : roles.stream().filter(r -> r.getRoleKey()!="admin").collect(Collectors.toList()));
+//
+//        CompanyPost postMap=new CompanyPost();
+//        if (postMap.getCompanyId() == null && loginUser.getCompany() != null) { postMap.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        ajax.put("posts", postService.selectCompanyPostList(postMap));
+//        if (StringUtils.isNotNull(userId))
+//        {
+//            CompanyUser companyUser=companyUserService.selectCompanyUserById(userId);
+//            ajax.put(AjaxResult.DATA_TAG, companyUser);
+//            ajax.put("postIds", postService.selectPostListByUserId(userId));
+//            ajax.put("roleIds", roleService.selectRoleListByUserId(userId));
+//
+//
+//        }
+//        return ajax;
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -358,56 +364,57 @@ public class CompanyUserController extends BaseController {
     @PostMapping
     public AjaxResult add(@Validated @RequestBody CompanyUser user)
     {
-        if (!PatternUtils.checkPassword(user.getPassword())) {
-            return AjaxResult.error("密码格式不正确,需包含字母、数字和特殊字符,长度为 8-20 位");
-        }
-
-        //判断用户数量是否已达到上线
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Integer count=companyUserService.selectCompanyUserCountByCompanyId(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        Company company=companyService.selectCompanyById(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-
-        if(count>company.getLimitUserCount()){
-            return AjaxResult.error("用户数量已达到上限");
-        }
-        if (user.getCompanyId() == null && loginUser.getCompany() != null) { user.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        if (UserConstants.NOT_UNIQUE.equals(String.valueOf(companyUserService.checkUserName(user.getUserName()))))
-        {
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
-        }
-        if (!StringUtil.strIsNullOrEmpty(user.getDomain())){
-            user.setDomain(user.getDomain().replaceAll("^[\\s\\u2005]+", ""));
-        }
-
-        user.setCreateBy(SecurityUtils.getUsername());
-        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
-        user.setCreateTime(new Date());
-        user.setUserType("01");//一般用户
-        user.setIsAudit(1);
-        if (isQuantityExceeded(loginUser)){
-            return AjaxResult.error("账号数量已达上限");
-        }
-        return toAjax(companyUserService.insertUser(user));
-    }
-
-    /**
-     *
-     * 判断公司数量是否超出租户配置的数量
-     */
-    private boolean isQuantityExceeded(LoginUser loginUser){
-        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
-        TenantInfo tenantInfo = tenantInfoMapper.selectTenantInfoById(loginUser.getTenantId().toString());
-        if (tenantInfo == null) {
-            return false;
-        }
-        tenantDataSourceManager.switchTenant(tenantInfo);
-        Integer count = companyUserService.getUserCount();
-        Integer accountNum = tenantInfo.getAccountNum();
-        if (accountNum == null || count == null) {
-            return false;
-        }
-        return count >= accountNum;
-    }
+//        if (!PatternUtils.checkPassword(user.getPassword())) {
+//            return AjaxResult.error("密码格式不正确,需包含字母、数字和特殊字符,长度为 8-20 位");
+//        }
+//
+//        //判断用户数量是否已达到上线
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Integer count=companyUserService.selectCompanyUserCountByCompanyId(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        Company company=companyService.selectCompanyById(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//
+//        if(count>company.getLimitUserCount()){
+//            return AjaxResult.error("用户数量已达到上限");
+//        }
+//        if (user.getCompanyId() == null && loginUser.getCompany() != null) { user.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        if (UserConstants.NOT_UNIQUE.equals(String.valueOf(companyUserService.checkUserName(user.getUserName()))))
+//        {
+//            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
+//        }
+//        if (!StringUtil.strIsNullOrEmpty(user.getDomain())){
+//            user.setDomain(user.getDomain().replaceAll("^[\\s\\u2005]+", ""));
+//        }
+//
+//        user.setCreateBy(SecurityUtils.getUsername());
+//        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+//        user.setCreateTime(new Date());
+//        user.setUserType("01");//一般用户
+//        user.setIsAudit(1);
+//        if (isQuantityExceeded(loginUser)){
+//            return AjaxResult.error("账号数量已达上限");
+//        }
+//        return toAjax(companyUserService.insertUser(user));
+        throw new RuntimeException("not implemented");
+    }
+
+//    /**
+//     *
+//     * 判断公司数量是否超出租户配置的数量
+//     */
+//    private boolean isQuantityExceeded(LoginUser loginUser){
+//        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+//        TenantInfo tenantInfo = tenantInfoMapper.selectTenantInfoById(loginUser.getTenantId().toString());
+//        if (tenantInfo == null) {
+//            return false;
+//        }
+//        tenantDataSourceManager.switchTenant(tenantInfo);
+//        Integer count = companyUserService.getUserCount();
+//        Integer accountNum = tenantInfo.getAccountNum();
+//        if (accountNum == null || count == null) {
+//            return false;
+//        }
+//        return count >= accountNum;
+//    }
 
     /**
     * 生成创建销售的二维码
@@ -418,43 +425,44 @@ public class CompanyUserController extends BaseController {
     @PostMapping("/addCodeUrl")
     public R addCodeUrl( @RequestBody CompanyUserCodeParam user) throws Exception {
 
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-
-        QwCompany qwCompany = iQwCompanyService.getQwCompanyByRedis(user.getCorpId());
-        if (qwCompany == null || qwCompany.getCorpId() == null){
-            return R.error("企业信息不存在");
-        }
-
-        //部门
-        Long deptId = user.getDeptId();
-
-        //角色组
-        Long[] roleIds = user.getRoleIds();
-
-        //区域
-        String addressId = user.getAddressId();
-
-
-        Map<String, Object> stateMap = new HashMap<>();
-        stateMap.put("companyId", companyId);
-        stateMap.put("deptId", deptId);
-        stateMap.put("roleIds", roleIds); // 数组可以直接存放
-        stateMap.put("addressId", addressId);
-
-        // 使用JSON库将Map转换为字符串
-        ObjectMapper objectMapper = new ObjectMapper();
-        String status = objectMapper.writeValueAsString(stateMap);
-
-        // 如果要将status作为URL参数传递，记得进行URL编码！
-        String encodedStatus = URLEncoder.encode(status, StandardCharsets.UTF_8.toString());
-
-        String url="https://open.weixin.qq.com/connect/oauth2/authorize?appid="+user.getCorpId()+"&redirect_uri=" +
-                "http://"+qwCompany.getRealmNameUrl()+"/loginqw/pages/companyLogin/index?corpId="+user.getCorpId() +
-                "&response_type=code&scope=snsapi_base&state="+encodedStatus+"&agentid="+qwCompany.getServerAgentId()+"#wechat_redirect";
-
-        R andUpload = QRCodeUtils.createAndUpload(url);
-        return  R.ok().put("data",andUpload);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//
+//        QwCompany qwCompany = iQwCompanyService.getQwCompanyByRedis(user.getCorpId());
+//        if (qwCompany == null || qwCompany.getCorpId() == null){
+//            return R.error("企业信息不存在");
+//        }
+//
+//        //部门
+//        Long deptId = user.getDeptId();
+//
+//        //角色组
+//        Long[] roleIds = user.getRoleIds();
+//
+//        //区域
+//        String addressId = user.getAddressId();
+//
+//
+//        Map<String, Object> stateMap = new HashMap<>();
+//        stateMap.put("companyId", companyId);
+//        stateMap.put("deptId", deptId);
+//        stateMap.put("roleIds", roleIds); // 数组可以直接存放
+//        stateMap.put("addressId", addressId);
+//
+//        // 使用JSON库将Map转换为字符串
+//        ObjectMapper objectMapper = new ObjectMapper();
+//        String status = objectMapper.writeValueAsString(stateMap);
+//
+//        // 如果要将status作为URL参数传递，记得进行URL编码！
+//        String encodedStatus = URLEncoder.encode(status, StandardCharsets.UTF_8.toString());
+//
+//        String url="https://open.weixin.qq.com/connect/oauth2/authorize?appid="+user.getCorpId()+"&redirect_uri=" +
+//                "http://"+qwCompany.getRealmNameUrl()+"/loginqw/pages/companyLogin/index?corpId="+user.getCorpId() +
+//                "&response_type=code&scope=snsapi_base&state="+encodedStatus+"&agentid="+qwCompany.getServerAgentId()+"#wechat_redirect";
+//
+//        R andUpload = QRCodeUtils.createAndUpload(url);
+//        return  R.ok().put("data",andUpload);
+        throw new RuntimeException("not implemented");
     }
     /**
      * 修改用户
@@ -465,25 +473,26 @@ public class CompanyUserController extends BaseController {
     public AjaxResult edit(@Validated @RequestBody CompanyUser user)
     {
 
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        user.setUpdateBy(SecurityUtils.getUsername());
-
-        if (!StringUtil.strIsNullOrEmpty(user.getDomain())){
-            user.setDomain(user.getDomain().replaceAll("^[\\s\\u2005]+", ""));
-        }
-
-        CompanyUser companyUser = companyUserService.selectCompanyUserById(user.getUserId());
-
-        if (!companyUser.getUserName().equals(user.getUserName())){
-            if (UserConstants.NOT_UNIQUE.equals(String.valueOf(companyUserService.checkUserName(user.getUserName()))))
-            {
-                return AjaxResult.error("修改员工账号'" + user.getUserName() + "'失败，员工账号已存在");
-            }
-        }
-
-
-        logger.info("用户管理-修改用户:"+user.getUserName()+"/登陆人:"+loginUser.getCompanyUser().getUserId()+"/名字："+loginUser.getCompanyUser().getUserName()+"/修改的角色："+ Arrays.toString(user.getRoleIds()));
-        return toAjax(companyUserService.updateUser(user));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        user.setUpdateBy(SecurityUtils.getUsername());
+//
+//        if (!StringUtil.strIsNullOrEmpty(user.getDomain())){
+//            user.setDomain(user.getDomain().replaceAll("^[\\s\\u2005]+", ""));
+//        }
+//
+//        CompanyUser companyUser = companyUserService.selectCompanyUserById(user.getUserId());
+//
+//        if (!companyUser.getUserName().equals(user.getUserName())){
+//            if (UserConstants.NOT_UNIQUE.equals(String.valueOf(companyUserService.checkUserName(user.getUserName()))))
+//            {
+//                return AjaxResult.error("修改员工账号'" + user.getUserName() + "'失败，员工账号已存在");
+//            }
+//        }
+//
+//
+//        logger.info("用户管理-修改用户:"+user.getUserName()+"/登陆人:"+loginUser.getCompanyUser().getUserId()+"/名字："+loginUser.getCompanyUser().getUserName()+"/修改的角色："+ Arrays.toString(user.getRoleIds()));
+//        return toAjax(companyUserService.updateUser(user));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -494,14 +503,15 @@ public class CompanyUserController extends BaseController {
     @DeleteMapping("/{userIds}")
     public AjaxResult remove(@PathVariable Long[] userIds)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        for (Long userId : userIds) {
-            CompanyUserDelayTime companyUserDelayTime = companyUserDelayTimeService.selectCompanyUserDelayTimeByCompanyUser(loginUser.getCompanyUser().getCompanyId(),userId);
-            if (ObjectUtil.isNotEmpty(companyUserDelayTime)){
-                companyUserDelayTimeService.deleteCompanyUserDelayTimeById(companyUserDelayTime.getId());
-            }
-        }
-        return toAjax(companyUserService.deleteCompanyUserByIds(userIds));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        for (Long userId : userIds) {
+//            CompanyUserDelayTime companyUserDelayTime = companyUserDelayTimeService.selectCompanyUserDelayTimeByCompanyUser(loginUser.getCompanyUser().getCompanyId(),userId);
+//            if (ObjectUtil.isNotEmpty(companyUserDelayTime)){
+//                companyUserDelayTimeService.deleteCompanyUserDelayTimeById(companyUserDelayTime.getId());
+//            }
+//        }
+//        return toAjax(companyUserService.deleteCompanyUserByIds(userIds));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -512,32 +522,33 @@ public class CompanyUserController extends BaseController {
     @PutMapping("/resetPwd")
     public AjaxResult resetPwd(@RequestBody CompanyUser user)
     {
-        if (!PatternUtils.checkPassword(user.getPassword())) {
-            return AjaxResult.error("密码格式不正确,需包含字母、数字和特殊字符,长度为 8-20 位");
-        }
-
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-
-        String newPassword = SecurityUtils.encryptPassword(user.getPassword());
-        int i = companyUserService.resetUserPwdByUserId(user.getUserId(), newPassword);
-
-        if (i > 0) {
-            // 更新缓存用户密码
-            loginUser.getCompanyUser().setPassword(SecurityUtils.encryptPassword(newPassword));
-            tokenService.setLoginUser(loginUser);
-            cleanFirstLogin(loginUser);
-        }
-
-        return toAjax(i);
+//        if (!PatternUtils.checkPassword(user.getPassword())) {
+//            return AjaxResult.error("密码格式不正确,需包含字母、数字和特殊字符,长度为 8-20 位");
+//        }
+//
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//
+//        String newPassword = SecurityUtils.encryptPassword(user.getPassword());
+//        int i = companyUserService.resetUserPwdByUserId(user.getUserId(), newPassword);
+//
+//        if (i > 0) {
+//            // 更新缓存用户密码
+//            loginUser.getCompanyUser().setPassword(SecurityUtils.encryptPassword(newPassword));
+//            tokenService.setLoginUser(loginUser);
+//            cleanFirstLogin(loginUser);
+//        }
+//
+//        return toAjax(i);
+        throw new RuntimeException("not implemented");
     }
 
-    /**
-     * 去除首次登录的标志
-     * @param loginUser
-     */
-    private void cleanFirstLogin(LoginUser loginUser) {
-        redisCache.deleteObject("newCompanyUser:" + loginUser.getCompanyUser().getCompanyId() + ":" + loginUser.getCompanyUser().getUserName());
-    }
+//    /**
+//     * 去除首次登录的标志
+//     * @param loginUser
+//     */
+//    private void cleanFirstLogin(LoginUser loginUser) {
+//        redisCache.deleteObject("newCompanyUser:" + loginUser.getCompanyUser().getCompanyId() + ":" + loginUser.getCompanyUser().getUserName());
+//    }
     /**
      * 状态修改
      */
@@ -546,13 +557,14 @@ public class CompanyUserController extends BaseController {
     @PutMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody CompanyUser user)
     {
-        //管理员的状态不能修改
-        CompanyUser companyUser=companyUserService.selectCompanyUserById(user.getUserId());
-        if(companyUser.isAdmin()){
-            return AjaxResult.error("不能修改管理员状态");
-        }
-        user.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(companyUserService.updateCompanyUser(user));
+//        //管理员的状态不能修改
+//        CompanyUser companyUser=companyUserService.selectCompanyUserById(user.getUserId());
+//        if(companyUser.isAdmin()){
+//            return AjaxResult.error("不能修改管理员状态");
+//        }
+//        user.setUpdateBy(SecurityUtils.getUsername());
+//        return toAjax(companyUserService.updateCompanyUser(user));
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -564,11 +576,12 @@ public class CompanyUserController extends BaseController {
     @GetMapping("/getAddressBookList")
     public TableDataInfo getAddressBookList(CompanyUser user)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (user.getCompanyId() == null && loginUser.getCompany() != null) { user.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        List<CompanyUserVO> list = companyUserService.selectMyUserList(user);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (user.getCompanyId() == null && loginUser.getCompany() != null) { user.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        List<CompanyUserVO> list = companyUserService.selectMyUserList(user);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -586,60 +599,65 @@ public class CompanyUserController extends BaseController {
     @GetMapping("/getUserListByDeptId")
     public R getUserListByDeptId(CompanyUser user)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (user.getCompanyId() == null && loginUser.getCompany() != null) { user.setCompanyId(loginUser.getCompany().getCompanyId()); }
-
-        List<CompanyUser> list = companyUserService.getUserListByDeptId(user);
-        return R.ok().put("data",list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (user.getCompanyId() == null && loginUser.getCompany() != null) { user.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//
+//        List<CompanyUser> list = companyUserService.getUserListByDeptId(user);
+//        return R.ok().put("data",list);
+        throw new RuntimeException("not implemented");
     }
 
     @GetMapping("/getSelectUserList")
     public TableDataInfo getSelectUserList(CompanyUser map)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (map.getCompanyId() == null && loginUser.getCompany() != null) { map.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        startPage();
-        List<CompanyUserVO> list = companyUserService.selecCompanyAllUsersList(map);
-        return getDataTable(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (map.getCompanyId() == null && loginUser.getCompany() != null) { map.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        startPage();
+//        List<CompanyUserVO> list = companyUserService.selecCompanyAllUsersList(map);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     @GetMapping("/getQwAllUserList/{id}")
     public R getQwAllUserList(@PathVariable("id") String corpId)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-
-        List<QwUserVO> list = companyUserService.selectCompanyQwUserList(corpId,loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        return  R.ok().put("data",list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//
+//        List<QwUserVO> list = companyUserService.selectCompanyQwUserList(corpId,loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        return  R.ok().put("data",list);
+        throw new RuntimeException("not implemented");
     }
 
     @GetMapping("/getQwMyUserList/{id}")
     public R getQwMyUserList(@PathVariable("id") String corpId)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        List<QwUserVO> list = companyUserService.selectCompanyQwUserListByMy(corpId,loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null,loginUser.getCompanyUser().getUserId());
-        return  R.ok().put("data",list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        List<QwUserVO> list = companyUserService.selectCompanyQwUserListByMy(corpId,loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null,loginUser.getCompanyUser().getUserId());
+//        return  R.ok().put("data",list);
+        throw new RuntimeException("not implemented");
     }
 
     @GetMapping("/getQwDeptUserList/{id}")
     public R getQwDeptUserList(@PathVariable("id") String corpId)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-
-        List<Long> combinedList = new ArrayList<>();
-        //本部门
-        Long deptId = loginUser.getCompanyUser().getDeptId();
-        if (deptId!=null){
-            combinedList.add(deptId);
-        }
-        //本部门的下级部门
-        List<Long> deptList = companyDeptService.selectCompanyDeptByParentId(deptId);
-        if (!deptList.isEmpty()){
-            combinedList.addAll(deptList);
-        }
-        String userType = loginUser.getCompanyUser().getUserType();
-
-        List<QwUserVO> list = companyUserService.selectCompanyQwUserListByDept(corpId,loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null,combinedList,userType);
-        return  R.ok().put("data",list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//
+//        List<Long> combinedList = new ArrayList<>();
+//        //本部门
+//        Long deptId = loginUser.getCompanyUser().getDeptId();
+//        if (deptId!=null){
+//            combinedList.add(deptId);
+//        }
+//        //本部门的下级部门
+//        List<Long> deptList = companyDeptService.selectCompanyDeptByParentId(deptId);
+//        if (!deptList.isEmpty()){
+//            combinedList.addAll(deptList);
+//        }
+//        String userType = loginUser.getCompanyUser().getUserType();
+//
+//        List<QwUserVO> list = companyUserService.selectCompanyQwUserListByDept(corpId,loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null,combinedList,userType);
+//        return  R.ok().put("data",list);
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -650,11 +668,12 @@ public class CompanyUserController extends BaseController {
     @GetMapping("/getUserListByDeptIdToQwId")
     public R getUserListByDeptIdToQwId(CompanyUser user)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (user.getCompanyId() == null && loginUser.getCompany() != null) { user.setCompanyId(loginUser.getCompany().getCompanyId()); }
-
-        List<CompanyUserQwVO> list = companyUserService.getUserListByDeptIdToQwUserid(user);
-        return R.ok().put("data",list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (user.getCompanyId() == null && loginUser.getCompany() != null) { user.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//
+//        List<CompanyUserQwVO> list = companyUserService.getUserListByDeptIdToQwUserid(user);
+//        return R.ok().put("data",list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -683,16 +702,17 @@ public class CompanyUserController extends BaseController {
     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);
-        //查询多条数据传入公司
-//        if (pageSize>=200){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        params.put("companyId", loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-//        }
-        PageHelper.startPage(pageNum, pageSize);
-        List<OptionsVO> companyUserList = companyUserService.selectCompanyUserListByMap(params);
-        return R.ok().put("data", new PageInfo<>(companyUserList));
+//        Map<String,Object> params = new HashMap<>();
+//        params.put("nickName", name);
+//        //查询多条数据传入公司
+////        if (pageSize>=200){
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        params.put("companyId", loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+////        }
+//        PageHelper.startPage(pageNum, pageSize);
+//        List<OptionsVO> companyUserList = companyUserService.selectCompanyUserListByMap(params);
+//        return R.ok().put("data", new PageInfo<>(companyUserList));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -704,41 +724,42 @@ public class CompanyUserController extends BaseController {
     public R getCompanyUserListLikeNameDept(@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);
-
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-
-        //查询多条数据传入公司
-//        if (pageSize>=200){
-
-        params.put("companyId", loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        Map<String,Object> params = new HashMap<>();
+//        params.put("nickName", name);
+//
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//
+//        //查询多条数据传入公司
+////        if (pageSize>=200){
+//
+//        params.put("companyId", loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+////        }
+//        List<Long> combinedDeptList = new ArrayList<>();
+//        //本部门
+//        Long deptId = loginUser.getCompanyUser().getDeptId();
+//        if (deptId!=null){
+//            combinedDeptList.add(deptId);
+//
+//                //本部门的上级部门
+//                List<Long> deptList = companyDeptService.selectCompanyDeptByDeptId(deptId);
+//                if (!deptList.isEmpty()){
+//                    combinedDeptList.addAll(deptList);
+//                }
+//            }
+//
+//        //本部门的下级部门
+//        List<Long> deptList = companyDeptService.selectCompanyDeptByParentId(deptId);
+//        if (!deptList.isEmpty()){
+//            combinedDeptList.addAll(deptList);
 //        }
-        List<Long> combinedDeptList = new ArrayList<>();
-        //本部门
-        Long deptId = loginUser.getCompanyUser().getDeptId();
-        if (deptId!=null){
-            combinedDeptList.add(deptId);
-
-                //本部门的上级部门
-                List<Long> deptList = companyDeptService.selectCompanyDeptByDeptId(deptId);
-                if (!deptList.isEmpty()){
-                    combinedDeptList.addAll(deptList);
-                }
-            }
-
-        //本部门的下级部门
-        List<Long> deptList = companyDeptService.selectCompanyDeptByParentId(deptId);
-        if (!deptList.isEmpty()){
-            combinedDeptList.addAll(deptList);
-        }
-
-        params.put("combinedDeptList",combinedDeptList);
-
-
-        PageHelper.startPage(pageNum, pageSize);
-        List<OptionsVO> companyUserList = companyUserService.selectCompanyUserListByMap(params);
-        return R.ok().put("data", new PageInfo<>(companyUserList));
+//
+//        params.put("combinedDeptList",combinedDeptList);
+//
+//
+//        PageHelper.startPage(pageNum, pageSize);
+//        List<OptionsVO> companyUserList = companyUserService.selectCompanyUserListByMap(params);
+//        return R.ok().put("data", new PageInfo<>(companyUserList));
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -748,21 +769,23 @@ public class CompanyUserController extends BaseController {
     @GetMapping("/getCompanyUserList")
     public TableDataInfo getCompanyUserList(CompanyUser user)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (user.getCompanyId() == null && loginUser.getCompany() != null) { user.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        startPage();
-        List<CompanyUser> list = companyUserService.getCompanyUserList(user);
-        return getDataTable(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (user.getCompanyId() == null && loginUser.getCompany() != null) { user.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        startPage();
+//        List<CompanyUser> list = companyUserService.getCompanyUserList(user);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     @GetMapping("/generateSubDomain")
     public R generateSubDomain(CompanyUser user){
-        //获取后台配置
-        String json= configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        // 生成二级域名
-        String subDomain = "http://" + DomainUtil.generateSubDomain(config.getCourseDomainName(), 6, String.valueOf(SecurityUtils.getLoginUser().getCompanyUser().getUserId()));
-        return  R.ok().put("data",subDomain);
+//        //获取后台配置
+//        String json= configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        // 生成二级域名
+//        String subDomain = "http://" + DomainUtil.generateSubDomain(config.getCourseDomainName(), 6, String.valueOf(SecurityUtils.getLoginUser().getCompanyUser().getUserId()));
+//        return  R.ok().put("data",subDomain);
+        throw new RuntimeException("not implemented");
     }
 
     @Log(title = "设置是否需要单独注册会员", businessType = BusinessType.UPDATE)

fs-agent/src/main/java/com/fs/company/controller/company/CompanyUserDelayTimeController.java

@@ -5,6 +5,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+
+import com.fs.framework.web.service.TokenService;
 import org.springframework.context.annotation.Profile;
 
 import cn.hutool.core.util.ObjectUtil;
@@ -15,8 +17,6 @@ import com.fs.common.utils.StringUtils;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.param.CompanyUserDelayTimeParam;
 import com.fs.company.service.ICompanyUserService;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
 import com.fs.voice.utils.StringUtil;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -97,58 +97,59 @@ public class CompanyUserDelayTimeController extends BaseController
     @Log(title = "员工发送延时时间关联", businessType = BusinessType.INSERT)
     @PostMapping("/batchAdd")
     public R batchAdd(@RequestBody CompanyUserDelayTimeParam companyUserDelayTimeParam) {
-        // 参数校验
-        if (companyUserDelayTimeParam == null || StringUtils.isEmpty(companyUserDelayTimeParam.getId())) {
-            return R.error("参数不能为空");
-        }
-
-        // 获取当前登录用户信息
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (loginUser == null || loginUser.getCompany() == null) {
-            return R.error("用户未登录或公司信息不存在");
-        }
-
-        // 处理用户ID集合
-        Set<String> companyUserIds = Arrays.stream(companyUserDelayTimeParam.getId().split(","))
-                .filter(StringUtils::isNotBlank)
-                .collect(Collectors.toSet());
-
-        if (companyUserIds.isEmpty()) {
-            return R.error("用户ID不能为空");
-        }
-
-        // 批量处理延迟时间设置
-        try {
-            companyUserIds.forEach(userId -> {
-                CompanyUser companyUser = companyUserService.selectCompanyUserById(Long.valueOf(userId));
-                if (companyUser == null) {
-                    throw new RuntimeException("用户ID不存在: " + userId);
-                }
-
-                CompanyUserDelayTime delayTime = new CompanyUserDelayTime();
-                if (delayTime.getCompanyId() == null && loginUser.getCompany() != null) { delayTime.setCompanyId(loginUser.getCompany().getCompanyId()); };
-                delayTime.setCompanyUserId(Long.valueOf(userId));
-                delayTime.setNickName(companyUser.getNickName());
-                delayTime.setRemark(companyUserDelayTimeParam.getRemark());
-                delayTime.setCreateBy(loginUser.getCompanyUser().getNickName());
-                delayTime.setSendDelayTime(Long.valueOf(companyUserDelayTimeParam.getSendDelayTime()));
-
-                CompanyUserDelayTime companyUserDelayTime = companyUserDelayTimeService.selectCompanyUserDelayTimeByCompanyUser(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null,Long.valueOf(userId));
-                if (ObjectUtil.isEmpty(companyUserDelayTime)){
-                    companyUserDelayTimeService.insertCompanyUserDelayTime(delayTime);
-                }else {
-                    delayTime.setId(companyUserDelayTime.getId());
-                    companyUserDelayTimeService.updateCompanyUserDelayTime(delayTime);
-                }
-            });
-            return R.ok();
-        } catch (RuntimeException e) {
-            e.fillInStackTrace();
-            return R.error(e.getMessage());
-        } catch (Exception e) {
-            e.fillInStackTrace();
-            return R.error("批量设置延迟时间失败");
-        }
+//        // 参数校验
+//        if (companyUserDelayTimeParam == null || StringUtils.isEmpty(companyUserDelayTimeParam.getId())) {
+//            return R.error("参数不能为空");
+//        }
+//
+//        // 获取当前登录用户信息
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (loginUser == null || loginUser.getCompany() == null) {
+//            return R.error("用户未登录或公司信息不存在");
+//        }
+//
+//        // 处理用户ID集合
+//        Set<String> companyUserIds = Arrays.stream(companyUserDelayTimeParam.getId().split(","))
+//                .filter(StringUtils::isNotBlank)
+//                .collect(Collectors.toSet());
+//
+//        if (companyUserIds.isEmpty()) {
+//            return R.error("用户ID不能为空");
+//        }
+//
+//        // 批量处理延迟时间设置
+//        try {
+//            companyUserIds.forEach(userId -> {
+//                CompanyUser companyUser = companyUserService.selectCompanyUserById(Long.valueOf(userId));
+//                if (companyUser == null) {
+//                    throw new RuntimeException("用户ID不存在: " + userId);
+//                }
+//
+//                CompanyUserDelayTime delayTime = new CompanyUserDelayTime();
+//                if (delayTime.getCompanyId() == null && loginUser.getCompany() != null) { delayTime.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//                delayTime.setCompanyUserId(Long.valueOf(userId));
+//                delayTime.setNickName(companyUser.getNickName());
+//                delayTime.setRemark(companyUserDelayTimeParam.getRemark());
+//                delayTime.setCreateBy(loginUser.getCompanyUser().getNickName());
+//                delayTime.setSendDelayTime(Long.valueOf(companyUserDelayTimeParam.getSendDelayTime()));
+//
+//                CompanyUserDelayTime companyUserDelayTime = companyUserDelayTimeService.selectCompanyUserDelayTimeByCompanyUser(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null,Long.valueOf(userId));
+//                if (ObjectUtil.isEmpty(companyUserDelayTime)){
+//                    companyUserDelayTimeService.insertCompanyUserDelayTime(delayTime);
+//                }else {
+//                    delayTime.setId(companyUserDelayTime.getId());
+//                    companyUserDelayTimeService.updateCompanyUserDelayTime(delayTime);
+//                }
+//            });
+//            return R.ok();
+//        } catch (RuntimeException e) {
+//            e.fillInStackTrace();
+//            return R.error(e.getMessage());
+//        } catch (Exception e) {
+//            e.fillInStackTrace();
+//            return R.error("批量设置延迟时间失败");
+//        }
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -159,32 +160,33 @@ public class CompanyUserDelayTimeController extends BaseController
     @Log(title = "员工发送延时时间关联", businessType = BusinessType.INSERT)
     @PostMapping()
     public AjaxResult add(@RequestBody CompanyUserDelayTime companyUserDelayTime) {
-        // 获取当前登录用户信息
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-
-        // 设置基本信息
-        companyUserDelayTime.setCompanyId(companyId);
-        companyUserDelayTime.setCreateBy(loginUser.getCompanyUser().getNickName());
-
-        // 验证并设置用户信息
-        Long companyUserId = companyUserDelayTime.getCompanyUserId();
-        CompanyUser companyUser = companyUserService.selectCompanyUserById(companyUserId);
-        if (companyUser == null) {
-            throw new ServiceException("员工信息不存在");
-        }
-        companyUserDelayTime.setNickName(companyUser.getNickName());
-
-        // 检查是否已存在延时时间记录
-        CompanyUserDelayTime existingDelayTime = companyUserDelayTimeService
-                .selectCompanyUserDelayTimeByCompanyUser(companyId, companyUser.getUserId());
-        if (existingDelayTime != null) {
-            throw new ServiceException("该员工已经绑定过延时时间信息");
-        }
-
-        // 插入新记录
-        int result = companyUserDelayTimeService.insertCompanyUserDelayTime(companyUserDelayTime);
-        return toAjax(result);
+//        // 获取当前登录用户信息
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//
+//        // 设置基本信息
+//        companyUserDelayTime.setCompanyId(companyId);
+//        companyUserDelayTime.setCreateBy(loginUser.getCompanyUser().getNickName());
+//
+//        // 验证并设置用户信息
+//        Long companyUserId = companyUserDelayTime.getCompanyUserId();
+//        CompanyUser companyUser = companyUserService.selectCompanyUserById(companyUserId);
+//        if (companyUser == null) {
+//            throw new ServiceException("员工信息不存在");
+//        }
+//        companyUserDelayTime.setNickName(companyUser.getNickName());
+//
+//        // 检查是否已存在延时时间记录
+//        CompanyUserDelayTime existingDelayTime = companyUserDelayTimeService
+//                .selectCompanyUserDelayTimeByCompanyUser(companyId, companyUser.getUserId());
+//        if (existingDelayTime != null) {
+//            throw new ServiceException("该员工已经绑定过延时时间信息");
+//        }
+//
+//        // 插入新记录
+//        int result = companyUserDelayTimeService.insertCompanyUserDelayTime(companyUserDelayTime);
+//        return toAjax(result);
+        throw new RuntimeException("not implemented");
     }
 
     /**

fs-agent/src/main/java/com/fs/company/controller/company/CompanyVoiceApiController.java

@@ -8,8 +8,7 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.company.domain.CompanyVoiceApi;
 import com.fs.company.service.ICompanyVoiceApiService;
 import com.fs.company.service.ICompanyVoiceMobileService;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.voice.service.IVoiceService;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -55,10 +54,11 @@ public class CompanyVoiceApiController extends BaseController {
                         @ApiParam(required = false, name = "packageOrderId", value = "套餐订单ID") @RequestParam(value = "packageOrderId", required = false) Long packageOrderId
     ) throws Exception
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-        if (companyId == null) { return R.error("请选择租户"); }
-        return voiceService.voiceCall(companyId,customerId,contactsId,loginUser.getCompanyUser().getUserId(),orderId,packageOrderId);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//        if (companyId == null) { return R.error("请选择租户"); }
+//        return voiceService.voiceCall(companyId,customerId,contactsId,loginUser.getCompanyUser().getUserId(),orderId,packageOrderId);
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -73,8 +73,9 @@ public class CompanyVoiceApiController extends BaseController {
     @GetMapping(value="/getSipAccount")
     public R getSipAccount() throws Exception
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        return voiceService.getSipAccount(loginUser.getCompanyUser().getUserId());
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        return voiceService.getSipAccount(loginUser.getCompanyUser().getUserId());
+        throw new RuntimeException("not implemented");
     }
 
 }

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

@@ -14,8 +14,7 @@ import com.fs.company.param.CompanyVoiceCallerParam;
 import com.fs.company.service.ICompanyService;
 import com.fs.company.service.ICompanyVoiceCallerService;
 import com.fs.company.vo.CompanyVoiceCallerListVO;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -51,11 +50,12 @@ public class CompanyVoiceCallerController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(CompanyVoiceCallerParam param)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<CompanyVoiceCallerListVO> list = companyVoiceCallerService.selectCompanyVoiceCallerListVO(param);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<CompanyVoiceCallerListVO> list = companyVoiceCallerService.selectCompanyVoiceCallerListVO(param);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -66,11 +66,12 @@ public class CompanyVoiceCallerController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(CompanyVoiceCallerParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        List<CompanyVoiceCallerListVO> list = companyVoiceCallerService.selectCompanyVoiceCallerListVO(param);
-        ExcelUtil<CompanyVoiceCallerListVO> util = new ExcelUtil<CompanyVoiceCallerListVO>(CompanyVoiceCallerListVO.class);
-        return util.exportExcel(list, "companyCalling");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        List<CompanyVoiceCallerListVO> list = companyVoiceCallerService.selectCompanyVoiceCallerListVO(param);
+//        ExcelUtil<CompanyVoiceCallerListVO> util = new ExcelUtil<CompanyVoiceCallerListVO>(CompanyVoiceCallerListVO.class);
+//        return util.exportExcel(list, "companyCalling");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -95,35 +96,36 @@ public class CompanyVoiceCallerController extends BaseController
 //        if(!checkCode.equals(caller.getCode().toString())){
 //            return R.error("验证码不正确");
 //        }
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Company company=companyService.selectCompanyById(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        //获取已分配置所有坐席数
-        Integer counts=companyVoiceCallerService.selectCompanyVoiceCallerCountsByCompanyId(company.getCompanyId());
-        if(counts>=company.getVoiceCallerNumber()){
-            return R.error("没有可分配置的坐席号");
-        }
-        CompanyVoiceCaller checkCaller=companyVoiceCallerService.selectCompanyVoiceCallerById(caller.getCallerId());
-        if(checkCaller.getStatus()==0){
-            return R.error("此坐席号已绑定");
-        }
-        //处理 是否已添加
-        CompanyVoiceCaller check=companyVoiceCallerService.selectCompanyVoiceCallerByUserId(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null,caller.getCompanyUserId());
-        if(check!=null){
-            return R.error("此员工已绑定为坐席");
-        }
-        caller.setCallerNo(caller.getCallerNo());
-        if (caller.getCompanyId() == null && loginUser.getCompany() != null) { caller.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        caller.setCompanyUserId(caller.getCompanyUserId());
-        caller.setStatus(0);
-        caller.setBindTime(new Date());
-        if(companyVoiceCallerService.updateCompanyVoiceCaller(caller)>0){
-//            redisTemplate.opsForValue().set(caller.getMobile(),null);
-            return R.ok("操作成功");
-        }
-        else
-        {
-            return R.error("操作失败");
-        }
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Company company=companyService.selectCompanyById(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        //获取已分配置所有坐席数
+//        Integer counts=companyVoiceCallerService.selectCompanyVoiceCallerCountsByCompanyId(company.getCompanyId());
+//        if(counts>=company.getVoiceCallerNumber()){
+//            return R.error("没有可分配置的坐席号");
+//        }
+//        CompanyVoiceCaller checkCaller=companyVoiceCallerService.selectCompanyVoiceCallerById(caller.getCallerId());
+//        if(checkCaller.getStatus()==0){
+//            return R.error("此坐席号已绑定");
+//        }
+//        //处理 是否已添加
+//        CompanyVoiceCaller check=companyVoiceCallerService.selectCompanyVoiceCallerByUserId(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null,caller.getCompanyUserId());
+//        if(check!=null){
+//            return R.error("此员工已绑定为坐席");
+//        }
+//        caller.setCallerNo(caller.getCallerNo());
+//        if (caller.getCompanyId() == null && loginUser.getCompany() != null) { caller.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        caller.setCompanyUserId(caller.getCompanyUserId());
+//        caller.setStatus(0);
+//        caller.setBindTime(new Date());
+//        if(companyVoiceCallerService.updateCompanyVoiceCaller(caller)>0){
+////            redisTemplate.opsForValue().set(caller.getMobile(),null);
+//            return R.ok("操作成功");
+//        }
+//        else
+//        {
+//            return R.error("操作失败");
+//        }
+        throw new RuntimeException("not implemented");
 
     }
 

fs-agent/src/main/java/com/fs/company/controller/company/CompanyVoiceCloneController.java

@@ -9,8 +9,7 @@ import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
 import com.fs.company.domain.CompanyVoiceCloneRef;
 import com.fs.company.service.ICompanyVoiceCloneService;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -38,11 +37,12 @@ public class CompanyVoiceCloneController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(CompanyVoiceCloneRef query)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (query.getCompanyId() == null && loginUser.getCompany() != null) { query.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<CompanyVoiceCloneRef> list = companyVoiceCloneService.selectCompanyVoiceCloneRefList(query);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (query.getCompanyId() == null && loginUser.getCompany() != null) { query.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<CompanyVoiceCloneRef> list = companyVoiceCloneService.selectCompanyVoiceCloneRefList(query);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -63,9 +63,10 @@ public class CompanyVoiceCloneController extends BaseController {
             @RequestParam(value = "language", defaultValue = "0") Integer language,
             @RequestParam(value = "model_type", defaultValue = "2") Integer modelType) {
 
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        return companyVoiceCloneService.uploadAndTrain(voiceName, speakerId, language, modelType, file,loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null,
-                loginUser.getCompanyUser().getUserId());
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        return companyVoiceCloneService.uploadAndTrain(voiceName, speakerId, language, modelType, file,loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null,
+//                loginUser.getCompanyUser().getUserId());
+        throw new RuntimeException("not implemented");
     }
 
     /**

fs-agent/src/main/java/com/fs/company/controller/company/CompanyVoiceLogsController.java

@@ -12,8 +12,7 @@ import com.fs.company.domain.CompanyVoiceLogs;
 import com.fs.company.param.CompanyVoiceLogsParam;
 import com.fs.company.service.ICompanyVoiceLogsService;
 import com.fs.company.vo.CompanyVoiceLogsVO;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -44,28 +43,29 @@ public class CompanyVoiceLogsController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(CompanyVoiceLogsParam param)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<CompanyVoiceLogsVO> list = companyVoiceLogsService.selectCompanyVoiceLogsVOList(param);
-        if (list != null) {
-            for (CompanyVoiceLogsVO vo : list) {
-                vo.setCalleePhone(ParseUtils.parsePhone(vo.getCalleePhone()));
-                vo.setCallerPhone(ParseUtils.parsePhone(vo.getCallerPhone()));
-                vo.setDisplayCalleeNumber(ParseUtils.parsePhone(vo.getDisplayCalleeNumber()));
-                vo.setDisplayCallerNumber(ParseUtils.parsePhone(vo.getDisplayCallerNumber()));
-                if (vo.getRemark()!=null&&vo.getRemark().length()>11){
-                    StringBuilder replace = new StringBuilder(vo.getRemark()).replace(vo.getRemark().length() - 8, vo.getRemark().length() - 4, "*****");
-                    vo.setRemark(replace.toString());
-                }
-                if (vo.getVoiceTitle()!=null&&vo.getVoiceTitle().length()>11){
-                    StringBuilder replace = new StringBuilder(vo.getVoiceTitle()).replace(vo.getVoiceTitle().length() - 8, vo.getVoiceTitle().length() - 4, "*****");
-                    vo.setVoiceTitle(replace.toString());
-                }
-            }
-        }
-
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<CompanyVoiceLogsVO> list = companyVoiceLogsService.selectCompanyVoiceLogsVOList(param);
+//        if (list != null) {
+//            for (CompanyVoiceLogsVO vo : list) {
+//                vo.setCalleePhone(ParseUtils.parsePhone(vo.getCalleePhone()));
+//                vo.setCallerPhone(ParseUtils.parsePhone(vo.getCallerPhone()));
+//                vo.setDisplayCalleeNumber(ParseUtils.parsePhone(vo.getDisplayCalleeNumber()));
+//                vo.setDisplayCallerNumber(ParseUtils.parsePhone(vo.getDisplayCallerNumber()));
+//                if (vo.getRemark()!=null&&vo.getRemark().length()>11){
+//                    StringBuilder replace = new StringBuilder(vo.getRemark()).replace(vo.getRemark().length() - 8, vo.getRemark().length() - 4, "*****");
+//                    vo.setRemark(replace.toString());
+//                }
+//                if (vo.getVoiceTitle()!=null&&vo.getVoiceTitle().length()>11){
+//                    StringBuilder replace = new StringBuilder(vo.getVoiceTitle()).replace(vo.getVoiceTitle().length() - 8, vo.getVoiceTitle().length() - 4, "*****");
+//                    vo.setVoiceTitle(replace.toString());
+//                }
+//            }
+//        }
+//
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -76,24 +76,25 @@ public class CompanyVoiceLogsController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(CompanyVoiceLogs companyVoiceLogs)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyVoiceLogs.getCompanyId() == null && loginUser.getCompany() != null) { companyVoiceLogs.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<CompanyVoiceLogs> list = companyVoiceLogsService.selectCompanyVoiceLogsList(companyVoiceLogs);
-        for (CompanyVoiceLogs vo : list) {
-            vo.setCalleePhone(ParseUtils.parsePhone(vo.getCalleePhone()));
-            vo.setCallerPhone(ParseUtils.parsePhone(vo.getCallerPhone()));
-            vo.setDisplayCalleeNumber(ParseUtils.parsePhone(vo.getDisplayCalleeNumber()));
-            vo.setDisplayCallerNumber(ParseUtils.parsePhone(vo.getDisplayCallerNumber()));
-            if (vo.getRemark()!=null&&vo.getRemark().length()>11){
-                StringBuilder replace = new StringBuilder(vo.getRemark()).replace(vo.getRemark().length() - 8, vo.getRemark().length() - 4, "*****");
-                vo.setRemark(replace.toString());
-            }
-            if (vo.getVoiceTitle()!=null&&vo.getVoiceTitle().length()>11){
-                StringBuilder replace = new StringBuilder(vo.getVoiceTitle()).replace(vo.getVoiceTitle().length() - 8, vo.getVoiceTitle().length() - 4, "*****");
-                vo.setVoiceTitle(replace.toString());
-            }
-        }
-        ExcelUtil<CompanyVoiceLogs> util = new ExcelUtil<CompanyVoiceLogs>(CompanyVoiceLogs.class);
-        return util.exportExcel(list, "companyVoiceLogs");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyVoiceLogs.getCompanyId() == null && loginUser.getCompany() != null) { companyVoiceLogs.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<CompanyVoiceLogs> list = companyVoiceLogsService.selectCompanyVoiceLogsList(companyVoiceLogs);
+//        for (CompanyVoiceLogs vo : list) {
+//            vo.setCalleePhone(ParseUtils.parsePhone(vo.getCalleePhone()));
+//            vo.setCallerPhone(ParseUtils.parsePhone(vo.getCallerPhone()));
+//            vo.setDisplayCalleeNumber(ParseUtils.parsePhone(vo.getDisplayCalleeNumber()));
+//            vo.setDisplayCallerNumber(ParseUtils.parsePhone(vo.getDisplayCallerNumber()));
+//            if (vo.getRemark()!=null&&vo.getRemark().length()>11){
+//                StringBuilder replace = new StringBuilder(vo.getRemark()).replace(vo.getRemark().length() - 8, vo.getRemark().length() - 4, "*****");
+//                vo.setRemark(replace.toString());
+//            }
+//            if (vo.getVoiceTitle()!=null&&vo.getVoiceTitle().length()>11){
+//                StringBuilder replace = new StringBuilder(vo.getVoiceTitle()).replace(vo.getVoiceTitle().length() - 8, vo.getVoiceTitle().length() - 4, "*****");
+//                vo.setVoiceTitle(replace.toString());
+//            }
+//        }
+//        ExcelUtil<CompanyVoiceLogs> util = new ExcelUtil<CompanyVoiceLogs>(CompanyVoiceLogs.class);
+//        return util.exportExcel(list, "companyVoiceLogs");
+        throw new RuntimeException("not implemented");
     }
 }

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

@@ -14,8 +14,7 @@ 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 com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -57,11 +56,12 @@ public class CompanyVoicePackageOrderController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(CompanyVoicePackageOrderListParam param)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }; };
-        List<CompanyVoicePackageOrderListVO> list = voicePackageOrderService.selectCompanyVoicePackageOrderListVO(param);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }; };
+//        List<CompanyVoicePackageOrderListVO> list = voicePackageOrderService.selectCompanyVoicePackageOrderListVO(param);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -69,11 +69,12 @@ public class CompanyVoicePackageOrderController extends BaseController
     @PostMapping("/buy")
     public R buy(@RequestBody CompanyPackageBuyParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
-         //处理企业余额是否购
-        param.setCreateBy(loginUser.getCompanyUser().getNickName());
-        return voicePackageOrderService.buy(param);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//         //处理企业余额是否购
+//        param.setCreateBy(loginUser.getCompanyUser().getNickName());
+//        return voicePackageOrderService.buy(param);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -84,11 +85,12 @@ public class CompanyVoicePackageOrderController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(CompanyVoicePackageOrderListParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        List<CompanyVoicePackageOrderListVO> list = voicePackageOrderService.selectCompanyVoicePackageOrderListVO(param);
-        ExcelUtil<CompanyVoicePackageOrderListVO> util = new ExcelUtil<CompanyVoicePackageOrderListVO>(CompanyVoicePackageOrderListVO.class);
-        return util.exportExcel(list, "companyPackageOrder");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        List<CompanyVoicePackageOrderListVO> list = voicePackageOrderService.selectCompanyVoicePackageOrderListVO(param);
+//        ExcelUtil<CompanyVoicePackageOrderListVO> util = new ExcelUtil<CompanyVoicePackageOrderListVO>(CompanyVoicePackageOrderListVO.class);
+//        return util.exportExcel(list, "companyPackageOrder");
+        throw new RuntimeException("not implemented");
     }
 
 

fs-agent/src/main/java/com/fs/company/controller/company/CompanyVoiceRoboticCallBlacklistController.java

@@ -9,8 +9,7 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.company.domain.CompanyVoiceRoboticCallBlacklist;
 import com.fs.company.service.ICompanyVoiceRoboticCallBlacklistService;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -41,11 +40,12 @@ public class CompanyVoiceRoboticCallBlacklistController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(CompanyVoiceRoboticCallBlacklist companyVoiceRoboticCallBlacklist)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyVoiceRoboticCallBlacklist.getCompanyId() == null && loginUser.getCompany() != null) { companyVoiceRoboticCallBlacklist.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<CompanyVoiceRoboticCallBlacklist> list = companyVoiceRoboticCallBlacklistService.selectCompanyVoiceRoboticCallBlacklistList(companyVoiceRoboticCallBlacklist);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyVoiceRoboticCallBlacklist.getCompanyId() == null && loginUser.getCompany() != null) { companyVoiceRoboticCallBlacklist.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<CompanyVoiceRoboticCallBlacklist> list = companyVoiceRoboticCallBlacklistService.selectCompanyVoiceRoboticCallBlacklistList(companyVoiceRoboticCallBlacklist);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -79,9 +79,10 @@ public class CompanyVoiceRoboticCallBlacklistController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CompanyVoiceRoboticCallBlacklist companyVoiceRoboticCallBlacklist)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyVoiceRoboticCallBlacklist.getCompanyId() == null && loginUser.getCompany() != null) { companyVoiceRoboticCallBlacklist.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        return toAjax(companyVoiceRoboticCallBlacklistService.insertCompanyVoiceRoboticCallBlacklist(companyVoiceRoboticCallBlacklist));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyVoiceRoboticCallBlacklist.getCompanyId() == null && loginUser.getCompany() != null) { companyVoiceRoboticCallBlacklist.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        return toAjax(companyVoiceRoboticCallBlacklistService.insertCompanyVoiceRoboticCallBlacklist(companyVoiceRoboticCallBlacklist));
+        throw new RuntimeException("not implemented");
     }
 
     /**

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

@@ -33,8 +33,7 @@ import com.fs.company.vo.CdrDetailVo;
 import com.fs.company.vo.DocCompanyUserVO;
 import com.fs.company.vo.WorkflowExecRecordVo;
 import com.fs.crm.service.ICrmCustomerPropertyService;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -82,12 +81,13 @@ public class CompanyVoiceRoboticController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:companyVoiceRobotic:list')")
     @GetMapping("/list")
     public TableDataInfo list(CompanyVoiceRobotic companyVoiceRobotic){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyVoiceRobotic.getCompanyId() == null && loginUser.getCompany() != null) { if (companyVoiceRobotic.getCompanyId() == null && loginUser.getCompany() != null) { if (companyVoiceRobotic.getCompanyId() == null && loginUser.getCompany() != null) { companyVoiceRobotic.setCompanyId(loginUser.getCompany().getCompanyId()); }; }; };
-        startPage();
-        List<CompanyVoiceRobotic> list = companyVoiceRoboticService.selectCompanyVoiceRoboticListCompany(companyVoiceRobotic);
-        fillUserInfo(list);
-        return getDataTable(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyVoiceRobotic.getCompanyId() == null && loginUser.getCompany() != null) { if (companyVoiceRobotic.getCompanyId() == null && loginUser.getCompany() != null) { if (companyVoiceRobotic.getCompanyId() == null && loginUser.getCompany() != null) { companyVoiceRobotic.setCompanyId(loginUser.getCompany().getCompanyId()); }; }; };
+//        startPage();
+//        List<CompanyVoiceRobotic> list = companyVoiceRoboticService.selectCompanyVoiceRoboticListCompany(companyVoiceRobotic);
+//        fillUserInfo(list);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
     /**
      * 查询机器人外呼任务列表
@@ -95,9 +95,10 @@ public class CompanyVoiceRoboticController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:companyVoiceRobotic:list')")
     @GetMapping("/listAll")
     public R listAll(CompanyVoiceRobotic companyVoiceRobotic){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyVoiceRobotic.getCompanyId() == null && loginUser.getCompany() != null) { companyVoiceRobotic.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        return R.ok().put("data", companyVoiceRoboticService.selectCompanyVoiceRoboticListCompany(companyVoiceRobotic));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyVoiceRobotic.getCompanyId() == null && loginUser.getCompany() != null) { companyVoiceRobotic.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        return R.ok().put("data", companyVoiceRoboticService.selectCompanyVoiceRoboticListCompany(companyVoiceRobotic));
+        throw new RuntimeException("not implemented");
     }
     @PreAuthorize("@ss.hasPermi('system:companyVoiceRobotic:list')")
     @GetMapping("/calleesList")
@@ -131,11 +132,12 @@ public class CompanyVoiceRoboticController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(CompanyVoiceRobotic companyVoiceRobotic)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyVoiceRobotic.getCompanyId() == null && loginUser.getCompany() != null) { companyVoiceRobotic.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        List<CompanyVoiceRobotic> list = companyVoiceRoboticService.selectCompanyVoiceRoboticListCompany(companyVoiceRobotic);
-        ExcelUtil<CompanyVoiceRobotic> util = new ExcelUtil<CompanyVoiceRobotic>(CompanyVoiceRobotic.class);
-        return util.exportExcel(list, "robotic");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyVoiceRobotic.getCompanyId() == null && loginUser.getCompany() != null) { companyVoiceRobotic.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        List<CompanyVoiceRobotic> list = companyVoiceRoboticService.selectCompanyVoiceRoboticListCompany(companyVoiceRobotic);
+//        ExcelUtil<CompanyVoiceRobotic> util = new ExcelUtil<CompanyVoiceRobotic>(CompanyVoiceRobotic.class);
+//        return util.exportExcel(list, "robotic");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -156,11 +158,12 @@ public class CompanyVoiceRoboticController extends BaseController
     @PostMapping
     @Transactional
     public AjaxResult add(@RequestBody CompanyVoiceRobotic companyVoiceRobotic){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        companyVoiceRobotic.setCreateUser(loginUser.getCompanyUser().getUserId());
-        companyVoiceRobotic.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-        if (companyVoiceRobotic.getCompanyId() == null && loginUser.getCompany() != null) { companyVoiceRobotic.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        return toAjax(companyVoiceRoboticService.insertCompanyVoiceRobotic(companyVoiceRobotic));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        companyVoiceRobotic.setCreateUser(loginUser.getCompanyUser().getUserId());
+//        companyVoiceRobotic.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        if (companyVoiceRobotic.getCompanyId() == null && loginUser.getCompany() != null) { companyVoiceRobotic.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        return toAjax(companyVoiceRoboticService.insertCompanyVoiceRobotic(companyVoiceRobotic));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -190,44 +193,48 @@ public class CompanyVoiceRoboticController extends BaseController
      */
     @GetMapping("/getTypes")
     public R getTypes(){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-        if (companyId == null) {
-            return R.error("未关联企业信息");
-        }
-        List<GetairobotResult> getairobotlist = aiCallService.getairobotlist(companyId);
-        List<EditDialogResult> editDialogResults = aiCallService.queryDialog(companyId);
-        return R.ok().put("robot", getairobotlist).put("dialog", editDialogResults);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//        if (companyId == null) {
+//            return R.error("未关联企业信息");
+//        }
+//        List<GetairobotResult> getairobotlist = aiCallService.getairobotlist(companyId);
+//        List<EditDialogResult> editDialogResults = aiCallService.queryDialog(companyId);
+//        return R.ok().put("robot", getairobotlist).put("dialog", editDialogResults);
+        throw new RuntimeException("not implemented");
     }
     /**
      * 查询状态
      */
     @GetMapping("/statusList")
     public R statusList(String ids){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-        List<String> list = Arrays.stream(ids.split(",")).filter(StringUtils::isNotEmpty).collect(Collectors.toList());
-        return R.ok().put("data", list.stream().map(e -> aiCallService.queryCallTaskInfo(TaskInfo.builder().taskID(e).build(), companyId)).collect(Collectors.toMap(QueryCallTaskInfoResult::getTaskID, e -> e)));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//        List<String> list = Arrays.stream(ids.split(",")).filter(StringUtils::isNotEmpty).collect(Collectors.toList());
+//        return R.ok().put("data", list.stream().map(e -> aiCallService.queryCallTaskInfo(TaskInfo.builder().taskID(e).build(), companyId)).collect(Collectors.toMap(QueryCallTaskInfoResult::getTaskID, e -> e)));
+        throw new RuntimeException("not implemented");
     }
     /**
      * 启动任务
      */
     @GetMapping("/startRobotic")
     public R startRobotic(String taskId){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-        aiCallService.startCallTask(TaskInfo.builder().taskID(taskId).build(), companyId);
-        return R.ok();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//        aiCallService.startCallTask(TaskInfo.builder().taskID(taskId).build(), companyId);
+//        return R.ok();
+        throw new RuntimeException("not implemented");
     }
     /**
      * 停止任务
      */
     @GetMapping("/stopRobotic")
     public R stopRobotic(String taskId){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-        aiCallService.stopCallTask(TaskInfo.builder().taskID(taskId).build(), companyId);
-        return R.ok();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//        aiCallService.stopCallTask(TaskInfo.builder().taskID(taskId).build(), companyId);
+//        return R.ok();
+        throw new RuntimeException("not implemented");
     }
     /**
      * 员工列表
@@ -267,10 +274,11 @@ public class CompanyVoiceRoboticController extends BaseController
      */
     @GetMapping("/cidList")
     public R cidList(){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-        companyVoiceRoboticService.cidList(companyId);
-        return R.ok();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//        companyVoiceRoboticService.cidList(companyId);
+//        return R.ok();
+        throw new RuntimeException("not implemented");
     }
     /**
      * 启动任务
@@ -278,16 +286,18 @@ public class CompanyVoiceRoboticController extends BaseController
     @GetMapping("/taskRun")
     public R taskRun(Long id){
 
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        companyVoiceRoboticService.taskRun(id,loginUser.getTenantId());
-        return R.ok();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        companyVoiceRoboticService.taskRun(id,loginUser.getTenantId());
+//        return R.ok();
+        throw new RuntimeException("not implemented");
     }
 
     @GetMapping("/getCIDGroupList")
     public R getCIDGroupList(){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        List<CIDGroupListResult> cidGroupList = aiCallService.getCIDGroupList(null, loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        return R.ok().put("data", cidGroupList);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        List<CIDGroupListResult> cidGroupList = aiCallService.getCIDGroupList(null, loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        return R.ok().put("data", cidGroupList);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -319,8 +329,9 @@ public class CompanyVoiceRoboticController extends BaseController
 
     @GetMapping("/getCurrentCompanyId")
     public R getCurrentCompanyId(){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        return R.ok().put("companyId", loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        return R.ok().put("companyId", loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+        throw new RuntimeException("not implemented");
     }
     /**
      * 填充创建人信息

fs-agent/src/main/java/com/fs/company/controller/company/CompanyWorkflowController.java

@@ -14,8 +14,7 @@ import com.fs.company.param.CompanyWorkflowSaveParam;
 import com.fs.company.param.CompanyWorkflowUpdateBindWCParam;
 import com.fs.company.service.ICompanyWorkflowService;
 import com.fs.company.vo.OptionVO;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.context.annotation.Profile;
@@ -43,11 +42,12 @@ public class CompanyWorkflowController extends BaseController {
      */
     @GetMapping("/list")
     public TableDataInfo list(CompanyWorkflow fsAiWorkflow) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (fsAiWorkflow.getCompanyId() == null && loginUser.getCompany() != null) { fsAiWorkflow.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        startPage();
-        List<CompanyWorkflow> list = companyWorkflowService.selectCompanyWorkflowList(fsAiWorkflow);
-        return getDataTable(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (fsAiWorkflow.getCompanyId() == null && loginUser.getCompany() != null) { fsAiWorkflow.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        startPage();
+//        List<CompanyWorkflow> list = companyWorkflowService.selectCompanyWorkflowList(fsAiWorkflow);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -75,12 +75,13 @@ public class CompanyWorkflowController extends BaseController {
     @Log(title = "AI工作流", businessType = BusinessType.INSERT)
     @PostMapping("/save")
     public AjaxResult save(@RequestBody CompanyWorkflowSaveParam param) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        param.setCompanyUserId(loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getUserId() : null);
-        param.setUserName(loginUser.getUsername());
-        Long workflowId = companyWorkflowService.saveCompanyWorkflow(param);
-        return AjaxResult.success(workflowId);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        param.setCompanyUserId(loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getUserId() : null);
+//        param.setUserName(loginUser.getUsername());
+//        Long workflowId = companyWorkflowService.saveCompanyWorkflow(param);
+//        return AjaxResult.success(workflowId);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -176,9 +177,10 @@ public class CompanyWorkflowController extends BaseController {
      */
     @GetMapping("/optionList")
     public R optionList() {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        List<OptionVO> optionVOS = companyWorkflowService.optionList(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        return R.ok().put("data",optionVOS);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        List<OptionVO> optionVOS = companyWorkflowService.optionList(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        return R.ok().put("data",optionVOS);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -202,9 +204,10 @@ public class CompanyWorkflowController extends BaseController {
      */
     @PostMapping("/versionRollback/{versionId}")
     public AjaxResult rollbackVersion(@PathVariable Long versionId) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long workflowId = companyWorkflowService.rollbackWorkflowVersion(versionId,loginUser.getUsername());
-        return AjaxResult.success(workflowId);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long workflowId = companyWorkflowService.rollbackWorkflowVersion(versionId,loginUser.getUsername());
+//        return AjaxResult.success(workflowId);
+        throw new RuntimeException("not implemented");
     }
 
 }

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

@@ -8,8 +8,7 @@ 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.framework.web.service.TokenService;
 import com.fs.qw.param.CompanyWxUserAddGroupParam;
 import com.fs.wxUser.domain.CompanyWxUser;
 import com.fs.wxUser.param.CompanyWxUserBindFsUserParam;
@@ -46,20 +45,22 @@ public class CompanyWxUserController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(CompanyWxUserParam param)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<CompanyWxUserVO> list = companyWxUserService.selectCompanyWxUserListVO(param);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<CompanyWxUserVO> list = companyWxUserService.selectCompanyWxUserListVO(param);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     @PreAuthorize("@ss.hasPermi('company:wxUser:list')")
     @GetMapping("/listAll")
     public R listAll(CompanyWxUserParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        return R.ok().put("data", companyWxUserService.selectCompanyWxUserListVO(param));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        return R.ok().put("data", companyWxUserService.selectCompanyWxUserListVO(param));
+        throw new RuntimeException("not implemented");
     }
     /**
      * 导出个微用户列表
@@ -69,11 +70,12 @@ public class CompanyWxUserController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(CompanyWxUserParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        List<CompanyWxUserVO> list = companyWxUserService.selectCompanyWxUserListVO(param);
-        ExcelUtil<CompanyWxUserVO> util = new ExcelUtil<CompanyWxUserVO>(CompanyWxUserVO.class);
-        return util.exportExcel(list, "个微用户数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        List<CompanyWxUserVO> list = companyWxUserService.selectCompanyWxUserListVO(param);
+//        ExcelUtil<CompanyWxUserVO> util = new ExcelUtil<CompanyWxUserVO>(CompanyWxUserVO.class);
+//        return util.exportExcel(list, "个微用户数据");
+        throw new RuntimeException("not implemented");
     }
 
     /**

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

@@ -7,8 +7,7 @@ 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.framework.web.service.TokenService;
 import com.fs.wxUser.domain.CompanyWxUserGroup;
 import com.fs.wxUser.service.ICompanyWxUserGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,11 +39,12 @@ public class CompanyWxUserGroupController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(CompanyWxUserGroup companyWxUserGroup)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyWxUserGroup.getCompanyId() == null && loginUser.getCompany() != null) { companyWxUserGroup.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<CompanyWxUserGroup> list = companyWxUserGroupService.selectCompanyWxUserGroupList(companyWxUserGroup);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyWxUserGroup.getCompanyId() == null && loginUser.getCompany() != null) { companyWxUserGroup.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<CompanyWxUserGroup> list = companyWxUserGroupService.selectCompanyWxUserGroupList(companyWxUserGroup);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -55,11 +55,12 @@ public class CompanyWxUserGroupController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(CompanyWxUserGroup companyWxUserGroup)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyWxUserGroup.getCompanyId() == null && loginUser.getCompany() != null) { companyWxUserGroup.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        List<CompanyWxUserGroup> list = companyWxUserGroupService.selectCompanyWxUserGroupList(companyWxUserGroup);
-        ExcelUtil<CompanyWxUserGroup> util = new ExcelUtil<CompanyWxUserGroup>(CompanyWxUserGroup.class);
-        return util.exportExcel(list, "个微 分组数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyWxUserGroup.getCompanyId() == null && loginUser.getCompany() != null) { companyWxUserGroup.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        List<CompanyWxUserGroup> list = companyWxUserGroupService.selectCompanyWxUserGroupList(companyWxUserGroup);
+//        ExcelUtil<CompanyWxUserGroup> util = new ExcelUtil<CompanyWxUserGroup>(CompanyWxUserGroup.class);
+//        return util.exportExcel(list, "个微 分组数据");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -80,9 +81,10 @@ public class CompanyWxUserGroupController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CompanyWxUserGroup companyWxUserGroup)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyWxUserGroup.getCompanyId() == null && loginUser.getCompany() != null) { companyWxUserGroup.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        return toAjax(companyWxUserGroupService.insertCompanyWxUserGroup(companyWxUserGroup));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyWxUserGroup.getCompanyId() == null && loginUser.getCompany() != null) { companyWxUserGroup.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        return toAjax(companyWxUserGroupService.insertCompanyWxUserGroup(companyWxUserGroup));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -112,11 +114,12 @@ public class CompanyWxUserGroupController extends BaseController
     @GetMapping("/sopList")
     public TableDataInfo sopList(CompanyWxUserGroup companyWxUserGroup)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (companyWxUserGroup.getCompanyId() == null && loginUser.getCompany() != null) { companyWxUserGroup.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        List<CompanyWxUserGroup> list = companyWxUserGroupService.selectCompanyWxUserGroupList(companyWxUserGroup);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (companyWxUserGroup.getCompanyId() == null && loginUser.getCompany() != null) { companyWxUserGroup.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        List<CompanyWxUserGroup> list = companyWxUserGroupService.selectCompanyWxUserGroupList(companyWxUserGroup);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
 }

fs-agent/src/main/java/com/fs/company/controller/company/EasyCallController.java

@@ -10,8 +10,7 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.company.mapper.CompanyVoiceCloneRefMapper;
 import com.fs.company.service.easycall.IEasyCallService;
 import com.fs.company.vo.easycall.*;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,11 +61,12 @@ public class EasyCallController extends BaseController {
     @ApiOperation("获取网关列表")
     @GetMapping("/gateway/list")
     public R getGatewayList() {
-        // 获取当前登录用户的公司ID（当前仅用于传递，未涉及多公司隔离）
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompanyUser().getCompanyId();
-        List<EasyCallGatewayVO> list = easyCallService.getGatewayList(companyId);
-        return R.ok().put("data", list);
+//        // 获取当前登录用户的公司ID（当前仅用于传递，未涉及多公司隔离）
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompanyUser().getCompanyId();
+//        List<EasyCallGatewayVO> list = easyCallService.getGatewayList(companyId);
+//        return R.ok().put("data", list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -76,20 +76,21 @@ public class EasyCallController extends BaseController {
     @ApiOperation("获取大模型配置列表")
     @GetMapping("/llmAccount/list")
     public R getLlmAccountList() {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompanyUser().getCompanyId();
-        CcLlmAgentAccount ccLlmAgentAccount = new CcLlmAgentAccount();
-        if (companyId != null) {
-            List<Long> modelIds = companyBindAiModelService.selectModelIdsByCompanyId(companyId);
-            if (!modelIds.isEmpty()) {
-                ccLlmAgentAccount.setModelIds(modelIds);
-            } else {
-                return R.ok().put("data", new ArrayList<>());
-            }
-        }
-        List<CcLlmAgentAccount> list = ccLlmAgentAccountService.selectCcLlmAgentAccountList(ccLlmAgentAccount);
-//        List<EasyCallLlmAccountVO> list = easyCallService.getLlmAccountList(companyId);
-        return R.ok().put("data", list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompanyUser().getCompanyId();
+//        CcLlmAgentAccount ccLlmAgentAccount = new CcLlmAgentAccount();
+//        if (companyId != null) {
+//            List<Long> modelIds = companyBindAiModelService.selectModelIdsByCompanyId(companyId);
+//            if (!modelIds.isEmpty()) {
+//                ccLlmAgentAccount.setModelIds(modelIds);
+//            } else {
+//                return R.ok().put("data", new ArrayList<>());
+//            }
+//        }
+//        List<CcLlmAgentAccount> list = ccLlmAgentAccountService.selectCcLlmAgentAccountList(ccLlmAgentAccount);
+////        List<EasyCallLlmAccountVO> list = easyCallService.getLlmAccountList(companyId);
+//        return R.ok().put("data", list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -99,26 +100,27 @@ public class EasyCallController extends BaseController {
     @ApiOperation("获取音色列表")
     @GetMapping("/voiceCode/list")
     public R getVoiceCodeList() {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompanyUser().getCompanyId();
-
-        List<Long> ttsIds = companyVoiceCloneRefMapper.selectByCompanyIdAndCompanyUserId(companyId, loginUser.getCompany().getUserId());
-        List<CcTtsAliyun> ccTtsAliyuns = companyVoiceCloneRefMapper.selectCcTtsAliyunList();
-
-        List<EasyCallVoiceCodeVO> result = ccTtsAliyuns.stream()
-                .filter(item ->
-                        item.getPriority() == 1 || (item.getPriority() == 0 && ttsIds.contains(item.getId()))
-                )
-                .map(item -> {
-                    EasyCallVoiceCodeVO vo = new EasyCallVoiceCodeVO();
-                    vo.setVoiceCode(item.getVoiceCode());
-                    vo.setVoiceName(item.getVoiceName());
-                    vo.setVoiceSource(item.getVoiceSource());
-                    return vo;
-                })
-                .collect(Collectors.toList());
-//        List<EasyCallVoiceCodeVO> list = easyCallService.getVoiceCodeList(companyId);
-        return R.ok().put("data", result);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompanyUser().getCompanyId();
+//
+//        List<Long> ttsIds = companyVoiceCloneRefMapper.selectByCompanyIdAndCompanyUserId(companyId, loginUser.getCompany().getUserId());
+//        List<CcTtsAliyun> ccTtsAliyuns = companyVoiceCloneRefMapper.selectCcTtsAliyunList();
+//
+//        List<EasyCallVoiceCodeVO> result = ccTtsAliyuns.stream()
+//                .filter(item ->
+//                        item.getPriority() == 1 || (item.getPriority() == 0 && ttsIds.contains(item.getId()))
+//                )
+//                .map(item -> {
+//                    EasyCallVoiceCodeVO vo = new EasyCallVoiceCodeVO();
+//                    vo.setVoiceCode(item.getVoiceCode());
+//                    vo.setVoiceName(item.getVoiceName());
+//                    vo.setVoiceSource(item.getVoiceSource());
+//                    return vo;
+//                })
+//                .collect(Collectors.toList());
+////        List<EasyCallVoiceCodeVO> list = easyCallService.getVoiceCodeList(companyId);
+//        return R.ok().put("data", result);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -128,10 +130,11 @@ public class EasyCallController extends BaseController {
     @ApiOperation("获取技能组列表")
     @GetMapping("/busiGroup/list")
     public R getBusiGroupList() {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompanyUser().getCompanyId();
-        List<EasyCallBusiGroupVO> list = easyCallService.getBusiGroupList(companyId);
-        return R.ok().put("data", list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompanyUser().getCompanyId();
+//        List<EasyCallBusiGroupVO> list = easyCallService.getBusiGroupList(companyId);
+//        return R.ok().put("data", list);
+        throw new RuntimeException("not implemented");
     }
 
     // =================== 任务管理 ===================
@@ -143,10 +146,11 @@ public class EasyCallController extends BaseController {
     @ApiOperation("任务列表查询")
     @PostMapping("/task/list")
     public R getTaskList(@RequestBody EasyCallTaskQueryParam param) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompanyUser().getCompanyId();
-        EasyCallPageResult<EasyCallTaskVO> result = easyCallService.getTaskList(param, companyId);
-        return R.ok().put("data", result);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompanyUser().getCompanyId();
+//        EasyCallPageResult<EasyCallTaskVO> result = easyCallService.getTaskList(param, companyId);
+//        return R.ok().put("data", result);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -157,10 +161,11 @@ public class EasyCallController extends BaseController {
     @ApiOperation("通话记录查询")
     @PostMapping("/record/list")
     public R getRecordList(@RequestBody EasyCallRecordQueryParam param) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompanyUser().getCompanyId();
-        EasyCallPageResult<EasyCallRecordVO> result = easyCallService.getRecordList(param, companyId);
-        return R.ok().put("data", result);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompanyUser().getCompanyId();
+//        EasyCallPageResult<EasyCallRecordVO> result = easyCallService.getRecordList(param, companyId);
+//        return R.ok().put("data", result);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -170,10 +175,11 @@ public class EasyCallController extends BaseController {
     @ApiOperation("创建外呼任务")
     @PostMapping("/task/create")
     public R createTask(@RequestBody EasyCallCreateTaskParam param) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompanyUser().getCompanyId();
-        EasyCallTaskVO task = easyCallService.createTask(param, companyId);
-        return R.ok().put("data", task);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompanyUser().getCompanyId();
+//        EasyCallTaskVO task = easyCallService.createTask(param, companyId);
+//        return R.ok().put("data", task);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -184,10 +190,11 @@ public class EasyCallController extends BaseController {
     @ApiOperation("启动外呼任务")
     @GetMapping("/task/start")
     public R startTask(@RequestParam Long batchId) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompanyUser().getCompanyId();
-        easyCallService.startTask(batchId, companyId);
-        return R.ok("操作成功");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompanyUser().getCompanyId();
+//        easyCallService.startTask(batchId, companyId);
+//        return R.ok("操作成功");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -198,10 +205,11 @@ public class EasyCallController extends BaseController {
     @ApiOperation("停止外呼任务")
     @GetMapping("/task/stop")
     public R stopTask(@RequestParam Long batchId) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompanyUser().getCompanyId();
-        easyCallService.stopTask(batchId, companyId);
-        return R.ok("操作成功");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompanyUser().getCompanyId();
+//        easyCallService.stopTask(batchId, companyId);
+//        return R.ok("操作成功");
+        throw new RuntimeException("not implemented");
     }
 
     // =================== 名单管理 ===================
@@ -214,10 +222,11 @@ public class EasyCallController extends BaseController {
     @ApiOperation("AI外呼追加名单")
     @PostMapping("/callList/addAi")
     public R addAiCallList(@RequestBody EasyCallAddCallListParam param) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompanyUser().getCompanyId();
-        easyCallService.addAiCallList(param, companyId);
-        return R.ok("操作成功");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompanyUser().getCompanyId();
+//        easyCallService.addAiCallList(param, companyId);
+//        return R.ok("操作成功");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -229,10 +238,11 @@ public class EasyCallController extends BaseController {
     @ApiOperation("通用追加名单")
     @PostMapping("/callList/addCommon")
     public R addCommonCallList(@RequestBody EasyCallCommonAddCallListParam param) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompanyUser().getCompanyId();
-        easyCallService.addCommonCallList(param, companyId);
-        return R.ok("操作成功");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompanyUser().getCompanyId();
+//        easyCallService.addCommonCallList(param, companyId);
+//        return R.ok("操作成功");
+        throw new RuntimeException("not implemented");
     }
 
     // =================== 录音相关 ===================
@@ -245,9 +255,10 @@ public class EasyCallController extends BaseController {
     @ApiOperation("获取录音文件完整访问url")
     @GetMapping("/record/fileUrl")
     public R getRecordFileUrl(@RequestParam String wavFileUrl) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompanyUser().getCompanyId();
-        String fullUrl = easyCallService.getRecordFileUrl(wavFileUrl, companyId);
-        return R.ok().put("data", fullUrl);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompanyUser().getCompanyId();
+//        String fullUrl = easyCallService.getRecordFileUrl(wavFileUrl, companyId);
+//        return R.ok().put("data", fullUrl);
+        throw new RuntimeException("not implemented");
     }
 }

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

@@ -13,7 +13,7 @@ import com.fs.company.service.ICompanyUserService;
 import com.fs.company.vo.FsStoreOrderStatisticsVO;
 import com.fs.company.vo.FsStorePaymentStatisticsVO;
 import com.fs.company.vo.FsStoreProductStatisticsVO;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.service.IFsStoreOrderService;
 import com.fs.his.service.IFsStorePaymentService;
 import org.springframework.beans.factory.annotation.Autowired;

fs-agent/src/main/java/com/fs/company/controller/company/IndexStatisticsController.java

@@ -6,8 +6,7 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.company.domain.Company;
 import com.fs.company.service.ICompanyService;
 import com.fs.config.cloud.CloudHostProper;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.statis.StatisticsRedisConstant;
 import com.fs.statis.dto.*;
 import com.fs.statis.service.IStatisticsService;
@@ -49,22 +48,23 @@ public class IndexStatisticsController {
      */
     @PostMapping("/analysisPreview")
     public R analysisPreview(@RequestBody AnalysisPreviewQueryDTO param){
-        AnalysisPreviewDTO analysisPreviewDTO = null;
-        Integer type = param.getType();
-        Integer userType = param.getUserType();
-
-        if(type == null) {
-            type = 0;
-        }
-
-        if(userType == null) {
-            userType = 0;
-        }
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        analysisPreviewDTO = redisCache.getCacheObject(String.format("%s:%d:%d:%d",DATA_OVERVIEW_DEALER_ANALYSISPREVIEW,type,userType,param.getCompanyId()));
-
-        return R.ok().put("data",analysisPreviewDTO);
+//        AnalysisPreviewDTO analysisPreviewDTO = null;
+//        Integer type = param.getType();
+//        Integer userType = param.getUserType();
+//
+//        if(type == null) {
+//            type = 0;
+//        }
+//
+//        if(userType == null) {
+//            userType = 0;
+//        }
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        analysisPreviewDTO = redisCache.getCacheObject(String.format("%s:%d:%d:%d",DATA_OVERVIEW_DEALER_ANALYSISPREVIEW,type,userType,param.getCompanyId()));
+//
+//        return R.ok().put("data",analysisPreviewDTO);
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -73,11 +73,12 @@ public class IndexStatisticsController {
      */
     @GetMapping("/rechargeComsumption")
     public R rechargeComsumption(){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-
-        ConsumptionBalanceDataDTO consumptionBalanceDataDTO = redisCache.getCacheObject(String.format("%s:%d",StatisticsRedisConstant.DATA_OVERVIEW_DEALER_BALANCE,companyId));
-        return R.ok().put("data", consumptionBalanceDataDTO);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//
+//        ConsumptionBalanceDataDTO consumptionBalanceDataDTO = redisCache.getCacheObject(String.format("%s:%d",StatisticsRedisConstant.DATA_OVERVIEW_DEALER_BALANCE,companyId));
+//        return R.ok().put("data", consumptionBalanceDataDTO);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -86,10 +87,11 @@ public class IndexStatisticsController {
      */
     @GetMapping("/trafficLog")
     public R getTrafficLog(){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-        TrafficLogDTO trafficLogDTO = redisCache.getCacheObject(String.format("%s:%d",DATA_OVERVIEW_TRAFFIC_LOG,companyId));
-        return R.ok().put("data",trafficLogDTO);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//        TrafficLogDTO trafficLogDTO = redisCache.getCacheObject(String.format("%s:%d",DATA_OVERVIEW_TRAFFIC_LOG,companyId));
+//        return R.ok().put("data",trafficLogDTO);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -97,95 +99,96 @@ public class IndexStatisticsController {
      */
     @PostMapping("/watchEndPlayTrend")
     public R watchEndPlayTrend(@RequestBody AnalysisPreviewQueryDTO param){
-        Integer type = param.getType();
-        Integer userType = param.getUserType();
-
-        if(type == null) {
-            type = 0;
-        }
-        if(userType == null){
-            userType = 0;
-        }
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-
-        if("四川致医".equals(cloudHostProper.getCompanyName())){
-            Long companyId1 = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-            Company company = loginUser.getCompany();
-            param.setCompanyId(companyId1);
-            List<WatchEndPlayTrendDTO> watchEndPlayTrendDTOS;
-
-            // 参考watchCourseTopTen方法的处理逻辑
-            if ((param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
-                String key = String.format("%s:%d:%d", DATA_OVERVIEW_DEALER_CHARTS, type,userType);
-                watchEndPlayTrendDTOS = redisCache.getCacheObject(key);
-            }else if(param.getCompanyId() != null){
-                String key = String.format("%s:%d:%d:%d", DATA_OVERVIEW_DEALER_CHARTS, type,userType,param.getCompanyId());
-                watchEndPlayTrendDTOS = redisCache.getCacheObject(key);
-            }else{
-                Long[] companyIds = companyService.selectCompanyList(company).stream().map(Company::getCompanyId).toArray(Long[]::new);
-                List<WatchEndPlayTrendDTO> tempDTOS = new ArrayList<>();
-                for(Long companyId : companyIds){
-                    String key = String.format("%s:%d:%d:%d", DATA_OVERVIEW_DEALER_CHARTS, type,userType,companyId);
-                    List<WatchEndPlayTrendDTO> companyData = redisCache.getCacheObject(key);
-                    if (companyData != null) {
-                        tempDTOS.addAll(companyData);
-                    }
-                }
-                // 根据startDate 和 x 分组,合并watchUserCount和completedUserCount 限制最多返回10条记录
-                watchEndPlayTrendDTOS = tempDTOS.stream()
-                        .collect(Collectors.groupingBy(
-                                dto -> dto.getStartDate() + ":" + dto.getX(),  // 根据startDate和x分组
-                                Collectors.reducing(new WatchEndPlayTrendDTO(), (dto1, dto2) -> {
-                                    // 合并watchUserCount和completedUserCount
-                                    WatchEndPlayTrendDTO result = new WatchEndPlayTrendDTO();
-                                    // 复制分组标识字段
-                                    if (dto2 != null && dto2.getStartDate() != null) {
-                                        result.setStartDate(dto2.getStartDate());
-                                    } else if (dto1 != null) {
-                                        result.setStartDate(dto1.getStartDate());
-                                    }
-
-                                    if (dto2 != null && dto2.getX() != null) {
-                                        result.setX(dto2.getX());
-                                    } else if (dto1 != null) {
-                                        result.setX(dto1.getX());
-                                    }
-
-                                    // 合并数值字段
-                                    result.setWatchUserCount(
-                                            (dto1 == null || dto1.getWatchUserCount() == null ? 0 : dto1.getWatchUserCount()) +
-                                                    (dto2 == null || dto2.getWatchUserCount() == null ? 0 : dto2.getWatchUserCount())
-                                    );
-
-                                    result.setCompletedUserCount(
-                                            (dto1 == null || dto1.getCompletedUserCount() == null ? 0 : dto1.getCompletedUserCount()) +
-                                                    (dto2 == null || dto2.getCompletedUserCount() == null ? 0 : dto2.getCompletedUserCount())
-                                    );
-
-                                    return result;
-                                })
-                        ))
-                        .values()
-                        .stream()
-                        .filter(Objects::nonNull)  // 过滤掉null值
-                        .limit(10)
-                        .sorted(Comparator.comparing(WatchEndPlayTrendDTO::getX))
-                        .collect(Collectors.toList());
-            }
-
-            if(watchEndPlayTrendDTOS == null){
-                watchEndPlayTrendDTOS = new ArrayList<>();
-            }
-
-            return R.ok().put("data", watchEndPlayTrendDTOS);
-        }else{
-            Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-            param.setCompanyId(companyId);
-
-            String key = String.format("%s:%d:%d:%d", DATA_OVERVIEW_DEALER_CHARTS, type,userType,param.getCompanyId());
-            List<DeaMemberTopTenDTO> deaMemberTopTenDTOS = redisCache.getCacheObject(key);
-            return R.ok().put("data", deaMemberTopTenDTOS);
-        }
+//        Integer type = param.getType();
+//        Integer userType = param.getUserType();
+//
+//        if(type == null) {
+//            type = 0;
+//        }
+//        if(userType == null){
+//            userType = 0;
+//        }
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//
+//        if("四川致医".equals(cloudHostProper.getCompanyName())){
+//            Long companyId1 = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//            Company company = loginUser.getCompany();
+//            param.setCompanyId(companyId1);
+//            List<WatchEndPlayTrendDTO> watchEndPlayTrendDTOS;
+//
+//            // 参考watchCourseTopTen方法的处理逻辑
+//            if ((param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
+//                String key = String.format("%s:%d:%d", DATA_OVERVIEW_DEALER_CHARTS, type,userType);
+//                watchEndPlayTrendDTOS = redisCache.getCacheObject(key);
+//            }else if(param.getCompanyId() != null){
+//                String key = String.format("%s:%d:%d:%d", DATA_OVERVIEW_DEALER_CHARTS, type,userType,param.getCompanyId());
+//                watchEndPlayTrendDTOS = redisCache.getCacheObject(key);
+//            }else{
+//                Long[] companyIds = companyService.selectCompanyList(company).stream().map(Company::getCompanyId).toArray(Long[]::new);
+//                List<WatchEndPlayTrendDTO> tempDTOS = new ArrayList<>();
+//                for(Long companyId : companyIds){
+//                    String key = String.format("%s:%d:%d:%d", DATA_OVERVIEW_DEALER_CHARTS, type,userType,companyId);
+//                    List<WatchEndPlayTrendDTO> companyData = redisCache.getCacheObject(key);
+//                    if (companyData != null) {
+//                        tempDTOS.addAll(companyData);
+//                    }
+//                }
+//                // 根据startDate 和 x 分组,合并watchUserCount和completedUserCount 限制最多返回10条记录
+//                watchEndPlayTrendDTOS = tempDTOS.stream()
+//                        .collect(Collectors.groupingBy(
+//                                dto -> dto.getStartDate() + ":" + dto.getX(),  // 根据startDate和x分组
+//                                Collectors.reducing(new WatchEndPlayTrendDTO(), (dto1, dto2) -> {
+//                                    // 合并watchUserCount和completedUserCount
+//                                    WatchEndPlayTrendDTO result = new WatchEndPlayTrendDTO();
+//                                    // 复制分组标识字段
+//                                    if (dto2 != null && dto2.getStartDate() != null) {
+//                                        result.setStartDate(dto2.getStartDate());
+//                                    } else if (dto1 != null) {
+//                                        result.setStartDate(dto1.getStartDate());
+//                                    }
+//
+//                                    if (dto2 != null && dto2.getX() != null) {
+//                                        result.setX(dto2.getX());
+//                                    } else if (dto1 != null) {
+//                                        result.setX(dto1.getX());
+//                                    }
+//
+//                                    // 合并数值字段
+//                                    result.setWatchUserCount(
+//                                            (dto1 == null || dto1.getWatchUserCount() == null ? 0 : dto1.getWatchUserCount()) +
+//                                                    (dto2 == null || dto2.getWatchUserCount() == null ? 0 : dto2.getWatchUserCount())
+//                                    );
+//
+//                                    result.setCompletedUserCount(
+//                                            (dto1 == null || dto1.getCompletedUserCount() == null ? 0 : dto1.getCompletedUserCount()) +
+//                                                    (dto2 == null || dto2.getCompletedUserCount() == null ? 0 : dto2.getCompletedUserCount())
+//                                    );
+//
+//                                    return result;
+//                                })
+//                        ))
+//                        .values()
+//                        .stream()
+//                        .filter(Objects::nonNull)  // 过滤掉null值
+//                        .limit(10)
+//                        .sorted(Comparator.comparing(WatchEndPlayTrendDTO::getX))
+//                        .collect(Collectors.toList());
+//            }
+//
+//            if(watchEndPlayTrendDTOS == null){
+//                watchEndPlayTrendDTOS = new ArrayList<>();
+//            }
+//
+//            return R.ok().put("data", watchEndPlayTrendDTOS);
+//        }else{
+//            Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//            param.setCompanyId(companyId);
+//
+//            String key = String.format("%s:%d:%d:%d", DATA_OVERVIEW_DEALER_CHARTS, type,userType,param.getCompanyId());
+//            List<DeaMemberTopTenDTO> deaMemberTopTenDTOS = redisCache.getCacheObject(key);
+//            return R.ok().put("data", deaMemberTopTenDTOS);
+//        }
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -193,25 +196,26 @@ public class IndexStatisticsController {
      */
     @PostMapping("/deaMemberTopTen")
     public R deaMemberTopTen(@RequestBody AnalysisPreviewQueryDTO param){
-        Integer type = param.getType();
-        Integer statisticalType = param.getStatisticalType();
-        Integer userType = param.getUserType();
-
-        if(type == null) {
-            type = 0;
-        }
-        if(userType == null){
-            userType = 0;
-        }
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-        param.setCompanyId(companyId);
-
-        List<DeaMemberTopTenDTO> deaMemberTopTenDTOS = redisCache.getCacheObject(String.format("%s:%d:%d:%d:%d", CHARTS_MEMBER_TOP_TEN_WATCH, type, statisticalType,userType,param.getCompanyId()));
-        if(deaMemberTopTenDTOS == null){
-            deaMemberTopTenDTOS = new ArrayList<>();
-        }
-        return R.ok().put("data", deaMemberTopTenDTOS);
+//        Integer type = param.getType();
+//        Integer statisticalType = param.getStatisticalType();
+//        Integer userType = param.getUserType();
+//
+//        if(type == null) {
+//            type = 0;
+//        }
+//        if(userType == null){
+//            userType = 0;
+//        }
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//        param.setCompanyId(companyId);
+//
+//        List<DeaMemberTopTenDTO> deaMemberTopTenDTOS = redisCache.getCacheObject(String.format("%s:%d:%d:%d:%d", CHARTS_MEMBER_TOP_TEN_WATCH, type, statisticalType,userType,param.getCompanyId()));
+//        if(deaMemberTopTenDTOS == null){
+//            deaMemberTopTenDTOS = new ArrayList<>();
+//        }
+//        return R.ok().put("data", deaMemberTopTenDTOS);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -219,15 +223,16 @@ public class IndexStatisticsController {
      */
     @PostMapping("/rewardMoneyTopTen")
     public R rewardMoneyTopTen(@RequestBody AnalysisPreviewQueryDTO param){
-        Integer type = param.getType();
-        Integer dataType = param.getDataType();
-        Integer userType = param.getUserType();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-        param.setCompanyId(companyId);
-
-        List<RewardMoneyTopTenDTO> rewardMoneyTopTenDTOS = redisCache.getCacheObject( String.format("%s:%d:%d:%d:%d", CHARTS_REWARD_MONEY_TOP_TEN, type,dataType,userType,param.getCompanyId()));
-        return R.ok().put("data", rewardMoneyTopTenDTOS);
+//        Integer type = param.getType();
+//        Integer dataType = param.getDataType();
+//        Integer userType = param.getUserType();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//        param.setCompanyId(companyId);
+//
+//        List<RewardMoneyTopTenDTO> rewardMoneyTopTenDTOS = redisCache.getCacheObject( String.format("%s:%d:%d:%d:%d", CHARTS_REWARD_MONEY_TOP_TEN, type,dataType,userType,param.getCompanyId()));
+//        return R.ok().put("data", rewardMoneyTopTenDTOS);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -235,14 +240,15 @@ public class IndexStatisticsController {
      */
     @PostMapping("/rewardMoneyTrend")
     public R rewardMoneyTrend(@RequestBody AnalysisPreviewQueryDTO param){
-        Integer type = param.getType();
-        Integer userType = param.getUserType();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-        param.setCompanyId(companyId);
-
-        List<RewardMoneyTrendDTO> rewardMoneyTrendDTOS = redisCache.getCacheObject( String.format("%s:%d:%d:%d", CHARTS_REWARD_MONEY_TREND, type,userType,param.getCompanyId()));
-        return R.ok().put("data", rewardMoneyTrendDTOS);
+//        Integer type = param.getType();
+//        Integer userType = param.getUserType();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//        param.setCompanyId(companyId);
+//
+//        List<RewardMoneyTrendDTO> rewardMoneyTrendDTOS = redisCache.getCacheObject( String.format("%s:%d:%d:%d", CHARTS_REWARD_MONEY_TREND, type,userType,param.getCompanyId()));
+//        return R.ok().put("data", rewardMoneyTrendDTOS);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -250,16 +256,17 @@ public class IndexStatisticsController {
      */
     @PostMapping("/watchCourseTopTen")
     public R watchCourseTopTen(@RequestBody AnalysisPreviewQueryDTO param){
-        Integer type = param.getType();
-        String sort = param.getSort();
-        Integer statisticalType = param.getStatisticalType();
-        Integer userType = param.getUserType();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-        param.setCompanyId(companyId);
-
-        List<CourseStatsDTO> courseStatsDTOS = redisCache.getCacheObject(String.format("%s:%d:%d:%d:%s:%d", CHARTS_WATCH_TOP_TEN, type,statisticalType,userType,sort,param.getCompanyId()));
-        return R.ok().put("data", courseStatsDTOS);
+//        Integer type = param.getType();
+//        String sort = param.getSort();
+//        Integer statisticalType = param.getStatisticalType();
+//        Integer userType = param.getUserType();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//        param.setCompanyId(companyId);
+//
+//        List<CourseStatsDTO> courseStatsDTOS = redisCache.getCacheObject(String.format("%s:%d:%d:%d:%s:%d", CHARTS_WATCH_TOP_TEN, type,statisticalType,userType,sort,param.getCompanyId()));
+//        return R.ok().put("data", courseStatsDTOS);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -267,12 +274,13 @@ public class IndexStatisticsController {
      */
     @GetMapping("/dealerAggregated")
     public R dealerAggregated(){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-
-        DealerAggregatedDTO dealerAggregatedDTO = redisCache.getCacheObject(String.format("%s:%d",StatisticsRedisConstant.DATA_OVERVIEW_DEALER_AGGREGATED,companyId));
-
-        return R.ok().put("data",dealerAggregatedDTO);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//
+//        DealerAggregatedDTO dealerAggregatedDTO = redisCache.getCacheObject(String.format("%s:%d",StatisticsRedisConstant.DATA_OVERVIEW_DEALER_AGGREGATED,companyId));
+//
+//        return R.ok().put("data",dealerAggregatedDTO);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -280,12 +288,13 @@ public class IndexStatisticsController {
      */
     @GetMapping("/smsBalance")
     public R smsBalance(){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-
-        Long smsBalance = redisCache.getCacheObject(String.format("%s:%d",StatisticsRedisConstant.DATA_OVERVIEW_DEALER_SMS_BALANCE,companyId));
-
-        return R.ok().put("data", smsBalance);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//
+//        Long smsBalance = redisCache.getCacheObject(String.format("%s:%d",StatisticsRedisConstant.DATA_OVERVIEW_DEALER_SMS_BALANCE,companyId));
+//
+//        return R.ok().put("data", smsBalance);
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -294,12 +303,13 @@ public class IndexStatisticsController {
      */
     @GetMapping("/authorizationInfo")
     public R authorizationInfo(){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-
-        AuthorizationInfoDTO authorizationInfoDTO = redisCache.getCacheObject(String.format("%s:%d",StatisticsRedisConstant.DATA_OVERVIEW_DEALER_AUTHORIZATION_INFO,companyId));
-
-        return R.ok().put("data", authorizationInfoDTO);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//
+//        AuthorizationInfoDTO authorizationInfoDTO = redisCache.getCacheObject(String.format("%s:%d",StatisticsRedisConstant.DATA_OVERVIEW_DEALER_AUTHORIZATION_INFO,companyId));
+//
+//        return R.ok().put("data", authorizationInfoDTO);
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -309,11 +319,12 @@ public class IndexStatisticsController {
      */
     @GetMapping("/thisMonthOrderCount")
     public R thisMonthOrderCount(){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-
-        R result = redisCache.getCacheObject(String.format("%s:%d",StatisticsRedisConstant.THIS_MONTH_ORDER_COUNT,companyId));
-        return result;
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//
+//        R result = redisCache.getCacheObject(String.format("%s:%d",StatisticsRedisConstant.THIS_MONTH_ORDER_COUNT,companyId));
+//        return result;
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -322,11 +333,12 @@ public class IndexStatisticsController {
      */
     @GetMapping("/thisMonthRecvCount")
     public R thisMonthRecvCount(){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-
-        R result = redisCache.getCacheObject(String.format("%s:%d",StatisticsRedisConstant.THIS_MONTH_RECV_COUNT,companyId));
-        return result;
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//
+//        R result = redisCache.getCacheObject(String.format("%s:%d",StatisticsRedisConstant.THIS_MONTH_RECV_COUNT,companyId));
+//        return result;
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -339,14 +351,15 @@ public class IndexStatisticsController {
     @PostMapping("/getWatchCourseStatisticsData")
     public R getWatchCourseStatisticsData(@RequestBody AnalysisPreviewQueryDTO param){
         // 获取公司ID
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-        if(param.getCompanyId()==null){
-            param.setCompanyId(companyId);
-        }
-        // 从缓存获取看客统计数据
-        List<WatchCourseStatisticsResultDTO> data=statisticsService.getWatchCourseStatisticsData(param);
-
-        return R.ok().put("data", data);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//        if(param.getCompanyId()==null){
+//            param.setCompanyId(companyId);
+//        }
+//        // 从缓存获取看客统计数据
+//        List<WatchCourseStatisticsResultDTO> data=statisticsService.getWatchCourseStatisticsData(param);
+//
+//        return R.ok().put("data", data);
+        throw new RuntimeException("not implemented");
     }
 }

fs-agent/src/main/java/com/fs/company/controller/companyWorkflow/CompanyWorkflowLobsterController.java

@@ -7,8 +7,7 @@ import com.fs.company.param.CompanyWorkflowLobsterCanvasParam;
 import com.fs.company.param.CompanyWorkflowLobsterConfirmParam;
 import com.fs.company.param.CompanyWorkflowLobsterGenerateParam;
 import com.fs.company.service.ICompanyWorkflowLobsterService;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.context.annotation.Profile;
@@ -38,8 +37,9 @@ public class CompanyWorkflowLobsterController extends BaseController {
     @GetMapping("/template/list")
     public AjaxResult list(@RequestParam(defaultValue = "1") Integer page,
                            @RequestParam(defaultValue = "10") Integer size) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        return AjaxResult.success(lobsterService.listTemplate(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, page, size));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        return AjaxResult.success(lobsterService.listTemplate(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, page, size));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -47,8 +47,9 @@ public class CompanyWorkflowLobsterController extends BaseController {
      */
     @GetMapping("/template/listTemplate")
     public AjaxResult listTemplate(@RequestParam Integer status) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        return AjaxResult.success(lobsterService.listTemplateByStatus(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, status));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        return AjaxResult.success(lobsterService.listTemplateByStatus(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, status));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -56,8 +57,9 @@ public class CompanyWorkflowLobsterController extends BaseController {
      */
     @GetMapping("/template/{templateId}")
     public AjaxResult getTemplate(@PathVariable Long templateId) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        return AjaxResult.success(lobsterService.getTemplate(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, templateId));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        return AjaxResult.success(lobsterService.getTemplate(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, templateId));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -65,8 +67,9 @@ public class CompanyWorkflowLobsterController extends BaseController {
      */
     @GetMapping("/template/{templateId}/preview")
     public AjaxResult preview(@PathVariable Long templateId) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        return AjaxResult.success(lobsterService.previewTemplate(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, templateId));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        return AjaxResult.success(lobsterService.previewTemplate(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, templateId));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -74,8 +77,9 @@ public class CompanyWorkflowLobsterController extends BaseController {
      */
     @PutMapping("/template/{templateId}")
     public AjaxResult updateTemplate(@PathVariable Long templateId, @RequestBody CompanyWorkflowLobsterConfirmParam param) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        return lobsterService.updateTemplate(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, loginUser.getUsername(), templateId, param);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        return lobsterService.updateTemplate(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, loginUser.getUsername(), templateId, param);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -83,8 +87,9 @@ public class CompanyWorkflowLobsterController extends BaseController {
      */
     @PutMapping("/template/{templateId}/{status}")
     public AjaxResult updateTemplateStatus(@PathVariable Long templateId, @PathVariable Integer status) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        return lobsterService.updateTemplateStatus(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, loginUser.getUsername(), templateId, status);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        return lobsterService.updateTemplateStatus(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, loginUser.getUsername(), templateId, status);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -92,8 +97,9 @@ public class CompanyWorkflowLobsterController extends BaseController {
      */
     @DeleteMapping("/template/{templateId}")
     public AjaxResult deleteTemplate(@PathVariable Long templateId) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        return lobsterService.deleteTemplate(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, loginUser.getUsername(), templateId);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        return lobsterService.deleteTemplate(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, loginUser.getUsername(), templateId);
+        throw new RuntimeException("not implemented");
     }
 
     // ==================== AI生成接口 ====================
@@ -103,9 +109,10 @@ public class CompanyWorkflowLobsterController extends BaseController {
      */
     @PostMapping("/ai-generator/generate")
     public AjaxResult generate(@RequestBody CompanyWorkflowLobsterGenerateParam param) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        String recordId = lobsterService.generate(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, loginUser.getUsername(), param);
-        return AjaxResult.success(Collections.singletonMap("recordId", recordId));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        String recordId = lobsterService.generate(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, loginUser.getUsername(), param);
+//        return AjaxResult.success(Collections.singletonMap("recordId", recordId));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -113,8 +120,9 @@ public class CompanyWorkflowLobsterController extends BaseController {
      */
     @GetMapping("/ai-generator/result/{recordId}/detail")
     public AjaxResult resultDetail(@PathVariable String recordId) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        return AjaxResult.success(lobsterService.getResultDetail(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, recordId));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        return AjaxResult.success(lobsterService.getResultDetail(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, recordId));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -122,8 +130,9 @@ public class CompanyWorkflowLobsterController extends BaseController {
      */
     @PostMapping("/ai-generator/confirm/{recordId}")
     public AjaxResult confirm(@PathVariable String recordId) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        return lobsterService.confirmRaw(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, loginUser.getUsername(), recordId);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        return lobsterService.confirmRaw(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, loginUser.getUsername(), recordId);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -131,8 +140,9 @@ public class CompanyWorkflowLobsterController extends BaseController {
      */
     @PostMapping("/ai-generator/confirm/{recordId}/edited")
     public AjaxResult confirmEdited(@PathVariable String recordId, @RequestBody CompanyWorkflowLobsterConfirmParam param) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        return lobsterService.confirmEdited(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, loginUser.getUsername(), recordId, param);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        return lobsterService.confirmEdited(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, loginUser.getUsername(), recordId, param);
+        throw new RuntimeException("not implemented");
     }
 
     // ==================== 画布编辑接口 ====================
@@ -142,7 +152,8 @@ public class CompanyWorkflowLobsterController extends BaseController {
      */
     @PutMapping("/canvas/{templateId}")
     public AjaxResult saveCanvas(@PathVariable Long templateId, @RequestBody CompanyWorkflowLobsterCanvasParam param) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        return lobsterService.saveCanvas(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, loginUser.getUsername(), templateId, param);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        return lobsterService.saveCanvas(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, loginUser.getUsername(), templateId, param);
+        throw new RuntimeException("not implemented");
     }
 }

fs-agent/src/main/java/com/fs/company/controller/companyWorkflow/CompanyWorkflowTagTemplateBindingController.java

@@ -6,8 +6,7 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.company.domain.CompanyTagTemplateBinding;
 import com.fs.company.param.BatchBindLobsterTagParam;
 import com.fs.company.service.ICompanyTagTemplateBindingService;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.context.annotation.Profile;
@@ -35,20 +34,22 @@ public class CompanyWorkflowTagTemplateBindingController extends BaseController
     @GetMapping("/tag-binding/list")
     public AjaxResult list(@RequestParam(required = false) String tagCode,
                           @RequestParam(required = false) Long templateId) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        List<CompanyTagTemplateBinding> list = tagTemplateBindingService.listBinding(
-            loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, tagCode, templateId);
-        return AjaxResult.success(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        List<CompanyTagTemplateBinding> list = tagTemplateBindingService.listBinding(
+//            loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, tagCode, templateId);
+//        return AjaxResult.success(list);
+        throw new RuntimeException("not implemented");
     }
     /**
      * 查询标签绑定列表
      */
     @GetMapping("/tag-binding/listByStatus")
     public AjaxResult listByStatus(@RequestParam(required = false) Integer status){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        List<CompanyTagTemplateBinding> list = tagTemplateBindingService.listByStatus(
-                loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, status);
-        return AjaxResult.success(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        List<CompanyTagTemplateBinding> list = tagTemplateBindingService.listByStatus(
+//                loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, status);
+//        return AjaxResult.success(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -56,8 +57,9 @@ public class CompanyWorkflowTagTemplateBindingController extends BaseController
      */
     @GetMapping("/tag-binding/{id}")
     public AjaxResult getById(@PathVariable Long id) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        return AjaxResult.success(tagTemplateBindingService.getBindingById(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, id));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        return AjaxResult.success(tagTemplateBindingService.getBindingById(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, id));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -65,8 +67,9 @@ public class CompanyWorkflowTagTemplateBindingController extends BaseController
      */
     @PostMapping("/tag-binding")
     public AjaxResult add(@RequestBody CompanyTagTemplateBinding binding) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        return tagTemplateBindingService.addBinding(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, loginUser.getUsername(), binding);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        return tagTemplateBindingService.addBinding(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, loginUser.getUsername(), binding);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -74,9 +77,10 @@ public class CompanyWorkflowTagTemplateBindingController extends BaseController
      */
     @PutMapping("/tag-binding/{id}")
     public AjaxResult update(@PathVariable Long id, @RequestBody CompanyTagTemplateBinding binding) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        binding.setId(id);
-        return tagTemplateBindingService.updateBinding(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, loginUser.getUsername(), binding);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        binding.setId(id);
+//        return tagTemplateBindingService.updateBinding(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, loginUser.getUsername(), binding);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -84,8 +88,9 @@ public class CompanyWorkflowTagTemplateBindingController extends BaseController
      */
     @DeleteMapping("/tag-binding/{id}")
     public AjaxResult delete(@PathVariable Long id) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        return tagTemplateBindingService.deleteBinding(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, loginUser.getUsername(), id);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        return tagTemplateBindingService.deleteBinding(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, loginUser.getUsername(), id);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -93,8 +98,9 @@ public class CompanyWorkflowTagTemplateBindingController extends BaseController
      */
     @PostMapping("/tag-binding/batch-bind/{templateId}")
     public AjaxResult batchBind(@PathVariable Long templateId, @RequestBody List<String> tagCodes) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        return tagTemplateBindingService.batchBind(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, loginUser.getUsername(), templateId, tagCodes);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        return tagTemplateBindingService.batchBind(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, loginUser.getUsername(), templateId, tagCodes);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -102,9 +108,10 @@ public class CompanyWorkflowTagTemplateBindingController extends BaseController
      */
     @PostMapping("/tag-binding/match-template")
     public AjaxResult matchTemplate(@RequestBody List<String> userTags) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Map<String, Object> result = tagTemplateBindingService.matchTemplate(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, userTags);
-        return AjaxResult.success(result);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Map<String, Object> result = tagTemplateBindingService.matchTemplate(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, userTags);
+//        return AjaxResult.success(result);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -112,9 +119,10 @@ public class CompanyWorkflowTagTemplateBindingController extends BaseController
      */
     @PostMapping("/tag-binding/{id}/test-match")
     public AjaxResult testMatch(@PathVariable Long id, @RequestBody Map<String, Object> testTags) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Map<String, Object> result = tagTemplateBindingService.testMatch(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, id, testTags);
-        return AjaxResult.success(result);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Map<String, Object> result = tagTemplateBindingService.testMatch(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, id, testTags);
+//        return AjaxResult.success(result);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -122,9 +130,10 @@ public class CompanyWorkflowTagTemplateBindingController extends BaseController
      */
     @PostMapping("/tag-binding/batch-bind-lobster-tag")
     public AjaxResult batchBindLobsterTag(@RequestBody BatchBindLobsterTagParam param) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        return tagTemplateBindingService.batchBindLobsterTag(
-                loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, loginUser.getUsername(),
-                param.getQwCorpId(), param.getUserIds(), param.getTagCodes(),loginUser.getCompanyUser().getUserId());
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        return tagTemplateBindingService.batchBindLobsterTag(
+//                loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null, loginUser.getUsername(),
+//                param.getQwCorpId(), param.getUserIds(), param.getTagCodes(),loginUser.getCompanyUser().getUserId());
+        throw new RuntimeException("not implemented");
     }
 }

fs-agent/src/main/java/com/fs/company/controller/companyWorkflow/ExternalApiConfigController.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fs.common.core.controller.BaseController;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.security.SecurityUtils;
 import com.fs.common.result.Result;
 import com.fs.companyWorkflow.domain.ExternalApiCallLog;
 import com.fs.companyWorkflow.domain.ExternalApiConfig;
@@ -51,33 +49,34 @@ public class ExternalApiConfigController extends BaseController {
 
     @PostMapping("/saveOrUpdate")
     public Result<Void> saveOrUpdate(@RequestBody ExternalApiConfigSaveReq req) {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        ExternalApiConfig entity = new ExternalApiConfig();
-        entity.setId(req.getId());
-        entity.setApiType(req.getApiType());
-        entity.setApiName(req.getApiName());
-        entity.setApiCode(req.getApiCode());
-        entity.setApiUrl(req.getApiUrl());
-        entity.setHttpMethod(req.getHttpMethod());
-        entity.setRateWindowSeconds(req.getRateWindowSeconds());
-        entity.setRateMaxCount(req.getRateMaxCount());
-        entity.setPriority(req.getPriority());
-        entity.setStatus(req.getStatus());
-        entity.setDefaultHeadersJson(req.getDefaultHeadersJson());
-        entity.setDefaultBodyJson(req.getDefaultBodyJson());
-        entity.setTimeoutMs(req.getTimeoutMs());
-
-        boolean ok;
-        if (req.getId() != null) {
-            entity.setUpdateTime(new Date());
-            entity.setUpdateBy(loginUser.getUserId().toString());
-            ok = configService.updateById(entity);
-        } else {
-            entity.setCreateTime(new Date());
-            entity.setCreateBy(loginUser.getUserId().toString());
-            ok = configService.save(entity);
-        }
-        return ok ? Result.success() : Result.error("保存失败");
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        ExternalApiConfig entity = new ExternalApiConfig();
+//        entity.setId(req.getId());
+//        entity.setApiType(req.getApiType());
+//        entity.setApiName(req.getApiName());
+//        entity.setApiCode(req.getApiCode());
+//        entity.setApiUrl(req.getApiUrl());
+//        entity.setHttpMethod(req.getHttpMethod());
+//        entity.setRateWindowSeconds(req.getRateWindowSeconds());
+//        entity.setRateMaxCount(req.getRateMaxCount());
+//        entity.setPriority(req.getPriority());
+//        entity.setStatus(req.getStatus());
+//        entity.setDefaultHeadersJson(req.getDefaultHeadersJson());
+//        entity.setDefaultBodyJson(req.getDefaultBodyJson());
+//        entity.setTimeoutMs(req.getTimeoutMs());
+//
+//        boolean ok;
+//        if (req.getId() != null) {
+//            entity.setUpdateTime(new Date());
+//            entity.setUpdateBy(loginUser.getUserId().toString());
+//            ok = configService.updateById(entity);
+//        } else {
+//            entity.setCreateTime(new Date());
+//            entity.setCreateBy(loginUser.getUserId().toString());
+//            ok = configService.save(entity);
+//        }
+//        return ok ? Result.success() : Result.error("保存失败");
+        throw new RuntimeException("not implemented");
     }
 
     @GetMapping("/{id}")

fs-agent/src/main/java/com/fs/company/controller/course/FsCourseAnswerLogsController.java

@@ -14,8 +14,7 @@ import com.fs.course.config.CourseConfig;
 import com.fs.course.param.FsCourseAnswerLogsParam;
 import com.fs.course.service.IFsCourseAnswerLogsService;
 import com.fs.course.vo.FsCourseAnswerLogsListVO;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.system.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -54,24 +53,25 @@ public class FsCourseAnswerLogsController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(FsCourseAnswerLogsParam param)
     {
-        if (param.getPhoneMk() != null && param.getPhoneMk() != "") {
-            param.setPhone(param.getPhoneMk());
-        }
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = loginUser.getCompanyUser().getUserId();
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
-            param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        }
-        List<FsCourseAnswerLogsListVO> list = fsCourseAnswerLogsService.selectFsCourseAnswerLogsListVONew(param);
-        TableDataInfo rspData = new TableDataInfo();
-        rspData.setCode(HttpStatus.SUCCESS);
-        rspData.setMsg("查询成功");
-        rspData.setRows(list);
-        rspData.setTotal(fsCourseAnswerLogsService.selectFsCourseAnswerLogsListVONewCount(param));
-
-        return rspData;
+//        if (param.getPhoneMk() != null && param.getPhoneMk() != "") {
+//            param.setPhone(param.getPhoneMk());
+//        }
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = loginUser.getCompanyUser().getUserId();
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
+//            param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        }
+//        List<FsCourseAnswerLogsListVO> list = fsCourseAnswerLogsService.selectFsCourseAnswerLogsListVONew(param);
+//        TableDataInfo rspData = new TableDataInfo();
+//        rspData.setCode(HttpStatus.SUCCESS);
+//        rspData.setMsg("查询成功");
+//        rspData.setRows(list);
+//        rspData.setTotal(fsCourseAnswerLogsService.selectFsCourseAnswerLogsListVONewCount(param));
+//
+//        return rspData;
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -82,22 +82,23 @@ public class FsCourseAnswerLogsController extends BaseController
     public TableDataInfo myList(FsCourseAnswerLogsParam param)
     {
 
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        //param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-        if (param.getPhoneMk() != null && param.getPhoneMk() != "") {
-            param.setPhone(param.getPhoneMk());
-        }
-
-        List<FsCourseAnswerLogsListVO> list = fsCourseAnswerLogsService.selectFsCourseAnswerLogsListVONew(param);
-
-        TableDataInfo rspData = new TableDataInfo();
-        rspData.setCode(HttpStatus.SUCCESS);
-        rspData.setMsg("查询成功");
-        rspData.setRows(list);
-        rspData.setTotal(fsCourseAnswerLogsService.selectFsCourseAnswerLogsListVONewCount(param));
-
-        return rspData;
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        //param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        if (param.getPhoneMk() != null && param.getPhoneMk() != "") {
+//            param.setPhone(param.getPhoneMk());
+//        }
+//
+//        List<FsCourseAnswerLogsListVO> list = fsCourseAnswerLogsService.selectFsCourseAnswerLogsListVONew(param);
+//
+//        TableDataInfo rspData = new TableDataInfo();
+//        rspData.setCode(HttpStatus.SUCCESS);
+//        rspData.setMsg("查询成功");
+//        rspData.setRows(list);
+//        rspData.setTotal(fsCourseAnswerLogsService.selectFsCourseAnswerLogsListVONewCount(param));
+//
+//        return rspData;
+        throw new RuntimeException("not implemented");
     }
     /**
      * 导出答题日志列表
@@ -108,15 +109,16 @@ public class FsCourseAnswerLogsController extends BaseController
     public AjaxResult export(FsCourseAnswerLogsParam param)
     {
 
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-
-        if (param.getPhoneMk() != null && param.getPhoneMk() != "") {
-            param.setPhone(param.getPhoneMk());
-        }
-        List<FsCourseAnswerLogsListVO> list = fsCourseAnswerLogsService.selectFsCourseAnswerLogsListVONew(param);
-        ExcelUtil<FsCourseAnswerLogsListVO> util = new ExcelUtil<FsCourseAnswerLogsListVO>(FsCourseAnswerLogsListVO.class);
-        return util.exportExcel(list, "答题记录数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//
+//        if (param.getPhoneMk() != null && param.getPhoneMk() != "") {
+//            param.setPhone(param.getPhoneMk());
+//        }
+//        List<FsCourseAnswerLogsListVO> list = fsCourseAnswerLogsService.selectFsCourseAnswerLogsListVONew(param);
+//        ExcelUtil<FsCourseAnswerLogsListVO> util = new ExcelUtil<FsCourseAnswerLogsListVO>(FsCourseAnswerLogsListVO.class);
+//        return util.exportExcel(list, "答题记录数据");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -127,15 +129,16 @@ public class FsCourseAnswerLogsController extends BaseController
     @GetMapping("/myExport")
     public AjaxResult myExport(FsCourseAnswerLogsParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-        if (param.getPhoneMk() != null && param.getPhoneMk() != "") {
-            param.setPhone(param.getPhoneMk());
-        }
-        List<FsCourseAnswerLogsListVO> list = fsCourseAnswerLogsService.selectFsCourseAnswerLogsListVONew(param);
-        ExcelUtil<FsCourseAnswerLogsListVO> util = new ExcelUtil<FsCourseAnswerLogsListVO>(FsCourseAnswerLogsListVO.class);
-        return util.exportExcel(list, "我的答题记录数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        if (param.getPhoneMk() != null && param.getPhoneMk() != "") {
+//            param.setPhone(param.getPhoneMk());
+//        }
+//        List<FsCourseAnswerLogsListVO> list = fsCourseAnswerLogsService.selectFsCourseAnswerLogsListVONew(param);
+//        ExcelUtil<FsCourseAnswerLogsListVO> util = new ExcelUtil<FsCourseAnswerLogsListVO>(FsCourseAnswerLogsListVO.class);
+//        return util.exportExcel(list, "我的答题记录数据");
+        throw new RuntimeException("not implemented");
     }
 
 //    /**

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

@@ -11,8 +11,6 @@ import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.course.domain.FsCourseFinishTemp;
 import com.fs.course.service.IFsCourseFinishTempService;
 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.*;
@@ -41,12 +39,13 @@ public class FsCourseFinishTempController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(FsCourseFinishTemp fsCourseFinishTemp)
     {
-        startPage();
-
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (fsCourseFinishTemp.getCompanyId() == null && loginUser.getCompany() != null) { fsCourseFinishTemp.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<FsCourseFinishTempListVO> list = fsCourseFinishTempService.selectFsCourseFinishTempListVO(fsCourseFinishTemp);
-        return getDataTable(list);
+//        startPage();
+//
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        if (fsCourseFinishTemp.getCompanyId() == null && loginUser.getCompany() != null) { fsCourseFinishTemp.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<FsCourseFinishTempListVO> list = fsCourseFinishTempService.selectFsCourseFinishTempListVO(fsCourseFinishTemp);
+//        return getDataTable(list);
+        throw new RuntimeException("Not implemented");
     }
 
 
@@ -82,10 +81,11 @@ public class FsCourseFinishTempController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody FsCourseFinishTemp fsCourseFinishTemp)
     {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (fsCourseFinishTemp.getCompanyId() == null && loginUser.getCompany() != null) { fsCourseFinishTemp.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        fsCourseFinishTemp.setCreateBy(String.valueOf(loginUser.getCompanyUser().getUserId()));
-        return toAjax(fsCourseFinishTempService.insertFsCourseFinishTemp(fsCourseFinishTemp));
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        if (fsCourseFinishTemp.getCompanyId() == null && loginUser.getCompany() != null) { fsCourseFinishTemp.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        fsCourseFinishTemp.setCreateBy(String.valueOf(loginUser.getCompanyUser().getUserId()));
+//        return toAjax(fsCourseFinishTempService.insertFsCourseFinishTemp(fsCourseFinishTemp));
+        throw new RuntimeException("Not implemented");
     }
 
     /**

fs-agent/src/main/java/com/fs/company/controller/course/FsCourseFinishTempParentController.java

@@ -7,8 +7,6 @@ import org.springframework.context.annotation.Profile;
 
 import com.fs.company.service.impl.CompanyDeptServiceImpl;
 import com.fs.company.service.impl.CompanyUserServiceImpl;
-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;
@@ -55,11 +53,12 @@ public class FsCourseFinishTempParentController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(FsCourseFinishTempParent fsCourseFinishTempParent)
     {
-        startPage();
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (fsCourseFinishTempParent.getCompanyId() == null && loginUser.getCompany() != null) { fsCourseFinishTempParent.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<FsCourseFinishTempParent> list = fsCourseFinishTempParentService.selectFsCourseFinishTempParentList(fsCourseFinishTempParent);
-        return getDataTable(list);
+//        startPage();
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        if (fsCourseFinishTempParent.getCompanyId() == null && loginUser.getCompany() != null) { fsCourseFinishTempParent.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<FsCourseFinishTempParent> list = fsCourseFinishTempParentService.selectFsCourseFinishTempParentList(fsCourseFinishTempParent);
+//        return getDataTable(list);
+        throw new  RuntimeException("not implemented");
     }
 
     /**
@@ -69,12 +68,13 @@ public class FsCourseFinishTempParentController extends BaseController
     @GetMapping("/myList")
     public TableDataInfo myList(FsCourseFinishTempParent fsCourseFinishTempParent)
     {
-        startPage();
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (fsCourseFinishTempParent.getCompanyId() == null && loginUser.getCompany() != null) { fsCourseFinishTempParent.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        fsCourseFinishTempParent.setCreateBy(String.valueOf(loginUser.getCompanyUser().getUserId()));
-        List<FsCourseFinishTempParent> list = fsCourseFinishTempParentService.selectFsCourseFinishTempParentList(fsCourseFinishTempParent);
-        return getDataTable(list);
+//        startPage();
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        if (fsCourseFinishTempParent.getCompanyId() == null && loginUser.getCompany() != null) { fsCourseFinishTempParent.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        fsCourseFinishTempParent.setCreateBy(String.valueOf(loginUser.getCompanyUser().getUserId()));
+//        List<FsCourseFinishTempParent> list = fsCourseFinishTempParentService.selectFsCourseFinishTempParentList(fsCourseFinishTempParent);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -84,31 +84,32 @@ public class FsCourseFinishTempParentController extends BaseController
     @GetMapping("/deptList")
     public TableDataInfo deptList(FsCourseFinishTempParent fsCourseFinishTempParent)
     {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (fsCourseFinishTempParent.getCompanyId() == null && loginUser.getCompany() != null) { fsCourseFinishTempParent.setCompanyId(loginUser.getCompany().getCompanyId()); }
-
-        List<Long> combinedList = new ArrayList<>();
-        //本部门
-        Long deptId = loginUser.getCompanyUser().getDeptId();
-        if (deptId!=null){
-            combinedList.add(deptId);
-        }
-        //本部门的下级部门
-        List<Long> deptList = companyDeptService.selectCompanyDeptByParentId(deptId);
-        if (!deptList.isEmpty()){
-            combinedList.addAll(deptList);
-        }
-
-        List<Long> userIds = companyUserService.selectCompanyQwUserByDept(combinedList, loginUser.getCompanyUser().getUserType());
-        if (userIds.isEmpty()){
-            return getDataTable(new ArrayList<>());
-        }
-
-        fsCourseFinishTempParent.setUserIds(userIds);
-
-        startPage();
-        List<FsCourseFinishTempParent> list = fsCourseFinishTempParentService.selectFsCourseFinishTempParentList(fsCourseFinishTempParent);
-        return getDataTable(list);
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        if (fsCourseFinishTempParent.getCompanyId() == null && loginUser.getCompany() != null) { fsCourseFinishTempParent.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//
+//        List<Long> combinedList = new ArrayList<>();
+//        //本部门
+//        Long deptId = loginUser.getCompanyUser().getDeptId();
+//        if (deptId!=null){
+//            combinedList.add(deptId);
+//        }
+//        //本部门的下级部门
+//        List<Long> deptList = companyDeptService.selectCompanyDeptByParentId(deptId);
+//        if (!deptList.isEmpty()){
+//            combinedList.addAll(deptList);
+//        }
+//
+//        List<Long> userIds = companyUserService.selectCompanyQwUserByDept(combinedList, loginUser.getCompanyUser().getUserType());
+//        if (userIds.isEmpty()){
+//            return getDataTable(new ArrayList<>());
+//        }
+//
+//        fsCourseFinishTempParent.setUserIds(userIds);
+//
+//        startPage();
+//        List<FsCourseFinishTempParent> list = fsCourseFinishTempParentService.selectFsCourseFinishTempParentList(fsCourseFinishTempParent);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -119,11 +120,12 @@ public class FsCourseFinishTempParentController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(FsCourseFinishTempParent fsCourseFinishTempParent)
     {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (fsCourseFinishTempParent.getCompanyId() == null && loginUser.getCompany() != null) { fsCourseFinishTempParent.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        List<FsCourseFinishTempParent> list = fsCourseFinishTempParentService.selectFsCourseFinishTempParentList(fsCourseFinishTempParent);
-        ExcelUtil<FsCourseFinishTempParent> util = new ExcelUtil<FsCourseFinishTempParent>(FsCourseFinishTempParent.class);
-        return util.exportExcel(list, "完课模板数据");
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        if (fsCourseFinishTempParent.getCompanyId() == null && loginUser.getCompany() != null) { fsCourseFinishTempParent.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        List<FsCourseFinishTempParent> list = fsCourseFinishTempParentService.selectFsCourseFinishTempParentList(fsCourseFinishTempParent);
+//        ExcelUtil<FsCourseFinishTempParent> util = new ExcelUtil<FsCourseFinishTempParent>(FsCourseFinishTempParent.class);
+//        return util.exportExcel(list, "完课模板数据");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -134,12 +136,13 @@ public class FsCourseFinishTempParentController extends BaseController
     @GetMapping("/myExport")
     public AjaxResult myExport(FsCourseFinishTempParent fsCourseFinishTempParent)
     {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (fsCourseFinishTempParent.getCompanyId() == null && loginUser.getCompany() != null) { fsCourseFinishTempParent.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        fsCourseFinishTempParent.setCreateBy(String.valueOf(loginUser.getCompanyUser().getUserId()));
-        List<FsCourseFinishTempParent> list = fsCourseFinishTempParentService.selectFsCourseFinishTempParentList(fsCourseFinishTempParent);
-        ExcelUtil<FsCourseFinishTempParent> util = new ExcelUtil<FsCourseFinishTempParent>(FsCourseFinishTempParent.class);
-        return util.exportExcel(list, "完课模板数据");
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        if (fsCourseFinishTempParent.getCompanyId() == null && loginUser.getCompany() != null) { fsCourseFinishTempParent.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        fsCourseFinishTempParent.setCreateBy(String.valueOf(loginUser.getCompanyUser().getUserId()));
+//        List<FsCourseFinishTempParent> list = fsCourseFinishTempParentService.selectFsCourseFinishTempParentList(fsCourseFinishTempParent);
+//        ExcelUtil<FsCourseFinishTempParent> util = new ExcelUtil<FsCourseFinishTempParent>(FsCourseFinishTempParent.class);
+//        return util.exportExcel(list, "完课模板数据");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -150,29 +153,30 @@ public class FsCourseFinishTempParentController extends BaseController
     @GetMapping("/deptExport")
     public AjaxResult deptExport(FsCourseFinishTempParent fsCourseFinishTempParent)
     {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-
-        List<Long> combinedList = new ArrayList<>();
-        //本部门
-        Long deptId = loginUser.getCompanyUser().getDeptId();
-        if (deptId!=null){
-            combinedList.add(deptId);
-        }
-        //本部门的下级部门
-        List<Long> deptList = companyDeptService.selectCompanyDeptByParentId(deptId);
-        if (!deptList.isEmpty()){
-            combinedList.addAll(deptList);
-        }
-
-        List<Long> userIds = companyUserService.selectCompanyQwUserByDept(combinedList, loginUser.getCompanyUser().getUserType());
-        if (userIds.isEmpty()){
-            return AjaxResult.error();
-        }
-
-        fsCourseFinishTempParent.setUserIds(userIds);
-        List<FsCourseFinishTempParent> list = fsCourseFinishTempParentService.selectFsCourseFinishTempParentList(fsCourseFinishTempParent);
-        ExcelUtil<FsCourseFinishTempParent> util = new ExcelUtil<FsCourseFinishTempParent>(FsCourseFinishTempParent.class);
-        return util.exportExcel(list, "完课模板数据");
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//
+//        List<Long> combinedList = new ArrayList<>();
+//        //本部门
+//        Long deptId = loginUser.getCompanyUser().getDeptId();
+//        if (deptId!=null){
+//            combinedList.add(deptId);
+//        }
+//        //本部门的下级部门
+//        List<Long> deptList = companyDeptService.selectCompanyDeptByParentId(deptId);
+//        if (!deptList.isEmpty()){
+//            combinedList.addAll(deptList);
+//        }
+//
+//        List<Long> userIds = companyUserService.selectCompanyQwUserByDept(combinedList, loginUser.getCompanyUser().getUserType());
+//        if (userIds.isEmpty()){
+//            return AjaxResult.error();
+//        }
+//
+//        fsCourseFinishTempParent.setUserIds(userIds);
+//        List<FsCourseFinishTempParent> list = fsCourseFinishTempParentService.selectFsCourseFinishTempParentList(fsCourseFinishTempParent);
+//        ExcelUtil<FsCourseFinishTempParent> util = new ExcelUtil<FsCourseFinishTempParent>(FsCourseFinishTempParent.class);
+//        return util.exportExcel(list, "完课模板数据");
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -194,11 +198,12 @@ public class FsCourseFinishTempParentController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody FsCourseFinishTempParent fsCourseFinishTempParent){
 
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (fsCourseFinishTempParent.getCompanyId() == null && loginUser.getCompany() != null) { fsCourseFinishTempParent.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        fsCourseFinishTempParent.setCreateTime(new Date());
-        fsCourseFinishTempParent.setCreateBy(String.valueOf(loginUser.getCompanyUser().getUserId()));
-        return toAjax(fsCourseFinishTempParentService.insertFsCourseFinishTempParent(fsCourseFinishTempParent));
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        if (fsCourseFinishTempParent.getCompanyId() == null && loginUser.getCompany() != null) { fsCourseFinishTempParent.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        fsCourseFinishTempParent.setCreateTime(new Date());
+//        fsCourseFinishTempParent.setCreateBy(String.valueOf(loginUser.getCompanyUser().getUserId()));
+//        return toAjax(fsCourseFinishTempParentService.insertFsCourseFinishTempParent(fsCourseFinishTempParent));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -209,9 +214,10 @@ public class FsCourseFinishTempParentController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody FsCourseFinishTempParent fsCourseFinishTempParent)
     {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (fsCourseFinishTempParent.getCompanyId() == null && loginUser.getCompany() != null) { fsCourseFinishTempParent.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        return toAjax(fsCourseFinishTempParentService.updateFsCourseFinishTempParent(fsCourseFinishTempParent));
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        if (fsCourseFinishTempParent.getCompanyId() == null && loginUser.getCompany() != null) { fsCourseFinishTempParent.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        return toAjax(fsCourseFinishTempParentService.updateFsCourseFinishTempParent(fsCourseFinishTempParent));
+        throw new RuntimeException("not implemented");
     }
 
     /**

fs-agent/src/main/java/com/fs/company/controller/course/FsCourseLinkController.java

@@ -14,8 +14,6 @@ import com.fs.course.param.FsCourseLinkCreateParam;
 import com.fs.course.param.FsCourseLinkRoomNewParam;
 import com.fs.course.service.IFsCourseLinkService;
 import com.fs.course.service.IFsUserCourseVideoService;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.security.SecurityUtils;
 import com.fs.qw.service.IQwUserService;
 import com.fs.qw.vo.QwUserVO;
 import io.swagger.annotations.ApiOperation;
@@ -125,10 +123,11 @@ public class FsCourseLinkController extends BaseController
     @PutMapping("createLinkUrl")
     public R createLinkUrl(@RequestBody FsCourseLinkCreateParam param)
     {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-        return fsCourseLinkService.createLinkUrl(param);
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        return fsCourseLinkService.createLinkUrl(param);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -139,26 +138,27 @@ public class FsCourseLinkController extends BaseController
     @GetMapping("/queryQwIds")
     public R selectQwUserIdByCompanyUserId()
     {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        CompanyUser companyUser = companyUserMapper.selectCompanyUserById(loginUser.getCompanyUser().getUserId());
-        String qwUserId = companyUser.getQwUserId();
-        if(qwUserId == null || qwUserId.isEmpty()){
-            return R.error("请先绑定企微");
-        }
-        Long[] array = Arrays.stream(qwUserId.split(","))
-                .map(String::trim) // 去除空白
-                .filter(str -> !str.isEmpty()) // 过滤空字符串
-                .map(str -> {
-                    try {
-                        return Long.parseLong(str);
-                    } catch (NumberFormatException e) {
-                        return null; // 非数字设为null
-                    }
-                })
-                .filter(num -> num != null) // 过滤null（非数字值）
-                .toArray(Long[]::new);
-        List<QwUserVO> qwUserVOS = qwUserService.selectQwUserVOByIds(array);
-        return R.ok().put("list",qwUserVOS);
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        CompanyUser companyUser = companyUserMapper.selectCompanyUserById(loginUser.getCompanyUser().getUserId());
+//        String qwUserId = companyUser.getQwUserId();
+//        if(qwUserId == null || qwUserId.isEmpty()){
+//            return R.error("请先绑定企微");
+//        }
+//        Long[] array = Arrays.stream(qwUserId.split(","))
+//                .map(String::trim) // 去除空白
+//                .filter(str -> !str.isEmpty()) // 过滤空字符串
+//                .map(str -> {
+//                    try {
+//                        return Long.parseLong(str);
+//                    } catch (NumberFormatException e) {
+//                        return null; // 非数字设为null
+//                    }
+//                })
+//                .filter(num -> num != null) // 过滤null（非数字值）
+//                .toArray(Long[]::new);
+//        List<QwUserVO> qwUserVOS = qwUserService.selectQwUserVOByIds(array);
+//        return R.ok().put("list",qwUserVOS);
+        throw new RuntimeException("not implemented");
     }
 
     /**

fs-agent/src/main/java/com/fs/company/controller/course/FsCoursePlaySourceConfigController.java

@@ -16,8 +16,6 @@ import com.fs.course.param.FsCoursePlaySourceConfigCreateParam;
 import com.fs.course.param.FsCoursePlaySourceConfigEditParam;
 import com.fs.course.service.IFsCoursePlaySourceConfigService;
 import com.fs.course.vo.FsCoursePlaySourceConfigVO;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.security.SecurityUtils;
 import com.github.pagehelper.PageHelper;
 import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -43,14 +41,15 @@ public class FsCoursePlaySourceConfigController extends BaseController {
                               @RequestParam(required = false) String appid,
                               @RequestParam(required = false, defaultValue = "1") Integer pageNum,
                               @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
-        Map<String, Object> params = new HashMap<>();
-        params.put("name", name);
-        params.put("appid", appid);
-        params.put("companyId", SecurityUtils.getLoginUser().getCompany() != null ? SecurityUtils.getLoginUser().getCompany().getCompanyId() : null);
-
-        PageHelper.startPage(pageNum, pageSize);
-        List<FsCoursePlaySourceConfigVO> list = fsCoursePlaySourceConfigService.selectCoursePlaySourceConfigVOListByMap(params);
-        return getDataTable(list);
+//        Map<String, Object> params = new HashMap<>();
+//        params.put("name", name);
+//        params.put("appid", appid);
+//        params.put("companyId", SecurityUtils.getLoginUser().getCompany() != null ? SecurityUtils.getLoginUser().getCompany().getCompanyId() : null);
+//
+//        PageHelper.startPage(pageNum, pageSize);
+//        List<FsCoursePlaySourceConfigVO> list = fsCoursePlaySourceConfigService.selectCoursePlaySourceConfigVOListByMap(params);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     @PreAuthorize("@ss.hasPermi('course:playSourceConfig:query')")
@@ -70,65 +69,68 @@ public class FsCoursePlaySourceConfigController extends BaseController {
     @Log(title = "点播播放源配置", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Valid @RequestBody FsCoursePlaySourceConfigCreateParam param) {
-        Wrapper<FsCoursePlaySourceConfig> queryWrapper = Wrappers.<FsCoursePlaySourceConfig>lambdaQuery()
-                .eq(FsCoursePlaySourceConfig::getAppid, param.getAppid())
-                .eq(FsCoursePlaySourceConfig::getIsDel, 0);
-        if (fsCoursePlaySourceConfigService.count(queryWrapper) > 0) {
-            return AjaxResult.error("appid已存在");
-        }
-
-        FsCoursePlaySourceConfig config = new FsCoursePlaySourceConfig();
-        BeanUtils.copyProperties(param, config);
-
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (config.getCompanyId() == null && loginUser.getCompany() != null) { config.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        config.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-        config.setIsDel(0);
-        config.setCreateTime(LocalDateTime.now());
-        config.setUpdateTime(LocalDateTime.now());
-        fsCoursePlaySourceConfigService.save(config);
-        return AjaxResult.success();
+//        Wrapper<FsCoursePlaySourceConfig> queryWrapper = Wrappers.<FsCoursePlaySourceConfig>lambdaQuery()
+//                .eq(FsCoursePlaySourceConfig::getAppid, param.getAppid())
+//                .eq(FsCoursePlaySourceConfig::getIsDel, 0);
+//        if (fsCoursePlaySourceConfigService.count(queryWrapper) > 0) {
+//            return AjaxResult.error("appid已存在");
+//        }
+//
+//        FsCoursePlaySourceConfig config = new FsCoursePlaySourceConfig();
+//        BeanUtils.copyProperties(param, config);
+//
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        if (config.getCompanyId() == null && loginUser.getCompany() != null) { config.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        config.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        config.setIsDel(0);
+//        config.setCreateTime(LocalDateTime.now());
+//        config.setUpdateTime(LocalDateTime.now());
+//        fsCoursePlaySourceConfigService.save(config);
+//        return AjaxResult.success();
+        throw new RuntimeException("not implemented");
     }
 
     @PreAuthorize("@ss.hasPermi('course:playSourceConfig:edit')")
     @Log(title = "点播播放源配置", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Valid @RequestBody FsCoursePlaySourceConfigEditParam param) {
-        FsCoursePlaySourceConfig config = fsCoursePlaySourceConfigService.getById(param.getId());
-        if (Objects.isNull(config)) {
-            return AjaxResult.error("点播播放源配置不存在");
-        }
-
-        Wrapper<FsCoursePlaySourceConfig> queryWrapper = Wrappers.<FsCoursePlaySourceConfig>lambdaQuery()
-                .eq(FsCoursePlaySourceConfig::getAppid, param.getAppid())
-                .eq(FsCoursePlaySourceConfig::getIsDel, 0)
-                .last("limit 1");
-        FsCoursePlaySourceConfig one = fsCoursePlaySourceConfigService.getOne(queryWrapper);
-        if (Objects.nonNull(one) && !one.getId().equals(config.getId())) {
-            return AjaxResult.error("appid已存在");
-        }
-
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (!(loginUser.getCompany() != null && loginUser.getCompany().getCompanyId().equals(config.getCompanyId()))) {
-            return AjaxResult.error("非法操作");
-        }
-
-        BeanUtils.copyProperties(param, config);
-        fsCoursePlaySourceConfigService.updateById(config);
-        return AjaxResult.success();
+//        FsCoursePlaySourceConfig config = fsCoursePlaySourceConfigService.getById(param.getId());
+//        if (Objects.isNull(config)) {
+//            return AjaxResult.error("点播播放源配置不存在");
+//        }
+//
+//        Wrapper<FsCoursePlaySourceConfig> queryWrapper = Wrappers.<FsCoursePlaySourceConfig>lambdaQuery()
+//                .eq(FsCoursePlaySourceConfig::getAppid, param.getAppid())
+//                .eq(FsCoursePlaySourceConfig::getIsDel, 0)
+//                .last("limit 1");
+//        FsCoursePlaySourceConfig one = fsCoursePlaySourceConfigService.getOne(queryWrapper);
+//        if (Objects.nonNull(one) && !one.getId().equals(config.getId())) {
+//            return AjaxResult.error("appid已存在");
+//        }
+//
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        if (!(loginUser.getCompany() != null && loginUser.getCompany().getCompanyId().equals(config.getCompanyId()))) {
+//            return AjaxResult.error("非法操作");
+//        }
+//
+//        BeanUtils.copyProperties(param, config);
+//        fsCoursePlaySourceConfigService.updateById(config);
+//        return AjaxResult.success();
+        throw new RuntimeException("not implemented");
     }
 
     @PreAuthorize("@ss.hasPermi('course:playSourceConfig:remove')")
     @Log(title = "点播播放源配置", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        Wrapper<FsCoursePlaySourceConfig> updateWrapper = Wrappers.<FsCoursePlaySourceConfig>lambdaUpdate()
-                .set(FsCoursePlaySourceConfig::getIsDel, 1)
-                .eq(FsCoursePlaySourceConfig::getCompanyId, loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null)
-                .in(FsCoursePlaySourceConfig::getId, Arrays.asList(ids));
-        fsCoursePlaySourceConfigService.update(updateWrapper);
-        return AjaxResult.success();
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        Wrapper<FsCoursePlaySourceConfig> updateWrapper = Wrappers.<FsCoursePlaySourceConfig>lambdaUpdate()
+//                .set(FsCoursePlaySourceConfig::getIsDel, 1)
+//                .eq(FsCoursePlaySourceConfig::getCompanyId, loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null)
+//                .in(FsCoursePlaySourceConfig::getId, Arrays.asList(ids));
+//        fsCoursePlaySourceConfigService.update(updateWrapper);
+//        return AjaxResult.success();
+        throw new RuntimeException("not implemented");
     }
 
     /**

fs-agent/src/main/java/com/fs/company/controller/course/FsCourseRedPacketLogController.java

@@ -21,8 +21,7 @@ import com.fs.course.param.FsCourseRedPacketLogParam;
 import com.fs.course.service.IFsCourseRedPacketLogService;
 import com.fs.course.service.IFsUserCoursePeriodService;
 import com.fs.course.vo.FsCourseRedPacketLogListPVO;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.utils.PhoneUtil;
 import com.fs.his.vo.OptionsVO;
 import com.fs.system.service.ISysConfigService;
@@ -68,35 +67,36 @@ public class FsCourseRedPacketLogController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(FsCourseRedPacketLogParam fsCourseRedPacketLog)
     {
-        startPage();
-        if (fsCourseRedPacketLog.getPhoneMk() != null && fsCourseRedPacketLog.getPhoneMk() != "") {
-            fsCourseRedPacketLog.setPhone(encryptPhone(fsCourseRedPacketLog.getPhoneMk()));
-        }
-
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = loginUser.getCompanyUser().getUserId();
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
-            fsCourseRedPacketLog.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        }
-
-        ProjectConfig projectConfig = configService.getProjectConfig();
-        String companyName = (projectConfig != null && projectConfig.getCloudHost() != null) ? projectConfig.getCloudHost().getCompanyName() : null;
-        if("济南联志健康".equals(companyName)){
-            fsCourseRedPacketLog.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        }
-
-        List<FsCourseRedPacketLogListPVO> list = fsCourseRedPacketLogService.selectFsCourseRedPacketLogListVO(fsCourseRedPacketLog);
-        for (FsCourseRedPacketLogListPVO fsCourseRedPacketLogListPVO : list) {
-            if (ObjectUtil.isNotEmpty(fsCourseRedPacketLogListPVO.getPeriodId())){
-                FsUserCoursePeriod fsUserCoursePeriod = fsUserCoursePeriodService.selectFsUserCoursePeriodById(fsCourseRedPacketLogListPVO.getPeriodId().longValue());
-                fsCourseRedPacketLogListPVO.setPeriodName(fsUserCoursePeriod.getPeriodName());
-            }
-
-            fsCourseRedPacketLogListPVO.setPhone(PhoneUtil.decryptAutoPhoneMk(fsCourseRedPacketLogListPVO.getPhone()));
-        }
-        return getDataTable(list);
+//        startPage();
+//        if (fsCourseRedPacketLog.getPhoneMk() != null && fsCourseRedPacketLog.getPhoneMk() != "") {
+//            fsCourseRedPacketLog.setPhone(encryptPhone(fsCourseRedPacketLog.getPhoneMk()));
+//        }
+//
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = loginUser.getCompanyUser().getUserId();
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
+//            fsCourseRedPacketLog.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        }
+//
+//        ProjectConfig projectConfig = configService.getProjectConfig();
+//        String companyName = (projectConfig != null && projectConfig.getCloudHost() != null) ? projectConfig.getCloudHost().getCompanyName() : null;
+//        if("济南联志健康".equals(companyName)){
+//            fsCourseRedPacketLog.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        }
+//
+//        List<FsCourseRedPacketLogListPVO> list = fsCourseRedPacketLogService.selectFsCourseRedPacketLogListVO(fsCourseRedPacketLog);
+//        for (FsCourseRedPacketLogListPVO fsCourseRedPacketLogListPVO : list) {
+//            if (ObjectUtil.isNotEmpty(fsCourseRedPacketLogListPVO.getPeriodId())){
+//                FsUserCoursePeriod fsUserCoursePeriod = fsUserCoursePeriodService.selectFsUserCoursePeriodById(fsCourseRedPacketLogListPVO.getPeriodId().longValue());
+//                fsCourseRedPacketLogListPVO.setPeriodName(fsUserCoursePeriod.getPeriodName());
+//            }
+//
+//            fsCourseRedPacketLogListPVO.setPhone(PhoneUtil.decryptAutoPhoneMk(fsCourseRedPacketLogListPVO.getPhone()));
+//        }
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -106,46 +106,48 @@ public class FsCourseRedPacketLogController extends BaseController
     @GetMapping("/myList")
     public TableDataInfo myList(FsCourseRedPacketLogParam fsCourseRedPacketLog)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        fsCourseRedPacketLog.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        //fsCourseRedPacketLog.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-        if (fsCourseRedPacketLog.getPhoneMk() != null && fsCourseRedPacketLog.getPhoneMk() != "") {
-            fsCourseRedPacketLog.setPhone(encryptPhone(fsCourseRedPacketLog.getPhoneMk()));
-        }
-
-        List<FsCourseRedPacketLogListPVO> list = fsCourseRedPacketLogService.selectFsCourseRedPacketLogListVO(fsCourseRedPacketLog);
-        for (FsCourseRedPacketLogListPVO fsCourseRedPacketLogListPVO : list) {
-            if (ObjectUtil.isNotEmpty(fsCourseRedPacketLogListPVO.getPeriodId())){
-                FsUserCoursePeriod fsUserCoursePeriod = fsUserCoursePeriodService.selectFsUserCoursePeriodById(fsCourseRedPacketLogListPVO.getPeriodId().longValue());
-                fsCourseRedPacketLogListPVO.setPeriodName(fsUserCoursePeriod.getPeriodName());
-            }
-            fsCourseRedPacketLogListPVO.setPhone(PhoneUtil.decryptAutoPhoneMk(fsCourseRedPacketLogListPVO.getPhone()));
-        }
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        fsCourseRedPacketLog.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        //fsCourseRedPacketLog.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        if (fsCourseRedPacketLog.getPhoneMk() != null && fsCourseRedPacketLog.getPhoneMk() != "") {
+//            fsCourseRedPacketLog.setPhone(encryptPhone(fsCourseRedPacketLog.getPhoneMk()));
+//        }
+//
+//        List<FsCourseRedPacketLogListPVO> list = fsCourseRedPacketLogService.selectFsCourseRedPacketLogListVO(fsCourseRedPacketLog);
+//        for (FsCourseRedPacketLogListPVO fsCourseRedPacketLogListPVO : list) {
+//            if (ObjectUtil.isNotEmpty(fsCourseRedPacketLogListPVO.getPeriodId())){
+//                FsUserCoursePeriod fsUserCoursePeriod = fsUserCoursePeriodService.selectFsUserCoursePeriodById(fsCourseRedPacketLogListPVO.getPeriodId().longValue());
+//                fsCourseRedPacketLogListPVO.setPeriodName(fsUserCoursePeriod.getPeriodName());
+//            }
+//            fsCourseRedPacketLogListPVO.setPhone(PhoneUtil.decryptAutoPhoneMk(fsCourseRedPacketLogListPVO.getPhone()));
+//        }
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     @PreAuthorize("@ss.hasPermi('course:courseRedPacketLog:myList')")
     @GetMapping("/myListNew")
     public TableDataInfo myListNew(FsCourseRedPacketLogParam fsCourseRedPacketLog)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        fsCourseRedPacketLog.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-
-        if (fsCourseRedPacketLog.getPhoneMk() != null && fsCourseRedPacketLog.getPhoneMk() != "") {
-            fsCourseRedPacketLog.setPhone(encryptPhone(fsCourseRedPacketLog.getPhoneMk()));
-        }
-
-        List<FsCourseRedPacketLogListPVO> list = fsCourseRedPacketLogService.selectFsCourseRedPacketLogListVONew(fsCourseRedPacketLog);
-        for (FsCourseRedPacketLogListPVO fsCourseRedPacketLogListPVO : list) {
-            if (ObjectUtil.isNotEmpty(fsCourseRedPacketLogListPVO.getPeriodId())){
-                FsUserCoursePeriod fsUserCoursePeriod = fsUserCoursePeriodService.selectFsUserCoursePeriodById(fsCourseRedPacketLogListPVO.getPeriodId().longValue());
-                fsCourseRedPacketLogListPVO.setPeriodName(fsUserCoursePeriod.getPeriodName());
-            }
-            fsCourseRedPacketLogListPVO.setPhone(PhoneUtil.decryptAutoPhoneMk(fsCourseRedPacketLogListPVO.getPhone()));
-        }
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        fsCourseRedPacketLog.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//
+//        if (fsCourseRedPacketLog.getPhoneMk() != null && fsCourseRedPacketLog.getPhoneMk() != "") {
+//            fsCourseRedPacketLog.setPhone(encryptPhone(fsCourseRedPacketLog.getPhoneMk()));
+//        }
+//
+//        List<FsCourseRedPacketLogListPVO> list = fsCourseRedPacketLogService.selectFsCourseRedPacketLogListVONew(fsCourseRedPacketLog);
+//        for (FsCourseRedPacketLogListPVO fsCourseRedPacketLogListPVO : list) {
+//            if (ObjectUtil.isNotEmpty(fsCourseRedPacketLogListPVO.getPeriodId())){
+//                FsUserCoursePeriod fsUserCoursePeriod = fsUserCoursePeriodService.selectFsUserCoursePeriodById(fsCourseRedPacketLogListPVO.getPeriodId().longValue());
+//                fsCourseRedPacketLogListPVO.setPeriodName(fsUserCoursePeriod.getPeriodName());
+//            }
+//            fsCourseRedPacketLogListPVO.setPhone(PhoneUtil.decryptAutoPhoneMk(fsCourseRedPacketLogListPVO.getPhone()));
+//        }
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -181,22 +183,23 @@ public class FsCourseRedPacketLogController extends BaseController
     @GetMapping("/myExport")
     public AjaxResult myExport(FsCourseRedPacketLogParam fsCourseRedPacketLog)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        fsCourseRedPacketLog.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-
-        if (fsCourseRedPacketLog.getPhoneMk()!=null&&fsCourseRedPacketLog.getPhoneMk()!=""){
-            fsCourseRedPacketLog.setPhone(encryptPhone(fsCourseRedPacketLog.getPhoneMk()));
-        }
-        List<FsCourseRedPacketLogListPVO> list = fsCourseRedPacketLogService.selectFsCourseRedPacketLogListVO(fsCourseRedPacketLog);
-        for (FsCourseRedPacketLogListPVO fsCourseRedPacketLogListPVO : list) {
-            if (ObjectUtil.isNotEmpty(fsCourseRedPacketLogListPVO.getPeriodId())){
-                FsUserCoursePeriod fsUserCoursePeriod = fsUserCoursePeriodService.selectFsUserCoursePeriodById(fsCourseRedPacketLogListPVO.getPeriodId().longValue());
-                fsCourseRedPacketLogListPVO.setPeriodName(fsUserCoursePeriod.getPeriodName());
-            }
-            fsCourseRedPacketLogListPVO.setPhone(PhoneUtil.decryptAutoPhoneMk(fsCourseRedPacketLogListPVO.getPhone()));
-        }
-        ExcelUtil<FsCourseRedPacketLogListPVO> util = new ExcelUtil<FsCourseRedPacketLogListPVO>(FsCourseRedPacketLogListPVO.class);
-        return util.exportExcel(list, "短链课程看课记录数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        fsCourseRedPacketLog.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//
+//        if (fsCourseRedPacketLog.getPhoneMk()!=null&&fsCourseRedPacketLog.getPhoneMk()!=""){
+//            fsCourseRedPacketLog.setPhone(encryptPhone(fsCourseRedPacketLog.getPhoneMk()));
+//        }
+//        List<FsCourseRedPacketLogListPVO> list = fsCourseRedPacketLogService.selectFsCourseRedPacketLogListVO(fsCourseRedPacketLog);
+//        for (FsCourseRedPacketLogListPVO fsCourseRedPacketLogListPVO : list) {
+//            if (ObjectUtil.isNotEmpty(fsCourseRedPacketLogListPVO.getPeriodId())){
+//                FsUserCoursePeriod fsUserCoursePeriod = fsUserCoursePeriodService.selectFsUserCoursePeriodById(fsCourseRedPacketLogListPVO.getPeriodId().longValue());
+//                fsCourseRedPacketLogListPVO.setPeriodName(fsUserCoursePeriod.getPeriodName());
+//            }
+//            fsCourseRedPacketLogListPVO.setPhone(PhoneUtil.decryptAutoPhoneMk(fsCourseRedPacketLogListPVO.getPhone()));
+//        }
+//        ExcelUtil<FsCourseRedPacketLogListPVO> util = new ExcelUtil<FsCourseRedPacketLogListPVO>(FsCourseRedPacketLogListPVO.class);
+//        return util.exportExcel(list, "短链课程看课记录数据");
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -260,9 +263,10 @@ public class FsCourseRedPacketLogController extends BaseController
     public R courseList()
     {
 
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        List<OptionsVO> optionsVOS = fsUserCourseMapper.selectFsUserCourseByCompany(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        return R.ok().put("list", optionsVOS);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        List<OptionsVO> optionsVOS = fsUserCourseMapper.selectFsUserCourseByCompany(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        return R.ok().put("list", optionsVOS);
+        throw new RuntimeException("not implemented");
     }
 
     @GetMapping(value = "/videoList/{id}")

fs-agent/src/main/java/com/fs/company/controller/course/FsCourseSopController.java

@@ -10,8 +10,7 @@ import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.course.domain.FsCourseSop;
 import com.fs.course.service.IFsCourseSopService;
 import com.fs.course.vo.FsCourseSopListVO;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -44,11 +43,12 @@ public class FsCourseSopController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(FsCourseSop fsSop)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        fsSop.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        List<FsCourseSopListVO> list = fsSopService.selectFsCourseSopVOList(fsSop);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        fsSop.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        List<FsCourseSopListVO> list = fsSopService.selectFsCourseSopVOList(fsSop);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -59,11 +59,12 @@ public class FsCourseSopController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(FsCourseSop fsSop)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        fsSop.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        List<FsCourseSop> list = fsSopService.selectFsCourseSopList(fsSop);
-        ExcelUtil<FsCourseSop> util = new ExcelUtil<FsCourseSop>(FsCourseSop.class);
-        return util.exportExcel(list, "看课sop数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        fsSop.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        List<FsCourseSop> list = fsSopService.selectFsCourseSopList(fsSop);
+//        ExcelUtil<FsCourseSop> util = new ExcelUtil<FsCourseSop>(FsCourseSop.class);
+//        return util.exportExcel(list, "看课sop数据");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -84,11 +85,12 @@ public class FsCourseSopController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody FsCourseSop fsSop)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        fsSop.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        fsSop.setCreateTime(new Date());
-        fsSop.setCreateBy(loginUser.getCompanyUser().getNickName());
-        return toAjax(fsSopService.insertFsCourseSop(fsSop));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        fsSop.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        fsSop.setCreateTime(new Date());
+//        fsSop.setCreateBy(loginUser.getCompanyUser().getNickName());
+//        return toAjax(fsSopService.insertFsCourseSop(fsSop));
+        throw new RuntimeException("not implemented");
     }
 
     /**

fs-agent/src/main/java/com/fs/company/controller/course/FsCourseSopLogsController.java

@@ -11,8 +11,7 @@ import com.fs.course.domain.FsCourseSopLogs;
 import com.fs.course.param.FsCourseSopLogsParam;
 import com.fs.course.service.IFsCourseSopLogsService;
 import com.fs.course.vo.FsCourseSopLogsCVOList;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -58,13 +57,14 @@ public class FsCourseSopLogsController extends BaseController
     @GetMapping("/CVOList")
     public TableDataInfo selectFsCourseSopLogsCVOList(FsCourseSopLogsParam param)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-
-        List<FsCourseSopLogsCVOList> list = fsSopLogsService.selectFsCourseSopLogsCVOList(param);
-
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//
+//        List<FsCourseSopLogsCVOList> list = fsSopLogsService.selectFsCourseSopLogsCVOList(param);
+//
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -74,13 +74,14 @@ public class FsCourseSopLogsController extends BaseController
     @GetMapping("/myCVOList")
     public TableDataInfo selectFsCourseSopLogsMyCVOList(FsCourseSopLogsParam param)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        param.setQwUserid(1L);
-        List<FsCourseSopLogsCVOList> list = fsSopLogsService.selectFsCourseSopLogsCVOList(param);
-
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        param.setQwUserid(1L);
+//        List<FsCourseSopLogsCVOList> list = fsSopLogsService.selectFsCourseSopLogsCVOList(param);
+//
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -92,12 +93,13 @@ public class FsCourseSopLogsController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(FsCourseSopLogsParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-
-        List<FsCourseSopLogsCVOList> list = fsSopLogsService.selectFsCourseSopLogsCVOList(param);
-        ExcelUtil<FsCourseSopLogsCVOList> util = new ExcelUtil<FsCourseSopLogsCVOList>(FsCourseSopLogsCVOList.class);
-        return util.exportExcel(list, "看课SOP  定时任务数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//
+//        List<FsCourseSopLogsCVOList> list = fsSopLogsService.selectFsCourseSopLogsCVOList(param);
+//        ExcelUtil<FsCourseSopLogsCVOList> util = new ExcelUtil<FsCourseSopLogsCVOList>(FsCourseSopLogsCVOList.class);
+//        return util.exportExcel(list, "看课SOP  定时任务数据");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -108,12 +110,13 @@ public class FsCourseSopLogsController extends BaseController
     @GetMapping("/myExport")
     public AjaxResult myExport(FsCourseSopLogsParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        param.setQwUserid(1L);
-        List<FsCourseSopLogsCVOList> list = fsSopLogsService.selectFsCourseSopLogsCVOList(param);
-        ExcelUtil<FsCourseSopLogsCVOList> util = new ExcelUtil<FsCourseSopLogsCVOList>(FsCourseSopLogsCVOList.class);
-        return util.exportExcel(list, "看课SOP  定时任务数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        param.setQwUserid(1L);
+//        List<FsCourseSopLogsCVOList> list = fsSopLogsService.selectFsCourseSopLogsCVOList(param);
+//        ExcelUtil<FsCourseSopLogsCVOList> util = new ExcelUtil<FsCourseSopLogsCVOList>(FsCourseSopLogsCVOList.class);
+//        return util.exportExcel(list, "看课SOP  定时任务数据");
+        throw new RuntimeException("not implemented");
     }
 
     /**

fs-agent/src/main/java/com/fs/company/controller/course/FsCourseTrafficLogController.java

@@ -12,7 +12,7 @@ import com.fs.course.param.FsCourseTrafficLogParam;
 import com.fs.course.service.IFsCourseTrafficLogService;
 import com.fs.course.service.IFsUserCourseService;
 import com.fs.course.vo.FsCourseTrafficLogListVO;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.vo.OptionsVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

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

@@ -18,8 +18,7 @@ import com.fs.course.vo.FsCourseOverVO;
 import com.fs.course.vo.FsCourseUserStatisticsListVO;
 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.framework.web.service.TokenService;
 import com.fs.qw.param.QwWatchLogStatisticsListParam;
 import com.fs.qw.service.IQwWatchLogService;
 import com.fs.qw.vo.QwWatchLogAllStatisticsListVO;
@@ -70,28 +69,29 @@ public class FsCourseWatchLogController extends BaseController
     public TableDataInfo list(FsCourseWatchLogListParam param)
     {
 
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-
-        if (param.getSendType()==1&& param.getPeriodETime()!=null && param.getPeriodSTime()!=null) {
-            List<Long> periodIds = userCoursePeriodDaysService.selectFsUserCoursePeriodDaysByTime(param.getPeriodSTime(), param.getPeriodETime());
-
-            if (!periodIds.isEmpty()){
-                List<Long> longs = userCoursePeriodService.selectFsUserCoursePeriodListByPeriodId(periodIds, loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-                if (!longs.isEmpty()){
-                    param.setPeriodIds(longs);
-                }else {
-                    return getDataTable(new ArrayList<>());
-                }
-            }else {
-                return getDataTable(new ArrayList<>());
-            }
-
-        }
-
-        startPage();
-        List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVO(param);
-        return getDataTable(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//
+//        if (param.getSendType()==1&& param.getPeriodETime()!=null && param.getPeriodSTime()!=null) {
+//            List<Long> periodIds = userCoursePeriodDaysService.selectFsUserCoursePeriodDaysByTime(param.getPeriodSTime(), param.getPeriodETime());
+//
+//            if (!periodIds.isEmpty()){
+//                List<Long> longs = userCoursePeriodService.selectFsUserCoursePeriodListByPeriodId(periodIds, loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//                if (!longs.isEmpty()){
+//                    param.setPeriodIds(longs);
+//                }else {
+//                    return getDataTable(new ArrayList<>());
+//                }
+//            }else {
+//                return getDataTable(new ArrayList<>());
+//            }
+//
+//        }
+//
+//        startPage();
+//        List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVO(param);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -102,55 +102,56 @@ public class FsCourseWatchLogController extends BaseController
     @GetMapping("/deptList")
     public TableDataInfo deptList(FsCourseWatchLogListParam param) {
 
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-
-
-        List<Long> combinedList = new ArrayList<>();
-        Long deptId;
-
-        if(param.getDeptId() != null){
-            deptId = param.getDeptId();
-            combinedList.add(deptId);
-        }else{
-            //本部门
-            deptId = loginUser.getCompanyUser().getDeptId();
-            if (deptId!=null){
-                combinedList.add(deptId);
-            }
-        }
-
-        //本部门的下级部门
-        List<Long> deptList = companyDeptService.selectCompanyDeptByParentId(deptId);
-        if (!deptList.isEmpty()){
-            combinedList.addAll(deptList);
-        }
-
-        param.setCuDeptIdList(combinedList);
-        param.setUserType(loginUser.getCompanyUser().getUserType());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
-
-
-        if (ObjectUtil.isNotEmpty(param.getSendType()) &&param.getSendType()==1&& param.getPeriodETime()!=null && param.getPeriodSTime()!=null) {
-            List<Long> periodIds = userCoursePeriodDaysService.selectFsUserCoursePeriodDaysByTime(param.getPeriodSTime(), param.getPeriodETime());
-
-            if (!periodIds.isEmpty()){
-                List<Long> longs = userCoursePeriodService.selectFsUserCoursePeriodListByPeriodId(periodIds, loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-                if (!longs.isEmpty()){
-                    param.setPeriodIds(longs);
-                }else {
-                    return getDataTable(new ArrayList<>());
-                }
-            }else {
-                return getDataTable(new ArrayList<>());
-            }
-
-        }
-
-
-        startPage();
-        List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVO(param);
-
-        return getDataTable(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//
+//
+//        List<Long> combinedList = new ArrayList<>();
+//        Long deptId;
+//
+//        if(param.getDeptId() != null){
+//            deptId = param.getDeptId();
+//            combinedList.add(deptId);
+//        }else{
+//            //本部门
+//            deptId = loginUser.getCompanyUser().getDeptId();
+//            if (deptId!=null){
+//                combinedList.add(deptId);
+//            }
+//        }
+//
+//        //本部门的下级部门
+//        List<Long> deptList = companyDeptService.selectCompanyDeptByParentId(deptId);
+//        if (!deptList.isEmpty()){
+//            combinedList.addAll(deptList);
+//        }
+//
+//        param.setCuDeptIdList(combinedList);
+//        param.setUserType(loginUser.getCompanyUser().getUserType());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//
+//
+//        if (ObjectUtil.isNotEmpty(param.getSendType()) &&param.getSendType()==1&& param.getPeriodETime()!=null && param.getPeriodSTime()!=null) {
+//            List<Long> periodIds = userCoursePeriodDaysService.selectFsUserCoursePeriodDaysByTime(param.getPeriodSTime(), param.getPeriodETime());
+//
+//            if (!periodIds.isEmpty()){
+//                List<Long> longs = userCoursePeriodService.selectFsUserCoursePeriodListByPeriodId(periodIds, loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//                if (!longs.isEmpty()){
+//                    param.setPeriodIds(longs);
+//                }else {
+//                    return getDataTable(new ArrayList<>());
+//                }
+//            }else {
+//                return getDataTable(new ArrayList<>());
+//            }
+//
+//        }
+//
+//
+//        startPage();
+//        List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVO(param);
+//
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
     /**
      * 查询短链课程看课记录列表
@@ -160,28 +161,29 @@ public class FsCourseWatchLogController extends BaseController
     public TableDataInfo myList(FsCourseWatchLogListParam param)
     {
 
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyUserId( loginUser.getCompanyUser().getUserId());
-
-        if (param.getSendType()==1&& param.getPeriodETime()!=null && param.getPeriodSTime()!=null) {
-            List<Long> periodIds = userCoursePeriodDaysService.selectFsUserCoursePeriodDaysByTime(param.getPeriodSTime(), param.getPeriodETime());
-            if (!periodIds.isEmpty()){
-                List<Long> longs = userCoursePeriodService.selectFsUserCoursePeriodListByPeriodId(periodIds, loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-                if (!longs.isEmpty()){
-                    param.setPeriodIds(longs);
-                }else {
-                    return getDataTable(new ArrayList<>());
-                }
-            }else {
-                return getDataTable(new ArrayList<>());
-            }
-
-        }
-
-        startPage();
-
-        List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVO(param);
-        return getDataTable(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyUserId( loginUser.getCompanyUser().getUserId());
+//
+//        if (param.getSendType()==1&& param.getPeriodETime()!=null && param.getPeriodSTime()!=null) {
+//            List<Long> periodIds = userCoursePeriodDaysService.selectFsUserCoursePeriodDaysByTime(param.getPeriodSTime(), param.getPeriodETime());
+//            if (!periodIds.isEmpty()){
+//                List<Long> longs = userCoursePeriodService.selectFsUserCoursePeriodListByPeriodId(periodIds, loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//                if (!longs.isEmpty()){
+//                    param.setPeriodIds(longs);
+//                }else {
+//                    return getDataTable(new ArrayList<>());
+//                }
+//            }else {
+//                return getDataTable(new ArrayList<>());
+//            }
+//
+//        }
+//
+//        startPage();
+//
+//        List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVO(param);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -189,84 +191,91 @@ public class FsCourseWatchLogController extends BaseController
     @GetMapping("/statisticsList")
     public TableDataInfo statisticsList(FsCourseWatchLogStatisticsListParam param)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        if (param.getSTime()==null||param.getETime()==null){
-            return getDataTable(new ArrayList<>());
-        }
-        param.setSendType(1); //个微
-        List<FsCourseWatchLogStatisticsListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogStatisticsListVO(param);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        if (param.getSTime()==null||param.getETime()==null){
+//            return getDataTable(new ArrayList<>());
+//        }
+//        param.setSendType(1); //个微
+//        List<FsCourseWatchLogStatisticsListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogStatisticsListVO(param);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     @GetMapping("/qwWatchLogStatisticsList")
     public TableDataInfo qwWatchLogStatisticsList(QwWatchLogStatisticsListParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        if (param.getSTime()==null||param.getETime()==null){
-            return getDataTable(new ArrayList<>());
-        }
-        return qwWatchLogService.selectQwWatchLogStatisticsListVONew(param);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        if (param.getSTime()==null||param.getETime()==null){
+//            return getDataTable(new ArrayList<>());
+//        }
+//        return qwWatchLogService.selectQwWatchLogStatisticsListVONew(param);
+        throw new RuntimeException("not implemented");
     }
     @GetMapping("/myQwWatchLogStatisticsList")
     public TableDataInfo myQwWatchLogStatisticsList(QwWatchLogStatisticsListParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-        if (param.getSTime()==null||param.getETime()==null){
-            return getDataTable(new ArrayList<>());
-        }
-        return qwWatchLogService.selectQwWatchLogStatisticsListVONew(param);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        if (param.getSTime()==null||param.getETime()==null){
+//            return getDataTable(new ArrayList<>());
+//        }
+//        return qwWatchLogService.selectQwWatchLogStatisticsListVONew(param);
+        throw new RuntimeException("not implemented");
     }
 
 
     @GetMapping("/qwWatchLogAllStatisticsList")
     public TableDataInfo qwWatchLogAllStatisticsList(QwWatchLogStatisticsListParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        if (param.getSTime()==null||param.getETime()==null){
-            return getDataTable(new ArrayList<>());
-        }
-        return qwWatchLogService.selectQwWatchLogAllStatisticsListVONew(param);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        if (param.getSTime()==null||param.getETime()==null){
+//            return getDataTable(new ArrayList<>());
+//        }
+//        return qwWatchLogService.selectQwWatchLogAllStatisticsListVONew(param);
+        throw new RuntimeException("not implemented");
     }
     @GetMapping("/myQwWatchLogAllStatisticsList")
     public TableDataInfo myQwWatchLogAllStatisticsList(QwWatchLogStatisticsListParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-        if (param.getSTime()==null||param.getETime()==null){
-            return getDataTable(new ArrayList<>());
-        }
-        return qwWatchLogService.selectQwWatchLogAllStatisticsListVONew(param);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        if (param.getSTime()==null||param.getETime()==null){
+//            return getDataTable(new ArrayList<>());
+//        }
+//        return qwWatchLogService.selectQwWatchLogAllStatisticsListVONew(param);
+        throw new RuntimeException("not implemented");
     }
     @GetMapping("/watchLogStatistics")
     public TableDataInfo watchLogStatistics(FsCourseOverParam param)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        if (param.getSTime()==null||param.getETime()==null){
-            return getDataTable(new ArrayList<>());
-        }
-        List<FsCourseOverVO> list = fsCourseWatchLogService.selectFsCourseWatchLogOverStatisticsListVO(param);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        if (param.getSTime()==null||param.getETime()==null){
+//            return getDataTable(new ArrayList<>());
+//        }
+//        List<FsCourseOverVO> list = fsCourseWatchLogService.selectFsCourseWatchLogOverStatisticsListVO(param);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
     @GetMapping("/watchLogStatisticsExport")
     public AjaxResult watchLogStatisticsExport(FsCourseOverParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        if (param.getSTime()==null||param.getETime()==null){
-            return AjaxResult.error("请选择时间");
-        }
-        List<FsCourseOverVO> list = fsCourseWatchLogService.selectFsCourseWatchLogOverStatisticsListVO(param);
-        ExcelUtil<FsCourseOverVO> util = new ExcelUtil<FsCourseOverVO>(FsCourseOverVO.class);
-        return util.exportExcel(list, "完课数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        if (param.getSTime()==null||param.getETime()==null){
+//            return AjaxResult.error("请选择时间");
+//        }
+//        List<FsCourseOverVO> list = fsCourseWatchLogService.selectFsCourseWatchLogOverStatisticsListVO(param);
+//        ExcelUtil<FsCourseOverVO> util = new ExcelUtil<FsCourseOverVO>(FsCourseOverVO.class);
+//        return util.exportExcel(list, "完课数据");
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -274,14 +283,15 @@ public class FsCourseWatchLogController extends BaseController
     @GetMapping("/userStatisticsList")
     public TableDataInfo userStatisticsList(FsCourseUserStatisticsListParam param)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        if (param.getSTime()==null||param.getETime()==null){
-            return getDataTable(new ArrayList<>());
-        }
-        List<FsCourseUserStatisticsListVO> list = fsCourseWatchLogService.selectFsCourseUserStatisticsListVO(param);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        if (param.getSTime()==null||param.getETime()==null){
+//            return getDataTable(new ArrayList<>());
+//        }
+//        List<FsCourseUserStatisticsListVO> list = fsCourseWatchLogService.selectFsCourseUserStatisticsListVO(param);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -294,11 +304,12 @@ public class FsCourseWatchLogController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(FsCourseWatchLogListParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVOexport(param);
-        ExcelUtil<FsCourseWatchLogListVO> util = new ExcelUtil<FsCourseWatchLogListVO>(FsCourseWatchLogListVO.class);
-        return util.exportExcel(list, "短链课程看课记录数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVOexport(param);
+//        ExcelUtil<FsCourseWatchLogListVO> util = new ExcelUtil<FsCourseWatchLogListVO>(FsCourseWatchLogListVO.class);
+//        return util.exportExcel(list, "短链课程看课记录数据");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -309,12 +320,13 @@ public class FsCourseWatchLogController extends BaseController
     @GetMapping("/myExport")
     public AjaxResult myExport(FsCourseWatchLogListParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        param.setCompanyUserId( loginUser.getCompanyUser().getUserId());
-        List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVOexport(param);
-        ExcelUtil<FsCourseWatchLogListVO> util = new ExcelUtil<FsCourseWatchLogListVO>(FsCourseWatchLogListVO.class);
-        return util.exportExcel(list, "短链课程看课记录数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        param.setCompanyUserId( loginUser.getCompanyUser().getUserId());
+//        List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVOexport(param);
+//        ExcelUtil<FsCourseWatchLogListVO> util = new ExcelUtil<FsCourseWatchLogListVO>(FsCourseWatchLogListVO.class);
+//        return util.exportExcel(list, "短链课程看课记录数据");
+        throw new RuntimeException("not implemented");
     }
     /**
      * 获取短链课程看课记录详细信息

fs-agent/src/main/java/com/fs/company/controller/course/FsMessTempController.java

@@ -10,8 +10,7 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.course.domain.FsMessTemp;
 import com.fs.course.service.IFsMessTempService;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -77,10 +76,11 @@ public class FsMessTempController extends BaseController
     @PostMapping
     public R add(@RequestBody FsMessTemp fsMessTemp)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        fsMessTemp.setCompanyId(loginUser==null?null:loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        fsMessTempService.insertFsMessTemp(fsMessTemp);
-        return R.ok();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        fsMessTemp.setCompanyId(loginUser==null?null:loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        fsMessTempService.insertFsMessTemp(fsMessTemp);
+//        return R.ok();
+        throw new RuntimeException("not implemented");
     }
 
     /**

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

@@ -11,8 +11,7 @@ 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.framework.web.service.TokenService;
 import com.fs.his.vo.OptionsVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -43,11 +42,12 @@ public class FsUserCourseController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(FsUserCourseParam fsUserCourse)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (fsUserCourse.getCompanyId() == null && loginUser.getCompany() != null) { fsUserCourse.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<FsUserCourseListPVO> list = fsUserCourseService.selectFsUserCourseListCompanyPVO(fsUserCourse);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (fsUserCourse.getCompanyId() == null && loginUser.getCompany() != null) { fsUserCourse.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<FsUserCourseListPVO> list = fsUserCourseService.selectFsUserCourseListCompanyPVO(fsUserCourse);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
 

fs-agent/src/main/java/com/fs/company/controller/course/FsUserCoursePeriodController.java

@@ -26,8 +26,7 @@ import com.fs.course.vo.FsPeriodCountVO;
 import com.fs.course.vo.FsUserCoursePeriodVO;
 import com.fs.course.vo.PeriodRedPacketVO;
 import com.fs.course.vo.UpdateCourseTimeVo;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.vo.OptionsVO;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -68,11 +67,12 @@ public class FsUserCoursePeriodController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(FsUserCoursePeriod fsUserCoursePeriod)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        fsUserCoursePeriod.setCompanyId(loginUser.getCompany() != null ? String.valueOf(loginUser.getCompany().getCompanyId()) : null);
-        List<FsUserCoursePeriod> list = fsUserCoursePeriodService.selectFsUserCoursePeriodList(fsUserCoursePeriod);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        fsUserCoursePeriod.setCompanyId(loginUser.getCompany() != null ? String.valueOf(loginUser.getCompany().getCompanyId()) : null);
+//        List<FsUserCoursePeriod> list = fsUserCoursePeriodService.selectFsUserCoursePeriodList(fsUserCoursePeriod);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -86,11 +86,12 @@ public class FsUserCoursePeriodController extends BaseController {
     @GetMapping("/listLabel")
     public TableDataInfo listLabel(FsUserCoursePeriod fsUserCoursePeriod)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        fsUserCoursePeriod.setCompanyId(loginUser.getCompany() != null ? String.valueOf(loginUser.getCompany().getCompanyId()) : null);
-        List<SysDictData> list = fsUserCoursePeriodService.selectFsUserCoursePeriodListLabel(fsUserCoursePeriod);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        fsUserCoursePeriod.setCompanyId(loginUser.getCompany() != null ? String.valueOf(loginUser.getCompany().getCompanyId()) : null);
+//        List<SysDictData> list = fsUserCoursePeriodService.selectFsUserCoursePeriodListLabel(fsUserCoursePeriod);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -98,42 +99,43 @@ public class FsUserCoursePeriodController extends BaseController {
     @ApiOperation("自定义查询主列表分页")
     public R pageList(@RequestBody FsUserCoursePeriod fsUserCoursePeriod)
     {
-        if (ObjectUtil.isNotEmpty(fsUserCoursePeriod.getTrainingCampId())){
-            throw new CustomException("训练营不能为空！");
-        }
-//        startPage();
-        PageHelper.startPage(fsUserCoursePeriod.getPageNum(), fsUserCoursePeriod.getPageSize());
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        fsUserCoursePeriod.setCompanyIdList(Collections.singletonList(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null));
-        List<FsUserCoursePeriodVO> list = fsUserCoursePeriodService.selectFsUserCoursePeriodPage(fsUserCoursePeriod);
-        // 使用Stream API的简洁写法
-        Long currentCompanyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-        for (FsUserCoursePeriodVO vo : list) {
-            String isNeedRegisterMember = vo.getIsNeedRegisterMember();
-
-            if (StringUtils.isNotEmpty(isNeedRegisterMember)) {
-                boolean containsCurrentCompany = Arrays.stream(isNeedRegisterMember.split(","))
-                        .map(String::trim)
-                        .anyMatch(id -> id.equals(String.valueOf(currentCompanyId)));
-                vo.setIsNeedRegisterMember(containsCurrentCompany ? "1" : "0");
-            } else {
-                vo.setIsNeedRegisterMember("0");
-            }
-
-            // 看课休息判断
-            if(StringUtils.isNotBlank(vo.getIsOpenRestFlag())){
-                JSONObject  jsonObject= JSON.parseObject(vo.getIsOpenRestFlag());
-                vo.setIsOpenRestReminder(Integer.parseInt(jsonObject.get(currentCompanyId.toString()).toString()));
-            }else {
-                vo.setIsOpenRestReminder(null);
-            }
-
-        }
-        PageInfo<FsUserCoursePeriodVO> pageInfo = new PageInfo<>(list);
-        Map<String, Object> result = new HashMap<>();
-        result.put("rows", pageInfo.getList());
-        result.put("total", pageInfo.getTotal());
-        return R.ok(result);
+//        if (ObjectUtil.isNotEmpty(fsUserCoursePeriod.getTrainingCampId())){
+//            throw new CustomException("训练营不能为空！");
+//        }
+////        startPage();
+//        PageHelper.startPage(fsUserCoursePeriod.getPageNum(), fsUserCoursePeriod.getPageSize());
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        fsUserCoursePeriod.setCompanyIdList(Collections.singletonList(loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null));
+//        List<FsUserCoursePeriodVO> list = fsUserCoursePeriodService.selectFsUserCoursePeriodPage(fsUserCoursePeriod);
+//        // 使用Stream API的简洁写法
+//        Long currentCompanyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//        for (FsUserCoursePeriodVO vo : list) {
+//            String isNeedRegisterMember = vo.getIsNeedRegisterMember();
+//
+//            if (StringUtils.isNotEmpty(isNeedRegisterMember)) {
+//                boolean containsCurrentCompany = Arrays.stream(isNeedRegisterMember.split(","))
+//                        .map(String::trim)
+//                        .anyMatch(id -> id.equals(String.valueOf(currentCompanyId)));
+//                vo.setIsNeedRegisterMember(containsCurrentCompany ? "1" : "0");
+//            } else {
+//                vo.setIsNeedRegisterMember("0");
+//            }
+//
+//            // 看课休息判断
+//            if(StringUtils.isNotBlank(vo.getIsOpenRestFlag())){
+//                JSONObject  jsonObject= JSON.parseObject(vo.getIsOpenRestFlag());
+//                vo.setIsOpenRestReminder(Integer.parseInt(jsonObject.get(currentCompanyId.toString()).toString()));
+//            }else {
+//                vo.setIsOpenRestReminder(null);
+//            }
+//
+//        }
+//        PageInfo<FsUserCoursePeriodVO> pageInfo = new PageInfo<>(list);
+//        Map<String, Object> result = new HashMap<>();
+//        result.put("rows", pageInfo.getList());
+//        result.put("total", pageInfo.getTotal());
+//        return R.ok(result);
+        throw new RuntimeException("not implemented");
 //        return getDataTable(list);
     }
 
@@ -145,11 +147,12 @@ public class FsUserCoursePeriodController extends BaseController {
     @GetMapping("/export")
     public AjaxResult export(FsUserCoursePeriod fsUserCoursePeriod)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        fsUserCoursePeriod.setCompanyId(loginUser.getCompany() != null ? String.valueOf(loginUser.getCompany().getCompanyId()) : null);
-        List<FsUserCoursePeriod> list = fsUserCoursePeriodService.selectFsUserCoursePeriodList(fsUserCoursePeriod);
-        ExcelUtil<FsUserCoursePeriod> util = new ExcelUtil<FsUserCoursePeriod>(FsUserCoursePeriod.class);
-        return util.exportExcel(list, "userCoursePeriod");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        fsUserCoursePeriod.setCompanyId(loginUser.getCompany() != null ? String.valueOf(loginUser.getCompany().getCompanyId()) : null);
+//        List<FsUserCoursePeriod> list = fsUserCoursePeriodService.selectFsUserCoursePeriodList(fsUserCoursePeriod);
+//        ExcelUtil<FsUserCoursePeriod> util = new ExcelUtil<FsUserCoursePeriod>(FsUserCoursePeriod.class);
+//        return util.exportExcel(list, "userCoursePeriod");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -170,12 +173,13 @@ public class FsUserCoursePeriodController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestBody FsUserCoursePeriod fsUserCoursePeriod)
     {
-        if (ObjectUtil.isNotEmpty(fsUserCoursePeriod.getTrainingCampId())){
-            throw new CustomException("训练营不能为空！");
-        }
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        fsUserCoursePeriod.setCompanyId(loginUser.getCompany() != null ? String.valueOf(loginUser.getCompany().getCompanyId()) : null);
-        return toAjax(fsUserCoursePeriodService.insertFsUserCoursePeriod(fsUserCoursePeriod));
+//        if (ObjectUtil.isNotEmpty(fsUserCoursePeriod.getTrainingCampId())){
+//            throw new CustomException("训练营不能为空！");
+//        }
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        fsUserCoursePeriod.setCompanyId(loginUser.getCompany() != null ? String.valueOf(loginUser.getCompany().getCompanyId()) : null);
+//        return toAjax(fsUserCoursePeriodService.insertFsUserCoursePeriod(fsUserCoursePeriod));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -186,9 +190,10 @@ public class FsUserCoursePeriodController extends BaseController {
     @PutMapping
     public AjaxResult edit(@RequestBody FsUserCoursePeriod fsUserCoursePeriod)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        fsUserCoursePeriod.setCompanyId(loginUser.getCompany() != null ? String.valueOf(loginUser.getCompany().getCompanyId()) : null);
-        return toAjax(fsUserCoursePeriodService.updateFsUserCoursePeriod(fsUserCoursePeriod));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        fsUserCoursePeriod.setCompanyId(loginUser.getCompany() != null ? String.valueOf(loginUser.getCompany().getCompanyId()) : null);
+//        return toAjax(fsUserCoursePeriodService.updateFsUserCoursePeriod(fsUserCoursePeriod));
+        throw new RuntimeException("not implemented");
     }
     /**
      * 修改会员营期单独注册状态
@@ -198,14 +203,14 @@ public class FsUserCoursePeriodController extends BaseController {
     @PutMapping("/editIsNeedRegisterMember")
     public AjaxResult editIsNeedRegisterMember(@RequestBody FsUserCoursePeriod fsUserCoursePeriod)
     {
-        FsUserCoursePeriod fsUserCoursePeriod1 = fsUserCoursePeriodService.selectFsUserCoursePeriodById(fsUserCoursePeriod.getPeriodId());
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (ObjectUtil.isEmpty(fsUserCoursePeriod.getIsNeedRegisterMember())){
-            throw new CustomException("修改失败！");
-        }
-
-        return toAjax(fsUserCoursePeriodService.editIsNeedRegisterMember(fsUserCoursePeriod,loginUser.getCompany() != null ? String.valueOf(loginUser.getCompany().getCompanyId()) : null));
-
+//        FsUserCoursePeriod fsUserCoursePeriod1 = fsUserCoursePeriodService.selectFsUserCoursePeriodById(fsUserCoursePeriod.getPeriodId());
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (ObjectUtil.isEmpty(fsUserCoursePeriod.getIsNeedRegisterMember())){
+//            throw new CustomException("修改失败！");
+//        }
+//
+//        return toAjax(fsUserCoursePeriodService.editIsNeedRegisterMember(fsUserCoursePeriod,loginUser.getCompany() != null ? String.valueOf(loginUser.getCompany().getCompanyId()) : null));
+        throw new RuntimeException("not implemented");
     }
 
     @PreAuthorize("@ss.hasPermi('course:period:edit')")
@@ -213,8 +218,9 @@ public class FsUserCoursePeriodController extends BaseController {
     @PutMapping("/updatePeriodIsOpenRestReminder")
     public AjaxResult updatePeriodIsOpenRestReminder(@RequestBody FsUserCoursePeriod fsUserCoursePeriod)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        return toAjax(fsUserCoursePeriodService.updatePeriod(fsUserCoursePeriod,loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        return toAjax(fsUserCoursePeriodService.updatePeriod(fsUserCoursePeriod,loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null));
+        throw new RuntimeException("not implemented");
 
     }
 
@@ -298,18 +304,19 @@ public class FsUserCoursePeriodController extends BaseController {
     @PostMapping("/periodCount")
     @ApiOperation("营期统计")
     public R periodCourseCount(@RequestBody PeriodCountParam param) {
-        PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        FsUserCoursePeriod period = fsUserCoursePeriodService.selectFsUserCoursePeriodById(param.getPeriodId());
-        param.setMaxDate(LocalDate.now().plusDays(period.getMaxViewNum()));
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<FsPeriodCountVO> list = fsUserCoursePeriodDaysService.periodCourseCount(param);
-        long count = fsUserCoursePeriodDaysService.periodCourseByCount(param);
-        PageInfo<FsPeriodCountVO> pageInfo = new PageInfo<>(list);
-        Map<String, Object> result = new HashMap<>();
-        result.put("rows", pageInfo.getList());
-        result.put("total", count);
-        return R.ok(result);
+//        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+//        FsUserCoursePeriod period = fsUserCoursePeriodService.selectFsUserCoursePeriodById(param.getPeriodId());
+//        param.setMaxDate(LocalDate.now().plusDays(period.getMaxViewNum()));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<FsPeriodCountVO> list = fsUserCoursePeriodDaysService.periodCourseCount(param);
+//        long count = fsUserCoursePeriodDaysService.periodCourseByCount(param);
+//        PageInfo<FsPeriodCountVO> pageInfo = new PageInfo<>(list);
+//        Map<String, Object> result = new HashMap<>();
+//        result.put("rows", pageInfo.getList());
+//        result.put("total", count);
+//        return R.ok(result);
+        throw  new RuntimeException("not implemented");
     }
 
     @GetMapping("/getPeriodListLikeName")

fs-agent/src/main/java/com/fs/company/controller/course/FsUserCourseTrainingCampController.java

@@ -11,8 +11,7 @@ import com.fs.course.dto.FsUserCourseTrainingCampDTO;
 import com.fs.course.dto.FsUserCourseTrainingCampUpdateDTO;
 import com.fs.course.service.IFsUserCourseTrainingCampService;
 import com.fs.course.vo.FsUserCourseTrainingCampVO;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.vo.OptionsVO;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -46,15 +45,16 @@ public class FsUserCourseTrainingCampController {
                            @RequestParam(required = false, defaultValue = "1") Integer pageNum,
                            @RequestParam(required = false, defaultValue = "10") Integer pageSize)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Map<String, Object> params = new HashMap<>();
-        params.put("trainingCampName", trainingCampName);
-        params.put("scs", SortUtils.parseSort(scs));
-        params.put("companyId", loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        params.put("userId", userId);
-        PageHelper.startPage(pageNum, pageSize);
-        List<FsUserCourseTrainingCampVO> list = fsUserCourseTrainingCampService.selectFsUserCourseTrainingCampVOListByMap(params);
-        return AjaxResult.success(new PageInfo<>(list));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Map<String, Object> params = new HashMap<>();
+//        params.put("trainingCampName", trainingCampName);
+//        params.put("scs", SortUtils.parseSort(scs));
+//        params.put("companyId", loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        params.put("userId", userId);
+//        PageHelper.startPage(pageNum, pageSize);
+//        List<FsUserCourseTrainingCampVO> list = fsUserCourseTrainingCampService.selectFsUserCourseTrainingCampVOListByMap(params);
+//        return AjaxResult.success(new PageInfo<>(list));
+        throw new RuntimeException("not implemented");
     }
 
 }

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

@@ -13,8 +13,7 @@ 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 com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -107,9 +106,10 @@ public class FsUserCourseVideoController extends BaseController
     @PutMapping("/updateMoney")
     public R updateMoney(@RequestBody FsUserCourseVideoParam fsUserCourseVideo)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (fsUserCourseVideo.getCompanyId() == null && loginUser.getCompany() != null) { fsUserCourseVideo.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        return fsUserCourseVideoService.updateFsUserCourseVideoCompanyRedPacket(fsUserCourseVideo);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (fsUserCourseVideo.getCompanyId() == null && loginUser.getCompany() != null) { fsUserCourseVideo.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        return fsUserCourseVideoService.updateFsUserCourseVideoCompanyRedPacket(fsUserCourseVideo);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -127,11 +127,12 @@ public class FsUserCourseVideoController extends BaseController
     @GetMapping("/getVideoListByCourseId")
     public TableDataInfo getVideoListByCourseId(FsUserCourseVideoParam fsUserCourseVideo)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (fsUserCourseVideo.getCompanyId() == null && loginUser.getCompany() != null) { fsUserCourseVideo.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        List<FsUserCourseVideoVO> list = fsUserCourseVideoService.selectFsUserCourseVideoListByCourseIdAndCompany(fsUserCourseVideo);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (fsUserCourseVideo.getCompanyId() == null && loginUser.getCompany() != null) { fsUserCourseVideo.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        List<FsUserCourseVideoVO> list = fsUserCourseVideoService.selectFsUserCourseVideoListByCourseIdAndCompany(fsUserCourseVideo);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     @GetMapping("/getSort/{courseId}")

fs-agent/src/main/java/com/fs/company/controller/course/FsUserWatchCourseStatisticsController.java

@@ -10,8 +10,7 @@ import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.course.domain.FsUserWatchCourseStatistics;
 import com.fs.course.service.IFsUserWatchCourseStatisticsService;
 import com.fs.course.vo.FsUserWatchCourseStatisticsExportVO;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,11 +43,12 @@ public class FsUserWatchCourseStatisticsController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(FsUserWatchCourseStatistics fsUserWatchCourseStatistics)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        fsUserWatchCourseStatistics.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        List<FsUserWatchCourseStatistics> list = fsUserWatchCourseStatisticsService.selectFsUserWatchCourseStatisticsList(fsUserWatchCourseStatistics);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        fsUserWatchCourseStatistics.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        List<FsUserWatchCourseStatistics> list = fsUserWatchCourseStatisticsService.selectFsUserWatchCourseStatisticsList(fsUserWatchCourseStatistics);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     @PreAuthorize("@ss.hasPermi('course:userWatchCourseStatistics:export')")
@@ -56,11 +56,12 @@ public class FsUserWatchCourseStatisticsController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(FsUserWatchCourseStatistics fsUserWatchCourseStatistics)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        fsUserWatchCourseStatistics.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        List<FsUserWatchCourseStatistics> list = fsUserWatchCourseStatisticsService.selectFsUserWatchCourseStatisticsList(fsUserWatchCourseStatistics);
-        ExcelUtil<FsUserWatchCourseStatistics> util = new ExcelUtil<FsUserWatchCourseStatistics>(FsUserWatchCourseStatistics.class);
-        return util.exportExcel(list, "会员观看数据明细");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        fsUserWatchCourseStatistics.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        List<FsUserWatchCourseStatistics> list = fsUserWatchCourseStatisticsService.selectFsUserWatchCourseStatisticsList(fsUserWatchCourseStatistics);
+//        ExcelUtil<FsUserWatchCourseStatistics> util = new ExcelUtil<FsUserWatchCourseStatistics>(FsUserWatchCourseStatistics.class);
+//        return util.exportExcel(list, "会员观看数据明细");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -70,17 +71,18 @@ public class FsUserWatchCourseStatisticsController extends BaseController
     @GetMapping("/listTotal")
     public TableDataInfo listTotal(FsUserWatchCourseStatistics fsUserWatchCourseStatistics)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        fsUserWatchCourseStatistics.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        List<FsUserWatchCourseStatistics> list = fsUserWatchCourseStatisticsService.selectFsUserWatchCourseStatisticsListTotal(fsUserWatchCourseStatistics);
-        if(!list.isEmpty()){
-            for (FsUserWatchCourseStatistics userWatchCourseStatistics : list) {
-                userWatchCourseStatistics.setCompleteWatchRatePercent(userWatchCourseStatistics.getCompleteWatchRate() + "%");
-                userWatchCourseStatistics.setOnlineRatePercent(userWatchCourseStatistics.getOnlineRate() + "%");
-            }
-        }
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        fsUserWatchCourseStatistics.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        List<FsUserWatchCourseStatistics> list = fsUserWatchCourseStatisticsService.selectFsUserWatchCourseStatisticsListTotal(fsUserWatchCourseStatistics);
+//        if(!list.isEmpty()){
+//            for (FsUserWatchCourseStatistics userWatchCourseStatistics : list) {
+//                userWatchCourseStatistics.setCompleteWatchRatePercent(userWatchCourseStatistics.getCompleteWatchRate() + "%");
+//                userWatchCourseStatistics.setOnlineRatePercent(userWatchCourseStatistics.getOnlineRate() + "%");
+//            }
+//        }
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -90,18 +92,19 @@ public class FsUserWatchCourseStatisticsController extends BaseController
     @GetMapping("/exportTotal")
     public AjaxResult exportTotal(FsUserWatchCourseStatistics fsUserWatchCourseStatistics)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        fsUserWatchCourseStatistics.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        List<FsUserWatchCourseStatistics> list = fsUserWatchCourseStatisticsService.selectFsUserWatchCourseStatisticsListTotal(fsUserWatchCourseStatistics);
-        List<FsUserWatchCourseStatisticsExportVO> listVO = list.stream().map(v -> {
-            FsUserWatchCourseStatisticsExportVO vo = new FsUserWatchCourseStatisticsExportVO();
-            BeanUtils.copyProperties(v, vo);
-            vo.setCompleteWatchRatePercent(v.getCompleteWatchRate() + "%");
-            vo.setOnlineRatePercent(v.getOnlineRate() + "%");
-            return vo;
-        }).collect(Collectors.toList());
-        ExcelUtil<FsUserWatchCourseStatisticsExportVO> util = new ExcelUtil<FsUserWatchCourseStatisticsExportVO>(FsUserWatchCourseStatisticsExportVO.class);
-        return util.exportExcel(listVO, "会员观看数据明细汇总");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        fsUserWatchCourseStatistics.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        List<FsUserWatchCourseStatistics> list = fsUserWatchCourseStatisticsService.selectFsUserWatchCourseStatisticsListTotal(fsUserWatchCourseStatistics);
+//        List<FsUserWatchCourseStatisticsExportVO> listVO = list.stream().map(v -> {
+//            FsUserWatchCourseStatisticsExportVO vo = new FsUserWatchCourseStatisticsExportVO();
+//            BeanUtils.copyProperties(v, vo);
+//            vo.setCompleteWatchRatePercent(v.getCompleteWatchRate() + "%");
+//            vo.setOnlineRatePercent(v.getOnlineRate() + "%");
+//            return vo;
+//        }).collect(Collectors.toList());
+//        ExcelUtil<FsUserWatchCourseStatisticsExportVO> util = new ExcelUtil<FsUserWatchCourseStatisticsExportVO>(FsUserWatchCourseStatisticsExportVO.class);
+//        return util.exportExcel(listVO, "会员观看数据明细汇总");
+        throw new RuntimeException("not implemented");
     }
     /**
      * 获取会员看课统计-按课程统计详细信息

fs-agent/src/main/java/com/fs/company/controller/course/qw/FsQwCourseAnswerLogsController.java

@@ -10,8 +10,7 @@ import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.course.param.FsCourseAnswerLogsParam;
 import com.fs.course.service.IFsCourseAnswerLogsService;
 import com.fs.course.vo.FsCourseAnswerLogsListVO;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -62,17 +61,18 @@ public class FsQwCourseAnswerLogsController extends BaseController
     @GetMapping("/myList")
     public TableDataInfo myList(FsCourseAnswerLogsParam param)
     {
-        startPage();
-
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-
-        if (param.getPhoneMk() != null && param.getPhoneMk() != "") {
-            param.setPhone(encryptPhone(param.getPhoneMk()));
-        }
-
-        List<FsCourseAnswerLogsListVO> list = fsCourseAnswerLogsService.selectFsCourseAnswerLogsListVO(param);
-        return getDataTable(list);
+//        startPage();
+//
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//
+//        if (param.getPhoneMk() != null && param.getPhoneMk() != "") {
+//            param.setPhone(encryptPhone(param.getPhoneMk()));
+//        }
+//
+//        List<FsCourseAnswerLogsListVO> list = fsCourseAnswerLogsService.selectFsCourseAnswerLogsListVO(param);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
     /**
      * 导出答题日志列表
@@ -99,15 +99,16 @@ public class FsQwCourseAnswerLogsController extends BaseController
     @GetMapping("/myExport")
     public AjaxResult myExport(FsCourseAnswerLogsParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-
-        if (param.getPhoneMk() != null && param.getPhoneMk() != "") {
-            param.setPhone(encryptPhone(param.getPhoneMk()));
-        }
-        List<FsCourseAnswerLogsListVO> list = fsCourseAnswerLogsService.selectFsCourseAnswerLogsListVO(param);
-        ExcelUtil<FsCourseAnswerLogsListVO> util = new ExcelUtil<FsCourseAnswerLogsListVO>(FsCourseAnswerLogsListVO.class);
-        return util.exportExcel(list, "答题日志数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//
+//        if (param.getPhoneMk() != null && param.getPhoneMk() != "") {
+//            param.setPhone(encryptPhone(param.getPhoneMk()));
+//        }
+//        List<FsCourseAnswerLogsListVO> list = fsCourseAnswerLogsService.selectFsCourseAnswerLogsListVO(param);
+//        ExcelUtil<FsCourseAnswerLogsListVO> util = new ExcelUtil<FsCourseAnswerLogsListVO>(FsCourseAnswerLogsListVO.class);
+//        return util.exportExcel(list, "答题日志数据");
+        throw new RuntimeException("not implemented");
     }
 
 //    /**

fs-agent/src/main/java/com/fs/company/controller/course/qw/FsQwCourseWatchLogController.java

@@ -8,6 +8,7 @@ import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.config.saas.ProjectConfig;
+import com.fs.framework.web.service.TokenService;
 import com.fs.system.service.ISysConfigService;
 import com.fs.course.domain.FsCourseWatchLog;
 import com.fs.course.param.*;
@@ -16,8 +17,6 @@ import com.fs.course.vo.FsCourseOverVO;
 import com.fs.course.vo.FsCourseUserStatisticsListVO;
 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.param.QwWatchLogStatisticsListParam;
 import com.fs.qw.service.IQwWatchLogService;
 import com.fs.qw.vo.QwWatchLogAllStatisticsListVO;
@@ -68,127 +67,136 @@ public class FsQwCourseWatchLogController extends BaseController
 //                return getDataTable(new ArrayList<>());
 //            }
 //        }
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVO(param);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVO(param);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     @PreAuthorize("@ss.hasPermi('course:courseWatchLog:statisticsList')")
     @GetMapping("/statisticsList")
     public TableDataInfo statisticsList(FsCourseWatchLogStatisticsListParam param)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        if (param.getSTime()==null||param.getETime()==null){
-            return getDataTable(new ArrayList<>());
-        }
-        param.setSendType(2);
-        List<FsCourseWatchLogStatisticsListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogStatisticsListVO(param);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        if (param.getSTime()==null||param.getETime()==null){
+//            return getDataTable(new ArrayList<>());
+//        }
+//        param.setSendType(2);
+//        List<FsCourseWatchLogStatisticsListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogStatisticsListVO(param);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
     @PreAuthorize("@ss.hasPermi('qw:user:export')")
     @GetMapping("/statisticsExport")
     public AjaxResult statisticsExport(FsCourseWatchLogStatisticsListParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        if (param.getSTime()==null||param.getETime()==null){
-            return AjaxResult.error("请选择时间");
-        }
-        param.setSendType(2);
-        List<FsCourseWatchLogStatisticsListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogStatisticsListVO(param);
-        ExcelUtil<FsCourseWatchLogStatisticsListVO> util = new ExcelUtil<FsCourseWatchLogStatisticsListVO>(FsCourseWatchLogStatisticsListVO.class);
-        return util.exportExcel(list, "企微看课统计");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        if (param.getSTime()==null||param.getETime()==null){
+//            return AjaxResult.error("请选择时间");
+//        }
+//        param.setSendType(2);
+//        List<FsCourseWatchLogStatisticsListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogStatisticsListVO(param);
+//        ExcelUtil<FsCourseWatchLogStatisticsListVO> util = new ExcelUtil<FsCourseWatchLogStatisticsListVO>(FsCourseWatchLogStatisticsListVO.class);
+//        return util.exportExcel(list, "企微看课统计");
+        throw new RuntimeException("not implemented");
 
     }
 
     @GetMapping("/qwWatchLogStatisticsList")
     public TableDataInfo qwWatchLogStatisticsList(QwWatchLogStatisticsListParam param) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        if (param.getSTime() == null || param.getETime() == null) {
-            return getDataTable(new ArrayList<>());
-        }
-        //济南联志健康 数据排除转接用户
-        ProjectConfig projectConfig = sysConfigService.getProjectConfig();
-        String companyName = (projectConfig != null && projectConfig.getCloudHost() != null) ? projectConfig.getCloudHost().getCompanyName() : null;
-        if ("济南联志健康".equals(companyName)) {
-            return qwWatchLogService.selectQwWatchLogStatisticsListVOExcludeTransfer(param);
-        } else {
-            return qwWatchLogService.selectQwWatchLogStatisticsListVO(param);
-        }
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        if (param.getSTime() == null || param.getETime() == null) {
+//            return getDataTable(new ArrayList<>());
+//        }
+//        //济南联志健康 数据排除转接用户
+//        ProjectConfig projectConfig = sysConfigService.getProjectConfig();
+//        String companyName = (projectConfig != null && projectConfig.getCloudHost() != null) ? projectConfig.getCloudHost().getCompanyName() : null;
+//        if ("济南联志健康".equals(companyName)) {
+//            return qwWatchLogService.selectQwWatchLogStatisticsListVOExcludeTransfer(param);
+//        } else {
+//            return qwWatchLogService.selectQwWatchLogStatisticsListVO(param);
+//        }
+        throw new RuntimeException("not implemented");
     }
 
     @GetMapping("/myQwWatchLogStatisticsList")
     public TableDataInfo myQwWatchLogStatisticsList(QwWatchLogStatisticsListParam param) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-        if (param.getSTime() == null || param.getETime() == null) {
-            return getDataTable(new ArrayList<>());
-        }
-        //济南联志健康 数据排除转接用户
-        ProjectConfig projectConfig2 = sysConfigService.getProjectConfig();
-        String companyName2 = (projectConfig2 != null && projectConfig2.getCloudHost() != null) ? projectConfig2.getCloudHost().getCompanyName() : null;
-        if ("济南联志健康".equals(companyName2)) {
-            return qwWatchLogService.selectQwWatchLogStatisticsListVOExcludeTransfer(param);
-        } else {
-            return qwWatchLogService.selectQwWatchLogStatisticsListVO(param);
-        }
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        if (param.getSTime() == null || param.getETime() == null) {
+//            return getDataTable(new ArrayList<>());
+//        }
+//        //济南联志健康 数据排除转接用户
+//        ProjectConfig projectConfig2 = sysConfigService.getProjectConfig();
+//        String companyName2 = (projectConfig2 != null && projectConfig2.getCloudHost() != null) ? projectConfig2.getCloudHost().getCompanyName() : null;
+//        if ("济南联志健康".equals(companyName2)) {
+//            return qwWatchLogService.selectQwWatchLogStatisticsListVOExcludeTransfer(param);
+//        } else {
+//            return qwWatchLogService.selectQwWatchLogStatisticsListVO(param);
+//        }
+        throw new RuntimeException("not implemented");
     }
 
 
     @GetMapping("/qwWatchLogAllStatisticsList")
     public TableDataInfo qwWatchLogAllStatisticsList(QwWatchLogStatisticsListParam param)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        if (param.getSTime()==null||param.getETime()==null){
-            return getDataTable(new ArrayList<>());
-        }
-        List<QwWatchLogAllStatisticsListVO> list = qwWatchLogService.selectQwWatchLogAllStatisticsListVO(param);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        if (param.getSTime()==null||param.getETime()==null){
+//            return getDataTable(new ArrayList<>());
+//        }
+//        List<QwWatchLogAllStatisticsListVO> list = qwWatchLogService.selectQwWatchLogAllStatisticsListVO(param);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
     @GetMapping("/myQwWatchLogAllStatisticsList")
     public TableDataInfo myQwWatchLogAllStatisticsList(QwWatchLogStatisticsListParam param)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-        if (param.getSTime()==null||param.getETime()==null){
-            return getDataTable(new ArrayList<>());
-        }
-        List<QwWatchLogAllStatisticsListVO> list = qwWatchLogService.selectQwWatchLogAllStatisticsListVO(param);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        if (param.getSTime()==null||param.getETime()==null){
+//            return getDataTable(new ArrayList<>());
+//        }
+//        List<QwWatchLogAllStatisticsListVO> list = qwWatchLogService.selectQwWatchLogAllStatisticsListVO(param);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
     @GetMapping("/watchLogStatistics")
     public TableDataInfo watchLogStatistics(FsCourseOverParam param)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        if (param.getSTime()==null||param.getETime()==null){
-            return getDataTable(new ArrayList<>());
-        }
-        List<FsCourseOverVO> list = fsCourseWatchLogService.selectFsCourseWatchLogOverStatisticsListVO(param);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        if (param.getSTime()==null||param.getETime()==null){
+//            return getDataTable(new ArrayList<>());
+//        }
+//        List<FsCourseOverVO> list = fsCourseWatchLogService.selectFsCourseWatchLogOverStatisticsListVO(param);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
     @GetMapping("/watchLogStatisticsExport")
     public AjaxResult watchLogStatisticsExport(FsCourseOverParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        if (param.getSTime()==null||param.getETime()==null){
-            return AjaxResult.error("请选择时间");
-        }
-        List<FsCourseOverVO> list = fsCourseWatchLogService.selectFsCourseWatchLogOverStatisticsListVO(param);
-        ExcelUtil<FsCourseOverVO> util = new ExcelUtil<FsCourseOverVO>(FsCourseOverVO.class);
-        return util.exportExcel(list, "完课数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        if (param.getSTime()==null||param.getETime()==null){
+//            return AjaxResult.error("请选择时间");
+//        }
+//        List<FsCourseOverVO> list = fsCourseWatchLogService.selectFsCourseWatchLogOverStatisticsListVO(param);
+//        ExcelUtil<FsCourseOverVO> util = new ExcelUtil<FsCourseOverVO>(FsCourseOverVO.class);
+//        return util.exportExcel(list, "完课数据");
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -196,14 +204,15 @@ public class FsQwCourseWatchLogController extends BaseController
     @GetMapping("/userStatisticsList")
     public TableDataInfo userStatisticsList(FsCourseUserStatisticsListParam param)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        if (param.getSTime()==null||param.getETime()==null){
-            return getDataTable(new ArrayList<>());
-        }
-        List<FsCourseUserStatisticsListVO> list = fsCourseWatchLogService.selectFsCourseUserStatisticsListVO(param);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        if (param.getSTime()==null||param.getETime()==null){
+//            return getDataTable(new ArrayList<>());
+//        }
+//        List<FsCourseUserStatisticsListVO> list = fsCourseWatchLogService.selectFsCourseUserStatisticsListVO(param);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -215,11 +224,12 @@ public class FsQwCourseWatchLogController extends BaseController
     @GetMapping("/myList")
     public TableDataInfo myList(FsCourseWatchLogListParam param)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyUserId( loginUser.getCompanyUser().getUserId());
-        List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVO(param);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyUserId( loginUser.getCompanyUser().getUserId());
+//        List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVO(param);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -230,20 +240,21 @@ public class FsQwCourseWatchLogController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(FsCourseWatchLogListParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        List<QwWatchLogStatisticsListVO> list = new ArrayList<>();
-
-        ProjectConfig projectConfig3 = sysConfigService.getProjectConfig();
-        String companyName3 = (projectConfig3 != null && projectConfig3.getCloudHost() != null) ? projectConfig3.getCloudHost().getCompanyName() : null;
-        if ("济南联志健康".equals(companyName3)) {
-            list = qwWatchLogService.selectQwWatchLogStatisticsListVOExportExcludeTransfer(param);
-        }else{
-            list = qwWatchLogService.selectQwWatchLogStatisticsListVOExport(param);
-        }
-
-        ExcelUtil<QwWatchLogStatisticsListVO> util = new ExcelUtil<QwWatchLogStatisticsListVO>(QwWatchLogStatisticsListVO.class);
-        return util.exportExcel(list, "短链课程看课记录数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        List<QwWatchLogStatisticsListVO> list = new ArrayList<>();
+//
+//        ProjectConfig projectConfig3 = sysConfigService.getProjectConfig();
+//        String companyName3 = (projectConfig3 != null && projectConfig3.getCloudHost() != null) ? projectConfig3.getCloudHost().getCompanyName() : null;
+//        if ("济南联志健康".equals(companyName3)) {
+//            list = qwWatchLogService.selectQwWatchLogStatisticsListVOExportExcludeTransfer(param);
+//        }else{
+//            list = qwWatchLogService.selectQwWatchLogStatisticsListVOExport(param);
+//        }
+//
+//        ExcelUtil<QwWatchLogStatisticsListVO> util = new ExcelUtil<QwWatchLogStatisticsListVO>(QwWatchLogStatisticsListVO.class);
+//        return util.exportExcel(list, "短链课程看课记录数据");
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -254,11 +265,12 @@ public class FsQwCourseWatchLogController extends BaseController
     @GetMapping("/myExport")
     public AjaxResult myExport(FsCourseWatchLogListParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVO(param);
-        ExcelUtil<FsCourseWatchLogListVO> util = new ExcelUtil<FsCourseWatchLogListVO>(FsCourseWatchLogListVO.class);
-        return util.exportExcel(list, "短链课程看课记录数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVO(param);
+//        ExcelUtil<FsCourseWatchLogListVO> util = new ExcelUtil<FsCourseWatchLogListVO>(FsCourseWatchLogListVO.class);
+//        return util.exportExcel(list, "短链课程看课记录数据");
+        throw new RuntimeException("not implemented");
     }
     /**
      * 获取短链课程看课记录详细信息

fs-agent/src/main/java/com/fs/company/controller/crm/ComprehensiveStatisticsController.java

@@ -3,8 +3,6 @@ package com.fs.company.controller.crm;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.security.SecurityUtils;
 import com.fs.company.service.ICrmStatisticManageService;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.statis.dto.ComprehensiveStatisticsDTO;
@@ -36,12 +34,13 @@ public class ComprehensiveStatisticsController extends BaseController {
      */
     @PostMapping("/statisticMainN")
     public R statisticMainN(@RequestBody ComprehensiveStatisticsParam param) {
-        Assert.notNull(param.getDimension(), "请选择统计维度");
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-        param.setCompanyId(companyId);
-        param.setTimeGroupFlag(false);
-        return R.ok().put("data", iCrmStatisticManageService.statisticMain(param));
+//        Assert.notNull(param.getDimension(), "请选择统计维度");
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//        param.setCompanyId(companyId);
+//        param.setTimeGroupFlag(false);
+//        return R.ok().put("data", iCrmStatisticManageService.statisticMain(param));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -51,12 +50,13 @@ public class ComprehensiveStatisticsController extends BaseController {
      */
     @PostMapping("/statisticMain")
     public R statisticMain(@RequestBody ComprehensiveStatisticsParam param) {
-        Assert.notNull(param.getDimension(), "请选择统计维度");
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-        param.setCompanyId(companyId);
-        param.setTimeGroupFlag(true);
-        return R.ok().put("data", iCrmStatisticManageService.statisticMain(param));
+//        Assert.notNull(param.getDimension(), "请选择统计维度");
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//        param.setCompanyId(companyId);
+//        param.setTimeGroupFlag(true);
+//        return R.ok().put("data", iCrmStatisticManageService.statisticMain(param));
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -65,9 +65,10 @@ public class ComprehensiveStatisticsController extends BaseController {
      */
     @GetMapping("/getSearchCompanyInfo")
     public R getSearchCompanyInfo(){
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-        return R.ok().put("data", iCrmStatisticManageService.getSearchCompanyInfo(companyId));
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        Long companyId = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//        return R.ok().put("data", iCrmStatisticManageService.getSearchCompanyInfo(companyId));
+        throw new RuntimeException("not implemented");
     }
 
     /**

fs-agent/src/main/java/com/fs/company/controller/crm/CrmCustomerAssignController.java

@@ -7,9 +7,7 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.crm.domain.CrmCustomerAssign;
 import com.fs.crm.service.ICrmCustomerAssignService;
 import com.fs.crm.vo.CrmCustomerAssignListVO;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.security.SecurityUtils;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -40,11 +38,12 @@ public class CrmCustomerAssignController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(CrmCustomerAssign crmCustomerAssign)
     {
-        startPage();
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (crmCustomerAssign.getCompanyId() == null && loginUser.getCompany() != null) { crmCustomerAssign.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<CrmCustomerAssignListVO> list = crmCustomerAssignService.selectCompanyCrmCustomerAssignList(crmCustomerAssign);
-        return getDataTable(list);
+//        startPage();
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        if (crmCustomerAssign.getCompanyId() == null && loginUser.getCompany() != null) { crmCustomerAssign.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<CrmCustomerAssignListVO> list = crmCustomerAssignService.selectCompanyCrmCustomerAssignList(crmCustomerAssign);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -53,9 +52,10 @@ public class CrmCustomerAssignController extends BaseController
     @PostMapping("/cancel")
     public R cancel(@RequestBody CrmCustomerAssign crmCustomerAssign)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        String operName = loginUser.getUsername();
-        return crmCustomerAssignService.cancel(crmCustomerAssign,operName);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        String operName = loginUser.getUsername();
+//        return crmCustomerAssignService.cancel(crmCustomerAssign,operName);
+        throw new RuntimeException("not implemented");
     }
 
 

fs-agent/src/main/java/com/fs/company/controller/crm/CrmCustomerContactsController.java

@@ -8,8 +8,7 @@ import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
 import com.fs.crm.domain.CrmCustomerContacts;
 import com.fs.crm.service.ICrmCustomerContactsService;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -36,19 +35,20 @@ public class CrmCustomerContactsController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(CrmCustomerContacts crmCustomerContacts)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (crmCustomerContacts.getCompanyId() == null && loginUser.getCompany() != null) { crmCustomerContacts.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<CrmCustomerContacts> list = crmCustomerContactsService.selectCrmCustomerContactsList(crmCustomerContacts);
-        if (list != null) {
-            for (CrmCustomerContacts vo : list) {
-                if(vo.getMobile()!=null){
-                    vo.setMobile(vo.getMobile().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-                }
-
-            }
-        }
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (crmCustomerContacts.getCompanyId() == null && loginUser.getCompany() != null) { crmCustomerContacts.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<CrmCustomerContacts> list = crmCustomerContactsService.selectCrmCustomerContactsList(crmCustomerContacts);
+//        if (list != null) {
+//            for (CrmCustomerContacts vo : list) {
+//                if(vo.getMobile()!=null){
+//                    vo.setMobile(vo.getMobile().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//                }
+//
+//            }
+//        }
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
 
@@ -71,9 +71,10 @@ public class CrmCustomerContactsController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CrmCustomerContacts crmCustomerContacts)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (crmCustomerContacts.getCompanyId() == null && loginUser.getCompany() != null) { crmCustomerContacts.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        return toAjax(crmCustomerContactsService.insertCrmCustomerContacts(crmCustomerContacts));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (crmCustomerContacts.getCompanyId() == null && loginUser.getCompany() != null) { crmCustomerContacts.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        return toAjax(crmCustomerContactsService.insertCrmCustomerContacts(crmCustomerContacts));
+        throw new RuntimeException("not implemented");
     }
 
     /**

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

@@ -19,8 +19,7 @@ import com.fs.crm.service.ICrmCustomerPropertyService;
 import com.fs.crm.service.ICrmCustomerService;
 import com.fs.crm.service.ICrmCustomerUserService;
 import com.fs.crm.vo.*;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.github.pagehelper.PageHelper;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -62,19 +61,20 @@ public class CrmCustomerController extends BaseController
     @GetMapping("/getLineCustomerList")
     public TableDataInfo getLineCustomerList(CrmLineCustomerListQueryParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<CrmLineCustomerListQueryVO> list = crmCustomerService.selectCrmLineCustomerListQuery(param);
-        if (list != null) {
-            for (CrmLineCustomerListQueryVO vo : list) {
-                if(vo.getMobile()!=null){
-                    vo.setMobile(vo.getMobile().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-                }
-
-            }
-        }
-        return getDataTable(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<CrmLineCustomerListQueryVO> list = crmCustomerService.selectCrmLineCustomerListQuery(param);
+//        if (list != null) {
+//            for (CrmLineCustomerListQueryVO vo : list) {
+//                if(vo.getMobile()!=null){
+//                    vo.setMobile(vo.getMobile().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//                }
+//
+//            }
+//        }
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
 
     @ApiOperation("获取公海客户")
@@ -83,22 +83,23 @@ public class CrmCustomerController extends BaseController
     @DataScope(deptAlias = "c",userAlias = "c")
     public TableDataInfo getFullCustomerList(CrmFullCustomerListQueryParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
-//        if(loginUser.getCompany().getCompanyId()==116){   // 河北湘银信息咨询服务有限公司（JZ-1）客户假删除不显示
-//            param.setCompanyId(0L);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
+////        if(loginUser.getCompany().getCompanyId()==116){   // 河北湘银信息咨询服务有限公司（JZ-1）客户假删除不显示
+////            param.setCompanyId(0L);
+////        }
+//        List<CrmFullCustomerListQueryVO> list = crmCustomerService.selectCrmFullCustomerListQuery(param);
+//        if (list != null) {
+//            for (CrmFullCustomerListQueryVO vo : list) {
+//                if(vo.getMobile()!=null){
+//                    vo.setMobile(vo.getMobile().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//                }
+//
+//            }
 //        }
-        List<CrmFullCustomerListQueryVO> list = crmCustomerService.selectCrmFullCustomerListQuery(param);
-        if (list != null) {
-            for (CrmFullCustomerListQueryVO vo : list) {
-                if(vo.getMobile()!=null){
-                    vo.setMobile(vo.getMobile().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-                }
-
-            }
-        }
-        return getDataTable(list);
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
     }
     @PreAuthorize("@ss.hasPermi('crm:customer:list')")
     @GetMapping("/listAll")
@@ -122,44 +123,46 @@ public class CrmCustomerController extends BaseController
     @PreAuthorize("@ss.hasPermi('crm:customer:assistList')")
     @GetMapping("/getMyAssistList")
     public TableDataInfo getMyAssistList(CrmMyCustomerListQueryParam param){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        if(!StringUtils.isEmpty(param.getCreateTimeRange())){
-            param.setCustomerCreateTime(param.getCreateTimeRange().split("--"));
-        }
-        List<CrmMyCustomerListQueryVO> list = crmCustomerService.selectCrmMyAssistListQuery(param);
-        if (list != null) {
-            for (CrmMyCustomerListQueryVO vo : list) {
-                if(vo.getMobile()!=null){
-                    vo.setMobile(vo.getMobile().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-                }
-            }
-        }
-        return getDataTable(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+//        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        if(!StringUtils.isEmpty(param.getCreateTimeRange())){
+//            param.setCustomerCreateTime(param.getCreateTimeRange().split("--"));
+//        }
+//        List<CrmMyCustomerListQueryVO> list = crmCustomerService.selectCrmMyAssistListQuery(param);
+//        if (list != null) {
+//            for (CrmMyCustomerListQueryVO vo : list) {
+//                if(vo.getMobile()!=null){
+//                    vo.setMobile(vo.getMobile().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//                }
+//            }
+//        }
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
 
     }
     @ApiOperation("获取我的客户列表")
     @PreAuthorize("@ss.hasPermi('crm:customer:myList')")
     @GetMapping("/getMyCustomerList")
     public TableDataInfo getMyCustomerList(CrmMyCustomerListQueryParam param){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        if(!StringUtils.isEmpty(param.getCreateTimeRange())){
-            param.setCustomerCreateTime(param.getCreateTimeRange().split("--"));
-        }
-        List<CrmMyCustomerListQueryVO> list = crmCustomerService.selectCrmMyCustomerListQuery(param);
-        if (list != null) {
-            for (CrmMyCustomerListQueryVO vo : list) {
-                if(vo.getMobile()!=null){
-                    vo.setMobile(vo.getMobile().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-                }
-            }
-        }
-        return getDataTable(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+//        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        if(!StringUtils.isEmpty(param.getCreateTimeRange())){
+//            param.setCustomerCreateTime(param.getCreateTimeRange().split("--"));
+//        }
+//        List<CrmMyCustomerListQueryVO> list = crmCustomerService.selectCrmMyCustomerListQuery(param);
+//        if (list != null) {
+//            for (CrmMyCustomerListQueryVO vo : list) {
+//                if(vo.getMobile()!=null){
+//                    vo.setMobile(vo.getMobile().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//                }
+//            }
+//        }
+//        return getDataTable(list);
+        throw new RuntimeException("not implemented");
 
     }
 
@@ -167,38 +170,39 @@ public class CrmCustomerController extends BaseController
     @GetMapping("/getCustomerList")
     @PreAuthorize("@ss.hasPermi('crm:customer:list')")
     public TableDataInfo getCustomerList(CrmCustomerListQueryParam param){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
-//        if(loginUser.getCompany().getCompanyId()==116){   // 河北湘银信息咨询服务有限公司（JZ-1）客户假删除不显示
-//            param.setCompanyId(0L);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
+////        if(loginUser.getCompany().getCompanyId()==116){   // 河北湘银信息咨询服务有限公司（JZ-1）客户假删除不显示
+////            param.setCompanyId(0L);
+////        }
+//        if (param.getIsReceive() != null && param.getIsReceive() == 0){
+//            CrmLineCustomerListQueryParam param1 = new CrmLineCustomerListQueryParam();
+//            BeanUtils.copyProperties(param,param1);
+//            List<CrmLineCustomerListQueryVO> list1 = crmCustomerService.selectCrmLineCustomerListQuery(param1);
+//            if (list1 != null) {
+//                for (CrmLineCustomerListQueryVO vo : list1) {
+//                    if(vo.getMobile()!=null){
+//                        vo.setMobile(vo.getMobile().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//                    }
+//                    vo.setProperties( crmCustomerPropertyService.selectCrmCustomerPropertyByCustomerId(vo.getCustomerId()));
+//                }
+//            }
+//            return getDataTable(list1);
+//        }else {
+//            List<CrmCustomerListQueryVO> list = crmCustomerService.selectCrmCustomerListQuery(param);
+//            if (list != null) {
+//                for (CrmCustomerListQueryVO vo : list) {
+//                    if (vo.getMobile() != null) {
+//                        vo.setMobile(vo.getMobile().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//                    }
+//                    vo.setProperties( crmCustomerPropertyService.selectCrmCustomerPropertyByCustomerId(vo.getCustomerId()));
+//
+//                }
+//            }
+//            return getDataTable(list);
 //        }
-        if (param.getIsReceive() != null && param.getIsReceive() == 0){
-            CrmLineCustomerListQueryParam param1 = new CrmLineCustomerListQueryParam();
-            BeanUtils.copyProperties(param,param1);
-            List<CrmLineCustomerListQueryVO> list1 = crmCustomerService.selectCrmLineCustomerListQuery(param1);
-            if (list1 != null) {
-                for (CrmLineCustomerListQueryVO vo : list1) {
-                    if(vo.getMobile()!=null){
-                        vo.setMobile(vo.getMobile().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-                    }
-                    vo.setProperties( crmCustomerPropertyService.selectCrmCustomerPropertyByCustomerId(vo.getCustomerId()));
-                }
-            }
-            return getDataTable(list1);
-        }else {
-            List<CrmCustomerListQueryVO> list = crmCustomerService.selectCrmCustomerListQuery(param);
-            if (list != null) {
-                for (CrmCustomerListQueryVO vo : list) {
-                    if (vo.getMobile() != null) {
-                        vo.setMobile(vo.getMobile().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-                    }
-                    vo.setProperties( crmCustomerPropertyService.selectCrmCustomerPropertyByCustomerId(vo.getCustomerId()));
-
-                }
-            }
-            return getDataTable(list);
-        }
+        throw new RuntimeException("not implemented");
     }
     @ApiOperation("获取客户详情")
     @GetMapping("/getCustomerDetails")
@@ -207,13 +211,14 @@ public class CrmCustomerController extends BaseController
             HttpServletRequest request,
             @ApiParam(required = true, name = "customerId", value = "客户ID") @RequestParam(value = "customerId", required = false) Long customerId
     ){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        CrmCustomer customer=crmCustomerService.selectCrmCustomerById(customerId);
-        Boolean isReceive=false;
-        if(customer.getIsReceive()!=null&&customer.getIsReceive()==1&&customer.getReceiveUserId()!=null&&loginUser.getCompanyUser().getUserId().equals(customer.getReceiveUserId())){
-            isReceive=true;
-        }
-        return R.ok().put("customer",customer).put("isReceive",isReceive);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        CrmCustomer customer=crmCustomerService.selectCrmCustomerById(customerId);
+//        Boolean isReceive=false;
+//        if(customer.getIsReceive()!=null&&customer.getIsReceive()==1&&customer.getReceiveUserId()!=null&&loginUser.getCompanyUser().getUserId().equals(customer.getReceiveUserId())){
+//            isReceive=true;
+//        }
+//        return R.ok().put("customer",customer).put("isReceive",isReceive);
+        throw new RuntimeException("not implemented");
 
     }
 
@@ -224,14 +229,15 @@ public class CrmCustomerController extends BaseController
             HttpServletRequest request,
             @ApiParam(required = true, name = "customerId", value = "客户ID") @RequestParam(value = "customerId", required = false) Long customerId
     ){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        CrmCustomer customer=crmCustomerService.selectCrmCustomerById(customerId);
-        customer.setMobile(customer.getMobile().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-        Boolean isReceive=false;
-        if(customer.getIsReceive()!=null&&customer.getIsReceive()==1&&customer.getReceiveUserId()!=null&&loginUser.getCompanyUser().getUserId().equals(customer.getReceiveUserId())){
-            isReceive=true;
-        }
-        return R.ok().put("customer",customer).put("isReceive",isReceive);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        CrmCustomer customer=crmCustomerService.selectCrmCustomerById(customerId);
+//        customer.setMobile(customer.getMobile().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//        Boolean isReceive=false;
+//        if(customer.getIsReceive()!=null&&customer.getIsReceive()==1&&customer.getReceiveUserId()!=null&&loginUser.getCompanyUser().getUserId().equals(customer.getReceiveUserId())){
+//            isReceive=true;
+//        }
+//        return R.ok().put("customer",customer).put("isReceive",isReceive);
+        throw new RuntimeException("not implemented");
 
     }
 
@@ -249,12 +255,13 @@ public class CrmCustomerController extends BaseController
     @PostMapping("/assignToUser")
     public R assignToUser(@RequestBody CrmCustomeAssignParam param)
     {
-        if(param.getCustomerIds().size()>1000){
-            return R.error("分配数据超出范围,最大1000条");
-        }
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        return crmCustomerService.assignToUser(loginUser.getUsername(),loginUser.getCompanyUser().getUserId(),param);
+//        if(param.getCustomerIds().size()>1000){
+//            return R.error("分配数据超出范围,最大1000条");
+//        }
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        return crmCustomerService.assignToUser(loginUser.getUsername(),loginUser.getCompanyUser().getUserId(),param);
+        throw new RuntimeException("not implemented");
 
     }
 
@@ -264,14 +271,15 @@ public class CrmCustomerController extends BaseController
     @PostMapping("/add")
     public AjaxResult add(@Validated @RequestBody CrmCustomer crmCustomer)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        crmCustomer.setCustomerCode(OrderUtils.getOrderNo());
-        crmCustomer.setIsDel(0);
-        crmCustomer.setIsLine(1);
-        if (crmCustomer.getCompanyId() == null && loginUser.getCompany() != null) { crmCustomer.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        crmCustomer.setCreateUserId(loginUser.getCompanyUser().getUserId());
-        crmCustomer.setDeptId(loginUser.getCompanyUser().getDeptId());
-        return toAjax(crmCustomerService.insertCrmCustomer(crmCustomer));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        crmCustomer.setCustomerCode(OrderUtils.getOrderNo());
+//        crmCustomer.setIsDel(0);
+//        crmCustomer.setIsLine(1);
+//        if (crmCustomer.getCompanyId() == null && loginUser.getCompany() != null) { crmCustomer.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        crmCustomer.setCreateUserId(loginUser.getCompanyUser().getUserId());
+//        crmCustomer.setDeptId(loginUser.getCompanyUser().getDeptId());
+//        return toAjax(crmCustomerService.insertCrmCustomer(crmCustomer));
+        throw new RuntimeException("not implemented");
     }
 
     @PreAuthorize("@ss.hasPermi('crm:customer:addMyCustomer')")
@@ -279,28 +287,29 @@ public class CrmCustomerController extends BaseController
     @PostMapping("/addMyCustomer")
     public R addMyCustomer(@RequestBody CrmCustomer crmCustomer)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        crmCustomer.setCustomerCode(OrderUtils.getOrderNo());
-        crmCustomer.setIsLine(0);
-        crmCustomer.setIsDel(0);
-        crmCustomer.setIsReceive(0);
-        crmCustomer.setStatus(1);
-        crmCustomer.setDeptId(loginUser.getCompanyUser().getDeptId());
-        crmCustomer.setCreateUserId(loginUser.getCompanyUser().getUserId());
-        if (crmCustomer.getCompanyId() == null && loginUser.getCompany() != null) { crmCustomer.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        if(crmCustomerService.insertCrmCustomer(crmCustomer)>0){
-            CompanyUser companyUser=loginUser.getCompanyUser();
-            CrmCustomeReceiveParam param=new CrmCustomeReceiveParam();
-            String operName = companyUser.getNickName();
-            param.setCompanyId(companyUser.getCompanyId());
-            param.setCompanyUserId(companyUser.getUserId());
-            param.setCustomerId(crmCustomer.getCustomerId());
-            crmCustomerService.receive(param,operName);
-            return R.ok();
-        }
-        else{
-            return R.error();
-        }
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        crmCustomer.setCustomerCode(OrderUtils.getOrderNo());
+//        crmCustomer.setIsLine(0);
+//        crmCustomer.setIsDel(0);
+//        crmCustomer.setIsReceive(0);
+//        crmCustomer.setStatus(1);
+//        crmCustomer.setDeptId(loginUser.getCompanyUser().getDeptId());
+//        crmCustomer.setCreateUserId(loginUser.getCompanyUser().getUserId());
+//        if (crmCustomer.getCompanyId() == null && loginUser.getCompany() != null) { crmCustomer.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        if(crmCustomerService.insertCrmCustomer(crmCustomer)>0){
+//            CompanyUser companyUser=loginUser.getCompanyUser();
+//            CrmCustomeReceiveParam param=new CrmCustomeReceiveParam();
+//            String operName = companyUser.getNickName();
+//            param.setCompanyId(companyUser.getCompanyId());
+//            param.setCompanyUserId(companyUser.getUserId());
+//            param.setCustomerId(crmCustomer.getCustomerId());
+//            crmCustomerService.receive(param,operName);
+//            return R.ok();
+//        }
+//        else{
+//            return R.error();
+//        }
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -319,12 +328,13 @@ public class CrmCustomerController extends BaseController
     @PostMapping("/receive")
     public R receive(@RequestBody CrmCustomeReceiveParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        String operName = loginUser.getUsername();
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-        param.setDeptId(loginUser.getCompanyUser().getDeptId());
-        return crmCustomerService.receive(param,operName);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        String operName = loginUser.getUsername();
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        param.setDeptId(loginUser.getCompanyUser().getDeptId());
+//        return crmCustomerService.receive(param,operName);
+        throw new RuntimeException("not implemented");
     }
 
     //回收
@@ -332,11 +342,12 @@ public class CrmCustomerController extends BaseController
     @PostMapping("/recover")
     public R recover(@RequestBody CrmCustomeRecoverParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        String operName = loginUser.getUsername();
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
-        return crmCustomerService.recover(param,operName);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        String operName = loginUser.getUsername();
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        param.setCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        return crmCustomerService.recover(param,operName);
+        throw new RuntimeException("not implemented");
     }
 
     //分配
@@ -344,25 +355,27 @@ public class CrmCustomerController extends BaseController
     @PostMapping("/assignUser")
     public R assignUser(@RequestBody CrmCustomeAssignUserParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        String operName = loginUser.getUsername();
-        param.setDeptId(loginUser.getCompanyUser().getDeptId());
-        return crmCustomerService.assignUser(param,operName);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        String operName = loginUser.getUsername();
+//        param.setDeptId(loginUser.getCompanyUser().getDeptId());
+//        return crmCustomerService.assignUser(param,operName);
+        throw new RuntimeException("not implemented");
     }
 
     @PreAuthorize("@ss.hasPermi('crm:customer:importLine')")
     @PostMapping("/importLineData")
     public AjaxResult importLineData(MultipartFile file) throws Exception
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        ExcelUtil<CrmCompanyLineCustomerImportParam> util = new ExcelUtil<CrmCompanyLineCustomerImportParam>(CrmCompanyLineCustomerImportParam.class);
-        List<CrmCompanyLineCustomerImportParam> list = util.importExcel(file.getInputStream());
-        if(list.size()>10000){
-            return new AjaxResult(500,"导入数据超出范围,最大10000条");
-        }
-        String operName = loginUser.getUsername();
-        String message = crmCustomerService.importCompanyLineCustomer(list, operName,loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null,loginUser.getCompanyUser().getUserId());
-        return AjaxResult.success(message);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        ExcelUtil<CrmCompanyLineCustomerImportParam> util = new ExcelUtil<CrmCompanyLineCustomerImportParam>(CrmCompanyLineCustomerImportParam.class);
+//        List<CrmCompanyLineCustomerImportParam> list = util.importExcel(file.getInputStream());
+//        if(list.size()>10000){
+//            return new AjaxResult(500,"导入数据超出范围,最大10000条");
+//        }
+//        String operName = loginUser.getUsername();
+//        String message = crmCustomerService.importCompanyLineCustomer(list, operName,loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null,loginUser.getCompanyUser().getUserId());
+//        return AjaxResult.success(message);
+        throw new RuntimeException("not implemented");
     }
 
     //下载模板
@@ -378,11 +391,12 @@ public class CrmCustomerController extends BaseController
     @PostMapping("/importVisitData")
     public AjaxResult importVisitData(MultipartFile file) throws Exception
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        ExcelUtil<CrmCustomerVisitImportParam> util = new ExcelUtil<CrmCustomerVisitImportParam>(CrmCustomerVisitImportParam.class);
-        List<CrmCustomerVisitImportParam> list = util.importExcel(file.getInputStream());
-        String message = crmCustomerService.importVisitCustomer(list,loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
-        return AjaxResult.success(message);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        ExcelUtil<CrmCustomerVisitImportParam> util = new ExcelUtil<CrmCustomerVisitImportParam>(CrmCustomerVisitImportParam.class);
+//        List<CrmCustomerVisitImportParam> list = util.importExcel(file.getInputStream());
+//        String message = crmCustomerService.importVisitCustomer(list,loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null);
+//        return AjaxResult.success(message);
+        throw new RuntimeException("not implemented");
     }
     //下载模板
     @GetMapping("/importVisitTemplate")
@@ -397,40 +411,42 @@ public class CrmCustomerController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(CrmCustomerListQueryParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
-
-
-
-
-        List<CrmCustomerExportVO> list = crmCustomerService.selectCrmCustomerExportListQuery(param);
-        for(CrmCustomerExportVO customer:list){
-            if(StringUtils.isNotEmpty(customer.getMobile())){
-
-                    customer.setMobile(customer.getMobile().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-            }
-        }
-        ExcelUtil<CrmCustomerExportVO> util = new ExcelUtil<CrmCustomerExportVO>(CrmCustomerExportVO.class);
-        return util.exportExcel(list, "客户");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//
+//
+//
+//
+//        List<CrmCustomerExportVO> list = crmCustomerService.selectCrmCustomerExportListQuery(param);
+//        for(CrmCustomerExportVO customer:list){
+//            if(StringUtils.isNotEmpty(customer.getMobile())){
+//
+//                    customer.setMobile(customer.getMobile().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//            }
+//        }
+//        ExcelUtil<CrmCustomerExportVO> util = new ExcelUtil<CrmCustomerExportVO>(CrmCustomerExportVO.class);
+//        return util.exportExcel(list, "客户");
+        throw new RuntimeException("not implemented");
     }
     @Log(title = "客户", businessType = BusinessType.EXPORT)
     @PostMapping("/{customerIds}")
     public AjaxResult exportByIds(@PathVariable Long[] customerIds)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        List<CrmCustomerExportVO> list = crmCustomerService.selectCrmCustomerExportListByIds(customerIds);
-        for(CrmCustomerExportVO customer:list){
-            if(StringUtils.isNotEmpty(customer.getMobile())){
-                if(loginUser.getCompanyUser().getUserType().equals("00")){
-                }
-                else{
-                    customer.setMobile(customer.getMobile().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-                }
-
-            }
-        }
-        ExcelUtil<CrmCustomerExportVO> util = new ExcelUtil<CrmCustomerExportVO>(CrmCustomerExportVO.class);
-        return util.exportExcel(list, "客户");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        List<CrmCustomerExportVO> list = crmCustomerService.selectCrmCustomerExportListByIds(customerIds);
+//        for(CrmCustomerExportVO customer:list){
+//            if(StringUtils.isNotEmpty(customer.getMobile())){
+//                if(loginUser.getCompanyUser().getUserType().equals("00")){
+//                }
+//                else{
+//                    customer.setMobile(customer.getMobile().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//                }
+//
+//            }
+//        }
+//        ExcelUtil<CrmCustomerExportVO> util = new ExcelUtil<CrmCustomerExportVO>(CrmCustomerExportVO.class);
+//        return util.exportExcel(list, "客户");
+        throw new RuntimeException("not implemented");
     }
 
     @PreAuthorize("@ss.hasPermi('crm:customer:editSource')")
@@ -453,10 +469,11 @@ public class CrmCustomerController extends BaseController
     @ApiOperation("查询客户")
     @GetMapping("/getCustomerListBySearch")
     public R getCustomerListBySearch(CrmCustomerSearchParam param){
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        List<CrmCustomer> list = crmCustomerService.selectCrmCustomerListBySearch(param);
-        return R.ok().put("data",list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        List<CrmCustomer> list = crmCustomerService.selectCrmCustomerListBySearch(param);
+//        return R.ok().put("data",list);
+        throw new RuntimeException("not implemented");
     }
 
 }

fs-agent/src/main/java/com/fs/company/controller/crm/CrmCustomerExtController.java

@@ -8,8 +8,7 @@ import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
 import com.fs.crm.domain.CrmCustomerExt;
 import com.fs.crm.service.ICrmCustomerExtService;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.context.annotation.Profile;
@@ -37,10 +36,11 @@ public class CrmCustomerExtController extends BaseController
     @GetMapping("/list")
     public R list(CrmCustomerExt crmCustomerExt)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (crmCustomerExt.getCompanyId() == null && loginUser.getCompany() != null) { crmCustomerExt.setCompanyId(loginUser.getCompany().getCompanyId()); };
-        List<CrmCustomerExt> list = crmCustomerExtService.selectCrmCustomerExtList(crmCustomerExt);
-        return R.ok().put("data",list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (crmCustomerExt.getCompanyId() == null && loginUser.getCompany() != null) { crmCustomerExt.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//        List<CrmCustomerExt> list = crmCustomerExtService.selectCrmCustomerExtList(crmCustomerExt);
+//        return R.ok().put("data",list);
+        throw new RuntimeException("not implemented");
     }
 
     /**
@@ -59,9 +59,10 @@ public class CrmCustomerExtController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CrmCustomerExt crmCustomerExt)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if (crmCustomerExt.getCompanyId() == null && loginUser.getCompany() != null) { crmCustomerExt.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        return toAjax(crmCustomerExtService.insertCrmCustomerExt(crmCustomerExt));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if (crmCustomerExt.getCompanyId() == null && loginUser.getCompany() != null) { crmCustomerExt.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        return toAjax(crmCustomerExtService.insertCrmCustomerExt(crmCustomerExt));
+        throw new RuntimeException("not implemented");
     }
 
     /**

fs-agent/src/main/java/com/fs/company/controller/crm/CrmCustomerPropertyController.java

@@ -9,8 +9,7 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.crm.domain.CrmCustomerProperty;
 import com.fs.crm.service.ICrmCustomerPropertyService;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -55,9 +54,10 @@ public class CrmCustomerPropertyController extends BaseController {
     @Log(title = "客户属性标签", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public AjaxResult add(@RequestBody CrmCustomerProperty property) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        property.setCreateBy(loginUser.getUsername());
-        return toAjax(crmCustomerPropertyService.insertCrmCustomerProperty(property));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        property.setCreateBy(loginUser.getUsername());
+//        return toAjax(crmCustomerPropertyService.insertCrmCustomerProperty(property));
+        throw new RuntimeException("not implemented");
     }
 
     @ApiOperation("为客户添加或更新属性标签")
@@ -65,18 +65,19 @@ public class CrmCustomerPropertyController extends BaseController {
     @Log(title = "客户属性标签", businessType = BusinessType.UPDATE)
     @PostMapping("/addOrUpdate")
     public AjaxResult addOrUpdate(@RequestBody CrmCustomerProperty property) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        return toAjax(crmCustomerPropertyService.addOrUpdateCustomerPropertyWithExtra(
-                property.getCustomerId(),
-                property.getPropertyId(),
-                property.getPropertyName(),
-                property.getPropertyValue(),
-                property.getPropertyValueType(),
-                property.getTradeType(),
-                property.getIntention(),
-                property.getLikeRatio(),
-                loginUser.getUsername()
-        ));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        return toAjax(crmCustomerPropertyService.addOrUpdateCustomerPropertyWithExtra(
+//                property.getCustomerId(),
+//                property.getPropertyId(),
+//                property.getPropertyName(),
+//                property.getPropertyValue(),
+//                property.getPropertyValueType(),
+//                property.getTradeType(),
+//                property.getIntention(),
+//                property.getLikeRatio(),
+//                loginUser.getUsername()
+//        ));
+        throw new RuntimeException("not implemented");
     }
 
     @ApiOperation("批量为客户添加属性标签")
@@ -86,11 +87,12 @@ public class CrmCustomerPropertyController extends BaseController {
     public AjaxResult batchAdd(
             @PathVariable("customerId") Long customerId,
             @RequestBody List<CrmCustomerProperty> properties) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        for (CrmCustomerProperty property : properties) {
-            property.setCreateBy(loginUser.getUsername());
-        }
-        return toAjax(crmCustomerPropertyService.batchAddCustomerProperties(customerId, properties));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        for (CrmCustomerProperty property : properties) {
+//            property.setCreateBy(loginUser.getUsername());
+//        }
+//        return toAjax(crmCustomerPropertyService.batchAddCustomerProperties(customerId, properties));
+        throw new RuntimeException("not implemented");
     }
 
     @ApiOperation("通过属性模板 ID 为客户添加标签")
@@ -101,8 +103,9 @@ public class CrmCustomerPropertyController extends BaseController {
             @ApiParam(required = true, name = "customerId", value = "客户 ID") @RequestParam Long customerId,
             @ApiParam(required = true, name = "templateId", value = "属性模板 ID") @RequestParam Long templateId,
             @ApiParam(required = true, name = "propertyValue", value = "属性值") @RequestParam String propertyValue) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        return toAjax(crmCustomerPropertyService.addPropertyByTemplateId(customerId, templateId, propertyValue, loginUser.getUsername()));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        return toAjax(crmCustomerPropertyService.addPropertyByTemplateId(customerId, templateId, propertyValue, loginUser.getUsername()));
+        throw new RuntimeException("not implemented");
     }
 
     @ApiOperation("通过属性模板 ID 为客户添加或更新标签")
@@ -113,8 +116,9 @@ public class CrmCustomerPropertyController extends BaseController {
             @ApiParam(required = true, name = "customerId", value = "客户 ID") @RequestParam Long customerId,
             @ApiParam(required = true, name = "templateId", value = "属性模板 ID") @RequestParam Long templateId,
             @ApiParam(required = true, name = "propertyValue", value = "属性值") @RequestParam String propertyValue) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        return toAjax(crmCustomerPropertyService.addOrUpdatePropertyByTemplateId(customerId, templateId, propertyValue, loginUser.getUsername()));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        return toAjax(crmCustomerPropertyService.addOrUpdatePropertyByTemplateId(customerId, templateId, propertyValue, loginUser.getUsername()));
+        throw new RuntimeException("not implemented");
     }
 
     @ApiOperation("批量通过属性模板 ID 为客户添加标签")
@@ -124,8 +128,9 @@ public class CrmCustomerPropertyController extends BaseController {
     public AjaxResult batchAddByTemplateIds(
             @PathVariable("customerId") Long customerId,
             @RequestBody Map<Long, String> propertyMap) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        return toAjax(crmCustomerPropertyService.batchAddPropertiesByTemplateIds(customerId, propertyMap, loginUser.getUsername()));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        return toAjax(crmCustomerPropertyService.batchAddPropertiesByTemplateIds(customerId, propertyMap, loginUser.getUsername()));
+        throw new RuntimeException("not implemented");
     }
 
     @ApiOperation("修改客户属性标签")
@@ -133,9 +138,10 @@ public class CrmCustomerPropertyController extends BaseController {
     @Log(title = "客户属性标签", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CrmCustomerProperty property) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        property.setUpdateBy(loginUser.getUsername());
-        return toAjax(crmCustomerPropertyService.updateCrmCustomerProperty(property));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        property.setUpdateBy(loginUser.getUsername());
+//        return toAjax(crmCustomerPropertyService.updateCrmCustomerProperty(property));
+        throw new RuntimeException("not implemented");
     }
 
     @ApiOperation("删除客户属性标签")
@@ -164,9 +170,10 @@ public class CrmCustomerPropertyController extends BaseController {
     @Log(title = "客户属性标签", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(CrmCustomerProperty crmCustomerProperty) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        List<CrmCustomerProperty> list = crmCustomerPropertyService.selectCrmCustomerPropertyList(crmCustomerProperty);
-        ExcelUtil<CrmCustomerProperty> util = new ExcelUtil<CrmCustomerProperty>(CrmCustomerProperty.class);
-        return util.exportExcel(list, "客户属性标签数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        List<CrmCustomerProperty> list = crmCustomerPropertyService.selectCrmCustomerPropertyList(crmCustomerProperty);
+//        ExcelUtil<CrmCustomerProperty> util = new ExcelUtil<CrmCustomerProperty>(CrmCustomerProperty.class);
+//        return util.exportExcel(list, "客户属性标签数据");
+        throw new RuntimeException("not implemented");
     }
 }