From 2dcf4b9d75cc1b6613aea59cec4a0f9cc97f1c0e Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 05 七月 2021 13:15:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java | 78 ++++++++++++++++++++++++++++-----------
1 files changed, 56 insertions(+), 22 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java
index e49c1ad..68d6a5d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java
@@ -2,24 +2,16 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.panzhihua.common.model.dtos.grid.EventVisitingTasksAddDTO;
-import com.panzhihua.common.model.dtos.grid.EventVisitingTasksDeleteDTO;
-import com.panzhihua.common.model.dtos.grid.EventVisitingTasksEditDTO;
-import com.panzhihua.common.model.dtos.grid.PageEventVisitingTasksDTO;
+import com.panzhihua.common.model.dtos.IdDTO;
+import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.query.visit.EventTasksQuery;
import com.panzhihua.common.model.query.visit.EventVisitListQuery;
-import com.panzhihua.common.model.vos.IPageVO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.visit.EventVisitCompleteDTO;
+import com.panzhihua.common.model.dtos.visit.EventVisitCompleteDTO;
import com.panzhihua.common.model.vos.visit.EventVisitingTasksDetailsVO;
import com.panzhihua.common.model.vos.visit.EventVisitingTasksVO;
import com.panzhihua.service_grid.model.dos.EventVisitingTasksDO;
-import javax.crypto.BadPaddingException;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
import java.util.List;
/**
@@ -27,13 +19,14 @@
*
* @author cedoo email:cedoo(a)qq.com
* @version 1.0
- * @since 1.0
* @date 2021-05-26
- * */
+ * @since 1.0
+ */
public interface EventVisitingTasksService extends IService<EventVisitingTasksDO> {
/**
* 新增重点人群走访记录
+ *
* @param eventVisitingTasksAddDTO
* @return 新增结果
*/
@@ -41,6 +34,7 @@
/**
* 修改重点人群走访记录
+ *
* @param eventVisitingTasksEditDTO
* @return 维护结果
*/
@@ -48,6 +42,7 @@
/**
* 分页查找重点人群走访记录
+ *
* @param pageEventVisitingTasksDTO
* @return 维护结果
*/
@@ -55,6 +50,7 @@
/**
* 删除重点人群走访记录
+ *
* @param EventVisitingTasksDeleteDTO
* @return 平台用户信息
*/
@@ -62,6 +58,7 @@
/**
* 查询重点人群走访记录详细信息
+ *
* @param id 重点人群走访记录 id
* @return 查找结果
*/
@@ -70,13 +67,22 @@
/**
* 后台统计走访任务
+ *
* @param communityId
* @return
*/
R count(Long communityId);
/**
+ * app走访任务
+ * @param query
+ * @return
+ */
+ R appTaskList(EventTasksQuery query) throws Exception;
+
+ /**
* 走访任务列表
+ *
* @param query
* @return
*/
@@ -84,14 +90,16 @@
/**
* 删除走访任务
- * @param ids
+ *
+ * @param idDTO
* @param communityId
* @return
*/
- R delete(String ids, Long communityId);
+ R delete(IdDTO idDTO, Long communityId);
/**
* 需走访人员列表
+ *
* @param query
* @return
*/
@@ -99,6 +107,7 @@
/**
* app查询走访记录
+ *
* @param query
* @return
*/
@@ -106,6 +115,7 @@
/**
* app 走访详情
+ *
* @param id
* @return
*/
@@ -113,40 +123,64 @@
/**
* 新增
- * @param ids
+ *
+ * @param idDTO
* @param communityId
* @param userId
* @return
*/
- R add(String ids, Long communityId, Long userId) throws Exception;
+ R add(IdDTO idDTO, Long communityId, Long userId) throws Exception;
List<EventVisitingTasksVO> exportTaskList(EventTasksQuery query) throws Exception;
/**
* 撤销
- * @param id
+ *
+ * @param idDTO
* @return
*/
- R cancel(Long id);
+ R cancel(IdDTO idDTO);
/**
* 恢复
- * @param id
+ *
+ * @param idDTO
* @return
*/
- R reset(Long id);
+ R reset(IdDTO idDTO);
/**
* 开始
+ *
* @param id
* @return
*/
- R start(Long id,Long userId);
+ R start(Long id, Long userId);
/**
* 完成
+ *
* @param taskCompleteDTO
* @return
*/
R complete(EventVisitCompleteDTO taskCompleteDTO);
+
+ /**
+ * description 获取所有未上传到浪潮平台的事件列表
+ *
+ * @return String 事件列表
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ List<LcEventVisitingTasksListDTO> getUnUploadVisitingTask();
+
+ /**
+ * description 更新上传是否成功标识
+ *
+ * @param id 事件主键ID
+ * @return Boolean 上传是否成功
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ Boolean updateLcUploadFlagVisitingTask(Long id);
}
--
Gitblit v1.7.1