ccsens_wiki
/
ccsenscloud
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

20201110修改报名规则前

tiaosheng
zy_Java 5 years ago
parent
c32326aa81
commit
7fdeabbf84
7 changed files with 122 additions and 80 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      cloudutil/src/main/java/com/ccsens/cloudutil/aspect/LogAspect.java
  2. 69
      mt/src/main/java/com/ccsens/mt/service/ProvinceService.java
  3. 4
      mt/src/main/resources/application.yml
  4. 11
      tall/src/main/java/com/ccsens/tall/bean/po/SysLog.java
  5. 60
      tall/src/main/java/com/ccsens/tall/bean/po/SysLogExample.java
  6. 16
      tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
  7. 30
      tall/src/main/resources/mapper_raw/SysLogMapper.xml

10
cloudutil/src/main/java/com/ccsens/cloudutil/aspect/LogAspect.java
View File

@ -1,6 +1,9 @@
package com.ccsens.cloudutil.aspect;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.ccsens.cloudutil.bean.tall.dto.LogDto;
import com.ccsens.cloudutil.bean.tall.vo.UserVo;
import com.ccsens.cloudutil.feign.TallFeignClient;
import com.ccsens.util.UploadFileUtil_Servlet3;
import com.ccsens.util.WebConstant;
@ -74,6 +77,13 @@ public class LogAspect {
throw throwable;
}
if (logDto != null) {
if("/users/signin".equals(logDto.getUrl()) && result != null){
JSONObject json = JSONObject.parseObject(JSON.toJSONString(result));
if(json.getIntValue("code") == 200 && json.get("data") != null){
long userId = json.getJSONObject("data").getLongValue("id");
logDto.setUserId(userId);
}
}
String message = result == null ? null : result.toString().length() > 1000 ? result.toString().substring(0, 1000) : result.toString();
logDto.setResult(message);
tallFeignClient.log(logDto);

69
mt/src/main/java/com/ccsens/mt/service/ProvinceService.java
View File

@ -9,31 +9,24 @@ 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;
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;
import com.ccsens.mt.util.Constant;
import com.ccsens.util.CodeEnum;
import com.ccsens.util.PropUtil;
import com.ccsens.util.UploadFileUtil_Servlet3;
import com.ccsens.util.WebConstant;
import com.ccsens.util.exception.BaseException;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.apache.bcel.classfile.Code;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.servlet.http.Part;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
@ -51,8 +44,6 @@ public class ProvinceService implements IProvinceService {
@Resource
private CompeteTimeDao competeTimeDao;
@Resource
private CommonFileMapper commonFileMapper;
@Resource
private CompetePlayerDao competePlayerDao;
@Resource
private CompeteCoachMapper competeCoachMapper;
@ -226,27 +217,6 @@ public class ProvinceService implements IProvinceService {
return competePlayerDao.queryPlayerByCompanyId(param.getCompanyId());
}
/**
* 将上传的图片信息保存，并在数据库添加记录
*/
private Long uploadPhotoFile(Part file,Long userId) throws Exception {
log.info("上传文件:{}", file.getSubmittedFileName());
String allowedExt = "jpg,jpeg,png";
String dir = PropUtil.path;
String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExt, dir);
log.info(dir+""+path);
CommonFile fileDo = new CommonFile();
String name = file.getSubmittedFileName();
fileDo.setId(snowflake.nextId());
fileDo.setFileName(name);
fileDo.setLocation(dir + File.separator + path);
fileDo.setUserId(userId);
fileDo.setVisitLocation(PropUtil.imgDomain + Constant.File.UPLOAD_URL + File.separator + path);
commonFileMapper.insertSelective(fileDo);
log.info("保存文件：{}", fileDo);
return fileDo.getId();
}
@Override
@ -385,29 +355,6 @@ public class ProvinceService implements IProvinceService {
return competeCompanyHeadList;
}
// @Override
// public void saveCoach(CompeteDto.AddCoach param) {
// CompeteCoach competeCoach = new CompeteCoach();
// Long companyId = param.getCompanyId();
// competeCoach.setCompanyId(companyId);
// Long cpachId = param.getCoachId();
// competeCoach.setId(cpachId);
// int identity = param.getIdentity();
// competeCoach.setIdentity((byte) identity);
// String name = param.getName();
// competeCoach.setName(name);
// int gender = param.getGender();
// competeCoach.setGender((byte) gender);
// String phone = param.getPhone();
// competeCoach.setPhone(phone);
// String idCard = param.getIdCard();
// competeCoach.setIdCard(idCard);
// Long idPhoto = param.getIdPhoto();
// competeCoach.setIdPhoto(idPhoto);
// Long coachCertificate = param.getCoachCertificate();
// competeCoach.setCoachCertificate(coachCertificate);
// competeCoachMapper.insertSelective(competeCoach);
// }
@Override
public void deleteCoach(CompeteDto.LeaderId param) {
@ -424,11 +371,6 @@ public class ProvinceService implements IProvinceService {
}else {
throw new BaseException(CodeEnum.PARAM_ERROR);
}
// else {
// throw new BaseException(CodeEnum.PARAM_ERROR);
// }
}
@Override
@ -590,12 +532,11 @@ public class ProvinceService implements IProvinceService {
CompeteTeamMemberExample example = new CompeteTeamMemberExample();
example.createCriteria().andCompeteTeamIdEqualTo(competeTeam.getId());
long memberNum = teamMemberMapper.countByExample(example);
if(joinCount + memberNum > competeProject.getMemberMax() ){
if(joinCount + memberNum > 0) {
if (joinCount + memberNum > competeProject.getMemberMax() || joinCount + memberNum < competeProject.getMemberMin()) {
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());
@ -635,6 +576,10 @@ public class ProvinceService implements IProvinceService {
competeTeam.setRecStatus((byte) 2);
competeTeamDao.updateByPrimaryKeySelective(competeTeam);
}else {
//当前参赛人数不符提示错误信息
if(teamMemberMapper.countByExample(memberExample) > competeProject.getMemberMax() || teamMemberMapper.countByExample(memberExample) < competeProject.getMemberMin()){
throw new BaseException(CodeEnum.MEMBER_NUM_ERROR);
}
//修改团队的性别组和组别备注信息
ProvinceCompeteVo.TeamGroupRemark teamGroupRemark = competePlayerDao.getTeamGroupRemark(competeTeam.getId());
if (StrUtil.isNotEmpty(teamGroupRemark.getGroupRemark())) {

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

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

11
tall/src/main/java/com/ccsens/tall/bean/po/SysLog.java
View File

@ -22,6 +22,8 @@ public class SysLog implements Serializable {
private String facility;
private Long userId;
private static final long serialVersionUID = 1L;
public Long getId() {
@ -96,6 +98,14 @@ public class SysLog implements Serializable {
this.facility = facility == null ? null : facility.trim();
}
public Long getUserId() {
return userId;
}
public void setUserId(Long userId) {
this.userId = userId;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
@ -111,6 +121,7 @@ public class SysLog implements Serializable {
sb.append(", updatedAt=").append(updatedAt);
sb.append(", recStatus=").append(recStatus);
sb.append(", facility=").append(facility);
sb.append(", userId=").append(userId);
sb.append("]");
return sb.toString();
}

60
tall/src/main/java/com/ccsens/tall/bean/po/SysLogExample.java
View File

@ -694,6 +694,66 @@ public class SysLogExample {
addCriterion("facility not between", value1, value2, "facility");
return (Criteria) this;
}
public Criteria andUserIdIsNull() {
addCriterion("user_id is null");
return (Criteria) this;
}
public Criteria andUserIdIsNotNull() {
addCriterion("user_id is not null");
return (Criteria) this;
}
public Criteria andUserIdEqualTo(Long value) {
addCriterion("user_id =", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdNotEqualTo(Long value) {
addCriterion("user_id <>", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdGreaterThan(Long value) {
addCriterion("user_id >", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdGreaterThanOrEqualTo(Long value) {
addCriterion("user_id >=", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdLessThan(Long value) {
addCriterion("user_id <", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdLessThanOrEqualTo(Long value) {
addCriterion("user_id <=", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdIn(List<Long> values) {
addCriterion("user_id in", values, "userId");
return (Criteria) this;
}
public Criteria andUserIdNotIn(List<Long> values) {
addCriterion("user_id not in", values, "userId");
return (Criteria) this;
}
public Criteria andUserIdBetween(Long value1, Long value2) {
addCriterion("user_id between", value1, value2, "userId");
return (Criteria) this;
}
public Criteria andUserIdNotBetween(Long value1, Long value2) {
addCriterion("user_id not between", value1, value2, "userId");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {

16
tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
View File

@ -275,14 +275,14 @@ public class ProTaskDetailService implements IProTaskDetailService {
if (CollectionUtil.isNotEmpty(secondTaskVoList)) {
for (TaskVo.NormalTask normalTask : secondTaskVoList) {
//处理分数
MemberVo.MemberInfo memberInfo = proMemberService.getMemberByUserIdAndProjectId(currentUserId, normalTask.getProjectId());
if (ObjectUtil.isNotNull(memberInfo)) {
BigDecimal score = mtFeignClient.getMemberScore(normalTask.getDetailId(), memberInfo.getId());
if (ObjectUtil.isNotNull(score)) {
normalTask.setScore(score);
}
}
// //处理分数
// MemberVo.MemberInfo memberInfo = proMemberService.getMemberByUserIdAndProjectId(currentUserId, normalTask.getProjectId());
// if (ObjectUtil.isNotNull(memberInfo)) {
// BigDecimal score = mtFeignClient.getMemberScore(normalTask.getDetailId(), memberInfo.getId());
// if (ObjectUtil.isNotNull(score)) {
// normalTask.setScore(score);
// }
// }
//处理插件
managePlugin(currentUserId, roleId, normalTask, imitation);
//任务完成状态

30
tall/src/main/resources/mapper_raw/SysLogMapper.xml
View File

@ -11,6 +11,7 @@
<result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
<result column="rec_status" jdbcType="TINYINT" property="recStatus" />
<result column="facility" jdbcType="VARCHAR" property="facility" />
<result column="user_id" jdbcType="BIGINT" property="userId" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
@ -71,7 +72,8 @@
</where>
</sql>
<sql id="Base_Column_List">
id, url, method_desc, params, result, created_at, updated_at, rec_status, facility
id, url, method_desc, params, result, created_at, updated_at, rec_status, facility,
user_id
</sql>
<select id="selectByExample" parameterType="com.ccsens.tall.bean.po.SysLogExample" resultMap="BaseResultMap">
select
@ -106,12 +108,12 @@
<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
)
updated_at, rec_status, facility,
user_id)
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}
)
#{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, #{facility,jdbcType=VARCHAR},
#{userId,jdbcType=BIGINT})
</insert>
<insert id="insertSelective" parameterType="com.ccsens.tall.bean.po.SysLog">
insert into t_sys_log
@ -143,6 +145,9 @@
<if test="facility != null">
facility,
</if>
<if test="userId != null">
user_id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
@ -172,6 +177,9 @@
<if test="facility != null">
#{facility,jdbcType=VARCHAR},
</if>
<if test="userId != null">
#{userId,jdbcType=BIGINT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.ccsens.tall.bean.po.SysLogExample" resultType="java.lang.Long">
@ -210,6 +218,9 @@
<if test="record.facility != null">
facility = #{record.facility,jdbcType=VARCHAR},
</if>
<if test="record.userId != null">
user_id = #{record.userId,jdbcType=BIGINT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
@ -225,7 +236,8 @@
created_at = #{record.createdAt,jdbcType=TIMESTAMP},
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
rec_status = #{record.recStatus,jdbcType=TINYINT},
facility = #{record.facility,jdbcType=VARCHAR}
facility = #{record.facility,jdbcType=VARCHAR},
user_id = #{record.userId,jdbcType=BIGINT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
@ -257,6 +269,9 @@
<if test="facility != null">
facility = #{facility,jdbcType=VARCHAR},
</if>
<if test="userId != null">
user_id = #{userId,jdbcType=BIGINT},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
@ -269,7 +284,8 @@
created_at = #{createdAt,jdbcType=TIMESTAMP},
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
rec_status = #{recStatus,jdbcType=TINYINT},
facility = #{facility,jdbcType=VARCHAR}
facility = #{facility,jdbcType=VARCHAR},
user_id = #{userId,jdbcType=BIGINT}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>
Write Preview
Loading…
Cancel
Save