From 61001ab6b7bba2ff087cc96537c626cf9b4ed2dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Fri, 26 Jan 2024 10:11:11 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=8E=B7=E5=8F=96=E5=93=81=E8=A7=84=E5=88=97?= =?UTF-8?q?=E8=A1=A8=202.=E6=A0=B8=E5=AF=B9=E4=BF=A1=E6=81=AF=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/config/ConfigProperties.java | 2 ++ .../web/controller/StockController.java | 7 +++++ .../zhehekeji/web/pojo/stock/StockCheck.java | 3 ++ .../zhehekeji/web/service/StockService.java | 23 ++++++++++++-- .../java/com/zhehekeji/web/util/FileUtil.java | 27 +++++++++++++++++ .../java/com/zhehekeji/web/util/ToolUtil.java | 30 +++++++++++++++++++ web/src/main/resources/application-prod.yml | 4 ++- 7 files changed, 93 insertions(+), 3 deletions(-) create mode 100644 web/src/main/java/com/zhehekeji/web/util/FileUtil.java create mode 100644 web/src/main/java/com/zhehekeji/web/util/ToolUtil.java diff --git a/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java b/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java index 8f29f4f..14fb48d 100644 --- a/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java +++ b/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java @@ -48,6 +48,8 @@ public class ConfigProperties { private Integer serverPort; private Long queueSpanTime = 5000L; + private String productDoc; + @Data public static class CameraConfig{ diff --git a/web/src/main/java/com/zhehekeji/web/controller/StockController.java b/web/src/main/java/com/zhehekeji/web/controller/StockController.java index 2195b55..07e8d5f 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/StockController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/StockController.java @@ -65,6 +65,13 @@ public class StockController { } + @ApiOperation(value = "获取品规列表") + @RequestMapping(value = "/getCategoryList", method = RequestMethod.POST) + public Result> getCategoryList() { + List list = stockService.getCategoryList(); + return Result.success(list); + } + @PostMapping("/statusByRowColumn") @ApiOperation(value = "行列的盘点状态") public ResultcheckStatus(@Validated @RequestBody RowColumnStatus rowColumnStatus){ diff --git a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockCheck.java b/web/src/main/java/com/zhehekeji/web/pojo/stock/StockCheck.java index 3f6787c..8f6806a 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockCheck.java +++ b/web/src/main/java/com/zhehekeji/web/pojo/stock/StockCheck.java @@ -27,4 +27,7 @@ public class StockCheck { @ApiModelProperty("列") private Integer column; + private String category; + private Integer count; + } diff --git a/web/src/main/java/com/zhehekeji/web/service/StockService.java b/web/src/main/java/com/zhehekeji/web/service/StockService.java index 968a59f..a6cecea 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StockService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.zhehekeji.core.util.Assert; +import com.zhehekeji.web.config.ConfigProperties; import com.zhehekeji.web.entity.Stock; import com.zhehekeji.web.entity.CheckLog; import com.zhehekeji.web.entity.StockLog; @@ -16,6 +17,7 @@ import com.zhehekeji.web.mapper.StockMapper; import com.zhehekeji.web.mapper.StreetMapper; import com.zhehekeji.web.pojo.category.PageSearch; import com.zhehekeji.web.pojo.stock.*; +import com.zhehekeji.web.util.FileUtil; import io.swagger.models.auth.In; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -43,6 +45,8 @@ public class StockService { private StockLogMapper stockLogMapper; @Resource private StreetMapper streetMapper; + @Resource + ConfigProperties configProperties; public void importExcel(MultipartFile file) { log.info("import excel stock"); @@ -354,7 +358,10 @@ public class StockService { log.info("check stock correct, street_id:{},direction:{},side:{},row:{},column:{}", stockCheck.getStreetId(),stockCheck.getDirection(),stockCheck.getSide(), stockCheck.getRow(), stockCheck.getColumn()); stock.setStatus(StockStatus.MANUAL.getStatus()); + stock.setCount(stockCheck.getCount()); + stock.setCategory(stockCheck.getCategory()); stockMapper.updateById(stock); + stock = stockMapper.selectById(stock.getId()); checkLog(stock); return stock; } @@ -379,16 +386,20 @@ public class StockService { private CheckLogMapper checkLogMapper; private void checkLog(Stock stock){ - CheckLog checkLog = new CheckLog(); + CheckLog checkLog = checkLogMapper.selectOne(new QueryWrapper() + .eq("check_num",stock.getCheckNum()) + .last("limit 1")); checkLog.setRow(stock.getRow()); checkLog.setColumn(stock.getColumn()); checkLog.setCheckNum(stock.getCheckNum()); checkLog.setPic(stock.getCheckPic()); + checkLog.setCount(stock.getCount()); + checkLog.setCategory(stock.getCategory()); //checkLog.setShelveId(stock.getShelveId()); checkLog.setStatus(stock.getStatus()); checkLog.setCode(stock.getCode()); checkLog.setCreateTime(LocalDateTime.now()); - checkLogMapper.insert(checkLog); + checkLogMapper.updateById(checkLog); } /** @@ -424,6 +435,14 @@ public class StockService { return stock; } + public List getCategoryList() { + List list = new ArrayList<>(); + if(configProperties.getProductDoc() != null){ + list = FileUtil.readLinesToList(configProperties.getProductDoc()); + } + return list; + } + // public void init(String shelveId, Integer row, Integer column){ // Map map = new HashMap<>(); // map.put("shelve_id",shelveId); diff --git a/web/src/main/java/com/zhehekeji/web/util/FileUtil.java b/web/src/main/java/com/zhehekeji/web/util/FileUtil.java new file mode 100644 index 0000000..abc8bf5 --- /dev/null +++ b/web/src/main/java/com/zhehekeji/web/util/FileUtil.java @@ -0,0 +1,27 @@ +package com.zhehekeji.web.util; + +import lombok.extern.slf4j.Slf4j; + +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +@Slf4j +public class FileUtil { + public static List readLinesToList(String path) { + List lines = new ArrayList<>(); + + try (BufferedReader reader = new BufferedReader(new FileReader(path))) { + String line; + while ((line = reader.readLine()) != null) { + lines.add(line); + } + }catch (IOException e){ + log.info("读取数据失败"); + } + + return lines; + } +} diff --git a/web/src/main/java/com/zhehekeji/web/util/ToolUtil.java b/web/src/main/java/com/zhehekeji/web/util/ToolUtil.java new file mode 100644 index 0000000..4c7e914 --- /dev/null +++ b/web/src/main/java/com/zhehekeji/web/util/ToolUtil.java @@ -0,0 +1,30 @@ +package com.zhehekeji.web.util; + +import java.lang.reflect.Array; +import java.util.Collection; +import java.util.Map; + +public class ToolUtil { + public static boolean isEmpty(Object o) { + if (o == null) { + return true; + } + if (o instanceof String) { + return ((String) o).isEmpty(); + } + if (o instanceof Collection) { + return ((Collection) o).isEmpty(); + } + if (o instanceof Map) { + return ((Map) o).isEmpty(); + } + if (o.getClass().isArray()) { + return Array.getLength(o) == 0; + } + return "".equals(o.toString()); + } + + public static boolean isNotEmpty(Object o) { + return !isEmpty(o); + } +} diff --git a/web/src/main/resources/application-prod.yml b/web/src/main/resources/application-prod.yml index ae77175..b4af03d 100644 --- a/web/src/main/resources/application-prod.yml +++ b/web/src/main/resources/application-prod.yml @@ -94,4 +94,6 @@ scanCodeMode: trayCodeTypes: - 14 # 照片 視頻保存多久 -deleteFileDays: 30 \ No newline at end of file +deleteFileDays: 30 + +productDoc: "C:/Users/昊天/Desktop/新建 文本文档 (3).txt" \ No newline at end of file