lyhzzz 3 år sedan
förälder
incheckning
7540d412ce
35 ändrade filer med 434 tillägg och 604 borttagningar
  1. 0 26
      4dkankan-center-platform/src/main/java/com/fdkankan/agent/controller/AgentAuditController.java
  2. 0 21
      4dkankan-center-platform/src/main/java/com/fdkankan/agent/controller/AgentController.java
  3. 0 21
      4dkankan-center-platform/src/main/java/com/fdkankan/agent/controller/AgentFrameworkController.java
  4. 0 21
      4dkankan-center-platform/src/main/java/com/fdkankan/agent/controller/AgentNoticeController.java
  5. 0 97
      4dkankan-center-platform/src/main/java/com/fdkankan/agent/entity/Agent.java
  6. 0 53
      4dkankan-center-platform/src/main/java/com/fdkankan/agent/entity/AgentFramework.java
  7. 0 62
      4dkankan-center-platform/src/main/java/com/fdkankan/agent/entity/AgentNotice.java
  8. 0 16
      4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/AgentFrameworkMapper.java
  9. 0 16
      4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/AgentMapper.java
  10. 0 16
      4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/AgentNoticeMapper.java
  11. 0 5
      4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/xml/AgentAuditMapper.xml
  12. 0 5
      4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/xml/AgentFrameworkMapper.xml
  13. 0 5
      4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/xml/AgentMapper.xml
  14. 0 5
      4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/xml/AgentNoticeMapper.xml
  15. 0 16
      4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/IAgentFrameworkService.java
  16. 0 16
      4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/IAgentNoticeService.java
  17. 0 16
      4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/IAgentService.java
  18. 0 20
      4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/impl/AgentFrameworkServiceImpl.java
  19. 0 20
      4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/impl/AgentNoticeServiceImpl.java
  20. 0 20
      4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/impl/AgentServiceImpl.java
  21. 62 0
      4dkankan-center-platform/src/main/java/com/fdkankan/generate/AutoGenerate.java
  22. 32 0
      4dkankan-center-platform/src/main/java/com/fdkankan/test/controller/AgentAuditController.java
  23. 32 14
      4dkankan-center-platform/src/main/java/com/fdkankan/agent/entity/AgentAudit.java
  24. 6 4
      4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/AgentAuditMapper.java
  25. 4 4
      4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/IAgentAuditService.java
  26. 6 6
      4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/impl/AgentAuditServiceImpl.java
  27. 17 1
      4dkankan-center-platform/src/main/resources/application.yml
  28. 18 0
      4dkankan-common/pom.xml
  29. 7 0
      4dkankan-common/src/main/java/com/fdkankan/common/rocketmq/MQLogFormat.java
  30. 60 0
      4dkankan-common/src/main/java/com/fdkankan/common/rocketmq/consumer/Consumer.java
  31. 51 0
      4dkankan-common/src/main/java/com/fdkankan/common/rocketmq/consumer/MqGetMessage.java
  32. 59 0
      4dkankan-common/src/main/java/com/fdkankan/common/rocketmq/producer/MqSendMessage.java
  33. 70 0
      4dkankan-common/src/main/java/com/fdkankan/common/rocketmq/producer/Producer.java
  34. 10 3
      4dkankan-pom/pom.xml
  35. 0 95
      4dkankan-pom/src/test/java/TestAutoGenerate.java

+ 0 - 26
4dkankan-center-platform/src/main/java/com/fdkankan/agent/controller/AgentAuditController.java

@@ -1,26 +0,0 @@
-package com.fdkankan.agent.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 代理商申请表 前端控制器
- * </p>
- *
- * @author ${author}
- * @since 2021-12-22
- */
-@RestController
-@RequestMapping("/agent")
-public class AgentAuditController {
-
-    @RequestMapping("/one")
-    public String getOne (){
-        return "??";
-    }
-
-}
-

+ 0 - 21
4dkankan-center-platform/src/main/java/com/fdkankan/agent/controller/AgentController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.agent.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 代理商表 前端控制器
- * </p>
- *
- * @author ${author}
- * @since 2021-12-22
- */
-@RestController
-@RequestMapping("/agent/agent")
-public class AgentController {
-
-}
-

+ 0 - 21
4dkankan-center-platform/src/main/java/com/fdkankan/agent/controller/AgentFrameworkController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.agent.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 代理商架构管理 前端控制器
- * </p>
- *
- * @author ${author}
- * @since 2021-12-22
- */
-@RestController
-@RequestMapping("/agent/agent-framework")
-public class AgentFrameworkController {
-
-}
-

+ 0 - 21
4dkankan-center-platform/src/main/java/com/fdkankan/agent/controller/AgentNoticeController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.agent.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 代理商公告表 前端控制器
- * </p>
- *
- * @author ${author}
- * @since 2021-12-22
- */
-@RestController
-@RequestMapping("/agent/agent-notice")
-public class AgentNoticeController {
-
-}
-

+ 0 - 97
4dkankan-center-platform/src/main/java/com/fdkankan/agent/entity/Agent.java

@@ -1,97 +0,0 @@
-package com.fdkankan.agent.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 代理商表
- * </p>
- *
- * @author ${author}
- * @since 2021-12-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("t_agent")
-public class Agent implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 代理商Id
-     */
-    private String agentId;
-
-    /**
-     * 代理商公司名称
-     */
-    private String agentName;
-
-    /**
-     * 代理商密码
-     */
-    private String agentPassword;
-
-    /**
-     * 代理商区域
-     */
-    private String agentArea;
-
-    /**
-     * 代理商邮箱
-     */
-    private String agentEmail;
-
-    /**
-     * 代理商电话
-     */
-    private String agentPhone;
-
-    /**
-     * 状态:1-正常,0-冻结
-     */
-    private Integer state;
-
-    /**
-     * 代理数量
-     */
-    private Integer agentNum;
-
-    /**
-     * 代理商所在的国家
-     */
-    private String agentCountry;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-
-    /**
-     * 记录的状态,A: 生效,I: 禁用
-     */
-    private String recStatus;
-
-    /**
-     * 0正常 ,1删除
-     */
-    private Integer tbStatus;
-
-
-}

+ 0 - 53
4dkankan-center-platform/src/main/java/com/fdkankan/agent/entity/AgentFramework.java

@@ -1,53 +0,0 @@
-package com.fdkankan.agent.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 代理商架构管理
- * </p>
- *
- * @author ${author}
- * @since 2021-12-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("t_agent_framework")
-public class AgentFramework implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 上级架构id
-     */
-    private Long parentId;
-
-    /**
-     * 代理商名称
-     */
-    private String agentName;
-
-    private String recStatus;
-
-    private Date createTime;
-
-    private Date updateTime;
-
-    /**
-     * 0正常,1删除
-     */
-    private Integer tbStatus;
-
-
-}

+ 0 - 62
4dkankan-center-platform/src/main/java/com/fdkankan/agent/entity/AgentNotice.java

@@ -1,62 +0,0 @@
-package com.fdkankan.agent.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 代理商公告表
- * </p>
- *
- * @author ${author}
- * @since 2021-12-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("t_agent_notice")
-public class AgentNotice implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 标题
-     */
-    private String title;
-
-    /**
-     * 公告内容
-     */
-    private String content;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-
-    /**
-     * 记录的状态,A: 生效,I: 禁用
-     */
-    private String recStatus;
-
-    /**
-     * 0正常,1删除
-     */
-    private Integer tbStatus;
-
-
-}

+ 0 - 16
4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/AgentFrameworkMapper.java

@@ -1,16 +0,0 @@
-package com.fdkankan.agent.mapper;
-
-import com.fdkankan.agent.entity.AgentFramework;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 代理商架构管理 Mapper 接口
- * </p>
- *
- * @author ${author}
- * @since 2021-12-22
- */
-public interface AgentFrameworkMapper extends BaseMapper<AgentFramework> {
-
-}

+ 0 - 16
4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/AgentMapper.java

@@ -1,16 +0,0 @@
-package com.fdkankan.agent.mapper;
-
-import com.fdkankan.agent.entity.Agent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 代理商表 Mapper 接口
- * </p>
- *
- * @author ${author}
- * @since 2021-12-22
- */
-public interface AgentMapper extends BaseMapper<Agent> {
-
-}

+ 0 - 16
4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/AgentNoticeMapper.java

@@ -1,16 +0,0 @@
-package com.fdkankan.agent.mapper;
-
-import com.fdkankan.agent.entity.AgentNotice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 代理商公告表 Mapper 接口
- * </p>
- *
- * @author ${author}
- * @since 2021-12-22
- */
-public interface AgentNoticeMapper extends BaseMapper<AgentNotice> {
-
-}

+ 0 - 5
4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/xml/AgentAuditMapper.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="com.fdkankan.agent.mapper.AgentAuditMapper">
-
-</mapper>

+ 0 - 5
4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/xml/AgentFrameworkMapper.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="com.fdkankan.agent.mapper.AgentFrameworkMapper">
-
-</mapper>

+ 0 - 5
4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/xml/AgentMapper.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="com.fdkankan.agent.mapper.AgentMapper">
-
-</mapper>

+ 0 - 5
4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/xml/AgentNoticeMapper.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="com.fdkankan.agent.mapper.AgentNoticeMapper">
-
-</mapper>

+ 0 - 16
4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/IAgentFrameworkService.java

@@ -1,16 +0,0 @@
-package com.fdkankan.agent.service;
-
-import com.fdkankan.agent.entity.AgentFramework;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 代理商架构管理 服务类
- * </p>
- *
- * @author ${author}
- * @since 2021-12-22
- */
-public interface IAgentFrameworkService extends IService<AgentFramework> {
-
-}

+ 0 - 16
4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/IAgentNoticeService.java

@@ -1,16 +0,0 @@
-package com.fdkankan.agent.service;
-
-import com.fdkankan.agent.entity.AgentNotice;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 代理商公告表 服务类
- * </p>
- *
- * @author ${author}
- * @since 2021-12-22
- */
-public interface IAgentNoticeService extends IService<AgentNotice> {
-
-}

+ 0 - 16
4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/IAgentService.java

@@ -1,16 +0,0 @@
-package com.fdkankan.agent.service;
-
-import com.fdkankan.agent.entity.Agent;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 代理商表 服务类
- * </p>
- *
- * @author ${author}
- * @since 2021-12-22
- */
-public interface IAgentService extends IService<Agent> {
-
-}

+ 0 - 20
4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/impl/AgentFrameworkServiceImpl.java

@@ -1,20 +0,0 @@
-package com.fdkankan.agent.service.impl;
-
-import com.fdkankan.agent.entity.AgentFramework;
-import com.fdkankan.agent.mapper.AgentFrameworkMapper;
-import com.fdkankan.agent.service.IAgentFrameworkService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 代理商架构管理 服务实现类
- * </p>
- *
- * @author ${author}
- * @since 2021-12-22
- */
-@Service
-public class AgentFrameworkServiceImpl extends ServiceImpl<AgentFrameworkMapper, AgentFramework> implements IAgentFrameworkService {
-
-}

+ 0 - 20
4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/impl/AgentNoticeServiceImpl.java

@@ -1,20 +0,0 @@
-package com.fdkankan.agent.service.impl;
-
-import com.fdkankan.agent.entity.AgentNotice;
-import com.fdkankan.agent.mapper.AgentNoticeMapper;
-import com.fdkankan.agent.service.IAgentNoticeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 代理商公告表 服务实现类
- * </p>
- *
- * @author ${author}
- * @since 2021-12-22
- */
-@Service
-public class AgentNoticeServiceImpl extends ServiceImpl<AgentNoticeMapper, AgentNotice> implements IAgentNoticeService {
-
-}

+ 0 - 20
4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/impl/AgentServiceImpl.java

@@ -1,20 +0,0 @@
-package com.fdkankan.agent.service.impl;
-
-import com.fdkankan.agent.entity.Agent;
-import com.fdkankan.agent.mapper.AgentMapper;
-import com.fdkankan.agent.service.IAgentService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 代理商表 服务实现类
- * </p>
- *
- * @author ${author}
- * @since 2021-12-22
- */
-@Service
-public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements IAgentService {
-
-}

+ 62 - 0
4dkankan-center-platform/src/main/java/com/fdkankan/generate/AutoGenerate.java

@@ -0,0 +1,62 @@
+package com.fdkankan.generate;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.generator.FastAutoGenerator;
+import com.baomidou.mybatisplus.generator.config.OutputFile;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class AutoGenerate {
+
+
+    public static void main(String[] args) {
+        String path ="H:\\project\\4dkankan-parent\\4dkankan-center-platform";
+        List<String> tables = new ArrayList<>();
+        tables.add("t_agent_audit");
+
+        FastAutoGenerator.create("jdbc:mysql://localhost:3306/4dkankan_center_application",
+                "root","123456")
+                .globalConfig(builder -> {
+                    builder.author("")               //作者
+                            .outputDir(path+"\\src\\main\\java")    //输出路径(写到java目录)
+                            //.enableSwagger()           //开启swagger
+                            .commentDate("yyyy-MM-dd")
+                            .fileOverride();            //开启覆盖之前生成的文件
+
+                })
+                .packageConfig(builder -> {
+                    builder.parent("com.fdkankan")
+                            .moduleName("test")
+                            .entity("entity")
+                            .service("service")
+                            .serviceImpl("service.impl")
+                            .controller("controller")
+                            .mapper("mapper")
+                            .xml("mapper")
+                            .pathInfo(Collections.singletonMap(OutputFile.mapperXml,path+"\\src\\main\\resources\\mapper"));
+                })
+                .strategyConfig(builder -> {
+                    builder.addInclude(tables)
+                            .addTablePrefix("t_")
+                            .serviceBuilder()
+                            .formatServiceFileName("I%sService")
+                            .formatServiceImplFileName("%sServiceImpl")
+                            .entityBuilder()
+                            .enableLombok()
+                            .logicDeleteColumnName("deleted")
+                            .enableTableFieldAnnotation()
+                            .controllerBuilder()
+                            .formatFileName("%sController")
+                            .enableRestStyle()
+                            .mapperBuilder()
+                            .superClass(BaseMapper.class)
+                            .formatMapperFileName("%sMapper")
+                            .enableMapperAnnotation()
+                            .formatXmlFileName("%sMapper");
+                })
+               // .templateEngine(new FreemarkerTemplateEngine()) // 使用Freemarker引擎模板,默认的是Velocity引擎模板
+                .execute();
+    }
+}

+ 32 - 0
4dkankan-center-platform/src/main/java/com/fdkankan/test/controller/AgentAuditController.java

@@ -0,0 +1,32 @@
+package com.fdkankan.test.controller;
+
+
+import com.fdkankan.common.rocketmq.producer.MqSendMessage;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 代理商申请表 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2021-12-23
+ */
+@RestController
+@RequestMapping("/test/")
+public class AgentAuditController {
+
+    @Resource(name = "mqSendMessage")
+    MqSendMessage mqSendMessage;
+
+
+    @RequestMapping("send")
+    public String getOne(String msg){
+        mqSendMessage.sendMessage(msg);
+        return msg;
+    }
+}
+

+ 32 - 14
4dkankan-center-platform/src/main/java/com/fdkankan/agent/entity/AgentAudit.java

@@ -1,29 +1,28 @@
-package com.fdkankan.agent.entity;
+package com.fdkankan.test.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * <p>
  * 代理商申请表
  * </p>
  *
- * @author ${author}
- * @since 2021-12-22
+ * @author 
+ * @since 2021-12-23
  */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
+@Getter
+@Setter
 @TableName("t_agent_audit")
 public class AgentAudit implements Serializable {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
@@ -31,96 +30,115 @@ public class AgentAudit implements Serializable {
     /**
      * 经销商公司名称
      */
+    @TableField("audit_name")
     private String auditName;
 
     /**
      * 国家
      */
+    @TableField("country")
     private String country;
 
     /**
      * 地区
      */
+    @TableField("region")
     private String region;
 
     /**
      * 地址
      */
+    @TableField("address")
     private String address;
 
     /**
      * 类型,1为线下,2为线上
      */
+    @TableField("audit_type")
     private Integer auditType;
 
     /**
      * 线下门店地址或线上网站
      */
+    @TableField("store_address")
     private String storeAddress;
 
     /**
      * 申请人的姓
      */
+    @TableField("sur_name")
     private String surName;
 
     /**
      * 申请人的名字
      */
+    @TableField("user_name")
     private String userName;
 
     /**
      * 申请人职位
      */
+    @TableField("post")
     private String post;
 
     /**
      * 区号
      */
+    @TableField("area_code")
     private String areaCode;
 
     /**
      * 手机号
      */
+    @TableField("phone")
     private String phone;
 
     /**
      * 邮箱地址
      */
+    @TableField("email")
     private String email;
 
     /**
      * 状态,0申请中,1审核通过,2审核失败
      */
+    @TableField("state")
     private Integer state;
 
     /**
      * 创建时间
      */
-    private Date createTime;
+    @TableField("create_time")
+    private LocalDateTime createTime;
 
     /**
      * 更新时间
      */
-    private Date updateTime;
+    @TableField("update_time")
+    private LocalDateTime updateTime;
 
     /**
      * 记录的状态,A: 生效,I: 禁用
      */
+    @TableField("rec_status")
     private String recStatus;
 
     /**
      * 备注等级
      */
+    @TableField("note_type")
     private Integer noteType;
 
     /**
      * 备注内容
      */
+    @TableField("note_content")
     private String noteContent;
 
     /**
      * 0正常,1删除
      */
+    @TableField("tb_status")
     private Integer tbStatus;
 
 

+ 6 - 4
4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/AgentAuditMapper.java

@@ -1,16 +1,18 @@
-package com.fdkankan.agent.mapper;
+package com.fdkankan.test.mapper;
 
-import com.fdkankan.agent.entity.AgentAudit;
+import com.fdkankan.test.entity.AgentAudit;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
  * 代理商申请表 Mapper 接口
  * </p>
  *
- * @author ${author}
- * @since 2021-12-22
+ * @author 
+ * @since 2021-12-23
  */
+@Mapper
 public interface AgentAuditMapper extends BaseMapper<AgentAudit> {
 
 }

+ 4 - 4
4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/IAgentAuditService.java

@@ -1,6 +1,6 @@
-package com.fdkankan.agent.service;
+package com.fdkankan.test.service;
 
-import com.fdkankan.agent.entity.AgentAudit;
+import com.fdkankan.test.entity.AgentAudit;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 代理商申请表 服务类
  * </p>
  *
- * @author ${author}
- * @since 2021-12-22
+ * @author 
+ * @since 2021-12-23
  */
 public interface IAgentAuditService extends IService<AgentAudit> {
 

+ 6 - 6
4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/impl/AgentAuditServiceImpl.java

@@ -1,8 +1,8 @@
-package com.fdkankan.agent.service.impl;
+package com.fdkankan.test.service.impl;
 
-import com.fdkankan.agent.entity.AgentAudit;
-import com.fdkankan.agent.mapper.AgentAuditMapper;
-import com.fdkankan.agent.service.IAgentAuditService;
+import com.fdkankan.test.entity.AgentAudit;
+import com.fdkankan.test.mapper.AgentAuditMapper;
+import com.fdkankan.test.service.IAgentAuditService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
@@ -11,8 +11,8 @@ import org.springframework.stereotype.Service;
  * 代理商申请表 服务实现类
  * </p>
  *
- * @author ${author}
- * @since 2021-12-22
+ * @author 
+ * @since 2021-12-23
  */
 @Service
 public class AgentAuditServiceImpl extends ServiceImpl<AgentAuditMapper, AgentAudit> implements IAgentAuditService {

+ 17 - 1
4dkankan-center-platform/src/main/resources/application.yml

@@ -48,4 +48,20 @@ oss:
   type: oss
   s3key: AKIAWCV5QFZ3ZNELKYUY
   s3secrey: epS5ghyR4LJ7rxk/qJO9ZYh6m9Oz6g5haKDu4yws
-  s3bucket: 4dkankan
+  s3bucket: 4dkankan
+
+
+rocketmq:
+  name-srv-addr: 127.0.0.1:9876 #集群地址,多个;隔开
+  producer:
+    group:
+      testGrop: test_grop
+    sendMsgTimeout: 5000  #发送超时配置毫秒数, 可选s, 默认3000
+    retryTimesWhenSendFailed: 15 #发送消息失败之后重试次数
+    maxMessageSize: 4194304  #消息最大长度,默认1024*1024*4(4M)
+  consumer:
+    testGrop: test_grop
+  topic:
+    testGrop: test_grop
+  tag:
+    testGrop: test

+ 18 - 0
4dkankan-common/pom.xml

@@ -14,6 +14,7 @@
     <artifactId>4dkankan-common</artifactId>
 
     <dependencies>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -79,6 +80,23 @@
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>5.3.13</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.rocketmq</groupId>
+            <artifactId>rocketmq-common</artifactId>
+            <version>3.6.2.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.rocketmq</groupId>
+            <artifactId>rocketmq-client</artifactId>
+            <version>4.5.1</version>
+        </dependency>
+
     </dependencies>
 
     <build>

+ 7 - 0
4dkankan-common/src/main/java/com/fdkankan/common/rocketmq/MQLogFormat.java

@@ -0,0 +1,7 @@
+package com.fdkankan.common.rocketmq;
+
+public interface MQLogFormat {
+
+    String mqConsumerLogFormat = "MQ|consumer|groupName:%s|topic:%s|tag:%s|message:%s"; //消费者开始消费日志
+    String mqProducerLogFormat = "MQ|producer|topic:%s|tag:%s|keys:%s|message:%s"; //消费者开始消费日志
+}

+ 60 - 0
4dkankan-common/src/main/java/com/fdkankan/common/rocketmq/consumer/Consumer.java

@@ -0,0 +1,60 @@
+package com.fdkankan.common.rocketmq.consumer;
+
+import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
+import org.apache.rocketmq.client.exception.MQClientException;
+import org.apache.rocketmq.common.consumer.ConsumeFromWhere;
+import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+
+@Component
+public class Consumer {
+    private static Logger logger = LoggerFactory.getLogger("programLog");
+
+    @Value("${rocketmq.name-srv-addr}")
+    private String nameSrvAddr;
+
+    @Value("${rocketmq.consumer.testGrop}")
+    private String consumerGroupName;
+
+    @Value("${rocketmq.topic.testGrop}")
+    private String topicName;
+
+    @Value("${rocketmq.tag.testGrop}")
+    private String tagName;
+
+    @Autowired
+    MqGetMessage mqGetMessage;
+
+    @PostConstruct
+    public void CalUserTradeAmountConsumer() throws MQClientException {
+        // Instantiate with specified consumer group name.
+        DefaultMQPushConsumer consumer = new DefaultMQPushConsumer(consumerGroupName);
+
+        // Specify name server addresses.
+        consumer.setNamesrvAddr(nameSrvAddr);
+        consumer.setInstanceName(consumerGroupName);
+        //广播
+        consumer.setMessageModel(MessageModel.BROADCASTING);
+        //一次最大消费多少数量消息,与List<MessageExt>数组数量有关,默认为1
+        //  consumer.setConsumeThreadMax(batchMaxSize);
+        //设置Consumer第一次启动是从队列头部开始消费还是队列尾部开始消费
+        //如果非第一次启动,那么按照上次消费的位置继续消费
+        consumer.setConsumeFromWhere(ConsumeFromWhere.CONSUME_FROM_FIRST_OFFSET);
+
+        // Subscribe one or more topics to consume.
+        consumer.subscribe(topicName, tagName);
+
+        // Register callback to execute on arrival of messages fetched from brokers.
+        consumer.registerMessageListener(mqGetMessage);
+
+        //Launch the consumer instance.
+        consumer.start();
+    }
+
+}

+ 51 - 0
4dkankan-common/src/main/java/com/fdkankan/common/rocketmq/consumer/MqGetMessage.java

@@ -0,0 +1,51 @@
+package com.fdkankan.common.rocketmq.consumer;
+
+import com.alibaba.fastjson.JSON;
+import com.fdkankan.common.rocketmq.MQLogFormat;
+import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
+import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
+import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
+import org.apache.rocketmq.common.message.MessageExt;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+
+@Component
+public class MqGetMessage implements MessageListenerConcurrently {
+
+    private static Logger log = LoggerFactory.getLogger("programLog");
+
+
+    @Value("${rocketmq.consumer.testGrop}")
+    private String consumerGroupName;
+
+    @Value("${rocketmq.topic.testGrop}")
+    private String topicName;
+
+    @Value("${rocketmq.tag.testGrop}")
+    private String  tagName;
+
+    @Override
+    public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgExt,
+                                                    ConsumeConcurrentlyContext consumeConcurrentlyContext) {
+        if (CollectionUtils.isEmpty(msgExt)) {
+            return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
+        }
+        MessageExt messageExt = msgExt.get(0);
+        Object object = JSON.parse(messageExt.getBody());
+        String msg = JSON.toJSONString(object);
+        work(msg);
+        log.info(String.format(MQLogFormat.mqConsumerLogFormat, consumerGroupName, topicName, tagName, JSON.toJSONString(object)));
+        return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
+    }
+
+
+
+    public  void work(String msg){
+        
+    }
+}

+ 59 - 0
4dkankan-common/src/main/java/com/fdkankan/common/rocketmq/producer/MqSendMessage.java

@@ -0,0 +1,59 @@
+package com.fdkankan.common.rocketmq.producer;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.common.rocketmq.MQLogFormat;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.rocketmq.client.exception.MQBrokerException;
+import org.apache.rocketmq.client.exception.MQClientException;
+import org.apache.rocketmq.client.producer.DefaultMQProducer;
+import org.apache.rocketmq.common.message.Message;
+import org.apache.rocketmq.remoting.exception.RemotingException;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+@Component
+public class MqSendMessage {
+    private static final Logger log = LogManager.getLogger("programLog");
+
+    @Resource(name = "testProducer")
+    protected DefaultMQProducer testProducer;
+
+    @Value("${rocketmq.topic.testGrop}")
+    private String topicName;
+
+    @Value("${rocketmq.tag.testGrop}")
+    private String tagName;
+
+
+    public void sendMessage(String context){
+        long currentTimeMillis = System.currentTimeMillis();
+        String keys = topicName + "_"+ currentTimeMillis;
+        Message msg = new Message(
+                topicName,
+                tagName,
+                // keys 每条消息唯一
+                keys,
+                JSONObject.toJSONString(context).getBytes());
+        try {
+            testProducer.send(msg);
+            log.info(String.format(MQLogFormat.mqProducerLogFormat, topicName, tagName, keys, JSON.toJSONString(context)));
+            log.info("SendMQ|messageContent|推送成功:"+ JSONObject.toJSONString(context) + "_" + currentTimeMillis);
+        } catch (MQClientException e) {
+            log.info("testProducer|sendMessage|MQClientException");
+            log.error("testProducer|sendMessage|" + e.getMessage(), e);
+        } catch (RemotingException e) {
+            log.info("testProducer|sendMessage|RemotingException");
+            log.error("testProducer|sendMessage|" + e.getMessage(), e);
+        } catch (InterruptedException e) {
+            log.info("testProducer|sendMessage|InterruptedException");
+            log.error("testProducer|sendMessage|" + e.getMessage(), e);
+        } catch (MQBrokerException e) {
+            log.info("testProducer|sendMessage|MQBrokerException");
+            log.error("testProducer|sendMessage|" + e.getMessage(), e);
+        }
+    }
+}

+ 70 - 0
4dkankan-common/src/main/java/com/fdkankan/common/rocketmq/producer/Producer.java

@@ -0,0 +1,70 @@
+package com.fdkankan.common.rocketmq.producer;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.rocketmq.client.exception.MQClientException;
+import org.apache.rocketmq.client.producer.DefaultMQProducer;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class Producer {
+
+    private static final Logger log = LogManager.getLogger("programLog");
+
+    @Value("${rocketmq.name-srv-addr}")
+    private String nameSrvAddr;
+    @Value("${rocketmq.producer.group.testGrop}")
+    private String producerGroupName;
+    /**
+     * 消息最大大小,默认4M
+     */
+    @Value("${rocketmq.producer.maxMessageSize}")
+    private Integer maxMessageSize;
+    /**
+     * 消息发送超时时间,默认3秒
+     */
+    @Value("${rocketmq.producer.sendMsgTimeout}")
+    private Integer sendMsgTimeout;
+    /**
+     * 消息发送失败重试次数,默认2次
+     */
+    @Value("${rocketmq.producer.retryTimesWhenSendFailed}")
+    private Integer retryTimesWhenSendFailed;
+
+    /**
+     * 初始化向rocketmq发送普通消息的生产者
+     */
+    @Bean("testProducer")
+    public DefaultMQProducer testProducer() throws MQClientException {
+        /*
+         * 一个应用创建一个Producer,由应用来维护此对象,可以设置为全局对象或者单例<br>
+         * 注意:ProducerGroupName需要由应用来保证唯一<br>
+         * ProducerGroup这个概念发送普通的消息时,作用不大,但是发送分布式事务消息时,比较关键,
+         * 因为服务器会回查这个Group下的任意一个Producer
+         */
+        DefaultMQProducer producer = new DefaultMQProducer(producerGroupName);
+        producer.setInstanceName(producerGroupName);
+        producer.setNamesrvAddr(nameSrvAddr);
+        //设置 lnstanceName,当一个 Jvm 需要启动多个 Producer 的时候,通过设置不同的 InstanceName来区分,不设置的话系统使用默认名称“DEFAULT”
+//        producer.setInstanceName(properties.getProducerInstanceName());
+        producer.setVipChannelEnabled(false);
+        //发送消息超时时间,默认3000
+        producer.setSendMsgTimeout(sendMsgTimeout);
+        //发送消息失败重试次数,默认2
+        producer.setRetryTimesWhenSendAsyncFailed(retryTimesWhenSendFailed);
+        //消息最大长度 默认1024*1024*4(4M)
+        producer.setMaxMessageSize(maxMessageSize);
+        /*
+         * Producer对象在使用之前必须要调用start初始化,初始化一次即可<br>
+         * 注意:切记不可以在每次发送消息时,都调用start方法
+         */
+        producer.start();
+        log.info("RocketMq " + this + " Started.");
+        return producer;
+    }
+
+
+
+}

+ 10 - 3
4dkankan-pom/pom.xml

@@ -39,21 +39,28 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.mybatis.spring.boot</groupId>-->
+<!--            <artifactId>mybatis-spring-boot-starter</artifactId>-->
+<!--        </dependency>-->
+
 
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.3.1.tmp</version>
+            <version>3.4.3.4</version>
         </dependency>
+        <!--mybatis-plus代码生成器-->
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-generator</artifactId>
-            <version>3.3.1.tmp</version>
+            <version>3.5.1</version>
         </dependency>
+        <!--velocity模板-->
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-core</artifactId>
-            <version>2.2</version>
+            <version>2.3</version>
         </dependency>
 
         <dependency>

+ 0 - 95
4dkankan-pom/src/test/java/TestAutoGenerate.java

@@ -1,95 +0,0 @@
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.generator.AutoGenerator;
-import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
-import com.baomidou.mybatisplus.generator.config.GlobalConfig;
-import com.baomidou.mybatisplus.generator.config.PackageConfig;
-import com.baomidou.mybatisplus.generator.config.StrategyConfig;
-import com.baomidou.mybatisplus.generator.config.rules.DateType;
-import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import org.junit.jupiter.api.Test;
-
-public class TestAutoGenerate {
-
-    @Test
-    public  void autoGenerate() {
-        // Step1:代码生成器
-        AutoGenerator mpg = new AutoGenerator();
-        // Step2:全局配置
-        GlobalConfig gc = new GlobalConfig();
-        // 填写代码生成的目录(需要修改)
-        String projectPath = "F:\\code2\\4dkankan-parent\\4dkankan-center-scene";
-        // 拼接出代码最终输出的目录
-        gc.setOutputDir(projectPath + "/src/main/java");
-        // 配置开发者信息(可选)(需要修改)
-        //gc.setAuthor("lyh");
-        // 配置是否打开目录,false 为不打开(可选)
-        gc.setOpen(false);
-        // 实体属性 Swagger2 注解,添加 Swagger 依赖,开启 Swagger2 模式(可选)
-        //gc.setSwagger2(true);
-        // 重新生成文件时是否覆盖,false 表示不覆盖(可选)
-        gc.setFileOverride(false);
-        // 配置主键生成策略,此处为 ASSIGN_ID(可选)
-        gc.setIdType(IdType.AUTO);
-        // 配置日期类型,此处为 ONLY_DATE(可选)
-        gc.setDateType(DateType.ONLY_DATE);
-        // 默认生成的 service 会有 I 前缀
-        //gc.setServiceName("%sService");
-        mpg.setGlobalConfig(gc);
-
-        // Step3:数据源配置(需要修改)
-        DataSourceConfig dsc = new DataSourceConfig();
-        // 配置数据库 url 地址
-        dsc.setUrl("jdbc:mysql://120.25.146.52:3306/4dkankan-center-scene?useUnicode=true&characterEncoding=utf8");
-        // dsc.setSchemaName("testMyBatisPlus"); // 可以直接在 url 中指定数据库名
-        // 配置数据库驱动
-        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
-        // 配置数据库连接用户名
-        dsc.setUsername("root");
-        // 配置数据库连接密码
-        dsc.setPassword("4dkk2020test%");
-        mpg.setDataSource(dsc);
-
-        // Step:4:包配置
-        PackageConfig pc = new PackageConfig();
-        // 配置父包名(需要修改)
-        pc.setParent("com.fdkankan");
-        // 配置模块名(需要修改)
-        pc.setModuleName("scene");
-        // 配置 entity 包名
-        pc.setEntity("entity");
-        // 配置 mapper 包名
-        pc.setMapper("mapper");
-        // 配置 service 包名
-        pc.setService("service");
-        // 配置 controller 包名
-        pc.setController("controller");
-        mpg.setPackageInfo(pc);
-
-        // Step5:策略配置(数据库表配置)
-        StrategyConfig strategy = new StrategyConfig();
-        // 指定表名 {}
-        String [] tableNames ={"t_folder","t_folder_scene","t_scene","t_scene_3d_num","t_scene_3dfamily",
-                "t_scene_cooperation","t_scene_data_download","t_scene_download_log","t_scene_feedback",
-                "t_scene_file_build","t_scene_file_upload","t_scene_module_video","t_scene_pro",
-                "t_scene_pro_edit","t_scene_pro_edit","t_scene_pro_ext","t_scene_record","t_scene_resource",
-                "t_scene_resource_camera","t_scene_resource_cooperation","t_scene_statistics"};
-        strategy.setInclude(tableNames);
-        // 配置数据表与实体类名之间映射的策略
-        strategy.setNaming(NamingStrategy.underline_to_camel);
-        // 配置数据表的字段与实体类的属性名之间映射的策略
-        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
-        // 配置 lombok 模式
-        strategy.setEntityLombokModel(true);
-        // 配置 rest 风格的控制器(@RestController)
-        strategy.setRestControllerStyle(true);
-        // 配置驼峰转连字符
-        strategy.setControllerMappingHyphenStyle(true);
-        // 配置表前缀,生成实体时去除表前缀
-        String [] prefix ={"t_","_"};
-        strategy.setTablePrefix(prefix);
-        mpg.setStrategy(strategy);
-
-        // Step6:执行代码生成操作
-        mpg.execute();
-    }
-}