增加更新、删除接口

src/main/java/cn/efunbox/audio/config/Config.java

@@ -57,8 +57,8 @@ public class Config extends WebMvcConfigurerAdapter{
                 .excludePathPatterns("/device/**");
 
         registry.addInterceptor(adminInterceptor())
-                .addPathPatterns("/**")
-                .excludePathPatterns("/device/**", "/admin/*", "/audio/search");
+                .addPathPatterns("/**", "/device/update", "/device/delete")
+                .excludePathPatterns("/device/**", "/admin/login", "/audio/search");
 
         registry.addInterceptor(ignoreOptionsInterceptor())
                 .addPathPatterns("/**");

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

@@ -128,10 +128,18 @@ public class AdminController {
         InsertUpdate(request, response, admin);
     }
 
+    @RequestMapping(value = "/delete", method = RequestMethod.POST)
+    public void Delete(HttpServletRequest request, HttpServletResponse response){
+        String idAdmin = request.getParameter("idAdmin");
+        adminService.Delete(Long.valueOf(idAdmin));
+        HttpUtil.responseOk(request, response);
+        return;
+    }
+
     public void InsertUpdate(HttpServletRequest request, HttpServletResponse response, Admin admin){
+        String name = admin.getName();
+        String pwd = admin.getPwd();
         if(admin.getId()==null){
-            String name = admin.getName();
-            String pwd = admin.getPwd();
 
             if(name==null || name.length()<4 || pwd==null || pwd.length()<4){
                 HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
@@ -143,9 +151,15 @@ public class AdminController {
                 return;
             }
             admin.setCreated(new Timestamp(new Date().getTime()));
+        }else{
+            Admin adminOld = adminService.GetOne(admin.getId());
+            if(adminOld==null){
+                HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
+                return;
+            }
+            admin = (Admin)Common.CopyValue(admin, adminOld);
         }
-        if(admin.getPwd()!=null){
-            String pwd = admin.getPwd();
+        if(pwd!=null){
             String salt = UUID.randomUUID().toString().replaceAll("-","");
             String token = UUID.randomUUID().toString().replaceAll("-", "");
             String pwdMD5 = Common.getMD5(Common.getMD5(pwd) + salt);

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

@@ -186,6 +186,14 @@ public class AudioController {
         return;
     }
 
+    @RequestMapping(value = "/delete", method = RequestMethod.POST)
+    public void Delete(HttpServletRequest request, HttpServletResponse response){
+        String idAudio = request.getParameter("idAudio");
+        audioService.Delete(Long.valueOf(idAudio));
+        HttpUtil.responseOk(request, response);
+        return;
+    }
+
     /**
      * 过滤出渠道有访问权限的音频列表
      * @param audioList

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

@@ -3,6 +3,7 @@ package cn.efunbox.audio.controller;
 import cn.efunbox.audio.entity.Channel;
 import cn.efunbox.audio.service.ChannelService;
 import cn.efunbox.audio.utils.ApiCode;
+import cn.efunbox.audio.utils.Common;
 import cn.efunbox.audio.utils.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -83,15 +84,23 @@ public class ChannelController {
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     public void Update(HttpServletRequest request, HttpServletResponse response, @RequestBody Channel channel){
-        List<Channel> list = channelService.SearchByName(channel.getName());
-        if(list!=null && list.size()>0){
-            HttpUtil.responseApiCode(request, response, ApiCode.RECORD_EXIST);
+        Channel channelOld = channelService.GetOne(channel.getId());
+        if(channelOld==null){
+            HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
             return;
         }
-        channel.setCreated(new Timestamp(new Date().getTime()));
+        channel = (Channel) Common.CopyValue(channel, channelOld);
         channel = channelService.Insert(channel);
         HttpUtil.responseOutWithJson(request, response, channel);
         return;
     }
 
+    @RequestMapping(value = "/delete", method = RequestMethod.POST)
+    public void Delete(HttpServletRequest request, HttpServletResponse response){
+        String idChannel = request.getParameter("idChannel");
+        channelService.Delete(Long.valueOf(idChannel));
+        HttpUtil.responseOk(request, response);
+        return;
+    }
+
 }

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

@@ -6,6 +6,7 @@ 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.Common;
 import cn.efunbox.audio.utils.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -144,4 +145,25 @@ public class DeviceController {
         return;
     }
 
+//    @RequestMapping(value = "/update", method = RequestMethod.POST)
+//    public void Update(HttpServletRequest request, HttpServletResponse response, @RequestBody Device device){
+//        Device deviceOld = deviceService.GetOne(device.getId());
+//        if(deviceOld==null){
+//            HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
+//            return;
+//        }
+//        device = (Device)Common.CopyValue(device, deviceOld);
+//        device = deviceService.Update(device);
+//        HttpUtil.responseOutWithJson(request, response, device);
+//        return;
+//    }
+//
+//    @RequestMapping(value = "/delete", method = RequestMethod.POST)
+//    public void Delete(HttpServletRequest request, HttpServletResponse response){
+//        String idDevice = request.getParameter("idDevice");
+//        deviceService.Delete(Long.valueOf(idDevice));
+//        HttpUtil.responseOk(request, response);
+//        return;
+//    }
+
 }

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

@@ -3,6 +3,7 @@ package cn.efunbox.audio.controller;
 import cn.efunbox.audio.entity.Grouping;
 import cn.efunbox.audio.service.GroupingService;
 import cn.efunbox.audio.utils.ApiCode;
+import cn.efunbox.audio.utils.Common;
 import cn.efunbox.audio.utils.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -97,4 +98,25 @@ public class GroupingController {
         return;
     }
 
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    public void Update(HttpServletRequest request, HttpServletResponse response, @RequestBody Grouping grouping){
+        Grouping groupingOld = groupingService.GetOne(grouping.getId());
+        if(groupingOld==null){
+            HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
+            return;
+        }
+        grouping = (Grouping) Common.CopyValue(grouping, groupingOld);
+        grouping = groupingService.Insert(grouping);
+        HttpUtil.responseOutWithJson(request, response, grouping);
+        return;
+    }
+
+    @RequestMapping(value = "/delete", method = RequestMethod.POST)
+    public void Delete(HttpServletRequest request, HttpServletResponse response){
+        String idGroup = request.getParameter("idGroup");
+        groupingService.Delete(Long.valueOf(idGroup));
+        HttpUtil.responseOk(request, response);
+        return;
+    }
+
 }

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

@@ -7,6 +7,7 @@ import cn.efunbox.audio.service.ChannelService;
 import cn.efunbox.audio.service.GroupingService;
 import cn.efunbox.audio.service.RightsService;
 import cn.efunbox.audio.utils.ApiCode;
+import cn.efunbox.audio.utils.Common;
 import cn.efunbox.audio.utils.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -126,4 +127,25 @@ public class RightsController {
         return;
     }
 
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    public void Update(HttpServletRequest request, HttpServletResponse response, @RequestBody Rights rights){
+        Rights rightsOld = rightsService.GetOne(rights.getId());
+        if(rightsOld==null){
+            HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
+            return;
+        }
+        rights = (Rights) Common.CopyValue(rights, rightsOld);
+        rights = rightsService.Insert(rights);
+        HttpUtil.responseOutWithJson(request, response, rights);
+        return;
+    }
+
+    @RequestMapping(value = "/delete", method = RequestMethod.POST)
+    public void Delete(HttpServletRequest request, HttpServletResponse response){
+        String idRights = request.getParameter("idRights");
+        rightsService.Delete(Long.valueOf(idRights));
+        HttpUtil.responseOk(request, response);
+        return;
+    }
+
 }

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

@@ -21,6 +21,12 @@ public class AdminServiceImpl implements AdminService {
     AdminRepo adminRepo;
 
     @Override
+    public Admin GetOne(Long id){
+        Admin admin = adminRepo.findOne(id);
+        return admin;
+    }
+
+    @Override
     public List<Admin> SearchAll(){
         List<Admin> list = adminRepo.findAll();
         return list;
@@ -52,5 +58,9 @@ public class AdminServiceImpl implements AdminService {
         return a;
     }
 
+    @Override
+    public void Delete(Long id){
+        adminRepo.delete(id);
+    }
 
 }

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

@@ -74,5 +74,9 @@ public class AudioServiceImpl implements AudioService {
         return a;
     }
 
+    @Override
+    public void Delete(Long id){
+        audioRepo.delete(id);
+    }
 
 }

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

@@ -20,6 +20,12 @@ public class ChannelServiceImpl implements ChannelService {
     @Autowired
     ChannelRepo channelRepo;
 
+    @Autowired
+    public Channel GetOne(Long id){
+        Channel channel = channelRepo.findOne(id);
+        return channel;
+    }
+
     @Override
     public List<Channel> SearchAll(){
         List<Channel> list = channelRepo.findAll();
@@ -54,5 +60,9 @@ public class ChannelServiceImpl implements ChannelService {
         return c;
     }
 
+    @Override
+    public void Delete(Long id){
+        channelRepo.delete(id);
+    }
 
 }

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

@@ -97,4 +97,8 @@ public class DeviceServiceImpl implements DeviceService {
         return device;
     }
 
+    @Override
+    public void Delete(Long id){
+        deviceRepo.delete(id);
+    }
 }

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

@@ -21,6 +21,12 @@ public class GroupingServiceImpl implements GroupingService {
     GroupingRepo groupingRepo;
 
     @Override
+    public Grouping GetOne(Long id){
+        Grouping grouping = groupingRepo.findOne(id);
+        return grouping;
+    }
+
+    @Override
     public List<Grouping> SearchAll(){
         List<Grouping> list = groupingRepo.findAll();
         return list;
@@ -54,5 +60,9 @@ public class GroupingServiceImpl implements GroupingService {
         return c;
     }
 
+    @Override
+    public void Delete(Long id){
+        groupingRepo.delete(id);
+    }
 
 }

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

@@ -56,5 +56,9 @@ public class RecordServiceImpl implements RecordService {
         return r;
     }
 
+    @Override
+    public void Delete(Long id){
+        recordRepo.delete(id);
+    }
 
 }

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

@@ -21,6 +21,12 @@ public class RightsServiceImpl implements RightsService {
     RightsRepo rightsRepo;
 
     @Override
+    public Rights GetOne(Long id){
+        Rights rights = rightsRepo.findOne(id);
+        return rights;
+    }
+
+    @Override
     public List<Rights> SearchAll(){
         List<Rights> list = rightsRepo.findAll();
         return list;
@@ -72,5 +78,9 @@ public class RightsServiceImpl implements RightsService {
         return r;
     }
 
+    @Override
+    public void Delete(Long id){
+        rightsRepo.delete(id);
+    }
 
 }

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

@@ -10,6 +10,8 @@ import java.util.List;
  */
 public interface AdminService {
 
+    public Admin GetOne(Long id);
+
     public List<Admin> SearchAll();
 
     public List<Admin> SearchById(Long id);
@@ -19,4 +21,6 @@ public interface AdminService {
     public Admin Insert(Admin admin);
 
     public Admin Update(Admin admin);
+
+    public void Delete(Long id);
 }

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

@@ -21,4 +21,6 @@ public interface AudioService {
     public List<Audio> SearchByNameAlbum(String name, String album);
 
     public Audio Insert(Audio audio);
+
+    public void Delete(Long id);
 }

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

@@ -10,6 +10,8 @@ import java.util.List;
  */
 public interface ChannelService {
 
+    public Channel GetOne(Long id);
+
     public List<Channel> SearchAll();
 
     public List<Channel> SearchById(Long id);
@@ -19,4 +21,6 @@ public interface ChannelService {
     public List<Channel> SearchByName(String name);
 
     public Channel Insert(Channel channel);
+
+    public void Delete(Long id);
 }

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

@@ -23,4 +23,5 @@ public interface DeviceService {
 
     public Device Update(Device device);
 
+    public void Delete(Long id);
 }

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

@@ -10,6 +10,8 @@ import java.util.List;
  */
 public interface GroupingService {
 
+    public Grouping GetOne(Long id);
+
     public List<Grouping> SearchAll();
 
     public List<Grouping> SearchById(Long id);
@@ -19,4 +21,6 @@ public interface GroupingService {
     public List<Grouping> SearchByName(String name);
 
     public Grouping Insert(Grouping grouping);
+
+    public void Delete(Long id);
 }

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

@@ -21,4 +21,6 @@ public interface RecordService {
     public List<Record> SearchByIdAudio(Long id);
 
     public Record Insert(Record record);
+
+    public void Delete(Long id);
 }

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

@@ -10,6 +10,8 @@ import java.util.List;
  */
 public interface RightsService {
 
+    public Rights GetOne(Long id);
+
     public List<Rights> SearchAll();
 
     public List<Rights> SearchById(Long id);
@@ -25,4 +27,6 @@ public interface RightsService {
     public List<Rights> SearchByNameGroup(String name);
 
     public Rights Insert(Rights rights);
+
+    public void Delete(Long id);
 }