Merge branch 'master' of git.taauav.net:gitadmin/taauav_lishui

src/main/java/com/taauav/admin/service/impl/TauvInspectDriverServiceImpl.java

         TauvInspectDriver inspectDriver = new TauvInspectDriver();
 //        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-        inspectDriver.setWeather(task.getWeather());
-        inspectDriver.setWind(task.getWind());
-        inspectDriver.setTemperature(task.getTemperature());
-        inspectDriver.setFlightHeight(new BigDecimal(task.getFlightHeight()));
-        inspectDriver.setFlightSpeed(new BigDecimal(task.getFlightSpeed()));
-        inspectDriver.setFlightTime(new BigDecimal(task.getFlightTime()));
-        inspectDriver.setRemark(task.getRemark());
+        inspectDriver.setWeather(StringUtils.isEmpty(task.getWeather()) ? "" : task.getWeather().trim());
+        inspectDriver.setWind(StringUtils.isEmpty(task.getWind()) ? "" : task.getWind().trim());
+        inspectDriver.setTemperature(StringUtils.isEmpty(task.getTemperature()) ? "" : task.getTemperature().trim());
+        if (!StringUtils.isEmpty(task.getFlightHeight())) {
+            inspectDriver.setFlightHeight(new BigDecimal(task.getFlightHeight()));
+        }
+        if (!StringUtils.isEmpty(task.getFlightSpeed())) {
+            inspectDriver.setFlightSpeed(new BigDecimal(task.getFlightSpeed()));
+        }
+        if (!StringUtils.isEmpty(task.getFlightTime())) {
+            inspectDriver.setFlightTime(new BigDecimal(task.getFlightTime()));
+        }
+        inspectDriver.setRemark(StringUtils.isEmpty(task.getRemark()) ? "" : task.getRemark().trim());
         inspectDriver.setStatus(3);
         inspectDriver.setFlightHand(adminId);
         inspectDriver.setExecutionTime(task.getExecutionTime());

src/main/resources/config/application-prod.yml

   #静态资源对外暴露的访问路径
   staticAccessPath: /upload/**
   ###静态资源实际存储路径
-  uploadFolder: /data/webroot/taauav/public/upload/
+  uploadFolder: /data/java/lishui/public/upload/
   uploadImage: temp/
   servlet:
     context-path:

src/main/resources/config/application-test.yml

   #静态资源对外暴露的访问路径
   staticAccessPath: /upload/**
   ###静态资源实际存储路径
-  uploadFolder: /data/webroot/taauav/public/upload/
+  uploadFolder: /data/java/lishui/public/upload/
   uploadImage: temp/
   servlet:
     context-path: