|
@@ -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;
|
|
|
+// }
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
* 搜索已注册的设备
|