diff --git a/cloud/haikangface/src/main/java/com/sincere/haikangface/service/impl/UserOperateServiceImpl.java b/cloud/haikangface/src/main/java/com/sincere/haikangface/service/impl/UserOperateServiceImpl.java index 27a9966..165ef78 100644 --- a/cloud/haikangface/src/main/java/com/sincere/haikangface/service/impl/UserOperateServiceImpl.java +++ b/cloud/haikangface/src/main/java/com/sincere/haikangface/service/impl/UserOperateServiceImpl.java @@ -1015,7 +1015,8 @@ public class UserOperateServiceImpl implements UserOperateService { for(SendRecordBean s : students){ String cardNum = s.getNum(); StudentBean studentBean = userDao.getStudentWithCard(cardNum,schoolId.intValue()); - if(studentBean == null){ + StudentBean teacher = userDao.getTeacherWithCard(cardNum,schoolId.intValue()); + if(studentBean == null && teacher ==null){ deviceList.stream().forEach(c->{ boolean isOk = false; if (cmsServer.getIsDeviceOnline(c)) { diff --git a/cloud/pom.xml b/cloud/pom.xml index 60339c1..c394d46 100644 --- a/cloud/pom.xml +++ b/cloud/pom.xml @@ -31,17 +31,17 @@ common getaway - dahua + - haikangface + - mypulsar + quartz - zkAttendance + user_search fIle-center RibbonConsume diff --git a/cloud/quartz/src/main/java/com/sincere/quartz/third/yixueyun/YXYReadService.java b/cloud/quartz/src/main/java/com/sincere/quartz/third/yixueyun/YXYReadService.java index 532cfa3..1eb2b98 100644 --- a/cloud/quartz/src/main/java/com/sincere/quartz/third/yixueyun/YXYReadService.java +++ b/cloud/quartz/src/main/java/com/sincere/quartz/third/yixueyun/YXYReadService.java @@ -36,16 +36,21 @@ public class YXYReadService { private static int SI_CODE = 12345678 ; private static String nameSpace = "http://service.pubinfo.com.cn" ; - private static String getAllTeacher = "http://122.229.30.149:8282/DataSynService/GetTeacherInfo"; +// private static String getAllTeacher = "http://122.229.30.149:8282/DataSynService/GetTeacherInfo"; + private static String getAllTeacher = "http://dx.114school.com:8282/DataSynService/GetTeacherInfo"; private static String getAllTeacher_method = "getTeacherInfo" ; - private static String getAddTeacher = "http://122.229.30.149:8282/DataSynService/GetIncrementTeacherInfo" ; +// private static String getAddTeacher = "http://122.229.30.149:8282/DataSynService/GetIncrementTeacherInfo" ; + private static String getAddTeacher = "http://dx.114school.com:8282/DataSynService/GetIncrementTeacherInfo" ; private static String getAddTeacher_method = "getIncrementTeacherInfo" ; - private static String getAllStudent = "http://122.229.30.149:8282/DataSynService/GetStudentInfo" ; +// private static String getAllStudent = "http://122.229.30.149:8282/DataSynService/GetStudentInfo" ; + private static String getAllStudent = "http://dx.114school.com:8282/DataSynService/GetStudentInfo" ; private static String getALlStudent_method = "getStudentInfo"; - private static String getAddStudent = "http://122.229.30.149:8282/DataSynService/GetIncrementStudentInfo" ; +// private static String getAddStudent = "http://122.229.30.149:8282/DataSynService/GetIncrementStudentInfo" ; + private static String getAddStudent = "http://dx.114school.com:8282/DataSynService/GetIncrementStudentInfo" ; private static String getAddStudent_method = "getIncrementStudentInfo" ; - private static String getAllDept = "http://122.229.30.149:8282/DataSynService/GetDeptInfo" ; +// private static String getAllDept = "http://122.229.30.149:8282/DataSynService/GetDeptInfo" ; + private static String getAllDept = "http://dx.114school.com:8282/DataSynService/GetDeptInfo" ; private static String getALlDept_method = "getDeptInfo"; @Autowired @@ -112,13 +117,12 @@ public class YXYReadService { int count = yxyService.selectCount(today); logger.info("跑批总数:count: "+ count); if(count > number){ - logger.info("----哈哈哈,你终于来了----"); yxyService.deleteWeekBefore(); yxyService.updateAgency(); yxyService.updateStudent(); yxyService.updateTeacher(); + logger.info("----哈哈哈,删除完成----"); } - logger.info("----哈哈哈,删除完成----"); }catch (Exception e){ } diff --git a/cloud/quartz/src/main/resources/logback.xml b/cloud/quartz/src/main/resources/logback.xml index 800e8d5..80fff7c 100644 --- a/cloud/quartz/src/main/resources/logback.xml +++ b/cloud/quartz/src/main/resources/logback.xml @@ -1,95 +1,59 @@ -     -     + -     + -     -     - -         -         + + -             -             + [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] %highlight([%-5level] %logger{50} - %msg%n) -             UTF-8 -         -     -     -     + -         -         + -             -             + ${LOG_HOME}/${PROJECT_NAME}/%d{yyyy-MM-dd}.%i.log -             -             + 30 -             -             + 100MB -         -         -             -             + [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] [%-5level] %logger{50} - %msg%n -             UTF-8 -         -     + -     -         -     -     -     + -     -     -     -     -     - -     -     -     -     -     -     + -         -         -     -- libgit2 0.21.0