Merge branch 'han' of uskycloud/usky-modules into server-165

service-alarm/pom.xml

@@ -8,13 +8,13 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>service-iot</artifactId>
+    <artifactId>service-alarm</artifactId>
 
     <packaging>pom</packaging>
     <version>0.0.1</version>
 
     <modules>
-        <module>service-iot-biz</module>
-        <module>service-iot-api</module>
+        <module>service-alarm-biz</module>
+        <module>service-alarm-api</module>
     </modules>
 </project>

service-alarm/service-alarm-api/pom.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>service-iot</artifactId>
+        <artifactId>service-alarm</artifactId>
         <groupId>com.usky</groupId>
         <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>service-iot-api</artifactId>
+    <artifactId>service-alarm-api</artifactId>
     <!-- SpringCloud Openfeign -->
     <dependencies>
         <dependency>

service-alarm/service-alarm-api/src/main/java/com/usky/alarm/RemoteUserService.java

@@ -1,4 +1,4 @@
-package com.usky.iot;
+package com.usky.alarm;
 
 
 import com.usky.common.core.bean.ApiResult;

service-alarm/service-alarm-api/src/main/java/com/usky/iot/RemoteUserService.java

@@ -1,28 +0,0 @@
-package com.usky.iot;
-
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.iot.domain.SysUserVO;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-
-@FeignClient(contextId = "remoteUserService", value = "usky-demo")
-public interface RemoteUserService {
-
-
-
-    @GetMapping("/byUserName")
-    ApiResult<List<SysUserVO>> getByUserName(@RequestParam("userName") String userName);
-
-
-    @PostMapping("/byUserName")
-    ApiResult<List<SysUserVO>> add(@RequestBody SysUserVO sysUserVO);
-
-
-    @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    ApiResult<String> upload(@RequestPart(value = "file") MultipartFile file);
-}

service-alarm/service-alarm-api/src/main/java/com/usky/iot/factory/RemoteUserFallbackFactory.java

@@ -1,48 +0,0 @@
-package com.usky.iot.factory;
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.exception.BusinessException;
-import com.usky.iot.RemoteUserService;
-import com.usky.iot.domain.SysUserVO;
-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;
-
-import java.util.List;
-
-
-/**
- * 用户服务降级处理
- *
- * @author ruoyi
- */
-@Component
-public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService>
-{
-    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
-
-    @Override
-    public RemoteUserService create(Throwable throwable)
-    {
-        log.error("用户服务调用失败:{}", throwable.getMessage());
-        return new RemoteUserService() {
-            @Override
-            public ApiResult<List<SysUserVO>> getByUserName(String userName) {
-                throw new BusinessException(throwable.getMessage());
-            }
-
-            @Override
-            public ApiResult<List<SysUserVO>> add(SysUserVO sysUserVO) {
-                throw new BusinessException(throwable.getMessage());
-            }
-
-            @Override
-            public ApiResult<String> upload(MultipartFile file) {
-                throw new BusinessException(throwable.getMessage());
-            }
-        };
-    }
-}

service-alarm/service-alarm-biz/pom.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>service-iot</artifactId>
+        <artifactId>service-alarm</artifactId>
         <groupId>com.usky</groupId>
         <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>service-iot-biz</artifactId>
+    <artifactId>service-alarm-biz</artifactId>
     <dependencies>
         <dependency>
             <groupId>com.usky</groupId>
@@ -34,8 +34,8 @@
 
         <dependency>
             <groupId>com.aliyun</groupId>
-            <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
-            <version>1.1.0</version>
+            <artifactId>aliyun-java-sdk-dyvmsapi</artifactId>
+            <version>1.2.2</version>
         </dependency>
 
         <!--MQTT依赖-->
@@ -79,10 +79,6 @@
                     <configFile>./src/main/resources/smart-doc.json</configFile>
                     <!--指定项目名称-->
                     <projectName>test</projectName>
-                    <!--                    <excludes>-->
-                    <!--                        <exclude>com.bizmatics:product-service-provider</exclude>-->
-                    <!--                        <exclude>cn.afterturn:easypoi-web</exclude>-->
-                    <!--                    </excludes>-->
                 </configuration>
             </plugin>
         </plugins>

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/RuoYiSystemApplication.java

@@ -1,4 +1,4 @@
-package com.usky.iot;
+package com.usky.alarm;
 
 
 import org.mybatis.spring.annotation.MapperScan;
@@ -22,7 +22,7 @@ import java.net.UnknownHostException;
 
 
 @EnableFeignClients(basePackages = "com.usky")
-@MapperScan(value = "com.usky.iot.mapper")
+@MapperScan(value = "com.usky.alarm.mapper")
 @ComponentScan("com.usky")
 @SpringBootApplication
 public class RuoYiSystemApplication

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/controller/MybatisGeneratorUtils.java

@@ -1,4 +1,4 @@
-package com.usky.iot.controller;//package com.usky.iot.controller;//package com.usky.dm.controller.web.business;//package com.usky.dm.controller.web;
+package com.usky.alarm.controller;//package com.usky.iot.controller;//package com.usky.dm.controller.web.business;//package com.usky.dm.controller.web;
 
 
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
@@ -18,7 +18,7 @@ import java.util.List;
 public class MybatisGeneratorUtils {
     public static void main(String[] args) {
 
-            shell("service-iot","service-iot-biz");
+            shell("service-alarm","service-alarm-biz");
     }
 
     private static void shell(String parentName,String model) {
@@ -51,7 +51,7 @@ public class MybatisGeneratorUtils {
 
         // 3、包配置
         PackageConfig pc = new PackageConfig();
-        pc.setParent("com.usky.iot");
+        pc.setParent("com.usky.alarm");
         pc.setController("controller.web");
         pc.setEntity("domain");
         pc.setMapper("mapper");
@@ -71,7 +71,7 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude("base_build");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("sys_user");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录
@@ -94,7 +94,7 @@ public class MybatisGeneratorUtils {
             @Override
             public String outputFile(TableInfo tableInfo) {
                 // 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！
-                return finalProjectPath + "/src/main/resources/mapper/iot" + "/"
+                return finalProjectPath + "/src/main/resources/mapper/alarm" + "/"
                         + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
             }
         });

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/controller/web/BaseAlarmController.java

@@ -0,0 +1,40 @@
+package com.usky.alarm.controller.web;
+
+
+import com.aliyuncs.exceptions.ClientException;
+import com.usky.alarm.domain.BaseAlarm;
+import com.usky.alarm.service.BaseAlarmService;
+import com.usky.common.core.bean.ApiResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 统一告警表 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-22
+ */
+@RestController
+@RequestMapping("/baseAlarm")
+public class BaseAlarmController {
+
+    @Autowired
+    private BaseAlarmService baseAlarmService;
+
+    /**
+     * 新增
+     * @param baseAlarm
+     * @return
+     */
+    @PostMapping("/alarmInfo")
+    public ApiResult<Void> add(@RequestBody BaseAlarm baseAlarm) throws ClientException {
+        baseAlarmService.add(baseAlarm);
+        return ApiResult.success();
+    }
+}
+

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/controller/web/BaseAlarmNoticeController.java

@@ -0,0 +1,21 @@
+package com.usky.alarm.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 告警通知配置 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-25
+ */
+@Controller
+@RequestMapping("/baseAlarmNotice")
+public class BaseAlarmNoticeController {
+
+}
+

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/controller/web/BaseAlarmNoticeResultController.java

@@ -0,0 +1,21 @@
+package com.usky.alarm.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 告警通知结果 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-25
+ */
+@Controller
+@RequestMapping("/baseAlarmNoticeResult")
+public class BaseAlarmNoticeResultController {
+
+}
+

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/controller/web/BaseAlarmTypeController.java

@@ -0,0 +1,21 @@
+package com.usky.alarm.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 告警类型表 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-22
+ */
+@Controller
+@RequestMapping("/baseAlarmType")
+public class BaseAlarmTypeController {
+
+}
+

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/controller/web/BaseBuildController.java

@@ -1,14 +1,10 @@
-package com.usky.iot.controller.web;
+package com.usky.alarm.controller.web;
 
 
+import com.aliyuncs.dyvmsapi.model.v20170525.SingleCallByTtsResponse;
+import com.aliyuncs.exceptions.ClientException;
+import com.usky.alarm.service.config.voice.VoiceNotice;
 import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.bean.CommonPage;
-import com.usky.iot.domain.BaseBuild;
-import com.usky.iot.domain.BaseBuildFacility;
-import com.usky.iot.domain.BaseBuildFacilityType;
-import com.usky.iot.domain.BaseGgpFacility;
-import com.usky.iot.service.BaseBuildService;
-import com.usky.iot.service.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -16,7 +12,7 @@ import java.util.List;
 
 /**
  * <p>
- * 建筑信息 前端控制器
+ * ceshi前端控制器
  * </p>
  *
  * @author han
@@ -25,103 +21,17 @@ import java.util.List;
 @RestController
 @RequestMapping("/baseBuild")
 public class BaseBuildController {
-    @Autowired
-    private BaseBuildService baseBuildService;
 
+    @Autowired
+    private VoiceNotice voiceNotice;
     /**
      * 新增
-     * @param baseBuild
-     * @return
-     */
-    @PostMapping
-    ApiResult<Void> add(@RequestBody BaseBuild baseBuild){
-        baseBuildService.add(baseBuild);
-        return ApiResult.success();
-    }
-
-    /**
-     * 修改
-     * @param baseBuild
-     * @return
-     */
-    @PutMapping
-    ApiResult<Void> update(@RequestBody BaseBuild baseBuild){
-        baseBuildService.update(baseBuild);
-        return ApiResult.success();
-    }
-
-    /**
-     * 删除
-     * @param id
-     * @return
-     */
-    @DeleteMapping("/{id}")
-    ApiResult<Void> remove(@PathVariable("id") Integer id){
-        baseBuildService.remove(id);
-        return ApiResult.success();
-    }
-
-    /**
-     * 列表
-     * @param id
-     * @return
-     */
-    @GetMapping("dataList")
-    ApiResult<List<BaseBuild>> dataList(@RequestParam(value = "id",required = false) Integer id){
-        return ApiResult.success(baseBuildService.dataList(id));
-    }
-
-    /**
-     * 关联设施信息列表
-     * @param requestVO
-     * @return
-     */
-    @PostMapping("buildFacilityRelateList")
-    ApiResult<CommonPage<BuildFacilityRelateResponeVO>> buildFacilityRelateList(@RequestBody BuildFacilityRelateRequestVO requestVO){
-        return ApiResult.success(baseBuildService.buildFacilityRelateList(requestVO));
-    }
-
-    /**
-     * 建筑设施绑定
-     * @param statusVO
-     * @return
-     */
-    @PostMapping("setBuildFacilityStatus")
-    ApiResult<Void> setBuildFacilityStatus(@RequestBody BuildFacilityStatusVO statusVO){
-        baseBuildService.setBuildFacilityStatus(statusVO);
-        return ApiResult.success();
-    }
-
-    /**
-     * 建筑设施关联查询
-     *
-     * @param baseBuildFacilityVO
-     * @return
-     */
-    @PostMapping("buildFacilityInfo")
-    public ApiResult<List<Object>> buildFacilityInfo(@RequestBody BaseBuildFacilityVO baseBuildFacilityVO) {
-        return ApiResult.success(baseBuildService.buildFacilityInfo(baseBuildFacilityVO));
-    }
-
-    /**
-     * 类型设施关联查询
-     *
-     * @param baseBuildFacilityVO
-     * @return
-     */
-    @PostMapping("typeFacilityInfo")
-    public ApiResult<List<BaseBuildFacility>> typeFacilityInfo(@RequestBody BaseBuildFacilityVO baseBuildFacilityVO) {
-        return ApiResult.success(baseBuildService.typeFacilityInfo(baseBuildFacilityVO));
-    }
-
-    /**
-     * 建筑关联类型查询
-     * @param id  主键ID
      * @return
      */
-    @GetMapping("buildTypeInfo")
-    public ApiResult<List<BaseBuildFacilityType>> buildTypeInfo(@RequestParam(value = "id") Integer id) {
-        return ApiResult.success(baseBuildService.buildTypeInfo(id));
+    @PostMapping("/alarmInfo")
+    public SingleCallByTtsResponse add() throws ClientException {
+        SingleCallByTtsResponse code = voiceNotice.sendCVoice("15122423833","视频监控","火点侦测","2023-09-12 10:01:54");
+        return code;
     }
 }
 

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/controller/web/BaseFacilityDeviceController.java

@@ -0,0 +1,21 @@
+package com.usky.alarm.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 地理设施设备关联表 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-22
+ */
+@Controller
+@RequestMapping("/baseFacilityDevice")
+public class BaseFacilityDeviceController {
+
+}
+

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/controller/web/DmpDeviceController.java

@@ -0,0 +1,21 @@
+package com.usky.alarm.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 设备信息表 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-22
+ */
+@Controller
+@RequestMapping("/dmpDevice")
+public class DmpDeviceController {
+
+}
+

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/controller/web/DmpProductController.java

@@ -0,0 +1,21 @@
+package com.usky.alarm.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 产品信息表 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-22
+ */
+@Controller
+@RequestMapping("/dmpProduct")
+public class DmpProductController {
+
+}
+

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/controller/web/SysUserController.java

@@ -0,0 +1,21 @@
+package com.usky.alarm.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 用户信息表 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-26
+ */
+@Controller
+@RequestMapping("/sysUser")
+public class SysUserController {
+
+}
+

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/controller/web/TaskController.java

@@ -1,8 +1,6 @@
-package com.usky.iot.controller.web;
+package com.usky.alarm.controller.web;
 
-import com.usky.iot.service.CrmCustomInfoService;
-import com.usky.iot.service.DmpDeviceStatusService;
-import com.usky.iot.service.job.DmpDataOverviewJob;
+import com.usky.alarm.service.job.DmpDataOverviewJob;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -18,27 +16,8 @@ public class TaskController {
     @Autowired
     private DmpDataOverviewJob dmpDataOverviewJob;
 
-    @Autowired
-    private DmpDeviceStatusService dmpDeviceStatusService;
-
-    @Autowired
-    private CrmCustomInfoService crmCustomInfoService;
-
     @Scheduled(cron = "0 0 1 * * ? ") //每天凌晨1点执行
     public void task() {
         System.out.println(Thread.currentThread().getName() + "定时任务执行中");
-        dmpDataOverviewJob.execute();
     }
-//    @Scheduled(cron = "0 0/1 * * * ? ") //每天凌晨1点执行
-//    public void task1() {
-//        System.out.println(Thread.currentThread().getName() + "定时任务执行中");
-//        dmpDeviceStatusService.status();
-//    }
-
-    @Scheduled(cron = "0 30 * * * ? ") //每天凌晨0点30分执行
-    public void task2() {
-        System.out.println(Thread.currentThread().getName() + "定时任务执行中");
-        crmCustomInfoService.updateStatus();
-    }
-
 }

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/domain/BaseAlarm.java

@@ -0,0 +1,167 @@
+package com.usky.alarm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 统一告警表
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseAlarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备ID
+     */
+    private String deviceId;
+
+    /**
+     * 告警时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime alarmTime;
+
+    /**
+     * 告警类型
+     */
+    private String alarmType;
+
+    /**
+     * 告警对象
+     */
+    private String alarmObject;
+
+    /**
+     * 告警值
+     */
+    private String alarmData;
+
+    /**
+     * 告警属性
+     */
+    private String alarmAttribute;
+
+    /**
+     * 告警内容
+     */
+    private String alarmContent;
+
+    /**
+     * 告警等级;1 一级，2 二级，3 三级，4 四级，5 五级
+     */
+    private Integer alarmGrade;
+
+    /**
+     * 告警位置
+     */
+    private String alarmAddress;
+
+    /**
+     * 处理人
+     */
+    private String handleBy;
+
+    /**
+     * 处理时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime handleTime;
+
+    /**
+     * 处理内容
+     */
+    private String handleContent;
+
+    /**
+     * 处理人电话
+     */
+    private String handlePhone;
+
+    /**
+     * 处理状态;0 未处理，1 已处理
+     */
+    private Integer handleStatus;
+
+    /**
+     * 是否误报;0 非误报，1 误报
+     */
+    private Integer alarmFalse;
+
+    /**
+     * 现场照片
+     */
+    private String sitePhoto;
+
+    /**
+     * 产品编码
+     */
+    private String productCode;
+
+    /**
+     * 组织机构ID
+     */
+    private Integer deptId;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
+    /**
+     * 单位名称
+     */
+    @TableField(exist = false)
+    private String companyName;
+
+    /**
+     * 设备名称
+     */
+    @TableField(exist = false)
+    private String deviceName;
+
+    /**
+     * 处理范围
+     */
+    @TableField(exist = false)
+    private Integer handleRange;
+
+    /**
+     * 图标
+     */
+    @TableField(exist = false)
+    private String typeImg;
+
+    /**
+     * 设施编号
+     */
+    @TableField(exist = false)
+    private Integer facilityId;
+
+    /**
+     * 转换时间
+     */
+    @TableField(exist = false)
+    private String alarmTime1;
+
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/domain/BaseAlarmNotice.java

@@ -0,0 +1,106 @@
+package com.usky.alarm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 告警通知配置
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseAlarmNotice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 系统编码
+     */
+    private String productCode;
+
+    /**
+     * 告警类型编码
+     */
+    private String typeCode;
+
+    /**
+     * 第一次接收人
+     */
+    private String receiver1;
+
+    /**
+     * 第二次接收人
+     */
+    private String receiver2;
+
+    /**
+     * 第三次接收人
+     */
+    private String receiver3;
+
+    /**
+     * 第一次超时时间
+     */
+    private Integer timeOut1;
+
+    /**
+     * 第二次超时时间
+     */
+    private Integer timeOut2;
+
+    /**
+     * 通知方式
+     */
+    private String noticeMethod;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新人
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 删除标识
+     */
+    private Integer deleteFlag;
+
+    /**
+     * 组织机构ID
+     */
+    private Integer deptId;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/domain/BaseAlarmNoticeResult.java

@@ -0,0 +1,66 @@
+package com.usky.alarm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 告警通知结果
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseAlarmNoticeResult implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 接收人
+     */
+    private String receiver;
+
+    /**
+     * 通知结果
+     */
+    private Integer noticeResult;
+
+    /**
+     * 告警ID
+     */
+    private Integer alarmId;
+
+    /**
+     * 通知时间
+     */
+    private LocalDateTime noticeTime;
+
+    /**
+     * 是否已读
+     */
+    private Integer isRead;
+
+    /**
+     * 组织机构ID
+     */
+    private Integer deptId;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/domain/BaseAlarmType.java

@@ -0,0 +1,91 @@
+package com.usky.alarm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 告警类型表
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseAlarmType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 类型编码
+     */
+    private String typeCode;
+
+    /**
+     * 类型简称
+     */
+    private String typeAbbrevia;
+
+    /**
+     * 类型名称
+     */
+    private String typeName;
+
+    /**
+     * 图标
+     */
+    private String typeImg;
+
+    /**
+     * 告警描述
+     */
+    private String alarmDesc;
+
+    /**
+     * 删除标识
+     */
+    private Integer deleteFlag;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新人
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 组织机构ID
+     */
+    private Integer deptId;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/domain/BaseFacilityDevice.java

@@ -0,0 +1,51 @@
+package com.usky.alarm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 地理设施设备关联表
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseFacilityDevice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设施id
+     */
+    private Integer facilityId;
+
+    /**
+     * 设备id
+     */
+    private String deviceId;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/domain/DmpDevice.java

@@ -0,0 +1,126 @@
+package com.usky.alarm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 设备信息表
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DmpDevice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备ID;设备注册时系统自动生成一个唯一编号
+     */
+    private String deviceId;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备类型（501、监控系统  502、门禁系统  503、梯控系统  504、机房系统  509、环境系统  510、照明系统）
+     */
+    private Integer deviceType;
+
+    /**
+     * 产品ID
+     */
+    private Integer productId;
+
+    /**
+     * 物联网卡号
+     */
+    private String simCode;
+
+    /**
+     * 国际移动用户识别码
+     */
+    private String imsiCode;
+
+    /**
+     * 自动订阅标识（0：否，1：是）
+     */
+    private Integer subscribeFlag;
+
+    /**
+     * 节点类型
+     */
+    private Integer nodeType;
+
+    /**
+     * 分组id
+     */
+    private Integer groupId;
+
+    /**
+     * 删除标识
+     */
+    private Integer deleteFlag;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 租户号
+     */
+    private Integer tenantId;
+
+    /**
+     * 单位编号
+     */
+    private String companyCode;
+
+    /**
+     * 安装位置
+     */
+    private String installAddress;
+
+    /**
+     * 业务状态;1：未激活，2：已激活，3：禁用
+     */
+    private Integer serviceStatus;
+
+    /**
+     * 产品编码
+     */
+    private String productCode;
+
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/domain/DmpProduct.java

@@ -0,0 +1,141 @@
+package com.usky.alarm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 产品信息表
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DmpProduct implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 产品名称
+     */
+    private String productName;
+
+    /**
+     * 接入方式（1、设备直连  2、网关接入）
+     */
+    private Integer accessMode;
+
+    /**
+     * 网络类型（1、WIFI  2、移动蜂窝数据 3、NB-IoT 4、以太网）
+     */
+    private Integer networkType;
+
+    /**
+     * 设备类型（501、监控系统  502、门禁系统  503、梯控系统  504、机房系统  509、环境系统  510、照明系统）
+     */
+    private Integer deviceType;
+
+    /**
+     * 通信协议（1、MQTT  2、TCP设备直连 3、HTTP）
+     */
+    private Integer comProtocol;
+
+    /**
+     * 认证方式
+     */
+    private String authMode;
+
+    /**
+     * 设备型号
+     */
+    private String deviceModel;
+
+    /**
+     * 产品描述
+     */
+    private String productDescribe;
+
+    /**
+     * 厂家名称
+     */
+    private String factoryName;
+
+    /**
+     * 厂家联系人
+     */
+    private String factoryPerson;
+
+    /**
+     * 厂家联系电话
+     */
+    private String factoryPhone;
+
+    /**
+     * 资质证书1
+     */
+    private String certificateUrl1;
+
+    /**
+     * 资质证书2
+     */
+    private String certificateUrl2;
+
+    /**
+     * 资质证书3
+     */
+    private String certificateUrl3;
+
+    /**
+     * 协议文档
+     */
+    private String agreementUrl;
+
+    /**
+     * 删除标识
+     */
+    private Integer deleteFlag;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 租户号
+     */
+    private Integer tenantId;
+
+    /**
+     * 产品编码
+     */
+    private String productCode;
+
+
+}

service-alarm/service-alarm-api/src/main/java/com/usky/iot/domain/SysUserVO.java → service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/domain/SysUser.java

@@ -1,16 +1,30 @@
-package com.usky.iot.domain;
-
-
-import lombok.Data;
+package com.usky.alarm.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
-
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 用户信息表
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-26
+ */
 @Data
-public class SysUserVO {
+@EqualsAndHashCode(callSuper = false)
+public class SysUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * 用户ID
      */
+    @TableId(value = "user_id", type = IdType.AUTO)
     private Long userId;
 
     /**
@@ -29,7 +43,7 @@ public class SysUserVO {
     private String nickName;
 
     /**
-     * 用户类型（00系统用户）
+     * 用户类型（00系统用户， 01 租户管理员）
      */
     private String userType;
 
@@ -48,6 +62,11 @@ public class SysUserVO {
      */
     private String sex;
 
+    /**
+     * 姓名
+     */
+    private String fullName;
+
     /**
      * 头像地址
      */
@@ -102,4 +121,16 @@ public class SysUserVO {
      * 备注
      */
     private String remark;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+
 }

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/mapper/BaseAlarmMapper.java

@@ -0,0 +1,17 @@
+package com.usky.alarm.mapper;
+
+import com.usky.alarm.domain.BaseAlarm;
+import com.usky.alarm.domain.BaseAlarmType;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 统一告警表 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-22
+ */
+public interface BaseAlarmMapper extends CrudMapper<BaseAlarm> {
+    BaseAlarmType getAlarmTypeOne(String alarmType);
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/mapper/BaseAlarmNoticeMapper.java

@@ -0,0 +1,16 @@
+package com.usky.alarm.mapper;
+
+import com.usky.alarm.domain.BaseAlarmNotice;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 告警通知配置 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-25
+ */
+public interface BaseAlarmNoticeMapper extends CrudMapper<BaseAlarmNotice> {
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/mapper/BaseAlarmNoticeResultMapper.java

@@ -0,0 +1,16 @@
+package com.usky.alarm.mapper;
+
+import com.usky.alarm.domain.BaseAlarmNoticeResult;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 告警通知结果 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-25
+ */
+public interface BaseAlarmNoticeResultMapper extends CrudMapper<BaseAlarmNoticeResult> {
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/mapper/BaseAlarmTypeMapper.java

@@ -0,0 +1,16 @@
+package com.usky.alarm.mapper;
+
+import com.usky.alarm.domain.BaseAlarmType;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 告警类型表 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-22
+ */
+public interface BaseAlarmTypeMapper extends CrudMapper<BaseAlarmType> {
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/mapper/BaseFacilityDeviceMapper.java

@@ -0,0 +1,16 @@
+package com.usky.alarm.mapper;
+
+import com.usky.alarm.domain.BaseFacilityDevice;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 地理设施设备关联表 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-22
+ */
+public interface BaseFacilityDeviceMapper extends CrudMapper<BaseFacilityDevice> {
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/mapper/DmpDeviceMapper.java

@@ -0,0 +1,16 @@
+package com.usky.alarm.mapper;
+
+import com.usky.alarm.domain.DmpDevice;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 设备信息表 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-22
+ */
+public interface DmpDeviceMapper extends CrudMapper<DmpDevice> {
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/mapper/DmpProductMapper.java

@@ -0,0 +1,16 @@
+package com.usky.alarm.mapper;
+
+import com.usky.alarm.domain.DmpProduct;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 产品信息表 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-22
+ */
+public interface DmpProductMapper extends CrudMapper<DmpProduct> {
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/mapper/SysUserMapper.java

@@ -0,0 +1,18 @@
+package com.usky.alarm.mapper;
+
+import com.usky.alarm.domain.SysUser;
+import com.usky.common.mybatis.core.CrudMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 用户信息表 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-26
+ */
+@Repository
+public interface SysUserMapper extends CrudMapper<SysUser> {
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/BaseAlarmNoticeResultService.java

@@ -0,0 +1,16 @@
+package com.usky.alarm.service;
+
+import com.usky.alarm.domain.BaseAlarmNoticeResult;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 告警通知结果 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-25
+ */
+public interface BaseAlarmNoticeResultService extends CrudService<BaseAlarmNoticeResult> {
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/BaseAlarmNoticeService.java

@@ -0,0 +1,16 @@
+package com.usky.alarm.service;
+
+import com.usky.alarm.domain.BaseAlarmNotice;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 告警通知配置 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-25
+ */
+public interface BaseAlarmNoticeService extends CrudService<BaseAlarmNotice> {
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/BaseAlarmService.java

@@ -0,0 +1,17 @@
+package com.usky.alarm.service;
+
+import com.aliyuncs.exceptions.ClientException;
+import com.usky.alarm.domain.BaseAlarm;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 统一告警表 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-22
+ */
+public interface BaseAlarmService extends CrudService<BaseAlarm> {
+    boolean add(BaseAlarm baseAlarm) throws ClientException;
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/BaseAlarmTypeService.java

@@ -0,0 +1,16 @@
+package com.usky.alarm.service;
+
+import com.usky.alarm.domain.BaseAlarmType;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 告警类型表 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-22
+ */
+public interface BaseAlarmTypeService extends CrudService<BaseAlarmType> {
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/BaseFacilityDeviceService.java

@@ -0,0 +1,16 @@
+package com.usky.alarm.service;
+
+import com.usky.alarm.domain.BaseFacilityDevice;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 地理设施设备关联表 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-22
+ */
+public interface BaseFacilityDeviceService extends CrudService<BaseFacilityDevice> {
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/DmpDeviceService.java

@@ -0,0 +1,16 @@
+package com.usky.alarm.service;
+
+import com.usky.alarm.domain.DmpDevice;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 设备信息表 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-22
+ */
+public interface DmpDeviceService extends CrudService<DmpDevice> {
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/DmpProductService.java

@@ -0,0 +1,16 @@
+package com.usky.alarm.service;
+
+import com.usky.alarm.domain.DmpProduct;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 产品信息表 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-22
+ */
+public interface DmpProductService extends CrudService<DmpProduct> {
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/SysUserService.java

@@ -0,0 +1,16 @@
+package com.usky.alarm.service;
+
+import com.usky.alarm.domain.SysUser;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 用户信息表 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-26
+ */
+public interface SysUserService extends CrudService<SysUser> {
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/config/DateStringConvert.java

@@ -1,4 +1,4 @@
-package com.usky.iot.service.config;
+package com.usky.alarm.service.config;
 
 
 import com.usky.common.core.util.DateUtils;

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/config/FormatterConfiguration.java

@@ -1,4 +1,4 @@
-package com.usky.iot.service.config;
+package com.usky.alarm.service.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/config/StringDateConverter.java

@@ -1,4 +1,4 @@
-package com.usky.iot.service.config;
+package com.usky.alarm.service.config;
 
 
 import com.usky.common.core.util.DateUtils;

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/config/mqtt/MqttBaseConfig.java

@@ -1,4 +1,4 @@
-package com.usky.iot.service.config.mqtt;
+package com.usky.alarm.service.config.mqtt;
 
 import lombok.Data;
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/config/mqtt/MqttOutConfig.java

@@ -1,4 +1,4 @@
-package com.usky.iot.service.config.mqtt;
+package com.usky.alarm.service.config.mqtt;
 
 
 import org.springframework.beans.factory.annotation.Autowired;

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/config/voice/VoiceNotice.java

@@ -1,2 +1,69 @@
-package com.usky.alarm.service.config.voice;public class VoiceNotice {
+package com.usky.alarm.service.config.voice;
+/**
+ * 语音拨号API
+ *
+ * @author han
+ * @date 2023/9/12
+ */
+import com.aliyuncs.DefaultAcsClient;
+import com.aliyuncs.IAcsClient;
+import com.aliyuncs.dyvmsapi.model.v20170525.SingleCallByTtsRequest;
+import com.aliyuncs.dyvmsapi.model.v20170525.SingleCallByTtsResponse;
+import com.aliyuncs.exceptions.ClientException;
+import com.aliyuncs.profile.DefaultProfile;
+import com.aliyuncs.profile.IClientProfile;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/**
+ * 阿里云语音服务调用接口 - 根据文本模板来进行语音通知
+ */
+@Component
+public class VoiceNotice {
+    @Value("${oss.product}")
+    private String product;
+    @Value("${oss.domain}")
+    private String domain;
+    @Value("${oss.accessKeyId}")
+    private String accessKeyId;
+    @Value("${oss.accessKeySecret}")
+    private String accessKeySecret;
+
+    /**
+     * 调用阿里云语音服务的方法
+     *    当address为空的时候, 就说明不是采用面对面咨询的方式
+     *    使用GeneralUtil.isNotNullAndEmpty(address)判断
+     *
+     * @return
+     * @throws ClientException
+     */
+    public SingleCallByTtsResponse sendCVoice(String phone, String visitorName, String gz,String bjsj) throws ClientException{
+        //设置访问超时时间
+        System.setProperty("sun.net.client.defaultConnectTimeout", "10000");
+        System.setProperty("sun.net.client.defaultReadTimeout", "10000");
+        //初始化acsClient 暂时不支持多region
+        IClientProfile profile = DefaultProfile.getProfile("cn-hangzhou", accessKeyId, accessKeySecret);
+        DefaultProfile.addEndpoint("cn-hangzhou", product, domain);
+        IAcsClient acsClient = new DefaultAcsClient(profile);
+        SingleCallByTtsRequest request = new SingleCallByTtsRequest();
+        //必填-被叫显号,可在语音控制台中找到所购买的显号
+        request.setCalledShowNumber("07952097202");
+        //必填-被叫号码
+        request.setCalledNumber(phone);
+        //必填-Tts模板ID
+        request.setTtsCode("TTS_173475471");
+        // 这里主要是填写我们语音文字模板里面的参数 ${param}
+        request.setTtsParam("{\"type\":\"" + visitorName +"\", \"gz\":\"" + gz + "\", \"bjsj\":\"" + bjsj + "\"}");
+        //可选-音量 取值范围 0--200
+        request.setVolume(200);
+        //可选-播放次数
+        request.setPlayTimes(2);
+        //可选-外部扩展字段,此ID将在回执消息中带回给调用方
+        SingleCallByTtsResponse singleCallByTtsResponse = acsClient.getAcsResponse(request);
+        if(singleCallByTtsResponse.getCode() != null && singleCallByTtsResponse.getCode().equals("OK")) {
+            //请求成功
+            System.out.print(singleCallByTtsResponse.getRequestId()+singleCallByTtsResponse.getCode()+"15122423833");
+        }
+        return singleCallByTtsResponse;
+    }
 }

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/config/websocket/WebSocket.java

@@ -1,4 +1,4 @@
-package com.usky.iot.service.config.websocket;
+package com.usky.alarm.service.config.websocket;
 
 import cn.hutool.json.JSONUtil;
 import org.springframework.stereotype.Component;

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/config/websocket/WebSocketConfig.java

@@ -1,4 +1,4 @@
-package com.usky.iot.service.config.websocket;
+package com.usky.alarm.service.config.websocket;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/impl/BaseAlarmNoticeResultServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.alarm.service.impl;
+
+import com.usky.alarm.domain.BaseAlarmNoticeResult;
+import com.usky.alarm.mapper.BaseAlarmNoticeResultMapper;
+import com.usky.alarm.service.BaseAlarmNoticeResultService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 告警通知结果 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-25
+ */
+@Service
+public class BaseAlarmNoticeResultServiceImpl extends AbstractCrudService<BaseAlarmNoticeResultMapper, BaseAlarmNoticeResult> implements BaseAlarmNoticeResultService {
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/impl/BaseAlarmNoticeServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.alarm.service.impl;
+
+import com.usky.alarm.domain.BaseAlarmNotice;
+import com.usky.alarm.mapper.BaseAlarmNoticeMapper;
+import com.usky.alarm.service.BaseAlarmNoticeService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 告警通知配置 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-25
+ */
+@Service
+public class BaseAlarmNoticeServiceImpl extends AbstractCrudService<BaseAlarmNoticeMapper, BaseAlarmNotice> implements BaseAlarmNoticeService {
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/impl/BaseAlarmServiceImpl.java

@@ -0,0 +1,128 @@
+package com.usky.alarm.service.impl;
+
+import com.aliyuncs.dyvmsapi.model.v20170525.SingleCallByTtsResponse;
+import com.aliyuncs.exceptions.ClientException;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.alarm.domain.*;
+import com.usky.alarm.mapper.BaseAlarmMapper;
+import com.usky.alarm.mapper.SysUserMapper;
+import com.usky.alarm.service.*;
+import com.usky.alarm.service.config.voice.VoiceNotice;
+import com.usky.alarm.service.config.websocket.WebSocket;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+/**
+ * <p>
+ * 统一告警表 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-22
+ */
+@Service
+public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, BaseAlarm> implements BaseAlarmService {
+
+    @Autowired
+    private DmpProductService dmpProductService;
+
+    @Autowired
+    private DmpDeviceService dmpDeviceInfoService;
+
+    @Autowired
+    private BaseFacilityDeviceService baseFacilityDeviceService;
+
+    @Autowired
+    private BaseAlarmNoticeService baseAlarmNoticeService;
+
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
+    @Autowired
+    private WebSocket webSocket;
+
+    @Autowired
+    private VoiceNotice voiceNotice;
+
+    @Override
+    public boolean add(BaseAlarm baseAlarm) throws ClientException {
+        baseAlarm.setHandleStatus(0);
+        if (StringUtils.isNotBlank(baseAlarm.getProductCode()) && StringUtils.isNotBlank(baseAlarm.getDeviceId()) && StringUtils.isNotBlank(baseAlarm.getAlarmType())){
+            LambdaQueryWrapper<DmpProduct> lambdaQuery = Wrappers.lambdaQuery();
+            lambdaQuery.eq(DmpProduct::getProductCode,baseAlarm.getProductCode())
+                    .eq(DmpProduct::getDeleteFlag,0);
+            List<DmpProduct> records = dmpProductService.list(lambdaQuery);
+            LambdaQueryWrapper<BaseFacilityDevice> lambdaQuery1 = Wrappers.lambdaQuery();
+            lambdaQuery1.eq(BaseFacilityDevice::getDeviceId,baseAlarm.getDeviceId());
+            List<BaseFacilityDevice> records1 = baseFacilityDeviceService.list(lambdaQuery1);
+            LambdaQueryWrapper<DmpDevice> lambdaQuery2 = Wrappers.lambdaQuery();
+            lambdaQuery2.eq(DmpDevice::getDeviceId,baseAlarm.getDeviceId())
+                    .eq(DmpDevice::getProductCode,baseAlarm.getProductCode())
+                    .eq(DmpDevice::getServiceStatus,2)
+                    .eq(DmpDevice::getDeleteFlag,0);
+            List<DmpDevice> records2 = dmpDeviceInfoService.list(lambdaQuery2);
+            BaseAlarmType baseAlarmType = baseMapper.getAlarmTypeOne(baseAlarm.getAlarmType());
+            if(records.size()>0 && baseAlarmType !=null && records2.size()>0){
+                baseAlarm.setTenantId(records.get(0).getTenantId());
+                if (StringUtils.isNotBlank(baseAlarm.getHandleBy()) || StringUtils.isNotBlank(baseAlarm.getHandlePhone())) {
+                    baseAlarm.setHandleStatus(1);
+                    LambdaQueryWrapper<BaseAlarm> queryWrapper = Wrappers.lambdaQuery();
+                    queryWrapper.eq(BaseAlarm::getDeviceId, baseAlarm.getDeviceId())
+                            .eq(BaseAlarm::getAlarmType, baseAlarm.getAlarmType())
+                            .eq(BaseAlarm::getAlarmAddress, baseAlarm.getAlarmAddress())
+                            .eq(BaseAlarm::getAlarmGrade, baseAlarm.getAlarmGrade());
+                    return this.update(baseAlarm, queryWrapper);
+                } else {
+                    boolean saveResult = this.save(baseAlarm);
+                    if (records1.size() > 0) {
+                        baseAlarm.setFacilityId(records1.get(0).getFacilityId());
+                    }
+                    baseAlarm.setDeviceName(records2.get(0).getDeviceName());
+                    baseAlarm.setTypeImg(baseAlarmType.getTypeImg());
+                    baseAlarm.setAlarmType(baseAlarmType.getTypeName());
+                    baseAlarm.setAlarmTime1(baseAlarm.getAlarmTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd " +
+                            "HH:mm:ss")));
+                    webSocket.sendMessage(baseAlarm, records.get(0).getTenantId().toString());
+                    LambdaQueryWrapper<BaseAlarmNotice> lambdaQuery3 = Wrappers.lambdaQuery();
+                    lambdaQuery3.eq(BaseAlarmNotice::getProductCode,baseAlarm.getProductCode())
+                            .eq(BaseAlarmNotice::getTypeCode,baseAlarmType.getTypeCode())
+                            .eq(BaseAlarmNotice::getDeleteFlag,0);
+                    List<BaseAlarmNotice> records3 = baseAlarmNoticeService.list(lambdaQuery3);
+                    if (records3.size()>0){
+                        if (records3.get(0).getNoticeMethod().contains("电话")){
+                            String[] array = records3.get(0).getReceiver1().split(",");
+                            for (String s : array) {
+                                LambdaQueryWrapper<SysUser> lambdaQuery4 = Wrappers.lambdaQuery();
+                                lambdaQuery4.eq(SysUser::getUserId,s)
+                                        .eq(SysUser::getDelFlag,0);
+                                SysUser sysUser = sysUserMapper.selectOne(lambdaQuery4);
+//                                SingleCallByTtsResponse code = voiceNotice.sendCVoice("15122423833","视频监控","火点侦测","2023-09-12 10:01:54");
+                                SingleCallByTtsResponse code = voiceNotice.sendCVoice(sysUser.getPhonenumber(),
+                                        records.get(0).getProductName(),baseAlarmType.getTypeName(),
+                                        baseAlarm.getAlarmTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd " +
+                                        "HH:mm:ss")));
+                            }
+                        }
+                    }
+                    return saveResult;
+                }
+            }else {
+                throw new BusinessException("告警数据投递失败，请检查产品编码、设备编号、告警类型，是否有误;设备是否激活");
+            }
+        }else {
+            throw new BusinessException("告警数据投递失败，请检查产品编码、设备编号、告警类型，不能为空");
+        }
+    }
+
+//    public SingleCallByTtsResponse sendCVoice(String phone,String visitorName,String gz,String bjsj) throws ClientException {
+//        SingleCallByTtsResponse code = voiceNotice.sendCVoice(phone,visitorName,gz,bjsj);
+//        return code;
+//    }
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/impl/BaseAlarmTypeServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.alarm.service.impl;
+
+import com.usky.alarm.domain.BaseAlarmType;
+import com.usky.alarm.mapper.BaseAlarmTypeMapper;
+import com.usky.alarm.service.BaseAlarmTypeService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 告警类型表 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-22
+ */
+@Service
+public class BaseAlarmTypeServiceImpl extends AbstractCrudService<BaseAlarmTypeMapper, BaseAlarmType> implements BaseAlarmTypeService {
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/impl/BaseFacilityDeviceServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.alarm.service.impl;
+
+import com.usky.alarm.domain.BaseFacilityDevice;
+import com.usky.alarm.mapper.BaseFacilityDeviceMapper;
+import com.usky.alarm.service.BaseFacilityDeviceService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 地理设施设备关联表 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-22
+ */
+@Service
+public class BaseFacilityDeviceServiceImpl extends AbstractCrudService<BaseFacilityDeviceMapper, BaseFacilityDevice> implements BaseFacilityDeviceService {
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/impl/DmpDeviceServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.alarm.service.impl;
+
+import com.usky.alarm.domain.DmpDevice;
+import com.usky.alarm.mapper.DmpDeviceMapper;
+import com.usky.alarm.service.DmpDeviceService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 设备信息表 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-22
+ */
+@Service
+public class DmpDeviceServiceImpl extends AbstractCrudService<DmpDeviceMapper, DmpDevice> implements DmpDeviceService {
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/impl/DmpProductServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.alarm.service.impl;
+
+import com.usky.alarm.domain.DmpProduct;
+import com.usky.alarm.mapper.DmpProductMapper;
+import com.usky.alarm.service.DmpProductService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 产品信息表 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-22
+ */
+@Service
+public class DmpProductServiceImpl extends AbstractCrudService<DmpProductMapper, DmpProduct> implements DmpProductService {
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/impl/SysUserServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.alarm.service.impl;
+
+import com.usky.alarm.domain.SysUser;
+import com.usky.alarm.mapper.SysUserMapper;
+import com.usky.alarm.service.SysUserService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户信息表 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-26
+ */
+@Service
+public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUser> implements SysUserService {
+
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/job/DmpDataOverviewJob.java

@@ -1,18 +1,5 @@
-package com.usky.iot.service.job;
+package com.usky.alarm.service.job;
 
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.usky.common.core.util.Arith;
-import com.usky.common.core.util.DateUtils;
-import com.usky.common.security.utils.SecurityUtils;
-import com.usky.iot.domain.DmpDataOverview;
-import com.usky.iot.mapper.DmpDeviceStatusMapper;
-import com.usky.iot.service.DmpDataOverviewService;
-import com.usky.iot.service.vo.DmpDataOverviewVO;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -21,133 +8,4 @@ import java.util.stream.Collectors;
 @Service
 public class DmpDataOverviewJob {
 
-
-    @Autowired
-    private DmpDeviceStatusMapper dmpDeviceStatusMapper;
-
-    @Autowired
-    private DmpDataOverviewService dmpDataOverviewService;
-
-    public void execute(){
-        deviceCount();
-    }
-
-    /**
-     * 设备量分析
-     */
-    public void deviceCount(){
-        Date date = new Date();
-        Date dayStartTime = DateUtils.getDayStartTime(date);
-        Date dayEndTime = DateUtils.getDayEndTime(date);
-        Date firstDayOfMonth = DateUtils.getFirstDayOfMonth(date);
-        Date lastDayOfMonth = DateUtils.getLastDayOfMonth(date);
-
-        Date date1 = DateUtils.setHours(date, 0);
-        Date date2 = DateUtils.setMinutes(date1, 0);
-        Date date3 = DateUtils.setSeconds(date2, 0);
-        Date date4 = DateUtils.setDays(date3, 1);
-        //产品日
-        List<DmpDataOverview> dmpDataOverviews = new ArrayList<>();
-        List<DmpDataOverviewVO> list = getListMap(null, dayStartTime, dayEndTime);
-        //计算产品活跃占比
-        checkRadio(list);
-        for (DmpDataOverviewVO dvo : list) {
-            DmpDataOverview dmpDataOverview = new DmpDataOverview();
-            dmpDataOverview.setCreatedTime(date3);
-            dmpDataOverview.setProductId(dvo.getProductId());
-            dmpDataOverview.setDeviceNumber(JSON.toJSONString(dvo));
-            dmpDataOverviews.add(dmpDataOverview);
-        }
-        dmpDataOverviewService.saveBatch(dmpDataOverviews);
-        //产品月
-        List<DmpDataOverviewVO> monthList = getListMap(null, firstDayOfMonth, lastDayOfMonth);
-        //活跃产品月
-        List<DmpDataOverviewVO> hyList = getHyListMap(null, firstDayOfMonth, lastDayOfMonth);
-        for (DmpDataOverviewVO dmpDataOverviewVO : monthList) {
-            hyList.stream().filter(hy -> Objects.equals(hy.getProductId(), dmpDataOverviewVO.getProductId()))
-                    .findFirst()
-                    .ifPresent(hy -> dmpDataOverviewVO.setHyCount(hy.getHyCount()));
-        }
-        //统计全部时间数据
-        List<DmpDataOverviewVO> allList = getListMap(null, null, null);
-        //计算占比
-        checkRadio(monthList);
-        //查看对应月份数据是否存在
-        List<DmpDataOverview> listByTimeAndIds = getListByTimeAndIds(monthList, firstDayOfMonth,lastDayOfMonth);
-        for (DmpDataOverviewVO dmpDataOverviewVO : monthList) {
-            DmpDataOverview dd = listByTimeAndIds.stream()
-                    .filter(dm -> dmpDataOverviewVO.getProductId().equals(dm.getProductId()) && DateUtils.isSameDay(dm.getCreatedTime(),date4))
-                    .findAny()
-                    .map(dm -> {
-                        dm.setDeviceNumber(JSON.toJSONString(dmpDataOverviewVO));
-                        return dm;
-                    })
-                    .orElseGet(() -> {
-                        DmpDataOverview dmpDataOverview = new DmpDataOverview();
-                        dmpDataOverview.setDeviceNumber(JSON.toJSONString(dmpDataOverviewVO));
-                        dmpDataOverview.setProductId(dmpDataOverviewVO.getProductId());
-                        dmpDataOverview.setCreatedTime(date4);
-                        dmpDataOverview.setCycleType(2);
-                        listByTimeAndIds.add(dmpDataOverview);
-                        return dmpDataOverview;
-                    });
-            allList.stream()
-                    .filter(dvo -> dvo.getProductId().equals(dd.getProductId()))
-                    .findAny()
-                    .ifPresent(dvo -> dd.setMiddleStatistic(JSON.toJSONString(dvo)));
-        }
-        dmpDataOverviewService.saveOrUpdateBatch(listByTimeAndIds);
-    }
-
-    /**
-     * 统计月信息
-     * @param productIds
-     * @param startTime
-     * @param endTime
-     * @return
-     */
-    public List<DmpDataOverview> getListByTimeAndIds(List<DmpDataOverviewVO> productIds,Date startTime,Date endTime){
-        if (CollectionUtils.isNotEmpty(productIds)){
-            List<Integer> productId = productIds.stream()
-                    .map(DmpDataOverviewVO::getProductId)
-                    .collect(Collectors.toList());
-            LambdaQueryWrapper<DmpDataOverview> queryWrapper = Wrappers.lambdaQuery();
-            queryWrapper.in(DmpDataOverview::getProductId,productId)
-                    .between(DmpDataOverview::getCreatedTime,startTime,endTime)
-                    .eq(DmpDataOverview::getCycleType,2);
-            return dmpDataOverviewService.list(queryWrapper);
-        }else {
-            return new ArrayList<>();
-        }
-    }
-
-    public List<DmpDataOverviewVO> getHyListMap(Integer productId,Date startTime,Date endTime){
-        List<DmpDataOverviewVO> list = dmpDeviceStatusMapper.getMonthHyCollect(productId, startTime, endTime, SecurityUtils.getTenantId());
-        DmpDataOverviewVO map = dmpDeviceStatusMapper.getAllMonthHyCollect(productId, startTime, endTime, SecurityUtils.getTenantId());
-        joinList(list,map);
-        return list;
-    }
-
-    public List<DmpDataOverviewVO> getListMap(Integer productId,Date startTime,Date endTime){
-        List<DmpDataOverviewVO> list = dmpDeviceStatusMapper.getDeviceStatusCollect(productId, startTime, endTime, SecurityUtils.getTenantId());
-        //全部产品日
-        DmpDataOverviewVO map = dmpDeviceStatusMapper.getAllCollect(productId, startTime, endTime, SecurityUtils.getTenantId());
-        joinList(list,map);
-        return list;
-    }
-
-    public void joinList(List<DmpDataOverviewVO> list,DmpDataOverviewVO map){
-        Optional.ofNullable(map).ifPresent(map1 -> map.setProductId(0));
-        list.add(map);
-    }
-
-
-    public void checkRadio(List<DmpDataOverviewVO> list){
-        list.forEach(dmpDataOverviewVO -> {
-            dmpDataOverviewVO.setJhRadioCount((null == dmpDataOverviewVO.getDeviceCount() || 0 == dmpDataOverviewVO.getDeviceCount())?0.00: Arith.div(dmpDataOverviewVO.getJhCount(),dmpDataOverviewVO.getDeviceCount()));
-            dmpDataOverviewVO.setHyRadioCount((null == dmpDataOverviewVO.getDeviceCount() || 0 == dmpDataOverviewVO.getDeviceCount())?0.00:Arith.div(dmpDataOverviewVO.getHyCount(),dmpDataOverviewVO.getDeviceCount()));
-        });
-    }
-
-
 }

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/mqtt/MqttStrategy.java

@@ -1,8 +1,8 @@
-package com.usky.iot.service.mqtt;
+package com.usky.alarm.service.mqtt;
 
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.usky.iot.service.vo.MqttBaseVO;
+import com.usky.alarm.service.vo.MqttBaseVO;
 
 import java.util.List;
 import java.util.Map;

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/BaseAlarmListVO.java

@@ -1,51 +0,0 @@
-package com.usky.iot.service.vo;
-
-import lombok.Data;
-
-@Data
-public class BaseAlarmListVO {
-    /**
-     * 页数
-     */
-    private Integer current;
-    /**
-     * 条数
-     */
-    private Integer size;
-
-    /**
-     * 产品编码
-     */
-    private String productCode;
-
-    /**
-     * 单位名称
-     */
-    private String companyName;
-
-    /**
-     * 设备名称
-     */
-    private String deviceName;
-
-    /**
-     * 告警类型
-     */
-    private String alarmType;
-
-    /**
-     * 处理状态;0 未处理，1 已处理
-     */
-    private Integer handleStatus;
-
-    /**
-     * 开始时间
-     */
-    private String startTime;
-
-    /**
-     * 结束时间
-     */
-    private String endTime;
-
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/BaseAlarmRequestVO.java

@@ -1,20 +0,0 @@
-package com.usky.iot.service.vo;
-
-import lombok.Data;
-
-@Data
-public class BaseAlarmRequestVO {
-    /**
-     * 页数
-     */
-    private Integer current;
-    /**
-     * 条数
-     */
-    private Integer size;
-
-    /**
-     * 产品名称
-     */
-    private String productName;
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/BaseAlarmResponeVO.java

@@ -1,62 +0,0 @@
-package com.usky.iot.service.vo;
-
-import lombok.Data;
-
-@Data
-public class BaseAlarmResponeVO {
-
-    /**
-     * 产品名称
-     */
-    private String productName;
-
-    /**
-     * 产品编码
-     */
-    private String productCode;
-
-    /**
-     * 设备类型编码
-     */
-    private Integer deviceType;
-
-    /**
-     * 告警总数
-     */
-    private Integer total;
-
-    /**
-     * 待处理
-     */
-    private Integer untreated;
-
-    /**
-     * 已处理
-     */
-    private Integer processed;
-
-    /**
-     * 处置率
-     */
-    private float processRate;
-
-    /**
-     * 设备数
-     */
-    private Integer deviceCount;
-
-    /**
-     * 离线告警待处理
-     */
-    private Integer offLineUntreated;
-
-    /**
-     * 离线告警已处理
-     */
-    private Integer offLineProcessed;
-
-    /**
-     * 离线告警处置率
-     */
-    private float offLineProcessRate;
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/BaseAlarmTypeRequestVO.java

@@ -1,25 +0,0 @@
-package com.usky.iot.service.vo;
-
-import lombok.Data;
-
-@Data
-public class BaseAlarmTypeRequestVO {
-    /**
-     * 页数
-     */
-    private Integer current;
-    /**
-     * 条数
-     */
-    private Integer size;
-
-    /**
-     * 类型编码
-     */
-    private String typeCode;
-
-    /**
-     * 类型名称
-     */
-    private String typeName;
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/BaseBuildFacilityRequestVO.java

@@ -1,48 +0,0 @@
-package com.usky.iot.service.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-
-@Data
-public class BaseBuildFacilityRequestVO {
-
-    /**
-     * 页数
-     */
-    private Integer current;
-
-    /**
-     * 条数
-     */
-    private Integer size;
-
-    /**
-     * id
-     */
-    private Integer id;
-
-    /**
-     * 建筑Id
-     */
-    private Integer buildId;
-
-    /**
-     * 建筑名称
-     */
-    private String buildName;
-
-    /**
-     * 建筑设施编号
-     */
-    private String facilityNum;
-
-    /**
-     * 设施名称
-     */
-    private String facilityName;
-
-    /**
-     * 设施类型编码
-     */
-    private String facilityType;
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/BaseBuildFacilityTypeRequestVO.java

@@ -1,25 +0,0 @@
-package com.usky.iot.service.vo;
-
-import lombok.Data;
-
-@Data
-public class BaseBuildFacilityTypeRequestVO {
-    /**
-     * 页数
-     */
-    private Integer current;
-    /**
-     * 条数
-     */
-    private Integer size;
-
-    /**
-     * 类型编码
-     */
-    private String typeCode;
-
-    /**
-     * 类型名称
-     */
-    private String typeName;
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/BaseBuildFacilityVO.java

@@ -1,23 +0,0 @@
-package com.usky.iot.service.vo;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author han
- * @since 2023-08-07
- */
-@Data
-public class BaseBuildFacilityVO {
-
-        private Integer id;
-
-        private List<String> facilityType;
-
-        private String floor;
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/BaseFacilityDeviceVO.java

@@ -1,16 +0,0 @@
-package com.usky.iot.service.vo;
-
-import lombok.Data;
-
-@Data
-public class BaseFacilityDeviceVO {
-    private Integer facilityId;
-    private String facilityName;
-    private String address;
-
-    public BaseFacilityDeviceVO(Integer id,String name,String addr){
-        this.facilityId = id;
-        this.facilityName = name;
-        this.address = addr;
-    }
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/BaseGgpFacilityExportVo.java

@@ -1,94 +0,0 @@
-package com.usky.iot.service.vo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.usky.common.core.annotation.Excel;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 地理设施表
- * </p>
- *
- * @author han
- * @since 2023-06-05
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class BaseGgpFacilityExportVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 序号
-     */
-    @Excel(name = "序号")
-    private Integer xh;
-
-    /**
-     * 设施编号
-     */
-    @Excel(name = "设施编号")
-    private String facilityNum;
-
-    /**
-     * 设施类型
-     */
-    @Excel(name = "设施类型")
-    private String facilityType;
-
-    /**
-     * 设施名称
-     */
-    @Excel(name = "设施名称")
-    private String facilityName;
-
-    /**
-     * 设施地址
-     */
-    @Excel(name = "设施地址")
-    private String address;
-
-    /**
-     * 图片地址URL
-     */
-    @Excel(name = "设施图片")
-    private String imagesUrl;
-
-    /**
-     * 联系人
-     */
-    @Excel(name = "联系人")
-    private String contact;
-
-    /**
-     * 联系方式
-     */
-    @Excel(name = "联系方式")
-    private String contactPhone;
-
-    /**
-     * 设施状态
-     */
-    @Excel(name = "设施状态", readConverterExp = "0=正常,1=维修,2=关闭")
-    private Integer status;
-
-    /**
-     * 开始时间
-     */
-    @Excel(name = "创建时间")
-    private String createTime;
-
-
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/BaseGgpFacilityInfoVO.java

@@ -1,23 +0,0 @@
-package com.usky.iot.service.vo;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class BaseGgpFacilityInfoVO {
-
-    /**
-     * 设施类型数
-     */
-    private Integer typeNum;
-    /**
-     * 设施总数
-     */
-    private Integer facilityNum;
-
-    /**
-     * 设施类型集合
-     */
-    private List<BaseGgpFacilityTypeNumVO> baseGgpFacilityTypeNumVO;
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/BaseGgpFacilityListVO.java

@@ -1,24 +0,0 @@
-package com.usky.iot.service.vo;
-
-import com.alibaba.fastjson.JSONObject;
-import com.usky.iot.domain.BaseGgpFacility;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author han
- * @since 2023-02-22
- */
-@Data
-public class BaseGgpFacilityListVO {
-
-        private BaseGgpFacility baseGgpFacility;
-
-        private JSONObject extendData;
-
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/BaseGgpFacilityRequest.java

@@ -1,33 +0,0 @@
-package com.usky.iot.service.vo;
-
-import lombok.Data;
-
-@Data
-public class BaseGgpFacilityRequest {
-
-    /**
-     * 页数
-     */
-    private Integer current;
-    /**
-     * 条数
-     */
-    private Integer size;
-
-    /**
-     * 设施名称
-     */
-    private String facilityName;
-    /**
-     * 设施编号
-     */
-    private String facilityNum;
-    /**
-     * 设施类型
-     */
-    private Integer facilityType;
-    /**
-     * id
-     */
-    private Integer id;
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/BaseGgpFacilityTypeNumVO.java

@@ -1,40 +0,0 @@
-package com.usky.iot.service.vo;
-
-import lombok.Data;
-
-@Data
-public class BaseGgpFacilityTypeNumVO {
-
-    /**
-     * 设施类型名称
-     */
-    private String typeName;
-    /**
-     * 设施类型编码
-     */
-    private String typeCode;
-    /**
-     * 设施类型图片
-     */
-    private String typeImg;
-    /**
-     * 设施类型对应设施数量
-     */
-    private Integer typeFacilityNum;
-    /**
-     * 设施类型对应正常设施数量
-     */
-    private Integer normalFacilityNum;
-    /**
-     * 设施类型对应维修设施数量
-     */
-    private Integer upkeepFacilityNum;
-    /**
-     * 设施类型对应关闭设施数量
-     */
-    private Integer closeFacilityNum;
-    /**
-     * id
-     */
-    private Integer id;
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/BaseGgpFacilityTypeVO.java

@@ -1,23 +0,0 @@
-package com.usky.iot.service.vo;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class BaseGgpFacilityTypeVO {
-
-    /**
-     * 设施类型数
-     */
-    private Integer typeNum;
-    /**
-     * 设施总数
-     */
-    private Integer facilityNum;
-
-    /**
-     * 设施类型集合
-     */
-    private List<BaseGgpFacilityTypeNumVO> baseGgpFacilityTypeNumVO;
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/BaseGgpFacilityVO.java

@@ -1,24 +0,0 @@
-package com.usky.iot.service.vo;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author han
- * @since 2023-04-06
- */
-@Data
-public class BaseGgpFacilityVO {
-
-        private Integer id;
-
-        private String streetTown;
-
-        private List<Integer> facilityType;
-
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/BuildFacilityRelateRequestVO.java

@@ -1,35 +0,0 @@
-package com.usky.iot.service.vo;
-
-import lombok.Data;
-
-@Data
-public class BuildFacilityRelateRequestVO {
-    /**
-     * 建筑id
-     */
-    private Integer buildId;
-
-    /**
-     * 页数
-     */
-    private Integer current;
-    /**
-     * 条数
-     */
-    private Integer size;
-
-    /**
-     * 设施编号
-     */
-    private String facilityNum;
-
-    /**
-     * 设施名称
-     */
-    private String facilityName;
-
-    /**
-     * 设施类型编码
-     */
-    private String facilityType;
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/BuildFacilityRelateResponeVO.java

@@ -1,42 +0,0 @@
-package com.usky.iot.service.vo;
-
-import lombok.Data;
-
-@Data
-public class BuildFacilityRelateResponeVO {
-
-    /**
-     * 建筑id
-     */
-    private Integer buildId;
-
-    /**
-     * 设施Id
-     */
-    private Integer facilityId;
-
-    /**
-     * 设施编号
-     */
-    private String facilityNum;
-
-    /**
-     * 设施名称
-     */
-    private String facilityName;
-
-    /**
-     * 设施类型名称
-     */
-    private String facilityType;
-
-    /**
-     * 设施地址
-     */
-    private String address;
-
-    /**
-     * 绑定状态（0 解绑，1 绑定）
-     */
-    private Integer status;
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/BuildFacilityRequestVO.java

@@ -1,30 +0,0 @@
-package com.usky.iot.service.vo;
-
-import lombok.Data;
-
-@Data
-public class BuildFacilityRequestVO {
-    /**
-     * 建筑设施表-id
-     */
-    private Integer baseBuildFacilityId;
-
-    /**
-     * 页数
-     */
-    private Integer current;
-    /**
-     * 条数
-     */
-    private Integer size;
-
-    /**
-     * 设备信息表-设备ID
-     */
-    private String deviceId;
-
-    /**
-     * 设备类型编码
-     */
-    private Integer deviceType;
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/BuildFacilityResponeVO.java

@@ -1,36 +0,0 @@
-package com.usky.iot.service.vo;
-
-import lombok.Data;
-
-@Data
-public class BuildFacilityResponeVO {
-    /**
-     * 建筑设施表-id
-     */
-    private Integer baseBuildFacilityId;
-
-    /**
-     * 设备Id
-     */
-    private String deviceId;
-
-    /**
-     * 设备名称
-     */
-    private String deviceName;
-
-    /**
-     * 设备类型名称
-     */
-    private String deviceTypeName;
-
-    /**
-     * 设备地址
-     */
-    private String installAddress;
-
-    /**
-     * 绑定状态（0 解绑，1 绑定）
-     */
-    private Integer status;
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/BuildFacilityStatusVO.java

@@ -1,21 +0,0 @@
-package com.usky.iot.service.vo;
-
-import lombok.Data;
-
-@Data
-public class BuildFacilityStatusVO {
-    /**
-     * 建筑id
-     */
-    private Integer buildId;
-
-    /**
-     * 设施Id
-     */
-    private Integer facilityId;
-
-    /**
-     * 绑定状态（0 解绑，1 绑定）
-     */
-    private Integer status;
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/CrmCustomInfoExportVO.java

@@ -1,99 +0,0 @@
-package com.usky.iot.service.vo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-
-import com.usky.common.core.annotation.Excel;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 客户管理信息表-导出
- * </p>
- *
- * @author han
- * @since 2023-06-26
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class CrmCustomInfoExportVO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 项目编号
-     */
-    @Excel(name = "项目编号")
-    private String projectId;
-
-    /**
-     * 项目名称
-     */
-    @Excel(name = "项目名称")
-    private String projectName;
-
-    /**
-     * 单位名称
-     */
-    @Excel(name = "单位名称")
-    private String companyName;
-
-    /**
-     * 客户负责人
-     */
-    @Excel(name = "客户负责人")
-    private String customPerson;
-
-    /**
-     * 客户电话
-     */
-    @Excel(name = "客户电话")
-    private String phone;
-
-    /**
-     * 维保费
-     */
-    @Excel(name = "维保费")
-    private Double maintainAmount;
-
-    /**
-     * 客户邮箱
-     */
-    @Excel(name = "客户邮箱")
-    private String email;
-
-    /**
-     * 销售负责人
-     */
-    @Excel(name = "销售负责人")
-    private String salePerson;
-
-    /**
-     * 状态;1：使用中,2：已到期
-     */
-    @Excel(name = "状态", readConverterExp = "1=使用中,2=已到期")
-    private Integer maintainStatus;
-
-    /**
-     * 到期时间
-     */
-    @Excel(name = "到期时间")
-    private String expireTime;
-
-    /**
-     * 客户地址
-     */
-    @Excel(name = "客户地址")
-    private String customAddress;
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/CrmCustomInfoRequestVO.java

@@ -1,40 +0,0 @@
-package com.usky.iot.service.vo;
-
-import lombok.Data;
-
-@Data
-public class CrmCustomInfoRequestVO {
-    /**
-     * 页数
-     */
-    private Integer current;
-    /**
-     * 条数
-     */
-    private Integer size;
-
-    /**
-     * 项目名称
-     */
-    private String projectName;
-
-    /**
-     * 单位名称
-     */
-    private String companyName;
-
-    /**
-     * 状态;1：使用中，2：已到期
-     */
-    private Integer maintainStatus;
-
-    /**
-     * 开始时间
-     */
-    private String startTime;
-
-    /**
-     * 结束时间
-     */
-    private String endTime;
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/CrmInvoiceInfoExportVO.java

@@ -1,96 +0,0 @@
-package com.usky.iot.service.vo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-
-import com.usky.common.core.annotation.Excel;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class CrmInvoiceInfoExportVO  implements Serializable {
-
-    /**
-     * 项目编号
-     */
-    @Excel(name = "项目编号")
-    private String projectId;
-
-    /**
-     * 发票抬头
-     */
-    @Excel(name = "发票抬头")
-    private String invoiceTitle;
-
-    /**
-     * 税号
-     */
-    @Excel(name = "税号")
-    private String dutyId;
-
-    /**
-     * 发票性质;1：电子发票,2：纸质发票
-     */
-    @Excel(name = "发票性质", readConverterExp = "1=电子发票,2=纸质发票")
-    private Integer invoiceAttribute;
-
-    /**
-     * 发票类型;1：普票,2：专票
-     */
-    @Excel(name = "发票类型", readConverterExp = "1=普票,2=专票")
-    private Integer invoiceType;
-
-    /**
-     * 金额
-     */
-    @Excel(name = "金额")
-    private String amount;
-
-    /**
-     * 开票状态;1：未开票,2：已开票
-     */
-    @Excel(name = "开票状态", readConverterExp = "1=未开票,2=已开票")
-    private Integer invoiceStatus;
-
-    /**
-     * 申请人
-     */
-    @Excel(name = "申请人")
-    private String applicant;
-
-    /**
-     * 联系方式
-     */
-    @Excel(name = "联系方式")
-    private String phone;
-
-    /**
-     * 邮箱
-     */
-    @Excel(name = "邮箱")
-    private String email;
-
-    /**
-     * 邮寄地址
-     */
-    @Excel(name = "邮寄地址")
-    private String sendAddress;
-
-    /**
-     * 付款回执
-     */
-    @Excel(name = "付款回执")
-    private String paymentReceipt;
-
-    /**
-     * 提交时间
-     */
-    @Excel(name = "提交时间")
-    private String createTime;
-
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/CrmInvoiceInfoRequest.java

@@ -1,41 +0,0 @@
-package com.usky.iot.service.vo;
-
-import lombok.Data;
-
-@Data
-public class CrmInvoiceInfoRequest {
-
-    /**
-     * 页数
-     */
-    private Integer current;
-    /**
-     * 条数
-     */
-    private Integer size;
-
-    /**
-     * 项目编号
-     */
-    private String projectId;
-
-    /**
-     * 发票抬头
-     */
-    private String invoiceTitle;
-
-    /**
-     * 开票状态;1：未开票,2：已开票
-     */
-    private Integer invoiceStatus;
-
-    /**
-     * 开始时间
-     */
-    private String startTime;
-
-    /**
-     * 结束时间
-     */
-    private String endTime;
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/CrmInvoiceInfoVO.java

@@ -1,69 +0,0 @@
-package com.usky.iot.service.vo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-
-@Data
-public class CrmInvoiceInfoVO {
-
-    /**
-     * 项目编号
-     */
-    private String projectId;
-
-    /**
-     * 发票抬头
-     */
-    private String invoiceTitle;
-
-    /**
-     * 税号
-     */
-    private String dutyId;
-
-    /**
-     * 电子邮箱
-     */
-    private String email;
-
-    /**
-     * 申请人
-     */
-    private String applicant;
-
-    /**
-     * 手机号码
-     */
-    private String phone;
-
-    /**
-     * 金额
-     */
-    private Double amount;
-
-    /**
-     * 发票类型;1：普票，2：专票
-     */
-    private Integer invoiceType;
-
-    /**
-     * 发票性质;1：电子发票，2：纸质发票
-     */
-    private Integer invoiceAttribute;
-
-    /**
-     * 邮寄地址
-     */
-    private String sendAddress;
-
-    /**
-     * 付款回执
-     */
-    private String paymentReceipt;
-
-    /**
-     * 提交时间
-     */
-    private String createTime;
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/DeviceDataInfoVO.java

@@ -1,41 +0,0 @@
-package com.usky.iot.service.vo;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class DeviceDataInfoVO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 属性值集合
-     */
-    private Map<String,Object> metrics;
-
-    /**
-     * 设备编号
-     */
-    private String device_id;
-
-    /**
-     * 产品Id
-     */
-    private String product_id;
-
-    /**
-     * 数据上报时间
-     */
-    private long timestamp;
-
-    /**
-     * 设备类型
-     */
-    private String device_type;
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/DeviceImportVo.java

@@ -1,46 +0,0 @@
-package com.usky.iot.service.vo;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-
-import lombok.Data;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author han
- * @since 2023-07-27
- */
-@Data
-public class DeviceImportVo{
-    /**
-     * 系统编号（必填）
-     */
-    @Excel(name = "系统编号（必填）")
-    private String productCode;
-
-    /**
-     * 设备id（必填）
-     */
-    @Excel(name = "设备id（必填）")
-    private String deviceId;
-
-    /**
-     * 设备名称（必填）
-     */
-    @Excel(name = "设备名称（必填）")
-    private String deviceName;
-    /**
-     * SIM
-     */
-    @Excel(name = "SIM")
-    private String simCode;
-
-    /**
-     * 安装位置描述（必填）
-     */
-    @Excel(name = "安装位置描述（必填）")
-    private String installAddress;
-
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/DmpDataOverviewVO.java

@@ -1,46 +0,0 @@
-package com.usky.iot.service.vo;
-
-import lombok.Data;
-
-@Data
-public class DmpDataOverviewVO {
-
-    /**
-     * 设备编号
-     */
-    private Integer productId;
-
-    /**
-     * 设备总数
-     */
-    private Integer deviceCount;
-    /**
-     * 活跃数
-     */
-    private Integer hyCount;
-    /**
-     * 激活数
-      */
-    private Integer jhCount;
-    /**
-     *注册数
-     */
-    private Integer zcCount;
-
-    /**
-     * 正常数据
-     */
-    private Integer dzcCount;
-    /**
-     * 离线数据
-     */
-    private Integer dlxCount;
-    /**
-     * 激活率
-     */
-    private Double jhRadioCount;
-    /**
-     * 活跃率
-     */
-    private Double hyRadioCount;
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/DmpDeviceExcelVO.java

@@ -1,113 +0,0 @@
-package com.usky.iot.service.vo;
-
-import com.usky.common.core.annotation.Excel;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class DmpDeviceExcelVO {
-
-    /**
-     * 主键id
-     */
-    @Excel(name = "id", height = 6, width = 20)
-    private Integer id;
-
-    /**
-     * 设备ID;设备注册时系统自动生成一个唯一编号
-     */
-    @Excel(name = "设备id", height = 6, width = 20)
-    private String deviceId;
-
-    /**
-     * 设备编号
-     */
-    @Excel(name = "设备编号", height = 6, width = 20)
-    private String deviceCode;
-
-    /**
-     * 设备名称
-     */
-    @Excel(name = "设备名称", height = 6, width = 20)
-    private String deviceName;
-
-    /**
-     * 设备类型
-     */
-    @Excel(name = "设备类型", height = 6, width = 20)
-    private Integer deviceType;
-
-    /**
-     * 产品ID
-     */
-    @Excel(name = "产品ID", height = 6, width = 20)
-    private Integer productId;
-
-    /**
-     * 物联网卡号
-     */
-    @Excel(name = "物联网卡号", height = 6, width = 20)
-    private String simCode;
-
-    /**
-     * 国际移动用户识别码
-     */
-    @Excel(name = "国际移动用户识别码", height = 6, width = 20)
-    private String imsiCode;
-
-    /**
-     * 节点类型
-     */
-    @Excel(name = "节点类型", height = 6, width = 20)
-    private Integer nodeType;
-
-    /**
-     * 分组id
-     */
-    @Excel(name = "分组id", height = 6, width = 20)
-    private Integer groupId;
-
-
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人", height = 6, width = 20)
-    private String createdBy;
-
-    /**
-     * 创建时间
-     */
-    @Excel(name = "创建时间", height = 6, width = 20)
-    private Date createdTime;
-
-    /**
-     * 更新人
-     */
-    @Excel(name = "更新人", height = 6, width = 20)
-    private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-    @Excel(name = "更新时间", height = 6, width = 20)
-    private Date updatedTime;
-
-
-    /**
-     * 产品名称
-     */
-    @Excel(name = "产品名称", height = 6, width = 20)
-    private String productName;
-    /**
-     * 设备状态
-     */
-    @Excel(name = "设备状态", height = 6, width = 20)
-    private Integer deviceStatus;
-
-    /**
-     * 是否自动订阅
-     */
-    @Excel(name = "是否自动订阅", height = 6, width = 20)
-    private Integer subscribeFlag;
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/DmpDeviceExportVO.java

@@ -1,42 +0,0 @@
-package com.usky.iot.service.vo;
-
-import com.usky.common.core.annotation.Excel;
-import lombok.Data;
-
-@Data
-public class DmpDeviceExportVO {
-
-    /**
-     * 设备名称
-     */
-    @Excel(name = "设备名称",width = 14)
-    private String deviceName;
-    /**
-     * 产品ID
-     */
-    private Integer productId;
-
-    /**
-     * 设备编号
-     */
-    @Excel(name = "IMEI",width = 14)
-    private String deviceCode;
-    /**
-     * 物联网卡号
-     */
-    @Excel(name = "SIM",width = 14)
-    private String simCode;
-
-    /**
-     * 国际移动用户识别码
-     */
-    @Excel(name = "IMSI",width = 14)
-    private String imsiCode;
-
-    /**
-     * 是否自动订阅
-     */
-    @Excel(name = "是否开启订阅",width = 14)
-    private Integer subscribeFlag;
-
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/DmpDeviceInfoRequest.java

@@ -1,40 +0,0 @@
-package com.usky.iot.service.vo;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class DmpDeviceInfoRequest {
-
-    /**
-     * 页数
-     */
-    private Integer current;
-    /**
-     * 条数
-     */
-    private Integer size;
-
-    /**
-     * 产品ID
-     */
-    private Integer productId;
-
-    /**
-     * 设备名称
-     */
-    private String deviceName;
-
-    /**
-     * 业务状态（1：未激活，2：已激活，3：禁用）
-      */
-    private Integer serviceStatus;
-
-    /**
-     * 设备状态;1：在线，2：离线
-     */
-    private Integer deviceStatus;
-
-
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/DmpProductAttributeRequest.java

@@ -1,25 +0,0 @@
-package com.usky.iot.service.vo;
-
-import lombok.Data;
-
-@Data
-public class DmpProductAttributeRequest {
-
-    /**
-     * 页数
-     */
-    private Integer current;
-    /**
-     * 条数
-     */
-    private Integer size;
-
-    /**
-     * 产品名称
-     */
-    private String attributeName;
-    /**
-     * 产品编号
-     */
-    private Integer productId;
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/DmpProductInfoRequest.java

@@ -1,29 +0,0 @@
-package com.usky.iot.service.vo;
-
-import lombok.Data;
-
-@Data
-public class DmpProductInfoRequest {
-
-    /**
-     * 页数
-     */
-    private Integer current;
-    /**
-     * 条数
-     */
-    private Integer size;
-
-    /**
-     * 产品名称
-     */
-    private String productName;
-    /**
-     * 设备型号
-     */
-    private String deviceModel;
-    /**
-     * id
-     */
-    private Integer id;
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/DmpSoftwareUpgradeRequest.java

@@ -1,21 +0,0 @@
-package com.usky.iot.service.vo;
-
-import lombok.Data;
-
-@Data
-public class DmpSoftwareUpgradeRequest {
-
-    /**
-     * 页数
-     */
-    private Integer current;
-    /**
-     * 条数
-     */
-    private Integer size;
-
-    /**
-     * 名称
-     */
-    private String name;
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/FacilityDeviceStatusVO.java

@@ -1,21 +0,0 @@
-package com.usky.iot.service.vo;
-
-import lombok.Data;
-
-@Data
-public class FacilityDeviceStatusVO {
-    /**
-     * 建筑设施表-id
-     */
-    private Integer baseBuildFacilityId;
-
-    /**
-     * 设备Id
-     */
-    private String deviceId;
-
-    /**
-     * 绑定状态（0 解绑，1 绑定）
-     */
-    private Integer status;
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/FacilityImportVo.java

@@ -1,64 +0,0 @@
-package com.usky.iot.service.vo;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-
-import lombok.Data;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author han
- * @since 2023-07-27
- */
-@Data
-public class FacilityImportVo{
-    /**
-     * 设施类型（必填）
-     */
-    @Excel(name = "设施类型（必填）")
-    private String facilityType;
-
-    /**
-     * 设施名称（必填）
-     */
-    @Excel(name = "设施名称（必填）")
-    private String facilityName;
-
-    /**
-     * 设施地址（必填）
-     */
-    @Excel(name = "设施地址（必填）")
-    private String address;
-    /**
-     * 联系人
-     */
-    @Excel(name = "联系人")
-    private String contact;
-
-    /**
-     * 联系电话
-     */
-    @Excel(name = "联系电话")
-    private String contactPhone;
-
-    /**
-     * 备注
-     */
-    @Excel(name = "备注")
-    private String facilityDesc;
-
-    /**
-     * 经度（必填）
-     */
-    @Excel(name = "经度（必填）")
-    private String longitude;
-
-    /**
-     * 维度（必填）
-     */
-    @Excel(name = "维度（必填）")
-    private String latitude;
-
-}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/MqttBaseVO.java

@@ -1,4 +1,4 @@
-package com.usky.iot.service.vo;
+package com.usky.alarm.service.vo;
 
 import lombok.Data;
 

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/vo/MqttDataVO.java

@@ -1,4 +1,4 @@
-package com.usky.iot.service.vo;
+package com.usky.alarm.service.vo;
 
 import lombok.Data;
 

service-alarm/service-alarm-biz/src/main/resources/bootstrap.yml

@@ -1,12 +1,12 @@
 # Tomcat
 server:
-  port: 9887
+  port: 9891
 
 # Spring
 spring: 
   application:
     # 应用名称
-    name: service-iot
+    name: service-alarm
   profiles:
     # 环境配置
     active: dev

service-alarm/service-alarm-biz/src/main/resources/logback.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-    <property name="log.path" value="/var/log/uskycloud/service-iot" />
+    <property name="log.path" value="/var/log/uskycloud/service-alarm" />
     <!-- 日志输出格式 -->
     <property name="log.pattern" value="%d{MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{26}:%line: %msg%n" />
     <!--    	<property name="log.pattern" value="%gray(%d{MM-dd HH:mm:ss.SSS}) %highlight(%-5level) &#45;&#45; [%gray(%thread)] %cyan(%logger{26}:%line): %msg%n" />-->
 
 
-    <property name="SQL_PACKAGE" value="com.usky.iot.mapper"/>
+    <property name="SQL_PACKAGE" value="com.usky.alarm.mapper"/>
 
     <!-- 控制台输出 -->
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">