Browse Source

提交 标签

pull/1/head
袁强 5 months ago
parent
commit
286352155a
  1. 4
      dk-api/api-system/src/main/java/org/dromara/system/api/RemoteLabelPostService.java
  2. 7
      dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java
  3. 14
      dk-modules/system/src/main/java/org/dromara/system/controller/system/SysPostController.java
  4. 4
      dk-modules/system/src/main/java/org/dromara/system/domain/AiLabel.java
  5. 6
      dk-modules/system/src/main/java/org/dromara/system/domain/AiLabelPost.java
  6. 2
      dk-modules/system/src/main/java/org/dromara/system/domain/bo/AiLabelBo.java
  7. 8
      dk-modules/system/src/main/java/org/dromara/system/domain/bo/AiLabelPostBo.java
  8. 8
      dk-modules/system/src/main/java/org/dromara/system/domain/vo/AiLabelPostVo.java
  9. 2
      dk-modules/system/src/main/java/org/dromara/system/domain/vo/AiLabelVo.java
  10. 14
      dk-modules/system/src/main/java/org/dromara/system/dubbo/RemoteLabelPostServicelmpl.java
  11. 18
      dk-modules/system/src/main/java/org/dromara/system/mapper/AiLabelPostMapper.java
  12. 20
      dk-modules/system/src/main/java/org/dromara/system/mapper/AiLablePostMapper.java
  13. 21
      dk-modules/system/src/main/java/org/dromara/system/service/IAiLabelPostService.java
  14. 4
      dk-modules/system/src/main/java/org/dromara/system/service/IAiLabelService.java
  15. 6
      dk-modules/system/src/main/java/org/dromara/system/service/ISysPostService.java
  16. 10
      dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLabelServiceImpl.java
  17. 42
      dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLablePostServiceImpl.java
  18. 8
      dk-modules/system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java
  19. 6
      dk-modules/system/src/main/resources/mapper/system/AiLabelPostMapper.xml

4
dk-api/api-system/src/main/java/org/dromara/system/api/RemoteLablePostService.java → dk-api/api-system/src/main/java/org/dromara/system/api/RemoteLabelPostService.java

@ -6,7 +6,7 @@ import java.util.List;
* @auther yq * @auther yq
* @data 2025/3/12 * @data 2025/3/12
*/ */
public interface RemoteLablePostService { public interface RemoteLabelPostService {
/** /**
@ -16,6 +16,6 @@ public interface RemoteLablePostService {
* @return 标签集合 * @return 标签集合
* *
* */ * */
List<RemoteAiLabelPostVo> selectLableByList(String postCode, Long deptId); List<RemoteAiLabelPostVo> selectLabelByList(String postCode, Long deptId);
} }

7
dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java

@ -18,16 +18,13 @@ import org.dromara.common.core.utils.StreamUtils;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.system.api.RemoteLablePostService; import org.dromara.system.api.RemoteLabelPostService;
import org.dromara.system.api.domain.vo.RemoteAiLabelPostVo;
import org.dromara.system.api.domain.vo.RemoteUserVo; import org.dromara.system.api.domain.vo.RemoteUserVo;
import org.dromara.system.api.model.PostDTO;
import org.dromara.workflow.api.RemoteWorkflowService; import org.dromara.workflow.api.RemoteWorkflowService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
/** /**
* 预警任务Service业务层处理 * 预警任务Service业务层处理
@ -45,7 +42,7 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService {
RemoteWorkflowService remoteWorkflowService; RemoteWorkflowService remoteWorkflowService;
@DubboReference @DubboReference
RemoteLablePostService remoteLablePostService; RemoteLabelPostService remoteLablePostService;
/** /**
* 新增预警任务 * 新增预警任务

14
dk-modules/system/src/main/java/org/dromara/system/controller/system/SysPostController.java

@ -2,7 +2,6 @@ package org.dromara.system.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import org.checkerframework.checker.units.qual.A;
import org.dromara.common.core.constant.UserConstants; import org.dromara.common.core.constant.UserConstants;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.excel.utils.ExcelUtil;
@ -11,13 +10,12 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController; import org.dromara.common.web.core.BaseController;
import org.dromara.system.domain.AiLablePost;
import org.dromara.system.domain.bo.AiLablePostBindBo; import org.dromara.system.domain.bo.AiLablePostBindBo;
import org.dromara.system.domain.bo.AiLablePostBo; import org.dromara.system.domain.bo.AiLabelPostBo;
import org.dromara.system.domain.bo.SysPostBo; import org.dromara.system.domain.bo.SysPostBo;
import org.dromara.system.domain.vo.AiLablePostVo; import org.dromara.system.domain.vo.AiLabelPostVo;
import org.dromara.system.domain.vo.SysPostVo; import org.dromara.system.domain.vo.SysPostVo;
import org.dromara.system.service.IAiLablePostService; import org.dromara.system.service.IAiLabelPostService;
import org.dromara.system.service.ISysPostService; import org.dromara.system.service.ISysPostService;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -39,7 +37,7 @@ import java.util.List;
public class SysPostController extends BaseController { public class SysPostController extends BaseController {
private final ISysPostService postService; private final ISysPostService postService;
private final IAiLablePostService aiLablePostService; private final IAiLabelPostService aiLablePostService;
/** /**
* 获取岗位列表 * 获取岗位列表
@ -80,7 +78,7 @@ public class SysPostController extends BaseController {
@PostMapping("/bindLable") @PostMapping("/bindLable")
public void add(@Validated @RequestBody AiLablePostBindBo aiLablePostBindBo) { public void add(@Validated @RequestBody AiLablePostBindBo aiLablePostBindBo) {
for (Long labelId : aiLablePostBindBo.getLableIdList()) { for (Long labelId : aiLablePostBindBo.getLableIdList()) {
AiLablePostBo ailablePost = new AiLablePostBo(); AiLabelPostBo ailablePost = new AiLabelPostBo();
ailablePost.setPostId(aiLablePostBindBo.getPostId()); ailablePost.setPostId(aiLablePostBindBo.getPostId());
ailablePost.setLableId(labelId); ailablePost.setLableId(labelId);
aiLablePostService.insertByBo(ailablePost); aiLablePostService.insertByBo(ailablePost);
@ -92,7 +90,7 @@ public class SysPostController extends BaseController {
*/ */
@SaCheckPermission("system:post:list") @SaCheckPermission("system:post:list")
@GetMapping("/lableList") @GetMapping("/lableList")
public TableDataInfo<AiLablePostVo> lableList(AiLablePostBo post, PageQuery pageQuery) { public TableDataInfo<AiLabelPostVo> lableList(AiLabelPostBo post, PageQuery pageQuery) {
return postService.lableList(post, pageQuery); return postService.lableList(post, pageQuery);
} }

4
dk-modules/system/src/main/java/org/dromara/system/domain/AiLabel.java

@ -24,8 +24,8 @@ public class AiLabel {
/** /**
* id * id
*/ */
@TableId(value = "lable_id") @TableId(value = "label_id")
private Long lableId; private Long labelId;
/** /**
* 标签名- * 标签名-

6
dk-modules/system/src/main/java/org/dromara/system/domain/AiLablePost.java → dk-modules/system/src/main/java/org/dromara/system/domain/AiLabelPost.java

@ -14,8 +14,8 @@ import java.io.Serial;
* @date 2025-03-11 * @date 2025-03-11
*/ */
@Data @Data
@TableName("ai_lable_post") @TableName("ai_label_post")
public class AiLablePost { public class AiLabelPost {
@Serial @Serial
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -25,7 +25,7 @@ public class AiLablePost {
/** /**
* 标签id * 标签id
*/ */
private Long lableId; private Long labelId;
/** /**
* 岗位id * 岗位id

2
dk-modules/system/src/main/java/org/dromara/system/domain/bo/AiLabelBo.java

@ -35,7 +35,7 @@ public class AiLabelBo {
* id * id
*/ */
@NotNull(message = "id不能为空", groups = { EditGroup.class }) @NotNull(message = "id不能为空", groups = { EditGroup.class })
private Long lableId; private Long labelId;
/** /**
* 标签名- * 标签名-

8
dk-modules/system/src/main/java/org/dromara/system/domain/bo/AiLablePostBo.java → dk-modules/system/src/main/java/org/dromara/system/domain/bo/AiLabelPostBo.java

@ -3,12 +3,10 @@ package org.dromara.system.domain.bo;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.EditGroup;
import org.dromara.system.domain.AiLablePost; import org.dromara.system.domain.AiLabelPost;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.AddGroup;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*; import jakarta.validation.constraints.*;
import java.util.HashMap; import java.util.HashMap;
@ -21,8 +19,8 @@ import java.util.Map;
* @date 2025-03-11 * @date 2025-03-11
*/ */
@Data @Data
@AutoMapper(target = AiLablePost.class, reverseConvertGenerate = false) @AutoMapper(target = AiLabelPost.class, reverseConvertGenerate = false)
public class AiLablePostBo { public class AiLabelPostBo {
/** /**
* 标签id * 标签id

8
dk-modules/system/src/main/java/org/dromara/system/domain/vo/AiLablePostVo.java → dk-modules/system/src/main/java/org/dromara/system/domain/vo/AiLabelPostVo.java

@ -1,6 +1,6 @@
package org.dromara.system.domain.vo; package org.dromara.system.domain.vo;
import org.dromara.system.domain.AiLablePost; import org.dromara.system.domain.AiLabelPost;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
@ -17,8 +17,8 @@ import java.io.Serializable;
*/ */
@Data @Data
@ExcelIgnoreUnannotated @ExcelIgnoreUnannotated
@AutoMapper(target = AiLablePost.class) @AutoMapper(target = AiLabelPost.class)
public class AiLablePostVo implements Serializable { public class AiLabelPostVo implements Serializable {
@Serial @Serial
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -27,7 +27,7 @@ public class AiLablePostVo implements Serializable {
/** /**
* 标签id * 标签id
*/ */
private Long lableId; private Long labelId;
private String labelCn; private String labelCn;

2
dk-modules/system/src/main/java/org/dromara/system/domain/vo/AiLabelVo.java

@ -28,7 +28,7 @@ public class AiLabelVo implements Serializable {
* id * id
*/ */
// @ExcelProperty(value = "id") // @ExcelProperty(value = "id")
private Long lableId; private Long labelId;
/** /**
* 标签名- * 标签名-

14
dk-modules/system/src/main/java/org/dromara/system/dubbo/RemoteLablePostServicelmpl.java → dk-modules/system/src/main/java/org/dromara/system/dubbo/RemoteLabelPostServicelmpl.java

@ -3,11 +3,11 @@ package org.dromara.system.dubbo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.dubbo.config.annotation.DubboService; import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.system.api.RemoteLablePostService; import org.dromara.system.api.RemoteLabelPostService;
import org.dromara.system.api.domain.vo.RemoteAiLabelPostVo; import org.dromara.system.api.domain.vo.RemoteAiLabelPostVo;
import org.dromara.system.domain.vo.AiLablePostVo; import org.dromara.system.domain.vo.AiLabelPostVo;
import org.dromara.system.domain.vo.SysPostVo; import org.dromara.system.domain.vo.SysPostVo;
import org.dromara.system.service.IAiLablePostService; import org.dromara.system.service.IAiLabelPostService;
import org.dromara.system.service.ISysPostService; import org.dromara.system.service.ISysPostService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -21,16 +21,16 @@ import java.util.List;
@RequiredArgsConstructor @RequiredArgsConstructor
@Service @Service
@DubboService @DubboService
public class RemoteLablePostServicelmpl implements RemoteLablePostService { public class RemoteLabelPostServicelmpl implements RemoteLabelPostService {
private final ISysPostService sysPostService; private final ISysPostService sysPostService;
private final IAiLablePostService aiLablePostService; private final IAiLabelPostService aiLabelPostService;
@Override @Override
public List<RemoteAiLabelPostVo> selectLableByList(String postCode, Long deptId) { public List<RemoteAiLabelPostVo> selectLabelByList(String postCode, Long deptId) {
SysPostVo sysPostVo = sysPostService.selectLableByList(postCode, deptId); SysPostVo sysPostVo = sysPostService.selectLableByList(postCode, deptId);
if(sysPostVo != null){ if(sysPostVo != null){
List<AiLablePostVo> aiLablePostVos = aiLablePostService.queryListByLable(sysPostVo.getPostId()); List<AiLabelPostVo> aiLablePostVos = aiLabelPostService.queryListByLabel(sysPostVo.getPostId());
return MapstructUtils.convert(aiLablePostVos, RemoteAiLabelPostVo.class); return MapstructUtils.convert(aiLablePostVos, RemoteAiLabelPostVo.class);
} }
return new ArrayList<>(); return new ArrayList<>();

18
dk-modules/system/src/main/java/org/dromara/system/mapper/AiLabelPostMapper.java

@ -0,0 +1,18 @@
package org.dromara.system.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.dromara.system.domain.AiLabelPost;
import org.dromara.system.domain.vo.AiLabelPostVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 职能-标签关系Mapper接口
*
* @author LionLi
* @date 2025-03-11
*/
public interface AiLabelPostMapper extends BaseMapperPlus<AiLabelPost, AiLabelPostVo> {
Page<AiLabelPostVo> selectAiLabelPostPage(@Param("page") Page<?> page, @Param("ew") QueryWrapper<AiLabelPost> wrapper);
}

20
dk-modules/system/src/main/java/org/dromara/system/mapper/AiLablePostMapper.java

@ -1,20 +0,0 @@
package org.dromara.system.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.dromara.system.domain.AiLablePost;
import org.dromara.system.domain.bo.AiLablePostBo;
import org.dromara.system.domain.vo.AiLablePostVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 职能-标签关系Mapper接口
*
* @author LionLi
* @date 2025-03-11
*/
public interface AiLablePostMapper extends BaseMapperPlus<AiLablePost, AiLablePostVo> {
Page<AiLablePostVo> selectAiLablePostPage(@Param("page") Page<?> page, @Param("ew") QueryWrapper<AiLablePost> wrapper);
}

21
dk-modules/system/src/main/java/org/dromara/system/service/IAiLablePostService.java → dk-modules/system/src/main/java/org/dromara/system/service/IAiLabelPostService.java

@ -1,8 +1,7 @@
package org.dromara.system.service; package org.dromara.system.service;
import org.dromara.system.domain.AiLablePost; import org.dromara.system.domain.bo.AiLabelPostBo;
import org.dromara.system.domain.vo.AiLablePostVo; import org.dromara.system.domain.vo.AiLabelPostVo;
import org.dromara.system.domain.bo.AiLablePostBo;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
@ -15,15 +14,15 @@ import java.util.List;
* @author LionLi * @author LionLi
* @date 2025-03-11 * @date 2025-03-11
*/ */
public interface IAiLablePostService { public interface IAiLabelPostService {
/** /**
* 查询职能-标签关系 * 查询职能-标签关系
* *
* @param lableId 主键 * @param labelId 主键
* @return 职能-标签关系 * @return 职能-标签关系
*/ */
AiLablePostVo queryById(Long lableId); AiLabelPostVo queryById(Long labelId);
/** /**
* 分页查询职能-标签关系列表 * 分页查询职能-标签关系列表
@ -32,7 +31,7 @@ public interface IAiLablePostService {
* @param pageQuery 分页参数 * @param pageQuery 分页参数
* @return 职能-标签关系分页列表 * @return 职能-标签关系分页列表
*/ */
TableDataInfo<AiLablePostVo> queryPageList(AiLablePostBo bo, PageQuery pageQuery); TableDataInfo<AiLabelPostVo> queryPageList(AiLabelPostBo bo, PageQuery pageQuery);
/** /**
* 查询符合条件的职能-标签关系列表 * 查询符合条件的职能-标签关系列表
@ -40,7 +39,7 @@ public interface IAiLablePostService {
* @param bo 查询条件 * @param bo 查询条件
* @return 职能-标签关系列表 * @return 职能-标签关系列表
*/ */
List<AiLablePostVo> queryList(AiLablePostBo bo); List<AiLabelPostVo> queryList(AiLabelPostBo bo);
/** /**
* 新增职能-标签关系 * 新增职能-标签关系
@ -48,7 +47,7 @@ public interface IAiLablePostService {
* @param bo 职能-标签关系 * @param bo 职能-标签关系
* @return 是否新增成功 * @return 是否新增成功
*/ */
Boolean insertByBo(AiLablePostBo bo); Boolean insertByBo(AiLabelPostBo bo);
/** /**
* 修改职能-标签关系 * 修改职能-标签关系
@ -56,7 +55,7 @@ public interface IAiLablePostService {
* @param bo 职能-标签关系 * @param bo 职能-标签关系
* @return 是否修改成功 * @return 是否修改成功
*/ */
Boolean updateByBo(AiLablePostBo bo); Boolean updateByBo(AiLabelPostBo bo);
/** /**
* 校验并批量删除职能-标签关系信息 * 校验并批量删除职能-标签关系信息
@ -67,5 +66,5 @@ public interface IAiLablePostService {
*/ */
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid); Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
List<AiLablePostVo> queryListByLable(Long postId); List<AiLabelPostVo> queryListByLabel(Long postId);
} }

4
dk-modules/system/src/main/java/org/dromara/system/service/IAiLabelService.java

@ -20,10 +20,10 @@ public interface IAiLabelService {
/** /**
* 查询ai 识别类型 * 查询ai 识别类型
* *
* @param lableId 主键 * @param labelId 主键
* @return ai 识别类型 * @return ai 识别类型
*/ */
AiLabelVo queryById(Long lableId); AiLabelVo queryById(Long labelId);
List<AiLabelVo> allList(); List<AiLabelVo> allList();

6
dk-modules/system/src/main/java/org/dromara/system/service/ISysPostService.java

@ -2,9 +2,9 @@ package org.dromara.system.service;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.system.domain.bo.AiLablePostBo; import org.dromara.system.domain.bo.AiLabelPostBo;
import org.dromara.system.domain.bo.SysPostBo; import org.dromara.system.domain.bo.SysPostBo;
import org.dromara.system.domain.vo.AiLablePostVo; import org.dromara.system.domain.vo.AiLabelPostVo;
import org.dromara.system.domain.vo.SysPostVo; import org.dromara.system.domain.vo.SysPostVo;
import java.util.List; import java.util.List;
@ -19,7 +19,7 @@ public interface ISysPostService {
TableDataInfo<SysPostVo> selectPagePostList(SysPostBo post, PageQuery pageQuery); TableDataInfo<SysPostVo> selectPagePostList(SysPostBo post, PageQuery pageQuery);
TableDataInfo<AiLablePostVo> lableList(AiLablePostBo bo, PageQuery pageQuery); TableDataInfo<AiLabelPostVo> lableList(AiLabelPostBo bo, PageQuery pageQuery);
/** /**
* 查询岗位信息集合 * 查询岗位信息集合
* *

10
dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLabelServiceImpl.java

@ -35,17 +35,17 @@ public class AiLabelServiceImpl implements IAiLabelService {
/** /**
* 查询ai 识别类型 * 查询ai 识别类型
* *
* @param lableId 主键 * @param labelId 主键
* @return ai 识别类型 * @return ai 识别类型
*/ */
@Override @Override
public AiLabelVo queryById(Long lableId){ public AiLabelVo queryById(Long labelId){
return baseMapper.selectVoById(lableId); return baseMapper.selectVoById(labelId);
} }
@Override @Override
public List<AiLabelVo> allList() { public List<AiLabelVo> allList() {
return baseMapper.selectVoList().stream().sorted(Comparator.comparing(AiLabelVo::getLableId)).toList(); return baseMapper.selectVoList().stream().sorted(Comparator.comparing(AiLabelVo::getLabelId)).toList();
} }
/** /**
@ -96,7 +96,7 @@ public class AiLabelServiceImpl implements IAiLabelService {
validEntityBeforeSave(add); validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0; boolean flag = baseMapper.insert(add) > 0;
if (flag) { if (flag) {
bo.setLableId(add.getLableId()); bo.setLabelId(add.getLabelId());
} }
return flag; return flag;
} }

42
dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLablePostServiceImpl.java

@ -8,13 +8,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.system.domain.AiLabelPost;
import org.dromara.system.domain.vo.AiLabelPostVo;
import org.dromara.system.mapper.AiLabelMapper; import org.dromara.system.mapper.AiLabelMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.dromara.system.domain.bo.AiLablePostBo; import org.dromara.system.domain.bo.AiLabelPostBo;
import org.dromara.system.domain.vo.AiLablePostVo; import org.dromara.system.mapper.AiLabelPostMapper;
import org.dromara.system.domain.AiLablePost; import org.dromara.system.service.IAiLabelPostService;
import org.dromara.system.mapper.AiLablePostMapper;
import org.dromara.system.service.IAiLablePostService;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -28,9 +28,9 @@ import java.util.Collection;
*/ */
@RequiredArgsConstructor @RequiredArgsConstructor
@Service @Service
public class AiLablePostServiceImpl implements IAiLablePostService { public class AiLablePostServiceImpl implements IAiLabelPostService {
private final AiLablePostMapper baseMapper; private final AiLabelPostMapper baseMapper;
private final AiLabelMapper aiLabelMapper; private final AiLabelMapper aiLabelMapper;
/** /**
@ -40,7 +40,7 @@ public class AiLablePostServiceImpl implements IAiLablePostService {
* @return 职能-标签关系 * @return 职能-标签关系
*/ */
@Override @Override
public AiLablePostVo queryById(Long lableId){ public AiLabelPostVo queryById(Long lableId){
return baseMapper.selectVoById(lableId); return baseMapper.selectVoById(lableId);
} }
@ -52,10 +52,10 @@ public class AiLablePostServiceImpl implements IAiLablePostService {
* @return 职能-标签关系分页列表 * @return 职能-标签关系分页列表
*/ */
@Override @Override
public TableDataInfo<AiLablePostVo> queryPageList(AiLablePostBo bo, PageQuery pageQuery) { public TableDataInfo<AiLabelPostVo> queryPageList(AiLabelPostBo bo, PageQuery pageQuery) {
QueryWrapper queryWrapper = new QueryWrapper(); QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("a.post_id", bo.getPostId()); queryWrapper.eq("a.post_id", bo.getPostId());
Page<AiLablePostVo> result = baseMapper.selectAiLablePostPage(pageQuery.build(), queryWrapper); Page<AiLabelPostVo> result = baseMapper.selectAiLabelPostPage(pageQuery.build(), queryWrapper);
return TableDataInfo.build(result); return TableDataInfo.build(result);
} }
@ -66,14 +66,14 @@ public class AiLablePostServiceImpl implements IAiLablePostService {
* @return 职能-标签关系列表 * @return 职能-标签关系列表
*/ */
@Override @Override
public List<AiLablePostVo> queryList(AiLablePostBo bo) { public List<AiLabelPostVo> queryList(AiLabelPostBo bo) {
LambdaQueryWrapper<AiLablePost> lqw = buildQueryWrapper(bo); LambdaQueryWrapper<AiLabelPost> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw); return baseMapper.selectVoList(lqw);
} }
private LambdaQueryWrapper<AiLablePost> buildQueryWrapper(AiLablePostBo bo) { private LambdaQueryWrapper<AiLabelPost> buildQueryWrapper(AiLabelPostBo bo) {
Map<String, Object> params = bo.getParams(); Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<AiLablePost> lqw = Wrappers.lambdaQuery(); LambdaQueryWrapper<AiLabelPost> lqw = Wrappers.lambdaQuery();
return lqw; return lqw;
} }
@ -84,12 +84,12 @@ public class AiLablePostServiceImpl implements IAiLablePostService {
* @return 是否新增成功 * @return 是否新增成功
*/ */
@Override @Override
public Boolean insertByBo(AiLablePostBo bo) { public Boolean insertByBo(AiLabelPostBo bo) {
AiLablePost add = MapstructUtils.convert(bo, AiLablePost.class); AiLabelPost add = MapstructUtils.convert(bo, AiLabelPost.class);
validEntityBeforeSave(add); validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0; boolean flag = baseMapper.insert(add) > 0;
if (flag) { if (flag) {
bo.setLableId(add.getLableId()); bo.setLableId(add.getLabelId());
} }
return flag; return flag;
} }
@ -101,8 +101,8 @@ public class AiLablePostServiceImpl implements IAiLablePostService {
* @return 是否修改成功 * @return 是否修改成功
*/ */
@Override @Override
public Boolean updateByBo(AiLablePostBo bo) { public Boolean updateByBo(AiLabelPostBo bo) {
AiLablePost update = MapstructUtils.convert(bo, AiLablePost.class); AiLabelPost update = MapstructUtils.convert(bo, AiLabelPost.class);
validEntityBeforeSave(update); validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0; return baseMapper.updateById(update) > 0;
} }
@ -110,7 +110,7 @@ public class AiLablePostServiceImpl implements IAiLablePostService {
/** /**
* 保存前的数据校验 * 保存前的数据校验
*/ */
private void validEntityBeforeSave(AiLablePost entity){ private void validEntityBeforeSave(AiLabelPost entity){
//TODO 做一些数据校验,如唯一约束 //TODO 做一些数据校验,如唯一约束
} }
@ -130,7 +130,7 @@ public class AiLablePostServiceImpl implements IAiLablePostService {
} }
@Override @Override
public List<AiLablePostVo> queryListByLable(Long postId) { public List<AiLabelPostVo> queryListByLabel(Long postId) {
return List.of(); return List.of();
} }
} }

8
dk-modules/system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java

@ -14,15 +14,13 @@ import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.helper.DataBaseHelper; import org.dromara.common.mybatis.helper.DataBaseHelper;
import org.dromara.system.domain.AiLablePost;
import org.dromara.system.domain.SysDept; import org.dromara.system.domain.SysDept;
import org.dromara.system.domain.SysPost; import org.dromara.system.domain.SysPost;
import org.dromara.system.domain.SysUserPost; import org.dromara.system.domain.SysUserPost;
import org.dromara.system.domain.bo.AiLablePostBo; import org.dromara.system.domain.bo.AiLabelPostBo;
import org.dromara.system.domain.bo.SysPostBo; import org.dromara.system.domain.bo.SysPostBo;
import org.dromara.system.domain.vo.AiLablePostVo; import org.dromara.system.domain.vo.AiLabelPostVo;
import org.dromara.system.domain.vo.SysPostVo; import org.dromara.system.domain.vo.SysPostVo;
import org.dromara.system.mapper.AiLablePostMapper;
import org.dromara.system.mapper.SysDeptMapper; import org.dromara.system.mapper.SysDeptMapper;
import org.dromara.system.mapper.SysPostMapper; import org.dromara.system.mapper.SysPostMapper;
import org.dromara.system.mapper.SysUserPostMapper; import org.dromara.system.mapper.SysUserPostMapper;
@ -53,7 +51,7 @@ public class SysPostServiceImpl implements ISysPostService {
} }
@Override @Override
public TableDataInfo<AiLablePostVo> lableList(AiLablePostBo bo, PageQuery pageQuery) { public TableDataInfo<AiLabelPostVo> lableList(AiLabelPostBo bo, PageQuery pageQuery) {
return aiLablePostService.queryPageList(bo,pageQuery); return aiLablePostService.queryPageList(bo,pageQuery);
} }

6
dk-modules/system/src/main/resources/mapper/system/AiLablePostMapper.xml → dk-modules/system/src/main/resources/mapper/system/AiLabelPostMapper.xml

@ -2,9 +2,9 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.system.mapper.AiLablePostMapper"> <mapper namespace="org.dromara.system.mapper.AiLabelPostMapper">
<select id="selectAiLablePostPage" resultType="org.dromara.system.domain.vo.AiLablePostVo"> <select id="selectAiLabelPostPage" resultType="org.dromara.system.domain.vo.AiLabelPostVo">
SELECT *,a.label_cn as ,label_en FROM ai_lable_post p inner JOIN ai_lable a ON p.lable_id = a.lable_id ${ew.customSqlSegment} SELECT *,a.label_cn as ,label_en FROM ai_lable_post p inner JOIN ai_label a ON p.label_id = a.label_id ${ew.customSqlSegment}
</select> </select>
</mapper> </mapper>
Loading…
Cancel
Save