change 4 роки тому
батько
коміт
643d61337c

+ 60 - 0
zhongzheng-api/src/main/java/com/zhongzheng/controller/alioss/OssController.java

@@ -0,0 +1,60 @@
+package com.zhongzheng.controller.alioss;
+
+
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.modules.alioss.bo.OssRequest;
+import com.zhongzheng.modules.alioss.service.OssService;
+import com.zhongzheng.modules.alioss.vo.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 阿里OSS
+ *
+ * @author change
+ * @date 2021-05-17
+ */
+@Api(value = "阿里OSS上传文件控制器", tags = {"阿里OSS上传文件"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/aliyun/oss")
+public class OssController {
+
+    private static Logger log = LoggerFactory.getLogger(OssController.class);
+
+    private final OssService ossService;
+
+    /**
+     * policy获得
+     */
+    @ApiOperation("policy获得")
+    @GetMapping("/policy")
+    public AjaxResult<ResultBean> policy(@Validated OssRequest ossRequest) {
+        ResultBean result = ossService.getPolicy(ossRequest);
+        log.info("服务端生成签名:{}",result);
+        return AjaxResult.success(result);
+    }
+
+    /**
+     * 阿里回调OSS返回参数到前端
+     */
+    @ApiOperation("回调")
+    @PostMapping("/callback")
+    public ResultBean callback(HttpServletRequest request) {
+        ResultBean ossCallbackResult = ossService.callback(request);
+        log.info("oss成功的回调:{}",ossCallbackResult);
+        return ossCallbackResult;
+    }
+
+}

+ 9 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityTaskUserAddBo.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.activity.bo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import javafx.beans.binding.LongExpression;
 import lombok.Data;
 import java.util.Date;
 
@@ -31,4 +32,12 @@ public class ActivityTaskUserAddBo {
 4视频学习 5模拟考试 */
     @ApiModelProperty("任务名称  0每日签到 1完善信息 2邀请好友 3每日分享 4视频学习 5模拟考试")
     private Integer taskType;
+
+    /** 用户id*/
+    @ApiModelProperty("用户id")
+    private Long UserId;
+
+    /** 任务ID*/
+    @ApiModelProperty("任务ID")
+    private Long taskId;
 }

+ 30 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityTaskUserServiceImpl.java

@@ -3,6 +3,12 @@ package com.zhongzheng.modules.activity.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.activity.service.IActivityGradeService;
+import com.zhongzheng.modules.activity.vo.ActivityGradeVo;
+import com.zhongzheng.modules.user.domain.User;
+import com.zhongzheng.modules.user.service.IUserService;
+import com.zhongzheng.modules.user.vo.UserVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -30,6 +36,13 @@ import java.util.stream.Collectors;
 @Service
 public class ActivityTaskUserServiceImpl extends ServiceImpl<ActivityTaskUserMapper, ActivityTaskUser> implements IActivityTaskUserService {
 
+    @Autowired
+    private IUserService userService;
+
+    @Autowired
+    private IActivityGradeService activityGradeService;
+
+
     @Override
     public ActivityTaskUserVo queryById(Long userId){
         ActivityTaskUser db = this.baseMapper.selectById(userId);
@@ -100,10 +113,26 @@ public class ActivityTaskUserServiceImpl extends ServiceImpl<ActivityTaskUserMap
 
     @Override
     public boolean userTask(ActivityTaskUserAddBo bo) {
+        //增加用户领取记录
         ActivityTaskUser add = BeanUtil.toBean(bo, ActivityTaskUser.class);
-        validEntityBeforeSave(add);
+        //判断是否领过过
+        validReceiver(bo);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
+        //增加用户积分,并判断是否达到对应等级,更新等级
+        UserVo userVo = userService.queryById(bo.getUserId());
+        ActivityGradeVo activityGradeVo = activityGradeService.queryById(bo.getTaskId());
+
+
         return this.save(add);
     }
+
+    private void validReceiver(ActivityTaskUserAddBo bo) {
+        switch (bo.getTaskType()){
+            //每日签到逻辑,当日有领取即无法签到
+            case 0:
+
+                break;
+        }
+    }
 }