From 9e50135d17aa29f1458a264b78f0660affe97494 Mon Sep 17 00:00:00 2001 From: 20918 <2091823062@qq.com> Date: Wed, 22 May 2024 16:38:26 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=B6=89=E5=AF=86=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/pom.xml | 8 ++++++++ .../web/controller/system/count/SysUsernumController.java | 1 + ruoyi-admin/src/main/resources/application-druid.yml | 4 ++++ ruoyi-admin/src/main/resources/application.yml | 3 ++- .../src/main/resources/templates/system/check/add.html | 6 +++--- .../src/main/resources/templates/system/train/add.html | 2 +- .../src/main/resources/templates/system/user/add.html | 4 ++-- ruoyi-admin/src/test/java/com/ruoyi/EncFactory.java | 2 +- .../com/ruoyi/generator/controller/GenController.java | 1 + 9 files changed, 23 insertions(+), 8 deletions(-) diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index f5f07b5..a13ee7e 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -49,6 +49,14 @@ mysql-connector-java + + + cn.com.kingbase + kingbase8 + 8.6.0 + + + com.ruoyi diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java index d65ce23..271e650 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java @@ -106,6 +106,7 @@ public class SysUsernumController extends BaseController { { List list = userService.lambdaQuery().eq(SysUser::getDeptId, deptId) .eq(SysUser::getDelFlag,0) + .ne(SysUser::getUserId,1) .list(); list.forEach(sysuser -> { List postList = sysUserPostService.lambdaQuery(). diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 5f01c1e..5f54284 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -3,14 +3,18 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.cj.jdbc.Driver +# driverClassName: com.kingbase8.Driver druid: # 主库数据源 master: url: jdbc:mysql://192.168.254.123:3306/zhky?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# url: jdbc:kingbase8://192.168.254.197:54321/zhky?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + #username: root #password: qwer1234 username: ENC(ElFzIjuV3codlxGotvqqyA==) password: ENC(aM81j4MP4WJC4ZQBNlDntx0jKsP3wwQZ) +# password: ENC(YgAg6bUSgw1uc1H17kDw0g==) # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 46198f5..1915d17 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -7,7 +7,7 @@ ruoyi: # 版权年份 copyrightYear: 2024 # 实例演示开关 - demoEnabled: true + demoEnabled: false # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath) profile: D:/ruoyi/uploadPath # 获取ip地址开关 @@ -85,6 +85,7 @@ mybatis: # PageHelper分页插件 pagehelper: helperDialect: mysql +# helperDialect: postgresql supportMethodsArguments: true params: count=countSql diff --git a/ruoyi-admin/src/main/resources/templates/system/check/add.html b/ruoyi-admin/src/main/resources/templates/system/check/add.html index 41981e8..30b245a 100644 --- a/ruoyi-admin/src/main/resources/templates/system/check/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/check/add.html @@ -10,20 +10,20 @@
- +
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/train/add.html b/ruoyi-admin/src/main/resources/templates/system/train/add.html index e76d9c7..7b87c1b 100644 --- a/ruoyi-admin/src/main/resources/templates/system/train/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/train/add.html @@ -16,7 +16,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/add.html b/ruoyi-admin/src/main/resources/templates/system/user/add.html index b6f8975..9030616 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/add.html @@ -189,7 +189,7 @@
- +
@@ -197,7 +197,7 @@
- +
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/EncFactory.java b/ruoyi-admin/src/test/java/com/ruoyi/EncFactory.java index 21e7eb7..cd25fb8 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/EncFactory.java +++ b/ruoyi-admin/src/test/java/com/ruoyi/EncFactory.java @@ -6,7 +6,7 @@ import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig; public class EncFactory { public static void main(String[] args) { String securityKey = "BUSINESS"; // 加密秘钥 - String data = "qwer1234"; // 需要加密的字符串 + String data = "123456"; // 需要加密的字符串 PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor(); SimpleStringPBEConfig config = new SimpleStringPBEConfig(); diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java index 49b02ba..80da98a 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java @@ -201,6 +201,7 @@ public class GenController extends BaseController { SqlUtil.filterKeyword(sql); List sqlStatements = SQLUtils.parseStatements(sql, DbType.mysql); + //List sqlStatements = SQLUtils.parseStatements(sql, DbType.kingbase); List tableNames = new ArrayList<>(); for (SQLStatement sqlStatement : sqlStatements) { From dc8d20b3a20003b17283dfd066449c8aa04ec6cf Mon Sep 17 00:00:00 2001 From: wangxy <1356089412@qq.com> Date: Tue, 28 May 2024 14:41:14 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=E5=8C=BA=E5=88=92=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/manager/SysAreaManager.java | 42 +++++++++++++++++++ .../system/system/SysAreaController.java | 41 ++++++++++++++++++ .../java/com/ruoyi/system/domain/SysArea.java | 39 +++++++++++++++++ .../ruoyi/system/mapper/SysAreaMapper.java | 19 +++++++++ .../ruoyi/system/service/SysAreaService.java | 13 ++++++ .../service/impl/SysAreaServiceImpl.java | 22 ++++++++++ .../resources/mapper/system/SysAreaMapper.xml | 19 +++++++++ 7 files changed, 195 insertions(+) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SysAreaManager.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysAreaController.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysArea.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysAreaMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/SysAreaService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysAreaServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/system/SysAreaMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SysAreaManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SysAreaManager.java new file mode 100644 index 0000000..c861749 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SysAreaManager.java @@ -0,0 +1,42 @@ +package com.ruoyi.web.controller.manager; + +import com.ruoyi.common.core.domain.Ztree; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.domain.SysArea; +import com.ruoyi.system.service.SysAreaService; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Objects; + +/** + * packageName com.ruoyi.web.controller.manager + * + * @author wangxy + * @version JDK 8 + * @className SysAreaManager + * @date 2024/5/28 + * @description 区划 + */ +@Component +public class SysAreaManager { + + + @Resource + private SysAreaService sysAreaService; + + + + public List getSysAreaList(Long parentId) { + return sysAreaService.lambdaQuery() + .eq(SysArea::getParentId, Objects.isNull(parentId) ? 29 : parentId) + .list(); + } + + + + + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysAreaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysAreaController.java new file mode 100644 index 0000000..b0f0529 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysAreaController.java @@ -0,0 +1,41 @@ +package com.ruoyi.web.controller.system.system; + +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.Ztree; +import com.ruoyi.common.core.domain.entity.SysDept; +import com.ruoyi.system.domain.SysArea; +import com.ruoyi.web.controller.manager.SysAreaManager; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import static com.ruoyi.common.core.domain.AjaxResult.success; + +/** + * packageName com.ruoyi.web.controller.system.system + * + * @author wangxy + * @version JDK 8 + * @className SysAreaController + * @date 2024/5/28 + * @description 区划 + */ +@Api("区划") +@Controller +@RequestMapping("/system/area") +public class SysAreaController { + + @Resource + private SysAreaManager sysAreaManager; + + @ApiOperation("查询区划信息") + @GetMapping("/getSysAreaList") + @ResponseBody + public AjaxResult getSysAreaList(@RequestParam(required = false) Long parentId) { + return success(sysAreaManager.getSysAreaList(parentId)); + } + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysArea.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysArea.java new file mode 100644 index 0000000..60722aa --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysArea.java @@ -0,0 +1,39 @@ +package com.ruoyi.system.domain; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import lombok.Data; + +/** + * 行政区域 + * @TableName sys_area + */ +@Data +public class SysArea implements Serializable { + /** + * 区域ID + */ + private Integer id; + + /** + * 上级区域ID + */ + private Integer parentId; + + /** + * 行政区域等级 1-省 2-市 3-区县 4-街道镇 + */ + private Integer areaLevel; + + /** + * 名称 + */ + private String name; + + /** + * 行政区划代码 + */ + private String areaCode; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysAreaMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysAreaMapper.java new file mode 100644 index 0000000..3d4fddc --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysAreaMapper.java @@ -0,0 +1,19 @@ +package com.ruoyi.system.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.system.domain.SysArea; + +/** +* @author 13560 +* @description 针对表【sys_area(行政区域)】的数据库操作Mapper +* @createDate 2024-05-28 14:06:56 +* @Entity generator.domain.SysArea +*/ +public interface SysAreaMapper extends BaseMapper { + +} + + + + diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysAreaService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysAreaService.java new file mode 100644 index 0000000..386e237 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysAreaService.java @@ -0,0 +1,13 @@ +package com.ruoyi.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.system.domain.SysArea; + +/** +* @author 13560 +* @description 针对表【sys_area(行政区域)】的数据库操作Service +* @createDate 2024-05-28 14:06:56 +*/ +public interface SysAreaService extends IService { + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysAreaServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysAreaServiceImpl.java new file mode 100644 index 0000000..fab1671 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysAreaServiceImpl.java @@ -0,0 +1,22 @@ +package com.ruoyi.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.system.domain.SysArea; +import com.ruoyi.system.mapper.SysAreaMapper; +import com.ruoyi.system.service.SysAreaService; +import org.springframework.stereotype.Service; + +/** +* @author 13560 +* @description 针对表【sys_area(行政区域)】的数据库操作Service实现 +* @createDate 2024-05-28 14:06:56 +*/ +@Service +public class SysAreaServiceImpl extends ServiceImpl + implements SysAreaService { + +} + + + + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysAreaMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysAreaMapper.xml new file mode 100644 index 0000000..acac252 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/SysAreaMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + id,parent_id,area_level, + name,area_code + + From 1b90329abf89d11f6a8ccb57b28a0fac4b6d833e Mon Sep 17 00:00:00 2001 From: wangxy <1356089412@qq.com> Date: Tue, 28 May 2024 14:50:53 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:=E5=8C=BA=E5=88=92=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/web/controller/manager/SysAreaManager.java | 7 +++++++ .../controller/system/system/SysAreaController.java | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SysAreaManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SysAreaManager.java index c861749..0090cc2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SysAreaManager.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SysAreaManager.java @@ -31,10 +31,17 @@ public class SysAreaManager { public List getSysAreaList(Long parentId) { return sysAreaService.lambdaQuery() .eq(SysArea::getParentId, Objects.isNull(parentId) ? 29 : parentId) + .orderByAsc(SysArea::getAreaCode) .list(); } + public String getAreaName(Long id) { + return sysAreaService.lambdaQuery() + .eq(SysArea::getId,id).one().getName(); + } + + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysAreaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysAreaController.java index b0f0529..b1f453c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysAreaController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysAreaController.java @@ -38,4 +38,15 @@ public class SysAreaController { } + @ApiOperation("获取区划名称") + @GetMapping("/getAreaName") + @ResponseBody + public AjaxResult getAreaName(@RequestParam Long id) { + return success(sysAreaManager.getAreaName(id)); + } + + + + + } From c8cd69b0b87d3ad93584e893b30a9cb1c435849d Mon Sep 17 00:00:00 2001 From: wangxy <1356089412@qq.com> Date: Tue, 28 May 2024 14:51:53 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix:=E5=8C=BA=E5=88=92=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/web/controller/system/system/SysAreaController.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysAreaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysAreaController.java index b1f453c..2308e65 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysAreaController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysAreaController.java @@ -1,9 +1,6 @@ package com.ruoyi.web.controller.system.system; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.Ztree; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.system.domain.SysArea; import com.ruoyi.web.controller.manager.SysAreaManager; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; From cead3320b1ec68c732c8e5fc33ca7b7d304fbc73 Mon Sep 17 00:00:00 2001 From: wangxy <1356089412@qq.com> Date: Tue, 28 May 2024 14:53:04 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix:=E5=8C=BA=E5=88=92=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/web/controller/manager/SysAreaManager.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SysAreaManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SysAreaManager.java index 0090cc2..e2b7a4f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SysAreaManager.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SysAreaManager.java @@ -1,7 +1,5 @@ package com.ruoyi.web.controller.manager; -import com.ruoyi.common.core.domain.Ztree; -import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.SysArea; import com.ruoyi.system.service.SysAreaService; import org.springframework.stereotype.Component; From 62be695f454680ec4d8df77faff7d6717e8dcc3c Mon Sep 17 00:00:00 2001 From: wangxy <1356089412@qq.com> Date: Tue, 28 May 2024 15:06:26 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix:=E5=8C=BA=E5=88=92=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/web/controller/manager/SysAreaManager.java | 7 ++++--- .../web/controller/system/system/SysAreaController.java | 4 ++-- .../src/main/java/com/ruoyi/system/domain/SysArea.java | 4 ++-- .../src/main/resources/mapper/system/SysAreaMapper.xml | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SysAreaManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SysAreaManager.java index e2b7a4f..3da973b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SysAreaManager.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SysAreaManager.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.manager; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.SysArea; import com.ruoyi.system.service.SysAreaService; import org.springframework.stereotype.Component; @@ -26,15 +27,15 @@ public class SysAreaManager { - public List getSysAreaList(Long parentId) { + public List getSysAreaList(String parentId) { return sysAreaService.lambdaQuery() - .eq(SysArea::getParentId, Objects.isNull(parentId) ? 29 : parentId) + .eq(SysArea::getParentId, StringUtils.isEmpty(parentId) ? "29" : parentId) .orderByAsc(SysArea::getAreaCode) .list(); } - public String getAreaName(Long id) { + public String getAreaName(String id) { return sysAreaService.lambdaQuery() .eq(SysArea::getId,id).one().getName(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysAreaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysAreaController.java index 2308e65..384047e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysAreaController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysAreaController.java @@ -30,7 +30,7 @@ public class SysAreaController { @ApiOperation("查询区划信息") @GetMapping("/getSysAreaList") @ResponseBody - public AjaxResult getSysAreaList(@RequestParam(required = false) Long parentId) { + public AjaxResult getSysAreaList(@RequestParam(required = false) String parentId) { return success(sysAreaManager.getSysAreaList(parentId)); } @@ -38,7 +38,7 @@ public class SysAreaController { @ApiOperation("获取区划名称") @GetMapping("/getAreaName") @ResponseBody - public AjaxResult getAreaName(@RequestParam Long id) { + public AjaxResult getAreaName(@RequestParam String id) { return success(sysAreaManager.getAreaName(id)); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysArea.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysArea.java index 60722aa..2ede96f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysArea.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysArea.java @@ -12,12 +12,12 @@ public class SysArea implements Serializable { /** * 区域ID */ - private Integer id; + private String id; /** * 上级区域ID */ - private Integer parentId; + private String parentId; /** * 行政区域等级 1-省 2-市 3-区县 4-街道镇 diff --git a/ruoyi-system/src/main/resources/mapper/system/SysAreaMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysAreaMapper.xml index acac252..bdb0209 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysAreaMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysAreaMapper.xml @@ -5,8 +5,8 @@ - - + + From ecd521d85bd49208539d3c3f64a7c39f4eccfdf8 Mon Sep 17 00:00:00 2001 From: wangxy <1356089412@qq.com> Date: Tue, 28 May 2024 15:20:23 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix:=E5=8C=BA=E5=88=92=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/system/mapper/SysAreaMapper.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysAreaMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysAreaMapper.java index 3d4fddc..c50f3d6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysAreaMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysAreaMapper.java @@ -3,6 +3,7 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.domain.SysArea; +import org.apache.ibatis.annotations.Mapper; /** * @author 13560 @@ -10,6 +11,7 @@ import com.ruoyi.system.domain.SysArea; * @createDate 2024-05-28 14:06:56 * @Entity generator.domain.SysArea */ +@Mapper public interface SysAreaMapper extends BaseMapper { }