From 8a28cffd71c29ea6d127d4b9ce41c386960a3838 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 13 Aug 2020 11:29:53 +0800 Subject: [PATCH 1/2] init --- .../src/main/resources/mapper/WxAppinfoMapper.xml | 7 ++----- .../main/resources/mapper/WxAuthorizerInfoMapper.xml | 8 +++----- .../src/main/resources/mapper/WxMsgConfigMapper.xml | 10 ++-------- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml b/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml index 713032e6d..5568fb4eb 100644 --- a/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml @@ -17,14 +17,14 @@ - + `id`,`tenant_id`,`app_id`,`parent_app_id`,`name`, `secret`,`token`,`aes_key`,`msg_data_format`,`access_token`,`last_token_time`,`expires_in`, - `pay_id`,`type`,`pay_bill_id`,`group_support` + `pay_id`,`type`,`pay_bill_id` @@ -86,9 +86,6 @@ and `pay_bill_id` = #{payBillId} - - and `group_support` = #{groupSupport} - and id in diff --git a/mallinkService/src/main/resources/mapper/WxAuthorizerInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxAuthorizerInfoMapper.xml index 06a06703f..8ce22317b 100644 --- a/mallinkService/src/main/resources/mapper/WxAuthorizerInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAuthorizerInfoMapper.xml @@ -29,7 +29,7 @@ - + @@ -38,7 +38,7 @@ `base_status`, `base_time`, `domain_status`, `domain_time`, `webdomain_status`, `webdomain_time`, `template_status`, `template_time`, `current_version`,`current_desc`,`release_time`, `open_appid`,`bind_open_time`,`refresh_token`, - `access_token`,`access_token_expire`,`group_support`,`enable` + `access_token`,`access_token_expire`,`enable` @@ -115,9 +115,7 @@ and `bind_open_time` = #{bindOpenTime} - - and `group_support` = #{groupSupport} - + and `enable` = #{enable} diff --git a/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml index 7f99ab969..999716609 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml @@ -18,15 +18,14 @@ - + - `id`,`tenant_id`,`parent_tenant_id`,`secret`,`publickey`,`bid`,`recharge`,`remains`,`total`,`account`, - `reminderstatus`,`reminder`,`phone`,`notifyurl`,`modelnotifyurl`,`verifynotifyurl`,`appid`,`sms_channel` + `reminderstatus`,`reminder`,`phone`,`notifyurl`,`modelnotifyurl`,`verifynotifyurl`,`sms_channel` @@ -99,11 +98,6 @@ - - and `appid` = #{appid} - - - and `sms_channel` = #{smsChannel} From d87292b0e2578beddbd7d43dac9bd05386fa1218 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 13 Aug 2020 14:18:18 +0800 Subject: [PATCH 2/2] init --- .../controller/basic/EnumController.java | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 mallinkAdmin/src/main/java/com/iformall/controller/basic/EnumController.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/EnumController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/EnumController.java new file mode 100644 index 000000000..9f92ae5b8 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/EnumController.java @@ -0,0 +1,56 @@ +package com.iformall.controller.basic; + +import com.iformall.annotation.SystemControllerLog; +import com.iformall.common.ErrorCode; +import com.iformall.common.ResultData; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.annotation.*; + +import java.lang.reflect.Method; +import java.util.*; + +@RestController +@RequestMapping("enum") +@Api(description="枚举接口") +public class EnumController { + + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @SystemControllerLog(description = "会员管理-标签获取") + @ApiOperation(value="获取枚举对象", notes="根据获取枚举类名获取枚举对象") + @GetMapping("/getEnum/{type}") + public ResultData getEnum(@PathVariable("type") String type) { + if(StringUtils.isBlank(type)){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + String className = "com.iformall.enums." + type; + List> list = new ArrayList>(); + try { + // 1.得到枚举类对象 + Class clz = (Class) Class.forName(className); + // 2.得到所有枚举常量 + Object[] objects = clz.getEnumConstants(); + Method getCode = clz.getMethod("getCode"); + Method getMessage = clz.getMethod("getMessage"); + Map map = null; + for (Object obj : objects) { + map = new HashMap(); + map.put("code", getCode.invoke(obj).toString()); + map.put("message", getMessage.invoke(obj).toString()); + list.add(map); + } + } catch (Exception e) { + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"数据不存在"); + } + if(list.size() == 0){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"数据不存在"); + } + return new ResultData(list); + + } + +}