From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java | 314 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 243 insertions(+), 71 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
index cdd7231..f8e4ff9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
@@ -3,13 +3,23 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
+import com.panzhihua.common.model.dtos.community.easyPhoto.ExportEasyPhotoDTO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
+import com.panzhihua.common.model.vos.community.StatisticsPhotoVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenDpcStatisticsInfo;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenEasyPhotoStatisticsInfo;
+import com.panzhihua.common.model.vos.community.bigscreen.BigscreenGridsGovernanceStatisticsVO;
+import com.panzhihua.common.model.vos.community.bigscreen.GridsGovernanceStatisticsVO;
+import com.panzhihua.common.model.vos.community.bigscreen.ResidentAutonomyStatisticsVO;
+import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO;
+import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoCountVO;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoStatisticsVO;
+import com.panzhihua.common.model.vos.community.easyPhoto.ExportEasyPhotoVO;
import com.panzhihua.common.model.vos.screen.EastPhotoTypeVO;
import com.panzhihua.common.model.vos.screen.EastPhotoVO;
-import com.panzhihua.common.model.vos.screen.EasyPhotoDataVO;
-import com.panzhihua.common.model.vos.screen.PbWorkVO;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -45,6 +55,7 @@
"p.is_report, " +
"p.is_publicity, " +
"p.activity_type, " +
+ "p.activity_id, " +
"p.activity_amount, " +
"p.examine_at " +
"FROM " +
@@ -68,7 +79,7 @@
" </if> " +
"where p.del_tag = 0 and p.status !=2"+
"<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
- " and p.community_id=#{comActEasyPhotoVO.communityId} " +
+ " and p.community_id = ${comActEasyPhotoVO.communityId} " +
" </if> " +
"<if test='comActEasyPhotoVO.happenAddr != null and comActEasyPhotoVO.happenAddr.trim() != ""'>" +
"AND p.happen_addr like concat(#{comActEasyPhotoVO.happenAddr},'%') " +
@@ -82,6 +93,15 @@
" </if> " +
"<if test='comActEasyPhotoVO.sponsorId != null and comActEasyPhotoVO.sponsorId != 0'>" +
"AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId} " +
+ " </if> " +
+ "<if test='comActEasyPhotoVO.activityType != null'>" +
+ "AND p.activity_type =#{comActEasyPhotoVO.activityType} " +
+ " </if> " +
+ "<if test='comActEasyPhotoVO.easyType != null and comActEasyPhotoVO.easyType == 1'>" +
+ " AND (p.status = 1 or (p.status > 1 and is_need_feed_back = 0)) " +
+ " </if> " +
+ "<if test='comActEasyPhotoVO.easyType != null and comActEasyPhotoVO.easyType == 2'>" +
+ " AND p.status > 1 and is_need_feed_back = 1 " +
" </if> " +
"group by p.id "+
@@ -105,6 +125,7 @@
"p.is_publicity, " +
"p.activity_type, " +
"p.activity_amount, " +
+ "p.activity_id, " +
"p.examine_at " +
"FROM " +
"com_act_easy_photo p " +
@@ -130,7 +151,7 @@
"and p.handler_id=#{comActEasyPhotoVO.backUserId}"+
" </if> " +
"<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
- " and p.community_id=#{comActEasyPhotoVO.communityId} " +
+ " and p.community_id = ${comActEasyPhotoVO.communityId} " +
" </if> " +
"<if test='comActEasyPhotoVO.happenAddr != null and comActEasyPhotoVO.happenAddr.trim() != ""'>" +
"AND p.happen_addr like concat(#{comActEasyPhotoVO.happenAddr},'%') " +
@@ -158,18 +179,25 @@
")t order by t.create_at desc "+
"</script>")
IPage<ComActEasyPhotoVO> pageEasyPhoto(Page page, @Param("comActEasyPhotoVO") ComActEasyPhotoVO comActEasyPhotoVO);
+
+ IPage<ComActEasyPhotoVO> pageEasyPhotoAdmin(Page page, @Param("comActEasyPhotoVO") ComActEasyPhotoVO comActEasyPhotoVO);
+
+ IPage<ComActEasyPhotoVO> pageEasyPhotoAdminLC(Page page);
@Select("SELECT " +
"p.id, " +
"p.sponsor_id, " +
"p.feedback_at, " +
+ "p.is_publicity, " +
"p.examine_at, " +
"p.create_at, " +
"u.`name` sponsorName, " +
"u.nick_name userNickName, " +
"su.`name` handlerName, " +
+ "su1.`name` completeName, " +
"u.`image_url`, " +
"u.phone, " +
"p.detail, " +
+ "p.lng_lat, " +
"p.is_need_feed_back, " +
"p.examine_at, " +
"p.status, " +
@@ -181,14 +209,31 @@
"p.handle_result, " +
"p.photo_path_list, " +
"p.activity_type, " +
+ "p.activity_id, " +
"p.activity_amount, " +
"count(pu.id)giveThumbsUpNum, " +
+ "c.name communityName," +
+ "p.transfer_time," +
+ "p.is_report_urban," +
+ "p.is_report_dpc," +
+ "p.transfer_reason," +
+ "ca.`name` as classifyName," +
+ "p.urban_status, " +
+ "p.img_width, " +
+ "p.img_height, " +
+ "p.evaluate_date, " +
+ "caepe.score," +
+ "caepe.`content`, " +
"p.handle_photo_list " +
"FROM " +
"com_act_easy_photo p " +
"JOIN sys_user u on p.sponsor_id=u.user_id " +
"LEFT JOIN sys_user su on p.handler_id=su.user_id " +
+ "LEFT JOIN sys_user su1 on p.complete_id=su1.user_id " +
"LEFT JOIN com_act_easy_photo_user pu on p.id=pu.easy_photo_id " +
+ "LEFT JOIN com_act c on p.community_id=c.community_id " +
+ "left join com_act_easy_photo_classify ca on ca.id = p.classify_id " +
+ "left join com_act_easy_photo_evaluate as caepe on caepe.service_id = p.id and caepe.service_type = 1 " +
"WHERE p.del_tag = 0 and p.id=#{id}")
ComActEasyPhotoVO detailEasyPhoto(Long id);
@Select("SELECT " +
@@ -196,7 +241,7 @@
"FROM " +
" com_act_easy_photo p " +
"WHERE " +
- " p.del_tag = 0 and p.community_id = #{communityId} " +
+ " p.del_tag = 0 and p.community_id = ${communityId} " +
"AND p.STATUS = 1 "+
" " +
"union all " +
@@ -206,71 +251,80 @@
"FROM " +
" com_act_easy_photo p " +
"WHERE " +
- " p.del_tag = 0 and p.community_id = #{communityId} " +
+ " p.del_tag = 0 and p.community_id = ${communityId} " +
"AND p.`status` = 2 and p.is_need_feed_back=1 and p.handler_id=#{userId} "
)
List<TodoEventsVO> selectNeedToDo(@Param("communityId") Long communityId, @Param("userId") Long userId);
- @Select("<script> " +
- "SELECT " +
- "p.id, " +
- "u.`name` sponsor_name, " +
- "u.`nick_name` userNickName, " +
- "u.phone sponsor_phone, " +
- "count(DISTINCT pu.id)giveThumbsUpNum, " +
- "count(DISTINCT c.id)commentNum, " +
- "u.image_url, " +
- "p.happen_addr, " +
- "su.`name` handler_name, " +
- "p.`status`, " +
- "p.`is_hide`, " +
- "p.`detail`, " +
- "p.`is_need_feed_back`, " +
- "p.`photo_path_list`, " +
- "p.create_at, " +
- "p.feedback_at, " +
- "p.activity_type, " +
- "p.activity_amount, " +
- "p.examine_at " +
- "FROM " +
- "com_act_easy_photo p " +
- "JOIN sys_user u ON p.sponsor_id = u.user_id " +
- "left join com_act_easy_photo_user pu ON p.id = pu.easy_photo_id " +
- "left JOIN sys_user su ON p.handler_id = su.user_id " +
- "left JOIN com_act_easy_photo_comment c ON p.id = c.easy_photo_id " +
- " <where>" +
- " p.del_tag = 0 " +
- "<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
- " and p.community_id=#{comActEasyPhotoVO.communityId} " +
- " </if> " +
- "<if test='comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' >" +
- "AND p.`status` = #{comActEasyPhotoVO.status} " +
- " </if> " +
- "<if test='comActEasyPhotoVO.sponsorId != null and comActEasyPhotoVO.sponsorId != 0'>" +
- "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId} " +
- " </if> " +
- "<if test='comActEasyPhotoVO.sponsorId == null or comActEasyPhotoVO.sponsorId==0'>" +
- "AND p.`status` in (2,4) " +
- " </if> " +
- "group by p.id "+
- "order by p.create_at desc "+
- " </where>" +
- "</script>"
- )
+// @Select("<script> " +
+// "SELECT " +
+// "p.id, " +
+// "u.`name` sponsor_name, " +
+// "u.`nick_name` userNickName, " +
+// "u.phone sponsor_phone, " +
+// "count(DISTINCT pu.id)giveThumbsUpNum, " +
+// "count(DISTINCT c.id)commentNum, " +
+// "u.image_url, " +
+// "p.happen_addr, " +
+// "p.addr_remark, " +
+// "su.`name` handler_name, " +
+// "p.`status`, " +
+// "p.`is_hide`, " +
+// "p.`detail`, " +
+// "p.`is_need_feed_back`, " +
+// "p.`photo_path_list`, " +
+// "p.create_at, " +
+// "p.feedback_at, " +
+// "p.activity_type, " +
+// "p.activity_amount, " +
+// "p.classify_id, " +
+// "class.`name` as classifyName, " +
+// "p.img_width, " +
+// "p.img_height, " +
+// "p.examine_at " +
+// "FROM " +
+// "com_act_easy_photo p " +
+// "JOIN sys_user u ON p.sponsor_id = u.user_id " +
+// "left join com_act_easy_photo_user pu ON p.id = pu.easy_photo_id " +
+// "left JOIN sys_user su ON p.handler_id = su.user_id " +
+// "left JOIN com_act_easy_photo_comment c ON p.id = c.easy_photo_id " +
+// "left JOIN com_act_easy_photo_classify class ON p.classify_id = class.id " +
+// " <where>" +
+// " p.del_tag = 0 " +
+// "<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
+// " and p.community_id = ${comActEasyPhotoVO.communityId} " +
+// " </if> " +
+// "<if test='comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' >" +
+// "AND p.`status` = #{comActEasyPhotoVO.status} " +
+// " </if> " +
+// "<if test='comActEasyPhotoVO.sponsorId != null and comActEasyPhotoVO.sponsorId != 0'>" +
+// "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId} " +
+// " </if> " +
+// "<if test='comActEasyPhotoVO.sponsorId == null or comActEasyPhotoVO.sponsorId==0'>" +
+// "AND p.`status` in (2,4) and p.is_publicity = 1 " +
+// " </if> " +
+// "<if test='comActEasyPhotoVO.keyWord != null and comActEasyPhotoVO.keyWord != ""'>" +
+// "AND (class.`name` like concat(#{comActEasyPhotoVO.keyWord},'%') or p.detail like concat(#{comActEasyPhotoVO.keyWord},'%')) " +
+// " </if> " +
+// "group by p.id "+
+// "order by p.create_at desc "+
+// " </where>" +
+// "</script>"
+// )
IPage<ComActEasyPhotoVO> pageEasyPhotoApplets(Page page, @Param("comActEasyPhotoVO")ComActEasyPhotoVO comActEasyPhotoVO);
@Select("SELECT t.name,COUNT(p.id) as num FROM com_act_easy_photo_type t LEFT JOIN com_act_easy_photo_type_relation r ON t.id = r.easy_type_id " +
- "LEFT JOIN com_act_easy_photo p ON r.easy_id = p.id AND p.handle_status = 1 AND p.community_id = #{communityId} " +
+ "LEFT JOIN com_act_easy_photo p ON r.easy_id = p.id AND p.handle_status = 1 AND p.community_id = ${communityId} " +
"GROUP BY t.name ")
List<EastPhotoTypeVO> countDeal(@Param("communityId")Long communityId);
@Select("SELECT t.name,COUNT(p.id) as num FROM com_act_easy_photo_type t LEFT JOIN com_act_easy_photo_type_relation r ON t.id = r.easy_type_id " +
- "LEFT JOIN com_act_easy_photo p ON r.easy_id = p.id AND p.is_publicity = 1 AND p.community_id = #{communityId} " +
+ "LEFT JOIN com_act_easy_photo p ON r.easy_id = p.id AND p.is_publicity = 1 AND p.community_id = ${communityId} " +
"GROUP BY t.name ")
List<EastPhotoTypeVO> countPub(@Param("communityId")Long communityId);
@Select("SELECT t.name,COUNT(p.id) as num FROM com_act_easy_photo_type t LEFT JOIN com_act_easy_photo_type_relation r ON t.id = r.easy_type_id " +
- "LEFT JOIN com_act_easy_photo p ON r.easy_id = p.id AND p.status = 4 where p.community_id = #{communityId} " +
+ "LEFT JOIN com_act_easy_photo p ON r.easy_id = p.id AND p.status = 4 where p.community_id = ${communityId} " +
"GROUP BY t.name ")
List<EastPhotoTypeVO> countApproved(@Param("communityId")Long communityId);
@@ -279,27 +333,145 @@
"SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = 2 AND create_at LIKE concat(#{nowDate},'%') " +
") AS currentNum," +
"(" +
- "(SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = #{communityId} AND STATUS = 4 AND handle_status = 2)*100/(SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = #{communityId} AND handle_status = 2) " +
+ "(SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND STATUS = 4 AND handle_status = 2)*100/(SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND handle_status = 2) " +
") AS pubPoint," +
- "(SELECT AVG(TIMESTAMPDIFF(HOUR,create_at,feedback_at)) FROM com_act_easy_photo WHERE community_id = #{communityId} and handle_status = 2 ) AS dealTime " +
- "FROM com_act_easy_photo where community_id = #{communityId}")
+ "(SELECT AVG(TIMESTAMPDIFF(HOUR,create_at,feedback_at)) FROM com_act_easy_photo WHERE community_id = ${communityId} and handle_status = 2 ) AS dealTime " +
+ "FROM com_act_easy_photo where community_id = ${communityId}")
Map<String, Object> countByCommunityId(@Param("communityId")Long communityId,@Param("nowDate") String nowDate);
@Select("SELECT COUNT(id) AS total, " +
- "(SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = #{communityId} AND #{start} < create_at and create_at < #{end} ) AS adds, " +
- "(SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id =#{communityId} AND handle_status = 2 AND #{start} < create_at and create_at < #{end}) AS deal " +
- "FROM com_act_easy_photo WHERE community_id = #{communityId} AND #{start} < create_at and create_at < #{end} ")
+ "(SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND #{start} < create_at and create_at < #{end} ) AS adds, " +
+ "(SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND handle_status = 2 AND #{start} < create_at and create_at < #{end}) AS deal " +
+ "FROM com_act_easy_photo WHERE community_id = ${communityId} AND #{start} < create_at and create_at < #{end} ")
EastPhotoVO countByTime(@Param("start")String start, @Param("end")String end, @Param("nowDate")String nowDate, @Param("communityId")Long communityId);
- @Select("SELECT " +
- " count( id ) AS examineNum, " +
- " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 2 AND community_id = #{communityId} ) AS verificationNum, " +
- " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 3 AND community_id = #{communityId} ) AS rejectNum, " +
- " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 4 AND community_id = #{communityId} ) AS completeNum " +
- "FROM " +
- " com_act_easy_photo " +
- "WHERE " +
- " `status` = 1 " +
- " AND community_id = #{communityId}")
+// @Select("SELECT " +
+// " count( id ) AS examineNum, " +
+// " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 2 AND community_id = ${communityId} and del_tag = 0 ) AS verificationNum, " +
+// " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 3 AND community_id = ${communityId} and del_tag = 0 ) AS rejectNum, " +
+// " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 4 AND community_id = ${communityId} and del_tag = 0 ) AS completeNum " +
+// "FROM " +
+// " com_act_easy_photo " +
+// "WHERE " +
+// " `status` = 1 " +
+// " AND community_id = ${communityId} and del_tag = 0")
ComActEasyPhotoStatisticsVO getEasyPhotoStatistics(@Param("communityId")Long communityId);
+ ComActEasyPhotoCountVO easyPhotoCount(ComActEasyPhotoVO comActEasyPhotoVO);
+ List<ExportEasyPhotoVO> export(ExportEasyPhotoDTO exportEasyPhotoDTO);
+ List<ExportEasyPhotoVO> exportByIds(List<Integer> ids);
+
+ /**
+ * 查询社区待处理随手拍id集合
+ * @param communityId 社区id
+ * @return 社区待处理随手拍id集合
+ */
+ List<Long> easyPhotoNoHandleIds(@Param("communityId")Long communityId);
+
+ /**
+ * 查询banner
+ * @param communityId
+ * @return
+ */
+ List<BannerVO> banner(@Param("communityId") Long communityId);
+
+ /**
+ * 获取随手拍居民自治统计数据
+ * @param communityId
+ * @return
+ */
+ List<StatisticsCommVO> selectStatisticsList(@Param("communityId") Long communityId);
+
+ /**
+ * 获取居民自治统计数据
+ * @param communityId
+ * @return
+ */
+ ResidentAutonomyStatisticsVO selectResidentAutonomyStatistics(@Param("communityId") Long communityId);
+
+ /**
+ * 获取清网治格统计数据
+ * @param communityId
+ * @return
+ */
+ GridsGovernanceStatisticsVO selectGridsGovernance(@Param("communityId") Long communityId);
+
+ /**
+ * 首页大屏获取网格统计数据
+ */
+ BigscreenGridsGovernanceStatisticsVO selectBigscreenGridsGovern(@Param("communityId")Long communityId);
+
+ /**
+ * 首页二级页面-随手拍基础数据查询
+ * @param communityId
+ * @return
+ */
+ BigScreenEasyPhotoStatisticsInfo selectIndexEasyPhotoBaseData(@Param("communityId") Long communityId);
+
+ List<StatisticsCommVO> getEasyPhotoAddPolylineData(@Param("communityId") Long communityId);
+
+ StatisticsCommVO getEasyPhotoTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);
+
+ /**
+ * 首页二级页面-随手拍展示列表
+ * @param page
+ * @param pageBaseDTO
+ * @return
+ */
+ IPage<ComActEasyPhotoVO> indexEasyPhotoList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
+
+ /**
+ * 随手拍治安防控记录列表
+ * @param communityId
+ * @param pageSize
+ * @return
+ */
+ List<ComActEasyPhotoVO> getPartyBuildIngRecord(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);
+
+ /**
+ * 获取上报人大代表的随手拍新增数据
+ * @param communityId
+ * @return
+ */
+ List<StatisticsCommVO> getEasyPhotoAddPolylineDataForDpc(@Param("communityId") Long communityId);
+
+ /**
+ * 上报人大代表的随手拍累计折线数据
+ * @param communityId
+ * @param date
+ * @return
+ */
+ StatisticsCommVO getEasyPhotoTotalPolylineDateForDpc(@Param("communityId") Long communityId, @Param("date") String date);
+
+ /**
+ * 人大代表-随手拍展示列表
+ * @param page
+ * @param pageBaseDTO
+ * @return
+ */
+ IPage<ComActEasyPhotoVO> dpcEasyPhotoList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
+
+ /**
+ * 获取人大代表基础数据
+ * @param communityId
+ * @return
+ */
+ BigScreenDpcStatisticsInfo selectDpcBaseData(@Param("communityId") Long communityId);
+
+ /**
+ * 获取社区动态置顶banner
+ * */
+ List<BannerVO> getBanner(@Param("communityId") Long communityId);
+
+ /**
+ * 统计所有随手拍，分状态
+ * @return
+ */
+ List<StatisticsPhotoVO> selectPhotoAll();
+
+ /**
+ * 统计所有随手拍，分状态
+ * @return
+ */
+ List<StatisticsPhotoVO> selectPhotoByMonth();
+
}
--
Gitblit v1.7.1