修改字典dao

guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/DictController.java

@@ -13,7 +13,6 @@ import com.stylefeng.guns.core.base.controller.BaseController;
 import com.stylefeng.guns.core.exception.GunsException;
 import com.stylefeng.guns.core.exception.GunsException;
 import com.stylefeng.guns.core.log.LogObjectHolder;
 import com.stylefeng.guns.core.log.LogObjectHolder;
 import com.stylefeng.guns.core.util.ToolUtil;
 import com.stylefeng.guns.core.util.ToolUtil;
-import com.stylefeng.guns.modular.system.dao.DictDao;
 import com.stylefeng.guns.modular.system.service.IDictService;
 import com.stylefeng.guns.modular.system.service.IDictService;
 import com.stylefeng.guns.modular.system.warpper.DictWarpper;
 import com.stylefeng.guns.modular.system.warpper.DictWarpper;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
@@ -40,9 +39,6 @@ public class DictController extends BaseController {
     private String PREFIX = "/system/dict/";
     private String PREFIX = "/system/dict/";
 
 
     @Resource
     @Resource
-    DictDao dictDao;
-
-    @Resource
     DictMapper dictMapper;
     DictMapper dictMapper;
 
 
     @Resource
     @Resource
@@ -102,7 +98,7 @@ public class DictController extends BaseController {
     @Permission(Const.ADMIN_NAME)
     @Permission(Const.ADMIN_NAME)
     @ResponseBody
     @ResponseBody
     public Object list(String condition) {
     public Object list(String condition) {
-        List<Map<String, Object>> list = this.dictDao.list(condition);
+        List<Map<String, Object>> list = this.dictMapper.list(condition);
         return super.warpObject(new DictWarpper(list));
         return super.warpObject(new DictWarpper(list));
     }
     }
 
 

guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DictDao.java

-package com.stylefeng.guns.modular.system.dao;
-
-import com.stylefeng.guns.modular.system.model.Dict;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 字典的dao
- *
- * @author fengshuonan
- * @date 2017年2月13日 下午11:10:24
- */
-public interface DictDao {
-
-    /**
-     * 根据编码获取词典列表
-     *
-     * @param code
-     * @return
-     * @date 2017年2月13日 下午11:11:28
-     */
-    List<Dict> selectByCode(@Param("code") String code);
-
-    /**
-     * 查询字典列表
-     * 
-     * @author fengshuonan
-     * @Date 2017/4/26 13:04
-     */
-    List<Map<String,Object>> list(@Param("condition") String conditiion);
-}

guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DictMapper.java

@@ -2,6 +2,10 @@ package com.stylefeng.guns.modular.system.dao;
 
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.stylefeng.guns.modular.system.model.Dict;
 import com.stylefeng.guns.modular.system.model.Dict;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 
 /**
 /**
  * <p>
  * <p>
@@ -13,4 +17,13 @@ import com.stylefeng.guns.modular.system.model.Dict;
  */
  */
 public interface DictMapper extends BaseMapper<Dict> {
 public interface DictMapper extends BaseMapper<Dict> {
 
 
+    /**
+     * 根据编码获取词典列表
+     */
+    List<Dict> selectByCode(@Param("code") String code);
+
+    /**
+     * 查询字典列表
+     */
+    List<Map<String, Object>> list(@Param("condition") String conditiion);
 }
 }
\ No newline at end of file

guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DictDao.xml

-<?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.stylefeng.guns.modular.system.dao.DictDao">
-
-	<sql id="Base_Column_List">
-		id, num, pid, name, tips
-	</sql>
-
-	<select id="selectByCode" resultType="dict">
-		select
-		<include refid="Base_Column_List" />
-		from sys_dict
-		where code = #{code}
-	</select>
-
-	<select id="list" resultType="map">
-		select * from sys_dict
-		where pid = 0
-		<if test="condition != null and condition != ''">
-			AND name like CONCAT('%',#{condition},'%')
-		</if>
-		order by id ASC
-	</select>
-
-</mapper>
\ No newline at end of file

guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DictMapper.xml

@@ -4,11 +4,31 @@
 
 
     <!-- 通用查询映射结果 -->
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Dict">
     <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Dict">
-		<id column="id" property="id" />
-		<result column="num" property="num" />
-		<result column="pid" property="pid" />
-		<result column="name" property="name" />
-		<result column="tips" property="tips" />
+        <id column="id" property="id"/>
+        <result column="num" property="num"/>
+        <result column="pid" property="pid"/>
+        <result column="name" property="name"/>
+        <result column="tips" property="tips"/>
     </resultMap>
     </resultMap>
 
 
+    <sql id="Base_Column_List">
+		id, num, pid, name, tips
+	</sql>
+
+    <select id="selectByCode" resultType="dict">
+        select
+        <include refid="Base_Column_List"/>
+        from sys_dict
+        where code = #{code}
+    </select>
+
+    <select id="list" resultType="map">
+        select * from sys_dict
+        where pid = 0
+        <if test="condition != null and condition != ''">
+            AND name like CONCAT('%',#{condition},'%')
+        </if>
+        order by id ASC
+    </select>
+
 </mapper>
 </mapper>