From b9e6121e9be0093842cb5c5d4d20b88cfd5a65af Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 27 Sep 2021 15:51:26 +0800
Subject: [PATCH] add app version

---
 src/main/java/cc/mrbird/febs/mall/entity/AppVersion.java           |   44 ++++++++++++++++++++++
 src/main/java/cc/mrbird/febs/mall/controller/CommonController.java |    6 +++
 src/test/java/cc/mrbird/febs/AgentTest.java                        |    4 +-
 src/main/java/cc/mrbird/febs/mall/service/ICommonService.java      |    3 +
 src/main/resources/mapper/modules/AppVersionMapper.xml             |    5 ++
 sql/xc_mall.sql                                                    |   11 +++++
 src/main/java/cc/mrbird/febs/mall/mapper/AppVersionMapper.java     |   11 +++++
 src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java  |    8 ++++
 8 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/sql/xc_mall.sql b/sql/xc_mall.sql
index 8589160..c044606 100644
--- a/sql/xc_mall.sql
+++ b/sql/xc_mall.sql
@@ -340,3 +340,14 @@
 )  COMMENT = '用户收款方式';
 alter table mall_goods_category add image varchar(500) null comment '分类图片';
 
+
+DROP TABLE IF EXISTS app_version;
+create table app_version
+(
+    id  bigint auto_increment primary key,
+    version    varchar(255) null comment '版本号',
+    content    varchar(255) null comment '更新内容',
+    createtime datetime     null comment '更新时间',
+    address    varchar(255) null comment '下载地址',
+    type       tinyint      null comment '类型:1安卓,2苹果'
+)comment '版本表';
\ No newline at end of file
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/CommonController.java b/src/main/java/cc/mrbird/febs/mall/controller/CommonController.java
index 8836141..357c82a 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/CommonController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/CommonController.java
@@ -135,4 +135,10 @@
 
         return new FebsResponse().message("上传成功").success().data(url);
     }
+
+    @ApiOperation(value = "获取版本信息")
+    @GetMapping(value = "/appVersion")
+    public FebsResponse appVersion() {
+        return new FebsResponse().message("获取成功").success().data(commonService.findAppVersion());
+    }
 }
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/AppVersion.java b/src/main/java/cc/mrbird/febs/mall/entity/AppVersion.java
new file mode 100644
index 0000000..eb78956
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/entity/AppVersion.java
@@ -0,0 +1,44 @@
+package cc.mrbird.febs.mall.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 版本表
+ **/
+@Data
+@TableName("app_version")
+public class AppVersion implements Serializable {
+    /**
+     * 账号状态 - 禁用
+     */
+    public static final Integer type_and = 1;
+
+    /**
+     * 账号状态 - 启用
+     */
+    public static final Integer type_app = 2;
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createtime;
+
+    private String version;
+    private String content;
+    private String address;
+    private Integer type;
+
+
+}
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/AppVersionMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/AppVersionMapper.java
new file mode 100644
index 0000000..fcc676a
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/AppVersionMapper.java
@@ -0,0 +1,11 @@
+package cc.mrbird.febs.mall.mapper;
+
+import cc.mrbird.febs.mall.entity.AppVersion;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @author wzy
+ * @date 2021-09-27
+ **/
+public interface AppVersionMapper extends BaseMapper<AppVersion> {
+}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/ICommonService.java b/src/main/java/cc/mrbird/febs/mall/service/ICommonService.java
index 5445eca..bb78e28 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/ICommonService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/ICommonService.java
@@ -1,5 +1,6 @@
 package cc.mrbird.febs.mall.service;
 
+import cc.mrbird.febs.mall.entity.AppVersion;
 import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
 
 import java.util.List;
@@ -12,4 +13,6 @@
     boolean verifyCode(String account, String code);
 
     List<DataDictionaryCustom> findDataDicByType(String type);
+
+    List<AppVersion> findAppVersion();
 }
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java
index e9efbc9..d14bbad 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java
@@ -2,7 +2,9 @@
 
 import cc.mrbird.febs.common.utils.AppContants;
 import cc.mrbird.febs.common.utils.RedisUtils;
+import cc.mrbird.febs.mall.entity.AppVersion;
 import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
+import cc.mrbird.febs.mall.mapper.AppVersionMapper;
 import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
 import cc.mrbird.febs.mall.service.ICommonService;
 import cn.hutool.core.util.StrUtil;
@@ -22,6 +24,7 @@
 public class CommonService implements ICommonService {
     private final RedisUtils redisUtils;
     private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+    private final AppVersionMapper appVersionMapper;
 
     @Override
     public boolean verifyCode(String account, String code) {
@@ -41,4 +44,9 @@
     public List<DataDictionaryCustom> findDataDicByType(String type) {
         return dataDictionaryCustomMapper.selectDicByType(type);
     }
+
+    @Override
+    public List<AppVersion> findAppVersion() {
+        return appVersionMapper.selectList(null);
+    }
 }
diff --git a/src/main/resources/mapper/modules/AppVersionMapper.xml b/src/main/resources/mapper/modules/AppVersionMapper.xml
new file mode 100644
index 0000000..e44f3f8
--- /dev/null
+++ b/src/main/resources/mapper/modules/AppVersionMapper.xml
@@ -0,0 +1,5 @@
+<?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="cc.mrbird.febs.mall.mapper.AppVersionMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/src/test/java/cc/mrbird/febs/AgentTest.java b/src/test/java/cc/mrbird/febs/AgentTest.java
index 0e8711e..5b62509 100644
--- a/src/test/java/cc/mrbird/febs/AgentTest.java
+++ b/src/test/java/cc/mrbird/febs/AgentTest.java
@@ -99,9 +99,9 @@
     @Test
     public void autoLevelUp() {
         // agentService.autoUpAgentLevel(3L);
-//        agentProducer.sendAutoLevelUpMsg(3L);
+        agentProducer.sendAutoLevelUpMsg(9L);
 
-        agentProducer.sendReturnMoneyMsg(24L);
+//        agentProducer.sendReturnMoneyMsg(24L);
     }
 
     @Test

--
Gitblit v1.9.1