diff --git a/Doc/挂图作战/测试账号.txt b/Doc/挂图作战/测试账号.txt index f011a8a3..74baa43a 100644 --- a/Doc/挂图作战/测试账号.txt +++ b/Doc/挂图作战/测试账号.txt @@ -1,4 +1,4 @@ （一中）老师 yizhong Y8z3BFS （装备中心）董建华 djh 123456 -（专家）明守刚 mingshougang JLyBn20 +（专家）黄海 huanghai 227687 （监理）长春弘扬建设监理有限公司 jianli w9f2AqC \ No newline at end of file diff --git a/WebRoot/upload/557C980E-37D5-4B52-A2C4-3F1E01B27809.png b/WebRoot/upload/557C980E-37D5-4B52-A2C4-3F1E01B27809.png new file mode 100644 index 00000000..4f51ef63 Binary files /dev/null and b/WebRoot/upload/557C980E-37D5-4B52-A2C4-3F1E01B27809.png differ diff --git a/src/main/java/Tools/FillSubject.java b/src/main/java/Tools/FillSubject.java index 19bf0230..237c4d73 100644 --- a/src/main/java/Tools/FillSubject.java +++ b/src/main/java/Tools/FillSubject.java @@ -41,6 +41,7 @@ public class FillSubject { public static HashMap _subjectTypeMap = new HashMap<>(); //根据单位名称获取单位代码 public static HashMap _schoolCodeMap = new HashMap<>(); + /** * 功能：将需要处理的学校名称形成一个HashSet * @@ -209,7 +210,7 @@ public class FillSubject { } //只有t_pro_task这张表落盘，其它两张表不落盘 - if (writeList.size() > 0) { + if (!writeList.isEmpty()) { CommonUtil.log("表：" + table_name + "数据条数：" + writeList.size()); //清表 PgSqlUtil.Truncate(table_name); @@ -301,6 +302,13 @@ public class FillSubject { if (finish_scan == 0) { c1 = c1 + 1; CommonUtil.log("成功插入表t_gtzz_subject：" + c1 + "条记录！"); + String install_area="064BB3C9-E8DB-45ED-B0C1-6ABC5EA3B667";//长春市 + //新增加的项目数据，需要根据全局变量ZhuanJiaCheck=1还是ZhuanJiaCheck=0，来决定是不是生成这个项目的评审专家和专家组组长 + sql = "select global_value from t_base_global where install_area=? and global_code=?"; + String global_value=Db.findFirst(sql, install_area, "ZhuanJiaCheck").getStr("global_value"); + if(global_value.equals("1")){ + //subject_id + } } else { c2 = c2 + 1; CommonUtil.log("成功更新表t_gtzz_subject：" + c2 + "条记录！"); @@ -359,6 +367,17 @@ public class FillSubject { gm.delTjCache(); } + public static void syncSubject() throws URISyntaxException, IOException { + //初始化 + init(); + //将财务审批的数据全部导入到数据库的表中 + loadJson(); + //对导入的数据进行处理 + syncData(); + + CommonUtil.log("恭喜，所有操作成功完成！"); + } + public static void main(String[] args) throws URISyntaxException, IOException { //告之配置文件位置 PropKit.use("application.properties"); @@ -378,14 +397,6 @@ public class FillSubject { //启动redis组件 redis.start(); - //初始化 - init(); - //将财务审批的数据全部导入到数据库的表中 - loadJson(); - - //对导入的数据进行处理 - syncData(); - - CommonUtil.log("恭喜，所有操作成功完成！"); + syncSubject(); } } \ No newline at end of file diff --git a/src/main/java/com/dsideal/QingLong/Cron4j/FillSubjectTask.java b/src/main/java/com/dsideal/QingLong/Cron4j/FillSubjectTask.java new file mode 100644 index 00000000..c6a48a7f --- /dev/null +++ b/src/main/java/com/dsideal/QingLong/Cron4j/FillSubjectTask.java @@ -0,0 +1,16 @@ +package com.dsideal.QingLong.Cron4j; + +import com.jfinal.plugin.cron4j.ITask; +import lombok.SneakyThrows; + +public class FillSubjectTask implements ITask { + @SneakyThrows + public void run() { + // 这里放被执行的调试任务代码 + Tools.FillSubject.syncSubject(); + } + + public void stop() { + // 这里的代码会在 task 被关闭前调用 + } +} diff --git a/src/main/java/com/dsideal/QingLong/Global/Model/GlobalModel.java b/src/main/java/com/dsideal/QingLong/Global/Model/GlobalModel.java index 7ffe4356..d481522b 100644 --- a/src/main/java/com/dsideal/QingLong/Global/Model/GlobalModel.java +++ b/src/main/java/com/dsideal/QingLong/Global/Model/GlobalModel.java @@ -85,8 +85,10 @@ public class GlobalModel { * 时间：2018-11-21 */ public void addGlobal(String global_type_id, String global_code, String global_value, String global_name, int sort_id) { - String sql = Db.getSql("global.addGlobal"); - Db.update(sql, Integer.parseInt(global_type_id), global_code, global_value, global_name, sort_id); + String sql = "select max(global_id) from t_base_global"; + int global_id = Db.queryInt(sql) + 1; + sql = Db.getSql("global.addGlobal"); + Db.update(sql, global_id,Integer.parseInt(global_type_id), global_code, global_value, global_name, sort_id); } /** diff --git a/src/main/java/com/dsideal/QingLong/Start.java b/src/main/java/com/dsideal/QingLong/Start.java index d6573f98..276e9ad3 100644 --- a/src/main/java/com/dsideal/QingLong/Start.java +++ b/src/main/java/com/dsideal/QingLong/Start.java @@ -36,6 +36,7 @@ import com.jfinal.kit.PropKit; import com.jfinal.kit.StrKit; import com.jfinal.plugin.activerecord.ActiveRecordPlugin; import com.jfinal.plugin.activerecord.dialect.PostgreSqlDialect; +import com.jfinal.plugin.cron4j.Cron4jPlugin; import com.jfinal.plugin.hikaricp.HikariCpPlugin; import com.jfinal.plugin.redis.RedisPlugin; import com.jfinal.server.undertow.UndertowServer; @@ -175,6 +176,8 @@ public class Start extends JFinalConfig { RedisPlugin pika = new RedisPlugin("Pika", PropKit.get("pika_ip"), PropKit.getInt("pika_port"), 10000); me.add(pika); } + //加载定时器 + me.add(new Cron4jPlugin(PropKit.use("cron4j.properties"))); } /** diff --git a/src/main/resource/Sql/global.sql b/src/main/resource/Sql/global.sql index 61639b14..d3a1fe8b 100644 --- a/src/main/resource/Sql/global.sql +++ b/src/main/resource/Sql/global.sql @@ -8,12 +8,13 @@ -- 获取所有分类 #sql("getGlobalList") - select global_id,global_type_id,global_code,global_value,global_name,sort_id from t_base_global where global_id=1 or install_area=#para(install_area) order by sort_id + select global_id,global_type_id,global_code,global_value,global_name,sort_id from t_base_global + where global_id=1 or install_area=#para(install_area) order by sort_id #end -- 增加一个全局变量设置 #sql("addGlobal") - insert into t_base_global(global_type_id,global_code,global_value,global_name,sort_id) values(?,?,?,?,?) + insert into t_base_global(global_id,global_type_id,global_code,global_value,global_name,sort_id) values(?,?,?,?,?,?) #end -- 修改一个全局变量设置 diff --git a/src/main/resource/cron4j.properties b/src/main/resource/cron4j.properties index 70cb5ed2..63079e41 100644 --- a/src/main/resource/cron4j.properties +++ b/src/main/resource/cron4j.properties @@ -7,12 +7,12 @@ # 星号 *：表示每一个时间点，例如 * * * * * 表示每分钟执行 # 除号 /：表示指定一个值的增加幅度。例如 n/m表示从 n 开始，每次增加 m 的时间点执行 # cron4j 集成cron 只有 分 时 天 月 周 没有秒 -cron4j=clearRubbish -# 每天凌晨2点执行一次 -clearRubbish.cron=0 2 * * * -clearRubbish.class=com.dsideal.QingLong.clearRubbish.clearRubbishAction -clearRubbish.daemon=true -clearRubbish.enable=true +cron4j=syncSubject +# 每天凌晨0点执行一次 +syncSubject.cron=0 0 * * * +syncSubject.class=com.dsideal.QingLong.Cron4j.FillSubjectTask +syncSubject.daemon=true +syncSubject.enable=true diff --git a/src/main/resource/gtzz_cleartable.txt b/src/main/resource/gtzz_cleartable.txt index 8d00a75b..08806c97 100644 --- a/src/main/resource/gtzz_cleartable.txt +++ b/src/main/resource/gtzz_cleartable.txt @@ -9,4 +9,6 @@ t_gtzz_subject_jianli t_gtzz_subject_zhuanjia t_gtzz_yanshou t_gtzz_sync_log -t_gtzz_ys \ No newline at end of file +t_gtzz_ys +t_gtzz_ys_subject +t_gtzz_ys_expert \ No newline at end of file