Merge remote-tracking branch 'origin/master'
commit
b5c693926e
@ -0,0 +1,4 @@
|
||||
package com.baiye.core.constant;
|
||||
|
||||
public interface AddGroup {
|
||||
}
|
||||
@ -0,0 +1,24 @@
|
||||
package com.baiye.core.constant;
|
||||
|
||||
/**
|
||||
* 抖音请求路径常量类
|
||||
* @author yqy
|
||||
* @date 2022/08/09
|
||||
*/
|
||||
public interface TiktokRequestConstants {
|
||||
|
||||
/**
|
||||
* 获取所有设备信息
|
||||
*/
|
||||
String DY_OBTAIN_INFO = "/api/device/batchQueryDevice";
|
||||
|
||||
/**
|
||||
* 账号密码登录
|
||||
*/
|
||||
String DY_ACCOUNT_LOGIN = "/api/device/passwordLogin";
|
||||
|
||||
/**
|
||||
* 手机号登录
|
||||
*/
|
||||
String DY_PHONE_LOGIN = "/api/device/smsCodeLogin";
|
||||
}
|
||||
@ -0,0 +1,25 @@
|
||||
package com.baiye.core.constant;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.ToString;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @author Enzo
|
||||
* @date : 2022/6/23
|
||||
*/
|
||||
@Data
|
||||
@ToString
|
||||
public class TiktokResponse<T extends Serializable> implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 6763956796736587193L;
|
||||
|
||||
private T data;
|
||||
|
||||
private String msg;
|
||||
|
||||
private Integer status;
|
||||
|
||||
private Boolean success;
|
||||
}
|
||||
@ -0,0 +1,4 @@
|
||||
package com.baiye.core.constant;
|
||||
|
||||
public interface UpdateGroup {
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
package com.baiye;
|
||||
|
||||
import org.mybatis.spring.annotation.MapperScan;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
|
||||
import org.springframework.scheduling.annotation.EnableAsync;
|
||||
|
||||
@SpringBootApplication
|
||||
@EnableDiscoveryClient
|
||||
@MapperScan("com.baiye.dao")
|
||||
@EnableAsync
|
||||
public class TiktokMemberApiApplication {
|
||||
public static void main(String[] args) {
|
||||
SpringApplication.run(TiktokMemberApiApplication.class,args);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
package com.baiye.controller;
|
||||
|
||||
import com.baiye.core.base.api.Result;
|
||||
import com.baiye.dto.LoginDto;
|
||||
import com.baiye.service.TiktokUserService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
@RequestMapping("/tiktok/account")
|
||||
public class TiktokAccountController {
|
||||
|
||||
private final TiktokUserService tiktokUserService;
|
||||
|
||||
@PostMapping("/phoneLogin")
|
||||
public Result<Object> phoneNumberLogin(@Validated @RequestBody LoginDto loginDto){
|
||||
return tiktokUserService.phoneNumberLogin(loginDto);
|
||||
}
|
||||
|
||||
@PostMapping("/accountLogin")
|
||||
public Result<Object> accountLogin(@Validated @RequestBody LoginDto loginDto){
|
||||
return tiktokUserService.accountLogin(loginDto);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
package com.baiye.controller;
|
||||
|
||||
import com.baiye.core.base.api.Result;
|
||||
import com.baiye.core.constant.UpdateGroup;
|
||||
import com.baiye.entity.TiktokEquipmentEntity9999;
|
||||
import com.baiye.service.TiktokEquipmentService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
@RequestMapping("/tiktok/equipment")
|
||||
public class TiktokEquipmentController {
|
||||
|
||||
private final TiktokEquipmentService tiktokEquipmentService;
|
||||
|
||||
/**
|
||||
* 分页查询
|
||||
*/
|
||||
@PostMapping("/pageList/{current}/{limit}")
|
||||
public Result<Object> getAccountList(@PathVariable int current, @PathVariable int limit, @RequestBody TiktokEquipmentEntity9999 tiktokAccountEntity){
|
||||
return Result.data(tiktokEquipmentService.getEquipmentList(current, limit, tiktokAccountEntity));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*/
|
||||
@PostMapping("/update")
|
||||
public Result<?> update(@Validated({UpdateGroup.class}) @RequestBody TiktokEquipmentEntity9999 tiktokAccountEntity){
|
||||
QueryWrapper<TiktokEquipmentEntity9999> wrapper = new QueryWrapper<>();
|
||||
wrapper.eq("dy_user_id", tiktokAccountEntity.getDyUserId());
|
||||
tiktokEquipmentService.update(tiktokAccountEntity, wrapper);
|
||||
return Result.success();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package com.baiye.controller;
|
||||
|
||||
import com.baiye.core.base.api.Result;
|
||||
import com.baiye.core.constant.AddGroup;
|
||||
import com.baiye.core.constant.UpdateGroup;
|
||||
import com.baiye.core.page.PageResult;
|
||||
import com.baiye.dto.OrganizeDto;
|
||||
import com.baiye.entity.OrganizeEntity;
|
||||
import com.baiye.service.OrganizeService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
@RequestMapping("/tiktok/organize")
|
||||
public class TiktokOrganizeController {
|
||||
|
||||
private final OrganizeService organizeService;
|
||||
|
||||
/**
|
||||
* 新增
|
||||
* @param organizeEntity
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/save")
|
||||
public Result<?> add(@Validated({AddGroup.class}) @RequestBody OrganizeEntity organizeEntity){
|
||||
organizeService.save(organizeEntity);
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public Result<List<OrganizeEntity>> list(){
|
||||
return Result.data(organizeService.list(new QueryWrapper<>()));
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询
|
||||
*/
|
||||
@PostMapping("/pageList/{current}/{limit}")
|
||||
public Result<PageResult> pageList(@PathVariable long current, @PathVariable long limit, @RequestBody OrganizeDto organizeDto){
|
||||
return Result.data(organizeService.pageList(current, limit, organizeDto));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*/
|
||||
@GetMapping("/del/{id}")
|
||||
public Result<?> del(@PathVariable Long id){
|
||||
organizeService.del(id);
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*/
|
||||
@PostMapping("/update")
|
||||
public Result<?> update(@Validated({UpdateGroup.class}) @RequestBody OrganizeEntity organizeEntity){
|
||||
organizeService.updateById(organizeEntity);
|
||||
return Result.success();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,64 @@
|
||||
|
||||
#配置数据源
|
||||
spring:
|
||||
cloud:
|
||||
nacos:
|
||||
discovery:
|
||||
server-addr: 8.130.96.163:8848
|
||||
redis:
|
||||
database: 4
|
||||
host: 8.130.96.163
|
||||
timeout: 5000
|
||||
datasource:
|
||||
druid:
|
||||
db-type: com.alibaba.druid.pool.DruidDataSource
|
||||
driver-class-name: com.mysql.jdbc.Driver
|
||||
url: jdbc:mysql://8.130.96.163:3306/db_tiktok?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
|
||||
username: root
|
||||
password: y7z7noq2
|
||||
# 初始连接数
|
||||
initial-size: 5
|
||||
# 最小连接数
|
||||
min-idle: 15
|
||||
# 最大连接数
|
||||
max-active: 30
|
||||
# 超时时间(以秒数为单位)
|
||||
remove-abandoned-timeout: 180
|
||||
# 获取连接超时时间
|
||||
max-wait: 3000
|
||||
# 连接有效性检测时间
|
||||
time-between-eviction-runs-millis: 60000
|
||||
# 连接在池中最小生存的时间
|
||||
min-evictable-idle-time-millis: 300000
|
||||
# 连接在池中最大生存的时间
|
||||
max-evictable-idle-time-millis: 900000
|
||||
# 指明连接是否被空闲连接回收器(如果有)进行检验.如果检测失败,则连接将被从池中去除
|
||||
test-while-idle: true
|
||||
# 指明是否在从池中取出连接前进行检验,如果检验失败, 则从池中去除连接并尝试取出另一个
|
||||
test-on-borrow: true
|
||||
# 是否在归还到池中前进行检验
|
||||
test-on-return: false
|
||||
# 检测连接是否有效
|
||||
validation-query: select 1
|
||||
# 配置监控统计
|
||||
webStatFilter:
|
||||
enabled: true
|
||||
stat-view-servlet:
|
||||
enabled: true
|
||||
url-pattern: /druid/*
|
||||
reset-enable: false
|
||||
filter:
|
||||
stat:
|
||||
enabled: true
|
||||
# 记录慢SQL
|
||||
log-slow-sql: true
|
||||
slow-sql-millis: 1000
|
||||
merge-sql: false
|
||||
wall:
|
||||
config:
|
||||
multi-statement-allow: true
|
||||
|
||||
#是否开启 swagger-ui
|
||||
swagger:
|
||||
enabled: true
|
||||
|
||||
@ -0,0 +1,43 @@
|
||||
server:
|
||||
port: 7325
|
||||
|
||||
spring:
|
||||
main:
|
||||
allow-bean-definition-overriding: true
|
||||
application:
|
||||
name: @artifactId@
|
||||
freemarker:
|
||||
check-template-location: false
|
||||
profiles:
|
||||
active: dev
|
||||
jackson:
|
||||
time-zone: GMT+8
|
||||
data:
|
||||
redis:
|
||||
repositories:
|
||||
enabled: false
|
||||
servlet:
|
||||
multipart:
|
||||
max-request-size: 200MB
|
||||
max-file-size: 200MB
|
||||
mybatis-plus:
|
||||
mapper-locations: classpath:mapper/*Mapper.xml
|
||||
# configuration:
|
||||
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #控制台打印sql语句
|
||||
|
||||
snowflake:
|
||||
workerId: 9
|
||||
datacenterId: 9
|
||||
|
||||
# 线程池配置
|
||||
save:
|
||||
task:
|
||||
thread_pool:
|
||||
corePoolSize: 2
|
||||
maxPoolSize: 16
|
||||
queueCapacity: 3
|
||||
ThreadNamePrefix: poolExecutor-
|
||||
|
||||
tiktok:
|
||||
gatewayHost: http://dy-api-test.xhuatea.com
|
||||
sessionKey: 220422
|
||||
@ -0,0 +1,53 @@
|
||||
package com.baiye.config.thread;
|
||||
|
||||
import cn.hutool.core.thread.NamedThreadFactory;
|
||||
import org.apache.tomcat.util.threads.ThreadPoolExecutor;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.scheduling.annotation.EnableAsync;
|
||||
|
||||
import java.util.concurrent.Executor;
|
||||
import java.util.concurrent.LinkedBlockingDeque;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
/**
|
||||
* 线程池配置总类,用于配置线程池
|
||||
*/
|
||||
@Configuration
|
||||
@EnableAsync
|
||||
public class ThreadPoolConfig {
|
||||
|
||||
/**
|
||||
* 从配置文件中加载线程池相关的配置
|
||||
*/
|
||||
|
||||
//常驻线程数量
|
||||
@Value(value = "${save.task.thread_pool.corePoolSize}")
|
||||
private int saveCorePoolSize = 4;
|
||||
//最大线程数量
|
||||
@Value(value = "${save.task.thread_pool.maxPoolSize}")
|
||||
private int saveMaxPoolSize = 32;
|
||||
//阻塞队列数量
|
||||
@Value(value = "${save.task.thread_pool.queueCapacity}")
|
||||
private int saveQueueCapacity = 100;
|
||||
//线程名称前缀
|
||||
@Value(value = "${save.task.thread_pool.ThreadNamePrefix}")
|
||||
private String saveThreadNamePrefix;
|
||||
|
||||
|
||||
@Bean(value = "poolExecutor")
|
||||
public Executor poolExecutor(){
|
||||
ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(
|
||||
saveCorePoolSize,
|
||||
saveMaxPoolSize,
|
||||
3,
|
||||
TimeUnit.SECONDS,
|
||||
new LinkedBlockingDeque<>(saveQueueCapacity),
|
||||
new NamedThreadFactory(saveThreadNamePrefix, false),
|
||||
new ThreadPoolExecutor.DiscardOldestPolicy()
|
||||
);
|
||||
return threadPoolExecutor;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
package com.baiye.dao;
|
||||
|
||||
import com.baiye.entity.OrganizeEntity;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* Mapper 接口
|
||||
* </p>
|
||||
*
|
||||
* @author yqy
|
||||
* @since 2022-08-10
|
||||
*/
|
||||
@Mapper
|
||||
public interface OrganizeMapper extends BaseMapper<OrganizeEntity> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,10 @@
|
||||
package com.baiye.dao;
|
||||
|
||||
import com.baiye.entity.TiktokAccountEntity;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface TiktokAccountMapper extends BaseMapper<TiktokAccountEntity> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,21 @@
|
||||
package com.baiye.dao;
|
||||
|
||||
import com.baiye.entity.TiktokEquipmentEntity9999;
|
||||
import com.baiye.vo.TiktokEquipmentVo;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
@Mapper
|
||||
public interface TiktokEquipmentMapper extends BaseMapper<TiktokEquipmentEntity9999> {
|
||||
|
||||
List<TiktokEquipmentVo> getEquipmentList();
|
||||
|
||||
List<Map<Long,Object>> findOrganizeCount();
|
||||
|
||||
void updateByUserId(@Param("entities") List<TiktokEquipmentEntity9999> entities, @Param("userIds") Set<String> userIdList);
|
||||
}
|
||||
@ -0,0 +1,25 @@
|
||||
package com.baiye.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
/**
|
||||
* 抖音调用登录接口dto
|
||||
*/
|
||||
@Data
|
||||
public class LoginDto {
|
||||
|
||||
@NotNull(message = "账号不能为空")
|
||||
private String account;
|
||||
|
||||
/**
|
||||
* 验证码
|
||||
*/
|
||||
private String smsCode;
|
||||
|
||||
/**
|
||||
* 抖音密码
|
||||
*/
|
||||
private String password;
|
||||
}
|
||||
@ -0,0 +1,50 @@
|
||||
package com.baiye.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class OrganizeDto {
|
||||
|
||||
/**
|
||||
* 小组表主键ID
|
||||
*/
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 小组名称
|
||||
*/
|
||||
private String organizeName;
|
||||
|
||||
/**
|
||||
* 标识
|
||||
*/
|
||||
private String identification;
|
||||
|
||||
/**
|
||||
* 说明
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 账号数量
|
||||
*/
|
||||
private Integer accountNum;
|
||||
|
||||
/**
|
||||
* 开始时间
|
||||
*/
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date beginTime;
|
||||
|
||||
/**
|
||||
* 结束时间
|
||||
*/
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date endTime;
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
package com.baiye.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ReqEquipment {
|
||||
|
||||
private String sessionKey;
|
||||
|
||||
private ReqEquipmentSon data;
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package com.baiye.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class ReqEquipmentSon {
|
||||
|
||||
private String type;
|
||||
|
||||
private List vendorIds;
|
||||
|
||||
private List customParameters;
|
||||
}
|
||||
@ -0,0 +1,55 @@
|
||||
package com.baiye.entity;
|
||||
|
||||
import com.baiye.core.base.MybatisBaseEntity;
|
||||
import com.baiye.core.constant.AddGroup;
|
||||
import com.baiye.core.constant.UpdateGroup;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 小组表
|
||||
* </p>
|
||||
*
|
||||
* @author yqy
|
||||
* @since 2022-08-10
|
||||
*/
|
||||
@Data
|
||||
@TableName("tb_organize")
|
||||
public class OrganizeEntity extends MybatisBaseEntity {
|
||||
|
||||
/**
|
||||
* 小组表主键ID
|
||||
*/
|
||||
@NotNull(groups = UpdateGroup.class, message = "ID不能为空")
|
||||
@TableId(value = "id", type = IdType.AUTO)
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 小组名称
|
||||
*/
|
||||
@NotNull(groups = AddGroup.class, message = "小组名称不能为空")
|
||||
private String organizeName;
|
||||
|
||||
/**
|
||||
* 标识
|
||||
*/
|
||||
private String identification;
|
||||
|
||||
/**
|
||||
* 说明
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 账号数量
|
||||
*/
|
||||
@TableField(exist = false) //排除字段
|
||||
private Integer accountNum;
|
||||
|
||||
}
|
||||
@ -0,0 +1,66 @@
|
||||
package com.baiye.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
@TableName("tb_account")
|
||||
public class TiktokAccountEntity {
|
||||
|
||||
/**
|
||||
* ID
|
||||
*/
|
||||
@TableId(type = IdType.AUTO)
|
||||
private Long Id;
|
||||
|
||||
/**
|
||||
* 抖音昵称
|
||||
*/
|
||||
@TableField("nick_name")
|
||||
private String nickName;
|
||||
|
||||
/**
|
||||
* 好友数
|
||||
*/
|
||||
@TableField("friend_num")
|
||||
private Integer friendNum;
|
||||
|
||||
/**
|
||||
* 登录状态 0:在线 -1:离线
|
||||
*/
|
||||
@TableField("sign_in_status")
|
||||
private Integer signInStatus;
|
||||
|
||||
/**
|
||||
* 工作状态
|
||||
*/
|
||||
@TableField("work_status")
|
||||
private Integer workStatus;
|
||||
|
||||
/**
|
||||
* 最后登录时间
|
||||
*/
|
||||
@TableField("last_time")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date lastTime;
|
||||
|
||||
/**
|
||||
* 设备信息
|
||||
*/
|
||||
@TableField("equipment_info")
|
||||
private String equipmentInfo;
|
||||
|
||||
/**
|
||||
* 小组id
|
||||
*/
|
||||
@TableField("organize_id")
|
||||
private Long organizeId;
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
package com.baiye.properties;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Data
|
||||
@Component
|
||||
@ConfigurationProperties(prefix = "tiktok")
|
||||
public class TiktokProperties {
|
||||
|
||||
@ApiModelProperty("请求地址")
|
||||
private String gatewayHost;
|
||||
|
||||
@ApiModelProperty("sessionKey")
|
||||
private String sessionKey;
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
package com.baiye.service;
|
||||
|
||||
import com.baiye.core.page.PageResult;
|
||||
import com.baiye.dto.OrganizeDto;
|
||||
import com.baiye.entity.OrganizeEntity;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 服务类
|
||||
* </p>
|
||||
*
|
||||
* @author yqy
|
||||
* @since 2022-08-10
|
||||
*/
|
||||
public interface OrganizeService extends IService<OrganizeEntity> {
|
||||
|
||||
/**
|
||||
* 小组分页查询
|
||||
*/
|
||||
PageResult pageList(long current, long limit, OrganizeDto organizeDto);
|
||||
|
||||
/**
|
||||
* 删除
|
||||
* @param id
|
||||
*/
|
||||
void del(Long id);
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
package com.baiye.service;
|
||||
|
||||
import com.baiye.entity.TiktokAccountEntity;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
public interface TiktokAccountService extends IService<TiktokAccountEntity> {
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
package com.baiye.service;
|
||||
|
||||
import com.baiye.core.page.PageResult;
|
||||
import com.baiye.entity.TiktokEquipmentEntity9999;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
public interface TiktokEquipmentService extends IService<TiktokEquipmentEntity9999> {
|
||||
|
||||
/**
|
||||
* 账号列表
|
||||
* @param tiktokAccountEntity
|
||||
* @return
|
||||
*/
|
||||
PageResult getEquipmentList(int current, int limit, TiktokEquipmentEntity9999 tiktokAccountEntity);
|
||||
|
||||
/**
|
||||
* 修改小组ID字段为0
|
||||
* @param id
|
||||
*/
|
||||
void updateByOrganizeId(Long id);
|
||||
|
||||
/**
|
||||
* 查询小组数量
|
||||
* @return
|
||||
*/
|
||||
Map<Long,Object> findOrganizeCount();
|
||||
}
|
||||
@ -0,0 +1,26 @@
|
||||
package com.baiye.service;
|
||||
|
||||
import com.baiye.core.base.api.Result;
|
||||
import com.baiye.dto.LoginDto;
|
||||
|
||||
public interface TiktokUserService {
|
||||
|
||||
/**
|
||||
* 获取当前抖音号信息
|
||||
* @param
|
||||
* @return
|
||||
*/
|
||||
Result<Object> getTiktokNumberInfo();
|
||||
|
||||
/**
|
||||
* 手机号登录
|
||||
* @return
|
||||
*/
|
||||
Result<Object> phoneNumberLogin(LoginDto loginDto);
|
||||
|
||||
/**
|
||||
* 账号密码登录
|
||||
* @return
|
||||
*/
|
||||
Result<Object> accountLogin(LoginDto loginDto);
|
||||
}
|
||||
@ -0,0 +1,77 @@
|
||||
package com.baiye.service.impl;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.convert.Convert;
|
||||
import com.baiye.core.page.PageResult;
|
||||
import com.baiye.core.util.StringUtils;
|
||||
import com.baiye.dto.OrganizeDto;
|
||||
import com.baiye.entity.OrganizeEntity;
|
||||
import com.baiye.dao.OrganizeMapper;
|
||||
import com.baiye.service.OrganizeService;
|
||||
import com.baiye.service.TiktokEquipmentService;
|
||||
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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 服务实现类
|
||||
* </p>
|
||||
*
|
||||
* @author yqy
|
||||
* @since 2022-08-10
|
||||
*/
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
@Slf4j
|
||||
public class OrganizeServiceImpl extends ServiceImpl<OrganizeMapper, OrganizeEntity> implements OrganizeService {
|
||||
|
||||
private final TiktokEquipmentService tiktokEquipmentService;
|
||||
|
||||
@Override
|
||||
public PageResult pageList(long current, long limit, OrganizeDto organizeDto) {
|
||||
Page<OrganizeEntity> page = new Page<>(current, limit);
|
||||
|
||||
QueryWrapper<OrganizeEntity> wrapper = new QueryWrapper<>();
|
||||
String organizeName = organizeDto.getOrganizeName();
|
||||
Date beginTime = organizeDto.getBeginTime();
|
||||
Date endTime = organizeDto.getEndTime();
|
||||
if (StringUtils.isNotBlank(organizeName)){
|
||||
wrapper.like("organize_name",organizeName);
|
||||
}
|
||||
if (beginTime != null && endTime != null){
|
||||
wrapper.ge("create_time", beginTime);
|
||||
wrapper.le("create_time", endTime);
|
||||
}
|
||||
|
||||
wrapper.orderByDesc("create_time");
|
||||
IPage<OrganizeEntity> iPage = this.page(page, wrapper);
|
||||
Map<Long, Object> organizeCount = tiktokEquipmentService.findOrganizeCount();
|
||||
// 设备数量set
|
||||
for (OrganizeEntity record : iPage.getRecords()) {
|
||||
Long id = record.getId();
|
||||
if (CollUtil.isNotEmpty(organizeCount) && organizeCount.containsKey(id)){
|
||||
record.setAccountNum(Convert.toInt(organizeCount.get(id)));
|
||||
}
|
||||
}
|
||||
return PageResult.success
|
||||
(iPage.getTotal(), iPage.getPages(), iPage.getRecords());
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void del(Long id) {
|
||||
//删除分组
|
||||
this.removeById(id);
|
||||
//分配的分组删除掉
|
||||
tiktokEquipmentService.updateByOrganizeId(id);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package com.baiye.service.impl;
|
||||
|
||||
import com.baiye.dao.TiktokAccountMapper;
|
||||
import com.baiye.entity.TiktokAccountEntity;
|
||||
import com.baiye.service.TiktokAccountService;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Slf4j
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class TiktokAccountServiceImpl extends ServiceImpl<TiktokAccountMapper, TiktokAccountEntity> implements TiktokAccountService {
|
||||
}
|
||||
@ -0,0 +1,103 @@
|
||||
package com.baiye.service.impl;
|
||||
|
||||
import cn.hutool.http.HttpStatus;
|
||||
import cn.hutool.http.HttpUtil;
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.baiye.core.base.api.Result;
|
||||
import com.baiye.core.base.api.ResultCode;
|
||||
import com.baiye.core.constant.TiktokRequestConstants;
|
||||
import com.baiye.core.constant.TiktokResponse;
|
||||
import com.baiye.core.util.StringUtils;
|
||||
import com.baiye.dto.LoginDto;
|
||||
import com.baiye.dto.ReqEquipment;
|
||||
import com.baiye.dto.ReqEquipmentSon;
|
||||
import com.baiye.properties.TiktokProperties;
|
||||
import com.baiye.service.TiktokUserService;
|
||||
import com.google.common.collect.Maps;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
||||
@Slf4j
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class TiktokUserServiceImpl implements TiktokUserService {
|
||||
|
||||
private final TiktokProperties tiktokProperties;
|
||||
|
||||
@Override
|
||||
public Result<Object> getTiktokNumberInfo() {
|
||||
ReqEquipment reqEquipment = new ReqEquipment();
|
||||
reqEquipment.setSessionKey(tiktokProperties.getSessionKey());
|
||||
reqEquipment.setData(new ReqEquipmentSon());
|
||||
String post = HttpUtil.post(tiktokProperties.getGatewayHost().concat(TiktokRequestConstants.DY_OBTAIN_INFO), JSONUtil.toJsonStr(reqEquipment));
|
||||
if (StringUtils.isNotBlank(post)){
|
||||
TiktokResponse tiktokResponse = JSONUtil.toBean(post, TiktokResponse.class);
|
||||
if (tiktokResponse.getStatus() == HttpStatus.HTTP_OK) {
|
||||
return Result.data(tiktokResponse.getData());
|
||||
}
|
||||
}
|
||||
return Result.fail(ResultCode.GROUP_ID_ERROR.getMsg());
|
||||
}
|
||||
|
||||
/**
|
||||
* 手机号登录
|
||||
*/
|
||||
@Override
|
||||
public Result<Object> phoneNumberLogin(LoginDto loginDto) {
|
||||
String account = loginDto.getAccount();
|
||||
String smsCode = loginDto.getSmsCode();
|
||||
if (StringUtils.isNotBlank(account) && StringUtils.isNotBlank(smsCode)){
|
||||
HashMap<String, Object> map = Maps.newHashMap();
|
||||
HashMap<String, Object> dataMap = Maps.newHashMap();
|
||||
dataMap.put("account", account);
|
||||
dataMap.put("smsCode", smsCode);
|
||||
if (implement(map, dataMap, TiktokRequestConstants.DY_PHONE_LOGIN)){
|
||||
return Result.success("登录成功");
|
||||
}
|
||||
}else {
|
||||
return Result.fail(HttpStatus.HTTP_BAD_REQUEST, "手机号验证码不能为空");
|
||||
}
|
||||
return Result.fail(ResultCode.REQUEST_PARAMETER_ERROR.getMsg());
|
||||
}
|
||||
|
||||
/**
|
||||
* 账号密码登录
|
||||
*/
|
||||
@Override
|
||||
public Result<Object> accountLogin(LoginDto loginDto) {
|
||||
String account = loginDto.getAccount();
|
||||
String password = loginDto.getPassword();
|
||||
if (StringUtils.isNotBlank(account) && StringUtils.isNotBlank(password)){
|
||||
HashMap<String, Object> map = Maps.newHashMap();
|
||||
HashMap<String, Object> dataMap = Maps.newHashMap();
|
||||
dataMap.put("account", account);
|
||||
dataMap.put("password", password);
|
||||
if (implement(map, dataMap,TiktokRequestConstants.DY_ACCOUNT_LOGIN)){
|
||||
return Result.success("登录成功");
|
||||
}
|
||||
}else {
|
||||
return Result.fail(HttpStatus.HTTP_BAD_REQUEST, "账号密码不能为空");
|
||||
}
|
||||
return Result.fail(ResultCode.REQUEST_PARAMETER_ERROR.getMsg());
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 登录抽取的公共代码
|
||||
*/
|
||||
private boolean implement(HashMap<String, Object> map, HashMap<String, Object> dataMap, String url) {
|
||||
map.put("sessionKey", tiktokProperties.getSessionKey());
|
||||
map.put("data", dataMap);
|
||||
String post = HttpUtil.post(tiktokProperties.getGatewayHost().concat(url), map);
|
||||
if (StringUtils.isNotBlank(post)){
|
||||
TiktokResponse tiktokResponse = JSONUtil.toBean(post, TiktokResponse.class);
|
||||
if (tiktokResponse.getStatus() == HttpStatus.HTTP_OK) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,54 @@
|
||||
package com.baiye.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class TiktokAccountVo {
|
||||
|
||||
/**
|
||||
* ID
|
||||
*/
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 抖音昵称
|
||||
*/
|
||||
private String nickName;
|
||||
|
||||
/**
|
||||
* 好友数
|
||||
*/
|
||||
private Integer friendNum;
|
||||
|
||||
/**
|
||||
* 登录状态 0:在线 -1:离线
|
||||
*/
|
||||
private Integer signInStatus;
|
||||
|
||||
/**
|
||||
* 工作状态
|
||||
*/
|
||||
private Integer workStatus;
|
||||
|
||||
/**
|
||||
* 最后登录时间
|
||||
*/
|
||||
private Date lastTime;
|
||||
|
||||
/**
|
||||
* 设备信息
|
||||
*/
|
||||
private String equipmentInfo;
|
||||
|
||||
/**
|
||||
* 小组id
|
||||
*/
|
||||
private Long organizeId;
|
||||
|
||||
/**
|
||||
* 小组名称
|
||||
*/
|
||||
private String organizeName;
|
||||
}
|
||||
@ -0,0 +1,31 @@
|
||||
package com.baiye.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class TiktokEquipmentVo {
|
||||
private Long id;
|
||||
private String dyVendorId;
|
||||
private String adminId;
|
||||
private String deviceLoginStatus;
|
||||
private String deviceLoginDesc;
|
||||
private String dyUserId;
|
||||
private String dyCdid;
|
||||
private String dyUserNo;
|
||||
private String dyTtToken;
|
||||
private String deviceStatus;
|
||||
private String deviceDesc;
|
||||
private String customParameters;
|
||||
private String screenName;
|
||||
private String avatarUrl;
|
||||
private String gender;
|
||||
private String mobile;
|
||||
private String verifyLink;
|
||||
private String followingCount;
|
||||
private String followerCount;
|
||||
private String friendCount;
|
||||
private String createTime;
|
||||
private String remark;
|
||||
private String organizeName;
|
||||
private Long organizeId;
|
||||
}
|
||||
@ -0,0 +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.baiye.dao.OrganizeMapper">
|
||||
|
||||
<!-- 通用查询映射结果 -->
|
||||
<resultMap id="BaseResultMap" type="com.baiye.entity.OrganizeEntity">
|
||||
<id column="id" property="id" />
|
||||
<result column="create_time" property="createTime" />
|
||||
<result column="update_time" property="updateTime" />
|
||||
<result column="create_by" property="createBy" />
|
||||
<result column="update_by" property="updateBy" />
|
||||
<result column="organize_name" property="organizeName" />
|
||||
<result column="identification" property="identification" />
|
||||
<result column="remark" property="remark" />
|
||||
</resultMap>
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,4 @@
|
||||
<?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.baiye.dao.TiktokAccountMapper">
|
||||
</mapper>
|
||||
@ -0,0 +1,61 @@
|
||||
<?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.baiye.dao.TiktokEquipmentMapper">
|
||||
|
||||
<select id="getEquipmentList" resultType="com.baiye.vo.TiktokEquipmentVo">
|
||||
SELECT e.*,
|
||||
o.organize_name as organizeName
|
||||
FROM tb_equipment e
|
||||
LEFT JOIN tb_organize o ON e.organize_id = o.id
|
||||
</select>
|
||||
|
||||
<select id="findOrganizeCount" resultType="java.util.Map">
|
||||
SELECT organize_id as organizeId,
|
||||
count(*) as num
|
||||
FROM tb_equipment
|
||||
GROUP BY organize_id
|
||||
</select>
|
||||
|
||||
<update id="updateByUserId">
|
||||
<foreach collection="entities" item="item" index="index" open="" close="" separator=";">
|
||||
update tb_equipment
|
||||
<set>
|
||||
<if test="item.dyVendorId != null and item.dyVendorId != ''">
|
||||
dy_vendor_id = #{item.dyVendorId},
|
||||
</if>
|
||||
<if test="item.adminId != null and item.adminId != ''">
|
||||
admin_id = #{item.adminId},
|
||||
</if>
|
||||
<if test="item.deviceLoginStatus != null and item.deviceLoginStatus != ''">
|
||||
device_login_status = #{item.deviceLoginStatus},
|
||||
</if>
|
||||
<if test="item.deviceLoginDesc != null and item.deviceLoginDesc != ''">
|
||||
device_login_desc = #{item.deviceLoginDesc},
|
||||
</if>
|
||||
<if test="item.dyTtToken != null and item.dyTtToken != ''">
|
||||
dy_tt_token = #{item.dyTtToken},
|
||||
</if>
|
||||
<if test="item.screenName != null and item.screenName != ''">
|
||||
screen_name = #{item.screenName},
|
||||
</if>
|
||||
<if test="item.avatarUrl != null and item.avatarUrl != ''">
|
||||
avatar_url = #{item.avatarUrl},
|
||||
</if>
|
||||
<if test="item.gender != null and item.gender != ''">
|
||||
gender = #{item.gender},
|
||||
</if>
|
||||
<if test="item.followingCount != null and item.followingCount != ''">
|
||||
following_count = #{item.followingCount},
|
||||
</if>
|
||||
<if test="item.followerCount != null and item.followerCount != ''">
|
||||
follower_count = #{item.followerCount},
|
||||
</if>
|
||||
<if test="item.friendCount != null and item.friendCount != ''">
|
||||
friend_count = #{item.friendCount}
|
||||
</if>
|
||||
</set>
|
||||
where dy_user_id = #{item.dyUserId}
|
||||
</foreach>
|
||||
</update>
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue