调整userw和iaw的dto的继承公参

gly-base-core/src/main/java/cn/com/taiji/core/dto/AbstractBizRequestDTO.java

@@ -22,6 +22,10 @@ public abstract class AbstractBizRequestDTO extends BaseValidDTO {
     @NotBlank(message = "loginSource不能为空")
     private String loginSource;
 
+    public SourceType getOrderSource() {
+        return SourceType.findByCode(loginSource);
+    }
+
     @Override
     protected void validate(ViolationValidator validator) {
 

gly-base-core/src/main/java/cn/com/taiji/core/dto/AbstractStaffBizRequestDTO.java

@@ -2,6 +2,7 @@ package cn.com.taiji.core.dto;
 
 import cn.com.taiji.common.valid.BaseValidDTO;
 import cn.com.taiji.common.valid.ViolationValidator;
+import cn.com.taiji.core.entity.dict.basic.SourceType;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -21,6 +22,11 @@ public abstract class AbstractStaffBizRequestDTO extends BaseValidDTO {
     @NotBlank(message = "staffId不能为空")
     private String staffId;
 
+
+    public SourceType getOrderSource() {
+        return SourceType.findByCode(loginSource);
+    }
+
     @Override
     protected void validate(ViolationValidator validator) {
 

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/comm/AddressAddRequestDTO.java

@@ -1,7 +1,7 @@
 package cn.com.taiji.iaw.dto.comm;
 
 import cn.com.taiji.common.valid.ViolationValidator;
-import cn.com.taiji.iaw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractBizRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/comm/AddressInfoRequestDTO.java

@@ -1,7 +1,7 @@
 package cn.com.taiji.iaw.dto.comm;
 
 import cn.com.taiji.common.valid.ViolationValidator;
-import cn.com.taiji.iaw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractBizRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/comm/AddressQueryRequestDTO.java

@@ -1,6 +1,6 @@
 package cn.com.taiji.iaw.dto.comm;
 
-import cn.com.taiji.iaw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractBizRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/comm/CardInfoQueryRequestDTO.java

@@ -1,6 +1,6 @@
 package cn.com.taiji.iaw.dto.comm;
 
-import cn.com.taiji.iaw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractBizRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/comm/SatisfactionNewAddRequestDTO.java

@@ -1,8 +1,8 @@
 package cn.com.taiji.iaw.dto.comm;
 
 import cn.com.taiji.common.valid.ViolationValidator;
+import cn.com.taiji.core.dto.AbstractBizRequestDTO;
 import cn.com.taiji.core.entity.dict.issue.OrderSatisfactionType;
-import cn.com.taiji.iaw.dto.AbstractBizRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/comm/SatisfactionNewInfoRequestDTO.java

@@ -1,7 +1,7 @@
 package cn.com.taiji.iaw.dto.comm;
 
 import cn.com.taiji.common.valid.ViolationValidator;
-import cn.com.taiji.iaw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractBizRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/comm/SatisfactionNewPageRequestDTO.java

@@ -1,8 +1,7 @@
 package cn.com.taiji.iaw.dto.comm;
 
+import cn.com.taiji.core.dto.AbstractBizPageRequestDTO;
 import cn.com.taiji.core.entity.dict.issue.OrderSatisfactionType;
-import cn.com.taiji.iaw.dto.AbstractBizPageRequestDTO;
-import cn.com.taiji.iaw.dto.AbstractBizRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/comm/VehicleBindPageRequestDTO.java

@@ -1,7 +1,6 @@
 package cn.com.taiji.iaw.dto.comm;
 
-import cn.com.taiji.iaw.dto.AbstractBizPageRequestDTO;
-import cn.com.taiji.iaw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractBizPageRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/comm/VehicleBindRequestDTO.java

@@ -1,6 +1,6 @@
 package cn.com.taiji.iaw.dto.comm;
 
-import cn.com.taiji.iaw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractBizRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/comm/VehicleUnBindRequestDTO.java

@@ -1,6 +1,6 @@
 package cn.com.taiji.iaw.dto.comm;
 
-import cn.com.taiji.iaw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractBizRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/AbstractCommManager.java

@@ -3,12 +3,11 @@ package cn.com.taiji.iaw.manager;
 import java.io.IOException;
 import java.util.concurrent.Callable;
 
-import cn.com.taiji.iaw.manager.FieldMsgConvertor;
+import cn.com.taiji.core.manager.cache.RedisCacheManager;
 import feign.RetryableException;
 import org.apache.http.NoHttpResponseException;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import cn.com.taiji.common.manager.AbstractManager;
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.manager.net.http.binclient.ApiRequestException;
 import cn.com.taiji.common.model.file.FileProtocolSystemError;
@@ -23,7 +22,7 @@ import cn.com.taiji.core.model.comm.protocol.SignJsonResponse;
 import cn.com.taiji.core.model.comm.protocol.valid.FieldMsgBuilder;
 import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
 
-public abstract class AbstractCommManager extends AbstractManager {
+public abstract class AbstractCommManager extends RedisCacheManager {
 
     @Autowired
     protected FeignClientManager feignClientManager;

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/comm/AddressManagerImpl.java

@@ -43,7 +43,7 @@ public class AddressManagerImpl extends AbstractCommManager implements AddressMa
         BeanTools.copyProperties(dto, req);
         List<String> openIds = Lists.newArrayList();
         if (SourceType.WECHAT.equals(dto.getOrderSource()) || SourceType.ALI.equals(dto.getOrderSource())) {
-            openIds.add(dto.getOpenId());
+            openIds.add(findOpenIdByToken(dto.getAccessToken()));
         } else {
             if (!hasText(dto.getMobile())) {
                 List<AccountInfo> allByMobile = accountInfoRepo.findAllByMobile(dto.getMobile());
@@ -73,7 +73,7 @@ public class AddressManagerImpl extends AbstractCommManager implements AddressMa
             entity = repo.findById(dto.getId()).orElse(null);
             if (entity == null) {
                 throw new ManagerException("地址不存在");
-            } else if (!dto.getOpenId().equals(entity.getOpenId())) {
+            } else if (!findOpenIdByToken(dto.getAccessToken()).equals(entity.getOpenId())) {
                 throw new ManagerException("不是您的地址信息，编辑失败");
             }
             BeanUtil.copyProperties(dto, entity, "id", "updateTime"
@@ -115,7 +115,7 @@ public class AddressManagerImpl extends AbstractCommManager implements AddressMa
         AddressInfo entity = repo.findById(dto.getId()).orElse(null);
         if (entity == null) {
             throw new ManagerException("地址不存在");
-        } else if (!dto.getOpenId().equals(entity.getOpenId())) {
+        } else if (!findOpenIdByToken(dto.getAccessToken()).equals(entity.getOpenId())) {
             throw new ManagerException("不是您的地址信息，删除失败");
         }
         entity.setStatus(0);//0-删除、1-正常

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/comm/IawVehicleBindManagerImpl.java

@@ -9,6 +9,7 @@ import cn.com.taiji.core.entity.comm.UserVehicleBind;
 import cn.com.taiji.core.repo.jpa.basic.QtkCardInfoRepo;
 import cn.com.taiji.core.repo.jpa.comm.UserVehicleBindRepo;
 import cn.com.taiji.iaw.dto.comm.*;
+import cn.com.taiji.iaw.manager.AbstractCommManager;
 import cn.com.taiji.iaw.repo.jpa.request.comm.VehicleBindPageRequest;
 import cn.com.taiji.iaw.tools.WxLoginUserUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -28,7 +29,7 @@ import java.util.stream.Collectors;
  * @version: 1.0
  */
 @Service
-public class IawVehicleBindManagerImpl implements IawVehicleBindManager {
+public class IawVehicleBindManagerImpl extends AbstractCommManager implements IawVehicleBindManager {
 
     @Autowired
     private UserVehicleBindRepo repo;
@@ -40,8 +41,8 @@ public class IawVehicleBindManagerImpl implements IawVehicleBindManager {
     @Override
     public VehicleBindResponseDTO bind(VehicleBindRequestDTO dto) throws ManagerException {
         VehicleBindResponseDTO resDto = new VehicleBindResponseDTO();
-        if (!StringUtils.isEmpty(dto.getOpenId())){
-            String customerId = wxLoginUserUtil.getCustomerIdFromOpenId(dto.getOpenId());
+        if (!StringUtils.isEmpty(findOpenIdByToken(dto.getAccessToken()))){
+            String customerId = wxLoginUserUtil.getCustomerIdFromOpenId(findOpenIdByToken(dto.getAccessToken()));
             if (StringUtils.isEmpty(customerId)){
                 throw new ManagerException("车辆不是操作人名下的卡签关联车辆，无法绑定！");
             }
@@ -88,7 +89,7 @@ public class IawVehicleBindManagerImpl implements IawVehicleBindManager {
 
     @Override
     public List<CardInfoQueryResponseDTO> queryCardInfo(CardInfoQueryRequestDTO dto) throws ManagerException {
-        String customerId = wxLoginUserUtil.getCustomerIdFromOpenId(dto.getOpenId());
+        String customerId = wxLoginUserUtil.getCustomerIdFromOpenId(findOpenIdByToken(dto.getAccessToken()));
         if (StringUtils.isEmpty(customerId)){
             throw new ManagerException("未获取到用户信息！");
         }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/comm/RefundReceiveInfoManagerImpl.java

@@ -10,6 +10,7 @@ import cn.com.taiji.core.repo.jpa.comm.RefundReceiveInfoRepo;
 import cn.com.taiji.core.repo.jpa.user.AccountInfoRepo;
 import cn.com.taiji.iaw.dto.ass.RefundInfoDTO;
 import cn.com.taiji.iaw.dto.ass.RefundInfoVO;
+import cn.com.taiji.iaw.manager.AbstractCommManager;
 import cn.com.taiji.iaw.repo.jpa.request.ass.RefundInfoPageRequest;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
@@ -22,7 +23,7 @@ import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
-public class RefundReceiveInfoManagerImpl extends AbstractManager implements RefundReceiveInfoManager {
+public class RefundReceiveInfoManagerImpl extends AbstractCommManager implements RefundReceiveInfoManager {
 
     private final RefundReceiveInfoRepo refundReceiveInfoRepo;
     private final AccountInfoRepo accountInfoRepo;

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/comm/SatisfactionManager.java

@@ -1,6 +1,7 @@
 package cn.com.taiji.iaw.manager.comm;
 
 import cn.com.taiji.common.manager.ManagerException;
+import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.iaw.dto.comm.*;
 
@@ -13,7 +14,7 @@ import cn.com.taiji.iaw.dto.comm.*;
  */
 public interface SatisfactionManager {
 
-    Pagination page(SatisfactionNewPageRequestDTO dto);
+    Pagination page(SatisfactionNewPageRequestDTO dto) throws ServiceHandleException;
 
     SatisfactionNewInfoResponseDTO view(SatisfactionNewInfoRequestDTO dto) throws ManagerException;
 

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/comm/SatisfactionManagerImpl.java

@@ -1,6 +1,7 @@
 package cn.com.taiji.iaw.manager.comm;
 
 import cn.com.taiji.common.manager.ManagerException;
+import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.common.pub.BeanTools;
 import cn.com.taiji.core.entity.comm.CommonSatisfaction;
@@ -32,13 +33,13 @@ public class SatisfactionManagerImpl extends AbstractCommManager implements Sati
     private StaffRepo staffRepo;
 
     @Override
-    public Pagination page(SatisfactionNewPageRequestDTO reqDto) {
+    public Pagination page(SatisfactionNewPageRequestDTO reqDto) throws ServiceHandleException {
 
         SatisfactionNewPageRequest pageRequest = new SatisfactionNewPageRequest();
         BeanTools.copyProperties(reqDto, pageRequest);
         if (SourceType.WEB.equals(reqDto.getOrderSource()) || SourceType.SERVICE_HALL.equals(reqDto.getOrderSource())){
             // 判断入口路径，微信端只查自己的openId
-            Staff staff = staffRepo.findByOpenId(reqDto.getOpenId());
+            Staff staff = staffRepo.findByOpenId(findOpenIdByToken(reqDto.getAccessToken()));
             if (staff != null){
                 pageRequest.setAgencyId(staff.getAgencyId());
                 if ("SUPER_MANAGER".equals(staff.getIdentityType())){

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/model/portal/AccessTokenCheckDto.java

@@ -24,7 +24,7 @@ public class AccessTokenCheckDto extends BaseModel {
 
     public AccessTokenCheckRequest toRequest() throws ManagerException {
         AccessTokenCheckRequest request = new AccessTokenCheckRequest();
-        request.setOpenId(openId);
+//        request.setOpenId(openId);
         request.setAccessToken(accessToken);
         if(SourceType.findByCode(loginSource)==null) throw new ManagerException("未知的登录来源方");
         request.setLoginSource(SourceType.findByCode(loginSource));

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/model/portal/LogoutDto.java

@@ -24,7 +24,7 @@ public class LogoutDto extends BaseModel {
 
     public LogoutRequest toRequest() throws ManagerException {
         LogoutRequest request = new LogoutRequest();
-        request.setOpenId(openId);
+//        request.setOpenId(openId);
         request.setAccessToken(accessToken);
         if(SourceType.findByCode(loginSource)==null) throw new ManagerException("未知的登录来源方");
         request.setLoginSource(SourceType.findByCode(loginSource));

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/agency/AgencyEnableRequestDTO.java

@@ -1,7 +1,7 @@
 package cn.com.taiji.userw.dto.agency;
 
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import cn.com.taiji.core.model.comm.protocol.constraint.IntegerConstant;
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
 import io.swagger.annotations.ApiModel;
 import lombok.Getter;
 import lombok.Setter;
@@ -12,7 +12,7 @@ import javax.validation.constraints.NotNull;
 @ApiModel(description = "渠道启用停用请求参数")
 @Getter
 @Setter
-public class AgencyEnableRequestDTO extends AbstractBizRequestDTO {
+public class AgencyEnableRequestDTO extends AbstractStaffBizRequestDTO {
 
     @NotBlank(message = "渠道编号不能为空")
     private String agencyId;

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/agency/AgencyInsertRequestDTO.java

@@ -1,8 +1,8 @@
 package cn.com.taiji.userw.dto.agency;
 
 import cn.com.taiji.common.valid.ViolationValidator;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import cn.com.taiji.core.model.comm.protocol.constraint.FixedLength;
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
 import cn.com.taiji.userw.model.agency.QtkAgencyBkModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,7 +12,7 @@ import javax.validation.constraints.NotBlank;
 
 @ApiModel(description = "渠道信息添加请求参数")
 @Data
-public class AgencyInsertRequestDTO extends AbstractBizRequestDTO {
+public class AgencyInsertRequestDTO extends AbstractStaffBizRequestDTO {
     @ApiModelProperty(value = "发行方编号")
     private String issuerId;
     @NotBlank

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/agency/AgencyLikeNameReqDTO.java

@@ -1,6 +1,6 @@
 package cn.com.taiji.userw.dto.agency;
 
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -15,7 +15,7 @@ import lombok.Setter;
 @ApiModel(description = "按名称模糊查询请求参数")
 @Getter
 @Setter
-public class AgencyLikeNameReqDTO extends AbstractBizRequestDTO {
+public class AgencyLikeNameReqDTO extends AbstractStaffBizRequestDTO {
 
     @ApiModelProperty(value = "渠道名称")
     private String name;

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/agency/AgencyPageRequestDTO.java

@@ -1,16 +1,15 @@
 package cn.com.taiji.userw.dto.agency;
 
-import cn.com.taiji.common.model.finals.SysFinals;
+import cn.com.taiji.core.dto.AbstractBizPageRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizPageRequestDTO;
 import cn.com.taiji.core.model.comm.protocol.constraint.IntegerConstant;
-import cn.com.taiji.userw.dto.AbstractBizPageRequestDTO;
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 @ApiModel(description = "机构分页查询请求参数")
-public class AgencyPageRequestDTO extends AbstractBizPageRequestDTO {
+public class AgencyPageRequestDTO extends AbstractStaffBizPageRequestDTO {
 
     @ApiModelProperty(value = "渠道编号")
     private String agencyId;

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/agency/AgencyUpdateRequestDTO.java

@@ -1,8 +1,8 @@
 package cn.com.taiji.userw.dto.agency;
 
 import cn.com.taiji.common.valid.ViolationValidator;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import cn.com.taiji.core.model.comm.protocol.constraint.FixedLength;
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
 import cn.com.taiji.userw.model.agency.QtkAgencyBkModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,7 +12,7 @@ import javax.validation.constraints.NotBlank;
 
 @ApiModel(description = "渠道信息添加请求参数")
 @Data
-public class AgencyUpdateRequestDTO extends AbstractBizRequestDTO {
+public class AgencyUpdateRequestDTO extends AbstractStaffBizRequestDTO {
 
     @NotBlank
     @ApiModelProperty(value = "渠道表唯一id")

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/agency/GetAgencyIdRequestDTO.java

@@ -1,6 +1,6 @@
 package cn.com.taiji.userw.dto.agency;
 
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 
 /**
  * @Author ChenChao
@@ -8,5 +8,5 @@ import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
  * @Description
  */
 
-public class GetAgencyIdRequestDTO extends AbstractBizRequestDTO {
+public class GetAgencyIdRequestDTO extends AbstractStaffBizRequestDTO {
 }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/centerHallAndAgency/CenterAgencyAddOrUpdateReqDTO.java

@@ -1,6 +1,6 @@
 package cn.com.taiji.userw.dto.centerHallAndAgency;
 
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,7 +13,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel(description = "中心渠道新增修改")
-public class CenterAgencyAddOrUpdateReqDTO extends AbstractBizRequestDTO {
+public class CenterAgencyAddOrUpdateReqDTO extends AbstractStaffBizRequestDTO {
 
     @ApiModelProperty(value = "中心渠道编号")
     private String centerAgencyId;

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/centerHallAndAgency/CenterHallAddOrUpdateReqDTO.java

@@ -1,7 +1,7 @@
 package cn.com.taiji.userw.dto.centerHallAndAgency;
 
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import cn.com.taiji.core.model.comm.protocol.constraint.FixedLength;
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -13,7 +13,7 @@ import javax.validation.constraints.NotBlank;
  * @description: 中心网点新增请求参数
  */
 @Data
-public class CenterHallAddOrUpdateReqDTO extends AbstractBizRequestDTO {
+public class CenterHallAddOrUpdateReqDTO extends AbstractStaffBizRequestDTO {
     @NotBlank(message = "中心网点编号不能为空")
     @FixedLength(length = 19, message = "中心网点编号必须是19位")
     private String centerServiceHallId;

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/centerHallAndAgency/CenterHallOrAgencyDeleteRequestDTO.java

@@ -1,6 +1,6 @@
 package cn.com.taiji.userw.dto.centerHallAndAgency;
 
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -17,7 +17,7 @@ import javax.validation.constraints.NotBlank;
 @ApiModel(description = "删除中心网点/渠道信息")
 @Getter
 @Setter
-public class CenterHallOrAgencyDeleteRequestDTO extends AbstractBizRequestDTO {
+public class CenterHallOrAgencyDeleteRequestDTO extends AbstractStaffBizRequestDTO {
 
     @ApiModelProperty(value = "中心网点id/中心渠道id")
     @NotBlank

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/centerHallAndAgency/CenterHallOrAgencyPageRequestDTO.java

@@ -1,6 +1,6 @@
 package cn.com.taiji.userw.dto.centerHallAndAgency;
 
-import cn.com.taiji.userw.dto.AbstractBizPageRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import lombok.Data;
 
 /**
@@ -10,6 +10,6 @@ import lombok.Data;
  * @description: 中心网点/渠道请求参数
  */
 @Data
-public class CenterHallOrAgencyPageRequestDTO extends AbstractBizPageRequestDTO {
+public class CenterHallOrAgencyPageRequestDTO extends AbstractStaffBizRequestDTO {
 
 }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/GetAccountInfoByRoleMenuPermListRequestDTO.java

@@ -1,7 +1,7 @@
 package cn.com.taiji.userw.dto.rbac;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.util.StringUtils;
@@ -12,7 +12,7 @@ import org.springframework.util.StringUtils;
  **/
 @Getter
 @Setter
-public class GetAccountInfoByRoleMenuPermListRequestDTO extends AbstractBizRequestDTO {
+public class GetAccountInfoByRoleMenuPermListRequestDTO extends AbstractStaffBizRequestDTO {
 
     /**
      * 菜单id

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/GetAccountInfoByRolePageRequestDTO.java

@@ -1,7 +1,7 @@
 package cn.com.taiji.userw.dto.rbac;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.userw.dto.AbstractBizPageRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizPageRequestDTO;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.util.StringUtils;
@@ -12,7 +12,7 @@ import org.springframework.util.StringUtils;
  **/
 @Getter
 @Setter
-public class GetAccountInfoByRolePageRequestDTO extends AbstractBizPageRequestDTO {
+public class GetAccountInfoByRolePageRequestDTO extends AbstractStaffBizPageRequestDTO {
 
     /**
      * 角色id

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacMenuListBySystemTypeRequestDTO.java

@@ -1,15 +1,15 @@
 package cn.com.taiji.userw.dto.rbac;
 
 import cn.com.taiji.common.manager.ManagerException;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import cn.com.taiji.core.entity.dict.user.SystemType;
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
 import cn.hutool.core.collection.CollectionUtil;
 import com.google.common.collect.Lists;
 
 import java.util.ArrayList;
 
 
-public class RbacMenuListBySystemTypeRequestDTO extends AbstractBizRequestDTO {
+public class RbacMenuListBySystemTypeRequestDTO extends AbstractStaffBizRequestDTO {
 
     /**
      * 角色归属那个系统

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRoleAddRequestDTO.java

@@ -1,10 +1,10 @@
 package cn.com.taiji.userw.dto.rbac;
 
 import cn.com.taiji.common.manager.ManagerException;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import cn.com.taiji.core.entity.dict.user.RbacSource;
 import cn.com.taiji.core.entity.dict.user.RbacStatus;
 import cn.com.taiji.core.entity.dict.user.SystemType;
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
 import cn.com.taiji.userw.model.rbac.SetMenuModel;
 import cn.hutool.core.collection.CollectionUtil;
 import com.google.common.collect.Lists;
@@ -15,7 +15,7 @@ import java.util.ArrayList;
 
 @Getter
 @Setter
-public class RbacRoleAddRequestDTO extends AbstractBizRequestDTO {
+public class RbacRoleAddRequestDTO extends AbstractStaffBizRequestDTO {
 
     /**
      * 角色名

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRoleChangeRequestDTO.java

@@ -1,11 +1,11 @@
 package cn.com.taiji.userw.dto.rbac;
 
 import cn.com.taiji.common.manager.ManagerException;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import cn.com.taiji.core.entity.dict.basic.SourceType;
 import cn.com.taiji.core.entity.dict.user.RbacSource;
 import cn.com.taiji.core.entity.dict.user.RbacStatus;
 import cn.com.taiji.core.entity.dict.user.SystemType;
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
 import cn.com.taiji.userw.model.rbac.SetMenuModel;
 import cn.hutool.core.collection.CollectionUtil;
 import com.google.common.collect.Lists;
@@ -16,7 +16,7 @@ import java.util.ArrayList;
 
 @Getter
 @Setter
-public class RbacRoleChangeRequestDTO extends AbstractBizRequestDTO {
+public class RbacRoleChangeRequestDTO extends AbstractStaffBizRequestDTO {
 
     /**
      * 角色id

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRoleDeleteRequestDTO.java

@@ -1,8 +1,7 @@
 package cn.com.taiji.userw.dto.rbac;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.core.entity.dict.basic.SourceType;
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import cn.hutool.core.collection.CollectionUtil;
 import com.google.common.collect.Lists;
 import lombok.Getter;
@@ -12,7 +11,7 @@ import java.util.ArrayList;
 
 @Getter
 @Setter
-public class RbacRoleDeleteRequestDTO extends AbstractBizRequestDTO {
+public class RbacRoleDeleteRequestDTO extends AbstractStaffBizRequestDTO {
 
     /**角色id*/
     private String id;

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRoleDisableRequestDTO.java

@@ -1,7 +1,6 @@
 package cn.com.taiji.userw.dto.rbac;
 
-import cn.com.taiji.core.entity.dict.basic.SourceType;
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import cn.com.taiji.userw.model.FormatException;
 import cn.hutool.core.collection.CollectionUtil;
 import com.google.common.collect.Lists;
@@ -12,7 +11,7 @@ import java.util.ArrayList;
 
 @Setter
 @Getter
-public class RbacRoleDisableRequestDTO extends AbstractBizRequestDTO {
+public class RbacRoleDisableRequestDTO extends AbstractStaffBizRequestDTO {
     /**角色id*/
     private String id;
 

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRoleEnableRequestDTO.java

@@ -1,8 +1,7 @@
 package cn.com.taiji.userw.dto.rbac;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.core.entity.dict.basic.SourceType;
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import cn.hutool.core.collection.CollectionUtil;
 import com.google.common.collect.Lists;
 import lombok.Getter;
@@ -12,7 +11,7 @@ import java.util.ArrayList;
 
 @Getter
 @Setter
-public class RbacRoleEnableRequestDTO extends AbstractBizRequestDTO {
+public class RbacRoleEnableRequestDTO extends AbstractStaffBizRequestDTO {
 
     /**角色id*/
     private String id;

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRoleListByMiniProgramRequestDTO.java

@@ -1,12 +1,9 @@
 package cn.com.taiji.userw.dto.rbac;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.core.entity.dict.basic.SourceType;
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import cn.hutool.core.collection.CollectionUtil;
 import com.google.common.collect.Lists;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.util.List;
 
@@ -14,7 +11,7 @@ import java.util.List;
  * 获取小程序系统对应所有的角色
  *
  */
-public class RbacRoleListByMiniProgramRequestDTO extends AbstractBizRequestDTO {
+public class RbacRoleListByMiniProgramRequestDTO extends AbstractStaffBizRequestDTO {
 
     public RbacRoleListByMiniProgramRequestDTO valid() throws ManagerException {
         final List<String> failParamInfo = Lists.newArrayList();

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRolePageRequestDTO.java

@@ -1,16 +1,16 @@
 package cn.com.taiji.userw.dto.rbac;
 
 import cn.com.taiji.common.manager.ManagerException;
+import cn.com.taiji.core.dto.AbstractStaffBizPageRequestDTO;
 import cn.com.taiji.core.entity.dict.user.RbacSource;
 import cn.com.taiji.core.entity.dict.user.RbacStatus;
 import cn.com.taiji.core.entity.dict.user.SystemType;
-import cn.com.taiji.userw.dto.AbstractBizPageRequestDTO;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class RbacRolePageRequestDTO extends AbstractBizPageRequestDTO {
+public class RbacRolePageRequestDTO extends AbstractStaffBizPageRequestDTO {
 
     /**
      * 角色名

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRoleQueryRequestDTO.java

@@ -1,7 +1,7 @@
 package cn.com.taiji.userw.dto.rbac;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import cn.hutool.core.collection.CollectionUtil;
 import com.google.common.collect.Lists;
 import lombok.Getter;
@@ -11,7 +11,7 @@ import java.util.ArrayList;
 
 @Getter
 @Setter
-public class RbacRoleQueryRequestDTO extends AbstractBizRequestDTO {
+public class RbacRoleQueryRequestDTO extends AbstractStaffBizRequestDTO {
 
     /**角色id*/
     private String id;

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacSystemTypeByOpenIdRequestDTO.java

@@ -1,6 +1,6 @@
 package cn.com.taiji.userw.dto.rbac;
 
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -8,7 +8,7 @@ import lombok.experimental.Accessors;
 @Getter
 @Setter
 @Accessors(chain = true)
-public class RbacSystemTypeByOpenIdRequestDTO extends AbstractBizRequestDTO {
+public class RbacSystemTypeByOpenIdRequestDTO extends AbstractStaffBizRequestDTO {
 
 
 }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/serviceHall/ServiceHallAddOneRequestDTO.java

@@ -1,8 +1,8 @@
 package cn.com.taiji.userw.dto.serviceHall;
 
 import cn.com.taiji.common.valid.ViolationValidator;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import cn.com.taiji.core.model.comm.protocol.constraint.FixedLength;
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
 import cn.com.taiji.userw.model.serviceHall.ServiceHallLocationModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -15,7 +15,7 @@ import java.util.List;
 
 @ApiModel(description = "新增一级网点请求参数")
 @Data
-public class ServiceHallAddOneRequestDTO extends AbstractBizRequestDTO {
+public class ServiceHallAddOneRequestDTO extends AbstractStaffBizRequestDTO {
 
     @FixedLength(length = 19, message = "上级网点编号必须是19位")
     @ApiModelProperty(value = "上级网点编号")

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/serviceHall/ServiceHallDeleteRequestDTO.java

@@ -1,13 +1,13 @@
 package cn.com.taiji.userw.dto.serviceHall;
 
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 
 @Data
-public class ServiceHallDeleteRequestDTO extends AbstractBizRequestDTO {
+public class ServiceHallDeleteRequestDTO extends AbstractStaffBizRequestDTO {
 
     @NotBlank(message = "网点编号不能为空")
     @ApiModelProperty(value = "网点编号")

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/serviceHall/ServiceHallGetIdRequestDTO.java

@@ -1,7 +1,6 @@
 package cn.com.taiji.userw.dto.serviceHall;
 
-import cn.com.taiji.common.valid.ViolationValidator;
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,7 +9,7 @@ import javax.validation.constraints.NotBlank;
 
 @ApiModel("获取网点编号请求")
 @Data
-public class ServiceHallGetIdRequestDTO extends AbstractBizRequestDTO {
+public class ServiceHallGetIdRequestDTO extends AbstractStaffBizRequestDTO {
 
 
     @NotBlank

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/serviceHall/ServiceHallPageRequestDTO.java

@@ -1,7 +1,7 @@
 package cn.com.taiji.userw.dto.serviceHall;
 
 
-import cn.com.taiji.userw.dto.AbstractBizPageRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizPageRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull;
 
 @ApiModel(description = "网点查询请求参数")
 @Data
-public class ServiceHallPageRequestDTO extends AbstractBizPageRequestDTO {
+public class ServiceHallPageRequestDTO extends AbstractStaffBizPageRequestDTO {
 
     @ApiModelProperty(value = "网点名称")
     private String name;//网点名称

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/serviceHall/ServiceHallRegisterFullBatchRequestDTO.java

@@ -1,6 +1,6 @@
 package cn.com.taiji.userw.dto.serviceHall;
 
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -12,7 +12,7 @@ import javax.validation.constraints.NotBlank;
  * @date Created in  2025/03/27 11:58
  */
 @Data
-public class ServiceHallRegisterFullBatchRequestDTO extends AbstractBizRequestDTO {
+public class ServiceHallRegisterFullBatchRequestDTO extends AbstractStaffBizRequestDTO {
     /**
      * excel文件的url下载地址 后缀
      */

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/serviceHall/ServiceHallSonQueryRequestDTO.java

@@ -1,13 +1,10 @@
 package cn.com.taiji.userw.dto.serviceHall;
 
-import cn.com.taiji.common.pub.StringTools;
-import cn.com.taiji.common.valid.BaseValidDTO;
-import cn.com.taiji.common.valid.ViolationValidator;
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import lombok.Data;
 
 
 @Data
-public class ServiceHallSonQueryRequestDTO extends AbstractBizRequestDTO {
+public class ServiceHallSonQueryRequestDTO extends AbstractStaffBizRequestDTO {
 //    private String servicehallId;
 }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/serviceHall/ServiceHallUpdateRequestDTO.java

@@ -1,8 +1,8 @@
 package cn.com.taiji.userw.dto.serviceHall;
 
 import cn.com.taiji.common.valid.ViolationValidator;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import cn.com.taiji.core.model.comm.protocol.constraint.FixedLength;
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
 import cn.com.taiji.userw.model.serviceHall.ServiceHallLocationModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,7 +12,7 @@ import javax.validation.constraints.NotNull;
 import java.util.List;
 
 @Data
-public class ServiceHallUpdateRequestDTO extends AbstractBizRequestDTO {
+public class ServiceHallUpdateRequestDTO extends AbstractStaffBizRequestDTO {
 
     @NotBlank
     @ApiModelProperty(value = "网点ID")

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/wx/WxCarAddReqDTO.java

@@ -1,6 +1,6 @@
 package cn.com.taiji.userw.dto.wx;
 
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,7 +14,7 @@ import javax.validation.constraints.NotBlank;
  */
 @Data
 @ApiModel(description = "车主签约新增")
-public class WxCarAddReqDTO extends AbstractBizRequestDTO {
+public class WxCarAddReqDTO extends AbstractStaffBizRequestDTO {
 
     @NotBlank
     @ApiModelProperty(value = "渠道编号")

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/wx/WxCarPageRequestDTO.java

@@ -1,6 +1,6 @@
 package cn.com.taiji.userw.dto.wx;
 
-import cn.com.taiji.userw.dto.AbstractBizPageRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizPageRequestDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -11,7 +11,7 @@ import lombok.Data;
  * @description:
  */
 @Data
-public class WxCarPageRequestDTO extends AbstractBizPageRequestDTO {
+public class WxCarPageRequestDTO extends AbstractStaffBizPageRequestDTO {
 
     @ApiModelProperty(value = "渠道编号")
     private String agencyId;

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/wx/WxCarUpdateReqDTO.java

@@ -1,6 +1,6 @@
 package cn.com.taiji.userw.dto.wx;
 
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,7 +15,7 @@ import javax.validation.constraints.NotBlank;
  */
 @Data
 @ApiModel(description = "车主签约修改")
-public class WxCarUpdateReqDTO extends AbstractBizRequestDTO {
+public class WxCarUpdateReqDTO extends AbstractStaffBizRequestDTO {
 
     @NotBlank
     @ApiModelProperty(value = "主键Id")

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/wx/WxPayAddReqDTO.java

@@ -1,15 +1,14 @@
 package cn.com.taiji.userw.dto.wx;
 
 import cn.com.taiji.common.valid.ViolationValidator;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import cn.com.taiji.core.entity.dict.pay.PayChannelType;
 import cn.com.taiji.core.model.comm.protocol.constraint.IntegerConstant;
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
 
 /**
  * @Author：ChenChao
@@ -19,7 +18,7 @@ import java.math.BigDecimal;
  */
 @Data
 @ApiModel(description = "车主配置新增")
-public class WxPayAddReqDTO extends AbstractBizRequestDTO {
+public class WxPayAddReqDTO extends AbstractStaffBizRequestDTO {
 
     @ApiModelProperty(value = "app名称")
     @NotBlank

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/wx/WxPayPageRequestDTO.java

@@ -1,6 +1,6 @@
 package cn.com.taiji.userw.dto.wx;
 
-import cn.com.taiji.userw.dto.AbstractBizPageRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizPageRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,7 +13,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel(description ="支付配置分页查询")
-public class WxPayPageRequestDTO extends AbstractBizPageRequestDTO {
+public class WxPayPageRequestDTO extends AbstractStaffBizPageRequestDTO {
 
     @ApiModelProperty(value = "渠道编号")
     private String agencyId;

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/wx/WxPayUpdateReqDTO.java

@@ -1,9 +1,9 @@
 package cn.com.taiji.userw.dto.wx;
 
 import cn.com.taiji.common.valid.ViolationValidator;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import cn.com.taiji.core.entity.dict.pay.PayChannelType;
 import cn.com.taiji.core.model.comm.protocol.constraint.IntegerConstant;
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,7 +19,7 @@ import javax.validation.constraints.NotNull;
  */
 @Data
 @ApiModel(description = "车主配置修改")
-public class WxPayUpdateReqDTO extends AbstractBizRequestDTO {
+public class WxPayUpdateReqDTO extends AbstractStaffBizRequestDTO {
 
     @NotBlank
     @ApiModelProperty(value = "主键id")

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/model/protocol/dict/DictItemAddRequest.java

@@ -1,8 +1,6 @@
 package cn.com.taiji.userw.model.protocol.dict;
 
-import cn.com.taiji.common.pub.StringTools;
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
-import cn.com.taiji.userw.model.FormatException;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -15,7 +13,7 @@ import javax.validation.constraints.NotNull;
  */
 @Getter
 @Setter
-public class DictItemAddRequest extends AbstractBizRequestDTO {
+public class DictItemAddRequest extends AbstractStaffBizRequestDTO {
     @ApiModelProperty(value = "字典类型id",required = true)
     @NotBlank
     private String typeId;

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/model/protocol/dict/DictItemDeleteRequest.java

@@ -1,6 +1,6 @@
 package cn.com.taiji.userw.model.protocol.dict;
 
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -8,7 +8,7 @@ import lombok.Setter;
 
 @Getter
 @Setter
-public class DictItemDeleteRequest extends AbstractBizRequestDTO {
+public class DictItemDeleteRequest extends AbstractStaffBizRequestDTO {
 
     @ApiModelProperty(value = "字典项目id")
     private String dictItemId;

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/model/protocol/dict/DictItemGetAllRequest.java

@@ -1,12 +1,12 @@
 package cn.com.taiji.userw.model.protocol.dict;
 
 
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class DictItemGetAllRequest extends AbstractBizRequestDTO {
+public class DictItemGetAllRequest extends AbstractStaffBizRequestDTO {
 
 }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/model/protocol/dict/DictItemQueryListRequest.java

@@ -1,7 +1,7 @@
 package cn.com.taiji.userw.model.protocol.dict;
 
 
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -10,7 +10,7 @@ import javax.validation.constraints.NotBlank;
 
 @Getter
 @Setter
-public class DictItemQueryListRequest extends AbstractBizRequestDTO {
+public class DictItemQueryListRequest extends AbstractStaffBizRequestDTO {
     @ApiModelProperty(value = "字典项目id",required = true)
     @NotBlank
     private String typeId;

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/model/protocol/dict/DictItemQueryRequest.java

@@ -1,13 +1,13 @@
 package cn.com.taiji.userw.model.protocol.dict;
 
 
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class DictItemQueryRequest extends AbstractBizRequestDTO {
+public class DictItemQueryRequest extends AbstractStaffBizRequestDTO {
 
     private String dictTypeId;
 

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/model/protocol/dict/DictItemUpdateRequest.java

@@ -1,7 +1,7 @@
 package cn.com.taiji.userw.model.protocol.dict;
 
 
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -11,7 +11,7 @@ import javax.validation.constraints.NotNull;
 
 @Getter
 @Setter
-public class DictItemUpdateRequest extends AbstractBizRequestDTO {
+public class DictItemUpdateRequest extends AbstractStaffBizRequestDTO {
     @ApiModelProperty(value = "字典项目id",required = true)
     @NotBlank
     private String typeId;

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/model/protocol/dict/DictTypeAddRequest.java

@@ -2,14 +2,14 @@ package cn.com.taiji.userw.model.protocol.dict;
 
 import javax.validation.constraints.NotBlank;
 
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class DictTypeAddRequest extends AbstractBizRequestDTO {
+public class DictTypeAddRequest extends AbstractStaffBizRequestDTO {
     @ApiModelProperty(value = "字典类型编码",required = true)
     @NotBlank
     private String code;

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/model/protocol/dict/DictTypeDeleteRequest.java

@@ -1,7 +1,6 @@
 package cn.com.taiji.userw.model.protocol.dict;
 
-import cn.com.taiji.common.manager.net.http.ServiceHandleException;
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -10,7 +9,7 @@ import javax.validation.constraints.NotBlank;
 
 @Getter
 @Setter
-public class DictTypeDeleteRequest extends AbstractBizRequestDTO {
+public class DictTypeDeleteRequest extends AbstractStaffBizRequestDTO {
     @ApiModelProperty(value = "字典类型id",required = true)
     @NotBlank
     private String typeId;

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/model/protocol/dict/DictTypeQueryRequest.java

@@ -1,17 +1,16 @@
 package cn.com.taiji.userw.model.protocol.dict;
 
 
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
 
 
 @Getter
 @Setter
-public class DictTypeQueryRequest extends AbstractBizRequestDTO {
+public class DictTypeQueryRequest extends AbstractStaffBizRequestDTO {
 
     @ApiModelProperty(value = "字典类型编码",required = true)
     private String code;

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/model/protocol/dict/DictTypeUpdateRequest.java

@@ -1,7 +1,7 @@
 package cn.com.taiji.userw.model.protocol.dict;
 
 
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -10,7 +10,7 @@ import javax.validation.constraints.NotBlank;
 
 @Getter
 @Setter
-public class DictTypeUpdateRequest extends AbstractBizRequestDTO {
+public class DictTypeUpdateRequest extends AbstractStaffBizRequestDTO {
     @ApiModelProperty(value = "字典类型id",required = true)
     @NotBlank
     private String typeId;

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/model/protocol/dict/DictTypeViewRequest.java

@@ -2,14 +2,14 @@ package cn.com.taiji.userw.model.protocol.dict;
 
 import javax.validation.constraints.NotBlank;
 
-import cn.com.taiji.userw.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class DictTypeViewRequest extends AbstractBizRequestDTO {
+public class DictTypeViewRequest extends AbstractStaffBizRequestDTO {
     @ApiModelProperty(value = "字典类型id",required = true)
     @NotBlank
     private String typeId;