Browse Source

消息添加任务详情id,修改输入文档相关接口

recovery
ma 4 years ago
parent
commit
81083db04b
  1. 13
      tall/src/main/java/com/ccsens/tall/bean/dto/InputDocDto.java
  2. 11
      tall/src/main/java/com/ccsens/tall/bean/po/SysOperation.java
  3. 60
      tall/src/main/java/com/ccsens/tall/bean/po/SysOperationExample.java
  4. 15
      tall/src/main/java/com/ccsens/tall/bean/vo/InputDocVo.java
  5. 12
      tall/src/main/java/com/ccsens/tall/bean/vo/MessageVo.java
  6. 9
      tall/src/main/java/com/ccsens/tall/persist/dao/SysOperationDao.java
  7. 19
      tall/src/main/java/com/ccsens/tall/persist/dao/SysOperationMessageDao.java
  8. 9
      tall/src/main/java/com/ccsens/tall/service/IInputDocService.java
  9. 51
      tall/src/main/java/com/ccsens/tall/service/InputDocService.java
  10. 1
      tall/src/main/java/com/ccsens/tall/service/ProjectMessageService.java
  11. 6
      tall/src/main/java/com/ccsens/tall/service/RobotService.java
  12. 2
      tall/src/main/java/com/ccsens/tall/util/RobotUtil.java
  13. 12
      tall/src/main/java/com/ccsens/tall/web/InputDocController.java
  14. 13
      tall/src/main/resources/mapper_dao/SysOperationDao.xml
  15. 18
      tall/src/main/resources/mapper_dao/SysOperationMessageDao.xml
  16. 27
      tall/src/main/resources/mapper_raw/SysOperationMapper.xml

13
tall/src/main/java/com/ccsens/tall/bean/dto/InputDocDto.java

@ -100,5 +100,18 @@ public class InputDocDto {
private String remark; private String remark;
} }
@Data
@ApiModel("根据任务id查询文档上传记录")
public static class FindDocRecordByTask{
@NotNull(message = "请选择任务")
@ApiModelProperty("任务详情id")
private Long taskId;
@ApiModelProperty("页码")
private Integer pageNum = 1;
@ApiModelProperty("分页大小")
private Integer PageSize = 10;
}
} }

11
tall/src/main/java/com/ccsens/tall/bean/po/SysOperation.java

@ -20,6 +20,8 @@ public class SysOperation implements Serializable {
private Byte recStatus; private Byte recStatus;
private Long taskDetailId;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public Long getId() { public Long getId() {
@ -86,6 +88,14 @@ public class SysOperation implements Serializable {
this.recStatus = recStatus; this.recStatus = recStatus;
} }
public Long getTaskDetailId() {
return taskDetailId;
}
public void setTaskDetailId(Long taskDetailId) {
this.taskDetailId = taskDetailId;
}
@Override @Override
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
@ -100,6 +110,7 @@ public class SysOperation implements Serializable {
sb.append(", createdAt=").append(createdAt); sb.append(", createdAt=").append(createdAt);
sb.append(", updatedAt=").append(updatedAt); sb.append(", updatedAt=").append(updatedAt);
sb.append(", recStatus=").append(recStatus); sb.append(", recStatus=").append(recStatus);
sb.append(", taskDetailId=").append(taskDetailId);
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();
} }

60
tall/src/main/java/com/ccsens/tall/bean/po/SysOperationExample.java

@ -584,6 +584,66 @@ public class SysOperationExample {
addCriterion("rec_status not between", value1, value2, "recStatus"); addCriterion("rec_status not between", value1, value2, "recStatus");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaskDetailIdIsNull() {
addCriterion("task_detail_id is null");
return (Criteria) this;
}
public Criteria andTaskDetailIdIsNotNull() {
addCriterion("task_detail_id is not null");
return (Criteria) this;
}
public Criteria andTaskDetailIdEqualTo(Long value) {
addCriterion("task_detail_id =", value, "taskDetailId");
return (Criteria) this;
}
public Criteria andTaskDetailIdNotEqualTo(Long value) {
addCriterion("task_detail_id <>", value, "taskDetailId");
return (Criteria) this;
}
public Criteria andTaskDetailIdGreaterThan(Long value) {
addCriterion("task_detail_id >", value, "taskDetailId");
return (Criteria) this;
}
public Criteria andTaskDetailIdGreaterThanOrEqualTo(Long value) {
addCriterion("task_detail_id >=", value, "taskDetailId");
return (Criteria) this;
}
public Criteria andTaskDetailIdLessThan(Long value) {
addCriterion("task_detail_id <", value, "taskDetailId");
return (Criteria) this;
}
public Criteria andTaskDetailIdLessThanOrEqualTo(Long value) {
addCriterion("task_detail_id <=", value, "taskDetailId");
return (Criteria) this;
}
public Criteria andTaskDetailIdIn(List<Long> values) {
addCriterion("task_detail_id in", values, "taskDetailId");
return (Criteria) this;
}
public Criteria andTaskDetailIdNotIn(List<Long> values) {
addCriterion("task_detail_id not in", values, "taskDetailId");
return (Criteria) this;
}
public Criteria andTaskDetailIdBetween(Long value1, Long value2) {
addCriterion("task_detail_id between", value1, value2, "taskDetailId");
return (Criteria) this;
}
public Criteria andTaskDetailIdNotBetween(Long value1, Long value2) {
addCriterion("task_detail_id not between", value1, value2, "taskDetailId");
return (Criteria) this;
}
} }
public static class Criteria extends GeneratedCriteria { public static class Criteria extends GeneratedCriteria {

15
tall/src/main/java/com/ccsens/tall/bean/vo/InputDocVo.java

@ -1,11 +1,13 @@
package com.ccsens.tall.bean.vo; package com.ccsens.tall.bean.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
@ -62,5 +64,18 @@ public class InputDocVo {
private String status; private String status;
} }
@Data
@ApiModel("根据任务id查看输入输出文档记录")
public static class DocRecordOfTask{
@JsonIgnore
@ApiModelProperty("消息操作ID")
private Long operationId;
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
@ApiModelProperty("发送时间")
private Date createTime;
@ApiModelProperty("文件名称")
List<MessageVo.Message> messages;
}
} }

12
tall/src/main/java/com/ccsens/tall/bean/vo/MessageVo.java

@ -222,8 +222,8 @@ public class MessageVo {
* @param taskName * @param taskName
* @return * @return
*/ */
public static Inform uploadForDocComment(Long userId, String userName, Long projectId, String projectName, String taskName,String deliverName) { public static Inform uploadForDocComment(Long userId, String userName, Long projectId, String projectName, String taskName,String deliverName,Long taskId) {
MessageVo.Inform inform = new MessageVo.Inform(projectId, userId); MessageVo.Inform inform = new MessageVo.Inform(projectId, userId,taskId);
inform.appendMessage(new MessageVo.Message(WebConstant.TemplateParam.Operator.value, userName)) inform.appendMessage(new MessageVo.Message(WebConstant.TemplateParam.Operator.value, userName))
.appendMessage(new MessageVo.Message(WebConstant.TemplateParam.ProjectName.value, projectName, WebConstant.Message.TYPE_LINK, Message.getProjectSettings(projectId))) .appendMessage(new MessageVo.Message(WebConstant.TemplateParam.ProjectName.value, projectName, WebConstant.Message.TYPE_LINK, Message.getProjectSettings(projectId)))
.appendMessage(new MessageVo.Message(WebConstant.TemplateParam.TaskName.value,taskName)) .appendMessage(new MessageVo.Message(WebConstant.TemplateParam.TaskName.value,taskName))
@ -240,8 +240,8 @@ public class MessageVo {
* @param taskName * @param taskName
* @return * @return
*/ */
public static Inform delDocComment(Long userId, String userName, Long projectId, String projectName, String taskName,String deliverName) { public static Inform delDocComment(Long userId, String userName, Long projectId, String projectName, String taskName,String deliverName,Long taskId) {
MessageVo.Inform inform = new MessageVo.Inform(projectId, userId); MessageVo.Inform inform = new MessageVo.Inform(projectId, userId,taskId);
inform.appendMessage(new MessageVo.Message(WebConstant.TemplateParam.Operator.value, userName)) inform.appendMessage(new MessageVo.Message(WebConstant.TemplateParam.Operator.value, userName))
.appendMessage(new MessageVo.Message(WebConstant.TemplateParam.ProjectName.value, projectName, WebConstant.Message.TYPE_LINK, Message.getProjectSettings(projectId))) .appendMessage(new MessageVo.Message(WebConstant.TemplateParam.ProjectName.value, projectName, WebConstant.Message.TYPE_LINK, Message.getProjectSettings(projectId)))
.appendMessage(new MessageVo.Message(WebConstant.TemplateParam.TaskName.value,taskName)) .appendMessage(new MessageVo.Message(WebConstant.TemplateParam.TaskName.value,taskName))
@ -258,8 +258,8 @@ public class MessageVo {
* @param taskName * @param taskName
* @return * @return
*/ */
public static Inform updateDocRemarkComment(Long userId, String userName, Long projectId, String projectName, String taskName,String deliverName) { public static Inform updateDocRemarkComment(Long userId, String userName, Long projectId, String projectName, String taskName,String deliverName,Long taskId) {
MessageVo.Inform inform = new MessageVo.Inform(projectId, userId); MessageVo.Inform inform = new MessageVo.Inform(projectId, userId,taskId);
inform.appendMessage(new MessageVo.Message(WebConstant.TemplateParam.Operator.value, userName)) inform.appendMessage(new MessageVo.Message(WebConstant.TemplateParam.Operator.value, userName))
.appendMessage(new MessageVo.Message(WebConstant.TemplateParam.ProjectName.value, projectName, WebConstant.Message.TYPE_LINK, Message.getProjectSettings(projectId))) .appendMessage(new MessageVo.Message(WebConstant.TemplateParam.ProjectName.value, projectName, WebConstant.Message.TYPE_LINK, Message.getProjectSettings(projectId)))
.appendMessage(new MessageVo.Message(WebConstant.TemplateParam.TaskName.value,taskName)) .appendMessage(new MessageVo.Message(WebConstant.TemplateParam.TaskName.value,taskName))

9
tall/src/main/java/com/ccsens/tall/persist/dao/SysOperationDao.java

@ -1,6 +1,8 @@
package com.ccsens.tall.persist.dao; package com.ccsens.tall.persist.dao;
import com.ccsens.tall.bean.dto.ProjectMessageDto; import com.ccsens.tall.bean.dto.ProjectMessageDto;
import com.ccsens.tall.bean.po.SysOperation;
import com.ccsens.tall.bean.vo.InputDocVo;
import com.ccsens.tall.bean.vo.MessageVo; import com.ccsens.tall.bean.vo.MessageVo;
import com.ccsens.tall.bean.vo.ProjectMessageVo; import com.ccsens.tall.bean.vo.ProjectMessageVo;
import com.ccsens.tall.persist.mapper.SysOperationMapper; import com.ccsens.tall.persist.mapper.SysOperationMapper;
@ -39,4 +41,11 @@ public interface SysOperationDao extends SysOperationMapper {
* @return * @return
*/ */
List<ProjectMessageVo.ProjectMsg> queryProjectMsg(ProjectMessageDto.ProjectMsg param); List<ProjectMessageVo.ProjectMsg> queryProjectMsg(ProjectMessageDto.ProjectMsg param);
/**
* 查询任务下的输入输入文档消息id
* @param taskId
* @return
*/
List<InputDocVo.DocRecordOfTask> findMessageByOperate(Long taskId);
} }

19
tall/src/main/java/com/ccsens/tall/persist/dao/SysOperationMessageDao.java

@ -0,0 +1,19 @@
package com.ccsens.tall.persist.dao;
import com.ccsens.tall.bean.vo.MessageVo;
import com.ccsens.tall.persist.mapper.SysOperationMessageMapper;
import java.util.List;
/**
* @author mz
*/
public interface SysOperationMessageDao extends SysOperationMessageMapper {
/**
* 查看消息内容
* @param operationId 操作id
* @return
*/
List<MessageVo.Message> selectContentByOpId(Long operationId);
}

9
tall/src/main/java/com/ccsens/tall/service/IInputDocService.java

@ -6,6 +6,8 @@ import com.ccsens.tall.bean.vo.InputDocVo;
import com.ccsens.tall.bean.vo.LwbsVo; import com.ccsens.tall.bean.vo.LwbsVo;
import com.ccsens.tall.bean.vo.TaskVo; import com.ccsens.tall.bean.vo.TaskVo;
import com.ccsens.util.bean.dto.QueryDto; import com.ccsens.util.bean.dto.QueryDto;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageInfo;
import java.util.List; import java.util.List;
@ -83,4 +85,11 @@ public interface IInputDocService {
* @param param * @param param
*/ */
void updateDocOfRemark(InputDocDto.UpdateDocOfRemark param,Long userId) throws Exception; void updateDocOfRemark(InputDocDto.UpdateDocOfRemark param,Long userId) throws Exception;
/**
* 查询历史记录(根据任务id)
* @param param
* @return
*/
PageInfo<InputDocVo.DocRecordOfTask> findDocRecordByTask(InputDocDto.FindDocRecordByTask param);
} }

51
tall/src/main/java/com/ccsens/tall/service/InputDocService.java

@ -13,13 +13,8 @@ import com.ccsens.tall.bean.dto.InputDocDto;
import com.ccsens.tall.bean.dto.LwbsDto; import com.ccsens.tall.bean.dto.LwbsDto;
import com.ccsens.tall.bean.po.*; import com.ccsens.tall.bean.po.*;
import com.ccsens.tall.bean.vo.FileVo; import com.ccsens.tall.bean.vo.*;
import com.ccsens.tall.bean.vo.InputDocVo; import com.ccsens.tall.persist.dao.*;
import com.ccsens.tall.bean.vo.LwbsVo;
import com.ccsens.tall.bean.vo.TaskVo;
import com.ccsens.tall.persist.dao.IInputDocDao;
import com.ccsens.tall.persist.dao.TaskDetailDao;
import com.ccsens.tall.persist.dao.TaskSubTimeDao;
import com.ccsens.tall.persist.mapper.*; import com.ccsens.tall.persist.mapper.*;
import com.ccsens.tall.util.TaskUtil; import com.ccsens.tall.util.TaskUtil;
@ -29,6 +24,9 @@ import com.ccsens.util.JsonResponse;
import com.ccsens.util.PropUtil; import com.ccsens.util.PropUtil;
import com.ccsens.util.RestTemplateUtil; import com.ccsens.util.RestTemplateUtil;
import com.ccsens.util.exception.BaseException; import com.ccsens.util.exception.BaseException;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Propagation;
@ -61,6 +59,10 @@ public class InputDocService implements IInputDocService {
private RobotService robotService; private RobotService robotService;
@Resource @Resource
private ProTaskDetailMapper proTaskDetailMapper; private ProTaskDetailMapper proTaskDetailMapper;
@Resource
private SysOperationDao sysOperationDao;
@Resource
private SysOperationMessageDao sysOperationMessageDao;
@ -259,7 +261,7 @@ public class InputDocService implements IInputDocService {
} }
//如果备注信息不为空 //如果备注信息不为空
if (!StrUtil.isBlank(param.getRemark())){ if (!StrUtil.isBlank(param.getRemark()) && ArrayUtil.isEmpty(param.getFileIds())){
ProTaskInputRecord proTaskInputRecord = new ProTaskInputRecord(); ProTaskInputRecord proTaskInputRecord = new ProTaskInputRecord();
proTaskInputRecord.setInputDocId(param.getDocId()); proTaskInputRecord.setInputDocId(param.getDocId());
proTaskInputRecord.setStatus((byte)1); proTaskInputRecord.setStatus((byte)1);
@ -393,6 +395,12 @@ public class InputDocService implements IInputDocService {
public void delDocOfFile(InputDocDto.DeleteDocOfFile param,Long userId) throws Exception{ public void delDocOfFile(InputDocDto.DeleteDocOfFile param,Long userId) throws Exception{
//查看该输入文档下是否还有正在使用的文件 //查看该输入文档下是否还有正在使用的文件
ProTaskInputRecord proTaskInputRecord = proTaskInputRecordMapper.selectByPrimaryKey(param.getRecordId()); ProTaskInputRecord proTaskInputRecord = proTaskInputRecordMapper.selectByPrimaryKey(param.getRecordId());
if (ObjectUtil.isNull(proTaskInputRecord)){
throw new BaseException(CodeEnum.FILE_NOT_FOUND);
}
//查出文档信息找到任务信息
ProTaskInputDoc doc = proTaskInputDocMapper.selectByPrimaryKey(proTaskInputRecord.getInputDocId());
//删除输入文档中的文件 //删除输入文档中的文件
ProTaskInputRecord record = new ProTaskInputRecord(); ProTaskInputRecord record = new ProTaskInputRecord();
@ -401,7 +409,7 @@ public class InputDocService implements IInputDocService {
proTaskInputRecordMapper.updateByPrimaryKeySelective(record); proTaskInputRecordMapper.updateByPrimaryKeySelective(record);
ProTaskInputRecordExample proTaskInputRecordExample = new ProTaskInputRecordExample(); ProTaskInputRecordExample proTaskInputRecordExample = new ProTaskInputRecordExample();
proTaskInputRecordExample.createCriteria().andRecStatusEqualTo((byte)1) proTaskInputRecordExample.createCriteria().andRecStatusEqualTo((byte)0)
.andInputDocIdEqualTo(proTaskInputRecord.getInputDocId()); .andInputDocIdEqualTo(proTaskInputRecord.getInputDocId());
List<ProTaskInputRecord> proTaskInputRecords = proTaskInputRecordMapper.selectByExample(proTaskInputRecordExample); List<ProTaskInputRecord> proTaskInputRecords = proTaskInputRecordMapper.selectByExample(proTaskInputRecordExample);
//如果没有将输入文档状态改为未上传 //如果没有将输入文档状态改为未上传
@ -413,7 +421,6 @@ public class InputDocService implements IInputDocService {
} }
//TODO 发送消息 //TODO 发送消息
ProTaskInputDoc doc = proTaskInputDocMapper.selectByPrimaryKey(record.getInputDocId());
ProTaskDetail taskDetail = proTaskDetailMapper.selectByPrimaryKey(doc.getTaskDetailId()); ProTaskDetail taskDetail = proTaskDetailMapper.selectByPrimaryKey(doc.getTaskDetailId());
if (ObjectUtil.isNotNull(taskDetail)){ if (ObjectUtil.isNotNull(taskDetail)){
robotService.delDocRobotSend(userId,taskDetail,doc.getName()); robotService.delDocRobotSend(userId,taskDetail,doc.getName());
@ -435,11 +442,33 @@ public class InputDocService implements IInputDocService {
proTaskInputRecordMapper.updateByPrimaryKeySelective(record); proTaskInputRecordMapper.updateByPrimaryKeySelective(record);
//TODO 发送消息 //TODO 发送消息
ProTaskInputDoc doc = proTaskInputDocMapper.selectByPrimaryKey(record.getInputDocId()); ProTaskInputRecord inputRecord = proTaskInputRecordMapper.selectByPrimaryKey(record.getId());
if (ObjectUtil.isNull(inputRecord)){
throw new BaseException(CodeEnum.FILE_NOT_FOUND);
}
ProTaskInputDoc doc = proTaskInputDocMapper.selectByPrimaryKey(inputRecord.getInputDocId());
ProTaskDetail taskDetail = proTaskDetailMapper.selectByPrimaryKey(doc.getTaskDetailId()); ProTaskDetail taskDetail = proTaskDetailMapper.selectByPrimaryKey(doc.getTaskDetailId());
if (ObjectUtil.isNotNull(taskDetail)){ if (ObjectUtil.isNotNull(taskDetail)){
robotService.updateRemarkRobotSend(userId,taskDetail,doc.getName()); robotService.updateRemarkRobotSend(userId,taskDetail,doc.getName());
} }
} }
/**
* 查询历史记录(根据任务id)
* @param param
* @return
*/
@Override
public PageInfo<InputDocVo.DocRecordOfTask> findDocRecordByTask(InputDocDto.FindDocRecordByTask param) {
PageHelper.startPage(param.getPageNum(),param.getPageSize());
List<InputDocVo.DocRecordOfTask> sysOperations = sysOperationDao.findMessageByOperate(param.getTaskId());
sysOperations.forEach(sysOperation -> {
List<MessageVo.Message> sysOperationMessages = sysOperationMessageDao.selectContentByOpId(sysOperation.getOperationId());
sysOperation.setMessages(sysOperationMessages);
});
return new PageInfo<>(sysOperations);
}
} }

1
tall/src/main/java/com/ccsens/tall/service/ProjectMessageService.java

@ -197,6 +197,7 @@ public class ProjectMessageService implements IProjectMessageService {
operation.setProjectId(inform.getProjectId()); operation.setProjectId(inform.getProjectId());
operation.setOperatorId(inform.getOperatorId()); operation.setOperatorId(inform.getOperatorId());
operation.setOperateType((byte)operateType.value()); operation.setOperateType((byte)operateType.value());
operation.setTaskDetailId(inform.getTaskId());
log.info("保存操作记录:{}", operation); log.info("保存操作记录:{}", operation);
sysOperationDao.insertSelective(operation); sysOperationDao.insertSelective(operation);
// 操作内容 // 操作内容

6
tall/src/main/java/com/ccsens/tall/service/RobotService.java

@ -413,7 +413,7 @@ public class RobotService implements IRobotService{
} }
RobotUtil.setRobotMessage(message); RobotUtil.setRobotMessage(message);
MessageVo.Inform inform = MessageVo.uploadForDocComment(currentUserId, userName, project.getId(), project.getName(), task.getName(),deliverable); MessageVo.Inform inform = MessageVo.uploadForDocComment(currentUserId, userName, project.getId(), project.getName(), task.getName(),deliverable,task.getId());
RobotUtil.setInform(inform); RobotUtil.setInform(inform);
// 添加wx消息通知 // 添加wx消息通知
RobotUtil.setWxTemplate(WxTemplateUtil.uploadFileForDoc(project.getId(), userName,project.getName(),task.getName(),deliverable)); RobotUtil.setWxTemplate(WxTemplateUtil.uploadFileForDoc(project.getId(), userName,project.getName(),task.getName(),deliverable));
@ -450,7 +450,7 @@ public class RobotService implements IRobotService{
} }
RobotUtil.setRobotMessage(message); RobotUtil.setRobotMessage(message);
MessageVo.Inform inform = MessageVo.delDocComment(userId, userName, project.getId(), project.getName(), taskDetail.getName(),name); MessageVo.Inform inform = MessageVo.delDocComment(userId, userName, project.getId(), project.getName(), taskDetail.getName(),name,taskDetail.getId());
RobotUtil.setInform(inform); RobotUtil.setInform(inform);
// 添加wx消息通知 // 添加wx消息通知
RobotUtil.setWxTemplate(WxTemplateUtil.delFileForDoc(project.getId(), userName,project.getName(),taskDetail.getName(),name)); RobotUtil.setWxTemplate(WxTemplateUtil.delFileForDoc(project.getId(), userName,project.getName(),taskDetail.getName(),name));
@ -487,7 +487,7 @@ public class RobotService implements IRobotService{
} }
RobotUtil.setRobotMessage(message); RobotUtil.setRobotMessage(message);
MessageVo.Inform inform = MessageVo.updateDocRemarkComment(userId, userName, project.getId(), project.getName(), taskDetail.getName(),name); MessageVo.Inform inform = MessageVo.updateDocRemarkComment(userId, userName, project.getId(), project.getName(), taskDetail.getName(),name,taskDetail.getId());
RobotUtil.setInform(inform); RobotUtil.setInform(inform);
// 添加wx消息通知 // 添加wx消息通知
RobotUtil.setWxTemplate(WxTemplateUtil.updateDocRemark(project.getId(), userName,project.getName(),taskDetail.getName(),name)); RobotUtil.setWxTemplate(WxTemplateUtil.updateDocRemark(project.getId(), userName,project.getName(),taskDetail.getName(),name));

2
tall/src/main/java/com/ccsens/tall/util/RobotUtil.java

@ -24,11 +24,13 @@ public class RobotUtil {
private List<String> mentionedMobileList = new ArrayList<>(); private List<String> mentionedMobileList = new ArrayList<>();
private boolean isAtAll = false; private boolean isAtAll = false;
private Long projectId; private Long projectId;
private Long taskId;
private List<MessageVo.Message> params = new ArrayList<>(); private List<MessageVo.Message> params = new ArrayList<>();
public Message(){ public Message(){
} }
public Message(String msgType,Long projectId){ public Message(String msgType,Long projectId){
this.msgType = msgType; this.msgType = msgType;
this.projectId = projectId; this.projectId = projectId;

12
tall/src/main/java/com/ccsens/tall/web/InputDocController.java

@ -11,6 +11,8 @@ import com.ccsens.util.JsonResponse;
import com.ccsens.util.WebConstant; import com.ccsens.util.WebConstant;
import com.ccsens.util.annotation.OperateType; import com.ccsens.util.annotation.OperateType;
import com.ccsens.util.bean.dto.QueryDto; import com.ccsens.util.bean.dto.QueryDto;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageInfo;
import io.jsonwebtoken.Claims; import io.jsonwebtoken.Claims;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -128,4 +130,14 @@ public class InputDocController {
return JsonResponse.newInstance().ok(); return JsonResponse.newInstance().ok();
} }
@MustLoginTall
@ApiOperation(value = "查询历史记录(根据任务id)", notes = "1007:查询输入文档上传记录")
@RequestMapping(value = "/docRecordByTask", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<PageInfo<InputDocVo.DocRecordOfTask>> findDocRecordByTask(@ApiParam @Validated @RequestBody QueryDto<InputDocDto.FindDocRecordByTask> params) {
log.info("查询输入文档上传记录:{}",params);
PageInfo<InputDocVo.DocRecordOfTask> docRecordByTask = iInputDocService.findDocRecordByTask(params.getParam());
log.info("查询输入文档上传记录");
return JsonResponse.newInstance().ok(docRecordByTask);
}
} }

13
tall/src/main/resources/mapper_dao/SysOperationDao.xml

@ -76,4 +76,17 @@
o.project_id = #{projectId} o.project_id = #{projectId}
AND o.rec_status = 0 AND o.rec_status = 0
</select> </select>
<select id="findMessageByOperate" resultType="com.ccsens.tall.bean.vo.InputDocVo$DocRecordOfTask">
SELECT
so.id AS operationId,
so.created_at AS createTime
FROM
t_sys_operation AS so
WHERE
so.task_detail_id = #{taskId}
AND so.operate_type IN (7, 8, 9, 14, 15, 16)
AND so.rec_status = 0
ORDER BY created_at DESC
</select>
</mapper> </mapper>

18
tall/src/main/resources/mapper_dao/SysOperationMessageDao.xml

@ -0,0 +1,18 @@
<?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.ccsens.tall.persist.dao.SysOperationMessageDao">
<select id="selectContentByOpId" resultType="com.ccsens.tall.bean.vo.MessageVo$Message">
SELECT
som.content AS content,
som.type AS type,
som.settings AS settings
FROM
t_sys_operation_message AS som
WHERE
som.operation_id = #{operationId}
ORDER BY
som.sort
</select>
</mapper>

27
tall/src/main/resources/mapper_raw/SysOperationMapper.xml

@ -10,6 +10,7 @@
<result column="created_at" jdbcType="TIMESTAMP" property="createdAt" /> <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
<result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" /> <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
<result column="rec_status" jdbcType="TINYINT" property="recStatus" /> <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
<result column="task_detail_id" jdbcType="BIGINT" property="taskDetailId" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<where> <where>
@ -71,7 +72,7 @@
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, operator_id, project_id, operate_type, operation_time, created_at, updated_at, id, operator_id, project_id, operate_type, operation_time, created_at, updated_at,
rec_status rec_status, task_detail_id
</sql> </sql>
<select id="selectByExample" parameterType="com.ccsens.tall.bean.po.SysOperationExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.ccsens.tall.bean.po.SysOperationExample" resultMap="BaseResultMap">
select select
@ -106,10 +107,12 @@
<insert id="insert" parameterType="com.ccsens.tall.bean.po.SysOperation"> <insert id="insert" parameterType="com.ccsens.tall.bean.po.SysOperation">
insert into t_sys_operation (id, operator_id, project_id, insert into t_sys_operation (id, operator_id, project_id,
operate_type, operation_time, created_at, operate_type, operation_time, created_at,
updated_at, rec_status) updated_at, rec_status, task_detail_id
)
values (#{id,jdbcType=BIGINT}, #{operatorId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, values (#{id,jdbcType=BIGINT}, #{operatorId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT},
#{operateType,jdbcType=TINYINT}, #{operationTime,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{operateType,jdbcType=TINYINT}, #{operationTime,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP},
#{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, #{taskDetailId,jdbcType=BIGINT}
)
</insert> </insert>
<insert id="insertSelective" parameterType="com.ccsens.tall.bean.po.SysOperation"> <insert id="insertSelective" parameterType="com.ccsens.tall.bean.po.SysOperation">
insert into t_sys_operation insert into t_sys_operation
@ -138,6 +141,9 @@
<if test="recStatus != null"> <if test="recStatus != null">
rec_status, rec_status,
</if> </if>
<if test="taskDetailId != null">
task_detail_id,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
@ -164,6 +170,9 @@
<if test="recStatus != null"> <if test="recStatus != null">
#{recStatus,jdbcType=TINYINT}, #{recStatus,jdbcType=TINYINT},
</if> </if>
<if test="taskDetailId != null">
#{taskDetailId,jdbcType=BIGINT},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.ccsens.tall.bean.po.SysOperationExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.ccsens.tall.bean.po.SysOperationExample" resultType="java.lang.Long">
@ -199,6 +208,9 @@
<if test="record.recStatus != null"> <if test="record.recStatus != null">
rec_status = #{record.recStatus,jdbcType=TINYINT}, rec_status = #{record.recStatus,jdbcType=TINYINT},
</if> </if>
<if test="record.taskDetailId != null">
task_detail_id = #{record.taskDetailId,jdbcType=BIGINT},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
@ -213,7 +225,8 @@
operation_time = #{record.operationTime,jdbcType=BIGINT}, operation_time = #{record.operationTime,jdbcType=BIGINT},
created_at = #{record.createdAt,jdbcType=TIMESTAMP}, created_at = #{record.createdAt,jdbcType=TIMESTAMP},
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
rec_status = #{record.recStatus,jdbcType=TINYINT} rec_status = #{record.recStatus,jdbcType=TINYINT},
task_detail_id = #{record.taskDetailId,jdbcType=BIGINT}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
@ -242,6 +255,9 @@
<if test="recStatus != null"> <if test="recStatus != null">
rec_status = #{recStatus,jdbcType=TINYINT}, rec_status = #{recStatus,jdbcType=TINYINT},
</if> </if>
<if test="taskDetailId != null">
task_detail_id = #{taskDetailId,jdbcType=BIGINT},
</if>
</set> </set>
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
@ -253,7 +269,8 @@
operation_time = #{operationTime,jdbcType=BIGINT}, operation_time = #{operationTime,jdbcType=BIGINT},
created_at = #{createdAt,jdbcType=TIMESTAMP}, created_at = #{createdAt,jdbcType=TIMESTAMP},
updated_at = #{updatedAt,jdbcType=TIMESTAMP}, updated_at = #{updatedAt,jdbcType=TIMESTAMP},
rec_status = #{recStatus,jdbcType=TINYINT} rec_status = #{recStatus,jdbcType=TINYINT},
task_detail_id = #{taskDetailId,jdbcType=BIGINT}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>
Loading…
Cancel
Save