光栅测试修改

ruoyi-admin/src/main/java/com/ruoyi/thread/ClientHandler.java

@@ -69,7 +69,7 @@ public class ClientHandler {
                             //光栅1 超高Y
                             log.info("------------光栅1 超高Y------------>");
                             sysConfig.setConfigId(Long.valueOf("6"));
-//                            sysConfig.setConfigValue("N");
+                            sysConfig.setConfigValue("N");
                             sysConfig.setConfigType("Y");
                             sysConfig.setUpdateTime(new Date());
                             configService.updateConfig(sysConfig);
@@ -78,7 +78,7 @@ public class ClientHandler {
                             //光栅1 不超高N
 //                            log.info("------------光栅1 不超高N------------>");
                             sysConfig.setConfigId(Long.valueOf("6"));
-//                            sysConfig.setConfigValue("N");
+                            sysConfig.setConfigValue("N");
                             sysConfig.setConfigType("N");
                             sysConfig.setUpdateTime(new Date());
                             configService.updateConfig(sysConfig);
@@ -87,7 +87,7 @@ public class ClientHandler {
                             //光栅2 超高Y
                             log.info("------------光栅2 超高Y------------>");
                             sysConfig.setConfigId(Long.valueOf("7"));
-//                            sysConfig.setConfigValue("N");
+                            sysConfig.setConfigValue("N");
                             sysConfig.setConfigType("Y");
                             sysConfig.setUpdateTime(new Date());
                             configService.updateConfig(sysConfig);
@@ -96,7 +96,7 @@ public class ClientHandler {
                             //光栅2 不超高N
 //                            log.info("------------光栅2 不超高N------------>");
                             sysConfig.setConfigId(Long.valueOf("7"));
-//                            sysConfig.setConfigValue("N");
+                            sysConfig.setConfigValue("N");
                             sysConfig.setConfigType("N");
                             sysConfig.setUpdateTime(new Date());
                             configService.updateConfig(sysConfig);
@@ -105,7 +105,7 @@ public class ClientHandler {
                             //光栅3 超高Y
                             log.info("------------光栅3 超高Y------------>");
                             sysConfig.setConfigId(Long.valueOf("8"));
-//                            sysConfig.setConfigValue("N");
+                            sysConfig.setConfigValue("N");
                             sysConfig.setConfigType("Y");
                             sysConfig.setUpdateTime(new Date());
                             configService.updateConfig(sysConfig);
@@ -114,7 +114,7 @@ public class ClientHandler {
                             //光栅3 不超高N
 //                            log.info("------------光栅3 不超高N------------>");
                             sysConfig.setConfigId(Long.valueOf("8"));
-//                            sysConfig.setConfigValue("N");
+                            sysConfig.setConfigValue("N");
                             sysConfig.setConfigType("N");
                             sysConfig.setUpdateTime(new Date());
                             configService.updateConfig(sysConfig);
@@ -123,7 +123,7 @@ public class ClientHandler {
                             //光栅4 超高Y
                             log.info("------------光栅4 超高Y------------>");
                             sysConfig.setConfigId(Long.valueOf("9"));
-//                            sysConfig.setConfigValue("N");
+                            sysConfig.setConfigValue("N");
                             sysConfig.setConfigType("Y");
                             sysConfig.setUpdateTime(new Date());
                             configService.updateConfig(sysConfig);
@@ -132,7 +132,7 @@ public class ClientHandler {
                             //光栅4 不超高N
 //                            log.info("------------光栅4 不超高N------------>");
                             sysConfig.setConfigId(Long.valueOf("9"));
-//                            sysConfig.setConfigValue("N");
+                            sysConfig.setConfigValue("N");
                             sysConfig.setConfigType("N");
                             sysConfig.setUpdateTime(new Date());
                             configService.updateConfig(sysConfig);

ruoyi-admin/src/main/java/com/ruoyi/thread/ServerGs.java

@@ -85,32 +85,32 @@ public class ServerGs {
                             List<SysConfig> list = configService.selectConfigList(config);
 
                             for (int i = 0; i < list.size(); i++) {
-
                                 //发送检测信号到光栅PLC
                                 switch (list.get(i).getConfigKey()) {
                                     case "sys.guangshan.no1":
                                         // 光栅1 发送检测信号
 //                                        log.info("------------光栅1 发送检测信号------------>");
-                                        client.getOutputStream().write(ByteUtil.hexString2ByteArray("3F00010D0A"));
+                                        os.write(ByteUtil.hexString2ByteArray("3F00010D0A"));
                                         break;
                                     case "sys.guangshan.no2":
                                         // 光栅2 发送检测信号
 //                                        log.info("------------光栅2 发送检测信号------------>");
-                                        client.getOutputStream().write(ByteUtil.hexString2ByteArray("3F00020D0A"));
+                                        os.write(ByteUtil.hexString2ByteArray("3F00020D0A"));
                                         break;
                                     case "sys.guangshan.no3":
                                         // 光栅3 发送检测信号
 //                                        log.info("------------光栅3 发送检测信号------------>");
-                                        client.getOutputStream().write(ByteUtil.hexString2ByteArray("3F00030D0A"));
+                                        os.write(ByteUtil.hexString2ByteArray("3F00030D0A"));
                                         break;
                                     case "sys.guangshan.no4":
                                         // 光栅4 发送检测信号
 //                                        log.info("------------光栅4 发送检测信号------------>");
-                                        client.getOutputStream().write(ByteUtil.hexString2ByteArray("3F00040D0A"));
+                                        os.write(ByteUtil.hexString2ByteArray("3F00040D0A"));
                                         break;
                                 }
+                                os.flush();
+                                Thread.sleep(200);
                             }
-                            os.flush();
                         } catch (Exception e) {
                             log.error("光栅客户端断开：" + e.getMessage());
                             //关闭连接
@@ -123,7 +123,7 @@ public class ServerGs {
                             throw new RuntimeException("光栅客户端断开,释放线程资源：" + e.getMessage());
                         }
                     }
-                }, 6000, 3000);
+                }, 6000, 2000);
                 new ClientHandler(client, configService).start();
             } catch (IOException e) {
                 System.out.println("光栅服务端异常:" + e);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/test/GuangShanTestController.java

@@ -0,0 +1,52 @@
+package com.ruoyi.web.controller.warewms.test;
+
+import com.ruoyi.system.service.ISysConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author JWK
+ * @version 1.0
+ * @date 2023/03/22
+ */
+@Api("光栅检测")
+@RestController
+@RequestMapping("/test/")
+public class GuangShanTestController {
+
+    @Autowired
+    private ISysConfigService iSysConfigService;
+
+    /**
+     * 光栅检测
+     *
+     * @param no 1｜2｜3｜4 对应四个光栅
+     * @return true 超高 false 不超高
+     */
+    @ApiOperation("光栅检测（输入1,2,3,4对应四个光栅）")
+    @PostMapping("/guangshan/check")
+    public Boolean responseState(String no) {
+        String configKey = "";
+        switch (Integer.parseInt(no)) {
+            case 1:
+                configKey = "sys.guangshan.no1";
+                break;
+            case 2:
+                configKey = "sys.guangshan.no2";
+                break;
+            case 3:
+                configKey = "sys.guangshan.no3";
+                break;
+            case 4:
+                configKey = "sys.guangshan.no4";
+                break;
+            default:
+                break;
+        }
+        return iSysConfigService.checkGratingIsSuperHigh(configKey);
+    }
+}

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -114,6 +114,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/druid/**").anonymous()
                 .antMatchers("/wcs/**").anonymous()
                 .antMatchers("/api/wcstask/**").permitAll()
+                .antMatchers("/test/**").permitAll()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()
                 .and()

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java

@@ -41,6 +41,8 @@ public interface ISysConfigService {
      */
     public List<SysConfig> selectConfigList(SysConfig config);
 
+    public SysConfig selectByConfigKey(SysConfig config);
+
     /**
      * 新增参数配置
      *

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.service.impl;
 
+import cn.hutool.core.thread.ThreadUtil;
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.constant.UserConstants;
@@ -11,8 +12,10 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.SysConfig;
 import com.ruoyi.system.mapper.SysConfigMapper;
 import com.ruoyi.system.service.ISysConfigService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.PostConstruct;
 import java.util.Collection;
 import java.util.List;
@@ -22,9 +25,9 @@ import java.util.List;
  *
  * @author ruoyi
  */
+@Slf4j
 @Service
-public class SysConfigServiceImpl implements ISysConfigService
-{
+public class SysConfigServiceImpl implements ISysConfigService {
     @Autowired
     private SysConfigMapper configMapper;
 
@@ -35,8 +38,7 @@ public class SysConfigServiceImpl implements ISysConfigService
      * 项目启动时，初始化参数到缓存
      */
     @PostConstruct
-    public void init()
-    {
+    public void init() {
         loadingConfigCache();
     }
 
@@ -48,8 +50,7 @@ public class SysConfigServiceImpl implements ISysConfigService
      */
     @Override
     @DataSource(DataSourceType.MASTER)
-    public SysConfig selectConfigById(Long configId)
-    {
+    public SysConfig selectConfigById(Long configId) {
         SysConfig config = new SysConfig();
         config.setConfigId(configId);
         return configMapper.selectConfig(config);
@@ -62,18 +63,15 @@ public class SysConfigServiceImpl implements ISysConfigService
      * @return 参数键值
      */
     @Override
-    public String selectConfigByKey(String configKey)
-    {
+    public String selectConfigByKey(String configKey) {
         String configValue = Convert.toStr(redisCache.getCacheObject(getCacheKey(configKey)));
-        if (StringUtils.isNotEmpty(configValue))
-        {
+        if (StringUtils.isNotEmpty(configValue)) {
             return configValue;
         }
         SysConfig config = new SysConfig();
         config.setConfigKey(configKey);
         SysConfig retConfig = configMapper.selectConfig(config);
-        if (StringUtils.isNotNull(retConfig))
-        {
+        if (StringUtils.isNotNull(retConfig)) {
             redisCache.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue());
             return retConfig.getConfigValue();
         }
@@ -86,11 +84,9 @@ public class SysConfigServiceImpl implements ISysConfigService
      * @return true开启，false关闭
      */
     @Override
-    public boolean selectCaptchaOnOff()
-    {
+    public boolean selectCaptchaOnOff() {
         String captchaOnOff = selectConfigByKey("sys.account.captchaOnOff");
-        if (StringUtils.isEmpty(captchaOnOff))
-        {
+        if (StringUtils.isEmpty(captchaOnOff)) {
             return true;
         }
         return Convert.toBool(captchaOnOff);
@@ -103,11 +99,16 @@ public class SysConfigServiceImpl implements ISysConfigService
      * @return 参数配置集合
      */
     @Override
-    public List<SysConfig> selectConfigList(SysConfig config)
-    {
+    public List<SysConfig> selectConfigList(SysConfig config) {
         return configMapper.selectConfigList(config);
     }
 
+    @Override
+    public SysConfig selectByConfigKey(SysConfig config) {
+        List<SysConfig> sysConfigs = this.selectConfigList(config);
+        return sysConfigs.size() > 0 ? sysConfigs.get(0) : null;
+    }
+
     /**
      * 新增参数配置
      *
@@ -115,11 +116,9 @@ public class SysConfigServiceImpl implements ISysConfigService
      * @return 结果
      */
     @Override
-    public int insertConfig(SysConfig config)
-    {
+    public int insertConfig(SysConfig config) {
         int row = configMapper.insertConfig(config);
-        if (row > 0)
-        {
+        if (row > 0) {
             redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
         }
         return row;
@@ -132,11 +131,9 @@ public class SysConfigServiceImpl implements ISysConfigService
      * @return 结果
      */
     @Override
-    public int updateConfig(SysConfig config)
-    {
+    public int updateConfig(SysConfig config) {
         int row = configMapper.updateConfig(config);
-        if (row > 0)
-        {
+        if (row > 0) {
             redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
         }
         return row;
@@ -149,13 +146,10 @@ public class SysConfigServiceImpl implements ISysConfigService
      * @return 结果
      */
     @Override
-    public void deleteConfigByIds(Long[] configIds)
-    {
-        for (Long configId : configIds)
-        {
+    public void deleteConfigByIds(Long[] configIds) {
+        for (Long configId : configIds) {
             SysConfig config = selectConfigById(configId);
-            if (StringUtils.equals(UserConstants.YES, config.getConfigType()))
-            {
+            if (StringUtils.equals(UserConstants.YES, config.getConfigType())) {
                 throw new ServiceException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey()));
             }
             configMapper.deleteConfigById(configId);
@@ -167,11 +161,9 @@ public class SysConfigServiceImpl implements ISysConfigService
      * 加载参数缓存数据
      */
     @Override
-    public void loadingConfigCache()
-    {
+    public void loadingConfigCache() {
         List<SysConfig> configsList = configMapper.selectConfigList(new SysConfig());
-        for (SysConfig config : configsList)
-        {
+        for (SysConfig config : configsList) {
             redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
         }
     }
@@ -180,8 +172,7 @@ public class SysConfigServiceImpl implements ISysConfigService
      * 清空参数缓存数据
      */
     @Override
-    public void clearConfigCache()
-    {
+    public void clearConfigCache() {
         Collection<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*");
         redisCache.deleteObject(keys);
     }
@@ -190,8 +181,7 @@ public class SysConfigServiceImpl implements ISysConfigService
      * 重置参数缓存数据
      */
     @Override
-    public void resetConfigCache()
-    {
+    public void resetConfigCache() {
         clearConfigCache();
         loadingConfigCache();
     }
@@ -203,12 +193,10 @@ public class SysConfigServiceImpl implements ISysConfigService
      * @return 结果
      */
     @Override
-    public String checkConfigKeyUnique(SysConfig config)
-    {
+    public String checkConfigKeyUnique(SysConfig config) {
         Long configId = StringUtils.isNull(config.getConfigId()) ? -1L : config.getConfigId();
         SysConfig info = configMapper.checkConfigKeyUnique(config.getConfigKey());
-        if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue())
-        {
+        if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -220,22 +208,44 @@ public class SysConfigServiceImpl implements ISysConfigService
      * @param configKey 参数键
      * @return 缓存键key
      */
-    private String getCacheKey(String configKey)
-    {
+    private String getCacheKey(String configKey) {
         return Constants.SYS_CONFIG_KEY + configKey;
     }
 
 
     @Override
     public boolean checkGratingIsSuperHigh(String gratingConfigKey) {
+        SysConfig sysConfigQuery = new SysConfig();
+        sysConfigQuery.setConfigKey(gratingConfigKey);
+        SysConfig sysConfig = this.selectByConfigKey(sysConfigQuery);
+
+        // 检测之前需要开启检测开关
+        SysConfig sysConfigUpdate = new SysConfig();
+        sysConfigUpdate.setConfigId(sysConfig.getConfigId());
+        sysConfigUpdate.setConfigValue("Y");
+        this.updateConfig(sysConfigUpdate);
+
+        // 超高状态 Y超高 ｜ N不超高
         String endState = "";
-        SysConfig sysConfig = new SysConfig();
-        sysConfig.setConfigKey(gratingConfigKey);
-        List<SysConfig> sysConfigs = this.selectConfigList(sysConfig);
-        if (sysConfigs.size() > 0) {
-            String configType = sysConfigs.get(0).getConfigType();
-            endState = configType;
+        SysConfig sysConfigState = null;
+        int checkNum = 0; // 查询次数
+        for (; ; ) {
+            if (checkNum > 10) {
+                break;
+            }
+            ThreadUtil.sleep(500);
+            sysConfigQuery.setConfigValue("N"); // plc会写成功会置为N
+            sysConfigState = this.selectByConfigKey(sysConfigQuery);
+            if (sysConfigState != null) {
+                break;
+            }
+            checkNum++;
+        }
+        if (sysConfigState == null) {
+            log.error("和光栅服务器通讯可能断开：" + gratingConfigKey);
+            return true;
         }
+        endState = sysConfigState.getConfigType();
         return endState.equals("Y");
     }
 }