积分任务

cloud-point-api/src/main/java/com/yizhi/point/application/feign/PointActivityFeignClients.java

@@ -39,6 +39,9 @@ public interface PointActivityFeignClients {
     @GetMapping("/manage/activity/list")
     @GetMapping("/manage/activity/list")
     Page<PointActivityVo> activityList(@RequestParam Map<String, Object> map);
     Page<PointActivityVo> activityList(@RequestParam Map<String, Object> map);
 
 
+    @GetMapping("/manage/activity/byCode")
+    PointActivityVo getActivity(@RequestParam("code") String code);
+
     @GetMapping("/manage/activity/getPointRecords")
     @GetMapping("/manage/activity/getPointRecords")
     List<MqPointParamVo> getPointRecords(@RequestParam("eventName") String eventName,
     List<MqPointParamVo> getPointRecords(@RequestParam("eventName") String eventName,
                                          @RequestParam("activityId") Long activityId,
                                          @RequestParam("activityId") Long activityId,

cloud-point-api/src/main/java/com/yizhi/point/application/feign/PointListenerClients.java

 package com.yizhi.point.application.feign;
 package com.yizhi.point.application.feign;
 
 
+import com.yizhi.point.application.vo.domain.MqPointParamVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
 
 
 /**
 /**
@@ -14,4 +17,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 public interface PointListenerClients {
 public interface PointListenerClients {
     @GetMapping("/manage/point/hadPointList")
     @GetMapping("/manage/point/hadPointList")
     void hadPointList();
     void hadPointList();
+
+    @GetMapping("saveHandPoint")
+    boolean saveHandPoint(@RequestParam("sitePointId") String sitePointId);
 }
 }

cloud-point-api/src/main/java/com/yizhi/point/application/vo/domain/PointActivityVo.java

@@ -32,6 +32,10 @@ public class PointActivityVo extends Model<PointActivityVo> {
     @TableField("activity_name")
     @TableField("activity_name")
     private String activityName;
     private String activityName;
 
 
+    @ApiModelProperty(value = "事件类型/学习活动类型, 枚举 统一传入 ActivityTypeEnum.类型")
+    @TableField("activity_type")
+    private String activityType;
+
 	@ApiModelProperty(value = "默认为1，不翻倍")
 	@ApiModelProperty(value = "默认为1，不翻倍")
     private Integer multiple;
     private Integer multiple;
 
 
@@ -43,6 +47,10 @@ public class PointActivityVo extends Model<PointActivityVo> {
     @TableField("end_time")
     @TableField("end_time")
     private Date endTime;
     private Date endTime;
 
 
+    @ApiModelProperty(value = "活动编号")
+    @TableField("code")
+	private String code;
+
 	@ApiModelProperty(value = "0删除 1草稿  2启用  3未启用")
 	@ApiModelProperty(value = "0删除 1草稿  2启用  3未启用")
     private Integer state;
     private Integer state;
 
 

cloud-point/src/main/java/com/yizhi/application/controller/PointActivityController.java

@@ -102,6 +102,20 @@ public class PointActivityController {
         return pointActivityService.pointDown(pointActivity1.getId(), pointActivity1.getUpdateById(), pointActivity1.getUpdateByName());
         return pointActivityService.pointDown(pointActivity1.getId(), pointActivity1.getUpdateById(), pointActivity1.getUpdateByName());
     }
     }
 
 
+    @GetMapping("/byCode")
+    public PointActivityVo getActivity(@RequestParam("code") String code){
+        PointActivity pointActivity = new PointActivity();
+        pointActivity.setCode(code);
+        EntityWrapper<PointActivity> entityWrapper = new EntityWrapper<PointActivity>();
+        PointActivityVo activityVo = new PointActivityVo();
+        PointActivity activity = pointActivityService.selectOne(entityWrapper);
+        if(activity==null){
+            return activityVo;
+        }
+        BeanUtils.copyProperties(activity,activityVo);
+        return activityVo;
+    }
+
     @GetMapping("/list")
     @GetMapping("/list")
     public Page<PointActivityVo> activityList(@RequestParam Map<String, Object> map) {
     public Page<PointActivityVo> activityList(@RequestParam Map<String, Object> map) {
         Page<PointActivity> list = null;
         Page<PointActivity> list = null;

cloud-point/src/main/java/com/yizhi/application/controller/PointListenerController.java

@@ -18,9 +18,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 import java.util.*;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
@@ -65,6 +63,16 @@ public class PointListenerController {
 		}
 		}
 	}
 	}
 
 
+	@GetMapping("saveHandPoint")
+	public boolean saveHandPoint(@RequestParam("sitePointId") String sitePointId){
+		MqPointParam mqPointParam = mqPointParamService.selectById(sitePointId);
+		if(mqPointParam!=null){
+			return handPoint(mqPointParam);
+		}
+		return false;
+	}
+
+	// 处理积分
 	public boolean handPoint(MqPointParam vo) {
 	public boolean handPoint(MqPointParam vo) {
 			if (vo == null) {
 			if (vo == null) {
 				LOGGER.info("消息ID{}获取不到缓存信息");
 				LOGGER.info("消息ID{}获取不到缓存信息");
@@ -155,6 +163,10 @@ public class PointListenerController {
 				if (selectByMap.size() == 0 || selectByMap == null) {
 				if (selectByMap.size() == 0 || selectByMap == null) {
 					addHandPoint(pointId, vo);
 					addHandPoint(pointId, vo);
 				}
 				}
+			}else{
+				if (selectByMap.size() == 0 || selectByMap == null) {
+					addHandPoint(pointId, vo);
+				}
 			}
 			}
 			try {
 			try {
 				vo.setState(0);
 				vo.setState(0);

cloud-point/src/main/java/com/yizhi/application/domain/PointActivity.java

@@ -43,6 +43,14 @@ public class PointActivity extends Model<PointActivity> {
     @TableField("end_time")
     @TableField("end_time")
     private Date endTime;
     private Date endTime;
 
 
+    @ApiModelProperty(value = "活动编号")
+    @TableField("code")
+    private String code;
+
+    @ApiModelProperty(value = "事件类型/学习活动类型, 枚举 统一传入 ActivityTypeEnum.类型")
+    @TableField("activity_type")
+    private String activityType;
+
 	@ApiModelProperty(value = "0删除 1草稿  2启用  3未启用")
 	@ApiModelProperty(value = "0删除 1草稿  2启用  3未启用")
     private Integer state;
     private Integer state;
 
 

cloud-point/src/main/java/com/yizhi/application/mapper/PointActivityMapper.java

@@ -19,7 +19,7 @@ import com.yizhi.application.domain.PointActivity;
  */
  */
 public interface PointActivityMapper extends BaseMapper<PointActivity> {
 public interface PointActivityMapper extends BaseMapper<PointActivity> {
 	List<PointActivity> activityList(@Param("page") Page<PointActivity> page, 
 	List<PointActivity> activityList(@Param("page") Page<PointActivity> page, 
-			@Param("companyId") Long companyId, @Param("siteId") Long siteId, @Param("activityName") String activityName);
+			@Param("companyId") Long companyId, @Param("siteId") Long siteId, @Param("activityName") String activityName, @Param("code") String code);
 
 
 	List<PointActivity> getPointActivity(@Param("createPointTime") Date createPointTime, @Param("companyId") Long companyId, @Param("siteId") Long siteId);
 	List<PointActivity> getPointActivity(@Param("createPointTime") Date createPointTime, @Param("companyId") Long companyId, @Param("siteId") Long siteId);
 }
 }

cloud-point/src/main/java/com/yizhi/application/service/impl/PointActivityServiceImpl.java

@@ -96,8 +96,9 @@ public class PointActivityServiceImpl extends ServiceImpl<PointActivityMapper, c
 	public Page<com.yizhi.application.domain.PointActivity> activityList(Page<com.yizhi.application.domain.PointActivity> page, Map<String, Object> map) {
 	public Page<com.yizhi.application.domain.PointActivity> activityList(Page<com.yizhi.application.domain.PointActivity> page, Map<String, Object> map) {
 		Long companyId = Long.valueOf((String)map.get("companyId"));
 		Long companyId = Long.valueOf((String)map.get("companyId"));
 		Long siteId = Long.valueOf((String)map.get("siteId")); 
 		Long siteId = Long.valueOf((String)map.get("siteId")); 
-		String activityName = (String) map.get("activityName"); 		
-		List<com.yizhi.application.domain.PointActivity> list = pointActivityMapper.activityList(page, companyId, siteId, activityName);
+		String activityName = (String) map.get("activityName");
+		String code = (String) map.get("code");
+		List<com.yizhi.application.domain.PointActivity> list = pointActivityMapper.activityList(page, companyId, siteId, activityName,code);
 		return page.setRecords(list);
 		return page.setRecords(list);
 	}
 	}
 
 

cloud-point/src/main/resources/mapper/PointActivityMapper.xml

@@ -21,13 +21,14 @@
 		<result column="enable_by_name" property="enableByName" />
 		<result column="enable_by_name" property="enableByName" />
 		<result column="company_id" property="companyId" />
 		<result column="company_id" property="companyId" />
 		<result column="org_id" property="orgId" />
 		<result column="org_id" property="orgId" />
+		<result column="code" property="code" />
 		<result column="site_id" property="siteId" />
 		<result column="site_id" property="siteId" />
 	</resultMap>
 	</resultMap>
 
 
 	<!-- 通用查询结果列 -->
 	<!-- 通用查询结果列 -->
 	<sql id="Base_Column_List">
 	<sql id="Base_Column_List">
 		pa.id, pa.activity_name, pa.multiple, pa.start_time, pa.end_time, pa.state, pa.create_time, 
 		pa.id, pa.activity_name, pa.multiple, pa.start_time, pa.end_time, pa.state, pa.create_time, 
-		pa.create_by_id, pa.create_by_name, pa.update_time, pa.update_by_id, pa.update_by_name,
+		pa.create_by_id, pa.create_by_name, pa.update_time, pa.update_by_id, pa.update_by_name,pa.code,
 		pa.enable_time, pa.enable_by_id, pa.enable_by_name, pa.company_id, pa.org_id, pa.site_id
 		pa.enable_time, pa.enable_by_id, pa.enable_by_name, pa.company_id, pa.org_id, pa.site_id
 	</sql>
 	</sql>
 	
 	
@@ -41,6 +42,9 @@
 		<if test="activityName!=null and activityName!=''">
 		<if test="activityName!=null and activityName!=''">
 		   AND activity_name like CONCAT('%', #{activityName}, '%')
 		   AND activity_name like CONCAT('%', #{activityName}, '%')
 		</if>
 		</if>
+		<if test="code!=null and code!=''">
+			AND code = #{code}
+		</if>
 		
 		
 	</select>
 	</select>