处理excel 格式

gis_application/src/main/resources/application-dev.properties

@@ -3,11 +3,11 @@
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.druid.username=root
-#spring.datasource.druid.url=jdbc:mysql://8.135.106.227:3306/${project.en}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-#spring.datasource.druid.password=4dkk2021testproject%
+spring.datasource.druid.url=jdbc:mysql://8.135.106.227:3306/${project.en}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.druid.password=4dkk2021testproject%
 
-spring.datasource.druid.url=jdbc:mysql://127.0.0.1:3306/${project.en}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.druid.password=root
+#spring.datasource.druid.url=jdbc:mysql://127.0.0.1:3306/${project.en}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+#spring.datasource.druid.password=root
 
 
 # \u521D\u59CB\u8FDE\u63A5\u6570

gis_application/src/main/resources/application.properties

@@ -1,4 +1,4 @@
-server.port=8005
+server.port=8014
 
 spring.profiles.active=dev
 

gis_cms/src/main/java/com/gis/cms/service/impl/HotelServiceImpl.java

@@ -375,8 +375,15 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, HotelEntity> impl
                 // 封装统一联系类型 的 联系人信息
                 StringBuilder builder = new StringBuilder();
                 for (ContactEntity entity : contactList) {
-                     builder.append(entity.getName()).append(",");
-                     builder.append(entity.getPhone()).append(";\r\n");
+                     if (StrUtil.isNotBlank(entity.getName())){
+                         builder.append(entity.getName());
+                     }
+                     if (StrUtil.isNotBlank(entity.getPhone())){
+                         if (StrUtil.isNotBlank(builder)){
+                             builder.append(",");
+                         }
+                         builder.append(entity.getPhone()).append(";\r\n");
+                     }
                 }
 
                 // 合并后的联系人信息