feats

src/main/java/com/yunzhi/nanyang/controller/TdDeviceController.java

@@ -80,6 +80,7 @@ public class TdDeviceController extends BaseController {
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean tdDeviceAdd(@ApiParam("保存内容") @RequestBody TdDevice tdDevice) throws Exception{
 
+        tdDevice.setDeviceId(null);
         boolean isNew = StringUtils.isEmpty(tdDevice.getDeviceId());
 
         if (StringUtils.isEmpty(tdDevice.getMachineryId())) {
@@ -169,10 +170,16 @@ public class TdDeviceController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/admin/device/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/device", method= RequestMethod.DELETE)
     @ApiOperation(value="取消绑定", notes = "取消绑定", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean tdDeviceDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
-        if(iTdDeviceService.removeLogicById(id)){
+    public ResponseBean tdDeviceDelete(@ApiParam("设备类型") @RequestParam String deviceType,
+                                       @ApiParam("设备号") @RequestParam String deviceNo) throws Exception{
+        TdDevice device = iTdDeviceService.getExistByDevice(deviceType, deviceNo);
+        if (null == device) {
+            return ResponseBean.error("未找到设备", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        if(iTdDeviceService.removeLogicById(device.getDeviceId())){
             return ResponseBean.success("success");
         } else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);