物业管理端

ruoyi-admin/src/main/java/com/ruoyi/web/controller/checkPoint/CheckPointManageController.java

@@ -85,8 +85,8 @@ public class CheckPointManageController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('wuYe:checkPointManage:addList')")
     @PostMapping("/addList")
-    public AjaxResult addList(@RequestBody List<CheckPointManage> checkPointManageList) {
-        return toAjax(checkPointManageService.batchCheckPointManage(checkPointManageList));
+    public AjaxResult addList(@RequestBody CheckPointManage checkPointManage) {
+        return toAjax(checkPointManageService.batchCheckPointManage(checkPointManage.getCheckPointManageList()));
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/communityNews/CommunityNewsController.java

@@ -23,18 +23,16 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/wuYe/news")
-public class CommunityNewsController extends BaseController
-{
+public class CommunityNewsController extends BaseController {
     @Autowired
     private ICommunityNewsService communityNewsService;
 
-/**
- * 查询社区资讯列表
- */
-@PreAuthorize("@ss.hasPermi('wuye:news:list')")
-@GetMapping("/list")
-    public TableDataInfo list(CommunityNews communityNews)
-    {
+    /**
+     * 查询社区资讯列表
+     */
+    @PreAuthorize("@ss.hasPermi('wuye:news:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CommunityNews communityNews) {
         startPage();
         List<CommunityNews> list = communityNewsService.selectCommunityNewsList(communityNews);
         return getDataTable(list);
@@ -46,8 +44,7 @@ public class CommunityNewsController extends BaseController
     @PreAuthorize("@ss.hasPermi('wuye:news:export')")
     @Log(title = "社区资讯", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, CommunityNews communityNews)
-    {
+    public void export(HttpServletResponse response, CommunityNews communityNews) {
         List<CommunityNews> list = communityNewsService.selectCommunityNewsList(communityNews);
         ExcelUtil<CommunityNews> util = new ExcelUtil<CommunityNews>(CommunityNews.class);
         util.exportExcel(response, list, "社区资讯数据");
@@ -58,8 +55,7 @@ public class CommunityNewsController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('wuye:news:query')")
     @GetMapping(value = "/{communityId}")
-    public AjaxResult getInfo(@PathVariable("communityId") Long communityId)
-    {
+    public AjaxResult getInfo(@PathVariable("communityId") Long communityId) {
         return success(communityNewsService.selectCommunityNewsByCommunityId(communityId));
     }
 
@@ -69,8 +65,7 @@ public class CommunityNewsController extends BaseController
     @PreAuthorize("@ss.hasPermi('wuye:news:add')")
     @Log(title = "社区资讯", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CommunityNews communityNews)
-    {
+    public AjaxResult add(@RequestBody CommunityNews communityNews) {
         return toAjax(communityNewsService.insertCommunityNews(communityNews));
     }
 
@@ -80,8 +75,7 @@ public class CommunityNewsController extends BaseController
     @PreAuthorize("@ss.hasPermi('wuye:news:edit')")
     @Log(title = "社区资讯", businessType = BusinessType.UPDATE)
     @PostMapping("/put")
-    public AjaxResult edit(@RequestBody CommunityNews communityNews)
-    {
+    public AjaxResult edit(@RequestBody CommunityNews communityNews) {
         return toAjax(communityNewsService.updateCommunityNews(communityNews));
     }
 
@@ -91,8 +85,7 @@ public class CommunityNewsController extends BaseController
     @PreAuthorize("@ss.hasPermi('wuye:news:remove')")
     @Log(title = "社区资讯", businessType = BusinessType.DELETE)
     @GetMapping("/delete/{communityIds}")
-    public AjaxResult remove(@PathVariable Long[] communityIds)
-    {
+    public AjaxResult remove(@PathVariable Long[] communityIds) {
         return toAjax(communityNewsService.deleteCommunityNewsByCommunityIds(communityIds));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/complaintSuggestion/ComplaintSuggestionController.java

@@ -11,6 +11,7 @@ import com.ruoyi.system.service.IComplaintSuggestionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -22,18 +23,16 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/wuYe/suggestion")
-public class ComplaintSuggestionController extends BaseController
-{
+public class ComplaintSuggestionController extends BaseController {
     @Autowired
     private IComplaintSuggestionService complaintSuggestionService;
 
-/**
- * 查询投诉建议列表
- */
-@PreAuthorize("@ss.hasPermi('wuYe:suggestion:list')")
-@GetMapping("/list")
-    public TableDataInfo list(ComplaintSuggestion complaintSuggestion)
-    {
+    /**
+     * 查询投诉建议列表
+     */
+    @PreAuthorize("@ss.hasPermi('wuYe:suggestion:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ComplaintSuggestion complaintSuggestion) {
         startPage();
         List<ComplaintSuggestion> list = complaintSuggestionService.selectComplaintSuggestionList(complaintSuggestion);
         return getDataTable(list);
@@ -45,8 +44,7 @@ public class ComplaintSuggestionController extends BaseController
     @PreAuthorize("@ss.hasPermi('wuYe:suggestion:export')")
     @Log(title = "投诉建议", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, ComplaintSuggestion complaintSuggestion)
-    {
+    public void export(HttpServletResponse response, ComplaintSuggestion complaintSuggestion) {
         List<ComplaintSuggestion> list = complaintSuggestionService.selectComplaintSuggestionList(complaintSuggestion);
         ExcelUtil<ComplaintSuggestion> util = new ExcelUtil<ComplaintSuggestion>(ComplaintSuggestion.class);
         util.exportExcel(response, list, "投诉建议数据");
@@ -57,8 +55,7 @@ public class ComplaintSuggestionController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('wuYe:suggestion:query')")
     @GetMapping(value = "/{suggestionId}")
-    public AjaxResult getInfo(@PathVariable("suggestionId") Long suggestionId)
-    {
+    public AjaxResult getInfo(@PathVariable("suggestionId") Long suggestionId) {
         return success(complaintSuggestionService.selectComplaintSuggestionBySuggestionId(suggestionId));
     }
 
@@ -68,8 +65,7 @@ public class ComplaintSuggestionController extends BaseController
     @PreAuthorize("@ss.hasPermi('wuYe:suggestion:add')")
     @Log(title = "投诉建议", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody ComplaintSuggestion complaintSuggestion)
-    {
+    public AjaxResult add(@RequestBody ComplaintSuggestion complaintSuggestion) {
         return toAjax(complaintSuggestionService.insertComplaintSuggestion(complaintSuggestion));
     }
 
@@ -79,8 +75,7 @@ public class ComplaintSuggestionController extends BaseController
     @PreAuthorize("@ss.hasPermi('wuYe:suggestion:edit')")
     @Log(title = "投诉建议", businessType = BusinessType.UPDATE)
     @PostMapping("/put")
-    public AjaxResult edit(@RequestBody ComplaintSuggestion complaintSuggestion)
-    {
+    public AjaxResult edit(@RequestBody ComplaintSuggestion complaintSuggestion) {
         return toAjax(complaintSuggestionService.updateComplaintSuggestion(complaintSuggestion));
     }
 
@@ -90,8 +85,7 @@ public class ComplaintSuggestionController extends BaseController
     @PreAuthorize("@ss.hasPermi('wuYe:suggestion:remove')")
     @Log(title = "投诉建议", businessType = BusinessType.DELETE)
     @GetMapping("/delete/{suggestionIds}")
-    public AjaxResult remove(@PathVariable Long[] suggestionIds)
-    {
+    public AjaxResult remove(@PathVariable Long[] suggestionIds) {
         return toAjax(complaintSuggestionService.deleteComplaintSuggestionBySuggestionIds(suggestionIds));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/houseInfo/HouseInfoController.java

@@ -0,0 +1,91 @@
+package com.ruoyi.web.controller.houseInfo;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.houseInfo.HouseInfo;
+import com.ruoyi.system.service.IHouseInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 房屋信息Controller
+ *
+ * @author boman
+ * @date 2025-02-20
+ */
+@RestController
+@RequestMapping("/wuYe/houseInfo")
+public class HouseInfoController extends BaseController {
+    @Autowired
+    private IHouseInfoService houseInfoService;
+
+    /**
+     * 查询房屋信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('wuYe:houseInfo:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(HouseInfo houseInfo) {
+        startPage();
+        List<HouseInfo> list = houseInfoService.selectHouseInfoList(houseInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出房屋信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('wuYe:houseInfo:export')")
+    @Log(title = "房屋信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, HouseInfo houseInfo) {
+        List<HouseInfo> list = houseInfoService.selectHouseInfoList(houseInfo);
+        ExcelUtil<HouseInfo> util = new ExcelUtil<HouseInfo>(HouseInfo.class);
+        util.exportExcel(response, list, "房屋信息数据");
+    }
+
+    /**
+     * 获取房屋信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('wuYe:houseInfo:query')")
+    @GetMapping(value = "/{houseId}")
+    public AjaxResult getInfo(@PathVariable("houseId") Long houseId) {
+        return success(houseInfoService.selectHouseInfoByHouseId(houseId));
+    }
+
+    /**
+     * 新增房屋信息
+     */
+    @PreAuthorize("@ss.hasPermi('wuYe:houseInfo:add')")
+    @Log(title = "房屋信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody HouseInfo houseInfo) {
+        return toAjax(houseInfoService.insertHouseInfo(houseInfo));
+    }
+
+    /**
+     * 修改房屋信息
+     */
+    @PreAuthorize("@ss.hasPermi('wuYe:houseInfo:edit')")
+    @Log(title = "房屋信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody HouseInfo houseInfo) {
+        return toAjax(houseInfoService.updateHouseInfo(houseInfo));
+    }
+
+    /**
+     * 删除房屋信息
+     */
+    @PreAuthorize("@ss.hasPermi('wuYe:houseInfo:remove')")
+    @Log(title = "房屋信息", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{houseIds}")
+    public AjaxResult remove(@PathVariable Long[] houseIds) {
+        return toAjax(houseInfoService.deleteHouseInfoByHouseIds(houseIds));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/houseManage/HouseManageController.java

@@ -1,98 +0,0 @@
-package com.ruoyi.web.controller.houseManage;
-
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.domain.houseManage.HouseManage;
-import com.ruoyi.system.service.IHouseManageService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * 房屋管理Controller
- *
- * @author boman
- * @date 2025-02-14
- */
-@RestController
-@RequestMapping("/wuYe/houseManage")
-public class HouseManageController extends BaseController
-{
-    @Autowired
-    private IHouseManageService houseManageService;
-
-/**
- * 查询房屋管理列表
- */
-@PreAuthorize("@ss.hasPermi('wuYe:houseManage:list')")
-@GetMapping("/list")
-    public TableDataInfo list(HouseManage houseManage)
-    {
-        startPage();
-        List<HouseManage> list = houseManageService.selectHouseManageList(houseManage);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出房屋管理列表
-     */
-    @PreAuthorize("@ss.hasPermi('wuYe:houseManage:export')")
-    @Log(title = "房屋管理", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, HouseManage houseManage)
-    {
-        List<HouseManage> list = houseManageService.selectHouseManageList(houseManage);
-        ExcelUtil<HouseManage> util = new ExcelUtil<HouseManage>(HouseManage.class);
-        util.exportExcel(response, list, "房屋管理数据");
-    }
-
-    /**
-     * 获取房屋管理详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('wuYe:houseManage:query')")
-    @GetMapping(value = "/{portalId}")
-    public AjaxResult getInfo(@PathVariable("portalId") Long portalId)
-    {
-        return success(houseManageService.selectHouseManageByPortalId(portalId));
-    }
-
-    /**
-     * 新增房屋管理
-     */
-    @PreAuthorize("@ss.hasPermi('wuYe:houseManage:add')")
-    @Log(title = "房屋管理", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody HouseManage houseManage)
-    {
-        return toAjax(houseManageService.insertHouseManage(houseManage));
-    }
-
-    /**
-     * 修改房屋管理
-     */
-    @PreAuthorize("@ss.hasPermi('wuYe:houseManage:edit')")
-    @Log(title = "房屋管理", businessType = BusinessType.UPDATE)
-    @PostMapping("/put")
-    public AjaxResult edit(@RequestBody HouseManage houseManage)
-    {
-        return toAjax(houseManageService.updateHouseManage(houseManage));
-    }
-
-    /**
-     * 删除房屋管理
-     */
-    @PreAuthorize("@ss.hasPermi('wuYe:houseManage:remove')")
-    @Log(title = "房屋管理", businessType = BusinessType.DELETE)
-    @GetMapping("/delete/{portalIds}")
-    public AjaxResult remove(@PathVariable Long[] portalIds)
-    {
-        return toAjax(houseManageService.deleteHouseManageByPortalIds(portalIds));
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/illegalParking/IllegalParkingController.java

@@ -88,4 +88,12 @@ public class IllegalParkingController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] illegalParkingIds) {
         return toAjax(illegalParkingService.deleteIllegalParkingByIllegalParkingIds(illegalParkingIds));
     }
+    /**
+     * 解除黑名单
+     */
+    @PreAuthorize("@ss.hasPermi('wuYe:illegalParking:cancel')")
+    @PostMapping("/cancel")
+    public AjaxResult cancel(@RequestBody IllegalParking illegalParking) {
+        return illegalParkingService.cancel(illegalParking);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/landlord/HouseLandlordController.java

@@ -1,98 +0,0 @@
-package com.ruoyi.web.controller.landlord;
-
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.domain.landlord.HouseLandlord;
-import com.ruoyi.system.service.IHouseLandlordService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * 业主管理Controller
- *
- * @author boman
- * @date 2025-02-14
- */
-@RestController
-@RequestMapping("/wuYe/landlord")
-public class HouseLandlordController extends BaseController
-{
-    @Autowired
-    private IHouseLandlordService houseLandlordService;
-
-/**
- * 查询业主管理列表
- */
-@PreAuthorize("@ss.hasPermi('wuYe:landlord:list')")
-@GetMapping("/list")
-    public TableDataInfo list(HouseLandlord houseLandlord)
-    {
-        startPage();
-        List<HouseLandlord> list = houseLandlordService.selectHouseLandlordList(houseLandlord);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出业主管理列表
-     */
-    @PreAuthorize("@ss.hasPermi('wuYe:landlord:export')")
-    @Log(title = "业主管理", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, HouseLandlord houseLandlord)
-    {
-        List<HouseLandlord> list = houseLandlordService.selectHouseLandlordList(houseLandlord);
-        ExcelUtil<HouseLandlord> util = new ExcelUtil<HouseLandlord>(HouseLandlord.class);
-        util.exportExcel(response, list, "业主管理数据");
-    }
-
-    /**
-     * 获取业主管理详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('wuYe:landlord:query')")
-    @GetMapping(value = "/{houseLandlordId}")
-    public AjaxResult getInfo(@PathVariable("houseLandlordId") Long houseLandlordId)
-    {
-        return success(houseLandlordService.selectHouseLandlordByHouseLandlordId(houseLandlordId));
-    }
-
-    /**
-     * 新增业主管理
-     */
-    @PreAuthorize("@ss.hasPermi('wuYe:landlord:add')")
-    @Log(title = "业主管理", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody HouseLandlord houseLandlord)
-    {
-        return toAjax(houseLandlordService.insertHouseLandlord(houseLandlord));
-    }
-
-    /**
-     * 修改业主管理
-     */
-    @PreAuthorize("@ss.hasPermi('wuYe:landlord:edit')")
-    @Log(title = "业主管理", businessType = BusinessType.UPDATE)
-    @PostMapping("/put")
-    public AjaxResult edit(@RequestBody HouseLandlord houseLandlord)
-    {
-        return toAjax(houseLandlordService.updateHouseLandlord(houseLandlord));
-    }
-
-    /**
-     * 删除业主管理
-     */
-    @PreAuthorize("@ss.hasPermi('wuYe:landlord:remove')")
-    @Log(title = "业主管理", businessType = BusinessType.DELETE)
-    @GetMapping("/delete/{houseLandlordIds}")
-    public AjaxResult remove(@PathVariable Long[] houseLandlordIds)
-    {
-        return toAjax(houseLandlordService.deleteHouseLandlordByHouseLandlordIds(houseLandlordIds));
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/partyNews/PartyNewsController.java

@@ -23,18 +23,16 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/wuYe/partyNews")
-public class PartyNewsController extends BaseController
-{
+public class PartyNewsController extends BaseController {
     @Autowired
     private IPartyNewsService partyNewsService;
 
-/**
- * 查询党建资讯列表
- */
-@PreAuthorize("@ss.hasPermi('wuYe:news:list')")
-@GetMapping("/list")
-    public TableDataInfo list(PartyNews partyNews)
-    {
+    /**
+     * 查询党建资讯列表
+     */
+    @PreAuthorize("@ss.hasPermi('wuYe:partyNews:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(PartyNews partyNews) {
         startPage();
         List<PartyNews> list = partyNewsService.selectPartyNewsList(partyNews);
         return getDataTable(list);
@@ -43,11 +41,10 @@ public class PartyNewsController extends BaseController
     /**
      * 导出党建资讯列表
      */
-    @PreAuthorize("@ss.hasPermi('wuYe:news:export')")
+    @PreAuthorize("@ss.hasPermi('wuYe:partyNews:export')")
     @Log(title = "党建资讯", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, PartyNews partyNews)
-    {
+    public void export(HttpServletResponse response, PartyNews partyNews) {
         List<PartyNews> list = partyNewsService.selectPartyNewsList(partyNews);
         ExcelUtil<PartyNews> util = new ExcelUtil<PartyNews>(PartyNews.class);
         util.exportExcel(response, list, "党建资讯数据");
@@ -56,43 +53,39 @@ public class PartyNewsController extends BaseController
     /**
      * 获取党建资讯详细信息
      */
-    @PreAuthorize("@ss.hasPermi('wuYe:news:query')")
+    @PreAuthorize("@ss.hasPermi('wuYe:partyNews:query')")
     @GetMapping(value = "/{partyId}")
-    public AjaxResult getInfo(@PathVariable("partyId") Long partyId)
-    {
+    public AjaxResult getInfo(@PathVariable("partyId") Long partyId) {
         return success(partyNewsService.selectPartyNewsByPartyId(partyId));
     }
 
     /**
      * 新增党建资讯
      */
-    @PreAuthorize("@ss.hasPermi('wuYe:news:add')")
+    @PreAuthorize("@ss.hasPermi('wuYe:partyNews:add')")
     @Log(title = "党建资讯", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody PartyNews partyNews)
-    {
+    public AjaxResult add(@RequestBody PartyNews partyNews) {
         return toAjax(partyNewsService.insertPartyNews(partyNews));
     }
 
     /**
      * 修改党建资讯
      */
-    @PreAuthorize("@ss.hasPermi('wuYe:news:edit')")
+    @PreAuthorize("@ss.hasPermi('wuYe:partyNews:edit')")
     @Log(title = "党建资讯", businessType = BusinessType.UPDATE)
     @PostMapping("/put")
-    public AjaxResult edit(@RequestBody PartyNews partyNews)
-    {
+    public AjaxResult edit(@RequestBody PartyNews partyNews) {
         return toAjax(partyNewsService.updatePartyNews(partyNews));
     }
 
     /**
      * 删除党建资讯
      */
-    @PreAuthorize("@ss.hasPermi('wuYe:news:remove')")
+    @PreAuthorize("@ss.hasPermi('wuYe:partyNews:remove')")
     @Log(title = "党建资讯", businessType = BusinessType.DELETE)
     @GetMapping("/delete/{partyIds}")
-    public AjaxResult remove(@PathVariable Long[] partyIds)
-    {
+    public AjaxResult remove(@PathVariable Long[] partyIds) {
         return toAjax(partyNewsService.deletePartyNewsByPartyIds(partyIds));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/propertyRepair/PropertyRepairController.java

@@ -23,18 +23,28 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/wuYe/repair")
-public class PropertyRepairController extends BaseController
-{
+public class PropertyRepairController extends BaseController {
     @Autowired
     private IPropertyRepairService propertyRepairService;
 
-/**
- * 查询物业报修列表
- */
-@PreAuthorize("@ss.hasPermi('wuYe:repair:list')")
-@GetMapping("/list")
-    public TableDataInfo list(PropertyRepair propertyRepair)
-    {
+    /**
+     * 查询物业报修列表
+     */
+    @PreAuthorize("@ss.hasPermi('wuYe:repair:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(PropertyRepair propertyRepair) {
+        startPage();
+        List<PropertyRepair> list = propertyRepairService.selectPropertyRepairList(propertyRepair);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询我的物业报修列表
+     */
+    @PreAuthorize("@ss.hasPermi('wuYe:repair:myList')")
+    @GetMapping("/myList")
+    public TableDataInfo myList(PropertyRepair propertyRepair) {
+        propertyRepair.setStaffId(getUserId());
         startPage();
         List<PropertyRepair> list = propertyRepairService.selectPropertyRepairList(propertyRepair);
         return getDataTable(list);
@@ -46,8 +56,7 @@ public class PropertyRepairController extends BaseController
     @PreAuthorize("@ss.hasPermi('wuYe:repair:export')")
     @Log(title = "物业报修", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, PropertyRepair propertyRepair)
-    {
+    public void export(HttpServletResponse response, PropertyRepair propertyRepair) {
         List<PropertyRepair> list = propertyRepairService.selectPropertyRepairList(propertyRepair);
         ExcelUtil<PropertyRepair> util = new ExcelUtil<PropertyRepair>(PropertyRepair.class);
         util.exportExcel(response, list, "物业报修数据");
@@ -58,8 +67,7 @@ public class PropertyRepairController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('wuYe:repair:query')")
     @GetMapping(value = "/{repairId}")
-    public AjaxResult getInfo(@PathVariable("repairId") Long repairId)
-    {
+    public AjaxResult getInfo(@PathVariable("repairId") Long repairId) {
         return success(propertyRepairService.selectPropertyRepairByRepairId(repairId));
     }
 
@@ -69,8 +77,7 @@ public class PropertyRepairController extends BaseController
     @PreAuthorize("@ss.hasPermi('wuYe:repair:add')")
     @Log(title = "物业报修", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody PropertyRepair propertyRepair)
-    {
+    public AjaxResult add(@RequestBody PropertyRepair propertyRepair) {
         return toAjax(propertyRepairService.insertPropertyRepair(propertyRepair));
     }
 
@@ -80,8 +87,7 @@ public class PropertyRepairController extends BaseController
     @PreAuthorize("@ss.hasPermi('wuYe:repair:edit')")
     @Log(title = "物业报修", businessType = BusinessType.UPDATE)
     @PostMapping("/put")
-    public AjaxResult edit(@RequestBody PropertyRepair propertyRepair)
-    {
+    public AjaxResult edit(@RequestBody PropertyRepair propertyRepair) {
         return toAjax(propertyRepairService.updatePropertyRepair(propertyRepair));
     }
 
@@ -91,8 +97,7 @@ public class PropertyRepairController extends BaseController
     @PreAuthorize("@ss.hasPermi('wuYe:repair:remove')")
     @Log(title = "物业报修", businessType = BusinessType.DELETE)
     @GetMapping("/delete/{repairIds}")
-    public AjaxResult remove(@PathVariable Long[] repairIds)
-    {
+    public AjaxResult remove(@PathVariable Long[] repairIds) {
         return toAjax(propertyRepairService.deletePropertyRepairByRepairIds(repairIds));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/proprietorCar/ProprietorCarController.java

@@ -19,22 +19,20 @@ import java.util.List;
  * 业主车辆管理Controller
  *
  * @author boman
- * @date 2025-02-14
+ * @date 2025-02-20
  */
 @RestController
 @RequestMapping("/wuYe/car")
-public class ProprietorCarController extends BaseController
-{
+public class ProprietorCarController extends BaseController {
     @Autowired
     private IProprietorCarService proprietorCarService;
 
-/**
- * 查询业主车辆管理列表
- */
-@PreAuthorize("@ss.hasPermi('wuYe:car:list')")
-@GetMapping("/list")
-    public TableDataInfo list(ProprietorCar proprietorCar)
-    {
+    /**
+     * 查询业主车辆管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('wuYe:car:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ProprietorCar proprietorCar) {
         startPage();
         List<ProprietorCar> list = proprietorCarService.selectProprietorCarList(proprietorCar);
         return getDataTable(list);
@@ -46,8 +44,7 @@ public class ProprietorCarController extends BaseController
     @PreAuthorize("@ss.hasPermi('wuYe:car:export')")
     @Log(title = "业主车辆管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, ProprietorCar proprietorCar)
-    {
+    public void export(HttpServletResponse response, ProprietorCar proprietorCar) {
         List<ProprietorCar> list = proprietorCarService.selectProprietorCarList(proprietorCar);
         ExcelUtil<ProprietorCar> util = new ExcelUtil<ProprietorCar>(ProprietorCar.class);
         util.exportExcel(response, list, "业主车辆管理数据");
@@ -58,8 +55,7 @@ public class ProprietorCarController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('wuYe:car:query')")
     @GetMapping(value = "/{carId}")
-    public AjaxResult getInfo(@PathVariable("carId") Long carId)
-    {
+    public AjaxResult getInfo(@PathVariable("carId") Long carId) {
         return success(proprietorCarService.selectProprietorCarByCarId(carId));
     }
 
@@ -69,8 +65,7 @@ public class ProprietorCarController extends BaseController
     @PreAuthorize("@ss.hasPermi('wuYe:car:add')")
     @Log(title = "业主车辆管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody ProprietorCar proprietorCar)
-    {
+    public AjaxResult add(@RequestBody ProprietorCar proprietorCar) {
         return toAjax(proprietorCarService.insertProprietorCar(proprietorCar));
     }
 
@@ -80,8 +75,7 @@ public class ProprietorCarController extends BaseController
     @PreAuthorize("@ss.hasPermi('wuYe:car:edit')")
     @Log(title = "业主车辆管理", businessType = BusinessType.UPDATE)
     @PostMapping("/put")
-    public AjaxResult edit(@RequestBody ProprietorCar proprietorCar)
-    {
+    public AjaxResult edit(@RequestBody ProprietorCar proprietorCar) {
         return toAjax(proprietorCarService.updateProprietorCar(proprietorCar));
     }
 
@@ -91,8 +85,7 @@ public class ProprietorCarController extends BaseController
     @PreAuthorize("@ss.hasPermi('wuYe:car:remove')")
     @Log(title = "业主车辆管理", businessType = BusinessType.DELETE)
     @GetMapping("/delete/{carIds}")
-    public AjaxResult remove(@PathVariable Long[] carIds)
-    {
+    public AjaxResult remove(@PathVariable Long[] carIds) {
         return toAjax(proprietorCarService.deleteProprietorCarByCarIds(carIds));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/proprietorHouse/ProprietorHouseController.java

@@ -1,98 +0,0 @@
-package com.ruoyi.web.controller.proprietorHouse;
-
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.domain.proprietorHouse.ProprietorHouse;
-import com.ruoyi.system.service.IProprietorHouseService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * 业主房屋管理Controller
- *
- * @author boman
- * @date 2025-02-14
- */
-@RestController
-@RequestMapping("/wuYe/house")
-public class ProprietorHouseController extends BaseController
-{
-    @Autowired
-    private IProprietorHouseService proprietorHouseService;
-
-/**
- * 查询业主房屋管理列表
- */
-@PreAuthorize("@ss.hasPermi('wuYe:house:list')")
-@GetMapping("/list")
-    public TableDataInfo list(ProprietorHouse proprietorHouse)
-    {
-        startPage();
-        List<ProprietorHouse> list = proprietorHouseService.selectProprietorHouseList(proprietorHouse);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出业主房屋管理列表
-     */
-    @PreAuthorize("@ss.hasPermi('wuYe:house:export')")
-    @Log(title = "业主房屋管理", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, ProprietorHouse proprietorHouse)
-    {
-        List<ProprietorHouse> list = proprietorHouseService.selectProprietorHouseList(proprietorHouse);
-        ExcelUtil<ProprietorHouse> util = new ExcelUtil<ProprietorHouse>(ProprietorHouse.class);
-        util.exportExcel(response, list, "业主房屋管理数据");
-    }
-
-    /**
-     * 获取业主房屋管理详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('wuYe:house:query')")
-    @GetMapping(value = "/{proprietorId}")
-    public AjaxResult getInfo(@PathVariable("proprietorId") Long proprietorId)
-    {
-        return success(proprietorHouseService.selectProprietorHouseByProprietorId(proprietorId));
-    }
-
-    /**
-     * 新增业主房屋管理
-     */
-    @PreAuthorize("@ss.hasPermi('wuYe:house:add')")
-    @Log(title = "业主房屋管理", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody ProprietorHouse proprietorHouse)
-    {
-        return toAjax(proprietorHouseService.insertProprietorHouse(proprietorHouse));
-    }
-
-    /**
-     * 修改业主房屋管理
-     */
-    @PreAuthorize("@ss.hasPermi('wuYe:house:edit')")
-    @Log(title = "业主房屋管理", businessType = BusinessType.UPDATE)
-    @PostMapping("/put")
-    public AjaxResult edit(@RequestBody ProprietorHouse proprietorHouse)
-    {
-        return toAjax(proprietorHouseService.updateProprietorHouse(proprietorHouse));
-    }
-
-    /**
-     * 删除业主房屋管理
-     */
-    @PreAuthorize("@ss.hasPermi('wuYe:house:remove')")
-    @Log(title = "业主房屋管理", businessType = BusinessType.DELETE)
-    @GetMapping("/delete/{proprietorIds}")
-    public AjaxResult remove(@PathVariable Long[] proprietorIds)
-    {
-        return toAjax(proprietorHouseService.deleteProprietorHouseByProprietorIds(proprietorIds));
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/reservRecord/ReservRecordController.java

@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.reservRecord;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.reservRecord.ReservRecord;
+import com.ruoyi.system.service.IReservRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 预约记录Controller
+ *
+ * @author boman
+ * @date 2025-02-19
+ */
+@RestController
+@RequestMapping("/wuYe/reservRecord")
+public class ReservRecordController extends BaseController
+{
+    @Autowired
+    private IReservRecordService reservRecordService;
+
+/**
+ * 查询预约记录列表
+ */
+@PreAuthorize("@ss.hasPermi('wuYe:reservRecord:list')")
+@GetMapping("/list")
+    public TableDataInfo list(ReservRecord reservRecord)
+    {
+        startPage();
+        List<ReservRecord> list = reservRecordService.selectReservRecordList(reservRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出预约记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('wuYe:reservRecord:export')")
+    @Log(title = "预约记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ReservRecord reservRecord)
+    {
+        List<ReservRecord> list = reservRecordService.selectReservRecordList(reservRecord);
+        ExcelUtil<ReservRecord> util = new ExcelUtil<ReservRecord>(ReservRecord.class);
+        util.exportExcel(response, list, "预约记录数据");
+    }
+
+    /**
+     * 获取预约记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('wuYe:reservRecord:query')")
+    @GetMapping(value = "/{reservRecordId}")
+    public AjaxResult getInfo(@PathVariable("reservRecordId") Long reservRecordId)
+    {
+        return success(reservRecordService.selectReservRecordByReservRecordId(reservRecordId));
+    }
+
+    /**
+     * 新增预约记录
+     */
+    @PreAuthorize("@ss.hasPermi('wuYe:reservRecord:add')")
+    @Log(title = "预约记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ReservRecord reservRecord)
+    {
+        return toAjax(reservRecordService.insertReservRecord(reservRecord));
+    }
+
+    /**
+     * 修改预约记录
+     */
+    @PreAuthorize("@ss.hasPermi('wuYe:reservRecord:edit')")
+    @Log(title = "预约记录", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody ReservRecord reservRecord)
+    {
+        return toAjax(reservRecordService.updateReservRecord(reservRecord));
+    }
+
+    /**
+     * 删除预约记录
+     */
+    @PreAuthorize("@ss.hasPermi('wuYe:reservRecord:remove')")
+    @Log(title = "预约记录", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{reservRecordIds}")
+    public AjaxResult remove(@PathVariable Long[] reservRecordIds)
+    {
+        return toAjax(reservRecordService.deleteReservRecordByReservRecordIds(reservRecordIds));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/residentInfo/ResidentInfoController.java

@@ -0,0 +1,91 @@
+package com.ruoyi.web.controller.residentInfo;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.residentInfo.ResidentInfo;
+import com.ruoyi.system.service.IResidentInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 居住人员信息，存储居住人员的详细信息Controller
+ *
+ * @author boman
+ * @date 2025-02-20
+ */
+@RestController
+@RequestMapping("/wuYe/residentInfo")
+public class ResidentInfoController extends BaseController {
+    @Autowired
+    private IResidentInfoService residentInfoService;
+
+    /**
+     * 查询居住人员信息，存储居住人员的详细信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('wuYe:residentInfo:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ResidentInfo residentInfo) {
+        startPage();
+        List<ResidentInfo> list = residentInfoService.selectResidentInfoList(residentInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出居住人员信息，存储居住人员的详细信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('wuYe:residentInfo:export')")
+    @Log(title = "居住人员信息，存储居住人员的详细信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ResidentInfo residentInfo) {
+        List<ResidentInfo> list = residentInfoService.selectResidentInfoList(residentInfo);
+        ExcelUtil<ResidentInfo> util = new ExcelUtil<ResidentInfo>(ResidentInfo.class);
+        util.exportExcel(response, list, "居住人员信息，存储居住人员的详细信息数据");
+    }
+
+    /**
+     * 获取居住人员信息，存储居住人员的详细信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('wuYe:residentInfo:query')")
+    @GetMapping(value = "/{residentId}")
+    public AjaxResult getInfo(@PathVariable("residentId") Long residentId) {
+        return success(residentInfoService.selectResidentInfoByResidentId(residentId));
+    }
+
+    /**
+     * 新增居住人员信息，存储居住人员的详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('wuYe:residentInfo:add')")
+    @Log(title = "居住人员信息，存储居住人员的详细信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ResidentInfo residentInfo) {
+        return toAjax(residentInfoService.insertResidentInfo(residentInfo));
+    }
+
+    /**
+     * 修改居住人员信息，存储居住人员的详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('wuYe:residentInfo:edit')")
+    @Log(title = "居住人员信息，存储居住人员的详细信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody ResidentInfo residentInfo) {
+        return toAjax(residentInfoService.updateResidentInfo(residentInfo));
+    }
+
+    /**
+     * 删除居住人员信息，存储居住人员的详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('wuYe:residentInfo:remove')")
+    @Log(title = "居住人员信息，存储居住人员的详细信息", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{residentIds}")
+    public AjaxResult remove(@PathVariable Long[] residentIds) {
+        return toAjax(residentInfoService.deleteResidentInfoByResidentIds(residentIds));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/staffManage/StaffManageController.java

@@ -11,6 +11,7 @@ import com.ruoyi.system.service.IStaffManageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -22,18 +23,16 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/wuYe/staffManage")
-public class StaffManageController extends BaseController
-{
+public class StaffManageController extends BaseController {
     @Autowired
     private IStaffManageService staffManageService;
 
-/**
- * 查询员工管理列表
- */
-@PreAuthorize("@ss.hasPermi('wuYe:staffManage:list')")
-@GetMapping("/list")
-    public TableDataInfo list(StaffManage staffManage)
-    {
+    /**
+     * 查询员工管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('wuYe:staffManage:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(StaffManage staffManage) {
         startPage();
         List<StaffManage> list = staffManageService.selectStaffManageList(staffManage);
         return getDataTable(list);
@@ -45,8 +44,7 @@ public class StaffManageController extends BaseController
     @PreAuthorize("@ss.hasPermi('wuYe:staffManage:export')")
     @Log(title = "员工管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, StaffManage staffManage)
-    {
+    public void export(HttpServletResponse response, StaffManage staffManage) {
         List<StaffManage> list = staffManageService.selectStaffManageList(staffManage);
         ExcelUtil<StaffManage> util = new ExcelUtil<StaffManage>(StaffManage.class);
         util.exportExcel(response, list, "员工管理数据");
@@ -57,8 +55,7 @@ public class StaffManageController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('wuYe:staffManage:query')")
     @GetMapping(value = "/{staffId}")
-    public AjaxResult getInfo(@PathVariable("staffId") Long staffId)
-    {
+    public AjaxResult getInfo(@PathVariable("staffId") Long staffId) {
         return success(staffManageService.selectStaffManageByStaffId(staffId));
     }
 
@@ -68,8 +65,7 @@ public class StaffManageController extends BaseController
     @PreAuthorize("@ss.hasPermi('wuYe:staffManage:add')")
     @Log(title = "员工管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody StaffManage staffManage)
-    {
+    public AjaxResult add(@RequestBody StaffManage staffManage) {
         return toAjax(staffManageService.insertStaffManage(staffManage));
     }
 
@@ -79,8 +75,7 @@ public class StaffManageController extends BaseController
     @PreAuthorize("@ss.hasPermi('wuYe:staffManage:edit')")
     @Log(title = "员工管理", businessType = BusinessType.UPDATE)
     @PostMapping("/put")
-    public AjaxResult edit(@RequestBody StaffManage staffManage)
-    {
+    public AjaxResult edit(@RequestBody StaffManage staffManage) {
         return toAjax(staffManageService.updateStaffManage(staffManage));
     }
 
@@ -90,8 +85,7 @@ public class StaffManageController extends BaseController
     @PreAuthorize("@ss.hasPermi('wuYe:staffManage:remove')")
     @Log(title = "员工管理", businessType = BusinessType.DELETE)
     @GetMapping("/delete/{staffIds}")
-    public AjaxResult remove(@PathVariable Long[] staffIds)
-    {
+    public AjaxResult remove(@PathVariable Long[] staffIds) {
         return toAjax(staffManageService.deleteStaffManageByStaffIds(staffIds));
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/checkPoint/CheckPointManage.java

@@ -7,6 +7,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 巡更点管理对象 check_point_manage
@@ -45,8 +46,17 @@ public class CheckPointManage extends BaseEntity
     /** 巡更人负责人id */
     @Excel(name = "巡更人负责人id")
     private Long useId;
+    private List<CheckPointManage> checkPointManageList;
 
-    public void setCheckPointManageId(Long checkPointManageId) 
+    public List<CheckPointManage> getCheckPointManageList() {
+        return checkPointManageList;
+    }
+
+    public void setCheckPointManageList(List<CheckPointManage> checkPointManageList) {
+        this.checkPointManageList = checkPointManageList;
+    }
+
+    public void setCheckPointManageId(Long checkPointManageId)
     {
         this.checkPointManageId = checkPointManageId;
     }

ruoyi-system/src/main/java/com/ruoyi/system/domain/complaintSuggestion/ComplaintSuggestion.java

@@ -46,16 +46,15 @@ public class ComplaintSuggestion extends BaseEntity
     @Excel(name = "投诉建议的回复内容，记录管理员或相关人员的回复")
     private String replyContent;
 
-    /** 投诉建议类型：complaint（投诉）、suggestion（建议） */
-    @Excel(name = "投诉建议类型：complaint", readConverterExp = "投=诉")
+    /** 投诉建议类型 1投诉建议 2*/
+    @Excel(name = "投诉建议类型")
     private String type;
 
     /** 投诉建议是否公开：Y（公开）、N（不公开） */
-    @Excel(name = "投诉建议是否公开：Y", readConverterExp = "公=开")
+    @Excel(name = "投诉建议是否公开", readConverterExp = "Y=公开,N=不公开")
     private String isPublic;
 
     /** 是否删除：Y（删除）、N（不删除） */
-    @Excel(name = "是否删除：Y", readConverterExp = "删=除")
     private String isDel;
 
     public void setSuggestionId(Long suggestionId) 

ruoyi-system/src/main/java/com/ruoyi/system/domain/houseInfo/HouseInfo.java

@@ -0,0 +1,257 @@
+package com.ruoyi.system.domain.houseInfo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 房屋信息对象 house_info
+ * 
+ * @author boman
+ * @date 2025-02-20
+ */
+public class HouseInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 房屋信息主键，唯一标识每条房屋信息 */
+    private Long houseId;
+
+    /** 权利人姓名 */
+    @Excel(name = "权利人姓名")
+    private String ownerName;
+
+    /** 房屋坐落位置 */
+    @Excel(name = "房屋坐落位置")
+    private String location;
+
+    /** 权利类型，如所有权、使用权等 */
+    @Excel(name = "权利类型，如所有权、使用权等")
+    private String rightType;
+
+    /** 房屋面积，单位为平方米 */
+    @Excel(name = "房屋面积，单位为平方米")
+    private BigDecimal area;
+
+    /** 房屋相关的字第号 */
+    @Excel(name = "房屋相关的字第号")
+    private String documentNumber;
+
+    /** 不动产单元号，唯一标识不动产单元 */
+    @Excel(name = "不动产单元号，唯一标识不动产单元")
+    private String propertyUnitNumber;
+
+    /** 房屋的共有情况，如共有比例等 */
+    @Excel(name = "房屋的共有情况，如共有比例等")
+    private String coOwnership;
+
+    /** 房屋用途，如住宅、商业等 */
+    @Excel(name = "房屋用途，如住宅、商业等")
+    private String usageType;
+
+    /** 房屋使用期限 */
+    @Excel(name = "房屋使用期限")
+    private String usagePeriod;
+
+    /** 房屋登记日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "房屋登记日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date registrationDate;
+
+    /** 共有人姓名，多个共有人可以用逗号分隔 */
+    @Excel(name = "共有人姓名，多个共有人可以用逗号分隔")
+    private String coOwner;
+
+    /** 房屋的详细门牌号 */
+    @Excel(name = "房屋的详细门牌号")
+    private String detailedAddress;
+
+    /** 是否有车位，Y表示有，N表示无 */
+    @Excel(name = "是否有车位，Y表示有，N表示无")
+    private String hasParkingSpace;
+
+    /** 房屋所在小区名称 */
+    @Excel(name = "房屋所在小区名称")
+    private String communityName;
+
+    /** 房屋状态：1-自住，2-出租，3-空闲，4-待售 */
+    @Excel(name = "房屋状态：1-自住，2-出租，3-空闲，4-待售")
+    private Integer houseStatus;
+
+    public void setHouseId(Long houseId) 
+    {
+        this.houseId = houseId;
+    }
+
+    public Long getHouseId() 
+    {
+        return houseId;
+    }
+    public void setOwnerName(String ownerName) 
+    {
+        this.ownerName = ownerName;
+    }
+
+    public String getOwnerName() 
+    {
+        return ownerName;
+    }
+    public void setLocation(String location) 
+    {
+        this.location = location;
+    }
+
+    public String getLocation() 
+    {
+        return location;
+    }
+    public void setRightType(String rightType) 
+    {
+        this.rightType = rightType;
+    }
+
+    public String getRightType() 
+    {
+        return rightType;
+    }
+    public void setArea(BigDecimal area) 
+    {
+        this.area = area;
+    }
+
+    public BigDecimal getArea() 
+    {
+        return area;
+    }
+    public void setDocumentNumber(String documentNumber) 
+    {
+        this.documentNumber = documentNumber;
+    }
+
+    public String getDocumentNumber() 
+    {
+        return documentNumber;
+    }
+    public void setPropertyUnitNumber(String propertyUnitNumber) 
+    {
+        this.propertyUnitNumber = propertyUnitNumber;
+    }
+
+    public String getPropertyUnitNumber() 
+    {
+        return propertyUnitNumber;
+    }
+    public void setCoOwnership(String coOwnership) 
+    {
+        this.coOwnership = coOwnership;
+    }
+
+    public String getCoOwnership() 
+    {
+        return coOwnership;
+    }
+
+    public String getUsageType() {
+        return usageType;
+    }
+
+    public void setUsageType(String usageType) {
+        this.usageType = usageType;
+    }
+
+    public void setUsagePeriod(String usagePeriod)
+    {
+        this.usagePeriod = usagePeriod;
+    }
+
+    public String getUsagePeriod() 
+    {
+        return usagePeriod;
+    }
+    public void setRegistrationDate(Date registrationDate) 
+    {
+        this.registrationDate = registrationDate;
+    }
+
+    public Date getRegistrationDate() 
+    {
+        return registrationDate;
+    }
+    public void setCoOwner(String coOwner) 
+    {
+        this.coOwner = coOwner;
+    }
+
+    public String getCoOwner() 
+    {
+        return coOwner;
+    }
+    public void setDetailedAddress(String detailedAddress) 
+    {
+        this.detailedAddress = detailedAddress;
+    }
+
+    public String getDetailedAddress() 
+    {
+        return detailedAddress;
+    }
+    public void setHasParkingSpace(String hasParkingSpace) 
+    {
+        this.hasParkingSpace = hasParkingSpace;
+    }
+
+    public String getHasParkingSpace() 
+    {
+        return hasParkingSpace;
+    }
+    public void setCommunityName(String communityName) 
+    {
+        this.communityName = communityName;
+    }
+
+    public String getCommunityName() 
+    {
+        return communityName;
+    }
+    public void setHouseStatus(Integer houseStatus) 
+    {
+        this.houseStatus = houseStatus;
+    }
+
+    public Integer getHouseStatus() 
+    {
+        return houseStatus;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("houseId", getHouseId())
+            .append("ownerName", getOwnerName())
+            .append("location", getLocation())
+            .append("rightType", getRightType())
+            .append("area", getArea())
+            .append("documentNumber", getDocumentNumber())
+            .append("propertyUnitNumber", getPropertyUnitNumber())
+            .append("coOwnership", getCoOwnership())
+            .append("usageType", getUsageType())
+            .append("usagePeriod", getUsagePeriod())
+            .append("registrationDate", getRegistrationDate())
+            .append("coOwner", getCoOwner())
+            .append("detailedAddress", getDetailedAddress())
+            .append("hasParkingSpace", getHasParkingSpace())
+            .append("communityName", getCommunityName())
+            .append("houseStatus", getHouseStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/houseManage/HouseManage.java

@@ -1,154 +0,0 @@
-package com.ruoyi.system.domain.houseManage;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 房屋管理对象 house_manage
- * 
- * @author boman
- * @date 2025-02-14
- */
-public class HouseManage extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 房屋管理主键 */
-    private Long portalId;
-
-    /** 详细门牌号 */
-    @Excel(name = "详细门牌号")
-    private String houseAddress;
-
-    /** 权利人 */
-    @Excel(name = "权利人")
-    private String houseOwnership;
-
-    /** 建筑面积 */
-    @Excel(name = "建筑面积")
-    private String floorage;
-
-    /** 房型 */
-    @Excel(name = "房型")
-    private String roomType;
-
-    /** 用途 */
-    @Excel(name = "用途")
-    private String purpose;
-
-    /** 权利类型 */
-    @Excel(name = "权利类型")
-    private String typeOfRights;
-
-    /** 权利期限 */
-    @Excel(name = "权利期限")
-    private String termOfRights;
-
-    /** 是否有车位 */
-    @Excel(name = "是否有车位")
-    private String isPark;
-
-    public void setPortalId(Long portalId) 
-    {
-        this.portalId = portalId;
-    }
-
-    public Long getPortalId() 
-    {
-        return portalId;
-    }
-    public void setHouseAddress(String houseAddress) 
-    {
-        this.houseAddress = houseAddress;
-    }
-
-    public String getHouseAddress() 
-    {
-        return houseAddress;
-    }
-    public void setHouseOwnership(String houseOwnership) 
-    {
-        this.houseOwnership = houseOwnership;
-    }
-
-    public String getHouseOwnership() 
-    {
-        return houseOwnership;
-    }
-    public void setFloorage(String floorage) 
-    {
-        this.floorage = floorage;
-    }
-
-    public String getFloorage() 
-    {
-        return floorage;
-    }
-    public void setRoomType(String roomType) 
-    {
-        this.roomType = roomType;
-    }
-
-    public String getRoomType() 
-    {
-        return roomType;
-    }
-    public void setPurpose(String purpose) 
-    {
-        this.purpose = purpose;
-    }
-
-    public String getPurpose() 
-    {
-        return purpose;
-    }
-    public void setTypeOfRights(String typeOfRights) 
-    {
-        this.typeOfRights = typeOfRights;
-    }
-
-    public String getTypeOfRights() 
-    {
-        return typeOfRights;
-    }
-    public void setTermOfRights(String termOfRights) 
-    {
-        this.termOfRights = termOfRights;
-    }
-
-    public String getTermOfRights() 
-    {
-        return termOfRights;
-    }
-    public void setIsPark(String isPark) 
-    {
-        this.isPark = isPark;
-    }
-
-    public String getIsPark() 
-    {
-        return isPark;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("portalId", getPortalId())
-            .append("houseAddress", getHouseAddress())
-            .append("houseOwnership", getHouseOwnership())
-            .append("floorage", getFloorage())
-            .append("roomType", getRoomType())
-            .append("purpose", getPurpose())
-            .append("typeOfRights", getTypeOfRights())
-            .append("termOfRights", getTermOfRights())
-            .append("isPark", getIsPark())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/system/domain/landlord/HouseLandlord.java

@@ -1,168 +0,0 @@
-package com.ruoyi.system.domain.landlord;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 业主管理对象 house_landlord
- * 
- * @author boman
- * @date 2025-02-14
- */
-public class HouseLandlord extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 业主主键 */
-    private Long houseLandlordId;
-
-    /** 门户id */
-    @Excel(name = "门户id")
-    private Long portalId;
-
-    /** 详细门牌号 */
-    @Excel(name = "详细门牌号")
-    private String houseAddress;
-
-    /** 身份证号码 */
-    @Excel(name = "身份证号码")
-    private String idcard;
-
-    /** 姓名 */
-    @Excel(name = "姓名")
-    private String name;
-
-    /** 出生日期 */
-    @Excel(name = "出生日期")
-    private String birthday;
-
-    /** 性别 */
-    @Excel(name = "性别")
-    private String gender;
-
-    /** 1:业主 2：租户 */
-    @Excel(name = "1:业主 2：租户")
-    private String type;
-
-    /** 手机号码 */
-    @Excel(name = "手机号码")
-    private String phoneNumber;
-
-    /** 是否户主 N:否 Y:是 */
-    @Excel(name = "是否户主 N:否 Y:是")
-    private String isPatriarch;
-
-    public void setHouseLandlordId(Long houseLandlordId) 
-    {
-        this.houseLandlordId = houseLandlordId;
-    }
-
-    public Long getHouseLandlordId() 
-    {
-        return houseLandlordId;
-    }
-    public void setPortalId(Long portalId) 
-    {
-        this.portalId = portalId;
-    }
-
-    public Long getPortalId() 
-    {
-        return portalId;
-    }
-    public void setHouseAddress(String houseAddress) 
-    {
-        this.houseAddress = houseAddress;
-    }
-
-    public String getHouseAddress() 
-    {
-        return houseAddress;
-    }
-    public void setIdcard(String idcard) 
-    {
-        this.idcard = idcard;
-    }
-
-    public String getIdcard() 
-    {
-        return idcard;
-    }
-    public void setName(String name) 
-    {
-        this.name = name;
-    }
-
-    public String getName() 
-    {
-        return name;
-    }
-    public void setBirthday(String birthday) 
-    {
-        this.birthday = birthday;
-    }
-
-    public String getBirthday() 
-    {
-        return birthday;
-    }
-    public void setGender(String gender) 
-    {
-        this.gender = gender;
-    }
-
-    public String getGender() 
-    {
-        return gender;
-    }
-    public void setType(String type) 
-    {
-        this.type = type;
-    }
-
-    public String getType() 
-    {
-        return type;
-    }
-    public void setPhoneNumber(String phoneNumber) 
-    {
-        this.phoneNumber = phoneNumber;
-    }
-
-    public String getPhoneNumber() 
-    {
-        return phoneNumber;
-    }
-    public void setIsPatriarch(String isPatriarch) 
-    {
-        this.isPatriarch = isPatriarch;
-    }
-
-    public String getIsPatriarch() 
-    {
-        return isPatriarch;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("houseLandlordId", getHouseLandlordId())
-            .append("portalId", getPortalId())
-            .append("houseAddress", getHouseAddress())
-            .append("idcard", getIdcard())
-            .append("name", getName())
-            .append("birthday", getBirthday())
-            .append("gender", getGender())
-            .append("type", getType())
-            .append("phoneNumber", getPhoneNumber())
-            .append("isPatriarch", getIsPatriarch())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/system/domain/proprietorCar/ProprietorCar.java

@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 业主车辆管理对象 proprietor_car
  * 
  * @author boman
- * @date 2025-02-14
+ * @date 2025-02-20
  */
 public class ProprietorCar extends BaseEntity
 {
@@ -18,6 +18,14 @@ public class ProprietorCar extends BaseEntity
     /** 业主车辆主键 */
     private Long carId;
 
+    /** 房屋信息id */
+    @Excel(name = "房屋信息id")
+    private Long houseId;
+
+    /** 房屋的详细门牌号 */
+    @Excel(name = "房屋的详细门牌号")
+    private String detailedAddress;
+
     /** 业主id */
     @Excel(name = "业主id")
     private Long userId;
@@ -26,6 +34,10 @@ public class ProprietorCar extends BaseEntity
     @Excel(name = "业主姓名")
     private String userName;
 
+    /** 业主手机号 */
+    @Excel(name = "业主手机号")
+    private String residentPhone;
+
     /** 车牌号码 */
     @Excel(name = "车牌号码")
     private String plateNumber;
@@ -67,6 +79,24 @@ public class ProprietorCar extends BaseEntity
     {
         return carId;
     }
+    public void setHouseId(Long houseId) 
+    {
+        this.houseId = houseId;
+    }
+
+    public Long getHouseId() 
+    {
+        return houseId;
+    }
+    public void setDetailedAddress(String detailedAddress) 
+    {
+        this.detailedAddress = detailedAddress;
+    }
+
+    public String getDetailedAddress() 
+    {
+        return detailedAddress;
+    }
     public void setUserId(Long userId) 
     {
         this.userId = userId;
@@ -85,6 +115,15 @@ public class ProprietorCar extends BaseEntity
     {
         return userName;
     }
+    public void setResidentPhone(String residentPhone) 
+    {
+        this.residentPhone = residentPhone;
+    }
+
+    public String getResidentPhone() 
+    {
+        return residentPhone;
+    }
     public void setPlateNumber(String plateNumber) 
     {
         this.plateNumber = plateNumber;
@@ -162,8 +201,11 @@ public class ProprietorCar extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("carId", getCarId())
+            .append("houseId", getHouseId())
+            .append("detailedAddress", getDetailedAddress())
             .append("userId", getUserId())
             .append("userName", getUserName())
+            .append("residentPhone", getResidentPhone())
             .append("plateNumber", getPlateNumber())
             .append("vehicleBrand", getVehicleBrand())
             .append("vehicleType", getVehicleType())

ruoyi-system/src/main/java/com/ruoyi/system/domain/proprietorHouse/ProprietorHouse.java

@@ -1,196 +0,0 @@
-package com.ruoyi.system.domain.proprietorHouse;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 业主房屋管理对象 proprietor_house
- * 
- * @author boman
- * @date 2025-02-14
- */
-public class ProprietorHouse extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 业主房屋主键 */
-    private Long proprietorId;
-
-    /** 业主id */
-    @Excel(name = "业主id")
-    private Long userId;
-
-    /** 详细门牌号 */
-    @Excel(name = "详细门牌号")
-    private String proprietorHouseAddress;
-
-    /** 业主姓名 */
-    @Excel(name = "业主姓名")
-    private String userName;
-
-    /** 房屋所属 */
-    @Excel(name = "房屋所属")
-    private String master;
-
-    /** 建筑面积 */
-    @Excel(name = "建筑面积")
-    private String floorage;
-
-    /** 房型 */
-    @Excel(name = "房型")
-    private String roomType;
-
-    /** 住户类型 */
-    @Excel(name = "住户类型")
-    private String tenementType;
-
-    /** 是否户主 */
-    @Excel(name = "是否户主")
-    private String isMaster;
-
-    /** 与户主关系 */
-    @Excel(name = "与户主关系")
-    private String masterRelation;
-
-    /** 住户数量 */
-    @Excel(name = "住户数量")
-    private String tenementQuantity;
-
-    /** 是否有车位 */
-    @Excel(name = "是否有车位")
-    private String isPark;
-
-    public void setProprietorId(Long proprietorId) 
-    {
-        this.proprietorId = proprietorId;
-    }
-
-    public Long getProprietorId() 
-    {
-        return proprietorId;
-    }
-    public void setUserId(Long userId) 
-    {
-        this.userId = userId;
-    }
-
-    public Long getUserId() 
-    {
-        return userId;
-    }
-    public void setProprietorHouseAddress(String proprietorHouseAddress) 
-    {
-        this.proprietorHouseAddress = proprietorHouseAddress;
-    }
-
-    public String getProprietorHouseAddress() 
-    {
-        return proprietorHouseAddress;
-    }
-    public void setUserName(String userName) 
-    {
-        this.userName = userName;
-    }
-
-    public String getUserName() 
-    {
-        return userName;
-    }
-    public void setMaster(String master) 
-    {
-        this.master = master;
-    }
-
-    public String getMaster() 
-    {
-        return master;
-    }
-    public void setFloorage(String floorage) 
-    {
-        this.floorage = floorage;
-    }
-
-    public String getFloorage() 
-    {
-        return floorage;
-    }
-    public void setRoomType(String roomType) 
-    {
-        this.roomType = roomType;
-    }
-
-    public String getRoomType() 
-    {
-        return roomType;
-    }
-    public void setTenementType(String tenementType) 
-    {
-        this.tenementType = tenementType;
-    }
-
-    public String getTenementType() 
-    {
-        return tenementType;
-    }
-    public void setIsMaster(String isMaster) 
-    {
-        this.isMaster = isMaster;
-    }
-
-    public String getIsMaster() 
-    {
-        return isMaster;
-    }
-    public void setMasterRelation(String masterRelation) 
-    {
-        this.masterRelation = masterRelation;
-    }
-
-    public String getMasterRelation() 
-    {
-        return masterRelation;
-    }
-    public void setTenementQuantity(String tenementQuantity) 
-    {
-        this.tenementQuantity = tenementQuantity;
-    }
-
-    public String getTenementQuantity() 
-    {
-        return tenementQuantity;
-    }
-    public void setIsPark(String isPark) 
-    {
-        this.isPark = isPark;
-    }
-
-    public String getIsPark() 
-    {
-        return isPark;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("proprietorId", getProprietorId())
-            .append("userId", getUserId())
-            .append("proprietorHouseAddress", getProprietorHouseAddress())
-            .append("userName", getUserName())
-            .append("master", getMaster())
-            .append("floorage", getFloorage())
-            .append("roomType", getRoomType())
-            .append("tenementType", getTenementType())
-            .append("isMaster", getIsMaster())
-            .append("masterRelation", getMasterRelation())
-            .append("tenementQuantity", getTenementQuantity())
-            .append("isPark", getIsPark())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/system/domain/reservRecord/ReservRecord.java

@@ -0,0 +1,271 @@
+package com.ruoyi.system.domain.reservRecord;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 预约记录对象 reserv_record
+ * 
+ * @author boman
+ * @date 2025-02-19
+ */
+public class ReservRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 预约主键 */
+    private Long reservRecordId;
+
+    /** 门户id */
+    @Excel(name = "门户id")
+    private Long portalId;
+
+    /** 详细门牌号 */
+    @Excel(name = "详细门牌号")
+    private String houseAddress;
+
+    /** 详细地址 */
+    @Excel(name = "详细地址")
+    private String detailAddress;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private String lgt;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private String lat;
+
+    /** 分享人姓名 */
+    @Excel(name = "分享人姓名")
+    private String shareName;
+
+    /** 访客姓名 */
+    @Excel(name = "访客姓名")
+    private String name;
+
+    /** 来访人数 */
+    @Excel(name = "来访人数")
+    private String num;
+
+    /** 来访事由 */
+    @Excel(name = "来访事由")
+    private String reason;
+
+    /** 手机号码 */
+    @Excel(name = "手机号码")
+    private String mobileNumber;
+
+    /** 是否驾车 N:否 Y:是 */
+    @Excel(name = "是否驾车 N:否 Y:是")
+    private String isCar;
+
+    /** 车牌号码 */
+    @Excel(name = "车牌号码")
+    private String plateNumber;
+
+    /** 预约时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "预约时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date reserveTime;
+
+    /** 来访时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "来访时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date visitorTime;
+
+    /** 状态 1：待来访 2：已来访 3：已过期 */
+    @Excel(name = "状态 1：待来访 2：已来访 3：已过期")
+    private String status;
+
+    /** 人脸信息 */
+    @Excel(name = "人脸信息")
+    private String photo;
+
+    public void setReservRecordId(Long reservRecordId) 
+    {
+        this.reservRecordId = reservRecordId;
+    }
+
+    public Long getReservRecordId() 
+    {
+        return reservRecordId;
+    }
+    public void setPortalId(Long portalId) 
+    {
+        this.portalId = portalId;
+    }
+
+    public Long getPortalId() 
+    {
+        return portalId;
+    }
+    public void setHouseAddress(String houseAddress) 
+    {
+        this.houseAddress = houseAddress;
+    }
+
+    public String getHouseAddress() 
+    {
+        return houseAddress;
+    }
+    public void setDetailAddress(String detailAddress) 
+    {
+        this.detailAddress = detailAddress;
+    }
+
+    public String getDetailAddress() 
+    {
+        return detailAddress;
+    }
+    public void setLgt(String lgt) 
+    {
+        this.lgt = lgt;
+    }
+
+    public String getLgt() 
+    {
+        return lgt;
+    }
+    public void setLat(String lat) 
+    {
+        this.lat = lat;
+    }
+
+    public String getLat() 
+    {
+        return lat;
+    }
+    public void setShareName(String shareName) 
+    {
+        this.shareName = shareName;
+    }
+
+    public String getShareName() 
+    {
+        return shareName;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setNum(String num) 
+    {
+        this.num = num;
+    }
+
+    public String getNum() 
+    {
+        return num;
+    }
+    public void setReason(String reason) 
+    {
+        this.reason = reason;
+    }
+
+    public String getReason() 
+    {
+        return reason;
+    }
+    public void setMobileNumber(String mobileNumber) 
+    {
+        this.mobileNumber = mobileNumber;
+    }
+
+    public String getMobileNumber() 
+    {
+        return mobileNumber;
+    }
+    public void setIsCar(String isCar) 
+    {
+        this.isCar = isCar;
+    }
+
+    public String getIsCar() 
+    {
+        return isCar;
+    }
+    public void setPlateNumber(String plateNumber) 
+    {
+        this.plateNumber = plateNumber;
+    }
+
+    public String getPlateNumber() 
+    {
+        return plateNumber;
+    }
+    public void setReserveTime(Date reserveTime) 
+    {
+        this.reserveTime = reserveTime;
+    }
+
+    public Date getReserveTime() 
+    {
+        return reserveTime;
+    }
+    public void setVisitorTime(Date visitorTime) 
+    {
+        this.visitorTime = visitorTime;
+    }
+
+    public Date getVisitorTime() 
+    {
+        return visitorTime;
+    }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+    public void setPhoto(String photo) 
+    {
+        this.photo = photo;
+    }
+
+    public String getPhoto() 
+    {
+        return photo;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("reservRecordId", getReservRecordId())
+            .append("portalId", getPortalId())
+            .append("houseAddress", getHouseAddress())
+            .append("detailAddress", getDetailAddress())
+            .append("lgt", getLgt())
+            .append("lat", getLat())
+            .append("shareName", getShareName())
+            .append("name", getName())
+            .append("num", getNum())
+            .append("reason", getReason())
+            .append("mobileNumber", getMobileNumber())
+            .append("isCar", getIsCar())
+            .append("plateNumber", getPlateNumber())
+            .append("reserveTime", getReserveTime())
+            .append("visitorTime", getVisitorTime())
+            .append("status", getStatus())
+            .append("photo", getPhoto())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/residentInfo/ResidentInfo.java

@@ -0,0 +1,222 @@
+package com.ruoyi.system.domain.residentInfo;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 居住人员信息，存储居住人员的详细信息对象 resident_info
+ * 
+ * @author boman
+ * @date 2025-02-20
+ */
+public class ResidentInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 居住人员主键，唯一标识每条居住人员信息 */
+    private Long residentId;
+
+    /** 关联房屋信息表的house_id，标识居住人员所属房屋 */
+    @Excel(name = "关联房屋信息表的house_id，标识居住人员所属房屋")
+    private Long houseId;
+
+    /** 关联sys_user表中user_id */
+    @Excel(name = "关联sys_user表中user_id")
+    private Long userId;
+
+    /** 居住人员的详细门牌号 */
+    @Excel(name = "居住人员的详细门牌号")
+    private String detailedAddress;
+
+    /** 居住人员姓名 */
+    @Excel(name = "居住人员姓名")
+    private String residentName;
+
+    /** 居住人员身份证号码，18位 */
+    @Excel(name = "居住人员身份证号码，18位")
+    private String residentIdCard;
+
+    /** 居住人员出生日期 */
+    @Excel(name = "居住人员出生日期")
+    private String residentBirthday;
+    /**
+     * 年龄
+     */
+    private String yearsOld;
+
+    /** 居住人员手机号 */
+    @Excel(name = "居住人员手机号")
+    private String residentPhone;
+
+    /** 居住人员性别：1-男，2-女 */
+    @Excel(name = "居住人员性别：1-男，2-女")
+    private Integer residentGender;
+
+    /** 居住人员与户主的关系，如父子、夫妻等 */
+    @Excel(name = "居住人员与户主的关系，如父子、夫妻等")
+    private String residentRelationship;
+
+    /** 是否是户主：1-是，0-否 */
+    @Excel(name = "是否是户主：1-是，0-否")
+    private Integer isHouseholder;
+
+    /** 居住人员工作单位 */
+    @Excel(name = "居住人员工作单位")
+    private String residentEmployer;
+
+    /** 居住人员面貌，如党员、群众等 */
+    @Excel(name = "居住人员面貌，如党员、群众等")
+    private String residentAppearance;
+
+    public String getYearsOld() {
+        return yearsOld;
+    }
+
+    public void setYearsOld(String yearsOld) {
+        this.yearsOld = yearsOld;
+    }
+
+    public void setResidentId(Long residentId)
+    {
+        this.residentId = residentId;
+    }
+
+    public Long getResidentId() 
+    {
+        return residentId;
+    }
+    public void setHouseId(Long houseId) 
+    {
+        this.houseId = houseId;
+    }
+
+    public Long getHouseId() 
+    {
+        return houseId;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setDetailedAddress(String detailedAddress) 
+    {
+        this.detailedAddress = detailedAddress;
+    }
+
+    public String getDetailedAddress() 
+    {
+        return detailedAddress;
+    }
+    public void setResidentName(String residentName) 
+    {
+        this.residentName = residentName;
+    }
+
+    public String getResidentName() 
+    {
+        return residentName;
+    }
+    public void setResidentIdCard(String residentIdCard) 
+    {
+        this.residentIdCard = residentIdCard;
+    }
+
+    public String getResidentIdCard() 
+    {
+        return residentIdCard;
+    }
+    public void setResidentBirthday(String residentBirthday) 
+    {
+        this.residentBirthday = residentBirthday;
+    }
+
+    public String getResidentBirthday() 
+    {
+        return residentBirthday;
+    }
+    public void setResidentPhone(String residentPhone) 
+    {
+        this.residentPhone = residentPhone;
+    }
+
+    public String getResidentPhone() 
+    {
+        return residentPhone;
+    }
+    public void setResidentGender(Integer residentGender) 
+    {
+        this.residentGender = residentGender;
+    }
+
+    public Integer getResidentGender() 
+    {
+        return residentGender;
+    }
+    public void setResidentRelationship(String residentRelationship) 
+    {
+        this.residentRelationship = residentRelationship;
+    }
+
+    public String getResidentRelationship() 
+    {
+        return residentRelationship;
+    }
+    public void setIsHouseholder(Integer isHouseholder) 
+    {
+        this.isHouseholder = isHouseholder;
+    }
+
+    public Integer getIsHouseholder() 
+    {
+        return isHouseholder;
+    }
+    public void setResidentEmployer(String residentEmployer) 
+    {
+        this.residentEmployer = residentEmployer;
+    }
+
+    public String getResidentEmployer() 
+    {
+        return residentEmployer;
+    }
+    public void setResidentAppearance(String residentAppearance) 
+    {
+        this.residentAppearance = residentAppearance;
+    }
+
+    public String getResidentAppearance() 
+    {
+        return residentAppearance;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("residentId", getResidentId())
+            .append("houseId", getHouseId())
+            .append("userId", getUserId())
+            .append("detailedAddress", getDetailedAddress())
+            .append("residentName", getResidentName())
+            .append("residentIdCard", getResidentIdCard())
+            .append("residentBirthday", getResidentBirthday())
+            .append("residentPhone", getResidentPhone())
+            .append("residentGender", getResidentGender())
+            .append("residentRelationship", getResidentRelationship())
+            .append("isHouseholder", getIsHouseholder())
+            .append("residentEmployer", getResidentEmployer())
+            .append("residentAppearance", getResidentAppearance())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/staffManage/StaffManage.java

@@ -17,13 +17,17 @@ public class StaffManage extends BaseEntity
 
     /** 员工管理id */
     private Long staffId;
+    /**
+     * 员工账号id
+     */
+    private Long userId;
 
     /** 员工姓名 */
     @Excel(name = "员工姓名")
     private String staffName;
 
-    /** 员工性别（0男 1女 2未知） */
-    @Excel(name = "员工性别", readConverterExp = "0=男,1=女,2=未知")
+    /** 员工性别（1男 2女 ） */
+    @Excel(name = "员工性别", readConverterExp = "1=男,2=女")
     private String gender;
 
     /** 员工类别，1：保安 2:维修人员 3：物业管理 */
@@ -62,7 +66,15 @@ public class StaffManage extends BaseEntity
     @Excel(name = "状态，字典值")
     private String status;
 
-    public void setStaffId(Long staffId) 
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public void setStaffId(Long staffId)
     {
         this.staffId = staffId;
     }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/HouseInfoMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.houseInfo.HouseInfo;
+
+import java.util.List;
+
+
+/**
+ * 房屋信息Mapper接口
+ * 
+ * @author boman
+ * @date 2025-02-20
+ */
+public interface HouseInfoMapper 
+{
+    /**
+     * 查询房屋信息
+     * 
+     * @param houseId 房屋信息主键
+     * @return 房屋信息
+     */
+    public HouseInfo selectHouseInfoByHouseId(Long houseId);
+
+    /**
+     * 查询房屋信息列表
+     * 
+     * @param houseInfo 房屋信息
+     * @return 房屋信息集合
+     */
+    public List<HouseInfo> selectHouseInfoList(HouseInfo houseInfo);
+
+    /**
+     * 新增房屋信息
+     * 
+     * @param houseInfo 房屋信息
+     * @return 结果
+     */
+    public int insertHouseInfo(HouseInfo houseInfo);
+
+    /**
+     * 修改房屋信息
+     * 
+     * @param houseInfo 房屋信息
+     * @return 结果
+     */
+    public int updateHouseInfo(HouseInfo houseInfo);
+
+    /**
+     * 删除房屋信息
+     * 
+     * @param houseId 房屋信息主键
+     * @return 结果
+     */
+    public int deleteHouseInfoByHouseId(Long houseId);
+
+    /**
+     * 批量删除房屋信息
+     * 
+     * @param houseIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteHouseInfoByHouseIds(Long[] houseIds);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/HouseLandlordMapper.java

@@ -1,63 +0,0 @@
-package com.ruoyi.system.mapper;
-
-import com.ruoyi.system.domain.landlord.HouseLandlord;
-
-import java.util.List;
-
-
-/**
- * 业主管理Mapper接口
- * 
- * @author boman
- * @date 2025-02-14
- */
-public interface HouseLandlordMapper 
-{
-    /**
-     * 查询业主管理
-     * 
-     * @param houseLandlordId 业主管理主键
-     * @return 业主管理
-     */
-    public HouseLandlord selectHouseLandlordByHouseLandlordId(Long houseLandlordId);
-
-    /**
-     * 查询业主管理列表
-     * 
-     * @param houseLandlord 业主管理
-     * @return 业主管理集合
-     */
-    public List<HouseLandlord> selectHouseLandlordList(HouseLandlord houseLandlord);
-
-    /**
-     * 新增业主管理
-     * 
-     * @param houseLandlord 业主管理
-     * @return 结果
-     */
-    public int insertHouseLandlord(HouseLandlord houseLandlord);
-
-    /**
-     * 修改业主管理
-     * 
-     * @param houseLandlord 业主管理
-     * @return 结果
-     */
-    public int updateHouseLandlord(HouseLandlord houseLandlord);
-
-    /**
-     * 删除业主管理
-     * 
-     * @param houseLandlordId 业主管理主键
-     * @return 结果
-     */
-    public int deleteHouseLandlordByHouseLandlordId(Long houseLandlordId);
-
-    /**
-     * 批量删除业主管理
-     * 
-     * @param houseLandlordIds 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteHouseLandlordByHouseLandlordIds(Long[] houseLandlordIds);
-}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/HouseManageMapper.java

@@ -1,63 +0,0 @@
-package com.ruoyi.system.mapper;
-
-import com.ruoyi.system.domain.houseManage.HouseManage;
-
-import java.util.List;
-
-
-/**
- * 房屋管理Mapper接口
- * 
- * @author boman
- * @date 2025-02-14
- */
-public interface HouseManageMapper 
-{
-    /**
-     * 查询房屋管理
-     * 
-     * @param portalId 房屋管理主键
-     * @return 房屋管理
-     */
-    public HouseManage selectHouseManageByPortalId(Long portalId);
-
-    /**
-     * 查询房屋管理列表
-     * 
-     * @param houseManage 房屋管理
-     * @return 房屋管理集合
-     */
-    public List<HouseManage> selectHouseManageList(HouseManage houseManage);
-
-    /**
-     * 新增房屋管理
-     * 
-     * @param houseManage 房屋管理
-     * @return 结果
-     */
-    public int insertHouseManage(HouseManage houseManage);
-
-    /**
-     * 修改房屋管理
-     * 
-     * @param houseManage 房屋管理
-     * @return 结果
-     */
-    public int updateHouseManage(HouseManage houseManage);
-
-    /**
-     * 删除房屋管理
-     * 
-     * @param portalId 房屋管理主键
-     * @return 结果
-     */
-    public int deleteHouseManageByPortalId(Long portalId);
-
-    /**
-     * 批量删除房屋管理
-     * 
-     * @param portalIds 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteHouseManageByPortalIds(Long[] portalIds);
-}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ProprietorCarMapper.java

@@ -9,7 +9,7 @@ import java.util.List;
  * 业主车辆管理Mapper接口
  * 
  * @author boman
- * @date 2025-02-14
+ * @date 2025-02-20
  */
 public interface ProprietorCarMapper 
 {

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ProprietorHouseMapper.java

@@ -1,63 +0,0 @@
-package com.ruoyi.system.mapper;
-
-import com.ruoyi.system.domain.proprietorHouse.ProprietorHouse;
-
-import java.util.List;
-
-
-/**
- * 业主房屋管理Mapper接口
- * 
- * @author boman
- * @date 2025-02-14
- */
-public interface ProprietorHouseMapper 
-{
-    /**
-     * 查询业主房屋管理
-     * 
-     * @param proprietorId 业主房屋管理主键
-     * @return 业主房屋管理
-     */
-    public ProprietorHouse selectProprietorHouseByProprietorId(Long proprietorId);
-
-    /**
-     * 查询业主房屋管理列表
-     * 
-     * @param proprietorHouse 业主房屋管理
-     * @return 业主房屋管理集合
-     */
-    public List<ProprietorHouse> selectProprietorHouseList(ProprietorHouse proprietorHouse);
-
-    /**
-     * 新增业主房屋管理
-     * 
-     * @param proprietorHouse 业主房屋管理
-     * @return 结果
-     */
-    public int insertProprietorHouse(ProprietorHouse proprietorHouse);
-
-    /**
-     * 修改业主房屋管理
-     * 
-     * @param proprietorHouse 业主房屋管理
-     * @return 结果
-     */
-    public int updateProprietorHouse(ProprietorHouse proprietorHouse);
-
-    /**
-     * 删除业主房屋管理
-     * 
-     * @param proprietorId 业主房屋管理主键
-     * @return 结果
-     */
-    public int deleteProprietorHouseByProprietorId(Long proprietorId);
-
-    /**
-     * 批量删除业主房屋管理
-     * 
-     * @param proprietorIds 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteProprietorHouseByProprietorIds(Long[] proprietorIds);
-}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ReservRecordMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.reservRecord.ReservRecord;
+
+import java.util.List;
+
+
+/**
+ * 预约记录Mapper接口
+ * 
+ * @author boman
+ * @date 2025-02-19
+ */
+public interface ReservRecordMapper 
+{
+    /**
+     * 查询预约记录
+     * 
+     * @param reservRecordId 预约记录主键
+     * @return 预约记录
+     */
+    public ReservRecord selectReservRecordByReservRecordId(Long reservRecordId);
+
+    /**
+     * 查询预约记录列表
+     * 
+     * @param reservRecord 预约记录
+     * @return 预约记录集合
+     */
+    public List<ReservRecord> selectReservRecordList(ReservRecord reservRecord);
+
+    /**
+     * 新增预约记录
+     * 
+     * @param reservRecord 预约记录
+     * @return 结果
+     */
+    public int insertReservRecord(ReservRecord reservRecord);
+
+    /**
+     * 修改预约记录
+     * 
+     * @param reservRecord 预约记录
+     * @return 结果
+     */
+    public int updateReservRecord(ReservRecord reservRecord);
+
+    /**
+     * 删除预约记录
+     * 
+     * @param reservRecordId 预约记录主键
+     * @return 结果
+     */
+    public int deleteReservRecordByReservRecordId(Long reservRecordId);
+
+    /**
+     * 批量删除预约记录
+     * 
+     * @param reservRecordIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteReservRecordByReservRecordIds(Long[] reservRecordIds);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ResidentInfoMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.residentInfo.ResidentInfo;
+
+import java.util.List;
+
+
+/**
+ * 居住人员信息，存储居住人员的详细信息Mapper接口
+ * 
+ * @author boman
+ * @date 2025-02-20
+ */
+public interface ResidentInfoMapper 
+{
+    /**
+     * 查询居住人员信息，存储居住人员的详细信息
+     * 
+     * @param residentId 居住人员信息，存储居住人员的详细信息主键
+     * @return 居住人员信息，存储居住人员的详细信息
+     */
+    public ResidentInfo selectResidentInfoByResidentId(Long residentId);
+
+    /**
+     * 查询居住人员信息，存储居住人员的详细信息列表
+     * 
+     * @param residentInfo 居住人员信息，存储居住人员的详细信息
+     * @return 居住人员信息，存储居住人员的详细信息集合
+     */
+    public List<ResidentInfo> selectResidentInfoList(ResidentInfo residentInfo);
+
+    /**
+     * 新增居住人员信息，存储居住人员的详细信息
+     * 
+     * @param residentInfo 居住人员信息，存储居住人员的详细信息
+     * @return 结果
+     */
+    public int insertResidentInfo(ResidentInfo residentInfo);
+
+    /**
+     * 修改居住人员信息，存储居住人员的详细信息
+     * 
+     * @param residentInfo 居住人员信息，存储居住人员的详细信息
+     * @return 结果
+     */
+    public int updateResidentInfo(ResidentInfo residentInfo);
+
+    /**
+     * 删除居住人员信息，存储居住人员的详细信息
+     * 
+     * @param residentId 居住人员信息，存储居住人员的详细信息主键
+     * @return 结果
+     */
+    public int deleteResidentInfoByResidentId(Long residentId);
+
+    /**
+     * 批量删除居住人员信息，存储居住人员的详细信息
+     * 
+     * @param residentIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteResidentInfoByResidentIds(Long[] residentIds);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IHouseInfoService.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.system.domain.houseInfo.HouseInfo;
+
+import java.util.List;
+
+
+/**
+ * 房屋信息Service接口
+ * 
+ * @author boman
+ * @date 2025-02-20
+ */
+public interface IHouseInfoService 
+{
+    /**
+     * 查询房屋信息
+     * 
+     * @param houseId 房屋信息主键
+     * @return 房屋信息
+     */
+    public HouseInfo selectHouseInfoByHouseId(Long houseId);
+
+    /**
+     * 查询房屋信息列表
+     * 
+     * @param houseInfo 房屋信息
+     * @return 房屋信息集合
+     */
+    public List<HouseInfo> selectHouseInfoList(HouseInfo houseInfo);
+
+    /**
+     * 新增房屋信息
+     * 
+     * @param houseInfo 房屋信息
+     * @return 结果
+     */
+    public int insertHouseInfo(HouseInfo houseInfo);
+
+    /**
+     * 修改房屋信息
+     * 
+     * @param houseInfo 房屋信息
+     * @return 结果
+     */
+    public int updateHouseInfo(HouseInfo houseInfo);
+
+    /**
+     * 批量删除房屋信息
+     * 
+     * @param houseIds 需要删除的房屋信息主键集合
+     * @return 结果
+     */
+    public int deleteHouseInfoByHouseIds(Long[] houseIds);
+
+    /**
+     * 删除房屋信息信息
+     * 
+     * @param houseId 房屋信息主键
+     * @return 结果
+     */
+    public int deleteHouseInfoByHouseId(Long houseId);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IHouseLandlordService.java

@@ -1,63 +0,0 @@
-package com.ruoyi.system.service;
-
-import com.ruoyi.system.domain.landlord.HouseLandlord;
-
-import java.util.List;
-
-
-/**
- * 业主管理Service接口
- * 
- * @author boman
- * @date 2025-02-14
- */
-public interface IHouseLandlordService 
-{
-    /**
-     * 查询业主管理
-     * 
-     * @param houseLandlordId 业主管理主键
-     * @return 业主管理
-     */
-    public HouseLandlord selectHouseLandlordByHouseLandlordId(Long houseLandlordId);
-
-    /**
-     * 查询业主管理列表
-     * 
-     * @param houseLandlord 业主管理
-     * @return 业主管理集合
-     */
-    public List<HouseLandlord> selectHouseLandlordList(HouseLandlord houseLandlord);
-
-    /**
-     * 新增业主管理
-     * 
-     * @param houseLandlord 业主管理
-     * @return 结果
-     */
-    public int insertHouseLandlord(HouseLandlord houseLandlord);
-
-    /**
-     * 修改业主管理
-     * 
-     * @param houseLandlord 业主管理
-     * @return 结果
-     */
-    public int updateHouseLandlord(HouseLandlord houseLandlord);
-
-    /**
-     * 批量删除业主管理
-     * 
-     * @param houseLandlordIds 需要删除的业主管理主键集合
-     * @return 结果
-     */
-    public int deleteHouseLandlordByHouseLandlordIds(Long[] houseLandlordIds);
-
-    /**
-     * 删除业主管理信息
-     * 
-     * @param houseLandlordId 业主管理主键
-     * @return 结果
-     */
-    public int deleteHouseLandlordByHouseLandlordId(Long houseLandlordId);
-}

ruoyi-system/src/main/java/com/ruoyi/system/service/IHouseManageService.java

@@ -1,63 +0,0 @@
-package com.ruoyi.system.service;
-
-import com.ruoyi.system.domain.houseManage.HouseManage;
-
-import java.util.List;
-
-
-/**
- * 房屋管理Service接口
- * 
- * @author boman
- * @date 2025-02-14
- */
-public interface IHouseManageService 
-{
-    /**
-     * 查询房屋管理
-     * 
-     * @param portalId 房屋管理主键
-     * @return 房屋管理
-     */
-    public HouseManage selectHouseManageByPortalId(Long portalId);
-
-    /**
-     * 查询房屋管理列表
-     * 
-     * @param houseManage 房屋管理
-     * @return 房屋管理集合
-     */
-    public List<HouseManage> selectHouseManageList(HouseManage houseManage);
-
-    /**
-     * 新增房屋管理
-     * 
-     * @param houseManage 房屋管理
-     * @return 结果
-     */
-    public int insertHouseManage(HouseManage houseManage);
-
-    /**
-     * 修改房屋管理
-     * 
-     * @param houseManage 房屋管理
-     * @return 结果
-     */
-    public int updateHouseManage(HouseManage houseManage);
-
-    /**
-     * 批量删除房屋管理
-     * 
-     * @param portalIds 需要删除的房屋管理主键集合
-     * @return 结果
-     */
-    public int deleteHouseManageByPortalIds(Long[] portalIds);
-
-    /**
-     * 删除房屋管理信息
-     * 
-     * @param portalId 房屋管理主键
-     * @return 结果
-     */
-    public int deleteHouseManageByPortalId(Long portalId);
-}

ruoyi-system/src/main/java/com/ruoyi/system/service/IIllegalParkingService.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.service;
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain.illegalParking.IllegalParking;
 
 import java.util.List;
@@ -60,4 +61,11 @@ public interface IIllegalParkingService
      * @return 结果
      */
     public int deleteIllegalParkingByIllegalParkingId(Long illegalParkingId);
+
+    /**
+     * 解除黑名单登记
+     * @param illegalParking
+     * @return
+     */
+    public AjaxResult cancel(IllegalParking illegalParking);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IProprietorCarService.java

@@ -9,7 +9,7 @@ import java.util.List;
  * 业主车辆管理Service接口
  * 
  * @author boman
- * @date 2025-02-14
+ * @date 2025-02-20
  */
 public interface IProprietorCarService 
 {

ruoyi-system/src/main/java/com/ruoyi/system/service/IProprietorHouseService.java

@@ -1,63 +0,0 @@
-package com.ruoyi.system.service;
-
-import com.ruoyi.system.domain.proprietorHouse.ProprietorHouse;
-
-import java.util.List;
-
-
-/**
- * 业主房屋管理Service接口
- * 
- * @author boman
- * @date 2025-02-14
- */
-public interface IProprietorHouseService 
-{
-    /**
-     * 查询业主房屋管理
-     * 
-     * @param proprietorId 业主房屋管理主键
-     * @return 业主房屋管理
-     */
-    public ProprietorHouse selectProprietorHouseByProprietorId(Long proprietorId);
-
-    /**
-     * 查询业主房屋管理列表
-     * 
-     * @param proprietorHouse 业主房屋管理
-     * @return 业主房屋管理集合
-     */
-    public List<ProprietorHouse> selectProprietorHouseList(ProprietorHouse proprietorHouse);
-
-    /**
-     * 新增业主房屋管理
-     * 
-     * @param proprietorHouse 业主房屋管理
-     * @return 结果
-     */
-    public int insertProprietorHouse(ProprietorHouse proprietorHouse);
-
-    /**
-     * 修改业主房屋管理
-     * 
-     * @param proprietorHouse 业主房屋管理
-     * @return 结果
-     */
-    public int updateProprietorHouse(ProprietorHouse proprietorHouse);
-
-    /**
-     * 批量删除业主房屋管理
-     * 
-     * @param proprietorIds 需要删除的业主房屋管理主键集合
-     * @return 结果
-     */
-    public int deleteProprietorHouseByProprietorIds(Long[] proprietorIds);
-
-    /**
-     * 删除业主房屋管理信息
-     * 
-     * @param proprietorId 业主房屋管理主键
-     * @return 结果
-     */
-    public int deleteProprietorHouseByProprietorId(Long proprietorId);
-}

ruoyi-system/src/main/java/com/ruoyi/system/service/IReservRecordService.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.system.domain.reservRecord.ReservRecord;
+
+import java.util.List;
+
+
+/**
+ * 预约记录Service接口
+ * 
+ * @author boman
+ * @date 2025-02-19
+ */
+public interface IReservRecordService 
+{
+    /**
+     * 查询预约记录
+     * 
+     * @param reservRecordId 预约记录主键
+     * @return 预约记录
+     */
+    public ReservRecord selectReservRecordByReservRecordId(Long reservRecordId);
+
+    /**
+     * 查询预约记录列表
+     * 
+     * @param reservRecord 预约记录
+     * @return 预约记录集合
+     */
+    public List<ReservRecord> selectReservRecordList(ReservRecord reservRecord);
+
+    /**
+     * 新增预约记录
+     * 
+     * @param reservRecord 预约记录
+     * @return 结果
+     */
+    public int insertReservRecord(ReservRecord reservRecord);
+
+    /**
+     * 修改预约记录
+     * 
+     * @param reservRecord 预约记录
+     * @return 结果
+     */
+    public int updateReservRecord(ReservRecord reservRecord);
+
+    /**
+     * 批量删除预约记录
+     * 
+     * @param reservRecordIds 需要删除的预约记录主键集合
+     * @return 结果
+     */
+    public int deleteReservRecordByReservRecordIds(Long[] reservRecordIds);
+
+    /**
+     * 删除预约记录信息
+     * 
+     * @param reservRecordId 预约记录主键
+     * @return 结果
+     */
+    public int deleteReservRecordByReservRecordId(Long reservRecordId);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IResidentInfoService.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.system.domain.residentInfo.ResidentInfo;
+
+import java.util.List;
+
+
+/**
+ * 居住人员信息，存储居住人员的详细信息Service接口
+ * 
+ * @author boman
+ * @date 2025-02-20
+ */
+public interface IResidentInfoService 
+{
+    /**
+     * 查询居住人员信息，存储居住人员的详细信息
+     * 
+     * @param residentId 居住人员信息，存储居住人员的详细信息主键
+     * @return 居住人员信息，存储居住人员的详细信息
+     */
+    public ResidentInfo selectResidentInfoByResidentId(Long residentId);
+
+    /**
+     * 查询居住人员信息，存储居住人员的详细信息列表
+     * 
+     * @param residentInfo 居住人员信息，存储居住人员的详细信息
+     * @return 居住人员信息，存储居住人员的详细信息集合
+     */
+    public List<ResidentInfo> selectResidentInfoList(ResidentInfo residentInfo);
+
+    /**
+     * 新增居住人员信息，存储居住人员的详细信息
+     * 
+     * @param residentInfo 居住人员信息，存储居住人员的详细信息
+     * @return 结果
+     */
+    public int insertResidentInfo(ResidentInfo residentInfo);
+
+    /**
+     * 修改居住人员信息，存储居住人员的详细信息
+     * 
+     * @param residentInfo 居住人员信息，存储居住人员的详细信息
+     * @return 结果
+     */
+    public int updateResidentInfo(ResidentInfo residentInfo);
+
+    /**
+     * 批量删除居住人员信息，存储居住人员的详细信息
+     * 
+     * @param residentIds 需要删除的居住人员信息，存储居住人员的详细信息主键集合
+     * @return 结果
+     */
+    public int deleteResidentInfoByResidentIds(Long[] residentIds);
+
+    /**
+     * 删除居住人员信息，存储居住人员的详细信息信息
+     * 
+     * @param residentId 居住人员信息，存储居住人员的详细信息主键
+     * @return 结果
+     */
+    public int deleteResidentInfoByResidentId(Long residentId);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java

@@ -6,7 +6,6 @@ import com.ruoyi.common.core.domain.entity.AssetType;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.system.mapper.AssetTypeMapper;
 import com.ruoyi.system.service.IAssetTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -146,7 +145,7 @@ public class AssetTypeServiceImpl implements IAssetTypeService {
      */
     @Override
     public List<TreeSelect> selectAssetTypeTreeList(AssetType assetType) {
-        List<AssetType> assetTypes = SpringUtils.getAopProxy(this).selectAssetTypeListTree(assetType);
+        List<AssetType> assetTypes = selectAssetTypeListTree(assetType);
         return buildAssetTypeTreeSelect(assetTypes);
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/HouseInfoServiceImpl.java

@@ -0,0 +1,96 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.houseInfo.HouseInfo;
+import com.ruoyi.system.mapper.HouseInfoMapper;
+import com.ruoyi.system.service.IHouseInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.List;
+
+/**
+ * 房屋信息Service业务层处理
+ * 
+ * @author boman
+ * @date 2025-02-20
+ */
+@Service
+public class HouseInfoServiceImpl implements IHouseInfoService 
+{
+    @Autowired
+    private HouseInfoMapper houseInfoMapper;
+
+    /**
+     * 查询房屋信息
+     * 
+     * @param houseId 房屋信息主键
+     * @return 房屋信息
+     */
+    @Override
+    public HouseInfo selectHouseInfoByHouseId(Long houseId)
+    {
+        return houseInfoMapper.selectHouseInfoByHouseId(houseId);
+    }
+
+    /**
+     * 查询房屋信息列表
+     * 
+     * @param houseInfo 房屋信息
+     * @return 房屋信息
+     */
+    @Override
+    public List<HouseInfo> selectHouseInfoList(HouseInfo houseInfo)
+    {
+        return houseInfoMapper.selectHouseInfoList(houseInfo);
+    }
+
+    /**
+     * 新增房屋信息
+     * 
+     * @param houseInfo 房屋信息
+     * @return 结果
+     */
+    @Override
+    public int insertHouseInfo(HouseInfo houseInfo)
+    {
+        houseInfo.setCreateTime(DateUtils.getNowDate());
+        return houseInfoMapper.insertHouseInfo(houseInfo);
+    }
+
+    /**
+     * 修改房屋信息
+     * 
+     * @param houseInfo 房屋信息
+     * @return 结果
+     */
+    @Override
+    public int updateHouseInfo(HouseInfo houseInfo)
+    {
+        houseInfo.setUpdateTime(DateUtils.getNowDate());
+        return houseInfoMapper.updateHouseInfo(houseInfo);
+    }
+
+    /**
+     * 批量删除房屋信息
+     * 
+     * @param houseIds 需要删除的房屋信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHouseInfoByHouseIds(Long[] houseIds)
+    {
+        return houseInfoMapper.deleteHouseInfoByHouseIds(houseIds);
+    }
+
+    /**
+     * 删除房屋信息信息
+     * 
+     * @param houseId 房屋信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHouseInfoByHouseId(Long houseId)
+    {
+        return houseInfoMapper.deleteHouseInfoByHouseId(houseId);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/HouseLandlordServiceImpl.java

@@ -1,97 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.system.domain.landlord.HouseLandlord;
-import com.ruoyi.system.mapper.HouseLandlordMapper;
-import com.ruoyi.system.service.IHouseLandlordService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 业主管理Service业务层处理
- * 
- * @author boman
- * @date 2025-02-14
- */
-@Service
-public class HouseLandlordServiceImpl implements IHouseLandlordService 
-{
-    @Autowired
-    private HouseLandlordMapper houseLandlordMapper;
-
-    /**
-     * 查询业主管理
-     * 
-     * @param houseLandlordId 业主管理主键
-     * @return 业主管理
-     */
-    @Override
-    public HouseLandlord selectHouseLandlordByHouseLandlordId(Long houseLandlordId)
-    {
-        return houseLandlordMapper.selectHouseLandlordByHouseLandlordId(houseLandlordId);
-    }
-
-    /**
-     * 查询业主管理列表
-     * 
-     * @param houseLandlord 业主管理
-     * @return 业主管理
-     */
-    @Override
-    public List<HouseLandlord> selectHouseLandlordList(HouseLandlord houseLandlord)
-    {
-        return houseLandlordMapper.selectHouseLandlordList(houseLandlord);
-    }
-
-    /**
-     * 新增业主管理
-     * 
-     * @param houseLandlord 业主管理
-     * @return 结果
-     */
-    @Override
-    public int insertHouseLandlord(HouseLandlord houseLandlord)
-    {
-        houseLandlord.setCreateTime(DateUtils.getNowDate());
-        return houseLandlordMapper.insertHouseLandlord(houseLandlord);
-    }
-
-    /**
-     * 修改业主管理
-     * 
-     * @param houseLandlord 业主管理
-     * @return 结果
-     */
-    @Override
-    public int updateHouseLandlord(HouseLandlord houseLandlord)
-    {
-        houseLandlord.setUpdateTime(DateUtils.getNowDate());
-        return houseLandlordMapper.updateHouseLandlord(houseLandlord);
-    }
-
-    /**
-     * 批量删除业主管理
-     * 
-     * @param houseLandlordIds 需要删除的业主管理主键
-     * @return 结果
-     */
-    @Override
-    public int deleteHouseLandlordByHouseLandlordIds(Long[] houseLandlordIds)
-    {
-        return houseLandlordMapper.deleteHouseLandlordByHouseLandlordIds(houseLandlordIds);
-    }
-
-    /**
-     * 删除业主管理信息
-     * 
-     * @param houseLandlordId 业主管理主键
-     * @return 结果
-     */
-    @Override
-    public int deleteHouseLandlordByHouseLandlordId(Long houseLandlordId)
-    {
-        return houseLandlordMapper.deleteHouseLandlordByHouseLandlordId(houseLandlordId);
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/HouseManageServiceImpl.java

@@ -1,97 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.system.domain.houseManage.HouseManage;
-import com.ruoyi.system.mapper.HouseManageMapper;
-import com.ruoyi.system.service.IHouseManageService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 房屋管理Service业务层处理
- * 
- * @author boman
- * @date 2025-02-14
- */
-@Service
-public class HouseManageServiceImpl implements IHouseManageService 
-{
-    @Autowired
-    private HouseManageMapper houseManageMapper;
-
-    /**
-     * 查询房屋管理
-     * 
-     * @param portalId 房屋管理主键
-     * @return 房屋管理
-     */
-    @Override
-    public HouseManage selectHouseManageByPortalId(Long portalId)
-    {
-        return houseManageMapper.selectHouseManageByPortalId(portalId);
-    }
-
-    /**
-     * 查询房屋管理列表
-     * 
-     * @param houseManage 房屋管理
-     * @return 房屋管理
-     */
-    @Override
-    public List<HouseManage> selectHouseManageList(HouseManage houseManage)
-    {
-        return houseManageMapper.selectHouseManageList(houseManage);
-    }
-
-    /**
-     * 新增房屋管理
-     * 
-     * @param houseManage 房屋管理
-     * @return 结果
-     */
-    @Override
-    public int insertHouseManage(HouseManage houseManage)
-    {
-        houseManage.setCreateTime(DateUtils.getNowDate());
-        return houseManageMapper.insertHouseManage(houseManage);
-    }
-
-    /**
-     * 修改房屋管理
-     * 
-     * @param houseManage 房屋管理
-     * @return 结果
-     */
-    @Override
-    public int updateHouseManage(HouseManage houseManage)
-    {
-        houseManage.setUpdateTime(DateUtils.getNowDate());
-        return houseManageMapper.updateHouseManage(houseManage);
-    }
-
-    /**
-     * 批量删除房屋管理
-     * 
-     * @param portalIds 需要删除的房屋管理主键
-     * @return 结果
-     */
-    @Override
-    public int deleteHouseManageByPortalIds(Long[] portalIds)
-    {
-        return houseManageMapper.deleteHouseManageByPortalIds(portalIds);
-    }
-
-    /**
-     * 删除房屋管理信息
-     * 
-     * @param portalId 房屋管理主键
-     * @return 结果
-     */
-    @Override
-    public int deleteHouseManageByPortalId(Long portalId)
-    {
-        return houseManageMapper.deleteHouseManageByPortalId(portalId);
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/IllegalParkingServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.service.impl;
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.domain.illegalParking.IllegalParking;
 import com.ruoyi.system.mapper.IllegalParkingMapper;
@@ -104,4 +105,17 @@ public class IllegalParkingServiceImpl implements IIllegalParkingService
     {
         return illegalParkingMapper.deleteIllegalParkingByIllegalParkingId(illegalParkingId);
     }
+
+    /**
+     * 解除黑名单
+     * @param illegalParking
+     * @return
+     */
+    @Override
+    public AjaxResult cancel(IllegalParking illegalParking) {
+        illegalParking.setIsBlack("N");
+        illegalParkingMapper.updateIllegalParking(illegalParking);
+        //todo 给道闸下发解除黑名单
+        return AjaxResult.success();
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ProprietorCarServiceImpl.java

@@ -13,7 +13,7 @@ import java.util.List;
  * 业主车辆管理Service业务层处理
  * 
  * @author boman
- * @date 2025-02-14
+ * @date 2025-02-20
  */
 @Service
 public class ProprietorCarServiceImpl implements IProprietorCarService 
@@ -54,10 +54,36 @@ public class ProprietorCarServiceImpl implements IProprietorCarService
     @Override
     public int insertProprietorCar(ProprietorCar proprietorCar)
     {
+
+
+        //根据车牌号判断是否是新能源
         proprietorCar.setCreateTime(DateUtils.getNowDate());
+        String plateNumber = proprietorCar.getPlateNumber();
+        String vehicleType = "燃油车";
+        if (isNewEnergyVehicle(plateNumber)){
+            vehicleType = "新能源";
+        }
+        proprietorCar.setVehicleType(vehicleType);
         return proprietorCarMapper.insertProprietorCar(proprietorCar);
     }
 
+    /**
+     * 判断是否是新能源
+     * @param licensePlate
+     * @return
+     */
+    public static boolean isNewEnergyVehicle(String licensePlate) {
+        if (licensePlate == null || licensePlate.isEmpty()) {
+            return false;
+        }
+
+        // 获取车牌号的第一个字符
+        char firstChar = licensePlate.charAt(0);
+
+        // 判断是否是新能源车辆
+        return firstChar == 'D' || firstChar == 'F';
+    }
+
     /**
      * 修改业主车辆管理
      * 
@@ -68,6 +94,12 @@ public class ProprietorCarServiceImpl implements IProprietorCarService
     public int updateProprietorCar(ProprietorCar proprietorCar)
     {
         proprietorCar.setUpdateTime(DateUtils.getNowDate());
+        String plateNumber = proprietorCar.getPlateNumber();
+        String vehicleType = "燃油车";
+        if (isNewEnergyVehicle(plateNumber)){
+            vehicleType = "新能源";
+        }
+        proprietorCar.setVehicleType(vehicleType);
         return proprietorCarMapper.updateProprietorCar(proprietorCar);
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ProprietorHouseServiceImpl.java

@@ -1,97 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.system.domain.proprietorHouse.ProprietorHouse;
-import com.ruoyi.system.mapper.ProprietorHouseMapper;
-import com.ruoyi.system.service.IProprietorHouseService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 业主房屋管理Service业务层处理
- * 
- * @author boman
- * @date 2025-02-14
- */
-@Service
-public class ProprietorHouseServiceImpl implements IProprietorHouseService 
-{
-    @Autowired
-    private ProprietorHouseMapper proprietorHouseMapper;
-
-    /**
-     * 查询业主房屋管理
-     * 
-     * @param proprietorId 业主房屋管理主键
-     * @return 业主房屋管理
-     */
-    @Override
-    public ProprietorHouse selectProprietorHouseByProprietorId(Long proprietorId)
-    {
-        return proprietorHouseMapper.selectProprietorHouseByProprietorId(proprietorId);
-    }
-
-    /**
-     * 查询业主房屋管理列表
-     * 
-     * @param proprietorHouse 业主房屋管理
-     * @return 业主房屋管理
-     */
-    @Override
-    public List<ProprietorHouse> selectProprietorHouseList(ProprietorHouse proprietorHouse)
-    {
-        return proprietorHouseMapper.selectProprietorHouseList(proprietorHouse);
-    }
-
-    /**
-     * 新增业主房屋管理
-     * 
-     * @param proprietorHouse 业主房屋管理
-     * @return 结果
-     */
-    @Override
-    public int insertProprietorHouse(ProprietorHouse proprietorHouse)
-    {
-        proprietorHouse.setCreateTime(DateUtils.getNowDate());
-        return proprietorHouseMapper.insertProprietorHouse(proprietorHouse);
-    }
-
-    /**
-     * 修改业主房屋管理
-     * 
-     * @param proprietorHouse 业主房屋管理
-     * @return 结果
-     */
-    @Override
-    public int updateProprietorHouse(ProprietorHouse proprietorHouse)
-    {
-        proprietorHouse.setUpdateTime(DateUtils.getNowDate());
-        return proprietorHouseMapper.updateProprietorHouse(proprietorHouse);
-    }
-
-    /**
-     * 批量删除业主房屋管理
-     * 
-     * @param proprietorIds 需要删除的业主房屋管理主键
-     * @return 结果
-     */
-    @Override
-    public int deleteProprietorHouseByProprietorIds(Long[] proprietorIds)
-    {
-        return proprietorHouseMapper.deleteProprietorHouseByProprietorIds(proprietorIds);
-    }
-
-    /**
-     * 删除业主房屋管理信息
-     * 
-     * @param proprietorId 业主房屋管理主键
-     * @return 结果
-     */
-    @Override
-    public int deleteProprietorHouseByProprietorId(Long proprietorId)
-    {
-        return proprietorHouseMapper.deleteProprietorHouseByProprietorId(proprietorId);
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ReservRecordServiceImpl.java

@@ -0,0 +1,97 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.reservRecord.ReservRecord;
+import com.ruoyi.system.mapper.ReservRecordMapper;
+import com.ruoyi.system.service.IReservRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 预约记录Service业务层处理
+ * 
+ * @author boman
+ * @date 2025-02-19
+ */
+@Service
+public class ReservRecordServiceImpl implements IReservRecordService 
+{
+    @Autowired
+    private ReservRecordMapper reservRecordMapper;
+
+    /**
+     * 查询预约记录
+     * 
+     * @param reservRecordId 预约记录主键
+     * @return 预约记录
+     */
+    @Override
+    public ReservRecord selectReservRecordByReservRecordId(Long reservRecordId)
+    {
+        return reservRecordMapper.selectReservRecordByReservRecordId(reservRecordId);
+    }
+
+    /**
+     * 查询预约记录列表
+     * 
+     * @param reservRecord 预约记录
+     * @return 预约记录
+     */
+    @Override
+    public List<ReservRecord> selectReservRecordList(ReservRecord reservRecord)
+    {
+        return reservRecordMapper.selectReservRecordList(reservRecord);
+    }
+
+    /**
+     * 新增预约记录
+     * 
+     * @param reservRecord 预约记录
+     * @return 结果
+     */
+    @Override
+    public int insertReservRecord(ReservRecord reservRecord)
+    {
+        reservRecord.setCreateTime(DateUtils.getNowDate());
+        return reservRecordMapper.insertReservRecord(reservRecord);
+    }
+
+    /**
+     * 修改预约记录
+     * 
+     * @param reservRecord 预约记录
+     * @return 结果
+     */
+    @Override
+    public int updateReservRecord(ReservRecord reservRecord)
+    {
+        reservRecord.setUpdateTime(DateUtils.getNowDate());
+        return reservRecordMapper.updateReservRecord(reservRecord);
+    }
+
+    /**
+     * 批量删除预约记录
+     * 
+     * @param reservRecordIds 需要删除的预约记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteReservRecordByReservRecordIds(Long[] reservRecordIds)
+    {
+        return reservRecordMapper.deleteReservRecordByReservRecordIds(reservRecordIds);
+    }
+
+    /**
+     * 删除预约记录信息
+     * 
+     * @param reservRecordId 预约记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteReservRecordByReservRecordId(Long reservRecordId)
+    {
+        return reservRecordMapper.deleteReservRecordByReservRecordId(reservRecordId);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ResidentInfoServiceImpl.java

@@ -0,0 +1,98 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.residentInfo.ResidentInfo;
+import com.ruoyi.system.mapper.ResidentInfoMapper;
+import com.ruoyi.system.service.IResidentInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 居住人员信息，存储居住人员的详细信息Service业务层处理
+ * 
+ * @author boman
+ * @date 2025-02-20
+ */
+@Service
+public class ResidentInfoServiceImpl implements IResidentInfoService 
+{
+    @Autowired
+    private ResidentInfoMapper residentInfoMapper;
+
+    /**
+     * 查询居住人员信息，存储居住人员的详细信息
+     * 
+     * @param residentId 居住人员信息，存储居住人员的详细信息主键
+     * @return 居住人员信息，存储居住人员的详细信息
+     */
+    @Override
+    public ResidentInfo selectResidentInfoByResidentId(Long residentId)
+    {
+        return residentInfoMapper.selectResidentInfoByResidentId(residentId);
+    }
+
+    /**
+     * 查询居住人员信息，存储居住人员的详细信息列表
+     * 
+     * @param residentInfo 居住人员信息，存储居住人员的详细信息
+     * @return 居住人员信息，存储居住人员的详细信息
+     */
+    @Override
+    public List<ResidentInfo> selectResidentInfoList(ResidentInfo residentInfo)
+    {
+        //todo 计算每个人的年龄
+        return residentInfoMapper.selectResidentInfoList(residentInfo);
+    }
+
+    /**
+     * 新增居住人员信息，存储居住人员的详细信息
+     * 
+     * @param residentInfo 居住人员信息，存储居住人员的详细信息
+     * @return 结果
+     */
+    @Override
+    public int insertResidentInfo(ResidentInfo residentInfo)
+    {
+        residentInfo.setCreateTime(DateUtils.getNowDate());
+        return residentInfoMapper.insertResidentInfo(residentInfo);
+    }
+
+    /**
+     * 修改居住人员信息，存储居住人员的详细信息
+     * 
+     * @param residentInfo 居住人员信息，存储居住人员的详细信息
+     * @return 结果
+     */
+    @Override
+    public int updateResidentInfo(ResidentInfo residentInfo)
+    {
+        residentInfo.setUpdateTime(DateUtils.getNowDate());
+        return residentInfoMapper.updateResidentInfo(residentInfo);
+    }
+
+    /**
+     * 批量删除居住人员信息，存储居住人员的详细信息
+     * 
+     * @param residentIds 需要删除的居住人员信息，存储居住人员的详细信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteResidentInfoByResidentIds(Long[] residentIds)
+    {
+        return residentInfoMapper.deleteResidentInfoByResidentIds(residentIds);
+    }
+
+    /**
+     * 删除居住人员信息，存储居住人员的详细信息信息
+     * 
+     * @param residentId 居住人员信息，存储居住人员的详细信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteResidentInfoByResidentId(Long residentId)
+    {
+        return residentInfoMapper.deleteResidentInfoByResidentId(residentId);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VisitorManageServiceImpl.java

@@ -56,6 +56,7 @@ public class VisitorManageServiceImpl implements IVisitorManageService
     {
         //todo 车牌需要进入道闸系统临时车
         visitorManage.setCreateTime(DateUtils.getNowDate());
+        visitorManage.setVisitorTime(DateUtils.getNowDate());
         return visitorManageMapper.insertVisitorManage(visitorManage);
     }
 

ruoyi-system/src/main/resources/mapper/system/CheckPointManageMapper.xml

@@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <insert id="batchCheckPointManage">
-        insert into check_point_manage( check_type, check_time, check_address,createTime) values
+        insert into check_point_manage( check_type, check_time, check_address,create_time) values
         <foreach item="item" index="index" collection="list" separator=",">
             ( #{item.checkType}, #{item.checkTime}, #{item.checkAddress},#{item.createTime})
         </foreach>

ruoyi-system/src/main/resources/mapper/system/CheckPointRecordMapper.xml

@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="checkResultDetails != null  and checkResultDetails != ''"> and check_result_details = #{checkResultDetails}</if>
             <if test="checkResultPhoto != null  and checkResultPhoto != ''"> and check_result_photo = #{checkResultPhoto}</if>
             <if test="checkResultTime != null "> and check_result_time = #{checkResultTime}</if>
-            <if test="createTime != null "> and date_format(create_time,'%Y%m%d') =date_format(#{createTime},'%Y%m%d') </if>
+            <if test="params.createTime != null  and params.createTime != ''"> AND date_format(create_time,'%Y%m%d') = date_format(#{params.createTime},'%Y%m%d')</if>
         </where>
     </select>
     

ruoyi-system/src/main/resources/mapper/system/HouseInfoMapper.xml

@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.HouseInfoMapper">
+    
+    <resultMap type="HouseInfo" id="HouseInfoResult">
+        <result property="houseId"    column="house_id"    />
+        <result property="ownerName"    column="owner_name"    />
+        <result property="location"    column="location"    />
+        <result property="rightType"    column="right_type"    />
+        <result property="area"    column="area"    />
+        <result property="documentNumber"    column="document_number"    />
+        <result property="propertyUnitNumber"    column="property_unit_number"    />
+        <result property="coOwnership"    column="co_ownership"    />
+        <result property="usageType"    column="usage_type"    />
+        <result property="usagePeriod"    column="usage_period"    />
+        <result property="registrationDate"    column="registration_date"    />
+        <result property="coOwner"    column="co_owner"    />
+        <result property="detailedAddress"    column="detailed_address"    />
+        <result property="hasParkingSpace"    column="has_parking_space"    />
+        <result property="communityName"    column="community_name"    />
+        <result property="houseStatus"    column="house_status"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectHouseInfoVo">
+        select house_id, owner_name, location, right_type, area, document_number, property_unit_number, co_ownership, usage, usage_period, registration_date, co_owner, detailed_address, has_parking_space, community_name, house_status, create_by, create_time, update_by, update_time, remark from house_info
+    </sql>
+
+    <select id="selectHouseInfoList" parameterType="HouseInfo" resultMap="HouseInfoResult">
+        <include refid="selectHouseInfoVo"/>
+        <where>  
+            <if test="ownerName != null  and ownerName != ''"> and owner_name like concat('%', #{ownerName}, '%')</if>
+            <if test="location != null  and location != ''"> and location = #{location}</if>
+            <if test="rightType != null  and rightType != ''"> and right_type = #{rightType}</if>
+            <if test="area != null "> and area = #{area}</if>
+            <if test="documentNumber != null  and documentNumber != ''"> and document_number = #{documentNumber}</if>
+            <if test="propertyUnitNumber != null  and propertyUnitNumber != ''"> and property_unit_number = #{propertyUnitNumber}</if>
+            <if test="coOwnership != null  and coOwnership != ''"> and co_ownership = #{coOwnership}</if>
+            <if test="usageType != null  and usageType != ''"> and usage_type = #{usageType}</if>
+            <if test="usagePeriod != null  and usagePeriod != ''"> and usage_period = #{usagePeriod}</if>
+            <if test="registrationDate != null "> and registration_date = #{registrationDate}</if>
+            <if test="coOwner != null  and coOwner != ''"> and co_owner = #{coOwner}</if>
+            <if test="detailedAddress != null  and detailedAddress != ''"> and detailed_address = #{detailedAddress}</if>
+            <if test="hasParkingSpace != null  and hasParkingSpace != ''"> and has_parking_space = #{hasParkingSpace}</if>
+            <if test="communityName != null  and communityName != ''"> and community_name like concat('%', #{communityName}, '%')</if>
+            <if test="houseStatus != null "> and house_status = #{houseStatus}</if>
+        </where>
+    </select>
+    
+    <select id="selectHouseInfoByHouseId" parameterType="Long" resultMap="HouseInfoResult">
+        <include refid="selectHouseInfoVo"/>
+        where house_id = #{houseId}
+    </select>
+
+    <insert id="insertHouseInfo" parameterType="HouseInfo" useGeneratedKeys="true" keyProperty="houseId">
+        insert into house_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="ownerName != null">owner_name,</if>
+            <if test="location != null">location,</if>
+            <if test="rightType != null">right_type,</if>
+            <if test="area != null">area,</if>
+            <if test="documentNumber != null">document_number,</if>
+            <if test="propertyUnitNumber != null">property_unit_number,</if>
+            <if test="coOwnership != null">co_ownership,</if>
+            <if test="usageType != null">usage_type,</if>
+            <if test="usagePeriod != null">usage_period,</if>
+            <if test="registrationDate != null">registration_date,</if>
+            <if test="coOwner != null">co_owner,</if>
+            <if test="detailedAddress != null">detailed_address,</if>
+            <if test="hasParkingSpace != null">has_parking_space,</if>
+            <if test="communityName != null">community_name,</if>
+            <if test="houseStatus != null">house_status,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="ownerName != null">#{ownerName},</if>
+            <if test="location != null">#{location},</if>
+            <if test="rightType != null">#{rightType},</if>
+            <if test="area != null">#{area},</if>
+            <if test="documentNumber != null">#{documentNumber},</if>
+            <if test="propertyUnitNumber != null">#{propertyUnitNumber},</if>
+            <if test="coOwnership != null">#{coOwnership},</if>
+            <if test="usageType != null">#{usageType},</if>
+            <if test="usagePeriod != null">#{usagePeriod},</if>
+            <if test="registrationDate != null">#{registrationDate},</if>
+            <if test="coOwner != null">#{coOwner},</if>
+            <if test="detailedAddress != null">#{detailedAddress},</if>
+            <if test="hasParkingSpace != null">#{hasParkingSpace},</if>
+            <if test="communityName != null">#{communityName},</if>
+            <if test="houseStatus != null">#{houseStatus},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateHouseInfo" parameterType="HouseInfo">
+        update house_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="ownerName != null">owner_name = #{ownerName},</if>
+            <if test="location != null">location = #{location},</if>
+            <if test="rightType != null">right_type = #{rightType},</if>
+            <if test="area != null">area = #{area},</if>
+            <if test="documentNumber != null">document_number = #{documentNumber},</if>
+            <if test="propertyUnitNumber != null">property_unit_number = #{propertyUnitNumber},</if>
+            <if test="coOwnership != null">co_ownership = #{coOwnership},</if>
+            <if test="usageType != null">usage_type = #{usageType},</if>
+            <if test="usagePeriod != null">usage_period = #{usagePeriod},</if>
+            <if test="registrationDate != null">registration_date = #{registrationDate},</if>
+            <if test="coOwner != null">co_owner = #{coOwner},</if>
+            <if test="detailedAddress != null">detailed_address = #{detailedAddress},</if>
+            <if test="hasParkingSpace != null">has_parking_space = #{hasParkingSpace},</if>
+            <if test="communityName != null">community_name = #{communityName},</if>
+            <if test="houseStatus != null">house_status = #{houseStatus},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where house_id = #{houseId}
+    </update>
+
+    <delete id="deleteHouseInfoByHouseId" parameterType="Long">
+        delete from house_info where house_id = #{houseId}
+    </delete>
+
+    <delete id="deleteHouseInfoByHouseIds" parameterType="String">
+        delete from house_info where house_id in 
+        <foreach item="houseId" collection="array" open="(" separator="," close=")">
+            #{houseId}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/HouseLandlordMapper.xml

@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.HouseLandlordMapper">
-    
-    <resultMap type="HouseLandlord" id="HouseLandlordResult">
-        <result property="houseLandlordId"    column="house_landlord_id"    />
-        <result property="portalId"    column="portal_id"    />
-        <result property="houseAddress"    column="house_address"    />
-        <result property="idcard"    column="idcard"    />
-        <result property="name"    column="name"    />
-        <result property="birthday"    column="birthday"    />
-        <result property="gender"    column="gender"    />
-        <result property="type"    column="type"    />
-        <result property="phoneNumber"    column="phone_number"    />
-        <result property="isPatriarch"    column="is_patriarch"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-    </resultMap>
-
-    <sql id="selectHouseLandlordVo">
-        select house_landlord_id, portal_id, house_address, idcard, name, birthday, gender, type, phone_number, is_patriarch, create_by, create_time, update_by, update_time, remark from house_landlord
-    </sql>
-
-    <select id="selectHouseLandlordList" parameterType="HouseLandlord" resultMap="HouseLandlordResult">
-        <include refid="selectHouseLandlordVo"/>
-        <where>  
-            <if test="portalId != null "> and portal_id = #{portalId}</if>
-            <if test="houseAddress != null  and houseAddress != ''"> and house_address = #{houseAddress}</if>
-            <if test="idcard != null  and idcard != ''"> and idcard = #{idcard}</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="birthday != null  and birthday != ''"> and birthday = #{birthday}</if>
-            <if test="gender != null  and gender != ''"> and gender = #{gender}</if>
-            <if test="type != null  and type != ''"> and type = #{type}</if>
-            <if test="phoneNumber != null  and phoneNumber != ''"> and phone_number = #{phoneNumber}</if>
-            <if test="isPatriarch != null  and isPatriarch != ''"> and is_patriarch = #{isPatriarch}</if>
-        </where>
-    </select>
-    
-    <select id="selectHouseLandlordByHouseLandlordId" parameterType="Long" resultMap="HouseLandlordResult">
-        <include refid="selectHouseLandlordVo"/>
-        where house_landlord_id = #{houseLandlordId}
-    </select>
-
-    <insert id="insertHouseLandlord" parameterType="HouseLandlord" useGeneratedKeys="true" keyProperty="houseLandlordId">
-        insert into house_landlord
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="portalId != null">portal_id,</if>
-            <if test="houseAddress != null and houseAddress != ''">house_address,</if>
-            <if test="idcard != null">idcard,</if>
-            <if test="name != null">name,</if>
-            <if test="birthday != null">birthday,</if>
-            <if test="gender != null">gender,</if>
-            <if test="type != null">type,</if>
-            <if test="phoneNumber != null">phone_number,</if>
-            <if test="isPatriarch != null">is_patriarch,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="remark != null">remark,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="portalId != null">#{portalId},</if>
-            <if test="houseAddress != null and houseAddress != ''">#{houseAddress},</if>
-            <if test="idcard != null">#{idcard},</if>
-            <if test="name != null">#{name},</if>
-            <if test="birthday != null">#{birthday},</if>
-            <if test="gender != null">#{gender},</if>
-            <if test="type != null">#{type},</if>
-            <if test="phoneNumber != null">#{phoneNumber},</if>
-            <if test="isPatriarch != null">#{isPatriarch},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null">#{remark},</if>
-         </trim>
-    </insert>
-
-    <update id="updateHouseLandlord" parameterType="HouseLandlord">
-        update house_landlord
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="portalId != null">portal_id = #{portalId},</if>
-            <if test="houseAddress != null and houseAddress != ''">house_address = #{houseAddress},</if>
-            <if test="idcard != null">idcard = #{idcard},</if>
-            <if test="name != null">name = #{name},</if>
-            <if test="birthday != null">birthday = #{birthday},</if>
-            <if test="gender != null">gender = #{gender},</if>
-            <if test="type != null">type = #{type},</if>
-            <if test="phoneNumber != null">phone_number = #{phoneNumber},</if>
-            <if test="isPatriarch != null">is_patriarch = #{isPatriarch},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null">remark = #{remark},</if>
-        </trim>
-        where house_landlord_id = #{houseLandlordId}
-    </update>
-
-    <delete id="deleteHouseLandlordByHouseLandlordId" parameterType="Long">
-        delete from house_landlord where house_landlord_id = #{houseLandlordId}
-    </delete>
-
-    <delete id="deleteHouseLandlordByHouseLandlordIds" parameterType="String">
-        delete from house_landlord where house_landlord_id in 
-        <foreach item="houseLandlordId" collection="array" open="(" separator="," close=")">
-            #{houseLandlordId}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/src/main/resources/mapper/system/HouseManageMapper.xml

@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.HouseManageMapper">
-    
-    <resultMap type="HouseManage" id="HouseManageResult">
-        <result property="portalId"    column="portal_id"    />
-        <result property="houseAddress"    column="house_address"    />
-        <result property="houseOwnership"    column="house_ownership"    />
-        <result property="floorage"    column="floorage"    />
-        <result property="roomType"    column="room_type"    />
-        <result property="purpose"    column="purpose"    />
-        <result property="typeOfRights"    column="type_of_rights"    />
-        <result property="termOfRights"    column="term_of_rights"    />
-        <result property="isPark"    column="is_park"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-    </resultMap>
-
-    <sql id="selectHouseManageVo">
-        select portal_id, house_address, house_ownership, floorage, room_type, purpose, type_of_rights, term_of_rights, is_park, create_by, create_time, update_by, update_time, remark from house_manage
-    </sql>
-
-    <select id="selectHouseManageList" parameterType="HouseManage" resultMap="HouseManageResult">
-        <include refid="selectHouseManageVo"/>
-        <where>  
-            <if test="houseAddress != null  and houseAddress != ''"> and house_address = #{houseAddress}</if>
-            <if test="houseOwnership != null  and houseOwnership != ''"> and house_ownership = #{houseOwnership}</if>
-            <if test="floorage != null  and floorage != ''"> and floorage = #{floorage}</if>
-            <if test="roomType != null  and roomType != ''"> and room_type = #{roomType}</if>
-            <if test="purpose != null  and purpose != ''"> and purpose = #{purpose}</if>
-            <if test="typeOfRights != null  and typeOfRights != ''"> and type_of_rights = #{typeOfRights}</if>
-            <if test="termOfRights != null  and termOfRights != ''"> and term_of_rights = #{termOfRights}</if>
-            <if test="isPark != null  and isPark != ''"> and is_park = #{isPark}</if>
-        </where>
-    </select>
-    
-    <select id="selectHouseManageByPortalId" parameterType="Long" resultMap="HouseManageResult">
-        <include refid="selectHouseManageVo"/>
-        where portal_id = #{portalId}
-    </select>
-
-    <insert id="insertHouseManage" parameterType="HouseManage" useGeneratedKeys="true" keyProperty="portalId">
-        insert into house_manage
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="houseAddress != null and houseAddress != ''">house_address,</if>
-            <if test="houseOwnership != null and houseOwnership != ''">house_ownership,</if>
-            <if test="floorage != null and floorage != ''">floorage,</if>
-            <if test="roomType != null and roomType != ''">room_type,</if>
-            <if test="purpose != null and purpose != ''">purpose,</if>
-            <if test="typeOfRights != null and typeOfRights != ''">type_of_rights,</if>
-            <if test="termOfRights != null and termOfRights != ''">term_of_rights,</if>
-            <if test="isPark != null">is_park,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="remark != null">remark,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="houseAddress != null and houseAddress != ''">#{houseAddress},</if>
-            <if test="houseOwnership != null and houseOwnership != ''">#{houseOwnership},</if>
-            <if test="floorage != null and floorage != ''">#{floorage},</if>
-            <if test="roomType != null and roomType != ''">#{roomType},</if>
-            <if test="purpose != null and purpose != ''">#{purpose},</if>
-            <if test="typeOfRights != null and typeOfRights != ''">#{typeOfRights},</if>
-            <if test="termOfRights != null and termOfRights != ''">#{termOfRights},</if>
-            <if test="isPark != null">#{isPark},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null">#{remark},</if>
-         </trim>
-    </insert>
-
-    <update id="updateHouseManage" parameterType="HouseManage">
-        update house_manage
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="houseAddress != null and houseAddress != ''">house_address = #{houseAddress},</if>
-            <if test="houseOwnership != null and houseOwnership != ''">house_ownership = #{houseOwnership},</if>
-            <if test="floorage != null and floorage != ''">floorage = #{floorage},</if>
-            <if test="roomType != null and roomType != ''">room_type = #{roomType},</if>
-            <if test="purpose != null and purpose != ''">purpose = #{purpose},</if>
-            <if test="typeOfRights != null and typeOfRights != ''">type_of_rights = #{typeOfRights},</if>
-            <if test="termOfRights != null and termOfRights != ''">term_of_rights = #{termOfRights},</if>
-            <if test="isPark != null">is_park = #{isPark},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null">remark = #{remark},</if>
-        </trim>
-        where portal_id = #{portalId}
-    </update>
-
-    <delete id="deleteHouseManageByPortalId" parameterType="Long">
-        delete from house_manage where portal_id = #{portalId}
-    </delete>
-
-    <delete id="deleteHouseManageByPortalIds" parameterType="String">
-        delete from house_manage where portal_id in 
-        <foreach item="portalId" collection="array" open="(" separator="," close=")">
-            #{portalId}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/src/main/resources/mapper/system/IllegalParkingMapper.xml

@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectIllegalParkingList" parameterType="IllegalParking" resultMap="IllegalParkingResult">
         <include refid="selectIllegalParkingVo"/>
         <where>  
-            <if test="plateNumber != null  and plateNumber != ''"> and plate_number = #{plateNumber}</if>
+            <if test="plateNumber != null  and plateNumber != ''"> and plate_number like concat('%', #{plateNumber}, '%')</if>
             <if test="portalId != null "> and portal_id = #{portalId}</if>
             <if test="visitPortal != null  and visitPortal != ''"> and visit_portal = #{visitPortal}</if>
             <if test="mobileNumber != null  and mobileNumber != ''"> and mobile_number = #{mobileNumber}</if>
@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="illegalPhoto != null  and illegalPhoto != ''"> and illegal_photo = #{illegalPhoto}</if>
             <if test="isBlack != null  and isBlack != ''"> and is_black = #{isBlack}</if>
             <if test="carType != null  and carType != ''"> and car_type = #{carType}</if>
+            <if test="params.createTime != null  and params.createTime != ''"> AND date_format(create_time,'%Y%m%d') = date_format(#{params.createTime},'%Y%m%d')</if>
         </where>
     </select>
     
@@ -44,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where illegal_parking_id = #{illegalParkingId}
     </select>
 
-    <select id="selectIllegalParkingByPlateNumber" parameterType="Long" resultMap="IllegalParkingResult">
+    <select id="selectIllegalParkingByPlateNumber" parameterType="string" resultMap="IllegalParkingResult">
         <include refid="selectIllegalParkingVo"/>
         where plate_number = #{plateNumber}
     </select>

ruoyi-system/src/main/resources/mapper/system/ProprietorCarMapper.xml

@@ -6,8 +6,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="ProprietorCar" id="ProprietorCarResult">
         <result property="carId"    column="car_id"    />
+        <result property="houseId"    column="house_id"    />
+        <result property="detailedAddress"    column="detailed_address"    />
         <result property="userId"    column="user_id"    />
         <result property="userName"    column="user_name"    />
+        <result property="residentPhone"    column="resident_phone"    />
         <result property="plateNumber"    column="plate_number"    />
         <result property="vehicleBrand"    column="vehicle_brand"    />
         <result property="vehicleType"    column="vehicle_type"    />
@@ -24,14 +27,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectProprietorCarVo">
-        select car_id, user_id, user_name, plate_number, vehicle_brand, vehicle_type, vehicle_colour, engine_number, identification_number, registration_date, issue_date, create_by, create_time, update_by, update_time, remark from proprietor_car
+        select car_id, house_id, detailed_address, user_id, user_name, resident_phone, plate_number, vehicle_brand, vehicle_type, vehicle_colour, engine_number, identification_number, registration_date, issue_date, create_by, create_time, update_by, update_time, remark from proprietor_car
     </sql>
 
     <select id="selectProprietorCarList" parameterType="ProprietorCar" resultMap="ProprietorCarResult">
         <include refid="selectProprietorCarVo"/>
         <where>  
+            <if test="houseId != null "> and house_id = #{houseId}</if>
+            <if test="detailedAddress != null  and detailedAddress != ''"> and detailed_address = #{detailedAddress}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="residentPhone != null  and residentPhone != ''"> and resident_phone = #{residentPhone}</if>
             <if test="plateNumber != null  and plateNumber != ''"> and plate_number = #{plateNumber}</if>
             <if test="vehicleBrand != null  and vehicleBrand != ''"> and vehicle_brand = #{vehicleBrand}</if>
             <if test="vehicleType != null  and vehicleType != ''"> and vehicle_type = #{vehicleType}</if>
@@ -51,8 +57,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertProprietorCar" parameterType="ProprietorCar" useGeneratedKeys="true" keyProperty="carId">
         insert into proprietor_car
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="houseId != null">house_id,</if>
+            <if test="detailedAddress != null">detailed_address,</if>
             <if test="userId != null">user_id,</if>
             <if test="userName != null">user_name,</if>
+            <if test="residentPhone != null">resident_phone,</if>
             <if test="plateNumber != null and plateNumber != ''">plate_number,</if>
             <if test="vehicleBrand != null">vehicle_brand,</if>
             <if test="vehicleType != null">vehicle_type,</if>
@@ -68,8 +77,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="houseId != null">#{houseId},</if>
+            <if test="detailedAddress != null">#{detailedAddress},</if>
             <if test="userId != null">#{userId},</if>
             <if test="userName != null">#{userName},</if>
+            <if test="residentPhone != null">#{residentPhone},</if>
             <if test="plateNumber != null and plateNumber != ''">#{plateNumber},</if>
             <if test="vehicleBrand != null">#{vehicleBrand},</if>
             <if test="vehicleType != null">#{vehicleType},</if>
@@ -89,8 +101,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateProprietorCar" parameterType="ProprietorCar">
         update proprietor_car
         <trim prefix="SET" suffixOverrides=",">
+            <if test="houseId != null">house_id = #{houseId},</if>
+            <if test="detailedAddress != null">detailed_address = #{detailedAddress},</if>
             <if test="userId != null">user_id = #{userId},</if>
             <if test="userName != null">user_name = #{userName},</if>
+            <if test="residentPhone != null">resident_phone = #{residentPhone},</if>
             <if test="plateNumber != null and plateNumber != ''">plate_number = #{plateNumber},</if>
             <if test="vehicleBrand != null">vehicle_brand = #{vehicleBrand},</if>
             <if test="vehicleType != null">vehicle_type = #{vehicleType},</if>

ruoyi-system/src/main/resources/mapper/system/ProprietorHouseMapper.xml

@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.ProprietorHouseMapper">
-    
-    <resultMap type="ProprietorHouse" id="ProprietorHouseResult">
-        <result property="proprietorId"    column="proprietor_id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="proprietorHouseAddress"    column="proprietor_house_address"    />
-        <result property="userName"    column="user_name"    />
-        <result property="master"    column="master"    />
-        <result property="floorage"    column="floorage"    />
-        <result property="roomType"    column="room_type"    />
-        <result property="tenementType"    column="tenement_type"    />
-        <result property="isMaster"    column="is_master"    />
-        <result property="masterRelation"    column="master_relation"    />
-        <result property="tenementQuantity"    column="tenement_quantity"    />
-        <result property="isPark"    column="is_park"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-    </resultMap>
-
-    <sql id="selectProprietorHouseVo">
-        select proprietor_id, user_id, proprietor_house_address, user_name, master, floorage, room_type, tenement_type, is_master, master_relation, tenement_quantity, is_park, create_by, create_time, update_by, update_time, remark from proprietor_house
-    </sql>
-
-    <select id="selectProprietorHouseList" parameterType="ProprietorHouse" resultMap="ProprietorHouseResult">
-        <include refid="selectProprietorHouseVo"/>
-        <where>  
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="proprietorHouseAddress != null  and proprietorHouseAddress != ''"> and proprietor_house_address = #{proprietorHouseAddress}</if>
-            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
-            <if test="master != null  and master != ''"> and master = #{master}</if>
-            <if test="floorage != null  and floorage != ''"> and floorage = #{floorage}</if>
-            <if test="roomType != null  and roomType != ''"> and room_type = #{roomType}</if>
-            <if test="tenementType != null  and tenementType != ''"> and tenement_type = #{tenementType}</if>
-            <if test="isMaster != null  and isMaster != ''"> and is_master = #{isMaster}</if>
-            <if test="masterRelation != null  and masterRelation != ''"> and master_relation = #{masterRelation}</if>
-            <if test="tenementQuantity != null  and tenementQuantity != ''"> and tenement_quantity = #{tenementQuantity}</if>
-            <if test="isPark != null  and isPark != ''"> and is_park = #{isPark}</if>
-        </where>
-    </select>
-    
-    <select id="selectProprietorHouseByProprietorId" parameterType="Long" resultMap="ProprietorHouseResult">
-        <include refid="selectProprietorHouseVo"/>
-        where proprietor_id = #{proprietorId}
-    </select>
-
-    <insert id="insertProprietorHouse" parameterType="ProprietorHouse" useGeneratedKeys="true" keyProperty="proprietorId">
-        insert into proprietor_house
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="userId != null">user_id,</if>
-            <if test="proprietorHouseAddress != null">proprietor_house_address,</if>
-            <if test="userName != null">user_name,</if>
-            <if test="master != null">master,</if>
-            <if test="floorage != null">floorage,</if>
-            <if test="roomType != null">room_type,</if>
-            <if test="tenementType != null">tenement_type,</if>
-            <if test="isMaster != null">is_master,</if>
-            <if test="masterRelation != null">master_relation,</if>
-            <if test="tenementQuantity != null">tenement_quantity,</if>
-            <if test="isPark != null">is_park,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="remark != null">remark,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="userId != null">#{userId},</if>
-            <if test="proprietorHouseAddress != null">#{proprietorHouseAddress},</if>
-            <if test="userName != null">#{userName},</if>
-            <if test="master != null">#{master},</if>
-            <if test="floorage != null">#{floorage},</if>
-            <if test="roomType != null">#{roomType},</if>
-            <if test="tenementType != null">#{tenementType},</if>
-            <if test="isMaster != null">#{isMaster},</if>
-            <if test="masterRelation != null">#{masterRelation},</if>
-            <if test="tenementQuantity != null">#{tenementQuantity},</if>
-            <if test="isPark != null">#{isPark},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null">#{remark},</if>
-         </trim>
-    </insert>
-
-    <update id="updateProprietorHouse" parameterType="ProprietorHouse">
-        update proprietor_house
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="proprietorHouseAddress != null">proprietor_house_address = #{proprietorHouseAddress},</if>
-            <if test="userName != null">user_name = #{userName},</if>
-            <if test="master != null">master = #{master},</if>
-            <if test="floorage != null">floorage = #{floorage},</if>
-            <if test="roomType != null">room_type = #{roomType},</if>
-            <if test="tenementType != null">tenement_type = #{tenementType},</if>
-            <if test="isMaster != null">is_master = #{isMaster},</if>
-            <if test="masterRelation != null">master_relation = #{masterRelation},</if>
-            <if test="tenementQuantity != null">tenement_quantity = #{tenementQuantity},</if>
-            <if test="isPark != null">is_park = #{isPark},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null">remark = #{remark},</if>
-        </trim>
-        where proprietor_id = #{proprietorId}
-    </update>
-
-    <delete id="deleteProprietorHouseByProprietorId" parameterType="Long">
-        delete from proprietor_house where proprietor_id = #{proprietorId}
-    </delete>
-
-    <delete id="deleteProprietorHouseByProprietorIds" parameterType="String">
-        delete from proprietor_house where proprietor_id in 
-        <foreach item="proprietorId" collection="array" open="(" separator="," close=")">
-            #{proprietorId}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-system/src/main/resources/mapper/system/ReservRecordMapper.xml

@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.ReservRecordMapper">
+    
+    <resultMap type="ReservRecord" id="ReservRecordResult">
+        <result property="reservRecordId"    column="reserv_record_id"    />
+        <result property="portalId"    column="portal_id"    />
+        <result property="houseAddress"    column="house_address"    />
+        <result property="detailAddress"    column="detail_address"    />
+        <result property="lgt"    column="lgt"    />
+        <result property="lat"    column="lat"    />
+        <result property="shareName"    column="share_name"    />
+        <result property="name"    column="name"    />
+        <result property="num"    column="num"    />
+        <result property="reason"    column="reason"    />
+        <result property="mobileNumber"    column="mobile_number"    />
+        <result property="isCar"    column="is_car"    />
+        <result property="plateNumber"    column="plate_number"    />
+        <result property="reserveTime"    column="reserve_time"    />
+        <result property="visitorTime"    column="visitor_time"    />
+        <result property="status"    column="status"    />
+        <result property="photo"    column="photo"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectReservRecordVo">
+        select reserv_record_id, portal_id, house_address, detail_address, lgt, lat, share_name, name, num, reason, mobile_number, is_car, plate_number, reserve_time, visitor_time, status, photo, create_by, create_time, update_by, update_time, remark from reserv_record
+    </sql>
+
+    <select id="selectReservRecordList" parameterType="ReservRecord" resultMap="ReservRecordResult">
+        <include refid="selectReservRecordVo"/>
+        <where>  
+            <if test="portalId != null "> and portal_id = #{portalId}</if>
+            <if test="houseAddress != null  and houseAddress != ''"> and house_address = #{houseAddress}</if>
+            <if test="detailAddress != null  and detailAddress != ''"> and detail_address = #{detailAddress}</if>
+            <if test="lgt != null  and lgt != ''"> and lgt = #{lgt}</if>
+            <if test="lat != null  and lat != ''"> and lat = #{lat}</if>
+            <if test="shareName != null  and shareName != ''"> and share_name like concat('%', #{shareName}, '%')</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="num != null  and num != ''"> and num = #{num}</if>
+            <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
+            <if test="mobileNumber != null  and mobileNumber != ''"> and mobile_number = #{mobileNumber}</if>
+            <if test="isCar != null  and isCar != ''"> and is_car = #{isCar}</if>
+            <if test="plateNumber != null  and plateNumber != ''"> and plate_number = #{plateNumber}</if>
+            <if test="reserveTime != null "> and reserve_time = #{reserveTime}</if>
+            <if test="visitorTime != null "> and visitor_time = #{visitorTime}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="photo != null  and photo != ''"> and photo = #{photo}</if>
+        </where>
+    </select>
+    
+    <select id="selectReservRecordByReservRecordId" parameterType="Long" resultMap="ReservRecordResult">
+        <include refid="selectReservRecordVo"/>
+        where reserv_record_id = #{reservRecordId}
+    </select>
+
+    <insert id="insertReservRecord" parameterType="ReservRecord" useGeneratedKeys="true" keyProperty="reservRecordId">
+        insert into reserv_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="portalId != null">portal_id,</if>
+            <if test="houseAddress != null and houseAddress != ''">house_address,</if>
+            <if test="detailAddress != null and detailAddress != ''">detail_address,</if>
+            <if test="lgt != null and lgt != ''">lgt,</if>
+            <if test="lat != null and lat != ''">lat,</if>
+            <if test="shareName != null">share_name,</if>
+            <if test="name != null">name,</if>
+            <if test="num != null">num,</if>
+            <if test="reason != null">reason,</if>
+            <if test="mobileNumber != null and mobileNumber != ''">mobile_number,</if>
+            <if test="isCar != null">is_car,</if>
+            <if test="plateNumber != null and plateNumber != ''">plate_number,</if>
+            <if test="reserveTime != null">reserve_time,</if>
+            <if test="visitorTime != null">visitor_time,</if>
+            <if test="status != null">status,</if>
+            <if test="photo != null">photo,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="portalId != null">#{portalId},</if>
+            <if test="houseAddress != null and houseAddress != ''">#{houseAddress},</if>
+            <if test="detailAddress != null and detailAddress != ''">#{detailAddress},</if>
+            <if test="lgt != null and lgt != ''">#{lgt},</if>
+            <if test="lat != null and lat != ''">#{lat},</if>
+            <if test="shareName != null">#{shareName},</if>
+            <if test="name != null">#{name},</if>
+            <if test="num != null">#{num},</if>
+            <if test="reason != null">#{reason},</if>
+            <if test="mobileNumber != null and mobileNumber != ''">#{mobileNumber},</if>
+            <if test="isCar != null">#{isCar},</if>
+            <if test="plateNumber != null and plateNumber != ''">#{plateNumber},</if>
+            <if test="reserveTime != null">#{reserveTime},</if>
+            <if test="visitorTime != null">#{visitorTime},</if>
+            <if test="status != null">#{status},</if>
+            <if test="photo != null">#{photo},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateReservRecord" parameterType="ReservRecord">
+        update reserv_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="portalId != null">portal_id = #{portalId},</if>
+            <if test="houseAddress != null and houseAddress != ''">house_address = #{houseAddress},</if>
+            <if test="detailAddress != null and detailAddress != ''">detail_address = #{detailAddress},</if>
+            <if test="lgt != null and lgt != ''">lgt = #{lgt},</if>
+            <if test="lat != null and lat != ''">lat = #{lat},</if>
+            <if test="shareName != null">share_name = #{shareName},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="num != null">num = #{num},</if>
+            <if test="reason != null">reason = #{reason},</if>
+            <if test="mobileNumber != null and mobileNumber != ''">mobile_number = #{mobileNumber},</if>
+            <if test="isCar != null">is_car = #{isCar},</if>
+            <if test="plateNumber != null and plateNumber != ''">plate_number = #{plateNumber},</if>
+            <if test="reserveTime != null">reserve_time = #{reserveTime},</if>
+            <if test="visitorTime != null">visitor_time = #{visitorTime},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="photo != null">photo = #{photo},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where reserv_record_id = #{reservRecordId}
+    </update>
+
+    <delete id="deleteReservRecordByReservRecordId" parameterType="Long">
+        delete from reserv_record where reserv_record_id = #{reservRecordId}
+    </delete>
+
+    <delete id="deleteReservRecordByReservRecordIds" parameterType="String">
+        delete from reserv_record where reserv_record_id in 
+        <foreach item="reservRecordId" collection="array" open="(" separator="," close=")">
+            #{reservRecordId}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/ResidentInfoMapper.xml

@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.ResidentInfoMapper">
+    
+    <resultMap type="ResidentInfo" id="ResidentInfoResult">
+        <result property="residentId"    column="resident_id"    />
+        <result property="houseId"    column="house_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="detailedAddress"    column="detailed_address"    />
+        <result property="residentName"    column="resident_name"    />
+        <result property="residentIdCard"    column="resident_id_card"    />
+        <result property="residentBirthday"    column="resident_birthday"    />
+        <result property="residentPhone"    column="resident_phone"    />
+        <result property="residentGender"    column="resident_gender"    />
+        <result property="residentRelationship"    column="resident_relationship"    />
+        <result property="isHouseholder"    column="is_householder"    />
+        <result property="residentEmployer"    column="resident_employer"    />
+        <result property="residentAppearance"    column="resident_appearance"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectResidentInfoVo">
+        select resident_id, house_id, user_id, detailed_address, resident_name, resident_id_card, resident_birthday, resident_phone, resident_gender, resident_relationship, is_householder, resident_employer, resident_appearance, create_by, create_time, update_by, update_time, remark from resident_info
+    </sql>
+
+    <select id="selectResidentInfoList" parameterType="ResidentInfo" resultMap="ResidentInfoResult">
+        <include refid="selectResidentInfoVo"/>
+        <where>  
+            <if test="houseId != null "> and house_id = #{houseId}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="detailedAddress != null  and detailedAddress != ''"> and detailed_address = #{detailedAddress}</if>
+            <if test="residentName != null  and residentName != ''"> and resident_name like concat('%', #{residentName}, '%')</if>
+            <if test="residentIdCard != null  and residentIdCard != ''"> and resident_id_card = #{residentIdCard}</if>
+            <if test="residentBirthday != null  and residentBirthday != ''"> and resident_birthday = #{residentBirthday}</if>
+            <if test="residentPhone != null  and residentPhone != ''"> and resident_phone = #{residentPhone}</if>
+            <if test="residentGender != null "> and resident_gender = #{residentGender}</if>
+            <if test="residentRelationship != null  and residentRelationship != ''"> and resident_relationship = #{residentRelationship}</if>
+            <if test="isHouseholder != null "> and is_householder = #{isHouseholder}</if>
+            <if test="residentEmployer != null  and residentEmployer != ''"> and resident_employer = #{residentEmployer}</if>
+            <if test="residentAppearance != null  and residentAppearance != ''"> and resident_appearance = #{residentAppearance}</if>
+        </where>
+    </select>
+    
+    <select id="selectResidentInfoByResidentId" parameterType="Long" resultMap="ResidentInfoResult">
+        <include refid="selectResidentInfoVo"/>
+        where resident_id = #{residentId}
+    </select>
+
+    <insert id="insertResidentInfo" parameterType="ResidentInfo" useGeneratedKeys="true" keyProperty="residentId">
+        insert into resident_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="houseId != null">house_id,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="detailedAddress != null">detailed_address,</if>
+            <if test="residentName != null">resident_name,</if>
+            <if test="residentIdCard != null">resident_id_card,</if>
+            <if test="residentBirthday != null">resident_birthday,</if>
+            <if test="residentPhone != null">resident_phone,</if>
+            <if test="residentGender != null">resident_gender,</if>
+            <if test="residentRelationship != null">resident_relationship,</if>
+            <if test="isHouseholder != null">is_householder,</if>
+            <if test="residentEmployer != null">resident_employer,</if>
+            <if test="residentAppearance != null">resident_appearance,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="houseId != null">#{houseId},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="detailedAddress != null">#{detailedAddress},</if>
+            <if test="residentName != null">#{residentName},</if>
+            <if test="residentIdCard != null">#{residentIdCard},</if>
+            <if test="residentBirthday != null">#{residentBirthday},</if>
+            <if test="residentPhone != null">#{residentPhone},</if>
+            <if test="residentGender != null">#{residentGender},</if>
+            <if test="residentRelationship != null">#{residentRelationship},</if>
+            <if test="isHouseholder != null">#{isHouseholder},</if>
+            <if test="residentEmployer != null">#{residentEmployer},</if>
+            <if test="residentAppearance != null">#{residentAppearance},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateResidentInfo" parameterType="ResidentInfo">
+        update resident_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="houseId != null">house_id = #{houseId},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="detailedAddress != null">detailed_address = #{detailedAddress},</if>
+            <if test="residentName != null">resident_name = #{residentName},</if>
+            <if test="residentIdCard != null">resident_id_card = #{residentIdCard},</if>
+            <if test="residentBirthday != null">resident_birthday = #{residentBirthday},</if>
+            <if test="residentPhone != null">resident_phone = #{residentPhone},</if>
+            <if test="residentGender != null">resident_gender = #{residentGender},</if>
+            <if test="residentRelationship != null">resident_relationship = #{residentRelationship},</if>
+            <if test="isHouseholder != null">is_householder = #{isHouseholder},</if>
+            <if test="residentEmployer != null">resident_employer = #{residentEmployer},</if>
+            <if test="residentAppearance != null">resident_appearance = #{residentAppearance},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where resident_id = #{residentId}
+    </update>
+
+    <delete id="deleteResidentInfoByResidentId" parameterType="Long">
+        delete from resident_info where resident_id = #{residentId}
+    </delete>
+
+    <delete id="deleteResidentInfoByResidentIds" parameterType="String">
+        delete from resident_info where resident_id in 
+        <foreach item="residentId" collection="array" open="(" separator="," close=")">
+            #{residentId}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/StaffManageMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="StaffManage" id="StaffManageResult">
         <result property="staffId"    column="staff_id"    />
+        <result property="userId"    column="user_id"    />
         <result property="staffName"    column="staff_name"    />
         <result property="gender"    column="gender"    />
         <result property="staffCategory"    column="staff_category"    />
@@ -25,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectStaffManageVo">
-        select staff_id, staff_name, gender, staff_category, maintenance_category, phone_number, avatar_photo, id_card, id_card_front, id_card_back, certificate, status, create_by, create_time, update_by, update_time, remark from staff_manage
+        select staff_id,user_id, staff_name, gender, staff_category, maintenance_category, phone_number, avatar_photo, id_card, id_card_front, id_card_back, certificate, status, create_by, create_time, update_by, update_time, remark from staff_manage
     </sql>
 
     <select id="selectStaffManageList" parameterType="StaffManage" resultMap="StaffManageResult">
@@ -53,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertStaffManage" parameterType="StaffManage" useGeneratedKeys="true" keyProperty="staffId">
         insert into staff_manage
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
             <if test="staffName != null">staff_name,</if>
             <if test="gender != null">gender,</if>
             <if test="staffCategory != null">staff_category,</if>
@@ -71,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
             <if test="staffName != null">#{staffName},</if>
             <if test="gender != null">#{gender},</if>
             <if test="staffCategory != null">#{staffCategory},</if>
@@ -93,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateStaffManage" parameterType="StaffManage">
         update staff_manage
         <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
             <if test="staffName != null">staff_name = #{staffName},</if>
             <if test="gender != null">gender = #{gender},</if>
             <if test="staffCategory != null">staff_category = #{staffCategory},</if>