From 04f0676e7361bda58164b793f18f38696afd854c Mon Sep 17 00:00:00 2001 From: zfhai <15856818120@163.com> Date: Sat, 9 Dec 2023 11:30:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9B=B8=E5=85=B3=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zlpt/equip/api/RemoteDevInfoService.java | 19 ++++++ .../bonus/zlpt/equip/api/domain/DevInfo.java | 2 + .../zlpt/equip/api/enums/MaStatusEnum.java | 66 +++++++++++++++++++ .../service/impl/DevInfoServiceImpl.java | 4 +- .../main/resources/mapper/DevInfoMapper.xml | 3 +- .../service/FileUploadTencentServiceImpl.java | 1 + 6 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/enums/MaStatusEnum.java diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/RemoteDevInfoService.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/RemoteDevInfoService.java index 3cb3063..b447a9e 100644 --- a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/RemoteDevInfoService.java +++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/RemoteDevInfoService.java @@ -2,15 +2,34 @@ package com.bonus.zlpt.equip.api; import com.bonus.zlpt.common.core.constant.ServiceNameConstants; import com.bonus.zlpt.common.core.web.domain.AjaxResult; +import com.bonus.zlpt.equip.api.domain.TypeInfo; import com.bonus.zlpt.equip.api.factory.DevInfoServiceApiFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import javax.servlet.http.HttpServletResponse; @FeignClient(contextId = "remoteDevInfoService", value = ServiceNameConstants.EQUIP_SERVICE, fallbackFactory = DevInfoServiceApiFallbackFactory.class) public interface RemoteDevInfoService { + /** + * 设备查询 + * @param maId + * @return + */ @GetMapping(value = "/dev/{maId}") public AjaxResult getInfo(@PathVariable("maId") Long maId); + /** + * 添加设备 + * @param typeInfo + * @param typeInfo + */ + @PostMapping("/dev") + void add(@RequestBody TypeInfo typeInfo); + + } diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/DevInfo.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/DevInfo.java index 06ef12b..7a9cd0d 100644 --- a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/DevInfo.java +++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/DevInfo.java @@ -141,4 +141,6 @@ public class DevInfo extends BaseEntity private String isActive; /**文件附件*/ private List fileList; + /**城市*/ + private String city; } diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/enums/MaStatusEnum.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/enums/MaStatusEnum.java new file mode 100644 index 0000000..330db46 --- /dev/null +++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/enums/MaStatusEnum.java @@ -0,0 +1,66 @@ +package com.bonus.zlpt.equip.api.enums; + +public enum MaStatusEnum { + + /** 待上架审批 */ + PENDING_APPROVAL(15, "待上架审批"), + /** 待租 */ + ON_HIRE(16, "待租"), + /** 在租 */ + UNDER_RENT(17, "在租"), + /** 下架 */ + DELIST(18,"下架"), + /** 自有 */ + SELF_OWNED(43,"自有"); + + + + + private final Integer code; + private final String name; + + MaStatusEnum(Integer code, String name) { + this.code = code; + this.name = name; + } + + public Integer getCode() { + return code; + } + + public String getName() { + return name; + } + + /** + * 根据code获取name + * @param code + * @return + */ + public static String getNameByCode(int code) { + MaStatusEnum[] maStatusEnums = values(); + for (MaStatusEnum maStatusEnum : maStatusEnums) { + if (maStatusEnum.getCode() == code) { + return maStatusEnum.getName(); + } + } + return null; + } + + /** + * + * @param msg + * @return + */ + public static Integer getCodeByName(String msg) { + MaStatusEnum[] maStatusEnums = values(); + for (MaStatusEnum maStatusEnum : maStatusEnums) { + if (maStatusEnum.getName() == msg) { + return maStatusEnum.getCode(); + } + } + return null; + } + + +} diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java index bafb5ae..5f5df89 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java @@ -11,6 +11,7 @@ import com.bonus.zlpt.equip.api.domain.vo.DevInfoVo; import com.bonus.zlpt.common.core.domain.system.SysFile; import com.bonus.zlpt.common.core.utils.DateUtils; +import com.bonus.zlpt.equip.api.enums.MaStatusEnum; import org.springframework.beans.BeanUtils; import com.bonus.zlpt.equip.mapper.SysFileInfoMapper; @@ -183,7 +184,8 @@ public class DevInfoServiceImpl implements IDevInfoService //根据key计算每种状态的数量 for (String key : keys) { List DevInfoList = groupedByMaStatus.get(key); - sumTypeMap.put(key,DevInfoList.size()); + //根据key来获取状态名称 + sumTypeMap.put(MaStatusEnum.getNameByCode(Integer.parseInt(key)),DevInfoList.size()); } return sumTypeMap; } diff --git a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml index 94c4a81..83119aa 100644 --- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml +++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml @@ -45,12 +45,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"