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

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

@@ -1,9 +1,19 @@
 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>
@@ -11,11 +21,31 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author han
- * @since 2023-11-09
+ * @since 2023-09-25
  */
-@Controller
+@RestController
 @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,6 +4,8 @@ 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;
 
@@ -13,7 +15,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author han
- * @since 2023-11-09
+ * @since 2023-09-25
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -45,6 +47,7 @@ public class BaseAlarmNoticeResult implements Serializable {
     /**
      * 通知时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime noticeTime;
 
     /**
@@ -73,4 +76,4 @@ public class BaseAlarmNoticeResult implements Serializable {
     private Integer tenantId;
 
 
-}
+}

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

@@ -1,6 +1,7 @@
 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;
 
 /**
@@ -9,8 +10,8 @@ import com.usky.common.mybatis.core.CrudService;
  * </p>
  *
  * @author han
- * @since 2023-11-09
+ * @since 2023-09-25
  */
 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,9 +1,16 @@
 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;
 
 /**
@@ -12,9 +19,18 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author han
- * @since 2023-11-09
+ * @since 2023-09-25
  */
 @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());
+    }
+}