device id修改

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

@@ -5,12 +5,9 @@ import cn.efunbox.audio.clients.AudioHttp;
 import cn.efunbox.audio.clients.UserHttp;
 import cn.efunbox.audio.entity.Channel;
 import cn.efunbox.audio.entity.Device;
-import cn.efunbox.audio.entity.Grouping;
 import cn.efunbox.audio.service.ChannelService;
 import cn.efunbox.audio.service.DeviceService;
 import cn.efunbox.audio.utils.ApiCode;
-import cn.efunbox.audio.utils.ApiResult;
-import cn.efunbox.audio.utils.Common;
 import cn.efunbox.audio.utils.HttpUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -18,13 +15,18 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.lang.reflect.Array;
 import java.sql.Timestamp;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 /**
  * Created by yao on 17-9-26.
@@ -136,7 +138,7 @@ public class DeviceController {
             HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
             return;
         }
-        if(deviceService.CheckRegister(Long.valueOf(idChannel), Long.valueOf(idDevice))) {
+        if(deviceService.CheckRegister(Long.valueOf(idChannel), idDevice)) {
             HttpUtil.responseApiCode(request, response, ApiCode.RECORD_EXIST);
             return;
         }
@@ -159,7 +161,7 @@ public class DeviceController {
         }
         mapRes = JSONObject.parseObject(mapRes.get("data").toString());
 
-        Device device = deviceService.Register(Long.valueOf(idChannel), Long.valueOf(idDevice));
+        Device device = deviceService.Register(Long.valueOf(idChannel), idDevice);
         if(device!=null){
             //记录云平台的账号信息
             device.setIaas_eid(mapRes.get("eid").toString());
@@ -253,9 +255,9 @@ public class DeviceController {
                 idChannel = "0";
             Page<Device> pageRes = null;
             if((start==null || start.length()==0) || (end==null || end.length()==0))
-                pageRes = deviceService.Search(Long.valueOf(idChannel), Long.valueOf(idDevice), Integer.valueOf(page), Integer.valueOf(size));
+                pageRes = deviceService.Search(Long.valueOf(idChannel), idDevice, Integer.valueOf(page), Integer.valueOf(size));
             else
-                pageRes = deviceService.Search(Long.valueOf(idChannel), Long.valueOf(idDevice), Integer.valueOf(page), Integer.valueOf(size), Timestamp.valueOf(start), Timestamp.valueOf(end));
+                pageRes = deviceService.Search(Long.valueOf(idChannel), idDevice, Integer.valueOf(page), Integer.valueOf(size), Timestamp.valueOf(start), Timestamp.valueOf(end));
             for(int i=0; i<pageRes.getNumberOfElements(); i++){
                 System.out.println("i:"+i);
                 pageRes.getContent().get(i).setTokenNew("");

src/main/java/cn/efunbox/audio/entity/Device.java

@@ -1,7 +1,6 @@
 package cn.efunbox.audio.entity;
 
 
-import cn.efunbox.audio.consts.Status;
 import lombok.Data;
 import lombok.ToString;
 import org.hibernate.annotations.DynamicInsert;
@@ -43,7 +42,7 @@ public class Device implements Serializable, Cloneable{
 
     //设备编号串
     @Column
-    private Long idDevice;
+    private String idDevice;
 
     //状态
     @Column

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

@@ -5,6 +5,7 @@ import cn.efunbox.audio.entity.Channel;
 import cn.efunbox.audio.entity.Device;
 import cn.efunbox.audio.repository.DeviceRepo;
 import cn.efunbox.audio.service.DeviceService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -27,7 +28,7 @@ public class DeviceServiceImpl implements DeviceService {
     DeviceRepo deviceRepo;
 
     @Override
-    public boolean CheckRegister(Long idChannel, Long idDevice){
+    public boolean CheckRegister(Long idChannel, String idDevice){
         List<Device> list = deviceRepo.findByChannelDevice(idChannel, idDevice);
         if(list.size()>0)
             return true;
@@ -36,7 +37,7 @@ public class DeviceServiceImpl implements DeviceService {
     }
 
     @Override
-    public Device Register(Long idChannel, Long idDevice){
+    public Device Register(Long idChannel, String idDevice){
         if(this.CheckRegister(idChannel, idDevice))
             return null;
 
@@ -80,14 +81,14 @@ public class DeviceServiceImpl implements DeviceService {
     }
 
     @Override
-    public Page<Device> Search(Long idChannel, Long idDevice, int page, int size){
+    public Page<Device> Search(Long idChannel, String idDevice, int page, int size){
         if(size<=0)
             size = 50;
         Pageable pageable = new PageRequest(page, size);
         Page<Device> list = null;
         if(idChannel>0)
             list = deviceRepo.findByIdChannel(idChannel, pageable);
-        else if(idDevice>0)
+        else if(StringUtils.isNotBlank(idDevice))
             list = deviceRepo.findByIdDevice(idDevice, pageable);
         else
             list = deviceRepo.findAll(pageable);
@@ -104,14 +105,14 @@ public class DeviceServiceImpl implements DeviceService {
     }
 
     @Override
-    public Page<Device> Search(Long idChannel, Long idDevice, int page, int size, Timestamp start, Timestamp end){
+    public Page<Device> Search(Long idChannel, String idDevice, int page, int size, Timestamp start, Timestamp end){
         if(size<=0)
             size = 50;
         Pageable pageable = new PageRequest(page, size);
         Page<Device> list = null;
         if(idChannel>0)
             list = deviceRepo.findByIdChannelAndCreatedBetween(idChannel, start, end, pageable);
-        else if(idDevice>0)
+        else if(StringUtils.isNotBlank(idDevice))
             list = deviceRepo.findByIdDeviceAndCreatedBetween(idDevice, start, end, pageable);
         else
             list = deviceRepo.findByCreatedBetween(start, end, pageable);

src/main/java/cn/efunbox/audio/repository/DeviceRepo.java

@@ -18,9 +18,9 @@ import java.util.List;
 public interface DeviceRepo extends JpaRepository<Device, Long> {
 
     Device findById(Long id);
-    Page<Device> findByIdDevice(Long idDevice, Pageable pageable);
+    Page<Device> findByIdDevice(String idDevice, Pageable pageable);
     Page<Device> findByIdChannel(Long idChannel, Pageable pageable);
-    Page<Device> findByIdDeviceAndCreatedBetween(Long idDevice, Timestamp start, Timestamp end, Pageable pageable);
+    Page<Device> findByIdDeviceAndCreatedBetween(String idDevice, Timestamp start, Timestamp end, Pageable pageable);
     Page<Device> findByIdChannelAndCreatedBetween(Long idChannel, Timestamp start, Timestamp end, Pageable pageable);
     Page<Device> findByCreatedBetween(Timestamp start, Timestamp end, Pageable pageable);
 
@@ -31,6 +31,6 @@ public interface DeviceRepo extends JpaRepository<Device, Long> {
     List<Device> findByChannel(@Param("idChannel")String idChannel);
 
     @Query("from Device d where d.idChannel=:idChannel and d.idDevice=:idDevice")
-    List<Device> findByChannelDevice(@Param("idChannel")Long idChannel, @Param("idDevice")Long idDevice);
+    List<Device> findByChannelDevice(@Param("idChannel")Long idChannel, @Param("idDevice")String idDevice);
 
 }

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

@@ -4,26 +4,25 @@ import cn.efunbox.audio.entity.Device;
 import org.springframework.data.domain.Page;
 
 import java.sql.Timestamp;
-import java.util.List;
 
 /**
  * Created by yao on 17-9-26.
  */
 public interface DeviceService {
 
-    public boolean CheckRegister(Long idChannel, Long idDevice);
+    public boolean CheckRegister(Long idChannel, String idDevice);
 
-    public Device Register(Long idChannel, Long idDevice);
+    public Device Register(Long idChannel, String idDevice);
 
     public Device Login(Long id, String token);
 
     public Device GetOne(Long id);
 
-    public Page<Device> Search(Long idChannel, Long idDevice, int page, int size);
+    public Page<Device> Search(Long idChannel, String idDevice, int page, int size);
 
     public Page<Device> SearchAll(int page, int size);
 
-    public Page<Device> Search(Long idChannel, Long idDevice, int page, int size, Timestamp start, Timestamp end);
+    public Page<Device> Search(Long idChannel, String idDevice, int page, int size, Timestamp start, Timestamp end);
 
     public Page<Device> SearchAll(int page, int size, Timestamp start, Timestamp end);
 

src/test/java/cn/efunbox/audio/AudioApplicationTests.java

@@ -8,15 +8,14 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.mock.web.MockServletContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
 
 import java.util.UUID;
 
+//import org.springframework.boot.test.context.SpringBootTest;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest    //1.5.7才支持
 public class AudioApplicationTests {
@@ -43,7 +42,7 @@ public class AudioApplicationTests {
 
 	@Test
 	public void register(){
-		Device device = deviceService.Register(Long.valueOf(1), Long.valueOf(1));
+		Device device = deviceService.Register(Long.valueOf(1), "1");
 		if(device==null){
 			System.out.println("fail to register");
 			return;