设备删除接口增加

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

@@ -1973,18 +1973,24 @@ 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中存在，且is_delete=0
+        //校验判断 1.存在且未软删除
         DevVO devVO = baseDAO.queryByKey(DevVO.class, "dev_id", dev_id);
         if (devVO != null && devVO.getDelete_tag() == 0) {
             return JSONUtil.getErrorMsg("设备已存在");
         }
-        //删除原来数据
-        DevVO deviceVO = new DevVO();
+        //检验判断 2.存在且已软删除 实现逻辑删除恢复
         if (devVO != null && devVO.getDelete_tag() == 1){
-            deviceVO.setId(devVO.getId());
-            baseDAO.deleteByKey(DevVO.class, "dev_id", dev_id);
+            String updateSql = "UPDATE dev_info SET dev_type = ?, software = ?, delete_tag = 0, update_time = ? WHERE dev_id = ?";
+            baseDAO.getJdbcTemplate().update(updateSql, 
+                dev_type,
+                software,
+                new Timestamp(System.currentTimeMillis()),
+                dev_id
+            );
+            return JSONUtil.getSuccessMsg("设备恢复成功");
         }
-        //拿到三个入参直接 插入在数据库dev_info表创建一条新数据，插入成功后返回成功信息
+        //3.新设备添加
+        DevVO deviceVO = new DevVO();
         deviceVO.setDev_id(dev_id);
         deviceVO.setDev_type(dev_type);
         deviceVO.setSoftware(software);
@@ -2006,8 +2012,8 @@ public class WxxcxIndexController<AesException extends Throwable> {
         //2.查询设备
         DevVO devVO = baseDAO.queryByKey(DevVO.class, "dev_id", dev_id);
         if (devVO != null) {
-            devVO.setDelete_tag(1);
-            baseDAO.update(devVO);
+            String updateSql = "UPDATE dev_info SET delete_tag = 1 WHERE dev_id = ?";
+            baseDAO.getJdbcTemplate().update(updateSql, dev_id);
             return JSONUtil.getSuccessMsg("设备删除成功");
         } else {
             return JSONUtil.getErrorMsg("设备不存在");
@@ -2114,8 +2120,8 @@ public class WxxcxIndexController<AesException extends Throwable> {
             IOException {
 
         // 根据queryListParam查询条件是否为空，拼接 jdbc sql
-        StringBuilder sql = new StringBuilder("SELECT * FROM dev_info WHERE 1=1 ");
-        StringBuilder countSql = new StringBuilder("SELECT count(*) FROM dev_info WHERE 1=1 ");
+        StringBuilder sql = new StringBuilder("SELECT * FROM dev_info WHERE delete_tag = 0 ");
+        StringBuilder countSql = new StringBuilder("SELECT count(*) FROM dev_info WHERE delete_tag = 0 ");
         if (!StringUtils.isEmpty(queryListParam.getDevId())) {
             sql.append(" AND dev_id like '%" + queryListParam.getDevId() + "%'");
             countSql.append(" AND dev_id like '%" + queryListParam.getDevId() + "%'");