diff --git a/signin/src/main/java/com/ccsens/signin/intercept/MybatisInterceptor.java b/signin/src/main/java/com/ccsens/signin/intercept/MybatisInterceptor.java index 1c78ff6e..fbb02f10 100644 --- a/signin/src/main/java/com/ccsens/signin/intercept/MybatisInterceptor.java +++ b/signin/src/main/java/com/ccsens/signin/intercept/MybatisInterceptor.java @@ -1,4 +1,4 @@ -package com.ccsens.wisdomcar.intercept; +package com.ccsens.signin.intercept; import cn.hutool.core.collection.CollectionUtil; import com.ccsens.util.WebConstant; diff --git a/tcm/src/main/java/com/ccsens/tcm/api/ConferenceRecordsController.java b/tcm/src/main/java/com/ccsens/tcm/api/ConferenceRecordsController.java index 2d12852c..1cf3c366 100644 --- a/tcm/src/main/java/com/ccsens/tcm/api/ConferenceRecordsController.java +++ b/tcm/src/main/java/com/ccsens/tcm/api/ConferenceRecordsController.java @@ -53,7 +53,7 @@ public class ConferenceRecordsController { @RequestMapping(value = "/save", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse saveConference(@ApiParam @Validated @RequestBody QueryDto params) { log.info("统计每个医院的完成情况：{}",params); - ConRecVo.SelConRecVo saveConference = conferenceService.saveConference(params.getParam()); + ConRecVo.SelConRecVo saveConference = conferenceService.saveConference(params.getParam(),params.getUserId()); log.info("查找每个医院的病例完成情况"); return JsonResponse.newInstance().ok(saveConference); } @@ -61,10 +61,20 @@ public class ConferenceRecordsController { @MustLogin @ApiOperation(value = "分享会议记录", notes = "zy:") @RequestMapping(value = "/share", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse shareConference(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + public JsonResponse shareConference(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { log.info("统计每个医院的完成情况：{}",params); ConRecVo.ShareConRecVo shareConference = conferenceService.shareConference(params.getParam()); log.info("查找每个医院的病例完成情况"); return JsonResponse.newInstance().ok(shareConference); } + + @MustLogin + @ApiOperation(value = "查看会议记录", notes = "zy:") + @RequestMapping(value = "/get", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse getConference(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("统计每个医院的完成情况：{}",params); + ConRecVo.SelConRecVo selConRecVo = conferenceService.getConference(params.getParam()); + log.info("查找每个医院的病例完成情况"); + return JsonResponse.newInstance().ok(selConRecVo); + } } diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/dto/ConRecDto.java b/tcm/src/main/java/com/ccsens/tcm/bean/dto/ConRecDto.java index 4c92cbfa..fe250dcb 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/dto/ConRecDto.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/dto/ConRecDto.java @@ -7,6 +7,7 @@ import lombok.Data; import javax.validation.constraints.Max; import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; import java.util.Date; /** @@ -41,8 +42,11 @@ public class ConRecDto { } @Data - @ApiModel("查询会议记录搜索条件") + @ApiModel("添加会议记录") public static class SaveConference { + @NotNull(message = "任务id不能为空") + @ApiModelProperty("任务id") + private Long taskId; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("开始时间") private Date startTime; @@ -55,9 +59,17 @@ public class ConRecDto { private String host; @ApiModelProperty("'参会人'") private String participants; - @ApiModelProperty("内容") + @ApiModelProperty("研讨内容") private String discussionContent; - @ApiModelProperty("内容") + @ApiModelProperty("会议纪要") private String meetingMinutes; } + + @Data + @ApiModel("会议关联的任务id") + public static class ConferenceTask { + @NotNull(message = "任务id不能为空") + @ApiModelProperty("任务id") + private Long taskId; + } } diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecords.java b/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecords.java index 64bc54df..bb5adf4e 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecords.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecords.java @@ -6,6 +6,8 @@ import java.util.Date; public class ConferenceRecords implements Serializable { private Long id; + private Long taskId; + private Date startTime; private Date endTime; @@ -38,6 +40,14 @@ public class ConferenceRecords implements Serializable { this.id = id; } + public Long getTaskId() { + return taskId; + } + + public void setTaskId(Long taskId) { + this.taskId = taskId; + } + public Date getStartTime() { return startTime; } @@ -133,6 +143,7 @@ public class ConferenceRecords implements Serializable { sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); + sb.append(", taskId=").append(taskId); sb.append(", startTime=").append(startTime); sb.append(", endTime=").append(endTime); sb.append(", place=").append(place); diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecordsExample.java b/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecordsExample.java index bb42fa01..642b351e 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecordsExample.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecordsExample.java @@ -165,6 +165,66 @@ public class ConferenceRecordsExample { return (Criteria) this; } + public Criteria andTaskIdIsNull() { + addCriterion("task_id is null"); + return (Criteria) this; + } + + public Criteria andTaskIdIsNotNull() { + addCriterion("task_id is not null"); + return (Criteria) this; + } + + public Criteria andTaskIdEqualTo(Long value) { + addCriterion("task_id =", value, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdNotEqualTo(Long value) { + addCriterion("task_id <>", value, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdGreaterThan(Long value) { + addCriterion("task_id >", value, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdGreaterThanOrEqualTo(Long value) { + addCriterion("task_id >=", value, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdLessThan(Long value) { + addCriterion("task_id <", value, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdLessThanOrEqualTo(Long value) { + addCriterion("task_id <=", value, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdIn(List values) { + addCriterion("task_id in", values, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdNotIn(List values) { + addCriterion("task_id not in", values, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdBetween(Long value1, Long value2) { + addCriterion("task_id between", value1, value2, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdNotBetween(Long value1, Long value2) { + addCriterion("task_id not between", value1, value2, "taskId"); + return (Criteria) this; + } + public Criteria andStartTimeIsNull() { addCriterion("start_time is null"); return (Criteria) this; diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/vo/ConRecVo.java b/tcm/src/main/java/com/ccsens/tcm/bean/vo/ConRecVo.java index 245f912a..1ab3944e 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/vo/ConRecVo.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/vo/ConRecVo.java @@ -17,6 +17,8 @@ public class ConRecVo { public static class SelConRecVo { @ApiModelProperty("会议记录id") private Long id; + @ApiModelProperty("任务id") + private Long taskId; @ApiModelProperty("会议开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; diff --git a/tcm/src/main/java/com/ccsens/tcm/service/ConferenceService.java b/tcm/src/main/java/com/ccsens/tcm/service/ConferenceService.java index 05cdfc9a..323c180d 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/ConferenceService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/ConferenceService.java @@ -1,6 +1,7 @@ package com.ccsens.tcm.service; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Snowflake; import com.ccsens.tcm.bean.dto.ConRecDto; import com.ccsens.tcm.bean.po.ConferenceRecords; @@ -16,6 +17,8 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; /** * @author 逗 @@ -30,10 +33,11 @@ public class ConferenceService implements IConferenceService{ private ConferenceRecordsMapper conferenceRecordsMapper; @Override - public ConRecVo.SelConRecVo saveConference(ConRecDto.SaveConference param) { + public ConRecVo.SelConRecVo saveConference(ConRecDto.SaveConference param,Long userId) { //新建会议记录对象 ConferenceRecords conferenceRecords = new ConferenceRecords(); conferenceRecords.setId(snowflake.nextId()); + conferenceRecords.setUserId(userId); BeanUtil.copyProperties(param,conferenceRecords); //加入数据库 conferenceRecordsMapper.insertSelective(conferenceRecords); @@ -44,7 +48,7 @@ public class ConferenceService implements IConferenceService{ } @Override - public ConRecVo.ShareConRecVo shareConference(Object param) throws Exception { + public ConRecVo.ShareConRecVo shareConference(ConRecDto.ConferenceTask param) throws Exception { //TODO 获取会议记录的地址 String conferencePath = "www.baidu.com"; //生成二维码 @@ -54,4 +58,16 @@ public class ConferenceService implements IConferenceService{ shareConRecVo.setPath(PropUtil.imgDomain + fileName); return shareConRecVo; } + + @Override + public ConRecVo.SelConRecVo getConference(ConRecDto.ConferenceTask param) { + ConRecVo.SelConRecVo selConRecVo = new ConRecVo.SelConRecVo(); + ConferenceRecordsExample conferenceRecordsExample = new ConferenceRecordsExample(); + conferenceRecordsExample.createCriteria().andTaskIdEqualTo(param.getTaskId()); + List conferenceRecordsList = conferenceRecordsMapper.selectByExample(conferenceRecordsExample); + if(CollectionUtil.isNotEmpty(conferenceRecordsList)){ + BeanUtil.copyProperties(conferenceRecordsList.get(0),selConRecVo); + } + return selConRecVo; + } } diff --git a/tcm/src/main/java/com/ccsens/tcm/service/IConferenceService.java b/tcm/src/main/java/com/ccsens/tcm/service/IConferenceService.java index 0db25c3d..9ef05d66 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/IConferenceService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/IConferenceService.java @@ -7,14 +7,22 @@ public interface IConferenceService { /** * 添加会议记录 * @param param 会议内容 + * @param userId userId * @return 返回会议内容 */ - ConRecVo.SelConRecVo saveConference(ConRecDto.SaveConference param); + ConRecVo.SelConRecVo saveConference(ConRecDto.SaveConference param,Long userId); /** * 分享会议记录 - * @param param + * @param param 任务id * @return 返回二维码路径 */ - ConRecVo.ShareConRecVo shareConference(Object param) throws Exception; + ConRecVo.ShareConRecVo shareConference(ConRecDto.ConferenceTask param) throws Exception; + + /** + * 查看会议记录 + * @param param 任务id + * @return 返回会议内容 + */ + ConRecVo.SelConRecVo getConference(ConRecDto.ConferenceTask param); } diff --git a/tcm/src/main/resources/mapper_raw/ConferenceRecordsMapper.xml b/tcm/src/main/resources/mapper_raw/ConferenceRecordsMapper.xml index bf1f1f00..5d1330ec 100644 --- a/tcm/src/main/resources/mapper_raw/ConferenceRecordsMapper.xml +++ b/tcm/src/main/resources/mapper_raw/ConferenceRecordsMapper.xml @@ -3,6 +3,7 @@ + @@ -74,8 +75,8 @@ - id, start_time, end_time, place, host, participants, discussion_content, meeting_minutes, - user_id, created_at, update_at, rec_status + id, task_id, start_time, end_time, place, host, participants, discussion_content, + meeting_minutes, user_id, created_at, update_at, rec_status