增删改查plus

pom.xml

@@ -156,15 +156,14 @@
                 <version>${ruoyi.version}</version>
             </dependency>
 
-            <!-- 测试模块-->
+
+            <!-- knife4j -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>com.github.xiaoymin</groupId>
-                <artifactId>rouyi-place</artifactId>
+                <artifactId>knife4j-spring-boot-starter</artifactId>
-                <version>3.8.6</version>
+                <version>3.0.3</version>
             </dependency>
 
-
-
             <!-- 系统模块-->
             <dependency>
                 <groupId>com.ruoyi</groupId>
@@ -189,7 +188,6 @@
         <module>ruoyi-quartz</module>
         <module>ruoyi-generator</module>
         <module>ruoyi-common</module>
-        <module>rouyi-place</module>
     </modules>
     <packaging>pom</packaging>
 

ruoyi-admin/pom.xml

@@ -61,13 +61,13 @@
             <artifactId>ruoyi-generator</artifactId>
         </dependency>
 
-        <!-- 测试模块-->
+        <!-- knife4j -->
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>rouyi-place</artifactId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+            <version>3.0.3</version>
         </dependency>
 
-
     </dependencies>
 
     <build>

ruoyi-admin/src/main/java/com/ruoyi/web/controller/areacode/SystemAreacodeInfoController.java

@@ -0,0 +1,62 @@
+package com.ruoyi.web.controller.areacode;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.*;
+import com.ruoyi.system.service.*;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import oshi.driver.mac.net.NetStat;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/info")
+@RequiredArgsConstructor
+public class SystemAreacodeInfoController extends BaseController {
+
+    private final SystemAreacodeInfoService service;
+
+    private final BasePlaceInfoService basePlaceInfoService;
+    private final BaseGridInfoService baseGridInfoService;
+    private final BaseBuildInfoService baseBuildInfoService;
+    private final BaseUnitInfoService baseUnitInfoService;
+    private final BaseHomeInfoService baseHomeInfoService;
+
+    @GetMapping("/{parentCode}")
+    public AjaxResult select(@PathVariable Long parentCode) {
+        List<SystemAreacodeInfo> list = service.lambdaQuery().eq(SystemAreacodeInfo::getParentAreaCode, parentCode).list();
+        return AjaxResult.success(list);
+    }
+
+
+    @GetMapping
+    public AjaxResult selects(BaseCode baseCode) {
+        List<BasePlaceInfo> list = basePlaceInfoService.lambdaQuery().list();
+        List<BaseGridInfo> baseGridInfos = baseGridInfoService.lambdaQuery().eq(BaseGridInfo::getPlaceCode, baseCode.getPlaceCode()).list();
+        List<BaseBuildInfo> baseBuildInfos = baseBuildInfoService.lambdaQuery().eq(BaseBuildInfo::getGridCode, baseCode.getGridCode()).list();
+        List<BaseUnitInfo> baseUnitInfos = baseUnitInfoService.lambdaQuery().eq(BaseUnitInfo::getBuildingCode, baseCode.getBuildingCode()).list();
+        List<BaseHomeInfo> baseHomeInfos = baseHomeInfoService.lambdaQuery().eq(BaseHomeInfo::getUnitCode, baseCode.getUnitCode()).list();
+        if (!baseHomeInfos.isEmpty()){
+            return AjaxResult.success(baseHomeInfos);
+        }
+        if (!baseUnitInfos.isEmpty()){
+            return AjaxResult.success(baseUnitInfos);
+        }
+        if (!baseBuildInfos.isEmpty()){
+            return AjaxResult.success(baseBuildInfos);
+        }
+        if (!baseGridInfos.isEmpty()){
+            return AjaxResult.success(baseGridInfos);
+        }
+        return AjaxResult.success(list);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/cache/DictCache.java

@@ -0,0 +1,12 @@
+package com.ruoyi.web.controller.cache;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+
+
+@Component
+@RequiredArgsConstructor
+public class DictCache {
+
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/place/BasePlaceController.java

@@ -1,9 +1,8 @@
-package com.ruoyi.system.controller;
+package com.ruoyi.web.controller.place;
+
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDictData;
@@ -12,6 +11,8 @@ import com.ruoyi.system.domain.BasePlaceInfo;
 import com.ruoyi.system.service.BasePlaceInfoService;
 import com.ruoyi.system.service.ISysDictTypeService;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -22,47 +23,52 @@ import java.util.stream.Collectors;
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/BasePlace")
+@Api(tags = "场所管理模块")
 public class BasePlaceController extends BaseController {
 
     private final BasePlaceInfoService basePlaceInfoService;
 
     private final ISysDictTypeService iSysDictTypeService;
 
+
+    @ApiOperation("新增场所")
     @PostMapping
     public AjaxResult insertPlace(@RequestBody BasePlaceInfo basePlaceInfo) {
-        LambdaQueryChainWrapper<BasePlaceInfo> wrapper = basePlaceInfoService.lambdaQuery()
+        basePlaceInfoService.setEncrypt(basePlaceInfo);
-                .eq(BasePlaceInfo::getPlaceName, basePlaceInfo.getPlaceName());
+        return toAjax(basePlaceInfoService.save(basePlaceInfo));
-        boolean empty = wrapper.isEmptyOfEntity();
-        return (empty) ? AjaxResult.success(basePlaceInfoService.save(basePlaceInfo)): AjaxResult.error("场所已添加!不用再加了!");
     }
 
+    @ApiOperation("编辑场所")
     @PutMapping
-    public AjaxResult updatePlace(@RequestBody BasePlaceInfo basePlaceInfo){
+    public AjaxResult updatePlace(@RequestBody BasePlaceInfo basePlaceInfo) {
+        basePlaceInfoService.setEncrypt(basePlaceInfo);
         return toAjax(basePlaceInfoService.updateById(basePlaceInfo));
     }
 
-    @DeleteMapping
+    @ApiOperation("删除场所")
-    public AjaxResult deletePlace(@RequestBody List<BasePlaceInfo> basePlaceInfoList){
+    @DeleteMapping("{ids}")
-        List<Long> ids = basePlaceInfoList.stream().map(BasePlaceInfo::getId).collect(Collectors.toList());
+    public AjaxResult deletePlace(@PathVariable List<Long> ids) {
         return toAjax(basePlaceInfoService.removeByIds(ids));
     }
 
+    @ApiOperation("获取场所信息")
     @GetMapping("/page")
-    public Page<BasePlaceInfo> selectPlaces(BasePlaceInfo basePlaceInfo){
+    public Page<BasePlaceInfo> selectPlaces(BasePlaceInfo basePlaceInfo) {
         Page<BasePlaceInfo> page = new Page<>(basePlaceInfo.getPageNum(), basePlaceInfo.getPageSize());
         page = basePlaceInfoService.page(page, new QueryWrapper<>(basePlaceInfo));
+        List<BasePlaceInfo> bases = page.getRecords();
+        basePlaceInfoService.setDecrypt(bases);
         return page;
     }
 
 
-
+    @ApiOperation("获取类型数据")
     @GetMapping("/type/{dictType}")
-    public AjaxResult selectPlaceType(@PathVariable String dictType){
+    public AjaxResult selectPlaceType(@PathVariable String dictType) {
         List<SysDictData> sysDictData = iSysDictTypeService.selectDictDataByType(dictType);
         Map<String, String> map = sysDictData.stream().collect(
                 Collectors.toMap
                         (SysDictData::getDictValue, SysDictData::getDictLabel, (V1, V2) -> V2));
-
         return AjaxResult.success(map);
     }
 

ruoyi-admin/src/main/resources/application-druid.yml

@@ -58,4 +58,4 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true

ruoyi-admin/src/main/resources/application.yml

@@ -18,7 +18,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8080
+  port: 6666
   servlet:
     # 应用的访问路径
     context-path: /
@@ -70,13 +70,13 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: localhost
+    host: 192.168.0.188
     # 端口，默认为6379
-    port: 6379
+    port: 26379
     # 数据库索引
-    database: 0
+    database: 2
     # 密码
-    password:
+    password: livegbs@2019
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -120,7 +120,7 @@ swagger:
   # 是否开启swagger
   enabled: true
   # 请求前缀
-  pathMapping: /dev-api
+  pathMapping:
 
 # 防止XSS攻击
 xss:
@@ -130,3 +130,7 @@ xss:
   excludes: /system/notice
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
+
+logback:
+  path: /home/han/log
+  max-history: 7

ruoyi-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/ruoyi/logs" />
+	<property name="log.path" value="/home/han/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 
@@ -11,7 +11,7 @@
 			<pattern>${log.pattern}</pattern>
 		</encoder>
 	</appender>
-	
+
 	<!-- 系统日志输出 -->
 	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
 	    <file>${log.path}/sys-info.log</file>
@@ -34,7 +34,7 @@
             <onMismatch>DENY</onMismatch>
         </filter>
 	</appender>
-	
+
 	<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
 	    <file>${log.path}/sys-error.log</file>
         <!-- 循环政策：基于时间创建日志文件 -->
@@ -56,7 +56,7 @@
             <onMismatch>DENY</onMismatch>
         </filter>
     </appender>
-	
+
 	<!-- 用户访问日志输出  -->
     <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<file>${log.path}/sys-user.log</file>
@@ -70,7 +70,7 @@
             <pattern>${log.pattern}</pattern>
         </encoder>
     </appender>
-	
+
 	<!-- 系统模块日志级别控制  -->
 	<logger name="com.ruoyi" level="info" />
 	<!-- Spring日志级别控制  -->
@@ -79,15 +79,15 @@
 	<root level="info">
 		<appender-ref ref="console" />
 	</root>
-	
+
 	<!--系统操作日志-->
     <root level="info">
         <appender-ref ref="file_info" />
         <appender-ref ref="file_error" />
     </root>
-	
+
 	<!--系统用户操作日志-->
     <logger name="sys-user" level="info">
         <appender-ref ref="sys-user"/>
     </logger>
-</configuration> 
+</configuration>

ruoyi-common/pom.xml

@@ -90,6 +90,18 @@
             <artifactId>snakeyaml</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.mujave</groupId>
+            <artifactId>dict-translate-spring-boot-starter</artifactId>
+            <version>1.0.3</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+            <version>3.0.3</version>
+        </dependency>
         <!-- Token生成与解析-->
         <dependency>
             <groupId>io.jsonwebtoken</groupId>

ruoyi-common/src/main/java/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: com.ruoyi.RuoYiApplication
+

ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseBuildInfo.java

@@ -0,0 +1,127 @@
+package com.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 楼栋信息表
+ * @TableName base_build_info
+ */
+@TableName(value ="base_build_info")
+@Data
+public class BaseBuildInfo implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 场所编码
+     */
+    private String placeCode;
+
+    /**
+     * 场所名称
+     */
+    private String placeName;
+
+    /**
+     * 网格编码
+     */
+    private String gridCode;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 楼栋编码
+     */
+    private String buildingCode;
+
+    /**
+     * 楼栋名称
+     */
+    private String buildingName;
+
+    /**
+     * 楼栋类型
+     */
+    private Integer buildingType;
+
+    /**
+     * 楼栋经度
+     */
+    private BigDecimal longitude;
+
+    /**
+     * 楼栋维度
+     */
+    private BigDecimal latitude;
+
+    /**
+     * 地上层数
+     */
+    private Integer upFloor;
+
+    /**
+     * 地下层数
+     */
+    private Integer belowFloor;
+
+    /**
+     * 建筑面积
+     */
+    private String floorAcreage;
+
+    /**
+     * 楼栋地址
+     */
+    private String buildingAddress;
+
+    /**
+     * 单元数量
+     */
+    private Integer unitNum;
+
+    /**
+     * 户室数量
+     */
+    private Integer homeNum;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建者
+     */
+    private Integer createBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新者
+     */
+    private Integer updateBy;
+
+    /**
+     * 0:不活跃,1:活跃
+     */
+    private Integer isActive;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseCode.java

@@ -0,0 +1,15 @@
+package com.ruoyi.system.domain;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class BaseCode implements Serializable {
+
+
+    private String placeCode;
+    private String gridCode;
+    private String buildingCode;
+    private String unitCode;
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseGridInfo.java

@@ -0,0 +1,71 @@
+package com.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 网格信息表
+ * @TableName base_grid_info
+ */
+@TableName(value ="base_grid_info")
+@Data
+public class BaseGridInfo implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 场所编码
+     */
+    private String placeCode;
+
+    /**
+     * 场所名称
+     */
+    private String placeName;
+
+    /**
+     * 网格编码
+     */
+    private String gridCode;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建者
+     */
+    private Integer createBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新者
+     */
+    private Integer updateBy;
+
+    /**
+     * 0:不活跃,1:活跃
+     */
+    private Integer isActive;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseHomeInfo.java

@@ -0,0 +1,176 @@
+package com.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 房屋信息表
+ * @TableName base_home_info
+ */
+@TableName(value ="base_home_info")
+@Data
+public class BaseHomeInfo implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 场所编码
+     */
+    private String placeCode;
+
+    /**
+     * 场所名称
+     */
+    private String placeName;
+
+    /**
+     * 网格编码
+     */
+    private String gridCode;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 楼栋编码
+     */
+    private String buildingCode;
+
+    /**
+     * 楼栋名称
+     */
+    private String buildingName;
+
+    /**
+     * 单元编码
+     */
+    private String unitCode;
+
+    /**
+     * 单元名称
+     */
+    private String unitName;
+
+    /**
+     * 房屋编码
+     */
+    private String homeCode;
+
+    /**
+     * 房屋名称
+     */
+    private String homeName;
+
+    /**
+     * 房屋楼层
+     */
+    private Integer homeFloor;
+
+    /**
+     * 房屋地址
+     */
+    private String homeAdddress;
+
+    /**
+     * 房屋面积
+     */
+    private String homeAcreage;
+
+    /**
+     * 房屋套内面积
+     */
+    private String insideAcreage;
+
+    /**
+     * 房屋类型
+     */
+    private Integer homeType;
+
+    /**
+     * 房屋类别
+     */
+    private Integer homeCategory;
+
+    /**
+     * 房屋用途
+     */
+    private Integer homeUse;
+
+    /**
+     * 房间数量
+     */
+    private Integer roomNum;
+
+    /**
+     * 居住人数
+     */
+    private Integer homePersonNum;
+
+    /**
+     * 房屋户型
+     */
+    private String homeDoorModel;
+
+    /**
+     * 房屋户型图
+     */
+    private String homeDoorModelPic;
+
+    /**
+     * 房屋状态
+     */
+    private Integer homeState;
+
+    /**
+     * 不动产权编号
+     */
+    private String certificateCode;
+
+    /**
+     * 产权人姓名
+     */
+    private String propertyOwner;
+
+    /**
+     * 产权人联系电话
+     */
+    private String propertyOwnerPhone;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建者
+     */
+    private Integer createBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新者
+     */
+    private Integer updateBy;
+
+    /**
+     * 0:不活跃,1:活跃
+     */
+    private Integer isActive;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/BasePlaceInfo.java

@@ -8,8 +8,10 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
+
 
 /**
  * 场所信息表
@@ -21,227 +23,288 @@ public class BasePlaceInfo  {
     /**
      * 主键
      */
+
     @TableId(type = IdType.AUTO)
     private Long id;
 
     /**
      * 场所编码
      */
+    @ApiModelProperty(value = "场所编码")
     private String placeCode;
 
     /**
      * 场所名称
      */
+    @ApiModelProperty(value = "场所名称")
     private String placeName;
 
     /**
      * 场所平面图
      */
+    @ApiModelProperty(value = "场所平面图")
     private String placePic;
 
     /**
      * 场所类别
      */
+    @ApiModelProperty(value = "场所类别")
     private Integer placeCategory;
 
+
+    @ApiModelProperty(value = "场所类别名称")
+    @TableField(exist = false)
+    private String placeCategoryName;
     /**
      * 场所类型
      */
+    @ApiModelProperty(value = "场所类型")
     private Integer placeType;
 
+    @ApiModelProperty(value = "场所类型名称")
+    @TableField(exist = false)
+    private String placeTypeName;
+
     /**
      * 场所性质
      */
+    @ApiModelProperty(value = "场所性质")
     private Integer placeNature;
 
+    @ApiModelProperty(value = "场所性质名称")
+    @TableField(exist = false)
+    private String placeNatureName;
+
     /**
      * 占地面积
      */
+    @ApiModelProperty(value = "占地面积")
     private String coversAcreage;
 
     /**
      * 建筑面积
      */
+    @ApiModelProperty(value = "建筑面积")
     private String structureAcreage;
 
     /**
      * 建成时间
      */
+    @ApiModelProperty(value = "建成时间")
     private String neighBulitTime;
 
     /**
      * 启用时间
      */
+    @ApiModelProperty(value = "启用时间")
     private String activeuseTime;
 
     /**
      * 接入状态
      */
+    @ApiModelProperty(value = "接入状态")
     private Integer accessType;
 
+    @ApiModelProperty(value = "接入状态名称")
+    @TableField(exist = false)
+    private String accessTypeName;
+
     /**
      * 绿化率
      */
+    @ApiModelProperty(value = "绿化率")
     private String afforestationRate;
 
     /**
      * 容积率
      */
+    @ApiModelProperty(value = "容积率")
     private String plotRate;
 
     /**
      * 经度
      */
+    @ApiModelProperty(value = "经度")
     private BigDecimal longitude;
 
     /**
      * 纬度
      */
+    @ApiModelProperty(value = "纬度")
     private BigDecimal latitude;
 
     /**
      * 场所标准地址
      */
+    @ApiModelProperty(value = "场所标准地址")
     private String placeAddress;
 
     /**
      * 省编码
      */
+    @ApiModelProperty(value = "省编码")
     private String provinceCode;
 
     /**
      * 省名称
      */
+    @ApiModelProperty(value = "省名称")
     private String provinceName;
 
     /**
      * 城市编码
      */
+    @ApiModelProperty(value = "城市编码")
     private String cityCode;
 
     /**
      * 城市名称
      */
+    @ApiModelProperty(value = "城市名称")
     private String cityName;
 
     /**
      * 区域编码
      */
+    @ApiModelProperty(value = "区域编码")
     private String areaCode;
 
     /**
      * 区域名称
      */
+    @ApiModelProperty(value = "区域名称")
     private String areaName;
 
     /**
      * 街道/乡镇编码
      */
+    @ApiModelProperty(value = "街道/乡镇编码")
     private String streetCode;
 
     /**
      * 街道/乡镇名称
      */
+    @ApiModelProperty(value = "街道/乡镇名称")
     private String streetName;
 
     /**
      * 社区/村编码
      */
+    @ApiModelProperty(value = "社区/村编码")
     private String blockCode;
 
     /**
      * 社区/村名称
      */
+    @ApiModelProperty(value = "社区/村名称")
     private String blockName;
 
     /**
      * 开发商名称
      */
+    @ApiModelProperty(value = "开发商名称")
     private String estateDeveloper;
 
     /**
      * 开发商联系人照片
      */
+    @ApiModelProperty(value = "开发商联系人照片")
     private String developerPic;
 
     /**
      * 开发商联系人姓名
      */
+    @ApiModelProperty(value = "开发商联系人姓名")
     private String developerName;
 
     /**
      * 开发商联系电话
      */
+    @ApiModelProperty(value = "开发商联系电话")
     private String developerPhone;
 
     /**
      * 物业公司名称
      */
+    @ApiModelProperty(value = "物业公司名称")
     private String propertyCompany;
 
     /**
      * 物业联系人姓名
      */
+    @ApiModelProperty(value = "物业联系人姓名")
     private String propertyName;
 
     /**
      * 物业联系人电话
      */
+    @ApiModelProperty(value = "物业联系人电话")
     private String propertyPhone;
 
     /**
      * 物业联系人照片
      */
+    @ApiModelProperty(value = "物业联系人照片")
     private String propertyPic;
 
     /**
      * 警务区名称
      */
+    @ApiModelProperty(value = "警务区名称")
     private String policeDistrict;
 
     /**
      * 警务区编码
      */
+    @ApiModelProperty(value = "警务区编码")
     private String policeDistrictCode;
 
     /**
      * 责任民警姓名
      */
+    @ApiModelProperty(value = "责任民警姓名")
     private String policeName;
 
     /**
      * 警员编号
      */
+    @ApiModelProperty(value = "警员编号")
     private String policeNo;
 
     /**
      * 责任民警电话
      */
+    @ApiModelProperty(value = "责任民警电话")
     private String policePhone;
 
     /**
      * 责任民警照片
      */
+    @ApiModelProperty(value = "责任民警照片")
     private String policePic;
 
     /**
      * 维数场所编码
      */
+    @ApiModelProperty(value = "维数场所编码")
     private String dimensoftVillageCode;
 
     /**
      * 20位目录编码
      */
+    @ApiModelProperty(value = "20位目录编码")
     private String policeVillageCode;
 
     /**
      * 管辖单位编码
      */
+    @ApiModelProperty(value = "管辖单位编码")
     private String jurisdictionalUnitCode;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(value = "场所编码")
     private Date createTime;
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseUnitInfo.java

@@ -0,0 +1,96 @@
+package com.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 单元信息表
+ * @TableName base_unit_info
+ */
+@TableName(value ="base_unit_info")
+@Data
+public class BaseUnitInfo implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 场所编码
+     */
+    private String placeCode;
+
+    /**
+     * 场所名称
+     */
+    private String placeName;
+
+    /**
+     * 网格编码
+     */
+    private String gridCode;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 楼栋编码
+     */
+    private String buildingCode;
+
+    /**
+     * 楼栋名称
+     */
+    private String buildingName;
+
+    /**
+     * 单元编码
+     */
+    private String unitCode;
+
+    /**
+     * 单元名称
+     */
+    private String unitName;
+
+    /**
+     * 单元地址
+     */
+    private String unitAddress;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建者
+     */
+    private Integer createBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新者
+     */
+    private Integer updateBy;
+
+    /**
+     * 0:不活跃,1:活跃
+     */
+    private Integer isActive;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/SystemAreacodeInfo.java

@@ -0,0 +1,71 @@
+package com.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 行政区域编码表
+ * @TableName system_areacode_info
+ */
+@TableName(value ="system_areacode_info")
+@Data
+public class SystemAreacodeInfo implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 行政编码
+     */
+    private Long subAreaCode;
+
+    /**
+     * 上级行政编码
+     */
+    private Long parentAreaCode;
+
+    /**
+     * 区域名称
+     */
+    private String areaName;
+
+    /**
+     * 层级
+     */
+    private Integer treeLevel;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建者
+     */
+    private Integer createBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新者
+     */
+    private Integer updateBy;
+
+    /**
+     * 0:不活跃,1:活跃
+     */
+    private Integer isActive;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,18 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.BaseBuildInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author 28758
+* @description 针对表【base_build_info(楼栋信息表)】的数据库操作Mapper
+* @createDate 2023-10-27 17:13:39
+* @Entity com.ruoyi.system.domain.BaseBuildInfo
+*/
+public interface BaseBuildInfoMapper extends BaseMapper<BaseBuildInfo> {
+
+}
+
+
+
+

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

@@ -0,0 +1,19 @@
+package com.ruoyi.system.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.system.domain.BaseGridInfo;
+
+/**
+* @author 28758
+* @description 针对表【base_grid_info(网格信息表)】的数据库操作Mapper
+* @createDate 2023-10-27 17:10:30
+* @Entity com/rouyi/system.domain.BaseGridInfo
+*/
+public interface BaseGridInfoMapper extends BaseMapper<BaseGridInfo> {
+
+}
+
+
+
+

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

@@ -0,0 +1,18 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.BaseHomeInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author 28758
+* @description 针对表【base_home_info(房屋信息表)】的数据库操作Mapper
+* @createDate 2023-10-27 17:15:11
+* @Entity com.ruoyi.system.domain.BaseHomeInfo
+*/
+public interface BaseHomeInfoMapper extends BaseMapper<BaseHomeInfo> {
+
+}
+
+
+
+

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

@@ -0,0 +1,18 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.BaseUnitInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author 28758
+* @description 针对表【base_unit_info(单元信息表)】的数据库操作Mapper
+* @createDate 2023-10-27 17:14:40
+* @Entity com.ruoyi.system.domain.BaseUnitInfo
+*/
+public interface BaseUnitInfoMapper extends BaseMapper<BaseUnitInfo> {
+
+}
+
+
+
+

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

@@ -0,0 +1,18 @@
+package com.ruoyi.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.system.domain.SystemAreacodeInfo;
+
+/**
+* @author 28758
+* @description 针对表【system_areacode_info(行政区域编码表)】的数据库操作Mapper
+* @createDate 2023-10-26 19:15:40
+* @Entity com/rouyi/system.domain.SystemAreacodeInfo
+*/
+public interface SystemAreacodeInfoMapper extends BaseMapper<SystemAreacodeInfo> {
+
+}
+
+
+
+

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

@@ -0,0 +1,13 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.system.domain.BaseBuildInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author 28758
+* @description 针对表【base_build_info(楼栋信息表)】的数据库操作Service
+* @createDate 2023-10-27 17:13:39
+*/
+public interface BaseBuildInfoService extends IService<BaseBuildInfo> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.ruoyi.system.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.system.domain.BaseGridInfo;
+
+/**
+* @author 28758
+* @description 针对表【base_grid_info(网格信息表)】的数据库操作Service
+* @createDate 2023-10-27 17:10:30
+*/
+public interface BaseGridInfoService extends IService<BaseGridInfo> {
+
+}

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

@@ -0,0 +1,13 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.system.domain.BaseHomeInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author 28758
+* @description 针对表【base_home_info(房屋信息表)】的数据库操作Service
+* @createDate 2023-10-27 17:15:11
+*/
+public interface BaseHomeInfoService extends IService<BaseHomeInfo> {
+
+}

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

@@ -3,6 +3,8 @@ package com.ruoyi.system.service;
 import com.ruoyi.system.domain.BasePlaceInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
 * @author 28758
 * @description 针对表【base_place_info(场所信息表)】的数据库操作Service
@@ -10,4 +12,17 @@ import com.baomidou.mybatisplus.extension.service.IService;
 */
 public interface BasePlaceInfoService extends IService<BasePlaceInfo> {
 
+    /**
+     * 加密
+     * @param basePlaceInfo
+     */
+    void setEncrypt(BasePlaceInfo basePlaceInfo);
+
+    /**
+     * 解密
+     * @param bases
+     */
+    void setDecrypt(List<BasePlaceInfo> bases);
+
+
 }

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

@@ -0,0 +1,13 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.system.domain.BaseUnitInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author 28758
+* @description 针对表【base_unit_info(单元信息表)】的数据库操作Service
+* @createDate 2023-10-27 17:14:40
+*/
+public interface BaseUnitInfoService extends IService<BaseUnitInfo> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.ruoyi.system.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.system.domain.SystemAreacodeInfo;
+
+import java.util.List;
+
+/**
+* @author 28758
+* @description 针对表【system_areacode_info(行政区域编码表)】的数据库操作Service
+* @createDate 2023-10-26 19:15:40
+*/
+public interface SystemAreacodeInfoService extends IService<SystemAreacodeInfo> {
+
+}

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

@@ -0,0 +1,22 @@
+package com.ruoyi.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.domain.BaseBuildInfo;
+import com.ruoyi.system.service.BaseBuildInfoService;
+import com.ruoyi.system.mapper.BaseBuildInfoMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author 28758
+* @description 针对表【base_build_info(楼栋信息表)】的数据库操作Service实现
+* @createDate 2023-10-27 17:13:39
+*/
+@Service
+public class BaseBuildInfoServiceImpl extends ServiceImpl<BaseBuildInfoMapper, BaseBuildInfo>
+    implements BaseBuildInfoService{
+
+}
+
+
+
+

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

@@ -0,0 +1,25 @@
+package com.ruoyi.system.service.impl;
+
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import com.ruoyi.system.domain.BaseGridInfo;
+import com.ruoyi.system.mapper.BaseGridInfoMapper;
+import com.ruoyi.system.service.BaseGridInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+* @author 28758
+* @description 针对表【base_grid_info(网格信息表)】的数据库操作Service实现
+* @createDate 2023-10-27 17:10:30
+*/
+@Service
+public class BaseGridInfoServiceImpl extends ServiceImpl<BaseGridInfoMapper, BaseGridInfo>
+    implements BaseGridInfoService {
+
+}
+
+
+
+

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

@@ -0,0 +1,22 @@
+package com.ruoyi.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.domain.BaseHomeInfo;
+import com.ruoyi.system.service.BaseHomeInfoService;
+import com.ruoyi.system.mapper.BaseHomeInfoMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author 28758
+* @description 针对表【base_home_info(房屋信息表)】的数据库操作Service实现
+* @createDate 2023-10-27 17:15:11
+*/
+@Service
+public class BaseHomeInfoServiceImpl extends ServiceImpl<BaseHomeInfoMapper, BaseHomeInfo>
+    implements BaseHomeInfoService{
+
+}
+
+
+
+

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

@@ -1,11 +1,14 @@
 package com.ruoyi.system.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.AES;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.system.mapper.BasePlaceInfoMapper;
 import com.ruoyi.system.service.BasePlaceInfoService;
 import com.ruoyi.system.domain.BasePlaceInfo;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
 * @author 28758
 * @description 针对表【base_place_info(场所信息表)】的数据库操作Service实现
@@ -14,6 +17,24 @@ import org.springframework.stereotype.Service;
 @Service
 public class BasePlaceInfoServiceImpl extends ServiceImpl<BasePlaceInfoMapper, BasePlaceInfo> implements BasePlaceInfoService {
 
+    private static final String AES_KEY ="asdfghjklasdfghj";
+    @Override
+    public void setEncrypt(BasePlaceInfo basePlaceInfo) {
+        basePlaceInfo.setDeveloperPhone(AES.encrypt(basePlaceInfo.getDeveloperPhone(), AES_KEY));
+        basePlaceInfo.setPolicePhone(AES.encrypt(basePlaceInfo.getPolicePhone(), AES_KEY));
+        basePlaceInfo.setPropertyPhone(AES.encrypt(basePlaceInfo.getPropertyPhone(), AES_KEY));
+    }
+
+    @Override
+    public void setDecrypt(List<BasePlaceInfo> infos) {
+        for (BasePlaceInfo base : infos) {
+            base.setPolicePhone(AES.decrypt(base.getPolicePhone(), AES_KEY));
+            base.setPropertyPhone(AES.decrypt(base.getPropertyPhone(), AES_KEY));
+            base.setDeveloperPhone(AES.decrypt(base.getDeveloperPhone(), AES_KEY));
+        }
+    }
+
+
 }
 
 

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

@@ -0,0 +1,22 @@
+package com.ruoyi.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.domain.BaseUnitInfo;
+import com.ruoyi.system.service.BaseUnitInfoService;
+import com.ruoyi.system.mapper.BaseUnitInfoMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author 28758
+* @description 针对表【base_unit_info(单元信息表)】的数据库操作Service实现
+* @createDate 2023-10-27 17:14:40
+*/
+@Service
+public class BaseUnitInfoServiceImpl extends ServiceImpl<BaseUnitInfoMapper, BaseUnitInfo>
+    implements BaseUnitInfoService{
+
+}
+
+
+
+

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

@@ -0,0 +1,24 @@
+package com.ruoyi.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.domain.SystemAreacodeInfo;
+import com.ruoyi.system.mapper.SystemAreacodeInfoMapper;
+import com.ruoyi.system.service.SystemAreacodeInfoService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+* @author 28758
+* @description 针对表【system_areacode_info(行政区域编码表)】的数据库操作Service实现
+* @createDate 2023-10-26 19:15:40
+*/
+@Service
+public class SystemAreacodeInfoServiceImpl extends ServiceImpl<SystemAreacodeInfoMapper, SystemAreacodeInfo>
+    implements SystemAreacodeInfoService {
+
+}
+
+
+
+