diff --git a/src/main/java/com/subsidy/controller/AdministerController.java b/src/main/java/com/subsidy/controller/AdministerController.java index 815ec0b..eccdb17 100644 --- a/src/main/java/com/subsidy/controller/AdministerController.java +++ b/src/main/java/com/subsidy/controller/AdministerController.java @@ -87,7 +87,7 @@ public class AdministerController { @PostMapping("classSummary") @ApiOperation("课程汇总 id 班级id ") - @LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE}) + //@LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE}) public ResponseVO classSummary(@RequestBody ClassDetailDTO classDetailDTO){ return ResponseData.generateCreatedResponse(0,administerService.classSummary(classDetailDTO)); } diff --git a/src/main/java/com/subsidy/controller/ClassDictController.java b/src/main/java/com/subsidy/controller/ClassDictController.java index e486a7a..2a1511a 100644 --- a/src/main/java/com/subsidy/controller/ClassDictController.java +++ b/src/main/java/com/subsidy/controller/ClassDictController.java @@ -36,7 +36,7 @@ public class ClassDictController { private ClassDictService classDictService; @PostMapping("getAllClasses") - @ApiOperation("获取某老师下的所有课程 companyId 所选企业id className 班级名称") + @ApiOperation("获取某公司下的所有课程 companyId 所选企业id className 班级名称") @LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE}) public ResponseVO getAllClasses(@RequestBody ClassDictDO classDictDO){ return ResponseData.generateCreatedResponse(0,classDictService.getAllClasses(classDictDO)); @@ -50,7 +50,7 @@ public class ClassDictController { } @PostMapping("addClass") - @ApiOperation("添加课程 userId:登录人id companyId courseId classType className startDate endDate memberId [] 班级学员 classNoticeDOS[noticeType isAuto noticeTime]") + @ApiOperation("添加课程 userId:登录人id companyId courseId classType className startDate endDate isOrder 是否按照顺序播放 isFastPlay 是否快进 memberId [] 班级学员 classNoticeDOS[noticeType isAuto noticeTime]") @LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE}) public ResponseVO addClass(@RequestBody AddClassDTO addClassDTO){ return ResponseData.generateCreatedResponse(0,classDictService.addClass(addClassDTO)); @@ -85,7 +85,7 @@ public class ClassDictController { } @PostMapping("addMemberToClass") - @ApiOperation("将某个成员加入到某个班级里 classId memberIds []") + @ApiOperation("将多个成员加入到某个班级里 classId memberIds []") @LoginRequired(value = {ConstantUtils.ADMINISTER_TERMINATE}) public ResponseVO addMemberToClass(@RequestBody AddMemberToClassDTO addMemberToClassDTO){ return ResponseData.generateCreatedResponse(0,classDictService.addMemberToClass(addMemberToClassDTO)); diff --git a/src/main/java/com/subsidy/controller/CompanyFieldMappingController.java b/src/main/java/com/subsidy/controller/CompanyFieldMappingController.java new file mode 100644 index 0000000..ad109eb --- /dev/null +++ b/src/main/java/com/subsidy/controller/CompanyFieldMappingController.java @@ -0,0 +1,22 @@ +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/JobDictController.java b/src/main/java/com/subsidy/controller/JobDictController.java new file mode 100644 index 0000000..553c13e --- /dev/null +++ b/src/main/java/com/subsidy/controller/JobDictController.java @@ -0,0 +1,61 @@ +package com.subsidy.controller; + + +import com.subsidy.common.ResponseData; +import com.subsidy.common.ResponseVO; +import com.subsidy.model.JobDictDO; +import com.subsidy.service.JobDictService; +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 DengMin + * @since 2022-02-10 + */ +@RestController +@Api(tags = "岗位表") +@RequestMapping("/jobDict") +//TODO: 字段类型不全 +public class JobDictController { + + @Autowired + private JobDictService jobDictService; + + @PostMapping("queryJobs") + @ApiOperation("查询某公司的岗位 companyId") + public ResponseVO queryJobs(@RequestBody JobDictDO jobDictDO){ + return ResponseData.generateCreatedResponse(0,jobDictService.queryJobs(jobDictDO)); + } + + @PostMapping("deleteJob") + @ApiOperation("删除某个岗位 id") + public ResponseVO deleteJob(@RequestBody JobDictDO jobDictDO){ + return ResponseData.generateCreatedResponse(0,jobDictService.deleteJob(jobDictDO)); + } + + @PostMapping("addJob") + @ApiOperation("添加岗位 companyId jobName") + public ResponseVO addJob(@RequestBody JobDictDO jobDictDO){ + return ResponseData.generateCreatedResponse(0,jobDictService.addJob(jobDictDO)); + } + + @PostMapping("updateJob") + @ApiOperation("更新岗位 jobName") + public ResponseVO updateJob(@RequestBody JobDictDO jobDictDO){ + return ResponseData.generateCreatedResponse(0,jobDictService.updateJob(jobDictDO)); + } + + + + +} diff --git a/src/main/java/com/subsidy/controller/JobMemberMappingController.java b/src/main/java/com/subsidy/controller/JobMemberMappingController.java new file mode 100644 index 0000000..fea9eeb --- /dev/null +++ b/src/main/java/com/subsidy/controller/JobMemberMappingController.java @@ -0,0 +1,22 @@ +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/jobs/Scheduler.java b/src/main/java/com/subsidy/jobs/Scheduler.java index 80f78f0..a685f28 100644 --- a/src/main/java/com/subsidy/jobs/Scheduler.java +++ b/src/main/java/com/subsidy/jobs/Scheduler.java @@ -126,6 +126,10 @@ public class Scheduler { List list = signInRecordMapper.getSignInRecord(); if(list != null && list.size() > 0) { for (SignInRecordDO signInRecordDO : list) { + Set set = redisUtil.scan(RedisPrefixConstant.SUBSIDY_SIGN_INFO_PREFIX + signInRecordDO.getMemberId() + ":classId:" + signInRecordDO.getClassId() + ":" + DateFormatUtil.format(signInRecordDO.getSignInDate(), "yyyy-MM-dd")+":*"); + if(set != null && set.size() > 0) { + redisUtil.del(set); + } redisUtil.set(RedisPrefixConstant.SUBSIDY_SIGN_INFO_PREFIX + signInRecordDO.getMemberId() + ":classId:" + signInRecordDO.getClassId() + ":" + DateFormatUtil.format(signInRecordDO.getSignInDate(), "yyyy-MM-dd") + ":" + DateFormatUtil.LocalDateTimeToSecond(signInRecordDO.getSignInDate()), null); } } diff --git a/src/main/java/com/subsidy/mapper/CompanyFieldMappingMapper.java b/src/main/java/com/subsidy/mapper/CompanyFieldMappingMapper.java new file mode 100644 index 0000000..3052c8d --- /dev/null +++ b/src/main/java/com/subsidy/mapper/CompanyFieldMappingMapper.java @@ -0,0 +1,18 @@ +package com.subsidy.mapper; + +import com.subsidy.model.CompanyFieldMappingDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * Mapper 接口 + *

+ * + * @author DengMin + * @since 2022-02-11 + */ + @Repository +public interface CompanyFieldMappingMapper extends BaseMapper { + +} diff --git a/src/main/java/com/subsidy/mapper/FieldDictMapper.java b/src/main/java/com/subsidy/mapper/FieldDictMapper.java index ebc9271..3875870 100644 --- a/src/main/java/com/subsidy/mapper/FieldDictMapper.java +++ b/src/main/java/com/subsidy/mapper/FieldDictMapper.java @@ -6,6 +6,8 @@ import com.subsidy.model.FieldDictDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.springframework.stereotype.Repository; +import java.util.List; + /** *

* 行业字典表 Mapper 接口 @@ -19,4 +21,5 @@ public interface FieldDictMapper extends BaseMapper { IPage queryFields(IPage ipage, String fieldName); + } diff --git a/src/main/java/com/subsidy/mapper/JobDictMapper.java b/src/main/java/com/subsidy/mapper/JobDictMapper.java new file mode 100644 index 0000000..796a81f --- /dev/null +++ b/src/main/java/com/subsidy/mapper/JobDictMapper.java @@ -0,0 +1,18 @@ +package com.subsidy.mapper; + +import com.subsidy.model.JobDictDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * 岗位表 Mapper 接口 + *

+ * + * @author DengMin + * @since 2022-02-10 + */ + @Repository +public interface JobDictMapper extends BaseMapper { + +} diff --git a/src/main/java/com/subsidy/mapper/JobMemberMappingMapper.java b/src/main/java/com/subsidy/mapper/JobMemberMappingMapper.java new file mode 100644 index 0000000..f792c08 --- /dev/null +++ b/src/main/java/com/subsidy/mapper/JobMemberMappingMapper.java @@ -0,0 +1,18 @@ +package com.subsidy.mapper; + +import com.subsidy.model.JobMemberMappingDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * 岗位人员表 Mapper 接口 + *

+ * + * @author DengMin + * @since 2022-02-10 + */ + @Repository +public interface JobMemberMappingMapper extends BaseMapper { + +} diff --git a/src/main/java/com/subsidy/model/CompanyFieldMappingDO.java b/src/main/java/com/subsidy/model/CompanyFieldMappingDO.java new file mode 100644 index 0000000..0f0e1bb --- /dev/null +++ b/src/main/java/com/subsidy/model/CompanyFieldMappingDO.java @@ -0,0 +1,33 @@ +package com.subsidy.model; + +import com.subsidy.util.BaseModel; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * + *

+ * + * @author DengMin + * @since 2022-02-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("company_field_mapping") +public class CompanyFieldMappingDO extends BaseModel { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + private Long companyId; + + private Long fieldId; + + +} diff --git a/src/main/java/com/subsidy/model/JobDictDO.java b/src/main/java/com/subsidy/model/JobDictDO.java new file mode 100644 index 0000000..87f6232 --- /dev/null +++ b/src/main/java/com/subsidy/model/JobDictDO.java @@ -0,0 +1,44 @@ +package com.subsidy.model; + +import com.subsidy.util.BaseModel; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 岗位表 + *

+ * + * @author DengMin + * @since 2022-02-10 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("job_dict") +public class JobDictDO extends BaseModel { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 公司id + */ + private Long companyId; + + /** + * 岗位名称 + */ + private String jobName; + + /** + * 排序 + */ + private Integer orderNo; + + +} diff --git a/src/main/java/com/subsidy/model/JobMemberMappingDO.java b/src/main/java/com/subsidy/model/JobMemberMappingDO.java new file mode 100644 index 0000000..cb5ba77 --- /dev/null +++ b/src/main/java/com/subsidy/model/JobMemberMappingDO.java @@ -0,0 +1,36 @@ +package com.subsidy.model; + +import com.subsidy.util.BaseModel; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 岗位人员表 + *

+ * + * @author DengMin + * @since 2022-02-10 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("job_member_mapping") +public class JobMemberMappingDO extends BaseModel { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 岗位id + */ + private Long jobId; + + private Long memberId; + + +} diff --git a/src/main/java/com/subsidy/service/CompanyFieldMappingService.java b/src/main/java/com/subsidy/service/CompanyFieldMappingService.java new file mode 100644 index 0000000..26b6517 --- /dev/null +++ b/src/main/java/com/subsidy/service/CompanyFieldMappingService.java @@ -0,0 +1,16 @@ +package com.subsidy.service; + +import com.subsidy.model.CompanyFieldMappingDO; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author DengMin + * @since 2022-02-11 + */ +public interface CompanyFieldMappingService extends IService { + +} diff --git a/src/main/java/com/subsidy/service/JobDictService.java b/src/main/java/com/subsidy/service/JobDictService.java new file mode 100644 index 0000000..20afcab --- /dev/null +++ b/src/main/java/com/subsidy/service/JobDictService.java @@ -0,0 +1,25 @@ +package com.subsidy.service; + +import com.subsidy.model.JobDictDO; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 岗位表 服务类 + *

+ * + * @author DengMin + * @since 2022-02-10 + */ +public interface JobDictService extends IService { + + List queryJobs(JobDictDO jobDictDO); + + String deleteJob(JobDictDO jobDictDO); + + String addJob(JobDictDO jobDictDO); + + String updateJob(JobDictDO jobDictDO); +} diff --git a/src/main/java/com/subsidy/service/JobMemberMappingService.java b/src/main/java/com/subsidy/service/JobMemberMappingService.java new file mode 100644 index 0000000..af8da78 --- /dev/null +++ b/src/main/java/com/subsidy/service/JobMemberMappingService.java @@ -0,0 +1,16 @@ +package com.subsidy.service; + +import com.subsidy.model.JobMemberMappingDO; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 岗位人员表 服务类 + *

+ * + * @author DengMin + * @since 2022-02-10 + */ +public interface JobMemberMappingService extends IService { + +} diff --git a/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java b/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java index 8df156a..cab624c 100644 --- a/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java +++ b/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java @@ -43,6 +43,7 @@ import com.subsidy.model.SignInRecordDO; import com.subsidy.model.VodDictDO; import com.subsidy.model.OprAdmDictDO; import com.subsidy.service.AdministerService; +import com.subsidy.service.FieldDictService; import com.subsidy.util.ConstantUtils; import com.subsidy.util.DateFormatUtil; import com.subsidy.util.ExcelFormatUtils; @@ -181,6 +182,9 @@ public class AdministerServiceImpl extends ServiceImpl operatorsVOIPage = companyDictMapper.operators(pager, operatorsDTO.getCompanyName(), operatorsDTO.getId(), operatorsDTO.getUserName(), 0); + + List operatorsVOS = operatorsVOIPage.getRecords(); + for (OperatorsVO operatorsVO : operatorsVOS){ + //operatorsVO.getField() + } + + return operatorsVOIPage; } public String addAdminister(AdministerDO administerDO) { @@ -412,6 +423,7 @@ public class AdministerServiceImpl extends ServiceImpl= vodDictDO.getVodLength()) { totalStudyVods++; } + totalStudyLength+=totalLength; } } classSummaryVO.setStudyVodCounts(MathUtil.intDivCeil(totalStudyVods, classMemberMappingDOS.size())); diff --git a/src/main/java/com/subsidy/service/impl/CompanyFieldMappingServiceImpl.java b/src/main/java/com/subsidy/service/impl/CompanyFieldMappingServiceImpl.java new file mode 100644 index 0000000..3fe658a --- /dev/null +++ b/src/main/java/com/subsidy/service/impl/CompanyFieldMappingServiceImpl.java @@ -0,0 +1,20 @@ +package com.subsidy.service.impl; + +import com.subsidy.model.CompanyFieldMappingDO; +import com.subsidy.mapper.CompanyFieldMappingMapper; +import com.subsidy.service.CompanyFieldMappingService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author DengMin + * @since 2022-02-11 + */ +@Service +public class CompanyFieldMappingServiceImpl extends ServiceImpl implements CompanyFieldMappingService { + +} diff --git a/src/main/java/com/subsidy/service/impl/JobDictServiceImpl.java b/src/main/java/com/subsidy/service/impl/JobDictServiceImpl.java new file mode 100644 index 0000000..5088a9b --- /dev/null +++ b/src/main/java/com/subsidy/service/impl/JobDictServiceImpl.java @@ -0,0 +1,59 @@ +package com.subsidy.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.subsidy.model.JobDictDO; +import com.subsidy.mapper.JobDictMapper; +import com.subsidy.service.JobDictService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.subsidy.util.ConstantUtils; +import com.tencentcloudapi.tia.v20180226.models.Job; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 岗位表 服务实现类 + *

+ * + * @author DengMin + * @since 2022-02-10 + */ +@Service +public class JobDictServiceImpl extends ServiceImpl implements JobDictService { + + public List queryJobs(JobDictDO jobDictDO) { + return this.baseMapper.selectList(new QueryWrapper() + .lambda() + .eq(JobDictDO::getCompanyId, jobDictDO.getCompanyId()) + .orderByAsc(JobDictDO::getOrderNo)); + } + + public String deleteJob(JobDictDO jobDictDO) { + this.baseMapper.deleteById(jobDictDO.getId()); + return ConstantUtils.DELETE_SUCCESS; + } + + public String addJob(JobDictDO jobDictDO) { + + int orderNo = 0; + List jobDictDOS = this.baseMapper.selectList(new QueryWrapper() + .lambda() + .eq(JobDictDO::getCompanyId, jobDictDO.getCompanyId()) + .orderByDesc(JobDictDO::getOrderNo)); + + if (jobDictDOS.size() > 0) { + orderNo = jobDictDOS.get(0).getOrderNo(); + } + jobDictDO.setOrderNo(orderNo + 1); + this.baseMapper.insert(jobDictDO); + + return ConstantUtils.SUCCESS_SEND_OUT; + } + + public String updateJob(JobDictDO jobDictDO) { + this.baseMapper.updateById(jobDictDO); + return ConstantUtils.SET_SUCCESS; + } + +} diff --git a/src/main/java/com/subsidy/service/impl/JobMemberMappingServiceImpl.java b/src/main/java/com/subsidy/service/impl/JobMemberMappingServiceImpl.java new file mode 100644 index 0000000..841f5c8 --- /dev/null +++ b/src/main/java/com/subsidy/service/impl/JobMemberMappingServiceImpl.java @@ -0,0 +1,20 @@ +package com.subsidy.service.impl; + +import com.subsidy.model.JobMemberMappingDO; +import com.subsidy.mapper.JobMemberMappingMapper; +import com.subsidy.service.JobMemberMappingService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 岗位人员表 服务实现类 + *

+ * + * @author DengMin + * @since 2022-02-10 + */ +@Service +public class JobMemberMappingServiceImpl extends ServiceImpl implements JobMemberMappingService { + +} diff --git a/src/main/java/com/subsidy/service/impl/MemberServiceImpl.java b/src/main/java/com/subsidy/service/impl/MemberServiceImpl.java index 5287227..3695192 100644 --- a/src/main/java/com/subsidy/service/impl/MemberServiceImpl.java +++ b/src/main/java/com/subsidy/service/impl/MemberServiceImpl.java @@ -212,7 +212,8 @@ public class MemberServiceImpl extends ServiceImpl imple MemberDO memberDO = new MemberDO(); BeanUtils.copyProperties(addMemberDTO, memberDO); this.baseMapper.updateById(memberDO); - redisUtil.set(RedisPrefixConstant.SUBSIDY_COMPANY_MEMBER_PREFIX + memberDO.getCompanyId() + ":" + memberDO.getAccountName(), memberDO); + MemberDO memberDO1 = this.baseMapper.selectById(addMemberDTO.getId()); + redisUtil.set(RedisPrefixConstant.SUBSIDY_COMPANY_MEMBER_PREFIX + memberDO.getCompanyId() + ":" + memberDO.getAccountName(), memberDO1); if (null != addMemberDTO.getDepartmentIds()) { memberDepartmentMappingMapper.delete(new QueryWrapper() @@ -336,6 +337,7 @@ public class MemberServiceImpl extends ServiceImpl imple //oprMemDictDO.setCompanyName(companyDictDO.getCompanyName()); //mongoTemplate.insert(oprMemDictDO); oprMemDictMapper.insert(oprMemDictDO); + redisUtil.set(RedisPrefixConstant.SUBSIDY_COMPANY_MEMBER_PREFIX + passwordLoginDTO.getCompanyId() + ":" + passwordLoginDTO.getAccountName(),memberDO); //redisUtil.set(RedisPrefixConstant.SUBSIDY_MEMBER_LOGIN_PREFIX + memberDO.getId() + ":" + System.currentTimeMillis(), 1); return memberVO; } else { diff --git a/src/main/java/com/subsidy/service/impl/SignInRecordServiceImpl.java b/src/main/java/com/subsidy/service/impl/SignInRecordServiceImpl.java index 141e014..271e7fd 100644 --- a/src/main/java/com/subsidy/service/impl/SignInRecordServiceImpl.java +++ b/src/main/java/com/subsidy/service/impl/SignInRecordServiceImpl.java @@ -84,6 +84,10 @@ public class SignInRecordServiceImpl extends ServiceImpl classDictDOS = classMemberMappingMapper.getMemberClass(signInRecordDO.getMemberId()); for (ClassDictDO classDictDO : classDictDOS) { + Set set = redisUtil.scan(RedisPrefixConstant.SUBSIDY_SIGN_INFO_PREFIX + signInRecordDO.getMemberId() + ":classId:" + signInRecordDO.getClassId() + ":" + DateFormatUtil.format(signInRecordDO.getSignInDate(), "yyyy-MM-dd")+":*"); + if(set != null && set.size() > 0) { + redisUtil.del(set); + } redisUtil.set(RedisPrefixConstant.SUBSIDY_SIGN_INFO_PREFIX + signInRecordDO.getMemberId() + ":classId:" + classDictDO.getId() + ":" + DateFormatUtil.format(new Date(), "yyyy-MM-dd") + ":" + System.currentTimeMillis(), null); // 存储到缓存到同时保存到数据库 @@ -136,7 +140,7 @@ public class SignInRecordServiceImpl extends ServiceImpl field; private String banner; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index cf4411d..dbc0753 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,7 +1,7 @@ # 环境配置 -spring.profiles.active=dev +spring.profiles.active=prod # 端口号 -spring.server.port=23457 +spring.server.port=23459 #嵌入tomcat配置 #和CPU数 spring.server.acceptorThreadCount=600 diff --git a/src/main/resources/mapper/CompanyDictMapper.xml b/src/main/resources/mapper/CompanyDictMapper.xml index 04010c3..fc958df 100644 --- a/src/main/resources/mapper/CompanyDictMapper.xml +++ b/src/main/resources/mapper/CompanyDictMapper.xml @@ -25,7 +25,6 @@ t2.id as companyId, t.telephone, t.user_name, - t2.field, t2.banner, t2.short_name, t.account_name, diff --git a/src/main/resources/mapper/CompanyFieldMappingMapper.xml b/src/main/resources/mapper/CompanyFieldMappingMapper.xml new file mode 100644 index 0000000..15928af --- /dev/null +++ b/src/main/resources/mapper/CompanyFieldMappingMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + create_date, + update_date, + delete_date, + id, company_id, field_id + + + diff --git a/src/main/resources/mapper/ExerciseDoneResultMapper.xml b/src/main/resources/mapper/ExerciseDoneResultMapper.xml index 589f276..e619237 100644 --- a/src/main/resources/mapper/ExerciseDoneResultMapper.xml +++ b/src/main/resources/mapper/ExerciseDoneResultMapper.xml @@ -138,12 +138,12 @@ diff --git a/src/main/resources/mapper/JobDictMapper.xml b/src/main/resources/mapper/JobDictMapper.xml new file mode 100644 index 0000000..cf66439 --- /dev/null +++ b/src/main/resources/mapper/JobDictMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + create_date, + update_date, + delete_date, + id, company_id, job_name, order_no + + + diff --git a/src/main/resources/mapper/JobMemberMappingMapper.xml b/src/main/resources/mapper/JobMemberMappingMapper.xml new file mode 100644 index 0000000..d0719eb --- /dev/null +++ b/src/main/resources/mapper/JobMemberMappingMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + create_date, + update_date, + delete_date, + id, job_id, member_id + + +