From ce4a770744d7a0b4e4ea3b5101556b94e72bdf1c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 14 十一月 2023 17:49:20 +0800
Subject: [PATCH] 修改打卡
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java | 505 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 499 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
index f285770..37418fc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
@@ -1,18 +1,27 @@
package com.panzhihua.applets.api;
-
+import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.partybuilding.*;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.service.community.CommunityWestService;
+import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
+import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
+import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
+import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.partybuilding.NewStriveForFeign;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.DateUtils;
+import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.common.utlis.WxUtil;
+import com.panzhihua.common.utlis.WxXCXTempSend;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.Date;
@Slf4j
@Api(tags = {"双挣双评新模块-小程序"})
@@ -24,12 +33,15 @@
@Resource
private NewStriveForFeign newStriveForFeign;
+ @ApiOperation(value = "获取党员个人排名", response = UserRankDTO.class)
@GetMapping("/NewStriveFor/getUserRank")
public R getUserRank()
{
return newStriveForFeign.getUserRank(getUserId()+"");
}
+
+ @ApiOperation(value = "获取党员排名列表", response = UserRankDTO.class)
@GetMapping("/NewStriveFor/getUserRankList")
public R getUserRankList(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize)
@@ -37,4 +49,485 @@
return newStriveForFeign.getUserRankList(pageNum,pageSize,getUserId()+"");
}
+
+ @ApiOperation(value = "获取累计积分")
+ @GetMapping("/getAllintegral")
+ public R getAllintegral(@RequestParam("type") String type,
+ @RequestParam("userId") String userId)
+ {
+ return newStriveForFeign.getAllintegral(type,userId);
+ }
+
+
+ /*****************************************************************************************************************
+ *
+ * 任务需求清单
+ *
+ ******************************************************************************************************************/
+ @ApiOperation(value = "任务需求清单列表", response = NeedProblemInventoryDTO.class)
+ @GetMapping("/NeedProblem/getList")
+ public R getNeedProblemList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "search", required = false)String search,
+ @RequestParam(value = "status", required = false)String status,
+ @RequestParam(value = "kind", required = false)String kind,
+ @RequestParam(value = "userId", required = false)String userId,
+ @RequestParam(value = "communityId", required = false)String communityId)
+ {
+ return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,status,kind,userId,getUserId()+"",communityId);
+ }
+
+
+ @ApiOperation(value = "任务需求清单我认领的列表", response = NeedProblemInventoryDTO.class)
+ @GetMapping("/getMyJoinNeedProblemList")
+ public R getMyJoinNeedProblemList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "search", required = false)String search,
+ @RequestParam(value = "status", required = false)String status,
+ @RequestParam(value = "kind", required = false)String kind)
+ {
+ return newStriveForFeign.getMyJoinNeedProblemList(pageNum,pageSize,search,status,kind,getUserId()+"",getUserId()+"");
+ }
+
+
+
+ @ApiOperation(value = "任务需求清单详情", response = NeedProblemInventoryDTO.class)
+ @GetMapping("/NeedProblem/getDetails")
+ public R getNeedProblemDetails(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.getNeedProblemDetails(id,getUserId()+"");
+ }
+
+ @ApiOperation(value = "新增任务需求")
+ @PostMapping("/NeedProblem/addData")
+ public R addNeedProblemData(@RequestBody NeedProblemInventoryDTO item)
+ {
+ return newStriveForFeign.addNeedProblemData(item);
+ }
+
+ @ApiOperation(value = "编辑任务需求")
+ @PostMapping("/NeedProblem/editData")
+ public R editNeedProblemData(@RequestBody NeedProblemInventoryDTO item)
+ {
+ return newStriveForFeign.editNeedProblemData(item);
+ }
+
+ @ApiOperation(value = "删除任务需求")
+ @DeleteMapping("/NeedProblem/expurgateData")
+ public R expurgateNeedProblemData(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.expurgateNeedProblemData(id);
+ }
+
+
+ /*******************************************************************************************************
+ *
+ * 任务需求报名
+ *
+ *******************************************************************************************************/
+ @ApiOperation(value = "任务报名列表", response = NeedProblemClaimDTO.class)
+ @GetMapping("/getNeedClaimList")
+ public R getNeedClaimList(@RequestParam(value = "taskId", required = false) String taskId,
+ @RequestParam(value = "userId", required = false) String userId,
+ @RequestParam(value = "unitId", required = false) String unitId)
+ {
+ return newStriveForFeign.getNeedClaimList(taskId,userId,unitId);
+ }
+
+ @ApiOperation(value = "任务报名详情", response = NeedProblemClaimDTO.class)
+ @GetMapping("/getNeedClaimDetails")
+ public R getNeedClaimDetails(@RequestParam(value = "id", required = false) String id,
+ @RequestParam(value = "taskId", required = false) String taskId,
+ @RequestParam(value = "userId", required = false) String userId)
+ {
+ return newStriveForFeign.getNeedClaimDetails(id,taskId,userId);
+ }
+
+ @ApiOperation(value = "任务报名")
+ @PostMapping("/addNeedClaimData")
+ public R addNeedClaimData(@RequestBody NeedProblemClaimDTO item)
+ {
+ return newStriveForFeign.addNeedClaimData(item);
+ }
+
+ @ApiOperation(value = "修改任务报名")
+ @PostMapping("/editNeedClaimData")
+ public R editNeedClaimData(@RequestBody NeedProblemClaimDTO item)
+ {
+ return newStriveForFeign.editNeedClaimData(item);
+ }
+
+ @ApiOperation(value = "取消报名")
+ @DeleteMapping("/expurgateNeedClaimData")
+ public R expurgateNeedClaimData(@RequestParam(value = "id", required = false) String id,
+ @RequestParam(value = "taskId", required = false) String taskId,
+ @RequestParam(value = "userId", required = false) String userId)
+ {
+ return newStriveForFeign.expurgateNeedClaimData(id,taskId,userId);
+ }
+
+
+ @ApiOperation(value = "打卡")
+ @GetMapping("/needClaimSignIn")
+ public R needClaimSignIn(@RequestParam("taskId") String taskId,
+ @RequestParam("userId") String userId,
+ @RequestParam("type") String type)
+ {
+
+ return newStriveForFeign.needClaimSignIn(taskId,userId,type);
+ }
+
+ /***************************************************************************************************************
+ *
+ * 代单位接受
+ *
+ *************************************************************************************************************/
+ @ApiOperation(value = "代单位任务报名列表", response = NeedProblemUnitTaskDTO.class)
+ @GetMapping("/getNeedTaskList")
+ public R getNeedTaskList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageNum") int pageSize,
+ @RequestParam(value = "unitId", required = false) String unitId)
+ {
+ return newStriveForFeign.getNeedTaskList(pageNum,pageSize,unitId);
+ }
+
+ @ApiOperation(value = "代单位任务报名详情", response = NeedProblemUnitTaskDTO.class)
+ @GetMapping("/getNeedTaskDetails")
+ public R getNeedTaskDetails(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.getNeedTaskDetails(id);
+ }
+
+ @ApiOperation(value = "代单位任务添加")
+ @PostMapping("/addNeedTaskData")
+ public R addNeedTaskData(@RequestBody NeedProblemUnitTaskDTO item)
+ {
+ return newStriveForFeign.addNeedTaskData(item);
+ }
+
+ @ApiOperation(value = "代单位任务修改")
+ @PostMapping("/editNeedTaskData")
+ public R editNeedTaskData(@RequestBody NeedProblemUnitTaskDTO item)
+ {
+ return newStriveForFeign.editNeedTaskData(item);
+ }
+
+ @ApiOperation(value = "代单位任务删除")
+ @DeleteMapping("/expurgateNeedTaskData")
+ public R expurgateNeedTaskData(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.expurgateNeedTaskData(id);
+ }
+
+
+ /*******************************************************************************************************************
+ *
+ * 新双争双评社区共建
+ *
+ ****************************************************************************************************************/
+
+ @ApiOperation(value = "社区共建项目列表", response = NewFightCommunityConstructionDTO.class)
+ @GetMapping("/getNewFightCommunityList")
+ public R getNewFightCommunityList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize)
+ {
+ return newStriveForFeign.getNewFightCommunityList(pageNum,pageSize,
+ getCommunityId()+"",getUserId()+"");
+ }
+
+ @ApiOperation(value = "社区共建项目删除", response = NewFightCommunityConstructionDTO.class)
+ @GetMapping("/getNewFightCommunityDetails")
+ public R getNewFightCommunityDetails(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.getNewFightCommunityDetails(id);
+ }
+
+ @ApiOperation(value = "社区共建项目添加")
+ @PostMapping("/addNewFightCommunityData")
+ public R addNewFightCommunityData(@RequestBody NewFightCommunityConstructionDTO item)
+ {
+ return newStriveForFeign.addNewFightCommunityData(item);
+ }
+
+ @ApiOperation(value = "社区共建项目编辑")
+ @PostMapping("/editNewFightCommunityData")
+ public R editNewFightCommunityData(@RequestBody NewFightCommunityConstructionDTO item)
+ {
+ return newStriveForFeign.editNewFightCommunityData(item);
+ }
+
+ @ApiOperation(value = "社区共建项目删除")
+ @DeleteMapping("/expurgateNewFightCommunityData")
+ public R expurgateNewFightCommunityData(@RequestParam(value = "id", required = false) String id)
+ {
+ return newStriveForFeign.expurgateNewFightCommunityData(id);
+ }
+
+
+ /**************************************************************************************************************
+ *
+ * 项目规划
+ *
+ ****************************************************************************************************************/
+ @ApiOperation(value = "项目规划列表", response = NewFightCommunityConstructionDTO.class)
+ @GetMapping("/getProjectPlanList")
+ public R getProjectPlanList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("projectId") String projectId)
+ {
+ return newStriveForFeign.getProjectPlanList(pageNum,pageSize,projectId);
+ }
+
+ @ApiOperation(value = "项目规划详情", response = NewFightCommunityConstructionDTO.class)
+ @GetMapping("/getProjectPlanDetails")
+ public R getProjectPlanDetails(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.getProjectPlanDetails(id);
+ }
+
+ @ApiOperation(value = "项目规划添加")
+ @PostMapping("/addProjectPlanData")
+ public R addProjectPlanData(@RequestBody NewFightProjectPlanDTO item)
+ {
+ return newStriveForFeign.addProjectPlanData(item);
+ }
+
+ @ApiOperation(value = "项目规划编辑")
+ @PostMapping("/editProjectPlanData")
+ public R editProjectPlanData(@RequestBody NewFightProjectPlanDTO item)
+ {
+ return newStriveForFeign.editProjectPlanData(item);
+ }
+
+
+ @ApiOperation(value = "项目规划确认完工")
+ @PostMapping("/editProjectPlanAccomplish")
+ public R editProjectPlanAccomplish(@RequestParam("id") String id)
+ {
+ NewFightProjectPlanDTO item =new NewFightProjectPlanDTO();
+ item.setId(id);
+ item.setAffirmTime(new Date());
+ item.setAccomplish("1");
+ return newStriveForFeign.editProjectPlanData(item);
+ }
+
+
+ @ApiOperation(value = "项目规划删除")
+ @DeleteMapping("/expurgateProjectPlanData")
+ public R expurgateProjectPlanData(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.expurgateProjectPlanData(id);
+ }
+
+
+ /********************************************************************************************************
+ *
+ * 项目参与
+ *
+ ******************************************************************************************************/
+
+ @ApiOperation(value = "项目参与人员列表", response = NewFightProjectJoinDTO.class)
+ @GetMapping("/getJoinList")
+ public R getJoinList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("projectId") String projectId)
+ {
+ return newStriveForFeign.getJoinList(pageNum,pageSize,projectId);
+ }
+
+ @ApiOperation(value = "项目参与人员详情", response = NewFightProjectJoinDTO.class)
+ @GetMapping("/getJoinDetails")
+ public R getJoinDetails(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.getJoinDetails(id);
+ }
+
+ @ApiOperation(value = "项目参与人员报名")
+ @PostMapping("/addJoinData")
+ public R addJoinData(@RequestBody NewFightProjectJoinDTO item)
+ {
+ return newStriveForFeign.addJoinData(item);
+ }
+
+ @ApiOperation(value = "项目参与人员修改")
+ @PostMapping("/editJoinData")
+ public R editJoinData(@RequestBody NewFightProjectJoinDTO item)
+ {
+ return newStriveForFeign.editJoinData(item);
+ }
+
+ @ApiOperation(value = "项目参与人员取消报名")
+ @DeleteMapping("/expurgateJoinData")
+ public R expurgateJoinData(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.expurgateJoinData(id);
+ }
+
+
+ /********************************************************************************************************
+ *
+ * 项目评论
+ *
+ ******************************************************************************************************/
+
+ @ApiOperation(value = "项目评论列表", response = NewFightProjectEvaluateDTO.class)
+ @GetMapping("/getEvaluateList")
+ public R getEvaluateList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("projectId") String projectId)
+ {
+ return newStriveForFeign.getEvaluateList(pageNum,pageSize,projectId);
+ }
+
+ @ApiOperation(value = "项目评论详情", response = NewFightProjectEvaluateDTO.class)
+ @GetMapping("/getEvaluateDetails")
+ public R getEvaluateDetails(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.getEvaluateDetails(id);
+ }
+
+ @ApiOperation(value = "项目评论新增")
+ @PostMapping("/addEvaluateData")
+ public R addEvaluateData(@RequestBody NewFightProjectEvaluateDTO item)
+ {
+ return newStriveForFeign.addEvaluateData(item);
+ }
+
+ @ApiOperation(value = "项目评论编辑")
+ @PostMapping("/editEvaluateData")
+ public R editEvaluateData(@RequestBody NewFightProjectEvaluateDTO item)
+ {
+ return newStriveForFeign.editEvaluateData(item);
+ }
+
+ @ApiOperation(value = "项目评论删除")
+ @DeleteMapping("/expurgateEvaluateData")
+ public R expurgateEvaluateData(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.expurgateEvaluateData(id);
+ }
+
+
+ /*******************************************************************************************************************
+ *
+ *
+ *
+ * ****************************************************************************************************************/
+
+ @Resource
+ private UserService userService;
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "微心愿app一键认领")
+ @PutMapping("/putmicrowish")
+ public R putlMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) {
+ Long id = comActMicroWishVO.getId();
+ Long userId = this.getUserId();
+ if (ObjectUtils.isEmpty(id)) {
+ return R.fail("心愿主键不能为空");
+ }
+ Integer type = comActMicroWishVO.getType();
+ if (ObjectUtils.isEmpty(type) || type > 5 || type < 1) {
+ return R.fail("操作类型不对");
+ }
+ comActMicroWishVO.setUserId(userId);
+ R r = communityService.putlMicroWish(comActMicroWishVO);
+ if (R.isOk(r)) {
+ if (R.isOk(r)) {
+ // 1 审核通过 2驳回 3分配人员 4发起活动 5反馈
+ R r1 = communityService.detailMicroWish(id, userId);
+ Object data = r1.getData();
+ ComActMicroWishVO comActMicroWishVO1 =
+ JSONObject.parseObject(JSONObject.toJSONString(data), ComActMicroWishVO.class);
+ // 查询用户openid
+ R userResult = userService.getUserOpenId(comActMicroWishVO1.getSponsorId());
+ if (R.isOk(r1)) {
+ SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
+ sysUserNoticeVO.setUserId(comActMicroWishVO1.getSponsorId());
+ sysUserNoticeVO.setType(2);
+ sysUserNoticeVO.setBusinessType(3);
+ sysUserNoticeVO.setBusinessTitle(comActMicroWishVO1.getWishName());
+ sysUserNoticeVO.setBusinessTime(comActMicroWishVO1.getExamineAt());
+ sysUserNoticeVO.setBusinessId(id);
+ sysUserNoticeVO.setStatus(0);
+ if (type.intValue() == 2) {
+ sysUserNoticeVO.setTitle("微心愿未通过审核");
+ sysUserNoticeVO
+ .setBusinessContent(String.format("驳回原因：%s", comActMicroWishVO1.getRejectReason()));
+ sysUserNoticeVO.setBusinessStatus(1);
+ R r2 = userService.addNotice(sysUserNoticeVO);
+ if (R.isOk(r2)) {
+ log.info("新增微心愿未通过审核通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
+ }
+ if (R.isOk(userResult)) {
+ String openid = userResult.getData().toString();
+ WxXCXTempSend util = new WxXCXTempSend();
+ try {
+ String result = comActMicroWishVO1.getRejectReason();
+ if (StringUtils.isNotEmpty(result)) {
+ result = result.substring(0, 4);
+ result += "…";
+ }
+ R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(this.getAreaCode(),4);
+ WxUtil.sendSubscribeSHZT(openid, util.getAccessToken(), "微心愿",
+ DateUtils.format(comActMicroWishVO1.getExamineAt(), DateUtils.ymdhms_format),
+ result,sysTemplateConfigVO.getData().getTemplateId());
+ } catch (Exception e) {
+ log.error("消息推送失败，失败原因：" + e.getMessage());
+ }
+ }
+ } else if (type.intValue() == 5) {
+ sysUserNoticeVO.setTitle("微心愿已完成");
+ sysUserNoticeVO.setBusinessContent(comActMicroWishVO.getFeedback());
+ sysUserNoticeVO.setBusinessStatus(2);
+ R r2 = userService.addNotice(sysUserNoticeVO);
+ if (R.isOk(r2)) {
+ log.info("新增微心愿已完成通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
+ }
+ } else if (type.intValue() == 3) {
+ sysUserNoticeVO.setTitle("微心愿已分配负责人");
+ sysUserNoticeVO.setBusinessContent("负责人会在近日和你联系，请保持电话畅通");
+ sysUserNoticeVO.setBusinessStatus(2);
+ R r2 = userService.addNotice(sysUserNoticeVO);
+ if (R.isOk(r2)) {
+ log.info("新增微心愿已分配负责人通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
+ }
+ } else if (type.intValue() == 4) {
+ sysUserNoticeVO.setTitle("微心愿发起了活动");
+ sysUserNoticeVO.setBusinessContent("请关注活动页面及时参加，并邀请你的朋友一起支持我们的活动");
+ sysUserNoticeVO.setBusinessStatus(2);
+ R r2 = userService.addNotice(sysUserNoticeVO);
+ if (R.isOk(r2)) {
+ log.info("新增微心愿发起了活动通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
+ }
+ }
+
+// if (type.equals(1)) {// 审核通过给用户增加积分
+// communityService.addIntegralTradeAdmin(
+// new AddComActIntegralUserDTO(id, AddComActIntegralUserDTO.integralType.fbwxy,
+// this.getCommunityId(), comActMicroWishVO1.getSponsorId()));
+// if (R.isOk(userResult)) {
+// String openid = userResult.getData().toString();
+// WxXCXTempSend util = new WxXCXTempSend();
+// R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(this.getAreaCode(),4);
+// try {
+// WxUtil.sendSubscribeSHZT(openid, util.getAccessToken(), "微心愿",
+// DateUtils.format(comActMicroWishVO1.getExamineAt(), DateUtils.ymdhms_format),
+// "审核通过",sysTemplateConfigVO.getData().getTemplateId());
+// } catch (Exception e) {
+// log.error("消息推送失败，失败原因：" + e.getMessage());
+// }
+// }
+// }
+ }
+ }
+ }
+ return r;
+ }
+
+
+
+
+
}
--
Gitblit v1.7.1