Przeglądaj źródła

删除遗留的无用模块代码以及实体类

syh 4 lat temu
rodzic
commit
4952abe98c
24 zmienionych plików z 18 dodań i 352 usunięć
  1. 2 2
      jeecg-boot-module-system/src/main/resources/application-wps.yml
  2. 10 0
      jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
  3. 0 36
      module-common/src/main/java/cn/com/ctop/common/module/entity/ActCustomForm.java
  4. 0 33
      module-common/src/main/java/cn/com/ctop/common/module/entity/ActFormData.java
  5. 0 34
      module-common/src/main/java/cn/com/ctop/common/module/entity/ActFormField.java
  6. 0 33
      module-common/src/main/java/cn/com/ctop/common/module/entity/ActFormPorcess.java
  7. 0 14
      module-common/src/main/java/cn/com/ctop/common/module/mapper/ActCustomFormMapper.java
  8. 0 14
      module-common/src/main/java/cn/com/ctop/common/module/mapper/ActFormDataMapper.java
  9. 0 14
      module-common/src/main/java/cn/com/ctop/common/module/mapper/ActFormFieldMapper.java
  10. 0 14
      module-common/src/main/java/cn/com/ctop/common/module/mapper/ActFormPorcessMapper.java
  11. 0 5
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/ActCustomFormMapper.xml
  12. 0 5
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/ActFormDataMapper.xml
  13. 0 5
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/ActFormFieldMapper.xml
  14. 0 5
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/ActFormPorcessMapper.xml
  15. 0 14
      module-common/src/main/java/cn/com/ctop/common/module/service/IActCustomFormService.java
  16. 0 14
      module-common/src/main/java/cn/com/ctop/common/module/service/IActFormDataService.java
  17. 0 14
      module-common/src/main/java/cn/com/ctop/common/module/service/IActFormFieldService.java
  18. 0 14
      module-common/src/main/java/cn/com/ctop/common/module/service/IActFormPorcessService.java
  19. 0 18
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/ActCustomFormServiceImpl.java
  20. 0 18
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/ActFormDataServiceImpl.java
  21. 0 18
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/ActFormFieldServiceImpl.java
  22. 0 18
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/ActFormPorcessServiceImpl.java
  23. 5 10
      module-job-kuaishou/src/main/resources/application-prod.yml
  24. 1 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

+ 2 - 2
jeecg-boot-module-system/src/main/resources/application-wps.yml

@@ -56,7 +56,7 @@ spring:
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
-    url: jdbc:mysql://139.186.27.96:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+    url: jdbc:mysql://139.186.27.96:4000/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: hcst
     password: hcst@2020
     driver-class-name: com.mysql.jdbc.Driver
@@ -96,7 +96,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://139.186.27.96:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://139.186.27.96:4000/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: hcst
           password: hcst@2020
           driver-class-name: com.mysql.jdbc.Driver

+ 10 - 0
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -250,6 +250,16 @@ public class SampleTest {
     }
 
     @Test
+    public void loadKuaishouData(){
+        Date getDate = DateUtils.addDay(new Date(), -1);
+        //1:查询当日数据
+        List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
+        for (CtopOauthToken token:tokens){
+            kuaishouInterfaceService.getAdvertiserCampaignReportDaily(token, getDate, getDate);
+        }
+    }
+
+    @Test
     public void loadKuaishouHourlyReportData(){
         Date getDate = new Date();
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH");

+ 0 - 36
module-common/src/main/java/cn/com/ctop/common/module/entity/ActCustomForm.java

@@ -1,36 +0,0 @@
-package cn.com.ctop.common.module.entity;
-
-import cn.com.ctop.common.module.annotation.Dict;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-/**
- * 自定义表单信息
- * @author jeecg-boot
- * @date   2020-08-25
- * @version V1.0
- */
-@Data
-@TableName("ctop_act_custom_form")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="ctop_act_custom_form对象", description="自定义表单信息")
-public class ActCustomForm {
-
-	@TableId(type = IdType.AUTO)
-	private Long id;
-	private String name;
-	private String text;
-	@Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
-	private String userId;
-	private Integer status;
-	private Date createTime;
-	private Date updateTime;
-}

+ 0 - 33
module-common/src/main/java/cn/com/ctop/common/module/entity/ActFormData.java

@@ -1,33 +0,0 @@
-package cn.com.ctop.common.module.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-/**
- * 自定义表单存储数据
- * @author jeecg-boot
- * @date   2020-08-25
- * @version V1.0
- */
-@Data
-@TableName("ctop_act_form_data")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class ActFormData {
-
-	@TableId(type = IdType.AUTO)
-	private Long id;
-	private Long formId;
-	private String userId;
-	private String bussinessId;
-	private String content;
-	private Integer status;
-	private Date createTime;
-	private Date updateTime;
-}

+ 0 - 34
module-common/src/main/java/cn/com/ctop/common/module/entity/ActFormField.java

@@ -1,34 +0,0 @@
-package cn.com.ctop.common.module.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-/**
- * 自定义表单字段信息
- * @author jeecg-boot
- * @date   2020-08-25
- * @version V1.0
- */
-@Data
-@TableName("ctop_act_form_field")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="ctop_act_form_field对象", description="自定义表单字段信息")
-public class ActFormField {
-
-	@TableId(type = IdType.AUTO)
-	private Long id;
-	private Long formId;
-	private String key;
-	private String type;
-	private Integer status;
-	private Date createTime;
-	private Date updateTime;
-}

+ 0 - 33
module-common/src/main/java/cn/com/ctop/common/module/entity/ActFormPorcess.java

@@ -1,33 +0,0 @@
-package cn.com.ctop.common.module.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-/**
- * 自定义表单关联流程信息
- * @author jeecg-boot
- * @date   2020-08-25
- * @version V1.0
- */
-@Data
-@TableName("ctop_act_form_porcess")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="ctop_act_form_porcess对象", description="自定义表单关联流程信息")
-public class ActFormPorcess {
-
-	@TableId(type = IdType.AUTO)
-	private Long id;
-	private Long formId;
-	private String processId;
-	private Integer status;
-	private Date createTime;
-	private Date updateTime;
-}

+ 0 - 14
module-common/src/main/java/cn/com/ctop/common/module/mapper/ActCustomFormMapper.java

@@ -1,14 +0,0 @@
-package cn.com.ctop.common.module.mapper;
-
-import cn.com.ctop.common.module.entity.ActCustomForm;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 自定义表单信息
- * @author: jeecg-boot
- * @date:   2020-08-25
- * @cersion: V1.0
- */
-public interface ActCustomFormMapper extends BaseMapper<ActCustomForm> {
-
-}

+ 0 - 14
module-common/src/main/java/cn/com/ctop/common/module/mapper/ActFormDataMapper.java

@@ -1,14 +0,0 @@
-package cn.com.ctop.common.module.mapper;
-
-import cn.com.ctop.common.module.entity.ActFormData;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 自定义表单存储数据
- * @author: jeecg-boot
- * @date:   2020-08-25
- * @cersion: V1.0
- */
-public interface ActFormDataMapper extends BaseMapper<ActFormData> {
-
-}

+ 0 - 14
module-common/src/main/java/cn/com/ctop/common/module/mapper/ActFormFieldMapper.java

@@ -1,14 +0,0 @@
-package cn.com.ctop.common.module.mapper;
-
-import cn.com.ctop.common.module.entity.ActFormField;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 自定义表单字段信息
- * @author: jeecg-boot
- * @date:   2020-08-25
- * @cersion: V1.0
- */
-public interface ActFormFieldMapper extends BaseMapper<ActFormField> {
-
-}

+ 0 - 14
module-common/src/main/java/cn/com/ctop/common/module/mapper/ActFormPorcessMapper.java

@@ -1,14 +0,0 @@
-package cn.com.ctop.common.module.mapper;
-
-import cn.com.ctop.common.module.entity.ActFormPorcess;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 自定义表单关联流程信息
- * @author: jeecg-boot
- * @date:   2020-08-25
- * @cersion: V1.0
- */
-public interface ActFormPorcessMapper extends BaseMapper<ActFormPorcess> {
-
-}

+ 0 - 5
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/ActCustomFormMapper.xml

@@ -1,5 +0,0 @@
-<?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="cn.com.ctop.common.module.mapper.ActCustomFormMapper">
-
-</mapper>

+ 0 - 5
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/ActFormDataMapper.xml

@@ -1,5 +0,0 @@
-<?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="cn.com.ctop.common.module.mapper.ActFormDataMapper">
-
-</mapper>

+ 0 - 5
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/ActFormFieldMapper.xml

@@ -1,5 +0,0 @@
-<?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="cn.com.ctop.common.module.mapper.ActFormFieldMapper">
-
-</mapper>

+ 0 - 5
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/ActFormPorcessMapper.xml

@@ -1,5 +0,0 @@
-<?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="cn.com.ctop.common.module.mapper.ActFormPorcessMapper">
-
-</mapper>

+ 0 - 14
module-common/src/main/java/cn/com/ctop/common/module/service/IActCustomFormService.java

@@ -1,14 +0,0 @@
-package cn.com.ctop.common.module.service;
-
-import cn.com.ctop.common.module.entity.ActCustomForm;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 自定义表单信息
- * @Author: jeecg-boot
- * @Date:   2020-08-25
- * @Version: V1.0
- */
-public interface IActCustomFormService extends IService<ActCustomForm> {
-
-}

+ 0 - 14
module-common/src/main/java/cn/com/ctop/common/module/service/IActFormDataService.java

@@ -1,14 +0,0 @@
-package cn.com.ctop.common.module.service;
-
-import cn.com.ctop.common.module.entity.ActFormData;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 自定义表单存储数据
- * @Author: jeecg-boot
- * @Date:   2020-08-25
- * @Version: V1.0
- */
-public interface IActFormDataService extends IService<ActFormData> {
-
-}

+ 0 - 14
module-common/src/main/java/cn/com/ctop/common/module/service/IActFormFieldService.java

@@ -1,14 +0,0 @@
-package cn.com.ctop.common.module.service;
-
-import cn.com.ctop.common.module.entity.ActFormField;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 自定义表单字段信息
- * @Author: jeecg-boot
- * @Date:   2020-08-25
- * @Version: V1.0
- */
-public interface IActFormFieldService extends IService<ActFormField> {
-
-}

+ 0 - 14
module-common/src/main/java/cn/com/ctop/common/module/service/IActFormPorcessService.java

@@ -1,14 +0,0 @@
-package cn.com.ctop.common.module.service;
-
-import cn.com.ctop.common.module.entity.ActFormPorcess;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 自定义表单关联流程信息
- * @Author: jeecg-boot
- * @Date:   2020-08-25
- * @Version: V1.0
- */
-public interface IActFormPorcessService extends IService<ActFormPorcess> {
-
-}

+ 0 - 18
module-common/src/main/java/cn/com/ctop/common/module/service/impl/ActCustomFormServiceImpl.java

@@ -1,18 +0,0 @@
-package cn.com.ctop.common.module.service.impl;
-
-import cn.com.ctop.common.module.entity.ActCustomForm;
-import cn.com.ctop.common.module.mapper.ActCustomFormMapper;
-import cn.com.ctop.common.module.service.IActCustomFormService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * 自定义表单信息
- * @author jeecg-boot
- * @date   2020-08-25
- * @version V1.0
- */
-@Service
-public class ActCustomFormServiceImpl extends ServiceImpl<ActCustomFormMapper, ActCustomForm> implements IActCustomFormService {
-
-}

+ 0 - 18
module-common/src/main/java/cn/com/ctop/common/module/service/impl/ActFormDataServiceImpl.java

@@ -1,18 +0,0 @@
-package cn.com.ctop.common.module.service.impl;
-
-import cn.com.ctop.common.module.entity.ActFormData;
-import cn.com.ctop.common.module.mapper.ActFormDataMapper;
-import cn.com.ctop.common.module.service.IActFormDataService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * 自定义表单存储数据
- * @author jeecg-boot
- * @date   2020-08-25
- * @version V1.0
- */
-@Service
-public class ActFormDataServiceImpl extends ServiceImpl<ActFormDataMapper, ActFormData> implements IActFormDataService {
-
-}

+ 0 - 18
module-common/src/main/java/cn/com/ctop/common/module/service/impl/ActFormFieldServiceImpl.java

@@ -1,18 +0,0 @@
-package cn.com.ctop.common.module.service.impl;
-
-import cn.com.ctop.common.module.entity.ActFormField;
-import cn.com.ctop.common.module.mapper.ActFormFieldMapper;
-import cn.com.ctop.common.module.service.IActFormFieldService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * 自定义表单字段信息
- * @author jeecg-boot
- * @date   2020-08-25
- * @version V1.0
- */
-@Service
-public class ActFormFieldServiceImpl extends ServiceImpl<ActFormFieldMapper, ActFormField> implements IActFormFieldService {
-
-}

+ 0 - 18
module-common/src/main/java/cn/com/ctop/common/module/service/impl/ActFormPorcessServiceImpl.java

@@ -1,18 +0,0 @@
-package cn.com.ctop.common.module.service.impl;
-
-import cn.com.ctop.common.module.entity.ActFormPorcess;
-import cn.com.ctop.common.module.mapper.ActFormPorcessMapper;
-import cn.com.ctop.common.module.service.IActFormPorcessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * 自定义表单关联流程信息
- * @author jeecg-boot
- * @date   2020-08-25
- * @version V1.0
- */
-@Service
-public class ActFormPorcessServiceImpl extends ServiceImpl<ActFormPorcessMapper, ActFormPorcess> implements IActFormPorcessService {
-
-}

+ 5 - 10
module-job-kuaishou/src/main/resources/application-prod.yml

@@ -4,11 +4,6 @@ management:
       exposure:
         include: metrics,httptrace
 spring:
-  rabbitmq:
-    host: 39.106.184.70
-    port: 5672
-    username: guest
-    password: guest
   servlet:
     multipart:
       max-file-size: -1
@@ -52,7 +47,7 @@ spring:
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
-    url: jdbc:mysql://172.30.0.4:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+    url: jdbc:mysql://172.30.0.4:4000/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: hcst
     password: hcst@2020
     driver-class-name: com.mysql.jdbc.Driver
@@ -91,7 +86,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://172.30.0.4:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://172.30.0.4:4000/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: hcst
           password: hcst@2020
           driver-class-name: com.mysql.jdbc.Driver
@@ -176,11 +171,11 @@ xxl:
   job:
     accessToken:
     executor:
-      appname: module-job-kuaishou
+      appname: module-job-kuaishou-v2
       port: 9998
       ip:
       logpath: /data/applogs/xxl-job/jobhandler
       logretentiondays: 30
     admin:
-#      addresses: http://129.28.150.229:8090/xxl-job-admin
-      addresses: http://139.186.29.76:8090/xxl-job-admin
+      addresses: http://129.28.150.229:8090/xxl-job-admin
+#      addresses: http://139.186.29.76:8090/xxl-job-admin

+ 1 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

@@ -351,6 +351,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
 
         String result = HttpUtils.httpPostRequest(url, param, headers);
         JSONObject resultJson = JSONObject.parseObject(result);
+        System.out.println(resultJson);
         Integer code = resultJson.getInteger("code");
         String message = resultJson.getString("message");
         if (null == code || code != 0) {