修改问题5.20

logistics/src/main/java/com/ccsens/logistics/Util/Constant.java

@@ -42,4 +42,22 @@ public  class Constant {
      * 在线获取数据
      */
     public static final String ONLINE = "online";
+
+    //车辆类型
+    /**
+     * 非机动车
+     */
+    public static final String NON_MOTOR = "非机动车";
+    public static final Long NON_MOTOR_WEIGHT = 1L;
+    /**
+     * 轿车
+     */
+    public static final String SMALL_CAR = "轿车";
+    public static final Long SMALL_CAR_WEIGHT = 1L;
+    /**
+     * 面包车
+     */
+    public static final String  MEDIUM_CAR = "面包车";
+    public static final Long MEDIUM_CAR_WEIGHT = 20L;
+
 }

logistics/src/main/java/com/ccsens/logistics/bean/dto/MbpsDto.java

@@ -54,7 +54,7 @@ public class MbpsDto {
 
     @Data
     @ApiModel(value = "查询是否有火灾水灾")
-    public static class SelFireOrFlood{
+    public static class  SelFireOrFlood{
         @NotNull(message = "请选择园区")
         @ApiModelProperty("园区id")
         private Long parkId;

logistics/src/main/java/com/ccsens/logistics/service/CarIdentificationService.java

@@ -52,13 +52,26 @@ public class CarIdentificationService implements ICarIdentificationService{
                     carRecord.setPlateType(param.get("plate_color"));
                     carRecord.setCamId(param.get("cam_id"));
                     carRecord.setRecordTime(Long.parseLong(param.get("start_time"))*1000);
-                    String pictureBase64 = param.get("picture");
 
+                    String pictureBase64 = param.get("picture");
                     String newPictureBase64 = pictureBase64.replace(".", "=").replace("_", "/").replace("-", "+");
-
                     String pictureUrl = Base64FileUtil.base64ToFile("data:image/png;base64,"+newPictureBase64,PropUtil.path, "/file/" + DateUtil.today() + "/");
+                    carRecord.setPicture(PropUtil.imgDomain+pictureUrl);
 
-                    carRecord.setPicture(pictureUrl);
+                    //根据车型预估重量
+                    switch(param.get("vehicle_type")){
+                        case Constant.NON_MOTOR:
+                            carRecord.setCarWeight(Constant.NON_MOTOR_WEIGHT);
+                            break;
+                        case Constant.SMALL_CAR:
+                            carRecord.setCarWeight(Constant.SMALL_CAR_WEIGHT);
+                            break;
+                        case Constant.MEDIUM_CAR:
+                            carRecord.setCarWeight(Constant.MEDIUM_CAR_WEIGHT);
+                            break;
+                        default:
+                            break;
+                    }
                     carRecordDao.insertSelective(carRecord);
                     jsonObject.put("error_num","0");
                     jsonObject.put("error_str","无");

logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java

@@ -116,7 +116,12 @@ public class MbpsService implements IMbpsService {
     public MbpsVo.SelTempAndHumidity selTeamAndHumidity(MbpsDto.SelTeamAndHumidity param) {
         MbpsVo.SelTempAndHumidity tempAndHumidity = new MbpsVo.SelTempAndHumidity();
 
-        String[] countArr = new String[param.getQueryOfDay()];
+        String[] countArr;
+        if (ObjectUtil.isNotNull(param.getQueryOfDay())){
+            countArr = new String[param.getQueryOfDay()];
+        }else{
+            countArr = new String[5];
+        }
         //查找当前时间
         Date date = new Date();
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH");

logistics/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
-    include: common,util-dev
+    active: prod
+    include: common,util-prod
 
 

logistics/src/main/resources/mapper_dao/LogisticsHeatImagingRecordDao.xml

@@ -15,7 +15,7 @@
             AND le.rec_status = 0
         WHERE
             ir.rec_status = 0
-            <if test="id != null">
+            <if test="id!=null and id!=''">
                 AND le.id = #{id}
             </if>
             <if test="warehouseId != null">