基础版 优化

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

@@ -292,7 +292,7 @@ public class CameraControlController {
     public Result pic(@PathVariable Integer id) {
         checkLogin(id);
         String path = "D:\\work\\qqq.jpeg";
-        OrderInfo orderInfo = new OrderInfo(0L,"SRM123","AAA",1,1,"C5",true,1);
+        OrderInfo orderInfo = new OrderInfo(0L,"SRM123","AAA",1,1,"C5",true,1,1);
         cameraControlModule.pic(id,0,path);
         return Result.success();
     }

web/src/main/java/com/zhehekeji/web/lib/OrderInfo.java

@@ -31,6 +31,11 @@ public class OrderInfo {
 
     private Integer leftRight;
 
+    /**
+     * 双伸货架 1：内   2：外侧
+     */
+    private Integer separation;
+
     public OrderInfo(Street street, PlcCmdInfo plcCmdInfo, Integer times, String c) {
         if (street == null) {
             return;
@@ -47,15 +52,37 @@ public class OrderInfo {
             leftRight = plcCmdInfo.getLeftRight1();
             row = plcCmdInfo.getRow1();
             column = plcCmdInfo.getColumn1();
+            separation = plcCmdInfo.getSeparation1();
         } else if (times == 4 || times == 3) {
             leftRight = plcCmdInfo.getLeftRight2();
             row = plcCmdInfo.getRow2();
             column = plcCmdInfo.getColumn2();
+            separation = plcCmdInfo.getSeparation2();
         }
         if (leftRight == 1) {
-            shelveId = street.getLeftShelveId();
+            //双伸
+            if(street.getLeftType() == 2){
+                //外侧
+                if(separation == 2){
+                    shelveId = street.getLeftOutsideShelveId();
+                }else {
+                    shelveId = street.getLeftOutsideShelveId();
+                }
+            }else {
+                shelveId = street.getLeftShelveId();
+            }
         } else {
-            shelveId = street.getRightShelveId();
+            //双伸
+            if(street.getRightType() == 2){
+                //外侧
+                if(separation == 2){
+                    shelveId = street.getRightOutsideShelveId();
+                }else {
+                    shelveId = street.getRightInsideShelveId();
+                }
+            }else {
+                shelveId = street.getRightShelveId();
+            }
         }
         orderId = 0L;
         orderNum = plcCmdInfo.getOrderNum();

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

@@ -179,7 +179,6 @@ public class CameraService {
             }
             camera.setPtzId(ptzId);
             cameraMapper.updateById(camera);
-            return ptzId;
         } else {
             //修改
             cameraIO = ioMapper.selectById(IOId);

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

@@ -412,7 +412,7 @@ public class PlcService {
                     } else {
                         //take the previous picture path the lasted over picture path
                         //take the lasted picture path the new one
-                        stock.setPreoperationPic(stock.getPreoperationPic());
+                        stock.setPreoperationPic(stock.getOveroperationPic());
                         stock.setOveroperationPic(path);
                         stock.setOrderNum(order.getOrderNum());
                         stockMapper.updateById(stock);

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

@@ -41,8 +41,8 @@ savePath:
 # ------------服务端类型  0：TCP(罗伯泰克)    1:KSEC(JSON)（昆船）
 serverMode: 1
 ksec:
-  ip: 192.168.43.46
-  #ip: 192.168.43.77
+  ip: 127.0.0.1
+  #ip: 192.168.43.46
   port: 9000
 # ------------ 实时视频流  全部页面的格式  行列数量
 videoStyleConfig: