From 9011c14f44b022c64d653a803adb2710154261fb Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 23 Jun 2020 11:34:04 +0800
Subject: [PATCH] 20200623 代码提交
---
src/main/java/com/xcong/excoin/modules/member/entity/AppVersionEntity.java | 8 ++++++++
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 19 ++++++++++---------
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 4 ++--
src/main/java/com/xcong/excoin/modules/member/parameter/vo/AppVersionListVo.java | 16 ++++++++++++++++
4 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
index ab0906c..1aeb253 100644
--- a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
+++ b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
@@ -22,7 +22,7 @@
import com.xcong.excoin.modules.member.parameter.dto.MemberUpdatePwdDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberUpdateTradePwdDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberUpdateTradersPwdTimeDto;
-import com.xcong.excoin.modules.member.parameter.vo.AppVersionVo;
+import com.xcong.excoin.modules.member.parameter.vo.AppVersionListVo;
import com.xcong.excoin.modules.member.parameter.vo.MemberAuthenticationInfoVo;
import com.xcong.excoin.modules.member.parameter.vo.MemberAvivableCoinInfoVo;
import com.xcong.excoin.modules.member.parameter.vo.MemberCoinAddressCountListVo;
@@ -62,7 +62,7 @@
* 获取当前版本号
*/
@ApiOperation(value="获取当前版本号", notes="获取当前版本号")
- @ApiResponses({@ApiResponse( code = 200, message = "success", response = AppVersionVo.class)})
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = AppVersionListVo.class)})
@GetMapping(value = "/getAppVersionInfo")
public Result getAppVersionInfo() {
return memberService.getAppVersionInfo();
diff --git a/src/main/java/com/xcong/excoin/modules/member/entity/AppVersionEntity.java b/src/main/java/com/xcong/excoin/modules/member/entity/AppVersionEntity.java
index 9cb4d3d..2261fdc 100644
--- a/src/main/java/com/xcong/excoin/modules/member/entity/AppVersionEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/member/entity/AppVersionEntity.java
@@ -16,7 +16,15 @@
@Data
@TableName("app_version")
public class AppVersionEntity implements Serializable {
+ /**
+ * 账号状态 - 禁用
+ */
+ public static final Integer type_and = 1;
+ /**
+ * 账号状态 - 启用
+ */
+ public static final Integer type_app = 2;
/**
*
*/
diff --git a/src/main/java/com/xcong/excoin/modules/member/parameter/vo/AppVersionListVo.java b/src/main/java/com/xcong/excoin/modules/member/parameter/vo/AppVersionListVo.java
new file mode 100644
index 0000000..2d11e03
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/parameter/vo/AppVersionListVo.java
@@ -0,0 +1,16 @@
+package com.xcong.excoin.modules.member.parameter.vo;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "AppVersionListVo", description = "版本信息列表")
+public class AppVersionListVo {
+
+ @ApiModelProperty(value = "版本信息")
+ private List<AppVersionVo> appVersionVo;
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index dfa904f..23f767f 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -887,19 +887,20 @@
@Override
public Result getAppVersionInfo() {
- Map<String, Object> columnMap = new HashMap<>();
- List<AppVersionEntity> selectByMap = appVersionDao.selectByMap(columnMap);
- AppVersionVo appVersionVo = new AppVersionVo();
+ Map<String, Object> columnMap = new HashMap<>();
+ List<AppVersionEntity> selectByMap = appVersionDao.selectByMap(columnMap);
+ List<Object> arrayList = new ArrayList<>();
if(CollUtil.isNotEmpty(selectByMap)) {
for(AppVersionEntity appVersionEntity : selectByMap) {
- appVersionVo.setAddress(appVersionEntity.getAddress());
- appVersionVo.setType(appVersionEntity.getType());
- appVersionVo.setVersion(appVersionEntity.getVersion());
+ AppVersionVo appVersionVo = new AppVersionVo();
+ appVersionVo.setAddress(appVersionEntity.getAddress());
+ appVersionVo.setType(appVersionEntity.getType());
+ appVersionVo.setVersion(appVersionEntity.getVersion());
+ arrayList.add(appVersionVo);
+ }
}
- }
- return Result.ok(appVersionVo);
+ return Result.ok(arrayList);
}
-
}
--
Gitblit v1.9.1