'开发统一告警表-统计、分页、修改接口'

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

@@ -0,0 +1,62 @@
+package com.usky.iot.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.iot.domain.BaseAlarm;
+import com.usky.iot.service.BaseAlarmService;
+import com.usky.iot.service.vo.BaseAlarmListVO;
+import com.usky.iot.service.vo.BaseAlarmRequestVO;
+import com.usky.iot.service.vo.BaseAlarmResponeVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 统一告警表 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-07-13
+ */
+@RestController
+@RequestMapping("/baseAlarm")
+public class BaseAlarmController {
+    @Autowired
+    private BaseAlarmService baseAlarmService;
+
+    /**
+     * 统计
+     * @param baseAlarmRequestVO
+     * @return
+     */
+    @PostMapping("/statistic")
+    public ApiResult<CommonPage<BaseAlarmResponeVO>> statistic(@RequestBody BaseAlarmRequestVO baseAlarmRequestVO){
+        return ApiResult.success(baseAlarmService.statistic(baseAlarmRequestVO));
+    }
+
+    /**
+     * 分页
+     * @param baseAlarmListVO
+     * @return
+     */
+    @PostMapping("/page")
+    public ApiResult<CommonPage<BaseAlarm>> page(@RequestBody BaseAlarmListVO baseAlarmListVO){
+        return ApiResult.success(baseAlarmService.page(baseAlarmListVO));
+    }
+
+    /**
+     * 修改
+     * @param baseAlarm
+     * @return
+     */
+    @PutMapping
+    public ApiResult<Void> update(@RequestBody BaseAlarm baseAlarm){
+        baseAlarmService.update(baseAlarm);
+        return ApiResult.success();
+    }
+
+}
+

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/DeviceHttpController.java

@@ -3,7 +3,7 @@ package com.usky.iot.controller.web;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.iot.service.DmpDataInfoService;
 import com.usky.iot.service.DmpDeviceStatusService;
-import com.usky.backend.domain.request.DmpDeviceDataRequestVO;
+//import com.usky.backend.domain.request.DmpDeviceDataRequestVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -15,17 +15,17 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/deviceHttp")
 public class DeviceHttpController {
 
-    @Autowired
-    private DmpDeviceStatusService dmpDeviceStatusService;
-
-    @Autowired
-    private DmpDataInfoService dmpDataInfoService;
-
-    @PutMapping("/status")
-    public ApiResult<Void> status(){
-        dmpDeviceStatusService.status();
-        return ApiResult.success();
-    }
+//    @Autowired
+//    private DmpDeviceStatusService dmpDeviceStatusService;
+//
+//    @Autowired
+//    private DmpDataInfoService dmpDataInfoService;
+//
+//    @PutMapping("/status")
+//    public ApiResult<Void> status(){
+//        dmpDeviceStatusService.status();
+//        return ApiResult.success();
+//    }
 
 //    /**
 //     * 设备实时历史数据-对接客户

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

@@ -0,0 +1,138 @@
+package com.usky.iot.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 lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 统一告警表
+ * </p>
+ *
+ * @author han
+ * @since 2023-07-13
+ */
+@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;
+
+    /**
+     * 告警时间
+     */
+    private LocalDateTime alarmTime;
+
+    /**
+     * 告警类型
+     */
+    private Integer 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;
+
+    /**
+     * 处理时间
+     */
+    private LocalDateTime handleTime;
+
+    /**
+     * 处理内容
+     */
+    private String handleContent;
+
+    /**
+     * 处理人电话
+     */
+    private String handlePhone;
+
+    /**
+     * 处理状态;0 未处理，1 已处理
+     */
+    private Integer handleStatus;
+
+    /**
+     * 是否误报;0 非误报，1 误报
+     */
+    private Integer alarmFalse;
+
+    /**
+     * 现场照片
+     */
+    private String sitePhoto;
+
+    /**
+     * 组织机构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;
+}

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

@@ -0,0 +1,16 @@
+package com.usky.iot.mapper;
+
+import com.usky.iot.domain.BaseAlarm;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 统一告警表 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-07-13
+ */
+public interface BaseAlarmMapper extends CrudMapper<BaseAlarm> {
+
+}

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

@@ -0,0 +1,26 @@
+package com.usky.iot.service;
+
+import com.usky.common.core.bean.CommonPage;
+import com.usky.iot.domain.BaseAlarm;
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.iot.service.vo.BaseAlarmListVO;
+import com.usky.iot.service.vo.BaseAlarmRequestVO;
+import com.usky.iot.service.vo.BaseAlarmResponeVO;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * <p>
+ * 统一告警表 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-07-13
+ */
+public interface BaseAlarmService extends CrudService<BaseAlarm> {
+
+    CommonPage<BaseAlarmResponeVO> statistic(BaseAlarmRequestVO baseAlarmRequestVO);
+
+    CommonPage<BaseAlarm> page(BaseAlarmListVO baseAlarmListVO);
+
+    void update(BaseAlarm baseAlarm);
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/DmpDataInfoService.java

@@ -2,7 +2,7 @@ package com.usky.iot.service;
 
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.iot.domain.DmpDataInfo;
-import com.usky.backend.domain.request.DmpDeviceDataRequestVO;
+//import com.usky.backend.domain.request.DmpDeviceDataRequestVO;
 
 
 /**
@@ -15,6 +15,6 @@ import com.usky.backend.domain.request.DmpDeviceDataRequestVO;
  */
 public interface DmpDataInfoService extends CrudService<DmpDataInfo> {
 
-    void data(DmpDeviceDataRequestVO dmpDeviceDataRequestVO);
+//    void data(DmpDeviceDataRequestVO dmpDeviceDataRequestVO);
 
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/DmpDeviceStatusService.java

@@ -20,6 +20,6 @@ public interface DmpDeviceStatusService extends CrudService<DmpDeviceStatus> {
 
     List<Map<String,Object>> getCollectByProduct(List<Integer> productIds);
 
-    void status();
+//    void status();
 
 }

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

@@ -0,0 +1,233 @@
+package com.usky.iot.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.iot.domain.BaseAlarm;
+import com.usky.iot.domain.BaseAlarmType;
+import com.usky.iot.domain.DmpDeviceInfo;
+import com.usky.iot.domain.DmpProductInfo;
+import com.usky.iot.mapper.BaseAlarmMapper;
+import com.usky.iot.service.BaseAlarmService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.iot.service.BaseAlarmTypeService;
+import com.usky.iot.service.DmpDeviceInfoService;
+import com.usky.iot.service.DmpProductInfoService;
+import com.usky.iot.service.vo.BaseAlarmListVO;
+import com.usky.iot.service.vo.BaseAlarmRequestVO;
+import com.usky.iot.service.vo.BaseAlarmResponeVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 统一告警表 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-07-13
+ */
+@Service
+public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, BaseAlarm> implements BaseAlarmService {
+    @Autowired
+    private BaseAlarmTypeService baseAlarmTypeService;
+
+    @Autowired
+    private DmpProductInfoService dmpProductInfoService;
+
+    @Autowired
+    private DmpDeviceInfoService dmpDeviceInfoService;
+
+    @Override
+    public CommonPage<BaseAlarmResponeVO> statistic(BaseAlarmRequestVO baseAlarmRequestVO){
+        IPage<BaseAlarmResponeVO> page = new Page<>(baseAlarmRequestVO.getCurrent(),baseAlarmRequestVO.getSize());
+
+        List<BaseAlarmResponeVO> list = new ArrayList<>();
+
+        QueryWrapper<BaseAlarmType> wrapper = new QueryWrapper<>();
+        if(StringUtils.isNotBlank(baseAlarmRequestVO.getProductCode())){
+            wrapper.select("distinct product_code as productCode")
+                    .eq("delete_flag",0)
+                    .eq("product_code",baseAlarmRequestVO.getProductCode());
+        }else{
+            wrapper.select("distinct product_code as productCode")
+                    .eq("delete_flag",0);
+        }
+        List<BaseAlarmType> list1 = baseAlarmTypeService.list(wrapper);
+        if(CollectionUtils.isNotEmpty(list1)){
+            for(int i=0;i<list1.size();i++){
+                BaseAlarmResponeVO responeVO = new BaseAlarmResponeVO();
+                responeVO.setProductCode(list1.get(i).getProductCode());
+
+                LambdaQueryWrapper<DmpProductInfo> queryWrapper = Wrappers.lambdaQuery();
+                queryWrapper.eq(DmpProductInfo::getDeleteFlag,0)
+                        .eq(DmpProductInfo::getProductCode,list1.get(i).getProductCode());
+                DmpProductInfo one = dmpProductInfoService.getOne(queryWrapper);
+                if(one != null){
+                    responeVO.setProductName(one.getProductName());
+                    responeVO.setDeviceType(one.getDeviceType());
+                }
+
+                LambdaQueryWrapper<BaseAlarmType> queryWrapper1 = Wrappers.lambdaQuery();
+                queryWrapper1.eq(BaseAlarmType::getDeleteFlag,0)
+                        .eq(BaseAlarmType::getProductCode,list1.get(i).getProductCode());
+                List<BaseAlarmType> list2 = baseAlarmTypeService.list(queryWrapper1);
+                List<Integer> alarmTypeList = new ArrayList<>();
+                if(CollectionUtils.isNotEmpty(list2)){
+                    for(int j=0;j<list2.size();j++){
+                        alarmTypeList.add(list2.get(j).getId());
+                    }
+                }
+                //未处理
+                int untreated = this.count(Wrappers.<BaseAlarm>query().lambda().eq(BaseAlarm::getHandleStatus,0).in(BaseAlarm::getAlarmType,alarmTypeList));
+                //已处理
+                int processed = this.count(Wrappers.<BaseAlarm>query().lambda().eq(BaseAlarm::getHandleStatus,1).in(BaseAlarm::getAlarmType,alarmTypeList));
+                //总数
+                int count = untreated+processed;
+                //处置率
+                float processRate = 0;
+                if(count != 0){
+                    processRate = ((float) processed/count)*100;
+                }
+
+                responeVO.setTotal(count);
+                responeVO.setUntreated(untreated);
+                responeVO.setProcessed(processed);
+                responeVO.setProcessRate(processRate);
+
+                list.add(responeVO);
+            }
+        }
+
+        int total = 0;
+        if(list1.size()>0){
+            total = list1.size();
+        }
+        int current = 0;
+        Integer pageNum = baseAlarmRequestVO.getCurrent();
+        Integer pageSize = baseAlarmRequestVO.getSize();
+        if(pageNum != null && pageSize >0){
+            current = (pageNum-1)*pageSize;
+        }
+        List<BaseAlarmResponeVO> records = list.stream().skip(current).limit(pageSize).collect(Collectors.toList());
+
+        return new CommonPage<BaseAlarmResponeVO>(records,total,pageSize,pageNum);
+    }
+
+    public CommonPage<BaseAlarm> page(BaseAlarmListVO baseAlarmListVO){
+        List<BaseAlarm> list = new ArrayList<>();
+
+        LambdaQueryWrapper<BaseAlarmType> queryWrapper2 = Wrappers.lambdaQuery();
+        queryWrapper2.eq(BaseAlarmType::getDeleteFlag,0)
+                .eq(BaseAlarmType::getProductCode,baseAlarmListVO.getProductCode());
+        List<BaseAlarmType> list2 = baseAlarmTypeService.list(queryWrapper2);
+        List<Integer> alarmTypeList = new ArrayList<>();
+        if(CollectionUtils.isNotEmpty(list2)){
+            for(int j=0;j<list2.size();j++){
+                alarmTypeList.add(list2.get(j).getId());
+            }
+        }
+
+        LambdaQueryWrapper<BaseAlarm> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper
+                .in(BaseAlarm::getAlarmType,alarmTypeList)
+                .eq(baseAlarmListVO.getAlarmType() != null,BaseAlarm::getAlarmType,baseAlarmListVO.getAlarmType())
+                .between(StringUtils.isNotBlank(baseAlarmListVO.getStartTime()) && StringUtils.isNotBlank(baseAlarmListVO.getEndTime()),BaseAlarm::getAlarmTime,baseAlarmListVO.getStartTime(),baseAlarmListVO.getEndTime())
+                .orderByDesc(BaseAlarm::getId);
+        List<BaseAlarm> records = this.list(queryWrapper);
+        if(records.size()>0){
+            for(int i=0;i<records.size();i++){
+                LambdaQueryWrapper<DmpDeviceInfo> queryWrapper1 = Wrappers.lambdaQuery();
+                queryWrapper1.eq(DmpDeviceInfo::getDeviceId,records.get(i).getDeviceId())
+                        .eq(DmpDeviceInfo::getDeleteFlag,0);
+                DmpDeviceInfo deviceInfo = dmpDeviceInfoService.getOne(queryWrapper1);
+                if(deviceInfo != null){
+                    records.get(i).setDeviceName(deviceInfo.getDeviceName());
+                }
+
+            }
+        }
+
+        if(StringUtils.isNotBlank(baseAlarmListVO.getDeviceName())){
+            list = records.stream().filter(e -> baseAlarmListVO.getDeviceName().equals(e.getDeviceName())).collect(Collectors.toList());
+        }else {
+            if(records.size()>0){
+                for(int k=0;k<records.size();k++){
+                    list.add(records.get(k));
+                }
+            }
+
+        }
+        int total = 0;
+        if(list.size()>0){
+            total = list.size();
+        }
+        int current = 0;
+        Integer pageNum = baseAlarmListVO.getCurrent();
+        Integer pageSize = baseAlarmListVO.getSize();
+        if(pageNum != null && pageSize >0){
+            current = (pageNum-1)*pageSize;
+        }
+        List<BaseAlarm> info = list.stream().sorted(Comparator.comparing(BaseAlarm::getId,Comparator.reverseOrder())).skip(current).limit(pageSize).collect(Collectors.toList());
+
+        return new CommonPage<BaseAlarm>(info,total,pageSize,pageNum);
+
+    }
+
+    public void update(BaseAlarm baseAlarm){
+        int handleRange = baseAlarm.getHandleRange();
+        if(handleRange == 0){  //批量
+            LambdaQueryWrapper<BaseAlarm> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.eq(BaseAlarm::getDeviceId,baseAlarm.getDeviceId())
+                    .eq(BaseAlarm::getAlarmType,baseAlarm.getAlarmType())
+                    .eq(BaseAlarm::getHandleStatus,0);
+            List<BaseAlarm> list = this.list(queryWrapper);
+            if(list.size() > 0){
+                for(int i=0;i<list.size();i++){
+                    list.get(i).setHandleContent(baseAlarm.getHandleContent());
+                    list.get(i).setAlarmFalse(baseAlarm.getAlarmFalse());
+                    list.get(i).setHandleStatus(1);
+                    list.get(i).setHandleBy(SecurityUtils.getUsername());
+                    list.get(i).setHandleTime(LocalDateTime.now());
+                    list.get(i).setHandlePhone("13715215564");
+                }
+            }
+            this.updateBatchById(list);
+
+        }else {  // 单一
+            baseAlarm.setHandleStatus(1);
+            baseAlarm.setHandleBy(SecurityUtils.getUsername());
+            baseAlarm.setHandleTime(LocalDateTime.now());
+            baseAlarm.setHandlePhone("13715215564");
+            this.updateById(baseAlarm);
+        }
+    }
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
+

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDataInfoServiceImpl.java

@@ -3,14 +3,14 @@ package com.usky.iot.service.impl;
 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.backend.client.DeviceDataClient;
-import com.usky.backend.domain.request.DeviceDataInfoVO;
+//import com.usky.backend.client.DeviceDataClient;
+//import com.usky.backend.domain.request.DeviceDataInfoVO;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.iot.domain.*;
 import com.usky.iot.mapper.DmpDataInfoMapper;
 import com.usky.iot.service.*;
-import com.usky.backend.domain.request.DmpDeviceDataRequestVO;
+//import com.usky.backend.domain.request.DmpDeviceDataRequestVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -31,81 +31,81 @@ import java.util.Map;
  */
 @Service
 public class DmpDataInfoServiceImpl extends AbstractCrudService<DmpDataInfoMapper, DmpDataInfo> implements DmpDataInfoService {
-    @Autowired
-    private DmpProductInfoService dmpProductInfoService;
-
-    @Autowired
-    private DmpProductAttributeService dmpProductAttributeService;
-
-    @Autowired
-    private DmpDeviceInfoService dmpDeviceInfoService;
-
-    @Autowired
-    private DeviceDataClient deviceDataClient;
-
-    @Autowired
-    private DmpDeviceTypeService dmpDeviceTypeService;
-
-    @Override
-    public void data(DmpDeviceDataRequestVO dmpDeviceDataRequestVO){
-        List<DeviceDataInfoVO> dataInfo = new ArrayList<>();
-
-        LambdaQueryWrapper<DmpDeviceInfo> dmpDeviceQuery = Wrappers.lambdaQuery();
-        dmpDeviceQuery.eq(DmpDeviceInfo::getDeleteFlag,0)
-                .eq(DmpDeviceInfo::getDeviceId,dmpDeviceDataRequestVO.getDeviceId());
-        List<DmpDeviceInfo> deviceDataInfo = dmpDeviceInfoService.list(dmpDeviceQuery);
-        if(CollectionUtils.isEmpty(deviceDataInfo)){
-            throw new BusinessException("录入数据失败，"+dmpDeviceDataRequestVO.getDeviceId()+" 这个设备没有注册");
-        }
-
-
-        LambdaQueryWrapper<DmpProductInfo> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.select(DmpProductInfo::getId,DmpProductInfo::getDeviceType)
-                .eq(DmpProductInfo::getDeleteFlag,0)
-                .eq(DmpProductInfo::getProductCode,dmpDeviceDataRequestVO.getProductCode());
-        List<DmpProductInfo> list = dmpProductInfoService.list(queryWrapper);
-        if(CollectionUtils.isNotEmpty(list)){
-
-            LambdaQueryWrapper<DmpDeviceType> deviceTypeList = Wrappers.lambdaQuery();
-            deviceTypeList.eq(DmpDeviceType::getTypeCode,list.get(0).getDeviceType());
-            List<DmpDeviceType> lt = dmpDeviceTypeService.list(deviceTypeList);
-            if(CollectionUtils.isEmpty(lt)){
-                throw new BusinessException("查找设备类型简称失败，"+list.get(0).getDeviceType()+" 在设备类型表中不存在");
-            }
-            String shortName = lt.get(0).getTypeAbbrevia();
-
-            LambdaQueryWrapper<DmpProductAttribute> queryWrapper1 = Wrappers.lambdaQuery();
-            queryWrapper1.select(DmpProductAttribute::getAttributeCode)
-                    .eq(DmpProductAttribute::getDeleteFlag,0)
-                    .eq(DmpProductAttribute::getProductId,list.get(0).getId());
-            List<DmpProductAttribute> list1 = dmpProductAttributeService.list(queryWrapper1);
-            if(CollectionUtils.isNotEmpty(list1)){
-                for(int i=0;i<list1.size();i++){
-                    Map<String,Float> metrics = dmpDeviceDataRequestVO.getMetrics();
-                    if(metrics.size()>0){
-                        for(Map.Entry<String,Float> map:metrics.entrySet()){
-                            String key = map.getKey();
-                            float value = map.getValue();
-                            if(key.equals(list1.get(i).getAttributeCode())){   //属性名需和产品注册信息一致
-                                DeviceDataInfoVO deviceDataInfoVO = new DeviceDataInfoVO();
-                                deviceDataInfoVO.setDeviceId(dmpDeviceDataRequestVO.getDeviceId());
-                                deviceDataInfoVO.setDeviceType(list.get(0).getDeviceType());
-                                deviceDataInfoVO.setTypeAbbrevia(shortName);
-                                deviceDataInfoVO.setName(key);
-                                deviceDataInfoVO.setValue(value);
-                                deviceDataInfoVO.setTimestamp(LocalDateTime.ofInstant(Instant.ofEpochSecond(dmpDeviceDataRequestVO.getTimestamp()), ZoneId.systemDefault()));
-                                dataInfo.add(deviceDataInfoVO);
-                            }
-                        }
-                    }
-                }
-            }
-        }else{
-            throw new BusinessException("查找产品信息失败，"+dmpDeviceDataRequestVO.getProductCode()+" 在产品信息表中不存在");
-        }
-        if(CollectionUtils.isNotEmpty(dataInfo)){
-            deviceDataClient.data(dataInfo);
-        }
-    }
+//    @Autowired
+//    private DmpProductInfoService dmpProductInfoService;
+//
+//    @Autowired
+//    private DmpProductAttributeService dmpProductAttributeService;
+//
+//    @Autowired
+//    private DmpDeviceInfoService dmpDeviceInfoService;
+//
+//    @Autowired
+//    private DeviceDataClient deviceDataClient;
+//
+//    @Autowired
+//    private DmpDeviceTypeService dmpDeviceTypeService;
+//
+//    @Override
+//    public void data(DmpDeviceDataRequestVO dmpDeviceDataRequestVO){
+//        List<DeviceDataInfoVO> dataInfo = new ArrayList<>();
+//
+//        LambdaQueryWrapper<DmpDeviceInfo> dmpDeviceQuery = Wrappers.lambdaQuery();
+//        dmpDeviceQuery.eq(DmpDeviceInfo::getDeleteFlag,0)
+//                .eq(DmpDeviceInfo::getDeviceId,dmpDeviceDataRequestVO.getDeviceId());
+//        List<DmpDeviceInfo> deviceDataInfo = dmpDeviceInfoService.list(dmpDeviceQuery);
+//        if(CollectionUtils.isEmpty(deviceDataInfo)){
+//            throw new BusinessException("录入数据失败，"+dmpDeviceDataRequestVO.getDeviceId()+" 这个设备没有注册");
+//        }
+//
+//
+//        LambdaQueryWrapper<DmpProductInfo> queryWrapper = Wrappers.lambdaQuery();
+//        queryWrapper.select(DmpProductInfo::getId,DmpProductInfo::getDeviceType)
+//                .eq(DmpProductInfo::getDeleteFlag,0)
+//                .eq(DmpProductInfo::getProductCode,dmpDeviceDataRequestVO.getProductCode());
+//        List<DmpProductInfo> list = dmpProductInfoService.list(queryWrapper);
+//        if(CollectionUtils.isNotEmpty(list)){
+//
+//            LambdaQueryWrapper<DmpDeviceType> deviceTypeList = Wrappers.lambdaQuery();
+//            deviceTypeList.eq(DmpDeviceType::getTypeCode,list.get(0).getDeviceType());
+//            List<DmpDeviceType> lt = dmpDeviceTypeService.list(deviceTypeList);
+//            if(CollectionUtils.isEmpty(lt)){
+//                throw new BusinessException("查找设备类型简称失败，"+list.get(0).getDeviceType()+" 在设备类型表中不存在");
+//            }
+//            String shortName = lt.get(0).getTypeAbbrevia();
+//
+//            LambdaQueryWrapper<DmpProductAttribute> queryWrapper1 = Wrappers.lambdaQuery();
+//            queryWrapper1.select(DmpProductAttribute::getAttributeCode)
+//                    .eq(DmpProductAttribute::getDeleteFlag,0)
+//                    .eq(DmpProductAttribute::getProductId,list.get(0).getId());
+//            List<DmpProductAttribute> list1 = dmpProductAttributeService.list(queryWrapper1);
+//            if(CollectionUtils.isNotEmpty(list1)){
+//                for(int i=0;i<list1.size();i++){
+//                    Map<String,Float> metrics = dmpDeviceDataRequestVO.getMetrics();
+//                    if(metrics.size()>0){
+//                        for(Map.Entry<String,Float> map:metrics.entrySet()){
+//                            String key = map.getKey();
+//                            float value = map.getValue();
+//                            if(key.equals(list1.get(i).getAttributeCode())){   //属性名需和产品注册信息一致
+//                                DeviceDataInfoVO deviceDataInfoVO = new DeviceDataInfoVO();
+//                                deviceDataInfoVO.setDeviceId(dmpDeviceDataRequestVO.getDeviceId());
+//                                deviceDataInfoVO.setDeviceType(list.get(0).getDeviceType());
+//                                deviceDataInfoVO.setTypeAbbrevia(shortName);
+//                                deviceDataInfoVO.setName(key);
+//                                deviceDataInfoVO.setValue(value);
+//                                deviceDataInfoVO.setTimestamp(LocalDateTime.ofInstant(Instant.ofEpochSecond(dmpDeviceDataRequestVO.getTimestamp()), ZoneId.systemDefault()));
+//                                dataInfo.add(deviceDataInfoVO);
+//                            }
+//                        }
+//                    }
+//                }
+//            }
+//        }else{
+//            throw new BusinessException("查找产品信息失败，"+dmpDeviceDataRequestVO.getProductCode()+" 在产品信息表中不存在");
+//        }
+//        if(CollectionUtils.isNotEmpty(dataInfo)){
+//            deviceDataClient.data(dataInfo);
+//        }
+//    }
 
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDeviceStatusServiceImpl.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.usky.backend.client.DataQueryClient;
-import com.usky.backend.domain.StatusVO;
+//import com.usky.backend.client.DataQueryClient;
+//import com.usky.backend.domain.StatusVO;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.iot.domain.DmpDeviceStatus;
 import com.usky.iot.mapper.DmpDeviceStatusMapper;
@@ -31,10 +31,10 @@ import java.util.Map;
 @Service
 public class DmpDeviceStatusServiceImpl extends AbstractCrudService<DmpDeviceStatusMapper, DmpDeviceStatus> implements DmpDeviceStatusService {
 
-
-    @Autowired
-    private DataQueryClient dataQueryClient;
-
+//
+//    @Autowired
+//    private DataQueryClient dataQueryClient;
+//
     @Override
     public List<Map<String, Object>> getCollectByProduct(List<Integer> productIds) {
         QueryWrapper<DmpDeviceStatus> query = Wrappers.query();
@@ -43,26 +43,26 @@ public class DmpDeviceStatusServiceImpl extends AbstractCrudService<DmpDeviceSta
                 .groupBy("product_id");
         return this.listMaps(query);
     }
-
-    @Override
-    public void status(){
-        List<StatusVO> list = dataQueryClient.status();
-        if(CollectionUtils.isNotEmpty(list)){
-            for(int i=0;i<list.size();i++){
-                String date =  list.get(i).getTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-                String currentDate = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-                LambdaUpdateWrapper<DmpDeviceStatus> updateWrapper = Wrappers.lambdaUpdate();
-                if(date.equals(currentDate)){
-                    updateWrapper.set(DmpDeviceStatus::getDeviceStatus,1)
-                            .set(DmpDeviceStatus::getLastOnlineTime,list.get(i).getTime())
-                            .eq(DmpDeviceStatus::getDeviceId,list.get(i).getDeviceId());
-                }else{
-                    updateWrapper.set(DmpDeviceStatus::getDeviceStatus,2)
-                            .set(DmpDeviceStatus::getLastOfflineTime,list.get(i).getTime())
-                            .eq(DmpDeviceStatus::getDeviceId,list.get(i).getDeviceId());
-                }
-                this.update(updateWrapper);
-            }
-        }
-    }
+//
+//    @Override
+//    public void status(){
+//        List<StatusVO> list = dataQueryClient.status();
+//        if(CollectionUtils.isNotEmpty(list)){
+//            for(int i=0;i<list.size();i++){
+//                String date =  list.get(i).getTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+//                String currentDate = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+//                LambdaUpdateWrapper<DmpDeviceStatus> updateWrapper = Wrappers.lambdaUpdate();
+//                if(date.equals(currentDate)){
+//                    updateWrapper.set(DmpDeviceStatus::getDeviceStatus,1)
+//                            .set(DmpDeviceStatus::getLastOnlineTime,list.get(i).getTime())
+//                            .eq(DmpDeviceStatus::getDeviceId,list.get(i).getDeviceId());
+//                }else{
+//                    updateWrapper.set(DmpDeviceStatus::getDeviceStatus,2)
+//                            .set(DmpDeviceStatus::getLastOfflineTime,list.get(i).getTime())
+//                            .eq(DmpDeviceStatus::getDeviceId,list.get(i).getDeviceId());
+//                }
+//                this.update(updateWrapper);
+//            }
+//        }
+//    }
 }

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

@@ -0,0 +1,46 @@
+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 Integer alarmType;
+
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
+
+}

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

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

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

@@ -0,0 +1,42 @@
+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;
+}

service-iot/service-iot-biz/src/main/resources/mapper/iot/BaseAlarmMapper.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.iot.mapper.BaseAlarmMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.iot.domain.BaseAlarm">
+        <id column="id" property="id" />
+        <result column="device_id" property="deviceId" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_object" property="alarmObject" />
+        <result column="alarm_data" property="alarmData" />
+        <result column="alarm_attribute" property="alarmAttribute" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="alarm_grade" property="alarmGrade" />
+        <result column="alarm_address" property="alarmAddress" />
+        <result column="handle_by" property="handleBy" />
+        <result column="handle_time" property="handleTime" />
+        <result column="handle_content" property="handleContent" />
+        <result column="handle_phone" property="handlePhone" />
+        <result column="handle_status" property="handleStatus" />
+        <result column="alarm_false" property="alarmFalse" />
+        <result column="site_photo" property="sitePhoto" />
+        <result column="dept_id" property="deptId" />
+        <result column="tenant_id" property="tenantId" />
+    </resultMap>
+
+</mapper>