修改了代码’ git commit -m 修改了代码’

zqy

2024-04-25 7abac54f0a1e4fda0a024a48eefb2ca626ad146c

修改了代码’
git commit -m 修改了代码’

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java

@@ -2,6 +2,7 @@


import lombok.Data;
import org.joda.time.DateTime;
import org.springframework.data.elasticsearch.annotations.Document;
import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType;
@@ -74,11 +75,46 @@
    @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
    private String by6;

    /** 备用6 */
    /** 备用7 */
    @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
    private String by7;


    /** 备用8*/
    @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
    private int by8;

    /** 备用9 */
    @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
    private int by9;

    /** 备用10 */
    @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
    private int by10;

    /** 备用11 */
    @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
    private int by11;

    /** 备用12 */
    @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
    private int by12;

    /** 备用13 */
    @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
    private int by13;

    /** 备用14 */
    @Field(index = true,type = FieldType.Date,analyzer = "ik_max_wor HH:mm:ss")
    private Date by14;

    /** 备用15 */
    @Field(index = true,type = FieldType.Date,analyzer = "ik_max_wor")
    private Date by15;

    /** 备用16 */
    @Field(index = true,type = FieldType.Date,analyzer = "ik_max_wor ")
    private Date by16;


}

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

@@ -7,6 +7,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;

import com.ruoyi.common.annotation.Excel;

import lombok.Data;

import org.joda.time.DateTime;



import java.util.Date;



@@ -49,13 +50,13 @@
     * 开始时间

     */

    @Excel(name = "开始时间")

    @JsonFormat(pattern = "yyyy-MM-dd")

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")

    private Date startTime;

    /**

     * 结束时间

     */

    @Excel(name = "结束时间")

    @JsonFormat(pattern = "yyyy-MM-dd")

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")

    private Date endTime;





@@ -93,7 +94,7 @@
    /**

     * 生成时间

     */

    @JsonFormat(pattern = "yyyy-MM-dd")

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")

    private Date createTime;






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

New file
@@ -0,0 +1,28 @@
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_ratify")

public class MeetingRatify {

    @TableId(value = "id", type = IdType.AUTO)

    private Long id;



    private int familyId;



    private String useTime;



    private String conferenceRoom;



    private String title;



    private int applyPerson;



    private int ratifyPerson;



    private String status;



}


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

New file
@@ -0,0 +1,4 @@
package com.ruoyi.service;



public interface MeetingRatify {

}


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

New file
@@ -0,0 +1,4 @@
package com.ruoyi.service;



public class MeetingStatisticesSevice {

}


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

New file
@@ -0,0 +1,4 @@
package com.ruoyi.service.impl;



public class MeetingRatifyServiceImpl {

}


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

@@ -22,6 +22,7 @@


import javax.annotation.Resource;

import java.io.IOException;

import java.sql.Timestamp;

import java.time.LocalDateTime;

import java.util.*;

import java.util.stream.Collectors;

@@ -200,56 +201,103 @@


            //操作es修改数据

            EsModel newModel = new EsModel();

            if(meeting.getPlace()!=null){

                newModel.setBy1(meeting.getPlace());



            if(meeting.getTitle()!=null){

                newModel.setBy1(meeting.getTitle());

            }else {

                newModel.setBy1(dataById.getPlace());

                newModel.setBy1(dataById.getTitle());

            }



            if(meeting.getPlace()!=null){

                newModel.setBy2(meeting.getPlace());

            }else {

                newModel.setBy2(dataById.getPlace());

            }



            if(StringUtils.isEmpty(String.valueOf(meeting.getConPeople()))){

                newModel.setBy8(meeting.getConPeople());

            }else {

                newModel.setBy8(dataById.getConPeople());

            }



            if(StringUtils.isEmpty(String.valueOf(meeting.getPartPeople()))){

                newModel.setBy9(meeting.getPartPeople());

            }else {

                newModel.setBy9(dataById.getPartPeople());

            }





            if(StringUtils.isEmpty(String.valueOf(meeting.getApplyPerson()))){

                newModel.setBy10(meeting.getApplyPerson());

            }else {

                newModel.setBy10(dataById.getApplyPerson());

            }



            if(meeting.getApplyApart()!=null){

                newModel.setBy2(meeting.getApplyApart());

                newModel.setBy3(meeting.getApplyApart());

            }else {

                newModel.setBy2(dataById.getApplyApart());

                newModel.setBy3(dataById.getApplyApart());

            }



            if(meeting.getTitle()!=null){

                newModel.setBy3(meeting.getTitle());

            if(StringUtils.isEmpty(String.valueOf(meeting.getStartTime()))){

                newModel.setBy14(meeting.getStartTime());

            }else {

                newModel.setBy3(dataById.getTitle());

                newModel.setBy14(dataById.getStartTime());

            }



            if(StringUtils.isEmpty(String.valueOf(meeting.getEndTime()))){

                newModel.setBy15(meeting.getEndTime());

            }else {

                newModel.setBy15(dataById.getEndTime());

            }





            if(StringUtils.isEmpty(String.valueOf(meeting.getIsPlacebrand()))){

                newModel.setBy11(meeting.getIsPlacebrand());

            }else {

                newModel.setBy11(dataById.getIsPlacebrand());

            }



            if(meeting.getConnPhone()!=null){

                newModel.setBy12(meeting.getConnPerson());

            }else {

                newModel.setBy12(dataById.getConnPerson());

            }



            if(meeting.getConnPhone()!=null){

                newModel.setBy4(meeting.getConnPhone());

            }else {

                newModel.setBy4(dataById.getConnPhone());

            }



            if(StringUtils.isEmpty(String.valueOf(meeting.getApplyPerson()))){

                newModel.setBy5(String.valueOf(meeting.getApplyPerson()));

            if(StringUtils.isEmpty(String.valueOf(meeting.getStatu()))){

                newModel.setBy13(meeting.getStatu());

            }else {

                newModel.setBy5(String.valueOf(dataById.getApplyPerson()));

                newModel.setBy13(dataById.getStatu());

            }



            if(StringUtils.isEmpty(String.valueOf(meeting.getPartPeople()))){

                newModel.setBy6(String.valueOf(meeting.getPartPeople()));

            if(StringUtils.isEmpty(String.valueOf(meeting.getCreateTime()))){

                newModel.setBy16(meeting.getCreateTime());

            }else {

                newModel.setBy6(String.valueOf(dataById.getPartPeople()));

                newModel.setBy16(dataById.getCreateTime());

            }



            if(StringUtils.isEmpty(String.valueOf(meeting.getConnPerson()))){

                newModel.setBy7(String.valueOf(meeting.getConnPerson()));

            }else {

                newModel.setBy7(String.valueOf(dataById.getConnPerson()));

            }





            UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());

            updateRequest.doc(

                    "by1",newModel.getBy1(),

                    "by2",newModel.getBy2(),

                    "by3",newModel.getBy3(),

                    "by4",newModel.getBy4(),

                    "by6",newModel.getBy6(),

                    "by7",newModel.getBy7()

                    "by3",newModel.getBy8(),

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



            );



            try {

@@ -311,16 +359,16 @@
    @Override

    public AjaxResult addData(Meeting meeting) {



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

//        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 (meeting.getFamilyId()!=null && !familyIdList.contains(zfEvent.getFamilyId())) {

//            throw new RuntimeException("你没有权限操作此家庭的数据");

@@ -347,17 +395,24 @@
            esModel.setId(uuid);

            esModel.setCtId(Long.valueOf(inte));

            esModel.setCtTableName("会议记录");

            esModel.setBy1(meeting.getPlace());

            esModel.setBy2(meeting.getApplyApart());

            esModel.setBy3(meeting.getTitle());

            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.setBy5(String.valueOf(meeting.getApplyPerson()));

            esModel.setBy6(String.valueOf(meeting.getPartPeople()));

            esModel.setBy7(String.valueOf(meeting.getConnPerson()));

            esModel.setBy13(meeting.getStatu());

            esModel.setBy16(meeting.getCreateTime());

            //这里存储查询详情的路径

            esModel.setBy5("/zMeeting");

//            esModel.setFid(familyId);

            esSer.insertTable(esModel);

            System.out.println(esModel);



            return AjaxResult.success();

        } else {