Przeglądaj źródła

```
refactor(device): 优化设备网关接口方法参数格式

- 调整 deviceUnBind 方法参数间的空格格式- 删除多余的换行符,统一代码风格- 规范方法参数书写格式,提升可读性refactor(alarm): 修正告警网关注释文本前后空格

- 去除告警计划与告警模板计划相关注释中多余的前导空格
- 统一注释文本格式,保持代码整洁一致

refactor(error): 格式化错误枚举类中的代码风格- 删除枚举常量定义中的多余空格
- 移除不必要的换行,使代码结构更紧凑
- 统一括号和参数之间的空格格式

refactor(msg): 规范短信客户端代码缩进与空格

- 将 MsgClient 类中的字段和方法缩进从制表符转为空格
- 统一注解、变量声明及方法体的排版风格
- 提升整体代码可读性和维护性

refactor(stats): 移除冗余导入和请求参数注解- 删除未使用的 RequestParam 导入语句
- 移除 fallingEventsQuery 方法中不必要的 @RequestParam 注解refactor(web): 移除重复的注释和空行

- 删除 web 网关接口中多余的注释和空行- 保持接口文档简洁清晰refactor(wx): 删除无用注释并统一代码缩进

- 移除 WxOfficeAccountClient 中废弃的 redisService 注释
- 替换注释前的制表符为空格,统一格式
- 标准化 SimpleDateFormat 使用方式的注释格式

chore(gateway): 移除 PubGateway 和 UserGateway 中的无效内容

- 删除 PubGateway 接口中多余的空行- 移除 UserGateway 中已注释的 uploadCarousel 方法
```

chejianzheng 1 miesiąc temu
rodzic
commit
a904fba421

+ 96 - 96
portal-service-domain/src/main/java/com/hfln/portal/domain/customer/util/MsgClient.java

@@ -23,101 +23,101 @@ import java.time.format.DateTimeFormatter;
 @Component
 public class MsgClient {
 
-	@Autowired
-	private RestTemplate restTemplate;
-
-	@NotBlank
-	@Value("${lnxx.sms.tencent.secretId}")
-	private String secretId;
-
-	@NotBlank
-	@Value("${lnxx.sms.tencent.secretKey}")
-	private String secretKey;
-
-	@NotBlank
-	@Value("${lnxx.sms.tencent.loginId}")
-	private String loginId;
-
-	@NotBlank
-	@Value("${lnxx.sms.tencent.registerId}")
-	private String registerId;
-
-	@NotBlank
-	@Value("${lnxx.sms.tencent.notifyId}")
-	private String notifyId;
-
-	@NotBlank
-	@Value("${lnxx.sms.tencent.sdkAppId}")
-	private String sdkAppId;
-
-	@NotBlank
-	@Value("${lnxx.sms.tencent.region}")
-	private String region;
-
-	@NotBlank
-	@Value("${lnxx.sms.tencent.signName}")
-	private String signName;
-
-	public String sendMsg(String mobile, String content, String signName) {
-		if (isValidMobile(mobile)) {
-			return "手机号格式不正确";
-		}
-		if (StringUtils.isEmpty(signName)) {
-			signName = "安徽柒零玖";
-		}
-		try {
-			String encodedContent = URLEncoder.encode(content + "【" + signName + "】", "GB2312");
-			String url = String.format(
-					"https://mb345.com/ws/BatchSend2.aspx?CorpID=HFLKJ0006642&Pwd=zh9527@&Mobile=%s&Content=%s&Cell=&SendTime=",
-					mobile, encodedContent);
-
-			log.info("发送短信内容: {}", content);
-			return restTemplate.getForObject(url, String.class);
-
-		} catch (UnsupportedEncodingException e) {
-			log.error("短信内容编码失败", e);
-		} catch (Exception e) {
-			log.error("调用短信接口异常", e);
-		}
-		return "发送失败";
-	}
-
-	public String sendLoginMsg(String mobile, String captcha) {
-		return sendTencentMsg(mobile, loginId, new String[]{captcha, "5"});
-	}
-
-	public String sendRegisterMsg(String mobile, String captcha) {
-		return sendTencentMsg(mobile, registerId, new String[]{captcha});
-	}
-
-	public String sendNotifyMsg(String mobile, String devName) {
-		String nowTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-		String[] timeParts = nowTime.split("[- :]");
-		return sendTencentMsg(mobile, notifyId, new String[]{devName, timeParts[0], timeParts[1], timeParts[2], timeParts[3], timeParts[4], timeParts[5]});
-	}
-
-	private String sendTencentMsg(String mobile, String templateId, String[] templateParams) {
-		if (isValidMobile(mobile)) {
-			throw new BizException("手机号码格式有误");
-		}
-		try {
-			SmsClient client = new SmsClient(new Credential(secretId, secretKey), region, new ClientProfile());
-			SendSmsRequest req = new SendSmsRequest();
-			req.setPhoneNumberSet(new String[]{mobile});
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @NotBlank
+    @Value("${lnxx.sms.tencent.secretId}")
+    private String secretId;
+
+    @NotBlank
+    @Value("${lnxx.sms.tencent.secretKey}")
+    private String secretKey;
+
+    @NotBlank
+    @Value("${lnxx.sms.tencent.loginId}")
+    private String loginId;
+
+    @NotBlank
+    @Value("${lnxx.sms.tencent.registerId}")
+    private String registerId;
+
+    @NotBlank
+    @Value("${lnxx.sms.tencent.notifyId}")
+    private String notifyId;
+
+    @NotBlank
+    @Value("${lnxx.sms.tencent.sdkAppId}")
+    private String sdkAppId;
+
+    @NotBlank
+    @Value("${lnxx.sms.tencent.region}")
+    private String region;
+
+    @NotBlank
+    @Value("${lnxx.sms.tencent.signName}")
+    private String signName;
+
+    public String sendMsg(String mobile, String content, String signName) {
+        if (isValidMobile(mobile)) {
+            return "手机号格式不正确";
+        }
+        if (StringUtils.isEmpty(signName)) {
+            signName = "安徽柒零玖";
+        }
+        try {
+            String encodedContent = URLEncoder.encode(content + "【" + signName + "】", "GB2312");
+            String url = String.format(
+                    "https://mb345.com/ws/BatchSend2.aspx?CorpID=HFLKJ0006642&Pwd=zh9527@&Mobile=%s&Content=%s&Cell=&SendTime=",
+                    mobile, encodedContent);
+
+            log.info("发送短信内容: {}", content);
+            return restTemplate.getForObject(url, String.class);
+
+        } catch (UnsupportedEncodingException e) {
+            log.error("短信内容编码失败", e);
+        } catch (Exception e) {
+            log.error("调用短信接口异常", e);
+        }
+        return "发送失败";
+    }
+
+    public String sendLoginMsg(String mobile, String captcha) {
+        return sendTencentMsg(mobile, loginId, new String[]{captcha, "5"});
+    }
+
+    public String sendRegisterMsg(String mobile, String captcha) {
+        return sendTencentMsg(mobile, registerId, new String[]{captcha});
+    }
+
+    public String sendNotifyMsg(String mobile, String devName) {
+        String nowTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        String[] timeParts = nowTime.split("[- :]");
+        return sendTencentMsg(mobile, notifyId, new String[]{devName, timeParts[0], timeParts[1], timeParts[2], timeParts[3], timeParts[4], timeParts[5]});
+    }
+
+    private String sendTencentMsg(String mobile, String templateId, String[] templateParams) {
+        if (isValidMobile(mobile)) {
+            throw new BizException("手机号码格式有误");
+        }
+        try {
+            SmsClient client = new SmsClient(new Credential(secretId, secretKey), region, new ClientProfile());
+            SendSmsRequest req = new SendSmsRequest();
+            req.setPhoneNumberSet(new String[]{mobile});
 //			req.setSignName("雷能守护小程序");
-			req.setSignName(signName);
-			req.setTemplateId(templateId);
-			req.setTemplateParamSet(templateParams);
-			req.setSmsSdkAppId(sdkAppId);
-			SendSmsResponse resp = client.SendSms(req);
-			return AbstractModel.toJsonString(resp);
-		} catch (Exception e) {
-			log.error("发送腾讯云短信失败", e);
-		}
-		return null;
-	}
-
-	private boolean isValidMobile(String mobile) {
-		return mobile == null || !mobile.matches("^1[3-9]\\d{9}$");
-	}
+            req.setSignName(signName);
+            req.setTemplateId(templateId);
+            req.setTemplateParamSet(templateParams);
+            req.setSmsSdkAppId(sdkAppId);
+            SendSmsResponse resp = client.SendSms(req);
+            return AbstractModel.toJsonString(resp);
+        } catch (Exception e) {
+            log.error("发送腾讯云短信失败", e);
+        }
+        return null;
+    }
+
+    private boolean isValidMobile(String mobile) {
+        return mobile == null || !mobile.matches("^1[3-9]\\d{9}$");
+    }
 }

+ 3 - 5
portal-service-domain/src/main/java/com/hfln/portal/domain/customer/util/WxOfficeAccountClient.java

@@ -38,8 +38,6 @@ import java.util.concurrent.TimeUnit;
 @Component
 public class WxOfficeAccountClient {
 
-//    private final RedisUtil redisService;
-
     @Autowired
     private StringRedisTemplate stringRedisTemplate;
 
@@ -79,7 +77,7 @@ public class WxOfficeAccountClient {
         }
 
         Map<String, Object> data = new HashMap<>();
-		// 1. 每个字段需要包装成包含 value 的 Map
+        // 1. 每个字段需要包装成包含 value 的 Map
         Map<String, String> characterString1 = new HashMap<>();
         characterString1.put("value", devId);
         data.put("character_string1", characterString1);
@@ -95,8 +93,8 @@ public class WxOfficeAccountClient {
         data.put("thing10", thing10);
 
         Map<String, String> time3 = new HashMap<>();
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		String currentTime = sdf.format(new Date());
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String currentTime = sdf.format(new Date());
         time3.put("value", currentTime);  // 时间字段需符合格式要求
         data.put("time3", time3);
 

+ 0 - 101
portal-service-domain/src/main/java/com/hfln/portal/domain/entity/MenuEntity.java

@@ -1,101 +0,0 @@
-package com.hfln.portal.domain.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @BelongsProject: harryDev
- * @BelongsPackage: com.hfln.portal.infrastructure.entity
- * @Author: huangls
- * @CreateTime: 2023-10-17  16:14
- * @Description: TODO
- * @Version: 1.0
- */
-@Data
-public class MenuEntity implements Serializable {
-    /**
-     * 菜单ID
-     */
-    private Long menuId;
-    /**
-     * 菜单名称
-     */
-    private String menuName;
-    /**
-     * 父菜单ID
-     */
-    private Long parentId;
-    /**
-     * 显示顺序
-     */
-    private Integer orderNum;
-    /**
-     * 路由地址
-     */
-    private String path;
-    /**
-     * 组件路径
-     */
-    private String component;
-    /**
-     * 路由参数
-     */
-    private String query;
-    /**
-     * 是否为外链(0是 1否)
-     */
-    private Integer isFrame;
-    /**
-     * 菜单类型(0-菜单 1-按钮)
-     */
-    private String menuType;
-    /**
-     * 权限标识
-     */
-    private String perms;
-    /**
-     * 菜单图标
-     */
-    private String icon;
-    /**
-     * 系统类型(1调度中心  2调度分站 3数据大屏 4后台管理 5医生端 6司机端 7专家端 )
-     */
-    private String sysType;
-    /**
-     * 备注
-     */
-    private String remark;
-    /**
-     * 删除标志
-     */
-    private String delFlag;
-
-    /**
-     * 子菜单
-     */
-    private List<MenuEntity> children = new ArrayList<>();
-    /**
-     * 父级名称
-     */
-    private String parentName;
-
-    /**
-     * 是否与角色关联 0 未关联  1
-     */
-    private String isLink;
-
-    private Long rmId;
-
-    /**
-     * 是否缓存 0-是 1-否
-     */
-    private String cacheFlag;
-
-    /**
-     * 是否显示 0-是 1-否
-     */
-    private String showFlag;
-}

+ 0 - 147
portal-service-domain/src/main/java/com/hfln/portal/domain/event/MqttHandler.java

@@ -1,147 +0,0 @@
-//package com.hfln.portal.domain.event;
-//
-//import cn.hfln.emqx.publisher.MqttPublisher;
-//import com.alibaba.fastjson2.JSONObject;
-//import com.hfln.portal.common.constant.mqtt.topic.TopicConstants;
-//import com.hfln.portal.common.request.device.DeviceBandingParams;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Component;
-//
-//import java.math.BigDecimal;
-//import java.util.HashMap;
-//import java.util.Map;
-//
-//@Component
-//public class MqttHandler {
-//    // 常量定义
-//    private static final double VERSION_THRESHOLD = 2.0; // 版本阈值,用于判断设备协议版本
-//    private static final int QOS = 1;                  // MQTT服务质量等级
-//    private static final boolean RETAIN = true;        // MQTT保留消息标志
-//
-//    @Autowired
-//    private MqttPublisher mqttPublisher; // MQTT消息发布器
-//
-//    /**
-//     * 处理设备更新消息
-//     * @param deviceVersion 设备协议版本号
-//     * @param request 设备绑定请求参数
-//     */
-//    public void handleDeviceUpdateMessage(String deviceVersion, DeviceBandingParams request) {
-//        if (isVersionSupported(deviceVersion)) {
-//            // 支持新协议的设备发送更新消息
-//            sendDeviceUpdateMessage(request);
-//        } else {
-//            // 旧版本设备发送参数设置消息
-//            sendDeviceParametersMessage(request);
-//        }
-//    }
-//
-//    /**
-//     * 检查设备版本是否支持新协议
-//     * @param version 设备协议版本号
-//     * @return true-支持新协议,false-不支持
-//     */
-//    private boolean isVersionSupported(String version) {
-//        try {
-//            return Double.parseDouble(version) >= VERSION_THRESHOLD;
-//        } catch (NumberFormatException e) {
-//            // 版本号解析失败视为不支持
-//            return false;
-//        }
-//    }
-//
-//    /**
-//     * 发送设备更新消息(新协议格式)
-//     * @param request 设备绑定请求参数
-//     */
-//    private void sendDeviceUpdateMessage(DeviceBandingParams request) {
-//        // 构建主题:使用设备ID动态生成
-//        String topic = String.format(TopicConstants.TOPIC_DEV_UPDATE, request.getDevId());
-//
-//        // 构建消息体
-//        JSONObject message = new JSONObject()
-//                .fluentPut("sensor_location", createSensorLocation(request.getHeight())) // 传感器位置
-//                .fluentPut("ext_region", createExtendedRegion(request))                  // 扩展区域
-//                .fluentPut("indicator_led", calculateIndicatorLedStatus(request.getStatusLight())); // 指示灯状态
-//
-//        // 发送MQTT消息
-//        mqttPublisher.send(topic, message, QOS, RETAIN);
-//    }
-//
-//    /**
-//     * 发送设备参数消息(旧协议格式)
-//     * @param request 设备绑定请求参数
-//     */
-//    private void sendDeviceParametersMessage(DeviceBandingParams request) {
-//        // 使用固定主题
-//        String topic = TopicConstants.TOPIC_SET_DEVICE_PARAM;
-//
-//        // 构建消息体
-//        JSONObject message = new JSONObject()
-//                .fluentPut("dev_id", request.getDevId())               // 设备ID
-//                .fluentPut("mounting_plain", request.getMountPlain())  // 安装平面
-//                .fluentPut("height", request.getHeight())              // 高度
-//                .fluentPut("area", createAreaObject(request));         // 区域参数
-//
-//        // 发送MQTT消息
-//        mqttPublisher.send(topic, message, QOS, RETAIN);
-//    }
-//
-//    /**
-//     * 创建传感器位置信息
-//     * @param height 传感器高度
-//     * @return 传感器位置Map
-//     */
-//    private Map<String, BigDecimal> createSensorLocation(BigDecimal height) {
-//        Map<String, BigDecimal> sensorLocation = new HashMap<>();
-//        sensorLocation.put("z_cm", height); // z轴坐标
-//        return sensorLocation;
-//    }
-//
-//    /**
-//     * 创建扩展区域信息
-//     * @param request 设备绑定请求参数
-//     * @return 扩展区域Map
-//     */
-//    private Map<String, Map<String, BigDecimal>> createExtendedRegion(DeviceBandingParams request) {
-//        // 基础区域参数
-//        Map<String, BigDecimal> baseRegion = new HashMap<>();
-//        baseRegion.put("x_cm_start", request.getXStart()); // x轴起点
-//        baseRegion.put("x_cm_stop", request.getXEnd());    // x轴终点
-//        baseRegion.put("y_cm_start", request.getYStart()); // y轴起点
-//        baseRegion.put("y_cm_stop", request.getYEnd());   // y轴终点
-//        baseRegion.put("z_cm_start", request.getZStart()); // z轴起点
-//        baseRegion.put("z_cm_stop", request.getZEnd());   // z轴终点
-//
-//        Map<String, Map<String, BigDecimal>> extendedRegion = new HashMap<>();
-//        extendedRegion.put("base", baseRegion); // 基础区域
-//        return extendedRegion;
-//    }
-//
-//    /**
-//     * 创建区域对象(旧协议格式)
-//     * @param request 设备绑定请求参数
-//     * @return 区域JSON对象
-//     */
-//    private JSONObject createAreaObject(DeviceBandingParams request) {
-//        return new JSONObject()
-//                .fluentPut("start_x", request.getXStart()) // 起始x坐标
-//                .fluentPut("stop_x", request.getXEnd())    // 结束x坐标
-//                .fluentPut("start_y", request.getYStart()) // 起始y坐标
-//                .fluentPut("stop_y", request.getYEnd())    // 结束y坐标
-//                .fluentPut("start_z", request.getZStart()) // 起始z坐标
-//                .fluentPut("stop_z", request.getZEnd());   // 结束z坐标
-//    }
-//
-//    /**
-//     * 计算指示灯状态
-//     * @param statusLight 原始状态灯值
-//     * @return 转换后的指示灯状态(0和1互换)
-//     */
-//    private int calculateIndicatorLedStatus(int statusLight) {
-//        return statusLight == 0 ? 1 : 0;
-//    }
-//
-//
-//
-//}

+ 13 - 15
portal-service-domain/src/main/java/com/hfln/portal/domain/exception/ErrorEnum.java

@@ -7,13 +7,13 @@ import java.util.Objects;
  * @DATE: 2023/10/18 13:44
  * @DESC:
  */
-public enum ErrorEnum implements ErrorEnumInterface{
+public enum ErrorEnum implements ErrorEnumInterface {
 
     /**
      * 业务异常
      */
-    ERROR_BIZ_FAIL( "10000", "业务失败"),
-    USER_NOT_FOUND( "10001", "用户不存在"),
+    ERROR_BIZ_FAIL("10000", "业务失败"),
+    USER_NOT_FOUND("10001", "用户不存在"),
     MOBILE_EXISTS("10002", "手机号已存在"),
     MOBILE_NOT_SIGN("10003", "手机号未注册"),
     DATA_NOT_EXISTS("10004", "数据不存在"),
@@ -61,7 +61,7 @@ public enum ErrorEnum implements ErrorEnumInterface{
     CLIENT_ID_ID_NULL("50003", "设备ID不能为空!"),
     DEVICE_IS_EXIST("50004", "设备已存在!"),
     DEVICE_PARAM_ERROR("50005", "设备参数范围错误!"),
-    STATUS_LIGHT_IS_NOT_EXIST("50006","指示灯状态不合法!"),
+    STATUS_LIGHT_IS_NOT_EXIST("50006", "指示灯状态不合法!"),
     USER_NO_PERMISSION("50007", "当前用户没有权限!"),
     DEVICE_UPDATE_FAIL("50008", "设备更新失败!"),
 
@@ -80,11 +80,10 @@ public enum ErrorEnum implements ErrorEnumInterface{
     SHARE_GROUP_IS_NOT_EXIST("70004", "共享群组不存在!"),
     DEVICE_IS_NOT_EXIST_GROUP("70005", "设备未加入此群组!"),
     SHARE_IS_HANDLED("70006", "分享已处理!"),
-    DEVICE_ALREADY_IN_GROUP("70007","设备已绑定群组,请勿重复添加"),
+    DEVICE_ALREADY_IN_GROUP("70007", "设备已绑定群组,请勿重复添加"),
     GROUP_NAME_IS_EXIST("70008", "群组名称已存在!"),
 
 
-
     /**
      * 文件相关
      */
@@ -101,10 +100,10 @@ public enum ErrorEnum implements ErrorEnumInterface{
     /**
      * web端角色相关
      */
-    ROLE_ALREADY_EXISTS("90001","角色已存在!"),
-    ROLE_ALREADY_DISABLED("90002","角色已禁用!"),
-    ROLE_CODE_NOT_NULL("90003","角色编码不能为空!"),
-    ROLE_NOT_EXIST("90004","角色不存在!"),
+    ROLE_ALREADY_EXISTS("90001", "角色已存在!"),
+    ROLE_ALREADY_DISABLED("90002", "角色已禁用!"),
+    ROLE_CODE_NOT_NULL("90003", "角色编码不能为空!"),
+    ROLE_NOT_EXIST("90004", "角色不存在!"),
 
     /**
      * 分享相关
@@ -120,9 +119,9 @@ public enum ErrorEnum implements ErrorEnumInterface{
     /**
      * web端系统相关
      */
-    MENU_NAME_EXISTS("12001","菜单名称已存在!"),
-    MENU_NOT_EXISTS("12002","菜单不存在!"),
-    MENU_PARENT_NOT_SELF("12003","父级菜单不能为自身!"),
+    MENU_NAME_EXISTS("12001", "菜单名称已存在!"),
+    MENU_NOT_EXISTS("12002", "菜单不存在!"),
+    MENU_PARENT_NOT_SELF("12003", "父级菜单不能为自身!"),
 
     /**
      * 租户相关
@@ -164,7 +163,7 @@ public enum ErrorEnum implements ErrorEnumInterface{
     private final String errorCode;
     private final String errorMessage;
 
-    ErrorEnum( String errorCode, String errorMessage) {
+    ErrorEnum(String errorCode, String errorMessage) {
         this.errorCode = errorCode;
         this.errorMessage = errorMessage;
     }
@@ -180,7 +179,6 @@ public enum ErrorEnum implements ErrorEnumInterface{
     }
 
 
-
     public static ErrorEnum getErrorByCode(String code) {
         for (ErrorEnum errorEnum : values()) {
             if (Objects.equals(errorEnum.getErrorCode(), code)) {

+ 2 - 3
portal-service-domain/src/main/java/com/hfln/portal/domain/gateway/AlarmGateway.java

@@ -11,7 +11,7 @@ import java.util.List;
 public interface AlarmGateway {
 
     /**
-     *  告警计划相关
+     * 告警计划相关
      */
     List<AlarmPlanDTO> queryPlan(AlarmPlanQueryReq req);
 
@@ -21,11 +21,10 @@ public interface AlarmGateway {
 
     void enablePlan(AlarmPlanEnableReq req);
 
-
     List<EventTypeDTO> queryEventType();
 
     /**
-     *  告警模板计划相关
+     * 告警模板计划相关
      */
     PageRecord<AlarmPlanTplDTO> webQueryPlanTpl(WebAlarmPlanTplQueryReq req);
 

+ 3 - 8
portal-service-domain/src/main/java/com/hfln/portal/domain/gateway/DeviceGateway.java

@@ -23,13 +23,12 @@ public interface DeviceGateway {
 
     List<DeviceDTO> queryDeviceList(DeviceListParams request);
 
-    Boolean deviceUnBind(Long userId,String devId);
+    Boolean deviceUnBind(Long userId, String devId);
 
     DeviceDTO deviceBind(DeviceBandingParams request);
 
     DeviceDTO queryDeviceById(String devId);
 
-
     Boolean handleEvent(Long eventListId);
 
     Boolean webUpdateDevice(WebUpdateDeviceParams params);
@@ -48,21 +47,18 @@ public interface DeviceGateway {
     /**
      * 房间布局
      */
-
     RoomDTO readRoom(Long devId);
 
     Boolean saveRoom(RoomParam param);
 
-
     /**
      * 设备分享
      */
-
     Boolean devShare(ShareParam shareParam);
 
     ShareDto shareByUrl(ShareParam shareParam);
 
-    void urlShareConfirm (UrlShareConfirmParam param);
+    void urlShareConfirm(UrlShareConfirmParam param);
 
     List<ShareDto> queryDevShare(QueryDevShareParam param);
 
@@ -79,9 +75,8 @@ public interface DeviceGateway {
     ShareDetailsDTO queryDetails(Long shareId);
 
     /**
-     *  mqtt 雷达
+     * mqtt 雷达
      */
-
     void getVersion(String clientId);
 
     void reboot(String clientId);

+ 0 - 16
portal-service-domain/src/main/java/com/hfln/portal/domain/gateway/LasGateway.java

@@ -1,16 +0,0 @@
-//package com.hfln.portal.domain.gateway;
-//
-//import com.hfln.portal.common.dto.data.event.AlarmPlanDTO;
-//import com.hfln.portal.common.request.event.AlarmEventNoticeReq;
-//import com.hfln.portal.common.request.event.AlarmPlanReq;
-//
-//import java.util.List;
-//
-//public interface LasGateway {
-//
-//
-//    List<AlarmPlanDTO> queryPlan(AlarmPlanReq req);
-//
-//    Void noticeEvent(AlarmEventNoticeReq req);
-//}
-//

+ 0 - 4
portal-service-domain/src/main/java/com/hfln/portal/domain/gateway/PubGateway.java

@@ -9,17 +9,13 @@ import java.util.List;
 
 public interface PubGateway {
 
-
     List<DicItemDto> query(String dicType);
 
-
     List<OtaFileDTO> queryOtaFiles();
 
-
     void updateOTA(UpdateOTAParams params);
 
     DevInfoDTO queryClientIdByDeviD(Long devId);
 
-
 }
 

+ 2 - 3
portal-service-domain/src/main/java/com/hfln/portal/domain/gateway/StatsGateway.java

@@ -2,10 +2,9 @@ package com.hfln.portal.domain.gateway;
 
 import com.hfln.portal.common.dto.data.event.EventListDTO;
 import com.hfln.portal.common.dto.data.event.EventsDTO;
-import com.hfln.portal.common.request.event.WapEventsParams;
 import com.hfln.portal.common.request.event.WapEventListParams;
+import com.hfln.portal.common.request.event.WapEventsParams;
 import com.hfln.portal.common.vo.PageRecord;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -13,7 +12,7 @@ public interface StatsGateway {
 
     PageRecord<EventsDTO> alarmEventsQuery(WapEventsParams params);
 
-    List<EventListDTO> fallingEventsQuery(@RequestParam Long userId);
+    List<EventListDTO> fallingEventsQuery(Long userId);
 
     PageRecord<EventListDTO> fallQuery(WapEventListParams params);
 }

+ 0 - 7
portal-service-domain/src/main/java/com/hfln/portal/domain/gateway/UserGateway.java

@@ -33,13 +33,6 @@ public interface UserGateway {
     boolean checkPhone(String phone, String code);
 
     /**
-     * 上传轮播图
-     * @param file 图片文件
-     * @throws IOException IO异常
-     */
-//    void uploadCarousel(MultipartFile file) throws IOException;
-
-    /**
      * 获取文件列表
      *
      * @param fileType 文件类型

+ 0 - 1
portal-service-domain/src/main/java/com/hfln/portal/domain/gateway/WebGateway.java

@@ -22,7 +22,6 @@ public interface WebGateway {
     /**
      * web设备列表相关
      */
-
     UploadRes uploadDev(MultipartFile file) throws IOException;
 
     PageRecord<DeviceDTO> queryDevList(DeviceListQueryReq queryReq);