导入和更新

air/src/main/java/com/air/land/entity/LandListed.java

@@ -30,6 +30,8 @@ public class LandListed extends Model<LandListed> {
     @TableId(type = IdType.INPUT)
     @ApiModelProperty(value = "主键，自增")
     private String landListedId;
+    @ApiModelProperty(value = "系统编号")
+    private Long systemId;
     @ApiModelProperty(value = "公告id，主键，以土地网爬取数据为准，不自增")
     private String annoId;
     @ApiModelProperty(value = "地块编号")

air/src/main/java/com/air/land/entity/LandToList.java

@@ -30,6 +30,9 @@ public class LandToList extends Model<LandToList> {
     @TableId(value = "proposedseria_id", type = IdType.INPUT)
     @ApiModelProperty(value = "拟出让序号")
     private String proposedseriaId;
+    @ApiModelProperty(value = "系统编号")
+    private Long SystemId;
+
     @ApiModelProperty(value = "供地状态")
     private String supplyStatus;
     @ApiModelProperty(value = "预计挂牌时间")

air/src/main/java/com/air/utils/ExcelUtil.java

@@ -121,7 +121,7 @@ public class ExcelUtil {
      * @author peihao
      * @date 2021/10/13
      **/
-    public static <T> List<T> importExcel(InputStream fileInputStream, int startSheet, int titleRow, int titleColumn, Class<T> clazz, String path) throws IOException {
+    public static <T> List<T>  importExcel(InputStream fileInputStream, int startSheet, int titleRow, int titleColumn, Class<T> clazz, String path) throws IOException {
         //读取文件的指定sheet
         XSSFWorkbook workbook = new XSSFWorkbook(fileInputStream);
         XSSFSheet sheet = workbook.getSheetAt(startSheet);
@@ -151,6 +151,7 @@ public class ExcelUtil {
             XSSFRow row = sheet.getRow(i);
             for (ExcelConfig excelConfig : excelConfigList) {
                 try {
+
                     Object value = getCellString(row.getCell(excelConfig.getColumn()), excelConfig.getValueType());
                     map.put(excelConfig.getFieldName(), value);
                 } catch (Exception e) {
@@ -160,6 +161,7 @@ public class ExcelUtil {
             }
             mapList.add(map);
         }
+
         return mapList.stream().map(e -> BeanUtil.mapToBean(e, clazz, true)).collect(Collectors.toList());
     }
 
@@ -262,7 +264,18 @@ public class ExcelUtil {
         if (StringUtils.isEmpty(value)) {
             return null;
         }
-        return new BigDecimal(value).setScale(decimal, BigDecimal.ROUND_HALF_UP);
+        try {
+
+
+            return new BigDecimal(value).setScale(decimal, BigDecimal.ROUND_HALF_UP);
+
+        }catch (Exception e){
+            value=value.replaceAll("%","");
+            return new BigDecimal(value).setScale(decimal, BigDecimal.ROUND_HALF_UP);
+
+        }
+
+
     }
 
     /**
@@ -279,7 +292,18 @@ public class ExcelUtil {
         if (StringUtils.isEmpty(value)) {
             return null;
         }
-        return new BigDecimal(value).multiply(new BigDecimal(mulitple)).setScale(decimal, BigDecimal.ROUND_HALF_UP);
+
+        try {
+
+
+            return new BigDecimal(value).multiply(new BigDecimal(mulitple)).setScale(decimal, BigDecimal.ROUND_HALF_UP);
+
+        }catch (Exception e){
+            value=value.replaceAll("%","");
+            e.printStackTrace();
+            return new BigDecimal(value).setScale(decimal, BigDecimal.ROUND_HALF_UP);
+
+        }
     }
 
     /**

air/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 9003
+  port: 9002
 
 spring:
   application:
@@ -10,9 +10,9 @@ spring:
       driver-class-name: com.mysql.cj.jdbc.Driver
       username: air
       password: air123456
-#      url: jdbc:mysql://127.0.0.1:4000/air?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
-#      url: jdbc:mysql://124.71.210.242:4000/air_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
-      url: jdbc:mysql://127.0.0.1:4000/air_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
+      #      url: jdbc:mysql://127.0.0.1:4000/air?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
+      url: jdbc:mysql://124.71.210.242:4000/air_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
+      #      url: jdbc:mysql://127.0.0.1:4000/air_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
       stat-view-servlet:
         enabled: true
         url-pattern: /druid/*
@@ -30,12 +30,13 @@ spring:
       only-show-slow-sql: false
   redis:
     key-prefix: 'at:'
-    host: 127.0.0.1
+    host: 192.168.40.102
+    password: 1qaz2wsx
   servlet:
     multipart:
       max-file-size: 100MB
       max-request-size: 100MB
-      location: /opt/air/tmp_files
+#      location: /opt/air/tmp_files
   freemarker:
     allow-request-override: false
     allow-session-override: false
@@ -89,7 +90,7 @@ security:
 
 # 文件系统
 minio:
-  url: http://127.0.0.1:9000
+  url: http://124.71.210.242:9000
   down-url: https://yoursairdata.com
   access-key: air
   secret-key: 1qaz2wsx

air/src/main/resources/config/landListed-config.json

@@ -1,4 +1,10 @@
 [
+  {
+    "titleName": "系统编号",
+    "fieldName": "landListedId",
+    "valueType": "string",
+    "required": false
+  },
   {
     "titleName": "公告序号",
     "fieldName": "annoId",
@@ -38,13 +44,13 @@
   {
     "titleName": "建筑密度(%)",
     "fieldName": "buildingDensity",
-    "valueType": "BigDecimal_mu",
+    "valueType": "BigDecimal",
     "required": false
   },
   {
     "titleName": "绿地率(%)",
     "fieldName": "greenSpaceRatio",
-    "valueType": "BigDecimal_mu",
+    "valueType": "BigDecimal",
     "required": false
   },
   {