diff --git a/jianshui-common/src/main/java/com/jianshui/common/constant/ServiceMode.java b/jianshui-common/src/main/java/com/jianshui/common/constant/ServiceMode.java new file mode 100644 index 0000000..a917caa --- /dev/null +++ b/jianshui-common/src/main/java/com/jianshui/common/constant/ServiceMode.java @@ -0,0 +1,32 @@ +package com.jianshui.common.constant; + +public enum ServiceMode { + SERVICE_MODE_0("0", "免费"), + SERVICE_MODE_1("1", "预付费"), + SERVICE_MODE_2("2", "定期结算"); + + private String serviceModeCode; + private String serviceModeMsg; + + ServiceMode(String serviceModeCode, String serviceModeMsg){ + this.serviceModeCode = serviceModeCode; + this.serviceModeMsg = serviceModeMsg; + } + + public String getServiceModeMsg(){ + return serviceModeMsg; + } + + public String getServiceModeCode(){ + return serviceModeCode; + } + + public static String getRebackType(String code){ + for(ServiceMode rebackType : ServiceMode.values()){ + if(rebackType.getServiceModeCode().equals(code)){ + return rebackType.getServiceModeMsg(); + } + } + return "未知服务模式"; + } +} diff --git a/jianshui-system/src/main/java/com/jianshui/system/domain/ServiceManage.java b/jianshui-system/src/main/java/com/jianshui/system/domain/ServiceManage.java index 0c9bace..38872c2 100644 --- a/jianshui-system/src/main/java/com/jianshui/system/domain/ServiceManage.java +++ b/jianshui-system/src/main/java/com/jianshui/system/domain/ServiceManage.java @@ -29,9 +29,12 @@ public class ServiceManage extends BaseEntity private String serviceKey; /** 服务状态 */ - @Excel(name = "服务状态") + private Integer state; + @Excel(name = "服务状态") + private String serviceState; + /** 请求报文类型 */ @Excel(name = "请求报文类型") private String requestMessageKey; @@ -89,10 +92,20 @@ public class ServiceManage extends BaseEntity this.state = state; } + public void setServiceState(String serviceState) + { + this.serviceState = serviceState; + } + public Integer getState() { return state; } + + public String getServiceState() + { + return serviceState; + } public void setRequestMessageKey(String requestMessageKey) { this.requestMessageKey = requestMessageKey; diff --git a/jianshui-system/src/main/java/com/jianshui/system/service/impl/ServiceManageServiceImpl.java b/jianshui-system/src/main/java/com/jianshui/system/service/impl/ServiceManageServiceImpl.java index dbf2d43..214a270 100644 --- a/jianshui-system/src/main/java/com/jianshui/system/service/impl/ServiceManageServiceImpl.java +++ b/jianshui-system/src/main/java/com/jianshui/system/service/impl/ServiceManageServiceImpl.java @@ -5,6 +5,7 @@ import java.util.Date; import java.util.List; import com.jianshui.common.constant.Constants; +import com.jianshui.common.constant.ServiceMode; import com.jianshui.common.core.domain.AjaxResult; import com.jianshui.common.core.redis.RedisCache; import com.jianshui.common.exception.jianshui.JianshuiNoServiceException; @@ -13,6 +14,7 @@ import com.jianshui.common.exception.jianshui.JianshuiServiceNoSurplusException; import com.jianshui.common.utils.DateUtils; import com.jianshui.common.utils.MessageUtils; import com.jianshui.common.utils.StringUtils; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jianshui.system.mapper.ServiceManageMapper; @@ -54,7 +56,18 @@ public class ServiceManageServiceImpl implements IServiceManageService { */ @Override public List selectServiceManageList(ServiceManage serviceManage) { - return serviceManageMapper.selectServiceManageList(serviceManage); + + List serviceManages = serviceManageMapper.selectServiceManageList(serviceManage); + + for (ServiceManage manage : serviceManages) { + if (ObjectUtils.isNotEmpty(manage.getState())){ + manage.setServiceState("1".equals(manage.getState().toString())?"已启用":"已停用"); + } + if (StringUtils.isNotBlank(manage.getServiceMode())){ + manage.setServiceMode(ServiceMode.getRebackType(manage.getServiceMode())); + } + } + return serviceManages; } /**