jp

ljq
1 parent 2e21b287
Showing 97 changed files with 22 additions and 11 deletions
src/main/java/com/bsth/data/ddexam/DdexamThread.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/ddexam/impl/DdexamServiceImpl.java
src/main/resources/application-dev.properties
src/main/resources/control-jdbc.properties
src/main/resources/logback.xml
src/main/resources/ms-jdbc.properties
src/main/resources/static/pages/base/line/addstation.html
src/main/resources/static/pages/forms/export/import_Jdl.xls
src/main/resources/static/pages/forms/export/import_Jygl.xls
src/main/resources/static/pages/forms/export/refuel.xls
src/main/resources/static/pages/forms/export/text.xls
src/main/resources/static/pages/forms/export/车辆充电量.xls
src/main/resources/static/pages/forms/mould/account.xls
src/main/resources/static/pages/forms/mould/allline.xls
src/main/resources/static/pages/forms/mould/busInterval0.xls
src/main/resources/static/pages/forms/mould/busInterval1.xls
src/main/resources/static/pages/forms/mould/calcIntervalCount.xls
src/main/resources/static/pages/forms/mould/calcIntervalList1.xls
src/main/resources/static/pages/forms/mould/calcIntervalSum.xls
 package com.bsth.data.ddexam;
-import com.bsth.repository.sys.SysRepository;
+import com.bsth.repository.sys.SysUserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -237,5 +237,8 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s.xlBm as xlBm,s.clZbh as clZbh from ScheduleRealInfo s where s.scheduleDateStr = ?1 and s.xlBm in (?2) GROUP BY s.xlBm, s.clZbh")
 	List<Map<String, Object>> selectclZbhGroup(String date, String[] t);
+	@Query(value="select count(*) from ScheduleRealInfo s where s.scheduleDateStr = ?1 and s.xlBm  = ?2")
+	int selectCountAll(String scheduleDateStr,String lineCode);
+
 }
@@ -380,7 +380,7 @@ public class DdexamServiceImpl implements DdexamService {
                 Integer linecodeId = linebumber++ ;
                 line.setId(linecodeId);
                 line.setLineCode(linecodeId.toString());
-                line.setName(mtline[j]+"+"+user.getName());
+                line.setName(mtline[j]+"-"+user.getName());
                 line.setCoLineCode(linest.getLineCode());
                 lineRepository.save(line);  //线路添加
                 //----------------线路--------------------------//
@@ -425,6 +425,10 @@ public class DdexamServiceImpl implements DdexamService {
     //添加排班
     public void inforealType(Line line){
+        int t  = ScheduleRealInfoRepository.selectCountAll(sdf.format(new Date()),line.getLineCode());
+        //鉴于有人员创建账号瞬间就初始化  修改人员状态慢了一步  在此多加一部判断
+        if(t  >  0)
+            return;
         //用旧线路code查出模板排班表
         List<ScheduleRealInfoSt>  sristList =  ScheduleRealInfoStRepository.queryUserInfo(line.getCoLineCode(),"2021-11-18");//模板固定日期
         List<ScheduleRealInfo>  sriList = new ArrayList<>();
@@ -4,7 +4,7 @@ server.port=9088
 dubbo.use=false
 #JPA
-spring.jpa.hibernate.ddl-auto= update
+spring.jpa.hibernate.ddl-auto= none
 spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl
 spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
 spring.jpa.database= MYSQL
@@ -33,6 +33,9 @@ spring.datasource.hikari.connection-timeout= 3000
 spring.datasource.hikari.connection-test-query= SELECT 1
 spring.datasource.hikari.validation-timeout= 3000
+jp.time = cmd /c time
+jp.date = cmd /c date
+
 ## gps client data
 http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
 ## gateway real data
@@ -40,4 +43,5 @@ http.gps.real.url= http://114.80.178.12:18080/transport_server/rtgps/
 ## gateway send directive
 http.send.directive = http://192.168.168.201:9090/transport_server/message/
 ## rfid data
-http.rfid.url= http://114.80.178.12:29000/rfid
 \ No newline at end of file
+http.rfid.url= http://114.80.178.12:29000/rfid
+
 station.mysql.driver= com.mysql.jdbc.Driver
-station.mysql.url= jdbc:mysql://10.10.200.121:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+station.mysql.url= jdbc:mysql://127.0.0.1/jp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 station.mysql.username= root
-station.mysql.password= root2jsp
+station.mysql.password= root
 #station.mysql.driver= com.mysql.jdbc.Driver
 #station.mysql.url= jdbc:mysql://10.10.200.121:3306/station?useUnicode=true&characterEncoding=utf-8
@@ -3,7 +3,7 @@
 <configuration>
 	<!-- <property resource="application.properties" /> -->
-	<property name="LOG_BASE" value="E:/bsth_control_logs" />
+	<property name="LOG_BASE" value="D:/bsth_control_logs" />
 	<!-- 控制台输出 -->
 	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
@@ -17,7 +17,7 @@
 	<!-- 主日志文件 -->
 	<appender name="FILE"
 			  class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${LOG_BASE}/main/main.log</file>
+		<file>${LOG_BASE}/mainks/main.log</file>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${LOG_BASE}/main/main-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
 			<timeBasedFileNamingAndTriggeringPolicy
@@ -4,6 +4,6 @@
 #ms.mysql.password= 123456
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://10.10.150.122:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.url= jdbc:mysql://127.0.0.17:3306/ms?useUnicode=true&characterEncoding=utf-8
 ms.mysql.username= root
-ms.mysql.password= root2jsp
 \ No newline at end of file
+ms.mysql.password= root
 \ No newline at end of file
@@ -206,7 +206,7 @@
 	</div>
 </div>
 <script type="text/javascript">
-$('#add_station_mobal').on('AddStationMobal.show', function(e, addMap,ajaxd,staobj,editRoute,fun){
+$('#add_station_mobal').on('add', function(e, addMap,ajaxd,staobj,editRoute,fun){
 	var Station =  staobj;
 	var Line = editRoute.getLineObj();
 	// 延迟加载