Merge remote-tracking branch 'origin/master'

feige

2024-06-10 2f432628a460a73f830c278a7d69e8328767a7b6

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
#	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingBackController.java

New file
@@ -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));
    }

}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingController.java

New file
@@ -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);
    }
}

 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);

    }





    /**

     * 批量删除会议统计记录

     */


 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();

 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删除用户
     * 

 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));

    }

    /**

 zhang-content/src/main/java/com/ruoyi/domain/LiveStreaming.java

New file
@@ -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;

}

 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;






 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;








 zhang-content/src/main/java/com/ruoyi/domain/MemoBook.java

@@ -34,9 +34,7 @@
    private Date createTime;

    private String content;



    
    private String url;

}

 zhang-content/src/main/java/com/ruoyi/mapper/LiveStreamingBackMapper.java

New file
@@ -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> {
}

 zhang-content/src/main/java/com/ruoyi/mapper/LiveStreamingMapper.java

New file
@@ -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> {
}

 zhang-content/src/main/java/com/ruoyi/service/LiveStreamingBackService.java

New file
@@ -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);
}

 zhang-content/src/main/java/com/ruoyi/service/LiveStreamingService.java

New file
@@ -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);
}

 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);

}


 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();


 zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingBackServiceImpl.java

New file
@@ -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());
//        //加上自己家庭的id
//        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;
    }

}

 zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingServiceImpl.java

New file
@@ -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());
//        //加上自己家庭的id
//        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();

        }
    }
}

 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中查询到对应那条数据在es的id

            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 {


 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());

//        //加上自己家庭的id

//        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);


 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("删除成功");
    }

 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("导入数据成功");

    }

 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();

 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();