功能优化

rk

3 天以前 7b95d5cd6cb9cb6ce48c0d4667d5e3f2334012b3

功能优化

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java

@@ -430,6 +430,7 @@
        String[] resourcesByParams= new String[]{"/api/irds/v2/resource/resourcesByParams","【海康消防看板】根据条件查询目录下有权限的资源列表"};// ã€æµ·åº·æ¶ˆé˜²çœ‹æ¿ã€‘根据条件查询目录下有权限的资源列表
        String[] iccmSignoff= new String[]{"/api/iccm/v1/signoff","iccm访客签离"};// iccm访客签离
        String[] wxAuthUrl= new String[]{"dps/web/wxAuth/loginV2?oaId=atwl&redirectUrl=","待办考勤跳转地址"};// å¾…办考勤跳转地址
        String[] sensorStatusStatistic= new String[]{"/api/v1/sensorStatusStatistic","消防维保定制-设备维保情况"};//消防维保定制-设备维保情况
    }
    /**
     * é™„录A.55消防设备类型

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java

@@ -874,6 +874,12 @@
    public static String fireStatistic(String body) {
        return startDoPostStringArtemis(HKConstants.InterfacePath.fireStatistic,body);
    }


    public static String sensorStatusStatistic(String body) {
        return startDoPostStringArtemis(HKConstants.InterfacePath.sensorStatusStatistic,body);
    }

    /**
     * æ¶ˆé˜²ç»´ä¿æ¯æœˆæ–°å¢žç»Ÿè®¡
     * @param body

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/SensorStatusStatisticResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package com.doumee.core.haikang.model.param.respose;

import lombok.Data;

@Data
public class SensorStatusStatisticResponse {

private Integer  sensorNum    ;//    Number    false    ä¼ æ„Ÿå™¨æ€»æ•°
   private Integer  sensorMainNum    ;//    Number    false    ä¼ æ„Ÿå™¨ç»´ä¿æ•°
   private Integer  sensorMainRate    ;//    Number    false    ä¼ æ„Ÿå™¨ç»´ä¿çŽ‡
   private Integer  sensorMainMonthNum    ;//    Number    false    ä¼ æ„Ÿå™¨æœ¬æœˆæ–°å¢žç»´ä¿æ•°
}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java

@@ -1916,6 +1916,23 @@
        }
        return  null;
    }

    public  static  BaseResponse<SensorStatusStatisticResponse>   sensorStatusStatistic(){
        log.info("【消防维保定制-设备维保情况】================开始====");
        try {
            String res = HKTools.sensorStatusStatistic(null);
            TypeReference typeReference =
                    new TypeReference< BaseResponse<SensorStatusStatisticResponse>>(){};
            BaseResponse<SensorStatusStatisticResponse>   result = JSONObject.parseObject(res, typeReference.getType());
            logResult(result,"海康消防维保统计");
            return  result;
        }catch (Exception e){
            log.error("【消防维保定制-设备维保情况】================失败====：\n"+ e.getMessage());
        }
        return  null;
    }


    /**
     *本月新增维保设备数
     * api_fire_statistic_month

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java

@@ -1505,24 +1505,42 @@
    @Override
    public    YearDeviceDataVO yearFightingAdminDeviceData(){
        YearDeviceDataVO data = new YearDeviceDataVO();
        FireStatisticRequest param = new FireStatisticRequest();
        param.setIndexCode("api_fire_statistic");
        BaseResponse<FireStatisticResponse> response = HKService.fireStatistic(param);
        if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ) {
            data.setProtectNum(Constants.formatIntegerNum(response.getData().getMaintenanceNum()));
            data.setPlanProtectTotal(Constants.formatIntegerNum(response.getData().getDeviceTotalNum()));
//        FireStatisticRequest param = new FireStatisticRequest();
//        param.setIndexCode("api_fire_statistic");
//        BaseResponse<FireStatisticResponse> response = HKService.fireStatistic(param);
//        if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ) {
//            data.setProtectNum(Constants.formatIntegerNum(response.getData().getMaintenanceNum()));
//            data.setPlanProtectTotal(Constants.formatIntegerNum(response.getData().getDeviceTotalNum()));
//        }
//        param = new FireStatisticRequest();
//        param.setIndexCode("api_fire_statistic_month");
//        BaseResponse<FireStatisticResponse> response1 = HKService.fireStatisticMonth(param);
//        if(response1 != null && StringUtils.equals(response1.getCode(), HKConstants.RESPONSE_SUCCEE)
//                && response1.getData()!=null ) {
//            data.setMonthAddNum(Constants.formatIntegerNum(response1.getData().getMaintenanceNumMonth()));
//            data.setMonthTotalNum(Constants.formatIntegerNum(response1.getData().getDeviceTotalNum()));
//        }

        data.setProtectNum(Constants.ZERO);
        data.setPlanProtectTotal(Constants.ZERO);
        data.setMonthAddNum(Constants.ZERO);
        data.setMonthTotalNum(Constants.ZERO);
        BaseResponse<SensorStatusStatisticResponse> response = HKService.sensorStatusStatistic();
        if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)
                && response.getData()!=null ) {
            data.setProtectNum(Constants.formatIntegerNum(response.getData().getSensorMainNum()));
            data.setPlanProtectTotal(Constants.formatIntegerNum(response.getData().getSensorNum()));
            data.setMonthAddNum(Constants.formatIntegerNum(response.getData().getSensorMainMonthNum()));
            data.setMonthTotalNum(Constants.formatIntegerNum(response.getData().getSensorNum()));
        }
        param = new FireStatisticRequest();
        param.setIndexCode("api_fire_statistic_month");
        BaseResponse<FireStatisticResponse> response1 = HKService.fireStatisticMonth(param);
        if(response1 != null && StringUtils.equals(response1.getCode(), HKConstants.RESPONSE_SUCCEE)
                && response1.getData()!=null ) {
            data.setMonthAddNum(Constants.formatIntegerNum(response1.getData().getMaintenanceNumMonth()));
            data.setMonthTotalNum(Constants.formatIntegerNum(response1.getData().getDeviceTotalNum()));
        }

        return data;
    }





    /**
     * ã€æ¶ˆé˜²ç®¡æŽ§ã€‘看板-分类和汇总的各状态设备数量
     * @return