Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-11-15 db0f521bf51f96029090ebc01dfa96fc163127a1

Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

 server/system_service/src/main/java/com/doumee/core/utils/Constants.java

@@ -139,6 +139,8 @@
    public static final String TMS_INTERFACE_URL_PREFIX ="TMS_INTERFACE_URL_PREFIX" ;
    public static final String MYSQL_BACKUP_CDOE ="MYSQL_BACKUP_CDOE" ;
    public static final String MYSQL_BACKUP_DIR ="MYSQL_BACKUP_DIR" ;
    public static final String EVENT_FILES_PRIVATE_DOMAIN ="EVENT_FILES_PRIVATE_DOMAIN" ;
    public static final String EVENT_FILES_PUBLIC_DOMAIN ="EVENT_FILES_PUBLIC_DOMAIN" ;
    public static  boolean DEALING_HK_SYNCPRIVILEGE= false;
    public static  boolean DEALING_HK_SYNCDEVICE = false;
    public static  boolean DEALING_HK_SYNCPLATFORM = false;
@@ -378,6 +380,16 @@
         int invalid =9;
    }

    public interface RetentionCarType{
        //车辆类型 0内部车辆 1相关方车辆 2访客车辆 3内运物流车 4外协车辆 5市公司卸货车
         int internal = 0;
         int relation = 1;
         int visitor = 2;
         int selfTruck = 3;
         int outTruck = 4;
         int cityComTruck = 5;
    }


    public interface EmpowerStatus{
        //一卡通授权下发状态 0待下发 1已下发 2下发成功   3已取消 4下发失败 5任务下载已结束
@@ -458,6 +470,14 @@
        d = d.setScale(4, BigDecimal.ROUND_HALF_UP);
        return  d;
    }
    public static BigDecimal formatBigdecimal2Float(BigDecimal d) {
        if (d == null) {
            d = new BigDecimal(0.0);
        }
        //保留两位小数且四舍五入
        d = d.setScale(2, BigDecimal.ROUND_HALF_UP);
        return  d;
    }




 server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java

@@ -460,7 +460,7 @@
     * @return String
     * @throws Exception
     */
    public static String getPlusTime(Date date) throws Exception {
    public static String getPlusTime(Date date)  {
        if (date == null)
            return null;
        try {

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java

@@ -2,12 +2,15 @@

import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.haikang.model.param.respose.RegionEnergyListResponse;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.dao.web.response.platformReport.*;
import com.doumee.service.business.third.BoardService;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -30,36 +33,16 @@
@Slf4j
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/energy")
public class EnergyController extends BaseController {

    @Autowired
    private BoardService boardService;

    @LoginNoRequired
    @ApiOperation("中心数据")
    @GetMapping("/centerData")
    public ApiResponse<EnergyBoardVO> centerData() {
        EnergyBoardVO data = new EnergyBoardVO();
        Random random = new Random();
        data.setSmokeBoxTotal(random.nextInt(20000));
        data.setCarbon(new BigDecimal(random.nextInt(1000)));
        data.setElectricityQuantity(random.nextInt(1000));
        data.setElectricityYear(new BigDecimal(random.nextInt(10)));
        data.setElectricityMonth(new BigDecimal(random.nextInt(10)));

        data.setWaterQuantity(new BigDecimal(random.nextInt(1000)));
        data.setWaterYear(new BigDecimal(random.nextInt(10)));
        data.setWaterMonth(new BigDecimal(random.nextInt(10)));
        EnergyBoardVO data =boardService.centerEnergyData();


        data.setGasQuantity(new BigDecimal(random.nextInt(1000)));
        data.setGasYear(new BigDecimal(random.nextInt(10)));
        data.setGasMonth(new BigDecimal(random.nextInt(10)));

        data.setOfficeQuantity(random.nextInt(20));
        data.setPowerQuantity(random.nextInt(20));
        data.setWorkHouseQuantity(random.nextInt(20));
        data.setParkQuantity(random.nextInt(20));
        data.setTodayElectricity(random.nextInt(20));
        data.setMonthElectricity(random.nextInt(20));
        data.setYesterdayElectricity(random.nextInt(20));
        return ApiResponse.success(data);
    }

@@ -68,17 +51,18 @@


    @LoginNoRequired
    @ApiOperation("用电总能耗同比、环比和区域用电量集合")
    @GetMapping("/energyRegionData")
    public ApiResponse< RegionEnergyListResponse> energyRegionData() {
         RegionEnergyListResponse  data=boardService.energyRegionData();
        return ApiResponse.success(data);
    }
    @LoginNoRequired
    @ApiOperation("实时负荷曲线")
    @GetMapping("/loadCurve")
    public ApiResponse<List<EnergyDataVO>> loadCurve() {
        List<EnergyDataVO> loadCurveList = new ArrayList<>();
        Random random = new Random();
        for (int i = 1; i <= 23; i++) {
            EnergyDataVO data = new EnergyDataVO();
            data.setTimeData(StringUtils.leftPad(i+"",2,"0") +":00");
            data.setEnergy(new BigDecimal(random.nextInt(200)));
            loadCurveList.add(data);
        }

        List<EnergyDataVO> loadCurveList =boardService.loadEnergyCurve();
        return ApiResponse.success(loadCurveList);
    }

@@ -88,17 +72,10 @@
    @ApiOperation("月能耗、油耗分析")
    @GetMapping("/energyDataList")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "查询类型：0=水；1=气；2=电；3=油耗", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "查询类型：0=水；1=气；2=油耗；3=用电", required = true),
    })
    public ApiResponse<List<EnergyDataVO>> energyDataList(@RequestParam Integer type) {
        List<EnergyDataVO> energyDataVOList = new ArrayList<>();
        Random random = new Random();
        for (int i = 1; i <= 12; i++) {
            EnergyDataVO data = new EnergyDataVO();
            data.setTimeData(i +"月");
            data.setEnergy(new BigDecimal(random.nextInt(200)));
            energyDataVOList.add(data);
        }
        List<EnergyDataVO> energyDataVOList = boardService.energyDataList(type);
        return ApiResponse.success(energyDataVOList);
    }

@@ -107,23 +84,7 @@
    @ApiOperation("上月油耗排行")
    @GetMapping("/lastMonthOil")
    public ApiResponse<List<OilDataVO>> lastMonthOil() {
        List<OilDataVO> oilDataVOList = new ArrayList<>();
        Random random = new Random();
        BigDecimal maxOil = BigDecimal.ZERO;
        BigDecimal lastOil = BigDecimal.ZERO;
        for (int i = 1; i <= 7; i++) {
            OilDataVO oilDataVO = new OilDataVO();
            oilDataVO.setCarNo("皖A8" + random.nextInt(9) + random.nextInt(9) + random.nextInt(9) + random.nextInt(9));
            if(i==1){
                oilDataVO.setQuantity(new BigDecimal(random.nextInt(100)));
                maxOil = oilDataVO.getQuantity();
            }else{
                oilDataVO.setQuantity(new BigDecimal(random.nextInt(lastOil.intValue())));
            }
            lastOil = oilDataVO.getQuantity();
            oilDataVO.setMaxOil(maxOil);
            oilDataVOList.add(oilDataVO);
        }
        List<OilDataVO> oilDataVOList = boardService.energyLastMonthOilSort();
        return ApiResponse.success(oilDataVOList);
    }
}

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java

@@ -1,12 +1,18 @@
package com.doumee.cloud.board;

import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.haikang.model.param.respose.PageRegionInfoResponse;
import com.doumee.core.haikang.model.param.respose.RuleEventSearchResponse;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.response.PCWorkPlatformDataVO;
import com.doumee.dao.business.model.Visits;
import com.doumee.dao.web.response.platformReport.*;
import com.doumee.service.business.VisitsService;
import com.doumee.service.business.third.BoardService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -15,10 +21,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.math.BigDecimal;
import java.util.ArrayList;
@@ -40,32 +43,14 @@

    @Autowired
    private BoardService boardService;
    @Autowired
    private VisitsService visitsService;

    @LoginNoRequired
    @ApiOperation("中心数据")
    @GetMapping("/centerData")
    public ApiResponse<SecurityBoardVO> centerData() {
        SecurityBoardVO data = new SecurityBoardVO();
        Random random = new Random();
        data.setParkingLotTotal(random.nextInt(200));
        data.setFreeParkingLot(random.nextInt(data.getParkingLotTotal()));

        data.setInternalCarTotal(random.nextInt(100));
        data.setRelatedCarTotal(random.nextInt(100));
        data.setVisitCarTotal(random.nextInt(100));
        data.setInParkCarTotal(data.getInternalCarTotal() + data.getRelatedCarTotal() + data.getVisitCarTotal());

        data.setInternalTotal(random.nextInt(100));
        data.setRelatedTotal(random.nextInt(100));
        data.setVisitTotal(random.nextInt(100));
        data.setInParkTotal(data.getInternalTotal() + data.getRelatedTotal() + data.getVisitTotal());

        data.setDeviceTotal(random.nextInt(20));
        data.setErrTotal(random.nextInt(20));
        data.setInternalJobCarTotal(random.nextInt(20));
        data.setVisitJobCarTotal(random.nextInt(20));
        data.setRelatedJobCarTotal(random.nextInt(20));

    public ApiResponse<SecurityBoardVO> centerSecurityData() {
        SecurityBoardVO data = boardService.centerSecurityData();
        return ApiResponse.success(data);
    }

@@ -75,16 +60,6 @@
    @GetMapping("/securityDeviceData")
    public ApiResponse<List<SecurityDeviceDataVO>> securityDeviceData() {
        List<SecurityDeviceDataVO> list = boardService.securityDeviceData();
        /*
        Random random = new Random();
        for (int i = 1; i <= 3; i++) {
            SecurityDeviceDataVO data = new SecurityDeviceDataVO();
            data.setDeviceType("设备类型_"+i);
            data.setOnlineNum(random.nextInt(10));
            data.setOfflineDeviceNum(random.nextInt(10));
            data.setTotalNum(data.getOnlineNum() + data.getOfflineDeviceNum() );
            list.add(data);
        }*/
        return ApiResponse.success(list);
    }
    @LoginNoRequired
@@ -93,18 +68,8 @@
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "类型 0全部 1区域告警 2行为告警", required = false)
    })
    @GetMapping("/warningEventData")
    public ApiResponse<List<WaningEventDataVO>> warningEventData(Integer type) {
        List<WaningEventDataVO> list = boardService.warningEventData(type);
        /*
        Random random = new Random();
        for (int i = 1; i <= 3; i++) {
            SecurityDeviceDataVO data = new SecurityDeviceDataVO();
            data.setDeviceType("设备类型_"+i);
            data.setOnlineNum(random.nextInt(10));
            data.setOfflineDeviceNum(random.nextInt(10));
            data.setTotalNum(data.getOnlineNum() + data.getOfflineDeviceNum() );
            list.add(data);
        }*/
    public ApiResponse<WaningEventDataVO> warningEventData(Integer type) {
        WaningEventDataVO list = boardService.warningEventData(type);
        return ApiResponse.success(list);
    }

@@ -115,15 +80,24 @@
    @ApiOperation("访客滞留情况")
    @GetMapping("/visitRetentionData")
    public ApiResponse<List<VisitRetentionDataVO>> visitRetentionData() {
        PageWrap<Visits> pageWrap = new PageWrap<>();
        pageWrap.setCapacity(10);
        pageWrap.setPage(1);
        pageWrap.setModel(new Visits());
        pageWrap.getModel().setLevelStatus(Constants.ZERO);
        pageWrap.getModel().setStatus(Constants.TWO);
        PageData<Visits>  resut =    visitsService.retentionPage(pageWrap);
        List<VisitRetentionDataVO> list = new ArrayList<>();
        Random random = new Random();
        for (int i = 1; i <= 3; i++) {
            VisitRetentionDataVO data = new VisitRetentionDataVO();
            data.setName("小明_"+i);
            data.setCompanyName("运维组_"+i);
            data.setTimeOutMinute(Long.valueOf(random.nextInt(200)));
            list.add(data);
        if(resut !=null && resut.getRecords() !=null && resut.getRecords().size()>0){
            for (Visits model : resut.getRecords()) {
                VisitRetentionDataVO data = new VisitRetentionDataVO();
                data.setName(model.getName());
                data.setCompanyName(model.getCompanyName());
                data.setTimeOutMinute(Constants.formatIntegerNum(model.getTimeOut()));
                list.add(data);
            }
        }

        return ApiResponse.success(list);
    }

@@ -152,11 +126,23 @@
    }
    @LoginNoRequired
    @ApiOperation("平铺结果区域集合接口")
    @GetMapping("/regionList")
    public ApiResponse<List<PageRegionInfoResponse>> regionList(CarmeraListVO param) {
    @PostMapping("/regionList")
    public ApiResponse<List<PageRegionInfoResponse>> regionList(@RequestBody  CarmeraListVO param) {
        return ApiResponse.success(boardService.regionList(param));
    }

    @LoginNoRequired
    @ApiOperation("获取监控流播放地址")
    @GetMapping("/getCarmeraPreviemUrl")
    public ApiResponse<String> getCarmeraPreviemUrl(CarmeraListVO param) {
        return ApiResponse.success(boardService.getCarmeraPreviemUrl(param));
    }


    @LoginNoRequired
    @ApiOperation("今日访客分析和滞留访客数据集合")
    @GetMapping("/visitSecurityData")
    public ApiResponse<VisitDataVO> visitSecurityData ( ){
        VisitDataVO data = boardService.visitSecurityData();
        return ApiResponse.success(data);
    }
}

 server/visits/dmvisit_admin/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active: dev
    active: pro
  application:
    name: visitsAdmin
    # å®‰å…¨é…ç½®

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

@@ -149,6 +149,13 @@
        String[] ruleEventSearch= new String[]{"/api/v2/ruleEvent/search","安防看板-今日告警事件-根据eventType字段3"};//安防看板-今日告警事件-根据eventType字段3[图片]
        String[] getSecureDevStatusList= new String[]{"/api/secureDataService/v2/getSecureDevStatusList","安防看板-园区安防设备-各类型设备状态数据列表"};//安防看板-园区安防设备-各类型设备状态数据列表
        String[] getSecureDevStatusTotal= new String[]{"/api/secureDataService/v2/getSecureDevStatusTotal","统计园区总体的安防设备数量，在线数、在线率、离线数、离线率"};//统计园区总体的安防设备数量，在线数、在线率、离线数、离线率
        String[] getParkingStatistics= new String[]{"/api/dataBoardService/v1/getParkingStatistics","安防看板--园区实时车数量4"};//安防看板--园区实时车数量4
        String[] getCurrentMonthDataByMeterType= new String[]{"/api/board/v1/getCurrentMonthDataByMeterType","能耗看板-1.获取本月用能总量-自然月"};//能耗看板-1.获取本月用能总量-自然月
        String[] regionTopPower= new String[]{"/api/board/v1/region/topPower","能耗看板-2.获取区域用能前N位"};//能耗看板-2.获取区域用能前N位
        String[] regionEnergyList= new String[]{"/api/board/v1/getRegionEnergyList","能耗看板-3.获取各区域用能及总能耗"};//能耗看板-3.获取各区域用能及总能耗
        String[] lastMonthFeeByMeterType= new String[]{"/api/board/v1/getLastMonthFeeByMeterType","能耗看板-4.获取上月用能费用，一天刷新，凌晨某个点刷"};//能耗看板-4.获取上月用能费用，一天刷新，凌晨某个点刷
        String[] energyTodayLoadData= new String[]{"/api/v1/exhibition/energy/getTodayLoadData","能耗看板-5.园区实时负荷曲线"};//能耗看板-5.园区实时负荷曲线
        String[] energyTrend= new String[]{"/api/v1/report/energyTrend","能耗看板-6按月查询近12个月的用电总量数据"};//能耗看板-6按月查询近12个月的用电总量数据
    }
    /**
     * é™„录A.55消防设备类型

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

@@ -775,6 +775,14 @@
        return startDoPostStringArtemis(HKConstants.InterfacePath.getSecureDevStatusList,body);
    }
    /**
     * èƒ½è€—看板-6按月查询近12个月的用电总量数据
     * @param body
     * @return
     */
    public static String energyTrend(String body) {
        return startDoPostStringArtemis(HKConstants.InterfacePath.energyTrend,body);
    }
    /**
     * ç»Ÿè®¡å›­åŒºæ€»ä½“的安防设备数量，在线数、在线率、离线数、离线率
     * @param body
     * @return
@@ -783,6 +791,48 @@
        return startDoPostStringArtemis(HKConstants.InterfacePath.getSecureDevStatusTotal,body);
    }
    /**
     * ç»Ÿå®‰é˜²çœ‹æ¿--园区实时车数量4
     * @return
     */
    public static String getParkingStatistics() {
        return startDoGetStringArtemis(HKConstants.InterfacePath.getParkingStatistics,null);
    }
    /**
     * èƒ½è€—看板-1.获取本月用能总量-自然月
     * @return
     */
    public static String getCurrentMonthDataByMeterType(Map<String,String>   powerType) {
        return startDoGetStringArtemis(HKConstants.InterfacePath.getCurrentMonthDataByMeterType,powerType);
    }
    /**
     * èƒ½è€—看板-2.获取区域用能前N位
     * @return
     */
    public static String regionTopPower(Map<String,String>   params) {
        return startDoGetStringArtemis(HKConstants.InterfacePath.regionTopPower,params);
    }
    /**
     * èƒ½è€—看板-3.获取各区域用能及总能耗
     * @return
     */
    public static String regionEnergyList(Map<String,String>   params) {
        return startDoGetStringArtemis(HKConstants.InterfacePath.regionEnergyList,params);
    }
    /**
     * èƒ½è€—看板-4.获取上月用能费用，一天刷新，凌晨某个点刷
     * @return
     */
    public static String lastMonthFeeByMeterType(Map<String,String>   params) {
        return startDoGetStringArtemis(HKConstants.InterfacePath.lastMonthFeeByMeterType,params);
    }
    /**
     * èƒ½è€—看板-5.园区实时负荷曲线
     * @return
     */
    public static String energyTodayLoadData( ) {
        return startDoGetStringArtemis(HKConstants.InterfacePath.energyTodayLoadData,null);
    }
    /**
     * èŽ·å–月台状态
     * @return
     */

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/EnergyTrendRequest.java

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

import lombok.Data;

@Data
public class EnergyTrendRequest {
    private String date;//    String    true    æ—¥æœŸ
    private int meterType;//    Number    true    ä»ªè¡¨ç±»åž‹(1:电表;2:水表;3:气表;4:热表)
    private String nodeId    ;//String    true    ç­›é€‰èŠ‚点id
    private int nodeType    ;//Number    true    ç­›é€‰èŠ‚点类型，1部门/2区域
    private String periodType;//    String    true    ç»Ÿè®¡ç»´åº¦day/quarter/month/year/custom
    private String showType;//    String    true    å±•ç¤ºç»´åº¦:1近6个月/2近4个季度/3近3å¹´--------4:日期类型
}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/RegionTopPowerRequest.java

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

import com.doumee.core.haikang.model.param.BaseListPageRequest;
import lombok.Data;

import java.util.List;

@Data
public class RegionTopPowerRequest  {

    private int powerType    ;//Query    Number    true    èƒ½æºç±»åž‹ ç”µ-1 æ°´-2 æ°”-3 çƒ­-4
    private String timeType;//    Query    String    true    month,表示本月
    private int top;//    Query    Number    true    å‰å‡ ä¸ªåŒºåŸŸæ•°
}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/RuleEventFiledOptionsRequest.java

@@ -1,12 +1,13 @@
package com.doumee.core.haikang.model.param.request;

import com.doumee.core.haikang.model.param.BaseListPageRequest;
import lombok.Data;

import java.util.List;

@Data
public class RuleEventFiledOptionsRequest {
public class RuleEventFiledOptionsRequest  {
  private String fieldName;//    String    false    å­—段名称
private String fieldValue    ;//String    false    å­—段值
private String type;//    String    false    æŸ¥è¯¢ç±»åž‹ï¼Œå¯é€‰èŒƒå›´ï¼šeq（相等）、neq(不相等)、like（类似）、lt（小于）、gt（大于）、lte（小于等于）、gte（大于等于）、in（范围）、notIn(范围之外)、in：fieldValue的值可以填多个，用英文逗号分隔、notNull(不为空)、isNull(为空)、recently(最近)、
  private String fieldValue    ;//String    false    å­—段值
  private String type;//    String    false    æŸ¥è¯¢ç±»åž‹ï¼Œå¯é€‰èŒƒå›´ï¼šeq（相等）、neq(不相等)、like（类似）、lt（小于）、gt（大于）、lte（小于等于）、gte（大于等于）、in（范围）、notIn(范围之外)、in：fieldValue的值可以填多个，用英文逗号分隔、notNull(不为空)、isNull(为空)、recently(最近)、
}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/RuleEventSearchRequest.java

@@ -10,4 +10,6 @@
   private String[] regionIds;//    Array    false    å›­åŒºå¯¹åº”区域id信息,item ç±»åž‹: string，传空list查全部
    private String includeBool;//    Number    false    æ˜¯å¦åŒ…含下级子节点,0-不包含,1-包含
    private List<RuleEventFiledOptionsRequest > filedOptions;//    Array    false    ç­›é€‰å­—段列表>

    private List<SortRequest > sorts;//排序餐宿
}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/SortRequest.java

@@ -8,5 +8,8 @@

    private String  field    ;//    string    False    æŽ’序字段，对应查询用的参数名称
    private String sort    ;//    string    False    æŽ’序规则，asc：正序，    desc：倒序
    private String  sortField    ;//    String    false    æŽ’序字段
    private String sortType    ;//    s    String    false    æŽ’序类型：支持desc、asc


}

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

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

import lombok.Data;

@Data
public class EnergyTodayLoadDataResponse {
   private String extra    ;//    String    false    è¾…助字段， å‰ç«¯ä¸ç”¨
   private String name    ;//    String    false    æ¨ªåæ ‡ï¼ˆæˆ–饼状图的元素值）
   private String value;//        String    false    çºµåæ ‡ï¼ˆæˆ–饼状图的元素名称）
}

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

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

import lombok.Data;

import java.util.List;

@Data
public class EnergyTrendResponse {

   private String names;//    String    false    names
private String pwValues    ;//String    false    pwValues
private String avgValues;//    String    false    å¹³å‡å€¼æ•°æ®
private String timeNameList    ;//String    false    timeNameList
private String[] xvalues;//    Array    false    x轴月份
private List<EnergyTrendYvalueResponse> yvalues;//    Array    false    yè½´
}

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

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

import lombok.Data;

@Data
public class EnergyTrendYvalueResponse {

   private String name;//    String    false    y轴名称
   private String[] value    ;//    Array    false    y轴值
}

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

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

import lombok.Data;

import java.util.List;

@Data
public class LastMonthFeeByMeterTypeResponse {
    private String value;//    String    false    æ•°å€¼
    private String quota;//    String    false    é¢å®šé‡
    private String samePercent;//    String    false    åŒæ¯”
    private Boolean samePercentAbnorml;//    Boolean    false    åŒæ¯”是否异常（超过阈值）
    private String ringPercent    ;//String    false    çŽ¯æ¯”
    private Boolean ringPercentAbnorml    ;//Boolean    false    çŽ¯æ¯”是否异常（超过阈值）
    private Boolean privateOpen    ;//Boolean    false    éšç§å¼€å¯
    private String innerFeeValue    ;//String    false    è´¹ç”¨
    private String feeSamePercent    ;//String    false    è´¹ç”¨åŒæ¯”
    private String feeRingPercent    ;//String    false    è´¹ç”¨çŽ¯æ¯”
}

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

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

import lombok.Data;

@Data
public class MonthDataByMeterTypeResponse {
      private String value    ;//String    false    æ•°å€¼
      private String quota;//    String    false    é¢å®šé‡
      private String samePercent;//    String    false    åŒæ¯”
      private Boolean samePercentAbnorml;//    Boolean    false    åŒæ¯”是否异常（超过阈值）
      private String ringPercent;//    String    false    çŽ¯æ¯”
      private Boolean ringPercentAbnorml    ;//Boolean    false    çŽ¯æ¯”是否异常（超过阈值）
      private Boolean privateOpen    ;//Boolean    false    éšç§å¼€å¯
      private String innerFeeValue    ;//String    false    è´¹ç”¨
      private String feeSamePercent    ;//String    false    è´¹ç”¨åŒæ¯”
      private String feeRingPercent    ;//String    false    è´¹ç”¨çŽ¯æ¯”
}

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

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

import lombok.Data;

import java.math.BigDecimal;

@Data
public class ParkingStatisticResponse {
   
   private TodayCarDataResponse todayCarDataDto;//BigDecimal    Object    false    ä»Šæ—¥å†…外部车辆数据Dto
private TodayParkingDataResponse todayParkingDataDto    ;//Object    false    ä»Šæ—¥è½¦ä½æ•°æ®
}

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

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

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

@Data
public class RegionEnergyListResponse {
    @ApiModelProperty(value = "根节点总能耗")
    private String rootValue    ;//    String    false
    @ApiModelProperty(value = "同比")
    private String samePercent;//        String    false    åŒæ¯”
    @ApiModelProperty(value = "环比")
    private String ringPercent;//        String    false    çŽ¯æ¯”
    @ApiModelProperty(value = "二级区域能耗数据")
    private List<RegionTopPowerResponse> secondRegionDataList    ;//Array    false    äºŒçº§åŒºåŸŸèƒ½è€—数据
}

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

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

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

@Data
public class RegionTopPowerResponse {
    @ApiModelProperty(value = "区域名称")
     private String name;//    String    false    åŒºåŸŸåç§°
    @ApiModelProperty(value = "值")
      private BigDecimal value    ;//Number    false    å€¼
    @ApiModelProperty(value = "占比")
      private BigDecimal percent    ;//Number    false    å æ¯”
}

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

@@ -1,5 +1,6 @@
package com.doumee.core.haikang.model.param.respose;

import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

@@ -45,5 +46,6 @@
   private String level_color;//    String    false    level_color
   private String plan_exec_status;//    String    false    plan_exec_status
   @JsonProperty(value = "_image_url")
   @JSONField(name = "_image_url")
   private String imgurl;//    String    false    æœ‰æ•ˆå›¾ç‰‡åœ°å€
}

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

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

import lombok.Data;

import java.math.BigDecimal;

@Data
public class TodayCarDataResponse {
   
private Integer innerCarCount;//    Number    false    å†…部车辆数量
private Integer outerCarCount    ;//Number    false    å¤–部车辆数量
}

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

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

import lombok.Data;

import java.math.BigDecimal;

@Data
public class TodayParkingDataResponse {
   
private Integer leftPlace    ;//Number    false    å‰©ä½™è½¦ä½æ•°é‡
private Integer totalPlace    ;//umber    false    æ€»è½¦ä½æ•°é‡
private String usePlace;//    String    false    å·²ç”¨è½¦ä½æ•°é‡
private BigDecimal useRate    ;//Number    false    è½¦ä½ä½¿ç”¨çŽ‡
private String parkName    ;//String    false    åœè½¦åœºåç§°
private String parkSyscode    ;//String    false    åœè½¦åœºå”¯ä¸€æ ‡è¯†
private String statisticsTime    ;//String    false    ç»Ÿè®¡æ ‡è¯†
}

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

@@ -1480,7 +1480,7 @@
            TypeReference typeReference =
                    new TypeReference< BaseResponse<BaseListPageResponse<PageCameraInfoResponse>> >(){};
            BaseResponse<BaseListPageResponse<PageCameraInfoResponse>>   result = JSONObject.parseObject(res, typeReference.getType());
            logResult(result,"海康分页获取监控点资源");
//            logResult(result,"海康分页获取监控点资源");
            return  result;
        }catch (Exception e){
            log.error("【海康分页获取监控点资源】================失败====：\n"+ e.getMessage());
@@ -1527,17 +1527,134 @@
     *安防看板-今日告警事件-根据eventType字段3
     * @return
     */
    public  static  BaseResponse< RuleEventSearchResponse>   ruleEventSearch(RuleEventSearchRequest param){
    public  static  BaseResponse<BaseListPageResponse<RuleEventSearchDataResponse>>   ruleEventSearch(RuleEventSearchRequest param){
        log.info("【海康安防看板-今日告警事件-根据eventType字段3】================开始===="+JSONObject.toJSONString(param));
        try {
            String res = HKTools.ruleEventSearch(JSONObject.toJSONString(param));
            TypeReference typeReference =
                    new TypeReference< BaseResponse<RuleEventSearchResponse> >(){};
            BaseResponse<RuleEventSearchResponse>   result = JSONObject.parseObject(res, typeReference.getType());
                    new TypeReference< BaseResponse<BaseListPageResponse<RuleEventSearchDataResponse>> >(){};
            BaseResponse<BaseListPageResponse<RuleEventSearchDataResponse>>   result = JSONObject.parseObject(res, typeReference.getType());
            logResult(result,"海康安防看板-今日告警事件-根据eventType字段3");
            return  result;
        }catch (Exception e){
            log.error("【海康安防看板-今日告警事件-根据eventType字段3】================失败====：\n"+ e.getMessage());
        }
        return  null;
    }
    /**
     *统计统安防看板--园区实时车数量4
     * @return
     */
    public  static  BaseResponse<ParkingStatisticResponse>   getParkingStatistics(){
        log.info("【海康安防看板--园区实时车数量4】================开始====");
        try {
            String res = HKTools.getParkingStatistics();
            TypeReference typeReference =
                    new TypeReference< BaseResponse<ParkingStatisticResponse>>(){};
            BaseResponse<ParkingStatisticResponse>   result = JSONObject.parseObject(res, typeReference.getType());
            logResult(result,"海康安防看板--园区实时车数量4");
            return  result;
        }catch (Exception e){
            log.error("【海康安防看板--园区实时车数量4】================失败====：\n"+ e.getMessage());
        }
        return  null;
    }

    /**
     * èƒ½è€—看板-3.获取各区域用能及总能耗
     * @param powerType èƒ½æºç±»åž‹ ç”µ-1 æ°´-2 æ°”-3 çƒ­-4
     * @return
     */
    public  static  BaseResponse<RegionEnergyListResponse>   regionEnergyList(String  powerType){
        log.info("【海康能耗看板-3.获取各区域用能及总能耗】================开始====");
        try {
            Map<String,String>   map = new HashMap<>();
            map.put("powerType",powerType);
            String res = HKTools.regionEnergyList(map);
            TypeReference typeReference =
                    new TypeReference< BaseResponse<RegionEnergyListResponse>>(){};
            BaseResponse<RegionEnergyListResponse>   result = JSONObject.parseObject(res, typeReference.getType());
            logResult(result,"【海康能耗看板-3.获取各区域用能及总能耗】");
            return  result;
        }catch (Exception e){
            log.error("【海康能耗看板-3.获取各区域用能及总能耗】================失败====：\n"+ e.getMessage());
        }
        return  null;
    }
    /**
     * èƒ½è€—看板-4.获取上月用能费用，一天刷新，凌晨某个点刷
     * @param powerType èƒ½æºç±»åž‹ ç”µ-1 æ°´-2 æ°”-3 çƒ­-4
     * @return
     */
    public  static  BaseResponse<LastMonthFeeByMeterTypeResponse>   lastMonthFeeByMeterType(String  powerType){
        log.info("【海康能耗看板-4.获取上月用能费用，一天刷新，凌晨某个点刷】================开始====");
        try {
            Map<String,String>   map = new HashMap<>();
            map.put("powerType",powerType);
            String res = HKTools.lastMonthFeeByMeterType(map);
            TypeReference typeReference =  new TypeReference< BaseResponse<LastMonthFeeByMeterTypeResponse>>(){};
            BaseResponse<LastMonthFeeByMeterTypeResponse>   result = JSONObject.parseObject(res, typeReference.getType());
            logResult(result,"【海康能耗看板-4.获取上月用能费用，一天刷新，凌晨某个点刷】");
            return  result;
        }catch (Exception e){
            log.error("【海康能耗看板-4.获取上月用能费用，一天刷新，凌晨某个点刷】================失败====：\n"+ e.getMessage());
        }
        return  null;
    }
    /**
     * æµ·åº·èƒ½è€—看板-5.园区实时负荷曲线
     * @return
     */
    public  static  BaseResponse<List<EnergyTodayLoadDataResponse>>   energyTodayLoadData(){
        log.info("【海康能耗看板-5.园区实时负荷曲线】================开始====");
        try {
            String res = HKTools.energyTodayLoadData();
            TypeReference typeReference =  new TypeReference< BaseResponse<List<EnergyTodayLoadDataResponse>>>(){};
            BaseResponse<List<EnergyTodayLoadDataResponse>>   result = JSONObject.parseObject(res, typeReference.getType());
            logResult(result,"【海康能耗看板-5.园区实时负荷曲线】");
            return  result;
        }catch (Exception e){
            log.error("【海康能耗看板-5.园区实时负荷曲线】================失败====：\n"+ e.getMessage());
        }
        return  null;
    }
    /**
     * èƒ½è€—看板-2.获取区域用能前N位
     * @param param
     * @return
     */
    public  static  BaseResponse<List<RegionTopPowerResponse>>   regionTopPower(RegionTopPowerRequest   param){
        log.info("【海康能耗看板-2.获取区域用能前N位】================开始====");
        try {
            String res = HKTools.regionTopPower(toMap(param));
            TypeReference typeReference =
                    new TypeReference< BaseResponse<List<RegionTopPowerResponse>>>(){};
            BaseResponse<List<RegionTopPowerResponse>>   result = JSONObject.parseObject(res, typeReference.getType());
            logResult(result,"海康能耗看板-2.获取区域用能前N位");
            return  result;
        }catch (Exception e){
            log.error("【海康能耗看板-2.获取区域用能前N位】================失败====：\n"+ e.getMessage());
        }
        return  null;
    }
    /**
     * èƒ½è€—看板-1.获取本月用能总量-自然月
     * @param powerType èƒ½æºç±»åž‹ ç”µ-1 æ°´-2 æ°”-3 çƒ­-4
     * @return
     */
    public  static  BaseResponse<MonthDataByMeterTypeResponse>   getCurrentMonthDataByMeterType(String  powerType){
        log.info("【能耗看板-1.获取本月用能总量-自然月】================开始====");
        try {
            Map<String,String>   map = new HashMap<>();
            map.put("powerType",powerType);
            String res = HKTools.getCurrentMonthDataByMeterType(map);
            TypeReference typeReference =
                    new TypeReference< BaseResponse<MonthDataByMeterTypeResponse>>(){};
            BaseResponse<MonthDataByMeterTypeResponse>   result = JSONObject.parseObject(res, typeReference.getType());
            logResult(result,"能耗看板-1.获取本月用能总量-自然月");
            return  result;
        }catch (Exception e){
            log.error("【能耗看板-1.获取本月用能总量-自然月】================失败====：\n"+ e.getMessage());
        }
        return  null;
    }
@@ -1578,6 +1695,24 @@
        return  null;
    }
    /**
     *能耗看板-6按月查询近12个月的用电总量数据
     * @return
     */
    public  static  BaseResponse<EnergyTrendResponse>   energyTrend(EnergyTrendRequest param){
        log.info("【海康能耗看板-6按月查询近12个月的用电总量数据】================开始===="+JSONObject.toJSONString(param));
        try {
            String res = HKTools.energyTrend(JSONObject.toJSONString(param));
            TypeReference typeReference =
                    new TypeReference< BaseResponse<EnergyTrendResponse>>(){};
            BaseResponse<EnergyTrendResponse>   result = JSONObject.parseObject(res, typeReference.getType());
            logResult(result,"海康能耗看板-6按月查询近12个月的用电总量数据");
            return  result;
        }catch (Exception e){
            log.error("【海康能耗看板-6按月查询近12个月的用电总量数据】================失败====：\n"+ e.getMessage());
        }
        return  null;
    }
    /**
     *根据用户标识获取客户端TGC接口
     * @return
     */

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java

@@ -98,6 +98,9 @@
    @ApiModelProperty(value = "组织类型：0=相关方；1=内部")
    private String companyType;

    @ApiModelProperty(value = "车辆类型 0内部车辆 1相关方车辆 2访客车辆 3内运物流车 4外协车辆 5市公司卸货车 ")
    private String carType;

    @ApiModelProperty(value = "姓名")
    @ExcelColumn(name="姓名",index = 7,width = 16)
    private String personName;

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/CarsMapper.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.Cars;
import com.github.yulichang.base.MPJBaseMapper;

import java.util.List;

@@ -9,6 +10,6 @@
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/30 15:33
 */
public interface CarsMapper extends BaseMapper<Cars> {
public interface CarsMapper extends MPJBaseMapper<Cars> {

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java

@@ -222,6 +222,11 @@

    @ApiModelProperty(value = "人员编码 ")
    private Integer memberId  ;
    @ApiModelProperty(value = "车辆类型 0内部车辆 1相关方车辆 2访客车辆 3内运物流车 4外协车辆 5市公司卸货车 ")
    private Integer carType  ;
    @ApiModelProperty(value = "人员编码 ")
    @TableField(exist = false)
    private Integer companyId  ;


    // æ¡ä»¶æŸ¥è¯¢å‚æ•°

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java

@@ -171,6 +171,10 @@
    //@ExcelColumn(name="部门")
    @TableField(exist = false)
    private String companyName;
    @ApiModelProperty(value = "部门类型", example = "1")
    //@ExcelColumn(name="部门")
    @TableField(exist = false)
    private Integer companyType;
    @ApiModelProperty(value = "车主是否删除", example = "1")
    @TableField(exist = false)
    private Integer memberDeleted;

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java

@@ -53,8 +53,8 @@
    @ApiModelProperty(value = "排序码", example = "1")
    private Integer sortnum;

    @ApiModelProperty(value = "类型 0用水 1用气 2用油", example = "1")
    @ExcelColumn(name="类型",valueMapping = "0=用水;1=用气;2=用油;",index = 0)
    @ApiModelProperty(value = "类型 0用水 1用气 2用油 3", example = "1")
    @ExcelColumn(name="类型",valueMapping = "0=用水;1=用气;2=用油;3=烟箱;",index = 0)
    private Integer type;

    @ApiModelProperty(value = "数量 (用电顿，用电度； æ²¹è€—L）", example = "1")
@@ -72,6 +72,9 @@
    @ApiModelProperty(value = "开始时间")
    @TableField(exist = false)
    private Date startTime;
    @ApiModelProperty(value = "年月时间")
    @TableField(exist = false)
    private String timeInfoStr;
    @ApiModelProperty(value = "开始时间")
    @TableField(exist = false)
    private Date endTime;

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java

@@ -84,7 +84,8 @@
    @ApiModelProperty(value = "海康门禁名称")
    @ExcelColumn(name="进厂门禁" ,index = 6,width = 12)
    private String deviceName;

    @ApiModelProperty(value = "车辆类型 0内部车辆 1相关方车辆 2访客车辆 3内运物流车 4外协车辆 5市公司卸货车 ")
    private Integer carType  ;
    @ApiModelProperty(value = "海康门禁编码")
    private String deviceIndex;

@@ -120,6 +121,9 @@
    @ApiModelProperty(value = "类型 0劳务公司 1内部组织")
    @TableField(exist = false)
    private Integer companyType;
    @ApiModelProperty(value = "类型 0访客 1内部人员")
    @TableField(exist = false)
    private Integer memberType;

    @ApiModelProperty(value = "开始时间")
    @TableField(exist = false)

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/EnergyBoardVO.java

@@ -22,76 +22,24 @@
    @ApiModelProperty(value = "碳排放 å•ä½ å¨")
    private BigDecimal carbon;

    @ApiModelProperty(value = "上月用电 å•ä½ kw·h")
    private Integer electricityQuantity;

    @ApiModelProperty(value = "用电环比")
    private BigDecimal electricityYear;

    @ApiModelProperty(value = "用电同比")
    private BigDecimal electricityMonth;
    @ApiModelProperty(value = "上月用电 å•ä½ kw·h  æ€»é‡ã€åŒæ¯”、环比")
    private EnergyModelDataVO electricityQuantity;


    @ApiModelProperty(value = "上月用水 å•ä½ t")
    private BigDecimal waterQuantity;

    @ApiModelProperty(value = "用水环比")
    private BigDecimal waterYear;

    @ApiModelProperty(value = "用水同比")
    private BigDecimal waterMonth;
    @ApiModelProperty(value = "上月用水 å•ä½ t æ€»é‡ã€åŒæ¯”、环比 ")
    private EnergyModelDataVO waterQuantity;


    @ApiModelProperty(value = "上月用气 å•ä½ æ€»é‡ã€åŒæ¯”、环比 ")
    private EnergyModelDataVO gasQuantity;

    @ApiModelProperty(value = "上月用气 å•ä½ ")
    private BigDecimal gasQuantity;
    @ApiModelProperty(value = "今日用电 å•ä½ kw·h，总量、同比、环比")
    private EnergyModelDataVO todayElectricity;

    @ApiModelProperty(value = "用气环比")
    private BigDecimal gasYear;
    @ApiModelProperty(value = "本月用电 å•ä½ kw·h æ€»é‡ã€åŒæ¯”、环比")
    private EnergyModelDataVO monthElectricity;

    @ApiModelProperty(value = "用气同比")
    private BigDecimal gasMonth;
    @ApiModelProperty(value = "昨日用电 å•ä½ kw·h æ€»é‡ã€åŒæ¯”、环比")
    private EnergyModelDataVO yesterdayElectricity;


    @ApiModelProperty(value = "办公楼用电 å•ä½ kw·h")
    private Integer officeQuantity;

    @ApiModelProperty(value = "成品库用电 å•ä½ kw·h")
    private Integer productHouseQuantity;

    @ApiModelProperty(value = "联合工房用电 å•ä½ kw·h")
    private Integer workHouseQuantity;

    @ApiModelProperty(value = "物流园区用电 å•ä½ kw·h")
    private Integer parkQuantity;

    @ApiModelProperty(value = "动力站房用电 å•ä½ kw·h")
    private Integer powerQuantity;

    @ApiModelProperty(value = "今日用电 å•ä½ kw·h")
    private Integer todayElectricity;

    @ApiModelProperty(value = "本月用电 å•ä½ kw·h")
    private Integer monthElectricity;

    @ApiModelProperty(value = "昨日用电 å•ä½ kw·h")
    private Integer yesterdayElectricity;

    @ApiModelProperty(value = "实时负荷曲线",hidden = true)
    private List<EnergyDataVO> loadCurveList;

    @ApiModelProperty(value = "月能耗分析 - æ°´",hidden = true)
    private List<EnergyDataVO> energyDataWaterList;

    @ApiModelProperty(value = "月能耗分析 - æ°”",hidden = true)
    private List<EnergyDataVO> energyDataGasList;

    @ApiModelProperty(value = "月能耗分析 - ç”µ",hidden = true)
    private List<EnergyDataVO> energyDataElectricityList;

    @ApiModelProperty(value = "月油耗分析",hidden = true)
    private List<EnergyDataVO> oilList;

    @ApiModelProperty(value = "上月油耗排行",hidden = true)
    private List<OilDataVO> lastMonthOilList;
}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/EnergyModelDataVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,31 @@
package com.doumee.dao.web.response.platformReport;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2024/10/25 16:25
 */
@Data
public class EnergyModelDataVO {

    @ApiModelProperty(value = "总量")
    private String total;
    @ApiModelProperty(value = "总量",hidden = true)
    private BigDecimal totalNum;

    @ApiModelProperty(value = "环比")
    private String ringRate;
    @ApiModelProperty(value = "环比值",hidden = true)
    private BigDecimal ringNum;
    @ApiModelProperty(value = "同比")
    private String sameRate;
    @ApiModelProperty(value = "同比值" ,hidden = true)
    private BigDecimal sameNum;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/InMemberDataVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,42 @@
package com.doumee.dao.web.response.platformReport;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * è®¿å®¢åˆ†æž
 *
 * @Author : Rk
 * @create 2024/10/25 10:59
 */
@Data
public class InMemberDataVO {

    @ApiModelProperty(value = "待访问数量")
    private Integer waitVisitNum;

    @ApiModelProperty(value = "待访问占比")
    private BigDecimal waitVisitRata;

    @ApiModelProperty(value = "已登记数量")
    private Integer registerVisitNum;

    @ApiModelProperty(value = "已登记占比")
    private BigDecimal registerVisitRata;

    @ApiModelProperty(value = "已离开数量")
    private Integer levelNum;

    @ApiModelProperty(value = "已离开占比")
    private BigDecimal levelRata;

    @ApiModelProperty(value = "滞留数量")
    private Integer retentionNum;

    @ApiModelProperty(value = "滞留占比")
    private BigDecimal retentionRata;


}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/SecurityBoardVO.java

@@ -17,49 +17,50 @@


    @ApiModelProperty(value = "总车位数量")
    private Integer parkingLotTotal;
    private int parkingLotTotal;

    @ApiModelProperty(value = "剩余车位数量")
    private Integer freeParkingLot;
    private int freeParkingLot;
    @ApiModelProperty(value = "车位使用率")
    private BigDecimal parkingUseRate;

    @ApiModelProperty(value = "员工车辆")
    private Integer internalCarTotal;
    private int internalCarTotal;

    @ApiModelProperty(value = "相关方车辆")
    private Integer relatedCarTotal;
    private int relatedCarTotal;

    @ApiModelProperty(value = "访客车辆")
    private Integer visitCarTotal;
    private int visitCarTotal;

    @ApiModelProperty(value = "当前在园人数")
    private Integer inParkTotal;
    private int inParkTotal;

    @ApiModelProperty(value = "在园内部人员数量")
    private Integer internalTotal;
    private int internalTotal;

    @ApiModelProperty(value = "在园相关方数量")
    private Integer relatedTotal;
    private int relatedTotal;

    @ApiModelProperty(value = "在园访客数量")
    private Integer visitTotal;

    private int visitTotal;
    @ApiModelProperty(value = "当前在园车辆总数")
    private Integer inParkCarTotal;
    private int inParkCarTotal;

    @ApiModelProperty(value = "当前设备总数")
    private Integer deviceTotal;
    private int deviceTotal;

    @ApiModelProperty(value = "当前报警总数")
    private Integer errTotal;
    private int errTotal;

    @ApiModelProperty(value = "内运车（安泰自有车）")
    private Integer internalJobCarTotal;
    private int internalJobCarTotal;

    @ApiModelProperty(value = "外协运输车辆")
    private Integer relatedJobCarTotal;
    private int relatedJobCarTotal;

    @ApiModelProperty(value = "市公司车辆")
    private Integer visitJobCarTotal;
    private int visitJobCarTotal;

    //TODO å®‰é˜²å‘Šè­¦


 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/VisitDataVO.java

@@ -4,6 +4,7 @@
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
 * è®¿å®¢åˆ†æž
@@ -15,28 +16,30 @@
public class VisitDataVO {

    @ApiModelProperty(value = "待访问数量")
    private Integer waitVisitNum;
    private long waitVisitNum;

    @ApiModelProperty(value = "待访问占比")
    private BigDecimal waitVisitRata;

    @ApiModelProperty(value = "已登记数量")
    private Integer registerVisitNum;
    private long registerVisitNum;

    @ApiModelProperty(value = "已登记占比")
    private BigDecimal registerVisitRata;

    @ApiModelProperty(value = "已离开数量")
    private Integer levelNum;
    private long levelNum;

    @ApiModelProperty(value = "已离开占比")
    private BigDecimal levelRata;

    @ApiModelProperty(value = "滞留数量")
    private Integer retentionNum;
    private long retentionNum;

    @ApiModelProperty(value = "滞留占比")
    private BigDecimal retentionRata;


    @ApiModelProperty(value = "访客滞留情况")
    private List<VisitRetentionDataVO> visitRetentionDataList;
}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/VisitRetentionDataVO.java

@@ -19,6 +19,6 @@
    private String companyName;

    @ApiModelProperty(value = "超时时长 å•ä½ï¼šåˆ†é’Ÿ")
    private Long timeOutMinute;
    private int timeOutMinute;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/WaningEventDataListVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.doumee.dao.web.response.platformReport;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * å›­åŒºå®‰é˜²è®¾å¤‡
 *
 * @Author : Rk
 * @create 2024/10/25 10:59
 */
@Data
public class WaningEventDataListVO {

    @ApiModelProperty(value = "标题")
    private String title;
    @ApiModelProperty(value = "图片地址")
    private String img;
    @ApiModelProperty(value = "时间")
    private String createDate;

    @ApiModelProperty(value = "发生地点")
    private String  addr;
    @ApiModelProperty(value = "内容")
    private String  content;


}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/WaningEventDataVO.java

@@ -4,6 +4,7 @@
import lombok.Data;

import java.util.Date;
import java.util.List;

/**
 * å›­åŒºå®‰é˜²è®¾å¤‡
@@ -14,17 +15,10 @@
@Data
public class WaningEventDataVO {

    @ApiModelProperty(value = "标题")
    private String title;
    @ApiModelProperty(value = "图片地址")
    private String img;
    @ApiModelProperty(value = "时间")
    private String createDate;

    @ApiModelProperty(value = "发生地点")
    private String  addr;
    @ApiModelProperty(value = "内容")
    private String  content;
    @ApiModelProperty(value = "告警总数")
    private int total;
    @ApiModelProperty(value = "告警数量(最近10条）")
    private List<WaningEventDataListVO> list;


}

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

@@ -318,7 +318,6 @@
        IPage<CarEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<CarEvent> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());

        queryWrapper
                .leftJoin(Member.class,Member::getId,CarEvent::getMemberId)
                .leftJoin(Company.class,Company::getId,Member::getCompanyId);

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

@@ -381,6 +381,7 @@
                bean.setUseRata(
                        bean.getWorkCountTime().multiply(new BigDecimal(100)).divide(sumTime,BigDecimal.ROUND_HALF_DOWN,2)
                );
                bean.setUseRata(Constants.formatBigdecimal2Float(bean.getUseRata()));//强制保留两位小数
            }
        }
        return platformList;

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

@@ -133,6 +133,8 @@
    @Autowired
    private EmayService emayService;



    @Override
    public Integer create(Visits visits) {
        visitsMapper.insert(visits);
@@ -1262,10 +1264,7 @@
        QueryWrapper<Visits> wrapper = new QueryWrapper<>(visits);
        return visitsMapper.selectCount(wrapper);
    }


    @Override
    public PageData<Visits> retentionPage(PageWrap<Visits> pageWrap) {
    public static PageData<Visits> retentionPageBiz(PageWrap<Visits> pageWrap, VisitsJoinMapper visitsJoinMapper,SystemDictDataBiz systemDictDataBiz) {
        String code= systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.TIMEOUT_WARNING).getCode();
        IPage<Visits> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
@@ -1277,9 +1276,7 @@
        queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper.leftJoin(" member m on m.id= t.MEMBER_ID");

        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getLevelStatus()),Visits::getStatus,Constants.VisitStatus.signin);

        queryWrapper.apply(Objects.nonNull(pageWrap.getModel().getLevelStatus())," TIMESTAMPDIFF( MINUTE, NOW(), t.OUT_DATE) <= "+code+"  ");

        queryWrapper.ne("m.type ",Constants.TWO);
@@ -1308,6 +1305,11 @@
        return PageData.from(result);
    }

    @Override
    public PageData<Visits> retentionPage(PageWrap<Visits> pageWrap) {
        return  retentionPageBiz(pageWrap,visitsJoinMapper,systemDictDataBiz);
    }



    @Override

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java

@@ -834,6 +834,44 @@
            event.setPlatePicUrl(getHkImgUrl(request.getData().getPicUrl().getPlatePicUrl()));
        }
        if(StringUtils.isNotBlank(event.getPlateNos())){
            Cars carModel = carsMapper.selectJoinOne(Cars.class,new MPJLambdaWrapper<Cars>()
                            .selectAll(Cars.class )
                            .selectAs(Company::getType,Cars::getCompanyType)
                            .leftJoin(Company.class,Company::getId,Cars::getGroupId)
                            .eq(Cars::getCode,event.getPlateNos())
                            .eq(Cars::getIsdeleted,Constants.ZERO)
                            .last(" limit 1"));
            if(carModel!=null){
                //0安泰公务车 1安泰自有物流车 2其它
                event.setMemberId(carModel.getMemberId());
                event.setCompanyId(carModel.getGroupId());
                if(Constants.equalsInteger(carModel.getType(),Constants.ONE)){
                    event.setCarType(Constants.RetentionCarType.selfTruck);
                }else {
                    if(Constants.equalsInteger(carModel.getCompanyType(),Constants.ONE)){
                        event.setCarType(Constants.RetentionCarType.internal);//内部车辆
                    }else{
                        event.setCarType(Constants.RetentionCarType.relation);//相关方车辆
                    }
                }
            }
            PlatformJob carTypeJob = platformJobMapper.selectOne(new QueryWrapper<PlatformJob>().lambda()
                            .eq(PlatformJob::getCarCodeFront,event.getPlateNos())
                            .eq(PlatformJob::getIsdeleted,Constants.ZERO)
                            .orderByAsc(PlatformJob::getCreateDate)
                            .last(" limit 1"));
            if(carTypeJob!=null){
                //作业类型 0自有车卸货 1自有车装货 2外协车卸货 3外协车装货 4市公司外协车卸货
                if(Constants.equalsInteger(carTypeJob.getType(),Constants.FOUR)){
                    event.setCarType(Constants.RetentionCarType.cityComTruck);//市公司车辆
                }else if(Constants.equalsInteger(carTypeJob.getType(),Constants.TWO)
                        || Constants.equalsInteger(carTypeJob.getType(),Constants.THREE)){
                    event.setCarType(Constants.RetentionCarType.outTruck);//外协车
                }else{
                    event.setCarType(Constants.RetentionCarType.selfTruck);//自有车
                }
            }

            ParkBook cars = parkBookMapper.selectOne(new QueryWrapper<ParkBook>().lambda()
                    .eq(ParkBook::getCarCode,event.getPlateNos())
                            .eq(ParkBook::getIsdeleted,Constants.ZERO )
@@ -884,9 +922,6 @@
                        }
                    }
                };



            }else{
                Visits visits =  visitsMapper.selectOne(new QueryWrapper<Visits>().lambda()
                        .eq(Visits::getCarNos,event.getPlateNos())
@@ -898,12 +933,13 @@
                if(visits!=null){
                    //最近使用该车的申请人（已到达）
                    event.setMemberId(visits.getMemberId());
                    event.setCarType(Constants.RetentionCarType.visitor);
                }
            }
            if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_IN.getKey()){
                //如果是入厂放行
                delRetentionList.add(event.getPlateNos());
                retentionList.add(getRetentionModelByParkRequest(request));
                retentionList.add(getRetentionModelByParkRequest(request,event));
                inoutDayCount.setInCarNum(Constants.formatIntegerNum(inoutDayCount.getInCarNum())+1);
            }else if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_OUT.getKey()){
                //如果是出场放行
@@ -914,12 +950,15 @@
        return event;
    }

    private Retention getRetentionModelByParkRequest(EventParkInfoRequest request) {
    private Retention getRetentionModelByParkRequest(EventParkInfoRequest request,CarEvent event) {
        Retention retention = new Retention();
        retention.setIsdeleted(Constants.ZERO);
        retention.setCreateDate(DateUtil.getISO8601DateByStr(request.getHappenTime()));
        retention.setCarNo(request.getData().getPlateNo());
        retention.setType(Constants.THREE);
        retention.setMemberId(event.getMemberId());
        retention.setCarType(event.getCarType());
        retention.setCompanyId(event.getCompanyId());
//        retention.setDeviceName(request.getSrcName());
//        retention.setDeviceIndex(request.getSrcIndex());
        return retention;

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

@@ -2,31 +2,35 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.BaseListPageResponse;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.BaseListPageRequest;
import com.doumee.core.haikang.model.param.request.RuleEventFiledOptionsRequest;
import com.doumee.core.haikang.model.param.request.RuleEventSearchRequest;
import com.doumee.core.haikang.model.param.request.SecureDevStatusTotalRequest;
import com.doumee.core.haikang.model.param.request.SensorStatusListRequest;
import com.doumee.core.haikang.model.param.request.*;
import com.doumee.core.haikang.model.param.respose.*;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.web.reqeust.SavePlatformWarnEventDTO;
import com.doumee.dao.web.response.platformReport.*;
import com.doumee.service.business.impl.PlatformJobServiceImpl;
import com.doumee.service.business.impl.VisitsServiceImpl;
import com.doumee.service.business.third.BoardService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -45,6 +49,10 @@
    @Autowired
    private PlatformLogMapper platformLogMapper;
    @Autowired
    private PlatformWaterGasMapper platformWaterGasMapper;
    @Autowired
    private SystemDictDataBiz systemDictDataBiz;
    @Autowired
    private PlatformWarnEventMapper platformWarnEventMapper;
    @Autowired
    private PlatformJobMapper platformJobMapper;
@@ -52,6 +60,10 @@
    private PlatformWmsDetailMapper platformWmsDetailMapper;
    @Autowired
    private PlatformMapper platformMapper;
    @Autowired
    private VisitsJoinMapper visitsJoinMapper;
    @Autowired
    private RetentionMapper retentionMapper;
    @Autowired
    private PlatformGroupMapper platformGroupMapper;
    /**
@@ -93,7 +105,9 @@
        return  data;
    }
    private void initReginCameralList(List<PageRegionInfoResponse> allList,String name) {
        List<CarmeraListVO> carmeraListVOList = cameraList(null);
        CarmeraListVO re = new CarmeraListVO();
        re.setName(name);
        List<CarmeraListVO> carmeraListVOList = cameraList(re);
        if(carmeraListVOList!=null && carmeraListVOList.size()>0){
            for(PageRegionInfoResponse p : allList){
                for(CarmeraListVO c : carmeraListVOList){
@@ -176,13 +190,15 @@

        List<CarmeraListVO> data = new ArrayList<>();
        for(PageCameraInfoResponse p : allList){
            CarmeraListVO t = new CarmeraListVO();
            t.setIndexCode(p.getCameraIndexCode());
            t.setReginCode(p.getRegionIndexCode());
            t.setName(p.getCameraName());
            t.setStatus(p.getStatus());
            t.setStatusName(p.getStatusName());
            data.add(t);
            if(StringUtils.isBlank(req.getName()) ||StringUtils.contains(p.getCameraName(),req.getName())){
                CarmeraListVO t = new CarmeraListVO();
                t.setIndexCode(p.getCameraIndexCode());
                t.setReginCode(p.getRegionIndexCode());
                t.setName(p.getCameraName());
                t.setStatus(p.getStatus());
                t.setStatusName(p.getStatusName());
                data.add(t);
            }
        }
        return  data;
    }
@@ -299,7 +315,10 @@
    @Override
    public  List<SecurityDeviceDataVO> securityDeviceData(){
        List<SecurityDeviceDataVO> list = new ArrayList<>();
        BaseResponse<List<SecureDevStatusListResponse>> result = HKService.getSecureDevStatusList(new SecureDevStatusTotalRequest()) ;
        SecureDevStatusTotalRequest request =new SecureDevStatusTotalRequest();
        request.setIncludeBool("");
        request.setRegionIds(new String[]{});
        BaseResponse<List<SecureDevStatusListResponse>> result = HKService.getSecureDevStatusList(request) ;
        if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) && result.getData()!=null){
            List<SecureDevStatusListResponse> rlist = result.getData();
            for(SecureDevStatusListResponse r :rlist){
@@ -324,32 +343,432 @@
        return list;
    }
    @Override
    public  List<WaningEventDataVO> warningEventData(Integer type){
        List<WaningEventDataVO> list = new ArrayList<>();
    public  WaningEventDataVO warningEventData(Integer type){
        WaningEventDataVO lastResult = new WaningEventDataVO();
        List<WaningEventDataListVO> list = new ArrayList<>();
        RuleEventSearchRequest request = new RuleEventSearchRequest();
        request.setPageNo(1);
        request.setPageSize(10);
        request.setFiledOptions(new ArrayList<>());
        request.setSorts(new ArrayList<>());
        RuleEventFiledOptionsRequest file = new RuleEventFiledOptionsRequest();
        file.setFieldName("event_type");
        file.setFieldValue("131588");//安防告警
        file.setType("eq");
        file.setType("in");
        request.getFiledOptions().add(file);
        BaseResponse< RuleEventSearchResponse> result = HKService.ruleEventSearch(request);
        SortRequest sort = new SortRequest();
        sort.setSortField("happen_time");
        sort.setSortType("desc");
        request.getSorts().add(sort);
        BaseResponse<BaseListPageResponse< RuleEventSearchDataResponse>> result = HKService.ruleEventSearch(request);
        if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) && result.getData()!=null){
            List<RuleEventSearchDataResponse> rlist = result.getData().getList();
            lastResult.setTotal(result.getData().getTotal());
            if(rlist!=null){
                String privateIp =systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.EVENT_FILES_PRIVATE_DOMAIN).getCode();
                String publicIp =systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.EVENT_FILES_PUBLIC_DOMAIN).getCode();
                for(RuleEventSearchDataResponse r :rlist){
                    WaningEventDataVO data = new WaningEventDataVO();
                    WaningEventDataListVO data = new WaningEventDataListVO();
                    data.setAddr(r.getSrc_name());
                    data.setImg(r.getImage_url());
                    if(data.getImg()!=null){
                        data.setImg(data.getImg().replace(privateIp,publicIp));
                    }
                    data.setTitle(r.getEvent_type_name());
                    data.setCreateDate(r.getCreate_time());
                    data.setCreateDate(DateUtil.getPlusTime(DateUtil.getISO8601DateByStr(r.getHappen_time())));
//                data.setContent(r.get);
                    list.add(data);
                }
            }

        }
        return list;
        lastResult.setList(list);
        return lastResult;
    }
    @Override
    public  String getCarmeraPreviemUrl(CarmeraListVO param){
        CameraPreviewURLsRequest request = new CameraPreviewURLsRequest();
        request.setCameraIndexCode(param.getIndexCode());
        BaseResponse<CamerasPreviewURLsResponse> result = HKService.cameraPreviewURLs(request);
        if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) && result.getData()!=null){
            return result.getData().getUrl();

        }
        return null;
    }
    @Override
    public   List<EnergyDataVO>  loadEnergyCurve(){
        List<EnergyDataVO> loadCurveList = new ArrayList<>();
        try {
            BaseResponse<List<EnergyTodayLoadDataResponse>>  response = HKService.energyTodayLoadData();
            if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) || response.getData()==null ){
                for (EnergyTodayLoadDataResponse model :response.getData()) {
                    EnergyDataVO data = new EnergyDataVO();
                    data.setTimeData(model.getName());
                    data.setEnergy(new BigDecimal(model.getName()));
                    loadCurveList.add(data);
                }
            }
        }catch (Exception e){
            e.printStackTrace();
        }
        return loadCurveList;
    }
    @Override
    public     List<OilDataVO> energyLastMonthOilSort(){
        List<OilDataVO> oilDataVOList = new ArrayList<>();
        //上月油耗
       List<PlatformWaterGas> list =  platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>().lambda()
                .eq(PlatformWaterGas::getIsdeleted,Constants.ZERO)
                .eq(PlatformWaterGas::getType,Constants.TWO)
                .apply("DATE_FORMAT(time_info, '%Y-%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m')")
                .orderByDesc(PlatformWaterGas::getNum)
                .last("limit 30" )
        );
        for (PlatformWaterGas model :list) {
            OilDataVO oilDataVO = new OilDataVO();
            oilDataVO.setCarNo(model.getCarCode());
            oilDataVO.setQuantity(model.getNum());
            oilDataVOList.add(oilDataVO);
        }
        return oilDataVOList;
    }

    /**
     * ç”¨ç”µæ€»èƒ½è€—同比、环比和区域用电量集合
     * @return
     */
    @Override
    public  EnergyBoardVO centerEnergyData(){
        EnergyBoardVO data = new EnergyBoardVO();
        Random random = new Random();
       PlatformWaterGas smoke=  platformWaterGasMapper.selectOne(new QueryWrapper<PlatformWaterGas>()
                 .select("sum(num) as num")
                .lambda()
                .eq(PlatformWaterGas::getIsdeleted,Constants.ZERO)
                .eq(PlatformWaterGas::getType,Constants.THREE)
                .apply("year(time_info) = year(now())")
                .last("limit 1 " ));

        data.setSmokeBoxTotal(0);
        if(smoke!=null){
            data.setSmokeBoxTotal(Constants.formatBigdecimal(smoke.getNum()).intValue());//当年烟箱数
        }
        BigDecimal carbonGas = new BigDecimal(0);//本月用气
        BigDecimal carbonWater = new BigDecimal(0);//本月用水
        BigDecimal carbonElec = new BigDecimal(0);//用电

        data.setTodayElectricity(getDefaultData());//今日用电
        data.setElectricityQuantity(getDefaultData());//上月用电
        data.setWaterQuantity(getDefaultData());//上月用水
        data.setGasQuantity(getDefaultData());//上月用气
        data.setMonthElectricity(getDefaultData());//本月用电
        data.setYesterdayElectricity(getDefaultData());//昨日用电
        getMonthElectricityData(data.getMonthElectricity());//通过安防平获取本月数据
        carbonElec = new BigDecimal(StringUtils.defaultString(data.getMonthElectricity().getTotal(), "0"));
        getLastMonthElectricityData(data.getElectricityQuantity());//通过安防平获取上月数据
        String firstDate = DateUtil.getFirstDayOfThisMonth() +" 00:00:00";
        Date month0 = DateUtil.getDateFromString(firstDate);
        Date month1 = DateUtil.increaseMonth(month0,-1);//上月
        Date month2 = DateUtil.increaseMonth(month0,-2);//上上月
        Date month3 = DateUtil.increaseMonth(month0,-12);//去年同月

        List<PlatformWaterGas> list =  platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>()
                .lambda()
                .eq(PlatformWaterGas::getIsdeleted,Constants.ZERO)
                .in(PlatformWaterGas::getType,Constants.ZERO,Constants.ONE)
                .in(PlatformWaterGas::getTimeInfo,month0,month1,month3,month2)
        );

        if(list!=null){
            //类型 0用水 1用气 2用油
            for(PlatformWaterGas model : list){
                if(Constants.equalsInteger(model.getType(),Constants.ONE)){
                    if(model.getTimeInfo().getTime() == month0.getTime()){
                        carbonGas = Constants.formatBigdecimal(model.getNum());
                    }
                    if(model.getTimeInfo().getTime() == month1.getTime()){
                        data.getGasQuantity().setTotalNum(Constants.formatBigdecimal(model.getNum()) );
                        data.getGasQuantity().setTotal(Constants.formatBigdecimal(model.getNum())+"");
                    }
                    if(model.getTimeInfo().getTime() == month2.getTime()){
                        data.getGasQuantity().setSameNum(Constants.formatBigdecimal(model.getNum()) );
                    }
                    if(model.getTimeInfo().getTime() == month3.getTime()){
                        data.getGasQuantity().setRingNum(Constants.formatBigdecimal(model.getNum()) );
                    }

                }else if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
                    if(model.getTimeInfo().getTime() == month0.getTime()){
                        carbonWater = Constants.formatBigdecimal(model.getNum());
                    }
                    if(model.getTimeInfo().getTime() == month1.getTime()){
                        data.getWaterQuantity().setTotalNum(Constants.formatBigdecimal(model.getNum()) );
                        data.getWaterQuantity().setTotal(Constants.formatBigdecimal(model.getNum())+"");
                    }
                    if(model.getTimeInfo().getTime() == month2.getTime()){
                        data.getWaterQuantity().setSameNum(Constants.formatBigdecimal(model.getNum()) );
                    }
                    if(model.getTimeInfo().getTime() == month3.getTime()){
                        data.getWaterQuantity().setRingNum(Constants.formatBigdecimal(model.getNum()) );
                    }
                }
            }
        }
        if( data.getGasQuantity().getTotalNum().compareTo(new BigDecimal(0)) !=0){
            //计算用气同比环比
            data.getGasQuantity().setSameRate(Constants.formatBigdecimal4Float(data.getGasQuantity().getSameNum().divide(data.getGasQuantity().getTotalNum())).doubleValue()*100 +"");
            data.getGasQuantity().setRingRate(Constants.formatBigdecimal4Float(data.getGasQuantity().getRingNum().divide(data.getGasQuantity().getTotalNum())).doubleValue()*100 +"");
        }
        if( data.getWaterQuantity().getTotalNum().compareTo(new BigDecimal(0)) !=0){
            // //计算用水同比环比
            data.getWaterQuantity().setSameRate(Constants.formatBigdecimal4Float(data.getWaterQuantity().getSameNum().divide(data.getWaterQuantity().getTotalNum())).doubleValue()*100 +"");
            data.getWaterQuantity().setRingRate(Constants.formatBigdecimal4Float(data.getWaterQuantity().getRingNum().divide(data.getWaterQuantity().getTotalNum())).doubleValue()*100 +"");
        }

        /*计算碳排量，以下三个因素之和
        1)用电的二氧化碳排放量(kg)=耗电量(kWh)x0.785；
        2) å¤©ç„¶æ°”二氧化碳排放量(kg)=天然气使用量(m3)×0.19；
        3) è‡ªæ¥æ°´äºŒæ°§åŒ–碳排放量(kg)=自来水使用量(m3)×0.91；*/
        data.setCarbon(Constants.formatBigdecimal2Float((carbonElec.multiply(new BigDecimal(0.785)))
                .add(carbonGas.multiply(new BigDecimal(0.19)))
                .add(carbonWater.multiply(new BigDecimal(0.91)))));
        return data;

    }

    /**
     * é€šè¿‡å®‰é˜²å¹³èŽ·å–本月数据
     * @param data
     */
    private void getMonthElectricityData(EnergyModelDataVO data) {
        BaseResponse<MonthDataByMeterTypeResponse> response = HKService.getCurrentMonthDataByMeterType("1");
        if(response != null && !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
           data.setRingRate(StringUtils.defaultString(response.getData().getRingPercent(),"0"));
           data.setSameRate(StringUtils.defaultString(response.getData().getSamePercent(),"0"));
           data.setTotal(StringUtils.defaultString(response.getData().getValue(),"0"));
        }
    }

    /**
     * é€šè¿‡å®‰é˜²å¹³èŽ·å–上月数据
     * @param data
     */
    private void getLastMonthElectricityData(EnergyModelDataVO data) {
        BaseResponse<LastMonthFeeByMeterTypeResponse> response = HKService.lastMonthFeeByMeterType("1");
        if(response != null && !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
           data.setRingRate(StringUtils.defaultString(response.getData().getRingPercent(),"0"));
           data.setSameRate(StringUtils.defaultString(response.getData().getSamePercent(),"0"));
           data.setTotal(StringUtils.defaultString(response.getData().getValue(),"0"));
        }
    }

    private EnergyModelDataVO getDefaultData() {
        EnergyModelDataVO data = new EnergyModelDataVO();
        data.setTotal("0");
        data.setSameRate("0");
        data.setRingRate("0");
        data.setTotalNum(new BigDecimal(0));
        data.setSameNum(new BigDecimal(0));
        data.setRingNum(new BigDecimal(0));
        return data;
    }

    /**
     * ç”¨ç”µæ€»èƒ½è€—同比、环比和区域用电量集合
     * @return
     */
    @Override
    public   RegionEnergyListResponse energyRegionData(){
        RegionEnergyListResponse data = null;
        BaseResponse<RegionEnergyListResponse> response = HKService.regionEnergyList("1");
        if(response != null && !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
            data = response.getData();
        }
        if(data == null){
            data = new RegionEnergyListResponse();
            data.setSecondRegionDataList(new ArrayList<>());
            data.setRootValue("0");
            data.setSamePercent("0");
            data.setRingPercent("0");
            data.setSecondRegionDataList(new ArrayList<>());
        }
        return data;

    }
    /**
     * è¿‘12个水电气油耗数据统计
     * @param type
     * @return
     */
    @Override
    public   List<EnergyDataVO> energyDataList(Integer type){
        List<EnergyDataVO> energyDataVOList = new ArrayList<>();
        List<OilDataVO> oilDataVOList = new ArrayList<>();
        Date lastMonth = DateUtil.increaseMonth(new Date(),-11);
        if(type >=0 && type <=2){
            //用水用电用气
            List<PlatformWaterGas> list =  platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>()
                            .select("DATE_FORMAT(TIME_INFO,'yyyy-MM') as time_info_str,sum(num) as num")
                    .lambda()
                    .eq(PlatformWaterGas::getIsdeleted,Constants.ZERO)
                    .eq(PlatformWaterGas::getType,type)
                    .apply("time_info BETWEEN DATE_SUB(CURDATE(), INTERVAL 12 MONTH) AND CURDATE()")//近12个月
                    .last(" groupby DATE_FORMAT(TIME_INFO,'yyyy-MM')")
            );
            for (int i = 0; i < 12; i++) {
                Date tempDate = DateUtil.increaseMonth(lastMonth,i);
                EnergyDataVO data = new EnergyDataVO();
                data.setTimeData(DateUtil.getFomartDate(tempDate,"YYYY-MM"));
                data.setEnergy(new BigDecimal(0));
                if(list!=null){
                    for(PlatformWaterGas m : list){
                        if(StringUtils.equals(m.getTimeInfoStr(),data.getTimeData())){
                            data.setEnergy(Constants.formatBigdecimal(m.getNum()));
                        }
                    }
                }
                energyDataVOList.add(data);
            }
        }else{
            for (int i = 0; i < 12; i++) {
                Date tempDate = DateUtil.increaseMonth(lastMonth,i);
                EnergyDataVO data = new EnergyDataVO();
                data.setTimeData(DateUtil.getFomartDate(tempDate,(i+1)+"月"));
                data.setEnergy(new BigDecimal(0));
                energyDataVOList.add(data);
            }
            //如果是用电数据
            EnergyTrendRequest param = new EnergyTrendRequest();
            param.setDate(DateUtil.getFomartDate(new Date(),"yyyy"));//年份
            param.setMeterType(1);
            param.setNodeType(2);
            param.setNodeId("root000000");
            param.setPeriodType("year");
            BaseResponse<EnergyTrendResponse> response = HKService.energyTrend(param);
            if(response != null && !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null&& response.getData().getYvalues()!=null ){
                for (int i = 0; i < 12; i++) {
                    if(response.getData().getYvalues().size()>0 &&response.getData().getYvalues().get(0).getValue().length>i){
                        //取相应的参数值
                        energyDataVOList.get(0).setEnergy(new BigDecimal(response.getData().getYvalues().get(0).getValue()[i]));
                    }
                }

            }
        }
        return energyDataVOList;
    }
    @Override
    public  VisitDataVO visitSecurityData(){
        //待访问、已登记、已离开

        VisitDataVO result = new VisitDataVO();
        result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
                .eq(Visits::getIsdeleted,Constants.ZERO)
                .in(Visits::getStatus,Constants.VisitStatus.pass,Constants.VisitStatus.xfSuccess )));//待访问
        result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
                .eq(Visits::getIsdeleted,Constants.ZERO)
                .in(Visits::getStatus,Constants.VisitStatus.signout,Constants.VisitStatus.signin )));//已登记
        result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
                .eq(Visits::getIsdeleted,Constants.ZERO)
                .in(Visits::getStatus,Constants.VisitStatus.signout )));//已签离
        PageWrap<Visits> pageWrap = new PageWrap<>();
        pageWrap.setCapacity(10);
        pageWrap.setPage(1);
        pageWrap.setModel(new Visits());
        pageWrap.getModel().setLevelStatus(Constants.ZERO);
        pageWrap.getModel().setStatus(Constants.TWO);
        PageData<Visits> visitsPageData =    VisitsServiceImpl.retentionPageBiz(pageWrap,visitsJoinMapper,systemDictDataBiz);
        List<VisitRetentionDataVO> list = new ArrayList<>();
        if(visitsPageData !=null && visitsPageData.getRecords() !=null && visitsPageData.getRecords().size()>0){
            for (Visits model : visitsPageData.getRecords()) {
                VisitRetentionDataVO data = new VisitRetentionDataVO();
                data.setName(model.getName());
                data.setCompanyName(model.getCompanyName());
                data.setTimeOutMinute(Constants.formatIntegerNum(model.getTimeOut()));
                list.add(data);
            }
            result.setRetentionNum(visitsPageData.getTotal());
        }
        result.setVisitRetentionDataList(list);//访客滞留数据集合
        return result;

    }
    @Override
    public  SecurityBoardVO centerSecurityData(){


        SecurityBoardVO data = new SecurityBoardVO();
        getParkingCarsNum(data);//获取车位数据
        List<Retention> retentionList = retentionMapper.selectJoinList(Retention.class,
                new MPJLambdaWrapper<Retention>()
                        .selectAll(Retention.class)
                        .selectAs(Company::getType,Retention::getCompanyType)
                        .leftJoin(Company.class,Company::getId,Retention::getCompanyId)
        );

        //今日在园人数
        data.setInParkTotal(
                (int) retentionList.stream().filter(i->!Constants.equalsInteger(i.getType(),Constants.THREE)).count()
        );
        //在园长期相关方人数
        data.setInternalTotal(
                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO) && Constants.equalsInteger(i.getCompanyType(),Constants.ZERO)).count()
        );
        //在园访客数量
        data.setVisitTotal(
                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&Objects.isNull(i.getCompanyType())).count()
        );
        //在园车辆
        data.setInternalCarTotal(
                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)).count()
        );
        //在园相关方车辆
        data.setRelatedCarTotal(
                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)
                        &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.relation)).count()
        );
        //内部车辆
        data.setInternalCarTotal(
                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)
                        &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.internal)).count()
        );
        //来访车辆
        data.setVisitCarTotal(
                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)
                        &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.visitor)).count()
        );
        //自由物流车数量
        data.setVisitCarTotal(
                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)
                        &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.selfTruck)).count()
        );
        //市公司卸货车数量
        data.setInternalJobCarTotal(
                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)
                        &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.cityComTruck)).count()
        );
        //外协车数量
        data.setRelatedJobCarTotal(
                (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)
                        &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.outTruck)).count()
        );
        return data;
    }

    private void getParkingCarsNum(SecurityBoardVO data) {
        try {
            BaseResponse<ParkingStatisticResponse> response = HKService.getParkingStatistics();
            if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) || response.getData()==null
            ||response.getData().getTodayParkingDataDto() == null){
                 return;
            }
            data.setParkingLotTotal(Constants.formatIntegerNum(response.getData().getTodayParkingDataDto().getTotalPlace()));//总车位
            data.setFreeParkingLot(Constants.formatIntegerNum(response.getData().getTodayParkingDataDto().getLeftPlace()));//剩余车位
            data.setParkingUseRate(Constants.formatBigdecimal(response.getData().getTodayParkingDataDto().getUseRate()));//车位使用率
        }catch (Exception e){

        }
    }

    @Override
@@ -361,22 +780,6 @@
                .eq(Platform::getIsdeleted, Constants.ZERO)
                .orderByAsc(Platform::getSortnum)
        );
        /**
         *    WAIT_CONFIRM(0, "待确认","待确认" ),
     *         WART_SIGN_IN(1, "待签到","待签到" ),
     *         WAIT_CALL(2, "已签到","已签到"),
     *         IN_WAIT(3, "入园等待","入园等待" ),
     *         CALLED(4, "已叫号","已叫号" ),
     *         WORKING(5, "作业中","作业中" ),
     *         DONE(6, "作业完成 ","作业完成" ),
     *         TRANSFERING(7, "转移中","转移中" ),
     *         EXCEPTION(8, "异常挂起","异常挂起" ),
     *         AUTHED_LEAVE(9, "已授权离园","已授权离园" ),
     *         LEAVED(10, "已离园 ","已离园 " ),
     *         OVER_NUMBER(11, "已过号","已过号" ),
     *         CANCEL(12, "已取消","已取消" ),
         */

        if(platformList!=null && platformList.size()>0){
            List<PlatformJob> jobList = platformJobMapper.selectJoinList(PlatformJob.class, new MPJLambdaWrapper<PlatformJob>()
                    .selectAll( PlatformJob.class)

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java

@@ -3,6 +3,7 @@
import com.doumee.core.haikang.model.param.respose.PageFireChannelInfoResponse;
import com.doumee.core.haikang.model.param.respose.PageRegionInfoResponse;
import com.doumee.core.haikang.model.param.respose.PageSensorStatusResponse;
import com.doumee.core.haikang.model.param.respose.RegionEnergyListResponse;
import com.doumee.core.tms.model.request.TmsLockStatusQueryRequest;
import com.doumee.core.tms.model.request.TmsOrderInfoRequest;
import com.doumee.core.tms.model.request.TmsOrderListRequest;
@@ -51,5 +52,21 @@

    List<SecurityDeviceDataVO> securityDeviceData();

    List<WaningEventDataVO> warningEventData(Integer type);
    WaningEventDataVO warningEventData(Integer type);

    String getCarmeraPreviemUrl(CarmeraListVO param);

    SecurityBoardVO centerSecurityData();

    VisitDataVO visitSecurityData();

    List<EnergyDataVO> loadEnergyCurve();

    List<OilDataVO> energyLastMonthOilSort();

    List<EnergyDataVO> energyDataList(Integer type);

    RegionEnergyListResponse energyRegionData();

    EnergyBoardVO centerEnergyData();
}