zhangjinli 3 years ago
parent 91b78d0197
commit e51585aa54

@ -273,36 +273,6 @@ public class TaskController {
return Result.success(res);
}
@Data
static class CusNoteParam {
@NotNull(message = "顾客姓名不能为空")
@Schema(title = "顾客姓名")
private String customerName;
@NotNull(message = "联系方式不能为空")
private String tel;
@Schema(title = "地区")
@NotNull(message = "地区不能为空")
private String area;
@Schema(title = "车型id")
private Integer brandId;
@Schema(title = "备注")
private String remarks;
}
@Operation(summary = "用户线索搜集")
@PostMapping("/customerNote")
@tokenValid
public Result customerNote(@Validated @RequestBody CusNoteParam param, @RequestHeader("token") @Parameter(name = "登录token") String token) {
Integer useId = userService.selByOpenid( new JwtUtil().parseOpenid(token)).getId();
if (useId == null) {
return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "未找到该用户");
}
customerActionNoteService.save(
new CustomerActionNote().setCustomerName(param.getCustomerName()).setTel(param.getTel()).setArea(param.getArea())
.setBrandId(param.getBrandId()).setRemarks(param.getRemarks()).setProvideId(useId).setCreatAt(LocalDateTime.now()));
return Result.success("上传完成");
}
@Operation(summary = "线索搜集列表")
@PostMapping("/customerNoteList")
public Result customerNote(@Validated @RequestBody JSONObject obj, @RequestHeader(value = "token",required = false) @Parameter(name = "登录token") String token) {

@ -1,79 +0,0 @@
package com.zh.project0512.controller.manage;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zh.project0512.annotation.adminTokenValid;
import com.zh.project0512.annotation.tokenValid;
import com.zh.project0512.model.UserReference;
import com.zh.project0512.service.IUserReferenceService;
import com.zh.project0512.service.IUserService;
import com.zh.project0512.utils.JwtUtil;
import com.zh.project0512.utils.result.HttpStatusEnum;
import com.zh.project0512.utils.result.Result;
import io.jsonwebtoken.Claims;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
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.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
/**
* <p>
*
* </p>
*
* @author zh
* @since 2022-05-26
*/
@Tag(name = "用户素材")
@RestController
@RequestMapping("/userReference")
public class UserReferenceController {
@Autowired
private IUserReferenceService userReferenceService;
@Autowired
private IUserService userService;
@Data
static class AddURParam {
@Schema(title = "素材id")
@NotNull(message = "referenceId不能为空")
@Min(value = 1, message = "referenceId最小值为1")
private Integer referenceId;
}
@Operation(summary = "添加到素材收藏夹")
@tokenValid
@PostMapping("/add")
public Result add(@Validated @RequestBody AddURParam param, @RequestHeader("token") @Parameter(name = "登录token") String token) {
Claims claims = new JwtUtil().parseJWT(token);
Integer userId = userService.selByOpenid(claims.getId()).getId();
if(userId == null){
return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION,"用户不存在");
}
QueryWrapper<UserReference> queryWrapper = new QueryWrapper<>();
// queryWrapper.eq("id",param.getId()).eq();
// userReferenceService.listObjs(queryWrapper)
if (null != userReferenceService.getMap(new QueryWrapper<UserReference>().eq("userId", userId).eq("referenceId", param.getReferenceId()))) {
return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION,"数据已存在");
}
userReferenceService.save(new UserReference().setUserId(userId).setReferenceId(param.getReferenceId()));
return Result.success("添加完成");
}
@Operation(summary = "用户列表")
@adminTokenValid
@PostMapping("/list")
public Result list(@RequestBody(required = false) JSONObject obj, @RequestHeader("admin-token") @Parameter(name = "登录token") String token) {
Claims claims = new JwtUtil().parseJWT(token);
return Result.success(userReferenceService.ListByOpenid(claims.getId()));
// return Result.success(userReferenceService.pageMaps(MybatisPlusUtil.SetPage(obj),new QueryWrapper<UserReference>().eq("userId",userId)));
}
}

@ -10,6 +10,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@ -32,7 +33,7 @@ public class RankController {
*/
@Operation(summary = "排行列表")
@PostMapping("/list")
public ResultPageInfo<RankListVo> rankList(@Validated RankListDTO rankListDTO){
public ResultPageInfo<RankListVo> rankList(@Validated @RequestBody RankListDTO rankListDTO){
return ResultPageInfo.success(rankService.rankList(rankListDTO),"请求成功");
}

@ -11,6 +11,7 @@ import com.zh.project0512.model.*;
import com.zh.project0512.model.validatedDemo.TaskValidGroup1;
import com.zh.project0512.model.validatedDemo.TaskValidGroup2;
import com.zh.project0512.service.*;
import com.zh.project0512.utils.CustomUtil;
import com.zh.project0512.utils.JwtUtil;
import com.zh.project0512.utils.MybatisPlusUtil;
import com.zh.project0512.utils.result.HttpStatusEnum;
@ -78,6 +79,7 @@ public class TaskUController {
@Schema(title = "任务名称关键词搜索")
private String keyword;
}
@Operation(summary = "列表")
@PostMapping("/list")
public Result list(@Validated @RequestBody ListTParam param, @RequestHeader(required = false, value = "token") @Parameter(name = "用户token", description = "关联用户信息") String token) {
@ -86,16 +88,16 @@ public class TaskUController {
qw.eq("t1.status", param.getStatus());
}
if (null != param.getMonth()) {
qw.between("t1.creatAt", LocalDateTime.now().minusMonths(param.getMonth()),LocalDateTime.now());
qw.between("t1.creatAt", LocalDateTime.now().minusMonths(param.getMonth()), LocalDateTime.now());
}
if (null != param.getKeyword()) {
qw.like("t1.title", param.getKeyword());
}
IPage iPage = taskService.idList(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()),param.getTagIdList(),param.getBrandIdList(), qw);
IPage iPage = taskService.idList(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()), param.getTagIdList(), param.getBrandIdList(), qw);
List list = iPage.getRecords();
if (list.size() > 0) {
System.out.println(list);
iPage.setRecords(taskService.list(new JwtUtil().parseOpenid(token),list,param.getTagIdList(),param.getBrandIdList(), qw));
iPage.setRecords(taskService.list(new JwtUtil().parseOpenid(token), list, param.getTagIdList(), param.getBrandIdList(), qw));
}
return Result.success(iPage);
}
@ -110,7 +112,7 @@ public class TaskUController {
@Operation(summary = "详情")
@PostMapping("detail")
public Result det( @RequestBody JSONObject obj,@RequestHeader(required = false, value = "token") @Parameter(name = "用户token", description = "关联用户信息") String token) {
public Result det(@RequestBody JSONObject obj, @RequestHeader(required = false, value = "token") @Parameter(name = "用户token", description = "关联用户信息") String token) {
Task task = taskService.detailById(new JwtUtil().parseOpenid(token), obj.getInteger("id"));
List rewardRulesList = rewardRuleService.listByTemplateId(task.getRewardRuleTemplateId());
JSONObject res = (JSONObject) JSONObject.toJSON(task);
@ -128,8 +130,8 @@ public class TaskUController {
@Schema(title = "地区")
@NotNull(message = "地区不能为空")
private String area;
@Schema(title = "车型id")
private Integer brandId;
@Schema(title = "车型列表")
private List<String> brandList;
@Schema(title = "备注")
private String remarks;
}
@ -138,14 +140,14 @@ public class TaskUController {
@PostMapping("/customerNote")
@tokenValid
public Result customerNote(@Validated @RequestBody CusNoteParam param, @RequestHeader("token") @Parameter(name = "登录token") String token) {
Claims claims = new JwtUtil().parseJWT(token);
Integer useId = userService.selByOpenid(claims.getId()).getId();
Integer useId = userService.selByOpenid(new JwtUtil().parseOpenid(token)).getId();
if (useId == null) {
return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "未找到该用户");
}
List<String> brandList = param.getBrandList();
customerActionNoteService.save(
new CustomerActionNote().setCustomerName(param.getCustomerName()).setTel(param.getTel()).setArea(param.getArea())
.setBrandId(param.getBrandId()).setRemarks(param.getRemarks()).setProvideId(useId).setCreatAt(LocalDateTime.now()));
.setBrandList(brandList).setRemarks(param.getRemarks()).setProvideId(useId).setCreatAt(LocalDateTime.now()));
return Result.success("上传完成");
}

@ -3,11 +3,13 @@ package com.zh.project0512.controller.wxApp;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zh.project0512.annotation.tokenValid;
import com.zh.project0512.model.UserReference;
import com.zh.project0512.service.IUserReferenceService;
import com.zh.project0512.service.IUserService;
import com.zh.project0512.utils.JwtUtil;
import com.zh.project0512.utils.MybatisPlusUtil;
import com.zh.project0512.utils.result.HttpStatusEnum;
import com.zh.project0512.utils.result.Result;
import io.jsonwebtoken.Claims;
@ -22,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
* <p>
@ -71,8 +74,12 @@ public class UserReferenceUController {
@tokenValid
@PostMapping("/list")
public Result list(@RequestBody(required = false) JSONObject obj, @RequestHeader("token") @Parameter(name = "登录token") String token) {
Claims claims = new JwtUtil().parseJWT(token);
return Result.success(userReferenceService.ListByOpenid(claims.getId()));
// return Result.success(userReferenceService.pageMaps(MybatisPlusUtil.SetPage(obj),new QueryWrapper<UserReference>().eq("userId",userId)));
String openid = new JwtUtil().parseOpenid(token);
IPage iPage = userReferenceService.dateList(MybatisPlusUtil.SetPage(obj),openid);
List list = iPage.getRecords();
if (list.size() > 0) {
iPage.setRecords(userReferenceService.list(new JwtUtil().parseOpenid(token),list));
}
return Result.success(iPage);
}
}

@ -17,9 +17,8 @@ import java.util.Map;
*/
public interface CustomerActionNoteMapper extends BaseMapper<CustomerActionNote> {
@Select("<script> " +
"select t1.*,t2.name as provideName,t3.name as brandName\n" +
" from customerActionNote as t1 left JOIN brand AS t3 on t1.brandId = t3.id,\n" +
"user as t2 WHERE t1.provideId = t2.id"+
"select t1.*,t2.name as provideName\n" +
" from customerActionNote as t1,user as t2 WHERE t1.provideId = t2.id"+
"<if test='openid!=null'>and t2.openid =#{openid} </if>"+
"</script>")
IPage<Map> pageList(IPage page,String openid);

@ -1,7 +1,11 @@
package com.zh.project0512.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zh.project0512.model.Reference;
import com.zh.project0512.model.UserReference;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@ -16,6 +20,15 @@ import java.util.Map;
* @since 2022-05-26
*/
public interface UserReferenceMapper extends BaseMapper<UserReference> {
@Select("select t3.* from user as t1,userReference as t2,reference as t3 where t1.openid = #{id} and t1.id = t2.userId and t2.referenceId =t3.id" )
List<Map> ListByOpenid(String openid);
@Select("<script>" +
"SELECT date_format(t1.creatAt, '%Y-%m-%d') dat " +
"from reference t1 " +
"left join userReference as t2 on t1.id = t2.referenceId left JOIN user as t3 on t3.id = t2.userId "+
"where t3.openid = #{openid} "+
" group by dat " +
"ORDER BY dat DESC" +
"</script>")
IPage<String> dateList(IPage iPage,String openid);
List<Map> list(String openid,List<String> list);
}

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.util.List;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@ -46,9 +48,9 @@ public class CustomerActionNote extends Model {
@Schema(title = "地区")
private String area;
@Schema(title = "品牌id")
@TableField("brandId")
private Integer brandId;
@Schema(title = "关联品牌列表")
@TableField("brandList")
private List<String> brandList;
/**
*

@ -1,5 +1,6 @@
package com.zh.project0512.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zh.project0512.model.UserReference;
import com.baomidou.mybatisplus.extension.service.IService;
@ -15,5 +16,6 @@ import java.util.Map;
* @since 2022-05-26
*/
public interface IUserReferenceService extends IService<UserReference> {
List<Map> ListByOpenid(String openid);
IPage<String> dateList(IPage iPage, String openid);
List<Map> list(String openid,List<String> list);
}

@ -28,11 +28,12 @@ public class RankServiceImpl implements IRankService {
ArrayList<RankListVo> rankListVoList = new ArrayList<>();
Calendar cal = Calendar.getInstance();
cal.setTime(new Date());
cal.add(Calendar.DAY_OF_MONTH,-1);
cal.add(Calendar.MONTH,-1);
cal.set(Calendar.DAY_OF_MONTH,1);
cal.set(Calendar.HOUR_OF_DAY, 0);
cal.set(Calendar.MINUTE, 0);
cal.set(Calendar.SECOND, 0);
cal.set(Calendar.MILLISECOND,0);
Date time = cal.getTime();
QueryWrapper<Rank> queryWrapper = new QueryWrapper<>();

@ -1,5 +1,6 @@
package com.zh.project0512.serviceImpl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zh.project0512.model.UserReference;
import com.zh.project0512.mapper.UserReferenceMapper;
import com.zh.project0512.service.IUserReferenceService;
@ -23,7 +24,10 @@ public class UserReferenceServiceImpl extends ServiceImpl<UserReferenceMapper, U
@Autowired
private UserReferenceMapper userReferenceMapper;
public List<Map> ListByOpenid(String opneid) {
return userReferenceMapper.ListByOpenid(opneid);
public IPage<String> dateList(IPage iPage, String openid){
return userReferenceMapper.dateList(iPage,openid);
}
public List<Map> list(String openid,List<String> list){
return userReferenceMapper.list(openid,list);
}
}

@ -0,0 +1,26 @@
package com.zh.project0512.utils;
import java.util.List;
public class CustomUtil {
public String listToString(List list) {
String sb = "";
if (null == list && list.size() <= 0) {
System.out.println("list内容为空");
} else {
for (int i = 0; i <= list.size() - 1; i++) {
if (i == 0) {
sb += ("[");
}
sb += ("'"+ list.get(i).toString() + "'");
if (i != list.size() - 1) {
sb += (",");
}
if (i == list.size() - 1) {
sb += ("]");
}
}
}
return sb;
}
}

@ -1,22 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zh.project0512.mapper.UserReferenceMapper">
<resultMap id="UserReferenceListMap" type="com.zh.project0512.model.UserReference">
<id property="id" column="id"/>
<collection property="tagList" ofType="java.util.Map" autoMapping="false">
<id column="tagId" property="id"/>
<result column="tagTitle" property="title"/>
</collection>
<collection property="brandList" ofType="java.util.Map" autoMapping="false">
<id column="brandId" property="id"/>
<result column="brandName" property="name"/>
</collection>
<collection property="referenceList" ofType="java.util.Map" autoMapping="false">
<id column="referenceId" property="id"/>
<result column="referenceTitle" property="title"/>
<result column="referenceType" property="type"/>
<result column="referenceFileUrl" property="fileUrl"/>
<result column="referenceCoverUrl" property="coverUrl"/>
<resultMap id="UserReferenceListMap" type="java.util.Map" autoMapping="false">
<id property="dat" column="dat"/>
<collection property="referenceList" ofType="java.util.Map" javaType="java.util.List" autoMapping="false">
<id column="id" property="id"/>
<result column="title" property="title"/>
<result column="type" property="type"/>
<result column="fileUrl" property="fileUrl"/>
<result column="coverUrl" property="coverUrl"/>
<result column="groupId" property="groupId"/>
<result column="creatAt" property="creatAt"/>
<result column="updateAt" property="updateAt"/>
</collection>
</resultMap>
<select id="list" resultMap="UserReferenceListMap">
@ -24,15 +19,9 @@
from reference as t1
left join userReference as t2 on t1.id = t2.referenceId
left JOIN user as t3 on t3.id = t2.userId
where t3.openid = #{id}
where t3.openid = #{openid}
and date_format(t1.creatAt, '%Y-%m-%d') in
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">#{item}</foreach>
<if test='ew != null'>
<if test='ew.nonEmptyOfWhere'>
AND
</if>
${ew.SqlSegment}
</if>
ORDER BY updateAt DESC,creatAt DESC
</select>
</mapper>

Loading…
Cancel
Save