feat:REQ-1419 代码逻辑优化
This commit is contained in:
parent
dc7beb1ece
commit
05f8801988
@ -39,7 +39,7 @@ public interface RobotMsgTemplateApi {
|
|||||||
* @return 返回新的机器人消息模板列表
|
* @return 返回新的机器人消息模板列表
|
||||||
*/
|
*/
|
||||||
@PostMapping("api/im/robot/msgTemplate/update")
|
@PostMapping("api/im/robot/msgTemplate/update")
|
||||||
ApiResult<RobotMsgTemplateResp> updateRobotMsgTemplateList(@RequestBody @Validated RobotMsgTemplateReq robotMsgTemplateReq);
|
ApiResult<Void> updateRobotMsgTemplates(@RequestBody @Validated RobotMsgTemplateReq robotMsgTemplateReq);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -20,7 +20,7 @@ public class RobotInfoReq {
|
|||||||
* 机器人昵称
|
* 机器人昵称
|
||||||
*/
|
*/
|
||||||
@NotNull(message = "机器人昵称不能为空")
|
@NotNull(message = "机器人昵称不能为空")
|
||||||
private String nickName;
|
private String nickName;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 机器人Tag列表
|
* 机器人Tag列表
|
||||||
@ -37,6 +37,7 @@ public class RobotInfoReq {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 机器人状态
|
* 机器人状态
|
||||||
|
*
|
||||||
* @see RobotStatusEnum
|
* @see RobotStatusEnum
|
||||||
*/
|
*/
|
||||||
private String status = "creating";
|
private String status = "creating";
|
||||||
|
|||||||
@ -16,14 +16,10 @@ import java.util.List;
|
|||||||
public class RobotMsgTemplateReq {
|
public class RobotMsgTemplateReq {
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 主键Id
|
|
||||||
*/
|
|
||||||
private Long id;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 机器人Id
|
* 机器人Id
|
||||||
*/
|
*/
|
||||||
|
@NotNull(message = "机器人ID不能为空")
|
||||||
private String robotId;
|
private String robotId;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -37,8 +37,8 @@ public class RobotMsgTemplateController implements RobotMsgTemplateApi {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ApiResult<RobotMsgTemplateResp> updateRobotMsgTemplateList(RobotMsgTemplateReq robotMsgTemplateReq) {
|
public ApiResult<Void> updateRobotMsgTemplates(RobotMsgTemplateReq robotMsgTemplateReq) {
|
||||||
RobotMsgTemplateResp robotMsgTemplateResp = robotMsgTemplateService.updateRobotMsgTemplateList(robotMsgTemplateReq);
|
robotMsgTemplateService.updateRobotMsgTemplateList(robotMsgTemplateReq);
|
||||||
return ApiResult.ok(robotMsgTemplateResp);
|
return ApiResult.ok();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -68,13 +68,10 @@ public class RobotMsgTemplateService {
|
|||||||
List<String> msgTemplates = partition.get(currentPage);
|
List<String> msgTemplates = partition.get(currentPage);
|
||||||
robotMsgTemplate.setMsgTemplateList(msgTemplates);
|
robotMsgTemplate.setMsgTemplateList(msgTemplates);
|
||||||
robotMsgTemplate.setRobotId(robotId);
|
robotMsgTemplate.setRobotId(robotId);
|
||||||
List<RobotMsgTemplateResp> templateRespList = msgTemplates.stream().map(new Function<String, RobotMsgTemplateResp>() {
|
List<RobotMsgTemplateResp> templateRespList = msgTemplates.stream().map(templateId -> {
|
||||||
@Override
|
RobotMsgTemplateResp templateResp = new RobotMsgTemplateResp();
|
||||||
public RobotMsgTemplateResp apply(String templateId) {
|
templateResp.setMsgTemplateId(templateId);
|
||||||
RobotMsgTemplateResp templateResp = new RobotMsgTemplateResp();
|
return templateResp;
|
||||||
templateResp.setMsgTemplateId(templateId);
|
|
||||||
return templateResp;
|
|
||||||
}
|
|
||||||
}).collect(Collectors.toList());
|
}).collect(Collectors.toList());
|
||||||
return PageResp.list((long) currentPage, (long) pageSize,
|
return PageResp.list((long) currentPage, (long) pageSize,
|
||||||
(long) pageTotal, templateRespList);
|
(long) pageTotal, templateRespList);
|
||||||
@ -96,7 +93,7 @@ public class RobotMsgTemplateService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public RobotMsgTemplateResp updateRobotMsgTemplateList(RobotMsgTemplateReq robotMsgTemplateReq) {
|
public void updateRobotMsgTemplateList(RobotMsgTemplateReq robotMsgTemplateReq) {
|
||||||
String robotId = robotMsgTemplateReq.getRobotId();
|
String robotId = robotMsgTemplateReq.getRobotId();
|
||||||
|
|
||||||
RobotInfo robotInfo = robotInfoDao.lambdaQuery().eq(RobotInfo::getIsDelete, 0)
|
RobotInfo robotInfo = robotInfoDao.lambdaQuery().eq(RobotInfo::getIsDelete, 0)
|
||||||
@ -115,6 +112,5 @@ public class RobotMsgTemplateService {
|
|||||||
robotMsgTemplate.setUpdateAt(new Date());
|
robotMsgTemplate.setUpdateAt(new Date());
|
||||||
robotMsgTemplate.setMsgTemplateList(robotMsgTemplateReq.getMsgTemplateList());
|
robotMsgTemplate.setMsgTemplateList(robotMsgTemplateReq.getMsgTemplateList());
|
||||||
robotMsgTemplateDao.saveOrUpdate(robotMsgTemplate);
|
robotMsgTemplateDao.saveOrUpdate(robotMsgTemplate);
|
||||||
return BeanMapper.map(robotMsgTemplate, RobotMsgTemplateResp.class);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user