From 7873c6f56380d28e1ae6958f77a84081797c817f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 28 九月 2024 21:34:44 +0800
Subject: [PATCH] 大华报警信息
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
index 3b431f8..9f9bc7a 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
@@ -1,11 +1,14 @@
package com.ycl.service.caseHandler.impl;
+import cn.hutool.core.util.PageUtil;
+import com.alibaba.druid.sql.PagerUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.api.CommonResult;
import com.ycl.bo.AdminUserDetails;
import com.ycl.common.constant.BaseCaseStatus;
import com.ycl.common.constant.StepName;
@@ -70,7 +73,7 @@
public final static Short LAST_THREEMONTH = 2;
@Override
- public Page<MyBacklogVO> listMyTask(Page<MyBacklogVO> page, String num, Long userId, Short type, Short source, Short time) {
+ public Page<MyBacklogVO> listMyTask(String num, Long userId, Short type, Short source, Short time, Integer current, Integer pageSize) {
LocalDateTime alarmTimeStart = null;
LocalDateTime alarmTimeEnd = null;
if (Objects.equals(time, LAST_WEEK)) {
@@ -83,14 +86,42 @@
alarmTimeStart = LocalDateTime.now().minusMonths(3);
alarmTimeEnd = LocalDateTime.now();
}
- //TODO:鍑虹幇杩囦竴娆￠噸澶嶆暟鎹�
- return disposeRecordMapper.selectMyBackList(page, userId, num, alarmTimeStart, alarmTimeEnd, source, type);
+ Integer pageIndex = PageUtil.getStart(current - 1, pageSize);
+ List<MyBacklogVO> list = disposeRecordMapper.selectMyBackList(userId, num, alarmTimeStart, alarmTimeEnd, source, type, pageIndex, pageSize);
+ Long total = disposeRecordMapper.selectMyBackListTotal(userId, num, alarmTimeStart, alarmTimeEnd, source, type);
+
+ list.forEach(o -> {
+ if (o.getPictureList() != null && o.getPictureList().size() > 0) {
+ o.setPicture(o.getPictureList().get(0).getUrl());
+ }
+ });
+ Page<MyBacklogVO> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(total);
+ return page;
+ }
+
+ @Override
+ public Long listMyTaskCount(String num, Long userId, Short type, Short source, Short time) {
+ LocalDateTime alarmTimeStart = null;
+ LocalDateTime alarmTimeEnd = null;
+ if (Objects.equals(time, LAST_WEEK)) {
+ alarmTimeStart = LocalDateTime.now().minusDays(7);
+ alarmTimeEnd = LocalDateTime.now();
+ } else if (Objects.equals(time, LAST_MONTH)) {
+ alarmTimeStart = LocalDateTime.now().minusMonths(1);
+ alarmTimeEnd = LocalDateTime.now();
+ } else if (Objects.equals(time, LAST_THREEMONTH)) {
+ alarmTimeStart = LocalDateTime.now().minusMonths(3);
+ alarmTimeEnd = LocalDateTime.now();
+ }
+ return disposeRecordMapper.selectMyBackListTotal(userId, num, alarmTimeStart, alarmTimeEnd, source, type);
}
@Override
@Transactional(rollbackFor = Exception.class)
- public Boolean saveOrUpdateUpload(UploadDisposingResultParam uploadDisposingResultParam) {
- log.info("鍙傛暟------------------>{}",uploadDisposingResultParam);
+ public CommonResult saveOrUpdateUpload(UploadDisposingResultParam uploadDisposingResultParam) {
+ log.info("鍙傛暟------------------>{}", uploadDisposingResultParam);
if (uploadDisposingResultParam.getArrivalTime() != null) {
uploadDisposingResultParam.setArrivalTime(uploadDisposingResultParam.getArrivalTime().replace("/", "-"));
}
@@ -252,6 +283,10 @@
//璁剧疆娴佺▼鐜妭鏁版嵁
disposeRecord.setWorkflowConfigStepId(workflowConfigStep.getId());
disposeRecord.setHandlerRoleId(workflowConfigStep.getRoleId());
- return baseMapper.insert(disposeRecord) == 1 ? true : false;
+ boolean result = baseMapper.insert(disposeRecord) == 1 ? true : false;
+ if (!result) {
+ CommonResult.failed("宸叉彁浜�,璇峰嬁閲嶅鎻愪氦");
+ }
+ return CommonResult.success("add success");
}
}
--
Gitblit v1.8.0