From e7154f2beb48a1e8d49d3c4e6657958f2323c8a5 Mon Sep 17 00:00:00 2001 From: 陈杰 <504987307@qq.com> Date: Tue, 14 Apr 2020 08:55:03 +0800 Subject: [PATCH] 日志 --- cloud/quartz/src/main/java/com/sincere/quartz/job/SyncJob.java | 4 ++-- cloud/quartz/src/main/java/com/sincere/quartz/model/YxyStudent.java | 27 +++++++++++++++++++++++++++ cloud/quartz/src/main/java/com/sincere/quartz/third/yixueyun/YXYReadService.java | 3 +++ cloud/quartz/src/main/java/com/sincere/quartz/third/yixueyun/YXYResult.java | 3 +++ cloud/quartz/src/main/java/com/sincere/quartz/third/yixueyun/YXYWriteService.java | 40 ++++++++++++++++++++++++++-------------- cloud/quartz/src/main/resources/application.yaml | 2 +- cloud/quartz/src/main/resources/mapper/YxyMapper.xml | 4 ++-- cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/controller/AttendanceController.java | 2 +- cloud/search_smartCampus/src/main/resources/application.yml | 6 ++---- cloud/search_xiaoan/pom.xml | 2 +- cloud/search_xiaoan/src/main/resources/application.yml | 4 ++-- 11 files changed, 70 insertions(+), 27 deletions(-) diff --git a/cloud/quartz/src/main/java/com/sincere/quartz/job/SyncJob.java b/cloud/quartz/src/main/java/com/sincere/quartz/job/SyncJob.java index a71218a..d841272 100644 --- a/cloud/quartz/src/main/java/com/sincere/quartz/job/SyncJob.java +++ b/cloud/quartz/src/main/java/com/sincere/quartz/job/SyncJob.java @@ -20,10 +20,10 @@ public class SyncJob { @Autowired YXYReadService yxyReadService ; - @Scheduled(cron = "0 0 22 * * ?") + @Scheduled(cron = "0 0 22 * * ? ") public void Sync(){ //翼校通的同步 之后还有钉钉的同步等等 - yxyWriteService.sync(); yxyReadService.sync(); + yxyWriteService.sync(); } } diff --git a/cloud/quartz/src/main/java/com/sincere/quartz/model/YxyStudent.java b/cloud/quartz/src/main/java/com/sincere/quartz/model/YxyStudent.java index d61ab7d..280fe3e 100644 --- a/cloud/quartz/src/main/java/com/sincere/quartz/model/YxyStudent.java +++ b/cloud/quartz/src/main/java/com/sincere/quartz/model/YxyStudent.java @@ -6,6 +6,33 @@ public class YxyStudent { private String classId ; private String name ; private String account ; + private String cardID ; + private String cardID2; + private String cardID3 ; + + public String getCardID() { + return cardID; + } + + public void setCardID(String cardID) { + this.cardID = cardID; + } + + public String getCardID2() { + return cardID2; + } + + public void setCardID2(String cardID2) { + this.cardID2 = cardID2; + } + + public String getCardID3() { + return cardID3; + } + + public void setCardID3(String cardID3) { + this.cardID3 = cardID3; + } public String getUserId() { return userId; 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 858418a..0464f78 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 @@ -138,6 +138,9 @@ public class YXYReadService { student.setAccount(object.get("account").toString()); student.setName(object.get("name").toString()); student.setUserId(object.get("userID").toString()); + student.setCardID(object.get("cardID").toString()); + student.setCardID2(object.get("cardID2").toString()); + student.setCardID3(object.get("cardID3").toString()); }catch (Exception e){ } yxyService.insertStudent(student); diff --git a/cloud/quartz/src/main/java/com/sincere/quartz/third/yixueyun/YXYResult.java b/cloud/quartz/src/main/java/com/sincere/quartz/third/yixueyun/YXYResult.java index 556b8a6..6570050 100644 --- a/cloud/quartz/src/main/java/com/sincere/quartz/third/yixueyun/YXYResult.java +++ b/cloud/quartz/src/main/java/com/sincere/quartz/third/yixueyun/YXYResult.java @@ -16,6 +16,9 @@ public class YXYResult implements Serializable { private int pass ; private List data ; + public YXYResult() { + this.code = -1 ; + } public int getCode() { return code; diff --git a/cloud/quartz/src/main/java/com/sincere/quartz/third/yixueyun/YXYWriteService.java b/cloud/quartz/src/main/java/com/sincere/quartz/third/yixueyun/YXYWriteService.java index dde373b..b7190c6 100644 --- a/cloud/quartz/src/main/java/com/sincere/quartz/third/yixueyun/YXYWriteService.java +++ b/cloud/quartz/src/main/java/com/sincere/quartz/third/yixueyun/YXYWriteService.java @@ -51,19 +51,23 @@ public class YXYWriteService { ScFeign scFeign ; public void sync(){ - //查出要同步的学校 - logger.info("开始同步翼学云数据==========="); - List schoolList = scFeign.selectSyncSchool(); - for(SyncSchoolDto school : schoolList){ - logger.info("学校"+school.getSchoolName()); - if(school.getPush() == 0){ - //同步课程 - syncSubject(school); - } - List deptList = scFeign.selectDept(school.getSchoolId()); - syncDept(school,deptList); - List userList = scFeign.selectUser(school.getSchoolId()); - syncUser(school,userList); + try{ + //查出要同步的学校 + logger.info("开始同步翼学云数据==========="); + List schoolList = scFeign.selectSyncSchool(); + for(SyncSchoolDto school : schoolList){ + logger.info("学校"+school.getSchoolName()); + if(school.getPush() == 0){ + //同步课程 + syncSubject(school); + } + List deptList = scFeign.selectDept(school.getSchoolId()); + syncDept(school,deptList); + List userList = scFeign.selectUser(school.getSchoolId()); + syncUser(school,userList); + } + }catch (Exception e){ + } } @@ -705,9 +709,17 @@ public class YXYWriteService { private YXYResult getResult(String url , String json){ YXYResult result = invokeApi(url,TOKEN,json); - if(result.getCode() == 2){ + if(result == null){ TOKEN = getToken(); result = invokeApi(url,TOKEN,json); + }else { + if (result.getCode() == 2) { + TOKEN = getToken(); + result = invokeApi(url, TOKEN, json); + } + } + if(result == null){ + result = new YXYResult(); } return result ; } diff --git a/cloud/quartz/src/main/resources/application.yaml b/cloud/quartz/src/main/resources/application.yaml index ee92214..bcfc2ba 100644 --- a/cloud/quartz/src/main/resources/application.yaml +++ b/cloud/quartz/src/main/resources/application.yaml @@ -39,5 +39,5 @@ eureka: lease-renewal-interval-in-seconds: 10 client: service-url: - defaultZone: http://localhost:8761/eureka/,http://localhost:8762/eureka/ + defaultZone: http://121.40.109.21:8761/eureka/,http://121.40.109.21:8762/eureka/ diff --git a/cloud/quartz/src/main/resources/mapper/YxyMapper.xml b/cloud/quartz/src/main/resources/mapper/YxyMapper.xml index 5f310f9..e1ab6e7 100644 --- a/cloud/quartz/src/main/resources/mapper/YxyMapper.xml +++ b/cloud/quartz/src/main/resources/mapper/YxyMapper.xml @@ -26,7 +26,7 @@ - insert into Student(userID , account , name , classID , intime , state , isCard , isEquipment , card_crafts) - values (#{userId} , #{account} , #{name} , #{classId} , GETDATE() , 1 ,0,0,2) + insert into Student(userID , account , name , classID , intime , state , isCard , isEquipment , card_crafts,cardID,cardid2,cardid3) + values (#{userId} , #{account} , #{name} , #{classId} , GETDATE() , 1 ,0,0,2,#{cardID},#{cardID2},#{cardID3}) diff --git a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/controller/AttendanceController.java b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/controller/AttendanceController.java index 5549d24..6fcf751 100644 --- a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/controller/AttendanceController.java +++ b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/controller/AttendanceController.java @@ -34,7 +34,7 @@ public class AttendanceController { attendacenService.updateAttendance(attendance.getClint_id()); }else { attendanceDto.setState(1); - attendanceDto.setSchool_id("0"); + attendanceDto.setSchool_id("-1"); try { attendanceDto.setIntime(DateUtils.getToday(DateUtils.format2)); }catch (Exception e){ diff --git a/cloud/search_smartCampus/src/main/resources/application.yml b/cloud/search_smartCampus/src/main/resources/application.yml index ad5513a..9662302 100644 --- a/cloud/search_smartCampus/src/main/resources/application.yml +++ b/cloud/search_smartCampus/src/main/resources/application.yml @@ -21,16 +21,14 @@ mybatis: type-aliases-package: com.sincere.smartSearch.mapper check-config-location: true - - eureka: instance: - hostname: localhost + hostname: 121.40.109.21 lease-expiration-duration-in-seconds: 60 lease-renewal-interval-in-seconds: 10 client: service-url: # defaultZone: http://localhost:8761/eureka/,http://localhost:8762/eureka/ - defaultZone: http://localhost:8761/eureka/,http://localhost:8762/eureka/ + defaultZone: http://121.40.109.21:8761/eureka/,http://121.40.109.21:8762/eureka/ diff --git a/cloud/search_xiaoan/pom.xml b/cloud/search_xiaoan/pom.xml index 31cbcbd..e6c158d 100644 --- a/cloud/search_xiaoan/pom.xml +++ b/cloud/search_xiaoan/pom.xml @@ -157,7 +157,7 @@ - com.jevon.Application + com.sincere.xiaoanSearch.XiaoanSearchApplication true lib/ diff --git a/cloud/search_xiaoan/src/main/resources/application.yml b/cloud/search_xiaoan/src/main/resources/application.yml index ef664c4..422d496 100644 --- a/cloud/search_xiaoan/src/main/resources/application.yml +++ b/cloud/search_xiaoan/src/main/resources/application.yml @@ -19,12 +19,12 @@ mybatis: eureka: instance: - hostname: localhost + hostname: 121.40.30.78 lease-expiration-duration-in-seconds: 60 lease-renewal-interval-in-seconds: 10 client: service-url: - defaultZone: http://localhost:8761/eureka/,http://localhost:8762/eureka/ + defaultZone: http://121.40.109.21:8761/eureka/,http://121.40.109.21:8762/eureka/ -- libgit2 0.21.0