From d7a97b8520a3cf0dd174ddda5669ef68a2a6b018 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 10 九月 2024 21:56:33 +0800
Subject: [PATCH] 修改保洁收纳&通讯录的导入，新增直播删除
---
zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingServiceImpl.java | 9 ++++
zhang-content/src/main/java/com/ruoyi/domain/Meeting.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingController.java | 9 ++++
zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java | 4 +
zhang-content/src/main/java/com/ruoyi/service/LiveStreamingService.java | 2 +
zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java | 44 +++++++++++-----------
zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java | 5 +-
7 files changed, 49 insertions(+), 26 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingController.java
index 8789fca..954bdcf 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingController.java
@@ -46,4 +46,13 @@
public AjaxResult add(@RequestBody LiveStreaming liveStreaming) throws ParseException {
return liveStreamingService.addData(liveStreaming);
}
+ /**
+ * 鎵归噺鍒犻櫎鐩存挱
+ */
+ @Log(title = "鐩存挱", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return liveStreamingService.deleteData(ids);
+ }
+
}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java b/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
index 706fc24..2e817df 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
@@ -99,4 +99,4 @@
private Date createTime;
-}
+}
\ No newline at end of file
diff --git a/zhang-content/src/main/java/com/ruoyi/service/LiveStreamingService.java b/zhang-content/src/main/java/com/ruoyi/service/LiveStreamingService.java
index 470382d..9ceff97 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/LiveStreamingService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/LiveStreamingService.java
@@ -14,4 +14,6 @@
List<LiveStreaming> selectByIds(Long[] ids);
AjaxResult addData(LiveStreaming liveStreaming) throws ParseException;
+
+ public AjaxResult deleteData(Long[] ids);
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingServiceImpl.java
index 720135c..4120a90 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingServiceImpl.java
@@ -182,4 +182,13 @@
}
}
+ @Override
+ public AjaxResult deleteData(Long[] ids) {
+ List<LiveStreaming> liveStreaming = selectByIds(ids);
+ for (LiveStreaming liveStreaming1:liveStreaming) {
+ liveStreaming1.setStatus(1);
+ updateById(liveStreaming1);
+ }
+ return AjaxResult.success();
+}
}
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 ab146b9..52677ae 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
@@ -49,7 +49,7 @@
private LambdaQueryWrapper<Meeting> buildCondition(Meeting meeting) {
LambdaQueryWrapper<Meeting> lqw = new LambdaQueryWrapper<>();
- // lqw.in(ZfDoctor::getFamilyId,familyIdList);
+ // lqw.in(ZfDoctor::getFamilyId,familyIdList);
lqw.orderByDesc(Meeting::getId);
lqw.like(StringUtils.isNotEmpty(meeting.getPlace()), Meeting::getPlace, meeting.getPlace())
.like(StringUtils.isNotEmpty(meeting.getApplyApart()), Meeting::getApplyApart, meeting.getApplyApart());
@@ -282,16 +282,16 @@
"by1",newModel.getBy1(),
"by2",newModel.getBy2(),
//"by3",newModel.getBy8(),
- // "by4",newModel.getBy9(),
+ // "by4",newModel.getBy9(),
"by5",newModel.getBy10()
- // "by6",newModel.getBy11(),
- // "by7",newModel.getBy3(),
- // "by8",newModel.getBy14(),
- // "by9",newModel.getBy15(),
- // "by10",newModel.getBy12(),
- // "by11",newModel.getBy4(),
- // "by12",newModel.getBy13(),
- // "by13",newModel.getBy15()
+ // "by6",newModel.getBy11(),
+ // "by7",newModel.getBy3(),
+ // "by8",newModel.getBy14(),
+ // "by9",newModel.getBy15(),
+ // "by10",newModel.getBy12(),
+ // "by11",newModel.getBy4(),
+ // "by12",newModel.getBy13(),
+ // "by13",newModel.getBy15()
);
@@ -395,17 +395,17 @@
esModel.setCtTableName("浼氳璁板綍");
esModel.setBy1(meeting.getTitle());
esModel.setBy2(meeting.getPlace());
- // esModel.setBy8(meeting.getConPeople());
- // esModel.setBy9(meeting.getPartPeople());
- // esModel.setBy10(meeting.getApplyPerson());
- // esModel.setBy3(meeting.getApplyApart());
- // esModel.setBy14(meeting.getStartTime());
- // esModel.setBy15(meeting.getEndTime());
- // esModel.setBy11(meeting.getIsPlacebrand());
- // esModel.setBy12(meeting.getConnPerson());
- // esModel.setBy4(meeting.getConnPhone());
- // esModel.setBy13(meeting.getStatu());
- // esModel.setBy16( meeting.getCreateTime());
+ // esModel.setBy8(meeting.getConPeople());
+ // esModel.setBy9(meeting.getPartPeople());
+ // esModel.setBy10(meeting.getApplyPerson());
+ // esModel.setBy3(meeting.getApplyApart());
+ // esModel.setBy14(meeting.getStartTime());
+ // esModel.setBy15(meeting.getEndTime());
+ // esModel.setBy11(meeting.getIsPlacebrand());
+ // esModel.setBy12(meeting.getConnPerson());
+ // esModel.setBy4(meeting.getConnPhone());
+ // esModel.setBy13(meeting.getStatu());
+ // esModel.setBy16( meeting.getCreateTime());
//杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
esModel.setBy5("/zMeeting");
// esModel.setFid(familyId);
@@ -418,4 +418,4 @@
}
}
-}
+}
\ No newline at end of file
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
index 79795fd..853b6e5 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
@@ -458,9 +458,10 @@
throw new RuntimeException(e);
}
log.info("鏁版嵁鍒楄〃涓猴細{}", dataList);
-
for (ZfClean zfClean : dataList) {
- zfCleanService.addData(zfClean);
+ if (zfClean.getMethod().length() != 0 && zfClean.getPlace().length() != 0 && zfClean.getSuitable().length() != 0) {
+ zfCleanService.addData(zfClean);
+ }
}
return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
index e44de9f..ec47aab 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
@@ -450,7 +450,9 @@
log.info("鏁版嵁鍒楄〃涓猴細{}", dataList);
for (ZfContact zfContact : dataList) {
- zfContactService.addData(zfContact);
+ if (zfContact.getNickName().length() != 0 && zfContact.getName().length() != 0 && zfContact.getMyName().length() != 0 ) {
+ zfContactService.addData(zfContact);
+ }
}
return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
--
Gitblit v1.9.1