From 46e29785628992ec17c5212739afc7375a05d7eb Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Wed, 12 Mar 2025 14:44:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=E8=BF=9C=E7=A8=8B?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3=EF=BC=9A=E5=B2=97=E4=BD=8D?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E4=B8=8E=E9=83=A8=E9=97=A8id=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=A0=87=E7=AD=BE=E9=9B=86=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/api/RemoteLablePostService.java | 25 +++++++++ .../api/domain/vo/RemoteAiLabelPostVo.java | 56 +++++++++++++++++++ .../system/domain/vo/AiLablePostVo.java | 2 + .../dubbo/RemoteLablePostServicelmpl.java | 39 +++++++++++++ .../dromara/system/mapper/SysPostMapper.java | 1 + .../system/service/IAiLablePostService.java | 2 + .../system/service/ISysPostService.java | 1 + .../service/impl/AiLablePostServiceImpl.java | 5 ++ .../service/impl/SysPostServiceImpl.java | 5 ++ .../resources/mapper/system/SysPostMapper.xml | 4 ++ pom.xml | 4 +- 11 files changed, 142 insertions(+), 2 deletions(-) create mode 100644 dk-api/api-system/src/main/java/org/dromara/system/api/RemoteLablePostService.java create mode 100644 dk-api/api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteAiLabelPostVo.java create mode 100644 dk-modules/system/src/main/java/org/dromara/system/dubbo/RemoteLablePostServicelmpl.java diff --git a/dk-api/api-system/src/main/java/org/dromara/system/api/RemoteLablePostService.java b/dk-api/api-system/src/main/java/org/dromara/system/api/RemoteLablePostService.java new file mode 100644 index 0000000..0def653 --- /dev/null +++ b/dk-api/api-system/src/main/java/org/dromara/system/api/RemoteLablePostService.java @@ -0,0 +1,25 @@ +package org.dromara.system.api; + +import org.dromara.system.api.domain.bo.RemoteLogininforBo; +import org.dromara.system.api.domain.vo.RemoteAiLabelPostVo; +import org.dromara.system.api.domain.vo.RemoteDeptVo; + +import java.util.List; + +/** + * @auther yq + * @data 2025/3/12 + */ +public interface RemoteLablePostService { + + + /** + * 根据岗位编码和部门id进行查询绑定的标签集合 + * @param postCode 岗位编码 + * @param deptId 部门id + * @return 标签集合 + * + * */ + List selectLableByList(String postCode, Long deptId); + +} diff --git a/dk-api/api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteAiLabelPostVo.java b/dk-api/api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteAiLabelPostVo.java new file mode 100644 index 0000000..9296275 --- /dev/null +++ b/dk-api/api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteAiLabelPostVo.java @@ -0,0 +1,56 @@ +package org.dromara.system.api.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.system.domain.AiLabel; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * ai 识别类型视图对象 ai_label + * + * @author LionLi + * @date 2025-03-11 + */ +@Data + +public class RemoteAiLabelPostVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + // @ExcelProperty(value = "id") + private Long lableId; + + /** + * 标签名-英 + */ + + private String labelEn; + + /** + * 标签名-中 + */ + + private String labelCn; + + /** + * 算法类型 + */ + private String aiType; + + /** + * 算法名称 + */ + private String aiName; + + private Long postId; + private String postName; +} diff --git a/dk-modules/system/src/main/java/org/dromara/system/domain/vo/AiLablePostVo.java b/dk-modules/system/src/main/java/org/dromara/system/domain/vo/AiLablePostVo.java index 5a5fdb5..dda13be 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/domain/vo/AiLablePostVo.java +++ b/dk-modules/system/src/main/java/org/dromara/system/domain/vo/AiLablePostVo.java @@ -31,6 +31,8 @@ public class AiLablePostVo implements Serializable { private String labelCn; + private String labelEn; + /** * 岗位id */ diff --git a/dk-modules/system/src/main/java/org/dromara/system/dubbo/RemoteLablePostServicelmpl.java b/dk-modules/system/src/main/java/org/dromara/system/dubbo/RemoteLablePostServicelmpl.java new file mode 100644 index 0000000..2811be5 --- /dev/null +++ b/dk-modules/system/src/main/java/org/dromara/system/dubbo/RemoteLablePostServicelmpl.java @@ -0,0 +1,39 @@ +package org.dromara.system.dubbo; + +import lombok.RequiredArgsConstructor; +import org.apache.dubbo.config.annotation.DubboService; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.system.api.RemoteLablePostService; +import org.dromara.system.api.domain.vo.RemoteAiLabelPostVo; +import org.dromara.system.api.domain.vo.RemoteDictDataVo; +import org.dromara.system.domain.vo.AiLablePostVo; +import org.dromara.system.domain.vo.SysPostVo; +import org.dromara.system.service.IAiLablePostService; +import org.dromara.system.service.ISysPostService; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * @auther yq + * @data 2025/3/12 + */ +@RequiredArgsConstructor +@Service +@DubboService +public class RemoteLablePostServicelmpl implements RemoteLablePostService { + + private final ISysPostService sysPostService; + private final IAiLablePostService aiLablePostService; + + @Override + public List selectLableByList(String postCode, Long deptId) { + SysPostVo sysPostVo = sysPostService.selectLableByList(postCode, deptId); + if(sysPostVo != null){ + List aiLablePostVos = aiLablePostService.queryListByLable(sysPostVo.getPostId()); + return MapstructUtils.convert(aiLablePostVos, RemoteAiLabelPostVo.class); + } + return new ArrayList<>(); + } +} diff --git a/dk-modules/system/src/main/java/org/dromara/system/mapper/SysPostMapper.java b/dk-modules/system/src/main/java/org/dromara/system/mapper/SysPostMapper.java index f9bf134..ce010cc 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/mapper/SysPostMapper.java +++ b/dk-modules/system/src/main/java/org/dromara/system/mapper/SysPostMapper.java @@ -33,4 +33,5 @@ public interface SysPostMapper extends BaseMapperPlus { */ List selectPostsByUserId(Long userId); + SysPostVo selectLableByList(@Param("postCode") String postCode, @Param("deptId") Long deptId); } diff --git a/dk-modules/system/src/main/java/org/dromara/system/service/IAiLablePostService.java b/dk-modules/system/src/main/java/org/dromara/system/service/IAiLablePostService.java index 5da8933..00ead53 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/service/IAiLablePostService.java +++ b/dk-modules/system/src/main/java/org/dromara/system/service/IAiLablePostService.java @@ -66,4 +66,6 @@ public interface IAiLablePostService { * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + List queryListByLable(Long postId); } diff --git a/dk-modules/system/src/main/java/org/dromara/system/service/ISysPostService.java b/dk-modules/system/src/main/java/org/dromara/system/service/ISysPostService.java index 79cdc21..38c36e0 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/service/ISysPostService.java +++ b/dk-modules/system/src/main/java/org/dromara/system/service/ISysPostService.java @@ -130,4 +130,5 @@ public interface ISysPostService { * @return 结果 */ List selectPostsByUserId(Long userId); + SysPostVo selectLableByList(String post_code, Long dept_id); } diff --git a/dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLablePostServiceImpl.java b/dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLablePostServiceImpl.java index b363e82..d672325 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLablePostServiceImpl.java +++ b/dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLablePostServiceImpl.java @@ -128,4 +128,9 @@ public class AiLablePostServiceImpl implements IAiLablePostService { } return baseMapper.deleteByIds(ids) > 0; } + + @Override + public List queryListByLable(Long postId) { + return List.of(); + } } diff --git a/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java b/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java index a44667c..7bbf7f9 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java +++ b/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java @@ -253,4 +253,9 @@ public class SysPostServiceImpl implements ISysPostService { public List selectPostsByUserId(Long userId) { return baseMapper.selectPostsByUserId(userId); } + + @Override + public SysPostVo selectLableByList(String postCode, Long deptId) { + return baseMapper.selectLableByList(postCode,deptId); + } } diff --git a/dk-modules/system/src/main/resources/mapper/system/SysPostMapper.xml b/dk-modules/system/src/main/resources/mapper/system/SysPostMapper.xml index 322403f..77615e6 100644 --- a/dk-modules/system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/dk-modules/system/src/main/resources/mapper/system/SysPostMapper.xml @@ -25,5 +25,9 @@ left join sys_user u on u.user_id = up.user_id where u.user_id = #{userId} + diff --git a/pom.xml b/pom.xml index 23aa72a..63a9d40 100644 --- a/pom.xml +++ b/pom.xml @@ -86,12 +86,12 @@ dev - 114.235.183.147:8848 + 127.0.0.1:8848 DEFAULT_GROUP DEFAULT_GROUP nacos nacos - 114.235.183.147:4560 + 127.0.0.1:4560