租户字典查询

hx-tenant/src/main/java/com/fjhx/tenant/controller/tenant/DictController.java

@@ -0,0 +1,34 @@
+package com.fjhx.tenant.controller.tenant;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fjhx.tenant.entity.dict.dto.DictTenantDataSelectDto;
+import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
+import com.fjhx.tenant.service.dict.DictTenantDataService;
+import com.ruoyi.common.annotation.TenantIgnore;
+import com.ruoyi.common.constant.BaseSourceConstant;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@DS(BaseSourceConstant.BASE)
+@TenantIgnore
+@RestController
+@RequestMapping("/tenantDict")
+public class DictController {
+
+    @Autowired
+    private DictTenantDataService dictTenantDataService;
+
+    /**
+     * 获取租户字典
+     */
+    @PostMapping("getDict")
+    public List<DictTenantDataVo> page(@RequestBody DictTenantDataSelectDto dto) {
+        return dictTenantDataService.getList(dto);
+    }
+
+}

hx-tenant/src/main/java/com/fjhx/tenant/mapper/dict/DictTenantDataMapper.java

@@ -7,6 +7,8 @@ import com.fjhx.tenant.entity.dict.po.DictTenantData;
 import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -23,4 +25,9 @@ public interface DictTenantDataMapper extends BaseMapper<DictTenantData> {
      */
     Page<DictTenantDataVo> getPage(@Param("page") Page<Object> page, @Param("dto") DictTenantDataSelectDto dto);
 
+    /**
+     * 租户字典明细列表
+     */
+    List<DictTenantDataVo> getList(@Param("dto") DictTenantDataSelectDto dto);
+
 }

hx-tenant/src/main/java/com/fjhx/tenant/service/dict/DictTenantDataService.java

@@ -7,6 +7,8 @@ import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
 import com.fjhx.tenant.entity.dict.dto.DictTenantDataSelectDto;
 import com.fjhx.tenant.entity.dict.dto.DictTenantDataDto;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -43,4 +45,9 @@ public interface DictTenantDataService extends BaseService<DictTenantData> {
      */
     void delete(Long id);
 
+    /**
+     * 获取租户字典
+     */
+    List<DictTenantDataVo> getList(DictTenantDataSelectDto dto);
+
 }

hx-tenant/src/main/java/com/fjhx/tenant/service/dict/impl/DictTenantDataServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fjhx.tenant.service.dict.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.tenant.entity.dict.dto.DictTenantDataDto;
@@ -12,9 +13,11 @@ import com.fjhx.tenant.mapper.dict.DictTenantDataMapper;
 import com.fjhx.tenant.service.dict.DictCommonDataService;
 import com.fjhx.tenant.service.dict.DictTenantDataService;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Objects;
 
 
@@ -102,4 +105,15 @@ public class DictTenantDataServiceImpl extends ServiceImpl<DictTenantDataMapper,
         this.removeById(id);
     }
 
+    @Override
+    public List<DictTenantDataVo> getList(DictTenantDataSelectDto dto) {
+        String dictCode = dto.getDictCode();
+        if (StrUtil.isBlank(dictCode)) {
+            throw new ServiceException("字典编码不能为空");
+        }
+
+        dto.setTenantId(SecurityUtils.getTenantId());
+        return baseMapper.getList(dto);
+    }
+
 }

hx-tenant/src/main/resources/mapper/dict/DictTenantDataMapper.xml

@@ -1,17 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.tenant.mapper.dict.DictTenantDataMapper">
+
     <select id="getPage" resultType="com.fjhx.tenant.entity.dict.vo.DictTenantDataVo">
+        <include refid="list"/>
+    </select>
+
+    <select id="getList" resultType="com.fjhx.tenant.entity.dict.vo.DictTenantDataVo">
+        <include refid="list"/>
+    </select>
+
+    <sql id="list">
         select t.id,
                t.type,
                t.dict_key,
                t.dict_value,
-               t.sort
+               t.sort,
+               t.tenant_id
         from ((select t.id,
                       1 type,
                       t.dict_key,
                       t.dict_value,
-                      t.sort
+                      t.sort,
+                      '000000' tenant_id
                from dict_common_data t
                where t.dict_code = #{dto.dictCode})
               union all
@@ -19,11 +30,12 @@
                       2 type,
                       t.dict_key,
                       t.dict_value,
-                      t.sort
+                      t.sort,
+                      t.tenant_id
                from dict_tenant_data t
                where t.dict_code = #{dto.dictCode}
                  and t.tenant_id = #{dto.tenantId})) t
         order by t.sort asc
-    </select>
+    </sql>
 
 </mapper>