glj-代码提交

kn-common/src/main/java/org/springblade/common/constant/CommonConstant.java

@@ -49,7 +49,7 @@ public interface CommonConstant {
 	/**
 	 * 对接TB模块的名称
 	 */
-	String KN_VORDM_MODULE_NAME = "biz-vordm-glj";
+	String KN_VORDM_MODULE_NAME = "biz-vordm";
 
 	/**
 	 * 系统管理模块 application name

kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityDataAll.java

@@ -9,6 +9,7 @@ import java.util.Date;
 import java.util.List;
 
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 其他上传的实体数据
@@ -167,7 +168,7 @@ public class EntityDataAll implements Serializable {
     /**
      * 生产时间
      */
-    private Date productTime;
+    private String productTime;
 
     /**
      * 产品波段树
@@ -289,6 +290,11 @@ public class EntityDataAll implements Serializable {
 	 */
 	private Integer isAdministration;
 
+	/**
+	 * 位置
+	 */
+	private String location;
+
 	/**
 	 * 查询枚举
 	 */

kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataAllMapper.xml

@@ -33,7 +33,7 @@
             <result property="productSerialNum" column="product_serial_num" jdbcType="VARCHAR"/>
             <result property="productResolution" column="product_resolution" jdbcType="VARCHAR"/>
             <result property="cloudCover" column="cloud_cover" jdbcType="INTEGER"/>
-            <result property="productTime" column="product_time" jdbcType="TIMESTAMP"/>
+            <result property="productTime" column="product_time" jdbcType="VARCHAR"/>
             <result property="productBandsNum" column="product_bands_num" jdbcType="VARCHAR"/>
             <result property="reason" column="reason" jdbcType="VARCHAR"/>
             <result property="source" column="source" jdbcType="VARCHAR"/>
@@ -57,6 +57,8 @@
             <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
             <result property="satelliteType" column="satellite_type" jdbcType="VARCHAR"/>
             <result property="pictureName" column="picture_name" jdbcType="VARCHAR"/>
+            <result property="isAdministration" column="is_administration" jdbcType="INTEGER"/>
+            <result property="location" column="location" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -77,7 +79,7 @@
         ed.upper_right_lon, ed.view_center_lat, ed.view_center_lon,
         ed.lower_right_lat, ed.lower_right_lon, ed.lower_left_lat,
         ed.lower_left_lon, ed.create_time, ed.satellite_type,
-        ed.picture_name
+        ed.picture_name, ed.is_administration, ed.location
     </sql>
 
     <select id="getEntityDataList" resultType="com.kening.vordm.entity.EntityDataAll">

kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataAllServiceImpl.java

@@ -24,6 +24,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.*;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -127,7 +129,7 @@ public class EntityDataAllServiceImpl extends ServiceImpl<EntityDataAllMapper, E
 									entityDataAll.setProductSerialNum(cell.getStringCellValue());
 									break;
 								case 3:
-									entityDataAll.setProductTime(cell.getDateCellValue());
+									entityDataAll.setProductTime(cell.getStringCellValue());
 									break;
 								case 4:
 									entityDataAll.setProductResolution(Double.toString(cell.getNumericCellValue()));