bug修复

docker/zd/README.md

@@ -3,8 +3,11 @@
 ## docker-compose.env
 所有服务共享的环境变量
 
+## docker-compose-base.yml
+基础服务：nacos、Redis、mysql、MQTT
+
 ## docker-compose-services.yml
-核心服务：nacos、Redis、mysql、MQTT、zd-auth、zd-system、zd-gateway、zd-local-forward、zd-airbottle、zd-alarm、zd-camera、zd-chemical、zd-face、zd-exam、zd-message、zd-app、zd-file、zd-gen、zd-job、zd-laboratory、zd-netty、zd-speaker、zd-monitor
+核心服务：zd-auth、zd-system、zd-gateway、zd-local-forward、zd-airbottle、zd-alarm、zd-camera、zd-chemical、zd-face、zd-exam、zd-message、zd-app、zd-file、zd-gen、zd-job、zd-laboratory、zd-netty、zd-speaker、zd-monitor
 
 ## docker-compose-nginx.yml
 前端服务：web-service

zd-api/zd-api-system/src/main/java/com/zd/system/api/netty/RemoteNettyService.java

@@ -4,24 +4,30 @@ import com.zd.common.core.constant.ServiceNameConstants;
 import com.zd.common.core.domain.R;
 import com.zd.system.api.laboratory.domain.RemoteLabHardware;
 import com.zd.system.api.netty.factory.RemoteNettyFallbackFactory;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 
+/**
+ * @author Administrator
+ */
 @FeignClient(contextId = "remoteNettyService", value = ServiceNameConstants.NETTY_SERVICE, fallbackFactory = RemoteNettyFallbackFactory.class)
 public interface RemoteNettyService {
     /**
      * 断开设备连接
+     * @param hardware 设备对象
+     * @return 结果
      */
     @ApiOperation("断开设备连接")
-    @GetMapping("/frid/disconnect")
+    @PostMapping("/frid/disconnect")
     R<Boolean> disconnect(@RequestBody RemoteLabHardware hardware);
 
+    /**
+     * 信道启动FRID扫描监控
+     * @param hardware 设备对象
+     * @return 结果
+     */
     @ApiOperation("信道启动FRID扫描监控")
     @PostMapping("/frid/startMonitorChannels")
     R<Boolean> startMonitorChannels(@RequestBody RemoteLabHardware hardware);

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabHardwareController.java

@@ -9,8 +9,6 @@ import com.zd.common.core.enums.HardwareTypeEnum;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.bean.TransferUtils;
-import com.zd.common.core.exception.ServiceException;
-import com.zd.common.core.utils.bean.TransferUtils;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.domain.AjaxResult;

zd-modules/zd-netty/install.cmd

@@ -0,0 +1,13 @@
+@echo off
+CHCP 65001
+set read=src\main\resources\libs\reader.jar
+if exist %read% (
+    	call mvn install:install-file -Dfile=src/main/resources/libs/reader.jar -DgroupId=com.gg.reader -DartifactId=greader-api -Dversion=1.0 -Dpackaging=jar
+    	echo ===========================%read%安装完成==============================
+    ) else (
+        color 04
+    	echo %read%不存在
+    )
+pause
+exit
+

zd-modules/zd-netty/src/main/java/com/zd/netty/controller/FridDeviceController.java

@@ -11,6 +11,9 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
+/**
+ * @author Administrator
+ */
 @Api(tags = {"FRID设备控制器"})
 @RestController
 @RequestMapping("/frid")
@@ -43,8 +46,8 @@ public class FridDeviceController {
      * 断开设备连接
      */
     @ApiOperation("断开设备连接")
-    @GetMapping("/disconnect")
-    public R<Boolean> disconnect(RemoteLabHardware hardware) {
+    @PostMapping("/disconnect")
+    public R<Boolean> disconnect(@RequestBody RemoteLabHardware hardware) {
         service.stop(hardware);
         return R.ok();
     }