From b121fc4c801f8b976e43084a8d932c156ca20917 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 28 Oct 2020 14:54:27 +0800 Subject: [PATCH 1/4] 20201028v1.4 --- .../ccsens/cloudutil/aspect/LogAspect.java | 3 +- .../cloudutil/bean/tall/dto/LogDto.java | 4 + .../ccsens/mt/bean/vo/ProvinceCompeteVo.java | 2 + .../ccsens/mt/service/ProvinceService.java | 7 +- .../mapper_dao/CompeteCompanyDao.xml | 14 +- .../java/com/ccsens/tall/bean/po/SysLog.java | 221 +-- .../ccsens/tall/bean/po/SysLogExample.java | 1510 +++++++++-------- .../tall/persist/mapper/SysLogMapper.java | 58 +- .../resources/mapper_raw/SysLogMapper.xml | 531 +++--- 9 files changed, 1235 insertions(+), 1115 deletions(-) diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/aspect/LogAspect.java b/cloudutil/src/main/java/com/ccsens/cloudutil/aspect/LogAspect.java index 7a43de2e..5d251207 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/aspect/LogAspect.java +++ b/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) { diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/LogDto.java b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/LogDto.java index c0089813..b6bef73f 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/LogDto.java +++ b/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; } diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java index 0d65ecbc..30bd59b3 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java @@ -82,6 +82,8 @@ public class ProvinceCompeteVo { private int memberMin; @ApiModelProperty("最多人数") private int memberMax; + @ApiModelProperty("当前参赛人数") + private int joinNum; } @Data diff --git a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java index f61ba394..2fffc572 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -131,9 +131,14 @@ public class ProvinceService implements IProvinceService { } } + /** + * 查找所有选手 + * @param param 单位id + * @param userId userId + * @return + */ @Override public List queryPlayerByCompanyId(ProvinceCompeteDto.CompanyIdVo param, Long userId) { - return competePlayerDao.queryPlayerByCompanyId(param.getCompanyId()); } diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml index f42e8bc8..34bec894 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -121,12 +121,22 @@ - select - - distinct - - - from t_sys_log - - - - - order by ${orderByClause} - - - - - delete from t_sys_log - where id = #{id,jdbcType=BIGINT} - - - delete from t_sys_log - - - - - - 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 into t_sys_log - - - id, - - - url, - - - method_desc, - - - params, - - - result, - - - created_at, - - - updated_at, - - - rec_status, - - - - - #{id,jdbcType=BIGINT}, - - - #{url,jdbcType=VARCHAR}, - - - #{methodDesc,jdbcType=VARCHAR}, - - - #{params,jdbcType=VARCHAR}, - - - #{result,jdbcType=VARCHAR}, - - - #{createdAt,jdbcType=TIMESTAMP}, - - - #{updatedAt,jdbcType=TIMESTAMP}, - - - #{recStatus,jdbcType=TINYINT}, - - - - - - update t_sys_log - - - 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}, - - - - - - - - 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} - - - - - - update t_sys_log - - - 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 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} - + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, url, method_desc, params, result, created_at, updated_at, rec_status, facility + + + + + delete from t_sys_log + where id = #{id,jdbcType=BIGINT} + + + delete from t_sys_log + + + + + + 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 into t_sys_log + + + id, + + + url, + + + method_desc, + + + params, + + + result, + + + created_at, + + + updated_at, + + + rec_status, + + + facility, + + + + + #{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}, + + + + + + update t_sys_log + + + 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}, + + + + + + + + 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} + + + + + + update t_sys_log + + + 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 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} + \ No newline at end of file From bc57141788c9938430c97cbf1f45572965335776 Mon Sep 17 00:00:00 2001 From: Wang0018 <1007152140@qq.com> Date: Wed, 28 Oct 2020 18:03:50 +0800 Subject: [PATCH 2/4] 10.28 --- .../com/ccsens/mt/api/ProvinceController.java | 10 ++++++++ .../mt/bean/dto/ProvinceCompeteDto.java | 22 ++++++++++++++++++ .../ccsens/mt/bean/vo/ProvinceCompeteVo.java | 2 ++ .../ccsens/mt/persist/dao/CompeteTimeDao.java | 1 + .../ccsens/mt/service/IProvinceService.java | 6 ++++- .../ccsens/mt/service/ProvinceService.java | 23 +++++++++++++++++++ 6 files changed, 63 insertions(+), 1 deletion(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java index ad15e257..1f8e6d53 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java @@ -12,6 +12,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Repository; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -112,6 +113,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 params){ + log.info("添加/修改单位信息:{}",params); + provinceService.updateLeader(params.getParam()); + return JsonResponse.newInstance().ok(); + } + diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java index b7da8617..82fe2a19 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java @@ -69,4 +69,26 @@ public class ProvinceCompeteDto { @ApiModelProperty("保险证明照片") private Part insuranceRecord; } + @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; //教练证(只有教练需要,文件类型) + } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java index 0d65ecbc..29c7076c 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java +++ b/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; @@ -102,4 +103,5 @@ public class ProvinceCompeteVo { @ApiModelProperty("参赛人员的人数") private int playerNum; } + } diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTimeDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTimeDao.java index 53c51615..fac2476c 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTimeDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTimeDao.java @@ -49,4 +49,5 @@ public interface CompeteTimeDao extends CompeteTimeMapper { * @return 返回组别信息 */ List queryGroupByProject(@Param("type") int type, @Param("projectId") Long projectId); + } diff --git a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java index efc56efe..fb3d61ea 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java @@ -75,5 +75,9 @@ public interface IProvinceService { */ ProvinceCompeteVo.CompeteCompany changeCompany(CompeteDto.CompeteCompany param); - + /** + * 添加/修改领队或教练 + * @param param + */ + void updateLeader(ProvinceCompeteDto.ModifyLeader param); } diff --git a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java index f61ba394..550652ac 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -1,5 +1,6 @@ package com.ccsens.mt.service; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -11,6 +12,7 @@ import com.ccsens.mt.persist.dao.CompeteCompanyDao; import com.ccsens.mt.persist.dao.CompetePlayerDao; import com.ccsens.mt.persist.dao.CompeteTimeDao; import com.ccsens.mt.persist.mapper.CommonFileMapper; +import com.ccsens.mt.persist.mapper.CompeteCoachMapper; import com.ccsens.mt.util.Constant; import com.ccsens.util.CodeEnum; import com.ccsens.util.PropUtil; @@ -45,6 +47,9 @@ public class ProvinceService implements IProvinceService { @Resource private CompetePlayerDao competePlayerDao; + @Resource + private CompeteCoachMapper competeCoachMapper; + /** * 查找当前用户填写的信息的概览 */ @@ -157,6 +162,7 @@ public class ProvinceService implements IProvinceService { commonFileMapper.insertSelective(fileDo); log.info("保存文件:{}", fileDo); return fileDo.getId(); + } @@ -216,5 +222,22 @@ public class ProvinceService implements IProvinceService { return competeCompany1; } + @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); + } + } + } + } From 5db90574d4ff0b7e0a08c204a5a08edb63c3b4f5 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Thu, 29 Oct 2020 09:18:23 +0800 Subject: [PATCH 3/4] 20201029v1.0 --- mt/src/main/java/com/ccsens/mt/api/ProvinceController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java index c367fec8..e60abed7 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java @@ -77,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 params) throws Exception { + public JsonResponse saveOrUpdatePlayer(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { log.info("新加/修改参赛人员:{}",params); provinceService.saveOrUpdatePlayer(params.getParam(),params.getUserId()); return JsonResponse.newInstance().ok(); @@ -86,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> queryPlayerByCompanyId(@ApiParam QueryDto params) throws Exception { + public JsonResponse> queryPlayerByCompanyId(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { log.info("查找所有注册的选手:{}",params); List playerByCompanyIds = provinceService.queryPlayerByCompanyId(params.getParam(),params.getUserId()); log.info("查找所有注册的选手:{}",playerByCompanyIds); From 24762e244ce37f966f58af7549733c43fbfa865b Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Thu, 29 Oct 2020 10:11:55 +0800 Subject: [PATCH 4/4] 20201029v1.1 --- .../com/ccsens/mt/api/DebugController.java | 13 ++++++++ .../com/ccsens/mt/api/FileController.java | 33 +++++++++++++++++++ .../com/ccsens/mt/service/FileService.java | 1 + mt/src/main/resources/application.yml | 4 +-- .../main/java/com/ccsens/util/CodeEnum.java | 1 + 5 files changed, 50 insertions(+), 2 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/DebugController.java b/mt/src/main/java/com/ccsens/mt/api/DebugController.java index 54b5366b..eb2fca5f 100644 --- a/mt/src/main/java/com/ccsens/mt/api/DebugController.java +++ b/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("测试"); + } + } diff --git a/mt/src/main/java/com/ccsens/mt/api/FileController.java b/mt/src/main/java/com/ccsens/mt/api/FileController.java index 6f711826..d1a8a56c 100644 --- a/mt/src/main/java/com/ccsens/mt/api/FileController.java +++ b/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 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 files = new ArrayList<>(); + files.add(file); + List fileVos = fileService.saveFile(dir, files, userId); + List 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); + } } diff --git a/mt/src/main/java/com/ccsens/mt/service/FileService.java b/mt/src/main/java/com/ccsens/mt/service/FileService.java index aaa34977..b322a75b 100644 --- a/mt/src/main/java/com/ccsens/mt/service/FileService.java +++ b/mt/src/main/java/com/ccsens/mt/service/FileService.java @@ -41,6 +41,7 @@ public class FileService implements IFileService { List 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(); diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index 5c2cd5c4..5889ff7f 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: dev - include: common, util-dev \ No newline at end of file + active: test + include: common, util-test \ No newline at end of file diff --git a/util/src/main/java/com/ccsens/util/CodeEnum.java b/util/src/main/java/com/ccsens/util/CodeEnum.java index f54770df..880a3c59 100644 --- a/util/src/main/java/com/ccsens/util/CodeEnum.java +++ b/util/src/main/java/com/ccsens/util/CodeEnum.java @@ -162,6 +162,7 @@ public enum CodeEnum { DINGDING_EXCEPTION(132,"钉钉接口调用异常。",true), URL_ERROR(133, "请求路径转换异常", true), JOIN_PROJECT_NUM_FULL(134, "可参赛次数已满", true), + PHOTO_FILE_EXCEED_2M(134, "图片大小不能超过2M", true), ;