xgxt_sd/zhxg_java
16
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
weishengyou
2025-12-30 10:48:03 +08:00
parent ecda360755 b0d0ba88fa
commit 4b4f25f813
15 changed files with 450 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java
View File

@@ -152,21 +152,12 @@ public class CphSqlServerDataController extends BaseController {
return success(list);
}
// //同步辅导员
// @RequestMapping("/synchronousEmployEEInfoList")
// public AjaxResult synchronousEmployEEInfoList(){
// //startPage();
// List<Map> list=sqlServerDataService.getEmployEEInfoList();
// iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步辅导员
// iCphTeacherService.Usertb();
// return success();
// }
//同步教职工
//同步辅导员
@RequestMapping("/synchronousEmployEEInfoList")
public AjaxResult synchronousEmployEEInfoList(){
//startPage();
List<Map> list=sqlServerDataService.getEmployEEInfoList();
iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步教职工
iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步辅导员
iCphTeacherService.Usertb();
return success();
}

33
srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java
View File

@@ -4,9 +4,11 @@ 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;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -17,9 +19,11 @@ import java.util.Map;
@RequestMapping("/syncdata")
public class SyncDataController extends BaseController {
@Autowired
private SyncDataService syncDataService;
SyncDataService syncDataService;
@Autowired
private ICphTeacherService iCphTeacherService;
ICphTeacherService iCphTeacherService;
@Autowired
ISrsMajorsService iSrsMajorsService;
@RequestMapping("/getEmployEEInfoList")
public TableDataInfo getEmployEEInfoList(){
startPage();
@@ -30,8 +34,29 @@ public class SyncDataController extends BaseController {
@RequestMapping("/synchronousEmployEEInfoList")
public AjaxResult synchronousEmployEEInfoList(){
List<Map> list=syncDataService.getEmployEEInfoList();
iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步教职工
//iCphTeacherService.Usertb();
iCphTeacherService.synchronousMYSQL(list);//同步教职工
iCphTeacherService.UsertbNew();
return success();
}
//中间表专业信息
@RequestMapping("/getSpecialtyInfoList")
public TableDataInfo getSpecialtyInfoList(String zydm){
startPage();
List<Map> list=syncDataService.getSpecialtyInfoList(zydm);
return getDataTable(list);
}
//同步专业
@RequestMapping("/synchronousSpecialtyInfoList")
public AjaxResult synchronousSpecialtyInfoList(){
List<Map> list=syncDataService.getSpecialtyALLInfo();
iSrsMajorsService.synchronousMYSQL(list);//同步专业
return success();
}
//中间表班级
@RequestMapping("/classInfoList")
public TableDataInfo classInfoList(){
startPage();
List<Map> list=syncDataService.getClassInfoList();
return getDataTable(list);
}
}

22
srs-admin/src/main/resources/application.yml
View File

@@ -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/*

3
srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java
View File

@@ -5,4 +5,7 @@ import java.util.Map;
public interface SyncDataMapper {
public List<Map> getEmployEEInfoList();//教职工
public List<Map> getSpecialtyInfoList(String zydm);//专业
public List<Map> getSpecialtyALLInfo();//所有专业
public List<Map> getClassInfoList();//班级
}

2
srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphTeacherService.java
View File

@@ -117,8 +117,10 @@ public interface ICphTeacherService
public Map<String, Integer> teacherDataSync();
void sqlserverSynchronousMYSQL(List<Map> list);
void synchronousMYSQL(List<Map> list);
void Usertb();
void UsertbNew();
void insertUserrole(List<SysUser> insertUser);

1
srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsMajorsService.java
View File

@@ -68,6 +68,7 @@ public interface ISrsMajorsService
public Map<String,Object> dataSync();
void sqlserverSynchronousMYSQL(List<Map> list);
void synchronousMYSQL(List<Map> list);
//根据专业名称获取专业id
public Long getMajorIdByName(String name);
//获取学生的专业名称

3
srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java
View File

@@ -5,4 +5,7 @@ import java.util.Map;
public interface SyncDataService {
List<Map> getEmployEEInfoList();//教职工
List<Map> getSpecialtyInfoList(String zydm);//专业
List<Map> getSpecialtyALLInfo();//所有专业
List<Map> getClassInfoList();//班级
}

309
srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java
View File

@@ -354,116 +354,118 @@ public class CphTeacherServiceImpl implements ICphTeacherService
}
//同步辅导员
// @Override
// @Transactional(rollbackFor = Exception.class)
// public void sqlserverSynchronousMYSQL(List<Map> list) {
// //辅导员列表
// List<CphTeacher> cphTeachers = cphTeacherMapper.selectTeacherList();
// //查找重复值
// List<Map> 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<String> kshList2 = cphTeachers.stream()
// .map(CphTeacher::getEmployeeId)
// .collect(Collectors.toList());
//
// List<Map> insertMap = list.stream()
// .filter(obj -> {
// Object xhObj = obj.get("zgh");
// return xhObj != null && !kshList2.contains(xhObj.toString());
// })
// .collect(Collectors.toList());
// //添加
// List<CphTeacher> 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<CphTeacher> 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<List<CphTeacher>> lists = ListSliceUtil.updateSlice(updateSrsStudent);
// if (lists != null) {
// for (List<CphTeacher> studentList : lists) {
// cphTeacherMapper.updateSrsClassList(studentList);
// }
// }
// }*/
//
//
//
// }
@Override
@Transactional(rollbackFor = Exception.class)
public void sqlserverSynchronousMYSQL(List<Map> list) {
//辅导员列表
List<CphTeacher> cphTeachers = cphTeacherMapper.selectTeacherList();
//查找重复值
List<Map> 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<String> kshList2 = cphTeachers.stream()
.map(CphTeacher::getEmployeeId)
.collect(Collectors.toList());
List<Map> insertMap = list.stream()
.filter(obj -> {
Object xhObj = obj.get("zgh");
return xhObj != null && !kshList2.contains(xhObj.toString());
})
.collect(Collectors.toList());
//添加
List<CphTeacher> 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<CphTeacher> 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<List<CphTeacher>> lists = ListSliceUtil.updateSlice(updateSrsStudent);
if (lists != null) {
for (List<CphTeacher> studentList : lists) {
cphTeacherMapper.updateSrsClassList(studentList);
}
}
}*/
}
//同步教职工表
@Override
@Transactional(rollbackFor = Exception.class)
public void sqlserverSynchronousMYSQL(List<Map> list) {
public void synchronousMYSQL(List<Map> list) {
List<QgzxTeacher> insertTeacherList = new ArrayList<>();//添加集合
List<QgzxTeacher> updateTeacherList = new ArrayList<>();//修改集合
for (Map<String, Object> 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);
}
}
//同步到用户表
@@ -545,6 +555,77 @@ public class CphTeacherServiceImpl implements ICphTeacherService
System.out.println(updateUser.size());
}
//同步到用户表
@Override
@Transactional(rollbackFor = Exception.class)
public void UsertbNew(){
//同步到user表
List<QgzxTeacher> qgzxTeachers = qgzxTeacherMapper.selectTeacherList();//所有职工
List<SysUser> sysUserList = sysUserMapper.selectUserLisrS();//所以用户
List<SysUser> insertUser = new ArrayList<>();//需要添加的集合
List<SysUser> updateUser = new ArrayList<>();//需要修改的集合
for (QgzxTeacher qgzxTeacher:qgzxTeachers){
int i=0;//添加标记
for (SysUser sysUser:sysUserList){
//修改
if (Objects.equals(qgzxTeacher.getEmployeeId(), sysUser.getUserName())){
SysUser sysUser1 = new SysUser();
sysUser1.setUserName(qgzxTeacher.getEmployeeId());
sysUser1.setDeptId(qgzxTeacher.getDeptId());
if(qgzxTeacher.getStatus().equals("11")){
sysUser1.setStatus("0");
}
else if (qgzxTeacher.getStatus().equals("4")){
sysUser1.setStatus("0");
}else {
sysUser1.setStatus("1");
}
updateUser.add(sysUser1);
i=0;
break;
}
i=1;
}
//添加
if (i==1){
SysUser sysUser = new SysUser();
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")){
sysUser.setStatus("0");
}
else if (qgzxTeacher.getStatus().equals("4")){
sysUser.setStatus("0");
}else {
sysUser.setStatus("1");
}
insertUser.add(sysUser);
}
i=0;
}
if (insertUser.size()!=0){
sysUserMapper.insertUserListInfo(insertUser);
insertUserroleNew(insertUser);
}
if (updateUser.size()!=0) {
List<List<SysUser>> listList1 = ListSliceUtil.updateSlice(updateUser);//切割修改集合
if (listList1 != null) {
for (List<SysUser> userList : listList1) {
sysUserMapper.updateUserListInfo(userList);
}
}
}
System.out.println(insertUser.size());
System.out.println(updateUser.size());
}
public void insertUserrole(List<SysUser> insertUser){
List<SysUserRole> userRoleList=new ArrayList<>();
for (SysUser sysUser:insertUser){
@@ -555,6 +636,16 @@ public class CphTeacherServiceImpl implements ICphTeacherService
}
sysUserRoleMapper.batchUserRole(userRoleList);
}
public void insertUserroleNew(List<SysUser> insertUser){
List<SysUserRole> 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<Map<String, Object>> exportSXZZ(CphExport param) {

95
srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java
View File

@@ -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业务层处理
@@ -251,4 +252,98 @@ public class SrsMajorsServiceImpl implements ISrsMajorsService
}
}
//同步专业
@Override
public void synchronousMYSQL(List<Map> list) {
List<SrsMajors> srsMajors = srsMajorsMapper.selectSrsmajorsList();//数据库存在的专业列表
//查找重复值
List<Map> 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<String> kshList2 = srsMajors.stream()
.map(SrsMajors::getMajorCode)
.collect(Collectors.toList());
List<Map> insertMap = list.stream()
.filter(obj -> {
Object xhObj = obj.get("zydm");
return xhObj != null && !kshList2.contains(xhObj.toString());
})
.collect(Collectors.toList());
//添加
List<SrsMajors> 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<SrsMajors> 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);
}
List<List<SrsMajors>> lists = ListSliceUtil.updateSlice(updateSrsStudent);
if (lists != null) {
for (List<SrsMajors> studentList : lists) {
srsMajorsMapper.updateSrsStudentList(studentList);
}
}
}
}

14
srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java
View File

@@ -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,16 @@ public class SyncDataServiceImpl implements SyncDataService {
public List<Map> getEmployEEInfoList() {
return syncDataMapper.getEmployEEInfoList();
}
@Override
public List<Map> getSpecialtyInfoList(String zydm) {
return syncDataMapper.getSpecialtyInfoList(zydm);
}
@Override
public List<Map> getSpecialtyALLInfo(){
return syncDataMapper.getSpecialtyALLInfo();
}
@Override
public List<Map> getClassInfoList(){
return syncDataMapper.getClassInfoList();
}
}

14
srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml
View File

@@ -11,4 +11,18 @@
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>
<select id="getSpecialtyInfoList" resultType="java.util.Map" parameterType="String">
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
<if test="zydm != null and zydm!= '' ">and b.JXZYBH=#{zydm}</if>
</where>
</select>
<select id="getSpecialtyALLInfo" resultType="java.util.Map">
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
</select>
<select id="getClassInfoList" resultType="java.util.Map">
select BJBH as bjdm,BJSSJXZYBH as zyid,BJMC as bjmc,BJSSNJ as njid from from_gxsdxyxxzx_class
</select>
</mapper>

21
srs-routine/src/main/java/com/srs/routine/service/impl/RtStuDisciplinaryApplicationServiceImpl.java
View File

@@ -147,11 +147,11 @@ public class RtStuDisciplinaryApplicationServiceImpl extends ServiceImpl<RtStuDi
rtStuDisciplinaryApplication.setUpdateTime(DateUtils.getNowDate());
rtStuDisciplinaryApplication.setUpdateBy(SecurityUtils.getUsername());
//if (rtStuDisciplinaryApplication.getViolationDate() != null) {
if (rtStuDisciplinaryApplication.getDisciplinaryDate() != null) {
// 设置 处分到期时间
//rtStuDisciplinaryApplication.setExpirationDate(calculationDueDisposition(rtStuDisciplinaryApplication.getPenaltyType(), rtStuDisciplinaryApplication.getViolationDate()));
rtStuDisciplinaryApplication.setExpirationDate(calculationDueDisposition(rtStuDisciplinaryApplication.getPenaltyType(), rtStuDisciplinaryApplication.getDisciplinaryDate()));
// }
}
if (rtStuDisciplinaryApplication.getSubmissionStatus() != null && rtStuDisciplinaryApplication.getSubmissionStatus() == 1) {
@@ -170,10 +170,10 @@ public class RtStuDisciplinaryApplicationServiceImpl extends ServiceImpl<RtStuDi
rtStuDisciplinaryApplication.setUpdateTime(DateUtils.getNowDate());
rtStuDisciplinaryApplication.setUpdateBy(SecurityUtils.getUsername());
//if (rtStuDisciplinaryApplication.getViolationDate() != null) {
// 设置 处分到期时间
//rtStuDisciplinaryApplication.setExpirationDate(calculationDueDisposition(rtStuDisciplinaryApplication.getPenaltyType(), rtStuDisciplinaryApplication.getViolationDate()));
rtStuDisciplinaryApplication.setExpirationDate(calculationDueDisposition(rtStuDisciplinaryApplication.getPenaltyType(), rtStuDisciplinaryApplication.getDisciplinaryDate()));
// }
// 设置 处分到期时间
//rtStuDisciplinaryApplication.setExpirationDate(calculationDueDisposition(rtStuDisciplinaryApplication.getPenaltyType(), rtStuDisciplinaryApplication.getViolationDate()));
rtStuDisciplinaryApplication.setExpirationDate(calculationDueDisposition(rtStuDisciplinaryApplication.getPenaltyType(), rtStuDisciplinaryApplication.getDisciplinaryDate()));
// }
return rtStuDisciplinaryApplicationMapper.updateRtStuDisciplinaryApplication(rtStuDisciplinaryApplication);
}
@@ -223,9 +223,9 @@ public class RtStuDisciplinaryApplicationServiceImpl extends ServiceImpl<RtStuDi
@Override
public StuDisciplinaryPenaltyNumber getStuDisciplinaryApplicationByPenaltyNumber(Long penaltyNumber) {
StuDisciplinaryPenaltyNumber stuDisciplinaryPenaltyNumber = rtStuDisciplinaryApplicationMapper.selectStuDisciplinaryApplicationByPenaltyNumber(penaltyNumber);
if (stuDisciplinaryPenaltyNumber != null){
if (stuDisciplinaryPenaltyNumber != null) {
return stuDisciplinaryPenaltyNumber;
}else{
} else {
throw new ServiceException("未找到相关处分文号信息");
}
}
@@ -302,9 +302,10 @@ public class RtStuDisciplinaryApplicationServiceImpl extends ServiceImpl<RtStuDi
}
}
@Override
public String getviolationDate(String stuNo){
return rtStuDisciplinaryApplicationMapper.getviolationDate(stuNo);
public String getviolationDate(String stuNo) {
return rtStuDisciplinaryApplicationMapper.getviolationDate(stuNo);
}
}

2
srs-system/src/main/java/com/srs/system/mapper/QgzxTeacherMapper.java
View File

@@ -46,7 +46,6 @@ public interface QgzxTeacherMapper extends BaseMapper<QgzxTeacher> {
*/
int updateQgzxTeacher(QgzxTeacher qgzxTeacher);
int updateQgzxTeacherNew(QgzxTeacher qgzxTeacher);
/**
* 删除教职工信息
*
@@ -66,4 +65,5 @@ public interface QgzxTeacherMapper extends BaseMapper<QgzxTeacher> {
public List<QgzxTeacher> selectTeacherList();
Long selectDeptCode(String ksh);
Integer insertBatchSomeColumn(@Param("list")List<QgzxTeacher> entityList);
Integer updateBatchSomeColumn(@Param("list")List<QgzxTeacher> entityList);
}

57
srs-system/src/main/resources/mapper/system/QgzxTeacherMapper.xml
View File

@@ -76,18 +76,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<insert id="insertBatchSomeColumn">
insert into qgzx_teacher(name,gender,age,employee_id,dept_id,status,create_time)
<insert id="insertBatchSomeColumn" parameterType="java.util.List">
insert into qgzx_teacher(name,gender,employee_id,dept_id,status,create_time)
values
<foreach item="entity" collection="List" separator="," open="(" close=")">
<foreach item="entity" collection="list" separator="," >
(
<if test="entity.name != null and entity.name != ''">#{entity.name},</if>
<if test="entity.gender != null and entity.gender != ''">#{entity.gender},</if>
<if test="entity.age!=null">#{entity.age},</if>
<if test="entity.employeeId != null and entity.employeeId != ''">#{entity.employeeId},</if>
<if test="entity.deptId!=null">#{entity.deptId},</if>
<if test="entity.status != null and entity.status != ''">#{entity.status},</if>
<if test="entity.createTime!=null">#{entity.createTime},</if>
<if test="entity.name != null and entity.name != ''">#{entity.name}</if>,
<if test="entity.gender != null and entity.gender != ''">#{entity.gender}</if>,
<if test="entity.employeeId != null and entity.employeeId != ''">#{entity.employeeId}</if>,
<if test="entity.deptId !=null">#{entity.deptId}</if>,
<if test="entity.status != null and entity.status != ''">#{entity.status}</if>,
<if test="entity.createTime !=null">#{entity.createTime}</if>
)
</foreach>
</insert>
@@ -122,6 +121,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
where employee_id = #{employeeId}
</update>
<update id="updateBatchSomeColumn" parameterType="java.util.List">
UPDATE qgzx_teacher
<set>
<!-- 批量更新姓名字段：根据主键匹配对应值 -->
name = CASE
<foreach collection="list" item="item" separator="">
WHEN employee_id = #{item.employeeId} THEN #{item.name}
</foreach>
END,
<!-- 批量更新性别编码字段：可同时更新多个字段 -->
gender = CASE
<foreach collection="list" item="item" separator="">
WHEN employee_id = #{item.employeeId} THEN #{item.gender}
</foreach>
END,
<!-- 批量更新所属部门编码字段 -->
dept_id = CASE
<foreach collection="list" item="item" separator="">
WHEN employee_id = #{item.employeeId} THEN #{item.deptId}
</foreach>
END,
status = CASE
<foreach collection="list" item="item" separator="">
WHEN employee_id = #{item.employeeId} THEN #{item.status}
</foreach>
END,
update_time = CASE
<foreach collection="list" item="item" separator="">
WHEN employee_id = #{item.employeeId} THEN #{item.updateTime}
</foreach>
END
</set>
<!-- 关键：通过主键过滤，只更新传入的数据集 -->
WHERE employee_id IN
<foreach collection="list" item="item" open="(" separator="," close=")">
#{item.employeeId}
</foreach>
</update>
<delete id="deleteQgzxTeacherByTeacherId" parameterType="Long">
delete from qgzx_teacher where teacher_id = #{teacherId}

25
srs-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@@ -291,19 +291,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
nick_name,
sex,
password,
status,
create_time
)
values
<foreach collection="userList" item="item" index="i" separator=",">
(
#{item.userName},
<if test="item.deptId != null">#{item.deptId}</if>
<if test="item.deptId == null">null</if>,
#{item.nickName},
<if test="item.sex != null">#{item.sex}</if>
<if test="item.sex == null">"2"</if>,
#{item.password},
sysdate())
#{item.userName},
<if test="item.deptId != null">#{item.deptId}</if>
<if test="item.deptId == null">null</if>,
#{item.nickName},
<if test="item.sex != null">#{item.sex}</if>
<if test="item.sex == null">'2'</if>,
#{item.password},
<if test="item.status != null">#{item.status}</if>
<if test="item.status == null">null</if>,
sysdate()
)
</foreach>
</insert>
<update id="updateUserListInfo" parameterType="java.util.List">
@@ -335,6 +339,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
when user_name=#{i.userName} then sysdate()
</foreach>
</trim>
<trim prefix="status=case" suffix="end,">
<foreach collection="studentList" item="i" index="index">
when user_name=#{i.userName} then #{i.status}
</foreach>
</trim>
</trim>
where user_name in
<foreach collection="studentList" separator="," item="i" index="index" open="(" close=")">