修改返回代码

modules/common/pom.xml

@@ -47,11 +47,11 @@
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
         </dependency>
-
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <optional>true</optional>
+            <version>1.18.24</version> <!-- 使用最新稳定版本 -->
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

modules/filter/pom.xml

@@ -49,7 +49,8 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <optional>true</optional>
+            <version>1.18.24</version> <!-- 使用最新稳定版本 -->
+            <scope>provided</scope>
         </dependency>
 
         <!--<dependency>

modules/pom.xml

@@ -37,7 +37,8 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <optional>true</optional>
+            <version>1.18.24</version> <!-- 使用最新稳定版本 -->
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 

pom.xml

@@ -34,7 +34,8 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <optional>true</optional>
+            <version>1.18.24</version> <!-- 使用最新稳定版本 -->
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

web/pom.xml

@@ -40,7 +40,8 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <optional>true</optional>
+            <version>1.18.24</version> <!-- 使用最新稳定版本 -->
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.zhehekeji</groupId>

web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java

@@ -37,6 +37,8 @@ public class ConfigProperties {
 
     private ScanCodeMode scanCodeMode;
 
+    private boolean sixEars = false;
+
     /**
      * 本机IP
      */

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

@@ -62,6 +62,7 @@ public class OrderController {
         return Result.success();
     }
 
+
     @ApiOperation("发生告警")
     @GetMapping("/error")
     public Result orderError(@ApiParam("plc") @RequestParam String plcId){

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

@@ -5,11 +5,14 @@ import com.github.pagehelper.PageInfo;
 import com.zhehekeji.common.util.ValidatorUtil;
 import com.zhehekeji.core.pojo.Result;
 import com.zhehekeji.web.entity.Stock;
+import com.zhehekeji.web.entity.StockErrorUrls;
 import com.zhehekeji.web.pojo.category.PageSearch;
 import com.zhehekeji.web.pojo.stock.*;
+import com.zhehekeji.web.service.PlcCmdInfo;
 import com.zhehekeji.web.service.StockService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.validation.annotation.Validated;
@@ -107,6 +110,14 @@ public class StockController {
         EasyExcel.write(os, StockExportExcel.class).sheet().doWrite(excels);
     }
 
+
+    @PostMapping("/getStockErrorUrls")
+    public Result<List<StockErrorUrls>> getStockErrorUrls(){
+
+        List<StockErrorUrls> urls =stockService.orderStop();
+        return Result.success(urls);
+    }
+
     @ApiOperation(value = "导出巷道excel")
     @RequestMapping(value = "/exportAll", method = RequestMethod.GET)
     public void exportAll(HttpServletResponse response) throws IOException {

web/src/main/java/com/zhehekeji/web/entity/StockErrorUrls.java

@@ -0,0 +1,10 @@
+package com.zhehekeji.web.entity;
+
+import lombok.Data;
+
+@Data
+public class StockErrorUrls {
+    String url;
+    String street;
+    String code ;
+}

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

@@ -716,6 +716,8 @@ public class PlcService {
             stockMapper.insert(stock);
         } else stockMapper.updateById(stock);
         TransmissionPojo transmissionPojo = new TransmissionPojo(checkLog, street);
+//        六耳
+        transmissionPojo.setSixEars(configProperties.isSixEars());
         if (ClientChanel.get(dataInfo.getSRMNumber()) != null) {
             ClientChanel.get(dataInfo.getSRMNumber()).writeAndFlush(transmissionPojo.toString(TransmissionType.ST));
         } else {
@@ -758,11 +760,14 @@ public class PlcService {
         CheckLog checkLog = checkLogMapper.selectById(transmissionPojo.getCheckId());
         Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("check_Num", checkLog.getId()));
         Street street = streetService.getStreetByPlcId(transmissionPojo.getStreetNumber());
-        if(  stock.getCategory() != null && stock.getCategory().length() != 6) {
+        if (stock.getCategory() != null && stock.getCategory().equals("0")) {
+            checkLog.setStatus(StockStatus.SUCCESS.getStatus());
+            stock.setStatus(StockStatus.SUCCESS.getStatus());
+        } else if(  stock.getCategory() != null && stock.getCategory().length() != 6) {
 
             checkLog.setStatus(StockStatus.OTHER.getStatus());
             stock.setStatus(StockStatus.OTHER.getStatus());
-        }else if (transmissionPojo.getResult() != null && transmissionPojo.getResult() == 1) {
+        }else  if (transmissionPojo.getResult() != null && transmissionPojo.getResult() == 1) {
             checkLog.setStatus(StockStatus.SUCCESS.getStatus());
             stock.setStatus(StockStatus.SUCCESS.getStatus());
         } else {

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

@@ -24,6 +24,7 @@ import javax.annotation.Resource;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Service
@@ -549,4 +550,26 @@ public class StockService {
     public void allStockClear() {
         stockMapper.truncate();
     }
+
+    public List<StockErrorUrls> orderStop() {
+        List<StockErrorUrls> list = new ArrayList<>();
+        List<Stock> stocks = stockMapper.selectList(new QueryWrapper<Stock>()
+                .eq("status",StockStatus.ERROR.getStatus()).like("check_pic","error"));
+        List<Street> streets = streetMapper.selectList(new QueryWrapper<Street>());
+        Map<Integer,String> streetMap = streets.stream().collect(Collectors.toMap(Street::getId, Street::getName));
+        for(Stock stock : stocks){
+            StockErrorUrls stockErrorUrls = new StockErrorUrls();
+            String[] urls = stock.getCheckPic().split(";");
+            for (String url : urls){
+                if (url.contains("error")) {
+                    stockErrorUrls.setUrl(url);
+                    break;
+                }
+            }
+            stockErrorUrls.setStreet(streetMap.get(stock.getStreetId()));
+            stockErrorUrls.setCode(stock.getWmsCategory());
+            list.add(stockErrorUrls);
+        }
+        return list;
+    }
 }

web/src/main/java/com/zhehekeji/web/service/client/Decoder.java

@@ -125,16 +125,32 @@ public class Decoder extends DelimiterBasedFrameDecoder {
             }
             //照片和结果保存，并发送给上位机
             else if(RETURN_CHECK.equals(transmissionPojo.getHeader())){
-               //保存数据
+                if (plcService.getConfigProperties().isSixEars() ){
-                plcService.visualCalculationResults(transmissionPojo);
+                    transmissionPojo.setResult(1);
-                //发送给上位机
+
-                KsecInfo ksecInfo = plcService.getKsecDataInfo(transmissionPojo,"E");
+                    //保存数据
-                ksecInfo.getData().setTypeNum(transmissionPojo.getCategory());
+                    plcService.visualCalculationResults(transmissionPojo);
-                ksecInfo.getData().setQuantity(transmissionPojo.getCount());
+                    //发送给上位机
-                ksecInfo.getData().setCheckRlt(transmissionPojo.getResult());
+                    KsecInfo ksecInfo = plcService.getKsecDataInfo(transmissionPojo,"E");
-                KsecNettyClient.write(ksecInfo);
+                    ksecInfo.getData().setTypeNum(transmissionPojo.getCategory());
-                GetPhotoDelayExecutor.removeTask(transmissionPojo.getStreetNumber(),  transmissionPojo);
+                    ksecInfo.getData().setQuantity(transmissionPojo.getCount());
+                    ksecInfo.getData().setCheckRlt(transmissionPojo.getResult());
+                    KsecNettyClient.write(ksecInfo);
+                    GetPhotoDelayExecutor.removeTask(transmissionPojo.getStreetNumber(),  transmissionPojo);
+
+                }else {
+
+                    //保存数据
+                    plcService.visualCalculationResults(transmissionPojo);
+                    //发送给上位机
+                    KsecInfo ksecInfo = plcService.getKsecDataInfo(transmissionPojo,"E");
+                    ksecInfo.getData().setTypeNum(transmissionPojo.getCategory());
+                    ksecInfo.getData().setQuantity(transmissionPojo.getCount());
+                    ksecInfo.getData().setCheckRlt(transmissionPojo.getResult());
+                    KsecNettyClient.write(ksecInfo);
+                    GetPhotoDelayExecutor.removeTask(transmissionPojo.getStreetNumber(),  transmissionPojo);
 
+                }
 
 
             }

web/src/main/java/com/zhehekeji/web/service/client/GetPhotoDelayExecutor.java

@@ -1,6 +1,7 @@
 package com.zhehekeji.web.service.client;
 
 import com.zhehekeji.common.util.SpringContextUtil;
+import com.zhehekeji.web.config.ConfigProperties;
 import com.zhehekeji.web.entity.Street;
 import com.zhehekeji.web.lib.CameraControlModule;
 import com.zhehekeji.web.lib.CameraDelayTask;
@@ -180,6 +181,8 @@ public class GetPhotoDelayExecutor {
          */
         @Override
         public void run() {
+
+            ConfigProperties configProperties = SpringContextUtil.getBean(ConfigProperties.class);
             while (true) {
                 try {
                     // 从Spring上下文中获取PlcService实例
@@ -193,7 +196,12 @@ public class GetPhotoDelayExecutor {
                             KsecInfo ksecInfo = plcService.getKsecDataInfo(transmissionPojo, "E");
                             ksecInfo.getData().setTypeNum(transmissionPojo.getCategory());
                             ksecInfo.getData().setQuantity(transmissionPojo.getCount());
+
                             ksecInfo.getData().setCheckRlt(0);
+                            if (configProperties.isSixEars()){
+
+                                ksecInfo.getData().setCheckRlt(1);
+                            }
                             // 将信息发送给上位机
                             if (!transmissionPojo.getTaskId().equals("0"))
                                 KsecNettyClient.write(ksecInfo);

web/src/main/java/com/zhehekeji/web/service/client/TransmissionPojo.java

@@ -27,6 +27,7 @@ public class TransmissionPojo {
     private Integer count = 0; //数量
     private String category = ""; //品规
     private Set<String> picsPath; //照片
+    private Boolean sixEars = false; //是否六耳;
 
 
     private Integer result;

web/src/main/resources/application-prod.yml

@@ -98,4 +98,6 @@ deleteFileDays: 30
 
 productDoc: "C:\\Users\\昊天\\Desktop\\新建文本文档.txt"
 
-inventorySimulationFollow: true
+inventorySimulationFollow: true
+
+sixEars: false