Skip to content

涂亚平 / subsidy

Go to a project
Commit 829fbc99 by 涂亚平
Options

新版本手机号可重复

1 parent c88a9ad1
Inline Side-by-side
Showing with 61 additions and 362 deletions
src/main/java/com/subsidy/controller/AdministerCompanyMappingController.java deleted 100644 → 0
package com.subsidy.controller;
import com.subsidy.common.ResponseData;
import com.subsidy.common.ResponseVO;
import com.subsidy.service.AdministerCompanyMappingService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
/**
* <p>
* 管理员-公司映射表 前端控制器
* </p>
*
* @author Tuyp
* @since 2024-01-05
*/
@RestController
@Api(tags = "管理员-公司映射表")
@RequestMapping("/administerCompanyMapping")
public class AdministerCompanyMappingController {
}
src/main/java/com/subsidy/controller/CertClassMemberMappingController.java deleted 100644 → 0
package com.subsidy.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
/**
* <p>
* 证书班级人员映射表 前端控制器
* </p>
*
* @author Tuyp
* @since 2022-09-06
*/
@RestController
@Api(tags = "证书班级人员映射表")
@RequestMapping("/certClassMemberMapping")
public class CertClassMemberMappingController {
}
src/main/java/com/subsidy/controller/CertMemberFileMappingController.java deleted 100644 → 0
package com.subsidy.controller;
import com.subsidy.service.CertMemberFileMappingService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
/**
* <p>
* 前端控制器
* </p>
*
* @author DengMin
* @since 2022-05-11
*/
@RestController
@Api(tags = "学生报名材料 映射表")
@RequestMapping("/certMemberFileMapping")
public class CertMemberFileMappingController {
}
src/main/java/com/subsidy/controller/CertTypeMappingController.java deleted 100644 → 0
package com.subsidy.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
/**
* <p>
* 证书-类型映射表 前端控制器
* </p>
*
* @author DengMin
* @since 2022-05-11
*/
@RestController
@Api(tags = "证书-类型映射表")
@RequestMapping("/certTypeMapping")
public class CertTypeMappingController {
}
src/main/java/com/subsidy/controller/ClassVodFaceCheckController.java deleted 100644 → 0
package com.subsidy.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
/**
* <p>
* 百分比认证视频表 前端控制器
* </p>
*
* @author Tuyp
* @since 2024-03-18
*/
@RestController
@Api(tags = "百分比认证视频表")
@RequestMapping("/class-vod-face-check-do")
public class ClassVodFaceCheckController {
}
src/main/java/com/subsidy/controller/CompanyFieldMappingController.java deleted 100644 → 0
package com.subsidy.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
/**
* <p>
* 前端控制器
* </p>
*
* @author DengMin
* @since 2022-02-11
*/
@RestController
@Api(tags = "")
@RequestMapping("/company-field-mapping-do")
public class CompanyFieldMappingController {
}
src/main/java/com/subsidy/controller/CourseBusinessMappingController.java deleted 100644 → 0
package com.subsidy.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
/**
* <p>
* 课程经营范围字典表 前端控制器
* </p>
*
* @author Tuyp
* @since 2022-08-04
*/
@RestController
@Api(tags = "课程经营范围字典表")
@RequestMapping("/course-business-mapping-do")
public class CourseBusinessMappingController {
}
src/main/java/com/subsidy/controller/CourseCategoryMappingController.java deleted 100644 → 0
package com.subsidy.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
/**
* <p>
* 课程类目映射 前端控制器
* </p>
*
* @author DengMin
* @since 2022-02-14
*/
@RestController
@Api(tags = "课程类目映射")
@RequestMapping("/course-category-mapping-do")
public class CourseCategoryMappingController {
}
src/main/java/com/subsidy/controller/CourseFieldMappingController.java deleted 100644 → 0
package com.subsidy.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
/**
* <p>
* 前端控制器
* </p>
*
* @author DengMin
* @since 2022-01-20
*/
@RestController
@Api(tags = "")
@RequestMapping("/courseField")
public class CourseFieldMappingController {
}
src/main/java/com/subsidy/controller/CourseJobMappingController.java deleted 100644 → 0
package com.subsidy.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
/**
* <p>
* 课程-岗位映射表 前端控制器
* </p>
*
* @author DengMin
* @since 2022-02-14
*/
@RestController
@Api(tags = "课程-岗位映射表")
@RequestMapping("/course-job-mapping-do")
public class CourseJobMappingController {
}
src/main/java/com/subsidy/controller/CourseRankMappingController.java deleted 100644 → 0
package com.subsidy.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
/**
* <p>
* 课程职级映射表 前端控制器
* </p>
*
* @author DengMin
* @since 2022-02-14
*/
@RestController
@Api(tags = "课程职级映射表")
@RequestMapping("/course-rank-mapping-do")
public class CourseRankMappingController {
}
src/main/java/com/subsidy/controller/JobMemberMappingController.java deleted 100644 → 0
package com.subsidy.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
/**
* <p>
* 岗位人员表 前端控制器
* </p>
*
* @author DengMin
* @since 2022-02-10
*/
@RestController
@Api(tags = "岗位人员表")
@RequestMapping("/jobMemberMapping")
public class JobMemberMappingController {
}
src/main/java/com/subsidy/controller/MemberStudyLengthController.java deleted 100644 → 0
package com.subsidy.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
/**
* <p>
* 前端控制器
* </p>
*
* @author DengMin
* @since 2022-01-28
*/
@RestController
@Api(tags = "")
@RequestMapping("/member-study-length-do")
public class MemberStudyLengthController {
}
src/main/java/com/subsidy/controller/MemberTokensController.java deleted 100644 → 0
package com.subsidy.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
/**
* <p>
* 用户登录token 前端控制器
* </p>
*
* @author Tuyp
* @since 2023-01-06
*/
@RestController
@Api(tags = "用户登录token")
@RequestMapping("/memberTokens")
public class MemberTokensController {
}
src/main/java/com/subsidy/controller/PushDataController.java
...@@ -53,6 +53,12 @@ public class PushDataController { ...@@ -53,6 +53,12 @@ public class PushDataController {
pushDataService.post7(); pushDataService.post7();
} }
@PostMapping("sendWarning")
@ApiOperation("发送短信 ")
public void sendWarning(){
pushDataService.sendWarning();
}
@GetMapping("check") @GetMapping("check")
@ApiOperation("核对数据") @ApiOperation("核对数据")
public ResponseVO check(){ public ResponseVO check(){
......
src/main/java/com/subsidy/model/MemberDO.java
...@@ -139,4 +139,8 @@ public class MemberDO extends BaseModel { ...@@ -139,4 +139,8 @@ public class MemberDO extends BaseModel {
*/ */
private Integer memberType; private Integer memberType;
private String bank;
private String payrollAccount;
} }
src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java
...@@ -1562,11 +1562,13 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -1562,11 +1562,13 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
MemberDO memberDel = memberMapper.selectOne(new QueryWrapper<MemberDO>() MemberDO memberDel = memberMapper.selectOne(new QueryWrapper<MemberDO>()
.lambda() .lambda()
.eq(MemberDO::getTelephone, s.getTelephone())); .eq(MemberDO::getTelephone, s.getTelephone())
.eq(MemberDO::getMemberType, 0));
MemberDO memberIdCard = memberMapper.selectOne(new QueryWrapper<MemberDO>() MemberDO memberIdCard = memberMapper.selectOne(new QueryWrapper<MemberDO>()
.lambda() .lambda()
.eq(MemberDO::getIdCard, s.getIdCard())); .eq(MemberDO::getIdCard, s.getIdCard())
.eq(MemberDO::getMemberType, 0));
boolean departmentFlag = false; boolean departmentFlag = false;
String[] fullName = s.getDepartments().split(","); String[] fullName = s.getDepartments().split(",");
...@@ -1675,6 +1677,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -1675,6 +1677,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
memberDO1.setStatus("启用"); memberDO1.setStatus("启用");
memberDO1.setPassword("Ykhl123456"); memberDO1.setPassword("Ykhl123456");
memberDO1.setAccountNameEn(s.getAccountNameEn()); memberDO1.setAccountNameEn(s.getAccountNameEn());
memberDO1.setMemberType(0);
memberMapper.insert(memberDO1); memberMapper.insert(memberDO1);
//人和公司的映射 //人和公司的映射
...@@ -2615,29 +2618,29 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -2615,29 +2618,29 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
newCell = dataRow.createCell(5); newCell = dataRow.createCell(5);
newCell.setCellStyle(cellStyle); newCell.setCellStyle(cellStyle);
if (null != exerciseTestVO.getScore()){ if (null != exerciseTestVO.getScore()) {
newCell.setCellValue(exerciseTestVO.getScore()); newCell.setCellValue(exerciseTestVO.getScore());
} }
//开始时间 //开始时间
newCell = dataRow.createCell(6); newCell = dataRow.createCell(6);
newCell.setCellStyle(cellStyle); newCell.setCellStyle(cellStyle);
if (null != exerciseTestVO.getScore()){ if (null != exerciseTestVO.getScore()) {
newCell.setCellValue(exerciseTestVO.getStartDate()); newCell.setCellValue(exerciseTestVO.getStartDate());
} }
//结束时间 //结束时间
newCell = dataRow.createCell(7); newCell = dataRow.createCell(7);
newCell.setCellStyle(cellStyle); newCell.setCellStyle(cellStyle);
if (null != exerciseTestVO.getScore()){ if (null != exerciseTestVO.getScore()) {
newCell.setCellValue(exerciseTestVO.getEndDate()); newCell.setCellValue(exerciseTestVO.getEndDate());
} }
newCell = dataRow.createCell(8); newCell = dataRow.createCell(8);
newCell.setCellStyle(cellStyle); newCell.setCellStyle(cellStyle);
if (null != exerciseTestVO.getScore() && exerciseTestVO.getScore()>=60){ if (null != exerciseTestVO.getScore() && exerciseTestVO.getScore() >= 60) {
newCell.setCellValue("合格"); newCell.setCellValue("合格");
}else { } else {
newCell.setCellValue("不合格"); newCell.setCellValue("不合格");
} }
......
src/main/java/com/subsidy/service/impl/DudaoServiceImpl.java
...@@ -83,7 +83,7 @@ public class DudaoServiceImpl implements DudaoService { ...@@ -83,7 +83,7 @@ public class DudaoServiceImpl implements DudaoService {
List<Long> imageClassIds = dudaoMapper.imageClassIds("0"); List<Long> imageClassIds = dudaoMapper.imageClassIds("0");
Set<Long> classIds = new HashSet<>(); Set<Long> classIds = new HashSet<>();
// classIds.add(424L); // classIds.add(423L);
vodClassIds.stream().forEach(x->classIds.add(x)); vodClassIds.stream().forEach(x->classIds.add(x));
examClassIds.stream().forEach(x->classIds.add(x)); examClassIds.stream().forEach(x->classIds.add(x));
...@@ -176,7 +176,7 @@ public class DudaoServiceImpl implements DudaoService { ...@@ -176,7 +176,7 @@ public class DudaoServiceImpl implements DudaoService {
List<Long> vodClassIds = dudaoMapper.vodClassIds("0"); List<Long> vodClassIds = dudaoMapper.vodClassIds("0");
// List<Long> vodClassIds = new ArrayList<>(); // List<Long> vodClassIds = new ArrayList<>();
// vodClassIds.add(424L); // vodClassIds.add(423L);
List<DailyStudyInfoVO> result = new ArrayList<>(); List<DailyStudyInfoVO> result = new ArrayList<>();
...@@ -307,7 +307,7 @@ public class DudaoServiceImpl implements DudaoService { ...@@ -307,7 +307,7 @@ public class DudaoServiceImpl implements DudaoService {
List<Long> classIds = dudaoMapper.dailyExamBasic("0"); List<Long> classIds = dudaoMapper.dailyExamBasic("0");
// List<Long>classIds = new ArrayList<>(); // List<Long>classIds = new ArrayList<>();
// classIds.add(424L); // classIds.add(419L);
try { try {
if (classIds.size() > 0) { if (classIds.size() > 0) {
......
src/main/java/com/subsidy/service/impl/MemberServiceImpl.java
...@@ -188,7 +188,8 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberDO> imple ...@@ -188,7 +188,8 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberDO> imple
Integer count = this.baseMapper.selectCount(new QueryWrapper<MemberDO>() Integer count = this.baseMapper.selectCount(new QueryWrapper<MemberDO>()
.lambda() .lambda()
.eq(MemberDO::getTelephone, addMemberDTO.getTelephone())); .eq(MemberDO::getTelephone, addMemberDTO.getTelephone())
.eq(MemberDO::getMemberType, 2));
if (count > 0) { if (count > 0) {
throw new HttpException(20002); throw new HttpException(20002);
...@@ -196,7 +197,8 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberDO> imple ...@@ -196,7 +197,8 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberDO> imple
Integer count2 = this.baseMapper.selectCount(new QueryWrapper<MemberDO>() Integer count2 = this.baseMapper.selectCount(new QueryWrapper<MemberDO>()
.lambda() .lambda()
.eq(MemberDO::getIdCard, addMemberDTO.getIdCard())); .eq(MemberDO::getIdCard, addMemberDTO.getIdCard())
.eq(MemberDO::getMemberType, 2));
if (count2 > 0) { if (count2 > 0) {
throw new HttpException(20002); throw new HttpException(20002);
...@@ -213,6 +215,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberDO> imple ...@@ -213,6 +215,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberDO> imple
memberDO.setPassword("Ykhl123456"); memberDO.setPassword("Ykhl123456");
memberDO.setStatus("启用"); memberDO.setStatus("启用");
memberDO.setFirstLogin(0); memberDO.setFirstLogin(0);
memberDO.setMemberType(0);
this.baseMapper.insert(memberDO); this.baseMapper.insert(memberDO);
//公司赋值 //公司赋值
CompanyMemberMappingDO companyMemberMappingDO = new CompanyMemberMappingDO(); CompanyMemberMappingDO companyMemberMappingDO = new CompanyMemberMappingDO();
...@@ -917,14 +920,14 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberDO> imple ...@@ -917,14 +920,14 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberDO> imple
vodVo.setVodLength(memberVodVO.getVodLength()); vodVo.setVodLength(memberVodVO.getVodLength());
//这个视频的人脸有没有做 //这个视频的人脸有没有做
int vodFaceCheck = activityDetectionMapper.selectCount(new QueryWrapper<ActivityDetectionDO>() int vodFaceCheck = activityDetectionMapper.selectCount(new QueryWrapper<ActivityDetectionDO>()
.lambda() .lambda()
.eq(ActivityDetectionDO::getVodId,memberVodVO.getId()) .eq(ActivityDetectionDO::getVodId, memberVodVO.getId())
.eq(ActivityDetectionDO::getMemberId,contentMemberDTO.getMemberId()) .eq(ActivityDetectionDO::getMemberId, contentMemberDTO.getMemberId())
.eq(ActivityDetectionDO::getClassId,contentMemberDTO.getClassId()) .eq(ActivityDetectionDO::getClassId, contentMemberDTO.getClassId())
.eq(ActivityDetectionDO::getStatus,1)); .eq(ActivityDetectionDO::getStatus, 1));
if (vodFaceCheck > 0){ if (vodFaceCheck > 0) {
vodVo.setVodFaceCheckFlag(true); vodVo.setVodFaceCheckFlag(true);
}else { } else {
vodVo.setVodFaceCheckFlag(false); vodVo.setVodFaceCheckFlag(false);
} }
...@@ -944,7 +947,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberDO> imple ...@@ -944,7 +947,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberDO> imple
if (i == 0 && vodFlag) { if (i == 0 && vodFlag) {
vodVo.setStatus(true); vodVo.setStatus(true);
} else if(memberVodVO.getPercent().equals("100")|| testFlag) { } else if (memberVodVO.getPercent().equals("100") || testFlag) {
//这个视频看完了，已解锁 //这个视频看完了，已解锁
vodVo.setStatus(true); vodVo.setStatus(true);
} else { } else {
...@@ -1011,13 +1014,13 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberDO> imple ...@@ -1011,13 +1014,13 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberDO> imple
//这个视频的人脸有没有做 //这个视频的人脸有没有做
int vodFaceCheck = activityDetectionMapper.selectCount(new QueryWrapper<ActivityDetectionDO>() int vodFaceCheck = activityDetectionMapper.selectCount(new QueryWrapper<ActivityDetectionDO>()
.lambda() .lambda()
.eq(ActivityDetectionDO::getVodId,memberVodVO.getId()) .eq(ActivityDetectionDO::getVodId, memberVodVO.getId())
.eq(ActivityDetectionDO::getMemberId,contentMemberDTO.getMemberId()) .eq(ActivityDetectionDO::getMemberId, contentMemberDTO.getMemberId())
.eq(ActivityDetectionDO::getClassId,contentMemberDTO.getClassId()) .eq(ActivityDetectionDO::getClassId, contentMemberDTO.getClassId())
.eq(ActivityDetectionDO::getStatus,1)); .eq(ActivityDetectionDO::getStatus, 1));
if (vodFaceCheck > 0){ if (vodFaceCheck > 0) {
vodVO.setVodFaceCheckFlag(true); vodVO.setVodFaceCheckFlag(true);
}else { } else {
vodVO.setVodFaceCheckFlag(false); vodVO.setVodFaceCheckFlag(false);
} }
socialVodTestVOS.add(vodVO); socialVodTestVOS.add(vodVO);
...@@ -1032,7 +1035,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberDO> imple ...@@ -1032,7 +1035,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberDO> imple
testVO.setItemType(1); testVO.setItemType(1);
testVO.setId(paperDictDO.getId()); testVO.setId(paperDictDO.getId());
memberVodVO.setStatus(true); memberVodVO.setStatus(true);
if (100==memberVodVO.getPercent()) { if (100 == memberVodVO.getPercent()) {
//视频全部看完 //视频全部看完
playCount++; playCount++;
//计算最好成绩 memberId,classId,vodId //计算最好成绩 memberId,classId,vodId
...@@ -1072,13 +1075,13 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberDO> imple ...@@ -1072,13 +1075,13 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberDO> imple
return socialContentVodNewVO; return socialContentVodNewVO;
} }
public CheckItemVO checkItem(CheckItemDTO checkItemDTO){ public CheckItemVO checkItem(CheckItemDTO checkItemDTO) {
CheckItemVO checkItemVO = new CheckItemVO(); CheckItemVO checkItemVO = new CheckItemVO();
if (0 == checkItemDTO.getType()){ if (0 == checkItemDTO.getType()) {
//视频 查看上一个视频对应的题目是否已经通过 //视频 查看上一个视频对应的题目是否已经通过
Integer integer = this.baseMapper.checkClassPaperPassStatus(checkItemDTO.getMemberId(), checkItemDTO.getClassId(), checkItemDTO.getPaperId()); Integer integer = this.baseMapper.checkClassPaperPassStatus(checkItemDTO.getMemberId(), checkItemDTO.getClassId(), checkItemDTO.getPaperId());
checkItemVO.setNextFlag(integer); checkItemVO.setNextFlag(integer);
}else { } else {
//题目 vodId 当前题目对应的视频id //题目 vodId 当前题目对应的视频id
Integer integer = this.baseMapper.checkClassVodPlayStatus(checkItemDTO.getMemberId(), checkItemDTO.getClassId(), checkItemDTO.getVodId()); Integer integer = this.baseMapper.checkClassVodPlayStatus(checkItemDTO.getMemberId(), checkItemDTO.getClassId(), checkItemDTO.getVodId());
checkItemVO.setNextFlag(integer); checkItemVO.setNextFlag(integer);
...@@ -1239,11 +1242,11 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberDO> imple ...@@ -1239,11 +1242,11 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberDO> imple
testVO.setId(paperDictDO.getId()); testVO.setId(paperDictDO.getId());
testVO.setItemName(paperDictDO.getPaperName()); testVO.setItemName(paperDictDO.getPaperName());
int totalCnt = exerciseDictMapper.selectCount(new QueryWrapper<ExerciseDictDO>() int totalCnt = exerciseDictMapper.selectCount(new QueryWrapper<ExerciseDictDO>()
.lambda() .lambda()
.eq(ExerciseDictDO::getPaperId,paperDictDO.getId())); .eq(ExerciseDictDO::getPaperId, paperDictDO.getId()));
testVO.setTotalCount(totalCnt); testVO.setTotalCount(totalCnt);
if (100 ==memberVodVO.getPercent()) { if (100 == memberVodVO.getPercent()) {
//视频全部看完 //视频全部看完
//计算最好成绩 memberId,classId,vodId //计算最好成绩 memberId,classId,vodId
MemberMaxScoreVO memberMaxScoreVO = paperDictMapper.memberMaxScore(contentMemberDTO.getMemberId(), contentMemberDTO.getClassId(), memberVodVO.getId()); MemberMaxScoreVO memberMaxScoreVO = paperDictMapper.memberMaxScore(contentMemberDTO.getMemberId(), contentMemberDTO.getClassId(), memberVodVO.getId());
......
src/main/java/com/subsidy/service/impl/PushDataServiceImpl.java
...@@ -221,7 +221,7 @@ public class PushDataServiceImpl extends ServiceImpl<PushAnsweringDataMapper, Pu ...@@ -221,7 +221,7 @@ public class PushDataServiceImpl extends ServiceImpl<PushAnsweringDataMapper, Pu
if (vodList.size()+answerList.size()+examList.size()+activityList.size()+imageList.size()>0){ if (vodList.size()+answerList.size()+examList.size()+activityList.size()+imageList.size()>0){
List<String> telephones = Arrays.asList("15201936167", "18201963812"); List<String> telephones = Arrays.asList("15201936167", "18201963812");
for (String telephone : telephones) { for (String telephone : telephones) {
smsUtils.sendWarning("SMS_460945631", telephone, null); // smsUtils.sendWarning("SMS_460945631", telephone, null);
} }
} }
......
src/main/java/com/subsidy/service/impl/RenSheJuServiceImpl.java
...@@ -162,7 +162,7 @@ public class RenSheJuServiceImpl implements RenSheJuService { ...@@ -162,7 +162,7 @@ public class RenSheJuServiceImpl implements RenSheJuService {
List<Long> vodClassIds = renSheJuMapper.vodClassIds("0"); List<Long> vodClassIds = renSheJuMapper.vodClassIds("0");
// List<Long> vodClassIds = new ArrayList<>(); // List<Long> vodClassIds = new ArrayList<>();
// vodClassIds.add(490L); // vodClassIds.add(537L);
List<DailyStudyInfoVO> result = new ArrayList<>(); List<DailyStudyInfoVO> result = new ArrayList<>();
...@@ -498,6 +498,11 @@ public class RenSheJuServiceImpl implements RenSheJuService { ...@@ -498,6 +498,11 @@ public class RenSheJuServiceImpl implements RenSheJuService {
//找到昨天做过人脸识别的班级 //找到昨天做过人脸识别的班级
List<Long> classIds = renSheJuMapper.checkClassIds("0"); List<Long> classIds = renSheJuMapper.checkClassIds("0");
// List<Long> classIds = new ArrayList<>();
// classIds.add(535L);
// classIds.add(536L);
// classIds.add(539L);
for (Long classId : classIds) { for (Long classId : classIds) {
UploadImageDTO uploadImage = new UploadImageDTO(); UploadImageDTO uploadImage = new UploadImageDTO();
...@@ -583,7 +588,6 @@ public class RenSheJuServiceImpl implements RenSheJuService { ...@@ -583,7 +588,6 @@ public class RenSheJuServiceImpl implements RenSheJuService {
renshejuHistoryDO1.setOutputParam(RenSheJuConstant.NO_DATA); renshejuHistoryDO1.setOutputParam(RenSheJuConstant.NO_DATA);
renshejuHistoryMapper.insert(renshejuHistoryDO1); renshejuHistoryMapper.insert(renshejuHistoryDO1);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
RenshejuHistoryDO renshejuHistoryDO = new RenshejuHistoryDO(); RenshejuHistoryDO renshejuHistoryDO = new RenshejuHistoryDO();
......
src/main/java/com/subsidy/service/impl/SmsVerifyCodeServiceImpl.java
...@@ -37,10 +37,10 @@ public class SmsVerifyCodeServiceImpl extends ServiceImpl<SmsVerifyCodeMapper, S ...@@ -37,10 +37,10 @@ public class SmsVerifyCodeServiceImpl extends ServiceImpl<SmsVerifyCodeMapper, S
//private RedisUtil redisUtil; //private RedisUtil redisUtil;
public void sendVerifyCode(SendVerifyCodeDTO sendVerifyCodeDTO) { public void sendVerifyCode(SendVerifyCodeDTO sendVerifyCodeDTO) {
MemberDO memberDO = memberMapper.selectOne(new QueryWrapper<MemberDO>() int count = memberMapper.selectCount(new QueryWrapper<MemberDO>()
.lambda() .lambda()
.eq(MemberDO::getTelephone, sendVerifyCodeDTO.getTelephone())); .eq(MemberDO::getTelephone, sendVerifyCodeDTO.getTelephone()));
if (memberDO == null) { if (count == 0) {
throw new HttpException(70012); throw new HttpException(70012);
} }
......
src/main/resources/application-prod.properties
...@@ -50,4 +50,5 @@ qxueyou.url=https://www.qxueyou.com/auth/user/token ...@@ -50,4 +50,5 @@ qxueyou.url=https://www.qxueyou.com/auth/user/token
renshe.url = https://api.shzypxy.com renshe.url = https://api.shzypxy.com
#renshe.url = http://trial.shzypxy.com/api #renshe.url = http://trial.shzypxy.com/api
renshe.secretKey = ad927f0b-6a39-43a7-bac7-163baef1fff7 renshe.secretKey = ad927f0b-6a39-43a7-bac7-163baef1fff7
renshe.putuo = http://180.167.195.117:18025/ddproject #renshe.putuo = http://180.167.195.117:18025/ddproject
\ No newline at end of file renshe.putuo = http://116.228.3.104:18025/ddproject
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!