From 2f432628a460a73f830c278a7d69e8328767a7b6 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 10 六月 2024 10:12:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java | 5
zhang-content/src/main/java/com/ruoyi/domain/Meeting.java | 8
zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingBackServiceImpl.java | 77 ++++++
zhang-content/src/main/java/com/ruoyi/domain/MemoBook.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MeetingStatisticController.java | 30 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MemoBookController.java | 1
zhang-content/src/main/java/com/ruoyi/service/LiveStreamingService.java | 16 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingBackController.java | 40 +++
zhang-content/src/main/java/com/ruoyi/service/LiveStreamingBackService.java | 13 +
zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java | 2
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java | 6
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 28 ++
zhang-content/src/main/java/com/ruoyi/mapper/LiveStreamingMapper.java | 9
zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingServiceImpl.java | 132 +++++++++++
zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java | 130 +++++++++-
zhang-content/src/main/java/com/ruoyi/domain/LiveStreaming.java | 63 +++++
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingController.java | 48 ++++
zhang-content/src/main/java/com/ruoyi/service/MeetingStatisticService.java | 8
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java | 6
zhang-content/src/main/java/com/ruoyi/domain/MeetingStatistic.java | 20 +
zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java | 11
zhang-content/src/main/java/com/ruoyi/mapper/LiveStreamingBackMapper.java | 9
zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java | 20
24 files changed, 647 insertions(+), 53 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingBackController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingBackController.java
new file mode 100644
index 0000000..f0a88f2
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingBackController.java
@@ -0,0 +1,40 @@
+package com.ruoyi.web.controller.zhang;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.domain.LiveStreaming;
+import com.ruoyi.service.LiveStreamingService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
+import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
+
+@Slf4j
+@RestController
+@RequestMapping("/zLiveStreamingBack")
+public class LiveStreamingBackController extends BaseController {
+ @Autowired
+ private LiveStreamingService liveStreamingService;
+
+ @GetMapping("/all")
+ public AjaxResult listAll(LiveStreaming liveStreaming){
+ Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ return liveStreamingService.selectDataList(liveStreaming, pageNum, pageSize);
+ }
+ /**
+ * 閫氳繃id鑾峰彇鐩存挱鍥炴斁璇︾粏淇℃伅
+ */
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return success(liveStreamingService.getById(id));
+ }
+
+}
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
new file mode 100644
index 0000000..938c27d
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingController.java
@@ -0,0 +1,48 @@
+package com.ruoyi.web.controller.zhang;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.domain.LiveStreaming;
+
+import com.ruoyi.service.LiveStreamingService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
+import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
+
+@Slf4j
+@RestController
+@RequestMapping("/zLiveStreaming")
+public class LiveStreamingController extends BaseController {
+ @Autowired
+ private LiveStreamingService liveStreamingService;
+
+ @GetMapping("/all")
+ public AjaxResult listAll(LiveStreaming liveStreaming){
+ Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ return liveStreamingService.selectDataList(liveStreaming, pageNum, pageSize);
+ }
+ /**
+ * 閫氳繃id鑾峰彇鐩存挱璇︾粏淇℃伅
+ */
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return success(liveStreamingService.getById(id));
+ }
+ /**
+ * 鏂板鐩存挱
+ */
+ @Log(title = "鐩存挱", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody LiveStreaming liveStreaming)
+ {
+ return liveStreamingService.addData(liveStreaming);
+ }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MeetingStatisticController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MeetingStatisticController.java
index ec01e55..027836c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MeetingStatisticController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MeetingStatisticController.java
@@ -3,11 +3,16 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.domain.MeetingStatistic;
import com.ruoyi.service.MeetingStatisticService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
+import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
@RestController
@RequestMapping("/zMeetingStatistic")
@@ -16,6 +21,30 @@
private MeetingStatisticService meetingStatisticService;
/**
+ * 鍏ㄩ儴鏁版嵁
+ */
+ @GetMapping("/all")
+ public AjaxResult listAll(MeetingStatistic meetingStatistic){
+ Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ return meetingStatisticService.selectDataList(meetingStatistic, pageNum, pageSize);
+ }
+ /**
+ * 鏍规嵁id,鑾峰彇浼氳璁板綍璇︾粏淇℃伅
+ */
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return success(meetingStatisticService.getById(id));
+ }
+
+ /**
+ * 鍙緭鍑哄搴彿鍜屽垱寤烘椂闂�
+ */
+ @GetMapping("/one")
+ public AjaxResult listOne(MeetingStatistic meetingStatistic){
+ return meetingStatisticService.DataList(meetingStatistic);
+ }
+ /**
* 淇敼浼氳缁熻
*/
@Log(title = "浼氳缁熻", businessType = BusinessType.UPDATE)
@@ -24,6 +53,7 @@
return meetingStatisticService.updateData(meetingStatistic);
}
+
/**
* 鎵归噺鍒犻櫎浼氳缁熻璁板綍
*/
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MemoBookController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MemoBookController.java
index 95c324a..8943f67 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MemoBookController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MemoBookController.java
@@ -51,6 +51,7 @@
public AjaxResult updateData(@RequestBody MemoBook memoBook){
boolean b = memoBookService.updateById(memoBook);
if (b){
+ System.out.println("sssddddddddddddddddddddddd");
return AjaxResult.success();
}else {
return AjaxResult.error();
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
index 98f9674..e41665f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -12,7 +12,7 @@
*/
public interface SysUserMapper
{
- public List<String> findUserNames(Long[] ids);
+ public List<SysUser> findUserNames(Long[] ids);
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃
*
@@ -87,6 +87,10 @@
*/
public int resetUserPwd(@Param("userName") String userName, @Param("password") String password);
+ public int deleteUserByUserName(String userName);
+ public int deleteUserByName(String userName);
+
+ public int deleteById(Long[] userId);
/**
* 閫氳繃鐢ㄦ埛ID鍒犻櫎鐢ㄦ埛
*
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 3f4c384..e97cc14 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -73,7 +73,9 @@
@Override
public List<String> findUserNames(Long[] ids) {
- List<String> usNames = userMapper.findUserNames(ids);
+ List<String> usNames = userMapper.findUserNames(ids).stream().map(SysUser::getUserName).collect(Collectors.toList());
+ //.stream().map(SysUser::getUserName).collect(Collectors.toList());;
+ System.out.println("99999999999900000000000");
System.out.println(usNames);
//.stream().map(SysUser::getUserName).collect(Collectors.toList());
return usNames;
@@ -491,7 +493,29 @@
userRoleMapper.deleteUserRole(userIds);
// 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧鑱�
userPostMapper.deleteUserPost(userIds);
- return userMapper.deleteUserByIds(userIds);
+ //鎵惧埌鐢ㄦ埛鍚�
+ List<String> unames = findUserNames(userIds);
+ for(String name :unames) {
+ // System.out.println(name.equals(""));
+ // System.out.println(name==null);
+
+ // if(name!="" || name != null) {
+ ZInfoUser fs = new ZInfoUser();
+ fs.setNickName(name);
+ List<ZInfoUser> lis = zInfoUserService.selectByCondition(fs);
+ System.out.println("902");
+
+ System.out.println(lis.size());
+ if (!name.equals("") && lis.size() > 0)
+ userMapper.deleteUserByUserName(name);
+ else
+ userMapper.deleteUserByName(name);
+ // }
+ }
+
+ return 1;
+// zInfoUserService.removeByUserName( findUserNames(userIds));
+
}
/**
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/LiveStreaming.java b/zhang-content/src/main/java/com/ruoyi/domain/LiveStreaming.java
new file mode 100644
index 0000000..d0b55d9
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/domain/LiveStreaming.java
@@ -0,0 +1,63 @@
+package com.ruoyi.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.ibatis.type.JdbcType;
+
+import java.sql.Timestamp;
+import java.util.Date;
+
+@Data
+@TableName("live_streaming")
+public class LiveStreaming {
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+ /**
+ * 寮�濮嬪紑浼氭椂闂�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
+ /**
+ * 缁撴潫寮�浼氭椂闂�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+ /**
+ * 鏍囬
+ */
+ private String title;
+ /**
+ * 鐢宠浜�
+ */
+ private String applyPerson;
+ /**
+ * 鑱旂郴浜�
+ */
+ private String contactPerson;
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
+ private String contactPhone;
+ /**
+ * 鐢熸垚鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @TableField(exist = false, jdbcType = JdbcType.TIMESTAMP)
+ private Timestamp happenStartTime;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @TableField(exist = false, jdbcType = JdbcType.TIMESTAMP)
+ private Timestamp happenEndTime;
+
+}
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 d945927..ed6e0f3 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
@@ -42,7 +42,7 @@
* 鐢宠浜�
*/
@Excel(name = "鐢宠浜�")
- private int applyPerson;
+ private String applyPerson;
/**
* 鐢宠閮ㄩ棬鎴栧搴�
*/
@@ -58,7 +58,7 @@
* 缁撴潫鏃堕棿
*/
@Excel(name = "缁撴潫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
@@ -82,7 +82,7 @@
* 鑱旂郴浜�
*/
@Excel(name = "鑱旂郴浜�")
- private int connPerson;
+ private String connPerson;
/**
* 鑱旂郴鐢佃瘽
*/
@@ -96,7 +96,7 @@
/**
* 鐢熸垚鏃堕棿
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/MeetingStatistic.java b/zhang-content/src/main/java/com/ruoyi/domain/MeetingStatistic.java
index 5b80f37..a94a2c8 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/MeetingStatistic.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/MeetingStatistic.java
@@ -2,7 +2,11 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+
+import java.util.Date;
+
@Data
@TableName("meeting_statistic")
public class MeetingStatistic {
@@ -37,6 +41,22 @@
* 鐘舵��
*/
private int status;
+ /**
+ * 寮�濮嬪紑浼氭椂闂�
+ */
+ @JsonFormat(timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+ private Date happenStartTime;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @JsonFormat(timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+ private Date happenEndTime;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTime;
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/MemoBook.java b/zhang-content/src/main/java/com/ruoyi/domain/MemoBook.java
index 77fcd83..df48b13 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/MemoBook.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/MemoBook.java
@@ -34,9 +34,7 @@
private Date createTime;
private String content;
-
-
-
+
private String url;
}
diff --git a/zhang-content/src/main/java/com/ruoyi/mapper/LiveStreamingBackMapper.java b/zhang-content/src/main/java/com/ruoyi/mapper/LiveStreamingBackMapper.java
new file mode 100644
index 0000000..b87c077
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/mapper/LiveStreamingBackMapper.java
@@ -0,0 +1,9 @@
+package com.ruoyi.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.domain.LiveStreaming;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface LiveStreamingBackMapper extends BaseMapper<LiveStreaming> {
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/mapper/LiveStreamingMapper.java b/zhang-content/src/main/java/com/ruoyi/mapper/LiveStreamingMapper.java
new file mode 100644
index 0000000..90be548
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/mapper/LiveStreamingMapper.java
@@ -0,0 +1,9 @@
+package com.ruoyi.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.domain.LiveStreaming;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface LiveStreamingMapper extends BaseMapper<LiveStreaming> {
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/LiveStreamingBackService.java b/zhang-content/src/main/java/com/ruoyi/service/LiveStreamingBackService.java
new file mode 100644
index 0000000..afab862
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/service/LiveStreamingBackService.java
@@ -0,0 +1,13 @@
+package com.ruoyi.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.domain.LiveStreaming;
+
+import java.util.List;
+
+public interface LiveStreamingBackService extends IService<LiveStreaming> {
+ AjaxResult selectDataList(LiveStreaming liveStreaming, Integer pageNum, Integer pageSize);
+
+ List<LiveStreaming> selectByIds(Long[] ids);
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/LiveStreamingService.java b/zhang-content/src/main/java/com/ruoyi/service/LiveStreamingService.java
new file mode 100644
index 0000000..59354ff
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/service/LiveStreamingService.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.LiveStreaming;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+public interface LiveStreamingService extends IService<LiveStreaming> {
+ AjaxResult selectDataList(LiveStreaming liveStreaming, Integer pageNum, Integer pageSize);
+
+ List<LiveStreaming> selectByIds(Long[] ids);
+
+ AjaxResult addData(LiveStreaming liveStreaming);
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/MeetingStatisticService.java b/zhang-content/src/main/java/com/ruoyi/service/MeetingStatisticService.java
index 3f98139..6b81a0c 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/MeetingStatisticService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/MeetingStatisticService.java
@@ -4,13 +4,19 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.MeetingStatistic;
+import java.util.List;
+
public interface MeetingStatisticService extends IService<MeetingStatistic> {
AjaxResult updateData(MeetingStatistic meetingStatistic);
AjaxResult deleteData(Long[] ids);
- AjaxResult countData(Long[] familyId ,String applyPerson );
+ AjaxResult DataList(MeetingStatistic meetingStatistic);
AjaxResult addData(MeetingStatistic meetingStatistic);
+
+ List<MeetingStatistic> selectByIds(Long[] ids);
+
+ AjaxResult selectDataList(MeetingStatistic meetingStatistic, Integer pageNum, Integer pageSize);
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
index d12a5fc..00e2113 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
@@ -30,7 +30,7 @@
// AjaxResult updateBySysId()
List<ZInfoUser> selectByCondition(ZInfoUser zInfoUser);
- AjaxResult removeByUserName(List userName);
+ AjaxResult removeByUserName(List<String> userName);
List<ZInfoUser> selectByFamId(long fid);
AjaxResult searchMyRelation();
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingBackServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingBackServiceImpl.java
new file mode 100644
index 0000000..78b43fe
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingBackServiceImpl.java
@@ -0,0 +1,77 @@
+package com.ruoyi.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.MapUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.domain.LiveStreaming;
+import com.ruoyi.mapper.LiveStreamingBackMapper;
+import com.ruoyi.service.LiveStreamingBackService;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+@Service
+public class LiveStreamingBackServiceImpl extends ServiceImpl<LiveStreamingBackMapper, LiveStreaming> implements LiveStreamingBackService {
+
+ private LambdaQueryWrapper<LiveStreaming> buildCondition(LiveStreaming liveStreaming) {
+ LambdaQueryWrapper<LiveStreaming> lqw = new LambdaQueryWrapper<>();
+// lqw.in(LiveStreaming::getFamilyId,familyIdList);
+ lqw.orderByDesc(LiveStreaming::getCreateTime);
+ lqw.like(StringUtils.isNotEmpty(liveStreaming.getTitle()), LiveStreaming::getTitle, liveStreaming.getTitle())
+ .like(StringUtils.isNotEmpty(liveStreaming.getApplyPerson()),LiveStreaming::getApplyPerson,liveStreaming.getApplyPerson())
+ .like(StringUtils.isNotEmpty(liveStreaming.getContactPerson()),LiveStreaming::getContactPerson,liveStreaming.getContactPerson());
+ lqw.between(liveStreaming.getHappenStartTime() != null && liveStreaming.getHappenEndTime() != null,LiveStreaming::getCreateTime,liveStreaming.getHappenStartTime(),liveStreaming.getHappenEndTime());
+
+ return lqw;
+ }
+
+ @Override
+ public AjaxResult selectDataList(LiveStreaming liveStreaming, Integer pageNum, Integer pageSize) {
+ //瑕佹煡鑷繁瀹跺涵鐨�
+// ZInfoUser myself = zInfoUserService.getMyself();
+// if(myself==null)
+// {
+// // System.out.println("ssssss");
+// return AjaxResult.success("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+// }
+// Long familyId = myself.getFamilyId();
+// //涔熻鏌ュ埆浜烘巿鏉冪殑
+// List<ZAuthority> authority = zAuthorityService.getAuthority();
+// List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(DOCTOR_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
+// //鍔犱笂鑷繁瀹跺涵鐨刬d
+// idList.add(familyId);
+// String familyIds = listFamilyIds();
+// String secondFamilyAuthority = listSecondFamilyIds();
+ LambdaQueryWrapper<LiveStreaming> lqw = buildCondition(liveStreaming);
+
+
+ Page<LiveStreaming> liveStreamingPage = new Page<>(pageNum, pageSize);
+ Page<LiveStreaming> pageResult = page(liveStreamingPage, lqw);
+
+ List<LiveStreaming> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
+
+// List<LiveStreaming> dtoResult = markOwnData(familyId, beanRecords);
+
+ HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
+ return AjaxResult.success(data);
+
+ }
+
+
+ @Override
+ public List<LiveStreaming> selectByIds(Long[] ids) {
+ List<LiveStreaming> list = new ArrayList<>();
+ if (ids.length != 0)
+ list = listByIds(Arrays.asList(ids));
+ else
+ list = list();
+ return list;
+ }
+
+}
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
new file mode 100644
index 0000000..f153e93
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingServiceImpl.java
@@ -0,0 +1,132 @@
+package com.ruoyi.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.MapUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.domain.*;
+import com.ruoyi.mapper.LiveStreamingMapper;
+import com.ruoyi.service.EsService;
+import com.ruoyi.service.LiveStreamingService;
+import com.ruoyi.service.ZAuthorityService;
+import com.ruoyi.service.ZInfoUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static com.ruoyi.constant.MenuAuthority.DOCTOR_LIST;
+@Slf4j
+@Service
+public class LiveStreamingServiceImpl extends ServiceImpl<LiveStreamingMapper, LiveStreaming> implements LiveStreamingService {
+
+ @Resource
+ ZInfoUserService zInfoUserService;
+
+ @Resource
+ ZAuthorityService zAuthorityService;
+
+ @Resource
+ private EsService esSer;
+
+ private LambdaQueryWrapper<LiveStreaming> buildCondition(LiveStreaming liveStreaming) {
+ LambdaQueryWrapper<LiveStreaming> lqw = new LambdaQueryWrapper<>();
+// lqw.in(LiveStreaming::getFamilyId,familyIdList);
+ lqw.orderByDesc(LiveStreaming::getCreateTime);
+ lqw.like(StringUtils.isNotEmpty(liveStreaming.getTitle()), LiveStreaming::getTitle, liveStreaming.getTitle())
+ .like(StringUtils.isNotEmpty(liveStreaming.getApplyPerson()),LiveStreaming::getApplyPerson,liveStreaming.getApplyPerson())
+ .like(StringUtils.isNotEmpty(liveStreaming.getContactPerson()),LiveStreaming::getContactPerson,liveStreaming.getContactPerson());
+ lqw.between(liveStreaming.getHappenStartTime() != null && liveStreaming.getHappenEndTime() != null,LiveStreaming::getCreateTime,liveStreaming.getHappenStartTime(),liveStreaming.getHappenEndTime());
+
+ return lqw;
+ }
+
+ private LambdaQueryWrapper<LiveStreaming> uniqueCondition(LiveStreaming liveStreaming){
+ LambdaQueryWrapper<LiveStreaming> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(!StringUtils.isEmpty(liveStreaming.getTitle()), LiveStreaming::getTitle, liveStreaming.getTitle());
+ lqw.eq(!StringUtils.isEmpty(liveStreaming.getContactPhone()), LiveStreaming::getContactPhone, liveStreaming.getContactPhone());
+ lqw.eq(!StringUtils.isEmpty(liveStreaming.getApplyPerson()), LiveStreaming::getApplyPerson, liveStreaming.getApplyPerson());
+ lqw.eq(!StringUtils.isEmpty(liveStreaming.getContactPerson()), LiveStreaming::getContactPerson, liveStreaming.getContactPerson());
+ return lqw;
+ }
+
+ @Override
+ public AjaxResult selectDataList(LiveStreaming liveStreaming, Integer pageNum, Integer pageSize) {
+ //瑕佹煡鑷繁瀹跺涵鐨�
+// ZInfoUser myself = zInfoUserService.getMyself();
+// if(myself==null)
+// {
+// // System.out.println("ssssss");
+// return AjaxResult.success("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+// }
+// Long familyId = myself.getFamilyId();
+// //涔熻鏌ュ埆浜烘巿鏉冪殑
+// List<ZAuthority> authority = zAuthorityService.getAuthority();
+// List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(DOCTOR_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
+// //鍔犱笂鑷繁瀹跺涵鐨刬d
+// idList.add(familyId);
+// String familyIds = listFamilyIds();
+// String secondFamilyAuthority = listSecondFamilyIds();
+ LambdaQueryWrapper<LiveStreaming> lqw = buildCondition(liveStreaming);
+
+
+ Page<LiveStreaming> liveStreamingPage = new Page<>(pageNum, pageSize);
+ Page<LiveStreaming> pageResult = page(liveStreamingPage, lqw);
+
+ List<LiveStreaming> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
+
+// List<LiveStreaming> dtoResult = markOwnData(familyId, beanRecords);
+
+ HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
+ return AjaxResult.success(data);
+
+ }
+
+
+ @Override
+ public List<LiveStreaming> selectByIds(Long[] ids) {
+ List<LiveStreaming> list = new ArrayList<>();
+ if (ids.length != 0)
+ list = listByIds(Arrays.asList(ids));
+ else
+ list = list();
+ return list;
+ }
+
+ @Override
+ public AjaxResult addData(LiveStreaming liveStreaming) {
+ LambdaQueryWrapper<LiveStreaming> lqw = uniqueCondition(liveStreaming);
+ List<LiveStreaming> list = list(lqw);
+
+ if(list.size()>0){
+ throw new RuntimeException("璇峰嬁鏂板閲嶅鏁版嵁");
+ }
+
+ if (save(liveStreaming)) {
+ EsModel esModel = new EsModel();
+ Long inte =liveStreaming.getId();
+ String uuid = UUID.randomUUID().toString().replace("-","");
+ esModel.setId(uuid);
+ esModel.setCtId(Long.valueOf(inte));
+ esModel.setCtTableName("鐩存挱");
+ esModel.setBy1(liveStreaming.getTitle());
+ esModel.setBy2(liveStreaming.getApplyPerson());
+
+ //杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
+ esModel.setBy5("/zLIveStreaming");
+// esModel.setFid(familyId);
+ esSer.insertTable(esModel);
+// System.out.println(esModel);
+
+ return AjaxResult.success();
+ } else {
+ return AjaxResult.error();
+
+ }
+ }
+}
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 cd4aae6..e298673 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
@@ -72,7 +72,7 @@
// lqw.eq(meeting.getFamilyId()!=null,Meeting::getFamilyId,meeting.getFamilyId());
lqw.eq(!StringUtils.isEmpty(String.valueOf(meeting.getApplyPerson())), Meeting::getApplyPerson, meeting.getApplyPerson());
lqw.eq(!StringUtils.isEmpty(String.valueOf(meeting.getPartPeople())), Meeting::getPartPeople, meeting.getPartPeople());
- lqw.eq(!StringUtils.isEmpty(String.valueOf(meeting.getConnPerson())), Meeting::getConnPerson, meeting.getConnPerson());
+ lqw.eq(!StringUtils.isEmpty(meeting.getConnPerson()), Meeting::getConnPerson, meeting.getConnPerson());
return lqw;
}
@@ -115,7 +115,7 @@
public List<Meeting> selectByCondition(Meeting meeting) {
//瑕佹煡鑷繁瀹跺涵鐨�
ZInfoUser myself = zInfoUserService.getMyself();
- System.out.println("================");
+// System.out.println("================");
// Long familyId = myself.getFamilyId();
//
@@ -185,22 +185,22 @@
zfLog.setModule("浼氳");
zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
zfLogService.save(zfLog);
- System.out.println("===================================="+meeting);
+// System.out.println("===================================="+meeting);
if(updateById(meeting)){
//鍒版暟鎹簱涓煡璇㈠搴旂殑鏁版嵁
Meeting dataById = getById(meeting.getId());
//鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
EsModel esResult = esSer.findByCtId(dataById.getId().intValue(), "浼氳");
- System.out.println("===================================="+meeting);
+// System.out.println("===================================="+meeting);
if (esResult == null){
return AjaxResult.success();
}
//鎿嶄綔es淇敼鏁版嵁
EsModel newModel = new EsModel();
- System.out.println(meeting);
- System.out.println("=============="+meeting.getConnPhone());
+// System.out.println(meeting);
+// System.out.println("=============="+meeting.getConnPhone());
if(meeting.getTitle()!=null){
newModel.setBy1(meeting.getTitle());
}else {
@@ -358,9 +358,9 @@
@Override
public AjaxResult addData(Meeting meeting) {
- System.out.println("-----------------000000000000");
-
- System.out.println(meeting.getStartTime());
+// System.out.println("-----------------000000000000");
+//
+// System.out.println(meeting.getStartTime());
// ZInfoUser myself = zInfoUserService.getMyself();
// Long familyId = myself.getFamilyId();
//
@@ -414,7 +414,7 @@
esModel.setBy5("/zMeeting");
// esModel.setFid(familyId);
esSer.insertTable(esModel);
- System.out.println(esModel);
+// System.out.println(esModel);
return AjaxResult.success();
} else {
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
index b099b67..fc33ed5 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java
@@ -1,9 +1,11 @@
package com.ruoyi.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.MapUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.domain.*;
import com.ruoyi.mapper.MeetingStatisticMapper;
@@ -17,9 +19,7 @@
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.*;
@Slf4j
@@ -56,7 +56,66 @@
lqw.eq(!StringUtils.isEmpty(String.valueOf(meetingStatistic.getFamilyId())), MeetingStatistic::getFamilyId, meetingStatistic.getFamilyId());
return lqw;
}
+ public static void getDatePoor(Date endDate, Date nowDate, MeetingStatistic meetingStatistic) {
+ long nd = 1000 * 24 * 60 * 60;
+ long nh = 1000 * 60 * 60;
+ long nm = 1000 * 60;
+ long ns = 1000;
+ // 鑾峰緱涓や釜鏃堕棿鐨勬绉掓椂闂村樊寮�
+ long diff = endDate.getTime() - nowDate.getTime();
+ // 璁＄畻宸灏戝ぉ
+// long day = diff / nd;
+ // 璁＄畻宸灏戝皬鏃�
+ long hour = diff % nd / nh;
+ // 璁＄畻宸灏戝垎閽�
+ long min = diff % nd % nh / nm;
+ // 璁＄畻宸灏戠//杈撳嚭缁撴灉
+ long sec = diff % nd % nh % nm / ns;
+ System.out.println(hour + "灏忔椂" + min + "鍒嗛挓"+ sec + "绉�");
+ meetingStatistic.setUseTime(hour + "灏忔椂" + min + "鍒嗛挓" + sec + "绉�");
+ }
+ private LambdaQueryWrapper<MeetingStatistic> buildCondition(MeetingStatistic meetingStatistic) {
+ LambdaQueryWrapper<MeetingStatistic> lqw = new LambdaQueryWrapper<>();
+ lqw.select(MeetingStatistic::getFamilyId,MeetingStatistic::getCreateTime);
+ return lqw;
+ }
+ @Override
+ public AjaxResult selectDataList(MeetingStatistic meetingStatistic, Integer pageNum, Integer pageSize) {
+ //瑕佹煡鑷繁瀹跺涵鐨�
+ ZInfoUser myself = zInfoUserService.getMyself();
+ if(myself==null)
+ {
+ // System.out.println("ssssss");
+ return AjaxResult.success("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ }
+ Long familyId = myself.getFamilyId();
+// //涔熻鏌ュ埆浜烘巿鏉冪殑
+// List<ZAuthority> authority = zAuthorityService.getAuthority();
+// List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(DOCTOR_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
+// //鍔犱笂鑷繁瀹跺涵鐨刬d
+// idList.add(familyId);
+// String familyIds = listFamilyIds();
+// String secondFamilyAuthority = listSecondFamilyIds();
+ LambdaQueryWrapper<MeetingStatistic> lqw = new LambdaQueryWrapper<>();
+// LambdaQueryWrapper<MeetingStatistic> lqw = buildCondition(meetingStatistic);
+
+
+ Page<MeetingStatistic> meetingStatisticPage = new Page<>(pageNum, pageSize);
+ Page<MeetingStatistic> pageResult = page(meetingStatisticPage, lqw);
+
+ List<MeetingStatistic> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
+ System.out.println("-----------鏁版嵁搴�-----------"+beanRecords);
+ HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
+ return AjaxResult.success(data);
+ }
+ @Override
+ public AjaxResult DataList(MeetingStatistic meetingStatistic) {
+ LambdaQueryWrapper<MeetingStatistic> lambdaQueryWrapper = buildCondition(meetingStatistic);
+ List<MeetingStatistic> beanRecords = list(lambdaQueryWrapper);
+ log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
+ return AjaxResult.success(beanRecords);
+ }
@Override
public AjaxResult updateData(MeetingStatistic meetingStatistic) {
@@ -82,26 +141,41 @@
// System.out.println(meeting);
// System.out.println("=============="+meetingStatistic.getConnPhone());
-// if(meetingStatistic.getUseTime()!=null){
-// newModel.setBy2(meetingStatistic.getUseTime());
-// }else {
-// newModel.setBy2(dataById.getUseTime());
+// if (meetingStatistic.getUseTime()==null){
+// if(meetingStatistic.getHappenEndTime()!=null && meetingStatistic.getHappenStartTime() !=null){
+// getDatePoor(meetingStatistic.getHappenEndTime(),meetingStatistic.getHappenStartTime(),meetingStatistic);
+// System.out.println("===============浣跨敤鏃堕棿====================="+meetingStatistic.getUseTime());
+// newModel.setBy2(meetingStatistic.getUseTime());
+// }else {
+// newModel.setBy2(dataById.getUseTime());
+// }
// }
+ if (meetingStatistic.getUseTime()==null){
+ if(meetingStatistic.getHappenEndTime()!=null && meetingStatistic.getHappenStartTime() !=null){
+ getDatePoor(meetingStatistic.getHappenEndTime(),meetingStatistic.getHappenStartTime(),meetingStatistic);
+ newModel.setBy1(meetingStatistic.getUseTime());
+ }
+ else {
+ newModel.setBy1(dataById.getUseTime());
+ }
+ }else {
+ newModel.setBy1(dataById.getUseTime());
+ }
// if(meetingStatistic.getConferenceRoom()!=null){
// newModel.setBy3(meetingStatistic.getConferenceRoom());
// }else {
// newModel.setBy3(dataById.getConferenceRoom());
// }
if(meetingStatistic.getTitle()!=null){
- newModel.setBy4(meetingStatistic.getTitle());
+ newModel.setBy2(meetingStatistic.getTitle());
}else {
- newModel.setBy4(dataById.getTitle());
+ newModel.setBy2(dataById.getTitle());
}
- if(meetingStatistic.getApplyPerson()!=null){
- newModel.setBy5(meetingStatistic.getApplyPerson());
- }else {
- newModel.setBy5(dataById.getApplyPerson());
- }
+// if(meetingStatistic.getApplyPerson()!=null){
+// newModel.setBy5(meetingStatistic.getApplyPerson());
+// }else {
+// newModel.setBy5(dataById.getApplyPerson());
+// }
// if(meetingStatistic.getRatifyPerson() == 0){
// newModel.setBy10(meetingStatistic.getRatifyPerson());
// }else {
@@ -114,15 +188,21 @@
// }
UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
updateRequest.doc(
- "by1",newModel.getBy4(),
- "by2",newModel.getBy5()
+ "by1",newModel.getBy1(),
+ "by2",newModel.getBy2()
+
);
+
+ LambdaQueryWrapper<MeetingStatistic> lqw = new LambdaQueryWrapper<>();
+ List<MeetingStatistic> beanRecords = list(lqw);
+ log.info("sss浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
try {
restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT);
} catch (IOException e) {
throw new RuntimeException(e);
}
+
return AjaxResult.success();
}else {
@@ -155,10 +235,15 @@
}
@Override
- public AjaxResult countData(Long[] familyId ,String applyPerson) {
- return null;
- }
+ public List<MeetingStatistic> selectByIds(Long[] ids) {
+ List<MeetingStatistic> list = new ArrayList<>();
+ if (ids.length != 0)
+ list = listByIds(Arrays.asList(ids));
+ else
+ list = list();
+ return list;
+ }
@Override
public AjaxResult addData(MeetingStatistic meetingStatistic) {
@@ -198,8 +283,11 @@
esModel.setId(uuid);
esModel.setCtId(inte);
esModel.setCtTableName("浼氳缁熻");
- esModel.setBy1(meetingStatistic.getTitle());
- esModel.setBy5(meetingStatistic.getApplyPerson());
+ getDatePoor(meetingStatistic.getHappenEndTime(),meetingStatistic.getHappenStartTime(),meetingStatistic);
+ System.out.println("===============浣跨敤鏃堕棿2====================="+meetingStatistic.getUseTime());
+ esModel.setBy1(meetingStatistic.getUseTime());
+ esModel.setBy2(meetingStatistic.getTitle());
+// esModel.setBy5(meetingStatistic.getApplyPerson());
//杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
esModel.setBy5("/zMeetingStatistic");
esModel.setFid(familyId);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
index e7f008e..f1534d8 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -12,10 +12,7 @@
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.domain.ZInfoUser;
-import com.ruoyi.domain.ZfEvent;
-import com.ruoyi.domain.ZfFamily;
-import com.ruoyi.domain.ZfRelation;
+import com.ruoyi.domain.*;
import com.ruoyi.domain.dto.*;
import com.ruoyi.mapper.ZInfoUserMapper;
import com.ruoyi.service.ZInfoUserService;
@@ -123,10 +120,13 @@
}
@Override
- public AjaxResult removeByUserName(List userName) {
+ public AjaxResult removeByUserName(List<String> userName) {
LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
- lqw.in(ZInfoUser::getNickName, userName);
- List<Long> ids = list(lqw).stream().map(ZInfoUser::getUserId).collect(Collectors.toList());
+ lqw.in(ZInfoUser::getNickName,String.valueOf(userName.get(0)));
+ System.out.println(userName.get(0));
+ List<ZInfoUser> beanRecords = list(lqw);
+ System.out.println("555555555555555555"+beanRecords);
+ List<Long> ids = list(lqw).stream().map(ZInfoUser::getUserId).collect(Collectors.toList());;
removeByIds(ids);
return AjaxResult.success("鍒犻櫎鎴愬姛");
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
index 1e07329..bdafaa5 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
@@ -155,10 +155,15 @@
}
log.info("鏁版嵁鍒楄〃涓猴細{}", dataList);
- for (ZfDoctor zfDoctor : dataList) {
- zfDoctorService.addData(zfDoctor);
- }
+ for (ZfDoctor zfDoctor : dataList) {
+ if (zfDoctor.getSymptom().length() == 0 || zfDoctor.getSymptom() == null) {
+ throw new RuntimeException("鐥囩姸涓虹┖锛屽鍏ユ暟鎹け璐�");
+ }
+ else {
+ zfDoctorService.addData(zfDoctor);
+ }
+ }
return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
index 6aa66ba..d12d14b 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
@@ -225,6 +225,7 @@
//瑕佹煡鑷繁瀹跺涵鐨�
ZInfoUser myself = zInfoUserService.getMyself();
+
Long familyId = myself.getFamilyId();
//涔熻鏌ュ埆浜烘巿鏉冪殑
List<ZAuthority> authority = zAuthorityService.getAuthority();
@@ -284,6 +285,11 @@
//瑕佹煡鑷繁瀹跺涵鐨�
ZInfoUser myself = zInfoUserService.getMyself();
+ if(myself==null)
+ {
+ // System.out.println("ssssss");
+ return AjaxResult.success("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ }
Long familyId = myself.getFamilyId();
//涔熻鏌ュ埆浜烘巿鏉冪殑
List<ZAuthority> authority = zAuthorityService.getAuthority();
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java
index d8ed24f..afa01d1 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java
@@ -65,6 +65,11 @@
//瑕佹煡鑷繁瀹跺涵鐨�
ZInfoUser myself = zInfoUserService.getMyself();
+ if(myself==null)
+ {
+ // System.out.println("ssssss");
+ return AjaxResult.success("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ }
Long familyId = myself.getFamilyId();
//涔熻鏌ュ埆浜烘巿鏉冪殑
List<ZAuthority> authority = zAuthorityService.getAuthority();
--
Gitblit v1.9.1