From dcad0ec731204cb5a3ce9220ff827489fb79ad75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E5=AE=87=E6=81=92?= <13581426+zhou030824@user.noreply.gitee.com> Date: Wed, 31 Jan 2024 21:35:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=8F=E6=88=B7=E5=88=A0=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zyh/common/domain/Building.java | 1 + .../com/zyh/common/domain/Households.java | 3 +- .../system/controller/BuildController.java | 37 ++++++++++++++++--- .../com/zyh/system/mapper/BuildMapper.java | 10 +++++ .../com/zyh/system/service/BuildService.java | 11 ++++++ .../system/service/impl/BuildServicempl.java | 34 +++++++++++++++++ .../src/main/resources/mapper/BuildMapper.xml | 32 +++++++++++++++- 7 files changed, 120 insertions(+), 8 deletions(-) diff --git a/community-security-common/src/main/java/com/zyh/common/domain/Building.java b/community-security-common/src/main/java/com/zyh/common/domain/Building.java index c13d7b3..3cd3527 100644 --- a/community-security-common/src/main/java/com/zyh/common/domain/Building.java +++ b/community-security-common/src/main/java/com/zyh/common/domain/Building.java @@ -12,6 +12,7 @@ public class Building { private Integer endFloor; private Integer startHold; private Integer endHold; + private Integer residents; } diff --git a/community-security-common/src/main/java/com/zyh/common/domain/Households.java b/community-security-common/src/main/java/com/zyh/common/domain/Households.java index ab17948..91f7162 100644 --- a/community-security-common/src/main/java/com/zyh/common/domain/Households.java +++ b/community-security-common/src/main/java/com/zyh/common/domain/Households.java @@ -10,8 +10,9 @@ public class Households { private Integer type; private Integer unit; - private String name; + private String typename; private String buildId; + private String pic; } diff --git a/community-security-modules/community-security-modules-shop/src/main/java/com/zyh/system/controller/BuildController.java b/community-security-modules/community-security-modules-shop/src/main/java/com/zyh/system/controller/BuildController.java index b734b46..ec044f7 100644 --- a/community-security-modules/community-security-modules-shop/src/main/java/com/zyh/system/controller/BuildController.java +++ b/community-security-modules/community-security-modules-shop/src/main/java/com/zyh/system/controller/BuildController.java @@ -1,13 +1,13 @@ package com.zyh.system.controller; import com.zyh.common.domain.Building; +import com.zyh.common.domain.Households; import com.zyh.common.result.Result; import com.zyh.system.service.BuildService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; @RestController @RequestMapping("build") @@ -18,9 +18,36 @@ public class BuildController { //添加楼栋（住户） @PostMapping("addBuild") - public Result addBuild(@RequestBody Building building){ + public Result addBuild(@RequestBody Building building) { return buildService.addBuild(building); } + //查询楼栋信息 + @PostMapping("getBuild") + public Result> getBuild() { + + return buildService.getBuild(); + } + + //查询住户信息 + @PostMapping("getHouse") + public Result> getHouse(@RequestParam String buildId, @RequestParam Integer unit) { + + return buildService.getHouse(buildId, unit); + } + + //删除住户 + @PostMapping("deleteHouse") + public Result deleteHouse(@RequestParam Integer id) { + + return buildService.deleteHouse(id); + } + + //修改住户信息 + @PostMapping("updateHouse") + public Result updateHouse(@RequestBody Households households) { + + return buildService.updateHouse(households); + } } diff --git a/community-security-modules/community-security-modules-shop/src/main/java/com/zyh/system/mapper/BuildMapper.java b/community-security-modules/community-security-modules-shop/src/main/java/com/zyh/system/mapper/BuildMapper.java index c71f06a..3d6e79b 100644 --- a/community-security-modules/community-security-modules-shop/src/main/java/com/zyh/system/mapper/BuildMapper.java +++ b/community-security-modules/community-security-modules-shop/src/main/java/com/zyh/system/mapper/BuildMapper.java @@ -5,6 +5,8 @@ import com.zyh.common.domain.Households; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface BuildMapper { Integer addBuild(Building building); @@ -12,4 +14,12 @@ public interface BuildMapper { void addHouse(Households households); String selectBuildId(@Param("buildId") String buildId); + + List getBuild(); + + List getHouse(@Param("buildId") String buildId, @Param("unit") Integer unit); + + Integer deleteHouse(@Param("id") Integer id); + + Integer updateHouse(Households households); } diff --git a/community-security-modules/community-security-modules-shop/src/main/java/com/zyh/system/service/BuildService.java b/community-security-modules/community-security-modules-shop/src/main/java/com/zyh/system/service/BuildService.java index 01551f4..bd502fb 100644 --- a/community-security-modules/community-security-modules-shop/src/main/java/com/zyh/system/service/BuildService.java +++ b/community-security-modules/community-security-modules-shop/src/main/java/com/zyh/system/service/BuildService.java @@ -1,8 +1,19 @@ package com.zyh.system.service; import com.zyh.common.domain.Building; +import com.zyh.common.domain.Households; import com.zyh.common.result.Result; +import java.util.List; + public interface BuildService { Result addBuild(Building building); + + Result> getBuild(); + + Result> getHouse(String buildId,Integer unit); + + Result deleteHouse(Integer id); + + Result updateHouse(Households households); } diff --git a/community-security-modules/community-security-modules-shop/src/main/java/com/zyh/system/service/impl/BuildServicempl.java b/community-security-modules/community-security-modules-shop/src/main/java/com/zyh/system/service/impl/BuildServicempl.java index 094a797..eb25508 100644 --- a/community-security-modules/community-security-modules-shop/src/main/java/com/zyh/system/service/impl/BuildServicempl.java +++ b/community-security-modules/community-security-modules-shop/src/main/java/com/zyh/system/service/impl/BuildServicempl.java @@ -7,6 +7,9 @@ import com.zyh.system.mapper.BuildMapper; import com.zyh.system.service.BuildService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; @Service public class BuildServicempl implements BuildService { @@ -44,4 +47,35 @@ public class BuildServicempl implements BuildService { return Result.error("添加失败"); } + + @Override + public Result> getBuild() { + List buildings =buildMapper.getBuild(); + return Result.success(buildings); + } + + @Override + public Result> getHouse(String buildId,Integer unit) { + List households =buildMapper.getHouse(buildId,unit); + return Result.success(households); + } + + @Override + public Result deleteHouse(Integer id) { + Integer delete =buildMapper.deleteHouse(id); + if(delete>0){ + return Result.success("删除成功"); + } + return Result.error("删除失败"); + } + + @Override + public Result updateHouse(Households households) { + Integer update =buildMapper.updateHouse(households); + if(update>0){ + return Result.success("更新成功"); + } + return Result.error("更新失败"); + } + } diff --git a/community-security-modules/community-security-modules-shop/src/main/resources/mapper/BuildMapper.xml b/community-security-modules/community-security-modules-shop/src/main/resources/mapper/BuildMapper.xml index c3ef086..276c565 100644 --- a/community-security-modules/community-security-modules-shop/src/main/resources/mapper/BuildMapper.xml +++ b/community-security-modules/community-security-modules-shop/src/main/resources/mapper/BuildMapper.xml @@ -4,12 +4,40 @@ - insert into building values (0,#{buildId},#{address},#{unit},#{startFloor},#{endFloor},#{startHold},#{endHold}) + insert into building values (0,#{buildId},#{address},#{unit},#{startFloor},#{endFloor},#{startHold},#{endHold},0) insert into households values (0,#{holdId},0,1,#{buildId},#{unit}) + + update households set + hold_id = #{holdId}, + build_id = #{buildId}, + unit = #{unit}, + person_num = #{personNum}, + type = #{type} + where id = #{id} + + + delete from households where id = #{id} + + +