增加搜索全部的接口

src/main/java/cn/efunbox/audio/controller/AdminController.java

@@ -2,6 +2,7 @@ package cn.efunbox.audio.controller;
 
 import cn.efunbox.audio.consts.Consts;
 import cn.efunbox.audio.entity.Admin;
+import cn.efunbox.audio.entity.Channel;
 import cn.efunbox.audio.service.AdminService;
 import cn.efunbox.audio.utils.ApiCode;
 import cn.efunbox.audio.utils.Common;
@@ -39,7 +40,7 @@ public class AdminController {
     int tokenExpire = 24*30;
 
     @RequestMapping(value = "/login" ,method = RequestMethod.POST)
-    public void Search(HttpServletRequest request, HttpServletResponse response){
+    public void Login(HttpServletRequest request, HttpServletResponse response){
         String name = request.getParameter("name");
         String pwd = request.getParameter("pwd");
         if(name==null && pwd==null){
@@ -103,8 +104,21 @@ public class AdminController {
 //        return;
 //    }
 
+    @RequestMapping(value = "/search" ,method = RequestMethod.POST)
+    public void Search(HttpServletRequest request, HttpServletResponse response){
+        List<Admin> adminList = adminService.SearchAll();
+
+        HttpUtil.responseOkData(request, response, adminList);
+        return;
+    }
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    public void Update(HttpServletRequest request, HttpServletResponse response, @RequestBody Admin admin){
+
+    }
+
     @RequestMapping(value = "/register", method = RequestMethod.POST)
-    public void Insert(HttpServletRequest request, HttpServletResponse response, @RequestBody Admin admin){
+    public void Insert(HttpServletRequest request, HttpServletResponse response, Admin admin){
         String name = admin.getName();
         String pwd = admin.getPwd();
 
@@ -124,7 +138,6 @@ public class AdminController {
         admin.setPwd(pwdMD5);
         admin.setSalt(salt);
         admin.setToken(token);
-        admin.setCreated(new Date());
         admin = adminService.Insert(admin);
         SaveRedis(admin);
 

src/main/java/cn/efunbox/audio/controller/AudioController.java

@@ -35,16 +35,35 @@ public class AudioController {
     @Autowired
     RightsService rightsService;
 
-    @RequestMapping(value = "/search", method = RequestMethod.POST)
-    public void UserSearch(HttpServletRequest request, HttpServletResponse response){
-        Search(request, response);
-    }
-
+    /**
+     * 管理员搜索接口
+     * @param request
+     * @param response
+     */
     @RequestMapping(value = "/admsearch", method = RequestMethod.POST)
     public void AdminSearch(HttpServletRequest request, HttpServletResponse response){
-        Search(request, response);
+        String name = request.getParameter("name");
+        String album = request.getParameter("album");
+        List<Audio> list = new ArrayList<>();
+        if(name!=null && name.length()>0  && album!=null && album.length()>0)
+            list = audioService.SearchByNameAlbum(name, album);
+        else if(name!=null && name.length()>0)
+            list = audioService.SearchByName(name);
+        else if(album!=null && album.length()>0)
+            list = audioService.SearchByAlbum(album);
+        else
+            list = audioService.SearchAll();
+
+        HttpUtil.responseOkData(request, response, list);
+        return;
     }
 
+    /**
+     * 用户搜索接口
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/search", method = RequestMethod.POST)
     public void Search(HttpServletRequest request, HttpServletResponse response){
         String id = request.getParameter("id");
         String name = request.getParameter("name");

src/main/java/cn/efunbox/audio/controller/ChannelController.java

@@ -31,20 +31,13 @@ public class ChannelController {
     public void Search(HttpServletRequest request, HttpServletResponse response){
         String name = request.getParameter("name");
         String idChannel = request.getParameter("idChannel");
-        if(name==null && idChannel==null){
-            HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
-            return;
-        }
         List<Channel> list = null;
         if(idChannel!=null && idChannel.length()>0)
             list = channelService.SearchById(Long.valueOf(idChannel));
         else if(name!=null && name.length()>0)
             list = channelService.SearchByName(name);
-
-        if(list==null || list.size()<1){
-            HttpUtil.responseApiCode(request, response, ApiCode.NOT_FOUND);
-            return;
-        }
+        else
+            list = channelService.SearchAll();
 
         HttpUtil.responseOkData(request, response, list);
         return;

src/main/java/cn/efunbox/audio/controller/DeviceController.java

@@ -125,16 +125,16 @@ public class DeviceController {
     public void Search(HttpServletRequest request, HttpServletResponse response){
         String idDevice = request.getParameter("idDevice");
         String idChannel = request.getParameter("idChannel");
-        if(idDevice==null || idDevice.length()==0)
+        if(idDevice==null)
             idDevice = "0";
-        if(idChannel==null || idChannel.length()==0)
+        if(idChannel==null)
             idChannel = "0";
-        List<Device> list = deviceService.Search(Long.valueOf(idChannel), Long.valueOf(idDevice));
+        List<Device> list = new ArrayList<>();
+        if(idDevice==null && idChannel==null)
+            list = deviceService.SearchAll();
+        else
+            list = deviceService.Search(Long.valueOf(idChannel), Long.valueOf(idDevice));
 
-        if(list==null || list.size()<1){
-            HttpUtil.responseApiCode(request, response, ApiCode.NOT_FOUND);
-            return;
-        }
         for(int i=0; i<list.size(); i++){
             list.get(i).setTokenNew("");
             list.get(i).setTokenOld("");

src/main/java/cn/efunbox/audio/controller/GroupingController.java

@@ -32,10 +32,10 @@ public class GroupingController {
         String name = request.getParameter("name");
         String idGroup = request.getParameter("idGroup");
         String idFather = request.getParameter("idFather");
-        if(name==null && idGroup==null && idFather==null){
-            HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
-            return;
-        }
+//        if(name==null && idGroup==null && idFather==null){
+//            HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
+//            return;
+//        }
         List<Grouping> list = null;
         if(idGroup!=null && idGroup.length()>0)
             list = groupingService.SearchById(Long.valueOf(idGroup));
@@ -43,11 +43,13 @@ public class GroupingController {
             list = groupingService.SearchByName(name);
         else if(idFather!=null && idFather.length()>0)
             list = groupingService.SearchByIdFather(Long.valueOf(idFather));
-
-        if(list==null || list.size()<1){
-            HttpUtil.responseApiCode(request, response, ApiCode.NOT_FOUND);
-            return;
-        }
+        else
+            list = groupingService.SearchAll();
+//
+//        if(list==null || list.size()<1){
+//            HttpUtil.responseApiCode(request, response, ApiCode.NOT_FOUND);
+//            return;
+//        }
 
         HttpUtil.responseOkData(request, response, list);
         return;

src/main/java/cn/efunbox/audio/controller/RecordController.java

@@ -32,10 +32,10 @@ public class RecordController {
         String idChannel = request.getParameter("idChannel");
         String idDevice = request.getParameter("idDevice");
         String idAudio = request.getParameter("idAudio");
-        if(idRecord==null && idChannel==null && idDevice==null && idAudio==null){
-            HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
-            return;
-        }
+//        if(idRecord==null && idChannel==null && idDevice==null && idAudio==null){
+//            HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
+//            return;
+//        }
         List<Record> list = null;
         if(idRecord!=null && idRecord.length()>0)
             list = recordService.SearchById(Long.valueOf(idRecord));
@@ -45,11 +45,13 @@ public class RecordController {
             list = recordService.SearchByIdDevice(Long.valueOf(idDevice));
         else if(idAudio!=null && idAudio.length()>0)
             list = recordService.SearchByIdAudio(Long.valueOf(idAudio));
+        else
+            list = recordService.SearchAll();
 
-        if(list==null || list.size()<1){
-            HttpUtil.responseApiCode(request, response, ApiCode.NOT_FOUND);
-            return;
-        }
+//        if(list==null || list.size()<1){
+//            HttpUtil.responseApiCode(request, response, ApiCode.NOT_FOUND);
+//            return;
+//        }
 
         HttpUtil.responseOkData(request, response, list);
         return;

src/main/java/cn/efunbox/audio/controller/RightsController.java

@@ -42,10 +42,10 @@ public class RightsController {
         String idRights = request.getParameter("idRights");
         String idChannel = request.getParameter("idChannel");
         String idGroup = request.getParameter("idGroup");
-        if(idRights==null && idChannel==null && idGroup==null){
-            HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
-            return;
-        }
+//        if(idRights==null && idChannel==null && idGroup==null){
+//            HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
+//            return;
+//        }
         List<Rights> list = null;
         if(idRights!=null && idRights.length()>0)
             list = rightsService.SearchById(Long.valueOf(idRights));
@@ -55,11 +55,13 @@ public class RightsController {
             list = rightsService.SearchByIdChannel(Long.valueOf(idChannel));
         else if(idGroup!=null && idGroup.length()>0)
             list = rightsService.SearchByIdGroup(Long.valueOf(idGroup));
+        else
+            list = rightsService.SearchAll();
 
-        if(list==null || list.size()<1){
-            HttpUtil.responseApiCode(request, response, ApiCode.NOT_FOUND);
-            return;
-        }
+//        if(list==null || list.size()<1){
+//            HttpUtil.responseApiCode(request, response, ApiCode.NOT_FOUND);
+//            return;
+//        }
 
         HttpUtil.responseOkData(request, response, list);
         return;

src/main/java/cn/efunbox/audio/impl/AdminServiceImpl.java

@@ -21,6 +21,12 @@ public class AdminServiceImpl implements AdminService {
     AdminRepo adminRepo;
 
     @Override
+    public List<Admin> SearchAll(){
+        List<Admin> list = adminRepo.findAll();
+        return list;
+    }
+
+    @Override
     public List<Admin> SearchById(Long id){
         List<Admin> list = adminRepo.findById(id);
         return list;

src/main/java/cn/efunbox/audio/impl/AudioServiceImpl.java

@@ -23,6 +23,12 @@ public class AudioServiceImpl implements AudioService {
     AudioRepo audioRepo;
 
     @Override
+    public List<Audio> SearchAll(){
+        List<Audio> list = audioRepo.findAll();
+        return list;
+    }
+
+    @Override
     public List<Audio> SearchByName(String name){
         if(name==null || name.isEmpty())
             return null;

src/main/java/cn/efunbox/audio/impl/ChannelServiceImpl.java

@@ -21,6 +21,12 @@ public class ChannelServiceImpl implements ChannelService {
     ChannelRepo channelRepo;
 
     @Override
+    public List<Channel> SearchAll(){
+        List<Channel> list = channelRepo.findAll();
+        return list;
+    }
+
+    @Override
     public List<Channel> SearchById(Long id){
         List<Channel> list = channelRepo.findById(id);
         return list;

src/main/java/cn/efunbox/audio/impl/DeviceServiceImpl.java

@@ -85,6 +85,12 @@ public class DeviceServiceImpl implements DeviceService {
     }
 
     @Override
+    public List<Device> SearchAll(){
+        List<Device> list = deviceRepo.findAll();
+        return list;
+    }
+
+    @Override
     public Device Update(Device device){
         device = deviceRepo.save(device);
         return device;

src/main/java/cn/efunbox/audio/impl/GroupingServiceImpl.java

@@ -21,6 +21,12 @@ public class GroupingServiceImpl implements GroupingService {
     GroupingRepo groupingRepo;
 
     @Override
+    public List<Grouping> SearchAll(){
+        List<Grouping> list = groupingRepo.findAll();
+        return list;
+    }
+
+    @Override
     public List<Grouping> SearchById(Long id){
         List<Grouping> list = groupingRepo.findById(id);
         return list;

src/main/java/cn/efunbox/audio/impl/RecordServiceImpl.java

@@ -21,6 +21,12 @@ public class RecordServiceImpl implements RecordService {
     RecordRepo recordRepo;
 
     @Override
+    public List<Record> SearchAll(){
+        List<Record> list = recordRepo.findAll();
+        return list;
+    }
+
+    @Override
     public List<Record> SearchById(Long id){
         List<Record> list = recordRepo.findById(id);
         return list;

src/main/java/cn/efunbox/audio/impl/RightsServiceImpl.java

@@ -21,6 +21,12 @@ public class RightsServiceImpl implements RightsService {
     RightsRepo rightsRepo;
 
     @Override
+    public List<Rights> SearchAll(){
+        List<Rights> list = rightsRepo.findAll();
+        return list;
+    }
+
+    @Override
     public List<Rights> SearchById(Long id){
         List<Rights> list = rightsRepo.findById(id);
         return list;

src/main/java/cn/efunbox/audio/service/AdminService.java

@@ -10,6 +10,8 @@ import java.util.List;
  */
 public interface AdminService {
 
+    public List<Admin> SearchAll();
+
     public List<Admin> SearchById(Long id);
 
     public List<Admin> SearchByName(String name);

src/main/java/cn/efunbox/audio/service/AudioService.java

@@ -10,6 +10,8 @@ import java.util.List;
  */
 public interface AudioService {
 
+    public List<Audio> SearchAll();
+
     public List<Audio> SearchByName(String name);
 
     public List<Audio> SearchByAlbum(String album);

src/main/java/cn/efunbox/audio/service/ChannelService.java

@@ -10,6 +10,8 @@ import java.util.List;
  */
 public interface ChannelService {
 
+    public List<Channel> SearchAll();
+
     public List<Channel> SearchById(Long id);
 
     public List<Channel> SearchByIdFather(Long idFather);

src/main/java/cn/efunbox/audio/service/DeviceService.java

@@ -19,6 +19,8 @@ public interface DeviceService {
 
     public List<Device> Search(Long idChannel, Long idDevice);
 
+    public List<Device> SearchAll();
+
     public Device Update(Device device);
 
 }

src/main/java/cn/efunbox/audio/service/GroupingService.java

@@ -10,6 +10,8 @@ import java.util.List;
  */
 public interface GroupingService {
 
+    public List<Grouping> SearchAll();
+
     public List<Grouping> SearchById(Long id);
 
     public List<Grouping> SearchByIdFather(Long idFather);

src/main/java/cn/efunbox/audio/service/RecordService.java

@@ -10,6 +10,8 @@ import java.util.List;
  */
 public interface RecordService {
 
+    public List<Record> SearchAll();
+
     public List<Record> SearchById(Long id);
 
     public List<Record> SearchByIdChannel(Long id);

src/main/java/cn/efunbox/audio/service/RightsService.java

@@ -10,6 +10,8 @@ import java.util.List;
  */
 public interface RightsService {
 
+    public List<Rights> SearchAll();
+
     public List<Rights> SearchById(Long id);
 
     public List<Rights> SearchByIdChannel(Long id);