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