From 627e479d983df4be0981049aabef855e25c72d0b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 17 六月 2024 17:55:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/domain/vo/MeetVO.java | 52 ++++
src/main/java/com/ycl/jxkg/enums/MeetStatusEnum.java | 45 ++++
src/main/java/com/ycl/jxkg/mapper/MeetMapper.java | 34 +++
src/main/java/com/ycl/jxkg/controller/student/MeetController.java | 49 ++++
src/main/java/com/ycl/jxkg/service/MeetService.java | 65 +++++
src/main/java/com/ycl/jxkg/domain/query/MeetQuery.java | 22 ++
src/main/resources/mapper/MeetMapper.xml | 54 ++++
src/main/java/com/ycl/jxkg/controller/admin/MeetController.java | 75 ++++++
src/main/java/com/ycl/jxkg/domain/form/MeetForm.java | 64 +++++
src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java | 132 ++++++++++++
src/main/java/com/ycl/jxkg/domain/entity/Meet.java | 51 ++++
src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java | 6
12 files changed, 648 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/MeetController.java b/src/main/java/com/ycl/jxkg/controller/admin/MeetController.java
new file mode 100644
index 0000000..e8a9221
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/controller/admin/MeetController.java
@@ -0,0 +1,75 @@
+package com.ycl.jxkg.controller.admin;
+
+import com.ycl.jxkg.group.Update;
+import com.ycl.jxkg.group.Add;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import lombok.RequiredArgsConstructor;
+import java.util.List;
+import org.springframework.validation.annotation.Validated;
+import javax.validation.constraints.NotEmpty;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.ycl.jxkg.service.MeetService;
+import com.ycl.jxkg.base.Result;
+import com.ycl.jxkg.domain.form.MeetForm;
+import com.ycl.jxkg.domain.query.MeetQuery;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 浼氳琛� 鍓嶇鎺у埗鍣�
+ *
+ * @author flq
+ * @since 2024-06-17
+ */
+@Validated
+@RequiredArgsConstructor
+@Api(value = "浼氳琛�", tags = "浼氳琛ㄧ鐞�")
+@RestController
+@RequestMapping("api/admin/meet")
+public class MeetController {
+
+ private final MeetService meetService;
+
+ @PostMapping
+ @ApiOperation(value = "娣诲姞", notes = "娣诲姞")
+ public Result add(@RequestBody @Validated(Add.class) MeetForm form) {
+ return meetService.add(form);
+ }
+
+ @PutMapping
+ @ApiOperation(value = "淇敼", notes = "淇敼")
+ public Result update(@RequestBody @Validated(Update.class) MeetForm form) {
+ return meetService.update(form);
+ }
+
+ @DeleteMapping("/{id}")
+ @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
+ public Result removeById(@PathVariable("id") String id) {
+ return meetService.removeById(id);
+ }
+
+ @DeleteMapping("/batch")
+ @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
+ public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
+ return meetService.remove(ids);
+ }
+
+ @GetMapping("/page")
+ @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
+ public Result page(MeetQuery query) {
+ return meetService.page(query);
+ }
+
+ @GetMapping("/{id}")
+ @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
+ public Result detail(@PathVariable("id") Integer id) {
+ return meetService.detail(id);
+ }
+
+ @GetMapping("/list")
+ public Result list() {
+ return meetService.all();
+ }
+}
diff --git a/src/main/java/com/ycl/jxkg/controller/student/MeetController.java b/src/main/java/com/ycl/jxkg/controller/student/MeetController.java
new file mode 100644
index 0000000..52f85d7
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/controller/student/MeetController.java
@@ -0,0 +1,49 @@
+package com.ycl.jxkg.controller.student;
+
+import com.ycl.jxkg.base.Result;
+import com.ycl.jxkg.domain.form.MeetForm;
+import com.ycl.jxkg.domain.query.MeetQuery;
+import com.ycl.jxkg.group.Add;
+import com.ycl.jxkg.group.Update;
+import com.ycl.jxkg.service.MeetService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * 浼氳琛� 鍓嶇鎺у埗鍣�
+ *
+ * @author flq
+ * @since 2024-06-17
+ */
+@Validated
+@RequiredArgsConstructor
+@Api(value = "浼氳琛�", tags = "浼氳琛ㄧ鐞�")
+@RestController
+@RequestMapping("api/student/meet")
+public class MeetController {
+
+ private final MeetService meetService;
+
+ @GetMapping("/page")
+ @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
+ public Result page(MeetQuery query) {
+ return meetService.page(query);
+ }
+
+ @GetMapping("/{id}")
+ @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
+ public Result detail(@PathVariable("id") Integer id) {
+ return meetService.detail(id);
+ }
+
+ @GetMapping("/list")
+ public Result list() {
+ return meetService.all();
+ }
+}
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/Meet.java b/src/main/java/com/ycl/jxkg/domain/entity/Meet.java
new file mode 100644
index 0000000..6bb8085
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/domain/entity/Meet.java
@@ -0,0 +1,51 @@
+package com.ycl.jxkg.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ycl.jxkg.domain.base.AbsEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 浼氳琛�
+ *
+ * @author flq
+ * @since 2024-06-17
+ */
+@Data
+@TableName("t_meet")
+public class Meet extends AbsEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableField("meet_name")
+ /** 浼氳鍚� */
+ private String meetName;
+
+ @TableField("meet_cover")
+ /** 浼氳灏侀潰 */
+ private String meetCover;
+
+ @TableField("student_ids")
+ /** 瀛︾敓id */
+ private String studentIds;
+
+ @TableField("create_user")
+ /** 鍒涘缓浜� */
+ private Integer createUser;
+
+ @TableField("start_time")
+ /** 寮�濮嬫椂闂� */
+ private Date startTime;
+
+ @TableField("end_time")
+ /** 缁撴潫鏃堕棿 */
+ private Date endTime;
+
+ @TableField("status")
+ /** 鐘舵�� 0/1/2 鏈紑濮�/杩涜涓�/宸茬粨鏉� */
+ private Integer status;
+
+
+}
diff --git a/src/main/java/com/ycl/jxkg/domain/form/MeetForm.java b/src/main/java/com/ycl/jxkg/domain/form/MeetForm.java
new file mode 100644
index 0000000..95c1c59
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/domain/form/MeetForm.java
@@ -0,0 +1,64 @@
+package com.ycl.jxkg.domain.form;
+
+import com.ycl.jxkg.group.Update;
+import com.ycl.jxkg.group.Add;
+import com.ycl.jxkg.domain.base.AbsForm;
+import com.ycl.jxkg.domain.entity.Meet;
+import org.springframework.beans.BeanUtils;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import org.springframework.lang.NonNull;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 浼氳琛ㄨ〃鍗�
+ *
+ * @author flq
+ * @since 2024-06-17
+ */
+@Data
+@ApiModel(value = "Meet琛ㄥ崟", description = "浼氳琛ㄨ〃鍗�")
+public class MeetForm extends AbsForm {
+
+ @NotBlank(message = "浼氳鍚嶄笉鑳戒负绌�", groups = {Add.class, Update.class})
+ @ApiModelProperty("浼氳鍚�")
+ private String meetName;
+
+ @NotBlank(message = "浼氳灏侀潰涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("浼氳灏侀潰")
+ private String meetCover;
+
+ @NotBlank(message = "瀛︾敓id涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("瀛︾敓id")
+ private List<Integer> studentIds;
+
+ @NotNull(message = "鍒涘缓浜轰笉鑳戒负绌�", groups = {Add.class, Update.class})
+ @ApiModelProperty("鍒涘缓浜�")
+ private Integer createUser;
+
+ @NotNull(message = "寮�濮嬫椂闂翠笉鑳戒负绌�", groups = {Add.class, Update.class})
+ @ApiModelProperty("寮�濮嬫椂闂�")
+ private Date startTime;
+
+ @NotNull(message = "缁撴潫鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("缁撴潫鏃堕棿")
+ private Date endTime;
+
+ @NotNull(message = "鐘舵�� 0/1/2 鏈紑濮�/杩涜涓�/宸茬粨鏉熶笉鑳戒负绌�", groups = {Add.class, Update.class})
+ @ApiModelProperty("鐘舵�� 0/1/2 鏈紑濮�/杩涜涓�/宸茬粨鏉�")
+ private Integer status;
+
+ public static Meet getEntityByForm(@NonNull MeetForm form, Meet entity) {
+ if(entity == null) {
+ entity = new Meet();
+ }
+ BeanUtils.copyProperties(form, entity);
+ return entity;
+ }
+
+}
diff --git a/src/main/java/com/ycl/jxkg/domain/query/MeetQuery.java b/src/main/java/com/ycl/jxkg/domain/query/MeetQuery.java
new file mode 100644
index 0000000..140677e
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/domain/query/MeetQuery.java
@@ -0,0 +1,22 @@
+package com.ycl.jxkg.domain.query;
+
+import com.ycl.jxkg.domain.base.AbsQuery;
+import java.util.List;
+import org.springframework.lang.NonNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 浼氳琛ㄦ煡璇�
+ *
+ * @author flq
+ * @since 2024-06-17
+ */
+@Data
+@ApiModel(value = "Meet鏌ヨ", description = "浼氳琛ㄦ煡璇�")
+public class MeetQuery extends AbsQuery {
+}
+
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/MeetVO.java b/src/main/java/com/ycl/jxkg/domain/vo/MeetVO.java
new file mode 100644
index 0000000..a6a3c59
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/domain/vo/MeetVO.java
@@ -0,0 +1,52 @@
+package com.ycl.jxkg.domain.vo;
+
+import com.ycl.jxkg.domain.base.AbsVo;
+import com.ycl.jxkg.domain.entity.Meet;
+
+import java.util.Date;
+import java.util.List;
+import org.springframework.lang.NonNull;
+import org.springframework.beans.BeanUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 浼氳琛ㄥ睍绀�
+ *
+ * @author flq
+ * @since 2024-06-17
+ */
+@Data
+public class MeetVO extends AbsVo {
+
+ /** 浼氳鍚� */
+ private String meetName;
+
+ /** 浼氳灏侀潰 */
+ private String meetCover;
+
+ /** 瀛︾敓id */
+ private List<Integer> studentIds;
+
+ /** 鍒涘缓浜� */
+ private Integer createUser;
+
+ /** 寮�濮嬫椂闂� */
+ private Date startTime;
+
+ /** 缁撴潫鏃堕棿 */
+ private Date endTime;
+
+ /** 鐘舵�� 0/1/2 鏈紑濮�/杩涜涓�/宸茬粨鏉� */
+ private Integer status;
+
+ public static MeetVO getVoByEntity(@NonNull Meet entity, MeetVO vo) {
+ if(vo == null) {
+ vo = new MeetVO();
+ }
+ BeanUtils.copyProperties(entity, vo);
+ return vo;
+ }
+
+}
diff --git a/src/main/java/com/ycl/jxkg/enums/MeetStatusEnum.java b/src/main/java/com/ycl/jxkg/enums/MeetStatusEnum.java
new file mode 100644
index 0000000..d69221d
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/enums/MeetStatusEnum.java
@@ -0,0 +1,45 @@
+package com.ycl.jxkg.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum MeetStatusEnum {
+
+ Wait(0, "鏈紑濮�"),
+ Starting(1, "杩涜涓�"),
+ End(2, "宸茬粨鏉�");
+
+
+ Integer code;
+ String name;
+
+ MeetStatusEnum(Integer code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+
+ private static Map<Integer, MeetStatusEnum> keyMap = new HashMap<>();
+
+ static {
+ for (MeetStatusEnum item : MeetStatusEnum.values()) {
+ keyMap.put(item.getCode(), item);
+ }
+ }
+
+ public static MeetStatusEnum fromCode(Integer code) {
+ return keyMap.get(code);
+ }
+
+
+ public Integer getCode() {
+ return code;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+
+
+}
diff --git a/src/main/java/com/ycl/jxkg/mapper/MeetMapper.java b/src/main/java/com/ycl/jxkg/mapper/MeetMapper.java
new file mode 100644
index 0000000..74ae5f6
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/mapper/MeetMapper.java
@@ -0,0 +1,34 @@
+package com.ycl.jxkg.mapper;
+
+import com.ycl.jxkg.domain.entity.Meet;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.jxkg.domain.query.MeetQuery;
+import com.ycl.jxkg.domain.vo.MeetVO;
+import com.ycl.jxkg.domain.form.MeetForm;
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 浼氳琛� Mapper 鎺ュ彛
+ *
+ * @author flq
+ * @since 2024-06-17
+ */
+@Mapper
+public interface MeetMapper extends BaseMapper<Meet> {
+
+ /**
+ * id鏌ユ壘浼氳琛�
+ * @param id
+ * @return
+ */
+ MeetVO getById(Integer id);
+
+ /**
+ * 鍒嗛〉
+ */
+ IPage getPage(IPage page, @Param("query") MeetQuery query);
+
+}
diff --git a/src/main/java/com/ycl/jxkg/service/MeetService.java b/src/main/java/com/ycl/jxkg/service/MeetService.java
new file mode 100644
index 0000000..e1791fd
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/service/MeetService.java
@@ -0,0 +1,65 @@
+package com.ycl.jxkg.service;
+
+import com.ycl.jxkg.domain.entity.Meet;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.jxkg.base.Result;
+import com.ycl.jxkg.domain.form.MeetForm;
+import com.ycl.jxkg.domain.query.MeetQuery;
+import java.util.List;
+
+/**
+ * 浼氳琛� 鏈嶅姟绫�
+ *
+ * @author flq
+ * @since 2024-06-17
+ */
+public interface MeetService extends IService<Meet> {
+
+ /**
+ * 娣诲姞
+ * @param form
+ * @return
+ */
+ Result add(MeetForm form);
+
+ /**
+ * 淇敼
+ * @param form
+ * @return
+ */
+ Result update(MeetForm form);
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ Result remove(List<String> ids);
+
+ /**
+ * id鍒犻櫎
+ * @param id
+ * @return
+ */
+ Result removeById(String id);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @return
+ */
+ Result page(MeetQuery query);
+
+ /**
+ * 鏍规嵁id鏌ユ壘
+ * @param id
+ * @return
+ */
+ Result detail(Integer id);
+
+ /**
+ * 鍒楄〃
+ * @return
+ */
+ Result all();
+}
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
index 37e4ce7..7768c0a 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
@@ -119,8 +119,12 @@
if (InnerError4 != null) return InnerError4;
Result InnerError5 = createQuestion(questionSetting, questionTitleList, questionType, questionIdList,QuestionTypeEnum.ShortAnswer.getCode());
if (InnerError5 != null) return InnerError5;
- Result InnerError6 = createQuestion(questionSetting, questionTitleList, questionType, questionIdList,QuestionTypeEnum.Calculate.getCode());
+ Result InnerError6 = createQuestion(questionSetting, questionTitleList, questionType, questionIdList,QuestionTypeEnum.Audio.getCode());
if (InnerError6 != null) return InnerError6;
+ Result InnerError7 = createQuestion(questionSetting, questionTitleList, questionType, questionIdList,QuestionTypeEnum.Calculate.getCode());
+ if (InnerError7 != null) return InnerError7;
+ Result InnerError8 = createQuestion(questionSetting, questionTitleList, questionType, questionIdList,QuestionTypeEnum.Analysis.getCode());
+ if (InnerError8 != null) return InnerError8;
}
examPaper.setContent(JSON.toJSONString(questionTitleList));
baseMapper.insert(examPaper);
diff --git a/src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java
new file mode 100644
index 0000000..31d55b9
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java
@@ -0,0 +1,132 @@
+package com.ycl.jxkg.service.impl;
+
+import com.alibaba.fastjson2.JSONArray;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.jxkg.domain.entity.Meet;
+import com.ycl.jxkg.mapper.MeetMapper;
+import com.ycl.jxkg.service.MeetService;
+import com.ycl.jxkg.base.Result;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.jxkg.domain.form.MeetForm;
+import com.ycl.jxkg.domain.vo.MeetVO;
+import com.ycl.jxkg.domain.query.MeetQuery;
+import org.springframework.stereotype.Service;
+import lombok.RequiredArgsConstructor;
+import com.ycl.jxkg.utils.PageUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.util.Assert;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 浼氳琛� 鏈嶅姟瀹炵幇绫�
+ *
+ * @author flq
+ * @since 2024-06-17
+ */
+@Service
+@RequiredArgsConstructor
+public class MeetServiceImpl extends ServiceImpl<MeetMapper, Meet> implements MeetService {
+
+ private final MeetMapper meetMapper;
+
+ /**
+ * 娣诲姞
+ * @param form
+ * @return
+ */
+ @Override
+ public Result add(MeetForm form) {
+ Meet entity = MeetForm.getEntityByForm(form, null);
+ entity.setStudentIds(JSONArray.toJSONString(form.getStudentIds()));
+ baseMapper.insert(entity);
+ return Result.ok("娣诲姞鎴愬姛");
+ }
+
+ /**
+ * 淇敼
+ * @param form
+ * @return
+ */
+ @Override
+ public Result update(MeetForm form) {
+ Meet entity = baseMapper.selectById(form.getId());
+
+ // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ BeanUtils.copyProperties(form, entity);
+ entity.setStudentIds(JSONArray.toJSONString(form.getStudentIds()));
+ baseMapper.updateById(entity);
+ return Result.ok("淇敼鎴愬姛");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ @Override
+ public Result remove(List<String> ids) {
+ baseMapper.deleteBatchIds(ids);
+ return Result.ok("鍒犻櫎鎴愬姛");
+ }
+
+ /**
+ * id鍒犻櫎
+ * @param id
+ * @return
+ */
+ @Override
+ public Result removeById(String id) {
+ baseMapper.deleteById(id);
+ return Result.ok("鍒犻櫎鎴愬姛");
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @return
+ */
+ @Override
+ public Result page(MeetQuery query) {
+
+ IPage<Meet> page = PageUtil.getPage(query, Meet.class);
+ baseMapper.getPage(page, query);
+ List<Meet> records = page.getRecords();
+ List<MeetVO> vos = new ArrayList<>();
+ for (Meet record : records) {
+ MeetVO meetVO = new MeetVO();
+ BeanUtils.copyProperties(record,meetVO);
+ meetVO.setStudentIds(JSONArray.parseArray(record.getStudentIds(),Integer.class));
+ vos.add(meetVO);
+ }
+ return Result.ok().data(vos).total(page.getTotal());
+ }
+
+ /**
+ * 鏍规嵁id鏌ユ壘
+ * @param id
+ * @return
+ */
+ @Override
+ public Result detail(Integer id) {
+ MeetVO vo = baseMapper.getById(id);
+ Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
+ return Result.ok().data(vo);
+ }
+
+ /**
+ * 鍒楄〃
+ * @return
+ */
+ @Override
+ public Result all() {
+ List<Meet> entities = baseMapper.selectList(null);
+ List<MeetVO> vos = entities.stream()
+ .map(entity -> MeetVO.getVoByEntity(entity, null))
+ .collect(Collectors.toList());
+ return Result.ok().data(vos);
+ }
+}
diff --git a/src/main/resources/mapper/MeetMapper.xml b/src/main/resources/mapper/MeetMapper.xml
new file mode 100644
index 0000000..ef9c874
--- /dev/null
+++ b/src/main/resources/mapper/MeetMapper.xml
@@ -0,0 +1,54 @@
+<?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.ycl.jxkg.mapper.MeetMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.Meet">
+ <result column="meet_name" property="meetName" />
+ <result column="meet_cover" property="meetCover" />
+ <result column="student_ids" property="studentIds" />
+ <result column="create_user" property="createUser" />
+ <result column="start_time" property="startTime" />
+ <result column="end_time" property="endTime" />
+ <result column="status" property="status" />
+ </resultMap>
+
+
+ <select id="getById" resultMap="BaseResultMap">
+ SELECT
+ TM.meet_name,
+ TM.meet_cover,
+ TM.student_ids,
+ TM.create_user,
+ TM.start_time,
+ TM.end_time,
+ TM.status,
+ TM.id
+ FROM
+ t_meet TM
+ WHERE
+ TM.id = #{id} AND TM.deleted = 0
+ </select>
+
+
+ <select id="getPage" resultMap="BaseResultMap">
+ SELECT
+ TM.meet_name,
+ TM.meet_cover,
+ TM.student_ids,
+ TM.create_user,
+ TM.start_time,
+ TM.end_time,
+ TM.status,
+ TM.id
+ FROM
+ t_meet TM
+ <where>
+ TM.deleted = 0
+ <if test="studentId!=null">
+ and
+ </if>
+ </where>
+ </select>
+
+</mapper>
--
Gitblit v1.8.0