修改算法 speak配置类位置

zd-api/zd-algorithm-api/src/main/java/com/zd/algorithm/api/speaker/entity/vo/ParamVo.java

@@ -1,4 +1,4 @@
-package com.zd.algorithm.api.speaker.entity.vo;
+package com.zd.algorithm.api.speaker.entity;
 
 import com.zd.model.entity.UrlVo;
 import io.swagger.annotations.ApiModelProperty;

zd-api/zd-algorithm-api/src/main/java/com/zd/algorithm/api/speaker/entity/vo/PlayBatchVo.java

@@ -1,4 +1,4 @@
-package com.zd.algorithm.api.speaker.entity.vo;
+package com.zd.algorithm.api.speaker.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.StringUtils;

zd-api/zd-algorithm-api/src/main/java/com/zd/algorithm/api/speaker/entity/vo/PlayVo.java

@@ -1,4 +1,4 @@
-package com.zd.algorithm.api.speaker.entity.vo;
+package com.zd.algorithm.api.speaker.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.StringUtils;

zd-api/zd-algorithm-api/src/main/java/com/zd/algorithm/api/speaker/feign/RemoteSpeakService.java

@@ -1,6 +1,6 @@
 package com.zd.algorithm.api.speaker.feign;
 
-import com.zd.algorithm.api.speaker.entity.vo.PlayVo;
+import com.zd.algorithm.api.speaker.entity.PlayVo;
 import com.zd.algorithm.api.speaker.feign.fallback.RemoteSpeakFallbackFactory;
 import com.zd.model.constant.ApplicationConstants;
 import com.zd.model.domain.R;

zd-api/zd-algorithm-api/src/main/java/com/zd/algorithm/api/speaker/feign/fallback/RemoteSpeakFallbackFactory.java

@@ -1,6 +1,6 @@
 package com.zd.algorithm.api.speaker.feign.fallback;
 
-import com.zd.algorithm.api.speaker.entity.vo.PlayVo;
+import com.zd.algorithm.api.speaker.entity.PlayVo;
 import com.zd.algorithm.api.speaker.feign.RemoteSpeakService;
 import com.zd.model.domain.R;
 import org.slf4j.Logger;

zd-api/zd-api-system/src/main/java/com/zd/system/api/alarm/RemoteAlarmService.java

@@ -1,21 +0,0 @@
-package com.zd.system.api.alarm;
-
-import com.zd.common.core.constant.ServiceNameConstants;
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.system.api.alarm.domain.AlarmEntrty;
-import com.zd.system.api.factory.RemoteAlarmFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * 报警系统Feign调用接口
- *
- * @Author: liubo
- */
-@FeignClient(contextId = "remoteAlarmService", value = ServiceNameConstants.ALARM_SERVICE, fallbackFactory = RemoteAlarmFallbackFactory.class)
-public interface RemoteAlarmService {
-
-    @PostMapping("/alarm/send")
-    public AjaxResult send(@RequestBody AlarmEntrty alarmEntrty);
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/alarm/domain/AlarmEntrty.java

@@ -1,116 +0,0 @@
-package com.zd.system.api.alarm.domain;
-
-import cn.hutool.json.JSONUtil;
-import com.zd.common.core.constant.Constants;
-
-import javax.validation.constraints.NotNull;
-import java.util.Arrays;
-
-public class AlarmEntrty {
-
-    private Routes route;
-
-    /**
-     * 手机号码
-     * Type 对象为 SMS、Call、All 时，To 为电话号码，字符串数组
-     */
-    @NotNull(message = "手机号码不能为空")
-    private String[] To;
-
-    /**
-     * 告警通知类型
-     * 目前只做出电话语音和短信（不选邮件和音频）
-     */
-    private String Type;
-
-    /**
-     * 编码方式 默认UTF-8
-     */
-    private String Encoding = Constants.UTF8;
-
-    /**
-     * 邮件主题
-     * Type 对象为 Email 时，Sub 必须添加邮件主题
-     * 可选
-     */
-    private String Sub;
-
-    /**
-     * 通知内容
-     */
-    @NotNull(message = "通知内容不能为空！")
-    private String Text;
-
-    public AlarmEntrty() {
-    }
-
-    /**
-     * 默认 电话语音播报
-     */
-    public AlarmEntrty(@NotNull Routes route, @NotNull String[] to, @NotNull String text) {
-        this.route = route;
-        this.Type = SendTypes.All+"";
-        this.setTo(to);
-        this.Text = text;
-    }
-
-    public AlarmEntrty(@NotNull Routes route, @NotNull String[] to, @NotNull String type, @NotNull String text) {
-        this.route = route;
-        this.To = to;
-        this.Type = type;
-        this.Text = text;
-    }
-
-    public String[] getTo() {
-        return To;
-    }
-
-    public void setTo(String[] to) {
-        To = to;
-    }
-
-    public String getType() {
-        return Type;
-    }
-
-    public void setType(String type) {
-        Type = type;
-    }
-
-    public String getEncoding() {
-        return Encoding;
-    }
-
-    public void setEncoding(String encoding) {
-        Encoding = encoding;
-    }
-
-    public String getSub() {
-        return Sub;
-    }
-
-    public void setSub(String sub) {
-        Sub = sub;
-    }
-
-    public String getText() {
-        return Text;
-    }
-
-    public void setText(String text) {
-        Text = text;
-    }
-
-    public Routes getRoute() {
-        return route;
-    }
-
-    public void setRoute(Routes route) {
-        this.route = route;
-    }
-
-    @Override
-    public String toString() {
-        return JSONUtil.toJsonStr(this);
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/alarm/domain/Routes.java

@@ -1,44 +0,0 @@
-package com.zd.system.api.alarm.domain;
-
-public enum Routes {
-
-    /**
-     * 1.告警通知推送至告警服务模块
-     */
-    NoticePush("/cgi-bin/NoticePush"),
-
-    /**
-     * 2.获取系统运行状态信息
-     */
-    SystemStatusSnapshot("/cgi-bin/SystemStatusSnapshot"),
-
-    /**
-     * 3.获取最新接收到的短信
-     */
-    ReadSMS("/cgi-bin/ReadSMS"),
-
-    /**
-     * 4.获取最新告警通知处理结果
-     */
-    NoticeResult("/cgi-bin/NoticeResult"),
-
-    /**
-     * 5.获取告警通知处理结果记录日志
-     */
-    notice( "/LogFS/notice.log"),
-
-    /**
-     * 6.获取接收短信记录日志
-     */
-    ReceiveSMS("/LogFS/ReceiveSMS.log");
-
-    private String url;
-
-    Routes(java.lang.String url) {
-        this.url = url;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/alarm/domain/SendTypes.java

@@ -1,19 +0,0 @@
-package com.zd.system.api.alarm.domain;
-
-/**
- * 告警通知类型
- * @author liubo
- */
-public enum SendTypes {
-
-    // 短信通知发送
-    SMS,
-    // 电话语音播报
-    Call,
-    // 电话语音播报和短信通知发送
-    All,
-    // 邮件通知发送
-    Email,
-    // 音频广播
-    Broadcast;
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/camera/RemoteCameraService.java

@@ -1,30 +0,0 @@
-package com.zd.system.api.camera;
-
-import com.zd.common.core.constant.ServiceNameConstants;
-import com.zd.common.core.domain.R;
-import com.zd.common.core.enums.HardwareOperate;
-import com.zd.system.api.camera.factory.RemoteCameraFallBackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@FeignClient(contextId = "remoteCameraService",value = ServiceNameConstants.CAMERA_SERVICE,fallbackFactory= RemoteCameraFallBackFactory.class)
-public interface RemoteCameraService {
-    @RequestMapping("/service/mqtt/send/{num}/{hardwareOperate}")
-    public R sends(@PathVariable("num") String num, @PathVariable("hardwareOperate") HardwareOperate hardwareOperate);
-
-    /**
-     * 视频头开始录制
-     * @param hostname IP地址
-     */
-    @RequestMapping("/api/onvif/startRecord")
-    public R startRecord(@RequestParam("hostname") String hostname);
-
-    /**
-     * 视频头结束录制获取录制mp4
-     * @param hostname IP地址
-     */
-    @RequestMapping("/api/onvif/stopRecord")
-    public R stopRecord(@RequestParam("hostname") String hostname);
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/camera/factory/RemoteCameraFallBackFactory.java

@@ -1,35 +0,0 @@
-package com.zd.system.api.camera.factory;
-
-import com.zd.common.core.domain.R;
-import com.zd.common.core.enums.HardwareOperate;
-import com.zd.system.api.camera.RemoteCameraService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-@Component
-public class RemoteCameraFallBackFactory implements FallbackFactory<RemoteCameraService> {
-    private static final Logger log = LoggerFactory.getLogger(RemoteCameraFallBackFactory.class);
-
-    @Override
-    public RemoteCameraService create(Throwable throwable) {
-        log.error("摄像头在线离线调用失败:{}", throwable.getMessage());
-        return new RemoteCameraService() {
-            @Override
-            public R sends(String num, HardwareOperate hardwareOperate) {
-                return R.fail("摄像头在线离线调用失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R startRecord(String hostname) {
-                return R.fail("摄像头开始录像调用失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R stopRecord(String hostname) {
-                return R.fail("摄像头结束录像调用失败:" + throwable.getMessage());
-            }
-        };
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/domain/InventoryTag.java

@@ -1,6 +1,5 @@
 package com.zd.system.api.domain;
 
-import com.zd.system.api.laboratory.domain.RemoteLabHardware;
 import lombok.Data;
 import lombok.ToString;
 

zd-api/zd-api-system/src/main/java/com/zd/system/api/face/RemoteFaceService.java

@@ -1,36 +0,0 @@
-package com.zd.system.api.face;
-
-import com.zd.common.core.constant.ServiceNameConstants;
-import com.zd.common.core.domain.R;
-import com.zd.system.api.face.factory.RemoteFaceFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestPart;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * 文件服务
- *
- * @author zd
- */
-@FeignClient(contextId = "remoteFaceService", value = ServiceNameConstants.FACE_SERVICE, fallbackFactory = RemoteFaceFallbackFactory.class)
-public interface RemoteFaceService {
-    /**
-     * 获取人脸特征-根据照片
-     * @param file 文件信息
-     * @return 结果
-     */
-    @PostMapping(value = "/faceApi/faceFeature", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public R<byte[]> upload(@RequestPart(value = "file") MultipartFile file);
-
-
-    /**
-     * 人脸特征对比
-     * @param faceCompare 文件信息
-     * @return 结果
-     */
-    @PostMapping(value = "/faceApi/compare")
-    public R compare(@RequestBody FaceCompare faceCompare);
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/face/factory/RemoteFaceFallbackFactory.java

@@ -1,43 +0,0 @@
-package com.zd.system.api.face.factory;
-
-import com.zd.common.core.domain.R;
-import com.zd.system.api.face.FaceCompare;
-import com.zd.system.api.face.RemoteFaceService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * 文件服务降级处理
- *
- * @author zd
- */
-@Component
-public class RemoteFaceFallbackFactory implements FallbackFactory<RemoteFaceService> {
-    private static final Logger log = LoggerFactory.getLogger(RemoteFaceFallbackFactory.class);
-
-    @Override
-    public RemoteFaceService create(Throwable throwable) {
-        log.error("人脸检测服务调用失败:{}", throwable.getMessage());
-        return new RemoteFaceService() {
-            @Override
-            public R<byte[]> upload(MultipartFile file) {
-
-                return R.fail("人脸检测服务调用失败:" + throwable.getMessage());
-            }
-
-            /**
-             * 人脸特征对比
-             *
-             * @param faceCompare 文件信息
-             * @return 结果
-             */
-            @Override
-            public R compare(FaceCompare faceCompare) {
-                return R.fail("人脸对比服务调用失败:" + throwable.getMessage());
-            }
-        };
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/factory/RemoteAlarmFallbackFactory.java

@@ -1,29 +0,0 @@
-package com.zd.system.api.factory;
-
-import com.zd.common.core.web.domain.AjaxResult;
-import com.zd.system.api.alarm.RemoteAlarmService;
-import com.zd.system.api.alarm.domain.AlarmEntrty;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-/**
- * 报警服务降级处理
- * @author liubo
- */
-@Component
-public class RemoteAlarmFallbackFactory implements FallbackFactory<RemoteAlarmService> {
-    private static final Logger log = LoggerFactory.getLogger(RemoteAlarmFallbackFactory.class);
-
-    @Override
-    public RemoteAlarmService create(Throwable throwable) {
-        log.error("用户服务调用失败:{}", throwable.getMessage());
-        return new RemoteAlarmService() {
-            @Override
-            public AjaxResult send(AlarmEntrty alarmEntrty) {
-                return AjaxResult.error("发送语音报警失败:" + throwable.getMessage());
-            }
-        };
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/forward/RemoteForwardService.java

@@ -1,34 +0,0 @@
-package com.zd.system.api.forward;
-
-import com.zd.common.core.constant.ServiceNameConstants;
-import com.zd.common.core.domain.R;
-import com.zd.system.api.domain.SysFile;
-import com.zd.system.api.forward.factory.RemoteForwardFallbackFactory;
-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;
-
-import java.util.Map;
-
-/**
- * 消息内容feign调用服务
- */
-@FeignClient(contextId = "remoteForwardService", value = ServiceNameConstants.FORWARD_SERVICE, fallbackFactory = RemoteForwardFallbackFactory.class)
-public interface RemoteForwardService {
-
-
-    /**
-     * 保存检查记录
-     */
-    @PostMapping("/checklog")
-    R add(@RequestBody Map<String,Object> map);
-
-
-    @PostMapping("/algorithm/save")
-    Object saveData(@RequestBody Map<String, Object> data);
-
-    @GetMapping("/alarm/photograph")
-    R<SysFile> photograph(@RequestParam("streamUrl") String streamUrl);
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/forward/factory/RemoteForwardFallbackFactory.java

@@ -1,46 +0,0 @@
-package com.zd.system.api.forward.factory;
-
-import com.zd.common.core.domain.R;
-import com.zd.system.api.domain.SysFile;
-import com.zd.system.api.forward.RemoteForwardService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-/**
- * 文件服务降级处理
- *
- * @author zd
- */
-@Component
-public class RemoteForwardFallbackFactory implements FallbackFactory<RemoteForwardService> {
-    private static final Logger log = LoggerFactory.getLogger(RemoteForwardFallbackFactory.class);
-
-    @Override
-    public RemoteForwardService create(Throwable throwable) {
-        log.error("实验室服务调用失败:{}", throwable.getMessage());
-        return new RemoteForwardService() {
-            /**
-             * 保存检查记录
-             */
-            @Override
-            public R add(Map<String, Object> map) {
-                return R.fail("实验室检查项结果保存调用失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public Object saveData(Map<String, Object> data) {
-
-                return R.fail("保存调用失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<SysFile> photograph(String streamUrl) {
-                return R.fail("报警拍照服务调用失败:" + throwable.getMessage());
-            }
-        };
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/laboratory/domain/RemoteLabHardware.java

@@ -1,162 +0,0 @@
-package com.zd.system.api.laboratory.domain;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.enums.HardwareOperate;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.hibernate.validator.constraints.Length;
-
-/**
- * 硬件对象 lab_hardware
- *
- * @author zd
- */
-@ApiModel("硬件表")
-@Data
-public class RemoteLabHardware{
-
-    /**
-     * 主键id
-     */
-    @ApiModelProperty(value = "${comment}")
-    private Long id;
-
-    /**
-     * 设备名称
-     */
-    @ApiModelProperty("设备名称")
-    @Excel(name = "设备名称")
-    private String name;
-
-    /**
-     * 设备厂家
-     */
-    @ApiModelProperty("设备厂家")
-    @Excel(name = "设备厂家")
-    private String factory;
-
-    /**
-     * 设备类型
-     */
-    @ApiModelProperty("设备类型")
-    @Excel(name = "设备类型")
-    private Integer type;
-
-    /**
-     * 一体机类型，管控一体机0  学习考试一体机1
-     */
-    @ApiModelProperty("一体机类型")
-    @Excel(name = "一体机类型")
-    private Integer pcType;
-
-    /**
-     * mac地址
-     */
-    @ApiModelProperty("mac地址")
-    @Excel(name = "mac地址")
-    private String macAdd;
-
-    /**
-     * 所属实验室id
-     */
-    @ApiModelProperty("所属实验室id")
-    @Excel(name = "所属实验室id")
-    private Long subjectId;
-
-    /**
-     * 部门id
-     */
-    @ApiModelProperty("部门id")
-    @Excel(name = "部门id")
-    private Long deptId;
-
-    /**
-     * 部门名称
-     */
-    @ApiModelProperty("部门名称")
-    @Excel(name = "部门名称")
-    private String deptName;
-
-    /**
-     * 设备状态
-     */
-    @ApiModelProperty("设备状态")
-    @Excel(name = "设备状态")
-    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    private HardwareOperate operate;
-
-    /**
-     * 创建人（用于数据权限）
-     */
-    @ApiModelProperty("创建人（用于数据权限）")
-    @Excel(name = "创建人", readConverterExp = "用=于数据权限")
-    private Long userId;
-
-    @ApiModelProperty("设备编码")
-    private String hardwareNum;
-
-    /**
-     * 配置名称
-     */
-    private String configName;
-
-    /**
-     * 配置状态
-     */
-    private String configStatus;
-
-    /**
-     * 老继电器，新继电器
-     */
-    private int hardwareType;
-
-    @ApiModelProperty(value = "供应厂商")
-    private Integer manufacturerType;
-
-    /** ip地址 */
-    @Length(message = "ip地址长度不能超过100")
-    @ApiModelProperty(value = "ip地址")
-    private String ipAddress;
-    /** 设备端口号 */
-    @ApiModelProperty(value = "设备端口号")
-    private Integer port;
-    /** 设备输出频率 33最大 */
-    @ApiModelProperty(value = "设备输出频率 33最大")
-    private String uniformPower;
-    /** 设备推送频率，0最大，2最小 */
-    @ApiModelProperty(value = "设备推送频率，0最大，2最小")
-    private Byte sessionIndex;
-    /** 支持1通道、4通道、8通道、16通道 */
-    @ApiModelProperty(value = "支持1通道、4通道、8通道、16通道")
-    private Integer channels;
-
-    /**
-     * 功能状态： 不同设备的功能状态都是不一样的
-     */
-    private String functionStatus;
-
-    /**
-     * 横轴坐标
-     */
-    private String horizontalAxis;
-
-    /**
-     * 竖轴坐标
-     */
-    private String verticalAxis;
-
-    /**
-     * 关联继电器编码
-     */
-    private String relayCode;
-
-    /**
-     * 继电器位数
-     */
-    private Integer bit;
-
-    @ApiModelProperty(value = "报警器响铃时长")
-    private Integer ringTime;
-}

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

@@ -1,44 +0,0 @@
-package com.zd.system.api.netty;
-
-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.ApiOperation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * @author Administrator
- */
-@FeignClient(contextId = "remoteNettyService", value = ServiceNameConstants.NETTY_SERVICE, fallbackFactory = RemoteNettyFallbackFactory.class)
-public interface RemoteNettyService {
-    /**
-     * 断开设备连接
-     * @param hardware 设备对象
-     * @return 结果
-     */
-    @ApiOperation("断开设备连接")
-    @PostMapping("/frid/disconnect")
-    R<Boolean> disconnect(@RequestBody RemoteLabHardware hardware);
-
-    /**
-     * 信道启动FRID扫描监控
-     * @param hardware 设备对象
-     * @return 结果
-     */
-    @ApiOperation("信道启动FRID扫描监控")
-    @PostMapping("/frid/startMonitorChannels")
-    R<Boolean> startMonitorChannels(@RequestBody RemoteLabHardware hardware);
-
-    /**
-     * 开启设备警报
-     * @param hardware 设备参数
-     * @return R
-     */
-    @ApiOperation("开启设备警报")
-    @PostMapping("/frid/alarm")
-    R<Boolean> alarm(@RequestBody RemoteLabHardware hardware);
-
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/netty/factory/RemoteNettyFallbackFactory.java

@@ -1,36 +0,0 @@
-package com.zd.system.api.netty.factory;
-
-import com.zd.common.core.domain.R;
-import com.zd.system.api.laboratory.domain.RemoteLabHardware;
-import com.zd.system.api.netty.RemoteNettyService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-@Component
-public class RemoteNettyFallbackFactory implements FallbackFactory<RemoteNettyService> {
-
-    private static final Logger log = LoggerFactory.getLogger(RemoteNettyFallbackFactory.class);
-
-    @Override
-    public RemoteNettyService create(Throwable throwable) {
-        log.error("netty服务调用失败:{}", throwable.getMessage());
-        return new RemoteNettyService() {
-            @Override
-            public R<Boolean> disconnect(RemoteLabHardware hardware) {
-                return  R.fail("停止扫描失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<Boolean> startMonitorChannels(RemoteLabHardware hardware) {
-                return  R.fail("启动扫描失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public R<Boolean> alarm(RemoteLabHardware hardware) {
-                return  R.fail("开启警报失败:" + throwable.getMessage());
-            }
-        };
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/smartlock/RemoteSmartlockService.java

@@ -1,23 +0,0 @@
-package com.zd.system.api.smartlock;
-
-import com.zd.common.core.constant.ServiceNameConstants;
-import com.zd.common.core.domain.R;
-import com.zd.system.api.speak.factory.RemoteSpeakFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-
-
-/***
- *
- * 智能锁远程调用
- */
-@FeignClient(contextId = "remoteSmartlockService",value = ServiceNameConstants.SMARTLOCK_SERVICE,fallbackFactory = RemoteSpeakFallbackFactory.class)
-public interface RemoteSmartlockService {
-
-    @GetMapping(value = "/approval/sysMsgApprova")
-    public R sysMsgApprova(@RequestParam(value = "phone", required = true) String phone,
-                        @RequestParam(value = "content", required = true) String content,
-                        @RequestParam(value = "lockApplyId",required = true) Long lockApplyId);
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/smartlock/factory/RemoteSmartlockFallbackFactory.java

@@ -1,27 +0,0 @@
-package com.zd.system.api.smartlock.factory;
-
-import com.zd.common.core.domain.R;
-import com.zd.system.api.smartlock.RemoteSmartlockService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-@Component
-public class RemoteSmartlockFallbackFactory implements FallbackFactory<RemoteSmartlockService> {
-
-    private static final Logger log = LoggerFactory.getLogger(RemoteSmartlockFallbackFactory.class);
-
-
-    @Override
-    public RemoteSmartlockService create(Throwable cause) {
-        return new RemoteSmartlockService() {
-            @Override
-            public R sysMsgApprova(String phone, String content, Long lockApplyId) {
-                log.info("短信审核处理失败:" + cause.getMessage());
-                return R.fail("短信审核处理失败："+ cause.getMessage());
-            }
-        };
-
-    }
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/speak/RemoteSpeakService.java

@@ -1,64 +0,0 @@
-package com.zd.system.api.speak;
-
-import com.zd.common.core.constant.ServiceNameConstants;
-import com.zd.common.core.domain.R;
-import com.zd.system.api.domain.PlayVo;
-import com.zd.system.api.speak.factory.RemoteSpeakFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.List;
-
-/**
- * 语音远程调用
- */
-@FeignClient(contextId = "remoteSpeakService",value = ServiceNameConstants.SPEAK_SERVICE,fallbackFactory = RemoteSpeakFallbackFactory.class)
-public interface RemoteSpeakService {
-      @RequestMapping("/speaker/textParseVideo")
-      String textParseUrl(@RequestParam("speed") Integer speed, @RequestParam("volume") Integer volume, @RequestParam("text") String text);
-
-      /***
-       * 文字转语音播放
-       * @return
-       */
-      @RequestMapping("/speaker/textParseUrlIps")
-      R textParseUrlIps(@RequestParam("text") String text, @RequestBody List<PlayVo> playVo);
-
-      /**
-       * 获取喇叭列表
-       * @param page
-       * @param pageSize
-       * @param floorId
-       * @return
-       */
-      @RequestMapping("/speaker/getDeviceList")
-      R getDeviceList(@RequestParam("page") Integer page, @RequestParam("pageSize") Integer pageSize,@RequestParam("floorId") Long floorId);
-
-      /**
-       * 获取喇叭列表（根据楼层Id和实验室ID）
-       * @param page
-       * @param pageSize
-       * @param floorId
-       * @param subId
-       * @return
-       */
-      @RequestMapping("/speaker/getDeviceListBySub")
-      R getDeviceList(@RequestParam("page") Integer page, @RequestParam("pageSize") Integer pageSize,@RequestParam("floorId") Long floorId,@RequestParam("subId") Long subId);
-
-
-      /***
-       * 语音播放
-       * @return
-       */
-      @RequestMapping("/speaker/textParseUrlAppIps")
-      R textParseUrlAppIps(@RequestParam("text") String text, @RequestBody List<PlayVo> playVo);
-
-      /***
-       * 关闭喇叭
-       * @return
-       */
-      @RequestMapping("/speaker/stopPlayMusic")
-      R stopPlayMusic(@RequestParam("sn") String sn, @RequestParam("ip") String ip);
-}

zd-api/zd-api-system/src/main/java/com/zd/system/api/speak/factory/RemoteSpeakFallbackFactory.java

@@ -1,62 +0,0 @@
-package com.zd.system.api.speak.factory;
-
-import com.zd.common.core.domain.R;
-import com.zd.system.api.domain.PlayVo;
-import com.zd.system.api.speak.RemoteSpeakService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- *
- */
-@Component
-public class RemoteSpeakFallbackFactory implements FallbackFactory<RemoteSpeakService> {
-
-    private static final Logger log = LoggerFactory.getLogger(RemoteSpeakFallbackFactory.class);
-
-    @Override
-    public RemoteSpeakService create(Throwable cause) {
-        return new RemoteSpeakService() {
-            @Override
-            public String textParseUrl(Integer speed, Integer volume, String text) {
-                log.info("语音转化失败:" + cause.getMessage());
-                return "语音转化失败:" + cause.getMessage();
-            }
-
-            @Override
-            public R textParseUrlIps(String text, List<PlayVo> playVo) {
-                log.info("语音转化失败:" + cause.getMessage());
-                return R.fail("textParseUrlIps：语音转化失败"+ cause.getMessage());
-            }
-
-            @Override
-            public R getDeviceList(Integer page, Integer pageSize, Long floorId) {
-                log.info("getDeviceList：获取喇叭列表失败:" + cause.getMessage());
-                return R.fail("getDeviceList：获取喇叭列表失败"+ cause.getMessage());
-            }
-
-            @Override
-            public R getDeviceList(Integer page, Integer pageSize, Long floorId, Long subId) {
-                log.info("getDeviceList：根据楼层Id和实验室Id获取喇叭列表失败:" + cause.getMessage());
-                return R.fail("getDeviceList：根据楼层Id和实验室Id获取喇叭列表失败"+ cause.getMessage());
-            }
-
-            @Override
-            public R textParseUrlAppIps(String text, List <PlayVo> playVo) {
-                log.info("语音播放失败:" + cause.getMessage());
-                return R.fail("textParseUrlIps：语音播放失败"+ cause.getMessage());
-            }
-
-            @Override
-            public R stopPlayMusic(String text, String ip) {
-                log.info("关闭喇叭失败:" + cause.getMessage());
-                return R.fail("textParseUrlIps：关闭喇叭失败"+ cause.getMessage());
-            }
-
-        };
-    }
-}

zd-api/zd-algorithm-api/src/main/java/com/zd/algorithm/api/speaker/entity/RemoteAddress.java

@@ -1,4 +1,4 @@
-package com.zd.algorithm.api.speaker.entity;
+package com.zd.alg.speaker.domain;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabExitLineServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zd.laboratory.service.impl;
 
-import com.zd.algorithm.api.speaker.entity.vo.ParamVo;
-import com.zd.algorithm.api.speaker.entity.vo.PlayVo;
+import com.zd.algorithm.api.speaker.entity.ParamVo;
+import com.zd.algorithm.api.speaker.entity.PlayVo;
 import com.zd.algorithm.api.speaker.feign.RemoteSpeakService;
 import com.zd.common.core.annotation.DataScope;
 import com.zd.common.core.exception.ServiceException;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabRiskPlanServiceImpl.java

@@ -2,8 +2,8 @@ package com.zd.laboratory.service.impl;
 
 import cn.hutool.json.JSONObject;
 import com.alibaba.fastjson.JSONArray;
-import com.zd.algorithm.api.speaker.entity.vo.ParamVo;
-import com.zd.algorithm.api.speaker.entity.vo.PlayVo;
+import com.zd.algorithm.api.speaker.entity.ParamVo;
+import com.zd.algorithm.api.speaker.entity.PlayVo;
 import com.zd.algorithm.api.speaker.feign.RemoteSpeakService;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.redis.RedisService;