Browse Source

1

tiaosheng
Lihong@123456 5 years ago
parent
commit
a04274799a
  1. 2
      cloudutil/src/main/java/com/ccsens/cloudutil/aspect/LogAspect.java
  2. 36
      mt/src/main/java/com/ccsens/mt/api/ExcelController.java
  3. 34
      mt/src/main/java/com/ccsens/mt/api/FileController.java
  4. 32
      mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java
  5. 7
      mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java
  6. 33
      mt/src/main/java/com/ccsens/mt/bean/po/CompeteGroup.java
  7. 180
      mt/src/main/java/com/ccsens/mt/bean/po/CompeteGroupExample.java
  8. 20
      mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java
  9. 2
      mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java
  10. 56
      mt/src/main/java/com/ccsens/mt/service/FileService.java
  11. 3
      mt/src/main/java/com/ccsens/mt/service/IFileService.java
  12. 226
      mt/src/main/java/com/ccsens/mt/service/ProvinceService.java
  13. 4
      mt/src/main/resources/application.yml
  14. 19
      mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml
  15. 6
      mt/src/main/resources/mapper_dao/CompetePlayerDao.xml
  16. 57
      mt/src/main/resources/mapper_raw/CompeteGroupMapper.xml
  17. BIN
      nullzzz/2020-10-22/1603333027707.xlsx
  18. 15
      tall/src/main/java/com/ccsens/tall/bean/dto/WeekMeetingDto.java
  19. 117
      tall/src/main/java/com/ccsens/tall/bean/po/ProPluginParameter.java
  20. 751
      tall/src/main/java/com/ccsens/tall/bean/po/ProPluginParameterExample.java
  21. 4
      tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java
  22. 1
      tall/src/main/java/com/ccsens/tall/config/SpringConfig.java
  23. 30
      tall/src/main/java/com/ccsens/tall/persist/mapper/ProPluginParameterMapper.java
  24. 8
      tall/src/main/java/com/ccsens/tall/service/IWeekMeetingService.java
  25. 12
      tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
  26. 19
      tall/src/main/java/com/ccsens/tall/service/WeekMeetingService.java
  27. 3
      tall/src/main/java/com/ccsens/tall/util/TaskUtil.java
  28. 20
      tall/src/main/java/com/ccsens/tall/web/UserController.java
  29. 7
      tall/src/main/java/com/ccsens/tall/web/UserInfoController.java
  30. 11
      tall/src/main/java/com/ccsens/tall/web/WeekMeetingController.java
  31. 22
      tall/src/main/resources/mapper_dao/SysProjectDao.xml
  32. 276
      tall/src/main/resources/mapper_raw/ProPluginParameterMapper.xml
  33. 25
      util/src/main/java/com/ccsens/util/CodeEnum.java
  34. 5
      util/src/main/java/com/ccsens/util/WebConstant.java
  35. 17
      util/src/test/java/com/ccsens/util/OtherTest.java

2
cloudutil/src/main/java/com/ccsens/cloudutil/aspect/LogAspect.java

@ -100,7 +100,7 @@ public class LogAspect {
}
LogDto dto = new LogDto();
dto.setUrl(url);
dto.setFacility("");
dto.setFacility(request.getHeader("fingerprint"));
//参数
Object[] args = pjp.getArgs();
StringBuilder param = new StringBuilder();

36
mt/src/main/java/com/ccsens/mt/api/ExcelController.java

@ -0,0 +1,36 @@
package com.ccsens.mt.api;
import com.ccsens.cloudutil.annotation.MustLogin;
import com.ccsens.mt.bean.dto.CompeteDto;
import com.ccsens.util.JsonResponse;
import com.ccsens.util.bean.dto.QueryDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.io.IOException;
/**
* @author li
*/
@Slf4j
@Api(tags = "报名表格的下载", description = "")
@RestController
@RequestMapping("/down")
public class ExcelController {
@MustLogin
@ApiOperation(value = "报名表详情表(关联wps)", notes = "")
@RequestMapping(value = "/enrollWPS", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse enrollPlayInfoWps(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteType> params) throws IOException {
log.info("查询各个项目报名人员信息:{}",params);
// String enrollPlayInfoList= competeService.enrollPlayInfoWps(params);
return JsonResponse.newInstance().ok();
}
}

34
mt/src/main/java/com/ccsens/mt/api/FileController.java

@ -1,29 +1,28 @@
package com.ccsens.mt.api;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.ccsens.cloudutil.feign.TallFeignClient;
import com.ccsens.mt.bean.dto.CompeteDto;
import com.ccsens.mt.bean.po.CommonFile;
import com.ccsens.mt.bean.vo.FileVo;
import com.ccsens.mt.service.IFileService;
import com.ccsens.mt.util.Constant;
import com.ccsens.util.*;
import com.ccsens.util.bean.dto.QueryDto;
import com.ccsens.util.exception.BaseException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.jsonwebtoken.Claims;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.Part;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
/**
@ -149,4 +148,25 @@ public class FileController {
// }
return JsonResponse.newInstance().ok(vo);
}
@ApiOperation(value = "上传图片证明文件(不大于2M)")
@ApiImplicitParams({
})
@RequestMapping(value = "/upload/photoBase64", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<FileVo.Upload> uploadPhoneBase64(HttpServletRequest request, @ApiParam @Validated @RequestBody CompeteDto.FileBase64 params) throws Exception {
// log.info("文件上传:{}", params);
String authHeader = request.getHeader(WebConstant.HEADER_KEY_TOKEN);
JsonResponse tokenRes = tallFeignClient.getUserIdByToken(authHeader);
log.info("{}查询userId返回:{}", authHeader, tokenRes);
if (tokenRes.getCode().intValue() != CodeEnum.SUCCESS.getCode().intValue()) {
return tokenRes;
}
JSONObject json = JSON.parseObject(JSON.toJSONString(tokenRes.getData()));
Long userId = json.getLong("id");
FileVo.Upload vo = fileService.uploadPhoneBase64(params.getFileBase64(),userId);
return JsonResponse.newInstance().ok(vo);
}
}

32
mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java

@ -5,8 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NonNull;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.*;
import java.util.List;
/**
@ -230,26 +229,33 @@ public class CompeteDto {
private String family;
}
@Data
@ApiModel("当前用户参赛单位基本信息")
@ApiModel("添加或修改单位信息")
public static class CompeteCompany{
@NotNull
@ApiModelProperty("大赛id")
private Long competeTimeId;
@ApiModelProperty("参赛单位id")
private Long companyId;
// @NotEmpty(message = "请输入单位名称")
@Size(min =0,max = 50,message = "单位名称过长")
@ApiModelProperty("单位名称")
private String companyName;
@NotEmpty(message = "姓名不能为空")
@Size(min =0,max = 50 ,message = "联系人姓名过长")
@ApiModelProperty("主要联系人姓名")
private String contactsName ;
private String contactsName;
@NotEmpty(message = "联系方式不能为空")
@Pattern(regexp="^[1]([3-9])[0-9]{9}$",message="请输入正确的手机号")
@ApiModelProperty("联系方式")
private String contactsPhone ;
@ApiModelProperty("教练的人数")
private int coachNum ;
private int coachNum;
@ApiModelProperty("领队的人数")
private int guideNum ;
private int guideNum;
@ApiModelProperty("参赛人员的人数")
private int playerNum;
@ApiModelProperty("是否同意安全责任书 0否 1是 只有同意才能报名")
private Byte authorization;
private byte authorization;
}
// @Data
@ -278,7 +284,7 @@ public class CompeteDto {
@Data
@ApiModel("领队id")
public static class LeaderId{
@NonNull
@NotNull
@ApiModelProperty("教练或领队的id")
private Long coachId;
@ -286,9 +292,17 @@ public class CompeteDto {
@Data
@ApiModel("项目id和组别id")
public static class DelPlayer{
@NonNull
@NotNull
@ApiModelProperty("选手id")
private Long playerId;
}
@Data
@ApiModel("文件base64")
public static class FileBase64{
@ApiModelProperty("")
private String fileBase64;
}
}

7
mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java

@ -16,6 +16,7 @@ public class ProvinceCompeteDto {
@Data
@ApiModel("参赛单位id")
public static class CompanyIdVo{
@NotNull(message = "请先填写基础信息")
@ApiModelProperty("参赛单位id")
private Long companyId;
}
@ -32,7 +33,7 @@ public class ProvinceCompeteDto {
@Data
@ApiModel("通过组别查找本单位注册的选手")
public static class QueryPlayerByGroup{
@NotNull
@NotNull(message = "请先填写基础信息")
@ApiModelProperty("参赛单位id")
private Long companyId;
@ApiModelProperty("组别id")
@ -45,14 +46,14 @@ public class ProvinceCompeteDto {
@ApiModel("添加或修改选手")
public static class PlayerInfo{
@ApiModelProperty("选手id")
private Long playerId ;
private Long playerId;
@ApiModelProperty("参赛单位id")
private Long competeId;
@ApiModelProperty("组别id")
private Long groupId;
@ApiModelProperty("选手姓名")
private String playerName;
@ApiModelProperty("性别")
@ApiModelProperty("性别 0女 1男")
private int gender;
@ApiModelProperty("身份证号")
private String idCard;

33
mt/src/main/java/com/ccsens/mt/bean/po/CompeteGroup.java

@ -24,6 +24,12 @@ public class CompeteGroup implements Serializable {
private Byte recStatus;
private Byte sex;
private Byte maxAge;
private Byte minAge;
private static final long serialVersionUID = 1L;
public Long getId() {
@ -106,6 +112,30 @@ public class CompeteGroup implements Serializable {
this.recStatus = recStatus;
}
public Byte getSex() {
return sex;
}
public void setSex(Byte sex) {
this.sex = sex;
}
public Byte getMaxAge() {
return maxAge;
}
public void setMaxAge(Byte maxAge) {
this.maxAge = maxAge;
}
public Byte getMinAge() {
return minAge;
}
public void setMinAge(Byte minAge) {
this.minAge = minAge;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
@ -122,6 +152,9 @@ public class CompeteGroup implements Serializable {
sb.append(", createdAt=").append(createdAt);
sb.append(", updatedAt=").append(updatedAt);
sb.append(", recStatus=").append(recStatus);
sb.append(", sex=").append(sex);
sb.append(", maxAge=").append(maxAge);
sb.append(", minAge=").append(minAge);
sb.append("]");
return sb.toString();
}

180
mt/src/main/java/com/ccsens/mt/bean/po/CompeteGroupExample.java

@ -724,6 +724,186 @@ public class CompeteGroupExample {
addCriterion("rec_status not between", value1, value2, "recStatus");
return (Criteria) this;
}
public Criteria andSexIsNull() {
addCriterion("sex is null");
return (Criteria) this;
}
public Criteria andSexIsNotNull() {
addCriterion("sex is not null");
return (Criteria) this;
}
public Criteria andSexEqualTo(Byte value) {
addCriterion("sex =", value, "sex");
return (Criteria) this;
}
public Criteria andSexNotEqualTo(Byte value) {
addCriterion("sex <>", value, "sex");
return (Criteria) this;
}
public Criteria andSexGreaterThan(Byte value) {
addCriterion("sex >", value, "sex");
return (Criteria) this;
}
public Criteria andSexGreaterThanOrEqualTo(Byte value) {
addCriterion("sex >=", value, "sex");
return (Criteria) this;
}
public Criteria andSexLessThan(Byte value) {
addCriterion("sex <", value, "sex");
return (Criteria) this;
}
public Criteria andSexLessThanOrEqualTo(Byte value) {
addCriterion("sex <=", value, "sex");
return (Criteria) this;
}
public Criteria andSexIn(List<Byte> values) {
addCriterion("sex in", values, "sex");
return (Criteria) this;
}
public Criteria andSexNotIn(List<Byte> values) {
addCriterion("sex not in", values, "sex");
return (Criteria) this;
}
public Criteria andSexBetween(Byte value1, Byte value2) {
addCriterion("sex between", value1, value2, "sex");
return (Criteria) this;
}
public Criteria andSexNotBetween(Byte value1, Byte value2) {
addCriterion("sex not between", value1, value2, "sex");
return (Criteria) this;
}
public Criteria andMaxAgeIsNull() {
addCriterion("max_age is null");
return (Criteria) this;
}
public Criteria andMaxAgeIsNotNull() {
addCriterion("max_age is not null");
return (Criteria) this;
}
public Criteria andMaxAgeEqualTo(Byte value) {
addCriterion("max_age =", value, "maxAge");
return (Criteria) this;
}
public Criteria andMaxAgeNotEqualTo(Byte value) {
addCriterion("max_age <>", value, "maxAge");
return (Criteria) this;
}
public Criteria andMaxAgeGreaterThan(Byte value) {
addCriterion("max_age >", value, "maxAge");
return (Criteria) this;
}
public Criteria andMaxAgeGreaterThanOrEqualTo(Byte value) {
addCriterion("max_age >=", value, "maxAge");
return (Criteria) this;
}
public Criteria andMaxAgeLessThan(Byte value) {
addCriterion("max_age <", value, "maxAge");
return (Criteria) this;
}
public Criteria andMaxAgeLessThanOrEqualTo(Byte value) {
addCriterion("max_age <=", value, "maxAge");
return (Criteria) this;
}
public Criteria andMaxAgeIn(List<Byte> values) {
addCriterion("max_age in", values, "maxAge");
return (Criteria) this;
}
public Criteria andMaxAgeNotIn(List<Byte> values) {
addCriterion("max_age not in", values, "maxAge");
return (Criteria) this;
}
public Criteria andMaxAgeBetween(Byte value1, Byte value2) {
addCriterion("max_age between", value1, value2, "maxAge");
return (Criteria) this;
}
public Criteria andMaxAgeNotBetween(Byte value1, Byte value2) {
addCriterion("max_age not between", value1, value2, "maxAge");
return (Criteria) this;
}
public Criteria andMinAgeIsNull() {
addCriterion("min_age is null");
return (Criteria) this;
}
public Criteria andMinAgeIsNotNull() {
addCriterion("min_age is not null");
return (Criteria) this;
}
public Criteria andMinAgeEqualTo(Byte value) {
addCriterion("min_age =", value, "minAge");
return (Criteria) this;
}
public Criteria andMinAgeNotEqualTo(Byte value) {
addCriterion("min_age <>", value, "minAge");
return (Criteria) this;
}
public Criteria andMinAgeGreaterThan(Byte value) {
addCriterion("min_age >", value, "minAge");
return (Criteria) this;
}
public Criteria andMinAgeGreaterThanOrEqualTo(Byte value) {
addCriterion("min_age >=", value, "minAge");
return (Criteria) this;
}
public Criteria andMinAgeLessThan(Byte value) {
addCriterion("min_age <", value, "minAge");
return (Criteria) this;
}
public Criteria andMinAgeLessThanOrEqualTo(Byte value) {
addCriterion("min_age <=", value, "minAge");
return (Criteria) this;
}
public Criteria andMinAgeIn(List<Byte> values) {
addCriterion("min_age in", values, "minAge");
return (Criteria) this;
}
public Criteria andMinAgeNotIn(List<Byte> values) {
addCriterion("min_age not in", values, "minAge");
return (Criteria) this;
}
public Criteria andMinAgeBetween(Byte value1, Byte value2) {
addCriterion("min_age between", value1, value2, "minAge");
return (Criteria) this;
}
public Criteria andMinAgeNotBetween(Byte value1, Byte value2) {
addCriterion("min_age not between", value1, value2, "minAge");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {

20
mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java

@ -159,16 +159,28 @@ public class ProvinceCompeteVo {
private int gender;
@ApiModelProperty("身份证号")
private String idCard;
@ApiModelProperty("身份证正面照片 或户口本照片id")
private Long idCardFrontId;
@ApiModelProperty("身份证正面照片 或户口本照片 (浏览路径)")
private String idCardFront ;
@ApiModelProperty("身份证反面照片ID")
private Long idCardBackId;
@ApiModelProperty("身份证反面照片(浏览路径)")
private String idCardBack;
@ApiModelProperty("一寸证件照id")
private Long idPhoneId;
@ApiModelProperty("一寸证件照(浏览路径)")
private String idPhone;
@ApiModelProperty("学籍证明id")
private Long studentRecordId;
@ApiModelProperty("学籍证明(浏览路径)")
private String studentRecord;
@ApiModelProperty("体检证明id")
private Long healthRecordId;
@ApiModelProperty("体检证明(浏览路径)")
private String healthRecord;
@ApiModelProperty("保险证明id")
private Long insuranceRecordId;
@ApiModelProperty("保险证明(浏览路径)")
private String insuranceRecord;
}
@ -191,9 +203,13 @@ public class ProvinceCompeteVo {
private String phone;
@ApiModelProperty("身份证号")
private String idCard;
@ApiModelProperty("证件照id")
private Long idPhotoId;
@ApiModelProperty("证件照(浏览路径)")
private Long idPhoto;
private String idPhoto;
@ApiModelProperty("教练证id")
private Long coachCertificateId;
@ApiModelProperty("教练证(浏览路径)")
private Long coachCertificate;
private String coachCertificate;
}
}

2
mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java

@ -68,7 +68,7 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper {
* @param companyId 单位id
* @return 返回单位参加的项目的数量
*/
int getJoinProjectNum(@Param("competeTimeId")Long companyId);
int getJoinProjectNum(@Param("companyId")Long companyId);
/**
* 查找单位在某项目下的某个组别的参赛数量个人项目

56
mt/src/main/java/com/ccsens/mt/service/FileService.java

@ -1,8 +1,14 @@
package com.ccsens.mt.service;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ImageUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.ccsens.mt.bean.po.CommonFile;
@ -19,9 +25,13 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.servlet.http.Part;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Random;
/**
* @description: 文件操作
@ -103,4 +113,50 @@ public class FileService implements IFileService {
}
return vo;
}
@Override
public FileVo.Upload uploadPhoneBase64(String fileBas64, Long userId) throws Exception {
FileVo.Upload vo = new FileVo.Upload();
if(ObjectUtil.isNotNull(fileBas64)) {
log.info("-------------解析base64");
//获取后缀 data:image/png;base64,xxxxxx
String suffix = fileBas64.substring(fileBas64.indexOf("/")+1, fileBas64.indexOf(";"));
String dir = PropUtil.path + Constant.File.UPLOAD_URL + File.separator;
Random random = new Random();
String randomStr = String.valueOf(System.currentTimeMillis()) + random.nextInt(100) + "." + suffix;
String fileName = DateUtil.today() + "/" + randomStr;
File file = new File(dir + fileName);
if (!file.getParentFile().exists()) {
file.getParentFile().mkdirs();
}
// 截取base64,后面的字符串
String base64flag = "base64,";
int index = fileBas64.indexOf(base64flag);
String str = index < 0 ? fileBas64 : fileBas64.substring(index + base64flag.length());
byte[] decode = Base64.decode(str);
FileOutputStream out = new FileOutputStream(file);
out.write(decode);
out.close();
if (file.length() > 2097152) {
// throw new BaseException(CodeEnum.PHOTO_FILE_EXCEED_2M);
}
String name = file.getName();
CommonFile fileDo = new CommonFile();
fileDo.setId(snowflake.nextId());
fileDo.setFileName(name);
fileDo.setLocation(dir + fileName);
fileDo.setUserId(userId);
fileDo.setVisitLocation(PropUtil.imgDomain + Constant.File.UPLOAD_URL + File.separator + fileName);
commonFileMapper.insertSelective(fileDo);
log.info("保存文件:{}", fileDo);
vo.setId(fileDo.getId());
vo.setName(fileDo.getFileName());
vo.setVisitUrl(fileDo.getVisitLocation());
}
return vo;
}
}

3
mt/src/main/java/com/ccsens/mt/service/IFileService.java

@ -5,6 +5,7 @@ import com.ccsens.mt.bean.vo.FileVo;
import com.ccsens.util.NotSupportedFileTypeException;
import javax.servlet.http.Part;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.List;
@ -37,4 +38,6 @@ public interface IFileService {
* @return
*/
FileVo.Upload uploadPhone(Part file,Long userId) throws IOException, NotSupportedFileTypeException;
FileVo.Upload uploadPhoneBase64(String file, Long userId) throws FileNotFoundException, Exception;
}

226
mt/src/main/java/com/ccsens/mt/service/ProvinceService.java

@ -9,6 +9,7 @@ import cn.hutool.core.util.StrUtil;
import com.ccsens.mt.bean.dto.CompeteDto;
import com.ccsens.mt.bean.dto.ProvinceCompeteDto;
import com.ccsens.mt.bean.po.*;
import com.ccsens.mt.bean.vo.CompeteVo;
import com.ccsens.mt.bean.vo.ProvinceCompeteVo;
import com.ccsens.mt.persist.dao.CompeteCompanyDao;
import com.ccsens.mt.persist.dao.CompetePlayerDao;
@ -65,6 +66,8 @@ public class ProvinceService implements IProvinceService {
private CompeteTeamMemberMapper teamMemberMapper;
@Resource
private CompetePlayerMapper competePlayerMapper;
@Resource
private CompeteGroupMapper competeGroupMapper;
/**
* 查找当前用户填写的信息的概览
@ -133,16 +136,26 @@ public class ProvinceService implements IProvinceService {
CompetePlayerExample competePlayerExample = new CompetePlayerExample();
competePlayerExample.createCriteria().andIdCardEqualTo(param.getIdCard());
if(competePlayerDao.countByExample(competePlayerExample) != 0){
throw new BaseException(CodeEnum.WBS_REPEAT_MEMBER_PHONE);
throw new BaseException(CodeEnum.ID_CARD_ALREADY);
}
if(ObjectUtil.isNull(param.getCompeteId())){ throw new BaseException(CodeEnum.NOT_COMPANY); }
if(ObjectUtil.isNull(param.getGroupId())){ throw new BaseException(CodeEnum.MT_NOT_GROUP); }
//检查性别与组别是否匹配
CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(param.getGroupId());
if(ObjectUtil.isNull(competeGroup) || param.getGender() != competeGroup.getSex()){
throw new BaseException(CodeEnum.MT_NOT_GROUP);
}
//判断各种证件是否为空
if(ObjectUtil.isNull(param.getCompeteId())){ throw new BaseException(CodeEnum.PARAM_ERROR); }
if(ObjectUtil.isNull(param.getGroupId())){ throw new BaseException(CodeEnum.PARAM_ERROR); }
if(ObjectUtil.isNull(param.getIdCardFront())){ throw new BaseException(CodeEnum.PARAM_ERROR); }
if(ObjectUtil.isNull(param.getIdPhone())){ throw new BaseException(CodeEnum.PARAM_ERROR); }
if(ObjectUtil.isNull(param.getStudentRecord())){ throw new BaseException(CodeEnum.PARAM_ERROR); }
if(ObjectUtil.isNull(param.getHealthRecord())){ throw new BaseException(CodeEnum.PARAM_ERROR); }
if(ObjectUtil.isNull(param.getInsuranceRecord())){ throw new BaseException(CodeEnum.PARAM_ERROR); }
if(ObjectUtil.isNull(param.getIdCardFront()) && ObjectUtil.isNotNull(param.getIdCardBack())){
param.setIdCardFront(param.getIdCardBack());
param.setIdCardBack(null);
}
if(ObjectUtil.isNull(param.getIdCardFront())){ throw new BaseException(CodeEnum.PHOTO_IS_EMPTY.mtMsgPhoto("身份证/户口本信息")); }
if(ObjectUtil.isNull(param.getIdPhone())){ throw new BaseException(CodeEnum.PHOTO_IS_EMPTY.mtMsgPhoto("证件照")); }
if(ObjectUtil.isNull(param.getStudentRecord())){ throw new BaseException(CodeEnum.PHOTO_IS_EMPTY.mtMsgPhoto("学籍证明")); }
if(ObjectUtil.isNull(param.getHealthRecord())){ throw new BaseException(CodeEnum.PHOTO_IS_EMPTY.mtMsgPhoto("健康证明")); }
if(ObjectUtil.isNull(param.getInsuranceRecord())){ throw new BaseException(CodeEnum.PHOTO_IS_EMPTY.mtMsgPhoto("保险证明")); }
player.setIdCard(param.getIdCard());
player.setCompanyId(param.getCompeteId());
player.setCompeteGroupId(param.getGroupId());
@ -239,6 +252,9 @@ public class ProvinceService implements IProvinceService {
return competeCompany;
}
/**
* 新增修改单位信息
*/
@Override
public ProvinceCompeteVo.CompeteCompany changeCompany(CompeteDto.CompeteCompany param, Long userId) {
//判断当前单位id是否为空,
@ -246,51 +262,61 @@ public class ProvinceService implements IProvinceService {
CompeteCompany competeCompany = new CompeteCompany();
//单位id为空,新增
if (ObjectUtil.isNull(companyid)){
Long id = snowflake.nextId();
competeCompany.setId(id);
competeCompany.setCoachNum(param.getCoachNum());
if (ObjectUtil.isNull(param.getCompanyName())){
throw new BaseException(CodeEnum.PARAM_ERROR);
}
competeCompany.setName(param.getCompanyName());
if (ObjectUtil.isNull(param.getContactsName())){
throw new BaseException(CodeEnum.PARAM_ERROR);
}
competeCompany.setContactsName(param.getContactsName());
if (ObjectUtil.isNull(param.getContactsPhone())){
throw new BaseException(CodeEnum.PARAM_ERROR);
//检查当前用户是否已经添加过单位,有的话直接返回
CompeteCompanyExample companyExample = new CompeteCompanyExample();
companyExample.createCriteria().andUserIdEqualTo(userId).andCompeteTimeIdEqualTo(param.getCompeteTimeId());
if(competeCompanyDao.countByExample(companyExample) == 0) {
Long id = snowflake.nextId();
competeCompany.setId(id);
// competeCompany.setCoachNum(param.getCoachNum());
if (StrUtil.isEmpty(param.getCompanyName())) {
throw new BaseException(CodeEnum.NAME_EMPTY);
}
competeCompany.setName(param.getCompanyName());
if (StrUtil.isEmpty(param.getContactsName())) {
throw new BaseException(CodeEnum.CONTACTS_NAME_EMPTY);
}
competeCompany.setContactsName(param.getContactsName());
if (StrUtil.isEmpty(param.getContactsPhone()) || !param.getContactsPhone().matches(WebConstant.REGEX_PHONE)) {
throw new BaseException(CodeEnum.PHONE_ERR);
}
competeCompany.setContactsPhone(param.getContactsPhone());
competeCompany.setLeaderNum(param.getGuideNum());
competeCompany.setJoinNum(param.getPlayerNum());
competeCompany.setUserId(userId);
competeCompany.setCompeteTimeId(param.getCompeteTimeId());
if (param.getAuthorization() != 1) {
throw new BaseException(CodeEnum.AUTHORIZATION_AGREE);
}
competeCompany.setAuthorization(param.getAuthorization());
competeCompanyDao.insertSelective(competeCompany);
}
competeCompany.setContactsPhone(param.getContactsPhone());
competeCompany.setLeaderNum(param.getGuideNum());
competeCompany.setJoinNum(param.getPlayerNum());
competeCompany.setUserId(userId);
competeCompany.setCompeteTimeId(param.getCompeteTimeId());
// if (ObjectUtil.isNull(authorization)){
// throw new BaseException(CodeEnum.PARAM_ERROR);
// }
competeCompany.setAuthorization(param.getAuthorization());
competeCompanyDao.insertSelective(competeCompany);
}else {
//不为空,根据单位id查出来修改 判断传进来的参数是否为空 为空则跳过 不为空则修改
competeCompany = competeCompanyDao.selectByPrimaryKey(companyid);
if (ObjectUtil.isNotNull(param.getCoachNum())){
competeCompany.setCoachNum(param.getCoachNum());
}
if (ObjectUtil.isNotNull(param.getCompanyName())) {
// if (ObjectUtil.isNotNull(param.getCoachNum())){
// competeCompany.setCoachNum(param.getCoachNum());
// }
if (StrUtil.isNotEmpty(param.getCompanyName())) {
competeCompany.setName(param.getCompanyName());
}
if (ObjectUtil.isNotNull(param.getContactsName())) {
if (StrUtil.isNotEmpty(param.getContactsName())) {
competeCompany.setContactsName(param.getContactsName());
}
if (ObjectUtil.isNotNull(param.getContactsPhone())) {
if (StrUtil.isNotEmpty(param.getContactsPhone())) {
if(!param.getContactsPhone().matches(WebConstant.REGEX_PHONE)){
throw new BaseException(CodeEnum.PHONE_ERR);
}
competeCompany.setContactsPhone(param.getContactsPhone());
}
if (ObjectUtil.isNotNull(param.getGuideNum())) {
competeCompany.setLeaderNum(param.getGuideNum());
}
if (ObjectUtil.isNotNull(param.getPlayerNum())) {
competeCompany.setJoinNum(param.getPlayerNum());
}
// if (ObjectUtil.isNotNull(param.getGuideNum())) {
// competeCompany.setLeaderNum(param.getGuideNum());
// }
// if (ObjectUtil.isNotNull(param.getPlayerNum())) {
// competeCompany.setJoinNum(param.getPlayerNum());
// }
competeCompanyDao.updateByPrimaryKeySelective(competeCompany);
// competeCompany1.setCompanyId(competeCompany.getId());
// competeCompany1.setCoachNum(competeCompany.getCoachNum());
@ -308,9 +334,9 @@ public class ProvinceService implements IProvinceService {
@Override
public ProvinceCompeteVo.CompeteCompanyHeadList queryCoach(ProvinceCompeteDto.CompanyIdVo param) {
Long company = param.getCompanyId();
if (ObjectUtil.isNull(company)){
throw new BaseException(CodeEnum.PARAM_ERROR);
}
// if (ObjectUtil.isNull(company)){
// throw new BaseException(CodeEnum.PARAM_ERROR);
// }
CompeteCoachExample competeCoachExample = new CompeteCoachExample();
competeCoachExample.createCriteria().andCompanyIdEqualTo(company);
List<CompeteCoach> competeCoachList = competeCoachMapper.selectByExample(competeCoachExample);
@ -387,9 +413,13 @@ public class ProvinceService implements IProvinceService {
competeCoachExample.createCriteria().andIdEqualTo(id);
competeCoachMapper.updateByExample(competeCoach,competeCoachExample);
}else {
throw new BaseException(CodeEnum.PARAM_ERROR);
}
// else {
// throw new BaseException(CodeEnum.PARAM_ERROR);
// }
}
@ -424,40 +454,18 @@ public class ProvinceService implements IProvinceService {
// CompetePlayerExample competePlayerExample = new CompetePlayerExample();
// competePlayerExample.createCriteria().andIdEqualTo(playerId);
// competePlayerMapper.updateByExampleSelective(competePlayer,competePlayerExample);
}else {
throw new BaseException(CodeEnum.PARAM_ERROR);
}
// else {
// throw new BaseException(CodeEnum.PARAM_ERROR);
// }
}
@Override
public ProvinceCompeteVo.PlayerInfo getPlayerInfo(CompeteDto.DelPlayer param) {
//<<<<<<< HEAD
return competePlayerDao.getPlayerByPlayerId(param.getPlayerId());
//=======
////
// Long playerId = param.getPlayerId();
// CompetePlayer competePlayer = competePlayerMapper.selectByPrimaryKey(playerId);
// if (ObjectUtil.isNull(competePlayer)){
// throw new BaseException(CodeEnum.PARAM_ERROR);
// }
//// ProvinceCompeteVo.PlayerInfo playerInfo = new ProvinceCompeteVo.PlayerInfo();
//// playerInfo.setPlayerId(competePlayer.getId());
//// playerInfo.setCompeteId(competePlayer.getCompeteTimeId());
//// playerInfo.setGroupId(competePlayer.getCompeteGroupId());
//// playerInfo.setPlayerName(competePlayer.getName());
//// playerInfo.setGender(competePlayer.getGender());
//// playerInfo.setIdCard(competePlayer.getIdCard());
//// playerInfo.setIdCardFront(competePlayer.getIdCardFront());
//// playerInfo.setIdCardBack(competePlayer.getIdCardBack());
//// playerInfo.setIdPhone(competePlayer.getIdPhotoFile());
//// playerInfo.setStudentRecord(competePlayer.getStudentRecordFile());
//// playerInfo.setHealthRecord(competePlayer.getHealthRecordFile());
//// playerInfo.setInsuranceRecord(competePlayer.getInsuranceRecordFile());
//// return playerInfo;
// return competePlayerDao.getPlayerByPlayerId(playerId);
//>>>>>>> f1a5f1b5d162548202a10e15eaec41aacda91a21
}
@Override
public void updateLeader(ProvinceCompeteDto.ModifyLeader param) {
if(ObjectUtil.isNull(param.getCoachId())){
@ -465,31 +473,31 @@ public class ProvinceService implements IProvinceService {
competeCoachExample.createCriteria().andCompanyIdEqualTo(param.getCompanyId()).andIdentityEqualTo((byte) param.getIdentity());
long count = competeCoachMapper.countByExample(competeCoachExample);
if (param.getIdentity() == 0 && count >= 2){
throw new BaseException(CodeEnum.COACH_NUM_FULL);
throw new BaseException(CodeEnum.COACH_NUM_FULL);
}
if (param.getIdentity() == 1 && count >=3){
throw new BaseException(CodeEnum.COACH_NUM_FULL);
throw new BaseException(CodeEnum.LEADER_NUM_FULL);
}
//手机号不能为空,且正确
if(StrUtil.isEmpty(param.getPhone()) || !param.getPhone().matches(WebConstant.REGEX_PHONE)){
throw new BaseException(CodeEnum.PARAM_ERROR);
throw new BaseException(CodeEnum.PHONE_ERR);
}
//身份证不能为空,且正确
if(StrUtil.isEmpty(param.getIdCard()) || !IdcardUtil.isValidCard(param.getIdCard())){
throw new BaseException(CodeEnum.PARAM_ERROR);
throw new BaseException(CodeEnum.ID_CARD_ERROR);
}
//证件照判断
if (ObjectUtil.isNull(param.getIdPhoto())){
throw new BaseException(CodeEnum.PARAM_ERROR);
if (param.getIdentity() == 1 && ObjectUtil.isNull(param.getIdPhoto())){
throw new BaseException(CodeEnum.PHOTO_IS_EMPTY);
}
CompeteCoach competeCoach1 = new CompeteCoach();
competeCoach1.setId(snowflake.nextId());
BeanUtil.copyProperties(param, competeCoach1);
competeCoachMapper.insertSelective(competeCoach1);
}else {
CompeteCoach competeCoach2 = new CompeteCoach();
BeanUtil.copyProperties(param, competeCoach2);
competeCoachMapper.updateByPrimaryKeySelective(competeCoach2);
CompeteCoach competeCoach = competeCoachMapper.selectByPrimaryKey(param.getCoachId());
BeanUtil.copyProperties(param, competeCoach);
competeCoachMapper.updateByPrimaryKeySelective(competeCoach);
}
}
@ -502,20 +510,20 @@ public class ProvinceService implements IProvinceService {
CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId());
if(ObjectUtil.isNull(competeProject)){ throw new BaseException(CodeEnum.PARAM_ERROR); }
//检查参赛人数是否符合
// if(CollectionUtil.isEmpty(param.getPlayers())){ throw new BaseException(CodeEnum.PARAM_ERROR); }
int joinCount = 0;
for(ProvinceCompeteDto.JoinProjectPlayer joinProject : param.getPlayers()){
if(joinProject.getJoinProject() == 1){
joinCount++;
}
}
if(joinCount > competeProject.getMemberMax() ){
throw new BaseException(CodeEnum.TEAM_MEMBER_ERROR);
}
// //检查参赛人数是否符合
// int joinCount = 0;
// for(ProvinceCompeteDto.JoinProjectPlayer joinProject : param.getPlayers()){
// if(joinProject.getJoinProject() == 1){
// joinCount++;
// }
// }
//// if(joinCount > competeProject.getMemberMax() ){
//// throw new BaseException(CodeEnum.TEAM_MEMBER_ERROR);
//// }
//判断项目是个人还是团队,参加
if(competeProject.getTeam() == 0){
param.getPlayers().forEach(joinPlayer -> {
// param.getPlayers().forEach(joinPlayer -> {
for(ProvinceCompeteDto.JoinProjectPlayer joinPlayer : param.getPlayers()){
//检查此用户之前是否参加此项目
CompeteProjectPlayerExample example = new CompeteProjectPlayerExample();
example.createCriteria().andProjectIdEqualTo(competeProject.getId()).andPlayerIdEqualTo(joinPlayer.getPlayerId())
@ -537,13 +545,13 @@ public class ProvinceService implements IProvinceService {
//查找此公司此组别是否参加过这个项目
int num = competeCompanyDao.getNumByCompanyAndGroup(competeProject.getId(), player.getCompanyId(), player.getCompeteGroupId(), param.getCompeteTimeId());
if (num > 0) {
throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg("该项目该组别"));
throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg1("该项目该组别"));
}
//查找个人参赛数量是否符合
//查找个人参赛数量是否符合(个人比赛3个)
CompeteProjectPlayerExample projectPlayerExample = new CompeteProjectPlayerExample();
projectPlayerExample.createCriteria().andPlayerIdEqualTo(joinPlayer.getPlayerId()).andCompeteTimeIdEqualTo(param.getCompeteTimeId());
if (projectPlayerMapper.countByExample(projectPlayerExample) >= 3) {
throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg(player.getName()));
throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg(player.getName()+"个人"));
}
//参加比赛记录
CompeteProjectPlayer projectPlayer = new CompeteProjectPlayer();
@ -555,7 +563,8 @@ public class ProvinceService implements IProvinceService {
projectPlayer.setGenderGroup(player.getGender());
projectPlayerMapper.insertSelective(projectPlayer);
}
});
// });
}
}else {
//查找当前公司是否已经报名此项目
CompeteTeam competeTeam;
@ -574,6 +583,24 @@ public class ProvinceService implements IProvinceService {
competeTeamDao.insertSelective(competeTeam);
}
//检查参赛人数是否符合
int joinCount = 0;
for(ProvinceCompeteDto.JoinProjectPlayer joinProject : param.getPlayers()){
if(joinProject.getJoinProject() == 1){
joinCount++;
}else {
joinCount--;
}
}
CompeteTeamMemberExample example = new CompeteTeamMemberExample();
example.createCriteria().andCompeteTeamIdEqualTo(competeTeam.getId());
long memberNum = teamMemberMapper.countByExample(example);
if(joinCount + memberNum > competeProject.getMemberMax() ){
throw new BaseException(CodeEnum.MEMBER_NUM_ERROR);
//TODO 参赛人数不满足比赛人数要求
}
for (int i = 0; i < param.getPlayers().size(); i++) {
ProvinceCompeteDto.JoinProjectPlayer joinProjectPlayer = param.getPlayers().get(i);
CompetePlayer player = competePlayerDao.selectByPrimaryKey(joinProjectPlayer.getPlayerId());
@ -592,10 +619,11 @@ public class ProvinceService implements IProvinceService {
}
//选手这次参加,以前未参加,添加数据
if(joinProjectPlayer.getJoinProject() == 1 && CollectionUtil.isEmpty(teamMemberList)){
//检查该选手报名项目数量
//检查该选手报名项目数量(团队6个)
int a = competeCompanyDao.getTeamNumByPlayerId(param.getCompeteTimeId(),player.getId());
if(a >= 6){
throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg(player.getName()));
throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg(player.getName()+"团队"));
//XXX团队项目参赛次数已满
}
//添加成员表
CompeteTeamMember teamMember = new CompeteTeamMember();

4
mt/src/main/resources/application.yml

@ -1,4 +1,4 @@
spring:
profiles:
active: test
include: common, util-test
active: dev
include: common, util-dev

19
mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml

@ -39,6 +39,7 @@
cc.compete_time_id = #{competeTimeId}
and cc.user_id = #{userId}
and cc.rec_status = 0
limit 1
</select>
<select id="queryPlayerByGroupId" resultMap="group_player">
@ -160,28 +161,34 @@
where user_id = #{userId}
and compete_time_id = #{competeTimeId}
and rec_status = 0
limit 1
</select>
<select id="getJoinProjectNum" resultType="java.lang.Integer">
SELECT
a1.num + a2.num as num
FROM
(SELECT
count(p.id) as num
count(distinct p.id) as num
FROM
t_compete_project p
LEFT JOIN t_compete_project_player pp on p.id = pp.project_id
LEFT JOIN t_compete_player pl on pp.player_id = pl.id
WHERE
pl.company_id = #{competeTimeId}) a1,
pl.company_id = #{companyId}
and pp.rec_status = 0
and pl.rec_status = 0) a1,
(SELECT
count(p.id) as num
count(distinct p.id) as num
FROM
t_compete_project p
LEFT JOIN t_compete_team t on p.id = t.project_id
LEFT JOIN t_compete_team_member m on t.id = m.compete_team_id
LEFT JOIN t_compete_player pl on m.player_id = pl.id
WHERE
pl.company_id = #{competeTimeId})a2
pl.company_id = #{companyId}
and t.rec_status = 0
and m.rec_status = 0
and pl.rec_status = 0)a2
</select>
<select id="getNumByCompanyAndGroup" resultType="java.lang.Integer">
SELECT
@ -191,7 +198,7 @@
WHERE
pp.project_id = #{projectId}
and p.company_id = #{companyId}
and p.compete_time_id = #{competeTimeId}
and pp.compete_time_id = #{competeTimeId}
and p.compete_group_id = #{groupId}
and pp.rec_status = 0
and p.rec_status = 0
@ -216,7 +223,9 @@
gender,
phone,
id_card,
(SELECT id FROM t_common_file WHERE id = id_photo) as idPhotoId,
(SELECT visit_location FROM t_common_file WHERE id = id_photo) as idPhoto,
(SELECT id FROM t_common_file WHERE id = coach_certificate) as coachCertificateId,
(SELECT visit_location FROM t_common_file WHERE id = coach_certificate) as coachCertificate
FROM
t_compete_coach

6
mt/src/main/resources/mapper_dao/CompetePlayerDao.xml

@ -171,11 +171,17 @@
id_card as idCard,
company_id as competeId,
compete_group_id as groupId,
(SELECT id FROM t_common_file WHERE id = id_card_front_file) as idCardFrontId,
(SELECT visit_location FROM t_common_file WHERE id = id_card_front_file) as idCardFront,
(SELECT id FROM t_common_file WHERE id = id_card_back_file) as idCardBackId,
(SELECT visit_location FROM t_common_file WHERE id = id_card_back_file) as idCardBack,
(SELECT id FROM t_common_file WHERE id = id_photo_file) as idPhoneId,
(SELECT visit_location FROM t_common_file WHERE id = id_photo_file) as idPhone,
(SELECT id FROM t_common_file WHERE id = student_record_file) as studentRecordId,
(SELECT visit_location FROM t_common_file WHERE id = student_record_file) as studentRecord,
(SELECT id FROM t_common_file WHERE id = health_record_file) as healthRecordId,
(SELECT visit_location FROM t_common_file WHERE id = health_record_file) as healthRecord,
(SELECT id FROM t_common_file WHERE id = insurance_record_file) as insuranceRecordId,
(SELECT visit_location FROM t_common_file WHERE id = insurance_record_file) as insuranceRecord
FROM
t_compete_player

57
mt/src/main/resources/mapper_raw/CompeteGroupMapper.xml

@ -12,6 +12,9 @@
<result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
<result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
<result column="rec_status" jdbcType="TINYINT" property="recStatus" />
<result column="sex" jdbcType="TINYINT" property="sex" />
<result column="max_age" jdbcType="TINYINT" property="maxAge" />
<result column="min_age" jdbcType="TINYINT" property="minAge" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
@ -73,7 +76,7 @@
</sql>
<sql id="Base_Column_List">
id, group_name, description, start_age, end_age, sequence, type, created_at, updated_at,
rec_status
rec_status, sex, max_age, min_age
</sql>
<select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompeteGroupExample" resultMap="BaseResultMap">
select
@ -109,11 +112,13 @@
insert into t_compete_group (id, group_name, description,
start_age, end_age, sequence,
type, created_at, updated_at,
rec_status)
rec_status, sex, max_age,
min_age)
values (#{id,jdbcType=BIGINT}, #{groupName,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR},
#{startAge,jdbcType=INTEGER}, #{endAge,jdbcType=INTEGER}, #{sequence,jdbcType=INTEGER},
#{type,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP},
#{recStatus,jdbcType=TINYINT})
#{recStatus,jdbcType=TINYINT}, #{sex,jdbcType=TINYINT}, #{maxAge,jdbcType=TINYINT},
#{minAge,jdbcType=TINYINT})
</insert>
<insert id="insertSelective" parameterType="com.ccsens.mt.bean.po.CompeteGroup">
insert into t_compete_group
@ -148,6 +153,15 @@
<if test="recStatus != null">
rec_status,
</if>
<if test="sex != null">
sex,
</if>
<if test="maxAge != null">
max_age,
</if>
<if test="minAge != null">
min_age,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
@ -180,6 +194,15 @@
<if test="recStatus != null">
#{recStatus,jdbcType=TINYINT},
</if>
<if test="sex != null">
#{sex,jdbcType=TINYINT},
</if>
<if test="maxAge != null">
#{maxAge,jdbcType=TINYINT},
</if>
<if test="minAge != null">
#{minAge,jdbcType=TINYINT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.ccsens.mt.bean.po.CompeteGroupExample" resultType="java.lang.Long">
@ -221,6 +244,15 @@
<if test="record.recStatus != null">
rec_status = #{record.recStatus,jdbcType=TINYINT},
</if>
<if test="record.sex != null">
sex = #{record.sex,jdbcType=TINYINT},
</if>
<if test="record.maxAge != null">
max_age = #{record.maxAge,jdbcType=TINYINT},
</if>
<if test="record.minAge != null">
min_age = #{record.minAge,jdbcType=TINYINT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
@ -237,7 +269,10 @@
type = #{record.type,jdbcType=TINYINT},
created_at = #{record.createdAt,jdbcType=TIMESTAMP},
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
rec_status = #{record.recStatus,jdbcType=TINYINT}
rec_status = #{record.recStatus,jdbcType=TINYINT},
sex = #{record.sex,jdbcType=TINYINT},
max_age = #{record.maxAge,jdbcType=TINYINT},
min_age = #{record.minAge,jdbcType=TINYINT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
@ -272,6 +307,15 @@
<if test="recStatus != null">
rec_status = #{recStatus,jdbcType=TINYINT},
</if>
<if test="sex != null">
sex = #{sex,jdbcType=TINYINT},
</if>
<if test="maxAge != null">
max_age = #{maxAge,jdbcType=TINYINT},
</if>
<if test="minAge != null">
min_age = #{minAge,jdbcType=TINYINT},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
@ -285,7 +329,10 @@
type = #{type,jdbcType=TINYINT},
created_at = #{createdAt,jdbcType=TIMESTAMP},
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
rec_status = #{recStatus,jdbcType=TINYINT}
rec_status = #{recStatus,jdbcType=TINYINT},
sex = #{sex,jdbcType=TINYINT},
max_age = #{maxAge,jdbcType=TINYINT},
min_age = #{minAge,jdbcType=TINYINT}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>

BIN
nullzzz/2020-10-22/1603333027707.xlsx

Binary file not shown.

15
tall/src/main/java/com/ccsens/tall/bean/dto/WeekMeetingDto.java

@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NonNull;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
@ -46,4 +47,18 @@ public class WeekMeetingDto {
@ApiModelProperty("域名")
private String domainName;
}
@Data
@ApiModel("获取插件关联的信息")
public static class PluginParameter{
@NotNull(message = "插件信息不正确")
@ApiModelProperty("插件id")
private Long pluginId;
@ApiModelProperty("任务id")
private Long subTaskId;
@ApiModelProperty("成员id")
private Long memberId;
@ApiModelProperty("项目id")
private Long projectId;
}
}

117
tall/src/main/java/com/ccsens/tall/bean/po/ProPluginParameter.java

@ -0,0 +1,117 @@
package com.ccsens.tall.bean.po;
import java.io.Serializable;
import java.util.Date;
public class ProPluginParameter implements Serializable {
private Long id;
private Long subTaskId;
private Long memberId;
private Long projectId;
private Long pluginId;
private String parameter;
private Date createdAt;
private Date updatedAt;
private Byte recStatus;
private static final long serialVersionUID = 1L;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getSubTaskId() {
return subTaskId;
}
public void setSubTaskId(Long subTaskId) {
this.subTaskId = subTaskId;
}
public Long getMemberId() {
return memberId;
}
public void setMemberId(Long memberId) {
this.memberId = memberId;
}
public Long getProjectId() {
return projectId;
}
public void setProjectId(Long projectId) {
this.projectId = projectId;
}
public Long getPluginId() {
return pluginId;
}
public void setPluginId(Long pluginId) {
this.pluginId = pluginId;
}
public String getParameter() {
return parameter;
}
public void setParameter(String parameter) {
this.parameter = parameter == null ? null : parameter.trim();
}
public Date getCreatedAt() {
return createdAt;
}
public void setCreatedAt(Date createdAt) {
this.createdAt = createdAt;
}
public Date getUpdatedAt() {
return updatedAt;
}
public void setUpdatedAt(Date updatedAt) {
this.updatedAt = updatedAt;
}
public Byte getRecStatus() {
return recStatus;
}
public void setRecStatus(Byte recStatus) {
this.recStatus = recStatus;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", subTaskId=").append(subTaskId);
sb.append(", memberId=").append(memberId);
sb.append(", projectId=").append(projectId);
sb.append(", pluginId=").append(pluginId);
sb.append(", parameter=").append(parameter);
sb.append(", createdAt=").append(createdAt);
sb.append(", updatedAt=").append(updatedAt);
sb.append(", recStatus=").append(recStatus);
sb.append("]");
return sb.toString();
}
}

751
tall/src/main/java/com/ccsens/tall/bean/po/ProPluginParameterExample.java

@ -0,0 +1,751 @@
package com.ccsens.tall.bean.po;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class ProPluginParameterExample {
protected String orderByClause;
protected boolean distinct;
protected List<Criteria> oredCriteria;
public ProPluginParameterExample() {
oredCriteria = new ArrayList<Criteria>();
}
public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause;
}
public String getOrderByClause() {
return orderByClause;
}
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
public boolean isDistinct() {
return distinct;
}
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
oredCriteria.add(criteria);
}
return criteria;
}
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> getCriteria() {
return criteria;
}
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
}
criteria.add(new Criterion(condition));
}
protected void addCriterion(String condition, Object value, String property) {
if (value == null) {
throw new RuntimeException("Value for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value));
}
protected void addCriterion(String condition, Object value1, Object value2, String property) {
if (value1 == null || value2 == null) {
throw new RuntimeException("Between values for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value1, value2));
}
public Criteria andIdIsNull() {
addCriterion("id is null");
return (Criteria) this;
}
public Criteria andIdIsNotNull() {
addCriterion("id is not null");
return (Criteria) this;
}
public Criteria andIdEqualTo(Long value) {
addCriterion("id =", value, "id");
return (Criteria) this;
}
public Criteria andIdNotEqualTo(Long value) {
addCriterion("id <>", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThan(Long value) {
addCriterion("id >", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThanOrEqualTo(Long value) {
addCriterion("id >=", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThan(Long value) {
addCriterion("id <", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThanOrEqualTo(Long value) {
addCriterion("id <=", value, "id");
return (Criteria) this;
}
public Criteria andIdIn(List<Long> values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<Long> values) {
addCriterion("id not in", values, "id");
return (Criteria) this;
}
public Criteria andIdBetween(Long value1, Long value2) {
addCriterion("id between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIdNotBetween(Long value1, Long value2) {
addCriterion("id not between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andSubTaskIdIsNull() {
addCriterion("sub_task_id is null");
return (Criteria) this;
}
public Criteria andSubTaskIdIsNotNull() {
addCriterion("sub_task_id is not null");
return (Criteria) this;
}
public Criteria andSubTaskIdEqualTo(Long value) {
addCriterion("sub_task_id =", value, "subTaskId");
return (Criteria) this;
}
public Criteria andSubTaskIdNotEqualTo(Long value) {
addCriterion("sub_task_id <>", value, "subTaskId");
return (Criteria) this;
}
public Criteria andSubTaskIdGreaterThan(Long value) {
addCriterion("sub_task_id >", value, "subTaskId");
return (Criteria) this;
}
public Criteria andSubTaskIdGreaterThanOrEqualTo(Long value) {
addCriterion("sub_task_id >=", value, "subTaskId");
return (Criteria) this;
}
public Criteria andSubTaskIdLessThan(Long value) {
addCriterion("sub_task_id <", value, "subTaskId");
return (Criteria) this;
}
public Criteria andSubTaskIdLessThanOrEqualTo(Long value) {
addCriterion("sub_task_id <=", value, "subTaskId");
return (Criteria) this;
}
public Criteria andSubTaskIdIn(List<Long> values) {
addCriterion("sub_task_id in", values, "subTaskId");
return (Criteria) this;
}
public Criteria andSubTaskIdNotIn(List<Long> values) {
addCriterion("sub_task_id not in", values, "subTaskId");
return (Criteria) this;
}
public Criteria andSubTaskIdBetween(Long value1, Long value2) {
addCriterion("sub_task_id between", value1, value2, "subTaskId");
return (Criteria) this;
}
public Criteria andSubTaskIdNotBetween(Long value1, Long value2) {
addCriterion("sub_task_id not between", value1, value2, "subTaskId");
return (Criteria) this;
}
public Criteria andMemberIdIsNull() {
addCriterion("member_id is null");
return (Criteria) this;
}
public Criteria andMemberIdIsNotNull() {
addCriterion("member_id is not null");
return (Criteria) this;
}
public Criteria andMemberIdEqualTo(Long value) {
addCriterion("member_id =", value, "memberId");
return (Criteria) this;
}
public Criteria andMemberIdNotEqualTo(Long value) {
addCriterion("member_id <>", value, "memberId");
return (Criteria) this;
}
public Criteria andMemberIdGreaterThan(Long value) {
addCriterion("member_id >", value, "memberId");
return (Criteria) this;
}
public Criteria andMemberIdGreaterThanOrEqualTo(Long value) {
addCriterion("member_id >=", value, "memberId");
return (Criteria) this;
}
public Criteria andMemberIdLessThan(Long value) {
addCriterion("member_id <", value, "memberId");
return (Criteria) this;
}
public Criteria andMemberIdLessThanOrEqualTo(Long value) {
addCriterion("member_id <=", value, "memberId");
return (Criteria) this;
}
public Criteria andMemberIdIn(List<Long> values) {
addCriterion("member_id in", values, "memberId");
return (Criteria) this;
}
public Criteria andMemberIdNotIn(List<Long> values) {
addCriterion("member_id not in", values, "memberId");
return (Criteria) this;
}
public Criteria andMemberIdBetween(Long value1, Long value2) {
addCriterion("member_id between", value1, value2, "memberId");
return (Criteria) this;
}
public Criteria andMemberIdNotBetween(Long value1, Long value2) {
addCriterion("member_id not between", value1, value2, "memberId");
return (Criteria) this;
}
public Criteria andProjectIdIsNull() {
addCriterion("project_id is null");
return (Criteria) this;
}
public Criteria andProjectIdIsNotNull() {
addCriterion("project_id is not null");
return (Criteria) this;
}
public Criteria andProjectIdEqualTo(Long value) {
addCriterion("project_id =", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdNotEqualTo(Long value) {
addCriterion("project_id <>", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdGreaterThan(Long value) {
addCriterion("project_id >", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdGreaterThanOrEqualTo(Long value) {
addCriterion("project_id >=", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdLessThan(Long value) {
addCriterion("project_id <", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdLessThanOrEqualTo(Long value) {
addCriterion("project_id <=", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdIn(List<Long> values) {
addCriterion("project_id in", values, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdNotIn(List<Long> values) {
addCriterion("project_id not in", values, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdBetween(Long value1, Long value2) {
addCriterion("project_id between", value1, value2, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdNotBetween(Long value1, Long value2) {
addCriterion("project_id not between", value1, value2, "projectId");
return (Criteria) this;
}
public Criteria andPluginIdIsNull() {
addCriterion("plugin_id is null");
return (Criteria) this;
}
public Criteria andPluginIdIsNotNull() {
addCriterion("plugin_id is not null");
return (Criteria) this;
}
public Criteria andPluginIdEqualTo(Long value) {
addCriterion("plugin_id =", value, "pluginId");
return (Criteria) this;
}
public Criteria andPluginIdNotEqualTo(Long value) {
addCriterion("plugin_id <>", value, "pluginId");
return (Criteria) this;
}
public Criteria andPluginIdGreaterThan(Long value) {
addCriterion("plugin_id >", value, "pluginId");
return (Criteria) this;
}
public Criteria andPluginIdGreaterThanOrEqualTo(Long value) {
addCriterion("plugin_id >=", value, "pluginId");
return (Criteria) this;
}
public Criteria andPluginIdLessThan(Long value) {
addCriterion("plugin_id <", value, "pluginId");
return (Criteria) this;
}
public Criteria andPluginIdLessThanOrEqualTo(Long value) {
addCriterion("plugin_id <=", value, "pluginId");
return (Criteria) this;
}
public Criteria andPluginIdIn(List<Long> values) {
addCriterion("plugin_id in", values, "pluginId");
return (Criteria) this;
}
public Criteria andPluginIdNotIn(List<Long> values) {
addCriterion("plugin_id not in", values, "pluginId");
return (Criteria) this;
}
public Criteria andPluginIdBetween(Long value1, Long value2) {
addCriterion("plugin_id between", value1, value2, "pluginId");
return (Criteria) this;
}
public Criteria andPluginIdNotBetween(Long value1, Long value2) {
addCriterion("plugin_id not between", value1, value2, "pluginId");
return (Criteria) this;
}
public Criteria andParameterIsNull() {
addCriterion("parameter is null");
return (Criteria) this;
}
public Criteria andParameterIsNotNull() {
addCriterion("parameter is not null");
return (Criteria) this;
}
public Criteria andParameterEqualTo(String value) {
addCriterion("parameter =", value, "parameter");
return (Criteria) this;
}
public Criteria andParameterNotEqualTo(String value) {
addCriterion("parameter <>", value, "parameter");
return (Criteria) this;
}
public Criteria andParameterGreaterThan(String value) {
addCriterion("parameter >", value, "parameter");
return (Criteria) this;
}
public Criteria andParameterGreaterThanOrEqualTo(String value) {
addCriterion("parameter >=", value, "parameter");
return (Criteria) this;
}
public Criteria andParameterLessThan(String value) {
addCriterion("parameter <", value, "parameter");
return (Criteria) this;
}
public Criteria andParameterLessThanOrEqualTo(String value) {
addCriterion("parameter <=", value, "parameter");
return (Criteria) this;
}
public Criteria andParameterLike(String value) {
addCriterion("parameter like", value, "parameter");
return (Criteria) this;
}
public Criteria andParameterNotLike(String value) {
addCriterion("parameter not like", value, "parameter");
return (Criteria) this;
}
public Criteria andParameterIn(List<String> values) {
addCriterion("parameter in", values, "parameter");
return (Criteria) this;
}
public Criteria andParameterNotIn(List<String> values) {
addCriterion("parameter not in", values, "parameter");
return (Criteria) this;
}
public Criteria andParameterBetween(String value1, String value2) {
addCriterion("parameter between", value1, value2, "parameter");
return (Criteria) this;
}
public Criteria andParameterNotBetween(String value1, String value2) {
addCriterion("parameter not between", value1, value2, "parameter");
return (Criteria) this;
}
public Criteria andCreatedAtIsNull() {
addCriterion("created_at is null");
return (Criteria) this;
}
public Criteria andCreatedAtIsNotNull() {
addCriterion("created_at is not null");
return (Criteria) this;
}
public Criteria andCreatedAtEqualTo(Date value) {
addCriterion("created_at =", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtNotEqualTo(Date value) {
addCriterion("created_at <>", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtGreaterThan(Date value) {
addCriterion("created_at >", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
addCriterion("created_at >=", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtLessThan(Date value) {
addCriterion("created_at <", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
addCriterion("created_at <=", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtIn(List<Date> values) {
addCriterion("created_at in", values, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtNotIn(List<Date> values) {
addCriterion("created_at not in", values, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtBetween(Date value1, Date value2) {
addCriterion("created_at between", value1, value2, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
addCriterion("created_at not between", value1, value2, "createdAt");
return (Criteria) this;
}
public Criteria andUpdatedAtIsNull() {
addCriterion("updated_at is null");
return (Criteria) this;
}
public Criteria andUpdatedAtIsNotNull() {
addCriterion("updated_at is not null");
return (Criteria) this;
}
public Criteria andUpdatedAtEqualTo(Date value) {
addCriterion("updated_at =", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtNotEqualTo(Date value) {
addCriterion("updated_at <>", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtGreaterThan(Date value) {
addCriterion("updated_at >", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
addCriterion("updated_at >=", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtLessThan(Date value) {
addCriterion("updated_at <", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
addCriterion("updated_at <=", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtIn(List<Date> values) {
addCriterion("updated_at in", values, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtNotIn(List<Date> values) {
addCriterion("updated_at not in", values, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtBetween(Date value1, Date value2) {
addCriterion("updated_at between", value1, value2, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
addCriterion("updated_at not between", value1, value2, "updatedAt");
return (Criteria) this;
}
public Criteria andRecStatusIsNull() {
addCriterion("rec_status is null");
return (Criteria) this;
}
public Criteria andRecStatusIsNotNull() {
addCriterion("rec_status is not null");
return (Criteria) this;
}
public Criteria andRecStatusEqualTo(Byte value) {
addCriterion("rec_status =", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusNotEqualTo(Byte value) {
addCriterion("rec_status <>", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusGreaterThan(Byte value) {
addCriterion("rec_status >", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) {
addCriterion("rec_status >=", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusLessThan(Byte value) {
addCriterion("rec_status <", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusLessThanOrEqualTo(Byte value) {
addCriterion("rec_status <=", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusIn(List<Byte> values) {
addCriterion("rec_status in", values, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusNotIn(List<Byte> values) {
addCriterion("rec_status not in", values, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusBetween(Byte value1, Byte value2) {
addCriterion("rec_status between", value1, value2, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusNotBetween(Byte value1, Byte value2) {
addCriterion("rec_status not between", value1, value2, "recStatus");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
super();
}
}
public static class Criterion {
private String condition;
private Object value;
private Object secondValue;
private boolean noValue;
private boolean singleValue;
private boolean betweenValue;
private boolean listValue;
private String typeHandler;
public String getCondition() {
return condition;
}
public Object getValue() {
return value;
}
public Object getSecondValue() {
return secondValue;
}
public boolean isNoValue() {
return noValue;
}
public boolean isSingleValue() {
return singleValue;
}
public boolean isBetweenValue() {
return betweenValue;
}
public boolean isListValue() {
return listValue;
}
public String getTypeHandler() {
return typeHandler;
}
protected Criterion(String condition) {
super();
this.condition = condition;
this.typeHandler = null;
this.noValue = true;
}
protected Criterion(String condition, Object value, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.typeHandler = typeHandler;
if (value instanceof List<?>) {
this.listValue = true;
} else {
this.singleValue = true;
}
}
protected Criterion(String condition, Object value) {
this(condition, value, null);
}
protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.secondValue = secondValue;
this.typeHandler = typeHandler;
this.betweenValue = true;
}
protected Criterion(String condition, Object value, Object secondValue) {
this(condition, value, secondValue, null);
}
}
}

4
tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java

@ -48,9 +48,9 @@ public class ProjectVo {
@ApiModelProperty("子项目信息")
private List<ProjectInfo> subProjectList;
@ApiModelProperty("是否在首页展示 0否 1是")
private byte homePageShow;
private Byte homePageShow;
@ApiModelProperty("是否高亮展示 0否 1是")
private byte highlight;
private Byte highlight;
@ApiModelProperty("父项目id")
private Long parentId;

1
tall/src/main/java/com/ccsens/tall/config/SpringConfig.java

@ -139,6 +139,7 @@ public class SpringConfig implements WebMvcConfigurer {
.excludePathPatterns("/users/password")
.excludePathPatterns("/users/password/account")
.excludePathPatterns("/users/account")
.excludePathPatterns("/users/phone")
.excludePathPatterns("/users/token")
.excludePathPatterns("/users/claims")
.excludePathPatterns("/users/member")

30
tall/src/main/java/com/ccsens/tall/persist/mapper/ProPluginParameterMapper.java

@ -0,0 +1,30 @@
package com.ccsens.tall.persist.mapper;
import com.ccsens.tall.bean.po.ProPluginParameter;
import com.ccsens.tall.bean.po.ProPluginParameterExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface ProPluginParameterMapper {
long countByExample(ProPluginParameterExample example);
int deleteByExample(ProPluginParameterExample example);
int deleteByPrimaryKey(Long id);
int insert(ProPluginParameter record);
int insertSelective(ProPluginParameter record);
List<ProPluginParameter> selectByExample(ProPluginParameterExample example);
ProPluginParameter selectByPrimaryKey(Long id);
int updateByExampleSelective(@Param("record") ProPluginParameter record, @Param("example") ProPluginParameterExample example);
int updateByExample(@Param("record") ProPluginParameter record, @Param("example") ProPluginParameterExample example);
int updateByPrimaryKeySelective(ProPluginParameter record);
int updateByPrimaryKey(ProPluginParameter record);
}

8
tall/src/main/java/com/ccsens/tall/service/IWeekMeetingService.java

@ -41,4 +41,12 @@ public interface IWeekMeetingService {
* @return
*/
String getCcMinutes(Long userId, WeekMeetingDto.WeekMeetingMinutes param) throws IOException;
/**
* 获取插件相关的参数信息
* @param userId
* @param param
* @return
*/
String getPluginParameter(Long userId, WeekMeetingDto.PluginParameter param);
}

12
tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java

@ -476,12 +476,18 @@ public class ProTaskDetailService implements IProTaskDetailService {
ProPluginConfig proPluginConfig = sysPluginDao.getPluginConfigByTaskPluginId(pluginIds[i], normalTask.getDetailId());
if (ObjectUtil.isNotNull(proPluginConfig)) {
//如果是“个人任务汇报”插件,特殊查询
if(pluginNames[i].equalsIgnoreCase(TallConstant.PERSONAL_TASK_REPORT) && StrUtil.isEmpty(proPluginConfig.getImportParam())){
//如果是周会相关的插件,且入参为空。特殊查询
SysPlugin sysPlugin = sysPluginDao.selectByPrimaryKey(Long.parseLong(pluginIds[i]));
if(ObjectUtil.isNotNull(sysPlugin) && sysPlugin.getScene() == 6 && StrUtil.isEmpty(proPluginConfig.getImportParam())){
PluginVo.PersonalTaskReport personalTaskReport = taskPluginService.getPersonalTaskReport(normalTask.getProjectId());
proPluginConfig.setImportParam(JacksonUtil.beanToJson(personalTaskReport));
// pluginConfigDao.updateByPrimaryKeySelective(proPluginConfig);
}
// //如果是“个人任务汇报”插件,特殊查询
// if(pluginNames[i].equalsIgnoreCase(TallConstant.PERSONAL_TASK_REPORT) && StrUtil.isEmpty(proPluginConfig.getImportParam())){
// PluginVo.PersonalTaskReport personalTaskReport = taskPluginService.getPersonalTaskReport(normalTask.getProjectId());
// proPluginConfig.setImportParam(JacksonUtil.beanToJson(personalTaskReport));
//// pluginConfigDao.updateByPrimaryKeySelective(proPluginConfig);
// }
plugin.setWebPath(proPluginConfig.getWebPath());
plugin.setRoutineLocation(proPluginConfig.getRoutineLocation());
plugin.setImportParam(proPluginConfig.getImportParam());

19
tall/src/main/java/com/ccsens/tall/service/WeekMeetingService.java

@ -9,6 +9,7 @@ import com.ccsens.tall.bean.po.*;
import com.ccsens.tall.bean.vo.PluginVo;
import com.ccsens.tall.bean.vo.TaskVo;
import com.ccsens.tall.persist.dao.*;
import com.ccsens.tall.persist.mapper.ProPluginParameterMapper;
import com.ccsens.tall.util.TallConstant;
import com.ccsens.util.JacksonUtil;
import com.ccsens.util.PoiUtil;
@ -50,6 +51,8 @@ public class WeekMeetingService implements IWeekMeetingService{
private ProPluginConfigDao proPluginConfigDao;
@Resource
private ITaskPluginService taskPluginService;
@Resource
private ProPluginParameterMapper parameterMapper;
/**
* 查找周会要用到的项目
@ -159,6 +162,22 @@ public class WeekMeetingService implements IWeekMeetingService{
return PropUtil.imgDomain + "/" + fileName;
}
/**
* 查找插件相关的参数信息
*/
@Override
public String getPluginParameter(Long userId, WeekMeetingDto.PluginParameter param) {
String parameter = null;
ProPluginParameterExample parameterExample = new ProPluginParameterExample();
parameterExample.createCriteria().andSubTaskIdEqualTo(param.getSubTaskId()).andPluginIdEqualTo(param.getPluginId())
.andMemberIdEqualTo(param.getMemberId()).andProjectIdEqualTo(param.getProjectId());
List<ProPluginParameter> parameterList = parameterMapper.selectByExample(parameterExample);
if(CollectionUtil.isNotEmpty(parameterList)){
parameter = parameterList.get(0).getParameter();
}
return parameter;
}
/**
* 生成个人汇报的任务
* @param reportMember

3
tall/src/main/java/com/ccsens/tall/util/TaskUtil.java

@ -38,7 +38,7 @@ public class TaskUtil {
}
public static Task splitTask(List<TaskVo.NormalTask> taskDetails, long start, long end,Integer process) {
log.info("传入判断是否是全局:{}",taskDetails);
// log.info("传入判断是否是全局:{}",taskDetails);
Task task = new Task();
List<TaskVo.NormalTask> globalTask = new ArrayList<>();
List<TaskVo.NormalTask> commonTask = new ArrayList<>();
@ -53,6 +53,7 @@ public class TaskUtil {
}
//判断时间不明确的为全局任务(时间为空或跨天)
for (TaskVo.NormalTask detail : taskDetails) {
log.info("传入判断是否是全局:{}",detail);
if((process==1 && detail.getProcess()!=2) || (process==2 && detail.getProcess()==2)){
continue;
}

20
tall/src/main/java/com/ccsens/tall/web/UserController.java

@ -163,22 +163,22 @@ public class UserController {
@ApiImplicitParams({
})
@RequestMapping(value = "/account", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
public JsonResponse accounts(@ApiParam @RequestParam String account) throws Exception {
public JsonResponse<Boolean> accounts(@ApiParam @RequestParam String account) throws Exception {
Boolean flag = userService.findAccount(account);
return JsonResponse.newInstance().ok(flag);
}
// @ApiOperation(value = "/检查手机号是否被注册", notes = "")
// @ApiImplicitParams({
// })
// @RequestMapping(value = "/phone", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
// public JsonResponse findPhone(@ApiParam @RequestParam String phone) throws Exception {
//
// Boolean flag = userService.findPhone(phone);
// return JsonResponse.newInstance().ok(flag);
// }
@ApiOperation(value = "/检查手机号是否被注册", notes = "")
@ApiImplicitParams({
})
@RequestMapping(value = "/phone", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
public JsonResponse<Boolean> findPhone(@ApiParam @RequestParam String phone) throws Exception {
Boolean flag = userService.findPhone(phone);
return JsonResponse.newInstance().ok(flag);
}
// @ApiOperation(value = "/修改账号信息",notes = "")
// @ApiImplicitParams({

7
tall/src/main/java/com/ccsens/tall/web/UserInfoController.java

@ -14,10 +14,7 @@ import io.jsonwebtoken.Claims;
import io.swagger.annotations.*;
import org.apache.commons.io.FileUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@ -65,7 +62,7 @@ public class UserInfoController {
})
@RequestMapping(value = "/avatarUrl", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse uploadAvatarUrl(HttpServletRequest request,
@ApiParam @Validated @RequestBody Part file) throws Exception {
@RequestParam(required = true) Part file) throws Exception {
Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
userInfoService.uploadAvatarUrl(currentUserId,file);

11
tall/src/main/java/com/ccsens/tall/web/WeekMeetingController.java

@ -76,4 +76,15 @@ public class WeekMeetingController {
return JsonResponse.newInstance().ok(path);
}
@MustLogin
@ApiOperation(value = "获取插件的相关数据(json)", notes = "")
@RequestMapping(value = "/get/parameter", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<String> getPluginParameter(@ApiParam @Validated @RequestBody QueryDto<WeekMeetingDto.PluginParameter> param) throws IOException {
log.info("获取插件的相关数据:{}", param);
String parameter = weekMeetingService.getPluginParameter(param.getUserId(),param.getParam());
log.info("获取插件的相关数据:{}", parameter);
return JsonResponse.newInstance().ok(parameter);
}
}

22
tall/src/main/resources/mapper_dao/SysProjectDao.xml

@ -148,22 +148,16 @@
t_sys_project p
LEFT JOIN t_sys_user_attention a ON a.project_id = p.id
left join t_sys_project_label pl on pl.project_id = p.id
left join t_sys_label l on pl.label_id = l.id and
l.user_id = #{userId}
AND ( pl.rec_status = 0 OR pl.rec_status IS NULL )
left join t_sys_label l on pl.label_id = l.id
AND ( l.rec_status = 0 OR l.rec_status IS NULL )
and l.user_id = #{userId}
WHERE
a.user_id = #{userId}
and
(p.parent_id = 0 or p.home_page_show = 1)
AND
p.rec_status = 0
and
a.rec_status = 0
and
(l.rec_status = 0 or l.rec_status is null)
and
(pl.rec_status = 0 or pl.rec_status is null)
AND
p.template = 0
and (p.parent_id = 0 or p.home_page_show = 1)
AND p.rec_status = 0
and a.rec_status = 0
AND p.template = 0
<if test="startTime != null">
<if test="endTime != null">
and

276
tall/src/main/resources/mapper_raw/ProPluginParameterMapper.xml

@ -0,0 +1,276 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ccsens.tall.persist.mapper.ProPluginParameterMapper">
<resultMap id="BaseResultMap" type="com.ccsens.tall.bean.po.ProPluginParameter">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="sub_task_id" jdbcType="BIGINT" property="subTaskId" />
<result column="member_id" jdbcType="BIGINT" property="memberId" />
<result column="project_id" jdbcType="BIGINT" property="projectId" />
<result column="plugin_id" jdbcType="BIGINT" property="pluginId" />
<result column="parameter" jdbcType="VARCHAR" property="parameter" />
<result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
<result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
<result column="rec_status" jdbcType="TINYINT" property="recStatus" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
id, sub_task_id, member_id, project_id, plugin_id, parameter, created_at, updated_at,
rec_status
</sql>
<select id="selectByExample" parameterType="com.ccsens.tall.bean.po.ProPluginParameterExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from t_pro_plugin_parameter
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from t_pro_plugin_parameter
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from t_pro_plugin_parameter
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.ccsens.tall.bean.po.ProPluginParameterExample">
delete from t_pro_plugin_parameter
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.ccsens.tall.bean.po.ProPluginParameter">
insert into t_pro_plugin_parameter (id, sub_task_id, member_id,
project_id, plugin_id, parameter,
created_at, updated_at, rec_status
)
values (#{id,jdbcType=BIGINT}, #{subTaskId,jdbcType=BIGINT}, #{memberId,jdbcType=BIGINT},
#{projectId,jdbcType=BIGINT}, #{pluginId,jdbcType=BIGINT}, #{parameter,jdbcType=VARCHAR},
#{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
)
</insert>
<insert id="insertSelective" parameterType="com.ccsens.tall.bean.po.ProPluginParameter">
insert into t_pro_plugin_parameter
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="subTaskId != null">
sub_task_id,
</if>
<if test="memberId != null">
member_id,
</if>
<if test="projectId != null">
project_id,
</if>
<if test="pluginId != null">
plugin_id,
</if>
<if test="parameter != null">
parameter,
</if>
<if test="createdAt != null">
created_at,
</if>
<if test="updatedAt != null">
updated_at,
</if>
<if test="recStatus != null">
rec_status,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="subTaskId != null">
#{subTaskId,jdbcType=BIGINT},
</if>
<if test="memberId != null">
#{memberId,jdbcType=BIGINT},
</if>
<if test="projectId != null">
#{projectId,jdbcType=BIGINT},
</if>
<if test="pluginId != null">
#{pluginId,jdbcType=BIGINT},
</if>
<if test="parameter != null">
#{parameter,jdbcType=VARCHAR},
</if>
<if test="createdAt != null">
#{createdAt,jdbcType=TIMESTAMP},
</if>
<if test="updatedAt != null">
#{updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="recStatus != null">
#{recStatus,jdbcType=TINYINT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.ccsens.tall.bean.po.ProPluginParameterExample" resultType="java.lang.Long">
select count(*) from t_pro_plugin_parameter
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update t_pro_plugin_parameter
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.subTaskId != null">
sub_task_id = #{record.subTaskId,jdbcType=BIGINT},
</if>
<if test="record.memberId != null">
member_id = #{record.memberId,jdbcType=BIGINT},
</if>
<if test="record.projectId != null">
project_id = #{record.projectId,jdbcType=BIGINT},
</if>
<if test="record.pluginId != null">
plugin_id = #{record.pluginId,jdbcType=BIGINT},
</if>
<if test="record.parameter != null">
parameter = #{record.parameter,jdbcType=VARCHAR},
</if>
<if test="record.createdAt != null">
created_at = #{record.createdAt,jdbcType=TIMESTAMP},
</if>
<if test="record.updatedAt != null">
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="record.recStatus != null">
rec_status = #{record.recStatus,jdbcType=TINYINT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
update t_pro_plugin_parameter
set id = #{record.id,jdbcType=BIGINT},
sub_task_id = #{record.subTaskId,jdbcType=BIGINT},
member_id = #{record.memberId,jdbcType=BIGINT},
project_id = #{record.projectId,jdbcType=BIGINT},
plugin_id = #{record.pluginId,jdbcType=BIGINT},
parameter = #{record.parameter,jdbcType=VARCHAR},
created_at = #{record.createdAt,jdbcType=TIMESTAMP},
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
rec_status = #{record.recStatus,jdbcType=TINYINT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.ccsens.tall.bean.po.ProPluginParameter">
update t_pro_plugin_parameter
<set>
<if test="subTaskId != null">
sub_task_id = #{subTaskId,jdbcType=BIGINT},
</if>
<if test="memberId != null">
member_id = #{memberId,jdbcType=BIGINT},
</if>
<if test="projectId != null">
project_id = #{projectId,jdbcType=BIGINT},
</if>
<if test="pluginId != null">
plugin_id = #{pluginId,jdbcType=BIGINT},
</if>
<if test="parameter != null">
parameter = #{parameter,jdbcType=VARCHAR},
</if>
<if test="createdAt != null">
created_at = #{createdAt,jdbcType=TIMESTAMP},
</if>
<if test="updatedAt != null">
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="recStatus != null">
rec_status = #{recStatus,jdbcType=TINYINT},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.ccsens.tall.bean.po.ProPluginParameter">
update t_pro_plugin_parameter
set sub_task_id = #{subTaskId,jdbcType=BIGINT},
member_id = #{memberId,jdbcType=BIGINT},
project_id = #{projectId,jdbcType=BIGINT},
plugin_id = #{pluginId,jdbcType=BIGINT},
parameter = #{parameter,jdbcType=VARCHAR},
created_at = #{createdAt,jdbcType=TIMESTAMP},
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
rec_status = #{recStatus,jdbcType=TINYINT}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>

25
util/src/main/java/com/ccsens/util/CodeEnum.java

@ -161,15 +161,34 @@ public enum CodeEnum {
DINGDING_EXCEPTION(132,"钉钉接口调用异常。",true),
URL_ERROR(133, "请求路径转换异常", true),
JOIN_PROJECT_NUM_FULL(134, "可参赛次数已满", true),
PHOTO_FILE_EXCEED_2M(135, "图片大小不能超过2M", true),
COACH_NUM_FULL(136,"该单位领队或教练人数已达上限",true)
COACH_NUM_FULL(136,"教练人数已达上限",true),
LEADER_NUM_FULL(137,"领队人数已达上限",true),
AUTHORIZATION_AGREE(138,"请阅读并同意安全责任书",true),
NAME_EMPTY(139,"单位名称不能为空",true),
PHOTO_IS_EMPTY(140,"请上传证件照",true),
ID_CARD_ALREADY(141,"此身份证已注册",true),
NOT_COMPANY(142,"请先填写基础信息",true),
MT_NOT_GROUP(143,"请选择正确的组别信息",true),
CONTACTS_NAME_EMPTY(144,"联系人名称不能为空",true),
MEMBER_NUM_ERROR(144,"参赛人数不满足比赛人数要求",true),
;
public CodeEnum mtMsgPhoto(String msg){
this.msg = "请上传"+msg;
return this;
}
public CodeEnum mtProjectMsg(String msg){
this.msg = msg+this.msg;
this.msg = msg+"项目参赛次数已满";
return this;
}
public CodeEnum mtProjectMsg1(String msg){
this.msg = msg+"报名人数已满";
return this;
}
public CodeEnum addMsg(String msg){

5
util/src/main/java/com/ccsens/util/WebConstant.java

@ -5,6 +5,8 @@ import cn.hutool.core.util.URLUtil;
import lombok.Getter;
import lombok.Setter;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.Pattern;
import java.io.File;
public class WebConstant {
@ -17,7 +19,8 @@ public class WebConstant {
public static final byte STATUS_DELETE = 1;
public static final String IMG_TYPE = "bmp,jpg,png,tif,gif,pcx,tga,exif,fpx,svg,psd,cdr,pcd,dxf,ufo,eps,ai,raw,WMF,webp,jpeg";
/**手机号正则*/
public static final String REGEX_PHONE = "^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(17[013678])|(18[0,5-9]))\\d{8}$";
// public static final String REGEX_PHONE = "^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(17[013678])|(18[0,1-9]))\\d{8}$";
public static final String REGEX_PHONE = "^[1]([3-9])[0-9]{9}$";
/**属性名*/
public static class Field{

17
util/src/test/java/com/ccsens/util/OtherTest.java

@ -1,22 +1,24 @@
package com.ccsens.util;
import cn.hutool.core.util.ImageUtil;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
import java.io.File;
@Slf4j
public class OtherTest {
public static final String REGEX_PHONE = "^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(17[013678])|(18[0,5-9]))\\d{8}$";
public static final String REGEX_PHONE = "^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(17[013678])|(18[0,1-9]))\\d{8}$";
@Test
public void test2() throws ScriptException {
String str = "11100000000";
String str = "18200000000";
if (str.matches(REGEX_PHONE)) {
System.out.println("是手机号");
} else {
@ -24,4 +26,15 @@ public class OtherTest {
}
}
@Test
public void test3() {
File file = new File("C:\\Users\\逗\\Desktop\\ABDBBE53630FE09D526858C4A8029873.jpg");
File file1 = new File("C:\\Users\\逗\\Desktop\\1.jpg");
File file2 = new File("C:\\Users\\逗\\Desktop\\2.jpg");
System.out.println(file.length());
ImageUtil.scale(file,file1,0.5f);
System.out.println(file1);
ImageUtil.scale(file1,file2,2);
}
}

Loading…
Cancel
Save