zhangjinli 3 years ago
parent 2c65ec1b6c
commit 5a8fd2f708

@ -6,12 +6,11 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zh.project0512.annotation.AdminCheckAuthorityAnnotation;
import com.zh.project0512.annotation.AdminTokenValid;
import com.zh.project0512.model.User;
import com.zh.project0512.model.AppMessage;
import com.zh.project0512.model.UserAccount;
import com.zh.project0512.service.IUserAccountService;
import com.zh.project0512.service.IUserService;
import com.zh.project0512.utils.AppMessageUtil;
import com.zh.project0512.utils.CustomUtil;
import com.zh.project0512.utils.ExcelUtil;
import com.zh.project0512.utils.MybatisPlusUtil;
import com.zh.project0512.utils.result.HttpStatusEnum;
@ -107,7 +106,7 @@ public class UserAccountController {
//平台1抖音2快手3朋友圈4视频号
Integer platform = (Integer) m.get("platform");
if (platform != null) {
m.replace("platform",platform ==1?"抖音":(platform ==2?"快手":(platform ==3?"朋友圈":platform ==4?"朋友圈":null)) );
m.replace("platform", platform == 1 ? "抖音" : (platform == 2 ? "快手" : (platform == 3 ? "朋友圈" : platform == 4 ? "朋友圈" : null)));
}
}
Workbook wb = ExcelUtil.writeToExcelByList(array, iPage.getRecords());
@ -152,10 +151,20 @@ public class UserAccountController {
return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "账号状态不在审核中");
}
UpdateWrapper<UserAccount> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("id", param.getId()).set("status", param.getStatus()).set("updateAt", LocalDateTime.now());
updateWrapper.set("reason", param.getStatus() == 2 ? param.getReason() : "");
Integer status = param.getStatus();
updateWrapper.eq("id", param.getId()).set("status",status).set("updateAt", LocalDateTime.now());
String description = "恭喜您,抖音关联账号审核通过。";
if(status == 2){
String reason = param.getReason();
if(null == reason){
return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "请说明拒绝理由");
}
updateWrapper.set("reason", reason);
description = "您的抖音关联账号审核未通过,未通过原因:"+ reason+"。";
}
userAccountService.update(updateWrapper);
// AppMessageUtil.sendMessage();
AppMessageUtil.sendMessage(new AppMessage().setTitle("关联账号审核结果").setDescription(description)
.setUrl("pages/user/subpage/relation/relation").setCreateDate(LocalDateTime.now()).setReceiverId(ua.getUserId()));
return Result.success("修改完成");
}
}

@ -6,11 +6,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.zh.project0512.annotation.AdminCheckAuthorityAnnotation;
import com.zh.project0512.annotation.AdminTokenValid;
import com.zh.project0512.model.AppMessage;
import com.zh.project0512.model.Video;
import com.zh.project0512.model.VideoEffectSetting;
import com.zh.project0512.service.IUserService;
import com.zh.project0512.service.IVideoEffectSettingService;
import com.zh.project0512.service.IVideoService;
import com.zh.project0512.utils.AppMessageUtil;
import com.zh.project0512.utils.MybatisPlusUtil;
import com.zh.project0512.utils.result.HttpStatusEnum;
import com.zh.project0512.utils.result.Result;
@ -19,6 +21,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -118,10 +121,12 @@ public class VideoController {
}
@Operation(summary = "视频审核")
@PostMapping("/valid")
@Transactional
@AdminTokenValid
@AdminCheckAuthorityAnnotation(jurisdictionId = "13")
public Result valid(@Validated @RequestBody VVParam param) {
int id = param.getId();
Video video = videoService.getById(id);
if (param.getStatus() == 3) {
String reason = param.getReason();
if (reason == null) {
@ -129,7 +134,12 @@ public class VideoController {
}
UpdateWrapper<Video> set = new UpdateWrapper<>();
set.eq("id", id).set("status", 3).set("reason", param.getReason()).set("updateAt", LocalDateTime.now());
videoService.update(set);
boolean op = videoService.update(set);
if(!op){
return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "无效操作");
}
AppMessageUtil.sendMessage(new AppMessage().setTitle("传播效果审核结果").setDescription("您的抖音传播效果审核未通过,未通过原因:"+ param.getReason()+"。")
.setUrl("pages/quest/subpage/detail/detail?id="+video.getTaskId()).setReceiverId(video.getUserId()));
return Result.success( "","审核拒绝完成");
}
UpdateWrapper<Video> up = new UpdateWrapper<>();
@ -148,6 +158,25 @@ public class VideoController {
up.set("effectResult", effectResult);
up.set("updateAt", LocalDateTime.now());
videoService.update(up);
String platForm = "未知平台";
System.out.println("video"+video);
switch (video.getType()){
case 1:
platForm = "抖音";
break;
case 2:
platForm = "快手";
break;
case 3:
platForm = "朋友圈";
break;
case 4:
platForm = "视频号";
break;
default:
}
AppMessageUtil.sendMessage(new AppMessage().setTitle("传播效果审核结果").setDescription("恭喜您,"+platForm+"传播效果审核通过,平台评定传播值为"+effectResult+"。")
.setUrl("pages/quest/subpage/detail/detail?id="+video.getTaskId()).setReceiverId(video.getUserId()));
return Result.success( "","审核完成");
}

@ -1,18 +1,19 @@
package com.zh.project0512.controller.wxApp;
import com.zh.project0512.model.dto.AppMessageListDTO;
import com.zh.project0512.model.vo.AppMessageListVo;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zh.project0512.model.AppMessage;
import com.zh.project0512.model.User;
import com.zh.project0512.service.IAppMessageService;
import com.zh.project0512.service.IUserService;
import com.zh.project0512.utils.JwtUtil;
import com.zh.project0512.utils.result.ResultPageInfo;
import com.zh.project0512.utils.MybatisPlusUtil;
import com.zh.project0512.utils.result.Result;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
/**
* <p>
@ -26,19 +27,18 @@ import javax.annotation.Resource;
@RequestMapping("/wxApp/userMessage")
@Tag(name = "用户消息")
public class AppMessageController {
@Resource
IAppMessageService appMessageService;
/**
* app
* @param appMessageListDTO app list DTO
* @return app
*/
@GetMapping("/list")
public ResultPageInfo<AppMessageListVo> list(AppMessageListDTO appMessageListDTO,@RequestHeader(value = "token") @Parameter(name = "登录token") String token){
@Autowired
private IAppMessageService appMessageService;
@Autowired
private IUserService userService;
@PostMapping("/list")
public Result list( @RequestBody JSONObject obj, @RequestHeader(value = "token") @Parameter(name = "登录token") String token){
String openid = new JwtUtil().parseOpenid(token);
return ResultPageInfo.success(appMessageService.list(appMessageListDTO,openid),"请求成功");
User user = userService.selByOpenid(openid);
QueryWrapper<AppMessage> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("receiverId",user.getId());
queryWrapper.orderByDesc("createDate");
return Result.success( appMessageService.page(MybatisPlusUtil.SetPage(obj),queryWrapper),"请求成功");
}
}

@ -1,70 +1,73 @@
package com.zh.project0512.model;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.AllArgsConstructor;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* app
* <p>
*
* </p>
*
* @author zh
* @since 2022-06-29
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("appMessage")
public class AppMessage implements Serializable {
public class AppMessage extends Model {
private static final long serialVersionUID = 1L;
/**
* id
*/
@TableId(value = "id", type = IdType.AUTO)
@TableField("id")
private Integer id;
/**
*
*/
@TableField("type")
private Integer type;
/**
*
*/
@TableField("title")
private String title;
/**
*
*/
@TableField("describe")
private String describe;
private String description;
/**
* url
*/
@TableField("url")
private String url;
/**
* openid
*/
@TableField("sendId")
private String sendOpenId;
/**
* openid
* id
*/
@TableField("receiverId")
private String receiverOpenId;
private Integer receiverId;
/**
*
*/
@TableField("createDate")
private Date createDate;
private LocalDateTime createDate;
/**
* 1.0.
*/
@TableField("reads")
private Integer reads;
private Integer settled;
}

@ -1,30 +0,0 @@
package com.zh.project0512.model.dto;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* app list DTO
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
public class AppMessageListDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*/
private int pageNum;
/**
*
*/
private int pageSize;
/**
*
*/
private Integer type;
}

@ -1,38 +0,0 @@
package com.zh.project0512.model.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* app list Vo
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
public class AppMessageListVo implements Serializable {
private static final long serialVersionUID = 1L;
/**
* id
*/
private Integer id;
/**
*
*/
private Integer type;
/**
*
*/
private String title;
/**
*
*/
private String describe;
/**
* url
*/
private String url;
}

@ -1,15 +1,16 @@
package com.zh.project0512.service;
import com.zh.project0512.model.dto.AppMessageListDTO;
import com.zh.project0512.model.vo.AppMessageListVo;
import com.zh.project0512.utils.page.PageInfo;
import com.zh.project0512.model.AppMessage;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
*
* </p>
*
* @author zh
* @since 2022-06-29
*/
public interface IAppMessageService extends IService<AppMessage> {
public interface IAppMessageService {
/**
* app
* @param appMessageListDTO app list DTO
* @param openid openid
* @return app list Vo
*/
PageInfo<AppMessageListVo> list(AppMessageListDTO appMessageListDTO, String openid);
}

@ -1,47 +1,20 @@
package com.zh.project0512.serviceImpl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zh.project0512.mapper.AppMessageMapper;
import com.zh.project0512.model.AdminRole;
import com.zh.project0512.model.AppMessage;
import com.zh.project0512.model.dto.AppMessageListDTO;
import com.zh.project0512.model.vo.AdminRoleListVo;
import com.zh.project0512.model.vo.AppMessageListVo;
import com.zh.project0512.mapper.AppMessageMapper;
import com.zh.project0512.service.IAppMessageService;
import com.zh.project0512.utils.PropertyUtils;
import com.zh.project0512.utils.page.PageInfo;
import org.apache.commons.lang3.StringUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
* <p>
*
* </p>
*
* @author zh
* @since 2022-06-29
*/
@Service
public class AppMessageServiceImpl implements IAppMessageService {
@Resource
AppMessageMapper appMessageMapper;
@Override
public PageInfo<AppMessageListVo> list(AppMessageListDTO appMessageListDTO, String openid) {
ArrayList<AppMessageListVo> appMessageListVos = new ArrayList<>();
QueryWrapper<AppMessage> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(appMessageListDTO.getType() != null,"type", appMessageListDTO.getType()).eq("receiver_open_id",openid);
Page<AppMessage> page = new Page<>(appMessageListDTO.getPageNum(), appMessageListDTO.getPageSize());
IPage<AppMessage> appMessageIPage = appMessageMapper.selectPage(page, queryWrapper);
List<AppMessage> records = appMessageIPage.getRecords();
if (records != null && records.size()>0){
for (AppMessage record : records) {
AppMessageListVo appMessageListVo = new AppMessageListVo();
PropertyUtils.copyProperties(record, appMessageListVo);
appMessageListVos.add(appMessageListVo);
}
}
public class AppMessageServiceImpl extends ServiceImpl<AppMessageMapper, AppMessage> implements IAppMessageService {
return new PageInfo<>(appMessageIPage.getPages(), appMessageListVos, appMessageIPage.getTotal());
}
}

@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.util.Date;
import java.time.LocalDateTime;
/**
* app
@ -26,21 +26,18 @@ public class AppMessageUtil {
appMessageUtil=this;
}
public static Boolean sendMessage(Integer type,String title,String describe,String url,String sendOpenId,String receiverOpenId){
public static Boolean sendMessage(Integer type,String title,String description,String url,Integer receiverId){
AppMessage appMessage = new AppMessage();
appMessage.setType(type);
appMessage.setTitle(title);
appMessage.setDescribe(describe);
appMessage.setDescription(description);
appMessage.setUrl(url);
appMessage.setSendOpenId(sendOpenId);
appMessage.setReceiverOpenId(receiverOpenId);
appMessage.setReceiverId(receiverId);
return sendMessage(appMessage);
}
public static Boolean sendMessage(AppMessage appMessage){
appMessage.setId(null);
appMessage.setCreateDate(new Date());
appMessage.setReads(0);
appMessage.setCreateDate(LocalDateTime.now());
int insert = appMessageUtil.appMessageMapper.insert(appMessage);
return insert > 0;
}

Loading…
Cancel
Save