From 829fbc997b9801fa12d6611293969cba734ecd3a Mon Sep 17 00:00:00 2001 From: tuyp Date: Wed, 4 Sep 2024 13:32:42 +0800 Subject: [PATCH] 新版本手机号可重复 --- src/main/java/com/subsidy/controller/AdministerCompanyMappingController.java | 29 ----------------------------- src/main/java/com/subsidy/controller/CertClassMemberMappingController.java | 22 ---------------------- src/main/java/com/subsidy/controller/CertMemberFileMappingController.java | 26 -------------------------- src/main/java/com/subsidy/controller/CertTypeMappingController.java | 25 ------------------------- src/main/java/com/subsidy/controller/ClassVodFaceCheckController.java | 22 ---------------------- src/main/java/com/subsidy/controller/CompanyFieldMappingController.java | 22 ---------------------- src/main/java/com/subsidy/controller/CourseBusinessMappingController.java | 22 ---------------------- src/main/java/com/subsidy/controller/CourseCategoryMappingController.java | 22 ---------------------- src/main/java/com/subsidy/controller/CourseFieldMappingController.java | 22 ---------------------- src/main/java/com/subsidy/controller/CourseJobMappingController.java | 22 ---------------------- src/main/java/com/subsidy/controller/CourseRankMappingController.java | 22 ---------------------- src/main/java/com/subsidy/controller/JobMemberMappingController.java | 22 ---------------------- src/main/java/com/subsidy/controller/MemberStudyLengthController.java | 22 ---------------------- src/main/java/com/subsidy/controller/MemberTokensController.java | 22 ---------------------- src/main/java/com/subsidy/controller/PushDataController.java | 6 ++++++ src/main/java/com/subsidy/model/MemberDO.java | 4 ++++ src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java | 17 ++++++++++------- src/main/java/com/subsidy/service/impl/DudaoServiceImpl.java | 6 +++--- src/main/java/com/subsidy/service/impl/MemberServiceImpl.java | 49 ++++++++++++++++++++++++++----------------------- src/main/java/com/subsidy/service/impl/PushDataServiceImpl.java | 2 +- src/main/java/com/subsidy/service/impl/RenSheJuServiceImpl.java | 8 ++++++-- src/main/java/com/subsidy/service/impl/SmsVerifyCodeServiceImpl.java | 4 ++-- src/main/resources/application-prod.properties | 3 ++- 23 files changed, 60 insertions(+), 361 deletions(-) delete mode 100644 src/main/java/com/subsidy/controller/AdministerCompanyMappingController.java delete mode 100644 src/main/java/com/subsidy/controller/CertClassMemberMappingController.java delete mode 100644 src/main/java/com/subsidy/controller/CertMemberFileMappingController.java delete mode 100644 src/main/java/com/subsidy/controller/CertTypeMappingController.java delete mode 100644 src/main/java/com/subsidy/controller/ClassVodFaceCheckController.java delete mode 100644 src/main/java/com/subsidy/controller/CompanyFieldMappingController.java delete mode 100644 src/main/java/com/subsidy/controller/CourseBusinessMappingController.java delete mode 100644 src/main/java/com/subsidy/controller/CourseCategoryMappingController.java delete mode 100644 src/main/java/com/subsidy/controller/CourseFieldMappingController.java delete mode 100644 src/main/java/com/subsidy/controller/CourseJobMappingController.java delete mode 100644 src/main/java/com/subsidy/controller/CourseRankMappingController.java delete mode 100644 src/main/java/com/subsidy/controller/JobMemberMappingController.java delete mode 100644 src/main/java/com/subsidy/controller/MemberStudyLengthController.java delete mode 100644 src/main/java/com/subsidy/controller/MemberTokensController.java diff --git a/src/main/java/com/subsidy/controller/AdministerCompanyMappingController.java b/src/main/java/com/subsidy/controller/AdministerCompanyMappingController.java deleted file mode 100644 index 2068e77..0000000 --- a/src/main/java/com/subsidy/controller/AdministerCompanyMappingController.java +++ /dev/null @@ -1,29 +0,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; - -/** - *

- * 管理员-公司映射表 前端控制器 - *

- * - * @author Tuyp - * @since 2024-01-05 - */ -@RestController -@Api(tags = "管理员-公司映射表") -@RequestMapping("/administerCompanyMapping") -public class AdministerCompanyMappingController { - -} diff --git a/src/main/java/com/subsidy/controller/CertClassMemberMappingController.java b/src/main/java/com/subsidy/controller/CertClassMemberMappingController.java deleted file mode 100644 index 89c3c21..0000000 --- a/src/main/java/com/subsidy/controller/CertClassMemberMappingController.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.subsidy.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; -import io.swagger.annotations.Api; - -/** - *

- * 证书班级人员映射表 前端控制器 - *

- * - * @author Tuyp - * @since 2022-09-06 - */ -@RestController -@Api(tags = "证书班级人员映射表") -@RequestMapping("/certClassMemberMapping") -public class CertClassMemberMappingController { - -} diff --git a/src/main/java/com/subsidy/controller/CertMemberFileMappingController.java b/src/main/java/com/subsidy/controller/CertMemberFileMappingController.java deleted file mode 100644 index e566ab4..0000000 --- a/src/main/java/com/subsidy/controller/CertMemberFileMappingController.java +++ /dev/null @@ -1,26 +0,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; - -/** - *

- * 前端控制器 - *

- * - * @author DengMin - * @since 2022-05-11 - */ -@RestController -@Api(tags = "学生报名材料 映射表") -@RequestMapping("/certMemberFileMapping") -public class CertMemberFileMappingController { - - -} diff --git a/src/main/java/com/subsidy/controller/CertTypeMappingController.java b/src/main/java/com/subsidy/controller/CertTypeMappingController.java deleted file mode 100644 index 03b3196..0000000 --- a/src/main/java/com/subsidy/controller/CertTypeMappingController.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.subsidy.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; -import io.swagger.annotations.Api; - -/** - *

- * 证书-类型映射表 前端控制器 - *

- * - * @author DengMin - * @since 2022-05-11 - */ -@RestController -@Api(tags = "证书-类型映射表") -@RequestMapping("/certTypeMapping") -public class CertTypeMappingController { - - - - -} diff --git a/src/main/java/com/subsidy/controller/ClassVodFaceCheckController.java b/src/main/java/com/subsidy/controller/ClassVodFaceCheckController.java deleted file mode 100644 index e1266ec..0000000 --- a/src/main/java/com/subsidy/controller/ClassVodFaceCheckController.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.subsidy.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; -import io.swagger.annotations.Api; - -/** - *

- * 百分比认证视频表 前端控制器 - *

- * - * @author Tuyp - * @since 2024-03-18 - */ -@RestController -@Api(tags = "百分比认证视频表") -@RequestMapping("/class-vod-face-check-do") -public class ClassVodFaceCheckController { - -} diff --git a/src/main/java/com/subsidy/controller/CompanyFieldMappingController.java b/src/main/java/com/subsidy/controller/CompanyFieldMappingController.java deleted file mode 100644 index ad109eb..0000000 --- a/src/main/java/com/subsidy/controller/CompanyFieldMappingController.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.subsidy.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; -import io.swagger.annotations.Api; - -/** - *

- * 前端控制器 - *

- * - * @author DengMin - * @since 2022-02-11 - */ -@RestController -@Api(tags = "") -@RequestMapping("/company-field-mapping-do") -public class CompanyFieldMappingController { - -} diff --git a/src/main/java/com/subsidy/controller/CourseBusinessMappingController.java b/src/main/java/com/subsidy/controller/CourseBusinessMappingController.java deleted file mode 100644 index b2c1683..0000000 --- a/src/main/java/com/subsidy/controller/CourseBusinessMappingController.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.subsidy.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; -import io.swagger.annotations.Api; - -/** - *

- * 课程经营范围字典表 前端控制器 - *

- * - * @author Tuyp - * @since 2022-08-04 - */ -@RestController -@Api(tags = "课程经营范围字典表") -@RequestMapping("/course-business-mapping-do") -public class CourseBusinessMappingController { - -} diff --git a/src/main/java/com/subsidy/controller/CourseCategoryMappingController.java b/src/main/java/com/subsidy/controller/CourseCategoryMappingController.java deleted file mode 100644 index a53fcce..0000000 --- a/src/main/java/com/subsidy/controller/CourseCategoryMappingController.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.subsidy.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; -import io.swagger.annotations.Api; - -/** - *

- * 课程类目映射 前端控制器 - *

- * - * @author DengMin - * @since 2022-02-14 - */ -@RestController -@Api(tags = "课程类目映射") -@RequestMapping("/course-category-mapping-do") -public class CourseCategoryMappingController { - -} diff --git a/src/main/java/com/subsidy/controller/CourseFieldMappingController.java b/src/main/java/com/subsidy/controller/CourseFieldMappingController.java deleted file mode 100644 index 830b0a4..0000000 --- a/src/main/java/com/subsidy/controller/CourseFieldMappingController.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.subsidy.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; -import io.swagger.annotations.Api; - -/** - *

- * 前端控制器 - *

- * - * @author DengMin - * @since 2022-01-20 - */ -@RestController -@Api(tags = "") -@RequestMapping("/courseField") -public class CourseFieldMappingController { - -} diff --git a/src/main/java/com/subsidy/controller/CourseJobMappingController.java b/src/main/java/com/subsidy/controller/CourseJobMappingController.java deleted file mode 100644 index e059c6c..0000000 --- a/src/main/java/com/subsidy/controller/CourseJobMappingController.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.subsidy.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; -import io.swagger.annotations.Api; - -/** - *

- * 课程-岗位映射表 前端控制器 - *

- * - * @author DengMin - * @since 2022-02-14 - */ -@RestController -@Api(tags = "课程-岗位映射表") -@RequestMapping("/course-job-mapping-do") -public class CourseJobMappingController { - -} diff --git a/src/main/java/com/subsidy/controller/CourseRankMappingController.java b/src/main/java/com/subsidy/controller/CourseRankMappingController.java deleted file mode 100644 index c6bbd5b..0000000 --- a/src/main/java/com/subsidy/controller/CourseRankMappingController.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.subsidy.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; -import io.swagger.annotations.Api; - -/** - *

- * 课程职级映射表 前端控制器 - *

- * - * @author DengMin - * @since 2022-02-14 - */ -@RestController -@Api(tags = "课程职级映射表") -@RequestMapping("/course-rank-mapping-do") -public class CourseRankMappingController { - -} diff --git a/src/main/java/com/subsidy/controller/JobMemberMappingController.java b/src/main/java/com/subsidy/controller/JobMemberMappingController.java deleted file mode 100644 index fea9eeb..0000000 --- a/src/main/java/com/subsidy/controller/JobMemberMappingController.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.subsidy.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; -import io.swagger.annotations.Api; - -/** - *

- * 岗位人员表 前端控制器 - *

- * - * @author DengMin - * @since 2022-02-10 - */ -@RestController -@Api(tags = "岗位人员表") -@RequestMapping("/jobMemberMapping") -public class JobMemberMappingController { - -} diff --git a/src/main/java/com/subsidy/controller/MemberStudyLengthController.java b/src/main/java/com/subsidy/controller/MemberStudyLengthController.java deleted file mode 100644 index 3b49989..0000000 --- a/src/main/java/com/subsidy/controller/MemberStudyLengthController.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.subsidy.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; -import io.swagger.annotations.Api; - -/** - *

- * 前端控制器 - *

- * - * @author DengMin - * @since 2022-01-28 - */ -@RestController -@Api(tags = "") -@RequestMapping("/member-study-length-do") -public class MemberStudyLengthController { - -} diff --git a/src/main/java/com/subsidy/controller/MemberTokensController.java b/src/main/java/com/subsidy/controller/MemberTokensController.java deleted file mode 100644 index 866427e..0000000 --- a/src/main/java/com/subsidy/controller/MemberTokensController.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.subsidy.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; -import io.swagger.annotations.Api; - -/** - *

- * 用户登录token 前端控制器 - *

- * - * @author Tuyp - * @since 2023-01-06 - */ -@RestController -@Api(tags = "用户登录token") -@RequestMapping("/memberTokens") -public class MemberTokensController { - -} diff --git a/src/main/java/com/subsidy/controller/PushDataController.java b/src/main/java/com/subsidy/controller/PushDataController.java index be4e624..211be13 100644 --- a/src/main/java/com/subsidy/controller/PushDataController.java +++ b/src/main/java/com/subsidy/controller/PushDataController.java @@ -53,6 +53,12 @@ public class PushDataController { pushDataService.post7(); } + @PostMapping("sendWarning") + @ApiOperation("发送短信 ") + public void sendWarning(){ + pushDataService.sendWarning(); + } + @GetMapping("check") @ApiOperation("核对数据") public ResponseVO check(){ diff --git a/src/main/java/com/subsidy/model/MemberDO.java b/src/main/java/com/subsidy/model/MemberDO.java index 60eeaf0..b66403c 100644 --- a/src/main/java/com/subsidy/model/MemberDO.java +++ b/src/main/java/com/subsidy/model/MemberDO.java @@ -139,4 +139,8 @@ public class MemberDO extends BaseModel { */ private Integer memberType; + private String bank; + + private String payrollAccount; + } diff --git a/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java b/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java index 9830552..ba5d485 100644 --- a/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java +++ b/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java @@ -1562,11 +1562,13 @@ public class AdministerServiceImpl extends ServiceImpl() .lambda() - .eq(MemberDO::getTelephone, s.getTelephone())); + .eq(MemberDO::getTelephone, s.getTelephone()) + .eq(MemberDO::getMemberType, 0)); MemberDO memberIdCard = memberMapper.selectOne(new QueryWrapper() .lambda() - .eq(MemberDO::getIdCard, s.getIdCard())); + .eq(MemberDO::getIdCard, s.getIdCard()) + .eq(MemberDO::getMemberType, 0)); boolean departmentFlag = false; String[] fullName = s.getDepartments().split(","); @@ -1675,6 +1677,7 @@ public class AdministerServiceImpl extends ServiceImpl=60){ + if (null != exerciseTestVO.getScore() && exerciseTestVO.getScore() >= 60) { newCell.setCellValue("合格"); - }else { + } else { newCell.setCellValue("不合格"); } diff --git a/src/main/java/com/subsidy/service/impl/DudaoServiceImpl.java b/src/main/java/com/subsidy/service/impl/DudaoServiceImpl.java index 92fcb6c..9e7299d 100644 --- a/src/main/java/com/subsidy/service/impl/DudaoServiceImpl.java +++ b/src/main/java/com/subsidy/service/impl/DudaoServiceImpl.java @@ -83,7 +83,7 @@ public class DudaoServiceImpl implements DudaoService { List imageClassIds = dudaoMapper.imageClassIds("0"); Set classIds = new HashSet<>(); -// classIds.add(424L); +// classIds.add(423L); vodClassIds.stream().forEach(x->classIds.add(x)); examClassIds.stream().forEach(x->classIds.add(x)); @@ -176,7 +176,7 @@ public class DudaoServiceImpl implements DudaoService { List vodClassIds = dudaoMapper.vodClassIds("0"); // List vodClassIds = new ArrayList<>(); -// vodClassIds.add(424L); +// vodClassIds.add(423L); List result = new ArrayList<>(); @@ -307,7 +307,7 @@ public class DudaoServiceImpl implements DudaoService { List classIds = dudaoMapper.dailyExamBasic("0"); // ListclassIds = new ArrayList<>(); -// classIds.add(424L); +// classIds.add(419L); try { if (classIds.size() > 0) { diff --git a/src/main/java/com/subsidy/service/impl/MemberServiceImpl.java b/src/main/java/com/subsidy/service/impl/MemberServiceImpl.java index 342e385..c9984f3 100644 --- a/src/main/java/com/subsidy/service/impl/MemberServiceImpl.java +++ b/src/main/java/com/subsidy/service/impl/MemberServiceImpl.java @@ -188,7 +188,8 @@ public class MemberServiceImpl extends ServiceImpl imple Integer count = this.baseMapper.selectCount(new QueryWrapper() .lambda() - .eq(MemberDO::getTelephone, addMemberDTO.getTelephone())); + .eq(MemberDO::getTelephone, addMemberDTO.getTelephone()) + .eq(MemberDO::getMemberType, 2)); if (count > 0) { throw new HttpException(20002); @@ -196,7 +197,8 @@ public class MemberServiceImpl extends ServiceImpl imple Integer count2 = this.baseMapper.selectCount(new QueryWrapper() .lambda() - .eq(MemberDO::getIdCard, addMemberDTO.getIdCard())); + .eq(MemberDO::getIdCard, addMemberDTO.getIdCard()) + .eq(MemberDO::getMemberType, 2)); if (count2 > 0) { throw new HttpException(20002); @@ -213,6 +215,7 @@ public class MemberServiceImpl extends ServiceImpl imple memberDO.setPassword("Ykhl123456"); memberDO.setStatus("启用"); memberDO.setFirstLogin(0); + memberDO.setMemberType(0); this.baseMapper.insert(memberDO); //公司赋值 CompanyMemberMappingDO companyMemberMappingDO = new CompanyMemberMappingDO(); @@ -917,14 +920,14 @@ public class MemberServiceImpl extends ServiceImpl imple vodVo.setVodLength(memberVodVO.getVodLength()); //这个视频的人脸有没有做 int vodFaceCheck = activityDetectionMapper.selectCount(new QueryWrapper() - .lambda() - .eq(ActivityDetectionDO::getVodId,memberVodVO.getId()) - .eq(ActivityDetectionDO::getMemberId,contentMemberDTO.getMemberId()) - .eq(ActivityDetectionDO::getClassId,contentMemberDTO.getClassId()) - .eq(ActivityDetectionDO::getStatus,1)); - if (vodFaceCheck > 0){ + .lambda() + .eq(ActivityDetectionDO::getVodId, memberVodVO.getId()) + .eq(ActivityDetectionDO::getMemberId, contentMemberDTO.getMemberId()) + .eq(ActivityDetectionDO::getClassId, contentMemberDTO.getClassId()) + .eq(ActivityDetectionDO::getStatus, 1)); + if (vodFaceCheck > 0) { vodVo.setVodFaceCheckFlag(true); - }else { + } else { vodVo.setVodFaceCheckFlag(false); } @@ -944,7 +947,7 @@ public class MemberServiceImpl extends ServiceImpl imple if (i == 0 && vodFlag) { vodVo.setStatus(true); - } else if(memberVodVO.getPercent().equals("100")|| testFlag) { + } else if (memberVodVO.getPercent().equals("100") || testFlag) { //这个视频看完了，已解锁 vodVo.setStatus(true); } else { @@ -1011,13 +1014,13 @@ public class MemberServiceImpl extends ServiceImpl imple //这个视频的人脸有没有做 int vodFaceCheck = activityDetectionMapper.selectCount(new QueryWrapper() .lambda() - .eq(ActivityDetectionDO::getVodId,memberVodVO.getId()) - .eq(ActivityDetectionDO::getMemberId,contentMemberDTO.getMemberId()) - .eq(ActivityDetectionDO::getClassId,contentMemberDTO.getClassId()) - .eq(ActivityDetectionDO::getStatus,1)); - if (vodFaceCheck > 0){ + .eq(ActivityDetectionDO::getVodId, memberVodVO.getId()) + .eq(ActivityDetectionDO::getMemberId, contentMemberDTO.getMemberId()) + .eq(ActivityDetectionDO::getClassId, contentMemberDTO.getClassId()) + .eq(ActivityDetectionDO::getStatus, 1)); + if (vodFaceCheck > 0) { vodVO.setVodFaceCheckFlag(true); - }else { + } else { vodVO.setVodFaceCheckFlag(false); } socialVodTestVOS.add(vodVO); @@ -1032,7 +1035,7 @@ public class MemberServiceImpl extends ServiceImpl imple testVO.setItemType(1); testVO.setId(paperDictDO.getId()); memberVodVO.setStatus(true); - if (100==memberVodVO.getPercent()) { + if (100 == memberVodVO.getPercent()) { //视频全部看完 playCount++; //计算最好成绩 memberId,classId,vodId @@ -1072,13 +1075,13 @@ public class MemberServiceImpl extends ServiceImpl imple return socialContentVodNewVO; } - public CheckItemVO checkItem(CheckItemDTO checkItemDTO){ + public CheckItemVO checkItem(CheckItemDTO checkItemDTO) { CheckItemVO checkItemVO = new CheckItemVO(); - if (0 == checkItemDTO.getType()){ + if (0 == checkItemDTO.getType()) { //视频 查看上一个视频对应的题目是否已经通过 Integer integer = this.baseMapper.checkClassPaperPassStatus(checkItemDTO.getMemberId(), checkItemDTO.getClassId(), checkItemDTO.getPaperId()); checkItemVO.setNextFlag(integer); - }else { + } else { //题目 vodId 当前题目对应的视频id Integer integer = this.baseMapper.checkClassVodPlayStatus(checkItemDTO.getMemberId(), checkItemDTO.getClassId(), checkItemDTO.getVodId()); checkItemVO.setNextFlag(integer); @@ -1239,11 +1242,11 @@ public class MemberServiceImpl extends ServiceImpl imple testVO.setId(paperDictDO.getId()); testVO.setItemName(paperDictDO.getPaperName()); int totalCnt = exerciseDictMapper.selectCount(new QueryWrapper() - .lambda() - .eq(ExerciseDictDO::getPaperId,paperDictDO.getId())); + .lambda() + .eq(ExerciseDictDO::getPaperId, paperDictDO.getId())); testVO.setTotalCount(totalCnt); - if (100 ==memberVodVO.getPercent()) { + if (100 == memberVodVO.getPercent()) { //视频全部看完 //计算最好成绩 memberId,classId,vodId MemberMaxScoreVO memberMaxScoreVO = paperDictMapper.memberMaxScore(contentMemberDTO.getMemberId(), contentMemberDTO.getClassId(), memberVodVO.getId()); diff --git a/src/main/java/com/subsidy/service/impl/PushDataServiceImpl.java b/src/main/java/com/subsidy/service/impl/PushDataServiceImpl.java index b4bc8c6..09e2bb5 100644 --- a/src/main/java/com/subsidy/service/impl/PushDataServiceImpl.java +++ b/src/main/java/com/subsidy/service/impl/PushDataServiceImpl.java @@ -221,7 +221,7 @@ public class PushDataServiceImpl extends ServiceImpl0){ List telephones = Arrays.asList("15201936167", "18201963812"); for (String telephone : telephones) { - smsUtils.sendWarning("SMS_460945631", telephone, null); +// smsUtils.sendWarning("SMS_460945631", telephone, null); } } diff --git a/src/main/java/com/subsidy/service/impl/RenSheJuServiceImpl.java b/src/main/java/com/subsidy/service/impl/RenSheJuServiceImpl.java index 5f63f19..c20373f 100644 --- a/src/main/java/com/subsidy/service/impl/RenSheJuServiceImpl.java +++ b/src/main/java/com/subsidy/service/impl/RenSheJuServiceImpl.java @@ -162,7 +162,7 @@ public class RenSheJuServiceImpl implements RenSheJuService { List vodClassIds = renSheJuMapper.vodClassIds("0"); // List vodClassIds = new ArrayList<>(); -// vodClassIds.add(490L); +// vodClassIds.add(537L); List result = new ArrayList<>(); @@ -498,6 +498,11 @@ public class RenSheJuServiceImpl implements RenSheJuService { //找到昨天做过人脸识别的班级 List classIds = renSheJuMapper.checkClassIds("0"); +// List classIds = new ArrayList<>(); +// classIds.add(535L); +// classIds.add(536L); +// classIds.add(539L); + for (Long classId : classIds) { UploadImageDTO uploadImage = new UploadImageDTO(); @@ -583,7 +588,6 @@ public class RenSheJuServiceImpl implements RenSheJuService { renshejuHistoryDO1.setOutputParam(RenSheJuConstant.NO_DATA); renshejuHistoryMapper.insert(renshejuHistoryDO1); } - } catch (Exception e) { e.printStackTrace(); RenshejuHistoryDO renshejuHistoryDO = new RenshejuHistoryDO(); diff --git a/src/main/java/com/subsidy/service/impl/SmsVerifyCodeServiceImpl.java b/src/main/java/com/subsidy/service/impl/SmsVerifyCodeServiceImpl.java index ada3051..1830d47 100644 --- a/src/main/java/com/subsidy/service/impl/SmsVerifyCodeServiceImpl.java +++ b/src/main/java/com/subsidy/service/impl/SmsVerifyCodeServiceImpl.java @@ -37,10 +37,10 @@ public class SmsVerifyCodeServiceImpl extends ServiceImpl() + int count = memberMapper.selectCount(new QueryWrapper() .lambda() .eq(MemberDO::getTelephone, sendVerifyCodeDTO.getTelephone())); - if (memberDO == null) { + if (count == 0) { throw new HttpException(70012); } diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 75e43ae..4deb985 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -50,4 +50,5 @@ qxueyou.url=https://www.qxueyou.com/auth/user/token renshe.url = https://api.shzypxy.com #renshe.url = http://trial.shzypxy.com/api renshe.secretKey = ad927f0b-6a39-43a7-bac7-163baef1fff7 -renshe.putuo = http://180.167.195.117:18025/ddproject \ No newline at end of file +#renshe.putuo = http://180.167.195.117:18025/ddproject +renshe.putuo = http://116.228.3.104:18025/ddproject \ No newline at end of file -- libgit2 0.25.0