From 4040856595952ea0b8f8b764ba2770d5c244c891 Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期五, 14 十月 2022 11:19:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into local_20221010 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 67 +++++++-------------------------- 1 files changed, 15 insertions(+), 52 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java index 283e45b..81a9fb7 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java @@ -1,72 +1,35 @@ package com.panzhihua.service_community.service.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import com.panzhihua.common.utlis.*; -import com.panzhihua.service_community.dao.*; -import com.panzhihua.service_community.entity.SysUser; -import com.panzhihua.service_community.model.dos.*; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - +import cn.hutool.core.collection.ListUtil; +import cn.hutool.core.util.PageUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.constants.NeighborCircleConstants; -import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO; -import com.panzhihua.common.model.dtos.neighbor.ComActNeighborAddBrowseAppDTO; -import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO; -import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO; -import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO; -import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCommentAppDTO; -import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCommentReplyAppDTO; -import com.panzhihua.common.model.dtos.neighbor.ComActNeighborFabulousAppDTO; -import com.panzhihua.common.model.dtos.neighbor.ComActNeighborForwardAppDTO; -import com.panzhihua.common.model.dtos.neighbor.ComActNeighborReplyAppDTO; -import com.panzhihua.common.model.dtos.neighbor.DeleteNeighborCircleAppDTO; -import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO; -import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO; -import com.panzhihua.common.model.dtos.neighbor.ServiceStaticBackstageDTO; -import com.panzhihua.common.model.dtos.neighbor.ServiceStaticDTO; +import com.panzhihua.common.model.dtos.neighbor.*; import com.panzhihua.common.model.vos.PageVO; import com.panzhihua.common.model.vos.R; -import com.panzhihua.common.model.vos.neighbor.ActivityAnalysisVO; -import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO; -import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO; -import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO; -import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAdminVO; -import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO; -import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleCommentAppVO; -import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleCommentReplyAppVO; -import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO; -import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentByAdminVO; -import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentReplyAppVO; -import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentReplyByAdminVO; -import com.panzhihua.common.model.vos.neighbor.DetailNeighborCircleAdminVO; -import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO; -import com.panzhihua.common.model.vos.neighbor.PartyMemberAnalysisVO; -import com.panzhihua.common.model.vos.neighbor.ServiceStaticsVO; -import com.panzhihua.common.model.vos.neighbor.UnitActivityAnalysisVO; +import com.panzhihua.common.model.vos.neighbor.*; import com.panzhihua.common.model.vos.user.AdministratorsUserVO; import com.panzhihua.common.service.user.UserService; +import com.panzhihua.common.utlis.*; +import com.panzhihua.service_community.dao.*; import com.panzhihua.service_community.entity.ComPbCheckUnit; +import com.panzhihua.service_community.entity.SysUser; +import com.panzhihua.service_community.model.dos.*; import com.panzhihua.service_community.service.ComActNeighborCircleBrowseService; import com.panzhihua.service_community.service.ComActNeighborCircleService; import com.panzhihua.service_community.service.ComActNeighborCircleTopicService; - -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.util.PageUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ObjectUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.*; /** * @auther lyq -- Gitblit v1.7.1