From 3463857f656a4459b1c7beb563e4d9b1a6156b48 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, 22 Mar 2021 16:17:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=95=BF=E6=A0=BC=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhehekeji/web/service/OrderService.java   |  2 +-
 .../zhehekeji/web/service/StreetService.java  | 31 -------------------
 .../zhehekeji/web/service/WarnService.java    |  2 +-
 web/src/main/resources/mapper/WarnMapper.xml  |  3 ++
 4 files changed, 5 insertions(+), 33 deletions(-)

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 f4fd014..6ce4858 100644
--- a/web/src/main/java/com/zhehekeji/web/service/OrderService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/OrderService.java
@@ -57,7 +57,7 @@ public class OrderService {
                 Long seconds = duration.getSeconds();
                 int minutes = seconds.intValue() / 60;
                 int remainingSeconds = seconds.intValue() % 60;
-                String timeLength = minutes + ":" + remainingSeconds;
+                String timeLength = String.format("%02d:%02d", minutes,remainingSeconds);
                 orderVO.setTimeLength(timeLength);
             }
             if (!StringUtils.isEmpty(orderVO.getPicPaths())) {
diff --git a/web/src/main/java/com/zhehekeji/web/service/StreetService.java b/web/src/main/java/com/zhehekeji/web/service/StreetService.java
index 01c306d..ef42991 100644
--- a/web/src/main/java/com/zhehekeji/web/service/StreetService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/StreetService.java
@@ -3,10 +3,7 @@ package com.zhehekeji.web.service;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.zhehekeji.core.util.Assert;
-import com.zhehekeji.web.entity.Stock;
 import com.zhehekeji.web.entity.Street;
-import com.zhehekeji.web.mapper.OrderLastMediaMapper;
-import com.zhehekeji.web.mapper.StockMapper;
 import com.zhehekeji.web.mapper.StreetMapper;
 import com.zhehekeji.web.pojo.street.StreetSearch;
 import com.zhehekeji.web.pojo.street.StreetType;
@@ -27,12 +24,8 @@ public class StreetService {
 
     @Resource
     private StreetMapper streetMapper;
-    //    @Resource
-//    private StreetShelveMapper streetShelveMapper;
     @Resource
     private NettyClient nettyClient;
-    @Resource
-    private StockMapper stockMapper;
 
     @Transactional(rollbackFor = Exception.class)
     public Integer add(Street street) {
@@ -122,28 +115,4 @@ public class StreetService {
         return new PageInfo<>(streetVOS);
     }
 
-    public List<String> shelvesByStreetId(Integer streetId) {
-        Street street = streetMapper.selectById(streetId);
-        if (street != null) {
-            return check(street);
-        }
-        return null;
-    }
-
-    private void stockGenerate(String sheveId, Integer row, Integer column) {
-        List<Stock> stocks = new ArrayList<>(row * column);
-        for (int i = 1; i <= row; i++) {
-            for (int j = 1; j <= column; i++) {
-                Stock stock = new Stock();
-                stock.setStatus(0);
-                stock.setRow(i);
-                stock.setColumn(j);
-                stock.setShelveId(sheveId);
-                stocks.add(stock);
-            }
-        }
-        stockMapper.batchInsert(stocks);
-    }
-
-
 }
diff --git a/web/src/main/java/com/zhehekeji/web/service/WarnService.java b/web/src/main/java/com/zhehekeji/web/service/WarnService.java
index cce135f..cbd3622 100644
--- a/web/src/main/java/com/zhehekeji/web/service/WarnService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/WarnService.java
@@ -29,7 +29,7 @@ public class WarnService {
                 Long seconds = duration.getSeconds();
                 int minutes = seconds.intValue() / 60;
                 int remainingSeconds = seconds.intValue() % 60;
-                String timeLength = minutes+":"+remainingSeconds;
+                String timeLength = String.format("%02d:%02d", minutes,remainingSeconds);
                 warnVO.setTimeLength(timeLength);
             }
 
diff --git a/web/src/main/resources/mapper/WarnMapper.xml b/web/src/main/resources/mapper/WarnMapper.xml
index f752acb..abd6e0e 100644
--- a/web/src/main/resources/mapper/WarnMapper.xml
+++ b/web/src/main/resources/mapper/WarnMapper.xml
@@ -10,6 +10,9 @@
             <if test="req.startTime != null and req.endTime != null">
                 and t.start_time >= #{req.startTime} and t.start_time  &lt;= #{req.endTime}
             </if>
+            <if test="req.streetId != null and req.streetId != 0">
+                and t.street_id = #{req.streetId}
+            </if>
         </where>
         order by t.id desc
     </select>