diff --git a/tz/.gitignore b/tz/.gitignore index ad52113..8adb533 100644 --- a/tz/.gitignore +++ b/tz/.gitignore @@ -53,3 +53,4 @@ Temporary Items .apdisk .idea *.iml +target \ No newline at end of file diff --git a/tz/common/common-core/src/main/java/com/tz/platform/common/core/vo/Answer.java b/tz/common/common-core/src/main/java/com/tz/platform/common/core/bo/Answer.java similarity index 75% rename from tz/common/common-core/src/main/java/com/tz/platform/common/core/vo/Answer.java rename to tz/common/common-core/src/main/java/com/tz/platform/common/core/bo/Answer.java index 7c91fd6..06c0251 100644 --- a/tz/common/common-core/src/main/java/com/tz/platform/common/core/vo/Answer.java +++ b/tz/common/common-core/src/main/java/com/tz/platform/common/core/bo/Answer.java @@ -1,4 +1,4 @@ -package com.tz.platform.common.core.vo; +package com.tz.platform.common.core.bo; import lombok.Data; @Data diff --git a/tz/common/common-core/src/main/java/com/tz/platform/common/core/bo/GroupCat.java b/tz/common/common-core/src/main/java/com/tz/platform/common/core/bo/GroupCat.java new file mode 100644 index 0000000..c0692cd --- /dev/null +++ b/tz/common/common-core/src/main/java/com/tz/platform/common/core/bo/GroupCat.java @@ -0,0 +1,9 @@ +package com.tz.platform.common.core.bo; + +import lombok.Data; + +@Data +public class GroupCat { + private Integer id; + private String name; +} diff --git a/tz/common/common-core/src/main/java/com/tz/platform/common/core/bo/Rotation.java b/tz/common/common-core/src/main/java/com/tz/platform/common/core/bo/Rotation.java new file mode 100644 index 0000000..4b1a67f --- /dev/null +++ b/tz/common/common-core/src/main/java/com/tz/platform/common/core/bo/Rotation.java @@ -0,0 +1,10 @@ +package com.tz.platform.common.core.bo; + +import lombok.Data; + +@Data +public class Rotation { + private Integer id; + private String img; + private String link; +} 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 new file mode 100644 index 0000000..be69ffc --- /dev/null +++ b/tz/common/common-core/src/main/java/com/tz/platform/common/core/bo/Stage.java @@ -0,0 +1,17 @@ +package com.tz.platform.common.core.bo; + +import lombok.Data; + +import java.util.Date; + +@Data +public class Stage { + private int id; + private String name; + private int status; + private Date startTime; + private Date endTime; + private Date signUpStartTime; + private Date singUpEndTime; + private boolean enableSignUp; +} diff --git a/tz/common/common-core/src/main/java/com/tz/platform/common/core/vo/SubQuestionVO.java b/tz/common/common-core/src/main/java/com/tz/platform/common/core/bo/SubQuestionVO.java similarity index 89% rename from tz/common/common-core/src/main/java/com/tz/platform/common/core/vo/SubQuestionVO.java rename to tz/common/common-core/src/main/java/com/tz/platform/common/core/bo/SubQuestionVO.java index 8ccbc9a..1b6d107 100644 --- a/tz/common/common-core/src/main/java/com/tz/platform/common/core/vo/SubQuestionVO.java +++ b/tz/common/common-core/src/main/java/com/tz/platform/common/core/bo/SubQuestionVO.java @@ -1,4 +1,4 @@ -package com.tz.platform.common.core.vo; +package com.tz.platform.common.core.bo; import lombok.Data; diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/CompetitionApplication.java b/tz/competition/competition-service/src/main/java/com/tz/platform/CompetitionApplication.java similarity index 93% rename from tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/CompetitionApplication.java rename to tz/competition/competition-service/src/main/java/com/tz/platform/CompetitionApplication.java index b68e817..c6b49a7 100644 --- a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/CompetitionApplication.java +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/CompetitionApplication.java @@ -1,4 +1,4 @@ -package com.tz.platform.competitiion; +package com.tz.platform; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/CompetitionController.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/CompetitionController.java new file mode 100644 index 0000000..5c0cc88 --- /dev/null +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/CompetitionController.java @@ -0,0 +1,41 @@ +package com.tz.platform.competitiion.pc; + +import com.tz.platform.common.core.base.Result; +import com.tz.platform.competitiion.pc.biz.PCCompetitionBiz; +import com.tz.platform.competitiion.pc.dto.PageCompetitionDTO; +import com.tz.platform.competitiion.pc.vo.CompetitionVO; +import com.tz.platform.competitiion.pc.vo.PageCompetitionVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping(value = "/pc/competition") +public class CompetitionController { + + @Autowired + private PCCompetitionBiz biz; + + @PostMapping(value = "add") + public Result add(@RequestBody CompetitionVO vo){ + return biz.add(vo); + } + + @PostMapping(value = "update") + public Result update(@RequestBody CompetitionVO vo){ + return biz.update(vo); + } + + @PostMapping(value = "delete") + public Result delete(@RequestBody CompetitionVO vo){ + return biz.delete(vo); + } + + @PostMapping(value = "list") + public Result list(@RequestBody PageCompetitionVo vo){ + return biz.list(vo); + } + +} diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/PCCompetitionBiz.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/PCCompetitionBiz.java new file mode 100644 index 0000000..287c37d --- /dev/null +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/PCCompetitionBiz.java @@ -0,0 +1,57 @@ +package com.tz.platform.competitiion.pc.biz; + +import com.tz.platform.common.core.base.Result; +import com.tz.platform.competitiion.pc.dto.PageCompetitionDTO; +import com.tz.platform.competitiion.pc.vo.CompetitionVO; +import com.tz.platform.competitiion.pc.vo.PageCompetitionVo; +import com.tz.platform.entity.Competition; +import com.tz.platform.repository.CompetitionDao; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; + +@Component +public class PCCompetitionBiz { + + @Autowired + private CompetitionDao competitionDao ; + + public Result add(CompetitionVO vo){ + if(StringUtils.isEmpty(vo.getName())){ + return Result.error("大赛名称不能为空"); + } + Competition competition = new Competition(); + BeanUtils.copyProperties(vo,competition); + competition =competitionDao.save(competition); + return Result.success(competition.getId()); + } + + public Result update(CompetitionVO vo){ + if(StringUtils.isEmpty(vo.getName())){ + return Result.error("大赛名称不能为空"); + } + Competition competition = new Competition(); + BeanUtils.copyProperties(vo,competition); + competitionDao.save(competition); + return Result.success("编辑成功"); + } + + public Result delete(CompetitionVO vo){ + competitionDao.deleteById(vo.getId()); + return Result.success("success"); + } + + public Result list(PageCompetitionVo vo){ + Sort sort = Sort.by(Sort.Direction.DESC,"id"); + Pageable pageable = PageRequest.of(vo.getPageNo(),vo.getPageSize(),sort); + Page competitionPage = competitionDao.findAll(pageable); + PageCompetitionDTO dto = new PageCompetitionDTO(); + dto.setPage(competitionPage); + return Result.success(dto); + } +} diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/dto/PageCompetitionDTO.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/dto/PageCompetitionDTO.java new file mode 100644 index 0000000..8838bda --- /dev/null +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/dto/PageCompetitionDTO.java @@ -0,0 +1,12 @@ +package com.tz.platform.competitiion.pc.dto; + +import com.tz.platform.entity.Competition; +import lombok.Data; +import org.springframework.data.domain.Page; + +import java.io.Serializable; + +@Data +public class PageCompetitionDTO implements Serializable { + private Page page; +} diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/vo/CompetitionVO.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/vo/CompetitionVO.java new file mode 100644 index 0000000..135cf06 --- /dev/null +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/vo/CompetitionVO.java @@ -0,0 +1,27 @@ +package com.tz.platform.competitiion.pc.vo; + +import com.tz.platform.common.core.bo.Rotation; +import com.tz.platform.common.core.bo.Stage; +import lombok.Data; +import java.io.Serializable; +import java.util.List; + +@Data +public class CompetitionVO implements Serializable { + private Long userNo; + private Long id; + private String name; + private Integer type; + private String sponsor; + private String supporter; + private Integer teamMinCount; + private Integer teamMaxCount; + private List stageList; + private Integer currentStage; + private List bannerList; + private String thumbnail; + private String summary; + private String rule; + private String prize; + private String news; +} diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/vo/PageCompetitionVo.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/vo/PageCompetitionVo.java new file mode 100644 index 0000000..9cb464c --- /dev/null +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/vo/PageCompetitionVo.java @@ -0,0 +1,11 @@ +package com.tz.platform.competitiion.pc.vo; + +import lombok.Data; + + +@Data +public class PageCompetitionVo { + private Long userNo; + private Integer pageSize; + private Integer pageNo; +} 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 new file mode 100644 index 0000000..e8ca1f6 --- /dev/null +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/Competition.java @@ -0,0 +1,47 @@ +package com.tz.platform.entity; + +import com.tz.platform.common.core.bo.Rotation; +import com.tz.platform.common.core.bo.Stage; +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; + +@Entity +@TypeDef(name = "json", typeClass = JsonStringType.class) +@Data +public class Competition { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + private Long userNo; + private String name; + private Integer type; + private String sponsor; + private String supporter; + private Integer teamMinCount; + private Integer teamMaxCount; + private Integer status; + @Type(type = "json") + @Column(columnDefinition = "json") + private List stageList; + private Integer currentStage; + private String currentStageName; + private Date creatTime; + @Type(type = "json") + @Column(columnDefinition = "json") + private List bannerList; + private String thumbnail; + @Column(columnDefinition = "text") + private String summary; + @Column(columnDefinition = "text") + private String rule; + @Column(columnDefinition = "text") + private String prize; + @Column(columnDefinition = "text") + private String news; +} 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 new file mode 100644 index 0000000..c60426e --- /dev/null +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionGroup.java @@ -0,0 +1,24 @@ +package com.tz.platform.entity; + +import com.tz.platform.common.core.bo.GroupCat; +import lombok.Data; +import org.hibernate.annotations.Type; + +import javax.persistence.*; +import java.util.List; + +@Data +@Entity +@Table(indexes = {@Index(columnList = "competitionId")}) +public class CompetitionGroup { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + private Long competitionId; + private String name; + private Integer limitType; + @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 new file mode 100644 index 0000000..8d2f3d3 --- /dev/null +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionTask.java @@ -0,0 +1,26 @@ +package com.tz.platform.entity; + +import lombok.Data; + +import javax.persistence.*; +import java.util.Date; + +@Data +@Entity +@Table(indexes = {@Index(columnList = "competitionId")}) +public class CompetitionTask { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + private Long competitionId; + private Integer stageId; + private Long financePower; + private Long examPower; + private Date operationStartTime; + private Date operationEndTime; + 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/entity/ExamPaper.java b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamPaper.java new file mode 100644 index 0000000..4fa2135 --- /dev/null +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamPaper.java @@ -0,0 +1,20 @@ +package com.tz.platform.entity; + +import lombok.Data; + +import javax.persistence.*; +import java.util.Date; + +@Entity +@Data +@Table(indexes = {@Index(columnList = "competitionId")}) +public class ExamPaper { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + private Long competitionId; + private Integer stageId; + private Date startTime; + private Date endTime; + +} diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/repository/CompetitionDao.java b/tz/competition/competition-service/src/main/java/com/tz/platform/repository/CompetitionDao.java new file mode 100644 index 0000000..fce3a83 --- /dev/null +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/repository/CompetitionDao.java @@ -0,0 +1,9 @@ +package com.tz.platform.repository; + +import com.tz.platform.entity.Competition; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface CompetitionDao extends JpaRepository { +} diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/repository/CompetitionGroupDao.java b/tz/competition/competition-service/src/main/java/com/tz/platform/repository/CompetitionGroupDao.java new file mode 100644 index 0000000..85b9172 --- /dev/null +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/repository/CompetitionGroupDao.java @@ -0,0 +1,9 @@ +package com.tz.platform.repository; + +import com.tz.platform.entity.CompetitionGroup; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface CompetitionGroupDao extends JpaRepository { +} 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 new file mode 100644 index 0000000..efcd7ac --- /dev/null +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/repository/CompetitionTaskDao.java @@ -0,0 +1,9 @@ +package com.tz.platform.repository; + +import com.tz.platform.entity.CompetitionTask; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface CompetitionTaskDao extends JpaRepository { +} diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/repository/ExamPaperDao.java b/tz/competition/competition-service/src/main/java/com/tz/platform/repository/ExamPaperDao.java new file mode 100644 index 0000000..2d0c5a3 --- /dev/null +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/repository/ExamPaperDao.java @@ -0,0 +1,9 @@ +package com.tz.platform.repository; + +import com.tz.platform.entity.ExamPaper; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ExamPaperDao extends JpaRepository { +} diff --git a/tz/competition/competition-service/src/main/resources/bootstrap.yml b/tz/competition/competition-service/src/main/resources/bootstrap.yml index 0b6e2ae..0e07d4f 100644 --- a/tz/competition/competition-service/src/main/resources/bootstrap.yml +++ b/tz/competition/competition-service/src/main/resources/bootstrap.yml @@ -14,4 +14,7 @@ spring: namespace: ${spring.profiles.active} file-extension: yaml discovery: - namespace: ${spring.profiles.active} \ No newline at end of file + namespace: ${spring.profiles.active} + devtools: + livereload: + port: 35731 \ No newline at end of file diff --git a/tz/competition/competition-service/target/classes/bootstrap.yml b/tz/competition/competition-service/target/classes/bootstrap.yml deleted file mode 100644 index 0b6e2ae..0000000 --- a/tz/competition/competition-service/target/classes/bootstrap.yml +++ /dev/null @@ -1,17 +0,0 @@ -server: - port: 50012 -spring: - application: - name: tz-competition-service - profiles: - active: dev - cloud: - nacos: - server-addr: 127.0.0.1:8848 - username: nacos - password: nacos - config: - namespace: ${spring.profiles.active} - file-extension: yaml - discovery: - namespace: ${spring.profiles.active} \ No newline at end of file diff --git a/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/qo/QuestionQO.java b/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/qo/QuestionQO.java index 24d6c71..a493f89 100644 --- a/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/qo/QuestionQO.java +++ b/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/qo/QuestionQO.java @@ -1,7 +1,6 @@ package com.tz.platform.feign.exam.qo; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.tz.platform.common.core.vo.Answer; +import com.tz.platform.common.core.bo.Answer; import java.util.List; diff --git a/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/vo/QuestionVo.java b/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/vo/QuestionVo.java index e05dbb8..5b6cff4 100644 --- a/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/vo/QuestionVo.java +++ b/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/vo/QuestionVo.java @@ -1,6 +1,6 @@ package com.tz.platform.feign.exam.vo; -import com.tz.platform.common.core.vo.Answer; +import com.tz.platform.common.core.bo.Answer; import lombok.Data; import lombok.experimental.Accessors; 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 30c799f..58747d0 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 @@ -1,8 +1,8 @@ package com.tz.platform.entity; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.tz.platform.common.core.vo.Answer; -import com.tz.platform.common.core.vo.SubQuestionVO; +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; @@ -45,7 +45,6 @@ public class Question { private String analysis; @Type(type = "json") @Column(columnDefinition = "json") - @JsonIgnore private List answerId; @Type(type = "json") diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/exam/pc/vo/QuestionVO.java b/tz/exam/exam-service/src/main/java/com/tz/platform/exam/pc/vo/QuestionVO.java index 0109d53..fda90a5 100644 --- a/tz/exam/exam-service/src/main/java/com/tz/platform/exam/pc/vo/QuestionVO.java +++ b/tz/exam/exam-service/src/main/java/com/tz/platform/exam/pc/vo/QuestionVO.java @@ -1,6 +1,6 @@ package com.tz.platform.exam.pc.vo; -import com.tz.platform.common.core.vo.Answer; +import com.tz.platform.common.core.bo.Answer; import lombok.Data; import lombok.experimental.Accessors; import java.util.List; diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/pc/biz/PCMuiltQuestionBiz.java b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/biz/PCMuiltQuestionBiz.java new file mode 100644 index 0000000..74a6b7d --- /dev/null +++ b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/biz/PCMuiltQuestionBiz.java @@ -0,0 +1,77 @@ +package com.tz.platform.pc.biz; + +import com.tz.platform.common.core.base.Result; +import com.tz.platform.entity.Question; +import com.tz.platform.pc.dto.MultiQuestionDTO; +import com.tz.platform.pc.dto.PageMuiltQuestionDTO; +import com.tz.platform.pc.dto.PageQuestionDTO; +import com.tz.platform.pc.vo.*; +import com.tz.platform.repository.QuestionDao; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; + +@Component +public class PCMuiltQuestionBiz { + + @Autowired + private QuestionDao questionDao; + + public Result list(PageQuestionVO questionVO){ + PageMuiltQuestionDTO questionDTO = new PageMuiltQuestionDTO(); + Pageable pageable = PageRequest.of(questionVO.getPageNo(),20); + Page questions =null; + if((questionVO.getCourseId() == null|| questionVO.getCourseId() == 0) && StringUtils.isEmpty(questionVO.getStem())){ + questions = questionDao.findAllByType(1,pageable); + }else if(questionVO.getCourseId()>0&&StringUtils.hasText(questionVO.getStem())){ + questions = questionDao.findAllByCourseIdAndStemAndType(questionVO.getCourseId(),questionVO.getStem(),1,pageable); + }else if(questionVO.getCourseId()>0){ + questions = questionDao.findAllByCourseIdAndType(questionVO.getCourseId(),1,pageable); + }else { + questions = questionDao.findAllByStemAndType(questionVO.getStem(), 1,pageable); + } + return Result.success(questionDTO.setPage(questions)); + } + + public Result add(MuiltQuestionVO vo){ + Question question = new Question(); + BeanUtils.copyProperties(vo,question); + question = questionDao.save(question); + return Result.success(question.getId()); + } + + public Result update(MultiQuestionUpdateVO vo){ + Question question = questionDao.getById(vo.getId()); + if(question==null){ + return Result.error("无数据"); + } + BeanUtils.copyProperties(vo,question); + questionDao.save(question); + return Result.success("success"); + } + + public Result delete(QuestionVO vo){ + questionDao.deleteById(vo.getId()); + return Result.success("success"); + } + + public Result get(QuestionVO vo){ + Question question = questionDao.getById(vo.getId()); + if(question == null){ + return Result.error("没有数据"); + } + MultiQuestionDTO questionDTO = new MultiQuestionDTO(); + BeanUtils.copyProperties(question,questionDTO); + return Result.success(questionDTO); + } + + public Result batch(BatchQuestionVO vo){ + questionDao.batchUpdate(vo.getStatus(),vo.getIds()); + return Result.success("success"); + } + +} diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/pc/dto/MultiQuestionDTO.java b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/dto/MultiQuestionDTO.java index bc840a6..e1952a5 100644 --- a/tz/exam/exam-service/src/main/java/com/tz/platform/pc/dto/MultiQuestionDTO.java +++ b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/dto/MultiQuestionDTO.java @@ -1,6 +1,6 @@ package com.tz.platform.pc.dto; -import com.tz.platform.common.core.vo.SubQuestionVO; +import com.tz.platform.common.core.bo.SubQuestionVO; import lombok.Data; import java.io.Serializable; diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/pc/dto/QuestionDTO.java b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/dto/QuestionDTO.java index fc32460..6cc80a4 100644 --- a/tz/exam/exam-service/src/main/java/com/tz/platform/pc/dto/QuestionDTO.java +++ b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/dto/QuestionDTO.java @@ -1,6 +1,6 @@ package com.tz.platform.pc.dto; -import com.tz.platform.common.core.vo.Answer; +import com.tz.platform.common.core.bo.Answer; import lombok.Data; import java.io.Serializable; diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/MuiltQuestionVO.java b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/MuiltQuestionVO.java index 8b35b13..8495b30 100644 --- a/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/MuiltQuestionVO.java +++ b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/MuiltQuestionVO.java @@ -1,7 +1,6 @@ package com.tz.platform.pc.vo; -import com.tz.platform.common.core.vo.Answer; -import com.tz.platform.common.core.vo.SubQuestionVO; +import com.tz.platform.common.core.bo.SubQuestionVO; import lombok.Data; import java.util.List; diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/MultiQuestionUpdateVO.java b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/MultiQuestionUpdateVO.java index f9373b1..eceb60c 100644 --- a/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/MultiQuestionUpdateVO.java +++ b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/MultiQuestionUpdateVO.java @@ -1,6 +1,6 @@ package com.tz.platform.pc.vo; -import com.tz.platform.common.core.vo.SubQuestionVO; +import com.tz.platform.common.core.bo.SubQuestionVO; import lombok.Data; import java.util.List; diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/QuestionUpdateVO.java b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/QuestionUpdateVO.java index e4068f0..072bc9c 100644 --- a/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/QuestionUpdateVO.java +++ b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/QuestionUpdateVO.java @@ -1,6 +1,6 @@ package com.tz.platform.pc.vo; -import com.tz.platform.common.core.vo.Answer; +import com.tz.platform.common.core.bo.Answer; import lombok.Data; import java.util.List; diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/QuestionVO.java b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/QuestionVO.java index 4df5e70..083ef97 100644 --- a/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/QuestionVO.java +++ b/tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/QuestionVO.java @@ -1,6 +1,6 @@ package com.tz.platform.pc.vo; -import com.tz.platform.common.core.vo.Answer; +import com.tz.platform.common.core.bo.Answer; import lombok.Data; import java.util.List; diff --git a/tz/exam/exam-service/src/test/java/com/tz/platform/repository/QuestionDaoTest.java b/tz/exam/exam-service/src/test/java/com/tz/platform/repository/QuestionDaoTest.java index 3312ee4..d56a899 100644 --- a/tz/exam/exam-service/src/test/java/com/tz/platform/repository/QuestionDaoTest.java +++ b/tz/exam/exam-service/src/test/java/com/tz/platform/repository/QuestionDaoTest.java @@ -1,6 +1,6 @@ package com.tz.platform.repository; -import com.tz.platform.common.core.vo.Answer; +import com.tz.platform.common.core.bo.Answer; import com.tz.platform.entity.Question; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/tz/system/system-service/src/main/java/com/tz/platform/system/pc/ProviceController.java b/tz/system/system-service/src/main/java/com/tz/platform/system/pc/ProviceController.java new file mode 100644 index 0000000..718daa7 --- /dev/null +++ b/tz/system/system-service/src/main/java/com/tz/platform/system/pc/ProviceController.java @@ -0,0 +1,8 @@ +package com.tz.platform.system.pc; + +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class ProviceController { + +}