From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/service/impl/ECallEventServiceImpl.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/ECallEventServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/ECallEventServiceImpl.java
index 382e78e..2db5463 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/ECallEventServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/ECallEventServiceImpl.java
@@ -17,12 +17,21 @@
package org.springblade.modules.task.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.logging.log4j.util.Strings;
+import org.springblade.common.cache.SysCache;
+import org.springblade.common.param.CommonParamSet;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.task.entity.ECallEventEntity;
import org.springblade.modules.task.vo.ECallEventVO;
import org.springblade.modules.task.mapper.EcCallEventMapper;
import org.springblade.modules.task.service.IECallEventService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
/**
* e呼即办表 服务实现类
@@ -35,8 +44,29 @@
@Override
public IPage<ECallEventVO> selectECallEventPage(IPage<ECallEventVO> page, ECallEventVO eCallEvent) {
- return page.setRecords(baseMapper.selectECallEventPage(page, eCallEvent));
+ CommonParamSet invoke = new CommonParamSet<>().invoke(ECallEventVO.class, eCallEvent);
+ return page.setRecords(baseMapper.selectECallEventPage(page,
+ eCallEvent,
+ invoke.getRegionChildCodesList(),
+ invoke.getGridCodeList(),
+ invoke.getIsAdministrator()));
}
-
+ /**
+ * e呼即办数据处理
+ */
+ @Override
+ public Object dataHandle() {
+ List<ECallEventEntity> list = list();
+ // 遍历
+ for (ECallEventEntity eCallEventEntity : list) {
+ if (!Strings.isBlank(eCallEventEntity.getLocation())){
+ String[] split = eCallEventEntity.getLocation().split(",");
+ eCallEventEntity.setAddress(split[2]);
+ // 更新
+ updateById(eCallEventEntity);
+ }
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3