Merge branch 'pre'

src/main/java/com/xjrsoft/module/courseTable/service/impl/CourseTableServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.courseTable.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
@@ -8,7 +9,6 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.support.ExcelTypeEnum;
 import com.alibaba.excel.write.metadata.WriteTable;
 import com.alibaba.excel.write.metadata.style.WriteCellStyle;
 import com.alibaba.excel.write.metadata.style.WriteFont;
@@ -52,13 +52,11 @@ import com.xjrsoft.module.schedule.vo.CourseDetailVo;
 import com.xjrsoft.module.schedule.vo.CourseListVo;
 import com.xjrsoft.module.schedule.vo.CourseTableVo;
 import com.xjrsoft.module.schedule.vo.ScheduleWeekExportQueryVo;
+import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
+import com.xjrsoft.module.student.service.IBaseStudentSchoolRollService;
 import com.xjrsoft.module.teacher.entity.BaseTeacher;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import com.xjrsoft.module.teacher.service.ITeacherbaseManagerService;
-import com.xjrsoft.module.textbook.entity.SubjectGroupCourse;
-import com.xjrsoft.module.textbook.vo.TextbookClaimExportQueryVo;
-import com.xjrsoft.module.textbook.vo.TextbookIssueRecordExcelVo;
-import io.swagger.models.auth.In;
 import lombok.AllArgsConstructor;
 import org.apache.poi.ss.usermodel.BorderStyle;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
@@ -69,7 +67,6 @@ import org.apache.poi.xwpf.usermodel.XWPFParagraph;
 import org.apache.poi.xwpf.usermodel.XWPFTable;
 import org.apache.poi.xwpf.usermodel.XWPFTableCell;
 import org.apache.poi.xwpf.usermodel.XWPFTableRow;
-import org.checkerframework.checker.units.qual.C;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -83,7 +80,11 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -110,7 +111,7 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
 
     private final ClassTimeMapper classTimeMapper;
     private final BaseSemesterMapper baseSemesterMapper;
-
+    private final IBaseStudentSchoolRollService baseStudentSchoolRollService;
     private final CourseTableBakMapper courseTableBakMapper;
 
     @Override
@@ -217,7 +218,6 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
             long days = between.toDays();
             int weeks = (int) Math.ceil((double) days / 7);
             if (dto.getWeek() == null) {
-
                 for (int i = 0; i < weeks; i++) {
                     LocalDateTime startDate = startDateTime.plusDays(i * 6).withHour(0).withMinute(0).withSecond(0).withNano(0);
                     LocalDateTime endDate = startDateTime.plusDays((i + 1) * 6).withHour(23).withMinute(59).withSecond(59).withNano(9999);
@@ -250,6 +250,19 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
                 tableVo.setTeacherName(xjrUser.getName());
             }
         }
+        if(dto.getStartDate() != null && dto.getEndDate() != null){
+            if(dto.getStudentId() == null && dto.getTeacherId() == null && dto.getClassId() == null){
+                dto.setTeacherId(StpUtil.getLoginIdAsLong());
+            }else{
+                List<BaseStudentSchoolRoll> schoolRolls = baseStudentSchoolRollService.list(
+                        new QueryWrapper<BaseStudentSchoolRoll>().lambda().eq(BaseStudentSchoolRoll::getUserId, dto.getStudentId())
+                );
+                if(schoolRolls != null && !schoolRolls.isEmpty()){
+                    dto.setCourseType("class");
+                    dto.setClassId(schoolRolls.get(0).getClassId());
+                }
+            }
+        }
         List<CourseDetailVo> list = courseTableMapper.getList(dto);
         tableVo.setCourseList(list);
         tableVo.setClassHour(list.size());

src/main/java/com/xjrsoft/module/dataexpert/dto/DataExpertConditionsDto.java

@@ -1,11 +1,8 @@
 package com.xjrsoft.module.dataexpert.dto;
 
-import com.xjrsoft.module.dataexpert.vo.DataExpertTemplateFieldVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 
 /**
 * @title: 数据导出-数据源设置字段查询入参

src/main/java/com/xjrsoft/module/dataexpert/dto/DataExpertDto.java

@@ -1,12 +1,10 @@
 package com.xjrsoft.module.dataexpert.dto;
 
-import com.google.gson.JsonArray;
 import com.xjrsoft.module.dataexpert.vo.DataExpertTemplateFieldVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
-import java.util.Map;
 
 
 /**

src/main/java/com/xjrsoft/module/dataexpert/dto/DataExpertSourceFieldListDto.java

@@ -1,9 +1,7 @@
 package com.xjrsoft.module.dataexpert.dto;
 
-import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 
 /**

src/main/java/com/xjrsoft/module/dataexpert/dto/DataExpertTemplateListDto.java

@@ -1,9 +1,7 @@
 package com.xjrsoft.module.dataexpert.dto;
 
-import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 
 /**

src/main/java/com/xjrsoft/module/dataexpert/mapper/DataExpertSourceFieldMapper.java

@@ -1,7 +1,6 @@
 package com.xjrsoft.module.dataexpert.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
-import com.xjrsoft.module.dataexpert.entity.DataExpertSource;
 import com.xjrsoft.module.dataexpert.entity.DataExpertSourceField;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/xjrsoft/module/dataexpert/service/IDataExpertTemplateService.java

@@ -1,9 +1,7 @@
 package com.xjrsoft.module.dataexpert.service;
 
 import com.github.yulichang.base.MPJBaseService;
-import com.xjrsoft.module.dataexpert.dto.DataExpertSourceFieldListDto;
 import com.xjrsoft.module.dataexpert.entity.DataExpertTemplate;
-import com.xjrsoft.module.dataexpert.vo.DataExpertSourceFieldVo;
 import com.xjrsoft.module.dataexpert.vo.DataExpertTemplateFieldVo;
 
 import java.sql.SQLException;

src/main/java/com/xjrsoft/module/dataexpert/service/impl/DataExpertTemplateServiceImpl.java

@@ -2,7 +2,6 @@ package com.xjrsoft.module.dataexpert.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.db.Db;
-import cn.hutool.db.Entity;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.xjrsoft.common.constant.GlobalConstant;
@@ -13,7 +12,6 @@ import com.xjrsoft.module.dataexpert.mapper.DataExpertTemplateFieldMapper;
 import com.xjrsoft.module.dataexpert.mapper.DataExpertTemplateMapper;
 import com.xjrsoft.module.dataexpert.service.IDataExpertTemplateService;
 import com.xjrsoft.module.dataexpert.vo.DataExpertTemplateFieldVo;
-import com.xjrsoft.module.schedule.entity.JianyueData;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 

src/main/java/com/xjrsoft/module/liteflow/node/WfCourseAdjustNode.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Component;
 import java.util.Map;
 
 /**
- * 退书申请
+ * 调课规则
  */
 @Component("wf_course_adjust_node")
 public class WfCourseAdjustNode extends NodeComponent {

src/main/java/com/xjrsoft/module/room/mapper/RoomMapper.java

@@ -28,7 +28,7 @@ public interface RoomMapper extends MPJBaseMapper<Room> {
      * @param dto
      * @return
      */
-    Page<RoomPageVo> getPage(Page<RoomPageDto> page, RoomPageDto dto);
+    Page<RoomPageVo> getPage(Page<RoomPageVo> page, RoomPageDto dto);
 
     List<RoomExcelVo> getList(@Param("dto") RoomPageDto dto);
     /**

src/main/java/com/xjrsoft/module/room/service/IRoomService.java

@@ -25,7 +25,7 @@ public interface IRoomService extends MPJBaseService<Room> {
      * @param dto
      * @return
      */
-    Page<RoomPageVo> getPage(Page<RoomPageDto> page, RoomPageDto dto);
+    Page<RoomPageVo> getPage(Page<RoomPageVo> page, RoomPageDto dto);
 
     List<RoomExcelVo> getList(RoomPageDto dto);
 

src/main/java/com/xjrsoft/module/room/service/impl/RoomServiceImpl.java

@@ -45,7 +45,7 @@ public class RoomServiceImpl extends MPJBaseServiceImpl<RoomMapper, Room> implem
     private final RoomRuleMapper roomRuleRoomRuleMapper;
     private final BaseOfficeBuildMapper baseOfficeBuildMapper;
     @Override
-    public Page<RoomPageVo> getPage(Page<RoomPageDto> page, RoomPageDto dto) {
+    public Page<RoomPageVo> getPage(Page<RoomPageVo> page, RoomPageDto dto) {
         Page<RoomPageVo> result = roomMapper.getPage(page, dto);
         return result;
     }

src/main/java/com/xjrsoft/module/schedule/util/DataUtil.java

@@ -34,15 +34,13 @@ public class DataUtil {
 
     public Map<Long, String> insertClass(Db db, String tableName, Map<Long, String> gradeMap,
     Map<Long, String> teacherMap, String semesterSerialNo, Map<Long, String> ids, Map<Long, String> classroomMap) throws Exception {
-        String sql = "SELECT * FROM " + tableName + " WHERE delete_mark = 0";
+        String sql = "SELECT * FROM " + tableName + " WHERE delete_mark = 0 and is_graduate = 1";
         List<BaseClass> dataList = db.query(sql, BaseClass.class);
-        String url  = ScheduleUtil.apiUrl + "class/create";
+
         Map<Long, String> idMap = new HashMap<>();
         JsonParser jsonParser = new JsonParser();
         for (BaseClass baseClass : dataList) {
-            if(ids != null && ids.get(baseClass.getId()) != null){
-                continue;
-            }
+            String url  = ScheduleUtil.apiUrl + "class/create";
             JsonObject paramJson = new JsonObject();
             paramJson.addProperty("teacherSerialNo", teacherMap.get(baseClass.getTeacherId()));
             paramJson.addProperty("name", baseClass.getName());
@@ -51,6 +49,15 @@ public class DataUtil {
             paramJson.addProperty("eduYearSerialNo", gradeMap.get(baseClass.getGradeId()));
             paramJson.addProperty("extendId", baseClass.getId());
             paramJson.addProperty("classRoomSerialNo", classroomMap.get(baseClass.getClassroomId()));
+            if(ids != null && ids.get(baseClass.getId()) != null){
+                url  = ScheduleUtil.apiUrl + "class/update";
+                paramJson.addProperty("serialNo", ids.get(baseClass.getId()));
+                long timestamp = System.currentTimeMillis();
+                //生成签名
+                String sign = ScheduleUtil.createSign(timestamp);
+                String result = ScheduleUtil.doPost(url, paramJson.toString(), sign, timestamp);
+                continue;
+            }
 
             //获取时间戳
             long timestamp = System.currentTimeMillis();
@@ -122,7 +129,11 @@ public class DataUtil {
             }
             JsonObject paramJson = new JsonObject();
             paramJson.addProperty("registerNo", student.getRegisterNo());
-            paramJson.addProperty("gender", student.getGender());
+            if("SB10001".equals(student.getGender())){
+                paramJson.addProperty("gender", 1);
+            }else if("SB10002".equals(student.getGender())){
+                paramJson.addProperty("gender", 2);
+            }
 
             paramJson.addProperty("realName", student.getRealName());
             paramJson.addProperty("alias", student.getAlias());
@@ -165,7 +176,11 @@ public class DataUtil {
             }
             JsonObject paramJson = new JsonObject();
             paramJson.addProperty("jobNumber", user.getUserName());
-            paramJson.addProperty("gender", user.getGender());
+            if("SB10001".equals(user.getGender())){
+                paramJson.addProperty("gender", 1);
+            }else if("SB10002".equals(user.getGender())){
+                paramJson.addProperty("gender", 2);
+            }
 
             paramJson.addProperty("name", user.getName());
             paramJson.addProperty("alias", user.getNickName());
@@ -486,7 +501,7 @@ public class DataUtil {
             if(teachers.size() > 0){
                 JsonObject teacherJson = teachers.get(0).getAsJsonObject();
 //                updateSql += " and teacher_id = " + teacherMap.get(teacherJson.get("teacherSerialNo").getAsString());
-                sql += teacherMap.get(teacherJson.get("teacherSerialNo").getAsString()) + ","
+                sql += (teacherMap.get(teacherJson.get("teacherSerialNo").getAsString())==null?0:teacherMap.get(teacherJson.get("teacherSerialNo").getAsString())) + ","
                     + "'" + teacherJson.get("name").getAsString() + "',"
                     + "'" + teacherJson.get("teacherSerialNo").getAsString() + "',";
             }else{

src/main/java/com/xjrsoft/module/schedule/vo/CourseDetailVo.java

@@ -3,6 +3,8 @@ package com.xjrsoft.module.schedule.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDate;
+
 /**
  * @author dzx
  * @date 2024/1/29
@@ -30,4 +32,7 @@ public class CourseDetailVo {
 
     @ApiModelProperty("节次")
     private String timeNumber;
+
+    @ApiModelProperty("上课日期")
+    private LocalDate scheduleDate;
 }

src/main/java/com/xjrsoft/module/student/controller/StudentManagerController.java

@@ -146,7 +146,10 @@ public class StudentManagerController {
         for (BaseStudentSchoolRollVo roll : userVo.getBaseStudentSchoolRollList()) {
             BaseClass aClass = baseClassService.getById(roll.getClassId());
             XjrUser xjrUser = xjrUserService.getById(aClass.getTeacherId());
-            roll.setTeacherName(xjrUser.getName());
+            if(xjrUser != null){
+                roll.setTeacherName(xjrUser.getName());
+            }
+
 
             String roomName = roomBedService.getRoomNameByStudentUserId(roll.getUserId());
             roll.setRoomName(roomName);

src/main/resources/mapper/base/BaseClass.xml

@@ -64,10 +64,10 @@
             and t1.classroom_id = #{dto.classroomId}
         </if>
         <if test="dto.code != null and dto.code != ''">
-            and t6.code like concat('%', #{dto.code}, '%')
+            and t1.code like concat('%', #{dto.code}, '%')
         </if>
         <if test="dto.enrollType != null and dto.enrollType != ''">
-            and t6.enroll_type = #{dto.enroll_type}
+            and t1.enroll_type = #{dto.enroll_type}
         </if>
     </select>
 

src/main/resources/mapper/courseTable/CourseTable.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xjrsoft.module.courseTable.mapper.CourseTableMapper">
     <select id="getList" parameterType="com.xjrsoft.module.schedule.dto.CourseTableDto" resultType="com.xjrsoft.module.schedule.vo.CourseDetailVo">
-        SELECT t1.course_name, t2.name AS teacher_name,CONCAT(t4.name,t3.name) AS classroom_name,t1.weeks,t1.time_period,t1.time_number,t5.name as class_name FROM course_table t1
+        SELECT t1.course_name, t2.name AS teacher_name,CONCAT(t4.name,t3.name) AS classroom_name,t1.weeks,t1.time_period,t1.time_number,t5.name as class_name,t1.schedule_date FROM course_table t1
         LEFT JOIN xjr_user t2 ON t1.teacher_id = t2.id
         LEFT JOIN base_classroom t3 ON t1.site_id = t3.id
         LEFT JOIN base_office_build t4 ON t3.office_build_id = t4.id
@@ -41,6 +41,12 @@
         <if test="dto.toDay != null">
             and t1.schedule_date = #{dto.toDay}
         </if>
+        <if test="dto.teacherId != null">
+            and t1.teacher_id = #{dto.teacherId}
+        </if>
+        <if test="dto.classId != null">
+            and t5.id = #{dto.classId}
+        </if>
     </select>
     <select id="getAdjustList" parameterType="com.xjrsoft.module.schedule.dto.CourseTableAdjustDto" resultType="com.xjrsoft.module.schedule.vo.CourseListVo">
         SELECT t1.time_period,t1.time_number,t1.course_name,t2.name AS class_name,t3.name AS classroom_name,t1.id,t2.id as class_id FROM course_table t1

src/test/java/com/xjrsoft/module/job/JianyuekbBaseDataTaskTest.java

@@ -0,0 +1,105 @@
+package com.xjrsoft.module.job;
+
+import cn.hutool.db.Db;
+import cn.hutool.extra.spring.SpringUtil;
+import com.google.gson.JsonArray;
+import com.xjrsoft.XjrSoftApplication;
+import com.xjrsoft.common.constant.GlobalConstant;
+import com.xjrsoft.common.utils.DatasourceUtil;
+import com.xjrsoft.module.schedule.entity.JianyueData;
+import com.xjrsoft.module.schedule.util.DataUtil;
+import org.junit.jupiter.api.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import javax.sql.DataSource;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author dzx
+ * @date 2024/4/30
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = XjrSoftApplication.class)
+class JianyuekbBaseDataTaskTest {
+
+
+    @Test
+    public void RefreshConnectionPool() {
+        DataSource datasource = DatasourceUtil.getDataSource(GlobalConstant.DEFAULT_DATASOURCE_KEY);
+        try {
+            Db use = Db.use(datasource);
+            String sql = "SELECT distinct table_name FROM jianyue_data WHERE 1 = 1";
+            List<JianyueData> query = use.query(sql, JianyueData.class);
+            Set<String> tables = new HashSet<>();
+            for (JianyueData jianyueData : query) {
+                tables.add(jianyueData.getTableName());
+            }
+            sql = "SELECT * FROM jianyue_data WHERE 0 = 0";
+            List<JianyueData> list = use.query(sql, JianyueData.class);
+            Map<String, Map<Long, String>> dataMap = new HashMap<>();
+            for (String table : tables) {
+                Map<Long, String> tableData = new HashMap<>();
+                for (JianyueData jianyueData : list) {
+                    if(!table.equals(jianyueData.getTableName())){
+                        continue;
+                    }
+                    tableData.put(jianyueData.getSourceId(), jianyueData.getJianyueId());
+                }
+                dataMap.put(table, tableData);
+            }
+            DataUtil dataUtil = new DataUtil();
+            //查询校区
+            JsonArray schoolDistrictData = dataUtil.getSchoolDistrictData();
+            //推送年级
+            String tableName = "base_grade";
+            Map<Long, String> grade = dataUtil.insertGrade(use, tableName, schoolDistrictData.get(0).getAsString(), dataMap.get(tableName));
+            if(grade.isEmpty() && dataMap.get(tableName) != null){
+                grade = dataMap.get(tableName);
+            }
+
+            //推送学期
+            tableName = "base_semester";
+            dataUtil.insertSemester(use, tableName, dataMap.get(tableName));
+            //推送标签
+            tableName = "base_label";
+            Map<Long, String> tagMap = dataUtil.insertCourseTag(use, tableName, dataMap.get(tableName));
+            if(tagMap.isEmpty() && dataMap.get(tableName) != null){
+                tagMap = dataMap.get(tableName);
+            }
+            //推送课程
+            tableName = "base_course_subject";
+            dataUtil.insertCourse(use, tableName, dataMap.get(tableName), tagMap);
+            //推送教职工
+            tableName = "base_teacher";
+            Map<Long, String> teacherMap = dataUtil.insertTeacher(use, tableName, dataMap.get(tableName));
+            if(teacherMap.isEmpty() && dataMap.get(tableName) != null){
+                teacherMap = dataMap.get(tableName);
+            }
+            //推送学生
+            tableName = "base_student";
+            dataUtil.insertStudent(use, tableName, grade, dataMap.get(tableName));
+            //推送教室
+            tableName = "base_classroom";
+            Map<Long, String> classroomMap = dataUtil.insertClassRoom(use, tableName, schoolDistrictData.get(0).getAsString(), dataMap.get(tableName));
+            if(classroomMap.isEmpty() && dataMap.get(tableName) != null){
+                classroomMap = dataMap.get(tableName);
+            }
+            //推送行政班，先查询当前学期id
+            String currenSemeter = dataUtil.getCurrenSemeter();
+            tableName = "base_class";
+            dataUtil.insertClass(use, tableName, grade, teacherMap, currenSemeter, dataMap.get(tableName), classroomMap);
+
+        } catch (Exception e) {
+        }
+    }
+
+}

src/test/java/com/xjrsoft/xjrsoftboot/ScheduleFlowTest.java

@@ -31,6 +31,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 // 简约课表测试
 //@RunWith(SpringRunner.class)
@@ -94,17 +95,17 @@ public class ScheduleFlowTest {
         System.out.println("sign:" + sign);
 
         //查询校区id
-//        String schoolDistrictId = insertSchoolDistrictData(sign, timestamp);
-//        System.out.println("schoolDistrictId:" + schoolDistrictId);
-//        //新增年级，并返回添加好的年级id
-//        Map<Long, String> gradeMap = insertGrade(sign, timestamp, schoolDistrictId);
+        String schoolDistrictId = insertSchoolDistrictData(sign, timestamp);
+        System.out.println("schoolDistrictId:" + schoolDistrictId);
         //新增年级，并返回添加好的年级id
+//        Map<Long, String> gradeMap = insertGrade(sign, timestamp, schoolDistrictId);
+//        //新增年级，并返回添加好的年级id
 //        insertSemester(sign, timestamp);
 //        //新增课程
 //        insertCourse(sign, timestamp);
 //        //新增教师
 //        insertTeacher(sign, timestamp);
-
+//
 //        insertStudent(sign, timestamp, gradeMap);
 //
 //        insertClassRoom(sign, timestamp,schoolDistrictId);