diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/feign/RobotMsgTemplateApi.java b/im-center-api/src/main/java/cn/axzo/im/center/api/feign/RobotMsgTemplateApi.java index 54fe109..3b1355d 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/feign/RobotMsgTemplateApi.java +++ b/im-center-api/src/main/java/cn/axzo/im/center/api/feign/RobotMsgTemplateApi.java @@ -39,7 +39,7 @@ public interface RobotMsgTemplateApi { * @return 返回新的机器人消息模板列表 */ @PostMapping("api/im/robot/msgTemplate/update") - ApiResult updateRobotMsgTemplateList(@RequestBody @Validated RobotMsgTemplateReq robotMsgTemplateReq); + ApiResult updateRobotMsgTemplates(@RequestBody @Validated RobotMsgTemplateReq robotMsgTemplateReq); } diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotInfoReq.java b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotInfoReq.java index 0d7775b..54134ab 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotInfoReq.java +++ b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotInfoReq.java @@ -20,7 +20,7 @@ public class RobotInfoReq { * 机器人昵称 */ @NotNull(message = "机器人昵称不能为空") - private String nickName; + private String nickName; /** * 机器人Tag列表 @@ -37,6 +37,7 @@ public class RobotInfoReq { /** * 机器人状态 + * * @see RobotStatusEnum */ private String status = "creating"; diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotMsgTemplateReq.java b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotMsgTemplateReq.java index b512a95..18c1ef2 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotMsgTemplateReq.java +++ b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotMsgTemplateReq.java @@ -16,14 +16,10 @@ import java.util.List; public class RobotMsgTemplateReq { - /** - * 主键Id - */ - private Long id; - /** * 机器人Id */ + @NotNull(message = "机器人ID不能为空") private String robotId; diff --git a/im-center-server/src/main/java/cn/axzo/im/controller/RobotMsgTemplateController.java b/im-center-server/src/main/java/cn/axzo/im/controller/RobotMsgTemplateController.java index d1fd0b0..1267c2d 100644 --- a/im-center-server/src/main/java/cn/axzo/im/controller/RobotMsgTemplateController.java +++ b/im-center-server/src/main/java/cn/axzo/im/controller/RobotMsgTemplateController.java @@ -37,8 +37,8 @@ public class RobotMsgTemplateController implements RobotMsgTemplateApi { } @Override - public ApiResult updateRobotMsgTemplateList(RobotMsgTemplateReq robotMsgTemplateReq) { - RobotMsgTemplateResp robotMsgTemplateResp = robotMsgTemplateService.updateRobotMsgTemplateList(robotMsgTemplateReq); - return ApiResult.ok(robotMsgTemplateResp); + public ApiResult updateRobotMsgTemplates(RobotMsgTemplateReq robotMsgTemplateReq) { + robotMsgTemplateService.updateRobotMsgTemplateList(robotMsgTemplateReq); + return ApiResult.ok(); } } diff --git a/im-center-server/src/main/java/cn/axzo/im/service/RobotMsgTemplateService.java b/im-center-server/src/main/java/cn/axzo/im/service/RobotMsgTemplateService.java index 051fcb7..528a2e1 100644 --- a/im-center-server/src/main/java/cn/axzo/im/service/RobotMsgTemplateService.java +++ b/im-center-server/src/main/java/cn/axzo/im/service/RobotMsgTemplateService.java @@ -68,13 +68,10 @@ public class RobotMsgTemplateService { List msgTemplates = partition.get(currentPage); robotMsgTemplate.setMsgTemplateList(msgTemplates); robotMsgTemplate.setRobotId(robotId); - List templateRespList = msgTemplates.stream().map(new Function() { - @Override - public RobotMsgTemplateResp apply(String templateId) { - RobotMsgTemplateResp templateResp = new RobotMsgTemplateResp(); - templateResp.setMsgTemplateId(templateId); - return templateResp; - } + List templateRespList = msgTemplates.stream().map(templateId -> { + RobotMsgTemplateResp templateResp = new RobotMsgTemplateResp(); + templateResp.setMsgTemplateId(templateId); + return templateResp; }).collect(Collectors.toList()); return PageResp.list((long) currentPage, (long) pageSize, (long) pageTotal, templateRespList); @@ -96,7 +93,7 @@ public class RobotMsgTemplateService { } - public RobotMsgTemplateResp updateRobotMsgTemplateList(RobotMsgTemplateReq robotMsgTemplateReq) { + public void updateRobotMsgTemplateList(RobotMsgTemplateReq robotMsgTemplateReq) { String robotId = robotMsgTemplateReq.getRobotId(); RobotInfo robotInfo = robotInfoDao.lambdaQuery().eq(RobotInfo::getIsDelete, 0) @@ -115,6 +112,5 @@ public class RobotMsgTemplateService { robotMsgTemplate.setUpdateAt(new Date()); robotMsgTemplate.setMsgTemplateList(robotMsgTemplateReq.getMsgTemplateList()); robotMsgTemplateDao.saveOrUpdate(robotMsgTemplate); - return BeanMapper.map(robotMsgTemplate, RobotMsgTemplateResp.class); } }