修复监控设备删除

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TpEquipmentController.java

@@ -60,4 +60,16 @@ public class TpEquipmentController extends BaseController {
         return responseBean;
     }
 
+    @RequestMapping(value = "/equipment/{id}", method = RequestMethod.DELETE)
+    @ApiOperation(value = "删除设备", notes = "删除设备s")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "设备id"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    })
+    public ResponseBean deleteEquipmentById(@PathVariable("id") Integer id, HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iTpEquipmentService.deleteEquipmentById(id);
+        return responseBean;
+    }
+
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITpEquipmentService.java

@@ -30,4 +30,11 @@ public interface ITpEquipmentService extends IService<TpEquipment> {
      * @return
      */
     ResponseBean saveOrUpdateMonitoring(String parameter, UserElement userElement);
+
+    /**
+     * 删除设备
+     * @param equipmentId
+     * @return
+     */
+    ResponseBean deleteEquipmentById(Integer equipmentId);
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpEquipmentServiceImpl.java

@@ -139,4 +139,12 @@ public class TpEquipmentServiceImpl extends ServiceImpl<TpEquipmentMapper, TpEqu
         tpConfiguration.setConfigurationValue(value);
         tpConfigurationMapper.updateById(tpConfiguration);
     }
+
+    @Override
+    public ResponseBean deleteEquipmentById(Integer equipmentId) {
+        ResponseBean responseBean = new ResponseBean();
+        tpEquipmentMapper.deleteById(equipmentId);
+        responseBean.addSuccess("操作成功!");
+        return responseBean;
+    }
 }

VUECODE/smart-property-manage/src/api/equipment.js

@@ -20,3 +20,11 @@ export function equipmentMonitoring(data) {
   })
 }
 
+// 删除设备
+export function deleteEquipment(id) {
+  return request({
+    url: '/equipment/' + id,
+    method: 'delete'
+  })
+}
+

VUECODE/smart-property-manage/src/store/modules/equipment.js

@@ -1,4 +1,4 @@
-import { getAll, equipmentMonitoring } from '@/api/equipment'
+import { getAll, equipmentMonitoring, deleteEquipment } from '@/api/equipment'
 
 const equipment = {
   state: {
@@ -25,6 +25,15 @@ const equipment = {
           reject(error)
         })
       })
+    },
+    DeleteEquipment({ commit }, data) { // 删除设备
+      return new Promise((resolve, reject) => {
+        deleteEquipment(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

VUECODE/smart-property-manage/src/views/systemResources/app/index.vue

@@ -224,14 +224,25 @@ export default {
     },
     monitoringRemover(id, equipmentIndex) { // 监控删除
       // console.log('monitoringForm : ', this.equipmentList, '  下坐标：', index)
-      const tempEquipmentList = []
-      this.equipmentList.map((item, index) => {
-        // 排除需要删除的下坐标的数据
-        if (index !== equipmentIndex) {
-          tempEquipmentList.push(item)
+      // const tempEquipmentList = []
+      // this.equipmentList.map((item, index) => {
+      //   // 排除需要删除的下坐标的数据
+      //   if (index !== equipmentIndex) {
+      //     tempEquipmentList.push(item)
+      //   }
+      // })
+      // this.equipmentList = tempEquipmentList
+
+      this.$store.dispatch('DeleteEquipment', id).then(res => {
+        const resCode = res.code
+        if (resCode === '1') {
+          this.$message.error(res.message)
+          return
         }
+        this.getMenuList()
+      }).catch(() => {
+        console.log('DeleteEquipment error!')
       })
-      this.equipmentList = tempEquipmentList
     },
     onSubmit() {
       this.getPropertyData()