修改设计信息的字段类型和包路径

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/DesignInformationDto.java

-package com.yeejoin.amos.boot.module.jxiop.api.dto;
+package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 设计信息
@@ -22,31 +25,40 @@ public class DesignInformationDto  extends BaseDto {
 
 
     @ApiModelProperty(value = "典型设计图信息")
-    private String typicalDiagram;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> typicalDiagram;
 
     @ApiModelProperty(value = "组件排布图")
-    private String componentLayout;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> componentLayout;
 
     @ApiModelProperty(value = "组件支架图")
-    private String componentBracket;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> componentBracket;
 
     @ApiModelProperty(value = "组串接线图")
-    private String connectionLine;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> connectionLine;
 
     @ApiModelProperty(value = "一次接线图")
-    private String onceLine;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> onceLine;
 
     @ApiModelProperty(value = "组件")
-    private String assembly;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> assembly;
 
     @ApiModelProperty(value = "逆变器")
-    private String inverter;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> inverter;
 
     @ApiModelProperty(value = "电表箱")
-    private String electricityMeter;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> electricityMeter;
 
     @ApiModelProperty(value = "支架")
-    private String support;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> support;
 
     @ApiModelProperty(value = " 防滑雪措施")
     private String antiSkiing;

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/SurveyInfoAllDto.java

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
 
-import com.yeejoin.amos.boot.module.jxiop.api.dto.DesignInformationDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.DesignInformationDto;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/DesignInformation.java

-package com.yeejoin.amos.boot.module.jxiop.api.entity;
+package com.yeejoin.amos.boot.module.hygf.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 设计信息
@@ -17,7 +19,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("hygf_design_information")
+@TableName(value = "hygf_design_information",autoResultMap = true)
 public class DesignInformation extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -25,56 +27,56 @@ public class DesignInformation extends BaseEntity {
     /**
      * 典型设计图信息
      */
-	@TableField("typical_diagram")
-    private String typicalDiagram;
+	@TableField(value = "typical_diagram",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> typicalDiagram;
 
     /**
      * 组件排布图
      */
-	@TableField("component_layout")
-    private String componentLayout;
+	@TableField(value = "component_layout",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> componentLayout;
 
     /**
      * 组件支架图
      */
-	@TableField("component_bracket")
-    private String componentBracket;
+	@TableField(value = "component_bracket",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> componentBracket;
 
     /**
      * 组串接线图
      */
-	@TableField("connection_line")
-    private String connectionLine;
+	@TableField(value = "connection_line",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> connectionLine;
 
     /**
      * 一次接线图
      */
-	@TableField("once_line")
-    private String onceLine;
+	@TableField(value = "once_line",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> onceLine;
 
     /**
      * 组件
      */
-	@TableField("assembly")
-    private String assembly;
+	@TableField(value = "assembly",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> assembly;
 
     /**
      * 逆变器
      */
-	@TableField("inverter")
-    private String inverter;
+	@TableField(value = "inverter",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> inverter;
 
     /**
      * 电表箱
      */
-	@TableField("electricity_meter")
-    private String electricityMeter;
+	@TableField(value = "electricity_meter",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> electricityMeter;
 
     /**
      * 支架
      */
-	@TableField("support")
-    private String support;
+	@TableField(value = "support",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> support;
 
     /**
      *  防滑雪措施

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/DesignInformationMapper.java

-package com.yeejoin.amos.boot.module.jxiop.api.mapper;
+package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
-import com.yeejoin.amos.boot.module.jxiop.api.entity.DesignInformation;
+import com.yeejoin.amos.boot.module.hygf.api.entity.DesignInformation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/DesignInformationController.java

-package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
@@ -6,14 +6,14 @@ import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import java.util.List;
-import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.DesignInformationServiceImpl;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.DesignInformationServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import javax.servlet.http.HttpServletRequest;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jxiop.api.dto.DesignInformationDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.DesignInformationDto;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/DesignInformationServiceImpl.java

-package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
-import com.yeejoin.amos.boot.module.jxiop.api.entity.DesignInformation;
-import com.yeejoin.amos.boot.module.jxiop.api.mapper.DesignInformationMapper;
+import com.yeejoin.amos.boot.module.hygf.api.entity.DesignInformation;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.DesignInformationMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.service.IDesignInformationService;
-import com.yeejoin.amos.boot.module.jxiop.api.dto.DesignInformationDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.DesignInformationDto;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/SurveyInformationServiceImpl.java

@@ -12,9 +12,9 @@ import com.yeejoin.amos.boot.module.hygf.api.mapper.SurveyInformationMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IPowerStationService;
 import com.yeejoin.amos.boot.module.hygf.api.service.ISurveyInformationService;
 import com.yeejoin.amos.boot.module.hygf.api.util.BeanDtoUtils;
-import com.yeejoin.amos.boot.module.jxiop.api.dto.DesignInformationDto;
-import com.yeejoin.amos.boot.module.jxiop.api.entity.DesignInformation;
-import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.DesignInformationServiceImpl;
+import com.yeejoin.amos.boot.module.hygf.api.dto.DesignInformationDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.DesignInformation;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.DesignInformationServiceImpl;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;