Merge branch 'v1' of http://git.quantgroup.cn/QG/cash-loan-flow-boss into v1

src/main/java/cn/quantgroup/cashloanflowboss/api/channel/repository/clf/ChannelConfigurationRepository.java

@@ -2,21 +2,11 @@ package cn.quantgroup.cashloanflowboss.api.channel.repository.clf;
 
 
 import cn.quantgroup.cashloanflowboss.api.channel.entity.clf.ChannelConfiguration;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface ChannelConfigurationRepository extends PagingAndSortingRepository<ChannelConfiguration, String> {
-    /**
-     * 获取用户列表（分页）
-     *
-     * @param pageable 分页
-     * @return
-     */
-    Page<ChannelConfiguration> findAllBy(Pageable pageable);
-
-    ChannelConfiguration findByRegisteredFrom(Integer channelId);
+public interface ChannelConfigurationRepository extends PagingAndSortingRepository<ChannelConfiguration, Long>, JpaSpecificationExecutor<ChannelConfiguration> {
 
 }

src/main/java/cn/quantgroup/cashloanflowboss/api/channel/service/ChannelConfService.java

@@ -12,6 +12,11 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 
+import javax.persistence.criteria.Predicate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
 /**
  * function:
  * date: 2019/8/2
@@ -31,13 +36,25 @@ public class ChannelConfService {
 
 
     public Page<ChannelConfiguration> getChannelInfo(Pagination pagination, Integer channelId) {
-        if (channelId == null) {
-            return clfChannelConfigurationRepository.findAllBy(new PageRequest(pagination.getPageNumber(), pagination.getPageSize()));
-        } else {
-            ChannelConfiguration channelConfiguration = clfChannelConfigurationRepository.findByRegisteredFrom(channelId);
-            Page<ChannelConfiguration> result = null;
-            return null;
+
+        Page<ChannelConfiguration> page = this.clfChannelConfigurationRepository.findAll((root, criteriaQuery, criteriaBuilder) -> {
+
+            List<Predicate> predicates = new ArrayList<>();
+
+            // 指定渠道号
+            if (Objects.nonNull(channelId)) {
+                predicates.add(criteriaBuilder.equal(root.get("channelId"), channelId));
             }
+
+            // 指定排序
+            criteriaQuery.orderBy(criteriaBuilder.desc(root.get("id")));
+
+            return criteriaQuery.getRestriction();
+
+        }, new PageRequest(pagination.getPageNumber(), pagination.getPageSize()));
+
+        return page;
+
     }
 
 

src/main/java/cn/quantgroup/cashloanflowboss/api/role/entity/boss/Role.java

 package cn.quantgroup.cashloanflowboss.api.role.entity.boss;
 
-import cn.quantgroup.cashloanflowboss.component.security.Authority;
+import cn.quantgroup.cashloanflowboss.api.role.entity.boss.Permission;
 import cn.quantgroup.cashloanflowboss.core.persistence.Primary;
 import lombok.Data;
 
@@ -31,6 +31,7 @@ public class Role extends Primary {
      * 授权列表
      */
     @Transient
-    private List<Authority> authorities;
+    private List<Permission> permissions;
+
 
 }

src/main/java/cn/quantgroup/cashloanflowboss/core/dictionary/ApplicationStatus.java

@@ -27,11 +27,11 @@ public enum ApplicationStatus implements Status<ApplicationStatus> {
 
     INVALID_AUTHORITY(501001, "无效的授权"),
 
-    INVALID_USER(501001, "无效的用户"),
+    INVALID_USER(501002, "无效的用户"),
 
-    DISABLED_USER(501002, "用户已被禁用"),
+    DISABLED_USER(501003, "用户已被禁用"),
 
-    USERNAME_OR_PASSWORD_ERROR(501003, "用户名或密码错误");
+    USERNAME_OR_PASSWORD_ERROR(501004, "用户名或密码错误");
 
     private int code;