增加对渠道、合作商户的管理接口

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

@@ -0,0 +1,75 @@
+package cn.efunbox.audio.controller;
+
+import cn.efunbox.audio.entity.Audio;
+import cn.efunbox.audio.entity.Channel;
+import cn.efunbox.audio.service.AudioService;
+import cn.efunbox.audio.service.ChannelService;
+import cn.efunbox.audio.util.ApiCode;
+import cn.efunbox.audio.util.HttpUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.List;
+import java.util.Random;
+
+/**
+ * Created by yao on 17-9-26.
+ */
+@RestController
+@Slf4j
+@RequestMapping(value = "/channel")
+public class ChannelController {
+
+    @Autowired
+    ChannelService channelService;
+
+    @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){
+            HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
+            return;
+        }
+        List<Channel> list = null;
+        if(id!=null && id.length()>0)
+            list = channelService.SearchById(Long.valueOf(id));
+        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;
+        }
+
+        HttpUtil.responseOkData(request, response, list.get(0));
+        return;
+    }
+
+    @RequestMapping(value = "/insert", method = RequestMethod.POST)
+    public void Insert(HttpServletRequest request, HttpServletResponse response){
+        String name = request.getParameter("name");
+        if(name==null){
+            HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
+            return;
+        }
+
+        List<Channel> list = channelService.SearchByName(name);
+        if(list!=null && list.size()>0){
+            HttpUtil.responseApiCode(request, response, ApiCode.RECORD_EXIST);
+            return;
+        }
+        Channel channel = new Channel();
+        channel.setName(name);
+        channel = channelService.Insert(channel);
+        HttpUtil.responseOutWithJson(request, response, channel);
+        return;
+    }
+
+}

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

@@ -1,7 +1,9 @@
 package cn.efunbox.audio.controller;
 
+import cn.efunbox.audio.entity.Channel;
 import cn.efunbox.audio.entity.Device;
 import cn.efunbox.audio.repository.DeviceRepo;
+import cn.efunbox.audio.service.ChannelService;
 import cn.efunbox.audio.service.DeviceService;
 import cn.efunbox.audio.util.ApiCode;
 import lombok.extern.slf4j.Slf4j;
@@ -13,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -26,6 +29,9 @@ public class DeviceController {
     @Autowired
     DeviceService deviceService;
 
+    @Autowired
+    ChannelService channelService;
+
     @RequestMapping(value = "/token" ,method = RequestMethod.POST)
     public Map Login(@RequestParam long id, @RequestParam String token){
         Map map = new HashMap<>();
@@ -60,6 +66,12 @@ public class DeviceController {
             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(idChannel, idDevice);
         if(device!=null){
             map.put("code", ApiCode.OK.getCode());

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

@@ -12,6 +12,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
+ * 音频资源
  * Created by yao on 17-9-26.
  */
 

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

@@ -0,0 +1,47 @@
+package cn.efunbox.audio.entity;
+
+
+import cn.efunbox.audio.enums.Status;
+import lombok.Data;
+import lombok.ToString;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 合作商家
+ * Created by yao on 17-9-26.
+ */
+
+
+@Data
+@ToString
+@Entity
+@DynamicInsert
+@DynamicUpdate
+public class Channel implements Serializable, Cloneable {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    //合作商家，如小七
+    @Column
+    private String name;
+
+    @Column
+    private int status= Status.ONLINE.getCode();
+
+    @Column
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date created;
+
+    public Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }
+
+
+}

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

@@ -0,0 +1,46 @@
+package cn.efunbox.audio.impl;
+
+import cn.efunbox.audio.entity.Audio;
+import cn.efunbox.audio.entity.Channel;
+import cn.efunbox.audio.repository.AudioRepo;
+import cn.efunbox.audio.repository.ChannelRepo;
+import cn.efunbox.audio.service.AudioService;
+import cn.efunbox.audio.service.ChannelService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by yao on 17-9-26.
+ */
+@Service
+public class ChannelServiceImpl implements ChannelService {
+
+    @Autowired
+    ChannelRepo channelRepo;
+
+    @Override
+    public List<Channel> SearchById(Long id){
+        List<Channel> list = channelRepo.findById(id);
+        return list;
+    }
+
+    @Override
+    public List<Channel> SearchByName(String name){
+        if(name==null || name.isEmpty())
+            return null;
+        List<Channel> list = channelRepo.findByName(name);
+        if(list==null)
+            list = channelRepo.findByNameLike(name);
+        return list;
+    }
+
+    @Override
+    public Channel Insert(Channel channel){
+        Channel c = channelRepo.save(channel);
+        return c;
+    }
+
+
+}

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

@@ -0,0 +1,22 @@
+package cn.efunbox.audio.repository;
+
+import cn.efunbox.audio.entity.Audio;
+import cn.efunbox.audio.entity.Channel;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * Created by yao on 17-9-26.
+ */
+@Repository
+public interface ChannelRepo extends JpaRepository<Channel, Long> {
+
+    public List<Channel> findById(Long id);
+    public List<Channel> findByName(String name);
+    public List<Channel> findByNameLike(String name);
+
+}

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

@@ -0,0 +1,18 @@
+package cn.efunbox.audio.service;
+
+import cn.efunbox.audio.entity.Audio;
+import cn.efunbox.audio.entity.Channel;
+
+import java.util.List;
+
+/**
+ * Created by yao on 17-9-26.
+ */
+public interface ChannelService {
+
+    public List<Channel> SearchById(Long id);
+
+    public List<Channel> SearchByName(String name);
+
+    public Channel Insert(Channel channel);
+}