diff --git a/community-security-auth/src/main/java/com/zyh/auth/service/impl/AuthServicempl.java b/community-security-auth/src/main/java/com/zyh/auth/service/impl/AuthServicempl.java index fc7dd51..2dfcfcd 100644 --- a/community-security-auth/src/main/java/com/zyh/auth/service/impl/AuthServicempl.java +++ b/community-security-auth/src/main/java/com/zyh/auth/service/impl/AuthServicempl.java @@ -49,10 +49,10 @@ public class AuthServicempl implements AuthService { HashMap map = new HashMap<>(); map.put(JwtConstants.USER_KEY, userkey); String token = JwtUtils.createToken(map); - redisTemplate.opsForValue().set(TokenConstants.LOGIN_TOKEN_KEY + userkey, JSONObject.toJSONString(user), 30, TimeUnit.MINUTES); + redisTemplate.opsForValue().set(TokenConstants.LOGIN_TOKEN_KEY + userkey, JSONObject.toJSONString(user), 60, TimeUnit.MINUTES); UserResponse userResponse = new UserResponse(); userResponse.setToken(token); - userResponse.setExpirTime("30MIN"); + userResponse.setExpirTime("60MIN"); return Result.success(userResponse); } 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 new file mode 100644 index 0000000..c13d7b3 --- /dev/null +++ b/community-security-common/src/main/java/com/zyh/common/domain/Building.java @@ -0,0 +1,17 @@ +package com.zyh.common.domain; + +import lombok.Data; + +@Data +public class Building { + private Integer id; + private String buildId; + private String address; + private Integer unit; + private Integer startFloor; + private Integer endFloor; + private Integer startHold; + private Integer endHold; + + +} 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 new file mode 100644 index 0000000..ab17948 --- /dev/null +++ b/community-security-common/src/main/java/com/zyh/common/domain/Households.java @@ -0,0 +1,17 @@ +package com.zyh.common.domain; + +import lombok.Data; + +@Data +public class Households { + private Integer id; + private String holdId; + private Integer personNum; + private Integer type; + private Integer unit; + + private String name; + private String buildId; + + +} diff --git a/community-security-common/src/main/java/com/zyh/common/domain/Housetype.java b/community-security-common/src/main/java/com/zyh/common/domain/Housetype.java new file mode 100644 index 0000000..705de1b --- /dev/null +++ b/community-security-common/src/main/java/com/zyh/common/domain/Housetype.java @@ -0,0 +1,9 @@ +package com.zyh.common.domain; + +import lombok.Data; + +@Data +public class Housetype { + private Integer id; + private String name; +} 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 new file mode 100644 index 0000000..b734b46 --- /dev/null +++ b/community-security-modules/community-security-modules-shop/src/main/java/com/zyh/system/controller/BuildController.java @@ -0,0 +1,26 @@ +package com.zyh.system.controller; + +import com.zyh.common.domain.Building; +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; + +@RestController +@RequestMapping("build") +public class BuildController { + + @Autowired + private BuildService buildService; + + //添加楼栋（住户） + @PostMapping("addBuild") + public Result addBuild(@RequestBody Building building){ + + return buildService.addBuild(building); + } + +} 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 new file mode 100644 index 0000000..c71f06a --- /dev/null +++ b/community-security-modules/community-security-modules-shop/src/main/java/com/zyh/system/mapper/BuildMapper.java @@ -0,0 +1,15 @@ +package com.zyh.system.mapper; + +import com.zyh.common.domain.Building; +import com.zyh.common.domain.Households; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface BuildMapper { + Integer addBuild(Building building); + + void addHouse(Households households); + + String selectBuildId(@Param("buildId") String buildId); +} 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 new file mode 100644 index 0000000..01551f4 --- /dev/null +++ b/community-security-modules/community-security-modules-shop/src/main/java/com/zyh/system/service/BuildService.java @@ -0,0 +1,8 @@ +package com.zyh.system.service; + +import com.zyh.common.domain.Building; +import com.zyh.common.result.Result; + +public interface BuildService { + Result addBuild(Building building); +} 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 new file mode 100644 index 0000000..094a797 --- /dev/null +++ b/community-security-modules/community-security-modules-shop/src/main/java/com/zyh/system/service/impl/BuildServicempl.java @@ -0,0 +1,47 @@ +package com.zyh.system.service.impl; + +import com.zyh.common.domain.Building; +import com.zyh.common.domain.Households; +import com.zyh.common.result.Result; +import com.zyh.system.mapper.BuildMapper; +import com.zyh.system.service.BuildService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class BuildServicempl implements BuildService { + @Autowired + BuildMapper buildMapper; + + @Override + public Result addBuild(Building building) { + //查询编号重复不可添加 + String buildId = buildMapper.selectBuildId(building.getBuildId()); + if(buildId!=null){ + return Result.error("编号重复不可添加"); + } + + Integer add =buildMapper.addBuild(building); + + + + if(add>0){ + int i = building.getEndFloor() - building.getStartFloor() + 1;//楼层 + int i2 = building.getEndHold() - building.getStartHold();//户数 + for (int i1 = 1; i1 <= i; i1++) { + for (int i3 = 1; i3 <= i2+1; i3++) { + Households households = new Households(); + String holdId = String.valueOf(i1 * 100 + i3); + households.setHoldId(holdId); + households.setBuildId(building.getBuildId()); + households.setUnit(building.getUnit()); + buildMapper.addHouse(households); + + } + } + return Result.success("添加成功"); + } + + return Result.error("添加失败"); + } +} diff --git a/community-security-modules/community-security-modules-shop/src/main/java/com/zyh/system/service/impl/HouseServicempl.java b/community-security-modules/community-security-modules-shop/src/main/java/com/zyh/system/service/impl/HouseServicempl.java index d307d33..7e3c402 100644 --- a/community-security-modules/community-security-modules-shop/src/main/java/com/zyh/system/service/impl/HouseServicempl.java +++ b/community-security-modules/community-security-modules-shop/src/main/java/com/zyh/system/service/impl/HouseServicempl.java @@ -29,8 +29,6 @@ public class HouseServicempl implements HouseService { checkHouse(house); - - Integer add = houseMapper.addHouse(house); if (add > 0) { return Result.success("添加成功"); 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 new file mode 100644 index 0000000..c3ef086 --- /dev/null +++ b/community-security-modules/community-security-modules-shop/src/main/resources/mapper/BuildMapper.xml @@ -0,0 +1,15 @@ + + + + + + + insert into building values (0,#{buildId},#{address},#{unit},#{startFloor},#{endFloor},#{startHold},#{endHold}) + + + insert into households values (0,#{holdId},0,1,#{buildId},#{unit}) + + +