Commit 98929816 authored by 罗林杰's avatar 罗林杰

获取控制台数据

parent 58a60b37
...@@ -6,6 +6,9 @@ import io.swagger.v3.oas.annotations.Parameter; ...@@ -6,6 +6,9 @@ import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import org.rcisoft.business.memInfo.entity.ArticleExamStatus;
import org.rcisoft.business.memInfo.entity.opmArticleDTO;
import org.rcisoft.business.memInfo.entity.peopleNumberDTO;
import org.rcisoft.core.anno.CyEncryptSm4Anno; import org.rcisoft.core.anno.CyEncryptSm4Anno;
import org.rcisoft.core.anno.CyOpeLogAnno; import org.rcisoft.core.anno.CyOpeLogAnno;
import org.rcisoft.core.operlog.enums.CyLogTypeEnum; import org.rcisoft.core.operlog.enums.CyLogTypeEnum;
...@@ -164,5 +167,29 @@ public class MemInfoController extends CyPaginationController<MemInfo> { ...@@ -164,5 +167,29 @@ public class MemInfoController extends CyPaginationController<MemInfo> {
memInfoServiceImpl.getUserPhone(businessId)); memInfoServiceImpl.getUserPhone(businessId));
} }
@PreAuthorize("@cyPerm.hasPerm('mem:info:list')")
@Operation(summary="分页查询动态表集合", description="分页查询动态表集合")
@GetMapping(value = "/listArticle")
public CyGridModel listArticleByPagination(opmArticleDTO opmArticleDTO) {
memInfoServiceImpl.findArticleByPagination(getPaginationUtility(), opmArticleDTO);
return getGridModelResponse();
}
/*
* 查询会员人数、实名人数、报名人数、文章数
*/
@GetMapping(value = "/getPeopleNumber")
public CyResult getPeopleNumber(peopleNumberDTO peopleNumberDTO) {
return CyResultGenUtil.genSuccessResult(memInfoServiceImpl.getPeopleNumber(peopleNumberDTO));
}
/**
* 查询文章审核
*/
@GetMapping(value = "/getArticle")
public CyResult getArticle(ArticleExamStatus articleExamStatus) {
return CyResultGenUtil.genSuccessResult(memInfoServiceImpl.getArticle(articleExamStatus));
}
} }
package org.rcisoft.business.memInfo.dao; package org.rcisoft.business.memInfo.dao;
import org.rcisoft.business.cmsActivity.entity.CmsActivity;
import org.rcisoft.business.memInfo.entity.ArticleExamStatus;
import org.rcisoft.business.memInfo.entity.opmArticleDTO;
import org.rcisoft.business.memInfo.entity.peopleNumberDTO;
import org.rcisoft.core.mapper.CyBaseMapper; import org.rcisoft.core.mapper.CyBaseMapper;
import org.rcisoft.business.memInfo.entity.MemInfo; import org.rcisoft.business.memInfo.entity.MemInfo;
import org.apache.ibatis.annotations.ResultMap; import org.apache.ibatis.annotations.ResultMap;
...@@ -10,7 +14,9 @@ import org.rcisoft.core.model.CyPageInfo; ...@@ -10,7 +14,9 @@ import org.rcisoft.core.model.CyPageInfo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import java.time.LocalDate;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* Created with cy on 2024年12月20日 下午3:35:34. * Created with cy on 2024年12月20日 下午3:35:34.
...@@ -59,5 +65,21 @@ public interface MemInfoRepository extends CyBaseMapper<MemInfo> { ...@@ -59,5 +65,21 @@ public interface MemInfoRepository extends CyBaseMapper<MemInfo> {
* @return * @return
*/ */
MemInfo getUserPhone(Integer businessId); MemInfo getUserPhone(Integer businessId);
IPage<opmArticleDTO> queryOpmArticlesPaged(CyPageInfo cyPageInfo,@Param("entity") opmArticleDTO opmArticleDTO);
String getRegisterNumber(@Param("entity") peopleNumberDTO peopleNumberDTO);
String getRealNumber(@Param("entity") peopleNumberDTO peopleNumberDTO);
String getActivityNumber(@Param("entity") peopleNumberDTO peopleNumberDTO);
String getArticleNumber(@Param("entity") peopleNumberDTO peopleNumberDTO);
List<CmsActivity> getCmsActivityList(@Param("entity") peopleNumberDTO peopleNumberDTO);
List<opmArticleDTO> getArticleCountByDateRange(@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
List<opmArticleDTO> getArticleCountByMonthRange(@Param("startDateMonth")LocalDate startDateMonth,@Param("endDate") LocalDate endDate);
} }
package org.rcisoft.business.memInfo.entity;
import lombok.Data;
import java.time.LocalDate;
import java.util.List;
@Data
public class ArticleExamStatus {
//日
private List<opmArticleDTO> articleExamStatusDayYes;
private List<opmArticleDTO> articleExamStatusDayNo;
//yue
private List<opmArticleDTO> articleExamStatusMonthYes;
private List<opmArticleDTO> articleExamStatusMonthNo;
private LocalDate date;
}
package org.rcisoft.business.memInfo.entity;
import cn.afterturn.easypoi.excel.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import org.rcisoft.core.entity.CyIdIncreEntity;
import java.util.Date;
@Data
@TableName("opm_article")
public class opmArticleDTO extends CyIdIncreEntity<opmArticleDTO> {
/**
* 发布人
*/
private Integer createUser;
/**
* 发布时间
*/
private Date createDate;
/**
* 话题
*/
private String topic;
private String articleNum;
private Date updateDate;
}
package org.rcisoft.business.memInfo.entity;
import lombok.Data;
import org.rcisoft.business.cmsActivity.entity.CmsActivity;
import java.util.List;
@Data
public class peopleNumberDTO {
/*
* 注册人数
*/
private String registerNumber;
/*
* 实名人数
*/
private String realNumber;
/*
* 参加活动人数
*/
private String activityNumber;
/*
* 动态数
*/
private String articleNumber;
/*
* 本月第一天
*/
private String firstDay;
/*
* 本月最后一天
*/
private String lastDay;
/*
* 活动列表
*/
List<CmsActivity> cmsActivityList;
/*
*访问次数
*/
List<CmsActivity> visitCount;
}
\ No newline at end of file
...@@ -2,7 +2,10 @@ package org.rcisoft.business.memInfo.service; ...@@ -2,7 +2,10 @@ package org.rcisoft.business.memInfo.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.rcisoft.business.memInfo.entity.ArticleExamStatus;
import org.rcisoft.business.memInfo.entity.MemInfo; import org.rcisoft.business.memInfo.entity.MemInfo;
import org.rcisoft.business.memInfo.entity.opmArticleDTO;
import org.rcisoft.business.memInfo.entity.peopleNumberDTO;
import org.rcisoft.core.model.CyPersistModel; import org.rcisoft.core.model.CyPersistModel;
import org.rcisoft.core.aop.CyPageUtilAsp; import org.rcisoft.core.aop.CyPageUtilAsp;
import org.rcisoft.core.model.CyPageInfo; import org.rcisoft.core.model.CyPageInfo;
...@@ -80,4 +83,12 @@ public interface MemInfoService { ...@@ -80,4 +83,12 @@ public interface MemInfoService {
Boolean checkInfo(MemInfo memInfo); Boolean checkInfo(MemInfo memInfo);
MemInfo getUserPhone(Integer businessId); MemInfo getUserPhone(Integer businessId);
IPage<opmArticleDTO> findArticleByPagination(CyPageInfo<MemInfo> paginationUtility,
opmArticleDTO opmArticleDTO);
peopleNumberDTO getPeopleNumber(peopleNumberDTO peopleNumberDTO );
ArticleExamStatus getArticle(ArticleExamStatus articleExamStatus );
} }
...@@ -6,7 +6,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -6,7 +6,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.rcisoft.business.cmsActivity.entity.CmsActivity;
import org.rcisoft.business.memInfo.bean.MemberGenerateBean; import org.rcisoft.business.memInfo.bean.MemberGenerateBean;
import org.rcisoft.business.memInfo.entity.ArticleExamStatus;
import org.rcisoft.business.memInfo.entity.opmArticleDTO;
import org.rcisoft.business.memInfo.entity.peopleNumberDTO;
import org.rcisoft.core.constant.CyDelStaCons; import org.rcisoft.core.constant.CyDelStaCons;
import org.rcisoft.core.constant.CyFlagStaCons; import org.rcisoft.core.constant.CyFlagStaCons;
import org.rcisoft.core.exception.CyServiceException; import org.rcisoft.core.exception.CyServiceException;
...@@ -365,4 +369,45 @@ public class MemInfoServiceImpl extends ServiceImpl<MemInfoRepository,MemInfo> ...@@ -365,4 +369,45 @@ public class MemInfoServiceImpl extends ServiceImpl<MemInfoRepository,MemInfo>
return memInfo; return memInfo;
} }
@Override
public IPage<opmArticleDTO> findArticleByPagination(CyPageInfo<MemInfo> paginationUtility,
opmArticleDTO opmArticleDTO){
return baseMapper.queryOpmArticlesPaged(paginationUtility,opmArticleDTO);
}
@Override
public peopleNumberDTO getPeopleNumber(peopleNumberDTO peopleNumberDTO ){
peopleNumberDTO list = new peopleNumberDTO();
list.setArticleNumber(baseMapper.getArticleNumber(peopleNumberDTO));
list.setActivityNumber(baseMapper.getActivityNumber(peopleNumberDTO));
list.setRealNumber(baseMapper.getRealNumber(peopleNumberDTO));
list.setRegisterNumber(baseMapper.getRegisterNumber(peopleNumberDTO));
list.setCmsActivityList(baseMapper.getCmsActivityList(peopleNumberDTO));
list.setVisitCount(baseMapper.getCmsActivityList(peopleNumberDTO));
return list;
}
@Override
public ArticleExamStatus getArticle(ArticleExamStatus articleExamStatus ){
LocalDate startDate = articleExamStatus.getDate().minusDays(7);
LocalDate startDateMonth = articleExamStatus.getDate().minusMonths(7);
LocalDate endDate = articleExamStatus.getDate();
ArticleExamStatus list = new ArticleExamStatus();
//审核通过
list.setArticleExamStatusDayYes(baseMapper.getArticleCountByDateRange(startDate, endDate));
list.setArticleExamStatusMonthYes(baseMapper.getArticleCountByMonthRange(startDateMonth, endDate));
//审核未通过
return list;
}
} }
...@@ -383,4 +383,93 @@ ...@@ -383,4 +383,93 @@
from mem_info from mem_info
where business_id = #{businessId} and del_flag = 0 where business_id = #{businessId} and del_flag = 0
</select> </select>
<select id="queryOpmArticlesPaged" resultType="org.rcisoft.business.memInfo.entity.opmArticleDTO">
select
a.create_date,
u.name as createName,
t.topic_name as topicName
from opm_article a
left join sys.user u on u.business_id = a.create_by
left join opm_topic t on t.business_id = a.topic_id
where a.del_flag = 0
and a.is_article = 1
and a.exam_status = 0
ORDER BY a.business_id DESC
</select>
<select id="getPeopleNumber" resultType="org.rcisoft.business.memInfo.entity.peopleNumberDTO">
</select>
<select id="getRegisterNumber" resultType="java.lang.String">
select count(1)
from mem_info m
where
del_flag = 0
<if test="entity.firstDay !=null and entity.firstDay != '' ">
and m.create_date &gt;= #{entity.firstDay}
</if>
<if test="entity.lastDay !=null and entity.lastDay != '' ">
and m.create_date &lt;= #{entity.lastDay}
</if>
</select>
<select id="getRealNumber" resultType="java.lang.String">
select count(1)
from mem_info m
where
del_flag = 0
and m.mem_real_authen = 1
<if test="entity.firstDay !=null and entity.firstDay != '' ">
and m.mem_real_authen_date &gt;= #{entity.firstDay}
</if>
<if test="entity.lastDay !=null and entity.lastDay != '' ">
and m.mem_real_authen_date &lt;= #{entity.lastDay}
</if>
</select>
<select id="getActivityNumber" resultType="java.lang.String">
SELECT SUM(c.application_count)
FROM cms_activity c
WHERE c.del_flag = 0
AND NOT (c.end_time &lt; #{entity.firstDay} OR c.start_time &gt; #{entity.lastDay})
</select>
<select id="getArticleNumber" resultType="java.lang.String">
SELECT COUNT(1)
FROM opm_article a
WHERE a.del_flag = 0
AND a.is_article = 1
AND a.exam_status = 1
<if test="entity.firstDay !=null and entity.firstDay != '' ">
and a.create_date &gt;= #{entity.firstDay}
</if>
<if test="entity.lastDay !=null and entity.lastDay != '' ">
and a.create_date &lt;= #{entity.lastDay}
</if>
</select>
<select id="getCmsActivityList" resultType="org.rcisoft.business.cmsActivity.entity.CmsActivity">
select c.title,c.application_count
from cms_activity c
where c.del_flag = 0
and NOT (c.end_time &lt; #{entity.firstDay} OR c.start_time &gt; #{entity.lastDay})
</select>
<select id="getArticleCountByDateRange" resultType="org.rcisoft.business.memInfo.entity.opmArticleDTO">
SELECT
DATE(a.update_date) as date,
COUNT(1) as count
FROM opm_article a
WHERE a.del_flag = 0
AND a.is_article = 1
AND a.exam_status = 1
AND DATE(a.update_date) BETWEEN #{startDate} AND #{endDate}
GROUP BY DATE(a.update_date)
</select>
<select id="getArticleCountByMonthRange" resultType="org.rcisoft.business.memInfo.entity.opmArticleDTO">
SELECT
DATE_FORMAT(a.update_date, '%Y-%m') as date,
COUNT(1) as count
FROM opm_article a
WHERE a.del_flag = 0
AND a.is_article = 1
AND a.exam_status = 1
AND DATE_FORMAT(a.update_date, '%Y-%m') BETWEEN #{startDateMonth} AND #{endDate}
GROUP BY DATE_FORMAT(a.update_date, '%Y-%m')
</select>
</mapper> </mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment