Merge remote-tracking branch 'origin/master' into ywx

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

@@ -37,17 +37,18 @@ public class ModuleController {
     @PostMapping("/list")
     public ResultVo listModules(@RequestBody TModule module){
         N_Utils.validation(new Object[]{module.getSchoolid(),"学校id",1,module.getModuletype(),"模块归属",1});
-        List<TModule> lst = moduleService.listModules(module.getSchoolid(), module.getModuletype(), 1);
+        List<TModule> lst = moduleService.listModules(module.getSchoolid(), module.getModuletype(), module.getDisplay());
         return new ResultVo(0,"获取应用集合成功",lst);
     }
 
     @PostMapping("/list2")
     public ResultVo listModules2(@RequestBody TModule module){
         N_Utils.validation(new Object[]{module.getSchoolid(),"学校id",1,module.getModuletype(),"模块归属",1});
-        List<TModule> lst = moduleService.listModules(module.getSchoolid(), module.getModuletype(), 1);
+        List<TModule> lst = moduleService.listModules(module.getSchoolid(), module.getModuletype(), module.getDisplay());
         return new ResultVo(0,"获取应用集合成功",lst);
     }
 
+    //学生网页端模块获取
     @PostMapping("/list_stu")
     public ResultVo listStuModules(@RequestBody TModule module){
         N_Utils.validation(new Object[]{module.getSchoolid(),"学校id",1,module.getModuletype(),"模块归属",1});
@@ -160,4 +161,20 @@ public class ModuleController {
         List<Map> list = moduleService.listForSel2(schoolid, moduletype);
         return new ResultVo(0,"获取模块选择列表成功", list);
     }
+
+    //设置显示
+    @PostMapping("/dis")
+    public ResultVo updateModuleDisplay(@RequestBody TModule module){
+        N_Utils.validation(new Object[]{module.getModuleid(),"模块id",2});
+        moduleService.updateModuleDisplay(module.getModuleid(),1);
+        return new ResultVo(0,"设置模块显示成功");
+    }
+
+    //设置模块不显示
+    @PostMapping("/nodis")
+    public ResultVo updateModuleNoDisplay(@RequestBody TModule module){
+        N_Utils.validation(new Object[]{module.getModuleid(),"模块id",2});
+        moduleService.updateModuleDisplay(module.getModuleid(),10);
+        return new ResultVo(0,"设置模块不显示成功");
+    }
 }

sapi/src/main/java/com/xhkjedu/sapi/mapper/system/ModuleMapper.java

@@ -58,4 +58,7 @@ public interface ModuleMapper extends TkMapper<TModule> {
 
     //批量保存
     void batchSave(@Param("modules") List<TModule> modules);
+
+    //修改模块状态
+    void updateModuleDisplay(@Param("moduleid") String moduleid, @Param("display") Integer display);
 }

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

@@ -194,4 +194,9 @@ public class ModuleService {
     public void batchSave(List<TModule> modules) {
         moduleMapper.batchSave(modules);
     }
+
+    //修改模块状态
+    public void updateModuleDisplay(String moduleid,Integer dispaly){
+        moduleMapper.updateModuleDisplay(moduleid,dispaly);
+    }
 }

sapi/src/main/resources/application.properties

@@ -2,6 +2,8 @@ server.port=8087
 spring.application.name=sapi
 #注册到我们本地的eureka注册中心，端口8081
 eureka.client.service-url.defaultZone=http://127.0.0.1:8081/eureka/
+#eureka.client.register-with-eureka=false
+#eureka.client.fetch-registry=false
 #设置eureka输出日志级别
 logging.level.com.netflix=error
 spring.datasource.url=jdbc:mysql://dbtest.xhkjedu.com:3306/xhkjedu_school_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&rewriteBatchedStatements=true&allowMultiQueries=true
@@ -98,4 +100,4 @@ cron.syncnum=100
 #每隔3s清除一下请求地址map
 cron.deleteUriMap=0/3 * * * * ?
 #版本号
-versionname=Test_v3.2.6
+versionname=Test_v3.2.7

sapi/src/main/resources/mapper/system/ModuleMapper.xml

@@ -73,4 +73,9 @@
             ,#{m.minout},#{m.mclass},#{m.level},#{m.mdefault},#{m.display},#{m.defaultid},#{m.createid},#{m.createtime},#{m.schoolid})
         </foreach>
     </insert>
+
+    <!--修改模块状态-->
+    <update id="updateModuleDisplay">
+        update t_module set display=#{display} where moduleid=#{moduleid}
+    </update>
 </mapper>

sstudy/src/main/java/com/xhkjedu/sstudy/controller/resource/GuideController.java

@@ -11,6 +11,7 @@ import com.xhkjedu.vo.ResultVo;
 import com.xhkjedu.sstudy.vo.paper.AnalyzeSearchVo;
 import com.xhkjedu.sstudy.vo.resource.GuideAnalyzeVo;
 import com.xhkjedu.sstudy.vo.resource.GuideVo;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -29,6 +30,7 @@ import java.util.Map;
  **/
 @RequestMapping("/guide")
 @RestController
+@Slf4j
 public class GuideController {
     @Autowired
     private GuideService guideService;
@@ -106,8 +108,7 @@ public class GuideController {
         String lsbid = guide.getLsbid();
         N_Utils.validation(new Object[]{createid,"教师id",1,subjectid,"科目",2,lsbid,"教材",2});
 
-        guideService.save(guide);
-        return new ResultVo(0, "保存成功");
+        return guideService.save(guide);
     }
 
     //分享预习
@@ -122,8 +123,7 @@ public class GuideController {
         String lsbid = guide.getLsbid();
         N_Utils.validation(new Object[]{resourceid,"资源",2,createid,"教师id",1,subjectid,"科目",2,lsbid,"教材",2});
 
-        guideService.shareGuide(guide);
-        return new ResultVo(0, "分享成功");
+        return guideService.shareGuide(guide);
     }
 
     //删除预习

sstudy/src/main/java/com/xhkjedu/sstudy/service/resource/GuideService.java

@@ -14,10 +14,13 @@ import com.xhkjedu.sstudy.vo.paper.AnalyzeSearchVo;
 import com.xhkjedu.sstudy.vo.resource.GuideAnalyzeVo;
 import com.xhkjedu.sstudy.vo.resource.GuideVo;
 import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -30,6 +33,7 @@ import java.util.stream.Collectors;
  * Date 2021/10/20 10:37
  **/
 @Service
+@Slf4j
 public class GuideService {
     @Resource
     private GuideMapper guideMapper;
@@ -90,76 +94,93 @@ public class GuideService {
     }
 
     //保存学生预习
-    @Transactional
-    public Integer save(TGuide guide){
-        Integer timestamp = N_Utils.getSecondTimestamp();
-        guide.setCreatetime(timestamp);
-        guideMapper.insertUseGeneratedKeys(guide);
-        Integer guideid = guide.getId();//预习id
-        guide.setGuideid(guideid);
-
-        //保存资源
-        List<TResource> resources = guide.getResources();
-        for(TResource r : resources) {
-            r.setCreateid(guide.getCreateid());
-            r.setCreatetime(guide.getCreatetime());
-            r.setLevel(3);
-            r.setResourcestate(1);
-            r.setResourcetype(10);
-            r.setBelong(4);
-            r.setSchoolid(guide.getSchoolid());
-            r.setSubjectid(guide.getSubjectid());
-
-            String resourceid = StudyUtil.getId();//资源id
-            r.setResourceid(resourceid);
-            Integer resourceclass = r.getResourceclass();
-            if (resourceclass == 3 || resourceclass == 4 || resourceclass == 6) {
-                r.setConverted(1);
-            } else if (resourceclass == 5 && (r.getSuffix().equals("flv") || r.getMp4code().equals("h264"))) {
-                r.setConverted(1);
+    @Transactional(rollbackFor = Exception.class)
+    public ResultVo save(TGuide guide){
+
+        try {
+            Integer timestamp = N_Utils.getSecondTimestamp();
+            guide.setCreatetime(timestamp);
+            guideMapper.insertUseGeneratedKeys(guide);
+            Integer guideid = guide.getId();//预习id
+            guide.setGuideid(guideid);
+
+            //保存资源
+            List<TResource> resources = guide.getResources();
+            for(TResource r : resources) {
+                r.setCreateid(guide.getCreateid());
+                r.setCreatetime(guide.getCreatetime());
+                r.setLevel(3);
+                r.setResourcestate(1);
+                r.setResourcetype(10);
+                r.setBelong(4);
+                r.setSchoolid(guide.getSchoolid());
+                r.setSubjectid(guide.getSubjectid());
+
+                String resourceid = StudyUtil.getId();//资源id
+                r.setResourceid(resourceid);
+                Integer resourceclass = r.getResourceclass();
+                if (resourceclass == 3 || resourceclass == 4 || resourceclass == 6) {
+                    r.setConverted(1);
+                } else if (resourceclass == 5 && (r.getSuffix().equals("flv") || r.getMp4code().equals("h264"))) {
+                    r.setConverted(1);
+                }
+                //保存资源信息
+                resourceMapper.insertSelective(r);
+                //保存预习资源关联关系
+                TGuideResource gr = new TGuideResource();
+                gr.setGuideid(guideid);
+                gr.setResourceid(resourceid);
+                gr.setCreateid(guide.getCreateid());
+                gr.setCreatetime(guide.getCreatetime());
+                guideResourceMapper.insertUseGeneratedKeys(gr);
+
+                convertUtil.convertResource(r);//资源转换（word或ppt转为pdf，视频非h264编码转码，压缩包解压）
             }
-            //保存资源信息
-            resourceMapper.insertSelective(r);
-            //保存预习资源关联关系
-            TGuideResource gr = new TGuideResource();
-            gr.setGuideid(guideid);
-            gr.setResourceid(resourceid);
-            gr.setCreateid(guide.getCreateid());
-            gr.setCreatetime(guide.getCreatetime());
-            guideResourceMapper.insertUseGeneratedKeys(gr);
-
-            convertUtil.convertResource(r);//资源转换（word或ppt转为pdf，视频非h264编码转码，压缩包解压）
+
+            //保存预习学生关联信息
+            batchSaveGuideStudent(guide);
+            return new ResultVo(0,"保存成功");
+        }catch (Exception e){
+            log.error("保存预习失败：" + e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return new ResultVo(1,"保存失败");
         }
 
-        //保存预习学生关联信息
-        batchSaveGuideStudent(guide);
-        return guideid;
     }
 
     //个人空间分享到学生预习
-    @Transactional
-    public void shareGuide(TGuide guide) {
-        String resourceid = guide.getResourceid();
-        Integer timestamp = N_Utils.getSecondTimestamp();
-        guide.setCreatetime(timestamp);
-        guideMapper.insertUseGeneratedKeys(guide);
-        Integer guideid = guide.getId();//预习id
-
-        //保存预习资源
-        TGuideResource guideResource = new TGuideResource();
-        guideResource.setGuideid(guideid);
-        guideResource.setResourceid(resourceid);
-        guideResource.setCreateid(guide.getCreateid());
-        guideResource.setCreatetime(timestamp);
-        guideResourceMapper.insert(guideResource);
-        guide.setGuideid(guideid);
-
-        //保存预习学生关联信息
-        batchSaveGuideStudent(guide);
+    @Transactional(rollbackFor = Exception.class)
+    public ResultVo shareGuide(TGuide guide){
+
+        try {
+            String resourceid = guide.getResourceid();
+            Integer timestamp = N_Utils.getSecondTimestamp();
+            guide.setCreatetime(timestamp);
+            guideMapper.insertUseGeneratedKeys(guide);
+            Integer guideid = guide.getId();//预习id
+
+            //保存预习资源
+            TGuideResource guideResource = new TGuideResource();
+            guideResource.setGuideid(guideid);
+            guideResource.setResourceid(resourceid);
+            guideResource.setCreateid(guide.getCreateid());
+            guideResource.setCreatetime(timestamp);
+            guideResourceMapper.insert(guideResource);
+            guide.setGuideid(guideid);
+
+            //保存预习学生关联信息
+            batchSaveGuideStudent(guide);
+            return new ResultVo(0,"分享成功");
+        }catch (Exception e){
+            log.error("分享预习失败：" + e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return new ResultVo(1,"分享失败");
+        }
+
     }
 
     //批量维护预习班级和学生信息
-    private void batchSaveGuideStudent(TGuide guide) {
+    private void batchSaveGuideStudent(TGuide guide) throws Exception {
         List<TGuideGroup> guideGroups = guide.getGuideGroups().stream().distinct().collect(Collectors.toList());
         List<TGuideGroup> savegroup = new ArrayList<>();
         List<TGuideGroupStudent> savestus = new ArrayList<>();
@@ -172,23 +193,29 @@ public class GuideService {
             g.setCreatetime(guide.getCreatetime());
             savegroup.add(g);
 
-            //页面选择的学生预习学生集合
-            String groupids = StringUtils.join(gg.getGroups(),",");
-
-            //获取选中班级分组下所有学生
-            List<Integer> stus = classMapper.listStudentidsByGroupids(groupids);
-            for (Integer studentid : stus) {
-                TGuideGroupStudent ggs = new TGuideGroupStudent();
-                ggs.setGuideid(guide.getGuideid());
-                ggs.setClassid(classid);
-                ggs.setStudentid(studentid);
-                ggs.setCosttime(0);
-                ggs.setCreatetime(N_Utils.getSecondTimestamp());
-                savestus.add(ggs);
+            if(gg.getGroups() != null && gg.getGroups().size() > 0){
+                //页面选择的学生预习学生集合
+                String groupids = StringUtils.join(gg.getGroups(),",");
+
+                //获取选中班级分组下所有学生
+                List<Integer> stus = classMapper.listStudentidsByGroupids(groupids);
+                for (Integer studentid : stus) {
+                    TGuideGroupStudent ggs = new TGuideGroupStudent();
+                    ggs.setGuideid(guide.getGuideid());
+                    ggs.setClassid(classid);
+                    ggs.setStudentid(studentid);
+                    ggs.setCosttime(0);
+                    ggs.setCreatetime(N_Utils.getSecondTimestamp());
+                    savestus.add(ggs);
 
+                }
             }
         }
 
+        if(savestus == null || savestus.size() == 0){
+            throw new Exception("未选择学生");
+        }
+
         //保存预习班级、预习学生信息
         guideGroupMapper.insertList(savegroup);
         guideGroupStudentMapper.insertList(savestus);

sstudy/src/main/resources/application.properties

@@ -107,4 +107,4 @@ file.showurl=http://schoolstatictest.xhkjedu.com/static/
 dbname=xhkjedu_school_test
 
 #版本号
-versionname=Test_v3.2.6
+versionname=Test_v3.2.7

suser/src/main/java/com/xhkjedu/suser/service/system/UserService.java

@@ -115,10 +115,24 @@ public class UserService extends JedisUtil {
                 }
             }
 
+            //判断用户状态
             if(userVo.getUserlock() == 1){
                 return new ResultVo(1, "此账号已锁定，禁止登录");
             }
 
+            //判断用户有效期
+            String usertime = userVo.getUsertime();
+            if (N_Utils.isNotEmpty(usertime)) {
+                String dayBegin = DatesUtil.getDayBegin();
+                if (usertime.compareTo(dayBegin) < 0) {
+                    if (usertype == 2) {//学生
+                        return new ResultVo(1, "账号已过有效期，请联系老师");
+                    } else {
+                        return new ResultVo(1, "账号已过有效期，请联系管理员");
+                    }
+                }
+            }
+
             //进行角色判断
             if (usertype == 2) {
                 Integer stuweb = userVo.getStuweb();
@@ -146,10 +160,14 @@ public class UserService extends JedisUtil {
                     return new ResultVo(1, "此账号未分配班级");
                 }
 
-                //更新学生硬件绑定信息
-                userVo.setMac(mac);
-                userVo.setBindmac(sbindmac);
-                userMapper.updateBindMac(userVo);
+                String device = user.getDevice();//只有学生
+                if (device != null && "pad".equals(device)) {
+                    //更新学生硬件绑定信息
+                    userVo.setMac(mac);
+                    userVo.setBindmac(sbindmac);
+                    userMapper.updateBindMac(userVo);
+                }
+
                 return new ResultVo(0, "登录成功", userVo);
             } else{
                 return new ResultVo(0, "登录成功", userVo);
@@ -169,7 +187,12 @@ public class UserService extends JedisUtil {
             user.setUserid(userVo.getUserid());
             user.setUsername(userVo.getUsername());
             user.setSchoolid(userVo.getSchoolid());
-            if (!userVo.getLoginpwd().equals(user.getLoginpwd())) {
+            user.setUsertype(userVo.getUsertype());
+
+            //验证用户信息
+            resultVo = this.checkLoginUser(user,userVo,1);
+
+            /*if (!userVo.getLoginpwd().equals(user.getLoginpwd())) {
                 resultVo = new ResultVo(1, "密码错误");
             } else {
                 if (userVo.getUsertype() != 1) {
@@ -183,7 +206,7 @@ public class UserService extends JedisUtil {
                         resultVo = new ResultVo(0, "登录成功", userVo);
                     }
                 }
-            }
+            }*/
         } else {
             resultVo = new ResultVo(1, "此账号不存在");
         }
@@ -210,6 +233,7 @@ public class UserService extends JedisUtil {
             user.setUserid(userVo.getUserid());
             user.setUsername(userVo.getUsername());
             user.setSchoolid(userVo.getSchoolid());
+            user.setUsertype(userVo.getUsertype());
             //验证学生登录系列问题
             resultVo = checkLoginStudent(user,userVo);
         } else {
@@ -226,6 +250,7 @@ public class UserService extends JedisUtil {
         } else {
             Integer sbindmac = userVo.getSbindmac();//学校是否绑定设备0未绑定1绑定
             String mac = user.getMac();
+            String usertime = userVo.getUsertime();
 
             if (userVo.getUsertype() != 2) {
                 return new ResultVo(1, "登录失败，仅允许学生登录");
@@ -240,7 +265,15 @@ public class UserService extends JedisUtil {
                         return new ResultVo(1, "登录失败，该设备已与其他账号关联");
                     }
                 }
+            } else if (N_Utils.isNotEmpty(usertime)){
+                String dayBegin = DatesUtil.getDayBegin();
+                if (usertime.compareTo(dayBegin) < 0) {
+                    return new ResultVo(1, "账号已过有效期，请联系老师");
+                }
+            } else if (userVo.getUserlock() == 1) {
+                return new ResultVo(1, "此账号已锁定，禁止登录");
             }
+
             //更新学生硬件绑定信息
             userVo.setMac(mac);
             userVo.setBindmac(sbindmac);
@@ -267,6 +300,7 @@ public class UserService extends JedisUtil {
             user.setUsername(userVo.getUsername());
             user.setSchoolid(userVo.getSchoolid());
             user.setLoginname(userVo.getLoginname());
+            user.setUsertype(userVo.getUsertype());
 
             resultVo = checkLoginUser(user,userVo,2);
         } else {
@@ -291,7 +325,8 @@ public class UserService extends JedisUtil {
         Integer usertype = user.getUsertype();
         if (result.getCode() == 0) {
             UserVo userVo = (UserVo) result.getObj();
-            if (userVo.getUserlock() == 1) {
+            //以下代码登录的时候进行判断
+            /*if (userVo.getUserlock() == 1) {
                 result.setCode(1);
                 result.setMsg("此账号已锁定，禁止登录");
                 return result;
@@ -308,7 +343,7 @@ public class UserService extends JedisUtil {
                     }
                     return result;
                 }
-            }
+            }*/
 
             //redis
             String ticketKey = UUID.randomUUID().toString().replace("-", "");

suser/src/main/resources/application.properties

@@ -57,4 +57,4 @@ signName=【河南星火燎原】
 #郑州管城大数据SSO认证鉴权接口
 ssourl=http://gcdsj.zzgcjy.cn/portal/sso/api/agent
 #版本号
-versionname=Test_v3.2.10
+versionname=Test_v3.2.11