From eadeaba419f9165fa3c11d9ec6ff578012731f92 Mon Sep 17 00:00:00 2001 From: HuangHai <10402852@qq.com> Date: Tue, 29 Apr 2025 07:57:42 +0800 Subject: [PATCH] 'commit' --- .../main/java/Tools/Init/InitOrgPerson.java | 117 ---------------- .../src/main/java/Tools/Init/addShiZhou.java | 131 ------------------ .../main/java/Tools/Init/clearDataBase.java | 58 ++++---- 3 files changed, 29 insertions(+), 277 deletions(-) delete mode 100644 dsBase/src/main/java/Tools/Init/InitOrgPerson.java delete mode 100644 dsBase/src/main/java/Tools/Init/addShiZhou.java diff --git a/dsBase/src/main/java/Tools/Init/InitOrgPerson.java b/dsBase/src/main/java/Tools/Init/InitOrgPerson.java deleted file mode 100644 index 4e87a394..00000000 --- a/dsBase/src/main/java/Tools/Init/InitOrgPerson.java +++ /dev/null @@ -1,117 +0,0 @@ -package Tools.Init; - -import com.dsideal.dsBase.Util.CommonUtil; -import com.dsideal.dsBase.Util.PkUtil; -import com.jfinal.kit.PropKit; -import com.jfinal.plugin.activerecord.ActiveRecordPlugin; -import com.jfinal.plugin.activerecord.CaseInsensitiveContainerFactory; -import com.jfinal.plugin.activerecord.Db; -import com.jfinal.plugin.activerecord.Record; -import com.jfinal.plugin.druid.DruidPlugin; -import com.jfinal.plugin.redis.RedisPlugin; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.List; -import java.util.UUID; - -public class InitOrgPerson { - - //在独立的main函数中，使用下面的方式进行声明logback对象 - private static final Logger log = LoggerFactory.getLogger(InitOrgPerson.class); - - public static void main(String[] args) throws Exception { - //告之配置文件位置 - PropKit.use("application.properties"); - String user = PropKit.get("user"); - String password = PropKit.get("password"); - String jdbcUrl = PropKit.get("jdbcUrl"); - DruidPlugin hp = new DruidPlugin(jdbcUrl, user, password); - hp.start(); - - // 配置ActiveRecord插件 - ActiveRecordPlugin arp = new ActiveRecordPlugin(hp); - //配置默认小写 - arp.setContainerFactory(new CaseInsensitiveContainerFactory(true)); - - //应用系统 - String basePath = "/Sql/"; - arp.addSqlTemplate(basePath + "organization.sql"); - arp.addSqlTemplate(basePath + "loginPerson.sql"); - arp.start(); - - // 用于缓存模块的redis服务 - RedisPlugin redis = new RedisPlugin("myRedis", PropKit.get("redis_ip"), PropKit.getInt("redis_port"), 10 * 1000); - - //启动redis组件 - redis.start(); - - //初始化主键生成 - PkUtil.InitOrgNumPk(); - PkUtil.InitPersonNumPk(); - - //找出所有单位 - String sql = "select org_id,org_name,city_id,area_id,id_int from t_base_organization"; - List list = Db.find(sql); - int cnt = 0; - for (Record record : list) { - cnt++; - String uuid = UUID.randomUUID().toString().toUpperCase(); - String sql2 = "update t_base_organization set org_id=?,bureau_id=? where id_int=?"; - Db.update(sql2, uuid, record.getInt("id_int"),record.getInt("id_int")); - System.out.println("成功更新" + cnt + "个单位！"); - } - - //写死的三个系统管理员 - String[] arrManager = new String[3]; - arrManager[0] = "9B28524B-7564-45BC-B1D4-156AC6306EC8"; - arrManager[1] = "B6013DFC-5C95-4FD7-86CA-8B15D0CDFACF"; - arrManager[2] = "101343CB-A6EA-452E-9A02-F0776288A912"; - - //重新来过 - list = Db.find(sql); - //插入登录表的sql - cnt = 0; - for (Record record : list) { - cnt++; - generateUser(4, record.getStr("org_name") + "管理员", record.getStr("city_id"), record.getStr("area_id"), cnt, arrManager[0], record.getStr("org_id")); - } - log.info("恭喜，所有工作成功完成！"); - } - /** - * 功能：产生用户 - * 作者：黄海 - * 时间：2018-12-21 - */ - public static void generateUser(int identity_id, String person_name, String city_id, String area_id, int sort_id, String operator,String org_id) { - Record record = new Record(); - String person_id = UUID.randomUUID().toString().toUpperCase(); - record.set("person_id", person_id); - record.set("identity_id", identity_id); - record.set("person_name", person_name); - long dentity_pk_num = PkUtil.GetPersonNumPk(identity_id, 1); - record.set("identity_pk_num", dentity_pk_num); - record.set("login_name", PkUtil.identityMap.get(identity_id) + dentity_pk_num); - String original_pwd = CommonUtil.getSixRandom(); - String pwd = CommonUtil.getLdapPassword(original_pwd); - record.set("pwd", pwd); - record.set("pwdmd5", CommonUtil.md5(original_pwd)); - record.set("b_use", 1); - record.set("create_time", CommonUtil.GetCurrentTimeString()); - record.set("sort_id", sort_id); - String idcard_code = "-1"; - record.set("idcard_code", idcard_code); - record.set("original_pwd", original_pwd); - record.set("xb", 1); - record.set("mz", "01"); - record.set("city_id", city_id); - record.set("area_id", area_id); - record.set("main_school_id", 1); - record.set("bureau_id", org_id); - record.set("org_id", org_id); - record.set("operator", operator); - record.set("ip_address", 2130706433); //127.0.0.1 - Db.save("t_sys_loginperson", record); - } -} - diff --git a/dsBase/src/main/java/Tools/Init/addShiZhou.java b/dsBase/src/main/java/Tools/Init/addShiZhou.java deleted file mode 100644 index 50de7b01..00000000 --- a/dsBase/src/main/java/Tools/Init/addShiZhou.java +++ /dev/null @@ -1,131 +0,0 @@ -package Tools.Init; - -import cn.hutool.core.date.DateUtil; -import com.dsideal.dsBase.Util.CommonUtil; -import com.dsideal.dsBase.Util.PkUtil; -import com.jfinal.kit.PropKit; -import com.jfinal.plugin.activerecord.ActiveRecordPlugin; -import com.jfinal.plugin.activerecord.CaseInsensitiveContainerFactory; -import com.jfinal.plugin.activerecord.Db; -import com.jfinal.plugin.activerecord.Record; -import com.jfinal.plugin.activerecord.dialect.PostgreSqlDialect; -import com.jfinal.plugin.hikaricp.HikariCpPlugin; -import com.jfinal.plugin.redis.RedisPlugin; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.Date; -import java.util.List; -import java.util.UUID; - -public class addShiZhou { - - //在独立的main函数中，使用下面的方式进行声明logback对象 - private static Logger log = LoggerFactory.getLogger(addShiZhou.class); - - - public static void main(String[] args) throws Exception { - //写死的三个系统管理员 - String[] arrManager = new String[3]; - arrManager[0] = "9B28524B-7564-45BC-B1D4-156AC6306EC8"; - arrManager[1] = "B6013DFC-5C95-4FD7-86CA-8B15D0CDFACF"; - arrManager[2] = "101343CB-A6EA-452E-9A02-F0776288A912"; - - //告之配置文件位置 - PropKit.use("application.properties"); - //启动数据库 - String user = PropKit.get("user"); - String password = PropKit.get("password"); - String jdbcUrl = PropKit.get("jdbcUrl"); - HikariCpPlugin hp = new HikariCpPlugin(jdbcUrl, user, password); - hp.start(); - // 配置ActiveRecord插件 - ActiveRecordPlugin arp = new ActiveRecordPlugin(hp); - //配置默认小写 - arp.setContainerFactory(new CaseInsensitiveContainerFactory(true)); - //方言 - arp.setDialect(new PostgreSqlDialect()); - //应用系统 - String basePath = "/Sql/"; - arp.addSqlTemplate(basePath + "clearDataBase.sql"); - arp.addSqlTemplate(basePath + "organization.sql"); - arp.addSqlTemplate(basePath + "loginPerson.sql"); - arp.start(); - - //安装地区 - String sql = "select global_value from t_base_global where global_code='install_area'"; - String InstallCityId = Db.findFirst(sql).getStr("global_value"); - - - // 用于缓存模块的redis服务 - RedisPlugin redis = new RedisPlugin("myRedis", PropKit.get("redis_ip"), PropKit.getInt("redis_port"), 10 * 1000); - - //启动redis组件 - redis.start(); - - //初始化主键生成 - PkUtil.InitOrgNumPk(); - PkUtil.InitPersonNumPk(); - - //目标：根据行政区划，并且生成市管理员帐号 - sql = Db.getSql("clearDataBase.getAreaByCityId"); - List dt = Db.find(sql, InstallCityId); - - for (int i = 0; i < dt.size(); i++) { - String area_id = dt.get(i).getStr("id"); - String city_id = dt.get(i).getStr("city_id"); - String area_code = dt.get(i).getStr("area_code"); - String area_name = dt.get(i).getStr("area_name"); - if (area_code.equals("0")) { - continue; - } - if (city_id.equals(area_id)) { - //存入市管理员 - generateUser(2, area_name + "管理员", InstallCityId, "-1", 1, arrManager[0], "-1"); - } else //如果是区县，需要找到对就的省和市 - { - log.info("当前:" + area_name); - generateUser(3, area_name + "管理员", InstallCityId, area_id, i + 1, arrManager[0], "-1"); - } - } - log.info("恭喜，所有工作成功完成！"); - } - - /** - * 功能：产生用户 - * 作者：黄海 - * 时间：2018-12-21 - */ - public static void generateUser(int identity_id, String person_name, String city_id, String area_id, int sort_id, String operator, String org_id) { - Record record = new Record(); - String person_id = UUID.randomUUID().toString().toUpperCase(); - record.set("person_id", person_id); - record.set("identity_id", identity_id); - record.set("person_name", person_name); - long dentity_pk_num = PkUtil.GetPersonNumPk(identity_id, 1); - record.set("identity_pk_num", dentity_pk_num); - record.set("login_name", PkUtil.identityMap.get(identity_id) + dentity_pk_num); - String original_pwd = CommonUtil.getSixRandom(); - String pwd = CommonUtil.getLdapPassword(original_pwd); - record.set("pwd", pwd); - record.set("pwdmd5", CommonUtil.md5(original_pwd)); - record.set("b_use", 1); - Date now = DateUtil.date(); - record.set("create_time", now); - record.set("sort_id", sort_id); - String idcard_code = "-1"; - record.set("idcard_code", idcard_code); - record.set("original_pwd", original_pwd); - record.set("xb", 1); - record.set("mz", "01"); - record.set("city_id", city_id); - record.set("area_id", area_id); - record.set("main_school_id", "-1"); - record.set("bureau_id", "-1"); - record.set("org_id", org_id); - record.set("operator", operator); - record.set("ip_address", 2130706433); //127.0.0.1 - Db.save("t_sys_loginperson","person_id", record); - } -} - diff --git a/dsBase/src/main/java/Tools/Init/clearDataBase.java b/dsBase/src/main/java/Tools/Init/clearDataBase.java index 8fdbe185..10144978 100644 --- a/dsBase/src/main/java/Tools/Init/clearDataBase.java +++ b/dsBase/src/main/java/Tools/Init/clearDataBase.java @@ -1,6 +1,7 @@ package Tools.Init; import cn.hutool.core.date.DateTime; +import com.dsideal.dsBase.Start; import com.dsideal.dsBase.Util.CommonUtil; import com.dsideal.dsBase.Util.PkUtil; import com.github.javafaker.DateAndTime; @@ -15,47 +16,48 @@ import com.jfinal.plugin.redis.RedisPlugin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.File; import java.util.List; +import java.util.Objects; import java.util.UUID; public class clearDataBase { - //在独立的main函数中，使用下面的方式进行声明logback对象 - private static Logger log = LoggerFactory.getLogger(clearDataBase.class); - + private static final Logger log = LoggerFactory.getLogger(clearDataBase.class); public static void main(String[] args) throws Exception { - //写死的一个系统管理员 - String[] arrManager = new String[3]; - arrManager[0] = "9B28524B-7564-45BC-B1D4-156AC6306EC8"; - //告之配置文件位置 - PropKit.use("application.properties"); + //写死系统管理员 + String arrManager = "9B28524B-7564-45BC-B1D4-156AC6306EC8"; + //安装地区 - String InstallCityId = "064BB3C9-E8DB-45ED-B0C1-6ABC5EA3B667"; + String InstallCityId = "064BB3C9-E8DB-45ED-B0C1-6ABC5EA3B667";//长春市 + //配置文件位置 + PropKit.use("application.properties"); String user = PropKit.get("user"); String password = PropKit.get("password"); String jdbcUrl = PropKit.get("jdbcUrl"); - DruidPlugin hp = new DruidPlugin(jdbcUrl, user, password); - hp.start(); + DruidPlugin druidPlugin = new DruidPlugin(jdbcUrl, user, password); + druidPlugin.start(); // 配置ActiveRecord插件 - ActiveRecordPlugin arp = new ActiveRecordPlugin(hp); + ActiveRecordPlugin arp = new ActiveRecordPlugin(druidPlugin); //配置默认小写 arp.setContainerFactory(new CaseInsensitiveContainerFactory(true)); - //方言 + //方言,这个很重要，否则执行SQL会报错 arp.setDialect(new PostgreSqlDialect()); - //应用系统 - String basePath = "/Sql/"; - arp.addSqlTemplate(basePath + "clearDataBase.sql"); - arp.addSqlTemplate(basePath + "organization.sql"); - arp.addSqlTemplate(basePath + "loginPerson.sql"); + //应用系统Sql模板 + String basePath = Start.class.getClassLoader().getResource(".").getPath(); + File sqlDir = new File(basePath + "/Sql"); + for (File sqlFile : Objects.requireNonNull(sqlDir.listFiles())) { + if (sqlFile.getName().indexOf(".sql") > 0) { + arp.addSqlTemplate("/Sql/" + sqlFile.getName()); + } + } arp.start(); // 用于缓存模块的redis服务 RedisPlugin redis = new RedisPlugin("myRedis", PropKit.get("redis_ip"), PropKit.getInt("redis_port"), 10 * 1000); - - //启动redis组件 redis.start(); //清空组织机构表 @@ -70,19 +72,17 @@ public class clearDataBase { PkUtil.InitOrgNumPk(); PkUtil.InitPersonNumPk(); - //修改global + //修改global中城市设置 String sql = Db.getSql("clearDataBase.set_install_area"); Db.update(sql, InstallCityId); log.info("正在生成超级管理员帐号..."); //插入登录表的sql - for (int i = 0; i < arrManager.length; i++) { - generateUser(1, "系统管理员" + (i + 1), "-1", "-1", i + 1, arrManager[0],"-1"); - } + generateUser(1, "系统管理员" , "-1", "-1", 1, arrManager, "-1"); //修正一下sys1的密码，配置开发用 sql = Db.getSql("clearDataBase.setPwd"); - String original_pwd = "DsideaL4r5t6y7u"; + String original_pwd = "DsideaL4r5t6y7u";//默认密码 String pwd = CommonUtil.getLdapPassword(original_pwd); Db.update(sql, "******", pwd, CommonUtil.md5(original_pwd), "sys1"); @@ -100,11 +100,11 @@ public class clearDataBase { } if (city_id.equals(area_id)) { //存入市管理员 - generateUser(2, area_name + "管理员", InstallCityId, "-1", 1, arrManager[0],"-1"); + generateUser(2, area_name + "管理员", InstallCityId, "-1", 1, arrManager, "-1"); } else //如果是区县，需要找到对就的省和市 { log.info("当前:" + area_name); - generateUser(3, area_name + "管理员", InstallCityId, area_id, i + 1, arrManager[0],"-1"); + generateUser(3, area_name + "管理员", InstallCityId, area_id, i + 1, arrManager, "-1"); } } log.info("恭喜，所有工作成功完成！"); @@ -115,7 +115,7 @@ public class clearDataBase { * 作者：黄海 * 时间：2018-12-21 */ - public static void generateUser(int identity_id, String person_name, String city_id, String area_id, int sort_id, String operator,String org_id) { + public static void generateUser(int identity_id, String person_name, String city_id, String area_id, int sort_id, String operator, String org_id) { Record record = new Record(); String person_id = UUID.randomUUID().toString().toUpperCase(); record.set("person_id", person_id); @@ -143,7 +143,7 @@ public class clearDataBase { record.set("org_id", org_id); record.set("operator", operator); record.set("ip_address", 2130706433); //127.0.0.1 - Db.save("t_sys_loginperson","person_id", record); + Db.save("t_sys_loginperson", "person_id", record); } }