Merge remote-tracking branch 'origin/dev' into dev

2c2c2c
2 parents 48e09191 5254a581
Showing 18 changed files with 106 additions and 90 deletions
trash-admin/src/main/java/com/trash/Application.java
trash-admin/src/main/resources/application-dev.yml
trash-admin/src/main/resources/application-local.yml
trash-admin/src/main/resources/static/car_2.png
trash-admin/src/main/resources/static/car_2.png1
trash-admin/src/main/resources/static/type-guide.1.png
trash-framework/src/main/java/com/trash/framework/web/service/SysLoginService.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/carInfo/domain/CarInfo.java
trash-unit/src/main/java/com/trash/carInfo/domain/vo/CarInfoVo.java
trash-unit/src/main/java/com/trash/enterprise/domain/TransportationEnterprise.java
trash-unit/src/main/resources/mapper/unit/CarInfoMapper.xml
@@ -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;
-    }
 }
@@ -9,8 +9,8 @@ trash:
     # 实例演示开关
     demoEnabled: true
     # 文件路径 示例（ Windows配置D:/trash/uploadPath，Linux配置 /home/trash/uploadPath，存储桶 trash/uploadPath,nginx配置 /trash/upload）
-    #profile: /home/trash/uploadPath
-    profile: E:/trash/uploadPath
+    profile: /home/trash/uploadPath
+#    profile: E:/trash/uploadPath
 #    profile: F:/work/project/Documents/uploadPath/trash
 #     获取ip地址开关
     addressEnabled: false
@@ -33,7 +33,7 @@ spring:
             # 主库数据源
             master:
 #                url: jdbc:mysql://localhost:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
-                url: jdbc:mysql://localhost:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                url: jdbc:mysql://192.168.168.141:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                 username: root
                 password: root
             # 从库数据源
@@ -85,7 +85,7 @@ spring:
         # redis 配置
     redis:
         # 地址
-        host: 127.0.0.1
+        host: 192.168.168.124
         # 端口，默认为6379
         port: 6379
         # 密码
 package com.trash.framework.web.service;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.annotation.Resource;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.stereotype.Component;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -34,9 +18,22 @@ import com.trash.common.utils.RemoteServerUtils;
 import com.trash.framework.manager.AsyncManager;
 import com.trash.framework.manager.factory.AsyncFactory;
 import com.trash.system.mapper.SysTempMapper;
-
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 /**
  * 登录校验方法
@@ -106,6 +103,7 @@ public class SysLoginService
                 throw new CustomException(e.getMessage());
             }
         }
+
         AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
         LoginUser loginUser = (LoginUser) authentication.getPrincipal();
         // 生成token
@@ -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);
         // 保存车辆信息
 package com.trash.carInfo.controller;
-import java.io.IOException;
-import java.util.List;
-
+import com.trash.carInfo.domain.CarInfo;
 import com.trash.carInfo.domain.vo.CarInfoVo;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import com.trash.carInfo.service.ICarInfoService;
 import com.trash.common.annotation.Log;
 import com.trash.common.core.controller.BaseController;
 import com.trash.common.core.domain.AjaxResult;
+import com.trash.common.core.page.TableDataInfo;
 import com.trash.common.enums.BusinessType;
-import com.trash.carInfo.domain.CarInfo;
-import com.trash.carInfo.service.ICarInfoService;
 import com.trash.common.utils.poi.ExcelUtil;
-import com.trash.common.core.page.TableDataInfo;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 /**
  * 运输车辆管理Controller
  * 
@@ -38,8 +41,24 @@ public class CarInfoController extends BaseController
     public TableDataInfo list(CarInfoVo carInfo)
     {
         startPage();
-        carInfo.setIsDel(1);
+        carInfo.setIsDel("1");
         List<CarInfoVo> list = carInfoService.selectCarInfoList(carInfo);
+        if(CollectionUtils.isNotEmpty(list)){
+            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());
+        }
+
         return getDataTable(list);
     }
@@ -51,7 +70,6 @@ public class CarInfoController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(CarInfoVo carInfo)
     {
-        carInfo.setIsDel(1);
         List<CarInfoVo> list = carInfoService.selectCarInfoList(carInfo);
         ExcelUtil<CarInfoVo> util = new ExcelUtil<CarInfoVo>(CarInfoVo.class);
         return util.exportExcel(list, "carInfo");
@@ -119,16 +119,6 @@ public class CarInfo extends BaseEntity
     @Excel(name = "二维码")
     private String qrCode;
-    private int isDel;
-
-    public int getIsDel() {
-        return isDel;
-    }
-
-    public void setIsDel(int isDel) {
-        this.isDel = isDel;
-    }
-
     public String getLengthWidthHeight() {
         return lengthWidthHeight;
     }
@@ -7,6 +7,8 @@ public class CarInfoVo extends CarInfo {
     private String driversName;
+    private String isDel;
+
     public String getCompanyName() {
         return companyName;
     }
@@ -22,4 +24,12 @@ public class CarInfoVo extends CarInfo {
     public void setDriversName(String driversName) {
         this.driversName = driversName;
     }
+
+    public String getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(String isDel) {
+        this.isDel = isDel;
+    }
 }
@@ -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;
     /** 信用状态 */
@@ -35,7 +35,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="updateBy"    column="update_by"    />
         <result property="creditStatus"    column="credit_status"    />
         <result property="qrCode"    column="qr_code"    />
-        <result property="isDel"    column="is_del"    />
     </resultMap>
     <resultMap type="CarInfoVo" id="CarInfoVoResult">
@@ -71,10 +70,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="qrCode"    column="qr_code"    />
         <result property="companyName"    column="companyName"    />
         <result property="driversName"    column="driversName"    />
+        <result property="is_del"    column="isDel"    />
     </resultMap>
     <sql id="selectCarInfoVo">
-        select id, company_id, car_type, car_code, car_brank, emission_standard, road_transport_date, driving_license_date, enter_date, farme_number, car_identification, container_volume, car_color, car_equipment, remark, road_transport, driving_license, car_front, car_left, car_behind, car_right, drivers, status, create_time, create_by, update_time, update_by, credit_status, qr_code，is_del from car_info
+        select id, company_id, car_type, car_code, car_brank, emission_standard, road_transport_date, driving_license_date, enter_date, farme_number, car_identification, container_volume, car_color, car_equipment, remark, road_transport, driving_license, car_front, car_left, car_behind, car_right, drivers, status, create_time, create_by, update_time, update_by, credit_status, qr_code from car_info
     </sql>
     <sql id="selectCarInfoForCompanyVo">
@@ -120,7 +120,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     <select id="selectCarInfoList" parameterType="CarInfoVo" resultMap="CarInfoVoResult">
         <include refid="selectCarInfoForCompanyVo"/>
-        <where>
+        <where>  
             <if test="companyName != null   and companyName != ''"> and c.name like concat('%',#{companyName},'%')</if>
             <if test="carType != null  and carType != ''"> and car_type = #{carType}</if>
             <if test="carCode != null  and carCode != ''"> and car_code like concat('%',#{carCode},'%')</if>
@@ -143,19 +143,19 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="drivers != null  and drivers != ''"> and drivers = #{drivers}</if>
             <if test="status != null "> and car.status = #{status}</if>
             <if test="creditStatus != null  and creditStatus != ''"> and car.credit_status = #{creditStatus}</if>
-                <if test="isDel != null  and isDel != ''"> and car.is_del = #{isDel}</if>
+            <if test="isDel != null  and isDel != ''"> and car.is_del = #{isDel}</if>
         </where>
     </select>
     <select id="selectCarInfoById" parameterType="Long" resultMap="CarInfoResult">
         <include refid="selectCarInfoVo"/>
-        where id = #{id} and is_del = 1
+        where id = #{id}
     </select>
     <select id="selectByCompanyId" parameterType="Long" resultMap="CarInfoVoResult">
         <include refid="selectCarInfoForCompanyVo"/>
-        where car.company_id=#{companyId} and is_del = 1
+        where car.company_id=#{companyId}
     </select>
@@ -191,7 +191,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="creditStatus != null">credit_status,</if>
             <if test="qrCode != null">qr_code,</if>
             <if test="lengthWidthHeight != null">length_width_height,</if>
-            <if test="isDel != null">is_del,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="companyId != null">#{companyId},</if>
@@ -223,7 +222,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="creditStatus != null">#{creditStatus},</if>
             <if test="qrCode != null">#{qrCode},</if>
             <if test="lengthWidthHeight != null">#{lengthWidthHeight},</if>
-            <if test="isDel != null">#{isDel},</if>
          </trim>
     </insert>
@@ -259,21 +257,20 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="creditStatus != null">credit_status = #{creditStatus},</if>
             <if test="qrCode != null">qr_code = #{qrCode},</if>
             <if test="lengthWidthHeight != null">length_width_height = #{lengthWidthHeight},</if>
-            <if test="isDel != null">is_del = #{isDel},</if>
         </trim>
         where id = #{id}
     </update>
-    <update id="deleteCarInfoById" parameterType="Long">
-        update car_info set is_del = 0 where id = #{id}
-    </update>
+    <delete id="deleteCarInfoById" parameterType="Long">
+        delete from car_info where id = #{id}
+    </delete>
-    <update id="deleteCarInfoByIds" parameterType="String">
-        update car_info set is_del = 0 where id in
+    <delete id="deleteCarInfoByIds" parameterType="String">
+        delete from car_info where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
-    </update>
+    </delete>
     <insert id="addCarDriverRelation" parameterType="CarDriverRelation">