Skip to content

涂亚平 / subsidy

Go to a project
Commit de277cb7 by 涂亚平
Options

拉websocket前备个份

1 parent 52d13bc2
Inline Side-by-side
Showing with 47 additions and 38 deletions
src/main/java/com/subsidy/common/interceptor/WebSocketInterceptor.java
...@@ -41,9 +41,7 @@ public class WebSocketInterceptor implements HandshakeInterceptor { ...@@ -41,9 +41,7 @@ public class WebSocketInterceptor implements HandshakeInterceptor {
HttpServletRequest httpServletRequest = ((ServletServerHttpRequest) request).getServletRequest(); HttpServletRequest httpServletRequest = ((ServletServerHttpRequest) request).getServletRequest();
Long userId = Long.parseLong(httpServletRequest.getParameter("userId")); Long userId = Long.parseLong(httpServletRequest.getParameter("userId"));
MemberDO memberDO = memberMapper.selectById(userId); MemberDO memberDO = memberMapper.selectById(userId);
if(null != memberDO) { return null != memberDO;
return true;
}
} }
return false; return false;
} }
......
src/main/java/com/subsidy/controller/MemberController.java
...@@ -88,7 +88,7 @@ public class MemberController { ...@@ -88,7 +88,7 @@ public class MemberController {
} }
@PostMapping("checkStatus") @PostMapping("checkStatus")
@ApiOperation("实名制验证状态 memberId") @ApiOperation("实名制验证状态 id")
@TimeRequired @TimeRequired
public ResponseVO checkStatus(@RequestBody MemberDO memberDO){ public ResponseVO checkStatus(@RequestBody MemberDO memberDO){
return ResponseData.generateCreatedResponse(0,memberService.checkStatus(memberDO)); return ResponseData.generateCreatedResponse(0,memberService.checkStatus(memberDO));
......
src/main/java/com/subsidy/dto/course/QueryCoursesDTO.java
...@@ -25,6 +25,6 @@ public class QueryCoursesDTO { ...@@ -25,6 +25,6 @@ public class QueryCoursesDTO {
private Long companyId; private Long companyId;
private Integer openStatus; private String openStatus;
} }
src/main/java/com/subsidy/mapper/CourseDictMapper.java
...@@ -27,7 +27,7 @@ public interface CourseDictMapper extends BaseMapper<CourseDictDO> { ...@@ -27,7 +27,7 @@ public interface CourseDictMapper extends BaseMapper<CourseDictDO> {
* courseName fieldId categoryId jobId courseRank courseType * courseName fieldId categoryId jobId courseRank courseType
* @return * @return
*/ */
IPage<QueryCoursesVO > queryCourses(IPage page, String courseName, Long fieldId,Long categoryId,Long jobId,Long rankId, String courseType,Long companyId,Integer openStatus,Long businessId); IPage<QueryCoursesVO > queryCourses(IPage page, String courseName, Long fieldId,Long categoryId,Long jobId,Long rankId, String courseType,Long companyId,String openStatus,Long businessId);
/** /**
* 通过课程id查询课程下的学生-----弃用 * 通过课程id查询课程下的学生-----弃用
......
src/main/java/com/subsidy/model/CourseDictDO.java
...@@ -52,7 +52,7 @@ public class CourseDictDO extends BaseModel { ...@@ -52,7 +52,7 @@ public class CourseDictDO extends BaseModel {
/** /**
* 课程开放状态 * 课程开放状态
*/ */
private Integer openStatus; private String openStatus;
/** /**
* 备注 * 备注
......
src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java
...@@ -605,9 +605,9 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -605,9 +605,9 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
} }
if (classDetailDTO.getFlag()) { if (classDetailDTO.getFlag()) {
CourseDictDO courseDictDO = courseDictMapper.selectById(classDictDO.getCourseId()); // CourseDictDO courseDictDO = courseDictMapper.selectById(classDictDO.getCourseId());
String studyDate = classDictDO.getStartDate() + " 至 " + classDictDO.getEndDate(); String studyDate = classDictDO.getStartDate() + " 至 " + classDictDO.getEndDate();
ExcelUtil.writeMemberExcel(companyDictDO.getCompanyName(), studyDate, courseDictDO.getCourseName(), "授课记录汇总表", classDetailVOS, ExcelFormatUtils.memberList); ExcelUtil.writeMemberExcel(companyDictDO.getCompanyName(), studyDate, classDictDO.getClassName(), "授课记录汇总表", classDetailVOS, ExcelFormatUtils.memberList);
} }
return classDetailVOS; return classDetailVOS;
} }
...@@ -693,9 +693,9 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -693,9 +693,9 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
if (classDetailDTO.getFlag()) { if (classDetailDTO.getFlag()) {
ClassDictDO classDictDO = classDictMapper.selectById(classDetailDTO.getId()); ClassDictDO classDictDO = classDictMapper.selectById(classDetailDTO.getId());
CompanyDictDO companyDictDO = companyDictMapper.selectById(classDictDO.getCompanyId()); CompanyDictDO companyDictDO = companyDictMapper.selectById(classDictDO.getCompanyId());
CourseDictDO courseDictDO = courseDictMapper.selectById(classDictDO.getCourseId()); // CourseDictDO courseDictDO = courseDictMapper.selectById(classDictDO.getCourseId());
String studyDate = classDictDO.getStartDate() + " 至 " + classDictDO.getEndDate(); String studyDate = classDictDO.getStartDate() + " 至 " + classDictDO.getEndDate();
ExcelUtil.writeSignExcel(companyDictDO.getCompanyName(), studyDate, courseDictDO.getCourseName(), "注册签到表", classSignVOS, ExcelFormatUtils.signList); ExcelUtil.writeSignExcel(companyDictDO.getCompanyName(), studyDate, classDictDO.getClassName(), "注册签到表", classSignVOS, ExcelFormatUtils.signList);
} }
return classSignVOS; return classSignVOS;
...@@ -756,9 +756,8 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -756,9 +756,8 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
if (classDetailDTO.getFlag()) { if (classDetailDTO.getFlag()) {
CompanyDictDO companyDictDO = companyDictMapper.selectById(classDictDO.getCompanyId()); CompanyDictDO companyDictDO = companyDictMapper.selectById(classDictDO.getCompanyId());
CourseDictDO courseDictDO = courseDictMapper.selectById(classDictDO.getCourseId());
String studyDate = classDictDO.getStartDate() + " 至 " + classDictDO.getEndDate(); String studyDate = classDictDO.getStartDate() + " 至 " + classDictDO.getEndDate();
ExcelUtil.writeTestExcel(companyDictDO.getCompanyName(), studyDate, courseDictDO.getCourseName(), "测试成绩表", exerciseTestVOS, ExcelFormatUtils.scoreList); ExcelUtil.writeTestExcel(companyDictDO.getCompanyName(), studyDate, classDictDO.getClassName(), "测试成绩表", exerciseTestVOS, ExcelFormatUtils.scoreList);
} }
return exerciseTestVOS; return exerciseTestVOS;
} }
...@@ -784,9 +783,8 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -784,9 +783,8 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
if (classDetailDTO.getFlag()) { if (classDetailDTO.getFlag()) {
ClassDictDO classDictDO = classDictMapper.selectById(classDetailDTO.getId()); ClassDictDO classDictDO = classDictMapper.selectById(classDetailDTO.getId());
CompanyDictDO companyDictDO = companyDictMapper.selectById(classDictDO.getCompanyId()); CompanyDictDO companyDictDO = companyDictMapper.selectById(classDictDO.getCompanyId());
CourseDictDO courseDictDO = courseDictMapper.selectById(classDictDO.getCourseId());
String studyDate = classDictDO.getStartDate() + " 至 " + classDictDO.getEndDate(); String studyDate = classDictDO.getStartDate() + " 至 " + classDictDO.getEndDate();
ExcelUtil.writeAnswerExcel(companyDictDO.getCompanyName(), studyDate, courseDictDO.getCourseName(), "答疑记录表", answerRecordVOS, ExcelFormatUtils.answersList); ExcelUtil.writeAnswerExcel(companyDictDO.getCompanyName(), studyDate, classDictDO.getClassName(), "答疑记录表", answerRecordVOS, ExcelFormatUtils.answersList);
} }
return answerRecordVOS; return answerRecordVOS;
} }
...@@ -1213,7 +1211,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -1213,7 +1211,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
classDetailDTO.setFlag(false); classDetailDTO.setFlag(false);
List<ClassDetailVO> classDetailVOS = exportClassDetail(classDetailDTO); List<ClassDetailVO> classDetailVOS = exportClassDetail(classDetailDTO);
String studyDate = classDictDO.getStartDate() + " 至 " + classDictDO.getEndDate(); String studyDate = classDictDO.getStartDate() + " 至 " + classDictDO.getEndDate();
membersListExcel(companyDictDO.getCompanyName(), studyDate, courseDictDO.getCourseName(), "授课记录汇总表", ExcelFormatUtils.memberList, classDetailVOS, null, 0, baos); membersListExcel(companyDictDO.getCompanyName(), studyDate, classDictDO.getClassName(), "授课记录汇总表", ExcelFormatUtils.memberList, classDetailVOS, null, 0, baos);
compressFileToZipStream(zipOutputStream, baos, "member.xlsx"); compressFileToZipStream(zipOutputStream, baos, "member.xlsx");
/** /**
...@@ -1222,7 +1220,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -1222,7 +1220,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
ByteArrayOutputStream baos1 = new ByteArrayOutputStream(); ByteArrayOutputStream baos1 = new ByteArrayOutputStream();
classDetailDTO.setFlag(false); classDetailDTO.setFlag(false);
List<ClassSignVO> classSignVOS = exportSignDetail(classDetailDTO); List<ClassSignVO> classSignVOS = exportSignDetail(classDetailDTO);
signListExcel(companyDictDO.getCompanyName(), studyDate, courseDictDO.getCourseName(), "注册签到", ExcelFormatUtils.signList, classSignVOS, null, 0, baos1); signListExcel(companyDictDO.getCompanyName(), studyDate, classDictDO.getClassName(), "注册签到", ExcelFormatUtils.signList, classSignVOS, null, 0, baos1);
compressFileToZipStream(zipOutputStream, baos1, "sign.xlsx"); compressFileToZipStream(zipOutputStream, baos1, "sign.xlsx");
...@@ -1244,7 +1242,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -1244,7 +1242,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
classDetailDTO.setFlag(false); classDetailDTO.setFlag(false);
classDetailDTO.setPaperId(paperDictDOS.get(i).getId()); classDetailDTO.setPaperId(paperDictDOS.get(i).getId());
List<ExerciseTestVO> exerciseTestVOS = exportExerciseTest(classDetailDTO); List<ExerciseTestVO> exerciseTestVOS = exportExerciseTest(classDetailDTO);
testListExcel(companyDictDO.getCompanyName(), studyDate, courseDictDO.getCourseName(), "测试成绩表", ExcelFormatUtils.scoreList, exerciseTestVOS, null, 0, baos2); testListExcel(companyDictDO.getCompanyName(), studyDate, classDictDO.getClassName(), "测试成绩表", ExcelFormatUtils.scoreList, exerciseTestVOS, null, 0, baos2);
compressFileToZipStream(zipOutputStream, baos2, "test" + i + ".xlsx"); compressFileToZipStream(zipOutputStream, baos2, "test" + i + ".xlsx");
} }
...@@ -1253,7 +1251,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -1253,7 +1251,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
*/ */
ByteArrayOutputStream baos3 = new ByteArrayOutputStream(); ByteArrayOutputStream baos3 = new ByteArrayOutputStream();
List<AnswerRecordVO> answerRecordVOS = exportAnswerRecord(classDetailDTO); List<AnswerRecordVO> answerRecordVOS = exportAnswerRecord(classDetailDTO);
askListExcel(companyDictDO.getCompanyName(), studyDate, courseDictDO.getCourseName(), "答疑记录", ExcelFormatUtils.answersList, answerRecordVOS, null, 0, baos3); askListExcel(companyDictDO.getCompanyName(), studyDate, classDictDO.getClassName(), "答疑记录", ExcelFormatUtils.answersList, answerRecordVOS, null, 0, baos3);
compressFileToZipStream(zipOutputStream, baos3, "answer.xlsx"); compressFileToZipStream(zipOutputStream, baos3, "answer.xlsx");
zipOutputStream.flush(); zipOutputStream.flush();
......
src/main/java/com/subsidy/service/impl/ClassDictServiceImpl.java
...@@ -153,6 +153,7 @@ public class ClassDictServiceImpl extends ServiceImpl<ClassDictMapper, ClassDict ...@@ -153,6 +153,7 @@ public class ClassDictServiceImpl extends ServiceImpl<ClassDictMapper, ClassDict
public String updateClass(ClassDictDO classDictDO) { public String updateClass(ClassDictDO classDictDO) {
this.baseMapper.updateById(classDictDO); this.baseMapper.updateById(classDictDO);
return ConstantUtils.SET_SUCCESS; return ConstantUtils.SET_SUCCESS;
} }
......
src/main/java/com/subsidy/service/impl/CourseDictServiceImpl.java
...@@ -100,7 +100,7 @@ public class CourseDictServiceImpl extends ServiceImpl<CourseDictMapper, CourseD ...@@ -100,7 +100,7 @@ public class CourseDictServiceImpl extends ServiceImpl<CourseDictMapper, CourseD
CourseDictDO courseDictDO = new CourseDictDO(); CourseDictDO courseDictDO = new CourseDictDO();
BeanUtils.copyProperties(addCourseDTO, courseDictDO); BeanUtils.copyProperties(addCourseDTO, courseDictDO);
courseDictDO.setOpenStatus(0); courseDictDO.setOpenStatus("0");
this.baseMapper.insert(courseDictDO); this.baseMapper.insert(courseDictDO);
if (null != addCourseDTO.getCategoryDOS()) { if (null != addCourseDTO.getCategoryDOS()) {
......
src/main/java/com/subsidy/service/impl/ImageCheckRecordServiceImpl.java
...@@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.*; import org.springframework.http.*;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import sun.misc.BASE64Decoder; import sun.misc.BASE64Decoder;
import sun.security.krb5.internal.crypto.Nonce;
//import org.apache.commons.codec.binary.Base64; //import org.apache.commons.codec.binary.Base64;
import java.io.*; import java.io.*;
...@@ -123,7 +124,11 @@ public class ImageCheckRecordServiceImpl extends ServiceImpl<ImageCheckRecordMap ...@@ -123,7 +124,11 @@ public class ImageCheckRecordServiceImpl extends ServiceImpl<ImageCheckRecordMap
//获取signTicket //获取signTicket
IdCardTicketsVO idCardTicketsVO = this.signTickets(getLatestAccessToken()); IdCardTicketsVO idCardTicketsVO = this.signTickets(getLatestAccessToken());
//生成签名 //生成签名
List<String> signList1 = Arrays.asList(WBAPPID, NONCE, memberDO.getId() + "", "1.0.0"); List<String> signList1 =new ArrayList<>();
signList1.add(WBAPPID);
signList1.add(memberDO.getId()+"");
signList1.add("1.0.0");
signList1.add(NONCE);
String sign = sign(signList1, idCardTicketsVO.getValue()); String sign = sign(signList1, idCardTicketsVO.getValue());
//合作方后台上送身份信息 //合作方后台上送身份信息
...@@ -143,7 +148,13 @@ public class ImageCheckRecordServiceImpl extends ServiceImpl<ImageCheckRecordMap ...@@ -143,7 +148,13 @@ public class ImageCheckRecordServiceImpl extends ServiceImpl<ImageCheckRecordMap
IdCardTicketsVO nonceTicket = this.nonceTicket(getLatestAccessToken(), memberDO.getId() + ""); IdCardTicketsVO nonceTicket = this.nonceTicket(getLatestAccessToken(), memberDO.getId() + "");
//签名2 //签名2
List<String> signList2 = Arrays.asList(WBAPPID, NONCE, imageCheckRecordDO.getId() + "", sendIdCardInfoVO.getResult().getH5faceId(), memberDO.getId() + "", "1.0.0"); List<String> signList2 = new ArrayList<>();
signList2.add(WBAPPID);
signList2.add(imageCheckRecordDO.getId()+"");
signList2.add(memberDO.getId()+"");
signList2.add("1.0.0");
signList2.add(sendIdCardInfoVO.getResult().getFaceId());
signList2.add(NONCE);
String sign2 = sign(signList2, nonceTicket.getValue()); String sign2 = sign(signList2, nonceTicket.getValue());
sendIdCardInfoVO.getResult().setWbAppId(WBAPPID); sendIdCardInfoVO.getResult().setWbAppId(WBAPPID);
...@@ -179,7 +190,7 @@ public class ImageCheckRecordServiceImpl extends ServiceImpl<ImageCheckRecordMap ...@@ -179,7 +190,7 @@ public class ImageCheckRecordServiceImpl extends ServiceImpl<ImageCheckRecordMap
IdCardTicketsVO idCardTicketsVO = this.signTickets(getLatestAccessToken()); IdCardTicketsVO idCardTicketsVO = this.signTickets(getLatestAccessToken());
//生成签名 //生成签名
List<String> signList1 = Arrays.asList(WBAPPID, imageCheckRecordDO.getId() + "", memberDO.getUserName(), memberDO.getIdCard(), memberDO.getId() + "", "1.0.0"); List<String> signList1 = new ArrayList(Arrays.asList(WBAPPID, imageCheckRecordDO.getId() + "", memberDO.getUserName(), memberDO.getIdCard(), memberDO.getId() + "", "1.0.0"));
String sign = sign(signList1, idCardTicketsVO.getValue()); String sign = sign(signList1, idCardTicketsVO.getValue());
//合作方后台上送身份信息 //合作方后台上送身份信息
...@@ -200,7 +211,7 @@ public class ImageCheckRecordServiceImpl extends ServiceImpl<ImageCheckRecordMap ...@@ -200,7 +211,7 @@ public class ImageCheckRecordServiceImpl extends ServiceImpl<ImageCheckRecordMap
IdCardTicketsVO nonceTicket = this.nonceTicket(getLatestAccessToken(), memberDO.getId() + ""); IdCardTicketsVO nonceTicket = this.nonceTicket(getLatestAccessToken(), memberDO.getId() + "");
//签名2 //签名2
List<String> signList2 = Arrays.asList(WBAPPID, memberDO.getId() + "", NONCE, "1.0.0", sendIdCardInfoVO.getResult().getFaceId(), sendIdCardInfoVO.getResult().getOrderNo()); List<String> signList2 = new ArrayList(Arrays.asList(WBAPPID, memberDO.getId() + "", NONCE, "1.0.0", sendIdCardInfoVO.getResult().getFaceId(), sendIdCardInfoVO.getResult().getOrderNo()));
String sign2 = sign(signList2, nonceTicket.getValue()); String sign2 = sign(signList2, nonceTicket.getValue());
sendIdCardInfoVO.getResult().setWbAppId(WBAPPID); sendIdCardInfoVO.getResult().setWbAppId(WBAPPID);
...@@ -423,8 +434,8 @@ public class ImageCheckRecordServiceImpl extends ServiceImpl<ImageCheckRecordMap ...@@ -423,8 +434,8 @@ public class ImageCheckRecordServiceImpl extends ServiceImpl<ImageCheckRecordMap
//获取最新的accessToken //获取最新的accessToken
public String getLatestAccessToken() { public String getLatestAccessToken() {
AccessTokenDO accessTokenDO = accessTokenMapper.selectOne(new QueryWrapper<AccessTokenDO>() AccessTokenDO accessTokenDO = accessTokenMapper.selectOne(new QueryWrapper<AccessTokenDO>()
.lambda() .lambda() //21min //39min
.lt(AccessTokenDO::getCreateDate, LocalDateTime.now().minusMinutes(19L))); .gt(AccessTokenDO::getCreateDate, LocalDateTime.now().minusMinutes(19L)));
//数据库没有的话 //数据库没有的话
if (null == accessTokenDO) { if (null == accessTokenDO) {
...@@ -438,5 +449,4 @@ public class ImageCheckRecordServiceImpl extends ServiceImpl<ImageCheckRecordMap ...@@ -438,5 +449,4 @@ public class ImageCheckRecordServiceImpl extends ServiceImpl<ImageCheckRecordMap
return accessTokenDO.getAccessToken(); return accessTokenDO.getAccessToken();
} }
} }
src/main/java/com/subsidy/service/impl/MemberServiceImpl.java
...@@ -590,7 +590,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberDO> imple ...@@ -590,7 +590,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberDO> imple
.eq(RotationImgDictDO::getCompanyId, companyDictDO.getId())); .eq(RotationImgDictDO::getCompanyId, companyDictDO.getId()));
userRoleVO.setRotationImgDictDOS(rotationImgDictDOS); userRoleVO.setRotationImgDictDOS(rotationImgDictDOS);
String token = JwtUtil.generateToken(memberDO.getId(), ConstantUtils.MOBILE_TERMINATE); String token = JwtUtil.generateToken(memberDO.getId(), ConstantUtils.MOBILE_TERMINATE);
redisUtil.set(ConstantUtils.MOBILE_TERMINATE + "_" + memberDO.getId(), token); // redisUtil.set(ConstantUtils.MOBILE_TERMINATE + "_" + memberDO.getId(), token);
userRoleVO.setToken(token); userRoleVO.setToken(token);
return userRoleVO; return userRoleVO;
} }
...@@ -677,7 +677,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberDO> imple ...@@ -677,7 +677,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberDO> imple
.eq(RotationImgDictDO::getCompanyId, companyDictDO.getId())); .eq(RotationImgDictDO::getCompanyId, companyDictDO.getId()));
userRoleVO.setRotationImgDictDOS(rotationImgDictDOS); userRoleVO.setRotationImgDictDOS(rotationImgDictDOS);
String token = JwtUtil.generateToken(memberDO.getId(), ConstantUtils.MOBILE_TERMINATE); String token = JwtUtil.generateToken(memberDO.getId(), ConstantUtils.MOBILE_TERMINATE);
redisUtil.set(ConstantUtils.MOBILE_TERMINATE + "_" + memberDO.getId(), token); // redisUtil.set(ConstantUtils.MOBILE_TERMINATE + "_" + memberDO.getId(), token);
userRoleVO.setToken(token); userRoleVO.setToken(token);
return userRoleVO; return userRoleVO;
} }
......
src/main/java/com/subsidy/service/impl/VodDictServiceImpl.java
...@@ -86,11 +86,11 @@ public class VodDictServiceImpl extends ServiceImpl<VodDictMapper, VodDictDO> im ...@@ -86,11 +86,11 @@ public class VodDictServiceImpl extends ServiceImpl<VodDictMapper, VodDictDO> im
throw new HttpException(18000); throw new HttpException(18000);
} }
if(vodDictDO.getVodCode() != null) { if(vod.getVodCode() != null) {
VodUtil.deleteMedia(vodConfig, vodDictDO.getVodCode()); VodUtil.deleteMedia(vodConfig, vod.getVodCode());
} }
this.baseMapper.deleteById(vodDictDO.getId()); this.baseMapper.deleteById(vod.getId());
} }
@Override @Override
......
src/main/java/com/subsidy/service/impl/VodPlayHistoryServiceImpl.java
...@@ -632,7 +632,7 @@ public class VodPlayHistoryServiceImpl extends ServiceImpl<VodPlayHistoryMapper, ...@@ -632,7 +632,7 @@ public class VodPlayHistoryServiceImpl extends ServiceImpl<VodPlayHistoryMapper,
String classIds = "150,151,152,153,165,195,199,200,202,207,209,210,211,212,213,215,227,228,229,233,234,235,240,241,243,244,248,249,250,251,252,253,254,255,256,257,258,261,268,278,280,282,286,287,288,289,292,293,294,295,297,298,300,301,303,304,305,306"; String classIds = "150,151,152,153,165,195,199,200,202,207,209,210,211,212,213,215,227,228,229,233,234,235,240,241,243,244,248,249,250,251,252,253,254,255,256,257,258,261,268,278,280,282,286,287,288,289,292,293,294,295,297,298,300,301,303,304,305,306";
List<String> classIdArr = Arrays.asList(classIds.split(",")); String[] classIdArr = classIds.split(",");
HashSet<Long> result = new HashSet<>(); HashSet<Long> result = new HashSet<>();
for (String classId : classIdArr) { for (String classId : classIdArr) {
......
src/main/java/com/subsidy/util/SecretUtils.java
...@@ -22,7 +22,7 @@ public class SecretUtils { ...@@ -22,7 +22,7 @@ public class SecretUtils {
public static String getMD5String(String str) { public static String getMD5String(String str) {
try { try {
// 生成一个MD5加密计算摘要 // 生成一个MD5加密计算摘要
return DigestUtils.md5Hex(str.toString()).toUpperCase(); return DigestUtils.md5Hex(str).toUpperCase();
// MessageDigest md = MessageDigest.getInstance("MD5"); // MessageDigest md = MessageDigest.getInstance("MD5");
// 计算md5函数 // 计算md5函数
// md.update(str.getBytes("utf-8")); // md.update(str.getBytes("utf-8"));
......
src/main/java/com/subsidy/util/websocket/WebSocketUtil.java
...@@ -103,7 +103,7 @@ public class WebSocketUtil implements WebSocketHandler { ...@@ -103,7 +103,7 @@ public class WebSocketUtil implements WebSocketHandler {
} }
webSocketMap.put(id, session); webSocketMap.put(id, session);
/* 班级配置信息 */ /* 班级配置信息 */ //查人的班级
List<ClassSettingsVO> classSettings = classDictMapper.getClassSettings(id); List<ClassSettingsVO> classSettings = classDictMapper.getClassSettings(id);
if(CollectionUtils.isNotEmpty(classSettings)) { if(CollectionUtils.isNotEmpty(classSettings)) {
String data = JSONObject.toJSONString(ResponseData.generateCreatedResponse(0, classSettings), SerializerFeature.WriteMapNullValue); String data = JSONObject.toJSONString(ResponseData.generateCreatedResponse(0, classSettings), SerializerFeature.WriteMapNullValue);
......
src/main/java/com/subsidy/vo/classdict/ClassSettingsVO.java
...@@ -65,4 +65,6 @@ public class ClassSettingsVO { ...@@ -65,4 +65,6 @@ public class ClassSettingsVO {
private Integer ipAddressRecord; private Integer ipAddressRecord;
private Integer deviceNoRecord; private Integer deviceNoRecord;
private Integer timeLimit;
} }
src/main/resources/application.properties
...@@ -68,7 +68,7 @@ spring.quartz.overwrite-existing-jobs=false ...@@ -68,7 +68,7 @@ spring.quartz.overwrite-existing-jobs=false
#spring.redis.port=6379 #spring.redis.port=6379
#spring.redis.password=r-uf6m4cpkjrgpzywjm3:Ykhl@208 #spring.redis.password=r-uf6m4cpkjrgpzywjm3:Ykhl@208
wechat: wechat=
#pro #pro
appId: wx5e1ecb9c9bd33451 appId= wx5e1ecb9c9bd33451
appSecret: 4f5e1abb6fb4f68f5273820b6295ec6b appSecret= 4f5e1abb6fb4f68f5273820b6295ec6b
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!