实体字段改变

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropBaseVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.crop.vo;
 
+import com.alibaba.fastjson.JSONArray;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -17,7 +18,7 @@ public class CropBaseVO {
     private String name;
 
     @ApiModelProperty(value = "物料图片")
-    private String images;
+    private JSONArray images;
 
     @ApiModelProperty(value = "当前库存", required = true)
     @NotNull(message = "当前库存不能为空")

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropExcelVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.crop.vo;
 
+import com.alibaba.fastjson.JSONArray;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -21,7 +22,7 @@ public class CropExcelVO {
     private String name;
 
     @ExcelProperty("物料图片")
-    private String images;
+    private JSONArray images;
 
     @ExcelProperty("当前库存")
     private Integer stock;

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropExportReqVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.crop.vo;
 
+import com.alibaba.fastjson.JSONArray;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -16,7 +17,7 @@ public class CropExportReqVO {
     private String name;
 
     @ApiModelProperty(value = "物料图片")
-    private String images;
+    private JSONArray images;
 
     @ApiModelProperty(value = "当前库存")
     private Integer stock;

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropPageReqVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.crop.vo;
 
+import com.alibaba.fastjson.JSONArray;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -18,7 +19,7 @@ public class CropPageReqVO extends PageParam {
     private String name;
 
     @ApiModelProperty(value = "物料图片")
-    private String images;
+    private JSONArray images;
 
     @ApiModelProperty(value = "当前库存")
     private Integer stock;

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventBaseVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.event.vo;
 
+import com.alibaba.fastjson.JSONArray;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -27,6 +28,6 @@ public class EventBaseVO {
     private String content;
 
     @ApiModelProperty(value = "")
-    private String images;
+    private JSONArray images;
 
 }

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventExcelVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.event.vo;
 
+import com.alibaba.fastjson.JSONArray;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -30,7 +31,7 @@ public class EventExcelVO {
     private String content;
 
     @ExcelProperty("")
-    private String images;
+    private JSONArray images;
 
     @ExcelProperty("")
     private Date createTime;

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventExportReqVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.event.vo;
 
+import com.alibaba.fastjson.JSONArray;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -25,7 +26,7 @@ public class EventExportReqVO {
     private String content;
 
     @ApiModelProperty(value = "")
-    private String images;
+    private JSONArray images;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "开始")

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventPageReqVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.event.vo;
 
+import com.alibaba.fastjson.JSONArray;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -27,7 +28,7 @@ public class EventPageReqVO extends PageParam {
     private String content;
 
     @ApiModelProperty(value = "")
-    private String images;
+    private JSONArray images;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "开始")

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventSearchPageReqVO.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.farm.controller.admin.event.vo;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import com.alibaba.fastjson.JSONArray;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -32,7 +33,7 @@ public class EventSearchPageReqVO extends PageParam {
     private String content;
 
     @ApiModelProperty(value = "")
-    private String images;
+    private JSONArray images;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "开始")

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectBaseVO.java

@@ -34,8 +34,8 @@ public class ProjectBaseVO {
     @ApiModelProperty("成员选择")
     private JSONArray members;
 
-    @ApiModelProperty(value = "")
+    @ApiModelProperty(value = "项目图片")
-    private String images;
+    private JSONArray images;
 
     @ApiModelProperty(value = "")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExcelVO.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.farm.controller.admin.project.vo;
 
 import cn.hutool.json.JSON;
+import com.alibaba.fastjson.JSONArray;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -27,16 +28,13 @@ public class ProjectExcelVO {
     @ExcelProperty("")
     private Integer state;
 
-    private Object areas;
+    private JSONArray areas;
-    private Object members;
+    private JSONArray members;
 
     private Integer cropId;
 
-    @ExcelProperty("")
+    @ExcelProperty("项目图片")
-    private Object resources;
+    private JSONArray images;
-
-    @ExcelProperty("")
-    private String images;
 
     @ExcelProperty("")
     private Date planStartTime;

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExportReqVO.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.farm.controller.admin.project.vo;
 
 import cn.hutool.json.JSON;
+import com.alibaba.fastjson.JSONArray;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -21,16 +22,14 @@ public class ProjectExportReqVO {
 
     private Integer state;
 
-    private Object areas;
+    private JSONArray areas;
 
     private Integer cropId;
 
-    @ApiModelProperty(value = "")
+    private JSONArray members;
-    private Object resources;
-    private Object members;
 
-    @ApiModelProperty(value = "")
+    @ApiModelProperty(value = "项目图片")
-    private String images;
+    private JSONArray images;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "开始")

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectPageReqVO.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.farm.controller.admin.project.vo;
 
 import cn.hutool.json.JSON;
+import com.alibaba.fastjson.JSONArray;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -23,16 +24,13 @@ public class ProjectPageReqVO extends PageParam {
 
     private Integer state;
 
-    private Object areas;
+    private JSONArray areas;
-    private Object members;
+    private JSONArray members;
 
     private Integer cropId;
 
-    @ApiModelProperty(value = "")
+    @ApiModelProperty(value = "项目图片")
-    private Object resources;
+    private JSONArray images;
-
-    @ApiModelProperty(value = "")
-    private String images;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "开始")

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectSearchPageReqVO.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.project.vo;
 
 import cn.hutool.json.JSON;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import com.alibaba.fastjson.JSONArray;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -28,17 +29,14 @@ public class ProjectSearchPageReqVO extends PageParam {
 
     private Integer state;
 
-    private Object areas;
+    private JSONArray areas;
 
     private Integer cropId;
 
-    @ApiModelProperty(value = "")
+    private JSONArray members;
-    private String resources;
-
-    private Object members;
 
     @ApiModelProperty(value = "")
-    private String images;
+    private JSONArray images;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "开始")

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/resource/vo/ResourceBaseVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.resource.vo;
 
+import com.alibaba.fastjson.JSONArray;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -25,7 +26,7 @@ public class ResourceBaseVO {
     private String content;
 
     @ApiModelProperty(value = "")
-    private String images;
+    private JSONArray images;
 
     @ApiModelProperty(value = "")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/resource/vo/ResourceExcelVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.resource.vo;
 
+import com.alibaba.fastjson.JSONArray;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -27,7 +28,7 @@ public class ResourceExcelVO {
     private String content;
 
     @ExcelProperty("")
-    private String images;
+    private JSONArray images;
 
     @ExcelProperty("")
     private Date validityStartTime;

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/resource/vo/ResourceExportReqVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.resource.vo;
 
+import com.alibaba.fastjson.JSONArray;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -22,7 +23,7 @@ public class ResourceExportReqVO {
     private String content;
 
     @ApiModelProperty(value = "")
-    private String images;
+    private JSONArray images;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "开始")

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/resource/vo/ResourcePageReqVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.resource.vo;
 
+import com.alibaba.fastjson.JSONArray;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -24,7 +25,7 @@ public class ResourcePageReqVO extends PageParam {
     private String content;
 
     @ApiModelProperty(value = "")
-    private String images;
+    private JSONArray images;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "开始")

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskBaseVO.java

@@ -32,7 +32,7 @@ public class TaskBaseVO {
     private Integer workingHours;
 
     @ApiModelProperty(value = "")
-    private Object images;
+    private JSONArray images;
 
     @ApiModelProperty(value = "")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExcelVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.task.vo;
 
+import com.alibaba.fastjson.JSONArray;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -28,15 +29,15 @@ public class TaskExcelVO {
     private Integer taskCateName;
 
     @ExcelProperty("")
-    private Object resources;
+    private JSONArray resources;
-    private Object areas;
+    private JSONArray areas;
 
     private Integer mainPerson;
-    private Object executorPerson;
+    private JSONArray executorPerson;
     private Integer workingHours;
 
     @ExcelProperty("")
-    private Object images;
+    private JSONArray images;
 
     @ExcelProperty("")
     private Date planStartTime;

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExportReqVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.task.vo;
 
+import com.alibaba.fastjson.JSONArray;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -20,15 +21,15 @@ public class TaskExportReqVO {
     private Integer taskCateName;
 
     @ApiModelProperty(value = "")
-    private Object resources;
+    private JSONArray resources;
-    private Object areas;
+    private JSONArray areas;
 
     private Integer mainPerson;
-    private Object executorPerson;
+    private JSONArray executorPerson;
     private Integer workingHours;
 
     @ApiModelProperty(value = "")
-    private Object images;
+    private JSONArray images;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "开始")

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageReqVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.task.vo;
 
+import com.alibaba.fastjson.JSONArray;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -22,15 +23,15 @@ public class TaskPageReqVO extends PageParam {
     private Integer taskCateName;
 
     @ApiModelProperty(value = "")
-    private Object resources;
+    private JSONArray resources;
-    private Object areas;
+    private JSONArray areas;
 
     private Integer mainPerson;
-    private Object executorPerson;
+    private JSONArray executorPerson;
     private Integer workingHours;
 
     @ApiModelProperty(value = "")
-    private Object images;
+    private JSONArray images;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "开始")

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageSearchReqVO.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.farm.controller.admin.task.vo;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import com.alibaba.fastjson.JSONArray;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,15 +28,16 @@ public class TaskPageSearchReqVO extends PageParam {
     private Integer taskCateName;
 
     @ApiModelProperty(value = "")
-    private String resources;
+    private JSONArray resources;
-    private Object areas;
+    private JSONArray areas;
+
 
     private Integer mainPerson;
-    private Object executorPerson;
+    private JSONArray executorPerson;
     private Integer workingHours;
 
     @ApiModelProperty(value = "")
-    private Object images;
+    private JSONArray images;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "开始")

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/crop/CropDO.java

@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.farm.dal.dataobject.crop;
 
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.*;
 import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
@@ -10,7 +12,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  *
  * @author 系统管理员
  */
-@TableName("farm_crop")
+@TableName(value = "farm_crop", autoResultMap = true)
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
@@ -31,7 +33,8 @@ public class CropDO extends BaseDO {
     /**
      * 物料图片
      */
-    private String images;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private JSONArray images;
     /**
      * 当前库存
      */

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/event/EventDO.java

@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.farm.dal.dataobject.event;
 
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.*;
 import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
@@ -10,7 +12,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  *
  * @author 系统管理员
  */
-@TableName("farm_event")
+@TableName(value = "farm_event", autoResultMap = true)
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
@@ -43,6 +45,7 @@ public class EventDO extends BaseDO {
     /**
      * 
      */
-    private String images;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private JSONArray images;
 
 }

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/project/ProjectDO.java

@@ -49,7 +49,8 @@ public class ProjectDO extends BaseDO {
     /**
      * 
      */
-    private String images;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private JSONArray images;
     /**
      * 
      */

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/resource/ResourceDO.java

@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.farm.dal.dataobject.resource;
 
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.*;
 import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
@@ -10,7 +12,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  *
  * @author 系统管理员
  */
-@TableName("farm_resource")
+@TableName(value = "farm_resource", autoResultMap = true)
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
@@ -39,7 +41,8 @@ public class ResourceDO extends BaseDO {
     /**
      * 
      */
-    private String images;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private JSONArray images;
     /**
      * 
      */

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/task/TaskDO.java

@@ -54,10 +54,10 @@ public class TaskDO extends BaseDO {
     @ApiModelProperty("区域及子区域")
     @TableField(typeHandler = JacksonTypeHandler.class)
     private JSONArray areas;
-    /**
+
-     * 
+    @ApiModelProperty("任务图片")
-     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
-    private Object images;
+    private JSONArray images;
     /**
      * 
      */

zsw-farm/zsw-farm-impl/src/test/java/cn/iocoder/yudao/module/farm/service/project/ProjectServiceImplTest.java

@@ -135,7 +135,6 @@ public class ProjectServiceImplTest extends BaseDbUnitTest {
        ProjectPageReqVO reqVO = new ProjectPageReqVO();
        reqVO.setName(null);
        reqVO.setContent(null);
-       reqVO.setResources(null);
        reqVO.setImages(null);
        reqVO.setBeginPlanStartTime(null);
        reqVO.setEndPlanStartTime(null);
@@ -185,7 +184,6 @@ public class ProjectServiceImplTest extends BaseDbUnitTest {
        ProjectExportReqVO reqVO = new ProjectExportReqVO();
        reqVO.setName(null);
        reqVO.setContent(null);
-       reqVO.setResources(null);
        reqVO.setImages(null);
        reqVO.setBeginPlanStartTime(null);
        reqVO.setEndPlanStartTime(null);