忽略不需要提交的文件

胡仁荣

2022-11-03 68408ba6f0ff9c4e7978735818ab12990c957c1a

忽略不需要提交的文件

 src/main/java/com/qxueyou/scc/admin/classes/service/impl/ClsClassService.java

@@ -186,6 +186,8 @@

        String hql = "select c from ClsClass c,StuStudent s where c.classId=s.classId and s.userId=? and s.status=?";

        System.out.println(ClientUtils.getUserId());

        List<ClsClass> result = find(hql, CollectionUtils.newList(ClientUtils.getUserId(), StuStudent.STATUS_ACTIVE),
                ClsClass.class);


 src/main/java/com/qxueyou/scc/base/util/ClientUtils.java

@@ -68,10 +68,13 @@

    /** 得到userName*/
    public static String getUserName(){
//        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
//        HttpSession session = request.getSession();
        return getUserInfo().getInfo(UserInfoWrapper.INF_USER_NAME);
//        return (String) session.getAttribute("userName");
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        HttpSession session = request.getSession();
        String info = getUserInfo().getInfo(UserInfoWrapper.INF_USER_NAME);
        if(info!=null){
            info= (String) session.getAttribute(UserInfoWrapper.INF_USER_NAME);
        }
        return info;
    }

    /** 得到用户头像*/
@@ -104,7 +107,13 @@

    /** 得到className*/
    public static String getClassName(){
        return getUserInfo().getInfo(UserInfoWrapper.INF_CLASS_NAME);
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        HttpSession session = request.getSession();
        String info = getUserInfo().getInfo(UserInfoWrapper.INF_CLASS_NAME);
        if(info!=null){
            info= (String) session.getAttribute(UserInfoWrapper.INF_CLASS_NAME);
        }
        return info;
//        System.out.println("CLassName"+session.getAttribute("className"));
//        return (String) session.getAttribute("className");
    }

 src/main/java/com/qxueyou/scc/stucontroller/HomePageController.java

@@ -105,8 +105,7 @@
     */
    @GetMapping(value = "lstSubjectDetail")
    public Result subjectDetailLst(HttpServletRequest request){
        Object userId = request.getSession().getAttribute("userId");
        return subjectService.lstSubjectDetail(String.valueOf(userId));
        return subjectService.lstSubjectDetail();
    }

    /**

 src/main/java/com/qxueyou/scc/stucontroller/StuSubjectController.java

@@ -3,6 +3,7 @@
import java.util.List;
import java.util.Map;

import com.qxueyou.scc.base.model.UserInfoWrapper;
import com.qxueyou.scc.user.model.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict;
@@ -428,17 +429,15 @@
        @ApiImplicitParam(name = "startTime", value = "开班时间", required = false, paramType="query", dataType = "String")
    })
    @GetMapping(value = "getSubjectLst")
    public Result getList(String classId, String startTime, Integer limit, @RequestParam(defaultValue="1")Integer pageNum, HttpServletRequest request) {
//        System.out.println("用户id"+request.getSession().getAttribute("userId"));
        Object userId = request.getSession().getAttribute("userId");
    public Result getList(String userId,String classId, String startTime, Integer limit, @RequestParam(defaultValue="1")Integer pageNum, HttpServletRequest request) {
        userId = StringUtils.isEmpty(userId)?ClientUtils.getUserId():userId;
        classId = StringUtils.isEmpty(classId)?ClientUtils.getClassId():classId;
        List<MySubjectV> result = subjectService.listMySubjectV(classId,String.valueOf(userId));
        List<MySubjectV> result = subjectService.listMySubjectV(classId,userId);
        return new Result(true, "success",
                QBeanUtils.listBean2ListMap(result,
                        CollectionUtils.newStringMap("id.subjectId", "subjectId", "id.classId", "classId",
                                "subjectName", "subjectName,coursewareName", "percent", "percent", "progressValue",
                                "studyTime", "coverPageUrl", "coverPageUrl")));

    }

    /**

 src/main/java/com/qxueyou/scc/sys/action/LoginController.java

@@ -256,8 +256,6 @@
//         缓存到请求线程
        UserInfoWrapper wrapper = cacheUserInfo(param, null);
        request.getSession().setAttribute(UserInfoWrapper.SESSION_USER_INFO_KEY, wrapper);
        System.out.println("sess"+request.getSession().getAttribute("userId"));
        System.out.println("aaa"+ClientUtils.getUserId());
        return new Result(true, "success",
                CollectionUtils.newObjectMap("userId", user.getUserId(), "userName", user.getName(), "imgPath",
                        user.getImgPath(), "orgName", ClientUtils.getOrgName(),"orgId", ClientUtils.getOrgId(), "orgLogo",

 src/main/java/com/qxueyou/scc/teach/res/service/impl/ResService.java

@@ -135,7 +135,7 @@
        res.setName(name);
        res.setCoverPageUrl(coverPageUrl);
        res.setRemark(remark);

        res.setStatus(Res.STATUS_DRAFT);
        save(res);

        return new Result(true, "success");

 src/main/java/com/qxueyou/scc/teach/subject/service/ISubjectService.java

@@ -162,7 +162,7 @@
    /**
     * 首页获取课程详情列表
     */
    Result lstSubjectDetail(String userId);
    Result lstSubjectDetail();

    /**
     * 获取数据排行

 src/main/java/com/qxueyou/scc/teach/subject/service/impl/SubjectService.java

@@ -411,9 +411,6 @@
    @Override
    public List<MySubjectV> listMySubjectV(String classId,String userId) {
        StringBuffer hql = new StringBuffer("from MySubjectV p where p.id.userId=? and p.subjectStatus=?");
//        UserInfoWrapper wrapper=new UserInfoWrapper();
//        System.out.println("cc"+ClientUtils.getUserInfo().getInfo(wrapper.INF_CLASS_ID));
//        System.out.println("1-"+ClientUtils.getUserId()+"2-"+Subject.STATUS_ISSUED+"aaaaaa"+userId);
        List<Object> args = CollectionUtils.newList(userId,Subject.STATUS_ISSUED);

        if (!StringUtils.isEmpty(classId)) {
@@ -568,8 +565,8 @@
    }

    @Override
    public Result lstSubjectDetail(String userId) {
//        String userId = ClientUtils.getUserId();
    public Result lstSubjectDetail() {
        String userId = ClientUtils.getUserId();
        StringBuffer hql = new StringBuffer(
                "select percent as percent,className as className ,id.classId as classId ,id.subjectId as subjectId ,"
                        + "subjectName as subjectName ,coverPageUrl as coverPageUrl , progressValue as progressValue from"

 src/main/java/com/qxueyou/scc/user/service/impl/UserService.java

@@ -67,9 +67,12 @@
        wrapper.setOrg(org);
        wrapper.setClass(objClsClass);
        wrapper.setLoginInfo(param.getCacheIpFlag(), param.getIp(), param.getPlatForm());
        System.out.println("aaa"+user.getUserId());
        session.setAttribute(UserInfoWrapper.INF_USER_ID,user.getUserId());
        session.setAttribute(UserInfoWrapper.INF_USER_NAME,user.getName());
        if(objClsClass!=null){
            session.setAttribute(UserInfoWrapper.INF_CLASS_ID,objClsClass.getClassId());
            session.setAttribute(UserInfoWrapper.INF_CLASS_NAME,objClsClass.getName());
        }
        return wrapper;
    }