sdsd

src/main/java/com/template/AutoCode.java

@@ -56,7 +56,7 @@ public class AutoCode {
         mpg.setPackageInfo(pc);
         //4、策略配置
         StrategyConfig strategy = new StrategyConfig();
-        strategy.setInclude("smart_teaching"); // 设置要映射的表名"smart_class","smart_grade","smart_attendance"
+        strategy.setInclude("smart_section","smart_section_detail"); // 设置要映射的表名"smart_class","smart_grade","smart_attendance"
         strategy.setNaming(NamingStrategy.underline_to_camel);//下划线转驼峰
         strategy.setColumnNaming(NamingStrategy.underline_to_camel);//下划线转驼峰
         strategy.setEntityLombokModel(true); // 自动lombok；

src/main/java/com/template/api/SmartSectionControllerAPI.java

@@ -0,0 +1,20 @@
+package com.template.api;
+
+
+import com.template.model.request.insertSmartUserRequest;
+import com.template.model.result.CommonResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@RequestMapping("/api/smartSection")
+@Api(tags = {"SmartSectionControllerAPI"}, value = "分段接口")
+public interface SmartSectionControllerAPI {
+    @PostMapping(value = "/insertSection")
+    @ApiOperation(value = "添加分段数据", notes = "添加分段数据", httpMethod = "POST")
+    CommonResult insertSection(@Validated @RequestBody insertSmartUserRequest isur, BindingResult bindingResult);
+}

src/main/java/com/template/api/SmartSectionDetailControllerAPI.java

@@ -0,0 +1,11 @@
+package com.template.api;
+
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@RequestMapping("/api/smartSectionDetail")
+@Api(tags = {"SmartSectionDetailControllerAPI"}, value = "分段明细接口")
+public interface SmartSectionDetailControllerAPI {
+
+}

src/main/java/com/template/controller/SmartDataSourceController.java

@@ -3,6 +3,7 @@ package com.template.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageInfo;
+import com.template.annotation.DESRespondSecret;
 import com.template.api.SmartDataSourceControllerAPI;
 import com.template.common.utils.AesUtils;
 import com.template.common.utils.CommonUtil;
@@ -35,6 +36,7 @@ import java.util.Map;
  * @since 2023-12-05
  */
 @RestController
+@DESRespondSecret
 public class SmartDataSourceController implements SmartDataSourceControllerAPI {
 
     @Autowired
@@ -57,6 +59,7 @@ public class SmartDataSourceController implements SmartDataSourceControllerAPI {
      * @return
      */
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult insertSmartDataSource(SmartDataSource smartDataSource, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
@@ -98,6 +101,7 @@ public class SmartDataSourceController implements SmartDataSourceControllerAPI {
      * @return
      */
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult vcoSmartDataSource(SmartDataSource smartDataSource, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
@@ -117,6 +121,7 @@ public class SmartDataSourceController implements SmartDataSourceControllerAPI {
      * @return
      */
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult updateSmartDataSourceById(SmartDataSource smartDataSource, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
@@ -150,6 +155,7 @@ public class SmartDataSourceController implements SmartDataSourceControllerAPI {
      * @return
      */
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult queryPageSmartDataSources(int currentPage, int pageCount, SmartDataSource smartDataSource) {
         PageInfo<SmartDataSource> result = smartDataSourceService.queryPageSmartDataSources(currentPage, pageCount, smartDataSource);
 
@@ -157,6 +163,7 @@ public class SmartDataSourceController implements SmartDataSourceControllerAPI {
     }
 
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult querySmartDataSourceById(int id) {
         SmartDataSource smartDataSource = smartDataSourceService.querySmartDataSourceById(id);
         return CommonResult.ok(smartDataSource);
@@ -164,6 +171,7 @@ public class SmartDataSourceController implements SmartDataSourceControllerAPI {
 
 
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult deleteSmartDataSourceById(int id, HttpServletRequest httpServletRequest) {
 
         SmartDataSource data = smartDataSourceService.getSmartById(id);

src/main/java/com/template/controller/SmartDataTaskController.java

@@ -3,6 +3,7 @@ package com.template.controller;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.github.pagehelper.PageInfo;
+import com.template.annotation.DESRespondSecret;
 import com.template.api.SmartDataTaskControllerAPI;
 import com.template.common.utils.AesUtils;
 import com.template.common.utils.CommonUtil;
@@ -30,6 +31,7 @@ import java.util.Map;
  * @since 2023-12-05
  */
 @RestController
+@DESRespondSecret
 public class SmartDataTaskController implements SmartDataTaskControllerAPI {
 
     @Autowired
@@ -42,6 +44,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
     private SmartDataSourceLogService smartDataSourceLogService;
 
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult createJob(SmartDataTask smartDataTask, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
@@ -66,6 +69,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
     }
 
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult pauseJob(SmartDataTask smartDataTask, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
@@ -90,6 +94,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
     }
 
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult resumeJob(SmartDataTask smartDataTask, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
@@ -114,6 +119,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
     }
 
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult updateJob(SmartDataTask smartDataTask, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
@@ -137,6 +143,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
     }
 
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult deleteJob(SmartDataTask smartDataTask, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
@@ -161,6 +168,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
     }
 
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult runOnceJob(SmartDataTask smartDataTask, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
@@ -187,6 +195,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
     /**
      * 部门
      */
+    @DESRespondSecret(validated = true)
     public CommonResult getDepart() {
         Map<String, Object> result = smartDataTaskService.getDepart();
         if (Integer.parseInt((String) result.get("code")) == 0) {
@@ -200,6 +209,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
      * 同步策略
      */
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult getSyncPolicy() {
         Map<String, Object> result = smartDataTaskService.getSyncPolicy();
         if (Integer.parseInt((String) result.get("code")) == 0) {
@@ -213,6 +223,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
      * 交换方式
      */
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult getExchangeType() {
         Map<String, Object> result = smartDataTaskService.getExchangeType();
         if (Integer.parseInt((String) result.get("code")) == 0) {
@@ -225,6 +236,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
     /**
      * 测试sql
      */
+    @DESRespondSecret(validated = true)
     public CommonResult testSql(String json) {
         // 获取数据源id对应的数据源
         Map<String, Object> result = smartDataTaskService.testSql(json);
@@ -236,6 +248,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
     }
 
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult getTables(String json) {
         // 获取数据源id对应的数据源
         Map<String, Object> result = smartDataTaskService.getTables(json);
@@ -247,6 +260,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
     }
 
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult getViews(String json) {
         // 获取数据源id对应的数据源
         Map<String, Object> result = smartDataTaskService.getViews(json);
@@ -265,6 +279,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
      * @return
      */
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult insertSmartDataTask1(SmartDataTask smartDataTask, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
@@ -289,6 +304,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
     }
 
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult insertSmartDataTask2(JSONObject json, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
@@ -313,6 +329,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
     }
 
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult insertSmartDataTask3(SmartDataTask smartDataTask, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
@@ -344,6 +361,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
      * @return
      */
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult updateSmartDataTaskById1(SmartDataTask smartDataTask, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
@@ -369,6 +387,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
     }
 
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult updateSmartDataTaskById2(JSONObject json, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
@@ -393,6 +412,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
     }
 
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult updateSmartDataTaskById3(SmartDataTask smartDataTask, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
@@ -425,6 +445,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
      * @return
      */
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult queryPageSmartDataTasks(int currentPage, int pageCount, SmartDataTask smartDataTask) {
         PageUtils<SmartDataTask> result = smartDataTaskService.queryPageSmartDataTasks(currentPage, pageCount, smartDataTask);
 
@@ -439,6 +460,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
      * @return
      */
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult deleteSmartDataTaskById(int id, int delMethod, HttpServletRequest httpServletRequest) {
 
         SmartDataTask smartDataTask = smartDataTaskService.getSmartById(id);
@@ -505,6 +527,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
      * @return 返回
      */
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult queryPageSmartDataTaskDebug(int currentPage, int pageCount, Integer eTaskId, String startTime, String endTime) {
         PageInfo<SmartDataTaskDebug> result = smartDataTaskService.queryPageSmartDataTaskDebug(currentPage, pageCount, eTaskId, startTime, endTime);
 
@@ -520,6 +543,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
      * @return 返回
      */
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult delSmartDataTaskDebugByIds(JSONObject json, HttpServletRequest httpServletRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
@@ -544,6 +568,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
     }
 
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult queryPageSmartDataTaskLog(int currentPage, int pageCount, Integer eTaskId, String tkLogTaskName, Integer tkLogAutoManual,
                                                   Integer tkLogDsSourceId, Integer tkLogDsDestinationId,
                                                   Integer tkLogCostTime, Integer tkLogExeStatus, String startTime, String endTime) {
@@ -554,6 +579,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
     }
 
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult queryAllTask() {
         List<SmartDataTask> result = smartDataTaskService.queryAllTask();
         if (result.size() > 0) {
@@ -563,6 +589,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
         }
     }
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult queryTaskDebugSql() {
         List<SmartDataTaskSetDebugSql> result = smartDataTaskService.queryTaskDebugSql();
         if (result.size() > 0) {
@@ -573,6 +600,7 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
     }
 
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult queryTaskSetDebugSql(int tkId, int tkDebugSql) {
         int count = smartDataTaskService.queryTaskSetDebugSql(tkId, tkDebugSql);
         if (count > 0) {

src/main/java/com/template/controller/SmartSectionController.java

@@ -0,0 +1,28 @@
+package com.template.controller;
+
+
+import com.template.api.SmartSectionControllerAPI;
+import com.template.model.request.insertSmartUserRequest;
+import com.template.model.result.CommonResult;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 应用管理 前端控制器
+ * </p>
+ *
+ * @author ceshi
+ * @since 2024-05-28
+ */
+@RestController
+public class SmartSectionController implements SmartSectionControllerAPI {
+
+    @Override
+    public CommonResult insertSection(insertSmartUserRequest isur, BindingResult bindingResult) {
+        return null;
+    }
+}
+

src/main/java/com/template/controller/SmartSectionDetailController.java

@@ -0,0 +1,21 @@
+package com.template.controller;
+
+
+import com.template.api.SmartSectionDetailControllerAPI;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 应用管理 前端控制器
+ * </p>
+ *
+ * @author ceshi
+ * @since 2024-05-28
+ */
+@RestController
+public class SmartSectionDetailController implements SmartSectionDetailControllerAPI {
+
+}
+

src/main/java/com/template/controller/SmartTeachingController.java

@@ -74,12 +74,12 @@ public class SmartTeachingController implements SmartTeachingControllerAPI {
                         }
                     }
 
-                    gradeDetail.setClasses(classVos);
+                    gradeDetail.setChildren(classVos);
                     subjectVos.add(gradeDetail);
                 }
 
             }
-            subjectData.setGrades(subjectVos);
+            subjectData.setChildren(subjectVos);
             result.add(subjectData);
         }
 

src/main/java/com/template/controller/SmartUserController.java

@@ -2560,20 +2560,14 @@ public class SmartUserController implements SmartUserControllerAPI {
         int result = smartUserService.insertSmartUser(su);
         if (result > 0 && isur.getIdentityId().intValue() == eIdentityStatu.Teacher.getValue() && isur.getIsr() != null && isur.getIsr().size() > 0) {
             List<SmartTeaching> teachings = new ArrayList<>();
-            for (SubjectVo sv : isur.getIsr()) {
-                if (sv.getGrades() != null && sv.getGrades().size() > 0) {
-                    for (SubjectGradeVo sg : sv.getGrades()) {
-                        if (sg.getClasses() != null && sg.getClasses().size() > 0) {
-                            for (SubjectClassVo sc : sg.getClasses()) {
-                                SmartTeaching st = new SmartTeaching();
-                                st.setUserId(result);
-                                st.setSubjectId(sv.getId());
-                                st.setGradeId(sg.getId());
-                                st.setClassId(sc.getId());
-                                teachings.add(st);
-                            }
-                        }
-                    }
+            for (isrRequest sv : isur.getIsr()) {
+                if (sv.getIds() != null && sv.getIds().size() > 0) {
+                    SmartTeaching st = new SmartTeaching();
+                    st.setUserId(result);
+                    st.setSubjectId(sv.getIds().size() > 0 ? sv.getIds().get(0) : 0);
+                    st.setGradeId(sv.getIds().size() > 1 ? sv.getIds().get(1) : 0);
+                    st.setClassId(sv.getIds().size() > 2 ? sv.getIds().get(2) : 0);
+                    teachings.add(st);
                 }
             }
             if (teachings != null && teachings.size() > 0) {
@@ -3109,20 +3103,14 @@ public class SmartUserController implements SmartUserControllerAPI {
             if (usur.getUsr() != null && usur.getUsr().size() > 0) {
 
                 List<SmartTeaching> teachings = new ArrayList<>();
-                for (SubjectVo sv : usur.getUsr()) {
-                    if (sv.getGrades() != null && sv.getGrades().size() > 0) {
-                        for (SubjectGradeVo sg : sv.getGrades()) {
-                            if (sg.getClasses() != null && sg.getClasses().size() > 0) {
-                                for (SubjectClassVo sc : sg.getClasses()) {
-                                    SmartTeaching st = new SmartTeaching();
-                                    st.setUserId(su.getId());
-                                    st.setSubjectId(sv.getId());
-                                    st.setGradeId(sg.getId());
-                                    st.setClassId(sc.getId());
-                                    teachings.add(st);
-                                }
-                            }
-                        }
+                for (isrRequest sv : usur.getUsr()) {
+                    if (sv.getIds() != null && sv.getIds().size() > 0) {
+                        SmartTeaching st = new SmartTeaching();
+                        st.setUserId(result);
+                        st.setSubjectId(sv.getIds().size() > 0 ? sv.getIds().get(0) : 0);
+                        st.setGradeId(sv.getIds().size() > 1 ? sv.getIds().get(1) : 0);
+                        st.setClassId(sv.getIds().size() > 2 ? sv.getIds().get(2) : 0);
+                        teachings.add(st);
                     }
                 }
                 if (teachings != null && teachings.size() > 0) {
@@ -4311,7 +4299,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                             sv.setName(ownerSubjects.get(0).getSubjectName());
                             List<SubjectGradeVo> grades = new ArrayList<>();
                             List<Integer> gradeIds = ownerSubjects.stream().map(UserSubjectVo::getGradeId).distinct().collect(Collectors.toList());
-                            List<SubjectClassVo> classes = new ArrayList<>();
+
                             if (gradeIds != null && gradeIds.size() > 0) {
                                 for (Integer gradeId : gradeIds) {
                                     String gradeStr = "";
@@ -4322,6 +4310,7 @@ public class SmartUserController implements SmartUserControllerAPI {
                                     SubjectGradeVo grade = new SubjectGradeVo();
                                     grade.setId(gradeId);
                                     grade.setName(gradeStr);
+                                    List<SubjectClassVo> classes = new ArrayList<>();
                                     List<UserSubjectVo> classeSubjects = ownerSubjects.stream().filter(e -> e.getGradeId().equals(gradeId)).collect(Collectors.toList());
                                     if (classeSubjects != null && classeSubjects.size() > 0) {
                                         for (UserSubjectVo classSubject : classeSubjects) {
@@ -4331,11 +4320,11 @@ public class SmartUserController implements SmartUserControllerAPI {
                                             classes.add(classData);
                                         }
                                     }
-                                    grade.setClasses(classes);
+                                    grade.setChildren(classes);
                                     grades.add(grade);
                                 }
                             }
-                            sv.setGrades(grades);
+                            sv.setChildren(grades);
                             subjectVos.add(sv);
                         }
                     }

src/main/java/com/template/controller/Task.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.template.annotation.PassToken;
 import com.template.common.utils.CommonUtil;
 import com.template.common.utils.DBUtil;
-import com.template.common.utils.HttpsClient;
 import com.template.common.utils.QuartzJobUtils;
 import com.template.mapper.SmartDataSourceMapper;
 import com.template.mapper.SmartDataTaskMapper;
@@ -18,8 +17,6 @@ import org.quartz.JobDataMap;
 import org.quartz.JobDetail;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobKey;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.quartz.QuartzJobBean;
 import org.springframework.stereotype.Component;
@@ -42,8 +39,6 @@ public class Task extends QuartzJobBean {
 
     private int debugSqlFlag = 0;
 
-    private static Logger logger = LoggerFactory.getLogger(QuartzJobBean.class);
-
     @Override
     @PassToken
     protected void executeInternal(JobExecutionContext jobExecutionContext) {
@@ -552,8 +547,11 @@ public class Task extends QuartzJobBean {
                 // 说明有需要更新的列
                 if (stringUpdateData.length() > 0) {
                     stringUpdateData.setLength(stringUpdateData.length() - 1);
-                    this.saveDebugMsg(tkId, tkTaskName, datetime, stringUpdateData.toString());
+                    if (debugSqlFlag == 1) {
+                        this.saveDebugMsg(tkId, tkTaskName, datetime, stringUpdateData.toString());
+                    }
                 }
+
                 // 查询是否存在该主键的记录sql
                 String destinationQuerySql = "SELECT * FROM " + destinationTable + " WHERE " + stringDestinationPk;
                 // 调试输出sql
@@ -703,13 +701,13 @@ public class Task extends QuartzJobBean {
             // 保存错误信息到数据库
             int i = smartDataTaskMapper.insertErrorMsg(smartDataTaskDebug);
             if (i == 0) {
-                logger.info(datetime + "：保存错误信息失败！");
+                System.out.println(datetime + "：保存错误信息失败！");
             }
         } else {
             smartDataTaskDebug.setEId(returnSmartDataTaskErr.getEId());
             int i = smartDataTaskMapper.updateErrorMsg(smartDataTaskDebug);
             if (i == 0) {
-                logger.info(datetime + "：更新错误信息失败！");
+                System.out.println(datetime + "：更新错误信息失败！");
             }
         }
     }

src/main/java/com/template/mapper/SmartSectionDetailMapper.java

@@ -0,0 +1,16 @@
+package com.template.mapper;
+
+import com.template.model.pojo.SmartSectionDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 应用管理 Mapper 接口
+ * </p>
+ *
+ * @author ceshi
+ * @since 2024-05-28
+ */
+public interface SmartSectionDetailMapper extends BaseMapper<SmartSectionDetail> {
+
+}

src/main/java/com/template/mapper/SmartSectionMapper.java

@@ -0,0 +1,16 @@
+package com.template.mapper;
+
+import com.template.model.pojo.SmartSection;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 应用管理 Mapper 接口
+ * </p>
+ *
+ * @author ceshi
+ * @since 2024-05-28
+ */
+public interface SmartSectionMapper extends BaseMapper<SmartSection> {
+
+}

src/main/java/com/template/model/pojo/SmartSection.java

@@ -0,0 +1,77 @@
+package com.template.model.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 应用管理
+ * </p>
+ *
+ * @author ceshi
+ * @since 2024-05-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="SmartSection对象", description="应用管理")
+public class SmartSection implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "年级ID")
+    private Integer gradeId;
+
+    @ApiModelProperty(value = "学期ID")
+    private Integer termId;
+
+    @ApiModelProperty(value = "考试类型 多个数据用逗号隔开")
+    private String examType;
+
+    @ApiModelProperty(value = "及格线")
+    private Double passLine;
+
+    @ApiModelProperty(value = "良好线")
+    private Double goodLine;
+
+    @ApiModelProperty(value = "优秀线")
+    private Double excellentLine;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    @ApiModelProperty(value = "创建人员")
+    @TableField(fill = FieldFill.INSERT)
+    private String createUser;
+
+    @ApiModelProperty(value = "更新人员")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateUser;
+
+    @ApiModelProperty(value = "逻辑删除 未删除：0；删除：1")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleted;
+
+
+}

src/main/java/com/template/model/pojo/SmartSectionDetail.java

@@ -0,0 +1,71 @@
+package com.template.model.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 应用管理
+ * </p>
+ *
+ * @author ceshi
+ * @since 2024-05-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="SmartSectionDetail对象", description="应用管理")
+public class SmartSectionDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "分段ID")
+    private Integer sectionId;
+
+    @ApiModelProperty(value = "科目ID")
+    private Integer subjectId;
+
+    @ApiModelProperty(value = "科目名称")
+    private String subjectName;
+
+    @ApiModelProperty(value = "分制")
+    private Integer score;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    @ApiModelProperty(value = "创建人员")
+    @TableField(fill = FieldFill.INSERT)
+    private String createUser;
+
+    @ApiModelProperty(value = "更新人员")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateUser;
+
+    @ApiModelProperty(value = "逻辑删除 未删除：0；删除：1")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleted;
+
+
+}

src/main/java/com/template/model/request/insertSectionRequest.java

@@ -0,0 +1,63 @@
+package com.template.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-12-04
+ */
+@Data
+public class insertSectionRequest {
+
+    /**
+     * 年级ID
+     */
+    @NotNull(message = "年级不能为空")
+    private Integer gradeId;
+
+    /**
+     * 学期ID
+     */
+    @NotNull(message = "学期不能为空")
+    private Integer termId;
+
+    /**
+     * 考试类型
+     */
+    @NotEmpty(message = "考试类型不能为空")
+    private List<Integer> examType;
+
+    /**
+     * 及格线
+     */
+    @NotNull(message = "及格线不能为空")
+    private Double passLine;
+
+    /**
+     * 良好线
+     */
+    @NotNull(message = "良好线不能为空")
+    private Double goodLine;
+
+    /**
+     * 优秀线
+     */
+    @NotNull(message = "优秀线不能为空")
+    private Double excellentLine;
+
+    /**
+     * 科目明细集合
+     */
+    List<String> sdsd;
+
+}

src/main/java/com/template/model/request/insertSmartUserRequest.java

@@ -141,6 +141,6 @@ public class insertSmartUserRequest {
     /**
      * 任课数据
      */
-    private List<SubjectVo> isr;
+    private List<isrRequest> isr;
 
 }

src/main/java/com/template/model/request/isrRequest.java

@@ -0,0 +1,26 @@
+package com.template.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-12-04
+ */
+@Data
+public class isrRequest {
+
+    /**
+     * 任课数据
+     */
+    private List<Integer> ids;
+
+}

src/main/java/com/template/model/request/sectionDetailRequest.java

@@ -0,0 +1,62 @@
+package com.template.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-12-04
+ */
+@Data
+public class sectionDetailRequest {
+
+    /**
+     * 年级ID
+     */
+    @NotNull(message = "年级不能为空")
+    private Integer gradeId;
+
+    /**
+     * 学期ID
+     */
+    @NotNull(message = "学期不能为空")
+    private Integer termId;
+
+    /**
+     * 考试类型
+     */
+    @NotEmpty(message = "考试类型不能为空")
+    private List<Integer> examType;
+
+    /**
+     * 及格线
+     */
+    @NotNull(message = "及格线不能为空")
+    private Double passLine;
+
+    /**
+     * 良好线
+     */
+    @NotNull(message = "良好线不能为空")
+    private Double goodLine;
+
+    /**
+     * 优秀线
+     */
+    @NotNull(message = "优秀线不能为空")
+    private Double excellentLine;
+
+    /**
+     * 科目明细集合
+     */
+    List<String> sdsd;
+
+}

src/main/java/com/template/model/request/updateSmartUserRequest.java

@@ -165,5 +165,5 @@ public class updateSmartUserRequest {
     /**
      * 任课数据
      */
-    private List<SubjectVo> usr;
+    private List<isrRequest> usr;
 }

src/main/java/com/template/model/vo/SubjectGradeVo.java

@@ -19,5 +19,5 @@ public class SubjectGradeVo {
     /**
      * 班级集合
      */
-    private List<SubjectClassVo> classes;
+    private List<SubjectClassVo> children;
 }

src/main/java/com/template/model/vo/SubjectVo.java

@@ -19,5 +19,5 @@ public class SubjectVo {
     /**
      * 年级集合
      */
-    private List<SubjectGradeVo> grades;
+    private List<SubjectGradeVo> children;
 }

src/main/java/com/template/services/SmartSectionDetailService.java

@@ -0,0 +1,16 @@
+package com.template.services;
+
+import com.template.model.pojo.SmartSectionDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 应用管理 服务类
+ * </p>
+ *
+ * @author ceshi
+ * @since 2024-05-28
+ */
+public interface SmartSectionDetailService extends IService<SmartSectionDetail> {
+
+}

src/main/java/com/template/services/SmartSectionService.java

@@ -0,0 +1,16 @@
+package com.template.services;
+
+import com.template.model.pojo.SmartSection;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 应用管理 服务类
+ * </p>
+ *
+ * @author ceshi
+ * @since 2024-05-28
+ */
+public interface SmartSectionService extends IService<SmartSection> {
+
+}

src/main/java/com/template/services/impl/SmartDataTaskServiceImpl.java

@@ -26,13 +26,11 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -45,7 +43,7 @@ import java.util.regex.Pattern;
  * @since 2023-12-05
  */
 @Service
-public class SmartDataTaskServiceImpl extends ServiceImpl<SmartDataTaskMapper , SmartDataTask> implements SmartDataTaskService {
+public class SmartDataTaskServiceImpl extends ServiceImpl<SmartDataTaskMapper, SmartDataTask> implements SmartDataTaskService {
 
     @Autowired
     private SmartDataTaskMapper smartDataTaskMapper;
@@ -750,6 +748,19 @@ public class SmartDataTaskServiceImpl extends ServiceImpl<SmartDataTaskMapper ,
             return CommonUtil.getReturnMap(String.valueOf(1), "任务调度cron表达式为空！该任务未设置【定时信息】！");
         }
 
+        // 生成cron表达式
+        if (smartDataTask_return.getTkCron().isEmpty()) {
+            // 获取当前时间
+            Calendar calendar = Calendar.getInstance();
+            // 当前时间加3秒
+            calendar.add(Calendar.SECOND, 3);
+            Date newTime = calendar.getTime();
+            // 格式化时间
+            SimpleDateFormat dateFormat = new SimpleDateFormat("ss mm HH dd MM ? yyyy");
+            String cronExpression = dateFormat.format(newTime);
+            smartDataTask_return.setTkCron(cronExpression);
+        }
+
         Map<String, Object> returnMap = QuartzJobUtils.createScheduleJob(scheduler, smartDataTask_return);
         if ("0".equals(returnMap.get("code"))) {
             smartDataTask.setTkId(smartDataTask_return.getTkId());

src/main/java/com/template/services/impl/SmartSectionDetailServiceImpl.java

@@ -0,0 +1,20 @@
+package com.template.services.impl;
+
+import com.template.model.pojo.SmartSectionDetail;
+import com.template.mapper.SmartSectionDetailMapper;
+import com.template.services.SmartSectionDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 应用管理 服务实现类
+ * </p>
+ *
+ * @author ceshi
+ * @since 2024-05-28
+ */
+@Service
+public class SmartSectionDetailServiceImpl extends ServiceImpl<SmartSectionDetailMapper, SmartSectionDetail> implements SmartSectionDetailService {
+
+}

src/main/java/com/template/services/impl/SmartSectionServiceImpl.java

@@ -0,0 +1,20 @@
+package com.template.services.impl;
+
+import com.template.model.pojo.SmartSection;
+import com.template.mapper.SmartSectionMapper;
+import com.template.services.SmartSectionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 应用管理 服务实现类
+ * </p>
+ *
+ * @author ceshi
+ * @since 2024-05-28
+ */
+@Service
+public class SmartSectionServiceImpl extends ServiceImpl<SmartSectionMapper, SmartSection> implements SmartSectionService {
+
+}