智库标签

pom.xml

@@ -68,7 +68,7 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-            <version>2.5.7</version>
+            <version>3.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>

src/main/java/com/zzsn/thinktank/controller/SysDictItemController.java

@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zzsn.thinktank.entity.SysDict;
 import com.zzsn.thinktank.entity.SysDictItem;
 import com.zzsn.thinktank.service.ISysDictItemService;
+import com.zzsn.thinktank.service.ISysDictService;
 import com.zzsn.thinktank.vo.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -33,6 +35,8 @@ public class SysDictItemController {
 
 	@Autowired
 	private ISysDictItemService sysDictItemService;
+	@Autowired
+	private ISysDictService sysDictService;
 
 	/**
 	 * @功能：查询字典数据
@@ -47,14 +51,19 @@ public class SysDictItemController {
 													@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 													@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
 		Result<IPage<SysDictItem>> result = new Result<IPage<SysDictItem>>();
+		QueryWrapper query = new QueryWrapper();
+		query.eq("dict_code",sysDictItem.getDictCode());
+		SysDict sysDict = sysDictService.getOne(query);
+		if(sysDict!=null){
 			LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<SysDictItem>()
 					.eq(null != sysDictItem.getStatus(), SysDictItem::getStatus, sysDictItem.getStatus())
-				.eq(null != sysDictItem.getDictId(), SysDictItem::getDictId, sysDictItem.getDictId())
+					.eq(null != sysDict.getId(), SysDictItem::getDictId, sysDict.getId())
 					.like(null != sysDictItem.getItemText(), SysDictItem::getItemText, sysDictItem.getItemText());
 			Page<SysDictItem> page = new Page<SysDictItem>(pageNo, pageSize);
 			IPage<SysDictItem> pageList = sysDictItemService.page(page, queryWrapper);
 			result.setSuccess(true);
 			result.setResult(pageList);
+		}
 		return result;
 	}
 	

src/main/java/com/zzsn/thinktank/entity/SysDict.java

+package com.zzsn.thinktank.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import lombok.*;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 字典表
+ * </p>
+ *
+ * @Author zhangweijian
+ * @since 2018-12-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class SysDict implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+    
+    /**
+     * [预留字段，暂时无用]
+     * 字典类型,0 string,1 number类型,2 boolean
+     * 前端js对stirng类型和number类型 boolean 类型敏感，需要区分。在select 标签匹配的时候会用到
+     * 默认为string类型
+     */
+    private Integer type;
+    
+    /**
+     * 字典名称
+     */
+    private String dictName;
+
+    /**
+     * 字典编码
+     */
+    private String dictCode;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 删除状态
+     */
+    @TableLogic
+    private Integer delFlag;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+    /**
+     * 父级id
+     */
+    private String parentId;
+    /**
+     * 是否为叶子节点
+     */
+    private Integer leafNode;
+
+
+}

src/main/java/com/zzsn/thinktank/entity/SysDictItem.java

 package com.zzsn.thinktank.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -74,5 +75,7 @@ public class SysDictItem implements Serializable {
 
     private Date updateTime;
 
+    @TableField(exist = false)
+    private String dictCode;
 
 }

src/main/java/com/zzsn/thinktank/mapper/SysDictMapper.java

+package com.zzsn.thinktank.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zzsn.thinktank.entity.SysDict;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+/**
+ * <p>
+ * 字典表 Mapper 接口
+ * </p>
+ *
+ * @Author zhangweijian
+ * @since 2018-12-28
+ */
+public interface SysDictMapper extends BaseMapper<SysDict> {
+	
+}

src/main/java/com/zzsn/thinktank/service/ISysDictService.java

+package com.zzsn.thinktank.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zzsn.thinktank.entity.SysDict;
+
+/**
+ * <p>
+ * 字典表 服务类
+ * </p>
+ *
+ * @Author zhangweijian
+ * @since 2018-12-28
+ */
+public interface ISysDictService extends IService<SysDict> {
+
+}

src/main/java/com/zzsn/thinktank/service/impl/SysDictServiceImpl.java

+package com.zzsn.thinktank.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zzsn.thinktank.entity.SysDict;
+import com.zzsn.thinktank.mapper.SysDictItemMapper;
+import com.zzsn.thinktank.mapper.SysDictMapper;
+import com.zzsn.thinktank.service.ISysDictService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 字典表 服务实现类
+ * </p>
+ *
+ * @Author zhangweijian
+ * @since 2018-12-28
+ */
+@DS("slave")
+@Service
+@Slf4j
+public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> implements ISysDictService {
+
+    @Autowired
+    private SysDictMapper sysDictMapper;
+    @Autowired
+    private SysDictItemMapper sysDictItemMapper;
+
+}

src/test/java/com/zzsn/thinktank/ThinkTankApplicationTests.java

-package com.zzsn.thinktank;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class ThinkTankApplicationTests {
-
-    @Test
-    void contextLoads() {
-    }
-
-}