From 53fd3bf6b9178291d449f0d7ad723639d0b15c56 Mon Sep 17 00:00:00 2001 From: tianea Date: Sun, 27 Feb 2022 21:12:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E8=B5=9B=E7=94=A8=E6=88=B7=E5=A4=A7?= =?UTF-8?q?=E8=B5=9B=E4=BB=BB=E5=8A=A1=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/bo/CompetitionNews.java | 9 +++ .../com/tz/platform/common/core/bo/Stage.java | 1 + .../platform/common/core/bo/TaskQuestion.java | 11 ++++ .../platform/common/core/tools/ExcelUtil.java | 4 +- .../platform/common/core/tools/StrUtil.java | 1 + .../src/main/resources/logback-tz.xml | 56 +++++++++---------- .../pc/CompetitionTaskController.java | 39 +++++++++++++ .../competitiion/pc/biz/PCGroupBiz.java | 12 +++- .../competitiion/pc/biz/PCTaskBiz.java | 46 +++++++++++++++ .../competitiion/pc/dto/ListTaskDTO.java | 12 ++++ .../platform/competitiion/pc/dto/TaskDTO.java | 24 ++++++++ .../platform/competitiion/pc/vo/TaskVO.java | 27 +++++++++ .../com/tz/platform/entity/Competition.java | 9 ++- .../tz/platform/entity/CompetitionGroup.java | 1 + .../tz/platform/entity/CompetitionTask.java | 12 ++++ .../tz/platform/entity/CompetitionTeam.java | 20 +++++++ .../com/tz/platform/entity/ExamQuestion.java | 42 ++++++++++++++ .../repository/CompetitionTaskDao.java | 4 ++ .../java/com/tz/platform/entity/Question.java | 3 +- .../com/tz/platform/pc/vo/PageQuestionVO.java | 4 ++ .../tz/platform/repository/QuestionDao.java | 4 ++ .../gateway/filter/TzGlobalFilter.java | 6 ++ .../user/pc/PcUserInfoController.java | 5 ++ 23 files changed, 315 insertions(+), 37 deletions(-) create mode 100644 tz/common/common-core/src/main/java/com/tz/platform/common/core/bo/CompetitionNews.java create mode 100644 tz/common/common-core/src/main/java/com/tz/platform/common/core/bo/TaskQuestion.java create mode 100644 tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/CompetitionTaskController.java create mode 100644 tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/PCTaskBiz.java create mode 100644 tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/dto/ListTaskDTO.java create mode 100644 tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/dto/TaskDTO.java create mode 100644 tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/vo/TaskVO.java create mode 100644 tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionTeam.java create mode 100644 tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamQuestion.java diff --git a/tz/common/common-core/src/main/java/com/tz/platform/common/core/bo/CompetitionNews.java b/tz/common/common-core/src/main/java/com/tz/platform/common/core/bo/CompetitionNews.java new file mode 100644 index 0000000..fe34591 --- /dev/null +++ b/tz/common/common-core/src/main/java/com/tz/platform/common/core/bo/CompetitionNews.java @@ -0,0 +1,9 @@ +package com.tz.platform.common.core.bo; + +import lombok.Data; + +@Data +public class CompetitionNews { + private String img; + private String content; +} diff --git a/tz/common/common-core/src/main/java/com/tz/platform/common/core/bo/Stage.java b/tz/common/common-core/src/main/java/com/tz/platform/common/core/bo/Stage.java index be69ffc..575c749 100644 --- a/tz/common/common-core/src/main/java/com/tz/platform/common/core/bo/Stage.java +++ b/tz/common/common-core/src/main/java/com/tz/platform/common/core/bo/Stage.java @@ -14,4 +14,5 @@ public class Stage { private Date signUpStartTime; private Date singUpEndTime; private boolean enableSignUp; + private boolean isDemo; } diff --git a/tz/common/common-core/src/main/java/com/tz/platform/common/core/bo/TaskQuestion.java b/tz/common/common-core/src/main/java/com/tz/platform/common/core/bo/TaskQuestion.java new file mode 100644 index 0000000..4b8c2f0 --- /dev/null +++ b/tz/common/common-core/src/main/java/com/tz/platform/common/core/bo/TaskQuestion.java @@ -0,0 +1,11 @@ +package com.tz.platform.common.core.bo; + +import lombok.Data; + +import java.util.List; + +@Data +public class TaskQuestion { + private Integer groupId; + private List questionIds; +} diff --git a/tz/common/common-core/src/main/java/com/tz/platform/common/core/tools/ExcelUtil.java b/tz/common/common-core/src/main/java/com/tz/platform/common/core/tools/ExcelUtil.java index 2131ae7..c5c4eee 100644 --- a/tz/common/common-core/src/main/java/com/tz/platform/common/core/tools/ExcelUtil.java +++ b/tz/common/common-core/src/main/java/com/tz/platform/common/core/tools/ExcelUtil.java @@ -74,11 +74,8 @@ public class ExcelUtil { public ExcelUtil(String template,String out,int sheetIndex) throws Exception{ this.templatePath = template; - is = new FileInputStream(templatePath); - excel = new XSSFWorkbook(is); - //获取第一个sheet sheet0 = excel.getSheetAt(sheetIndex); outPath = out; @@ -323,6 +320,7 @@ public class ExcelUtil { if(cell == null) {return "";} + if(cell.getCellType() == Cell.CELL_TYPE_STRING){ return cell.getStringCellValue(); diff --git a/tz/common/common-core/src/main/java/com/tz/platform/common/core/tools/StrUtil.java b/tz/common/common-core/src/main/java/com/tz/platform/common/core/tools/StrUtil.java index fbbf895..c578866 100644 --- a/tz/common/common-core/src/main/java/com/tz/platform/common/core/tools/StrUtil.java +++ b/tz/common/common-core/src/main/java/com/tz/platform/common/core/tools/StrUtil.java @@ -31,4 +31,5 @@ public class StrUtil { public static String get32UUID() { return IdUtil.simpleUUID(); } + } diff --git a/tz/common/common-core/src/main/resources/logback-tz.xml b/tz/common/common-core/src/main/resources/logback-tz.xml index 1baebb8..b3e806c 100644 --- a/tz/common/common-core/src/main/resources/logback-tz.xml +++ b/tz/common/common-core/src/main/resources/logback-tz.xml @@ -74,35 +74,35 @@ - - - - - ${PATTERN} - - - - - ${FILE_PATH}/info - - - ${FILE_PATH}/info.%d{yyyy-MM-dd}.log - - 7 - + + + + + + + + + + + + + + + + - - ${PATTERN} - - + + + + - - - + + + - - - - - + + + + + diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/CompetitionTaskController.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/CompetitionTaskController.java new file mode 100644 index 0000000..bdcfd39 --- /dev/null +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/CompetitionTaskController.java @@ -0,0 +1,39 @@ +package com.tz.platform.competitiion.pc; + +import com.tz.platform.common.core.base.Result; +import com.tz.platform.competitiion.pc.biz.PCTaskBiz; +import com.tz.platform.competitiion.pc.dto.ListTaskDTO; +import com.tz.platform.competitiion.pc.dto.TaskDTO; +import com.tz.platform.competitiion.pc.vo.TaskVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping(value = "/pc/competition/task") +public class CompetitionTaskController { + + @Autowired + private PCTaskBiz biz; + + @PostMapping(value = "add") + public Result add(TaskVO vo){ + return biz.save(vo); + } + + @PostMapping(value = "update") + public Result update(TaskVO vo){ + return biz.save(vo); + } + + @PostMapping(value = "list") + public Result list(TaskVO vo){ + return biz.list(vo); + } + + @PostMapping(value = "get") + public Result get(TaskVO vo){ + return biz.get(vo); + } +} diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/PCGroupBiz.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/PCGroupBiz.java index b950fcd..a461f8f 100644 --- a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/PCGroupBiz.java +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/PCGroupBiz.java @@ -14,7 +14,9 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; +import java.util.stream.Stream; @Component public class PCGroupBiz { @@ -26,14 +28,20 @@ public class PCGroupBiz { ListGroupDTO dto = new ListGroupDTO(); List list = new ArrayList<>(); Long competitionId = vo.getList().stream().findFirst().orElse(null).getCompetitionId(); + Stream groupVOStream = vo.getList().stream().filter(gp -> gp.getId()!=null&& gp.getId() > 0); + if(groupVOStream!=null){ + List ids = groupVOStream.map(GroupVO::getId).collect(Collectors.toList()); + groupDao.deleteAllByCompetitionIdAndIdNotIn(competitionId,ids); + } + vo.getList().forEach(vo1 -> { CompetitionGroup groupCat = new CompetitionGroup(); BeanUtils.copyProperties(vo1,groupCat); groupCat = groupDao.save(groupCat); list.add(groupCat); }); - List ids = vo.getList().stream().filter(gp -> gp.getId() > 0).map(GroupVO::getId).collect(Collectors.toList()); - groupDao.deleteAllByCompetitionIdAndIdNotIn(competitionId,ids); + + dto.setList(list); return Result.success(dto); } diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/PCTaskBiz.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/PCTaskBiz.java new file mode 100644 index 0000000..e6f8843 --- /dev/null +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/PCTaskBiz.java @@ -0,0 +1,46 @@ +package com.tz.platform.competitiion.pc.biz; + +import com.tz.platform.common.core.base.Result; +import com.tz.platform.competitiion.pc.dto.ListTaskDTO; +import com.tz.platform.competitiion.pc.dto.TaskDTO; +import com.tz.platform.competitiion.pc.vo.TaskVO; +import com.tz.platform.entity.CompetitionTask; +import com.tz.platform.repository.CompetitionTaskDao; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Component +public class PCTaskBiz { + @Autowired + private CompetitionTaskDao taskDao; + + public Result save(TaskVO vo){ + if(vo.getCompetitionId()==null|| vo.getCompetitionId() <=0){ + return Result.error("没有大赛信息"); + } + if(vo.getStageId()==null||vo.getStageId() <=0){ + return Result.error("没有指定赛段"); + } + + CompetitionTask task = new CompetitionTask(); + BeanUtils.copyProperties(vo,task); + task = taskDao.save(task); + return Result.success(task.getId()); + } + + public Result get(TaskVO vo){ + CompetitionTask task = taskDao.getById(vo.getId()); + TaskDTO dto = new TaskDTO(); + BeanUtils.copyProperties(task,dto); + return Result.success(dto); + } + public Result list(TaskVO vo){ + List taskList = taskDao.findAllByCompetitionId(vo.getCompetitionId()); + ListTaskDTO dto = new ListTaskDTO(); + dto.setList(taskList); + return Result.success(dto); + } +} diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/dto/ListTaskDTO.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/dto/ListTaskDTO.java new file mode 100644 index 0000000..c7504ef --- /dev/null +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/dto/ListTaskDTO.java @@ -0,0 +1,12 @@ +package com.tz.platform.competitiion.pc.dto; + +import com.tz.platform.entity.CompetitionTask; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class ListTaskDTO implements Serializable { + List list; +} diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/dto/TaskDTO.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/dto/TaskDTO.java new file mode 100644 index 0000000..a921596 --- /dev/null +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/dto/TaskDTO.java @@ -0,0 +1,24 @@ +package com.tz.platform.competitiion.pc.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class TaskDTO implements Serializable { + private Integer id; + private Long competitionId; + private Integer stageId; + private Long financePower; + private Long examPower; + private Date operationStartTime; + private Date operationEndTime; + private Date examStartTime; + private Date examEndTime; + private Integer tradeType; + private Long initCapital; + private String operationLogo; + private Long financeBasePower; + private Long financeProfitPower; +} diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/vo/TaskVO.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/vo/TaskVO.java new file mode 100644 index 0000000..2b3f8ea --- /dev/null +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/vo/TaskVO.java @@ -0,0 +1,27 @@ +package com.tz.platform.competitiion.pc.vo; + +import com.tz.platform.common.core.bo.TaskQuestion; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +@Data +public class TaskVO implements Serializable { + private Integer id; + private Long competitionId; + private Integer stageId; + private Long financePower; + private Long examPower; + private Date operationStartTime; + private Date operationEndTime; + private Date examStartTime; + private Date examEndTime; + private Integer tradeType; + private Long initCapital; + private String operationLogo; + private Long financeBasePower; + private Long financeProfitPower; + private List questionList; +} diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/Competition.java b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/Competition.java index c20301f..a3cc498 100644 --- a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/Competition.java +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/Competition.java @@ -1,5 +1,6 @@ package com.tz.platform.entity; +import com.tz.platform.common.core.bo.CompetitionNews; import com.tz.platform.common.core.bo.Rotation; import com.tz.platform.common.core.bo.Stage; import com.vladmihalcea.hibernate.type.json.JsonStringType; @@ -48,6 +49,10 @@ public class Competition { private String rule; @Column(columnDefinition = "text") private String prize; - @Column(columnDefinition = "text") - private String news; + @Type(type = "json") + @Column(columnDefinition = "json") + private List news; + @Type(type = "json") + @Column(columnDefinition = "json") + private List schoolNews; } diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionGroup.java b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionGroup.java index 745cf9c..93f3ac7 100644 --- a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionGroup.java +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionGroup.java @@ -21,4 +21,5 @@ public class CompetitionGroup { @Type(type = "json") @Column(columnDefinition = "json") private List catList; + } diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionTask.java b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionTask.java index 8d2f3d3..4763e7a 100644 --- a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionTask.java +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionTask.java @@ -1,13 +1,19 @@ package com.tz.platform.entity; +import com.tz.platform.common.core.bo.TaskQuestion; +import com.vladmihalcea.hibernate.type.json.JsonStringType; import lombok.Data; +import org.hibernate.annotations.Type; +import org.hibernate.annotations.TypeDef; import javax.persistence.*; import java.util.Date; +import java.util.List; @Data @Entity @Table(indexes = {@Index(columnList = "competitionId")}) +@TypeDef(name = "json", typeClass = JsonStringType.class) public class CompetitionTask { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -18,9 +24,15 @@ public class CompetitionTask { private Long examPower; private Date operationStartTime; private Date operationEndTime; + private Date examStartTime; + private Date examEndTime; private Integer tradeType; private Long initCapital; private String operationLogo; private Long financeBasePower; private Long financeProfitPower; + @Type(type = "json") + @Column(columnDefinition = "json") + private List questionList; + } diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionTeam.java b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionTeam.java new file mode 100644 index 0000000..3f10ba3 --- /dev/null +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionTeam.java @@ -0,0 +1,20 @@ +package com.tz.platform.entity; + +import lombok.Data; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +@Data +@Entity +public class CompetitionTeam { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + private Long competitionId; + private Integer stageId; + private String teamName; + private String teacherName; +} diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamQuestion.java b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamQuestion.java new file mode 100644 index 0000000..7e1e2ee --- /dev/null +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamQuestion.java @@ -0,0 +1,42 @@ +package com.tz.platform.entity; + +import com.tz.platform.common.core.bo.Answer; +import com.tz.platform.common.core.bo.SubQuestionVO; +import com.vladmihalcea.hibernate.type.json.JsonStringType; +import lombok.Data; +import org.hibernate.annotations.Type; +import org.hibernate.annotations.TypeDef; + +import javax.persistence.*; +import java.util.List; + +@Data +@Entity +@TypeDef(name = "json", typeClass = JsonStringType.class) +public class ExamQuestion { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + private Long competitionId; + private Integer stageId; + private Integer groupId; + private Long questionType; + private Long score; + private Integer type; + @Column(columnDefinition = "text") + private String stem; + @Column(columnDefinition = "text") + private String content; + private String stemImg; + @Type(type = "json") + @Column(columnDefinition = "json" ) + List answerList; + @Column( columnDefinition = "text") + private String analysis; + @Type(type = "json") + @Column(columnDefinition = "json") + private List answerId; + @Type(type = "json") + @Column(columnDefinition = "json") + private List children; +} diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/repository/CompetitionTaskDao.java b/tz/competition/competition-service/src/main/java/com/tz/platform/repository/CompetitionTaskDao.java index efcd7ac..df9a79d 100644 --- a/tz/competition/competition-service/src/main/java/com/tz/platform/repository/CompetitionTaskDao.java +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/repository/CompetitionTaskDao.java @@ -4,6 +4,10 @@ import com.tz.platform.entity.CompetitionTask; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository public interface CompetitionTaskDao extends JpaRepository { + CompetitionTask getById(Integer id); + List findAllByCompetitionId(Long competitionId); } diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/entity/Question.java b/tz/exam/exam-service/src/main/java/com/tz/platform/entity/Question.java index 58747d0..13791c0 100644 --- a/tz/exam/exam-service/src/main/java/com/tz/platform/entity/Question.java +++ b/tz/exam/exam-service/src/main/java/com/tz/platform/entity/Question.java @@ -13,7 +13,7 @@ import java.util.Date; import java.util.List; @Entity -@Table(name = "question",indexes = {@Index(columnList = "title,type")}) +@Table(name = "question",indexes = {@Index(columnList = "type"),@Index(columnList = "courseId,questionType,levelId"),@Index(columnList = "userNo")}) @Data @TypeDef(name = "json", typeClass = JsonStringType.class) public class Question { @@ -46,7 +46,6 @@ public class Question { @Type(type = "json") @Column(columnDefinition = "json") private List answerId; - @Type(type = "json") @Column(columnDefinition = "json") private List children; diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/PageQuestionVO.java b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/PageQuestionVO.java index 7a4fe55..c1e5e63 100644 --- a/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/PageQuestionVO.java +++ b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/PageQuestionVO.java @@ -5,7 +5,11 @@ import lombok.Data; @Data public class PageQuestionVO { private Integer pageNo; + private Integer pageSize; private Long courseId; private String stem; private Integer type; + private Integer questionType; + private Integer levelId; + private Long score; } diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/repository/QuestionDao.java b/tz/exam/exam-service/src/main/java/com/tz/platform/repository/QuestionDao.java index 5e723b8..3c713f7 100644 --- a/tz/exam/exam-service/src/main/java/com/tz/platform/repository/QuestionDao.java +++ b/tz/exam/exam-service/src/main/java/com/tz/platform/repository/QuestionDao.java @@ -32,6 +32,10 @@ public interface QuestionDao extends JpaRepository { Page findAllByCourseIdAndStemAndType(Long courseId,String stem,Integer type ,Pageable pageable); + Page findAllByCourseIdAndTypeAndQuestionTypeAndStemLike(Long courseId,Integer type,Integer questType,String stem,Pageable pageable); + + Page findAllByIdIn(List id,Pageable pageable); + @Transactional @Modifying diff --git a/tz/gateway/src/main/java/com/tz/platform/gateway/filter/TzGlobalFilter.java b/tz/gateway/src/main/java/com/tz/platform/gateway/filter/TzGlobalFilter.java index 8b14010..32a9759 100644 --- a/tz/gateway/src/main/java/com/tz/platform/gateway/filter/TzGlobalFilter.java +++ b/tz/gateway/src/main/java/com/tz/platform/gateway/filter/TzGlobalFilter.java @@ -70,6 +70,8 @@ public class TzGlobalFilter implements GlobalFilter , Ordered { // 解析token Long userNo = getUserNoByToken(request); + + if (uri.contains("/pc") && !uri.contains("/system/pc/menu/user/list") && !uri.contains("/system/pc/menu/user/button/list")) { // 管理后台鉴权 // if (!stringRedisTemplate.hasKey(RedisPreEnum.ADMINI_MENU.getCode().concat(userNo.toString()))) { @@ -150,6 +152,8 @@ public class TzGlobalFilter implements GlobalFilter , Ordered { return ip; } + + private Mono modifiedBody(ServerWebExchange serverWebExchange){ String device = getDevice(serverWebExchange.getRequest()); String ip = getRemoteIp(serverWebExchange.getRequest()); @@ -178,6 +182,8 @@ public class TzGlobalFilter implements GlobalFilter , Ordered { ServerRequest serverRequest = ServerRequest.create(serverWebExchange, HandlerStrategies.withDefaults().messageReaders()); return serverRequest.bodyToMono(String.class).flatMap(body -> { + + logger.info(body); JSONObject bodyJson; if (MediaType.APPLICATION_FORM_URLENCODED.isCompatibleWith(mediaType)) { Map bodyMap = decodeBody(body); diff --git a/tz/user/user-service/src/main/java/com/tz/platform/user/pc/PcUserInfoController.java b/tz/user/user-service/src/main/java/com/tz/platform/user/pc/PcUserInfoController.java index e4d8a0b..b80a1f7 100644 --- a/tz/user/user-service/src/main/java/com/tz/platform/user/pc/PcUserInfoController.java +++ b/tz/user/user-service/src/main/java/com/tz/platform/user/pc/PcUserInfoController.java @@ -7,6 +7,7 @@ import com.tz.platform.user.pc.bo.UserPageBO; import com.tz.platform.user.pc.dto.UserPageDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; @RestController @RequestMapping(path = "/pc/user") @@ -19,4 +20,8 @@ public class PcUserInfoController extends BaseController { public Result listUser(@RequestBody UserPageBO bo){ return pcUserInfoBiz.listPage(bo.getPageNo()); } + + public Result importUser(MultipartFile file){ + return Result.success("success"); + } }