1.巷道盘点状态

2.盘点导出顺序
3.软加密

lp.key

@@ -0,0 +1 @@
+BFEBFBFF000B06710025_38BC_21C3_A29D.

lp.lic

@@ -0,0 +1 @@
+255509055115241936

web/src/main/java/com/zhehekeji/web/controller/CameraController.java

@@ -187,14 +187,11 @@ public class CameraController {
             });
             jsonObject.put("streams",streams);
             Writer write = new OutputStreamWriter(new FileOutputStream(file), "UTF-8");
-
             write.write(jsonObject.toJSONString());
             write.flush();
             write.close();
             log.info("downloadConfig:{}",entry.getKey());
-
         }
         return Result.success();
     }
-
 }

web/src/main/java/com/zhehekeji/web/controller/StreetController.java

@@ -15,6 +15,7 @@ import com.zhehekeji.web.service.damLightSource.JYDamHelper;
 import com.zhehekeji.web.service.hikLightSource.HikControlSocket;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
@@ -70,6 +71,13 @@ public class StreetController {
         return Result.success();
     }
 
+    @PostMapping("/streetStockStatus")
+    @ApiOperation(value = "巷道盘点状态")
+    public Result streetStockStatus(){
+        List<StreetVO> streetStockStatus = streetService.streetStockStatus();
+
+        return Result.success(streetStockStatus);
+    }
     @GetMapping("/{id}")
     @ApiOperation(value = "巷道详情")
     public Result<Street> detail(@PathVariable Integer id){

web/src/main/java/com/zhehekeji/web/pojo/stock/StockExportExcel.java

@@ -11,13 +11,13 @@ public class StockExportExcel {
     @ExcelProperty(index = 0, value = "巷道名称")
     private String streetName;
 
-    @ExcelProperty(index = 7, value = "盘点批次号")
+    @ExcelProperty(index = 6, value = "盘点批次号")
     private String lotnum;
 
-    @ExcelProperty(index = 4, value = "条码")
+    @ExcelProperty(index = 5, value = "条码")
     private String code;
 
-    @ExcelProperty(index = 5, value = "WMS条码")
+    @ExcelProperty(index = 8, value = "WMS条码")
     private String wmsCode;
 
     @ExcelProperty(index = 1, value = "左右,1:左侧,2:右侧")
@@ -38,10 +38,14 @@ public class StockExportExcel {
     @ExcelProperty(index = 2, value = "列")
     private Integer column;
 
-    @ExcelProperty(index = 6, value = "盘点结果", converter = StockStatusConvert.class)
+    @ExcelProperty(index = 4, value = "盘点任务号")
+    private String checkNum;
+
+
+    @ExcelProperty(index = 7, value = "盘点结果", converter = StockStatusConvert.class)
     private Integer status;
 
-    @ExcelProperty(index = 8, value = "时间", converter = LocalDateTimeConvert.class)
+    @ExcelProperty(index = 9, value = "时间", converter = LocalDateTimeConvert.class)
     private LocalDateTime exportTime;
 
 }

web/src/main/java/com/zhehekeji/web/pojo/street/StreetVO.java

@@ -25,6 +25,7 @@ public class StreetVO extends Street {
 
     private Integer rightSensorGunPort;
 
+    private Long statusCount;
 
     @JsonProperty(value="RFIDIp")
     private String RFIDIp;

web/src/main/java/com/zhehekeji/web/service/StockService.java

@@ -74,6 +74,12 @@ public class StockService {
         List<Stock> stocks = stockMapper.selectList(new QueryWrapper<Stock>().eq("street_id", streetId).orderByAsc("`direction`", "`side`", "`row`", "`column`"));
         return stocks;
     }
+    public List<Stock> list() {
+
+        //List<String> shelves = streetService.check(street);
+        List<Stock> stocks = stockMapper.selectList(new QueryWrapper<Stock>());
+        return stocks;
+    }
 
     public PageInfo<Stock> page(PageSearch pageSearch) {
         PageHelper.startPage(pageSearch.getPageNum(), pageSearch.getPageSize());
@@ -338,6 +344,7 @@ public class StockService {
             stockExportExcel.setCode(stock.getTrayCode());
             stockExportExcel.setLotnum(stock.getLotnum());
             stockExportExcel.setColumn(stock.getColumn());
+            stockExportExcel.setCheckNum(stock.getCheckNum());
             stockExportExcel.setWmsCode(stock.getWmsTrayCode());
             //stockExportExcel.setCount(stock.getCount());
             stockExportExcel.setRow(stock.getRow());
@@ -367,6 +374,7 @@ public class StockService {
             stockExportExcel.setCode(stock.getTrayCode());
             stockExportExcel.setLotnum(stock.getLotnum());
             stockExportExcel.setColumn(stock.getColumn());
+            stockExportExcel.setCheckNum(stock.getCheckNum());
             //stockExportExcel.setCount(stock.getCount());
             stockExportExcel.setRow(stock.getRow());
             stockExportExcel.setStreetName(streetMap.get(stock.getStreetId()));

web/src/main/java/com/zhehekeji/web/service/StreetService.java

@@ -6,10 +6,7 @@ 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.LightSource;
-import com.zhehekeji.web.entity.RFID;
-import com.zhehekeji.web.entity.SensorGun;
-import com.zhehekeji.web.entity.Street;
+import com.zhehekeji.web.entity.*;
 import com.zhehekeji.web.mapper.LightSourceMapper;
 import com.zhehekeji.web.mapper.RFIDMapper;
 import com.zhehekeji.web.mapper.SensorGunMapper;
@@ -34,6 +31,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -248,4 +246,16 @@ public class StreetService {
     }
 
 
+    public  List<StreetVO> streetStockStatus() {
+        List<Stock> stockList =  stockService.list();
+        Map<Integer, Map<Integer, Long>> map = stockList.stream().collect(Collectors.groupingBy(Stock::getStreetId,Collectors.groupingBy(Stock::getStatus,Collectors.counting())));
+        List<StreetVO> streetVOList = list();
+        for(StreetVO streetVO :streetVOList){
+            if(map.get(streetVO.getId()) != null && map.get(streetVO.getId()).get(0) != null){
+                streetVO.setStatusCount(map.get(streetVO.getId()).get(0));
+            }else streetVO.setStatusCount(0L);
+        }
+
+        return streetVOList ;
+    }
 }