diff --git a/im-center-api/.flattened-pom.xml b/im-center-api/.flattened-pom.xml index ac2539b..5554932 100644 --- a/im-center-api/.flattened-pom.xml +++ b/im-center-api/.flattened-pom.xml @@ -1,5 +1,5 @@ - 4.0.0 @@ -21,6 +21,16 @@ org.springframework.cloud spring-cloud-openfeign-core + + cn.hutool + hutool-all + 5.8.4 + + + cn.axzo.im.center + im-center-common + 2.0.0-SNAPSHOT + cn.axzo.framework axzo-common-domain @@ -30,4 +40,11 @@ axzo-common-web + + + axzo + axzo repository + https://nexus.axzo.cn/repository/axzo/ + + diff --git a/im-center-api/im-center-api.iml b/im-center-api/im-center-api.iml index e1f80c7..7624422 100644 --- a/im-center-api/im-center-api.iml +++ b/im-center-api/im-center-api.iml @@ -20,7 +20,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -58,7 +58,6 @@ - @@ -160,6 +159,5 @@ - \ No newline at end of file diff --git a/im-center-api/pom.xml b/im-center-api/pom.xml index 15dc323..971400f 100644 --- a/im-center-api/pom.xml +++ b/im-center-api/pom.xml @@ -6,26 +6,26 @@ im-center cn.axzo.im.center - ${revision} + 2.0.0-SNAPSHOT ../pom.xml im-center-api jar + + org.springframework.cloud + spring-cloud-openfeign-core + cn.hutool hutool-all 5.8.4 - - org.springframework.cloud - spring-cloud-openfeign-core - - cn.axzo.im.center im-center-common + 2.0.0-SNAPSHOT cn.axzo.framework @@ -36,4 +36,11 @@ axzo-common-web + + + axzo + axzo repository + https://nexus.axzo.cn/repository/axzo/ + + diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/feign/AccountApi.java b/im-center-api/src/main/java/cn/axzo/im/center/api/feign/AccountApi.java index eca102c..628e2d3 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/feign/AccountApi.java +++ b/im-center-api/src/main/java/cn/axzo/im/center/api/feign/AccountApi.java @@ -1,9 +1,9 @@ package cn.axzo.im.center.api.feign; +import cn.axzo.framework.domain.web.result.ApiResult; import cn.axzo.im.center.api.vo.req.RobotAccountReq; import cn.axzo.im.center.api.vo.req.UserAccountReq; import cn.axzo.im.center.api.vo.resp.UserAccountResp; -import cn.azxo.framework.common.model.CommonResponse; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; @@ -28,7 +28,7 @@ public interface AccountApi { * @return 返回云信IM账户 */ @PostMapping("api/im/user/account/generate") - CommonResponse generateAccount(@RequestBody @Validated UserAccountReq userAccountReq); + ApiResult generateAccount(@RequestBody @Validated UserAccountReq userAccountReq); /** * 生成机器人网易云信IM账户,机器人只有一个PC端，不需要appType来区分 @@ -36,6 +36,6 @@ public interface AccountApi { * @return 返回云信IM账户 */ @PostMapping("api/im/robot/account/generate") - CommonResponse generateRobotAccount(@RequestBody @Validated RobotAccountReq robotAccountReq); + ApiResult generateRobotAccount(@RequestBody @Validated RobotAccountReq robotAccountReq); } diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/feign/MessageApi.java b/im-center-api/src/main/java/cn/axzo/im/center/api/feign/MessageApi.java index a5cee07..8b026ff 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/feign/MessageApi.java +++ b/im-center-api/src/main/java/cn/axzo/im/center/api/feign/MessageApi.java @@ -1,8 +1,7 @@ package cn.axzo.im.center.api.feign; +import cn.axzo.framework.domain.web.result.ApiResult; import cn.axzo.im.center.api.vo.req.MessageInfo; -import cn.axzo.im.center.api.vo.resp.RobotInfoResp; -import cn.azxo.framework.common.model.CommonResponse; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; @@ -25,6 +24,6 @@ public interface MessageApi { * @return 机器人成功创建信息 */ @PostMapping("api/im/message/dispatch") - CommonResponse sendMessage(@RequestBody @Validated MessageInfo messageInfo); + ApiResult sendMessage(@RequestBody @Validated MessageInfo messageInfo); } diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/feign/RobotInfoApi.java b/im-center-api/src/main/java/cn/axzo/im/center/api/feign/RobotInfoApi.java index 814407d..7fec0a9 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/feign/RobotInfoApi.java +++ b/im-center-api/src/main/java/cn/axzo/im/center/api/feign/RobotInfoApi.java @@ -1,11 +1,13 @@ package cn.axzo.im.center.api.feign; import cn.axzo.framework.domain.page.Page; +import cn.axzo.framework.domain.web.result.ApiPageResult; +import cn.axzo.framework.domain.web.result.ApiResult; import cn.axzo.im.center.api.vo.req.RobotInfoReq; -import cn.axzo.im.center.api.vo.req.RobotQuery; +import cn.axzo.im.center.api.vo.req.RobotPageQuery; import cn.axzo.im.center.api.vo.req.UpdateRobotInfoReq; import cn.axzo.im.center.api.vo.resp.RobotInfoResp; -import cn.azxo.framework.common.model.CommonResponse; +import cn.axzo.im.center.api.vo.resp.RobotMsgTemplateResp; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; @@ -32,7 +34,7 @@ public interface RobotInfoApi { * @return 机器人成功创建信息 */ @PostMapping("api/im/robot/basic/save") - CommonResponse saveRobotInfo(@RequestBody @Validated RobotInfoReq robotInfoReq); + ApiResult saveRobotInfo(@RequestBody @Validated RobotInfoReq robotInfoReq); /** * 更新机器人信息 @@ -40,7 +42,7 @@ public interface RobotInfoApi { * @return 机器人成功更新信息 */ @PostMapping("api/im/robot/basic/update") - CommonResponse updateRobotInfo(@RequestBody @Validated UpdateRobotInfoReq updateRobotInfoReq); + ApiResult updateRobotInfo(@RequestBody @Validated UpdateRobotInfoReq updateRobotInfoReq); /** * 查询机器人信息 @@ -48,25 +50,18 @@ public interface RobotInfoApi { * @return 机器人信息 */ @GetMapping("api/im/robot/basic/{robotId}") - CommonResponse queryRobotTagInfo(@PathVariable("robotId") Long robotId); + ApiResult queryRobotInfo(@PathVariable("robotId") Long robotId); /** * OMS-PC端-查询机器人列表 - * @param robotQuery 机器人查询条件 + * @param robotPageQuery 机器人查询条件 * @return 机器人列表信息 */ - @GetMapping("api/im/robot/basic/list") - CommonResponse> queryRobotList(@RequestBody RobotQuery robotQuery); + @GetMapping("api/im/robot/page") + ApiPageResult queryRobotList(@RequestBody RobotPageQuery robotPageQuery); - /** - * 生成网易云信IM账户 - * @param robotInfoRequest 生成云信账户参数 - * @return 返回云信IM账户 - */ - @PostMapping("api/im/robot/account/generate") - CommonResponse generateAccount(@RequestBody @Validated RobotInfoReq robotInfoRequest); /** @@ -74,7 +69,7 @@ public interface RobotInfoApi { * @return 所有机器人的列表信息，包含标签、以及消息模板信息 */ @GetMapping("api/im/robot/msgTemplate/list") - CommonResponse> queryRunningRobots(); + ApiResult> queryRunningRobots(); } diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/feign/RobotTagApi.java b/im-center-api/src/main/java/cn/axzo/im/center/api/feign/RobotTagApi.java index 22dd517..e613544 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/feign/RobotTagApi.java +++ b/im-center-api/src/main/java/cn/axzo/im/center/api/feign/RobotTagApi.java @@ -1,11 +1,13 @@ package cn.axzo.im.center.api.feign; +import cn.axzo.framework.domain.page.PageResp; +import cn.axzo.framework.domain.web.result.ApiPageResult; +import cn.axzo.framework.domain.web.result.ApiResult; import cn.axzo.im.center.api.vo.req.RobotTagQuery; import cn.axzo.im.center.api.vo.req.RobotTagReq; import cn.axzo.im.center.api.vo.req.UpdateRobotTagReq; import cn.axzo.im.center.api.vo.resp.RobotTagResp; -import cn.azxo.framework.common.model.CommonResponse; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import cn.azxo.framework.common.model.Page; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; @@ -30,7 +32,7 @@ public interface RobotTagApi { * @return 机器人标签创建完成信息 */ @PostMapping("api/im/robot/tag/save") - CommonResponse saveRobotTag(@RequestBody @Validated RobotTagReq robotTagRequest); + ApiResult saveRobotTag(@RequestBody @Validated RobotTagReq robotTagRequest); /** * 更新机器人标签信息 @@ -39,7 +41,7 @@ public interface RobotTagApi { * @return 机器人标签更新完成信息 */ @PostMapping("api/im/robot/tag/update") - CommonResponse updateRobotTag(@RequestBody @Validated UpdateRobotTagReq robotTagRequest); + ApiResult updateRobotTag(@RequestBody @Validated UpdateRobotTagReq robotTagRequest); /** * 查询机器人标签信息 @@ -48,7 +50,7 @@ public interface RobotTagApi { * @return 单个机器人标签信息 */ @GetMapping("api/im/robot/tag/{robotTagId}") - CommonResponse queryRobotTagInfo(@PathVariable("robotTagId") Long robotTagId); + ApiResult queryRobotTagInfo(@PathVariable("robotTagId") Long robotTagId); /** @@ -57,7 +59,7 @@ public interface RobotTagApi { * @param robotTagQuery 机器人标签查询条件 * @return 返回机器人标签列表 */ - @GetMapping("api/im/robot/tag/list") - CommonResponse> queryRobotTagList(@RequestBody RobotTagQuery robotTagQuery); + @GetMapping("api/im/robot/tag/page") + ApiPageResult queryRobotTagList(@RequestBody RobotTagQuery robotTagQuery); } diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotQuery.java b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotPageQuery.java similarity index 68% rename from im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotQuery.java rename to im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotPageQuery.java index d735ee2..f5093f4 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotQuery.java +++ b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotPageQuery.java @@ -1,5 +1,6 @@ package cn.axzo.im.center.api.vo.req; +import cn.axzo.basics.common.page.PageRequest; import lombok.Data; /** @@ -10,18 +11,7 @@ import lombok.Data; * @date 2023/10/9 16:01 */ @Data -public class RobotQuery { - - /** - * 页码（从第1页开始） - */ - private Long pageNum; - - /** - * 每页条数 - */ - private Long pageSize; - +public class RobotPageQuery extends PageRequest { /** * 机器人昵称 diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotTagQuery.java b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotTagQuery.java index 5298386..c46dc04 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotTagQuery.java +++ b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotTagQuery.java @@ -1,5 +1,6 @@ package cn.axzo.im.center.api.vo.req; +import cn.axzo.basics.common.page.PageRequest; import lombok.*; import lombok.experimental.Accessors; @@ -17,17 +18,7 @@ import lombok.experimental.Accessors; @Getter @Setter @ToString -public class RobotTagQuery { - - /** - * 页码（从第1页开始） - */ - private Long pageNum; - - /** - * 每页条数 - */ - private Long pageSize; +public class RobotTagQuery extends PageRequest { /** * 机器人Tag名称 diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/UpdateRobotTagReq.java b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/UpdateRobotTagReq.java index f732355..e01e450 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/UpdateRobotTagReq.java +++ b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/UpdateRobotTagReq.java @@ -26,7 +26,7 @@ public class UpdateRobotTagReq { * 机器人TagID */ @NotNull(message = "机器人TagID不能为空") - private Integer tagId; + private Long id; /** * 机器人Tag名称 diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/resp/MessageResp.java b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/resp/MessageResp.java index 824edbb..5dc5cab 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/resp/MessageResp.java +++ b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/resp/MessageResp.java @@ -1,5 +1,6 @@ package cn.axzo.im.center.api.vo.resp; +import lombok.Data; /** * im-center * diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/resp/RobotTagResp.java b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/resp/RobotTagResp.java index c7544e3..7b33769 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/resp/RobotTagResp.java +++ b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/resp/RobotTagResp.java @@ -15,7 +15,7 @@ public class RobotTagResp { /** * 机器人标签Id */ - private Integer tagId; + private Long id; /** * 机器人Tag名称 @@ -43,5 +43,5 @@ public class RobotTagResp { /** * 机器人使用数量 */ - private Integer robotUseCount; + private Integer useCount; } diff --git a/im-center-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/im-center-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index e69de29..8e3beb3 100644 --- a/im-center-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/im-center-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,23 @@ +cn\axzo\im\center\api\feign\RobotTagApi.class +cn\axzo\im\center\api\vo\req\RobotInfoReq.class +cn\axzo\im\center\api\vo\req\UpdateRobotInfoReq.class +cn\axzo\im\center\api\vo\req\UserAccountReq.class +cn\axzo\im\center\api\vo\req\UpdateRobotTagReq$UpdateRobotTagReqBuilder.class +cn\axzo\im\center\api\vo\resp\RobotInfoResp.class +cn\axzo\im\center\api\vo\req\RobotTagReq$RobotTagReqBuilder.class +cn\axzo\im\center\api\vo\req\RobotTagQuery$RobotTagQueryBuilder.class +cn\axzo\im\center\api\AppTypeEnum.class +cn\axzo\im\center\api\vo\req\MessageInfo.class +cn\axzo\im\center\api\vo\resp\UserAccountResp.class +cn\axzo\im\center\api\vo\resp\MessageTemplateResp.class +cn\axzo\im\center\api\vo\resp\MessageResp.class +cn\axzo\im\center\api\vo\req\RobotTagQuery.class +cn\axzo\im\center\api\vo\req\RobotAccountReq.class +cn\axzo\im\center\api\vo\resp\RobotMsgTemplateResp.class +cn\axzo\im\center\api\feign\AccountApi.class +cn\axzo\im\center\api\vo\req\UpdateRobotTagReq.class +cn\axzo\im\center\api\vo\resp\RobotTagResp.class +cn\axzo\im\center\api\vo\req\RobotQuery.class +cn\axzo\im\center\api\vo\req\RobotTagReq.class +cn\axzo\im\center\api\feign\RobotInfoApi.class +cn\axzo\im\center\api\feign\MessageApi.class diff --git a/im-center-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/im-center-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index f6f9175..7454427 100644 --- a/im-center-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/im-center-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,13 +1,24 @@ -D:\IM\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\req\RobotTagQuery.java -D:\IM\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\req\UserAccountReq.java -D:\IM\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\req\RobotInfoReq.java -D:\IM\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\resp\RobotTagResp.java -D:\IM\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\resp\UserAccountResp.java -D:\IM\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\feign\UserAccountApi.java -D:\IM\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\resp\RobotInfoResp.java -D:\IM\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\feign\RobotInfoApi.java -D:\IM\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\req\MessageInfo.java -D:\IM\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\req\RobotQuery.java -D:\IM\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\feign\MessageApi.java -D:\IM\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\feign\RobotTagApi.java -D:\IM\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\req\RobotTagReq.java +D:\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\nim\CheckSumUtil.java +D:\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\req\RobotQuery.java +D:\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\feign\AccountApi.java +D:\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\feign\RobotTagApi.java +D:\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\feign\MessageApi.java +D:\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\AppTypeEnum.java +D:\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\resp\UserAccountResp.java +D:\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\req\RobotAccountReq.java +D:\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\nim\NimService.java +D:\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\req\UserAccountReq.java +D:\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\resp\MessageTemplateResp.java +D:\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\req\RobotTagReq.java +D:\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\resp\RobotTagResp.java +D:\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\req\RobotInfoReq.java +D:\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\req\UpdateRobotTagReq.java +D:\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\nim\AppKeyUtil.java +D:\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\req\MessageInfo.java +D:\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\feign\RobotInfoApi.java +D:\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\nim\Register.java +D:\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\req\RobotTagQuery.java +D:\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\resp\MessageResp.java +D:\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\resp\RobotInfoResp.java +D:\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\req\UpdateRobotInfoReq.java +D:\im-center\im-center-api\src\main\java\cn\axzo\im\center\api\vo\resp\RobotMsgTemplateResp.java diff --git a/im-center-common/.flattened-pom.xml b/im-center-common/.flattened-pom.xml index db7d0f0..d5b9614 100644 --- a/im-center-common/.flattened-pom.xml +++ b/im-center-common/.flattened-pom.xml @@ -1,5 +1,5 @@ - 4.0.0 @@ -51,4 +51,11 @@ basics-profiles-common + + + axzo + axzo repository + https://nexus.axzo.cn/repository/axzo/ + + diff --git a/im-center-common/pom.xml b/im-center-common/pom.xml index e10b7a1..5347d56 100644 --- a/im-center-common/pom.xml +++ b/im-center-common/pom.xml @@ -6,7 +6,7 @@ im-center cn.axzo.im.center - ${revision} + 2.0.0-SNAPSHOT ../pom.xml im-center-common @@ -50,5 +50,11 @@ - + + + axzo + axzo repository + https://nexus.axzo.cn/repository/axzo/ + + \ No newline at end of file diff --git a/im-center-common/src/main/java/cn/axzo/maokai/common/enums/AppTypeEnum.java b/im-center-common/src/main/java/cn/axzo/maokai/common/enums/AppTypeEnum.java new file mode 100644 index 0000000..39cd85a --- /dev/null +++ b/im-center-common/src/main/java/cn/axzo/maokai/common/enums/AppTypeEnum.java @@ -0,0 +1,27 @@ +package cn.axzo.maokai.common.enums; + +import lombok.Getter; + + +/** + * App终端类型 + * + * @version V1.0 + * @author zuoqinbo + * @date 2023/10/9 16:01 + */ +@Getter +public enum AppTypeEnum { + + WORKER("worker", "工人端"), + ENTERPRISE("enterprise", "企业端"); + + private String code; + + private String message; + + AppTypeEnum(String code, String message) { + this.code = code; + } + +} diff --git a/im-center-common/src/main/java/cn/axzo/maokai/common/enums/ApprovalStatusEnum.java b/im-center-common/src/main/java/cn/axzo/maokai/common/enums/ApprovalStatusEnum.java deleted file mode 100644 index c33b258..0000000 --- a/im-center-common/src/main/java/cn/axzo/maokai/common/enums/ApprovalStatusEnum.java +++ /dev/null @@ -1,66 +0,0 @@ -package cn.axzo.maokai.common.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * 审核状态 - */ -public enum ApprovalStatusEnum { - CANCEL(0, "撤销", "撤销"), - AUDITING(10, "审核中", "认证中"), - AUDIT_REFUSE(20, "审核拒绝", "认证失败"), - AUDIT_PASS(30, "审核通过", "已认证"), - ; - - @EnumValue - @JsonValue - private final Integer value; - private final String desc; - - private final String certification; - - public Integer getValue() { - return this.value; - } - - public String getDesc() { - return this.desc; - } - - public String getCertification() { - return certification; - } - - ApprovalStatusEnum(final Integer value, final String desc, final String certification) { - this.value = value; - this.desc = desc; - this.certification = certification; - } - - public static String toDesc(Integer value) { - if (value == null) { - return ""; - } - ApprovalStatusEnum[] values = ApprovalStatusEnum.values(); - for (ApprovalStatusEnum item : values) { - if (item.value.equals(value)) { - return item.getDesc(); - } - } - return ""; - } - public static String toCertification(Integer value) { - if (value == null) { - return ""; - } - ApprovalStatusEnum[] values = ApprovalStatusEnum.values(); - for (ApprovalStatusEnum item : values) { - if (item.value.equals(value)) { - return item.getCertification(); - } - } - return ""; - } - -} diff --git a/im-center-common/src/main/java/cn/axzo/maokai/common/enums/KeyWordTypeEnum.java b/im-center-common/src/main/java/cn/axzo/maokai/common/enums/KeyWordTypeEnum.java deleted file mode 100644 index 03d28bc..0000000 --- a/im-center-common/src/main/java/cn/axzo/maokai/common/enums/KeyWordTypeEnum.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.axzo.maokai.common.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.fasterxml.jackson.annotation.JsonValue; - -import java.util.Arrays; - -public enum KeyWordTypeEnum { - NAME(1, "姓名"), - JOB(2, "岗位"), - PHONE(3, "手机号"), - ID_NUMBER(4, "身份证号"); - - @EnumValue - @JsonValue - private final Integer value; - private final String desc; - - public static KeyWordTypeEnum getByType(Integer value) { - return Arrays.stream(values()).filter(o -> o.getValue().equals(value)).findFirst().orElse(null); - } - - public Integer getValue() { - return this.value; - } - - public String getDesc() { - return this.desc; - } - - KeyWordTypeEnum(final Integer value, final String desc) { - this.value = value; - this.desc = desc; - } -} diff --git a/im-center-common/src/main/java/cn/axzo/maokai/common/enums/MainBodyTypeEnum.java b/im-center-common/src/main/java/cn/axzo/maokai/common/enums/MainBodyTypeEnum.java deleted file mode 100644 index ff57fee..0000000 --- a/im-center-common/src/main/java/cn/axzo/maokai/common/enums/MainBodyTypeEnum.java +++ /dev/null @@ -1,44 +0,0 @@ -package cn.axzo.maokai.common.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * 主体类型 - */ -public enum MainBodyTypeEnum { - OU(1, "企业"), - CORPS(2, "团队"), - ; - - @EnumValue - @JsonValue - private final Integer value; - private final String desc; - - public static String toDesc(Integer mainBodyType) { - if (mainBodyType == null) { - return ""; - } - MainBodyTypeEnum[] values = MainBodyTypeEnum.values(); - for (MainBodyTypeEnum item : values) { - if (item.value.equals(mainBodyType)) { - return item.getDesc(); - } - } - return ""; - } - - public Integer getValue() { - return this.value; - } - - public String getDesc() { - return this.desc; - } - - MainBodyTypeEnum(final Integer value, final String desc) { - this.value = value; - this.desc = desc; - } -} diff --git a/im-center-common/src/main/java/cn/axzo/maokai/common/enums/QualificationsTypeEnum.java b/im-center-common/src/main/java/cn/axzo/maokai/common/enums/QualificationsTypeEnum.java deleted file mode 100644 index 729c264..0000000 --- a/im-center-common/src/main/java/cn/axzo/maokai/common/enums/QualificationsTypeEnum.java +++ /dev/null @@ -1,52 +0,0 @@ -package cn.axzo.maokai.common.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.fasterxml.jackson.annotation.JsonValue; - -import java.util.Arrays; - -/** - * 资质类型 - */ -public enum QualificationsTypeEnum { - PRIMARY_CONTRACTING_UNIT(1, "施工单位"), - CONSTRUCTION_UNIT(2, "建设单位"), - SUPERVISION_UNIT(3, "监理单位"), - LABOR_SUBCONTRACTING(4, "劳务分包"), - PROFESSIONAL_SUBCONTRACTING(5, "专业分包"), - ; - - @EnumValue - @JsonValue - private final Integer value; - private final String desc; - - public Integer getValue() { - return this.value; - } - - public String getDesc() { - return this.desc; - } - - QualificationsTypeEnum(final Integer value, final String desc) { - this.value = value; - this.desc = desc; - } - - public static QualificationsTypeEnum getByValue(Integer value) { - return Arrays.stream(values()).filter(o -> o.getValue().equals(value)).findFirst().orElse(null); - } - - public static String toDesc(Integer value) { - if (value == null) { - return ""; - } - for (QualificationsTypeEnum item : values()) { - if (item.value.equals(value)) { - return item.desc; - } - } - return ""; - } -} diff --git a/im-center-common/src/main/java/cn/axzo/maokai/common/enums/RegisterTypeEnum.java b/im-center-common/src/main/java/cn/axzo/maokai/common/enums/RegisterTypeEnum.java deleted file mode 100644 index 0ca7a5c..0000000 --- a/im-center-common/src/main/java/cn/axzo/maokai/common/enums/RegisterTypeEnum.java +++ /dev/null @@ -1,52 +0,0 @@ -package cn.axzo.maokai.common.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * 注册类型：1:单位注册 2:施工资质注册 3:单位注册、施工资质注册 - */ -public enum RegisterTypeEnum { - OU_CORPS_REGISTER(1, "单位注册"), - QUA_REGISTER(2, "施工资质注册"), - OU_CORPS_QUA_REGISTER(3, "单位注册、施工资质注册"), - ; - - @EnumValue - @JsonValue - private final Integer value; - private final String desc; - - public Integer getValue() { - return this.value; - } - - public String getDesc() { - return this.desc; - } - - RegisterTypeEnum(final Integer value, final String desc) { - this.value = value; - this.desc = desc; - } - - public boolean apply(Integer registerType) { - if (registerType == null) { - return false; - } - return registerType.equals(this.value); - } - - public static String toDesc(Integer value) { - if (value == null) { - return ""; - } - RegisterTypeEnum[] values = RegisterTypeEnum.values(); - for (RegisterTypeEnum item : values) { - if (item.value.equals(value)) { - return item.getDesc(); - } - } - return ""; - } -} diff --git a/im-center-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/im-center-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 22d4085..930943c 100644 --- a/im-center-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/im-center-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,7 +1,7 @@ -D:\IM\im-center\im-center-common\src\main\java\cn\axzo\maokai\common\enums\MainBodyTypeEnum.java -D:\IM\im-center\im-center-common\src\main\java\cn\axzo\maokai\common\enums\QualificationsTypeEnum.java -D:\IM\im-center\im-center-common\src\main\java\cn\axzo\maokai\common\enums\RegisterTypeEnum.java -D:\IM\im-center\im-center-common\src\main\java\cn\axzo\maokai\common\package-info.java -D:\IM\im-center\im-center-common\src\main\java\cn\axzo\maokai\common\enums\ApprovalStatusEnum.java -D:\IM\im-center\im-center-common\src\main\java\cn\axzo\maokai\common\enums\RobotStatusEnum.java -D:\IM\im-center\im-center-common\src\main\java\cn\axzo\maokai\common\enums\KeyWordTypeEnum.java +D:\im-center\im-center-common\src\main\java\cn\axzo\maokai\common\enums\RegisterTypeEnum.java +D:\im-center\im-center-common\src\main\java\cn\axzo\maokai\common\enums\ApprovalStatusEnum.java +D:\im-center\im-center-common\src\main\java\cn\axzo\maokai\common\enums\QualificationsTypeEnum.java +D:\im-center\im-center-common\src\main\java\cn\axzo\maokai\common\enums\RobotStatusEnum.java +D:\im-center\im-center-common\src\main\java\cn\axzo\maokai\common\enums\KeyWordTypeEnum.java +D:\im-center\im-center-common\src\main\java\cn\axzo\maokai\common\enums\MainBodyTypeEnum.java +D:\im-center\im-center-common\src\main\java\cn\axzo\maokai\common\package-info.java diff --git a/im-center-server/im-center-server.iml b/im-center-server/im-center-server.iml index 4fbd43e..eeb8899 100644 --- a/im-center-server/im-center-server.iml +++ b/im-center-server/im-center-server.iml @@ -63,10 +63,6 @@ - - - - @@ -196,10 +192,6 @@ - - - - @@ -213,7 +205,13 @@ - + + + + + + + @@ -229,6 +227,11 @@ + + + + + diff --git a/im-center-server/pom.xml b/im-center-server/pom.xml index 5a5a719..2ef6c27 100644 --- a/im-center-server/pom.xml +++ b/im-center-server/pom.xml @@ -4,7 +4,7 @@ im-center cn.axzo.im.center - ${revision} + 2.0.0-SNAPSHOT ../pom.xml 4.0.0 @@ -21,10 +21,11 @@ - - - - + + cn.hutool + hutool-all + 5.8.4 + cn.axzo.framework axzo-web-spring-boot-starter @@ -160,5 +161,11 @@ - + + + axzo + axzo repository + https://nexus.axzo.cn/repository/axzo/ + + diff --git a/im-center-server/src/main/java/cn/axzo/im/controller/RobotInfoController.java b/im-center-server/src/main/java/cn/axzo/im/controller/RobotInfoController.java new file mode 100644 index 0000000..2f63449 --- /dev/null +++ b/im-center-server/src/main/java/cn/axzo/im/controller/RobotInfoController.java @@ -0,0 +1,64 @@ +package cn.axzo.im.controller; + +import cn.axzo.framework.domain.page.PageResp; +import cn.axzo.framework.domain.web.result.ApiPageResult; +import cn.axzo.framework.domain.web.result.ApiResult; +import cn.axzo.im.center.api.feign.RobotInfoApi; +import cn.axzo.im.center.api.vo.req.RobotInfoReq; +import cn.axzo.im.center.api.vo.req.RobotPageQuery; +import cn.axzo.im.center.api.vo.req.UpdateRobotInfoReq; +import cn.axzo.im.center.api.vo.resp.RobotInfoResp; +import cn.axzo.im.center.api.vo.resp.RobotMsgTemplateResp; +import cn.axzo.im.service.RobotInfoService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * im-center + * + * @author zuoqinbo + * @version V1.0 + * @date 2023/10/11 11:42 + */ +@Slf4j +@RestController +@RequiredArgsConstructor +public class RobotInfoController implements RobotInfoApi { + + @Resource + private RobotInfoService infoService; + + @Override + public ApiResult saveRobotInfo(RobotInfoReq robotInfoReq) { + RobotInfoResp robotTagResp = infoService.saveRobotInfo(robotInfoReq); + return ApiResult.ok(robotTagResp); + } + + @Override + public ApiResult updateRobotInfo(UpdateRobotInfoReq updateRobotInfoReq) { + RobotInfoResp robotTagResp = infoService.updateRobotInfo(updateRobotInfoReq); + return ApiResult.ok(robotTagResp); + } + + @Override + public ApiResult queryRobotInfo(Long robotId) { + RobotInfoResp robotTagResp = infoService.queryRobotInfo(robotId); + return ApiResult.ok(robotTagResp); + } + + @Override + public ApiPageResult queryRobotList(RobotPageQuery robotQuery) { + PageResp robotTagRespPage = infoService.queryRobotInfoList(robotQuery); + return ApiPageResult.ok(robotTagRespPage); + } + + @Override + public ApiResult> queryRunningRobots() { + List robotTagResp = infoService.queryRunningRobotList(); + return ApiResult.ok(robotTagResp); + } +} diff --git a/im-center-server/src/main/java/cn/axzo/im/controller/RobotTagController.java b/im-center-server/src/main/java/cn/axzo/im/controller/RobotTagController.java index fd290ee..2ed7a6f 100644 --- a/im-center-server/src/main/java/cn/axzo/im/controller/RobotTagController.java +++ b/im-center-server/src/main/java/cn/axzo/im/controller/RobotTagController.java @@ -4,11 +4,18 @@ import cn.axzo.basics.common.BeanMapper; import cn.axzo.framework.domain.page.PageResp; import cn.axzo.framework.domain.web.result.ApiPageResult; import cn.axzo.framework.domain.web.result.ApiResult; -import cn.azxo.framework.common.model.CommonResponse; +import cn.axzo.im.center.api.feign.RobotTagApi; +import cn.axzo.im.center.api.vo.req.RobotTagQuery; +import cn.axzo.im.center.api.vo.req.RobotTagReq; +import cn.axzo.im.center.api.vo.req.UpdateRobotTagReq; +import cn.axzo.im.center.api.vo.resp.RobotTagResp; +import cn.axzo.im.service.RobotTagService; +import cn.azxo.framework.common.model.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; import java.util.List; @@ -17,25 +24,30 @@ import java.util.List; @RequiredArgsConstructor public class RobotTagController implements RobotTagApi { - private final RobotTagService robotTagService; + @Resource + private RobotTagService robotTagService; @Override - public CommonResponse saveRobotTag(RobotTagReq robotTagRequest) { - return null; + public ApiResult saveRobotTag(RobotTagReq robotTagRequest) { + RobotTagResp robotTagResp = robotTagService.saveRobotTag(robotTagRequest); + return ApiResult.ok(robotTagResp); } @Override - public CommonResponse updateRobotTag(RobotTagReq robotTagRequest) { - return null; + public ApiResult updateRobotTag(UpdateRobotTagReq robotTagRequest) { + RobotTagResp robotTagResp = robotTagService.updateRobotTag(robotTagRequest); + return ApiResult.ok(robotTagResp); } @Override - public CommonResponse queryRobotTagInfo(Long robotTagId) { - return null; + public ApiResult queryRobotTagInfo(Long robotTagId) { + RobotTagResp robotTagResp = robotTagService.queryRobotTagInfo(robotTagId); + return ApiResult.ok(robotTagResp); } @Override - public CommonResponse> queryRobotTagList(RobotTagQuery robotTagQuery) { - return null; + public ApiPageResult queryRobotTagList(RobotTagQuery robotTagQuery) { + PageResp robotTagRespPage = robotTagService.queryRobotTagList(robotTagQuery); + return ApiPageResult.ok(robotTagRespPage); } } \ No newline at end of file diff --git a/im-center-server/src/main/java/cn/axzo/im/dao/repository/RobotInfoDao.java b/im-center-server/src/main/java/cn/axzo/im/dao/repository/RobotInfoDao.java index 7dbc301..23b47bc 100644 --- a/im-center-server/src/main/java/cn/axzo/im/dao/repository/RobotInfoDao.java +++ b/im-center-server/src/main/java/cn/axzo/im/dao/repository/RobotInfoDao.java @@ -1,9 +1,15 @@ package cn.axzo.im.dao.repository; -import cn.axzo.im.entity.RobotInfo; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; +import cn.axzo.im.center.api.vo.req.RobotPageQuery; import cn.axzo.im.dao.mapper.RobotInfoMapper; +import cn.axzo.im.entity.RobotInfo; +import cn.axzo.im.enums.RobotStatus; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.List; /** * im @@ -14,5 +20,48 @@ import cn.axzo.im.dao.mapper.RobotInfoMapper; */ @Service public class RobotInfoDao extends ServiceImpl { + /** + * 查询机器人标签列表,支持分页查询 + * + * @param robotInfoQuery + * @return + */ + public IPage queryRobotInfoOfPage(RobotPageQuery robotInfoQuery) { + IPage pageOfRobotInfo = lambdaQuery().eq(RobotInfo::getIsDelete, 0) + .like(StringUtils.isNoneBlank(robotInfoQuery.getNickName()), + RobotInfo::getNickName, + robotInfoQuery.getNickName()) + .eq(StringUtils.isNoneBlank(robotInfoQuery.getStatus()), + RobotInfo::getStatus, robotInfoQuery.getStatus()) + .eq(StringUtils.isNoneBlank(robotInfoQuery.getImAccount()), + RobotInfo::getImAccount, robotInfoQuery.getImAccount()) + .orderByDesc(RobotInfo::getUpdateAt) + .page(robotInfoQuery.toPage()); + return pageOfRobotInfo; + } + + /** + * 查询机器人目前所有运行中的机器人 + * + * + * @return + */ + public List queryRunningRobotList() { + List pageOfRobotInfo = lambdaQuery().eq(RobotInfo::getIsDelete, 0) + .eq(RobotInfo::getStatus, RobotStatus.ENABLED.getCode()) + .orderByDesc(RobotInfo::getUpdateAt).list(); + return pageOfRobotInfo; + } + + /** + * 保存机器人标签 + * + * @param robotInfo 机器人标签参数 + * @return + */ + public RobotInfo saveOrUpdateRobotInfo(RobotInfo robotInfo) { + saveOrUpdate(robotInfo); + return robotInfo; + } } diff --git a/im-center-server/src/main/java/cn/axzo/im/dao/repository/RobotTagDao.java b/im-center-server/src/main/java/cn/axzo/im/dao/repository/RobotTagDao.java index 1d2c37b..4df268e 100644 --- a/im-center-server/src/main/java/cn/axzo/im/dao/repository/RobotTagDao.java +++ b/im-center-server/src/main/java/cn/axzo/im/dao/repository/RobotTagDao.java @@ -1,6 +1,7 @@ package cn.axzo.im.dao.repository; import cn.axzo.basics.common.BeanMapper; +import cn.axzo.im.center.api.vo.req.RobotTagQuery; import cn.axzo.im.entity.RobotTag; import com.baomidou.mybatisplus.core.metadata.IPage; import cn.axzo.im.dao.mapper.RobotTagMapper; @@ -19,13 +20,13 @@ import org.springframework.stereotype.Repository; public class RobotTagDao extends ServiceImpl { /** - * 获取组织人员 + * 查询机器人标签列表,支持分页查询 * * @param robotTagQuery * @return */ public IPage queryRobotTagOfPage(RobotTagQuery robotTagQuery) { - IPage page = lambdaQuery().eq(RobotTag::getIsDelete, 0) + IPage pageOfRobotTag = lambdaQuery().eq(RobotTag::getIsDelete, 0) .like(StringUtils.isNoneBlank(robotTagQuery.getTagName()), RobotTag::getTagName, robotTagQuery.getTagName()) @@ -33,19 +34,18 @@ public class RobotTagDao extends ServiceImpl { RobotTag::getStatus, robotTagQuery.getStatus()) .orderByDesc(RobotTag::getWeight) .page(robotTagQuery.toPage()); - return page; + return pageOfRobotTag; } /** - * 保存单位联系人 + * 保存机器人标签 * - * @param dto + * @param robotTag 机器人标签参数 * @return */ - public RobotTag saveRobotTag(RobotTag robotTag) { - RobotTag contact = BeanMapper.map(robotTag, RobotTag.class); - saveOrUpdate(contact); - return contact; + public RobotTag saveOrUpdateRobotTag(RobotTag robotTag) { + saveOrUpdate(robotTag); + return robotTag; } } diff --git a/im-center-server/src/main/java/cn/axzo/im/nim/AppKeyUtil.java b/im-center-server/src/main/java/cn/axzo/im/nim/AppKeyUtil.java new file mode 100644 index 0000000..9850f65 --- /dev/null +++ b/im-center-server/src/main/java/cn/axzo/im/nim/AppKeyUtil.java @@ -0,0 +1,23 @@ +package cn.axzo.im.nim; + +import cn.axzo.maokai.common.enums.AppTypeEnum; + +import javax.annotation.Resource; + +/** + * im-center + * + * @author zuoqinbo + * @version V1.0 + * @date 2023/10/11 9:44 + */ +@Resource +public class AppKeyUtil { + + + public static String generateAccount(String sourceAccount, AppTypeEnum appType ){ + Register register = new Register(); + String account = NimService.registerAccount(register); + return account; + } +} diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/nim/CheckSumUtil.java b/im-center-server/src/main/java/cn/axzo/im/nim/CheckSumUtil.java similarity index 97% rename from im-center-api/src/main/java/cn/axzo/im/center/api/vo/nim/CheckSumUtil.java rename to im-center-server/src/main/java/cn/axzo/im/nim/CheckSumUtil.java index 67c8df0..a3f5066 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/nim/CheckSumUtil.java +++ b/im-center-server/src/main/java/cn/axzo/im/nim/CheckSumUtil.java @@ -1,4 +1,4 @@ -package cn.axzo.im.center.api.vo.nim; +package cn.axzo.im.nim; import java.security.MessageDigest; diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/nim/Message.aj b/im-center-server/src/main/java/cn/axzo/im/nim/Message.aj similarity index 97% rename from im-center-api/src/main/java/cn/axzo/im/center/api/vo/nim/Message.aj rename to im-center-server/src/main/java/cn/axzo/im/nim/Message.aj index 27d0ff5..187e49f 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/nim/Message.aj +++ b/im-center-server/src/main/java/cn/axzo/im/nim/Message.aj @@ -1,4 +1,4 @@ -package cn.axzo.im.center.api.vo.nim; +package cn.axzo.im.nim; import lombok.Data; diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/nim/NimService.java b/im-center-server/src/main/java/cn/axzo/im/nim/NimService.java similarity index 95% rename from im-center-api/src/main/java/cn/axzo/im/center/api/vo/nim/NimService.java rename to im-center-server/src/main/java/cn/axzo/im/nim/NimService.java index 711673e..0db3811 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/nim/NimService.java +++ b/im-center-server/src/main/java/cn/axzo/im/nim/NimService.java @@ -1,8 +1,8 @@ -package cn.axzo.im.center.api.vo.nim; +package cn.axzo.im.nim; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; -import cn.hutool.http.HttpUtil; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.util.HashMap; @@ -17,6 +17,7 @@ import java.util.UUID; * @date 2023/10/10 18:46 */ @Service +@Slf4j public class NimService { private static final String NIM_ACCOUNT_CREATE_URL = " https://api.netease.im/nimserver/user/create.action"; @@ -49,6 +50,11 @@ public class NimService { return result; } + /** + * + * @param register + * @return + */ public static String registerAccount(Register register) { HashMap paramMap = new HashMap<>(); paramMap.put("accid", register.getAccid()); diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/nim/Register.java b/im-center-server/src/main/java/cn/axzo/im/nim/Register.java similarity index 95% rename from im-center-api/src/main/java/cn/axzo/im/center/api/vo/nim/Register.java rename to im-center-server/src/main/java/cn/axzo/im/nim/Register.java index 7375f0e..c082bf0 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/nim/Register.java +++ b/im-center-server/src/main/java/cn/axzo/im/nim/Register.java @@ -1,4 +1,4 @@ -package cn.axzo.im.center.api.vo.nim; +package cn.axzo.im.nim; import lombok.Data; diff --git a/im-center-server/src/main/java/cn/axzo/im/service/RobotInfoService.java b/im-center-server/src/main/java/cn/axzo/im/service/RobotInfoService.java new file mode 100644 index 0000000..cea0e11 --- /dev/null +++ b/im-center-server/src/main/java/cn/axzo/im/service/RobotInfoService.java @@ -0,0 +1,82 @@ +package cn.axzo.im.service; + +import cn.axzo.basics.common.BeanMapper; +import cn.axzo.framework.domain.page.PageResp; +import cn.axzo.im.center.api.vo.req.RobotInfoReq; +import cn.axzo.im.center.api.vo.req.RobotPageQuery; +import cn.axzo.im.center.api.vo.req.UpdateRobotInfoReq; +import cn.axzo.im.center.api.vo.resp.RobotInfoResp; +import cn.axzo.im.center.api.vo.resp.RobotMsgTemplateResp; +import cn.axzo.im.dao.repository.RobotInfoDao; +import cn.axzo.im.dao.repository.RobotInfoDao; +import cn.axzo.im.entity.RobotInfo; +import cn.axzo.im.utils.BeanConvertUtils; +import cn.azxo.framework.common.model.CommonResponse; +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.List; + +/** + * im + * + * @author zuoqinbo + * @version V1.0 + * @date 2023/10/10 10:06 + */ +@Slf4j +@RestController +@RequiredArgsConstructor +public class RobotInfoService { + + @Resource + private RobotInfoDao robotInfoDao; + + + public RobotInfoResp saveRobotInfo(@Valid RobotInfoReq robotInfoRequest) { + RobotInfo robotInfo = BeanConvertUtils.copyBean(robotInfoRequest, RobotInfo.class); + robotInfo = robotInfoDao.saveOrUpdateRobotInfo(robotInfo); + if (robotInfo != null) { + RobotInfoResp robotInfoResp = BeanMapper.map(robotInfo, RobotInfoResp.class); + return robotInfoResp; + } + return null; + } + + public RobotInfoResp updateRobotInfo(@Valid UpdateRobotInfoReq updateRobotInfoReq) { + RobotInfo robotInfo = BeanConvertUtils.copyBean(updateRobotInfoReq, RobotInfo.class); + robotInfo = robotInfoDao.saveOrUpdateRobotInfo(robotInfo); + if (robotInfo != null) { + RobotInfoResp robotInfoResp = BeanMapper.map(robotInfo, RobotInfoResp.class); + return robotInfoResp; + } + return null; + } + + public RobotInfoResp queryRobotInfo(Long robotInfoId) { + RobotInfo robotInfo = robotInfoDao.getById(robotInfoId); + if (robotInfo != null) { + RobotInfoResp robotInfoResp = BeanMapper.map(robotInfo, RobotInfoResp.class); + return robotInfoResp; + } + return null; + } + + public PageResp queryRobotInfoList(RobotPageQuery robotInfoQuery) { + IPage robotInfoIPage = robotInfoDao.queryRobotInfoOfPage(robotInfoQuery); + List list = BeanMapper.copyList(robotInfoIPage.getRecords(), RobotInfoResp.class); + PageResp pageOfRobotInfoResp = PageResp.list(robotInfoIPage.getCurrent(), robotInfoIPage.getSize(), + robotInfoIPage.getTotal(), list); + return pageOfRobotInfoResp; + } + + public List queryRunningRobotList() { + List runningRobots = robotInfoDao.queryRunningRobotList(); + List msgTemplateResps = BeanMapper.copyList(runningRobots, RobotMsgTemplateResp.class); + return msgTemplateResps; + } +} diff --git a/im-center-server/src/main/java/cn/axzo/im/service/RobotInfoServiceImpl.java b/im-center-server/src/main/java/cn/axzo/im/service/RobotInfoServiceImpl.java deleted file mode 100644 index ad53357..0000000 --- a/im-center-server/src/main/java/cn/axzo/im/service/RobotInfoServiceImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package cn.axzo.im.service; - -import cn.axzo.im.api.feign.RobotInfoApi; -import cn.axzo.im.api.vo.Page; -import cn.axzo.im.api.vo.req.RobotInfoReq; -import cn.axzo.im.api.vo.req.RobotQuery; -import cn.axzo.im.api.vo.resp.RobotInfoResp; -import cn.azxo.framework.common.model.CommonResponse; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; - -/** - * im - * - * @author zuoqinbo - * @version V1.0 - * @date 2023/10/10 10:06 - */ -@Slf4j -@RestController -@RequiredArgsConstructor -public class RobotInfoServiceImpl implements RobotInfoApi { - - @Resource - private RobotInfoDao robotInfoDao; - - @Override - public CommonResponse saveRobotInfo(RobotInfoReq robotInfoReq) { - return null; - } - - @Override - public CommonResponse updateRobotInfo(RobotInfoReq robotInfoReq) { - return null; - } - - @Override - public CommonResponse queryRobotTagInfo(Long robotId) { - return null; - } - - - @Override - public CommonResponse> queryRobotList(RobotQuery robotQuery) { - return null; - } - - @Override - public CommonResponse generateAccount(RobotInfoReq robotInfoRequest) { - return null; - } - -} diff --git a/im-center-server/src/main/java/cn/axzo/im/service/RobotTagService.java b/im-center-server/src/main/java/cn/axzo/im/service/RobotTagService.java new file mode 100644 index 0000000..67649f9 --- /dev/null +++ b/im-center-server/src/main/java/cn/axzo/im/service/RobotTagService.java @@ -0,0 +1,78 @@ +package cn.axzo.im.service; + +import cn.axzo.basics.common.BeanMapper; +import cn.axzo.framework.domain.page.PageResp; +import cn.axzo.im.center.api.vo.req.RobotTagQuery; +import cn.axzo.im.center.api.vo.req.RobotTagReq; +import cn.axzo.im.center.api.vo.req.UpdateRobotTagReq; +import cn.axzo.im.center.api.vo.resp.RobotTagResp; +import cn.axzo.im.dao.repository.RobotInfoDao; +import cn.axzo.im.entity.RobotTag; +import cn.axzo.im.dao.repository.RobotTagDao; +import cn.axzo.im.utils.BeanConvertUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.List; +import java.util.function.Consumer; + +/** + * 机器人标签服务 + * + * @author zuoqinbo + * @version V1.0 + * @date 2023/10/10 10:06 + */ +@Slf4j +@RestController +@RequiredArgsConstructor +public class RobotTagService { + + @Resource + private RobotTagDao robotTagDao; + + @Resource + private RobotInfoDao robotInfoDao; + + + public RobotTagResp saveRobotTag(@Valid RobotTagReq robotTagRequest) { + RobotTag robotTag = BeanConvertUtils.copyBean(robotTagRequest, RobotTag.class); + robotTag = robotTagDao.saveOrUpdateRobotTag(robotTag); + if (robotTag != null) { + RobotTagResp robotTagResp = BeanMapper.map(robotTag, RobotTagResp.class); + return robotTagResp; + } + return null; + } + + public RobotTagResp updateRobotTag(@Valid UpdateRobotTagReq updateRobotTagReq) { + RobotTag robotTag = BeanConvertUtils.copyBean(updateRobotTagReq, RobotTag.class); + robotTag = robotTagDao.saveOrUpdateRobotTag(robotTag); + if (robotTag != null) { + RobotTagResp robotTagResp = BeanMapper.map(robotTag, RobotTagResp.class); + return robotTagResp; + } + return null; + } + + public RobotTagResp queryRobotTagInfo(Long robotTagId) { + RobotTag robotTag = robotTagDao.getById(robotTagId); + if (robotTag != null) { + RobotTagResp robotTagResp = BeanMapper.map(robotTag, RobotTagResp.class); + return robotTagResp; + } + return null; + } + + public PageResp queryRobotTagList(RobotTagQuery robotTagQuery) { + IPage robotTagIPage = robotTagDao.queryRobotTagOfPage(robotTagQuery); + List list = BeanMapper.copyList(robotTagIPage.getRecords(), RobotTagResp.class); + PageResp pageOfRobotTagResp = PageResp.list(robotTagIPage.getCurrent(), robotTagIPage.getSize(), + robotTagIPage.getTotal(), list); + return pageOfRobotTagResp; + } +} diff --git a/im-center-server/src/main/java/cn/axzo/im/service/RobotTagServiceImpl.java b/im-center-server/src/main/java/cn/axzo/im/service/RobotTagServiceImpl.java deleted file mode 100644 index 88979a8..0000000 --- a/im-center-server/src/main/java/cn/axzo/im/service/RobotTagServiceImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -package cn.axzo.im.service; - -import cn.axzo.im.api.feign.RobotTagApi; -import cn.axzo.im.api.vo.Page; -import cn.axzo.im.api.vo.req.RobotTagQuery; -import cn.axzo.im.api.vo.req.RobotTagReq; -import cn.axzo.im.api.vo.resp.RobotTagResp; -import cn.axzo.im.entity.RobotTag; -import cn.axzo.im.dao.repository.RobotTagDao; -import cn.axzo.im.utils.BeanConvertUtils; -import cn.azxo.framework.common.model.CommonResponse; -import com.baomidou.mybatisplus.core.metadata.IPage; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; - -/** - * im - * - * @author zuoqinbo - * @version V1.0 - * @date 2023/10/10 10:06 - */ -@Slf4j -@RestController -@RequiredArgsConstructor -public class RobotTagServiceImpl implements RobotTagApi { - - @Resource - private RobotTagDao robotTagDao; - - @Override - public CommonResponse saveRobotTag(RobotTagReq robotTagRequest) { - RobotTag robotTag = BeanConvertUtils.copyBean(robotTagRequest, RobotTag.class); - robotTagDao.saveOrUpdate(robotTag); - return null; - } - - @Override - public CommonResponse updateRobotTag(RobotTagReq robotTagRequest) { - RobotTag robotTag = BeanConvertUtils.copyBean(robotTagRequest, RobotTag.class); - robotTagDao.saveOrUpdate(robotTag); - return null; - } - - @Override - public CommonResponse queryRobotTagInfo(Long robotTagId) { - RobotTag robotTag = robotTagDao.getById(robotTagId); - return null; - } - - @Override - public CommonResponse> queryRobotTagList(RobotTagQuery robotTagQuery) { - IPage robotTagIPage = robotTagDao.queryRobotTagOfPage(robotTagQuery); - - CommonResponse commonResponse = new CommonResponse(); - - commonResponse.setData(robotTagIPage); - - return commonResponse; - } -} diff --git a/pom.xml b/pom.xml index 427cd2a..820ead3 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ cn.axzo.im.center im-center pom - ${revision} + 2.0.0-SNAPSHOT im-center