From 5e877672f949b10287f265cc14b4085719d091c3 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 30 四月 2024 21:05:05 +0800
Subject: [PATCH] 提交会议统计
---
zhang-content/src/main/java/com/ruoyi/mapper/MeetingStatisticMapper.java | 9 +
zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java | 216 +++++++++++++++++++++++++++++++++++++++++++
zhang-content/src/main/java/com/ruoyi/service/MeetingStatisticService.java | 16 +++
zhang-content/src/main/java/com/ruoyi/domain/MeetingStatistic.java | 43 ++++++++
zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java | 2
5 files changed, 284 insertions(+), 2 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/MeetingStatistic.java b/zhang-content/src/main/java/com/ruoyi/domain/MeetingStatistic.java
new file mode 100644
index 0000000..5b80f37
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/domain/MeetingStatistic.java
@@ -0,0 +1,43 @@
+package com.ruoyi.domain;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+@Data
+@TableName("meeting_statistic")
+public class MeetingStatistic {
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 瀹跺涵鍙�
+ */
+ private Long familyId;
+ /**
+ * 浣跨敤鏃堕棿
+ */
+ private String useTime;
+ /**
+ * 浼氳瀹ゅ悕绉�
+ */
+ private String conferenceRoom;
+ /**
+ * 鏍囬
+ */
+ private String title;
+ /**
+ * 鐢宠浜�
+ */
+ private String applyPerson;
+ /**
+ * 瀹℃壒浜�
+ */
+ private int ratifyPerson;
+ /**
+ * 鐘舵��
+ */
+ private int status;
+
+
+
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/mapper/MeetingStatisticMapper.java b/zhang-content/src/main/java/com/ruoyi/mapper/MeetingStatisticMapper.java
new file mode 100644
index 0000000..8c774e6
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/mapper/MeetingStatisticMapper.java
@@ -0,0 +1,9 @@
+package com.ruoyi.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.domain.MeetingStatistic;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MeetingStatisticMapper extends BaseMapper<MeetingStatistic> {
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/MeetingStatisticService.java b/zhang-content/src/main/java/com/ruoyi/service/MeetingStatisticService.java
new file mode 100644
index 0000000..3f98139
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/service/MeetingStatisticService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.domain.MeetingStatistic;
+
+public interface MeetingStatisticService extends IService<MeetingStatistic> {
+
+ AjaxResult updateData(MeetingStatistic meetingStatistic);
+
+ AjaxResult deleteData(Long[] ids);
+
+ AjaxResult countData(Long[] familyId ,String applyPerson );
+
+ AjaxResult addData(MeetingStatistic meetingStatistic);
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java
index aa04d1e..cd4aae6 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java
@@ -59,8 +59,6 @@
.like(StringUtils.isNotEmpty(meeting.getApplyApart()), Meeting::getApplyApart, meeting.getApplyApart());
// .like(Integer.valueOf(meeting.getApplyPerson())!=null, Meeting::getApplyPerson, meeting.getApplyPerson());
-
-
lqw.between(meeting.getHappenStartTime() != null && meeting.getHappenEndTime() != null, Meeting::getStartTime, meeting.getHappenStartTime(), meeting.getHappenEndTime());
return lqw;
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java
new file mode 100644
index 0000000..f35eedc
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java
@@ -0,0 +1,216 @@
+package com.ruoyi.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.EsModel;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.domain.*;
+import com.ruoyi.mapper.MeetingStatisticMapper;
+import com.ruoyi.service.*;
+import lombok.extern.slf4j.Slf4j;
+import org.elasticsearch.action.delete.DeleteRequest;
+import org.elasticsearch.action.update.UpdateRequest;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import static com.ruoyi.constant.MenuAuthority.EVENT_LIST_ADD;
+
+
+@Slf4j
+@Service
+public class MeetingStatisticServiceImpl extends ServiceImpl<MeetingStatisticMapper, MeetingStatistic> implements MeetingStatisticService {
+
+ @Resource
+ ZInfoUserService zInfoUserService;
+
+ @Resource
+ ZfLogService zfLogService;
+
+ @Resource
+ private RestHighLevelClient restHighLevelClient;
+
+ @Resource
+ private EsService esSer;
+
+ @Resource
+ ZAuthorityService zAuthorityService;
+
+ @Resource
+ private MeetingStatisticService meetingStatisticService;
+
+ private LambdaQueryWrapper<MeetingStatistic> uniqueCondition(MeetingStatistic meetingStatistic){
+ LambdaQueryWrapper<MeetingStatistic> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(!StringUtils.isEmpty(meetingStatistic.getUseTime()), MeetingStatistic::getUseTime, meetingStatistic.getUseTime());
+ lqw.eq(!StringUtils.isEmpty(meetingStatistic.getConferenceRoom()), MeetingStatistic::getConferenceRoom, meetingStatistic.getConferenceRoom());
+ lqw.eq(!StringUtils.isEmpty(meetingStatistic.getTitle()), MeetingStatistic::getTitle, meetingStatistic.getTitle());
+// lqw.eq(meetingStatistic.getFamilyId()!=null,MeetingStatistic::getFamilyId,meeting.getFamilyId());
+ lqw.eq(!StringUtils.isEmpty(meetingStatistic.getApplyPerson()), MeetingStatistic::getApplyPerson, meetingStatistic.getApplyPerson());
+ lqw.eq(!StringUtils.isEmpty(String.valueOf(meetingStatistic.getRatifyPerson())), MeetingStatistic::getRatifyPerson, meetingStatistic.getRatifyPerson());
+ lqw.eq(!StringUtils.isEmpty(String.valueOf(meetingStatistic.getStatus())), MeetingStatistic::getStatus, meetingStatistic.getStatus());
+ lqw.eq(!StringUtils.isEmpty(String.valueOf(meetingStatistic.getFamilyId())), MeetingStatistic::getFamilyId, meetingStatistic.getFamilyId());
+ return lqw;
+ }
+
+
+ @Override
+ public AjaxResult updateData(MeetingStatistic meetingStatistic) {
+ ZfLog zfLog = new ZfLog();
+ zfLog.setUpdateTime(LocalDateTime.now());
+ zfLog.setModule("浼氳瀹℃壒");
+ zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
+ zfLogService.save(zfLog);
+ System.out.println("===================================="+meetingStatistic);
+ if(updateById(meetingStatistic)){
+ //鍒版暟鎹簱涓煡璇㈠搴旂殑鏁版嵁
+ MeetingStatistic dataById = getById(meetingStatistic.getId());
+
+ //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
+ EsModel esResult = esSer.findByCtId(dataById.getId().intValue(), "浼氳");
+ System.out.println("===================================="+meetingStatistic);
+ if (esResult == null){
+ return AjaxResult.success();
+ }
+
+ //鎿嶄綔es淇敼鏁版嵁
+ EsModel newModel = new EsModel();
+// System.out.println(meeting);
+// System.out.println("=============="+meetingStatistic.getConnPhone());
+
+// if(meetingStatistic.getUseTime()!=null){
+// newModel.setBy2(meetingStatistic.getUseTime());
+// }else {
+// newModel.setBy2(dataById.getUseTime());
+// }
+// if(meetingStatistic.getConferenceRoom()!=null){
+// newModel.setBy3(meetingStatistic.getConferenceRoom());
+// }else {
+// newModel.setBy3(dataById.getConferenceRoom());
+// }
+ if(meetingStatistic.getTitle()!=null){
+ newModel.setBy4(meetingStatistic.getTitle());
+ }else {
+ newModel.setBy4(dataById.getTitle());
+ }
+ if(meetingStatistic.getApplyPerson()!=null){
+ newModel.setBy5(meetingStatistic.getApplyPerson());
+ }else {
+ newModel.setBy5(dataById.getApplyPerson());
+ }
+// if(meetingStatistic.getRatifyPerson() == 0){
+// newModel.setBy10(meetingStatistic.getRatifyPerson());
+// }else {
+// newModel.setBy10(dataById.getRatifyPerson());
+// }
+// if(meetingStatistic.getStatus() == 0){
+// newModel.setBy11(meetingStatistic.getStatus());
+// }else {
+// newModel.setBy11(dataById.getStatus());
+// }
+ UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
+ updateRequest.doc(
+ "by1",newModel.getBy4(),
+ "by2",newModel.getBy5()
+ );
+
+ try {
+ restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ return AjaxResult.success();
+ }else {
+ return AjaxResult.error();
+ }
+ }
+
+ @Override
+ public AjaxResult deleteData(Long[] ids) {
+ List<MeetingStatistic> meetings = listByIds(Arrays.asList(ids));
+ if (meetingStatisticService.removeByIds(Arrays.asList(ids))) {
+ //鍒犻櫎es涓殑鏁版嵁
+ meetings.stream().forEach(meeting -> {
+ EsModel esModel = esSer.findByCtId((meeting.getId().intValue()), "浼氳");
+ if (esModel != null){
+ DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
+ try {
+ restHighLevelClient.delete(deleteRequest,RequestOptions.DEFAULT);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ });
+
+ return AjaxResult.success();
+ }else {
+ return AjaxResult.error();
+ }
+
+ }
+
+ @Override
+ public AjaxResult countData(Long[] familyId ,String applyPerson) {
+ return null;
+ }
+
+ @Override
+ public AjaxResult addData(MeetingStatistic meetingStatistic) {
+
+ ZInfoUser myself = zInfoUserService.getMyself();
+ Long familyId = myself.getFamilyId();
+
+ if(familyId == null){
+ throw new RuntimeException("鎮ㄨ繕鏈姞鍏ヤ换浣曞搴�");
+ }
+
+ List<ZAuthority> authority = zAuthorityService.getAuthority();
+ List<Long> familyIdList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EVENT_LIST_ADD)).map(ZAuthority::getFid).collect(Collectors.toList());
+ familyIdList.add(familyId);
+
+ if (meetingStatistic.getFamilyId()!=null && !familyIdList.contains(meetingStatistic.getFamilyId())) {
+ throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
+ }
+
+
+ if(meetingStatistic.getFamilyId() == null){
+ //榛樿娣诲姞鑷繁瀹跺涵鐨勬暟鎹�
+ meetingStatistic.setFamilyId(familyId);
+ }
+
+ //鍒ゆ柇鏄惁鏈夐噸澶嶆暟鎹�
+ LambdaQueryWrapper<MeetingStatistic> lqw = uniqueCondition(meetingStatistic);
+ List<MeetingStatistic> list = list(lqw);
+
+ if(list.size()>0){
+ throw new RuntimeException("璇峰嬁鏂板閲嶅鏁版嵁");
+ }
+
+ if (save(meetingStatistic)) {
+ EsModel esModel = new EsModel();
+ Long inte = meetingStatistic.getId();
+ String uuid = UUID.randomUUID().toString().replace("-","");
+ esModel.setId(uuid);
+ esModel.setCtId(inte);
+ esModel.setCtTableName("浼氳缁熻");
+ esModel.setBy1(meetingStatistic.getTitle());
+ esModel.setBy5(meetingStatistic.getApplyPerson());
+ //杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
+ esModel.setBy5("/zMeetingStatistic");
+ esModel.setFid(familyId);
+ esSer.insertTable(esModel);
+
+ return AjaxResult.success();
+ } else {
+ return AjaxResult.error();
+ }
+ }
+}
--
Gitblit v1.9.1