修改省bug

ace-common/src/main/java/com/github/wxiaoqi/security/common/util/EntityUtils.java

@@ -66,6 +66,7 @@ public class EntityUtils {
 		// 默认属性
 		String[] fields = {"crtName","crtUser","crtHost","crtTime"};
 		Field field = ReflectionUtils.getAccessibleField(entity, "crtTime");
+
 		// 默认值
 		Object [] value = null;
 		if(field!=null&&field.getType().equals(Date.class)){
@@ -75,6 +76,7 @@ public class EntityUtils {
 		}else {
 			value = new Object []{name,id,hostIp, null};
 		}
+
 		// 填充默认属性值
 		setDefaultValues(entity, fields, value);
 	}

rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/entity/RscpAreaImageTotal.java

@@ -3,10 +3,13 @@ package com.upyuns.platform.rs.datacenter.entity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import tk.mybatis.mapper.annotation.ColumnType;
 import tk.mybatis.mapper.annotation.KeySql;
 
 import javax.persistence.*;
 import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
 
 @Data
 @Table(name = "rscp_area_image_total")
@@ -20,7 +23,7 @@ public class RscpAreaImageTotal implements java.io.Serializable {
     /** id */
     @Id
     @KeySql(useGeneratedKeys = true)
-    @Column(name = "id",insertable = false)
+    @Column(name = "id")
     @ApiModelProperty(value = "")
     private String id;
 
@@ -30,7 +33,8 @@ public class RscpAreaImageTotal implements java.io.Serializable {
 
     /** areaNoDetail */
     @ApiModelProperty(value = "")
-    private String areaNoDetail;
+    @ColumnType(typeHandler = com.upyuns.platform.rs.datacenter.mybatis.ArrayTypeHandler.class)
+    private String[] areaNoDetail;
 
     /** imageRowCol */
     @ApiModelProperty(value = "")
@@ -42,11 +46,13 @@ public class RscpAreaImageTotal implements java.io.Serializable {
 
     /** imageResolution */
     @ApiModelProperty(value = "")
-    private String imageResolution;
+    @ColumnType(typeHandler = com.upyuns.platform.rs.datacenter.mybatis.ArrayTypeHandler.class)
+    private BigDecimal[] imageResolution;
 
     /** imageSpectrumType */
     @ApiModelProperty(value = "")
-    private String imageSpectrumType;
+    @ColumnType(typeHandler = com.upyuns.platform.rs.datacenter.mybatis.ArrayTypeHandler.class)
+    private String[] imageSpectrumType;
 
     /** imageSensorType */
     @ApiModelProperty(value = "")
@@ -58,7 +64,7 @@ public class RscpAreaImageTotal implements java.io.Serializable {
 
     /** updateTime */
     @ApiModelProperty(value = "")
-    private String updateTime;
+    private Date updateTime;
 
     /** gemo */
     @ApiModelProperty(value = "")
@@ -74,11 +80,13 @@ public class RscpAreaImageTotal implements java.io.Serializable {
 
     /** isCover */
     @ApiModelProperty(value = "")
-    private String isCover;
+    @ColumnType(typeHandler = com.upyuns.platform.rs.datacenter.mybatis.ArrayTypeHandler.class)
+    private Integer[] isCover;
 
     /** imageArea */
     @ApiModelProperty(value = "")
-    private String imageArea;
+    @ColumnType(typeHandler = com.upyuns.platform.rs.datacenter.mybatis.ArrayTypeHandler.class)
+    private BigDecimal[] imageArea;
 
     /** dataId */
     /** imageYear */
@@ -112,402 +120,4 @@ public class RscpAreaImageTotal implements java.io.Serializable {
     /* This code was generated by TableGo tools, mark 1 end. */
 
     /* This code was generated by TableGo tools, mark 2 begin. */
-
-    /**
-     * 获取id
-     * 
-     * @return id
-     */
-    public String getId() {
-        return this.id;
-    }
-
-    /**
-     * 设置id
-     * 
-     * @param id
-     */
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    /**
-     * 获取areaNo
-     * 
-     * @return areaNo
-     */
-    public String getAreaNo() {
-        return this.areaNo;
-    }
-
-    /**
-     * 设置areaNo
-     * 
-     * @param areaNo
-     */
-    public void setAreaNo(String areaNo) {
-        this.areaNo = areaNo;
-    }
-
-    /**
-     * 获取areaNoDetail
-     * 
-     * @return areaNoDetail
-     */
-    public String getAreaNoDetail() {
-        return this.areaNoDetail;
-    }
-
-    /**
-     * 设置areaNoDetail
-     * 
-     * @param areaNoDetail
-     */
-    public void setAreaNoDetail(String areaNoDetail) {
-        this.areaNoDetail = areaNoDetail;
-    }
-
-    /**
-     * 获取imageRowCol
-     * 
-     * @return imageRowCol
-     */
-    public String getImageRowCol() {
-        return this.imageRowCol;
-    }
-
-    /**
-     * 设置imageRowCol
-     * 
-     * @param imageRowCol
-     */
-    public void setImageRowCol(String imageRowCol) {
-        this.imageRowCol = imageRowCol;
-    }
-
-    /**
-     * 获取imageSatelliteType
-     * 
-     * @return imageSatelliteType
-     */
-    public String getImageSatelliteType() {
-        return this.imageSatelliteType;
-    }
-
-    /**
-     * 设置imageSatelliteType
-     * 
-     * @param imageSatelliteType
-     */
-    public void setImageSatelliteType(String imageSatelliteType) {
-        this.imageSatelliteType = imageSatelliteType;
-    }
-
-    /**
-     * 获取imageResolution
-     * 
-     * @return imageResolution
-     */
-    public String getImageResolution() {
-        return this.imageResolution;
-    }
-
-    /**
-     * 设置imageResolution
-     * 
-     * @param imageResolution
-     */
-    public void setImageResolution(String imageResolution) {
-        this.imageResolution = imageResolution;
-    }
-
-    /**
-     * 获取imageSpectrumType
-     * 
-     * @return imageSpectrumType
-     */
-    public String getImageSpectrumType() {
-        return this.imageSpectrumType;
-    }
-
-    /**
-     * 设置imageSpectrumType
-     * 
-     * @param imageSpectrumType
-     */
-    public void setImageSpectrumType(String imageSpectrumType) {
-        this.imageSpectrumType = imageSpectrumType;
-    }
-
-    /**
-     * 获取imageSensorType
-     * 
-     * @return imageSensorType
-     */
-    public String getImageSensorType() {
-        return this.imageSensorType;
-    }
-
-    /**
-     * 设置imageSensorType
-     * 
-     * @param imageSensorType
-     */
-    public void setImageSensorType(String imageSensorType) {
-        this.imageSensorType = imageSensorType;
-    }
-
-    /**
-     * 获取beginTime
-     * 
-     * @return beginTime
-     */
-    public String getBeginTime() {
-        return this.beginTime;
-    }
-
-    /**
-     * 设置beginTime
-     * 
-     * @param beginTime
-     */
-    public void setBeginTime(String beginTime) {
-        this.beginTime = beginTime;
-    }
-
-    /**
-     * 获取updateTime
-     * 
-     * @return updateTime
-     */
-    public String getUpdateTime() {
-        return this.updateTime;
-    }
-
-    /**
-     * 设置updateTime
-     * 
-     * @param updateTime
-     */
-    public void setUpdateTime(String updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    /**
-     * 获取gemo
-     * 
-     * @return gemo
-     */
-    public String getGemo() {
-        return this.gemo;
-    }
-
-    /**
-     * 设置gemo
-     * 
-     * @param gemo
-     */
-    public void setGemo(String gemo) {
-        this.gemo = gemo;
-    }
-
-    /**
-     * 获取range
-     * 
-     * @return range
-     */
-    public String getRange() {
-        return this.range;
-    }
-
-    /**
-     * 设置range
-     * 
-     * @param range
-     */
-    public void setRange(String range) {
-        this.range = range;
-    }
-
-    /**
-     * 获取num
-     * 
-     * @return num
-     */
-    public Integer getNum() {
-        return this.num;
-    }
-
-    /**
-     * 设置num
-     * 
-     * @param num
-     */
-    public void setNum(Integer num) {
-        this.num = num;
-    }
-
-    /**
-     * 获取isCover
-     * 
-     * @return isCover
-     */
-    public String getIsCover() {
-        return this.isCover;
-    }
-
-    /**
-     * 设置isCover
-     * 
-     * @param isCover
-     */
-    public void setIsCover(String isCover) {
-        this.isCover = isCover;
-    }
-
-    /**
-     * 获取imageArea
-     * 
-     * @return imageArea
-     */
-    public String getImageArea() {
-        return this.imageArea;
-    }
-
-    /**
-     * 设置imageArea
-     * 
-     * @param imageArea
-     */
-    public void setImageArea(String imageArea) {
-        this.imageArea = imageArea;
-    }
-
-    /**
-     * 获取dataId
-     * 
-     * @return dataId
-     */
-    public Long getDataId() {
-        return this.dataId;
-    }
-
-    /**
-     * 设置dataId
-     * 
-     * @param dataId
-     */
-    public void setDataId(Long dataId) {
-        this.dataId = dataId;
-    }
-
-    /**
-     * 获取imageCloudage
-     * 
-     * @return imageCloudage
-     */
-    public BigDecimal getImageCloudage() {
-        return this.imageCloudage;
-    }
-
-    /**
-     * 设置imageCloudage
-     * 
-     * @param imageCloudage
-     */
-    public void setImageCloudage(BigDecimal imageCloudage) {
-        this.imageCloudage = imageCloudage;
-    }
-
-    /**
-     * 获取imageProductType
-     * 
-     * @return imageProductType
-     */
-    public String getImageProductType() {
-        return this.imageProductType;
-    }
-
-    /**
-     * 设置imageProductType
-     * 
-     * @param imageProductType
-     */
-    public void setImageProductType(String imageProductType) {
-        this.imageProductType = imageProductType;
-    }
-
-    /**
-     * 获取name
-     * 
-     * @return name
-     */
-    public String getName() {
-        return this.name;
-    }
-
-    /**
-     * 设置name
-     * 
-     * @param name
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * 获取thumbnailPath
-     * 
-     * @return thumbnailPath
-     */
-    public String getThumbnailPath() {
-        return this.thumbnailPath;
-    }
-
-    /**
-     * 设置thumbnailPath
-     * 
-     * @param thumbnailPath
-     */
-    public void setThumbnailPath(String thumbnailPath) {
-        this.thumbnailPath = thumbnailPath;
-    }
-
-    /**
-     * 获取isDel
-     * 
-     * @return isDel
-     */
-    public Integer getIsDel() {
-        return this.isDel;
-    }
-
-    /**
-     * 设置isDel
-     * 
-     * @param isDel
-     */
-    public void setIsDel(Integer isDel) {
-        this.isDel = isDel;
-    }
-
-    /**
-     * 获取imageIsSave
-     * 
-     * @return imageIsSave
-     */
-    public Integer getImageIsSave() {
-        return this.imageIsSave;
-    }
-
-    /**
-     * 设置imageIsSave
-     * 
-     * @param imageIsSave
-     */
-    public void setImageIsSave(Integer imageIsSave) {
-        this.imageIsSave = imageIsSave;
-    }
-
-    /* This code was generated by TableGo tools, mark 2 end. */
 }
\ No newline at end of file

rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/entity/RscpImageInputLog.java

@@ -43,6 +43,10 @@ public class RscpImageInputLog implements java.io.Serializable {
     @ApiModelProperty(value = "json文本")
     private String contextJson;
 
+    /** json文本 */
+    @ApiModelProperty(value = "返回信息")
+    private String result;
+
     /* This code was generated by TableGo tools, mark 1 end. */
 
     /* This code was generated by TableGo tools, mark 2 begin. */

rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/pojo/ImageTotalInputDTO.java

 package com.upyuns.platform.rs.datacenter.pojo;
 
+import cn.hutool.core.util.StrUtil;
 import com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal;
 import lombok.Data;
 
@@ -31,4 +32,13 @@ public class ImageTotalInputDTO extends RscpImageDataTotal {
     private String rangeJson;
 
     private Long id;
+
+    private String areaDataId;
+
+    public void initRange(){
+        String range = StrUtil.format("st_GeomFromText('MULTIPOLYGON((({} {}  ,{} {}  , {} {}  ,{} {},   {} {})))',4326)"
+                , getLeftTopLon(), getLeftTopLat(), getLeftBottomLon(), getLeftBottomLat(), getRightBottomLon(), getRightBottomLat()
+                , getRightTopLon(), getRightTopLat(), getLeftTopLon(), getLeftTopLat());
+        setRange(range);
+    }
 }

rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/vo/ImageInputVO.java

@@ -113,6 +113,8 @@ public class ImageInputVO {
     //几何范围
     String range;
 
+    Long logId;
+
     public void clearBracket(){
         if(StrUtil.isNotBlank(this.getImageSpectrumType())) {
             this.setImageSpectrumType(this.getImageSpectrumType()

rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/vo/ResultDTO.java

+package com.upyuns.platform.rs.datacenter.vo;
+
+import cn.hutool.core.util.StrUtil;
+import lombok.Builder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+//@Data
+//@Builder
+//public class ResultDTO {
+//    /**
+//     * 入库失败信息
+//     */
+//    private String message;
+//}

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/mapper/RscpImageDataTotalMapper.java

@@ -19,7 +19,7 @@ public interface RscpImageDataTotalMapper extends Mapper<RscpImageDataTotal> {
     public List<RscpImageDataTotal> queryDataList(RscpImageDataTotalController.QueryDTO dto);
     public List<RscpImageDataTotal> bgQueryDataList(BgImageQueryDTO dto);
 
-    public List<RscpImageDataTotal> queryDataById(@Param("id")String id );
+    public List<RscpImageDataTotal> queryDataById(@Param("id")Long id );
 
 
 //    //左上角经度

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/RscpImageDataTotalController.java

@@ -111,7 +111,7 @@ public class RscpImageDataTotalController extends BaseController<RscpImageDataTo
 
     @RequestMapping(value = "/app/unauth/detailById", method = RequestMethod.GET)
     @IgnoreUserToken
-    public ObjectRestResponse<List<RscpImageDataTotal>> detailById(String id){
+    public ObjectRestResponse<List<RscpImageDataTotal>> detailById(Long id){
 //        List<RscpImageDataTotal> list2 = baseBiz.selectByAttrs(RscpImageDataTotal::getId, CollUtil.newArrayList(id));
 //        if(list2.size() > 0) {
 //            RscpImageDataTotal rscpImageDataTotal = list2.get(0);

rs-datacenter/rs-datacenter-server/src/main/resources/mapper/RscpAreaImageTotalMapper.xml

@@ -8,19 +8,19 @@
     <resultMap id="rscpAreaImageTotalMap" type="com.upyuns.platform.rs.datacenter.entity.RscpAreaImageTotal">
         <result column="id" property="id" jdbcType="VARCHAR" />
         <result column="area_no" property="areaNo" jdbcType="VARCHAR" />
-        <result column="area_no_detail" property="areaNoDetail" jdbcType="VARCHAR" />
+        <result column="area_no_detail" property="areaNoDetail" jdbcType="VARCHAR" typeHandler="com.upyuns.platform.rs.datacenter.mybatis.ArrayTypeHandler"/>
         <result column="image_row_col" property="imageRowCol" jdbcType="VARCHAR" />
         <result column="image_satellite_type" property="imageSatelliteType" jdbcType="VARCHAR" />
-        <result column="image_resolution" property="imageResolution" jdbcType="VARCHAR" />
-        <result column="image_spectrum_type" property="imageSpectrumType" jdbcType="VARCHAR" />
+        <result column="image_resolution" property="imageResolution" jdbcType="VARCHAR"  typeHandler="com.upyuns.platform.rs.datacenter.mybatis.ArrayTypeHandler"/>
+        <result column="image_spectrum_type" property="imageSpectrumType" jdbcType="VARCHAR"  typeHandler="com.upyuns.platform.rs.datacenter.mybatis.ArrayTypeHandler"/>
         <result column="image_sensor_type" property="imageSensorType" jdbcType="VARCHAR" />
         <result column="begin_time" property="beginTime" jdbcType="VARCHAR" />
         <result column="update_time" property="updateTime" jdbcType="VARCHAR" />
         <result column="gemo" property="gemo" jdbcType="VARCHAR" />
         <result column="range" property="range" jdbcType="VARCHAR" />
         <result column="num" property="num" jdbcType="INTEGER" />
-        <result column="is_cover" property="isCover" jdbcType="VARCHAR" />
-        <result column="image_area" property="imageArea" jdbcType="VARCHAR" />
+        <result column="is_cover" property="isCover" jdbcType="VARCHAR" typeHandler="com.upyuns.platform.rs.datacenter.mybatis.ArrayTypeHandler"/>
+        <result column="image_area" property="imageArea" jdbcType="VARCHAR" typeHandler="com.upyuns.platform.rs.datacenter.mybatis.ArrayTypeHandler"/>
         <result column="data_id" property="dataId" jdbcType="VARCHAR" />
         <result column="image_cloudage" property="imageCloudage" jdbcType="INTEGER" />
         <result column="image_product_type" property="imageProductType" jdbcType="VARCHAR" />