修改参数名称

src/main/java/cn/efunbox/audio/aop/AdminInterceptor.java

@@ -28,10 +28,12 @@ public class AdminInterceptor implements HandlerInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request,
                              HttpServletResponse response, Object handler) throws Exception {
-//        String id = request.getParameter("id");
-//        String token = request.getParameter("token");
         String id = request.getHeader("id");
         String token = request.getHeader("token");
+        if(id==null)
+            id = request.getParameter("id");
+        if(token==null)
+            token = request.getParameter("token");
         if(id==null || token==null){
             HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
             return false;
@@ -40,6 +42,7 @@ public class AdminInterceptor implements HandlerInterceptor {
         String tokenSes = valueOperations.get(Consts.REDIS_ADMIN+id)==null?
                 "":valueOperations.get(Consts.REDIS_ADMIN+id).toString();
         if(false == tokenSes.equalsIgnoreCase(token)){
+            System.out.println("token:"+token+", tokenSes:"+tokenSes);
             HttpUtil.responseApiCode(request, response, ApiCode.INVALID_TOKEN);
             return false;
         }

src/main/java/cn/efunbox/audio/aop/AuthInterceptor.java

@@ -27,12 +27,14 @@ public class AuthInterceptor implements HandlerInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request,
                              HttpServletResponse response, Object handler) throws Exception {
-//        Map map = new HashMap<>();
-//        String id = request.getParameter("id");
-//        String token = request.getParameter("token");
         String id = request.getHeader("id");
         String token = request.getHeader("token");
+        if(id==null)
+            id = request.getParameter("id");
+        if(token==null)
+            token = request.getParameter("token");
         if(id==null || token==null){
+            System.out.println("id:"+id+",token:"+token);
             HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
             return false;
         }
@@ -40,7 +42,6 @@ public class AuthInterceptor implements HandlerInterceptor {
         if(device==null ||
                 ((device.getTokenNew()==null || false == device.getTokenNew().equalsIgnoreCase(token))
                 && (device.getTokenOld()==null || false == device.getTokenOld().equalsIgnoreCase(token)))){
-//            System.out.println("token:"+token+", tokendb:"+device.getTokenNew());
             HttpUtil.responseApiCode(request,response, ApiCode.INVALID_TOKEN);
             return false;
         }

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

@@ -30,14 +30,14 @@ public class ChannelController {
     @RequestMapping(value = "/search" ,method = RequestMethod.POST)
     public void Search(HttpServletRequest request, HttpServletResponse response){
         String name = request.getParameter("name");
-        String id = request.getParameter("cid");
-        if(name==null && id==null){
+        String idChannel = request.getParameter("idChannel");
+        if(name==null && idChannel==null){
             HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
             return;
         }
         List<Channel> list = null;
-        if(id!=null && id.length()>0)
-            list = channelService.SearchById(Long.valueOf(id));
+        if(idChannel!=null && idChannel.length()>0)
+            list = channelService.SearchById(Long.valueOf(idChannel));
         else if(name!=null && name.length()>0)
             list = channelService.SearchByName(name);
 

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

@@ -51,59 +51,28 @@ public class DeviceController {
         return map;
     }
 
-//    @RequestMapping(value = "/register" ,method = RequestMethod.POST)
-//    public Map Register(HttpServletRequest request){
-//        Map map = new HashMap<>();
-//        String idChannel = request.getParameter("idChannel");
-//        String idDevice = request.getParameter("idDevice");
-//        if(idChannel==null || idDevice==null){
-//            map.put("code", ApiCode.PARAMETER_ERROR.getCode());
-//            map.put("msg", ApiCode.PARAMETER_ERROR.getMessage());
-//            return map;
-//        }
-//        if(deviceService.CheckRegister(Long.valueOf(idChannel), Long.valueOf(idDevice))) {
-//            map.put("code", ApiCode.RECORD_EXIST.getCode());
-//            map.put("msg", ApiCode.RECORD_EXIST.getMessage());
-//            return map;
-//        }
-//        List<Channel> channelList = channelService.SearchById(Long.valueOf(idChannel));
-//        if(channelList==null || channelList.size()<1){
-//            map.put("code", ApiCode.PARAMETER_ERROR.getCode());
-//            map.put("msg", ApiCode.PARAMETER_ERROR.getMessage());
-//            return map;
-//        }
-//        Device device = deviceService.Register(Long.valueOf(idChannel), Long.valueOf(idDevice));
-//        if(device!=null){
-//            map.put("code", ApiCode.OK.getCode());
-//            Map data = new HashMap<>();
-//            data.put("id", device.getId());
-//            data.put("token", device.getTokenNew());
-//            map.put("data", data);
-//        }
-//
-//        return map;
-//    }
-
     @RequestMapping(value = "/register" ,method = RequestMethod.POST)
-    public Map Register(HttpServletRequest request, @RequestBody Device device){
+    public Map Register(HttpServletRequest request){
         Map map = new HashMap<>();
-        if(device.getIdChannel()==null || device.getIdDevice()==null){
+        String idChannel = request.getParameter("idChannel");
+        String idDevice = request.getParameter("idDevice");
+        if(idChannel==null || idDevice==null){
             map.put("code", ApiCode.PARAMETER_ERROR.getCode());
             map.put("msg", ApiCode.PARAMETER_ERROR.getMessage());
             return map;
         }
-        if(deviceService.CheckRegister(device.getIdChannel(), device.getIdDevice())){
+        if(deviceService.CheckRegister(Long.valueOf(idChannel), Long.valueOf(idDevice))) {
             map.put("code", ApiCode.RECORD_EXIST.getCode());
             map.put("msg", ApiCode.RECORD_EXIST.getMessage());
             return map;
         }
-        List<Channel> channelList = channelService.SearchById(device.getIdChannel());
+        List<Channel> channelList = channelService.SearchById(Long.valueOf(idChannel));
         if(channelList==null || channelList.size()<1){
             map.put("code", ApiCode.PARAMETER_ERROR.getCode());
             map.put("msg", ApiCode.PARAMETER_ERROR.getMessage());
             return map;
         }
-        device = deviceService.Register(device.getIdChannel(), device.getIdDevice());
+        Device device = deviceService.Register(Long.valueOf(idChannel), Long.valueOf(idDevice));
         if(device!=null){
             map.put("code", ApiCode.OK.getCode());
             Map data = new HashMap<>();
@@ -115,6 +84,37 @@ public class DeviceController {
         return map;
     }
 
+//    @RequestMapping(value = "/register" ,method = RequestMethod.POST)
+//    public Map Register(HttpServletRequest request, @RequestBody Device device){
+//        Map map = new HashMap<>();
+//        if(device.getIdChannel()==null || device.getIdDevice()==null){
+//            map.put("code", ApiCode.PARAMETER_ERROR.getCode());
+//            map.put("msg", ApiCode.PARAMETER_ERROR.getMessage());
+//            return map;
+//        }
+//        if(deviceService.CheckRegister(device.getIdChannel(), device.getIdDevice())){
+//            map.put("code", ApiCode.RECORD_EXIST.getCode());
+//            map.put("msg", ApiCode.RECORD_EXIST.getMessage());
+//            return map;
+//        }
+//        List<Channel> channelList = channelService.SearchById(device.getIdChannel());
+//        if(channelList==null || channelList.size()<1){
+//            map.put("code", ApiCode.PARAMETER_ERROR.getCode());
+//            map.put("msg", ApiCode.PARAMETER_ERROR.getMessage());
+//            return map;
+//        }
+//        device = deviceService.Register(device.getIdChannel(), device.getIdDevice());
+//        if(device!=null){
+//            map.put("code", ApiCode.OK.getCode());
+//            Map data = new HashMap<>();
+//            data.put("id", device.getId());
+//            data.put("token", device.getTokenNew());
+//            map.put("data", data);
+//        }
+//
+//        return map;
+//    }
+
 
     /**
      * 搜索已注册的设备

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

@@ -30,15 +30,15 @@ public class GroupingController {
     @RequestMapping(value = "/search" ,method = RequestMethod.POST)
     public void Search(HttpServletRequest request, HttpServletResponse response){
         String name = request.getParameter("name");
-        String id = request.getParameter("gid");
+        String idGroup = request.getParameter("idGroup");
         String idFather = request.getParameter("idFather");
-        if(name==null && id==null && idFather==null){
+        if(name==null && idGroup==null && idFather==null){
             HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
             return;
         }
         List<Grouping> list = null;
-        if(id!=null && id.length()>0)
-            list = groupingService.SearchById(Long.valueOf(id));
+        if(idGroup!=null && idGroup.length()>0)
+            list = groupingService.SearchById(Long.valueOf(idGroup));
         else if(name!=null && name.length()>0)
             list = groupingService.SearchByName(name);
         else if(idFather!=null && idFather.length()>0)

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

@@ -28,17 +28,17 @@ public class RecordController {
 
     @RequestMapping(value = "/search" ,method = RequestMethod.POST)
     public void Search(HttpServletRequest request, HttpServletResponse response){
-        String id = request.getParameter("rid");
+        String idRecord = request.getParameter("idRecord");
         String idChannel = request.getParameter("idChannel");
         String idDevice = request.getParameter("idDevice");
         String idAudio = request.getParameter("idAudio");
-        if(id==null && idChannel==null && idDevice==null && idAudio==null){
+        if(idRecord==null && idChannel==null && idDevice==null && idAudio==null){
             HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
             return;
         }
         List<Record> list = null;
-        if(id!=null && id.length()>0)
-            list = recordService.SearchById(Long.valueOf(id));
+        if(idRecord!=null && idRecord.length()>0)
+            list = recordService.SearchById(Long.valueOf(idRecord));
         else if(idChannel!=null && idChannel.length()>0)
             list = recordService.SearchByIdChannel(Long.valueOf(idChannel));
         else if(idDevice!=null && idDevice.length()>0)

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

@@ -39,16 +39,16 @@ public class RightsController {
 
     @RequestMapping(value = "/search" ,method = RequestMethod.POST)
     public void Search(HttpServletRequest request, HttpServletResponse response){
-        String id = request.getParameter("rid");
+        String idRights = request.getParameter("idRights");
         String idChannel = request.getParameter("idChannel");
         String idGroup = request.getParameter("idGroup");
-        if(id==null && idChannel==null && idGroup==null){
+        if(idRights==null && idChannel==null && idGroup==null){
             HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
             return;
         }
         List<Rights> list = null;
-        if(id!=null && id.length()>0)
-            list = rightsService.SearchById(Long.valueOf(id));
+        if(idRights!=null && idRights.length()>0)
+            list = rightsService.SearchById(Long.valueOf(idRights));
         else if(idChannel!=null && idGroup!=null)
             list = rightsService.SearchByIdChannelAndIdGroup(Long.valueOf(idChannel), Long.valueOf(idGroup));
         else if(idChannel!=null && idChannel.length()>0)