Commit eb6f1ade97f5862e0407062686fec94487801518
1 parent
2675577c
Exists in
master
tongbu
Showing
2 changed files
with
46 additions
and
51 deletions
Show diff stats
cloud/quartz/src/main/java/com/sincere/quartz/controller/YxyController.java
| @@ -37,11 +37,6 @@ public class YxyController { | @@ -37,11 +37,6 @@ public class YxyController { | ||
| 37 | @Autowired | 37 | @Autowired |
| 38 | YxyService yxyService ; | 38 | YxyService yxyService ; |
| 39 | 39 | ||
| 40 | - @ApiOperation(value = "test") | ||
| 41 | - @RequestMapping(value = "test",method = RequestMethod.GET) | ||
| 42 | - public void test(){ | ||
| 43 | - addReadService.sync(); | ||
| 44 | - } | ||
| 45 | 40 | ||
| 46 | @ApiOperation(value = "syncTeacher") | 41 | @ApiOperation(value = "syncTeacher") |
| 47 | @RequestMapping(value = "syncTeacher",method = RequestMethod.GET) | 42 | @RequestMapping(value = "syncTeacher",method = RequestMethod.GET) |
cloud/quartz/src/main/java/com/sincere/quartz/third/yixueyun/YXYAddReadService.java
| @@ -64,8 +64,7 @@ public class YXYAddReadService { | @@ -64,8 +64,7 @@ public class YXYAddReadService { | ||
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | public void syncSchool(String yxtId , int hxyId){ | 66 | public void syncSchool(String yxtId , int hxyId){ |
| 67 | - List<YxyStudent> studentList = new ArrayList<>(); //syncStudent(yxtId); | ||
| 68 | - List<YxyTeacher> teacherList = syncTeacher(yxtId); | 67 | + List<YxyStudent> studentList = syncStudent(yxtId); |
| 69 | logger.info("学生同步"); | 68 | logger.info("学生同步"); |
| 70 | for(YxyStudent student : studentList){ | 69 | for(YxyStudent student : studentList){ |
| 71 | logger.info(student.toString()); | 70 | logger.info(student.toString()); |
| @@ -122,46 +121,47 @@ public class YXYAddReadService { | @@ -122,46 +121,47 @@ public class YXYAddReadService { | ||
| 122 | //删除 暂不操作 | 121 | //删除 暂不操作 |
| 123 | } | 122 | } |
| 124 | } | 123 | } |
| 125 | - logger.info("教师同步"); | ||
| 126 | - for(YxyTeacher teacher : teacherList){ | ||
| 127 | - logger.info(teacher.toString()); | ||
| 128 | - if(teacher.getType() == 0){ | ||
| 129 | - //新增 | ||
| 130 | - try{ | ||
| 131 | - AddTeacherDto addTeacherDto = new AddTeacherDto(); | ||
| 132 | - addTeacherDto.setAppId(0); | ||
| 133 | - addTeacherDto.setUserId(""); | ||
| 134 | - addTeacherDto.setSchoolId(hxyId); | ||
| 135 | - addTeacherDto.setXml(initAddTeacherXML(teacher.getName(),teacher.getAccount())); | ||
| 136 | - yxyService.addTeacher(addTeacherDto); | ||
| 137 | - logger.info("操作结果："+addTeacherDto.getErr()); | ||
| 138 | - }catch (Exception e){ | ||
| 139 | - logger.info("操作结果失败："+e.toString()); | ||
| 140 | - } | ||
| 141 | - } | ||
| 142 | - if(teacher.getType() == 2){ | ||
| 143 | - //修改 | ||
| 144 | - try{ | ||
| 145 | - EditTeacherDto editTeacherDto = new EditTeacherDto(); | ||
| 146 | - editTeacherDto.setAppId(0); | ||
| 147 | - editTeacherDto.setUserId(""); | ||
| 148 | - List<TeacherView> list = yxyService.getTeacherView(hxyId,teacher.getName()); | ||
| 149 | - if(list != null && list.size() == 1){ | ||
| 150 | - editTeacherDto.setXml(initEditTeacherXML(teacher.getName(),teacher.getAccount(),hxyId,list.get(0).getTeacherId())); | ||
| 151 | - yxyService.editTeacher(editTeacherDto); | ||
| 152 | - logger.info("操作结果："+editTeacherDto.getErr()); | ||
| 153 | - }else { | ||
| 154 | - throw new Exception("同一个班级同一姓名返回数据两条"); | ||
| 155 | - } | ||
| 156 | - | ||
| 157 | - }catch (Exception e){ | ||
| 158 | - logger.info("操作结果失败："+e.toString()); | ||
| 159 | - } | ||
| 160 | - } | ||
| 161 | - if(teacher.getType() == 3){ | ||
| 162 | - //删除 暂不操作 | ||
| 163 | - } | ||
| 164 | - } | 124 | +// List<YxyTeacher> teacherList = syncTeacher(yxtId); |
| 125 | +// logger.info("教师同步"); | ||
| 126 | +// for(YxyTeacher teacher : teacherList){ | ||
| 127 | +// logger.info(teacher.toString()); | ||
| 128 | +// if(teacher.getType() == 1){ | ||
| 129 | +// //新增 | ||
| 130 | +// try{ | ||
| 131 | +// AddTeacherDto addTeacherDto = new AddTeacherDto(); | ||
| 132 | +// addTeacherDto.setAppId(0); | ||
| 133 | +// addTeacherDto.setUserId(""); | ||
| 134 | +// addTeacherDto.setSchoolId(hxyId); | ||
| 135 | +// addTeacherDto.setXml(initAddTeacherXML(teacher.getName(),teacher.getAccount())); | ||
| 136 | +// yxyService.addTeacher(addTeacherDto); | ||
| 137 | +// logger.info("操作结果："+addTeacherDto.getErr()); | ||
| 138 | +// }catch (Exception e){ | ||
| 139 | +// logger.info("操作结果失败："+e.toString()); | ||
| 140 | +// } | ||
| 141 | +// } | ||
| 142 | +// if(teacher.getType() == 2){ | ||
| 143 | +// //修改 | ||
| 144 | +// try{ | ||
| 145 | +// EditTeacherDto editTeacherDto = new EditTeacherDto(); | ||
| 146 | +// editTeacherDto.setAppId(0); | ||
| 147 | +// editTeacherDto.setUserId(""); | ||
| 148 | +// List<TeacherView> list = yxyService.getTeacherView(hxyId,teacher.getName()); | ||
| 149 | +// if(list != null && list.size() == 1){ | ||
| 150 | +// editTeacherDto.setXml(initEditTeacherXML(teacher.getName(),teacher.getAccount(),hxyId,list.get(0).getTeacherId(),list.get(0).getUserId())); | ||
| 151 | +// yxyService.editTeacher(editTeacherDto); | ||
| 152 | +// logger.info("操作结果："+editTeacherDto.getErr()); | ||
| 153 | +// }else { | ||
| 154 | +// throw new Exception("同一个学校同一个老师返回数据两条"); | ||
| 155 | +// } | ||
| 156 | +// | ||
| 157 | +// }catch (Exception e){ | ||
| 158 | +// logger.info("操作结果失败："+e.toString()); | ||
| 159 | +// } | ||
| 160 | +// } | ||
| 161 | +// if(teacher.getType() == 3){ | ||
| 162 | +// //删除 暂不操作 | ||
| 163 | +// } | ||
| 164 | +// } | ||
| 165 | } | 165 | } |
| 166 | 166 | ||
| 167 | private String initAddStudentXML(String name , int classId , int gradeId , String phone , String userId){ | 167 | private String initAddStudentXML(String name , int classId , int gradeId , String phone , String userId){ |
| @@ -247,10 +247,10 @@ public class YXYAddReadService { | @@ -247,10 +247,10 @@ public class YXYAddReadService { | ||
| 247 | return xml ; | 247 | return xml ; |
| 248 | } | 248 | } |
| 249 | 249 | ||
| 250 | - private String initEditTeacherXML(String name , String phone , int schoolId , int teacherId){ | 250 | + private String initEditTeacherXML(String name , String phone , int schoolId , int teacherId , String userId){ |
| 251 | String xml = "<region>" + | 251 | String xml = "<region>" + |
| 252 | "<school_id>"+schoolId+"</school_id>" + | 252 | "<school_id>"+schoolId+"</school_id>" + |
| 253 | - "<user_id></user_id>" + | 253 | + "<user_id>"+userId+"</user_id>" + |
| 254 | "<name>"+name+"</name>" + | 254 | "<name>"+name+"</name>" + |
| 255 | "<id_card></id_card>" + | 255 | "<id_card></id_card>" + |
| 256 | "<pass></pass>" + | 256 | "<pass></pass>" + |
| @@ -278,9 +278,9 @@ public class YXYAddReadService { | @@ -278,9 +278,9 @@ public class YXYAddReadService { | ||
| 278 | list.add(SI); | 278 | list.add(SI); |
| 279 | list.add(getPassword(SI_CODE)); | 279 | list.add(getPassword(SI_CODE)); |
| 280 | list.add(schoolId); | 280 | list.add(schoolId); |
| 281 | - String wsdl =getAddStudent ; | 281 | + String wsdl =getAllStudent ; |
| 282 | String ns = nameSpace; | 282 | String ns = nameSpace; |
| 283 | - String method = getAddStudent_method; | 283 | + String method = getALlStudent_method; |
| 284 | JSONArray jsonArray = getMessage(wsdl, ns, method, list); | 284 | JSONArray jsonArray = getMessage(wsdl, ns, method, list); |
| 285 | if(jsonArray != null){ | 285 | if(jsonArray != null){ |
| 286 | for(int i = 0 ; i < jsonArray.size() ; i++){ | 286 | for(int i = 0 ; i < jsonArray.size() ; i++){ |