量表类型调整

src/main/java/com/rf/psychological/dao/repository/CategoryRepository.java

@@ -150,4 +150,7 @@ public interface CategoryRepository extends BaseRepository<CategoryEntity, Strin
             ")\n" +
             "   or ename = 'ALL' order by sequence ", nativeQuery = true)
     List<CategoryEntity> findAllSubjectGroup(String groupId);
+
+
+    List<CategoryEntity> findAllByType(String type);
 }

src/main/java/com/rf/psychological/scale/rest/SubjectController.java

@@ -7,6 +7,7 @@ import com.rf.psychological.scale.dao.model.SubjectEntity;
 import com.rf.psychological.scale.service.CategorySubjectService;
 import com.rf.psychological.scale.service.ScaleService;
 import com.rf.psychological.scale.service.SubjectService;
+import com.rf.psychological.security.SafetyProcess;
 import com.rf.psychological.service.*;
 import com.rf.psychological.user.dao.model.UserEntity;
 import com.rf.psychological.utils.Constant;
@@ -88,14 +89,21 @@ public class SubjectController extends BaseController {
 
     @GetMapping("/getSubjectByCategory")
     @ApiOperation("根据类型获取")
+    @SafetyProcess
     public Result getSubjectByCategory(int pageNum,int pageSize, String category){
         try {
-            //先获取到该类型下量表FLAG
-            List<String> listFlag = categorySubjectService.findByEName(category);
-            if (CollectionUtils.isEmpty(listFlag)){
-                return success(null);
+            if (StringUtils.isEmpty(category) || "ALL".equals(category)){
+                Page<SubjectEntity> page = subjectService.findAllByPage(pageNum,pageSize);
+                return success(page);
+            }else {
+                //先获取到该类型下量表FLAG
+                List<String> listFlag = categorySubjectService.findByEName(category);
+                if (CollectionUtils.isEmpty(listFlag)){
+                    return success(null);
+                }
+                return success( subjectService.findSubjectByPage(pageNum,pageSize,listFlag));
             }
-            return success( subjectService.findSubjectByPage(pageNum,pageSize,listFlag));
+
         }catch (Exception e){
             log.error(e.getMessage());
             return fail();

src/main/java/com/rf/psychological/scale/service/SubjectService.java

@@ -211,4 +211,6 @@ public interface SubjectService {
     void deleteSubjectByFlag(String flag);
 
     Page findSubjectByPage(int pageNum,int pageSize,List<String> flags);
+
+    Page findAllByPage(int pageNum,int pageSize);
 }

src/main/java/com/rf/psychological/scale/service/impl/CategoryServiceImpl.java

@@ -86,7 +86,7 @@ public class CategoryServiceImpl implements CategoryService {
      */
     @Override
     public List<CategoryEntity> findAll(String type) {
-        return this.categoryRepository.findAllOrder(type);
+        return this.categoryRepository.findAllByType(type);
     }
 
     /**

src/main/java/com/rf/psychological/scale/service/impl/SubjectServiceImpl.java

@@ -350,6 +350,11 @@ public class SubjectServiceImpl implements SubjectService {
         return page;
     }
 
+    @Override
+    public Page findAllByPage(int pageNum, int pageSize) {
+        return subjectRepository.findAll(PageRequestUtil.of(pageNum,pageSize));
+    }
+
 
     ////解密量表list
     //private List<SubjectEntity> decryptList(List<SubjectEntity> before) {