光源和按批次清空

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

@@ -83,21 +83,8 @@ public class StreetController {
         List<LightSource> lightSources = lightSourceService.getLightSource();
 
         lightSources.forEach(lightSource -> {
-            JSONObject obj = JSONObject.parseObject(configProperties.getLightSource().getInfo());
+            LightSourceService.lightControllerFactory(configProperties.getLightSource(),lightSource,1);
-            if(configProperties.getLightSource().getType() == 1){
+
-
-                JYDAMEquip equip = JYDamHelper.Connect(lightSource.getIp(),lightSource.getPort());
-                JYDamHelper.openDO(equip,configProperties.getLightSource().getIndex());
-                //暂时关闭灯源状态查询
-                /*Integer status = JYDamHelper.ReadStatus(equip,configProperties.getLightSource().getNum(),configProperties.getLightSource().getIndex());
-                log.info("ip:{},status:{}",lightSource.getIp(),status);*/
-                equip.DisConnect();
-
-            }else if(configProperties.getLightSource().getType() == 2){
-                HikControlSocket.openLight(lightSource.getIp(),lightSource.getPort(),configProperties.getLightSource().getIndex(),1);
-            }else if (configProperties.getLightSource().getType() == 3){
-                LightSourceService.lightController(lightSource.getIp(),lightSource.getPort(),1);
-            }
 
         });
 
@@ -111,18 +98,7 @@ public class StreetController {
         List<LightSource> lightSources = lightSourceService.getLightSource();
 
         lightSources.forEach(lightSource -> {
-            JSONObject obj = JSONObject.parseObject(configProperties.getLightSource().getInfo());
+            LightSourceService.lightControllerFactory(configProperties.getLightSource(),lightSource,0);
-            if(configProperties.getLightSource().getType() == 1){
-
-                JYDAMEquip equip = JYDamHelper.Connect(lightSource.getIp(),lightSource.getPort());
-                JYDamHelper.closeDO(equip,obj.getInteger("index"));
-                Integer status = JYDamHelper.ReadStatus(equip,obj.getInteger("num"),obj.getInteger("index"));
-                log.info("ip:{},status:{}",lightSource.getIp(),status);
-            }else if(configProperties.getLightSource().getType() == 2){
-                HikControlSocket.openLight(lightSource.getIp(),lightSource.getPort(),configProperties.getLightSource().getIndex(),0);
-            }else if (configProperties.getLightSource().getType() == 3){
-                LightSourceService.lightController(lightSource.getIp(),lightSource.getPort(),0);
-            }
 
         });
 
@@ -134,17 +110,7 @@ public class StreetController {
     public Result openStreetLightSource(@PathVariable Integer streetId){
         List<LightSource> lightSources = lightSourceService.getLightSourceByStreetId(streetId);
         lightSources.forEach(lightSource -> {
-            if(configProperties.getLightSource().getType() == 1){
+            LightSourceService.lightControllerFactory(configProperties.getLightSource(),lightSource,1);
-                JYDAMEquip equip = JYDamHelper.Connect(lightSource.getIp(),lightSource.getPort());
-                JYDamHelper.openDO(equip,configProperties.getLightSource().getIndex());
-                Integer status = JYDamHelper.ReadStatus(equip,configProperties.getLightSource().getNum(),configProperties.getLightSource().getIndex());
-                log.info("ip:{},status:{}",lightSource.getIp(),status);
-                equip.DisConnect();
-            }else if(configProperties.getLightSource().getType() == 2){
-                HikControlSocket.openLight(lightSource.getIp(),lightSource.getPort(),configProperties.getLightSource().getIndex(),1);
-            }else if (configProperties.getLightSource().getType() == 3){
-                LightSourceService.lightController(lightSource.getIp(),lightSource.getPort(),1);
-            }
 
         });
 
@@ -156,17 +122,7 @@ public class StreetController {
     public Result closeStreetLightSource(@PathVariable Integer streetId){
         List<LightSource> lightSources = lightSourceService.getLightSourceByStreetId(streetId);
         lightSources.forEach(lightSource -> {
-            if(configProperties.getLightSource().getType() == 1){
+            LightSourceService.lightControllerFactory(configProperties.getLightSource(),lightSource,0);
-                JYDAMEquip equip = JYDamHelper.Connect(lightSource.getIp(),lightSource.getPort());
-                JYDamHelper.closeDO(equip,configProperties.getLightSource().getIndex());
-                Integer status = JYDamHelper.ReadStatus(equip,configProperties.getLightSource().getNum(),configProperties.getLightSource().getIndex());
-                log.info("ip:{},status:{}",lightSource.getIp(),status);
-                equip.DisConnect();
-            }else if(configProperties.getLightSource().getType() == 2){
-                HikControlSocket.openLight(lightSource.getIp(),lightSource.getPort(),configProperties.getLightSource().getIndex(),0);
-            }else if (configProperties.getLightSource().getType() == 3){
-                LightSourceService.lightController(lightSource.getIp(),lightSource.getPort(),0);
-            }
 
         });
 

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

@@ -80,16 +80,7 @@ public class CronTab {
             if((BigInteger.valueOf(timeStamp).subtract(BigInteger.valueOf(entry.getValue()))).compareTo(timeDIff) > 0){
                 List<LightSource> lightSources = lightSourceMapper.selectList(new QueryWrapper<LightSource>().eq("street_id",entry.getKey()));
                 lightSources.forEach(lightSource -> {
-                    if(configProperties.getLightSource().getType() == 1){
+                    LightSourceService.lightControllerFactory(configProperties.getLightSource(),lightSource,0);
-
-                        JYDAMEquip equip = JYDamHelper.Connect(lightSource.getIp(),lightSource.getPort());
-                        JYDamHelper.closeDO(equip,configProperties.getLightSource().getIndex());
-                        Integer status = JYDamHelper.ReadStatus(equip,configProperties.getLightSource().getNum(),configProperties.getLightSource().getIndex());
-                        log.info("ip:{},status:{}",lightSource.getIp(),status);
-                        equip.DisConnect();
-                    }else if(configProperties.getLightSource().getType() == 2){
-                        HikControlSocket.openLight(lightSource.getIp(),lightSource.getPort(),configProperties.getLightSource().getIndex(),0);
-                    }
                 });
                 it.remove();
             }

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

@@ -1,11 +1,16 @@
 package com.zhehekeji.web.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zhehekeji.web.config.ConfigProperties;
 import com.zhehekeji.web.entity.LightSource;
 import com.zhehekeji.web.mapper.LightSourceMapper;
+import com.zhehekeji.web.service.damLightSource.JYDAMEquip;
+import com.zhehekeji.web.service.damLightSource.JYDamHelper;
+import com.zhehekeji.web.service.hikLightSource.HikControlSocket;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -18,8 +23,26 @@ import java.util.List;
 @Service
 public class LightSourceService {
 
-    @Autowired
+    @Resource
     private LightSourceMapper lightSourceMapper;
+    public static void lightControllerFactory(ConfigProperties.LightSource lightSource,LightSource lightInfo, Integer stat){
+        if(lightSource.getType() == 1){
+
+            JYDAMEquip equip = JYDamHelper.Connect(lightInfo.getIp(),lightInfo.getPort());
+            if(stat == 1) {
+                JYDamHelper.openDO(equip, lightSource.getIndex());
+            }else JYDamHelper.closeDO(equip, lightSource.getIndex());
+            //暂时关闭灯源状态查询
+                /*Integer status = JYDamHelper.ReadStatus(equip,configProperties.getLightSource().getNum(),configProperties.getLightSource().getIndex());
+                log.info("ip:{},status:{}",lightSource.getIp(),status);*/
+            equip.DisConnect();
+
+        }else if(lightSource.getType() == 2){
+            HikControlSocket.openLight(lightInfo.getIp(),lightInfo.getPort(),lightSource.getIndex(),stat);
+        }else if (lightSource.getType() == 3){
+            LightSourceService.lightController(lightInfo.getIp(),lightInfo.getPort(),stat);
+        }
+    }
 
     /**
      *

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

@@ -1,5 +1,6 @@
 package com.zhehekeji.web.service;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zhehekeji.common.util.PathUtil;
 import com.zhehekeji.core.pojo.Result;
@@ -637,6 +638,10 @@ public class PlcService {
         checkLog.setCount(dataInfo.getQuantity());
 
         checkLogMapper.insert(checkLog);
+        //如果存在则清空表
+        if(stockMapper.selectCount(new QueryWrapper<Stock>().eq("lotnum", checkLog.getLotnum()))==0){
+            stockMapper.truncate();
+        }
 
         Stock stock = stockMapper.getByStreetAndDirectionAndSideAndRowColumn(street.getId(), dataInfo.getFromDirection(), dataInfo.getFromSide(), dataInfo.getFromRow(), dataInfo.getFromColumn());
         if (stock == null) {

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

@@ -76,7 +76,7 @@ videoStyleConfig:
   videoStyleRow: 4
   videoStyleColumn: 4
 # ------------光源---
-# -------------type 0:没有光源   1：利珀光源控制器JYDam   2：利珀视觉控制器
+# -------------type 0:没有光源   1：利珀光源控制器JYDam   2：利珀视觉控制器 3.tcp控制
 # -----------  num:总共多少个光源端口   index:需要控制的是哪个
 # ------------ 利珀视觉控制器id从1开始，光源控制器从0开始
 lightSource: