1

ljq
1 parent be051f4d
Showing 12 changed files with 21 additions and 18 deletions
.gitignore
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/service/ddexam/impl/DdexamServiceImpl.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/java/com/bsth/util/FTPClientUtils.java
src/main/java/com/bsth/util/ReportUtils.java
src/main/resources/application-dev.properties
src/main/resources/application-prod.properties
src/main/resources/logback.xml
src/main/resources/static/index.html
src/main/resources/static/login.html
src/main/resources/static/real_control_v2/main.html
@@ -11,7 +11,7 @@ test_coverage/
 npm-debug.log
 *.iml
 tmp
-D:/
+F:/
 # git忽略空文件夹，按照惯例，空文件夹下放置.gitkeep文件避免文件夹被忽略不上传。
 !.gitkeep
@@ -201,14 +201,15 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据
         sexec.scheduleWithFixedDelay(basicDataLoader, 1, 1, TimeUnit.HOURS);//基础数据更新
         sexec.scheduleWithFixedDelay(autoExecScanThread, 180, 50, TimeUnit.SECONDS);//班次自动执行
-        DirectivePushQueue.start();//消息队列 -指令，系统下发的
+        //DirectivePushQueue.start();//消息队列 -指令，系统下发的
         WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
+        sexec.scheduleAtFixedRate(ddexamThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
         /** 线调为其他程序提供的数据 --写入数据库 */
-        sexec.scheduleWithFixedDelay(fcxxUpdateThread, 160, 30, TimeUnit.SECONDS);//发车信息（发车屏、信息发布）
+        //sexec.scheduleWithFixedDelay(fcxxUpdateThread, 160, 30, TimeUnit.SECONDS);//发车信息（发车屏、信息发布）
         //线路首末班数据（网关用，班次更新时写入）
         //com.bsth.data.schedule.f_a_l.FirstAndLastHandler
-        sexec.scheduleWithFixedDelay(schSiginUpdateDBThread, 160, 60 * 30, TimeUnit.SECONDS);//无法自动完成的班次信息（网关用，补信号）
+        //sexec.scheduleWithFixedDelay(schSiginUpdateDBThread, 160, 60 * 30, TimeUnit.SECONDS);//无法自动完成的班次信息（网关用，补信号）
         //运管处静态数据提交
        // log.info(timeDiff / 1000 / 60 + "分钟之后提交到运管处");
@@ -226,7 +226,7 @@ public class DdexamServiceImpl implements DdexamService {
     public Map initializationAll2(Long userName){
         Long start = System.currentTimeMillis();
         Map m = new HashMap<>();
-        String t = String.valueOf(userName).substring(0,8);
+        String t = String.valueOf(userName).substring(0,7);
         try {  //用户当天分配完直接改状态  无二次分配的可能
             List<SysUser> userList = sysUserRepository.findBySusUser(t); //已有的用户   不考虑用户角色表  正常情况下创建必分配
@@ -346,7 +346,7 @@ public class DdexamServiceImpl implements DdexamService {
     }
     //创建考试人数 并分配线路信息
-    public  Boolean  usercreateType(int st,Long userName){
+    public synchronized Boolean  usercreateType(int st,Long userName){
         int usernum = sysUserRepository.findAll_distinct().size();
         SysUser user = new SysUser();//总人数
         for (int i = 0; i < st; i++) { //创建考试人数
@@ -576,7 +576,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	public String setLDFile(){
 		String result = "failure";
 		try {
-			String tmp = readXmlFromFile("D:/ld.txt");
+			String tmp = readXmlFromFile("F:/ld.txt");
 			Results rss = ssop.setLD(userNameOther, passwordOther, StringEscapeUtils.unescapeHtml(tmp));
 			if(rss.isSuccess()){
 				result = "success";
@@ -369,7 +369,7 @@ public class FTPClientUtils {
 		Test test= new Test();
-		File[] sources = new File[] {new File("D:/20079.txt")};
+		File[] sources = new File[] {new File("F:/20079.txt")};
 		File target = new File("release_package.tar.gz");
@@ -584,8 +584,8 @@ public class ReportUtils {
 			dataList.add(sr);
 			list.add(dataList.iterator());
-			ee.excelReplace(list, new Object[] { srr }, "D:/waybill.xls",
-					"D:/22.xls");
+			ee.excelReplace(list, new Object[] { srr }, "F:/waybill.xls",
+					"F:/22.xls");
 			System.out.println("ok");
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -9,7 +9,8 @@ spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.Im
 spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
-spring.jpa.show-sql= true
+#服务器问题不打印sql
+spring.jpa.show-sql= false
 #DATABASE
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
 server.port=9088
-# dubbo服务化使用开关flag
+# dubbo锟斤拷锟斤拷使锟矫匡拷锟斤拷flag
 dubbo.use=false
 #JPA
@@ -9,11 +9,12 @@ spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.Im
 spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
-spring.jpa.show-sql= true
+#鏈嶅姟鍣ㄩ棶棰樹笉鎵撳嵃sql
+spring.jpa.show-sql= false
 #DATABASE
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://10.10.200.121:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+spring.datasource.url= jdbc:mysql://192.168.2.171:3306/jp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
 spring.datasource.username= root
 spring.datasource.password= root2jsp
 spring.datasource.type= com.zaxxer.hikari.HikariDataSource
@@ -3,7 +3,7 @@
 <configuration>
 	<!-- <property resource="application.properties" /> -->
-	<property name="LOG_BASE" value="D:/bsth_control_logs" />
+	<property name="LOG_BASE" value="F:/bsth_control_logs" />
 	<!-- 控制台输出 -->
 	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
@@ -220,7 +220,7 @@
 		<!-- LOGO -->
 		<div class="page-logo">
 			<a href="index.html" class="logo-default logo-default-text">
-				集群调度培训系统 </a>
+				集群调度考试系统 </a>
 			<div class="menu-toggler sidebar-toggler"></div>
 		</div>
 		<!-- END LOGO -->
@@ -181,7 +181,7 @@
 <div class="wrapper ng-scope">
     <div id="loginPanel" class="dialog dialog-shadow">
         <br>
-        <h3 class="logo-text">集群调度培训系统</h3>
+        <h3 class="logo-text">集群调度考试系统</h3>
         <hr>
         <form style="padding: 0px 35px;">
             <div class="form-group" style="margin-bottom: 0">
@@ -55,7 +55,7 @@
         <div class="uk-width-4-10">
             <div class="uk-panel">
                 <h2 class="north-logo">
-                    <!--<i class="uk-icon-life-ring"></i>--> 集群调度培训系统
+                    <!--<i class="uk-icon-life-ring"></i>--> 集群调度考试系统
                 </h2>
             </div>
         </div>