From 594c88924d23f6e5d635f128763a0f7355129a8c Mon Sep 17 00:00:00 2001 From: 15976874561 <2553956742@qq.com> Date: Wed, 24 Dec 2025 12:57:23 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=95=99=E8=81=8C=E5=B7=A5=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../comprehensive/SyncDataController.java | 4 +- .../service/impl/CphTeacherServiceImpl.java | 16 +++++-- .../srs/system/mapper/QgzxTeacherMapper.java | 2 +- .../mapper/system/QgzxTeacherMapper.xml | 42 ++++++++++++++++++- 4 files changed, 56 insertions(+), 8 deletions(-) diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java index a1b1702..2657ff3 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java @@ -17,9 +17,9 @@ import java.util.Map; @RequestMapping("/syncdata") public class SyncDataController extends BaseController { @Autowired - private SyncDataService syncDataService; + SyncDataService syncDataService; @Autowired - private ICphTeacherService iCphTeacherService; + ICphTeacherService iCphTeacherService; @RequestMapping("/getEmployEEInfoList") public TableDataInfo getEmployEEInfoList(){ startPage(); diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java index 98e98d5..334f9cb 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java @@ -464,6 +464,8 @@ public class CphTeacherServiceImpl implements ICphTeacherService @Override @Transactional(rollbackFor = Exception.class) public void sqlserverSynchronousMYSQL(List list) { + List insertTeacherList = new ArrayList<>();//添加集合 + List updateTeacherList = new ArrayList<>();//修改集合 for (Map map : list) { String zgh = (String) map.get("zgh"); String xm=(String) map.get("xm"); @@ -482,13 +484,21 @@ public class CphTeacherServiceImpl implements ICphTeacherService entity.setStatus(zgzt); entity.setCreateTime(DateUtils.getNowDate()); if(qgzxTeacher==null){ - qgzxTeacherMapper.insertQgzxTeacher(entity); + //qgzxTeacherMapper.insertQgzxTeacher(entity); + insertTeacherList.add(entity); }else{ entity.setEmployeeId(zgh); - qgzxTeacherMapper.updateQgzxTeacherNew(entity); + entity.setUpdateTime(DateUtils.getNowDate()); + //qgzxTeacherMapper.updateQgzxTeacherNew(entity); + updateTeacherList.add(entity); } } - + if(insertTeacherList.size()!=0){ + qgzxTeacherMapper.insertBatchSomeColumn(insertTeacherList); + } + if(updateTeacherList.size()!=0){ + qgzxTeacherMapper.updateBatchSomeColumn(updateTeacherList); + } } //同步到用户表 diff --git a/srs-system/src/main/java/com/srs/system/mapper/QgzxTeacherMapper.java b/srs-system/src/main/java/com/srs/system/mapper/QgzxTeacherMapper.java index 75680b4..1fd61f4 100644 --- a/srs-system/src/main/java/com/srs/system/mapper/QgzxTeacherMapper.java +++ b/srs-system/src/main/java/com/srs/system/mapper/QgzxTeacherMapper.java @@ -46,7 +46,6 @@ public interface QgzxTeacherMapper extends BaseMapper { */ int updateQgzxTeacher(QgzxTeacher qgzxTeacher); int updateQgzxTeacherNew(QgzxTeacher qgzxTeacher); - /** * 删除教职工信息 * @@ -66,4 +65,5 @@ public interface QgzxTeacherMapper extends BaseMapper { public List selectTeacherList(); Long selectDeptCode(String ksh); Integer insertBatchSomeColumn(@Param("list")List entityList); + Integer updateBatchSomeColumn(@Param("list")List entityList); } diff --git a/srs-system/src/main/resources/mapper/system/QgzxTeacherMapper.xml b/srs-system/src/main/resources/mapper/system/QgzxTeacherMapper.xml index 7da8eb0..0a82f50 100644 --- a/srs-system/src/main/resources/mapper/system/QgzxTeacherMapper.xml +++ b/srs-system/src/main/resources/mapper/system/QgzxTeacherMapper.xml @@ -76,10 +76,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, - + insert into qgzx_teacher(name,gender,age,employee_id,dept_id,status,create_time) values - + ( #{entity.name}, #{entity.gender}, @@ -122,6 +122,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where employee_id = #{employeeId} + + UPDATE qgzx_teacher + + + name = CASE + + WHEN employee_id = #{item.employeeId} THEN #{item.name} + + END, + + gender = CASE + + WHEN employee_id = #{item.employeeId} THEN #{item.gender} + + END, + + dept_id = CASE + + WHEN employee_id = #{item.employeeId} THEN #{item.deptId} + + END, + status = CASE + + WHEN employee_id = #{item.employeeId} THEN #{item.status} + + END, + update_time = CASE + + WHEN employee_id = #{item.employeeId} THEN #{item.updateTime} + + END + + + WHERE employee_id IN + + #{item.employeeId} + + delete from qgzx_teacher where teacher_id = #{teacherId} From 6cfbb502daff125deec5896e70b6b5dc21252673 Mon Sep 17 00:00:00 2001 From: 15976874561 <2553956742@qq.com> Date: Wed, 24 Dec 2025 16:40:01 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=B8=AD=E9=97=B4=E8=A1=A8=E6=95=99?= =?UTF-8?q?=E8=81=8C=E5=B7=A5=E8=A1=A8=E7=8A=B6=E6=80=81=E6=98=AF=E9=9D=9E?= =?UTF-8?q?=E5=9C=A8=E8=81=8C=E6=88=96=E8=BF=94=E8=81=98=E7=9A=84=E8=81=8C?= =?UTF-8?q?=E5=B7=A5=E7=A6=81=E6=AD=A2=E7=99=BB=E5=BD=95=E5=AD=A6=E5=B7=A5?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CphSqlServerDataController.java | 9 -- .../comprehensive/SyncDataController.java | 2 +- .../service/impl/CphTeacherServiceImpl.java | 85 ++++++++++++++++--- .../mapper/system/QgzxTeacherMapper.xml | 17 ++-- .../resources/mapper/system/SysUserMapper.xml | 25 ++++-- 5 files changed, 99 insertions(+), 39 deletions(-) diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java index 6fa8f57..815a5c8 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java @@ -152,15 +152,6 @@ public class CphSqlServerDataController extends BaseController { return success(list); } -// //同步辅导员 -// @RequestMapping("/synchronousEmployEEInfoList") -// public AjaxResult synchronousEmployEEInfoList(){ -// //startPage(); -// List list=sqlServerDataService.getEmployEEInfoList(); -// iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步辅导员 -// iCphTeacherService.Usertb(); -// return success(); -// } //同步教职工 @RequestMapping("/synchronousEmployEEInfoList") public AjaxResult synchronousEmployEEInfoList(){ diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java index 2657ff3..73b16d4 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java @@ -31,7 +31,7 @@ public class SyncDataController extends BaseController { public AjaxResult synchronousEmployEEInfoList(){ List list=syncDataService.getEmployEEInfoList(); iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步教职工 - //iCphTeacherService.Usertb(); + iCphTeacherService.Usertb(); return success(); } } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java index 334f9cb..9e9b764 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java @@ -501,23 +501,80 @@ public class CphTeacherServiceImpl implements ICphTeacherService } } +// //同步到用户表 +// @Override +// @Transactional(rollbackFor = Exception.class) +// public void Usertb(){ +// //同步到user表 +// List cphTeachers = cphTeacherMapper.selectTeacherList();//所有职工 +// List sysUserList = sysUserMapper.selectUserLisrS();//所以用户 +// List insertUser = new ArrayList<>();//需要添加的集合 +// List updateUser = new ArrayList<>();//需要修改的集合 +// for (CphTeacher cphTeacher:cphTeachers){ +// int i=0;//添加标记 +// for (SysUser sysUser:sysUserList){ +// //修改 +// if (Objects.equals(cphTeacher.getEmployeeId(), sysUser.getUserName())){ +// SysUser sysUser1 = new SysUser(); +// sysUser1.setUserName(cphTeacher.getEmployeeId()); +// sysUser1.setDeptId(cphTeacher.getDeptId()); +// updateUser.add(sysUser1); +// i=0; +// break; +// } +// i=1; +// } +// //添加 +// if (i==1){ +// SysUser sysUser = new SysUser(); +// sysUser.setUserName(cphTeacher.getEmployeeId()); +// if (cphTeacher.getDeptId()!=null){ +// sysUser.setDeptId(cphTeacher.getDeptId()); +// } +// sysUser.setSex(Objects.equals(cphTeacher.getGender(), "男") ?"0":"1"); +// sysUser.setNickName(cphTeacher.getName()); +// sysUser.setPassword(SecurityUtils.encryptPassword("#A"+cphTeacher.getEmployeeId()+"A#")); +// insertUser.add(sysUser); +// +// } +// i=0; +// } +// if (insertUser.size()!=0){ +// sysUserMapper.insertUserListInfo(insertUser); +// insertUserrole(insertUser); +// } +// if (updateUser.size()!=0) { +// List> listList1 = ListSliceUtil.updateSlice(updateUser);//切割修改集合 +// if (listList1 != null) { +// for (List userList : listList1) { +// // sysUserMapper.updateUserListInfo(userList); +// } +// } +// } +// System.out.println(insertUser.size()); +// System.out.println(updateUser.size()); +// } + //同步到用户表 @Override @Transactional(rollbackFor = Exception.class) public void Usertb(){ //同步到user表 - List cphTeachers = cphTeacherMapper.selectTeacherList();//所有职工 + List qgzxTeachers = qgzxTeacherMapper.selectTeacherList();//所有职工 List sysUserList = sysUserMapper.selectUserLisrS();//所以用户 List insertUser = new ArrayList<>();//需要添加的集合 List updateUser = new ArrayList<>();//需要修改的集合 - for (CphTeacher cphTeacher:cphTeachers){ + for (QgzxTeacher qgzxTeacher:qgzxTeachers){ int i=0;//添加标记 for (SysUser sysUser:sysUserList){ //修改 - if (Objects.equals(cphTeacher.getEmployeeId(), sysUser.getUserName())){ + if (Objects.equals(qgzxTeacher.getEmployeeId(), sysUser.getUserName())){ SysUser sysUser1 = new SysUser(); - sysUser1.setUserName(cphTeacher.getEmployeeId()); - sysUser1.setDeptId(cphTeacher.getDeptId()); + sysUser1.setUserName(qgzxTeacher.getEmployeeId()); + sysUser1.setDeptId(qgzxTeacher.getDeptId()); + if(!qgzxTeacher.getStatus().equals("11")&&!qgzxTeacher.getStatus().equals("4")){ + sysUser1.setStatus("1"); + } updateUser.add(sysUser1); i=0; break; @@ -527,13 +584,16 @@ public class CphTeacherServiceImpl implements ICphTeacherService //添加 if (i==1){ SysUser sysUser = new SysUser(); - sysUser.setUserName(cphTeacher.getEmployeeId()); - if (cphTeacher.getDeptId()!=null){ - sysUser.setDeptId(cphTeacher.getDeptId()); + sysUser.setUserName(qgzxTeacher.getEmployeeId()); + if (qgzxTeacher.getDeptId()!=null){ + sysUser.setDeptId(qgzxTeacher.getDeptId()); + } + sysUser.setSex(Objects.equals(qgzxTeacher.getGender(), "男") ?"0":"1"); + sysUser.setNickName(qgzxTeacher.getName()); + sysUser.setPassword(SecurityUtils.encryptPassword("#A"+qgzxTeacher.getEmployeeId()+"A#")); + if(!qgzxTeacher.getStatus().equals("11")&&!qgzxTeacher.getStatus().equals("4")){ + sysUser.setStatus("1"); } - sysUser.setSex(Objects.equals(cphTeacher.getGender(), "男") ?"0":"1"); - sysUser.setNickName(cphTeacher.getName()); - sysUser.setPassword(SecurityUtils.encryptPassword("#A"+cphTeacher.getEmployeeId()+"A#")); insertUser.add(sysUser); } @@ -547,7 +607,7 @@ public class CphTeacherServiceImpl implements ICphTeacherService List> listList1 = ListSliceUtil.updateSlice(updateUser);//切割修改集合 if (listList1 != null) { for (List userList : listList1) { - // sysUserMapper.updateUserListInfo(userList); + sysUserMapper.updateUserListInfo(userList); } } } @@ -555,6 +615,7 @@ public class CphTeacherServiceImpl implements ICphTeacherService System.out.println(updateUser.size()); } + public void insertUserrole(List insertUser){ List userRoleList=new ArrayList<>(); for (SysUser sysUser:insertUser){ diff --git a/srs-system/src/main/resources/mapper/system/QgzxTeacherMapper.xml b/srs-system/src/main/resources/mapper/system/QgzxTeacherMapper.xml index 0a82f50..ee2daa6 100644 --- a/srs-system/src/main/resources/mapper/system/QgzxTeacherMapper.xml +++ b/srs-system/src/main/resources/mapper/system/QgzxTeacherMapper.xml @@ -77,17 +77,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into qgzx_teacher(name,gender,age,employee_id,dept_id,status,create_time) + insert into qgzx_teacher(name,gender,employee_id,dept_id,status,create_time) values - + ( - #{entity.name}, - #{entity.gender}, - #{entity.age}, - #{entity.employeeId}, - #{entity.deptId}, - #{entity.status}, - #{entity.createTime}, + #{entity.name}, + #{entity.gender}, + #{entity.employeeId}, + #{entity.deptId}, + #{entity.status}, + #{entity.createTime} ) diff --git a/srs-system/src/main/resources/mapper/system/SysUserMapper.xml b/srs-system/src/main/resources/mapper/system/SysUserMapper.xml index cd9c5cc..2b756be 100644 --- a/srs-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/srs-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -291,19 +291,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" nick_name, sex, password, + status, create_time ) values ( - #{item.userName}, - #{item.deptId} - null, - #{item.nickName}, - #{item.sex} - "2", - #{item.password}, - sysdate()) + #{item.userName}, + #{item.deptId} + null, + #{item.nickName}, + #{item.sex} + '2', + #{item.password}, + #{item.status} + null, + sysdate() + ) @@ -335,6 +339,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" when user_name=#{i.userName} then sysdate() + + + when user_name=#{i.userName} then #{i.status} + + where user_name in From c19b0a5c60f936ebe0712d138761a5ef64d99214 Mon Sep 17 00:00:00 2001 From: 15976874561 <2553956742@qq.com> Date: Wed, 24 Dec 2025 17:32:08 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=B8=AD=E9=97=B4=E8=A1=A8=E6=95=99?= =?UTF-8?q?=E8=81=8C=E5=B7=A5=E8=A1=A8=E7=8A=B6=E6=80=81=E6=98=AF=E9=9D=9E?= =?UTF-8?q?=E5=9C=A8=E8=81=8C=E6=88=96=E8=BF=94=E8=81=98=E7=9A=84=E8=81=8C?= =?UTF-8?q?=E5=B7=A5=E7=A6=81=E6=AD=A2=E7=99=BB=E5=BD=95=E5=AD=A6=E5=B7=A5?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CphTeacherServiceImpl.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java index 9e9b764..4af48a0 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java @@ -572,7 +572,12 @@ public class CphTeacherServiceImpl implements ICphTeacherService SysUser sysUser1 = new SysUser(); sysUser1.setUserName(qgzxTeacher.getEmployeeId()); sysUser1.setDeptId(qgzxTeacher.getDeptId()); - if(!qgzxTeacher.getStatus().equals("11")&&!qgzxTeacher.getStatus().equals("4")){ + if(qgzxTeacher.getStatus().equals("11")){ + sysUser1.setStatus("0"); + } + else if (qgzxTeacher.getStatus().equals("4")){ + sysUser1.setStatus("0"); + }else { sysUser1.setStatus("1"); } updateUser.add(sysUser1); @@ -591,7 +596,12 @@ public class CphTeacherServiceImpl implements ICphTeacherService sysUser.setSex(Objects.equals(qgzxTeacher.getGender(), "男") ?"0":"1"); sysUser.setNickName(qgzxTeacher.getName()); sysUser.setPassword(SecurityUtils.encryptPassword("#A"+qgzxTeacher.getEmployeeId()+"A#")); - if(!qgzxTeacher.getStatus().equals("11")&&!qgzxTeacher.getStatus().equals("4")){ + if(qgzxTeacher.getStatus().equals("11")){ + sysUser.setStatus("0"); + } + else if (qgzxTeacher.getStatus().equals("4")){ + sysUser.setStatus("0"); + }else { sysUser.setStatus("1"); } insertUser.add(sysUser); From e13af56d7fcf3e3385cdd225bd6f0cdf319b2b61 Mon Sep 17 00:00:00 2001 From: 15976874561 <2553956742@qq.com> Date: Thu, 25 Dec 2025 11:35:36 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=93=E4=B8=9A?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/comprehensive/SyncDataController.java | 7 +++++++ .../java/com/srs/comprehensive/mapper/SyncDataMapper.java | 1 + .../com/srs/comprehensive/service/SyncDataService.java | 1 + .../comprehensive/service/impl/SyncDataServiceImpl.java | 6 ++++++ .../main/resources/mapper/comprehensive/SyncDataMapper.xml | 4 ++++ 5 files changed, 19 insertions(+) diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java index 73b16d4..87eb1fb 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java @@ -34,4 +34,11 @@ public class SyncDataController extends BaseController { iCphTeacherService.Usertb(); return success(); } + //专业 + @RequestMapping("/getSpecialtyInfoList") + public TableDataInfo getSpecialtyInfoList(){ + startPage(); + List list=syncDataService.getSpecialtyInfoList(); + return getDataTable(list); + } } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java index 72ad3d0..bac3c0b 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java @@ -5,4 +5,5 @@ import java.util.Map; public interface SyncDataMapper { public List getEmployEEInfoList();//教职工 + public List getSpecialtyInfoList();//专业 } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java index a128842..647db1f 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java @@ -5,4 +5,5 @@ import java.util.Map; public interface SyncDataService { List getEmployEEInfoList();//教职工 + List getSpecialtyInfoList();//专业 } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java index 13b6fdb..bafa633 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java @@ -1,5 +1,7 @@ package com.srs.comprehensive.service.impl; +import com.srs.common.annotation.DataSource; +import com.srs.common.enums.DataSourceType; import com.srs.comprehensive.mapper.SyncDataMapper; import com.srs.comprehensive.service.SyncDataService; import org.springframework.beans.factory.annotation.Autowired; @@ -16,4 +18,8 @@ public class SyncDataServiceImpl implements SyncDataService { public List getEmployEEInfoList() { return syncDataMapper.getEmployEEInfoList(); } + @Override + public List getSpecialtyInfoList() { + return syncDataMapper.getSpecialtyInfoList(); + } } diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml index 9980122..6526ad4 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml @@ -11,4 +11,8 @@ END as xb,TBD.BMMC as ksmc,TBD.BMMC as yxmc,TBD.BMBH as ksh,TBA.ZGDQZTDM as zgzt from from_gxsdxyxxzx_teacher TBA LEFT JOIN from_gxsdxyxxzx_xzbm TBD ON TBA.SZBMBH=TBD.BMBH WHERE TBA.ZGLBDM LIKE '1%' + From 83f0751f5a7ce7216bf2c231a96b5b2bdf01b63e Mon Sep 17 00:00:00 2001 From: 15976874561 <2553956742@qq.com> Date: Thu, 25 Dec 2025 17:35:15 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=93=E4=B8=9A?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/comprehensive/SyncDataController.java | 5 +++-- .../com/srs/comprehensive/mapper/SyncDataMapper.java | 2 +- .../com/srs/comprehensive/service/SyncDataService.java | 3 ++- .../comprehensive/service/impl/SyncDataServiceImpl.java | 5 +++-- .../resources/mapper/comprehensive/SyncDataMapper.xml | 9 ++++++--- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java index 87eb1fb..d90ae4d 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java @@ -7,6 +7,7 @@ import com.srs.comprehensive.service.ICphTeacherService; import com.srs.comprehensive.service.SyncDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -36,9 +37,9 @@ public class SyncDataController extends BaseController { } //专业 @RequestMapping("/getSpecialtyInfoList") - public TableDataInfo getSpecialtyInfoList(){ + public TableDataInfo getSpecialtyInfoList(String zydm){ startPage(); - List list=syncDataService.getSpecialtyInfoList(); + List list=syncDataService.getSpecialtyInfoList(zydm); return getDataTable(list); } } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java index bac3c0b..86ec885 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java @@ -5,5 +5,5 @@ import java.util.Map; public interface SyncDataMapper { public List getEmployEEInfoList();//教职工 - public List getSpecialtyInfoList();//专业 + public List getSpecialtyInfoList(String zydm);//专业 } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java index 647db1f..5c97eda 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java @@ -5,5 +5,6 @@ import java.util.Map; public interface SyncDataService { List getEmployEEInfoList();//教职工 - List getSpecialtyInfoList();//专业 + List getSpecialtyInfoList(String zydm);//专业 + } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java index bafa633..7e4cc15 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java @@ -19,7 +19,8 @@ public class SyncDataServiceImpl implements SyncDataService { return syncDataMapper.getEmployEEInfoList(); } @Override - public List getSpecialtyInfoList() { - return syncDataMapper.getSpecialtyInfoList(); + public List getSpecialtyInfoList(String zydm) { + return syncDataMapper.getSpecialtyInfoList(zydm); } + } diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml index 6526ad4..d0002f1 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml @@ -11,8 +11,11 @@ END as xb,TBD.BMMC as ksmc,TBD.BMMC as yxmc,TBD.BMBH as ksh,TBA.ZGDQZTDM as zgzt from from_gxsdxyxxzx_teacher TBA LEFT JOIN from_gxsdxyxxzx_xzbm TBD ON TBA.SZBMBH=TBD.BMBH WHERE TBA.ZGLBDM LIKE '1%' - select b.JXZYBH as zydm,b.JXZYJC as zyjc,b.JXZYMC as zymc,a.BMMC yxmc from from_gxsdxyxxzx_xzbm a left join from_gxsdxyxxzx_zyxx b on a.BMBH=b.JXZYSSYXBBH - where b.JXZYBH is not null - + + b.JXZYBH is not null + and b.JXZYBH=#{zydm} + + From b0159da137c0e8cda3b6fcd59678514ea77d0ea4 Mon Sep 17 00:00:00 2001 From: 15976874561 <2553956742@qq.com> Date: Thu, 25 Dec 2025 19:16:45 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=93=E4=B8=9A?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CphSqlServerDataController.java | 2 +- .../comprehensive/SyncDataController.java | 4 +- .../service/ICphTeacherService.java | 2 + .../service/impl/CphTeacherServiceImpl.java | 320 +++++++++--------- 4 files changed, 165 insertions(+), 163 deletions(-) diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java index 815a5c8..e43ae21 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java @@ -152,7 +152,7 @@ public class CphSqlServerDataController extends BaseController { return success(list); } - //同步教职工 + //同步辅导员 @RequestMapping("/synchronousEmployEEInfoList") public AjaxResult synchronousEmployEEInfoList(){ //startPage(); diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java index d90ae4d..a4f7b63 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java @@ -31,8 +31,8 @@ public class SyncDataController extends BaseController { @RequestMapping("/synchronousEmployEEInfoList") public AjaxResult synchronousEmployEEInfoList(){ List list=syncDataService.getEmployEEInfoList(); - iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步教职工 - iCphTeacherService.Usertb(); + iCphTeacherService.synchronousMYSQL(list);//同步教职工 + iCphTeacherService.UsertbNew(); return success(); } //专业 diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphTeacherService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphTeacherService.java index c73a947..b1d586c 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphTeacherService.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphTeacherService.java @@ -117,8 +117,10 @@ public interface ICphTeacherService public Map teacherDataSync(); void sqlserverSynchronousMYSQL(List list); + void synchronousMYSQL(List list); void Usertb(); + void UsertbNew(); void insertUserrole(List insertUser); diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java index 4af48a0..c5dc26c 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java @@ -354,116 +354,116 @@ public class CphTeacherServiceImpl implements ICphTeacherService } //同步辅导员 -// @Override -// @Transactional(rollbackFor = Exception.class) -// public void sqlserverSynchronousMYSQL(List list) { -// //辅导员列表 -// List cphTeachers = cphTeacherMapper.selectTeacherList(); -// //查找重复值 -// List updateMap = list.stream() -// .filter(obj1 -> cphTeachers -// .stream().anyMatch(obj2 -> { -// Object xhObj = obj1.get("zgh"); -// if (xhObj != null) { -// String zgh = xhObj.toString(); -// return obj2.getEmployeeId().equals(zgh); -// } -// return false; -// })) -// .collect(Collectors.toList()); -// -// //添加需要 -// List kshList2 = cphTeachers.stream() -// .map(CphTeacher::getEmployeeId) -// .collect(Collectors.toList()); -// -// List insertMap = list.stream() -// .filter(obj -> { -// Object xhObj = obj.get("zgh"); -// return xhObj != null && !kshList2.contains(xhObj.toString()); -// }) -// .collect(Collectors.toList()); -// //添加 -// List insertStudentList = new ArrayList<>(); -// for (Map map:insertMap){ -// CphTeacher cphTeacher = new CphTeacher(); -// Object xmObj = map.get("xm"); -// if (xmObj != null) { -// cphTeacher.setName(xmObj.toString()); -// } -// Object xbObj = map.get("xb"); -// if (xbObj != null) { -// String s = xbObj.toString(); -// if (!Objects.equals(s, "NULL") && !Objects.equals(s, "null")&&!Objects.equals(s," ")) { -// cphTeacher.setGender(xbObj.toString()); -// } -// } -// Object zghObj = map.get("zgh"); -// if (zghObj != null) { -// cphTeacher.setEmployeeId(zghObj.toString()); -// } -// //学院id -// Object yxdmObj = map.get("yxdm"); -// if (yxdmObj!=null) { -// Long deptId = cphTeacherMapper.selectDeptCode(yxdmObj.toString()); -// if (deptId != null) { -// cphTeacher.setDeptId(deptId); -// } -// } -// cphTeacher.setStatus("1"); -// cphTeacher.setCreateTime(DateUtils.getNowDate()); -// insertStudentList.add(cphTeacher); -// } -// if (insertStudentList.size()!=0) { -// cphTeacherMapper.insertBatchSomeColumn(insertStudentList); -// } -// //修改 -// List updateSrsStudent = new ArrayList<>(); -// for (Map map:updateMap){ -// CphTeacher cphTeacher = new CphTeacher(); -// Object xmObj = map.get("xm"); -// if (xmObj != null) { -// cphTeacher.setName(xmObj.toString()); -// } -// Object xbObj = map.get("xb"); -// if (xbObj != null) { -// String s = xbObj.toString(); -// if (!Objects.equals(s, "NULL") && !Objects.equals(s, "null")&&!Objects.equals(s," ")) { -// cphTeacher.setGender(xbObj.toString()); -// } -// } -// Object zghObj = map.get("zgh"); -// if (zghObj != null) { -// cphTeacher.setEmployeeId(zghObj.toString()); -// } -// //学院id -// Object yxdmObj = map.get("yxdm"); -// if (yxdmObj!=null) { -// Long ksh = cphTeacherMapper.selectDeptCode(yxdmObj.toString()); -// if (ksh != null) { -// cphTeacher.setDeptId(ksh); -// } -// } -// cphTeacher.setUpdateTime(DateUtils.getNowDate()); -// updateSrsStudent.add(cphTeacher); -// } -// /*if (updateSrsStudent.size()!=0) { -// List> lists = ListSliceUtil.updateSlice(updateSrsStudent); -// if (lists != null) { -// for (List studentList : lists) { -// cphTeacherMapper.updateSrsClassList(studentList); -// } -// } -// }*/ -// -// -// -// } + @Override + @Transactional(rollbackFor = Exception.class) + public void sqlserverSynchronousMYSQL(List list) { + //辅导员列表 + List cphTeachers = cphTeacherMapper.selectTeacherList(); + //查找重复值 + List updateMap = list.stream() + .filter(obj1 -> cphTeachers + .stream().anyMatch(obj2 -> { + Object xhObj = obj1.get("zgh"); + if (xhObj != null) { + String zgh = xhObj.toString(); + return obj2.getEmployeeId().equals(zgh); + } + return false; + })) + .collect(Collectors.toList()); + + //添加需要 + List kshList2 = cphTeachers.stream() + .map(CphTeacher::getEmployeeId) + .collect(Collectors.toList()); + + List insertMap = list.stream() + .filter(obj -> { + Object xhObj = obj.get("zgh"); + return xhObj != null && !kshList2.contains(xhObj.toString()); + }) + .collect(Collectors.toList()); + //添加 + List insertStudentList = new ArrayList<>(); + for (Map map:insertMap){ + CphTeacher cphTeacher = new CphTeacher(); + Object xmObj = map.get("xm"); + if (xmObj != null) { + cphTeacher.setName(xmObj.toString()); + } + Object xbObj = map.get("xb"); + if (xbObj != null) { + String s = xbObj.toString(); + if (!Objects.equals(s, "NULL") && !Objects.equals(s, "null")&&!Objects.equals(s," ")) { + cphTeacher.setGender(xbObj.toString()); + } + } + Object zghObj = map.get("zgh"); + if (zghObj != null) { + cphTeacher.setEmployeeId(zghObj.toString()); + } + //学院id + Object yxdmObj = map.get("yxdm"); + if (yxdmObj!=null) { + Long deptId = cphTeacherMapper.selectDeptCode(yxdmObj.toString()); + if (deptId != null) { + cphTeacher.setDeptId(deptId); + } + } + cphTeacher.setStatus("1"); + cphTeacher.setCreateTime(DateUtils.getNowDate()); + insertStudentList.add(cphTeacher); + } + if (insertStudentList.size()!=0) { + cphTeacherMapper.insertBatchSomeColumn(insertStudentList); + } + //修改 + List updateSrsStudent = new ArrayList<>(); + for (Map map:updateMap){ + CphTeacher cphTeacher = new CphTeacher(); + Object xmObj = map.get("xm"); + if (xmObj != null) { + cphTeacher.setName(xmObj.toString()); + } + Object xbObj = map.get("xb"); + if (xbObj != null) { + String s = xbObj.toString(); + if (!Objects.equals(s, "NULL") && !Objects.equals(s, "null")&&!Objects.equals(s," ")) { + cphTeacher.setGender(xbObj.toString()); + } + } + Object zghObj = map.get("zgh"); + if (zghObj != null) { + cphTeacher.setEmployeeId(zghObj.toString()); + } + //学院id + Object yxdmObj = map.get("yxdm"); + if (yxdmObj!=null) { + Long ksh = cphTeacherMapper.selectDeptCode(yxdmObj.toString()); + if (ksh != null) { + cphTeacher.setDeptId(ksh); + } + } + cphTeacher.setUpdateTime(DateUtils.getNowDate()); + updateSrsStudent.add(cphTeacher); + } + /*if (updateSrsStudent.size()!=0) { + List> lists = ListSliceUtil.updateSlice(updateSrsStudent); + if (lists != null) { + for (List studentList : lists) { + cphTeacherMapper.updateSrsClassList(studentList); + } + } + }*/ + + + + } //同步教职工表 @Override @Transactional(rollbackFor = Exception.class) - public void sqlserverSynchronousMYSQL(List list) { + public void synchronousMYSQL(List list) { List insertTeacherList = new ArrayList<>();//添加集合 List updateTeacherList = new ArrayList<>();//修改集合 for (Map map : list) { @@ -501,64 +501,64 @@ public class CphTeacherServiceImpl implements ICphTeacherService } } -// //同步到用户表 -// @Override -// @Transactional(rollbackFor = Exception.class) -// public void Usertb(){ -// //同步到user表 -// List cphTeachers = cphTeacherMapper.selectTeacherList();//所有职工 -// List sysUserList = sysUserMapper.selectUserLisrS();//所以用户 -// List insertUser = new ArrayList<>();//需要添加的集合 -// List updateUser = new ArrayList<>();//需要修改的集合 -// for (CphTeacher cphTeacher:cphTeachers){ -// int i=0;//添加标记 -// for (SysUser sysUser:sysUserList){ -// //修改 -// if (Objects.equals(cphTeacher.getEmployeeId(), sysUser.getUserName())){ -// SysUser sysUser1 = new SysUser(); -// sysUser1.setUserName(cphTeacher.getEmployeeId()); -// sysUser1.setDeptId(cphTeacher.getDeptId()); -// updateUser.add(sysUser1); -// i=0; -// break; -// } -// i=1; -// } -// //添加 -// if (i==1){ -// SysUser sysUser = new SysUser(); -// sysUser.setUserName(cphTeacher.getEmployeeId()); -// if (cphTeacher.getDeptId()!=null){ -// sysUser.setDeptId(cphTeacher.getDeptId()); -// } -// sysUser.setSex(Objects.equals(cphTeacher.getGender(), "男") ?"0":"1"); -// sysUser.setNickName(cphTeacher.getName()); -// sysUser.setPassword(SecurityUtils.encryptPassword("#A"+cphTeacher.getEmployeeId()+"A#")); -// insertUser.add(sysUser); -// -// } -// i=0; -// } -// if (insertUser.size()!=0){ -// sysUserMapper.insertUserListInfo(insertUser); -// insertUserrole(insertUser); -// } -// if (updateUser.size()!=0) { -// List> listList1 = ListSliceUtil.updateSlice(updateUser);//切割修改集合 -// if (listList1 != null) { -// for (List userList : listList1) { -// // sysUserMapper.updateUserListInfo(userList); -// } -// } -// } -// System.out.println(insertUser.size()); -// System.out.println(updateUser.size()); -// } - //同步到用户表 @Override @Transactional(rollbackFor = Exception.class) public void Usertb(){ + //同步到user表 + List cphTeachers = cphTeacherMapper.selectTeacherList();//所有职工 + List sysUserList = sysUserMapper.selectUserLisrS();//所以用户 + List insertUser = new ArrayList<>();//需要添加的集合 + List updateUser = new ArrayList<>();//需要修改的集合 + for (CphTeacher cphTeacher:cphTeachers){ + int i=0;//添加标记 + for (SysUser sysUser:sysUserList){ + //修改 + if (Objects.equals(cphTeacher.getEmployeeId(), sysUser.getUserName())){ + SysUser sysUser1 = new SysUser(); + sysUser1.setUserName(cphTeacher.getEmployeeId()); + sysUser1.setDeptId(cphTeacher.getDeptId()); + updateUser.add(sysUser1); + i=0; + break; + } + i=1; + } + //添加 + if (i==1){ + SysUser sysUser = new SysUser(); + sysUser.setUserName(cphTeacher.getEmployeeId()); + if (cphTeacher.getDeptId()!=null){ + sysUser.setDeptId(cphTeacher.getDeptId()); + } + sysUser.setSex(Objects.equals(cphTeacher.getGender(), "男") ?"0":"1"); + sysUser.setNickName(cphTeacher.getName()); + sysUser.setPassword(SecurityUtils.encryptPassword("#A"+cphTeacher.getEmployeeId()+"A#")); + insertUser.add(sysUser); + + } + i=0; + } + if (insertUser.size()!=0){ + sysUserMapper.insertUserListInfo(insertUser); + insertUserrole(insertUser); + } + if (updateUser.size()!=0) { + List> listList1 = ListSliceUtil.updateSlice(updateUser);//切割修改集合 + if (listList1 != null) { + for (List userList : listList1) { + // sysUserMapper.updateUserListInfo(userList); + } + } + } + System.out.println(insertUser.size()); + System.out.println(updateUser.size()); + } + + //同步到用户表 + @Override + @Transactional(rollbackFor = Exception.class) + public void UsertbNew(){ //同步到user表 List qgzxTeachers = qgzxTeacherMapper.selectTeacherList();//所有职工 List sysUserList = sysUserMapper.selectUserLisrS();//所以用户 From 8125a085f0cf9ab53a7863459bf76f4ceb452e76 Mon Sep 17 00:00:00 2001 From: 15976874561 <2553956742@qq.com> Date: Fri, 26 Dec 2025 13:35:35 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=93=E4=B8=9A?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CphSqlServerDataController.java | 2 +- .../comprehensive/SyncDataController.java | 11 ++- .../comprehensive/mapper/SyncDataMapper.java | 1 + .../service/ISrsMajorsService.java | 1 + .../service/SyncDataService.java | 2 +- .../service/impl/CphTeacherServiceImpl.java | 12 ++- .../service/impl/SrsMajorsServiceImpl.java | 98 +++++++++++++++++++ .../service/impl/SyncDataServiceImpl.java | 4 + .../mapper/comprehensive/SyncDataMapper.xml | 4 + 9 files changed, 131 insertions(+), 4 deletions(-) diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java index e43ae21..e93026e 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java @@ -157,7 +157,7 @@ public class CphSqlServerDataController extends BaseController { public AjaxResult synchronousEmployEEInfoList(){ //startPage(); List list=sqlServerDataService.getEmployEEInfoList(); - iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步教职工 + iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步辅导员 iCphTeacherService.Usertb(); return success(); } diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java index a4f7b63..9f7fb62 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java @@ -4,6 +4,7 @@ import com.srs.common.core.controller.BaseController; import com.srs.common.core.domain.AjaxResult; import com.srs.common.core.page.TableDataInfo; import com.srs.comprehensive.service.ICphTeacherService; +import com.srs.comprehensive.service.ISrsMajorsService; import com.srs.comprehensive.service.SyncDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -21,6 +22,7 @@ public class SyncDataController extends BaseController { SyncDataService syncDataService; @Autowired ICphTeacherService iCphTeacherService; + ISrsMajorsService iSrsMajorsService; @RequestMapping("/getEmployEEInfoList") public TableDataInfo getEmployEEInfoList(){ startPage(); @@ -35,11 +37,18 @@ public class SyncDataController extends BaseController { iCphTeacherService.UsertbNew(); return success(); } - //专业 + //中间表专业信息 @RequestMapping("/getSpecialtyInfoList") public TableDataInfo getSpecialtyInfoList(String zydm){ startPage(); List list=syncDataService.getSpecialtyInfoList(zydm); return getDataTable(list); } + //同步专业 + @RequestMapping("/synchronousSpecialtyInfoList") + public AjaxResult synchronousSpecialtyInfoList(){ + List list=syncDataService.getSpecialtyALLInfo(); + //iSrsMajorsService.synchronousMYSQL(list);//同步专业 + return success(); + } } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java index 86ec885..d7d20c8 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java @@ -6,4 +6,5 @@ import java.util.Map; public interface SyncDataMapper { public List getEmployEEInfoList();//教职工 public List getSpecialtyInfoList(String zydm);//专业 + public List getSpecialtyALLInfo();//所有专业 } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsMajorsService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsMajorsService.java index 8d157c8..a552610 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsMajorsService.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsMajorsService.java @@ -68,6 +68,7 @@ public interface ISrsMajorsService public Map dataSync(); void sqlserverSynchronousMYSQL(List list); + void synchronousMYSQL(List list); //根据专业名称获取专业id public Long getMajorIdByName(String name); //获取学生的专业名称 diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java index 5c97eda..3a433bf 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java @@ -6,5 +6,5 @@ import java.util.Map; public interface SyncDataService { List getEmployEEInfoList();//教职工 List getSpecialtyInfoList(String zydm);//专业 - + List getSpecialtyALLInfo();//所有专业 } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java index c5dc26c..80c6286 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java @@ -611,7 +611,7 @@ public class CphTeacherServiceImpl implements ICphTeacherService } if (insertUser.size()!=0){ sysUserMapper.insertUserListInfo(insertUser); - insertUserrole(insertUser); + insertUserroleNew(insertUser); } if (updateUser.size()!=0) { List> listList1 = ListSliceUtil.updateSlice(updateUser);//切割修改集合 @@ -636,6 +636,16 @@ public class CphTeacherServiceImpl implements ICphTeacherService } sysUserRoleMapper.batchUserRole(userRoleList); } + public void insertUserroleNew(List insertUser){ + List userRoleList=new ArrayList<>(); + for (SysUser sysUser:insertUser){ + SysUserRole sysRole = new SysUserRole(); + sysRole.setUserId(sysUser.getUserId()); + sysRole.setRoleId(124L);//统一设为教职工角色 + userRoleList.add(sysRole); + } + sysUserRoleMapper.batchUserRole(userRoleList); + } @Override public List> exportSXZZ(CphExport param) { diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java index 81ae353..a4f9871 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java @@ -251,4 +251,102 @@ public class SrsMajorsServiceImpl implements ISrsMajorsService } } + //同步专业 + @Override + public void synchronousMYSQL(List list) { + List srsMajors = srsMajorsMapper.selectSrsmajorsList();//数据库存在的专业列表 + //查找重复值 + List updateMap = list.stream() + .filter(obj1 -> srsMajors + .stream().anyMatch(obj2 -> { + Object xhObj = obj1.get("zydm"); + if (xhObj != null) { + String xh = xhObj.toString(); + return obj2.getMajorCode().equals(xh); + } + return false; + })) + .collect(Collectors.toList()); + + //添加需要 + List kshList2 = srsMajors.stream() + .map(SrsMajors::getMajorCode) + .collect(Collectors.toList()); + + List insertMap = list.stream() + .filter(obj -> { + Object xhObj = obj.get("zydm"); + return xhObj != null && !kshList2.contains(xhObj.toString()); + }) + .collect(Collectors.toList()); + //添加 + List insertStudentList = new ArrayList<>(); + for (Map map:insertMap){ + SrsMajors srsMajors1 = new SrsMajors(); + Object zydmobj=map.get("zydm"); + if (zydmobj!=null) { + srsMajors1.setMajorCode(zydmobj.toString()); + } + Object zymcobj=map.get("zymc"); + if (zymcobj!=null) { + srsMajors1.setMajorName(zymcobj.toString()); + } + srsMajors1.setStatus("0"); + + if (map.get("yxmc")!=null) { + //使用代码查询学院id + Long yxdm = srsMajorsMapper.selectOldDeptIdByDeptName(map.get("yxmc").toString()); + if (yxdm != null) { + srsMajors1.setCollegeId(yxdm);//学院id + } else { + srsMajors1.setCollegeId(0L); + } + }else { + srsMajors1.setCollegeId(0L); + } + srsMajors1.setCreateTime(DateUtils.getNowDate()); + insertStudentList.add(srsMajors1); + } + //修改 + List updateSrsStudent = new ArrayList<>(); + for (Map map:updateMap){ + SrsMajors srsMajors1 = new SrsMajors(); + Object zydmobj=map.get("zydm"); + if (zydmobj!=null) { + srsMajors1.setMajorCode(zydmobj.toString()); + } + Object zymcobj=map.get("zymc"); + if (zymcobj!=null) { + srsMajors1.setMajorName(zymcobj.toString()); + } + + if (map.get("yxmc")!=null) { + //使用代码查询学院id + Long yxdm = srsMajorsMapper.selectOldDeptIdByDeptName(map.get("yxmc").toString()); + if (yxdm != null) { + srsMajors1.setCollegeId(yxdm);//学院id + } else { + srsMajors1.setCollegeId(0L); + } + }else { + srsMajors1.setCollegeId(0L); + } + srsMajors1.setUpdateTime(DateUtils.getNowDate()); + updateSrsStudent.add(srsMajors1); + } + if (insertStudentList.size()!=0) { + srsMajorsMapper.insertBatchSomeColumn(insertStudentList); + } + if(updateSrsStudent.size()!=0) { + List> lists = ListSliceUtil.updateSlice(updateSrsStudent); + if (lists != null) { + for (List studentList : lists) { + srsMajorsMapper.updateSrsStudentList(studentList); + } + } + } + System.out.println(insertStudentList.size()); + System.out.println(updateSrsStudent.size()); + } + } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java index 7e4cc15..fce4a0a 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java @@ -22,5 +22,9 @@ public class SyncDataServiceImpl implements SyncDataService { public List getSpecialtyInfoList(String zydm) { return syncDataMapper.getSpecialtyInfoList(zydm); } + @Override + public List getSpecialtyALLInfo(){ + return syncDataMapper.getSpecialtyALLInfo(); + } } diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml index d0002f1..64205f1 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml @@ -18,4 +18,8 @@ and b.JXZYBH=#{zydm} + From ddf20c9194d1c3311ccb255ce375f8a6c7d884cf Mon Sep 17 00:00:00 2001 From: 15976874561 <2553956742@qq.com> Date: Fri, 26 Dec 2025 13:36:00 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=93=E4=B8=9A?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- srs-admin/src/main/resources/application.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srs-admin/src/main/resources/application.yml b/srs-admin/src/main/resources/application.yml index e77d1ab..66caa4a 100644 --- a/srs-admin/src/main/resources/application.yml +++ b/srs-admin/src/main/resources/application.yml @@ -64,8 +64,8 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: druid #正式环境 -# active: dev #测试环境 +# active: druid #正式环境 + active: dev #测试环境 # 文件上传 servlet: multipart: @@ -81,15 +81,15 @@ spring: # redis 配置 redis: # 地址 - host: localhost #正式环境redis -# host: 47.112.118.149 #测试开发地址 +# host: localhost #正式环境redis + host: 47.112.118.149 #测试开发地址 # 端口，默认为6379 port: 6379 # 数据库索引 database: 0 # 密码SSSS -# password: Houpuyfb #测试开发密码 - password: #正式环境密码 + password: Houpuyfb #测试开发密码 +# password: #正式环境密码 # 连接超时时间 timeout: 10s lettuce: From 2573d4bebdeacd025a0af209eb5226d5f2f251df Mon Sep 17 00:00:00 2001 From: 15976874561 <2553956742@qq.com> Date: Fri, 26 Dec 2025 18:44:52 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E9=99=A2=E6=A0=A1=E6=9F=A5=E5=87=BA=E9=83=A8=E9=97=A8=E7=BC=96?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../comprehensive/SyncDataController.java | 3 +- .../service/impl/SrsMajorsServiceImpl.java | 41 +++++++++---------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java index 9f7fb62..ef06d0c 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java @@ -22,6 +22,7 @@ public class SyncDataController extends BaseController { SyncDataService syncDataService; @Autowired ICphTeacherService iCphTeacherService; + @Autowired ISrsMajorsService iSrsMajorsService; @RequestMapping("/getEmployEEInfoList") public TableDataInfo getEmployEEInfoList(){ @@ -48,7 +49,7 @@ public class SyncDataController extends BaseController { @RequestMapping("/synchronousSpecialtyInfoList") public AjaxResult synchronousSpecialtyInfoList(){ List list=syncDataService.getSpecialtyALLInfo(); - //iSrsMajorsService.synchronousMYSQL(list);//同步专业 + iSrsMajorsService.synchronousMYSQL(list);//同步专业 return success(); } } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java index a4f9871..de8de9c 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java @@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.srs.comprehensive.domain.SrsMajors; import com.srs.comprehensive.service.ISrsMajorsService; +import org.springframework.transaction.annotation.Transactional; /** * 【请填写功能名称】Service业务层处理 @@ -295,18 +296,19 @@ public class SrsMajorsServiceImpl implements ISrsMajorsService if (map.get("yxmc")!=null) { //使用代码查询学院id - Long yxdm = srsMajorsMapper.selectOldDeptIdByDeptName(map.get("yxmc").toString()); - if (yxdm != null) { - srsMajors1.setCollegeId(yxdm);//学院id - } else { - srsMajors1.setCollegeId(0L); - } + Long yxdm = srsMajorsMapper.selectOldDeptIdByDeptName(map.get("yxmc").toString()); + if (yxdm != null) { + srsMajors1.setCollegeId(yxdm);//学院id + } else { + srsMajors1.setCollegeId(0L); + } }else { srsMajors1.setCollegeId(0L); } srsMajors1.setCreateTime(DateUtils.getNowDate()); insertStudentList.add(srsMajors1); } + //修改 List updateSrsStudent = new ArrayList<>(); for (Map map:updateMap){ @@ -319,15 +321,14 @@ public class SrsMajorsServiceImpl implements ISrsMajorsService if (zymcobj!=null) { srsMajors1.setMajorName(zymcobj.toString()); } - if (map.get("yxmc")!=null) { - //使用代码查询学院id - Long yxdm = srsMajorsMapper.selectOldDeptIdByDeptName(map.get("yxmc").toString()); - if (yxdm != null) { - srsMajors1.setCollegeId(yxdm);//学院id - } else { - srsMajors1.setCollegeId(0L); - } + //使用代码查询学院id + Long yxdm = srsMajorsMapper.selectOldDeptIdByDeptName(map.get("yxmc").toString()); + if (yxdm != null) { + srsMajors1.setCollegeId(yxdm);//学院id + } else { + srsMajors1.setCollegeId(0L); + } }else { srsMajors1.setCollegeId(0L); } @@ -337,16 +338,12 @@ public class SrsMajorsServiceImpl implements ISrsMajorsService if (insertStudentList.size()!=0) { srsMajorsMapper.insertBatchSomeColumn(insertStudentList); } - if(updateSrsStudent.size()!=0) { - List> lists = ListSliceUtil.updateSlice(updateSrsStudent); - if (lists != null) { - for (List studentList : lists) { - srsMajorsMapper.updateSrsStudentList(studentList); - } + List> lists = ListSliceUtil.updateSlice(updateSrsStudent); + if (lists != null) { + for (List studentList : lists) { + srsMajorsMapper.updateSrsStudentList(studentList); } } - System.out.println(insertStudentList.size()); - System.out.println(updateSrsStudent.size()); } } From 59162701aec3c82846d1d43283919de4b6045273 Mon Sep 17 00:00:00 2001 From: 18154758993 <605281283@qq.com> Date: Mon, 29 Dec 2025 10:51:06 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=84=E5=88=86?= =?UTF-8?q?=E6=8F=90=E4=BA=A4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- srs-admin/src/main/resources/application.yml | 22 +++++++++---------- ...StuDisciplinaryApplicationServiceImpl.java | 21 +++++++++--------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/srs-admin/src/main/resources/application.yml b/srs-admin/src/main/resources/application.yml index e77d1ab..bdf5918 100644 --- a/srs-admin/src/main/resources/application.yml +++ b/srs-admin/src/main/resources/application.yml @@ -8,7 +8,7 @@ srs: copyrightYear: 2023 # 实例演示开关 demoEnabled: true - # 文件路径 示例（ Windows配置D:/srs/uploadPath，Linux配置 /home/srs/uploadPath）#D:/srs/uploadPath + # 文件路径 示例( Windows配置D:/srs/uploadPath,Linux配置 /home/srs/uploadPath)#D:/srs/uploadPath profile: /usr/local/java/srs/uploadPath #/usr/local/java/srs/uploadPath #profile: D:/srs/uploadPath #/srs/uploadPath # 获取ip地址开关 @@ -20,7 +20,7 @@ srs: # 开发环境配置 server: - # 服务器的HTTP端口，默认为8080 正式：8085 测试：8088 + # 服务器的HTTP端口,默认为8080 正式:8085 测试:8088 port: 8085 servlet: # 应用的访问路径 @@ -28,12 +28,12 @@ server: tomcat: # tomcat的URI编码 uri-encoding: UTF-8 - # 连接数满后的排队数，默认为100 + # 连接数满后的排队数,默认为100 accept-count: 1000 threads: - # tomcat最大线程数，默认为200 + # tomcat最大线程数,默认为200 max: 800 - # Tomcat启动初始化的线程数，默认值10 + # Tomcat启动初始化的线程数,默认值10 min-spare: 100 # 日志配置 @@ -54,7 +54,7 @@ user: password: # 密码最大错误次数 maxRetryCount: 5 - # 密码锁定时间（默认10分钟） + # 密码锁定时间(默认10分钟) lockTime: 10 # Spring配置 @@ -83,7 +83,7 @@ spring: # 地址 host: localhost #正式环境redis # host: 47.112.118.149 #测试开发地址 -# 端口，默认为6379 +# 端口,默认为6379 port: 6379 # 数据库索引 database: 0 @@ -100,7 +100,7 @@ spring: max-idle: 8 # 连接池的最大数据库连接数 max-active: 8 - # #连接池最大阻塞等待时间（使用负值表示没有限制） + # #连接池最大阻塞等待时间(使用负值表示没有限制) max-wait: -1ms # token配置 @@ -109,14 +109,14 @@ token: header: Authorization # 令牌密钥 secret: abcdefghijklmnopqrstuvwxyz - # 令牌有效期（默认30分钟） + # 令牌有效期(默认30分钟) expireTime: 43200 # MyBatis配置 #mybatis: # # 搜索指定包别名 # typeAliasesPackage: com.srs.**.domain -# # 配置mapper的扫描，找到所有的mapper.xml映射文件 +# # 配置mapper的扫描,找到所有的mapper.xml映射文件 # mapperLocations: classpath*:mapper/**/*Mapper.xml # # 加载全局的配置文件 # configLocation: classpath:mybatis/mybatis-config.xml @@ -149,7 +149,7 @@ swagger: xss: # 过滤开关 enabled: false - # 排除链接（多个用逗号分隔） + # 排除链接(多个用逗号分隔) excludes: /system/notify/* # 匹配链接 urlPatterns: /system/*,/monitor/*,/tool/*,/stureg/intenetin/* diff --git a/srs-routine/src/main/java/com/srs/routine/service/impl/RtStuDisciplinaryApplicationServiceImpl.java b/srs-routine/src/main/java/com/srs/routine/service/impl/RtStuDisciplinaryApplicationServiceImpl.java index 2b747e5..48d1dfe 100644 --- a/srs-routine/src/main/java/com/srs/routine/service/impl/RtStuDisciplinaryApplicationServiceImpl.java +++ b/srs-routine/src/main/java/com/srs/routine/service/impl/RtStuDisciplinaryApplicationServiceImpl.java @@ -145,11 +145,11 @@ public class RtStuDisciplinaryApplicationServiceImpl extends ServiceImpl Date: Mon, 29 Dec 2025 15:18:13 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8F=AD=E7=BA=A7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/comprehensive/SyncDataController.java | 7 +++++++ .../java/com/srs/comprehensive/mapper/SyncDataMapper.java | 1 + .../com/srs/comprehensive/service/SyncDataService.java | 1 + .../comprehensive/service/impl/SyncDataServiceImpl.java | 5 ++++- .../main/resources/mapper/comprehensive/SyncDataMapper.xml | 3 +++ 5 files changed, 16 insertions(+), 1 deletion(-) diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java index ef06d0c..d26c4e3 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java @@ -52,4 +52,11 @@ public class SyncDataController extends BaseController { iSrsMajorsService.synchronousMYSQL(list);//同步专业 return success(); } + //中间表班级 + @RequestMapping("/classInfoList") + public TableDataInfo classInfoList(){ + startPage(); + List list=syncDataService.getClassInfoList(); + return getDataTable(list); + } } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java index d7d20c8..8e0b68f 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java @@ -7,4 +7,5 @@ public interface SyncDataMapper { public List getEmployEEInfoList();//教职工 public List getSpecialtyInfoList(String zydm);//专业 public List getSpecialtyALLInfo();//所有专业 + public List getClassInfoList();//班级 } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java index 3a433bf..0aafaea 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java @@ -7,4 +7,5 @@ public interface SyncDataService { List getEmployEEInfoList();//教职工 List getSpecialtyInfoList(String zydm);//专业 List getSpecialtyALLInfo();//所有专业 + List getClassInfoList();//班级 } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java index fce4a0a..511268a 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java @@ -26,5 +26,8 @@ public class SyncDataServiceImpl implements SyncDataService { public List getSpecialtyALLInfo(){ return syncDataMapper.getSpecialtyALLInfo(); } - + @Override + public List getClassInfoList(){ + return syncDataMapper.getClassInfoList(); + } } diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml index 64205f1..830fffb 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml @@ -22,4 +22,7 @@ select b.JXZYBH as zydm,b.JXZYJC as zyjc,b.JXZYMC as zymc,a.BMMC yxmc from from_gxsdxyxxzx_xzbm a left join from_gxsdxyxxzx_zyxx b on a.BMBH=b.JXZYSSYXBBH where b.JXZYBH is not null +