zqy
2024-09-10 c4c84ca692671214bacc45dc578785f1b5c2168d
修改保洁收纳&通讯录的导入,新增直播删除
7个文件已修改
75 ■■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/domain/Meeting.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/LiveStreamingService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingServiceImpl.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingController.java
@@ -46,4 +46,13 @@
    public AjaxResult add(@RequestBody LiveStreaming liveStreaming) throws ParseException {
        return liveStreamingService.addData(liveStreaming);
    }
    /**
     * 批量删除直播
     */
    @Log(title = "直播", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return liveStreamingService.deleteData(ids);
    }
}
zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
@@ -99,4 +99,4 @@
    private Date createTime;
}
}
zhang-content/src/main/java/com/ruoyi/service/LiveStreamingService.java
@@ -14,4 +14,6 @@
    List<LiveStreaming> selectByIds(Long[] ids);
    AjaxResult addData(LiveStreaming liveStreaming) throws ParseException;
    public AjaxResult deleteData(Long[] ids);
}
zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingServiceImpl.java
@@ -182,4 +182,13 @@
        }
    }
    @Override
    public AjaxResult deleteData(Long[] ids) {
        List<LiveStreaming> liveStreaming = selectByIds(ids);
        for (LiveStreaming liveStreaming1:liveStreaming) {
            liveStreaming1.setStatus(1);
            updateById(liveStreaming1);
        }
        return AjaxResult.success();
}
}
zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java
@@ -49,7 +49,7 @@
    private LambdaQueryWrapper<Meeting> buildCondition(Meeting meeting) {
        LambdaQueryWrapper<Meeting> lqw = new LambdaQueryWrapper<>();
    //    lqw.in(ZfDoctor::getFamilyId,familyIdList);
        //    lqw.in(ZfDoctor::getFamilyId,familyIdList);
        lqw.orderByDesc(Meeting::getId);
        lqw.like(StringUtils.isNotEmpty(meeting.getPlace()), Meeting::getPlace, meeting.getPlace())
                .like(StringUtils.isNotEmpty(meeting.getApplyApart()), Meeting::getApplyApart, meeting.getApplyApart());
@@ -282,16 +282,16 @@
                    "by1",newModel.getBy1(),
                    "by2",newModel.getBy2(),
                    //"by3",newModel.getBy8(),
                  //  "by4",newModel.getBy9(),
                    //  "by4",newModel.getBy9(),
                    "by5",newModel.getBy10()
                  //  "by6",newModel.getBy11(),
                 //   "by7",newModel.getBy3(),
                  //  "by8",newModel.getBy14(),
                 //   "by9",newModel.getBy15(),
                 //   "by10",newModel.getBy12(),
                 //   "by11",newModel.getBy4(),
                 //   "by12",newModel.getBy13(),
                 //   "by13",newModel.getBy15()
                    //  "by6",newModel.getBy11(),
                    //   "by7",newModel.getBy3(),
                    //  "by8",newModel.getBy14(),
                    //   "by9",newModel.getBy15(),
                    //   "by10",newModel.getBy12(),
                    //   "by11",newModel.getBy4(),
                    //   "by12",newModel.getBy13(),
                    //   "by13",newModel.getBy15()
            );
@@ -395,17 +395,17 @@
            esModel.setCtTableName("会议记录");
            esModel.setBy1(meeting.getTitle());
            esModel.setBy2(meeting.getPlace());
          //  esModel.setBy8(meeting.getConPeople());
         //   esModel.setBy9(meeting.getPartPeople());
        //    esModel.setBy10(meeting.getApplyPerson());
         //   esModel.setBy3(meeting.getApplyApart());
         //   esModel.setBy14(meeting.getStartTime());
         //   esModel.setBy15(meeting.getEndTime());
        //    esModel.setBy11(meeting.getIsPlacebrand());
        //    esModel.setBy12(meeting.getConnPerson());
         //   esModel.setBy4(meeting.getConnPhone());
         //   esModel.setBy13(meeting.getStatu());
       //     esModel.setBy16( meeting.getCreateTime());
            //  esModel.setBy8(meeting.getConPeople());
            //   esModel.setBy9(meeting.getPartPeople());
            //    esModel.setBy10(meeting.getApplyPerson());
            //   esModel.setBy3(meeting.getApplyApart());
            //   esModel.setBy14(meeting.getStartTime());
            //   esModel.setBy15(meeting.getEndTime());
            //    esModel.setBy11(meeting.getIsPlacebrand());
            //    esModel.setBy12(meeting.getConnPerson());
            //   esModel.setBy4(meeting.getConnPhone());
            //   esModel.setBy13(meeting.getStatu());
            //     esModel.setBy16( meeting.getCreateTime());
            //这里存储查询详情的路径
            esModel.setBy5("/zMeeting");
//            esModel.setFid(familyId);
@@ -418,4 +418,4 @@
        }
    }
}
}
zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
@@ -458,9 +458,10 @@
            throw new RuntimeException(e);
        }
        log.info("数据列表为:{}", dataList);
        for (ZfClean zfClean : dataList) {
            zfCleanService.addData(zfClean);
            if (zfClean.getMethod().length() != 0 && zfClean.getPlace().length() != 0 && zfClean.getSuitable().length() != 0) {
                zfCleanService.addData(zfClean);
            }
        }
        return AjaxResult.success("导入数据成功");
zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
@@ -450,7 +450,9 @@
        log.info("数据列表为:{}", dataList);
        for (ZfContact zfContact : dataList) {
            zfContactService.addData(zfContact);
            if (zfContact.getNickName().length() != 0 && zfContact.getName().length() != 0 && zfContact.getMyName().length() != 0 ) {
                zfContactService.addData(zfContact);
            }
        }
        return AjaxResult.success("导入数据成功");