派生自 projectDept/qhighschool

EricsHu
2023-05-09 3adefa44b77cae70f37b573560ed480c2e56768b
新增后台接口
11个文件已修改
96 ■■■■■ 已修改文件
src/main/java/com/qxueyou/scc/admin/classes/service/impl/ClsClassService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/qxueyou/scc/admin/schoolRoll/impl/SchoolRollServiceImpl.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/qxueyou/scc/base/dao/BaseDAO.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/qxueyou/scc/controller/VideoLiveController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/qxueyou/scc/exercise/service/impl/ExerciseInfoService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/qxueyou/scc/sys/action/LoginController.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/qxueyou/scc/teach/live/service/IMediaLiveService.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/qxueyou/scc/teach/live/service/impl/MediaLiveService.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/qxueyou/scc/wx/service/IWechatService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/qxueyou/scc/wx/service/impl/WechatService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.properties 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/qxueyou/scc/admin/classes/service/impl/ClsClassService.java
@@ -150,7 +150,7 @@
            hql.append(" and c.endTime < sysdate() ");
        }
//        System.out.println("vvvvv"+ClientUtils.getOrgId()+"333333333"+ClientUtils.getUserId());
        List<Object> args = CollectionUtils.newList(ClientUtils.getOrgId(),keyword_ + "%","40288a1261d106ba0161d1072e260000");
        List<Object> args = CollectionUtils.newList(ClientUtils.getOrgId(),keyword_ + "%",ClientUtils.getUserId());
//        System.out.println(args);
        if (!StringUtils.isEmpty(teacherId)) {
            hql.append(" and exists( select 1 from ClsClassReSubject r,Subject t where r.subjectId=t.subjectId and c.classId= r.classId and t.teacherId=? and r.deleteFlag is false and t.deleteFlag is false)");
src/main/java/com/qxueyou/scc/admin/schoolRoll/impl/SchoolRollServiceImpl.java
@@ -65,14 +65,23 @@
            StuStudent stuStudent = findUnique(hql.toString(), args, StuStudent.class);
            if(stuStudent!=null && classId!=null){
                StringBuffer ClaHql=new StringBuffer("from ClsClass where classId=? and deleteFlag is false");
                List<Object> claArgs = CollectionUtils.newList(classId);
                ClsClass cLaClass = findUnique(ClaHql.toString(), claArgs, ClsClass.class);
                cLaClass.setStudentCount(cLaClass.getStudentCount()+1);
                stuStudent.setClassId(classId);
                save(stuStudent);
            }else {
                return new Result(false,"班级不存在或学生不存在");
            }
        }
        return new Result(true);
        return new Result(true,"分班成功");
    }
src/main/java/com/qxueyou/scc/base/dao/BaseDAO.java
@@ -39,6 +39,7 @@
 * @since JDK1.6
 * @history 2010-07-28 夏德虎 新建
 */
@Transactional(readOnly=false)
public class BaseDAO extends HibernateDaoSupport {
    
    /** 注释 rawtypes  */
src/main/java/com/qxueyou/scc/controller/VideoLiveController.java
@@ -259,8 +259,8 @@
     */
    @ApiOperation(value = "删除创建的直播")
    @PostMapping(value = "delete")
    public Result delete(String videoLiveIds) {
        return liveService.delete(videoLiveIds.split(","));
    public Result delete(String videoLiveIds,String    courseIds) throws Exception {
        return liveService.delete(videoLiveIds.split(","),courseIds.split(","));
    }
    
    
src/main/java/com/qxueyou/scc/exercise/service/impl/ExerciseInfoService.java
@@ -794,7 +794,7 @@
            ResFile resFile = this.read(ResFile.class, fileId);
            exerciseCompleteInfo.setFileId(fileId);
            exerciseCompleteInfo.setFilePath(filePath);
            exerciseCompleteInfo.setOrgiFileName(resFile.getFileName());
            exerciseCompleteInfo.setOrgiFileName(ClientUtils.getUserName()+"的作业");
        }
        exerciseCompleteInfo.setUploadDesc(content);
src/main/java/com/qxueyou/scc/sys/action/LoginController.java
@@ -116,6 +116,18 @@
    @Value("${wx.secret}")
    private String secret;
    /**
     * 公众号appID
     */
    @Value("${wx.app.appId}")
    private String wxappId;
    /**
     * 公众号secret
     */
    @Value("${wx.app.secret}")
    private String wxsecret;
    public static String UUNUMBER="QXYUUNUMBER";
@@ -129,8 +141,19 @@
     * @throws IOException
     */
    @PostMapping("/wxAccountsLogin")
    @ApiOperation("微信公众号登录")
    @ResponseBody
    public Result wxAccountsLogin(String code) {
        JSONObject gettoken = wechatService.gettoken(wxappId, wxsecret);
        JSONObject OpenId = wechatService.getSessionKeyOrOpenId(code);
        JSONObject user = wechatService.getUser(gettoken.get("access_token").toString(), OpenId.get("openid").toString());
        return new Result(true,"成功",user);
    }
    @PostMapping("/wxlogin")
    @ApiOperation("微信登录")
    @ApiOperation("微信小程序登录")
    @ResponseBody
    public Result wechatLogin(String code,String number) {
        JSONObject sessionKeyOrOpenId = wechatService.getSessionKeyOrOpenId(code);
@@ -164,11 +187,21 @@
            String studentSql = "from StuStudent where deleteFlag is false and userId = ? ";
            List<Object> stuParams =  CollectionUtils.newList(user.getUserId());
            StuStudent stuStudent = commonDAO.findUnique(studentSql, stuParams, StuStudent.class);
            CacheParamters param = new CacheParamters();
            param.setUserId(user.getUserId());
            param.setCustomRoleValue(user.getEmail());
            param.setCustomOrgId(user.getImei());
            param.setCacheIpFlag(true);
            //         缓存到请求线程
            UserInfoWrapper wrapper = cacheUserInfo(param, null);
            // 存到redis
            redisTemplate.opsForValue().set(UserInfoWrapper.SESSION_USER_INFO_KEY, wrapper);
            return new Result(true,"授权成功",CollectionUtils.newObjectMap("user",user,"ClassId",stuStudent.getClassId()));
        }
        return phone;
}
    @ApiOperation(value = "登入接口", notes = "")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "account", value = "账号", required = true, paramType="query", dataType = "String"),
src/main/java/com/qxueyou/scc/teach/live/service/IMediaLiveService.java
@@ -28,6 +28,8 @@
     */
    MediaVideoLive read(String liveId);
    
    MediaVideoLive revamp(int courseId);
    /**
     * 查询直播
     * @param noticeId 直播Id
@@ -98,7 +100,7 @@
     * @param liveId 直播ID数组
     * @return
     */
    Result delete(String[] liveIds);
    Result delete(String[] liveIds,String [] courseIds) throws Exception;
    
    /**
     * 发布直播
src/main/java/com/qxueyou/scc/teach/live/service/impl/MediaLiveService.java
@@ -7,6 +7,7 @@
import java.util.List;
import java.util.Map;
import com.qxueyou.scc.sdk.MTCloud;
import io.swagger.models.auth.In;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -159,12 +160,17 @@
    }
    
    @Override
    public Result delete(String[] liveIds) {
    public Result delete(String[] liveIds,String [] courseIds) throws Exception {
        for(String liveId:liveIds) {
            delete(liveId);
            for(String courseId:courseIds) {
                MTCloud client = new MTCloud();
                String s = client.courseDelete(courseId);
            }
        }
        return Result.SUCCESS;
    }
    @Override
    public Result doIssue(String liveId) {
@@ -348,6 +354,13 @@
        return read(MediaVideoLive.class,liveId);
    }
    
    @Override
    public MediaVideoLive revamp(int courseId) {
        String hql = "from MediaVideoLive where deleteFlag is false and courseId=?";
        MediaVideoLive unique = findUnique(hql, CollectionUtils.newList(courseId), MediaVideoLive.class);
        return unique ;
    }
    @SuppressWarnings("unchecked")
    @Override
    public List<MediaVideoLive> readByStatus(List<String> liveIdLst,short[] status) {
src/main/java/com/qxueyou/scc/wx/service/IWechatService.java
@@ -23,6 +23,8 @@
    Result getNumber(String tonken, String number);
    JSONObject gettoken(String appid,String secret);
    JSONObject getUser(String token,String openId);
//    Result isBindWx(String userId);
    
//    Result getSignature(String url);
src/main/java/com/qxueyou/scc/wx/service/impl/WechatService.java
@@ -116,6 +116,22 @@
        return s;
    }
    @Override
    public JSONObject getUser(String token, String openId) {
        String requestUrl = "https://api.weixin.qq.com/sns/userinfo";
        Map<String, String> requestUrlParam = new HashMap<>();
        requestUrlParam.put("access_token", token);
        requestUrlParam.put("openid", openId);
        requestUrlParam.put("lang", "zh_CN");
        JSONObject s = JSON.parseObject(HttpClientUtil.doGet(requestUrl, requestUrlParam));
        return s;
    }
//    private String getWechatHeadImgUrl(String unionId) {
//        WechatUserDO wxUser = this.template.findOne(Query.query(condition().and("unionId").is(unionId)), WechatUserDO.class);
//        return wxUser.getHeadImgUrl();
src/main/resources/application.properties
@@ -96,4 +96,8 @@
wx.appId=wx953bf2ed18e7836b
wx.secret=1d8b00beaddf5c8f36d1fedc14ef7973
wx.app.appId=wx5a7c0d4798fbfdc2
wx.app.secret=95c5470a52a2c4e037741f82246f4d86
logging.config=classpath:log4j2.xml