feat：系统关键字基础功能完善

fs-admin/src/main/java/com/fs/web/controller/system/SysDictDataController.java

@@ -28,13 +28,10 @@ import com.fs.system.service.ISysDictTypeService;
 
 /**
  * 数据字典信息
- * 
- 
  */
 @RestController
 @RequestMapping("/system/dict/data")
-public class SysDictDataController extends BaseController
-{
+public class SysDictDataController extends BaseController {
     @Autowired
     private ISysDictDataService dictDataService;
 
@@ -43,8 +40,7 @@ public class SysDictDataController extends BaseController
 
     @PreAuthorize("@ss.hasPermi('system:dict:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysDictData dictData)
-    {
+    public TableDataInfo list(SysDictData dictData) {
         startPage();
         List<SysDictData> list = dictDataService.selectDictDataList(dictData);
         return getDataTable(list);
@@ -53,8 +49,7 @@ public class SysDictDataController extends BaseController
     @Log(title = "字典数据", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:dict:export')")
     @GetMapping("/export")
-    public AjaxResult export(SysDictData dictData)
-    {
+    public AjaxResult export(SysDictData dictData) {
         List<SysDictData> list = dictDataService.selectDictDataList(dictData);
         ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
         return util.exportExcel(list, "字典数据");
@@ -65,8 +60,7 @@ public class SysDictDataController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dict:query')")
     @GetMapping(value = "/{dictCode}")
-    public AjaxResult getInfo(@PathVariable Long dictCode)
-    {
+    public AjaxResult getInfo(@PathVariable Long dictCode) {
         return AjaxResult.success(dictDataService.selectDictDataById(dictCode));
     }
 
@@ -74,8 +68,7 @@ public class SysDictDataController extends BaseController
      * 根据字典类型查询字典数据信息
      */
     @GetMapping(value = "/type/{dictType}")
-    public AjaxResult dictType(@PathVariable String dictType)
-    {
+    public AjaxResult dictType(@PathVariable String dictType) {
         return AjaxResult.success(dictTypeService.selectDictDataByType(dictType));
     }
 
@@ -85,8 +78,7 @@ public class SysDictDataController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:add')")
     @Log(title = "字典数据", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysDictData dict)
-    {
+    public AjaxResult add(@Validated @RequestBody SysDictData dict) {
         dict.setCreateBy(SecurityUtils.getUsername());
         return toAjax(dictDataService.insertDictData(dict));
     }
@@ -97,8 +89,7 @@ public class SysDictDataController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:edit')")
     @Log(title = "字典数据", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysDictData dict)
-    {
+    public AjaxResult edit(@Validated @RequestBody SysDictData dict) {
         dict.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(dictDataService.updateDictData(dict));
     }
@@ -109,9 +100,17 @@ public class SysDictDataController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictCodes}")
-    public AjaxResult remove(@PathVariable Long[] dictCodes)
-    {
+    public AjaxResult remove(@PathVariable Long[] dictCodes) {
         return toAjax(dictDataService.deleteDictDataByIds(dictCodes));
     }
 
+    /**
+     * 不分页获取列表
+     */
+    @GetMapping("/allList")
+    public AjaxResult allList(SysDictData dictData) {
+        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+        return AjaxResult.success(list);
+    }
+
 }

fs-admin/src/main/java/com/fs/sys/controller/SysKeywordController.java → fs-admin/src/main/java/com/fs/web/controller/system/SysKeywordController.java

@@ -1,6 +1,11 @@
-package com.fs.sys.controller;
+package com.fs.web.controller.system;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import com.fs.common.core.domain.R;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,11 +43,17 @@ public class SysKeywordController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:keyword:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysKeyword sysKeyword)
+    public R list(SysKeyword sysKeyword)
     {
-        startPage();
+//        startPage();
+        PageHelper.startPage(sysKeyword.getPageNum(), sysKeyword.getPageSize());
         List<SysKeyword> list = sysKeywordService.selectSysKeywordList(sysKeyword);
-        return getDataTable(list);
+
+        PageInfo<SysKeyword> pageInfo = new PageInfo<>(list);
+        Map<String, Object> result = new HashMap<>();
+        result.put("rows", pageInfo.getList());
+        result.put("total", pageInfo.getTotal());
+        return R.ok(result);
     }
 
     /**

fs-service-system/src/main/java/com/fs/system/domain/SysKeyword.java

@@ -1,5 +1,6 @@
 package com.fs.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fs.common.annotation.Excel;
 import lombok.Data;
@@ -16,6 +17,12 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class SysKeyword extends BaseEntity{
 
+    @TableField(exist = false)
+    private Integer pageNum;
+
+    @TableField(exist = false)
+    private Integer pageSize;
+
     /** 关键字id */
     private Long keywordId;
 
@@ -31,5 +38,12 @@ public class SysKeyword extends BaseEntity{
     @Excel(name = "所属公司")
     private Long companyId;
 
+    @TableField(exist = false)
+    @Excel(name = "类型名称")
+    private String typeName;
+
+    @TableField(exist = false)
+    @Excel(name = "公司名称")
+    private String companyName;
 
 }

fs-service-system/src/main/resources/mapper/system/SysKeywordMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fs.system.mapper.SysKeywordMapper">
-    
+
     <resultMap type="SysKeyword" id="SysKeywordResult">
         <result property="keywordId"    column="keyword_id"    />
         <result property="keyword"    column="keyword"    />
@@ -13,24 +13,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
-    <sql id="selectSysKeywordVo">
+    <sql id="selectSysKeyword">
         select keyword_id, keyword, type, company_id, create_time, update_time from sys_keyword
     </sql>
 
+    <sql id="selectSysKeywordVo">
+        SELECT
+            keyword_id,
+            keyword,
+            type,
+            sys_keyword.company_id,
+            sys_keyword.create_time,
+            sys_keyword.update_time,
+            sys_dict_data.dict_label as typeName,
+            company.company_name
+        FROM
+            sys_keyword
+                LEFT JOIN sys_dict_data ON sys_dict_data.dict_type = "keyword_type"
+                AND sys_dict_data.dict_value = sys_keyword.type
+                LEFT JOIN company ON company.company_id = sys_keyword.company_id
+    </sql>
+
     <select id="selectSysKeywordList" parameterType="SysKeyword" resultMap="SysKeywordResult">
         <include refid="selectSysKeywordVo"/>
-        <where>  
-            <if test="keyword != null  and keyword != ''"> and keyword = #{keyword}</if>
+        <where>
+            <if test="keyword != null  and keyword != ''"> and keyword like concat('%', #{keyword}, '%')</if>
             <if test="type != null "> and type = #{type}</if>
-            <if test="companyId != null "> and company_id = #{companyId}</if>
+            <if test="companyId != null "> and sys_keyword.company_id = #{companyId}</if>
         </where>
     </select>
-    
+
     <select id="selectSysKeywordById" parameterType="Long" resultMap="SysKeywordResult">
         <include refid="selectSysKeywordVo"/>
         where keyword_id = #{keywordId}
     </select>
-        
+
     <insert id="insertSysKeyword" parameterType="SysKeyword" useGeneratedKeys="true" keyProperty="keywordId">
         insert into sys_keyword
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -66,9 +83,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteSysKeywordByIds" parameterType="String">
-        delete from sys_keyword where keyword_id in 
+        delete from sys_keyword where keyword_id in
         <foreach item="keywordId" collection="array" open="(" separator="," close=")">
             #{keywordId}
         </foreach>
     </delete>
-</mapper>
+</mapper>