Explorar el Código

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

master
牧羊人 hace 4 años
padre
commit
630bddbf6c
Se han modificado 3 ficheros con 15 adiciones y 9 borrados
  1. +13
    -7
      src/main/java/com/taauav/admin/service/impl/TauvInspectDriverServiceImpl.java
  2. +1
    -1
      src/main/resources/config/application-prod.yml
  3. +1
    -1
      src/main/resources/config/application-test.yml

+ 13
- 7
src/main/java/com/taauav/admin/service/impl/TauvInspectDriverServiceImpl.java Ver fichero

@@ -585,13 +585,19 @@ public class TauvInspectDriverServiceImpl extends BaseServiceImpl<TauvInspectDri
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());

+ 1
- 1
src/main/resources/config/application-prod.yml Ver fichero

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

+ 1
- 1
src/main/resources/config/application-test.yml Ver fichero

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

Cargando…
Cancelar
Guardar