From 5bec3d7f2adcd82aafd7cdde38c39e99dbe53e9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E9=B8=A3?= <wangyiming@zhehekeji.com>
Date: Mon, 2 Nov 2020 11:26:06 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=AA=92=E4=BD=93=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                            | 21 ++++++++++++++
 .../web/controller/OrderController.java       |  2 +-
 .../java/com/zhehekeji/web/entity/Order.java  |  5 ++++
 .../zhehekeji/web/service/OrderService.java   | 28 +++++++++++++++++++
 web/src/main/resources/application-test.yml   |  1 +
 5 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 .idea/compiler.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..1c7d7c9
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="common" />
+        <module name="filter" />
+        <module name="springbootstart-web" />
+      </profile>
+    </annotationProcessing>
+  </component>
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
+      <module name="filter" options="-parameters" />
+      <module name="springbootstart-web" options="-parameters" />
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/web/src/main/java/com/zhehekeji/web/controller/OrderController.java b/web/src/main/java/com/zhehekeji/web/controller/OrderController.java
index aa4ab35..50690f1 100644
--- a/web/src/main/java/com/zhehekeji/web/controller/OrderController.java
+++ b/web/src/main/java/com/zhehekeji/web/controller/OrderController.java
@@ -41,7 +41,7 @@ public class OrderController {
 
     @PostMapping("/list")
     @ApiOperation(value = "查询")
-    @SessionHandler
+    //@SessionHandler
     public Result<List<Order>> findRoleList(@RequestBody OrderSearch orderSearch) {
         validatorUtil.validate(orderSearch);
         return new Result<>(orderService.orders(orderSearch));
diff --git a/web/src/main/java/com/zhehekeji/web/entity/Order.java b/web/src/main/java/com/zhehekeji/web/entity/Order.java
index 5d94631..b32d873 100644
--- a/web/src/main/java/com/zhehekeji/web/entity/Order.java
+++ b/web/src/main/java/com/zhehekeji/web/entity/Order.java
@@ -1,6 +1,7 @@
 package com.zhehekeji.web.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
@@ -31,6 +32,10 @@ public class Order {
 
     private String deviceid;
 
+    @ApiModelProperty("图片地址")
+    @TableField(exist = false)
+    private String mediaPath;
+
     private LocalDateTime execTime;
 
     private LocalDateTime createTime;
diff --git a/web/src/main/java/com/zhehekeji/web/service/OrderService.java b/web/src/main/java/com/zhehekeji/web/service/OrderService.java
index 2b860cc..eb770bf 100644
--- a/web/src/main/java/com/zhehekeji/web/service/OrderService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/OrderService.java
@@ -7,6 +7,7 @@ import com.zhehekeji.web.mapper.OrderMapper;
 import com.zhehekeji.web.pojo.OrderSaveReq;
 import com.zhehekeji.web.pojo.OrderSearch;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -21,15 +22,42 @@ public class OrderService {
     @Resource
     private OrderMapper orderMapper;
 
+    @Value("${picPort}")
+    private String picPort;
+
     public List<Order> orders(OrderSearch orderSearch){
         QueryWrapper<Order> queryWrapper = new QueryWrapper<Order>().eq("order_num",orderSearch.getOrderNum());
         if(!StringUtils.isEmpty(orderSearch.getDeviceid())){
             queryWrapper.eq("deviceid",orderSearch.getDeviceid());
         }
+
         List<Order> orders = orderMapper.selectList(queryWrapper);
+        //图片地址处理
+        orders.forEach(order -> {
+            String deviceId = order.getDeviceid();
+            if(!StringUtils.isEmpty(deviceId)){
+                String [] strings = deviceId.split("_");
+                if(strings != null && strings.length > 4){
+                    Integer len = strings.length;
+                    String ip = strings[len -4]+"."+strings[len-3]+"."+strings[len-2]+"."+strings[len-1];
+                    // fliePath ->  E:/stable3262/tadpole/tpvs17/x64/Release/../../../runner17/x64/LIQUN_Image/20200827/155907_HL0101001002031_name1.jpg
+                    //去掉盘符，取后面的地址 拼接
+                    int i = order.getFilePath().indexOf(":");
+                    String path = "http://"+ip+":"+picPort+order.getFilePath().substring(i+1,order.getFilePath().length());
+                    order.setMediaPath(path);
+                }
+            }
+        });
         return orders;
     }
 
+    public static void main(String[] args) {
+        String filePath = "E2:/stable3262/tadpole/tpvs17/x64/Release/../../../runner17/x64/LIQUN_Image/20200827/155907_HL0101001002031_name1.jpg";
+        int i = filePath.indexOf(":");
+        System.out.println(filePath.substring(i+1,filePath.length()));
+        System.out.println(i);
+    }
+
     public Long add(OrderSaveReq saveReq){
         Order order = new Order();
         BeanUtils.copyProperties(saveReq,order);
diff --git a/web/src/main/resources/application-test.yml b/web/src/main/resources/application-test.yml
index 5b34d15..023e9bd 100644
--- a/web/src/main/resources/application-test.yml
+++ b/web/src/main/resources/application-test.yml
@@ -32,3 +32,4 @@ zhehe:
 server:
   port: 8099
 userUrl: http://115.236.65.98:8007
+picPort: 8544