diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/utils/HttpHelper.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/utils/HttpHelper.java index fb83d6bd..ca95c135 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/utils/HttpHelper.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/utils/HttpHelper.java @@ -1,7 +1,7 @@ package com.bonus.common.biz.utils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; + +import com.alibaba.fastjson2.JSONObject; import com.bonus.common.security.utils.SecurityUtils; import org.apache.http.HttpEntity; import org.apache.http.client.methods.CloseableHttpResponse; @@ -245,4 +245,4 @@ public class HttpHelper { } -} \ No newline at end of file +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/PushProDataUseInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/PushProDataUseInfoController.java index 5df61a7c..23335871 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/PushProDataUseInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/PushProDataUseInfoController.java @@ -98,6 +98,22 @@ public class PushProDataUseInfoController extends BaseController { throw new ServiceException("数据查询异常,请联系运维人员查询日志处理"); } } + /** + * 查询重要机具详情 + * + * @param bean + * @return + */ + @GetMapping(value = "getDeviceNumByType") + public AjaxResult getDeviceNumByType(ProIdsBean bean) { + try { + List results = service.getDeviceNumByType(bean); + return AjaxResult.success(results); + } catch (Exception e) { + logger.error(e.toString(), e); + throw new ServiceException("数据查询异常,请联系运维人员查询日志处理"); + } + } /** * 保有量、在用量、再修量、库存量 装备详情 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/StaticsNumsBean.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/StaticsNumsBean.java index 05ffd36b..3e1d512a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/StaticsNumsBean.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/StaticsNumsBean.java @@ -34,4 +34,9 @@ public class StaticsNumsBean { * 单位名称 */ private String unitName; + + /** + * 单位名称 + */ + private String deviceName; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/TotalNumsBean.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/TotalNumsBean.java index 11780272..447351fe 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/TotalNumsBean.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/TotalNumsBean.java @@ -2,6 +2,7 @@ package com.bonus.material.push.domain; import lombok.Data; import java.math.BigDecimal; +import java.util.List; @Data public class TotalNumsBean { @@ -17,6 +18,13 @@ public class TotalNumsBean { private BigDecimal num; private BigDecimal ApproachingNum; private BigDecimal TimeoutNum; + private BigDecimal stNum; + private BigDecimal leaseNum; + + private String deviceName; + + private List projectIds; + // 可以根据需要添加分类名称getter方法 public String getCategoryName() { @@ -34,4 +42,4 @@ public class TotalNumsBean { default: return "未知分类"; } } -} \ No newline at end of file +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/mapper/ProDataUseInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/mapper/ProDataUseInfoMapper.java index a3b1d957..8f52d6ca 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/mapper/ProDataUseInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/mapper/ProDataUseInfoMapper.java @@ -57,4 +57,6 @@ public interface ProDataUseInfoMapper { List getCompletionNotRefundedSub(ProIdsBean bean); List getCompletionNotRefundedDetailsSub(ProIdsBean bean); + + List getDeviceNumByType(ProIdsBean bean); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/ProDataUseInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/ProDataUseInfoService.java index 09f92b1f..1ae21d68 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/ProDataUseInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/ProDataUseInfoService.java @@ -48,4 +48,6 @@ public interface ProDataUseInfoService { List getCompletionNotRefundedSub(ProIdsBean bean); List getCompletionNotRefundedDetailsSub(ProIdsBean bean); + + List getDeviceNumByType(ProIdsBean bean); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/ProDataUseInfoImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/ProDataUseInfoImpl.java index a2da1fdf..8832bf2b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/ProDataUseInfoImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/ProDataUseInfoImpl.java @@ -218,4 +218,9 @@ public class ProDataUseInfoImpl implements ProDataUseInfoService { public List getCompletionNotRefundedDetailsSub(ProIdsBean bean) { return proDataUseInfoMapper.getCompletionNotRefundedDetailsSub(bean); } + + @Override + public List getDeviceNumByType(ProIdsBean bean) { + return proDataUseInfoMapper.getDeviceNumByType(bean); + } } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml index 08d3338b..f8413634 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml @@ -737,4 +737,542 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +