涉密人员统计

ruoyi-admin/pom.xml

@@ -49,6 +49,14 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
 
+        <!-- 人大金仓数据库-->
+        <dependency>
+            <groupId>cn.com.kingbase</groupId>
+            <artifactId>kingbase8</artifactId>
+            <version>8.6.0</version>
+        </dependency>
+
+
         <!-- 核心模块-->
         <dependency>
             <groupId>com.ruoyi</groupId>

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java

@@ -106,6 +106,7 @@ public class SysUsernumController extends BaseController {
     {
         List<SysUser> list = userService.lambdaQuery().eq(SysUser::getDeptId, deptId)
                 .eq(SysUser::getDelFlag,0)
+                .ne(SysUser::getUserId,1)
                 .list();
         list.forEach(sysuser -> {
             List<SysUserPost> postList = sysUserPostService.lambdaQuery().

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:
                 # 从数据源开关/默认关闭

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
 

ruoyi-admin/src/main/resources/templates/system/check/add.html

@@ -10,20 +10,20 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">报告人：</label>
                 <div class="col-sm-8">
-                    <input name="user" disabled th:value="*{userName}" class="form-control" type="text">
+                    <input name="user" readonly th:value="*{userName}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">报告人单位：</label>
                 <div class="col-sm-8">
-                    <input name="depart" disabled th:value="*{dept.deptName}" class="form-control" type="text">
+                    <input name="depart" readonly th:value="*{dept.deptName}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">检查开始时间：</label>
                 <div class="col-sm-8">
                     <div class="input-group date">
-                        <input name="checkStartTime" disabled class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <input name="checkStartTime" readonly class="form-control" placeholder="yyyy-MM-dd" type="text">
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                     </div>
                 </div>

ruoyi-admin/src/main/resources/templates/system/train/add.html

@@ -16,7 +16,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">所属区县：</label>
                 <div class="col-sm-8">
-                    <input name="FRAMEWORK" class="form-control" type="text">
+                    <input name="FRAMEWORK" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    

ruoyi-admin/src/main/resources/templates/system/user/add.html

@@ -189,7 +189,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label">生效时间：</label>
                         <div class="col-sm-8">
-                            <input name="startdate" class="form-control"      type="text">
+                            <input name="startdate" readonly class="form-control"      type="text">
                         </div>
                     </div>
                 </div>
@@ -197,7 +197,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label">失效时间：</label>
                         <div class="col-sm-8">
-                            <input name="enddate" class="form-control" value="2050-12-31" type="text">
+                            <input name="enddate" readonly class="form-control" value="2050-12-31" type="text">
                         </div>
                     </div>
                 </div>

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();

ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java

@@ -201,6 +201,7 @@ public class GenController extends BaseController
         {
             SqlUtil.filterKeyword(sql);
             List<SQLStatement> sqlStatements = SQLUtils.parseStatements(sql, DbType.mysql);
+            //List<SQLStatement> sqlStatements = SQLUtils.parseStatements(sql, DbType.kingbase);
             List<String> tableNames = new ArrayList<>();
             for (SQLStatement sqlStatement : sqlStatements)
             {