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/manager/SysAreaManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SysAreaManager.java new file mode 100644 index 0000000..3da973b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SysAreaManager.java @@ -0,0 +1,48 @@ +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; + +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(String parentId) { + return sysAreaService.lambdaQuery() + .eq(SysArea::getParentId, StringUtils.isEmpty(parentId) ? "29" : parentId) + .orderByAsc(SysArea::getAreaCode) + .list(); + } + + + 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/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/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..384047e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysAreaController.java @@ -0,0 +1,49 @@ +package com.ruoyi.web.controller.system.system; + +import com.ruoyi.common.core.domain.AjaxResult; +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) String parentId) { + return success(sysAreaManager.getSysAreaList(parentId)); + } + + + @ApiOperation("获取区划名称") + @GetMapping("/getAreaName") + @ResponseBody + public AjaxResult getAreaName(@RequestParam String id) { + return success(sysAreaManager.getAreaName(id)); + } + + + + + +} 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 d11e8bc..88bf2a3 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) { 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..2ede96f --- /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 String id; + + /** + * 上级区域ID + */ + private String 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..c50f3d6 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysAreaMapper.java @@ -0,0 +1,21 @@ +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 +* @description 针对表【sys_area(行政区域)】的数据库操作Mapper +* @createDate 2024-05-28 14:06:56 +* @Entity generator.domain.SysArea +*/ +@Mapper +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..bdb0209 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/SysAreaMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + id,parent_id,area_level, + name,area_code + +