From eb6f1ade97f5862e0407062686fec94487801518 Mon Sep 17 00:00:00 2001
From: 陈杰 <504987307@qq.com>
Date: Tue, 18 Aug 2020 14:24:59 +0800
Subject: [PATCH] tongbu

---
 cloud/quartz/src/main/java/com/sincere/quartz/controller/YxyController.java         |  5 -----
 cloud/quartz/src/main/java/com/sincere/quartz/third/yixueyun/YXYAddReadService.java | 92 ++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------
 2 files changed, 46 insertions(+), 51 deletions(-)

diff --git a/cloud/quartz/src/main/java/com/sincere/quartz/controller/YxyController.java b/cloud/quartz/src/main/java/com/sincere/quartz/controller/YxyController.java
index 3607463..1560dd7 100644
--- a/cloud/quartz/src/main/java/com/sincere/quartz/controller/YxyController.java
+++ b/cloud/quartz/src/main/java/com/sincere/quartz/controller/YxyController.java
@@ -37,11 +37,6 @@ public class YxyController {
     @Autowired
     YxyService yxyService ;
 
-    @ApiOperation(value = "test")
-    @RequestMapping(value = "test",method = RequestMethod.GET)
-    public void test(){
-        addReadService.sync();
-    }
 
     @ApiOperation(value = "syncTeacher")
     @RequestMapping(value = "syncTeacher",method = RequestMethod.GET)
diff --git a/cloud/quartz/src/main/java/com/sincere/quartz/third/yixueyun/YXYAddReadService.java b/cloud/quartz/src/main/java/com/sincere/quartz/third/yixueyun/YXYAddReadService.java
index 3f93edb..476b64d 100644
--- a/cloud/quartz/src/main/java/com/sincere/quartz/third/yixueyun/YXYAddReadService.java
+++ b/cloud/quartz/src/main/java/com/sincere/quartz/third/yixueyun/YXYAddReadService.java
@@ -64,8 +64,7 @@ public class YXYAddReadService {
     }
 
     public void syncSchool(String yxtId , int hxyId){
-        List<YxyStudent> studentList = new ArrayList<>(); //syncStudent(yxtId);
-        List<YxyTeacher> teacherList = syncTeacher(yxtId);
+        List<YxyStudent> studentList = syncStudent(yxtId);
         logger.info("学生同步");
         for(YxyStudent student : studentList){
             logger.info(student.toString());
@@ -122,46 +121,47 @@ public class YXYAddReadService {
                 //删除  暂不操作
             }
         }
-        logger.info("教师同步");
-        for(YxyTeacher teacher : teacherList){
-            logger.info(teacher.toString());
-            if(teacher.getType() == 0){
-                //新增
-                try{
-                    AddTeacherDto addTeacherDto = new AddTeacherDto();
-                    addTeacherDto.setAppId(0);
-                    addTeacherDto.setUserId("");
-                    addTeacherDto.setSchoolId(hxyId);
-                    addTeacherDto.setXml(initAddTeacherXML(teacher.getName(),teacher.getAccount()));
-                    yxyService.addTeacher(addTeacherDto);
-                    logger.info("操作结果："+addTeacherDto.getErr());
-                }catch (Exception e){
-                    logger.info("操作结果失败："+e.toString());
-                }
-            }
-            if(teacher.getType() == 2){
-                //修改
-                try{
-                    EditTeacherDto editTeacherDto = new EditTeacherDto();
-                    editTeacherDto.setAppId(0);
-                    editTeacherDto.setUserId("");
-                    List<TeacherView> list = yxyService.getTeacherView(hxyId,teacher.getName());
-                    if(list != null && list.size() == 1){
-                        editTeacherDto.setXml(initEditTeacherXML(teacher.getName(),teacher.getAccount(),hxyId,list.get(0).getTeacherId()));
-                        yxyService.editTeacher(editTeacherDto);
-                        logger.info("操作结果："+editTeacherDto.getErr());
-                    }else {
-                        throw new Exception("同一个班级同一姓名返回数据两条");
-                    }
-
-                }catch (Exception e){
-                    logger.info("操作结果失败："+e.toString());
-                }
-            }
-            if(teacher.getType() == 3){
-                //删除  暂不操作
-            }
-        }
+//        List<YxyTeacher> teacherList = syncTeacher(yxtId);
+//        logger.info("教师同步");
+//        for(YxyTeacher teacher : teacherList){
+//            logger.info(teacher.toString());
+//            if(teacher.getType() == 1){
+//                //新增
+//                try{
+//                    AddTeacherDto addTeacherDto = new AddTeacherDto();
+//                    addTeacherDto.setAppId(0);
+//                    addTeacherDto.setUserId("");
+//                    addTeacherDto.setSchoolId(hxyId);
+//                    addTeacherDto.setXml(initAddTeacherXML(teacher.getName(),teacher.getAccount()));
+//                    yxyService.addTeacher(addTeacherDto);
+//                    logger.info("操作结果："+addTeacherDto.getErr());
+//                }catch (Exception e){
+//                    logger.info("操作结果失败："+e.toString());
+//                }
+//            }
+//            if(teacher.getType() == 2){
+//                //修改
+//                try{
+//                    EditTeacherDto editTeacherDto = new EditTeacherDto();
+//                    editTeacherDto.setAppId(0);
+//                    editTeacherDto.setUserId("");
+//                    List<TeacherView> list = yxyService.getTeacherView(hxyId,teacher.getName());
+//                    if(list != null && list.size() == 1){
+//                        editTeacherDto.setXml(initEditTeacherXML(teacher.getName(),teacher.getAccount(),hxyId,list.get(0).getTeacherId(),list.get(0).getUserId()));
+//                        yxyService.editTeacher(editTeacherDto);
+//                        logger.info("操作结果："+editTeacherDto.getErr());
+//                    }else {
+//                        throw new Exception("同一个学校同一个老师返回数据两条");
+//                    }
+//
+//                }catch (Exception e){
+//                    logger.info("操作结果失败："+e.toString());
+//                }
+//            }
+//            if(teacher.getType() == 3){
+//                //删除  暂不操作
+//            }
+//        }
     }
 
     private String initAddStudentXML(String name , int classId , int gradeId , String phone , String userId){
@@ -247,10 +247,10 @@ public class YXYAddReadService {
         return xml ;
     }
 
-    private String initEditTeacherXML(String name , String phone , int schoolId , int teacherId){
+    private String initEditTeacherXML(String name , String phone , int schoolId , int teacherId , String userId){
         String xml = "<region>" +
                 "<school_id>"+schoolId+"</school_id>" +
-                "<user_id></user_id>" +
+                "<user_id>"+userId+"</user_id>" +
                 "<name>"+name+"</name>" +
                 "<id_card></id_card>" +
                 "<pass></pass>" +
@@ -278,9 +278,9 @@ public class YXYAddReadService {
             list.add(SI);
             list.add(getPassword(SI_CODE));
             list.add(schoolId);
-            String wsdl =getAddStudent ;
+            String wsdl =getAllStudent ;
             String ns = nameSpace;
-            String method = getAddStudent_method;
+            String method = getALlStudent_method;
             JSONArray jsonArray = getMessage(wsdl, ns, method, list);
             if(jsonArray != null){
                 for(int i = 0 ; i < jsonArray.size() ; i++){
--
libgit2 0.21.0