From 508dd8dde98b7da379e56a819d1cb8d78b98a110 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 23 八月 2021 15:55:42 +0800
Subject: [PATCH] 随手拍新增图片宽高
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 358 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 315 insertions(+), 43 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index 29977ba..0183547 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -9,6 +9,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.community.easyPhoto.ExportEasyPhotoDTO;
+import com.panzhihua.common.model.dtos.community.questnaire.StatisticsSummaryDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.*;
@@ -19,9 +21,9 @@
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import com.panzhihua.common.service.user.UserService;
-import com.panzhihua.common.utlis.ClazzUtils;
-import com.panzhihua.common.utlis.IdCard;
-import com.panzhihua.common.utlis.IdCardUtil;
+import com.panzhihua.common.utlis.*;
+import com.panzhihua.service_community.dao.ComActActSignDAO;
+import com.panzhihua.service_community.dao.ComEldersAuthHistoryRecordMapper;
import com.panzhihua.service_community.dao.ComMngPopulationDAO;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.*;
@@ -35,10 +37,7 @@
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -84,7 +83,13 @@
@Resource
public ComMngPopulationDAO comMngPopulationDAO;
@Resource
+ private ComActActSignDAO comActActSignDAO;
+ @Resource
public ComEldersAuthUserService comEldersAuthUserService;
+ @Resource
+ private ComEldersAuthHistoryRecordMapper comEldersAuthHistoryRecordMapper;
+ @Resource
+ private ComActEasyPhotoActivityService comActEasyPhotoActivityService;
/**
* 新增社区活动
@@ -255,7 +260,7 @@
* @return 详情
*/
@PostMapping("detailactivity")
- public R detailActivity(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
+ public R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId",required = false) Long userId) {
ComActActivityVO comActActivityVO = comActActivityService.inforActivity(id, userId);
if (ObjectUtils.isEmpty(comActActivityVO)) {
return R.fail("活动不存在");
@@ -272,7 +277,7 @@
}
ActivitySignVO activitySignVO = new ActivitySignVO();
activitySignVO.setActivityId(id);
- R r = comActActivityService.listActivitySign(activitySignVO);
+ R r = comActActivityService.listActivitySigns(activitySignVO);
if (R.isOk(r)) {
List<ActivitySignVO> activitySignVOS = JSONArray.parseArray(JSONArray.toJSONString( r.getData()),ActivitySignVO.class);
if (!ObjectUtils.isEmpty(activitySignVOS)) {
@@ -307,7 +312,7 @@
}
/**
- * 活动报名名单
+ * 分页活动报名名单
*
* @param activitySignVO 查询参数
* @return 报名人员集合
@@ -315,6 +320,17 @@
@PostMapping("listactivitysign")
public R listActivitySign(@RequestBody ActivitySignVO activitySignVO) {
return comActActivityService.listActivitySign(activitySignVO);
+ }
+
+ /**
+ * 活动报名名单
+ *
+ * @param activitySignVO 查询参数
+ * @return 报名人员集合
+ */
+ @PostMapping("listactivitysigns")
+ public R listActivitySigns(@RequestBody ActivitySignVO activitySignVO) {
+ return comActActivityService.listActivitySigns(activitySignVO);
}
/**
@@ -360,18 +376,25 @@
*/
@PostMapping("putdynamic")
public R putDynamic(@RequestBody ComActDynVO comActDynVO) {
- ComActDynDO comActDynDO = new ComActDynDO();
- Long id = comActDynVO.getId();
- BeanUtils.copyProperties(comActDynVO, comActDynDO);
+ ComActDynDO comActDynDO = comActDynService.getById(comActDynVO.getId());
+ if(comActDynDO == null){
+ return R.fail("未查到社区动态记录");
+ }
+// Long id = comActDynVO.getId();
Integer isTopping = comActDynVO.getIsTopping();
- boolean b = isTopping.intValue() == 1;
+ boolean b = isTopping.equals(1);
if(b){
- ComActDynDO comActDynDO1 = comActDynService.getById(id);
- Integer status = comActDynDO1.getStatus();
- if (status.intValue()==0) {
- return R.fail("该动态还未发布");
+ Integer status = comActDynDO.getStatus();
+ if (status.equals(0)) {
+ return R.fail("待发布的社区动态不可置顶");
}
}
+
+// if(StringUtils.isEmpty(comActDynVO.getCover())){
+// comActDynVO.setCover(comActDynDO.getCover());
+// }
+ BeanUtils.copyProperties(comActDynVO, comActDynDO);
+
boolean update = comActDynService.updateById(comActDynDO);
if (update) {
// 最多只能设置三条置顶状态，后边设置会取消先前设置的置顶
@@ -453,6 +476,24 @@
@PostMapping("pageeasyphoto")
public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
return comActEasyPhotoService.pageEasyPhoto(comActEasyPhotoVO);
+ }
+
+ /**
+ * 城管安排
+ *
+ * @param comActEasyPhotoVO 查询参数
+ * @return 心愿列表
+ */
+ @PostMapping("updatePageeasyphoto")
+ public R updatePageeasyphoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
+ return comActEasyPhotoService.updatePageeasyphoto(comActEasyPhotoVO);
+ }
+ /**
+ * 城管导出
+ */
+ @PostMapping("exportEasyPhoto")
+ public R exportEasyPhoto(@RequestBody ExportEasyPhotoDTO exportEasyPhotoDTO){
+ return comActEasyPhotoService.export(exportEasyPhotoDTO);
}
/**
@@ -555,6 +596,15 @@
}
/**
+ * 查询随手拍是否有活动
+ * @return 活动详情
+ */
+ @PostMapping("getEasyPhotoActivity")
+ public R getEasyPhotoActivity(@RequestParam("communityId") Long communityId) {
+ return comActEasyPhotoActivityService.getEasyPhotoActivity(communityId);
+ }
+
+ /**
* 发布微心愿
*
* @param comActMicroWishVO 发布内容
@@ -614,6 +664,14 @@
@PostMapping("puteasyphotostatus")
public R putEasypHotoStatus(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
return comActEasyPhotoService.putEasypHotoStatus(comActEasyPhotoVO);
+ }
+
+ /**
+ * 城管随手拍统计
+ */
+ @PostMapping("/esayPhotoCount")
+ public R esayphotoCount(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
+ return comActEasyPhotoService.easyPhotoCount(comActEasyPhotoVO);
}
/**
@@ -1390,32 +1448,56 @@
}
}
+ /**
+ * 小程序-问卷调查详情
+ * @param userId 用户id
+ * @param questId 问卷id
+ * @return 问卷调查详情
+ */
+ @GetMapping("questnaire/view/detail")
+ public R viewDetail(@RequestParam("questId") Long questId,@RequestParam("userId") Long userId) {
+ return comActQuestnaireService.getQuesDetail(questId,userId);
+ }
+
+ /**
+ * 社区后台-查询问卷调查详情
+ * @param questId 问卷id
+ * @return 问卷调查详情
+ */
+ @GetMapping("questnaire/admin/detail")
+ public R quesDetail( @RequestParam("questId") Long questId) {
+ return comActQuestnaireService.getQuesDetailAdmin(questId);
+ }
+
/**
* 新增社区问卷
* @param questnaireVO
* @return
*/
- @Transactional(rollbackFor = Exception.class)
@PostMapping("questnaire/addquestnaire")
- public R addQuestnaire(@RequestBody QuestnaireVO questnaireVO, @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId) {
- return comActQuestnaireService.addQuestnaire(questnaireVO, communityId, userId);
+ public R addQuestnaire(@RequestBody QuestnaireVO questnaireVO) {
+ return comActQuestnaireService.addQuestnaire(questnaireVO);
}
/**
- * 社区问卷列表
- * @param pageQuestnaireDTO
- * @return
+ * 小程序-社区问卷列表
+ * @param pageQuestnaireDTO 请求参数
+ * @return 社区问卷列表
*/
@PostMapping("questnaire/pagequestnaire")
- public R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO,@RequestParam("communityId") Long communityId) {
- if(pageQuestnaireDTO.getForParty()==null){
- pageQuestnaireDTO.setForParty(false);
- }
- if(pageQuestnaireDTO.getForVolunteer()==null){
- pageQuestnaireDTO.setForVolunteer(false);
- }
- return comActQuestnaireService.pageQuestnaire(pageQuestnaireDTO, communityId);
+ public R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) {
+ return comActQuestnaireService.pageQuestnaire(pageQuestnaireDTO);
+ }
+
+ /**
+ * 社区后台-社区问卷列表
+ * @param pageQuestnaireDTO 请求参数
+ * @return 社区问卷列表
+ */
+ @PostMapping("questnaire/admin/pagequestnaire")
+ public R pageQuestnaireAdmin(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) {
+ return comActQuestnaireService.pageQuestnaireAdmin(pageQuestnaireDTO);
}
/**
@@ -1423,7 +1505,6 @@
* @param questnaireVO
* @return
*/
- @Transactional(rollbackFor = Exception.class)
@PostMapping("questnaire/editquestnaire")
public R editQuestnaire(@RequestBody QuestnaireVO questnaireVO) {
return comActQuestnaireService.editQuestnaire(questnaireVO);
@@ -1435,8 +1516,8 @@
* @return
*/
@PostMapping("questnaire/editquestnairedo")
- public R editQuestnaireDO(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo, @RequestParam("userId") Long userId) {
- return comActQuestnaireService.editQuestnaireDO(editComActQuestnaireVo, userId);
+ public R editQuestnaireDO(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo) {
+ return comActQuestnaireService.editQuestnaireDO(editComActQuestnaireVo);
}
/**
@@ -1490,12 +1571,22 @@
}
/**
- * 居民填写问卷调查问卷
- * @param usersAnswerQuestnaireVO
+ * 居民填写问卷调查问卷questnaire/pagequestnaire
*/
@PostMapping("questnaire/usersanswequestnaire")
- public R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO,@RequestParam("userId") Long userId){
- return comActQuestnaireService.usersAnsweQuestnaire(usersAnswerQuestnaireVO,userId);
+ public R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO){
+ return comActQuestnaireService.usersAnsweQuestnaire(usersAnswerQuestnaireVO);
+ }
+
+ /**
+ * 小程序-用户弹窗添加不在提醒接口
+ * @param questId 问卷id
+ * @param userId 用户id
+ * @return 添加结果
+ */
+ @GetMapping("questnaire/add/noNotice")
+ public R addNoNotice(@RequestParam("questId") Long questId,@RequestParam("userId") Long userId){
+ return comActQuestnaireService.addNoNotice(questId,userId);
}
/**
@@ -1577,6 +1668,7 @@
}
@PostMapping("/eldersauth/addByFamilyUser")
+ @Transactional(rollbackFor = Exception.class)
R addByFamilyUser(@RequestBody EldersAuthAddByFamilyDTO eldersAuthAddByFamilyDTO){
ComEldersAuthUserDO authUserDO = comEldersAuthUserService.getById(eldersAuthAddByFamilyDTO.getFamilyUserId());
@@ -1584,16 +1676,24 @@
return R.fail("未查询到老人信息");
}
+ Long elderId = authUserDO.getId();
+ boolean canReAuthThisMonth = comEldersAuthUserService.checkReAuthAgain(elderId);
+ if(!canReAuthThisMonth){
+ return R.fail("当月已认证，不能再次进行认证");
+ }
+
+ String idCard = authUserDO.getIdCard();
+
Long loginUserId = eldersAuthAddByFamilyDTO.getUserId();
EldersAuthDO eldersAuthDO = new EldersAuthDO();
eldersAuthDO.setSumitUserId(loginUserId);
eldersAuthDO.setCreateBy(loginUserId);
eldersAuthDO.setCreateAt(new Date());
- eldersAuthDO.setIdCard(authUserDO.getIdCard());
+ eldersAuthDO.setIdCard(idCard);
eldersAuthDO.setAuthUserName(authUserDO.getName());
eldersAuthDO.setVideoUrl(eldersAuthAddByFamilyDTO.getVideoUrl());
eldersAuthDO.setFamilyUserId(authUserDO.getId());
- eldersAuthDO.setAge(IdcardUtil.getAgeByIdCard(authUserDO.getIdCard()));
+ eldersAuthDO.setAge(IdcardUtil.getAgeByIdCard(idCard));
//根据身份证查询出籍贯 出生日期
//String domicile = IdCard.domicile(eldersAuthDO.getIdCard());
String domicile = eldersAuthService.queryDomicile(eldersAuthDO.getIdCard());
@@ -1601,11 +1701,35 @@
domicile = "暂无";
}
- Date birthDay = IdCard.birthDay(eldersAuthDO.getIdCard());
+ Date birthDay = IdCard.birthDay(idCard);
eldersAuthDO.setDomicile(domicile);
eldersAuthDO.setBirthDay(birthDay);
int add = eldersAuthService.getBaseMapper().insert(eldersAuthDO);
if(add==1){
+ //设置认证成功
+ Long familyUserId = eldersAuthDO.getFamilyUserId();
+ ComEldersAuthUserDO comEldersAuthUserDO = new ComEldersAuthUserDO();
+ comEldersAuthUserDO.setId(familyUserId);
+ comEldersAuthUserDO.setIsAuth(1);
+ boolean updated = comEldersAuthUserService.updateById(comEldersAuthUserDO);
+ if(!updated){
+ throw new ServiceException("添加认证失败，更新认证状态");
+ }
+ //认证成功 添加认证记录
+ List<ComEldersAuthHistoryRecordDO> authHistoryRecordDOList = comEldersAuthHistoryRecordMapper.selectList(new QueryWrapper<ComEldersAuthHistoryRecordDO>()
+ .lambda().eq(ComEldersAuthHistoryRecordDO::getIdCard,idCard).ge(ComEldersAuthHistoryRecordDO::getCreateAt, DateUtils.getFirstDayOfMonth()));
+ if(authHistoryRecordDOList.isEmpty()){
+ ComEldersAuthHistoryRecordDO authHistoryRecordDO = new ComEldersAuthHistoryRecordDO();
+ authHistoryRecordDO.setUserId(eldersAuthAddByFamilyDTO.getFamilyUserId());
+ authHistoryRecordDO.setAuthId(eldersAuthDO.getId());
+ BeanUtils.copyProperties(eldersAuthDO,authHistoryRecordDO);
+ authHistoryRecordDO.setId(null);
+ authHistoryRecordDO.setBrithday(AgeUtils.getAgeFormatBirthday(IdcardUtil.getBirthByIdCard(idCard)));
+ authHistoryRecordDO.setAge(IdcardUtil.getAgeByIdCard(idCard));
+ authHistoryRecordDO.setIsAuth(1);
+ authHistoryRecordDO.setDomicile(domicile);
+ comEldersAuthHistoryRecordMapper.insert(authHistoryRecordDO);
+ }
return R.ok(eldersAuthDO.getId());
}
@@ -1641,8 +1765,21 @@
if (R.isOk(r1)) {
log.info("新增用户报名党建活动通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
}
- }
+ //用户高龄认证反馈，推送订阅消息给用户
+ Map<String,String> map = comActActSignDAO.getUserOpenId(eldersAuthDO.getSumitUserId());
+ if(map != null){
+ String openid = map.get("openid");
+ try {
+ WxXCXTempSend util = new WxXCXTempSend();
+ String accessToken = util.getAppAccessToken();
+ WxUtil.sendSubscribeRZSH(openid,accessToken,"高龄认证"
+ ,DateUtils.format(eldersAuthDO.getCreateAt(),DateUtils.ymdhms_format),eldersAuthFeedbackAddDTO.getFeedBack());
+ }catch (Exception e){
+ log.error("推送审核状态订阅消息失败，失败原因：" + e.getMessage());
+ }
+ }
+ }
return addR;
}
@@ -1667,4 +1804,139 @@
R setCommunityAuthType(@RequestParam("communityId")Long communityId,@RequestParam("type") Integer type){
return eldersAuthService.setCommunityAuthType(communityId, type);
}
+
+ /**
+ * 随手拍活动定时任务
+ * @return 执行结果
+ */
+ @PostMapping("timeTaskEasyPhotoActivity")
+ public R timeTaskEasyPhotoActivity(){
+ return comActEasyPhotoActivityService.timeTaskEasyPhotoActivity();
+ }
+
+ /**
+ * 社区随手拍列表统计
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @GetMapping("easyphoto/statistics")
+ public R easyPhotoStatistics(@RequestParam("communityId")Long communityId) {
+ return comActEasyPhotoService.easyPhotoStatistics(communityId);
+ }
+
+ /**
+ * 综治后台-查询社区列表
+ * @return 社区列表
+ */
+ @GetMapping("/eventgrid/community/list")
+ public R getCommunityLists(){
+ return comActService.getCommunityLists();
+ }
+
+ /**
+ * 随手拍发放奖励
+ * @param grantRewardDTO 请求参数
+ * @return 发放结果
+ */
+ @PostMapping("/easyphoto/grantReward")
+ public R grantReward(@RequestBody GrantRewardDTO grantRewardDTO) {
+ return comActEasyPhotoService.grantReward(grantRewardDTO);
+ }
+
+ /**
+ * 获取最新活动和用户最新收益
+ * @param userId 用户id
+ * @param communityId 社区id
+ * @return 最新活动和用户最新收益
+ */
+ @PostMapping("easyphoto/getUserReward")
+ public R getUserReward(@RequestParam("userId") Long userId,@RequestParam("communityId") Long communityId) {
+ return comActEasyPhotoService.getUserReward(userId,communityId);
+ }
+
+ /**
+ * 读取用户随手拍奖励
+ * @param userId 用户id
+ * @return 读取结果
+ */
+ @PostMapping("easyphoto/readUserReward")
+ public R readUserReward(@RequestParam("userId") Long userId,@RequestParam("communityId") Long communityId) {
+ return comActEasyPhotoService.readUserReward(userId,communityId);
+ }
+
+ /**
+ * 定时任务检测即将开始的社区活动，并使用订阅消息通知用户
+ */
+ @PostMapping("timedTaskActivityNotice")
+ public R timedTaskActivityNotice(){
+ return comActActivityService.timedTaskActivityNotice();
+ }
+
+ /**
+ * 问卷调查统计汇总
+ * @param summaryDTO 请求参数
+ * @return 统计汇总
+ */
+ @PostMapping("questnaire/statisticsSummary")
+ public R statisticsSummary(@RequestBody StatisticsSummaryDTO summaryDTO) {
+ return comActQuestnaireService.statisticsSummary(summaryDTO);
+ }
+
+ /**
+ * 问卷调查统计汇总导出数据查询
+ * @param questId 调查问卷id
+ * @return 调查统计汇总导出数据
+ */
+ @GetMapping("questnaire/statisticsSummary/export")
+ public R statisticsSummaryExport(@RequestParam("questId") Long questId) {
+ return comActQuestnaireService.statisticsSummaryExport(questId);
+ }
+
+ /**
+ * 问卷调查统计汇总表头统计
+ * @param questId 调查问卷id
+ * @return 问卷调查统计汇总表头统计数据
+ */
+ @GetMapping("questnaire/statisticsSummary/header")
+ public R statisticsSummaryHeader(@RequestParam("questId") Long questId,@RequestParam("communityId") Long communityId) {
+ return comActQuestnaireService.statisticsSummaryHeader(questId,communityId);
+ }
+
+ /**
+ * 定时任务检测待发布，调研中的问卷调查状态
+ */
+ @PostMapping("timedTaskQuestionnaire")
+ public R timedTaskQuestionnaire(){
+ return comActQuestnaireService.timedTaskQuestionnaire();
+ }
+
+ /**
+ * 小程序-新增问卷调查浏览数量
+ * @param questId 问卷调查id
+ * @return 增加结果
+ */
+ @GetMapping("questnaire/add/view")
+ public R addQuestnaireView(@RequestParam("questId") Long questId) {
+ return comActQuestnaireService.addQuestnaireView(questId);
+ }
+
+ /**
+ * 社区后台-切换随手拍公示状态
+ * @param comActEasyPhotoVO 请求参数
+ * @return 切换结果
+ */
+ @PostMapping("easyphoto/switch/publicity")
+ public R easyPhotoSwitchPublicity(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
+ return comActEasyPhotoService.easyPhotoSwitchPublicity(comActEasyPhotoVO);
+ }
+
+ /**
+ * 查询社区待处理随手拍id集合
+ * @param communityId 社区id
+ * @return 社区待处理随手拍id集合
+ */
+ @GetMapping("easyphoto/noHandle/list")
+ public R easyPhotoNoHandleList(@RequestParam("communityId") Long communityId) {
+ return comActEasyPhotoService.easyPhotoNoHandleList(communityId);
+ }
}
--
Gitblit v1.7.1