区域添加升级时间限制，学校升级时间段判断

sapi/src/main/java/com/xhkjedu/sapi/controller/system/SchoolController.java

@@ -9,6 +9,7 @@ import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
 import com.xhkjedu.vo.ResultVo;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,6 +25,7 @@ import java.util.Map;
  * @description
  * @date 2020/6/2 15:06
  **/
+@Slf4j
 @RestController
 @RequestMapping("/school")
 public class SchoolController {
@@ -69,19 +71,39 @@ public class SchoolController {
         return new ResultVo(0,"获取列表成功",pageResult);
     }
 
+    /*
+    * @Description 检测学年升级
+    * @Author WN
+    * @Date 2023/6/15 11:40:10
+    */
+    @PostMapping("/check_upgrade")
+    public ResultVo checkUpgrade(@RequestBody TSchool tSchool) {
+        Integer schoolid = tSchool.getSchoolid();
+        N_Utils.validation(new Object[]{schoolid,"学校id",1});
+
+        try {
+            Map rtnmap = schoolService.checkSchoolUpgrade(schoolid);
+            return new ResultVo(0,"成功检测学年升级",rtnmap);
+        } catch (Exception e) {
+            log.error("检测学年升级失败：" + e.getMessage());
+            return new ResultVo(1,"检测学年升级失败");
+        }
+    }
+
     //学年升级
     @PostMapping("/upgrade")
     public ResultVo upgrade(@RequestBody TSchool tSchool) {
         Integer schoolid = tSchool.getSchoolid();
-        Integer year = schoolService.getYearById(schoolid);
         N_Utils.validation(new Object[]{schoolid,"学校id",1});
+        Integer year = schoolService.getYearById(schoolid);
         Integer nowYear = N_Utils.getNodeDateTime("year");//当前年份
         if (year >= nowYear) return new ResultVo(1,"当前学年不用升级");
         try {
             schoolService.upgrade(schoolid, year);
             return new ResultVo(0,"学年升级成功");
         } catch (Exception e) {
-            return new ResultVo(1,e.getMessage());
+            log.error("学年升级失败：" + e.getMessage());
+            return new ResultVo(1,"学年升级失败");
         }
     }
 

sapi/src/main/java/com/xhkjedu/sapi/mapper/cloud/CloudMapper.java

@@ -18,4 +18,7 @@ public interface CloudMapper extends TkMapper<TCloud> {
 
     //区域学段列表
     List<Integer> listLevel();
+
+    //获取区域升级时间段限制
+    TCloud getCloudUpTime();
 }

sapi/src/main/java/com/xhkjedu/sapi/model/cloud/TCloud.java

@@ -62,4 +62,10 @@ public class TCloud extends BaseBean {
 
     //区地区显示json
     private String cloudmap;
+
+    //学年升级开始时间
+    private String starttime;
+
+    //学年升级结束时间
+    private String stoptime;
 }

sapi/src/main/java/com/xhkjedu/sapi/service/system/SchoolService.java

@@ -1,7 +1,9 @@
 package com.xhkjedu.sapi.service.system;
 
+import com.xhkjedu.sapi.mapper.cloud.CloudMapper;
 import com.xhkjedu.sapi.mapper.gradeclass.*;
 import com.xhkjedu.sapi.mapper.system.*;
+import com.xhkjedu.sapi.model.cloud.TCloud;
 import com.xhkjedu.sapi.model.gradeclass.*;
 import com.xhkjedu.sapi.model.system.*;
 import com.xhkjedu.sapi.utils.ApiUtil;
@@ -54,6 +56,8 @@ public class SchoolService {
     private UserRoleMapper userRoleMapper;
     @Resource
     private SchoolFriendMapper schoolFriendMapper;
+    @Resource
+    private CloudMapper cloudMapper;
 
     //添加
     @Transactional(rollbackFor = Exception.class)
@@ -230,6 +234,31 @@ public class SchoolService {
         return schoolMapper.findAll();
     }
 
+    public Map checkSchoolUpgrade(Integer schoolid) throws Exception{
+        Map rtnMap = new HashMap();
+        TCloud cloud = cloudMapper.getCloudUpTime();
+        boolean isup = false;
+        if(ApiUtil.compareCurrDateTime(cloud.getStarttime(),cloud.getStoptime())){
+            isup = true;
+        }
+
+        //获取当前学校的学年
+        int year = schoolMapper.getYearById(schoolid);
+
+        Integer nowYear = N_Utils.getNodeDateTime("year");//当前年份
+        //如果学校年份大于等于当前年份无需升级
+        if(year >= nowYear){
+            isup = false;
+        }
+
+        rtnMap.put("isup",isup);
+        rtnMap.put("year",year);
+        rtnMap.put("upyear",(year + 1));//学年升级之后年份
+        rtnMap.put("starttime",cloud.getStarttime());
+        rtnMap.put("stoptime",cloud.getStoptime());
+        return rtnMap;
+    }
+
     /**
      * 学年升级
      * @Param [schoolid, year]
@@ -239,6 +268,12 @@ public class SchoolService {
      **/
     @Transactional(rollbackFor = Exception.class)
     public void upgrade(Integer schoolid, Integer year) throws Exception {
+        //获取区域限制学年升级时间
+        TCloud cloud = cloudMapper.getCloudUpTime();
+        if(!ApiUtil.compareCurrDateTime(cloud.getStarttime(),cloud.getStoptime())){
+           throw new Exception("不在学年升级时间范围，禁止升级");
+        }
+
         try {
             List<TClass> classes = classMapper.listClassBySchoolId(schoolid, year);//要升级的班级列表
             if (N_Utils.isListNotEmpty(classes)) {

sapi/src/main/java/com/xhkjedu/sapi/utils/ApiUtil.java

@@ -1,6 +1,7 @@
 package com.xhkjedu.sapi.utils;
 
 import com.xhkjedu.sapi.config.ConfigKey;
+import com.xhkjedu.utils.N_Utils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -10,7 +11,9 @@ import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -65,4 +68,32 @@ public class ApiUtil {
             return null;
         }
     }
+
+    /*
+    * @Description 比较当前时间和时间段
+    * @Author WN
+    * @Date 2023/6/15 11:24:59
+    */
+    public static boolean compareCurrDateTime(String starttimeStr,String stoptimeStr) throws Exception{
+        boolean rtn = false;
+        if(N_Utils.isEmpty(starttimeStr) || N_Utils.isEmpty(stoptimeStr)){
+            rtn = false;
+        }else{
+            SimpleDateFormat sdf = new SimpleDateFormat("MM-dd HH:mm");
+
+            Date starttime = sdf.parse(starttimeStr); //开始时间
+            Date stoptime = sdf.parse(stoptimeStr); //结束时间
+
+            Date nowtime = new Date();
+            String times = sdf.format(nowtime);
+            Date currtime = sdf.parse(times);//当前时间
+
+            //当前时间在开始时间之前或者等于开始时间  并且 当前时间在结束时间之后或者等于结束时间
+            if((starttime.before(currtime) || starttime.equals(currtime)) && (stoptime.after(currtime) || stoptime.equals(currtime))){
+                rtn = true;
+            }
+        }
+
+        return rtn;
+    }
 }

sapi/src/main/resources/mapper/cloud/CloudMapper.xml

@@ -21,6 +21,8 @@
           <if test="cloud.stuweb!=null">stuweb=#{cloud.stuweb},</if>
           <if test="cloud.tesupport!=null">tesupport=#{cloud.tesupport},</if>
           <if test="cloud.recordno!=null">recordno=#{cloud.recordno},</if>
+          <if test="cloud.starttime!=null">starttime=#{cloud.starttime},</if>
+          <if test="cloud.stoptime!=null">stoptime=#{cloud.stoptime},</if>
       </trim>
         WHERE cloudid=#{cloud.cloudid}
     </update>
@@ -32,4 +34,9 @@
     <select id="listLevel" resultType="java.lang.Integer">
         select schoollevel from t_school where schoolstate=1 group by schoollevel order by schoollevel
     </select>
+
+    <!--获取区域升级时间段限制-->
+    <select id="getCloudUpTime" resultType="com.xhkjedu.sapi.model.cloud.TCloud">
+        select starttime,stoptime from t_cloud limit 1
+    </select>
 </mapper>

sclass/src/main/resources/mapper/classroom/ClassroomMapper.xml

@@ -464,7 +464,7 @@
         group by cs.studentid order by convert(u.username using gbk)
     </select>-->
     <select id="listStudent" resultType="java.util.Map">
-        select cs.studentid,u.username studentname
+        select cs.studentid,u.username studentname,u.headpic
         from t_class_student cs left join t_user u on cs.studentid=u.userid
         where cs.classid=#{classid}
         group by cs.studentid order by convert(u.username using gbk)