diff --git a/pusong-admin/src/main/resources/application-dev.yml b/pusong-admin/src/main/resources/application-dev.yml index 2b8b76e..b59438d 100644 --- a/pusong-admin/src/main/resources/application-dev.yml +++ b/pusong-admin/src/main/resources/application-dev.yml @@ -95,7 +95,7 @@ spring.data: # 端口,默认为6379 port: 6378 # 数据库索引 - database: 1 + database: 8 # 密码(如没有密码请注释掉) password: 12345 # 连接超时时间 diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsApproverRecordController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsApproverRecordController.java index e6e2baf..72fc700 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsApproverRecordController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsApproverRecordController.java @@ -2,6 +2,7 @@ package com.pusong.business.controller; import java.util.List; +import cn.dev33.satoken.annotation.SaIgnore; import com.pusong.business.service.IPsContractInfoService; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; @@ -33,6 +34,7 @@ import com.pusong.common.mybatis.core.page.TableDataInfo; @RequiredArgsConstructor @RestController @RequestMapping("/business/approverRecord") +@SaIgnore public class PsApproverRecordController extends BaseController { private final IPsApproverRecordService psApproverRecordService; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCompanyInfoController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCompanyInfoController.java index e5f5d93..d3a899f 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCompanyInfoController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCompanyInfoController.java @@ -2,6 +2,7 @@ package com.pusong.business.controller; import java.util.List; +import cn.dev33.satoken.annotation.SaIgnore; import com.pusong.common.core.validate.QueryGroup; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; @@ -33,6 +34,7 @@ import com.pusong.common.mybatis.core.page.TableDataInfo; @RequiredArgsConstructor @RestController @RequestMapping("/business/companyInfo") +@SaIgnore public class PsCompanyInfoController extends BaseController { private final IPsCompanyInfoService psCompanyInfoService; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractInfoController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractInfoController.java index 4865b4c..68b1ef8 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractInfoController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractInfoController.java @@ -2,6 +2,7 @@ package com.pusong.business.controller; import java.util.List; +import cn.dev33.satoken.annotation.SaIgnore; import com.pusong.business.domain.bo.PsContractInfoQueryBo; import com.pusong.business.domain.vo.PsContractBusinessVo; import com.pusong.business.domain.vo.ServiceScheduleVo; @@ -39,6 +40,7 @@ import javax.management.Query; @RequiredArgsConstructor @RestController @RequestMapping("/business/contractInfo") +@SaIgnore public class PsContractInfoController extends BaseController { private final IPsContractInfoService psContractInfoService; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractOperateController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractOperateController.java index 698efd7..73ff7bc 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractOperateController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractOperateController.java @@ -1,6 +1,7 @@ package com.pusong.business.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaIgnore; import com.pusong.business.domain.bo.PsContractInfoBo; import com.pusong.business.domain.bo.PsContractInfoQueryBo; import com.pusong.business.domain.bo.PsContractPayBo; @@ -38,6 +39,7 @@ import java.util.List; @RequiredArgsConstructor @RestController @RequestMapping("/business/contractOperate") +@SaIgnore public class PsContractOperateController extends BaseController { private final IPsContractPayService payService; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractPayController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractPayController.java index 43f0979..6dc60a3 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractPayController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsContractPayController.java @@ -2,6 +2,7 @@ package com.pusong.business.controller; import java.util.List; +import cn.dev33.satoken.annotation.SaIgnore; import com.pusong.business.domain.vo.PsRefundVo; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; @@ -35,6 +36,7 @@ import org.springframework.web.multipart.MultipartFile; @RequiredArgsConstructor @RestController @RequestMapping("/business/contractPay") +@SaIgnore public class PsContractPayController extends BaseController { private final IPsContractPayService psContractPayService; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java index d7568b4..acab732 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java @@ -2,6 +2,7 @@ package com.pusong.business.controller; import java.util.List; +import cn.dev33.satoken.annotation.SaIgnore; import com.pusong.business.domain.bo.PsCustomCallbackBo; import com.pusong.business.domain.bo.PsCustomPriceBo; import com.pusong.business.domain.bo.PsCustomRecordQueryBo; @@ -36,12 +37,14 @@ import com.pusong.common.mybatis.core.page.TableDataInfo; @RequiredArgsConstructor @RestController @RequestMapping("/business/customInfo") +@SaIgnore public class PsCustomController extends BaseController { private final IPsCustomInfoService psCustomInfoService; /** * 查询登陆人下所有的客户名称和id */ + @SaCheckPermission("business:customInfo:list") @GetMapping("/listByLoginUser") public R> listByLoginUser() { diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsHomeController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsHomeController.java index a85b204..0bc8374 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsHomeController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsHomeController.java @@ -1,6 +1,7 @@ package com.pusong.business.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaIgnore; import com.pusong.business.domain.bo.PsCustomCallbackBo; import com.pusong.business.domain.bo.PsCustomInfoBo; import com.pusong.business.domain.bo.PsCustomPriceBo; @@ -33,6 +34,7 @@ import java.util.List; @RequiredArgsConstructor @RestController @RequestMapping("/business/home") +@SaIgnore public class PsHomeController extends BaseController { private final IPsCustomInfoService psCustomInfoService; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsSalaryConfigController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsSalaryConfigController.java index b1413ac..6bfd851 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsSalaryConfigController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsSalaryConfigController.java @@ -2,6 +2,7 @@ package com.pusong.business.controller; import java.util.List; +import cn.dev33.satoken.annotation.SaIgnore; import com.pusong.business.domain.bo.PsSalaryConfigAddVo; import com.pusong.business.domain.vo.PsSalaryConfigInfoVo; import lombok.RequiredArgsConstructor; @@ -34,6 +35,7 @@ import com.pusong.common.mybatis.core.page.TableDataInfo; @RequiredArgsConstructor @RestController @RequestMapping("/business/salaryConfig") +@SaIgnore public class PsSalaryConfigController extends BaseController { private final IPsSalaryConfigService psSalaryConfigService; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsSalaryController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsSalaryController.java index cbc8232..fbcfb83 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsSalaryController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsSalaryController.java @@ -2,6 +2,7 @@ package com.pusong.business.controller; import java.util.List; +import cn.dev33.satoken.annotation.SaIgnore; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; @@ -32,6 +33,7 @@ import com.pusong.common.mybatis.core.page.TableDataInfo; @RequiredArgsConstructor @RestController @RequestMapping("/business/salary") +@SaIgnore public class PsSalaryController extends BaseController { private final IPsSalaryService psSalaryService; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskController.java index c725002..4626919 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskController.java @@ -1,5 +1,6 @@ package com.pusong.business.controller; +import cn.dev33.satoken.annotation.SaIgnore; import com.pusong.business.domain.PsTaskAppoint; import com.pusong.business.domain.bo.AppointBo; import com.pusong.business.domain.bo.MediaCompanySaveBo; @@ -38,6 +39,7 @@ import java.util.Map; @RequiredArgsConstructor @RestController @RequestMapping("/business/task") +@SaIgnore public class PsTaskController extends BaseController { private final IPsTaskService psTaskMainService; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskWorkRecordController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskWorkRecordController.java index 3815dc1..670e93d 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskWorkRecordController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskWorkRecordController.java @@ -2,6 +2,7 @@ package com.pusong.business.controller; import java.util.List; +import cn.dev33.satoken.annotation.SaIgnore; import lombok.RequiredArgsConstructor; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; @@ -31,6 +32,7 @@ import com.pusong.common.mybatis.core.page.TableDataInfo; @RequiredArgsConstructor @RestController @RequestMapping("/business/taskWorkRecord") +@SaIgnore public class PsTaskWorkRecordController extends BaseController { private final IPsTaskWorkRecordService psTaskWorkRecordService; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/ServiceConfigController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/ServiceConfigController.java index acb940d..4f6a2c9 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/ServiceConfigController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/ServiceConfigController.java @@ -1,6 +1,7 @@ package com.pusong.business.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONArray; import com.pusong.business.domain.bo.DicDataBo; import com.pusong.business.domain.vo.PsCustomInfoVo; @@ -21,6 +22,7 @@ import java.util.List; @RequiredArgsConstructor @RestController @RequestMapping("/business/serviceConfig") +@SaIgnore public class ServiceConfigController { private final IServiceConfigService configService; /** diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsCustomInfoMapper.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsCustomInfoMapper.java index 065e5fe..6645326 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsCustomInfoMapper.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsCustomInfoMapper.java @@ -49,8 +49,8 @@ public interface PsCustomInfoMapper extends BaseMapperPlus selectPageUserList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); @DataPermission({ - @DataColumn(key = "deptName", value = "info.create_dept"), - @DataColumn(key = "userName", value = "info.create_by") + @DataColumn(key = "deptName", value = "custom.create_dept"), + @DataColumn(key = "userName", value = "custom.create_by") }) Page selectPageCustomerRecordList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper);