From 47b20dbb8f81f2a3ac113a7e209a8b4d1cb0146d Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 13 九月 2021 14:35:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java |  109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 109 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java
index 957e74a..293670f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java
@@ -2,6 +2,9 @@
 
 import com.panzhihua.common.model.dtos.property.CommonPage;
 import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.property.ComPropertyAlarmSettingVO;
+import com.panzhihua.common.model.vos.property.ComPropertyAlarmVO;
+import com.panzhihua.common.model.vos.property.ComPropertyEquipmentVO;
 import com.panzhihua.common.model.vos.property.ComPropertyRepairVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
@@ -53,4 +56,110 @@
      */
     @GetMapping("/comPropertyRepair/del")
     R comPropertyRepairDelete(@RequestParam("id") Long id);
+
+    /**
+     * 查询报警列表
+     * @param commonPage
+     * @return
+     */
+    @PostMapping("/comPropertyAlarm/queryAll")
+    R comPropertyAlarmSelectAll(@RequestBody CommonPage commonPage);
+
+    /**
+     * 通过主键查询单条数据
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    @GetMapping("/comPropertyAlarm/{id}")
+    R comPropertyAlarmSelectOne(@PathVariable("id") Integer id);
+
+    /**
+     * 新增数据
+     *
+     * @param comPropertyAlarm 实体对象
+     * @return 新增结果
+     */
+    @PostMapping("/comPropertyAlarm")
+    R comPropertyAlarmInsert(@RequestBody ComPropertyAlarmVO comPropertyAlarm);
+
+    /**
+     * 修改数据
+     *
+     * @param comPropertyAlarm 实体对象
+     * @return 修改结果
+     */
+    @PostMapping("/comPropertyAlarm/update")
+    R comPropertyAlarmUpdate(@RequestBody ComPropertyAlarmVO comPropertyAlarm);
+
+    /**
+     * 删除数据
+     *
+     * @param id 主键结合
+     * @return 删除结果
+     */
+    @GetMapping("/comPropertyAlarm/del")
+    R comPropertyAlarmDelete(@RequestParam("id") Long id);
+
+    /**
+     * 分页查询所有数据
+     * @param commonPage 查询实体
+     * @return 所有数据
+     */
+    @PostMapping("/comPropertyEquipment/queryAll")
+    R comPropertyEquipmentSelectAll(@RequestBody CommonPage commonPage);
+
+    /**
+     * 通过主键查询单条数据
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    @GetMapping("/comPropertyEquipment/{id}")
+    R comPropertyEquipmentSelectOne(@PathVariable("id") Integer id);
+
+    /**
+     * 新增数据
+     *
+     * @param comPropertyEquipment 实体对象
+     * @return 新增结果
+     */
+    @PostMapping("/comPropertyEquipment")
+    R comPropertyEquipmentInsert(@RequestBody ComPropertyEquipmentVO comPropertyEquipment);
+
+    /**
+     * 修改数据
+     *
+     * @param comPropertyEquipment 实体对象
+     * @return 修改结果
+     */
+    @PostMapping("/comPropertyEquipment/update")
+    R comPropertyEquipmentUpdate(@RequestBody ComPropertyEquipmentVO comPropertyEquipment);
+
+    /**
+     * 删除数据
+     *
+     * @param id 主键结合
+     * @return 删除结果
+     */
+    @GetMapping("/comPropertyEquipment/del")
+    R comPropertyEquipmentDelete(@RequestParam("id") Long id);
+
+    /**
+     * 新增数据
+     *
+     * @param comPropertyAlarmSettingVO 实体对象
+     * @return 新增结果
+     */
+    @PostMapping("/comPropertyAlarmSetting")
+    R comPropertyAlarmSettingInsert(@RequestBody ComPropertyAlarmSettingVO comPropertyAlarmSettingVO);
+
+    /**
+     * 通过主键查询单条数据
+     *
+     * @param communityId 主键
+     * @return 单条数据
+     */
+    @GetMapping("/comPropertyAlarmSetting")
+    R comPropertyAlarmSettingSelectOne(@RequestParam("communityId") Long communityId);
 }

--
Gitblit v1.7.1