完善首页地块相关功能

ruoyi-modules/ruoyi-uniapp/src/main/java/com/ruoyi/uniapp/controller/FieldController.java

@@ -29,6 +29,15 @@ public class FieldController extends BaseController {
     private IFieldService fieldService;
 
 
+    /**
+     * 返回用户关联的地块信息（不分页）
+     */
+    @GetMapping("/name/{userId}")
+    public R<List<Field>> listFieldName(@PathVariable("userId") Long userId) {
+        List<Field> fields = fieldService.fieldNameByUserList(userId);
+        return R.ok(fields);
+    }
+
     /**
      * 根据用户ID查询关联地块列表
      */

ruoyi-modules/ruoyi-uniapp/src/main/java/com/ruoyi/uniapp/controller/KnowledgeController.java

@@ -3,6 +3,9 @@ package com.ruoyi.uniapp.controller;
 import java.util.List;
 import java.util.Date;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.github.pagehelper.PageHelper;
+import com.ruoyi.common.core.web.page.TableDataInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.http.MediaType;
@@ -28,24 +31,26 @@ public class KnowledgeController extends BaseController {
      * 获取农技知识列表
      */
     @GetMapping("/tech")
-    public AjaxResult getTechList(@RequestParam(required = false, defaultValue = "1") Integer pageNum, 
-                                  @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
+    public TableDataInfo getTechList(@RequestParam(required = false, defaultValue = "1") Integer pageNum,
+                                     @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
         Integer userId = null;
         try {
             userId = SecurityUtils.getUserId().intValue();
         } catch (Exception e) {
             // 未登录或token无效
         }
-        
+        PageHelper.startPage(ObjectUtil.defaultIfNull(pageNum, 1), ObjectUtil.defaultIfNull(pageSize, 10));
+
         List<KnowledgeArticleVO> list = knowledgeService.getTechList(pageNum, pageSize, userId);
-        return AjaxResult.success(list);
+
+        return getDataTable(list);
     }
     
     /**
      * 获取政策解读列表
      */
     @GetMapping("/policy")
-    public AjaxResult getPolicyList(@RequestParam(required = false, defaultValue = "1") Integer pageNum, 
+    public TableDataInfo getPolicyList(@RequestParam(required = false, defaultValue = "1") Integer pageNum,
                                     @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
         Integer userId = null;
         try {
@@ -53,9 +58,10 @@ public class KnowledgeController extends BaseController {
         } catch (Exception e) {
             // 未登录或token无效
         }
-        
+        PageHelper.startPage(ObjectUtil.defaultIfNull(pageNum, 1), ObjectUtil.defaultIfNull(pageSize, 10));
+
         List<KnowledgeArticleVO> list = knowledgeService.getPolicyList(pageNum, pageSize, userId);
-        return AjaxResult.success(list);
+        return getDataTable(list);
     }
     
     /**

ruoyi-modules/ruoyi-uniapp/src/main/java/com/ruoyi/uniapp/mapper/FieldMapper.java

@@ -34,7 +34,7 @@ public interface FieldMapper {
     /**
      * 获取用户的地块总数、状态数量；
      *
-     * @param userId 地块ID
+     * @param userId 用户ID
      * @return 地块总数、状态数量
      */
     public Field countFieldTotalByUser(Long userId);

ruoyi-modules/ruoyi-uniapp/src/main/java/com/ruoyi/uniapp/service/IFieldService.java

@@ -12,6 +12,14 @@ import com.ruoyi.uniapp.domain.vo.FieldVO;
  * @author ruoyi
  */
 public interface IFieldService {
+
+    /**
+     * 获取用户的地块；
+     *
+     * @param userId 用户ID
+     * @return 地块总数、状态数量
+     */
+    public List<Field> fieldNameByUserList(Long userId);
     
     /**
      * 根据用户ID查询用户关联的地块列表

ruoyi-modules/ruoyi-uniapp/src/main/java/com/ruoyi/uniapp/service/impl/FieldServiceImpl.java

@@ -28,6 +28,11 @@ public class FieldServiceImpl implements IFieldService {
     @Autowired
     private FieldMapper fieldMapper;
 
+    @Override
+    public List<Field> fieldNameByUserList(Long userId) {
+        return fieldMapper.selectFieldListByUserId(userId);
+    }
+
     /**
      * 根据用户ID查询用户关联的地块列表
      *

ruoyi-modules/ruoyi-uniapp/src/main/java/com/ruoyi/uniapp/service/impl/KnowledgeServiceImpl.java

@@ -4,6 +4,9 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -37,9 +40,6 @@ public class KnowledgeServiceImpl implements IKnowledgeService {
      */
     @Override
     public List<KnowledgeArticleVO> getTechList(Integer pageNum, Integer pageSize, Integer userId) {
-        // 处理分页参数
-        pageNum = (pageNum - 1) * pageSize;
-        
         // 查询农技知识列表
         List<KnowledgeArticle> articles = knowledgeArticleMapper.selectKnowledgeArticlesByCategory("tech", pageNum, pageSize);
         
@@ -52,9 +52,7 @@ public class KnowledgeServiceImpl implements IKnowledgeService {
      */
     @Override
     public List<KnowledgeArticleVO> getPolicyList(Integer pageNum, Integer pageSize, Integer userId) {
-        // 处理分页参数
-        pageNum = (pageNum - 1) * pageSize;
-        
+//        pageNum = (pageNum - 1) * pageSize;
         // 查询政策解读列表
         List<KnowledgeArticle> articles = knowledgeArticleMapper.selectKnowledgeArticlesByCategory("policy", pageNum, pageSize);
         

ruoyi-modules/ruoyi-uniapp/src/main/resources/mapper/FieldMapper.xml

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fieldCode" column="field_code"/>
         <result property="fieldName" column="field_name"/>
         <result property="farmId" column="farm_id"/>
+        <result property="farmName" column="farmName"/>
         <result property="fieldType" column="field_type"/>
         <result property="growCrops" column="grow_crops"/>
         <result property="size" column="size"/>
@@ -34,8 +35,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             f.id, f.field_code, f.field_name, f.farm_id,
             f.field_type, f.grow_crops, f.size, f.soil_type, f.irrigation_type, 
             f.status, f.manager_id, f.manager_name, f.description, f.location_data, 
-            f.created_time, f.updated_time, f.created_by, f.updated_by, f.is_deleted
+            f.created_time, f.updated_time, f.created_by, f.updated_by, f.is_deleted,s.dept_name as farmName
         from field f
+        left join sys_dept s on f.farm_id = s.dept_id
     </sql>
     
     <!-- 根据用户ID查询关联的地块列表 -->

ruoyi-modules/ruoyi-uniapp/src/main/resources/mapper/KnowledgeArticleMapper.xml

@@ -62,7 +62,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectKnowledgeArticleVo"/>
         where category = #{category} and status = 1
         order by publish_date desc
-        limit #{pageNum}, #{pageSize}
     </select>
     
     <insert id="insertKnowledgeArticle" parameterType="com.ruoyi.uniapp.domain.KnowledgeArticle" useGeneratedKeys="true" keyProperty="id">