feats

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

@@ -94,61 +94,69 @@ public class TdDeviceController extends BaseController {
         if (isNew) {
             // 如果是新增操作
             if (null != origin) {
-                return ResponseBean.error("该农机已绑定设备, 请先解绑");
+                if (origin.getMachineryId().equals(tdDevice.getMachineryId())) {
+                    return ResponseBean.error("该设备已绑定当前农机");
+                } else {
+                    return ResponseBean.error("该设备已绑定其他农机, 请先解绑");
+                }
             }
         } else {
             if (null != origin) {
                 // 如果非新增操作, 并且当前的 id 与 数据库 id 不一致
                 if (!tdDevice.getDeviceId().equals(origin.getDeviceId())) {
-                    return ResponseBean.error("该农机已绑定设备");
+                    if (origin.getMachineryId().equals(tdDevice.getMachineryId())) {
+                        return ResponseBean.error("该设备已绑定当前农机");
+                    } else {
+                        return ResponseBean.error("该设备已绑定其他农机, 请先解绑");
+                    }
                 }
             } else {
                 isNew = true;
             }
         }
 
-        if (StringUtils.isEmpty(tdDevice.getApiConfig())) {
-            return ResponseBean.error("未绑定海康设备");
-        }
+//        if (StringUtils.isEmpty(tdDevice.getApiConfig())) {
+//            return ResponseBean.error("未绑定海康设备");
+//        }
 
         TaMachinery taMachinery = iTaMachineryService.getExistBy("machinery_id", tdDevice.getMachineryId(), false, true);
         if (taMachinery == null) {
             return ResponseBean.error("绑定农机不存在");
         }
 
-        try {
-            DeviceSummary deviceSummary = JSONObject.parseObject(tdDevice.getApiConfig(), DeviceSummary.class);
-            if (null == deviceSummary) {
-                return ResponseBean.error("未绑定海康设备");
-            }
-
-            if (StringUtils.isEmpty(deviceSummary.getDeviceId())) {
-                return ResponseBean.error("未绑定海康设备");
-            }
-
-            TdHatcDevice hatcDevice = iTdHatcDeviceService.getById(deviceSummary.getDeviceId());
-            if (null == hatcDevice) {
-                return ResponseBean.error("绑定的海康设备不存在");
-            }
-
-            if (null == deviceSummary.getChannel() || deviceSummary.getChannel() < 1) {
-                return ResponseBean.error("未设置通道号, 或者通道号不正确");
-            }
-
-            if (null == deviceSummary.getNetType() || deviceSummary.getNetType() < 0 || deviceSummary.getNetType() > 3) {
-                return ResponseBean.error("未设置网络类型, 或者网络类型不正确");
-            }
-
-            tdDevice.setDeviceNo(hatcDevice.getTerminalId());
-            tdDevice.setDeviceType(hatcDevice.getProductKey());
-            taMachinery.setOnlineStatus(hatcDevice.getDeviceStatus());
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ResponseBean.error("海康设备参数无效");
-        }
+//        try {
+//            DeviceSummary deviceSummary = JSONObject.parseObject(tdDevice.getApiConfig(), DeviceSummary.class);
+//            if (null == deviceSummary) {
+//                return ResponseBean.error("未绑定海康设备");
+//            }
+//
+//            if (StringUtils.isEmpty(deviceSummary.getDeviceId())) {
+//                return ResponseBean.error("未绑定海康设备");
+//            }
+//
+//            TdHatcDevice hatcDevice = iTdHatcDeviceService.getById(deviceSummary.getDeviceId());
+//            if (null == hatcDevice) {
+//                return ResponseBean.error("绑定的海康设备不存在");
+//            }
+//
+//            if (null == deviceSummary.getChannel() || deviceSummary.getChannel() < 1) {
+//                return ResponseBean.error("未设置通道号, 或者通道号不正确");
+//            }
+//
+//            if (null == deviceSummary.getNetType() || deviceSummary.getNetType() < 0 || deviceSummary.getNetType() > 3) {
+//                return ResponseBean.error("未设置网络类型, 或者网络类型不正确");
+//            }
+//
+//            tdDevice.setDeviceNo(hatcDevice.getTerminalId());
+//            tdDevice.setDeviceType(hatcDevice.getProductKey());
+//            taMachinery.setOnlineStatus(hatcDevice.getDeviceStatus());
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            return ResponseBean.error("海康设备参数无效");
+//        }
 
         boolean isOk = isNew ? iTdDeviceService.save(tdDevice) : iTdDeviceService.updateById(tdDevice);
-        iTaMachineryService.updateById(taMachinery);
+//        iTaMachineryService.updateById(taMachinery);
 
         if (isOk){
             return ResponseBean.success(tdDevice);
@@ -156,20 +164,20 @@ public class TdDeviceController extends BaseController {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
-//
-//    /**
-//     * 根据id删除对象
-//     * @param id  实体ID
-//     */
-//    @RequestMapping(value="/tdDevice/{id}", method= RequestMethod.DELETE)
-//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-//    public ResponseBean tdDeviceDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-//        if(iTdDeviceService.removeById(id)){
-//            return ResponseBean.success("success");
-//        }else {
-//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-//        }
-//    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/device/{id}", 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)){
+            return ResponseBean.success("success");
+        } else {
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
 //
 //    /**
 //     * 修改对象

src/main/resources/mapper/TdDeviceMapper.xml

@@ -26,6 +26,13 @@
             t.create_date DESC
     </select>
     <select id="getExistByDevice" resultType="com.yunzhi.nanyang.entity.TdDevice">
-
+        SELECT
+            *
+        FROM
+            td_device t
+        WHERE
+            t.device_type = #{deviceType}
+          AND t.device_no = #{deviceNo}
+          AND t.`status` &gt; -1
     </select>
 </mapper>