Lihong@123456 5 years ago
parent
commit
e7d242edb5
  1. 3
      cloudutil/src/main/java/com/ccsens/cloudutil/aspect/LogAspect.java
  2. 4
      cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/LogDto.java
  3. 13
      mt/src/main/java/com/ccsens/mt/api/DebugController.java
  4. 33
      mt/src/main/java/com/ccsens/mt/api/FileController.java
  5. 23
      mt/src/main/java/com/ccsens/mt/api/ProvinceController.java
  6. 12
      mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java
  7. 62
      mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java
  8. 11
      mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeam.java
  9. 60
      mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeamExample.java
  10. 6
      mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java
  11. 23
      mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java
  12. 1
      mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTimeDao.java
  13. 1
      mt/src/main/java/com/ccsens/mt/service/FileService.java
  14. 11
      mt/src/main/java/com/ccsens/mt/service/IProvinceService.java
  15. 198
      mt/src/main/java/com/ccsens/mt/service/ProvinceService.java
  16. 4
      mt/src/main/resources/application.yml
  17. 110
      mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml
  18. 29
      mt/src/main/resources/mapper_raw/CompeteTeamMapper.xml
  19. 221
      tall/src/main/java/com/ccsens/tall/bean/po/SysLog.java
  20. 1510
      tall/src/main/java/com/ccsens/tall/bean/po/SysLogExample.java
  21. 58
      tall/src/main/java/com/ccsens/tall/persist/mapper/SysLogMapper.java
  22. 6
      tall/src/main/resources/application.yml
  23. 16
      tall/src/main/resources/mapper_dao/TaskSubTimeDao.xml
  24. 531
      tall/src/main/resources/mapper_raw/SysLogMapper.xml
  25. 6
      util/src/main/java/com/ccsens/util/CodeEnum.java

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

@ -98,9 +98,9 @@ public class LogAspect {
log.info("保存日志,不进行记录");
return null;
}
LogDto dto = new LogDto();
dto.setUrl(url);
dto.setFacility("");
//参数
Object[] args = pjp.getArgs();
StringBuilder param = new StringBuilder();
@ -114,6 +114,7 @@ public class LogAspect {
String userId = claims == null ? null : ((Claims) claims).getSubject();
if (userId != null) {
param.append("userId:").append(userId).append("--");
dto.setUserId(Long.parseLong(userId));
}
} else if (args[i] instanceof Part) {

4
cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/LogDto.java

@ -24,4 +24,8 @@ public class LogDto {
private String methodDesc;
@ApiModelProperty("接口返回值(或异常)")
private String result;
@ApiModelProperty("设备信息")
private String facility;
@ApiModelProperty("设备信息")
private Long userId;
}

13
mt/src/main/java/com/ccsens/mt/api/DebugController.java

@ -11,10 +11,13 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.data.redis.core.ZSetOperations;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.Part;
import java.util.List;
import java.util.Objects;
import java.util.Set;
@ -59,4 +62,14 @@ public class DebugController {
return JsonResponse.newInstance().ok("OK");
}
@ApiOperation(value = "/测试",notes = "")
@ApiImplicitParams({
})
@RequestMapping(value="file",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"})
public JsonResponse debug(HttpServletRequest request, @RequestParam() Part files) throws Exception {
System.out.println(files.getSize());
return JsonResponse.newInstance().ok("测试");
}
}

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

@ -1,5 +1,6 @@
package com.ccsens.mt.api;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.ccsens.cloudutil.feign.TallFeignClient;
@ -19,6 +20,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.Part;
import java.util.ArrayList;
import java.util.List;
/**
@ -81,4 +83,35 @@ public class FileController {
log.info("文件下载结束");
}
@ApiOperation(value = "上传图片证明文件(不大于2M)")
@ApiImplicitParams({
})
@RequestMapping(value = "/upload/photo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<FileVo.Upload> upload(HttpServletRequest request, @RequestParam() Part file) throws Exception {
log.info("文件上传:{}", file);
//限制文件大小 2M
if(file.getSize() > 2097152){
throw new BaseException(CodeEnum.PHOTO_FILE_EXCEED_2M);
}
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");
String dir = PropUtil.path + Constant.File.UPLOAD_URL;
List<Part> files = new ArrayList<>();
files.add(file);
List<CommonFile> fileVos = fileService.saveFile(dir, files, userId);
List<FileVo.Upload> vos = FileVo.Upload.transFilePo(fileVos);
log.info("文件上传返回:{}", vos);
FileVo.Upload vo = new FileVo.Upload();
if(CollectionUtil.isNotEmpty(vos)){
vo = vos.get(0);
}
return JsonResponse.newInstance().ok(vo);
}
}

23
mt/src/main/java/com/ccsens/mt/api/ProvinceController.java

@ -3,7 +3,6 @@ package com.ccsens.mt.api;
import com.ccsens.cloudutil.annotation.MustLogin;
import com.ccsens.mt.bean.dto.CompeteDto;
import com.ccsens.mt.bean.dto.ProvinceCompeteDto;
import com.ccsens.mt.bean.vo.CompeteVo;
import com.ccsens.mt.bean.vo.ProvinceCompeteVo;
import com.ccsens.mt.service.IProvinceService;
import com.ccsens.util.JsonResponse;
@ -78,7 +77,7 @@ public class ProvinceController {
@MustLogin
@ApiOperation(value = "新加/修改参赛人员", notes = "")
@RequestMapping(value = "/save/player", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse saveOrUpdatePlayer(@ApiParam QueryDto<ProvinceCompeteDto.PlayerInfo> params) throws Exception {
public JsonResponse saveOrUpdatePlayer(@ApiParam @Validated @RequestBody QueryDto<ProvinceCompeteDto.PlayerInfo> params) throws Exception {
log.info("新加/修改参赛人员:{}",params);
provinceService.saveOrUpdatePlayer(params.getParam(),params.getUserId());
return JsonResponse.newInstance().ok();
@ -87,7 +86,7 @@ public class ProvinceController {
@MustLogin
@ApiOperation(value = "查找所有注册的选手", notes = "")
@RequestMapping(value = "/query/player", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<List<ProvinceCompeteVo.PlayerByCompanyId>> queryPlayerByCompanyId(@ApiParam QueryDto<ProvinceCompeteDto.CompanyIdVo> params) throws Exception {
public JsonResponse<List<ProvinceCompeteVo.PlayerByCompanyId>> queryPlayerByCompanyId(@ApiParam @Validated @RequestBody QueryDto<ProvinceCompeteDto.CompanyIdVo> params) throws Exception {
log.info("查找所有注册的选手:{}",params);
List<ProvinceCompeteVo.PlayerByCompanyId> playerByCompanyIds = provinceService.queryPlayerByCompanyId(params.getParam(),params.getUserId());
log.info("查找所有注册的选手:{}",playerByCompanyIds);
@ -112,6 +111,15 @@ public class ProvinceController {
log.info("添加/修改单位信息:{}",competeCompany);
return JsonResponse.newInstance().ok(competeCompany);
}
@MustLogin
@ApiOperation(value ="添加/修改领队或教练",notes = "")
@RequestMapping(value = "/province/save/coach",method = RequestMethod.POST,produces = {"application/json;charset=UTF-8"})
public JsonResponse updataLeader(@ApiParam @Validated @RequestBody QueryDto<ProvinceCompeteDto.ModifyLeader> params){
log.info("添加/修改单位信息:{}",params);
provinceService.updateLeader(params.getParam());
return JsonResponse.newInstance().ok();
}
@MustLogin
@ApiOperation(value = "查找此单位的领队和教练信息", notes = "")
@ -143,6 +151,15 @@ public class ProvinceController {
return JsonResponse.newInstance().ok();
}
@ApiOperation(value = "参加比赛", notes = "")
@RequestMapping(value = "/join", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse playerJoinProject(@ApiParam @Validated @RequestBody QueryDto<ProvinceCompeteDto.JoinProject> params) {
log.info("参加比赛:{}", params);
provinceService.playerJoinProject(params.getParam());
return JsonResponse.newInstance().ok();
}
@MustLogin
@ApiOperation(value = "删除选手信息", notes = "")
@RequestMapping(value = "/del/player", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})

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

@ -3,7 +3,6 @@ package com.ccsens.mt.bean.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List;
@ -255,15 +254,15 @@ public class CompeteDto {
@ApiModelProperty("参赛单位id")
private Long companyId;
@ApiModelProperty("教练或领队的id,有则修改,没有则添加")
private Long cpachId;
private Long coachId;
@ApiModelProperty("身份: 0领队 1教练")
private int identity ;
private int identity;
@ApiModelProperty("姓名")
private String name ;
private String name;
@ApiModelProperty("性别")
private int gender ;
private int gender;
@ApiModelProperty("手机号")
private String phone ;
private String phone;
@ApiModelProperty("身份证号")
private String idCard;
@ApiModelProperty("证件照(文件类型")
@ -276,7 +275,6 @@ public class CompeteDto {
public static class DelPlayer{
@ApiModelProperty("选手id")
private Long playerId;
}
}

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

@ -4,8 +4,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.servlet.http.Part;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
* @author
@ -57,16 +57,64 @@ public class ProvinceCompeteDto {
@ApiModelProperty("身份证号")
private String idCard;
@ApiModelProperty("身份证正面照片")
private Part idCardFront;
private Long idCardFront;
@ApiModelProperty("身份证反面照片")
private Part idCardBack;
private Long idCardBack;
@ApiModelProperty("证件照")
private Part idPhone;
private Long idPhone;
@ApiModelProperty("学籍照片")
private Part studentRecord;
private Long studentRecord;
@ApiModelProperty("体检证明照片")
private Part healthRecord;
private Long healthRecord;
@ApiModelProperty("保险证明照片")
private Part insuranceRecord;
private Long insuranceRecord;
// @ApiModelProperty("身份证正面照片")
// private Part idCardFront;
// @ApiModelProperty("身份证反面照片")
// private Part idCardBack;
// @ApiModelProperty("证件照")
// private Part idPhone;
// @ApiModelProperty("学籍照片")
// private Part studentRecord;
// @ApiModelProperty("体检证明照片")
// private Part healthRecord;
// @ApiModelProperty("保险证明照片")
// private Part insuranceRecord;
}
@Data
@ApiModel("选择选手参加项目")
public static class JoinProject{
@NotNull
@ApiModelProperty("大赛id")
private Long competeTimeId ;
@ApiModelProperty("项目id")
private Long projectId;
@ApiModelProperty("单位id")
private Long companyId;
@ApiModelProperty("选手id")
private List<Long> playerId;
}
@Data
@ApiModel("添加/修改领队或教练")
public static class ModifyLeader{
@ApiModelProperty("参赛单位id")
private Long companyId; //参赛单位id
@ApiModelProperty("教练或领队的id")
private Long coachId; //教练或领队的id,有则修改,没有则添加
@ApiModelProperty("身份: 0领队 1教练")
private int identity; //身份: 0领队 1教练
@ApiModelProperty("姓名")
private String name; //姓名
@ApiModelProperty("性别")
private String gender; //性别
@ApiModelProperty("联系方式")
private String phone; //联系方式
@ApiModelProperty("身份证号")
private String idCard; //身份证号
@ApiModelProperty("证件照")
private Long idPhoto; //证件照(文件类型)
@ApiModelProperty("教练证")
private Long coachCertificate; //教练证(只有教练需要,文件类型)
}
}

11
mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeam.java

@ -28,6 +28,8 @@ public class CompeteTeam implements Serializable {
private Byte success;
private Long companyId;
private static final long serialVersionUID = 1L;
public Long getId() {
@ -126,6 +128,14 @@ public class CompeteTeam implements Serializable {
this.success = success;
}
public Long getCompanyId() {
return companyId;
}
public void setCompanyId(Long companyId) {
this.companyId = companyId;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
@ -144,6 +154,7 @@ public class CompeteTeam implements Serializable {
sb.append(", recStatus=").append(recStatus);
sb.append(", competeGroupId=").append(competeGroupId);
sb.append(", success=").append(success);
sb.append(", companyId=").append(companyId);
sb.append("]");
return sb.toString();
}

60
mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeamExample.java

@ -834,6 +834,66 @@ public class CompeteTeamExample {
addCriterion("success not between", value1, value2, "success");
return (Criteria) this;
}
public Criteria andCompanyIdIsNull() {
addCriterion("company_id is null");
return (Criteria) this;
}
public Criteria andCompanyIdIsNotNull() {
addCriterion("company_id is not null");
return (Criteria) this;
}
public Criteria andCompanyIdEqualTo(Long value) {
addCriterion("company_id =", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdNotEqualTo(Long value) {
addCriterion("company_id <>", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdGreaterThan(Long value) {
addCriterion("company_id >", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdGreaterThanOrEqualTo(Long value) {
addCriterion("company_id >=", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdLessThan(Long value) {
addCriterion("company_id <", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdLessThanOrEqualTo(Long value) {
addCriterion("company_id <=", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdIn(List<Long> values) {
addCriterion("company_id in", values, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdNotIn(List<Long> values) {
addCriterion("company_id not in", values, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdBetween(Long value1, Long value2) {
addCriterion("company_id between", value1, value2, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdNotBetween(Long value1, Long value2) {
addCriterion("company_id not between", value1, value2, "companyId");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {

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

@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.servlet.http.Part;
import java.util.List;
@ -25,6 +26,8 @@ public class ProvinceCompeteVo {
private int guideNum;
@ApiModelProperty("当前添加的参赛人员的人数")
private int playerNum;
@ApiModelProperty("当前报名的项目数量")
private int projectNum;
}
@Data
@ -82,6 +85,8 @@ public class ProvinceCompeteVo {
private int memberMin;
@ApiModelProperty("最多人数")
private int memberMax;
@ApiModelProperty("当前参赛人数")
private int joinNum;
}
@Data
@ -102,6 +107,7 @@ public class ProvinceCompeteVo {
@ApiModelProperty("参赛人员的人数")
private int playerNum;
}
@Data
@ApiModel("查询当前用户参赛单位基本信息")
public static class CompeteCompanyCoach {

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

@ -56,6 +56,27 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper {
ProvinceCompeteVo.CompeteCompany getCompany(@Param("competeTimeId")long competeTimeId,@Param("userId")long userId);
void saveCompany (ProvinceCompeteVo.CompeteCompany competeCompany);
/**
* 查看单位报名的项目的数量
* @param companyId 单位id
* @return 返回单位参加的项目的数量
*/
int getJoinProjectNum(@Param("competeTimeId")Long companyId);
/**
* 查找单位在某项目下的某个组别的参赛数量个人项目
* @param projectId 项目id
* @param companyId 单位id
* @param groupId 组别id
* @return 返回参加的数量
*/
int getNumByCompanyAndGroup(@Param("projectId")Long projectId, @Param("companyId")Long companyId, @Param("groupId")Long groupId,@Param("competeTimeId")Long competeTimeId);
/**
* 查看此用户在这届大赛参加了几个团队项目
* @param competeTimeId 大赛id
* @param playerId 选手id
* @return 参加的数量
*/
int getTeamNumByPlayerId(@Param("competeTimeId")Long competeTimeId, @Param("playerId")Long playerId);
}

1
mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTimeDao.java

@ -49,4 +49,5 @@ public interface CompeteTimeDao extends CompeteTimeMapper {
* @return 返回组别信息
*/
List<CompeteVo.CompeteGroup> queryGroupByProject(@Param("type") int type, @Param("projectId") Long projectId);
}

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

@ -41,6 +41,7 @@ public class FileService implements IFileService {
List<CommonFile> fileList = new ArrayList<>();
String allowedExt = WebConstant.IMG_TYPE + "," + WebConstant.Wps.FILE_TYPE_ALL;
for (Part file: files) {
log.info("文件名:{}", file.getSubmittedFileName());
String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExt, dir);
CommonFile fileDo = new CommonFile();

11
mt/src/main/java/com/ccsens/mt/service/IProvinceService.java

@ -2,7 +2,6 @@ package com.ccsens.mt.service;
import com.ccsens.mt.bean.dto.CompeteDto;
import com.ccsens.mt.bean.dto.ProvinceCompeteDto;
import com.ccsens.mt.bean.vo.CompeteVo;
import com.ccsens.mt.bean.vo.ProvinceCompeteVo;
import java.util.List;
@ -75,6 +74,11 @@ public interface IProvinceService {
*/
ProvinceCompeteVo.CompeteCompany changeCompany(CompeteDto.CompeteCompany param);
/**
* 添加/修改领队或教练
* @param param
*/
void updateLeader(ProvinceCompeteDto.ModifyLeader param);
/**
* 查找此单位的领队和教练信息
@ -100,6 +104,11 @@ public interface IProvinceService {
*/
void deleteCoach(CompeteDto.AddCoach param);
/**
* 选择选手参加比赛
* @param param 选手id和项目id
*/
void playerJoinProject(ProvinceCompeteDto.JoinProject param);
/**
* 删除选手信息
* @param

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

@ -1,6 +1,9 @@
package com.ccsens.mt.service;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.IdcardUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.ccsens.mt.bean.dto.CompeteDto;
@ -9,7 +12,9 @@ import com.ccsens.mt.bean.po.*;
import com.ccsens.mt.bean.vo.ProvinceCompeteVo;
import com.ccsens.mt.persist.dao.CompeteCompanyDao;
import com.ccsens.mt.persist.dao.CompetePlayerDao;
import com.ccsens.mt.persist.dao.CompeteTeamDao;
import com.ccsens.mt.persist.dao.CompeteTimeDao;
import com.ccsens.mt.persist.mapper.*;
import com.ccsens.mt.persist.mapper.CommonFileMapper;
import com.ccsens.mt.persist.mapper.CompeteCoachMapper;
import com.ccsens.mt.persist.mapper.CompetePlayerMapper;
@ -49,6 +54,14 @@ public class ProvinceService implements IProvinceService {
@Resource
private CompeteCoachMapper competeCoachMapper;
@Resource
private CompeteProjectMapper competeProjectMapper;
@Resource
private CompeteProjectPlayerMapper projectPlayerMapper;
@Resource
private CompeteTeamDao competeTeamDao;
@Resource
private CompeteTeamMemberMapper teamMemberMapper;
@Resource
private CompetePlayerMapper competePlayerMapper;
/**
@ -56,7 +69,11 @@ public class ProvinceService implements IProvinceService {
*/
@Override
public ProvinceCompeteVo.CompeteOverview getOverview(CompeteDto.CompeteTime param, Long userId) {
return competeCompanyDao.getCompanyOverview(param.getCompeteTimeId(),userId);
ProvinceCompeteVo.CompeteOverview competeOverview = competeCompanyDao.getCompanyOverview(param.getCompeteTimeId(),userId);
if(ObjectUtil.isNotNull(competeOverview)){
competeOverview.setProjectNum(competeCompanyDao.getJoinProjectNum(competeOverview.getCompanyId()));
}
return competeOverview;
}
/**
@ -91,7 +108,7 @@ public class ProvinceService implements IProvinceService {
* 添加或修改选手
*/
@Override
public void saveOrUpdatePlayer(ProvinceCompeteDto.PlayerInfo param, Long userId) throws Exception {
public void saveOrUpdatePlayer(ProvinceCompeteDto.PlayerInfo param, Long userId) {
//判断选手id是否为空
if(ObjectUtil.isNull(param.getPlayerId())){
//id为空,新加一个选手
@ -99,21 +116,35 @@ public class ProvinceService implements IProvinceService {
player.setId(snowflake.nextId());
player.setName(param.getPlayerName());
player.setGender((byte) param.getGender());
//身份证不能为空,且正确
if(StrUtil.isEmpty(param.getIdCard()) || !IdcardUtil.isValidCard(param.getIdCard())){throw new BaseException(CodeEnum.ID_CARD_ERROR);}
//是否已注册
CompetePlayerExample competePlayerExample = new CompetePlayerExample();
competePlayerExample.createCriteria().andIdCardEqualTo(param.getIdCard());
if(competePlayerDao.countByExample(competePlayerExample) != 0){
throw new BaseException(CodeEnum.WBS_REPEAT_MEMBER_PHONE);
}
player.setIdCard(param.getIdCard());
player.setCompanyId(param.getCompeteId());
player.setCompeteGroupId(param.getGroupId());
//添加身份证正面照片
player.setIdCardFrontFile(uploadPhotoFile(param.getIdCardFront(),userId));
//身份证反面
player.setIdCardBackFile(uploadPhotoFile(param.getIdCardFront(),userId));
//一寸证件照
player.setIdPhotoFile(uploadPhotoFile(param.getIdCardFront(),userId));
//学籍证明
player.setStudentRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));
//健康证明
player.setHealthRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));
//保险证明
player.setInsuranceRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));
player.setIdCardFrontFile(param.getIdCardFront());
player.setIdCardBackFile(param.getIdCardBack());
player.setIdPhotoFile(param.getIdPhone());
player.setStudentRecordFile(param.getStudentRecord());
player.setHealthRecordFile(param.getHealthRecord());
player.setInsuranceRecordFile(param.getInsuranceRecord());
// //添加身份证正面照片
// player.setIdCardFrontFile(uploadPhotoFile(param.getIdCardFront(),userId));
// //身份证反面
// player.setIdCardBackFile(uploadPhotoFile(param.getIdCardFront(),userId));
// //一寸证件照
// player.setIdPhotoFile(uploadPhotoFile(param.getIdCardFront(),userId));
// //学籍证明
// player.setStudentRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));
// //健康证明
// player.setHealthRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));
// //保险证明
// player.setInsuranceRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));
competePlayerDao.insertSelective(player);
log.info("新加参赛选手:{}",player);
}else {
@ -127,19 +158,32 @@ public class ProvinceService implements IProvinceService {
if(ObjectUtil.isNotNull(param.getGender())){player.setGender((byte) param.getGender());}
if(ObjectUtil.isNotNull(param.getGroupId())){player.setCompeteGroupId(param.getGroupId());}
if(ObjectUtil.isNotNull(param.getCompeteId())){player.setCompanyId(param.getCompeteId());}
if(ObjectUtil.isNotNull(param.getIdCardFront())){player.setIdCardFrontFile(uploadPhotoFile(param.getIdCardFront(),userId));}
if(ObjectUtil.isNotNull(param.getIdCardBack())){player.setIdCardBackFile(uploadPhotoFile(param.getIdCardFront(),userId));}
if(ObjectUtil.isNotNull(param.getIdPhone())){player.setIdPhotoFile(uploadPhotoFile(param.getIdCardFront(),userId));}
if(ObjectUtil.isNotNull(param.getStudentRecord())){ player.setStudentRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));}
if(ObjectUtil.isNotNull(param.getHealthRecord())){ player.setHealthRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));}
if(ObjectUtil.isNotNull(param.getInsuranceRecord())){ player.setInsuranceRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));}
if(ObjectUtil.isNotNull(param.getIdCardFront())){player.setIdCardFrontFile(param.getIdCardFront());}
if(ObjectUtil.isNotNull(param.getIdCardBack())){player.setIdCardBackFile(param.getIdCardBack());}
if(ObjectUtil.isNotNull(param.getIdPhone())){player.setIdPhotoFile(param.getIdPhone());}
if(ObjectUtil.isNotNull(param.getStudentRecord())){player.setStudentRecordFile(param.getStudentRecord());}
if(ObjectUtil.isNotNull(param.getHealthRecord())){player.setHealthRecordFile(param.getHealthRecord());}
if(ObjectUtil.isNotNull(param.getInsuranceRecord())){player.setInsuranceRecordFile(param.getInsuranceRecord());}
// if(ObjectUtil.isNotNull(param.getIdCardFront())){player.setIdCardFrontFile(uploadPhotoFile(param.getIdCardFront(),userId));}
// if(ObjectUtil.isNotNull(param.getIdCardBack())){player.setIdCardBackFile(uploadPhotoFile(param.getIdCardFront(),userId));}
// if(ObjectUtil.isNotNull(param.getIdPhone())){player.setIdPhotoFile(uploadPhotoFile(param.getIdCardFront(),userId));}
// if(ObjectUtil.isNotNull(param.getStudentRecord())){ player.setStudentRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));}
// if(ObjectUtil.isNotNull(param.getHealthRecord())){ player.setHealthRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));}
// if(ObjectUtil.isNotNull(param.getInsuranceRecord())){ player.setInsuranceRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));}
competePlayerDao.updateByPrimaryKeySelective(player);
}
}
/**
* 查找所有选手
* @param param 单位id
* @param userId userId
* @return 返回选手信息
*/
@Override
public List<ProvinceCompeteVo.PlayerByCompanyId> queryPlayerByCompanyId(ProvinceCompeteDto.CompanyIdVo param, Long userId) {
return competePlayerDao.queryPlayerByCompanyId(param.getCompanyId());
}
@ -221,8 +265,6 @@ public class ProvinceService implements IProvinceService {
}
return competeCompany1;
}
@Override
public ProvinceCompeteVo.CompeteCompanyCoach queryCoach(CompeteDto.CompeteCompany param) {
Long company = param.getCompanyId();
@ -251,7 +293,7 @@ public class ProvinceService implements IProvinceService {
CompeteCoach competeCoach = new CompeteCoach();
Long companyId = param.getCompanyId();
competeCoach.setCompanyId(companyId);
Long cpachId = param.getCpachId();
Long cpachId = param.getCoachId();
competeCoach.setId(cpachId);
int identity = param.getIdentity();
competeCoach.setIdentity((byte) identity);
@ -272,11 +314,16 @@ public class ProvinceService implements IProvinceService {
@Override
public void deleteCoach(CompeteDto.AddCoach param) {
Long cpachId = param.getCpachId();
CompeteCoach competeCoach = competeCoachMapper.selectByPrimaryKey(cpachId);
//<<<<<<< HEAD
// Long coachId = param.getCoachId();
// CompeteCoach competeCoach = competeCoachMapper.selectByPrimaryKey(coachId);
// competeCoachMapper.deleteByPrimaryKey(competeCoach.getId());
//=======
Long coachId = param.getCoachId();
CompeteCoach competeCoach = competeCoachMapper.selectByPrimaryKey(coachId);
competeCoach.setRecStatus((byte) 2);
CompeteCoachExample competeCoachExample = new CompeteCoachExample();
competeCoachExample.createCriteria().andIdEqualTo(cpachId);
competeCoachExample.createCriteria().andIdEqualTo(coachId);
competeCoachMapper.updateByExample(competeCoach,competeCoachExample);
}
@ -315,5 +362,102 @@ public class ProvinceService implements IProvinceService {
return playerInfo;
}
@Override
public void updateLeader(ProvinceCompeteDto.ModifyLeader param) {
Long coachId=param.getCoachId();
if(ObjectUtil.isNull(coachId)){
CompeteCoach competeCoach=new CompeteCoach();
competeCoach.setId(snowflake.nextId());
BeanUtil.copyProperties(param,competeCoach);
competeCoachMapper.insertSelective(competeCoach);
}else{
CompeteCoach competeCoach=competeCoachMapper.selectByPrimaryKey(coachId);
if(ObjectUtil.isNotNull(competeCoach)){
BeanUtil.copyProperties(param,competeCoach);
competeCoachMapper.updateByPrimaryKeySelective(competeCoach);
}
}
}
/**
* 选择选手参加比赛
*/
@Override
public void playerJoinProject(ProvinceCompeteDto.JoinProject param) {
//查找项目信息
CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId());
if(ObjectUtil.isNull(competeProject)){ throw new BaseException(CodeEnum.PARAM_ERROR); }
//检查参赛人数是否符合
if(CollectionUtil.isEmpty(param.getPlayerId())){ throw new BaseException(CodeEnum.PARAM_ERROR); }
if(param.getPlayerId().size() < competeProject.getMemberMin() || param.getPlayerId().size() > competeProject.getMemberMax()){
throw new BaseException(CodeEnum.TEAM_MEMBER_ERROR);
}
//判断项目是个人还是团队
if(competeProject.getTeam() == 0){
param.getPlayerId().forEach(playerId -> {
CompetePlayer player = competePlayerDao.selectByPrimaryKey(playerId);
if(ObjectUtil.isNull(player)){ throw new BaseException(CodeEnum.PARAM_ERROR); }
//查找此公司此组别是否参加过这个项目
int num = competeCompanyDao.getNumByCompanyAndGroup(competeProject.getId(),player.getCompanyId(),player.getCompeteGroupId(),param.getCompeteTimeId());
if(num > 0){
throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg("该项目该组别"));
}
//查找个人参赛数量是否符合
CompeteProjectPlayerExample projectPlayerExample = new CompeteProjectPlayerExample();
projectPlayerExample.createCriteria().andPlayerIdEqualTo(playerId).andCompeteTimeIdEqualTo(param.getCompeteTimeId());
if(projectPlayerMapper.countByExample(projectPlayerExample) >= 3){
throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg(player.getName()));
}
//参加比赛记录
CompeteProjectPlayer projectPlayer = new CompeteProjectPlayer();
projectPlayer.setId(snowflake.nextId());
projectPlayer.setCompeteTimeId(param.getCompeteTimeId());
projectPlayer.setProjectId(param.getProjectId());
projectPlayer.setPlayerId(playerId);
projectPlayer.setCompeteGroupId(player.getCompeteGroupId());
projectPlayer.setGenderGroup(player.getGender());
projectPlayerMapper.insertSelective(projectPlayer);
});
}else {
//查找当前公司是否已经报名次项目
CompeteTeamExample teamExample = new CompeteTeamExample();
teamExample.createCriteria().andProjectIdEqualTo(competeProject.getId()).andCompanyIdEqualTo(param.getCompanyId()).andCompeteTimeIdEqualTo(param.getCompeteTimeId());
if(competeTeamDao.countByExample(teamExample) > 0){
throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg("该项目"));
}
//生成团队
CompeteTeam competeTeam = new CompeteTeam();
competeTeam.setId(snowflake.nextId());
competeTeam.setCompeteTimeId(param.getCompeteTimeId());
competeTeam.setProjectId(param.getProjectId());
competeTeam.setCompanyId(param.getCompanyId());
//添加成员表
for (int i = 0; i < param.getPlayerId().size(); i++) {
CompetePlayer player = competePlayerDao.selectByPrimaryKey(param.getPlayerId().get(i));
if(ObjectUtil.isNull(player)){ throw new BaseException(CodeEnum.PARAM_ERROR); }
//检查该选手报名项目数量
int a = competeCompanyDao.getTeamNumByPlayerId(param.getCompeteTimeId(),player.getId());
if(a >= 6){
throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg(player.getName()));
}
//团队性别组根据参赛成员而定
if (i == 0){
competeTeam.setGenderGroup(player.getGender());
}else {
if(!competeTeam.getGenderGroup().equals(player.getGender())){
competeTeam.setGenderGroup((byte) 2);
}
}
//添加成员表
CompeteTeamMember teamMember = new CompeteTeamMember();
teamMember.setId(snowflake.nextId());
teamMember.setCompeteTeamId(competeTeam.getId());
teamMember.setPlayerId(player.getId());
teamMemberMapper.insertSelective(teamMember);
}
//添加团队表
competeTeamDao.insertSelective(competeTeam);
}
}
}

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

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

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

@ -121,12 +121,22 @@
</select>
<select id="queryProjectByFirstProject" resultType="com.ccsens.mt.bean.vo.ProvinceCompeteVo$CompeteSecondProject">
SELECT
SELECT
p.id as id,
p.`name` as `name`,
team,
member_min as memberMin,
member_max as memberMax
member_max as memberMax,
if(
p.team = 0,
(SELECT count(id) FROM t_compete_project_player WHERE project_id = p.id
and rec_status = 0
),
(SELECT count(m.player_id) FROM t_compete_team t LEFT JOIN t_compete_team_member m on t.id = m.compete_team_id WHERE t.project_id = p.id
and t.rec_status = 0 and m.rec_status = 0
)
) as joinNum
FROM
t_compete_project p
where
@ -148,54 +158,52 @@
where user_id = #{userId}
and compete_time_id = #{competeTimeId}
</select>
<select id="getJoinProjectNum" resultType="java.lang.Integer">
SELECT
a1.num + a2.num as num
FROM
(SELECT
count(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,
(SELECT
count(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
</select>
<select id="getNumByCompanyAndGroup" resultType="java.lang.Integer">
SELECT
count(pp.id)
FROM
`t_compete_project_player` pp LEFT JOIN t_compete_player p on pp.player_id = p.id
WHERE
pp.project_id = #{projectId}
and p.company_id = #{companyId}
and p.compete_time_id = #{competeTimeId}
and p.compete_group_id = #{groupId}
and pp.rec_status = 0
and p.rec_status = 0
</select>
<select id="getTeamNumByPlayerId" resultType="java.lang.Integer">
SELECT
count(t.id)
FROM
t_compete_team t LEFT JOIN t_compete_team_member m on t.id = m.compete_team_id
WHERE
t.compete_time_id = #{competeTimeId}
and m.player_id = #{playerId}
and t.rec_status = 0
and m.rec_status = 0
</select>
<insert id="saveCompany" parameterType="com.ccsens.mt.bean.dto.CompeteDto$CompeteCompany">
insert into t_compete_company
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="companyId != null">
id,
</if>
<if test="companyName != null">
name,
</if>
<if test="contactsName != null">
contacts_name,
</if>
<if test="contactsPhone != null">
contacts_phone,
</if>
<if test="coachNum != null">
judgment_num,
</if>
<if test="guideNum != null">
leader_num,
</if>
<if test="playerNum != null">
join_num,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="companyId != null">
#{companyId,jdbcType=BIGINT},
</if>
<if test="companyName != null">
#{companyName,jdbcType=BIGINT},
</if>
<if test="contactsName != null">
#{contactsName,jdbcType=INTEGER},
</if>
<if test="contactsPhone != null">
#{contactsPhone,jdbcType=VARCHAR},
</if>
<if test="coachNum != null">
#{coachNum,jdbcType=TIMESTAMP},
</if>
<if test="guideNum != null">
#{guideNum,jdbcType=TIMESTAMP},
</if>
<if test="playerNum != null">
#{playerNum,jdbcType=TINYINT},
</if>
</trim>
</insert>
</mapper>

29
mt/src/main/resources/mapper_raw/CompeteTeamMapper.xml

@ -14,6 +14,7 @@
<result column="rec_status" jdbcType="TINYINT" property="recStatus" />
<result column="compete_group_id" jdbcType="BIGINT" property="competeGroupId" />
<result column="success" jdbcType="TINYINT" property="success" />
<result column="company_id" jdbcType="BIGINT" property="companyId" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
@ -75,7 +76,7 @@
</sql>
<sql id="Base_Column_List">
id, creator, project_id, compete_time_id, gender_group, certificate, qr_code, created_at,
updated_at, rec_status, compete_group_id, success
updated_at, rec_status, compete_group_id, success, company_id
</sql>
<select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompeteTeamExample" resultMap="BaseResultMap">
select
@ -111,13 +112,13 @@
insert into t_compete_team (id, creator, project_id,
compete_time_id, gender_group, certificate,
qr_code, created_at, updated_at,
rec_status, compete_group_id, success
)
rec_status, compete_group_id, success,
company_id)
values (#{id,jdbcType=BIGINT}, #{creator,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT},
#{competeTimeId,jdbcType=BIGINT}, #{genderGroup,jdbcType=TINYINT}, #{certificate,jdbcType=TINYINT},
#{qrCode,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP},
#{recStatus,jdbcType=TINYINT}, #{competeGroupId,jdbcType=BIGINT}, #{success,jdbcType=TINYINT}
)
#{recStatus,jdbcType=TINYINT}, #{competeGroupId,jdbcType=BIGINT}, #{success,jdbcType=TINYINT},
#{companyId,jdbcType=BIGINT})
</insert>
<insert id="insertSelective" parameterType="com.ccsens.mt.bean.po.CompeteTeam">
insert into t_compete_team
@ -158,6 +159,9 @@
<if test="success != null">
success,
</if>
<if test="companyId != null">
company_id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
@ -196,6 +200,9 @@
<if test="success != null">
#{success,jdbcType=TINYINT},
</if>
<if test="companyId != null">
#{companyId,jdbcType=BIGINT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.ccsens.mt.bean.po.CompeteTeamExample" resultType="java.lang.Long">
@ -243,6 +250,9 @@
<if test="record.success != null">
success = #{record.success,jdbcType=TINYINT},
</if>
<if test="record.companyId != null">
company_id = #{record.companyId,jdbcType=BIGINT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
@ -261,7 +271,8 @@
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
rec_status = #{record.recStatus,jdbcType=TINYINT},
compete_group_id = #{record.competeGroupId,jdbcType=BIGINT},
success = #{record.success,jdbcType=TINYINT}
success = #{record.success,jdbcType=TINYINT},
company_id = #{record.companyId,jdbcType=BIGINT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
@ -302,6 +313,9 @@
<if test="success != null">
success = #{success,jdbcType=TINYINT},
</if>
<if test="companyId != null">
company_id = #{companyId,jdbcType=BIGINT},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
@ -317,7 +331,8 @@
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
rec_status = #{recStatus,jdbcType=TINYINT},
compete_group_id = #{competeGroupId,jdbcType=BIGINT},
success = #{success,jdbcType=TINYINT}
success = #{success,jdbcType=TINYINT},
company_id = #{companyId,jdbcType=BIGINT}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>

221
tall/src/main/java/com/ccsens/tall/bean/po/SysLog.java

@ -1,106 +1,117 @@
package com.ccsens.tall.bean.po;
import java.io.Serializable;
import java.util.Date;
public class SysLog implements Serializable {
private Long id;
private String url;
private String methodDesc;
private String params;
private String result;
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 String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url == null ? null : url.trim();
}
public String getMethodDesc() {
return methodDesc;
}
public void setMethodDesc(String methodDesc) {
this.methodDesc = methodDesc == null ? null : methodDesc.trim();
}
public String getParams() {
return params;
}
public void setParams(String params) {
this.params = params == null ? null : params.trim();
}
public String getResult() {
return result;
}
public void setResult(String result) {
this.result = result == null ? null : result.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(", url=").append(url);
sb.append(", methodDesc=").append(methodDesc);
sb.append(", params=").append(params);
sb.append(", result=").append(result);
sb.append(", createdAt=").append(createdAt);
sb.append(", updatedAt=").append(updatedAt);
sb.append(", recStatus=").append(recStatus);
sb.append("]");
return sb.toString();
}
package com.ccsens.tall.bean.po;
import java.io.Serializable;
import java.util.Date;
public class SysLog implements Serializable {
private Long id;
private String url;
private String methodDesc;
private String params;
private String result;
private Date createdAt;
private Date updatedAt;
private Byte recStatus;
private String facility;
private static final long serialVersionUID = 1L;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url == null ? null : url.trim();
}
public String getMethodDesc() {
return methodDesc;
}
public void setMethodDesc(String methodDesc) {
this.methodDesc = methodDesc == null ? null : methodDesc.trim();
}
public String getParams() {
return params;
}
public void setParams(String params) {
this.params = params == null ? null : params.trim();
}
public String getResult() {
return result;
}
public void setResult(String result) {
this.result = result == null ? null : result.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;
}
public String getFacility() {
return facility;
}
public void setFacility(String facility) {
this.facility = facility == null ? null : facility.trim();
}
@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(", url=").append(url);
sb.append(", methodDesc=").append(methodDesc);
sb.append(", params=").append(params);
sb.append(", result=").append(result);
sb.append(", createdAt=").append(createdAt);
sb.append(", updatedAt=").append(updatedAt);
sb.append(", recStatus=").append(recStatus);
sb.append(", facility=").append(facility);
sb.append("]");
return sb.toString();
}
}

1510
tall/src/main/java/com/ccsens/tall/bean/po/SysLogExample.java

File diff suppressed because it is too large

58
tall/src/main/java/com/ccsens/tall/persist/mapper/SysLogMapper.java

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

6
tall/src/main/resources/application.yml

@ -1,9 +1,5 @@
spring:
profiles:
<<<<<<< HEAD
active: test
include: util-test,common
=======
active: dev
include: util-dev,common
>>>>>>> f7d8f099ca8ad4f99f76e5616b35eb8202fecdf8

16
tall/src/main/resources/mapper_dao/TaskSubTimeDao.xml

@ -188,10 +188,10 @@
r.`name` as executorRoleName,
d.`name` as taskName,
d.milestone as milestone,
FROM_UNIXTIME(s.begin_time/1000,'%Y-%m-%d %H:%m') as beginTime,
FROM_UNIXTIME(s.end_time/1000,'%Y-%m-%d %H:%m') as endTime,
if(s.real_begin_time = 0,'' ,FROM_UNIXTIME(s.real_begin_time/1000,'%Y-%m-%d %H:%m')) as realBeginTime,
if(s.real_end_time = 0,'' ,FROM_UNIXTIME(s.real_end_time/1000,'%Y-%m-%d %H:%m')) as realEndTime,
FROM_UNIXTIME(s.begin_time/1000,'%m-%d %H:%m') as beginTime,
FROM_UNIXTIME(s.end_time/1000,'%m-%d %H:%m') as endTime,
if(s.real_begin_time = 0,'' ,FROM_UNIXTIME(s.real_begin_time/1000,'%m-%d %H:%m')) as realBeginTime,
if(s.real_end_time = 0,'' ,FROM_UNIXTIME(s.real_end_time/1000,'%m-%d %H:%m')) as realEndTime,
t.commentId as commentId,
t.userName as userName,
t.commentValue as commentValue,
@ -248,10 +248,10 @@
r.`name` as executorRoleName,
d.`name` as taskName,
d.milestone as milestone,
FROM_UNIXTIME(s.begin_time/1000,'%Y-%m-%d %H:%m') as beginTime,
FROM_UNIXTIME(s.end_time/1000,'%Y-%m-%d %H:%m') as endTime,
if(s.real_begin_time = 0,'' ,FROM_UNIXTIME(s.real_begin_time/1000,'%Y-%m-%d %H:%m')) as realBeginTime,
if(s.real_end_time = 0,'' ,FROM_UNIXTIME(s.real_end_time/1000,'%Y-%m-%d %H:%m')) as realEndTime,
FROM_UNIXTIME(s.begin_time/1000,'%m-%d %H:%m') as beginTime,
FROM_UNIXTIME(s.end_time/1000,'%m-%d %H:%m') as endTime,
if(s.real_begin_time = 0,'' ,FROM_UNIXTIME(s.real_begin_time/1000,'%m-%d %H:%m')) as realBeginTime,
if(s.real_end_time = 0,'' ,FROM_UNIXTIME(s.real_end_time/1000,'%m-%d %H:%m')) as realEndTime,
p.id as projectId,
p.`name` as projectName,
t.commentId as commentId,

531
tall/src/main/resources/mapper_raw/SysLogMapper.xml

@ -1,258 +1,275 @@
<?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.SysLogMapper">
<resultMap id="BaseResultMap" type="com.ccsens.tall.bean.po.SysLog">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="url" jdbcType="VARCHAR" property="url" />
<result column="method_desc" jdbcType="VARCHAR" property="methodDesc" />
<result column="params" jdbcType="VARCHAR" property="params" />
<result column="result" jdbcType="VARCHAR" property="result" />
<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, url, method_desc, params, result, created_at, updated_at, rec_status
</sql>
<select id="selectByExample" parameterType="com.ccsens.tall.bean.po.SysLogExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from t_sys_log
<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_sys_log
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from t_sys_log
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.ccsens.tall.bean.po.SysLogExample">
delete from t_sys_log
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.ccsens.tall.bean.po.SysLog">
insert into t_sys_log (id, url, method_desc,
params, result, created_at,
updated_at, rec_status)
values (#{id,jdbcType=BIGINT}, #{url,jdbcType=VARCHAR}, #{methodDesc,jdbcType=VARCHAR},
#{params,jdbcType=VARCHAR}, #{result,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP},
#{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
</insert>
<insert id="insertSelective" parameterType="com.ccsens.tall.bean.po.SysLog">
insert into t_sys_log
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="url != null">
url,
</if>
<if test="methodDesc != null">
method_desc,
</if>
<if test="params != null">
params,
</if>
<if test="result != null">
result,
</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="url != null">
#{url,jdbcType=VARCHAR},
</if>
<if test="methodDesc != null">
#{methodDesc,jdbcType=VARCHAR},
</if>
<if test="params != null">
#{params,jdbcType=VARCHAR},
</if>
<if test="result != null">
#{result,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.SysLogExample" resultType="java.lang.Long">
select count(*) from t_sys_log
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update t_sys_log
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.url != null">
url = #{record.url,jdbcType=VARCHAR},
</if>
<if test="record.methodDesc != null">
method_desc = #{record.methodDesc,jdbcType=VARCHAR},
</if>
<if test="record.params != null">
params = #{record.params,jdbcType=VARCHAR},
</if>
<if test="record.result != null">
result = #{record.result,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_sys_log
set id = #{record.id,jdbcType=BIGINT},
url = #{record.url,jdbcType=VARCHAR},
method_desc = #{record.methodDesc,jdbcType=VARCHAR},
params = #{record.params,jdbcType=VARCHAR},
result = #{record.result,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.SysLog">
update t_sys_log
<set>
<if test="url != null">
url = #{url,jdbcType=VARCHAR},
</if>
<if test="methodDesc != null">
method_desc = #{methodDesc,jdbcType=VARCHAR},
</if>
<if test="params != null">
params = #{params,jdbcType=VARCHAR},
</if>
<if test="result != null">
result = #{result,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.SysLog">
update t_sys_log
set url = #{url,jdbcType=VARCHAR},
method_desc = #{methodDesc,jdbcType=VARCHAR},
params = #{params,jdbcType=VARCHAR},
result = #{result,jdbcType=VARCHAR},
created_at = #{createdAt,jdbcType=TIMESTAMP},
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
rec_status = #{recStatus,jdbcType=TINYINT}
where id = #{id,jdbcType=BIGINT}
</update>
<?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.SysLogMapper">
<resultMap id="BaseResultMap" type="com.ccsens.tall.bean.po.SysLog">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="url" jdbcType="VARCHAR" property="url" />
<result column="method_desc" jdbcType="VARCHAR" property="methodDesc" />
<result column="params" jdbcType="VARCHAR" property="params" />
<result column="result" jdbcType="VARCHAR" property="result" />
<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="facility" jdbcType="VARCHAR" property="facility" />
</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, url, method_desc, params, result, created_at, updated_at, rec_status, facility
</sql>
<select id="selectByExample" parameterType="com.ccsens.tall.bean.po.SysLogExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from t_sys_log
<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_sys_log
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from t_sys_log
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.ccsens.tall.bean.po.SysLogExample">
delete from t_sys_log
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.ccsens.tall.bean.po.SysLog">
insert into t_sys_log (id, url, method_desc,
params, result, created_at,
updated_at, rec_status, facility
)
values (#{id,jdbcType=BIGINT}, #{url,jdbcType=VARCHAR}, #{methodDesc,jdbcType=VARCHAR},
#{params,jdbcType=VARCHAR}, #{result,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP},
#{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, #{facility,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="com.ccsens.tall.bean.po.SysLog">
insert into t_sys_log
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="url != null">
url,
</if>
<if test="methodDesc != null">
method_desc,
</if>
<if test="params != null">
params,
</if>
<if test="result != null">
result,
</if>
<if test="createdAt != null">
created_at,
</if>
<if test="updatedAt != null">
updated_at,
</if>
<if test="recStatus != null">
rec_status,
</if>
<if test="facility != null">
facility,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="url != null">
#{url,jdbcType=VARCHAR},
</if>
<if test="methodDesc != null">
#{methodDesc,jdbcType=VARCHAR},
</if>
<if test="params != null">
#{params,jdbcType=VARCHAR},
</if>
<if test="result != null">
#{result,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>
<if test="facility != null">
#{facility,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.ccsens.tall.bean.po.SysLogExample" resultType="java.lang.Long">
select count(*) from t_sys_log
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update t_sys_log
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.url != null">
url = #{record.url,jdbcType=VARCHAR},
</if>
<if test="record.methodDesc != null">
method_desc = #{record.methodDesc,jdbcType=VARCHAR},
</if>
<if test="record.params != null">
params = #{record.params,jdbcType=VARCHAR},
</if>
<if test="record.result != null">
result = #{record.result,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>
<if test="record.facility != null">
facility = #{record.facility,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
update t_sys_log
set id = #{record.id,jdbcType=BIGINT},
url = #{record.url,jdbcType=VARCHAR},
method_desc = #{record.methodDesc,jdbcType=VARCHAR},
params = #{record.params,jdbcType=VARCHAR},
result = #{record.result,jdbcType=VARCHAR},
created_at = #{record.createdAt,jdbcType=TIMESTAMP},
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
rec_status = #{record.recStatus,jdbcType=TINYINT},
facility = #{record.facility,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.ccsens.tall.bean.po.SysLog">
update t_sys_log
<set>
<if test="url != null">
url = #{url,jdbcType=VARCHAR},
</if>
<if test="methodDesc != null">
method_desc = #{methodDesc,jdbcType=VARCHAR},
</if>
<if test="params != null">
params = #{params,jdbcType=VARCHAR},
</if>
<if test="result != null">
result = #{result,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>
<if test="facility != null">
facility = #{facility,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.ccsens.tall.bean.po.SysLog">
update t_sys_log
set url = #{url,jdbcType=VARCHAR},
method_desc = #{methodDesc,jdbcType=VARCHAR},
params = #{params,jdbcType=VARCHAR},
result = #{result,jdbcType=VARCHAR},
created_at = #{createdAt,jdbcType=TIMESTAMP},
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
rec_status = #{recStatus,jdbcType=TINYINT},
facility = #{facility,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>

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

@ -161,9 +161,15 @@ public enum CodeEnum {
DINGDING_EXCEPTION(132,"钉钉接口调用异常。",true),
URL_ERROR(133, "请求路径转换异常", true),
JOIN_PROJECT_NUM_FULL(134, "可参赛次数已满", true),
PHOTO_FILE_EXCEED_2M(134, "图片大小不能超过2M", true),
;
public CodeEnum mtProjectMsg(String msg){
this.msg = msg+this.msg;
return this;
}
public CodeEnum addMsg(String msg){
this.msg = msg+"行:"+this.msg;
return this;

Loading…
Cancel
Save