From bfc1b465579f49e1f7fa404cda983c9fcf05a44f Mon Sep 17 00:00:00 2001 From: sunzheng Date: Thu, 25 Jul 2024 10:13:10 +0800 Subject: [PATCH] =?UTF-8?q?update:=E5=B0=86=E9=A3=9E=E4=B9=A6=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=E4=BB=A3=E7=A0=81=E7=A7=BB=E5=8A=A8=E5=88=B0=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=E6=A8=A1=E5=9D=97=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FeiShuDockingController.java | 11 +++++----- .../docking}/feishu/dto/BotMessageDto.java | 2 +- .../docking}/feishu/dto/InstanceDto.java | 2 +- .../feishu/service/IFeiShuDockingService.java | 8 +++---- .../impl/FeiShuDockingServiceImpl.java | 21 ++++++++++--------- .../docking}/feishu/vo/bot/BotMessageVo.java | 2 +- .../vo/definition/ApprovalsDefinitionVo.java | 2 +- .../vo/definition/DefinitionExternal.java | 2 +- .../definition/DefinitionI18nResources.java | 2 +- .../feishu/vo/definition/DefinitionTexts.java | 2 +- .../vo/definition/DefinitionViewers.java | 2 +- .../vo/instance/ApprovalsInstanceVo.java | 4 ++-- .../feishu/vo/instance/InstanceForm.java | 2 +- .../feishu/vo/instance/InstanceLink.java | 2 +- .../feishu/vo/instance/InstanceTask.java | 4 +--- 15 files changed, 34 insertions(+), 34 deletions(-) rename {laws-modules/src/main/java/com/jero/modules => laws-modules-docking/src/main/java/com/jero/modules/docking}/feishu/controller/FeiShuDockingController.java (87%) rename {laws-modules/src/main/java/com/jero/modules => laws-modules-docking/src/main/java/com/jero/modules/docking}/feishu/dto/BotMessageDto.java (93%) rename {laws-modules/src/main/java/com/jero/modules => laws-modules-docking/src/main/java/com/jero/modules/docking}/feishu/dto/InstanceDto.java (97%) rename {laws-modules/src/main/java/com/jero/modules => laws-modules-docking/src/main/java/com/jero/modules/docking}/feishu/service/IFeiShuDockingService.java (80%) rename {laws-modules/src/main/java/com/jero/modules => laws-modules-docking/src/main/java/com/jero/modules/docking}/feishu/service/impl/FeiShuDockingServiceImpl.java (97%) rename {laws-modules/src/main/java/com/jero/modules => laws-modules-docking/src/main/java/com/jero/modules/docking}/feishu/vo/bot/BotMessageVo.java (94%) rename {laws-modules/src/main/java/com/jero/modules => laws-modules-docking/src/main/java/com/jero/modules/docking}/feishu/vo/definition/ApprovalsDefinitionVo.java (97%) rename {laws-modules/src/main/java/com/jero/modules => laws-modules-docking/src/main/java/com/jero/modules/docking}/feishu/vo/definition/DefinitionExternal.java (98%) rename {laws-modules/src/main/java/com/jero/modules => laws-modules-docking/src/main/java/com/jero/modules/docking}/feishu/vo/definition/DefinitionI18nResources.java (96%) rename {laws-modules/src/main/java/com/jero/modules => laws-modules-docking/src/main/java/com/jero/modules/docking}/feishu/vo/definition/DefinitionTexts.java (89%) rename {laws-modules/src/main/java/com/jero/modules => laws-modules-docking/src/main/java/com/jero/modules/docking}/feishu/vo/definition/DefinitionViewers.java (94%) rename {laws-modules/src/main/java/com/jero/modules => laws-modules-docking/src/main/java/com/jero/modules/docking}/feishu/vo/instance/ApprovalsInstanceVo.java (98%) rename {laws-modules/src/main/java/com/jero/modules => laws-modules-docking/src/main/java/com/jero/modules/docking}/feishu/vo/instance/InstanceForm.java (87%) rename {laws-modules/src/main/java/com/jero/modules => laws-modules-docking/src/main/java/com/jero/modules/docking}/feishu/vo/instance/InstanceLink.java (91%) rename {laws-modules/src/main/java/com/jero/modules => laws-modules-docking/src/main/java/com/jero/modules/docking}/feishu/vo/instance/InstanceTask.java (98%) diff --git a/laws-modules/src/main/java/com/jero/modules/feishu/controller/FeiShuDockingController.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/controller/FeiShuDockingController.java similarity index 87% rename from laws-modules/src/main/java/com/jero/modules/feishu/controller/FeiShuDockingController.java rename to laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/controller/FeiShuDockingController.java index 6c28e09a..cb0d26e4 100644 --- a/laws-modules/src/main/java/com/jero/modules/feishu/controller/FeiShuDockingController.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/controller/FeiShuDockingController.java @@ -1,14 +1,15 @@ -package com.jero.modules.feishu.controller; +package com.jero.modules.docking.feishu.controller; import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; -import com.jero.modules.feishu.dto.BotMessageDto; -import com.jero.modules.feishu.dto.InstanceDto; -import com.jero.modules.feishu.service.IFeiShuDockingService; -import com.jero.modules.feishu.vo.definition.ApprovalsDefinitionVo; +import com.jero.modules.docking.feishu.dto.BotMessageDto; +import com.jero.modules.docking.feishu.dto.InstanceDto; +import com.jero.modules.docking.feishu.service.IFeiShuDockingService; +import com.jero.modules.docking.feishu.vo.definition.ApprovalsDefinitionVo; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; + import javax.annotation.Resource; /** diff --git a/laws-modules/src/main/java/com/jero/modules/feishu/dto/BotMessageDto.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/dto/BotMessageDto.java similarity index 93% rename from laws-modules/src/main/java/com/jero/modules/feishu/dto/BotMessageDto.java rename to laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/dto/BotMessageDto.java index ff3df206..22272e7a 100644 --- a/laws-modules/src/main/java/com/jero/modules/feishu/dto/BotMessageDto.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/dto/BotMessageDto.java @@ -1,4 +1,4 @@ -package com.jero.modules.feishu.dto; +package com.jero.modules.docking.feishu.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/laws-modules/src/main/java/com/jero/modules/feishu/dto/InstanceDto.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/dto/InstanceDto.java similarity index 97% rename from laws-modules/src/main/java/com/jero/modules/feishu/dto/InstanceDto.java rename to laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/dto/InstanceDto.java index c96ddec9..1427f433 100644 --- a/laws-modules/src/main/java/com/jero/modules/feishu/dto/InstanceDto.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/dto/InstanceDto.java @@ -1,4 +1,4 @@ -package com.jero.modules.feishu.dto; +package com.jero.modules.docking.feishu.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/laws-modules/src/main/java/com/jero/modules/feishu/service/IFeiShuDockingService.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/IFeiShuDockingService.java similarity index 80% rename from laws-modules/src/main/java/com/jero/modules/feishu/service/IFeiShuDockingService.java rename to laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/IFeiShuDockingService.java index 39d37bcb..c80eb14b 100644 --- a/laws-modules/src/main/java/com/jero/modules/feishu/service/IFeiShuDockingService.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/IFeiShuDockingService.java @@ -1,10 +1,10 @@ -package com.jero.modules.feishu.service; +package com.jero.modules.docking.feishu.service; import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; -import com.jero.modules.feishu.dto.BotMessageDto; -import com.jero.modules.feishu.dto.InstanceDto; -import com.jero.modules.feishu.vo.definition.ApprovalsDefinitionVo; +import com.jero.modules.docking.feishu.dto.BotMessageDto; +import com.jero.modules.docking.feishu.dto.InstanceDto; +import com.jero.modules.docking.feishu.vo.definition.ApprovalsDefinitionVo; public interface IFeiShuDockingService { diff --git a/laws-modules/src/main/java/com/jero/modules/feishu/service/impl/FeiShuDockingServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/impl/FeiShuDockingServiceImpl.java similarity index 97% rename from laws-modules/src/main/java/com/jero/modules/feishu/service/impl/FeiShuDockingServiceImpl.java rename to laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/impl/FeiShuDockingServiceImpl.java index dd7b5e9f..ee09ceab 100644 --- a/laws-modules/src/main/java/com/jero/modules/feishu/service/impl/FeiShuDockingServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/impl/FeiShuDockingServiceImpl.java @@ -1,4 +1,4 @@ -package com.jero.modules.feishu.service.impl; +package com.jero.modules.docking.feishu.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -12,14 +12,14 @@ import com.jero.common.system.util.JwtUtil; import com.jero.common.system.vo.SysDictItemCore; import com.jero.common.util.RedisUtil; import com.jero.common.util.oConvertUtils; -import com.jero.modules.feishu.dto.BotMessageDto; -import com.jero.modules.feishu.dto.InstanceDto; -import com.jero.modules.feishu.service.IFeiShuDockingService; -import com.jero.modules.feishu.vo.bot.BotMessageVo; -import com.jero.modules.feishu.vo.definition.*; -import com.jero.modules.feishu.vo.instance.ApprovalsInstanceVo; -import com.jero.modules.feishu.vo.instance.InstanceLink; -import com.jero.modules.feishu.vo.instance.InstanceTask; +import com.jero.modules.docking.feishu.dto.BotMessageDto; +import com.jero.modules.docking.feishu.dto.InstanceDto; +import com.jero.modules.docking.feishu.service.IFeiShuDockingService; +import com.jero.modules.docking.feishu.vo.bot.BotMessageVo; +import com.jero.modules.docking.feishu.vo.definition.*; +import com.jero.modules.docking.feishu.vo.instance.ApprovalsInstanceVo; +import com.jero.modules.docking.feishu.vo.instance.InstanceLink; +import com.jero.modules.docking.feishu.vo.instance.InstanceTask; import com.jero.modules.system.entity.*; import com.jero.modules.system.service.*; import lombok.extern.slf4j.Slf4j; @@ -35,6 +35,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; + import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; @@ -570,7 +571,7 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService { return result; } - private String translateDictValue(String code, String text, String table, String key, List listDict) { + private String translateDictValue(String code, String text, String table, String key, List listDict) { if (oConvertUtils.isEmpty(key)) { return null; } diff --git a/laws-modules/src/main/java/com/jero/modules/feishu/vo/bot/BotMessageVo.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/bot/BotMessageVo.java similarity index 94% rename from laws-modules/src/main/java/com/jero/modules/feishu/vo/bot/BotMessageVo.java rename to laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/bot/BotMessageVo.java index 5178f3d0..dee4ac8b 100644 --- a/laws-modules/src/main/java/com/jero/modules/feishu/vo/bot/BotMessageVo.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/bot/BotMessageVo.java @@ -1,4 +1,4 @@ -package com.jero.modules.feishu.vo.bot; +package com.jero.modules.docking.feishu.vo.bot; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/laws-modules/src/main/java/com/jero/modules/feishu/vo/definition/ApprovalsDefinitionVo.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/definition/ApprovalsDefinitionVo.java similarity index 97% rename from laws-modules/src/main/java/com/jero/modules/feishu/vo/definition/ApprovalsDefinitionVo.java rename to laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/definition/ApprovalsDefinitionVo.java index 2caccb4d..6ff682fd 100644 --- a/laws-modules/src/main/java/com/jero/modules/feishu/vo/definition/ApprovalsDefinitionVo.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/definition/ApprovalsDefinitionVo.java @@ -1,4 +1,4 @@ -package com.jero.modules.feishu.vo.definition; +package com.jero.modules.docking.feishu.vo.definition; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/laws-modules/src/main/java/com/jero/modules/feishu/vo/definition/DefinitionExternal.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/definition/DefinitionExternal.java similarity index 98% rename from laws-modules/src/main/java/com/jero/modules/feishu/vo/definition/DefinitionExternal.java rename to laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/definition/DefinitionExternal.java index 499c6e24..7acf7bb8 100644 --- a/laws-modules/src/main/java/com/jero/modules/feishu/vo/definition/DefinitionExternal.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/definition/DefinitionExternal.java @@ -1,4 +1,4 @@ -package com.jero.modules.feishu.vo.definition; +package com.jero.modules.docking.feishu.vo.definition; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/laws-modules/src/main/java/com/jero/modules/feishu/vo/definition/DefinitionI18nResources.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/definition/DefinitionI18nResources.java similarity index 96% rename from laws-modules/src/main/java/com/jero/modules/feishu/vo/definition/DefinitionI18nResources.java rename to laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/definition/DefinitionI18nResources.java index 4e51a958..ccdd7ced 100644 --- a/laws-modules/src/main/java/com/jero/modules/feishu/vo/definition/DefinitionI18nResources.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/definition/DefinitionI18nResources.java @@ -1,4 +1,4 @@ -package com.jero.modules.feishu.vo.definition; +package com.jero.modules.docking.feishu.vo.definition; import com.alibaba.fastjson.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; diff --git a/laws-modules/src/main/java/com/jero/modules/feishu/vo/definition/DefinitionTexts.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/definition/DefinitionTexts.java similarity index 89% rename from laws-modules/src/main/java/com/jero/modules/feishu/vo/definition/DefinitionTexts.java rename to laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/definition/DefinitionTexts.java index 213393bb..5e199d55 100644 --- a/laws-modules/src/main/java/com/jero/modules/feishu/vo/definition/DefinitionTexts.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/definition/DefinitionTexts.java @@ -1,4 +1,4 @@ -package com.jero.modules.feishu.vo.definition; +package com.jero.modules.docking.feishu.vo.definition; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/laws-modules/src/main/java/com/jero/modules/feishu/vo/definition/DefinitionViewers.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/definition/DefinitionViewers.java similarity index 94% rename from laws-modules/src/main/java/com/jero/modules/feishu/vo/definition/DefinitionViewers.java rename to laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/definition/DefinitionViewers.java index a8803199..231fc13f 100644 --- a/laws-modules/src/main/java/com/jero/modules/feishu/vo/definition/DefinitionViewers.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/definition/DefinitionViewers.java @@ -1,4 +1,4 @@ -package com.jero.modules.feishu.vo.definition; +package com.jero.modules.docking.feishu.vo.definition; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/laws-modules/src/main/java/com/jero/modules/feishu/vo/instance/ApprovalsInstanceVo.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/instance/ApprovalsInstanceVo.java similarity index 98% rename from laws-modules/src/main/java/com/jero/modules/feishu/vo/instance/ApprovalsInstanceVo.java rename to laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/instance/ApprovalsInstanceVo.java index 8a5fa8d9..47b17089 100644 --- a/laws-modules/src/main/java/com/jero/modules/feishu/vo/instance/ApprovalsInstanceVo.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/instance/ApprovalsInstanceVo.java @@ -1,6 +1,6 @@ -package com.jero.modules.feishu.vo.instance; +package com.jero.modules.docking.feishu.vo.instance; -import com.jero.modules.feishu.vo.definition.DefinitionI18nResources; +import com.jero.modules.docking.feishu.vo.definition.DefinitionI18nResources; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/laws-modules/src/main/java/com/jero/modules/feishu/vo/instance/InstanceForm.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/instance/InstanceForm.java similarity index 87% rename from laws-modules/src/main/java/com/jero/modules/feishu/vo/instance/InstanceForm.java rename to laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/instance/InstanceForm.java index 14cf52bc..c12aa287 100644 --- a/laws-modules/src/main/java/com/jero/modules/feishu/vo/instance/InstanceForm.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/instance/InstanceForm.java @@ -1,4 +1,4 @@ -package com.jero.modules.feishu.vo.instance; +package com.jero.modules.docking.feishu.vo.instance; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/laws-modules/src/main/java/com/jero/modules/feishu/vo/instance/InstanceLink.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/instance/InstanceLink.java similarity index 91% rename from laws-modules/src/main/java/com/jero/modules/feishu/vo/instance/InstanceLink.java rename to laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/instance/InstanceLink.java index 3ebbaa90..4b402962 100644 --- a/laws-modules/src/main/java/com/jero/modules/feishu/vo/instance/InstanceLink.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/instance/InstanceLink.java @@ -1,4 +1,4 @@ -package com.jero.modules.feishu.vo.instance; +package com.jero.modules.docking.feishu.vo.instance; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/laws-modules/src/main/java/com/jero/modules/feishu/vo/instance/InstanceTask.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/instance/InstanceTask.java similarity index 98% rename from laws-modules/src/main/java/com/jero/modules/feishu/vo/instance/InstanceTask.java rename to laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/instance/InstanceTask.java index 571f0018..55d1133e 100644 --- a/laws-modules/src/main/java/com/jero/modules/feishu/vo/instance/InstanceTask.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/vo/instance/InstanceTask.java @@ -1,10 +1,8 @@ -package com.jero.modules.feishu.vo.instance; +package com.jero.modules.docking.feishu.vo.instance; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.List; - /** * 任务列表 */