陶汉栋 / MyCloud

Download as
Browse Code »

Commit c28016fb977cf9adb2a19d7066ccabe6b9c10e8d

Authored by 徐泉
1 parent c029c277
Exists in master

代码修改提交

Showing 4 changed files with 31 additions and 62 deletions   Show diff stats
cloud/haikangface/src/main/java/com/sincere/haikangface/service/impl/UserOperateServiceImpl.java
  Diff comments   View file @c28016f
@@ -1015,7 +1015,8 @@ public class UserOperateServiceImpl implements UserOperateService { @@ -1015,7 +1015,8 @@ public class UserOperateServiceImpl implements UserOperateService {
1015 for(SendRecordBean s : students){ 1015 for(SendRecordBean s : students){
1016 String cardNum = s.getNum(); 1016 String cardNum = s.getNum();
1017 StudentBean studentBean = userDao.getStudentWithCard(cardNum,schoolId.intValue()); 1017 StudentBean studentBean = userDao.getStudentWithCard(cardNum,schoolId.intValue());
1018 - if(studentBean == null){ 1018 + StudentBean teacher = userDao.getTeacherWithCard(cardNum,schoolId.intValue());
  1019 + if(studentBean == null && teacher ==null){
1019 deviceList.stream().forEach(c->{ 1020 deviceList.stream().forEach(c->{
1020 boolean isOk = false; 1021 boolean isOk = false;
1021 if (cmsServer.getIsDeviceOnline(c)) { 1022 if (cmsServer.getIsDeviceOnline(c)) {
@@ -31,17 +31,17 @@ @@ -31,17 +31,17 @@
31 <module>common</module> 31 <module>common</module>
32 <module>getaway</module> 32 <module>getaway</module>
33 <!--<module>haikang</module>--> 33 <!--<module>haikang</module>-->
34 - <module>dahua</module> 34 +<!-- <module>dahua</module>-->
35 <!-- <module>consumer</module>--> 35 <!-- <module>consumer</module>-->
36 - <module>haikangface</module> 36 +<!-- <module>haikangface</module>-->
37 <!-- <module>search_independence</module>--> 37 <!-- <module>search_independence</module>-->
38 <!-- <module>search_smartCampus</module>--> 38 <!-- <module>search_smartCampus</module>-->
39 <!-- <module>search_xiaoan</module>--> 39 <!-- <module>search_xiaoan</module>-->
40 - <module>mypulsar</module> 40 +<!-- <module>mypulsar</module>-->
41 <!-- <module>weigeng</module>--> 41 <!-- <module>weigeng</module>-->
42 <!-- <module>independence</module>--> 42 <!-- <module>independence</module>-->
43 <module>quartz</module> 43 <module>quartz</module>
44 - <module>zkAttendance</module> 44 +<!-- <module>zkAttendance</module>-->
45 <module>user_search</module> 45 <module>user_search</module>
46 <module>fIle-center</module> 46 <module>fIle-center</module>
47 <module>RibbonConsume</module> 47 <module>RibbonConsume</module>
cloud/quartz/src/main/java/com/sincere/quartz/third/yixueyun/YXYReadService.java
  Diff comments   View file @c28016f
@@ -36,16 +36,21 @@ public class YXYReadService { @@ -36,16 +36,21 @@ public class YXYReadService {
36 private static int SI_CODE = 12345678 ; 36 private static int SI_CODE = 12345678 ;
37 37
38 private static String nameSpace = "http://service.pubinfo.com.cn" ; 38 private static String nameSpace = "http://service.pubinfo.com.cn" ;
39 - private static String getAllTeacher = "http://122.229.30.149:8282/DataSynService/GetTeacherInfo"; 39 +// private static String getAllTeacher = "http://122.229.30.149:8282/DataSynService/GetTeacherInfo";
  40 + private static String getAllTeacher = "http://dx.114school.com:8282/DataSynService/GetTeacherInfo";
40 private static String getAllTeacher_method = "getTeacherInfo" ; 41 private static String getAllTeacher_method = "getTeacherInfo" ;
41 - private static String getAddTeacher = "http://122.229.30.149:8282/DataSynService/GetIncrementTeacherInfo" ; 42 +// private static String getAddTeacher = "http://122.229.30.149:8282/DataSynService/GetIncrementTeacherInfo" ;
  43 + private static String getAddTeacher = "http://dx.114school.com:8282/DataSynService/GetIncrementTeacherInfo" ;
42 private static String getAddTeacher_method = "getIncrementTeacherInfo" ; 44 private static String getAddTeacher_method = "getIncrementTeacherInfo" ;
43 45
44 - private static String getAllStudent = "http://122.229.30.149:8282/DataSynService/GetStudentInfo" ; 46 +// private static String getAllStudent = "http://122.229.30.149:8282/DataSynService/GetStudentInfo" ;
  47 + private static String getAllStudent = "http://dx.114school.com:8282/DataSynService/GetStudentInfo" ;
45 private static String getALlStudent_method = "getStudentInfo"; 48 private static String getALlStudent_method = "getStudentInfo";
46 - private static String getAddStudent = "http://122.229.30.149:8282/DataSynService/GetIncrementStudentInfo" ; 49 +// private static String getAddStudent = "http://122.229.30.149:8282/DataSynService/GetIncrementStudentInfo" ;
  50 + private static String getAddStudent = "http://dx.114school.com:8282/DataSynService/GetIncrementStudentInfo" ;
47 private static String getAddStudent_method = "getIncrementStudentInfo" ; 51 private static String getAddStudent_method = "getIncrementStudentInfo" ;
48 - private static String getAllDept = "http://122.229.30.149:8282/DataSynService/GetDeptInfo" ; 52 +// private static String getAllDept = "http://122.229.30.149:8282/DataSynService/GetDeptInfo" ;
  53 + private static String getAllDept = "http://dx.114school.com:8282/DataSynService/GetDeptInfo" ;
49 private static String getALlDept_method = "getDeptInfo"; 54 private static String getALlDept_method = "getDeptInfo";
50 55
51 @Autowired 56 @Autowired
@@ -112,13 +117,12 @@ public class YXYReadService { @@ -112,13 +117,12 @@ public class YXYReadService {
112 int count = yxyService.selectCount(today); 117 int count = yxyService.selectCount(today);
113 logger.info("跑批总数：count: "+ count); 118 logger.info("跑批总数：count: "+ count);
114 if(count > number){ 119 if(count > number){
115 - logger.info("----哈哈哈，你终于来了----");  
116 yxyService.deleteWeekBefore(); 120 yxyService.deleteWeekBefore();
117 yxyService.updateAgency(); 121 yxyService.updateAgency();
118 yxyService.updateStudent(); 122 yxyService.updateStudent();
119 yxyService.updateTeacher(); 123 yxyService.updateTeacher();
  124 + logger.info("----哈哈哈，删除完成----");
120 } 125 }
121 - logger.info("----哈哈哈，删除完成----");  
122 }catch (Exception e){ 126 }catch (Exception e){
123 127
124 } 128 }
cloud/quartz/src/main/resources/logback.xml
  Diff comments   View file @c28016f
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <configuration debug="true"> 2 <configuration debug="true">
3 -     <!-- 项目名称 -->  
4 -     3 + <!-- 项目名称 -->
5 <property name="PROJECT_NAME" value="quartz"/> 4 <property name="PROJECT_NAME" value="quartz"/>
6 5
7 -     <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径--> 6 + <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
8 <property name="LOG_HOME" value="C://log"/> 7 <property name="LOG_HOME" value="C://log"/>
9 8
10 -     <!-- 控制台输出 -->  
11 -      
12 - <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">  
13 -         <!--<withJansi>true</withJansi>-->  
14 -         9 + <!-- 控制台输出 -->
  10 + <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"><!--<withJansi>true</withJansi>-->
15 <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> 11 <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
16 -             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->  
17 -             12 + <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
18 <pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] %highlight([%-5level] %logger{50} - %msg%n)</pattern> 13 <pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] %highlight([%-5level] %logger{50} - %msg%n)</pattern>
19 -              
20 <charset>UTF-8</charset> 14 <charset>UTF-8</charset>
21 -          
22 </encoder> 15 </encoder>
23 -      
24 </appender> 16 </appender>
25 17
26 -     <!-- 按照每天生成日志文件 -->  
27 -     18 + <!-- 按照每天生成日志文件 -->
28 <appender name="SYSTEM_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> 19 <appender name="SYSTEM_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
29 -         <!-- 过滤器，只打印ERROR级别的日志 -->  
30 -         20 + <!-- 过滤器，只打印ERROR级别的日志 -->
31 <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> 21 <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
32 -             <!--日志文件输出的文件名-->  
33 -             22 + <!--日志文件输出的文件名-->
34 <FileNamePattern>${LOG_HOME}/${PROJECT_NAME}/%d{yyyy-MM-dd}.%i.log</FileNamePattern> 23 <FileNamePattern>${LOG_HOME}/${PROJECT_NAME}/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
35 -             <!--日志文件保留天数-->  
36 -             24 + <!--日志文件保留天数-->
37 <MaxHistory>30</MaxHistory> 25 <MaxHistory>30</MaxHistory>
38 -             <!--日志文件最大的大小-->  
39 -             26 + <!--日志文件最大的大小-->
40 <MaxFileSize>100MB</MaxFileSize> 27 <MaxFileSize>100MB</MaxFileSize>
41 -          
42 </rollingPolicy> 28 </rollingPolicy>
43 29
44 -          
45 <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> 30 <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
46 -             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->  
47 -             31 + <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
48 <pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] [%-5level] %logger{50} - %msg%n</pattern> 32 <pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] [%-5level] %logger{50} - %msg%n</pattern>
49 -              
50 <charset>UTF-8</charset> 33 <charset>UTF-8</charset>
51 -          
52 </encoder> 34 </encoder>
53 -     35 +
54 </appender> 36 </appender>
55 -      
56 <logger name="system_error" additivity="true"> 37 <logger name="system_error" additivity="true">
57 -          
58 <appender-ref ref="SYSTEM_FILE"/> 38 <appender-ref ref="SYSTEM_FILE"/>
59 -      
60 </logger> 39 </logger>
61 40
62 -     <!-- 设置Spring&Hibernate日志输出级别 -->  
63 -     41 + <!-- 设置Spring&Hibernate日志输出级别 -->
64 <logger name="org.springframework" level="WARN"/> 42 <logger name="org.springframework" level="WARN"/>
65 -      
66 <logger name="org.mybatis" level="WARN"/> 43 <logger name="org.mybatis" level="WARN"/>
67 -      
68 <logger name="com.ibatis" level="DEBUG"/> 44 <logger name="com.ibatis" level="DEBUG"/>
69 -      
70 <logger name="com.ibatis.common.jdbc.SimpleDataSource" level="DEBUG"/> 45 <logger name="com.ibatis.common.jdbc.SimpleDataSource" level="DEBUG"/>
71 -      
72 <logger name="com.ibatis.common.jdbc.ScriptRunner" level="DEBUG"/> 46 <logger name="com.ibatis.common.jdbc.ScriptRunner" level="DEBUG"/>
73 -      
74 <logger name="com.ibatis.sqlmap.engine.impl.SqlMapClientDelegate" level="DEBUG"/> 47 <logger name="com.ibatis.sqlmap.engine.impl.SqlMapClientDelegate" level="DEBUG"/>
75 48
76 -  
77 -      
78 <logger name="java.sql.Connection" level="DEBUG"/> 49 <logger name="java.sql.Connection" level="DEBUG"/>
79 -      
80 <logger name="java.sql.Statement" level="DEBUG"/> 50 <logger name="java.sql.Statement" level="DEBUG"/>
81 -      
82 <logger name="java.sql.PreparedStatement" level="DEBUG"/> 51 <logger name="java.sql.PreparedStatement" level="DEBUG"/>
83 -      
84 <logger name="com.sincere.smartSearch.mapper" level="DEBUG"/> 52 <logger name="com.sincere.smartSearch.mapper" level="DEBUG"/>
85 -     <!-- 开发环境下的日志配置 -->  
86 -     53 + <!-- 开发环境下的日志配置 -->
87 <root level="INFO"> 54 <root level="INFO">
88 -          
89 <appender-ref ref="CONSOLE"/> 55 <appender-ref ref="CONSOLE"/>
90 -          
91 <appender-ref ref="SYSTEM_FILE"/> 56 <appender-ref ref="SYSTEM_FILE"/>
92 -      
93 </root> 57 </root>
94 58
95 </configuration> 59 </configuration>