设备删除接口增加

src/main/java/com/wxxcx/index/WxxcxIndexController.java

@@ -1973,13 +1973,18 @@ public class WxxcxIndexController<AesException extends Throwable> {
     @PostMapping("/addOneDevice")
     @ApiOperation(value = "单个添加设备")
     public R addOneDevice(String dev_id, String dev_type, String software){
-        //比较dev_id是否在dev_info中存在
+        //比较dev_id是否在dev_info中存在，且is_delete=0
         DevVO devVO = baseDAO.queryByKey(DevVO.class, "dev_id", dev_id);
-        if (devVO != null) {
+        if (devVO != null && devVO.getDelete_tag() == 0) {
             return JSONUtil.getErrorMsg("设备已存在");
         }
-        //拿到三个入参直接 插入在数据库dev_info表创建一条新数据，插入成功后返回成功信息
+        //删除原来数据
         DevVO deviceVO = new DevVO();
+        if (devVO != null && devVO.getDelete_tag() == 1){
+            deviceVO.setId(devVO.getId());
+            baseDAO.deleteByKey(DevVO.class, "dev_id", dev_id);
+        }
+        //拿到三个入参直接 插入在数据库dev_info表创建一条新数据，插入成功后返回成功信息
         deviceVO.setDev_id(dev_id);
         deviceVO.setDev_type(dev_type);
         deviceVO.setSoftware(software);
@@ -1990,6 +1995,25 @@ public class WxxcxIndexController<AesException extends Throwable> {
         return JSONUtil.getSuccessMsg("添加成功");
     }
 
+    @PostMapping("/deleteDevice")
+    @ApiOperation(value = "删除设备")
+    public R deleteDevice(String dev_id) {
+        //1.参数校验
+        if (StringUtils.isBlank(dev_id)){
+            return JSONUtil.getErrorMsg("设备ID不能为空");
+        }
+
+        //2.查询设备
+        DevVO devVO = baseDAO.queryByKey(DevVO.class, "dev_id", dev_id);
+        if (devVO != null) {
+            devVO.setDelete_tag(1);
+            baseDAO.update(devVO);
+            return JSONUtil.getSuccessMsg("设备删除成功");
+        } else {
+            return JSONUtil.getErrorMsg("设备不存在");
+        }
+    }
+
     public String getSHA1(String token, String timestamp, String nonce) {
         try {
             String[] array = new String[]{token, timestamp, nonce};