优化

liujun001
1 parent 2a1db592
Showing 9 changed files with 39 additions and 33 deletions
trash-admin/src/main/java/com/trash/Application.java
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrder.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderCar.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/OrderDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailVo.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-unit/src/main/java/com/trash/carInfo/controller/CarInfoController.java
trash-unit/src/main/java/com/trash/enterprise/domain/TransportationEnterprise.java
@@ -3,10 +3,6 @@ package com.trash;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer;
-import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
-import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
-import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.EnableScheduling;
 /**
@@ -20,15 +16,8 @@ public class Application
 {
     public static void main(String[] args)
     {
-         System.setProperty("spring.devtools.restart.enabled", "true");
+        // System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(Application.class, args);
         System.out.println("Application start success");
     }
-    
-    @Bean
-    public ConfigurableServletWebServerFactory webServerFactory() {
-	    TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory();
-	    factory.addConnectorCustomizers((TomcatConnectorCustomizer) connector -> connector.setProperty("relaxedQueryChars", "|{}[]\\"));
-	    return factory;
-    }
 }
@@ -94,7 +94,7 @@ public class GarbageOrderController {
             // 上传并返回新文件名称
             fileName = FileUploadUtils.upload(filePath, file);
         } catch (IOException e) {
-//            log.error("上传图片异常",e);
+            log.error("上传图片异常",e);
             throw new BizException(ResultCode.CODE_400, ResultCode.CODE_400.getMsg());
         }
         String url = serverConfig.getUrl() + fileName;
@@ -169,6 +169,8 @@ public class GarOrder implements Serializable {
 	private Integer garTimeOutFlag;
+	private String garEstimatedCost;
+
 	/**
 	 * 是否有用户的评价，默认值是0，默认没有
 	 *
@@ -471,4 +473,12 @@ public class GarOrder implements Serializable {
 	public void setHaveEvaluateOfClient(Integer haveEvaluateOfClient) {
 		this.haveEvaluateOfClient = haveEvaluateOfClient;
 	}
+
+	public String getGarEstimatedCost() {
+		return garEstimatedCost;
+	}
+
+	public void setGarEstimatedCost(String garEstimatedCost) {
+		this.garEstimatedCost = garEstimatedCost;
+	}
 }
 \ No newline at end of file
@@ -55,23 +55,7 @@ public class GarOrderCar implements Serializable {
     @TableField(fill = FieldFill.INSERT)
     private String garCreateBy;
-    public Integer getCarId() {
-		return carId;
-	}
-
-	public void setCarId(Integer carId) {
-		this.carId = carId;
-	}
-
-	public String getContainerVolume() {
-		return containerVolume;
-	}
-
-	public void setContainerVolume(String containerVolume) {
-		this.containerVolume = containerVolume;
-	}
-
-	/**
+    /**
      * 
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
@@ -91,6 +91,8 @@ public class OrderDto {
     private List<CarInfo> garCarInfoList;
+    private String garEstimatedCost;
+
     @ToString
     @EqualsAndHashCode
     public static class CarInfo {
@@ -107,8 +109,6 @@ public class OrderDto {
         private String garOrderCarType;
         private String containerVolume;
-        
-        
         public Integer getGarOrderCarNumber() {
             return garOrderCarNumber;
@@ -281,6 +281,14 @@ public class OrderDto {
         this.garInCarStore = garInCarStore;
     }
+    public String getGarEstimatedCost() {
+        return garEstimatedCost;
+    }
+
+    public void setGarEstimatedCost(String garEstimatedCost) {
+        this.garEstimatedCost = garEstimatedCost;
+    }
+
     @Override
     public String toString() {
         return "OrderDto{" +
@@ -159,6 +159,8 @@ public class OrderDetailVo {
      */
     private Integer haveEvaluateOfClient = 0;
+    private String garEstimatedCost;
+
     public OrderDetailVo() {
         this.currentImages = new ArrayList<>();
         this.putDownImages = new ArrayList<>();
@@ -441,4 +443,12 @@ public class OrderDetailVo {
     public void setHaveEvaluateOfClient(Integer haveEvaluateOfClient) {
         this.haveEvaluateOfClient = haveEvaluateOfClient;
     }
+
+    public String getGarEstimatedCost() {
+        return garEstimatedCost;
+    }
+
+    public void setGarEstimatedCost(String garEstimatedCost) {
+        this.garEstimatedCost = garEstimatedCost;
+    }
 }
@@ -96,6 +96,8 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         // 预估车辆等于用户选择得车辆
         order.setGarRealCarCount(dto.getGarCarInfoList().stream().mapToInt(OrderDto.CarInfo::getGarOrderCarNumber).sum());
         order.setGarTimeOutFlag(GlobalStatus.GarOrderStatus.ORDER_TIME_OUT_FLAG_NO.getValue());
+        order.setGarEstimatedCost(dto.getGarEstimatedCost());
+
         save(order);
         // 保存车辆信息
@@ -47,10 +47,13 @@ public class CarInfoController extends BaseController
             list = list.stream().map(car->{
                 if(Objects.equals(car.getCarType(),"轻型货车")){
                     car.setCarLeft("car_1.png");
+                    car.setRemark("箱体长2.6m,宽1.7m,高1.5m；最多可容纳约90袋装修垃圾（75cm*5cm每袋）");
                 }else if(Objects.equals(car.getCarType(),"中型货车")){
                     car.setCarLeft("car_2.png");
+                    car.setRemark("箱体长3.2m,宽1.5m,高1.5m；最多可容纳约110袋装修垃圾（75cm*45cm每袋）");
                 }else if(Objects.equals(car.getCarType(),"大中型货车")){
                     car.setCarLeft("car_3.png");
+                    car.setRemark("箱体长3.2m,宽1.9m,高1.9m；最多可容纳约150袋装修垃圾（75cm*45cm每袋）");
                 }
                 return car;
             }).collect(Collectors.toList());
@@ -117,7 +117,7 @@ public class TransportationEnterprise extends BaseEntity
     private Long parentId;
     /** 公司类型（0经营单位，1运输公司） */
-//    @Excel(name = "公司类型", readConverterExp = "0=投放点信息，1运输公司")
+    @Excel(name = "公司类型", readConverterExp = "0=经营单位，1运输公司")
     private Integer companyType;
     /** 信用状态 */