告警推送记录

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

@@ -1,19 +1,9 @@
 package com.usky.alarm.controller.web;
 
 
-import com.usky.alarm.domain.BaseAlarmNoticeResult;
-import com.usky.alarm.service.BaseAlarmNoticeResultService;
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.bean.CommonPage;
-import com.usky.common.log.annotation.Log;
-import com.usky.common.log.enums.BusinessType;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -21,31 +11,11 @@ import org.springframework.web.bind.annotation.RestController;
  * </p>
  *
  * @author han
- * @since 2023-09-25
+ * @since 2023-11-09
  */
-@RestController
+@Controller
 @RequestMapping("/baseAlarmNoticeResult")
 public class BaseAlarmNoticeResultController {
 
-    @Autowired
-    private BaseAlarmNoticeResultService baseAlarmNoticeResultService;
-
-    /**
-     * 推送记录查看分页
-     * @param receiver  接收人
-     * @param alarmId  告警ID
-     * @param current      当前页
-     * @param size     每页条数
-     * @return
-     */
-    @Log(title = "关联设备查看分页", businessType = BusinessType.OTHER)
-    @GetMapping("/resultInfo")
-    public ApiResult<CommonPage<BaseAlarmNoticeResult>> resultInfo(@RequestParam(value = "receiver", required = false) String receiver,
-                                                                   @RequestParam(value = "alarmId") Integer alarmId,
-                                                                   @RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
-                                                                   @RequestParam(value = "size", required = false, defaultValue = "10") Integer size)
-    {
-        return ApiResult.success(baseAlarmNoticeResultService.resultInfo(receiver, alarmId, current, size));
-    }
 }
 

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

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
 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;
 
@@ -15,7 +13,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author han
- * @since 2023-09-25
+ * @since 2023-11-09
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -47,7 +45,6 @@ public class BaseAlarmNoticeResult implements Serializable {
     /**
      * 通知时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime noticeTime;
 
     /**

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

@@ -2,6 +2,7 @@ package com.usky.alarm.mapper;
 
 import com.usky.alarm.domain.BaseAlarmNoticeResult;
 import com.usky.common.mybatis.core.CrudMapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * <p>
@@ -9,8 +10,9 @@ import com.usky.common.mybatis.core.CrudMapper;
  * </p>
  *
  * @author han
- * @since 2023-09-25
+ * @since 2023-11-09
  */
+@Repository
 public interface BaseAlarmNoticeResultMapper extends CrudMapper<BaseAlarmNoticeResult> {
 
 }

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

@@ -1,7 +1,6 @@
 package com.usky.alarm.service;
 
 import com.usky.alarm.domain.BaseAlarmNoticeResult;
-import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
 
 /**
@@ -10,8 +9,8 @@ import com.usky.common.mybatis.core.CrudService;
  * </p>
  *
  * @author han
- * @since 2023-09-25
+ * @since 2023-11-09
  */
 public interface BaseAlarmNoticeResultService extends CrudService<BaseAlarmNoticeResult> {
-    CommonPage<BaseAlarmNoticeResult> resultInfo(String receiver, Integer alarmId, Integer current, Integer size);
+
 }

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

@@ -1,16 +1,9 @@
 package com.usky.alarm.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-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.alarm.domain.BaseAlarmNoticeResult;
 import com.usky.alarm.mapper.BaseAlarmNoticeResultMapper;
 import com.usky.alarm.service.BaseAlarmNoticeResultService;
-import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.AbstractCrudService;
-import com.usky.common.security.utils.SecurityUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -19,18 +12,9 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author han
- * @since 2023-09-25
+ * @since 2023-11-09
  */
 @Service
 public class BaseAlarmNoticeResultServiceImpl extends AbstractCrudService<BaseAlarmNoticeResultMapper, BaseAlarmNoticeResult> implements BaseAlarmNoticeResultService {
-    @Override
-    public CommonPage<BaseAlarmNoticeResult> resultInfo(String receiver, Integer alarmId, Integer current, Integer size) {
-        IPage<BaseAlarmNoticeResult> page = new Page<>(current, size);
-        LambdaQueryWrapper<BaseAlarmNoticeResult> queryWrapper1 = Wrappers.lambdaQuery();
-        queryWrapper1.like(StringUtils.isNotBlank(receiver),BaseAlarmNoticeResult::getReceiver, receiver)
-                .eq(BaseAlarmNoticeResult::getAlarmId, alarmId);
-//                .eq(BaseAlarmNoticeResult::getTenantId, SecurityUtils.getTenantId());
-        page = this.page(page,queryWrapper1);
-        return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
-    }
+
 }

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

@@ -7,6 +7,7 @@ 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.BaseAlarmNoticeResultMapper;
 import com.usky.alarm.mapper.SysUserMapper;
 import com.usky.alarm.service.*;
 import com.usky.alarm.service.config.voice.VoiceNotice;
@@ -16,6 +17,7 @@ import com.usky.common.mybatis.core.AbstractCrudService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 
@@ -51,6 +53,9 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
     @Autowired
     private VoiceNotice voiceNotice;
 
+    @Autowired
+    private BaseAlarmNoticeResultMapper baseAlarmNoticeResultMapper;
+
     @Override
     public boolean add(BaseAlarm baseAlarm) throws ClientException {
         baseAlarm.setHandleStatus(0);
@@ -81,6 +86,7 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
                     return this.update(baseAlarm, queryWrapper);
                 } else {
                     boolean saveResult = this.save(baseAlarm);
+                    Integer alarmId = baseAlarm.getId();
                     if (records1.size() > 0) {
                         baseAlarm.setFacilityId(records1.get(0).getFacilityId());
                     }
@@ -108,6 +114,21 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
                                         records.get(0).getProductName(),baseAlarmType.getTypeName(),
                                         baseAlarm.getAlarmTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd " +
                                         "HH:mm:ss")));
+                                BaseAlarmNoticeResult baseAlarmNoticeResult = new BaseAlarmNoticeResult();
+                                baseAlarmNoticeResult.setReceiver(sysUser.getPhonenumber());
+                                baseAlarmNoticeResult.setAlarmId(alarmId);
+                                baseAlarmNoticeResult.setNoticeTime(LocalDateTime.now());
+                                baseAlarmNoticeResult.setNoticeType(3);
+                                baseAlarmNoticeResult.setNoticeContent(records.get(0).getProductName()+","+baseAlarmType.getTypeName()+","+baseAlarm.getAlarmTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd " +
+                                        "HH:mm:ss")));
+                                baseAlarmNoticeResult.setTenantId(records.get(0).getTenantId());
+                                if(code.getCode() != null && code.getCode().equals("OK")) {
+                                    //请求成功
+                                    baseAlarmNoticeResult.setNoticeResult(1);
+                                }else {
+                                    baseAlarmNoticeResult.setNoticeResult(2);
+                                }
+                                Integer saveAlarmResult = baseAlarmNoticeResultMapper.insert(baseAlarmNoticeResult);
                             }
                         }
                     }