调整

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

 import cn.com.taiji.core.repo.jpa.comm.OcrResultRepo;
 import cn.com.taiji.core.repo.jpa.log.OperateLogRepo;
 import cn.com.taiji.core.repo.jpa.user.AccountInfoRepo;
+import cn.com.taiji.core.repo.jpa.user.StaffRepo;
 import cn.com.taiji.iaw.model.MyFinals;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.context.request.RequestContextHolder;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 
 public abstract class AbstractIawManager extends AbstractCommManager {
 
     @Autowired
     protected MinioUtil minioUtil;
 
-    protected Boolean isManager(String identityType, String agencyId) throws ManagerException {
+    protected Boolean isManager(String identityType, String agencyId) {
         if ("MANAGER".equals(identityType) || MyFinals.QTZL_AGENCY_ID.equals(agencyId)){
             return true;
         }

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

 import cn.com.taiji.core.repo.jpa.ass.AssOrderinfoRepo;
 import cn.com.taiji.core.repo.jpa.issue.IssueProductPromotionRepo;
 import cn.com.taiji.core.repo.jpa.issue.IssueProductRepo;
+import cn.com.taiji.core.repo.jpa.user.StaffRepo;
 import cn.com.taiji.core.repo.request.ass.AssOrderinfoPageRequest;
 import cn.com.taiji.iaw.dto.CommRequestDTO;
 import cn.com.taiji.iaw.dto.ass.AssOrderinfoPageRequestDTO;
     private IssueProductPromotionRepo issueProductPromotionRepo;
     @Autowired
     private IssueProductRepo issueProductRepo;
+    @Autowired
+    private StaffRepo staffRepo;
 
 
     @Override

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

     private AssAgencyConfigRepo assAgencyConfigRepo;
     @Autowired
     private AssDeviceUpgradeRepo assDeviceUpgradeRepo;
+    @Autowired
+    private StaffRepo staffRepo;
 
 
     @Override

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

  */
 public interface SatisfactionManager {
 
-    Pagination page(SatisfactionPageRequestDTO dto) throws ServiceHandleException;
+    Pagination page(SatisfactionPageRequestDTO dto) throws ManagerException;
 
     SatisfactionInfoResponseDTO view(SatisfactionInfoRequestDTO dto) throws ManagerException;
 

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

 import cn.com.taiji.core.repo.request.operation.SatisfactionPageRequest;
 import cn.com.taiji.iaw.dto.comm.*;
 import cn.com.taiji.iaw.manager.AbstractCommManager;
+import cn.com.taiji.iaw.manager.AbstractIawManager;
 import cn.com.taiji.iaw.model.MyFinals;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
  * @version: 1.0
  */
 @Service
-public class SatisfactionManagerImpl extends AbstractCommManager implements SatisfactionManager{
+public class SatisfactionManagerImpl extends AbstractIawManager implements SatisfactionManager{
 
     @Autowired
     private SatisfactionRepo repo;
     private StaffRepo staffRepo;
 
     @Override
-    public Pagination page(SatisfactionPageRequestDTO reqDto) throws ServiceHandleException {
+    public Pagination page(SatisfactionPageRequestDTO reqDto) throws ManagerException {
         SatisfactionPageRequest pageRequest = new SatisfactionPageRequest();
         BeanTools.copyProperties(reqDto, pageRequest);
         if (SourceType.SERVICE_HALL.equals(reqDto.getOrderSource())){
             Staff staff = staffRepo.findByOpenId(findOpenIdByToken(reqDto.getAccessToken()));
             if (staff != null){
                 pageRequest.setAgencyId(staff.getAgencyId());
-                if ("MANAGER".equals(staff.getIdentityType()) || MyFinals.QTZL_AGENCY_ID.equals(findAgencyIdByToken(reqDto.getAccessToken()))){
+                if (isManager(staff.getIdentityType(), staff.getAgencyId())){
                     pageRequest.setAgencyId(null);
                 }
             }

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

             if (staff == null){
                 throw new ManagerException("为获取到当前员工账号！");
             }
-            if ("MANAGER".equals(staff.getIdentityType()) || MyFinals.QTZL_AGENCY_ID.equals(staff.getAgencyId())){
+            if (isManager(staff.getIdentityType(), staff.getAgencyId())){
                 cardInfos = cardInfoRepo.listByVehicleId(dto.getVehicleId());
                 obuInfos = obuInfoRepo.listByVehicleId(dto.getVehicleId());
             }else {
             if (staff == null){
                 throw new ManagerException("为获取到当前员工账号！");
             }
-            if ("MANAGER".equals(staff.getIdentityType()) || MyFinals.QTZL_AGENCY_ID.equals(staff.getAgencyId())){
+            if (isManager(staff.getIdentityType(), staff.getAgencyId())){
                 cardInfos = cardInfoRepo.listByVehicleId(dto.getVehicleId());
             }else {
                 cardInfos = cardInfoRepo.listByAgencyIdAndVehicleId(findAgencyIdByToken(dto.getAccessToken()),dto.getVehicleId());

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/AbstractInvwManager.java

     @Autowired
     private AccountInfoRepo accountInfoRepo;
 
-    protected Boolean isManager(String identityType, String agencyId) throws ManagerException {
+    protected Boolean isManager(String identityType, String agencyId) {
         if ("MANAGER".equals(identityType) || MyFinals.QTZL_AGENCY_ID.equals(agencyId)){
             return true;
         }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/card/InvwCardDetailsManagerImpl.java

         Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
         if (ObjectUtils.isNotEmpty(staff)){
             pageRequest.setAgencyId(staff.getAgencyId());
-            if ("MANAGER".equals(staff.getIdentityType()) || MyFinals.QTZL_AGENCY_ID.equals(findAgencyIdByToken(dto.getAccessToken()))){
+            if (isManager(staff.getIdentityType(), staff.getAgencyId())){
                 pageRequest.setAgencyId(null);
             }
         }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/enter/InvwEnterApplyManager.java

  */
 public interface InvwEnterApplyManager {
 
-    Pagination page(InvwEnterApplyPageRequestDTO req) throws ServiceHandleException;
+    Pagination page(InvwEnterApplyPageRequestDTO req) throws ManagerException;
 
     InvwEnterApplyAddResponseDTO apply(InvwEnterApplyAddRequestDTO dto) throws ManagerException;
 

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/enter/InvwEnterApplyManagerImpl.java

 
 
     @Override
-    public Pagination page(InvwEnterApplyPageRequestDTO req) throws ServiceHandleException {
+    public Pagination page(InvwEnterApplyPageRequestDTO req) throws ManagerException {
         InvwEnterApplyPageRequest pageRequest = copyProperties(req, new InvwEnterApplyPageRequest());
         Staff staff = staffRepo.findByOpenId(findOpenIdByToken(req.getAccessToken()));
         if (ObjectUtils.isNotEmpty(staff)){
             pageRequest.setAgencyId(staff.getAgencyId());
-            if ("MANAGER".equals(staff.getIdentityType()) || MyFinals.QTZL_AGENCY_ID.equals(findAgencyIdByToken(req.getAccessToken()))){
+            if (isManager(staff.getIdentityType(), staff.getAgencyId())){
                 pageRequest.setAgencyId(null);
             }
         }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/obu/InvwObuDetailsManager.java

  */
 public interface InvwObuDetailsManager {
 
-    Pagination page(InvwObuDetailsPageRequestDTO dto) throws ServiceHandleException;
+    Pagination page(InvwObuDetailsPageRequestDTO dto) throws ManagerException;
 
     InvwObuDetailsRemoveResponseDTO remove(InvwObuDetailsRemoveRequestDTO dto) throws ManagerException;
 

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/obu/InvwObuDetailsManagerImpl.java

 
 
     @Override
-    public Pagination page(InvwObuDetailsPageRequestDTO dto) throws ServiceHandleException {
+    public Pagination page(InvwObuDetailsPageRequestDTO dto) throws ManagerException {
         InvwObuDetailsPageRequest pageRequest = copyProperties(dto, new InvwObuDetailsPageRequest());
         Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
         if (ObjectUtils.isNotEmpty(staff)){
             pageRequest.setAgencyId(staff.getAgencyId());
-            if ("MANAGER".equals(staff.getIdentityType()) || MyFinals.QTZL_AGENCY_ID.equals(staff.getAgencyId())){
+            if (isManager(staff.getIdentityType(), staff.getAgencyId())){
                 pageRequest.setAgencyId(null);
             }
         }
         Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
         if (ObjectUtils.isNotEmpty(staff)){
             pageRequest.setAgencyId(staff.getAgencyId());
-            if ("MANAGER".equals(staff.getIdentityType()) || MyFinals.QTZL_AGENCY_ID.equals(findAgencyIdByToken(dto.getAccessToken()))){
+            if (isManager(staff.getIdentityType(), staff.getAgencyId())){
                 pageRequest.setAgencyId(null);
             }
         }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/warehouse/InvwWarehouseManagerImpl.java

         // 如果不是管理员，已及非黔通的只能查询本渠道的仓库
         if (ObjectUtils.isNotEmpty(staff)){
             req.setAgencyId(staff.getAgencyId());
-            if ("MANAGER".equals(staff.getIdentityType()) || MyFinals.QTZL_AGENCY_ID.equals(staff.getAgencyId())){
+            if (isManager(staff.getIdentityType(), staff.getAgencyId())){
                 req.setAgencyId(null);
             }
         }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/api/issueOrder/IssueOrderRefundController.java

 
     @ApiOperation(value = "退费分页查询")
     @PostMapping("/page")
-    public ApiResponse<Pagination> page(@Valid @RequestBody IssueOrderRefundPageRequestDTO dto) throws ServiceHandleException {
+    public ApiResponse<Pagination> page(@Valid @RequestBody IssueOrderRefundPageRequestDTO dto) throws ManagerException {
         return ApiResponse.of(manager.page(dto));
     }
 
     @ApiOperation(value = "退费确认管理-查看")
     @PostMapping("/view")
-    public ApiResponse<IssueOrderRefundViewResponseDTO> view(@Valid @RequestBody IssueOrderRefundViewRequestDTO dto) throws ServiceHandleException {
+    public ApiResponse<IssueOrderRefundViewResponseDTO> view(@Valid @RequestBody IssueOrderRefundViewRequestDTO dto) throws ManagerException {
         return ApiResponse.of(manager.view(dto));
     }
 

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/AbstractManagewManager.java

     @Autowired
     protected IssueOrderinfoRepo issueOrderinfoRepo;
 
-    protected Boolean isManager(String identityType, String agencyId) throws ManagerException {
+    protected Boolean isManager(String identityType, String agencyId) {
         if ("MANAGER".equals(identityType) || MyFinals.QTZL_AGENCY_ID.equals(agencyId)){
             return true;
         }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/AssOrderinfoManagerImpl.java

             throw new ManagerException("为获取到当前员工账号！");
         }
         pageRequest.setAgencyId(staff.getAgencyId());
-        if ("MANAGER".equals(staff.getIdentityType()) || MyFinals.QTZL_AGENCY_ID.equals(staff.getAgencyId())){
+        if (isManager(staff.getIdentityType(), staff.getAgencyId())){
             pageRequest.setAgencyId(null);
         }
         return repo.page(pageRequest).convertResult(this::toModel);

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/AssRefundApplyInfoManagerImpl.java

             throw new ManagerException("为获取到当前员工账号！");
         }
         pageRequest.setAgencyId(staff.getAgencyId());
-        if ("MANAGER".equals(staff.getIdentityType()) || MyFinals.QTZL_AGENCY_ID.equals(staff.getAgencyId())){
+        if (isManager(staff.getIdentityType(), staff.getAgencyId())){
             pageRequest.setAgencyId(null);
         }
         return refundApplyInfoRepo.page(pageRequest);

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/issueOrder/IssueOrderRefundManager.java

  */
 public interface IssueOrderRefundManager {
 
-    Pagination page(IssueOrderRefundPageRequestDTO dto) throws ServiceHandleException;
+    Pagination page(IssueOrderRefundPageRequestDTO dto) throws ManagerException;
 
     IssueOrderRefundViewResponseDTO view(IssueOrderRefundViewRequestDTO dto);
 

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/issueOrder/IssueOrderRefundManagerImpl.java

 
 
     @Override
-    public Pagination page(IssueOrderRefundPageRequestDTO dto) throws ServiceHandleException {
+    public Pagination page(IssueOrderRefundPageRequestDTO dto) throws ManagerException {
         IssueOrderRefundPageRequest pageRequest = copyProperties(dto, new IssueOrderRefundPageRequest());
         pageRequest.setSettlew(false);
         Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
         if (ObjectUtils.isNotEmpty(staff)){
             pageRequest.setAgencyId(staff.getAgencyId());
-            if ("MANAGER".equals(staff.getIdentityType()) || MyFinals.QTZL_AGENCY_ID.equals(findAgencyIdByToken(dto.getAccessToken()))){
+            if (isManager(staff.getIdentityType(), staff.getAgencyId())){
                 pageRequest.setAgencyId(null);
             }
         }
         Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
         if (ObjectUtils.isNotEmpty(staff)){
             pageRequest.setAgencyId(staff.getAgencyId());
-            if ("MANAGER".equals(staff.getIdentityType()) || MyFinals.QTZL_AGENCY_ID.equals(findAgencyIdByToken(dto.getAccessToken()))){
+            if (isManager(staff.getIdentityType(), staff.getAgencyId())){
                 pageRequest.setAgencyId(null);
             }
         }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/operation/SatisfactionManager.java

  */
 public interface SatisfactionManager {
     
-    Pagination page(SatisfactionPageRequestDTO dto) throws ServiceHandleException;
+    Pagination page(SatisfactionPageRequestDTO dto) throws ManagerException;
 
     SatisfactionInfoResponseDTO view(SatisfactionInfoRequestDTO dto) throws ManagerException;
 }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/operation/SatisfactionManagerImpl.java

 import cn.com.taiji.managew.dto.operation.satisfactiono.SatisfactionInfoResponseDTO;
 import cn.com.taiji.managew.dto.operation.satisfactiono.SatisfactionPageRequestDTO;
 import cn.com.taiji.managew.manager.AbstractCommManager;
+import cn.com.taiji.managew.manager.AbstractManagewManager;
 import cn.com.taiji.managew.model.MyFinals;
+import org.apache.catalina.Manager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
  * @version: 1.0
  */
 @Service
-public class SatisfactionManagerImpl extends AbstractCommManager implements SatisfactionManager {
+public class SatisfactionManagerImpl extends AbstractManagewManager implements SatisfactionManager {
 
     @Autowired
     private SatisfactionRepo repo;
     private StaffRepo staffRepo;
 
     @Override
-    public Pagination page(SatisfactionPageRequestDTO dto) throws ServiceHandleException {
+    public Pagination page(SatisfactionPageRequestDTO dto) throws ManagerException {
         SatisfactionPageRequest pageRequest = new SatisfactionPageRequest();
         BeanTools.copyProperties(dto, pageRequest);
         // 判断入口路径，微信端只查自己的openId
         Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
         if (staff != null){
             pageRequest.setAgencyId(staff.getAgencyId());
-            if ("MANAGER".equals(staff.getIdentityType()) || MyFinals.QTZL_AGENCY_ID.equals(findAgencyIdByToken(dto.getAccessToken()))){
+            if (isManager(staff.getIdentityType(), staff.getAgencyId())){
                 pageRequest.setAgencyId(null);
             }
         }

zhywpt-app-settlew/src/main/java/cn/com/taiji/settlew/manager/AbstractSettlewManager.java

 package cn.com.taiji.settlew.manager;
 
+import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.pub.IPTools;
 import cn.com.taiji.common.pub.TimeTools;
 import cn.com.taiji.core.entity.dict.basic.SourceType;
 import cn.com.taiji.core.entity.user.AccountInfo;
 import cn.com.taiji.core.repo.jpa.log.OperateLogRepo;
 import cn.com.taiji.core.repo.jpa.user.AccountInfoRepo;
+import cn.com.taiji.settlew.model.MyFinals;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
     @Autowired
     private AccountInfoRepo accountInfoRepo;
 
+    protected Boolean isManager(String identityType, String agencyId){
+        if ("MANAGER".equals(identityType) || MyFinals.QTZL_AGENCY_ID.equals(agencyId)){
+            return true;
+        }
+        return false;
+    }
+
     //    操作日志记录
     protected void persistOperateLog(OperateType operateType, String operatorDataId, SourceType source,
                                   String openId, String msg) {

zhywpt-app-settlew/src/main/java/cn/com/taiji/settlew/manager/issueOrder/IssueOrderRefundManagerImpl.java

         Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
         if (ObjectUtils.isNotEmpty(staff)){
             pageRequest.setAgencyId(staff.getAgencyId());
-            if ("MANAGER".equals(staff.getIdentityType()) || MyFinals.QTZL_AGENCY_ID.equals(findAgencyIdByToken(dto.getAccessToken()))){
+            if (isManager(staff.getIdentityType(), staff.getAgencyId())){
                 pageRequest.setAgencyId(null);
             }
         }
         Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
         if (ObjectUtils.isNotEmpty(staff)){
             pageRequest.setAgencyId(staff.getAgencyId());
-            if ("MANAGER".equals(staff.getIdentityType()) || MyFinals.QTZL_AGENCY_ID.equals(findAgencyIdByToken(dto.getAccessToken()))){
+            if (isManager(staff.getIdentityType(), staff.getAgencyId())){
                 pageRequest.setAgencyId(null);
             }
         }