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

liukangdong

2024-12-19 96a2b1c68aa545abbf8245b0b2859b342fa6e63d

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

 admin/src/api/business/tmsFactoryParam.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,40 @@
import request from '../../utils/request'

// æŸ¥è¯¢
export function fetchList (data) {
  return request.post('/visitsAdmin/cloudService/tmsFactoryParam/page', data, {
    trim: true
  })
}

// å¯¼å‡ºExcel
export function exportExcel (data) {
  return request.post('/visitsAdmin/cloudService/tmsFactoryParam/exportExcel', data, {
    trim: true,
    download: true
  })
}

// åˆ›å»º
export function create (data) {
  return request.post('/visitsAdmin/cloudService/tmsFactoryParam/create', data)
}

// ä¿®æ”¹
export function updateById (data) {
  return request.post('/visitsAdmin/cloudService/tmsFactoryParam/updateById', data)
}

// åˆ é™¤
export function deleteById (id) {
  return request.get(`/visitsAdmin/cloudService/tmsFactoryParam/delete/${id}`)
}

// æ‰¹é‡åˆ é™¤
export function deleteByIdInBatch (ids) {
  return request.get('/visitsAdmin/cloudService/tmsFactoryParam/delete/batch', {
    params: {
      ids
    }
  })
}

 admin/src/components/business/OperaTmsFactoryParamWindow.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,58 @@
<template>
  <GlobalWindow
    :title="title"
    :visible.sync="visible"
    :confirm-working="isWorking"
    @confirm="confirm"
  >
    <el-form :model="form" ref="form" :rules="rules">
       <el-form-item label="名称" prop="name" required>
        <el-input v-model="form.name" placeholder="请输入名称" v-trim/>
      </el-form-item>
    <el-form-item label="TMS编码" prop="code" required>
      <el-input v-model="form.code" placeholder="请输入TMS编码" v-trim/>
    </el-form-item>
      <el-form-item label="总库存量（万支）" prop="num1">
        <el-input v-model="form.num1" placeholder="请输入总库存量（万支）" v-trim/>
      </el-form-item>
      <el-form-item label="总出库能力（万支）" prop="num2">
        <el-input v-model="form.num2" placeholder="请输入总出库能力（万支）" v-trim/>
      </el-form-item>
    <el-form-item label="排序码" prop="sortnum">
      <el-input v-model="form.sortnum" placeholder="请输入排序码" v-trim/>
    </el-form-item>
    </el-form>
  </GlobalWindow>
</template>

<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
export default {
  name: 'OperaTmsFactoryParamWindow',
  extends: BaseOpera,
  components: { GlobalWindow },
  data () {
    return {
      // è¡¨å•æ•°æ®
      form: {
        id: null,
        code: '',
        name: '',
        sortnum: '',
        num1: '',
        num2: ''
      },
      // éªŒè¯è§„则
      rules: {
      }
    }
  },
  created () {
    this.config({
      api: '/business/tmsFactoryParam',
      'field.id': 'id'
    })
  }
}
</script>

 admin/src/views/business/tmsFactoryParam.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,88 @@
<template>
  <TableLayout :permissions="['business:tmsfactoryparam:query']">
    <!-- æœç´¢è¡¨å• -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="名称" prop="name">
        <el-input v-model="searchForm.name" placeholder="名称" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="编码" prop="code">
        <el-input v-model="searchForm.code" placeholder="编码" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
      </section>
    </el-form>
    <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:tmsfactoryparam:create', 'business:tmsfactoryparam:delete']">
        <li><el-button type="primary" @click="$refs.operaTmsFactoryParamWindow.open('新建TMS工厂配置信息表')" icon="el-icon-plus" v-permissions="['business:tmsfactoryparam:create']">新建</el-button></li>
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:tmsfactoryparam:delete']">删除</el-button></li>
      </ul>
      <el-table
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe
        @selection-change="handleSelectionChange"
      >
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="name" label="姓名" min-width="100px"></el-table-column>
        <el-table-column prop="code" label="编码" min-width="100px"></el-table-column>
        <el-table-column prop="num1" label="总库存量（万支）" min-width="100px"></el-table-column>
        <el-table-column prop="num2" label="总出库能力（万支）" min-width="100px"></el-table-column>
        <el-table-column prop="sortnum" label="排序码" min-width="100px"></el-table-column>
        <el-table-column prop="editorName" label="操作人" min-width="100px"></el-table-column>
        <el-table-column prop="editDate" label="更新时间" min-width="100px"></el-table-column>
        <el-table-column
          v-if="containPermissions(['business:tmsfactoryparam:update', 'business:tmsfactoryparam:delete'])"
          label="操作"
          min-width="120"
          fixed="right"
        >
          <template slot-scope="{row}">
            <el-button type="text" @click="$refs.operaTmsFactoryParamWindow.open('编辑TMS工厂配置信息表', row)" icon="el-icon-edit" v-permissions="['business:tmsfactoryparam:update']">编辑</el-button>
            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:tmsfactoryparam:delete']">删除</el-button>
          </template>
        </el-table-column>
      </el-table>
      <pagination
        @size-change="handleSizeChange"
        @current-change="handlePageChange"
        :pagination="tableData.pagination"
      >
      </pagination>
    </template>
    <!-- æ–°å»º/修改 -->
    <OperaTmsFactoryParamWindow ref="operaTmsFactoryParamWindow" @success="handlePageChange"/>
  </TableLayout>
</template>

<script>
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaTmsFactoryParamWindow from '@/components/business/OperaTmsFactoryParamWindow'
export default {
  name: 'TmsFactoryParam',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaTmsFactoryParamWindow },
  data () {
    return {
      // æœç´¢
      searchForm: {
        code: '',
        name: ''
      }
    }
  },
  created () {
    this.config({
      module: 'TMS工厂配置信息表',
      api: '/business/tmsFactoryParam',
      'field.id': 'id',
      'field.main': 'id'
    })
    this.search()
  }
}
</script>

 server/db/business.tms_factory_param.permissions.sql

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,6 @@
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:tmsfactoryparam:create', '新建TMS工厂配置信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:tmsfactoryparam:delete', '删除TMS工厂配置信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:tmsfactoryparam:update', '修改TMS工厂配置信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:tmsfactoryparam:query', '查询TMS工厂配置信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:tmsfactoryparam:exportExcel', '导出TMS工厂配置信息表(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);


 server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java

@@ -1539,6 +1539,7 @@
                )
                .eq("c.DELETED",0)
                .eq("c.status",0)
                .eq("m.WORK_STATUS",0)
                .orderByAsc("c.id")
        );
        String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()

 server/system_service/src/main/java/com/doumee/dao/system/SystemUserMapper.java

@@ -32,7 +32,8 @@
    @Select(" select c.id , c.type , c.REALNAME as realName , c.userName as userName , c.avatar ," +
            " c.wechat_name as wechatName , c.mobile , c.sex , c.birthday  , c.avatar   ,  d.COMPANY_NAME_PATH as departmentName  " +
            " from system_user c   " +
            " INNER JOIN company d on c.COMPANY_ID = d.id  " +
            " INNER JOIN company d on c.COMPANY_ID = d.id " +
            " LEFT JOIN member m on c.member_id = m.id   " +
            " ${ew.customSqlSegment} ")
    IPage<UserResponse> getUserPage(IPage<UserResponse> page, @Param(Constants.WRAPPER) Wrapper wrapper);


 server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java

@@ -59,5 +59,10 @@
    @ApiModelProperty(value = "是否查询固定人员组织主键" ,hidden = true)
    private String companySpecialId;

    @ApiModelProperty(value = "在职状态 0在职 1离职" )
    private Integer workStatus;




}

 server/system_service/src/main/resources/mappers/SystemUserMapper.xml

@@ -66,6 +66,9 @@
      <if test="dto.status != null ">
        AND  usr.`status` = #{dto.status}
      </if>
      <if test="dto.workStatus != null ">
        AND  m.WORK_STATUS = #{dto.workStatus}
      </if>
      <if test="dto.memberType != null ">
        AND  m.`type` = #{dto.memberType}
      </if>

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java

@@ -182,4 +182,21 @@
        return ApiResponse.success(  HKService.temperatureHumidityDataStatistic(request));
    }

    @ApiOperation("【海康】根据时间和时间维度获取园区能耗数据")
    @PostMapping("/energyTotal")
    @LoginNoRequired
    public ApiResponse<BaseResponse<EnergyTotalDataResponse>> energyTotalData(@RequestBody EnergyTotalDataRequest request, HttpServletResponse response) {
        return ApiResponse.success(  HKService.energyTotal(request));
    }


    @ApiOperation("【海康】获取区域用量排名-能耗看板")
    @PostMapping("/regionDataRanking")
    @LoginNoRequired
    public ApiResponse<BaseResponse<List<RegionDataRankingDataResponse>>> regionDataRankingData(@RequestBody RegionDataRankingDataRequest request, HttpServletResponse response) {
        return ApiResponse.success(  HKService.regionDataRanking(request));
    }



}

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsFactoryParamCloudController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,93 @@
package com.doumee.cloud.admin;

import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
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.business.model.TmsFactoryParam;
import com.doumee.service.business.TmsFactoryParamService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2024/12/18 17:44
 */
@Api(tags = "TMS工厂配置信息表")
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/tmsFactoryParam")
public class TmsFactoryParamCloudController extends BaseController {

    @Autowired
    private TmsFactoryParamService tmsFactoryParamService;

    @PreventRepeat
    @ApiOperation("新建")
    @PostMapping("/create")
    @CloudRequiredPermission("business:tmsfactoryparam:create")
    public ApiResponse create(@RequestBody TmsFactoryParam tmsFactoryParam,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        tmsFactoryParam.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(tmsFactoryParamService.create(tmsFactoryParam));
    }

    @ApiOperation("根据ID删除")
    @GetMapping("/delete/{id}")
    @CloudRequiredPermission("business:tmsfactoryparam:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        tmsFactoryParamService.deleteById(id,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

    @ApiOperation("批量删除")
    @GetMapping("/delete/batch")
    @CloudRequiredPermission("business:tmsfactoryparam:delete")
    public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        String [] idArray = ids.split(",");
        List<Integer> idList = new ArrayList<>();
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        tmsFactoryParamService.deleteByIdInBatch(idList,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

    @ApiOperation("根据ID修改")
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:tmsfactoryparam:update")
    public ApiResponse updateById(@RequestBody TmsFactoryParam tmsFactoryParam,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        tmsFactoryParam.setLoginUserInfo(this.getLoginUser(token));
        tmsFactoryParamService.updateById(tmsFactoryParam);
        return ApiResponse.success(null);
    }

    @ApiOperation("分页查询")
    @PostMapping("/page")
    @CloudRequiredPermission("business:tmsfactoryparam:query")
    public ApiResponse<PageData<TmsFactoryParam>> findPage (@RequestBody PageWrap<TmsFactoryParam> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        return ApiResponse.success(tmsFactoryParamService.findPage(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:tmsfactoryparam:exportExcel")
    public void exportExcel (@RequestBody PageWrap<TmsFactoryParam> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ExcelExporter.build(TmsFactoryParam.class).export(tmsFactoryParamService.findPage(pageWrap).getRecords(), "TMS工厂配置信息表", response);
    }

    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @CloudRequiredPermission("business:tmsfactoryparam:query")
    public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        return ApiResponse.success(tmsFactoryParamService.findById(id));
    }
}

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

@@ -2,7 +2,11 @@

import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.RegionDataRankingTypeRequest;
import com.doumee.core.haikang.model.param.respose.RegionDataRankingDataResponse;
import com.doumee.core.haikang.model.param.respose.RegionEnergyListResponse;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.dao.web.response.platformReport.*;
@@ -10,11 +14,9 @@
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
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 javax.servlet.http.HttpServletResponse;
import java.util.List;

/**
@@ -36,12 +38,21 @@
    @ApiOperation("中心数据")
    @GetMapping("/centerData")
    public ApiResponse<EnergyBoardVO> centerData() {

        EnergyBoardVO data =boardService.centerEnergyData();

        return ApiResponse.success(data);
    }



    @LoginNoRequired
    @ApiOperation("中心用电能耗数据")
    @GetMapping("/regionDataRanking")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "查询类型：1=今日；2=本月；3=昨日", required = true),
    })
    public ApiResponse<List<RegionDataRankingDataResponse>> regionDataRanking(@RequestParam Integer type) {
        return ApiResponse.success(boardService.getRegionDataRanking(type));
    }


    @LoginNoRequired
@@ -57,7 +68,6 @@
    @ApiOperation("实时负荷曲线")
    @GetMapping("/loadCurve")
    public ApiResponse<List<EnergyDataVO>> loadCurve() {

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

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

@@ -621,6 +621,8 @@
        String[] minitorDataSearch= new String[]{"/api/fpms/v2/minitor/data/search","分页查询设备监测历史数据"};//分页查询设备监测历史数据
        String[] userOpenidSave= new String[]{"/api/v1/oa/userOpenId/saveV2","保存用户及openId绑定信息微信公众号"};//保存用户及openId绑定信息微信公众号
        String[] temperatureHumidityDataStatistic= new String[]{"/api/v2/public/monitor/sensor/list","消防看板-4温湿度统计"};//消防看板-温湿度
        String[] regionDataRanking= new String[]{"/api/ecm/v1/energy/regionDataRanking","消防看板-4获取区域用量排名-能耗看板"};//消防看板-获取区域用量排名 - èƒ½è€—看板
        String[] energyTotal= new String[]{"/api/ecm/v1/energy/energyTotal","消防看板-4根据时间和时间维度获取园区能耗数据"};//消防看板-根据时间和时间维度获取园区能耗数据
    }
    /**
     * é™„录A.55消防设备类型

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

@@ -322,6 +322,23 @@
        return startDoPostStringArtemisAdmin(HKConstants.InterfacePath.temperatureHumidityDataStatistic,body);
    }

    /**
     *消防看板-4获取区域用量排名-能耗看板
     * @param body
     * @return
     */
    public static String regionDataRanking(String body) {
        return startDoPostStringArtemis(HKConstants.InterfacePath.regionDataRanking,body);
    }

    /**
     *消防看板-4根据时间和时间维度获取园区能耗数据
     * @param body
     * @return
     */
    public static String energyTotal(String body) {
        return startDoPostStringArtemis(HKConstants.InterfacePath.energyTotal,body);
    }

    /**
     *    èŽ·å–门禁点列表

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

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

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

@Data
public class EnergyTotalDataRequest {

    @ApiModelProperty(value = "时间维度day/month/year")
    private String  periodType;

    @ApiModelProperty(value = "查询日期")
    private String  date;

}

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

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

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

@Data
public class RegionDataRankingDataRequest {

    @ApiModelProperty(value = "时间维度day/month/year")
    private String  periodType;

    @ApiModelProperty(value = "查询日期")
    private String  date;

    @ApiModelProperty(value = "仪表类型(1:电表;2:水表;3:气表;4:热表)")
    private Integer  meterType;

}

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

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

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

@Data
public class RegionDataRankingTypeRequest {

    @ApiModelProperty(value = "查询类型：1=今日；2=本月；3=昨日")
    private Integer queryType;


}

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

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

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

@Data
public class EnergyTotalDataResponse {

 @ApiModelProperty(value = "用电总量")
 private String   electricity;

 @ApiModelProperty(value = "用水总量")
 private String  water;

 @ApiModelProperty(value = "用气总量")
 private String  gas;

 @ApiModelProperty(value = "用热总量")
 private String  heat;

 @ApiModelProperty(value = "自定义总量")
 private String  extend    ;

}

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

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

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

@Data
public class RegionDataRankingDataResponse {

 @ApiModelProperty(value = "区域")
 private String   name;

 @ApiModelProperty(value = "电量")
 private String  value;

 @ApiModelProperty(value = "百分比")
 private String  percent;

}

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

@@ -958,6 +958,45 @@
        return  null;
    }

    /**
     *消防看板-4获取区域用量排名-能耗看板
     * @return
     */
    public  static  BaseResponse<List<RegionDataRankingDataResponse>>  regionDataRanking(RegionDataRankingDataRequest param){
        log.info("【海康消防看板-4获取区域用量排名-能耗看板】================开始===="+JSONObject.toJSONString(param));
        try {
            String res = HKTools.regionDataRanking(JSONObject.toJSONString(param));
            TypeReference typeReference =
                    new TypeReference< BaseResponse<List<RegionDataRankingDataResponse> >>(){};
            BaseResponse<List<RegionDataRankingDataResponse>>   result = JSONObject.parseObject(res, typeReference.getType());
            logResult(result,"海康消防看板-4获取区域用量排名-能耗看板");
            return  result;
        }catch (Exception e){
            log.error("【海康消防看板-4获取区域用量排名-能耗看板】================失败====：\n"+ e.getMessage());
        }
        return  null;
    }


    /**
     *消防看板-4获取区域用量排名-能耗看板
     * @return
     */
    public  static  BaseResponse<EnergyTotalDataResponse>  energyTotal(EnergyTotalDataRequest param){
        log.info("【海康消防看板-4根据时间和时间维度获取园区能耗数据】================开始===="+JSONObject.toJSONString(param));
        try {
            String res = HKTools.energyTotal(JSONObject.toJSONString(param));
            TypeReference typeReference =
                    new TypeReference< BaseResponse<EnergyTotalDataResponse >>(){};
            BaseResponse<EnergyTotalDataResponse>   result = JSONObject.parseObject(res, typeReference.getType());
            logResult(result,"海康消防看板-4根据时间和时间维度获取园区能耗数据");
            return  result;
        }catch (Exception e){
            log.error("【海康消防看板-4根据时间和时间维度获取园区能耗数据】================失败====：\n"+ e.getMessage());
        }
        return  null;
    }


    /**
     *分页查询消防设备部件状态

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
package com.doumee.dao.business;

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

/**
 * @author æ±Ÿè¹„蹄
 * @date 2024/12/18 17:44
 */
public interface TmsFactoryParamMapper extends MPJBaseMapper<TmsFactoryParam> {

}

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

@@ -59,7 +59,7 @@
    private Integer areaId;

    @ApiModelProperty(value = "状态 0待处理 1已处理 2不处理", example = "1")
    @ExcelColumn(name="处理结果" ,valueMapping ="0=0待处理;1=已处理;2=不处理;",index = 5)
    @ExcelColumn(name="处理结果" ,valueMapping ="0=0待处理;1=已处理;2=不处理;",index = 5,width = 6)
    private Integer status;

    @ApiModelProperty(value = "申请处理人编码(关联member)", example = "1")
@@ -91,12 +91,12 @@
    private Integer checkUserId;

    @ApiModelProperty(value = "区域名称")
    @ExcelColumn(name="隐患区域",index = 1)
    @ExcelColumn(name="隐患区域",index = 1,width = 10)
    private String areaName;

    @ApiModelProperty(value = "申请人姓名", example = "1")
    @TableField(exist = false)
    @ExcelColumn(name="提报人姓名",index =3)
    @ExcelColumn(name="提报人姓名",index =3,width = 6)
    private String memberName;
    @ApiModelProperty(value = "申请人所属组织名称", example = "1")
    @TableField(exist = false)
@@ -104,7 +104,7 @@
    private String companyName;
    @ApiModelProperty(value = "责任部门名称", example = "1")
    @TableField(exist = false)
    @ExcelColumn(name="责任部门名称",index = 0)
    @ExcelColumn(name="责任部门名称",index = 0,width = 10)
    private String dutyCompanyName;
    @ApiModelProperty(value = "申请人手机号", example = "1")
    @TableField(exist = false)
@@ -124,7 +124,7 @@
    private String checkorPhone;
    @ApiModelProperty(value = "隐患类型名称", example = "1")
    @TableField(exist = false)
    @ExcelColumn(name="隐患类型",index = 2)
    @ExcelColumn(name="隐患类型",index = 2,width = 10)
    private String categoryName;

    @ApiModelProperty(value = "查询开始时间（基于提报时间）", example = "2024-05-20 11:48:50")
@@ -145,12 +145,12 @@

    @ApiModelProperty(value = "提报时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ExcelColumn(name="提报时间",index = 6,dateFormat = "yyyy-MM-dd HH:mm:ss")
    @ExcelColumn(name="提报时间",index = 6,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 18)
    private Date submitTime;

    @ApiModelProperty(value = "处理时间（整改/退回使用）")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ExcelColumn(name="处理时间",index = 7 ,dateFormat = "yyyy-MM-dd HH:mm:ss")
    @ExcelColumn(name="处理时间",index = 7 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 18)
    private Date dealTime;

    @ApiModelProperty(value = "附件信息")

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

@@ -65,8 +65,8 @@
    @ExcelColumn(name="入库类型",index = 7,width = 12,valueMapping = "0=整托盘;1=件烟;")
    private Integer inType;

    @ApiModelProperty(value = "总运输量", example = "1")
    @ExcelColumn(name="总运输量",index = 2,width = 12)
    @ApiModelProperty(value = "总作业量(万支)", example = "1")
    @ExcelColumn(name="总作业量(万支)",index = 2,width = 12)
    private BigDecimal totalNum;

    @ApiModelProperty(value = "前车牌号")

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,86 @@
package com.doumee.dao.business.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;

/**
 * TMS工厂配置信息表
 * @author æ±Ÿè¹„蹄
 * @date 2024/12/18 17:44
 */
@Data
@ApiModel("TMS工厂配置信息表")
@TableName("`tms_factory_param`")
public class TmsFactoryParam extends LoginUserModel {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    @ExcelColumn(name="主键")
    private Integer id;

    @ApiModelProperty(value = "创建人编码", example = "1")
    @ExcelColumn(name="创建人编码")
    private Integer creator;

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    private Date createDate;

    @ApiModelProperty(value = "更新人编码", example = "1")
    @ExcelColumn(name="更新人编码")
    private Integer editor;

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
    @ExcelColumn(name="是否删除0否 1是")
    private Integer isdeleted;

    @ApiModelProperty(value = "备注")
    @ExcelColumn(name="备注")
    private String remark;

    @ApiModelProperty(value = "编号")
    @ExcelColumn(name="编号")
    private String code;

    @ApiModelProperty(value = "名称")
    @ExcelColumn(name="名称")
    private String name;

    @ApiModelProperty(value = "排序码", example = "1")
    @ExcelColumn(name="排序码")
    private Integer sortnum;

    @ApiModelProperty(value = "总库存量（万支）", example = "1")
    @ExcelColumn(name="总库存量（万支）")
    private BigDecimal num1;

    @ApiModelProperty(value = "总出库能力（万支）", example = "1")
    @ExcelColumn(name="总出库能力（万支）")
    private BigDecimal num2;

    @ApiModelProperty(value = "扩展字段3")
    @ExcelColumn(name="扩展字段3")
    private String param3;

    @ApiModelProperty(value = "扩展字段4")
    @ExcelColumn(name="扩展字段4")
    private String param4;
    @ApiModelProperty(value = "操作人姓名")
    @TableField(exist = false)
    private String editorName;

}

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

@@ -22,22 +22,22 @@
public class PlatformWaterGasForExcelVO {

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="最近操作时间",index = 5,dateFormat="yyyy-MM-dd HH:mm",width = -1)
    @ExcelColumn(name="最近操作时间",index = 5,dateFormat="yyyy-MM-dd HH:mm",width = 20)
    private Date editDate;

    @ApiModelProperty(value = "时间（年月）")
    @ExcelColumn(name="使用月份",index = 2,dateFormat="yyyy-MM")
    @ExcelColumn(name="使用月份",index = 2,dateFormat="yyyy-MM",width = 10)
    private Date timeInfo;

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

    @ApiModelProperty(value = "数量 (用电顿，用电度； æ²¹è€—L）", example = "1")
    @ExcelColumn(name="数量",index = 3)
    @ExcelColumn(name="数量",index = 3,width = 10)
    private BigDecimal num;

    @ApiModelProperty(value = "说明")
    @ExcelColumn(name="说明",index = 4)
    @ExcelColumn(name="说明",index = 4,width = 20)
    private String content;
}

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

@@ -1,9 +1,11 @@
package com.doumee.dao.web.response.platformReport;

import com.doumee.core.haikang.model.param.respose.RegionDataRankingDataResponse;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

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

/**
 * Created by IntelliJ IDEA.
@@ -28,4 +30,7 @@
    @ApiModelProperty(value = "同比值" ,hidden = true)
    private BigDecimal sameNum;

    @ApiModelProperty(value = "各个区域用电信息")
    private List<RegionDataRankingDataResponse> regionDataRankingDataList;

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,98 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.TmsFactoryParam;
import java.util.List;

/**
 * TMS工厂配置信息表Service定义
 * @author æ±Ÿè¹„蹄
 * @date 2024/12/18 17:44
 */
public interface TmsFactoryParamService {

    /**
     * åˆ›å»º
     * 
     * @param tmsFactoryParam å®žä½“对象
     * @return Integer
     */
    Integer create(TmsFactoryParam tmsFactoryParam);

    /**
     * ä¸»é”®åˆ é™¤
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id,LoginUserInfo user);

    /**
     * åˆ é™¤
     *
     * @param tmsFactoryParam å®žä½“对象
     */
    void delete(TmsFactoryParam tmsFactoryParam);

    /**
     * æ‰¹é‡ä¸»é”®åˆ é™¤
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user);

    /**
     * ä¸»é”®æ›´æ–°
     *
     * @param tmsFactoryParam å®žä½“对象
     */
    void updateById(TmsFactoryParam tmsFactoryParam);

    /**
     * æ‰¹é‡ä¸»é”®æ›´æ–°
     *
     * @param tmsFactoryParams å®žä½“集
     */
    void updateByIdInBatch(List<TmsFactoryParam> tmsFactoryParams);

    /**
     * ä¸»é”®æŸ¥è¯¢
     *
     * @param id ä¸»é”®
     * @return TmsFactoryParam
     */
    TmsFactoryParam findById(Integer id);

    /**
     * æ¡ä»¶æŸ¥è¯¢å•æ¡è®°å½•
     *
     * @param tmsFactoryParam å®žä½“对象
     * @return TmsFactoryParam
     */
    TmsFactoryParam findOne(TmsFactoryParam tmsFactoryParam);

    /**
     * æ¡ä»¶æŸ¥è¯¢
     *
     * @param tmsFactoryParam å®žä½“对象
     * @return List<TmsFactoryParam>
     */
    List<TmsFactoryParam> findList(TmsFactoryParam tmsFactoryParam);
  
    /**
     * åˆ†é¡µæŸ¥è¯¢
     *
     * @param pageWrap åˆ†é¡µå¯¹è±¡
     * @return PageData<TmsFactoryParam>
     */
    PageData<TmsFactoryParam> findPage(PageWrap<TmsFactoryParam> pageWrap);

    /**
     * æ¡ä»¶ç»Ÿè®¡
     *
     * @param tmsFactoryParam å®žä½“对象
     * @return long
     */
    long count(TmsFactoryParam tmsFactoryParam);
}

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

@@ -424,8 +424,6 @@
        return hiddenDangerMapper.selectCount(wrapper);
    }



    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public void dealHiddenDanger(HiddenDanger hiddenDanger){

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,194 @@
package com.doumee.service.business.impl;

import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.TmsFactoryParamMapper;
import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.model.PlatformGroup;
import com.doumee.dao.business.model.TmsFactoryParam;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.TmsFactoryParamService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

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

/**
 * TMS工厂配置信息表Service实现
 * @author æ±Ÿè¹„蹄
 * @date 2024/12/18 17:44
 */
@Service
public class TmsFactoryParamServiceImpl implements TmsFactoryParamService {

    @Autowired
    private TmsFactoryParamMapper tmsFactoryParamMapper;

    @Override
    public Integer create(TmsFactoryParam model) {
        if(tmsFactoryParamMapper.selectCount(new QueryWrapper<TmsFactoryParam>().lambda()
                .eq(TmsFactoryParam::getIsdeleted, Constants.ZERO)
                .eq(TmsFactoryParam::getCode,model.getCode())
        )>0){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，工厂编码不能重复！");
        }
        model.setIsdeleted(Constants.ZERO);
        model.setCreator(model.getLoginUserInfo().getId());
        model.setCreateDate(new Date());
        model.setEditDate(model.getCreateDate());
        model.setEditor(model.getCreator());
        tmsFactoryParamMapper.insert(model);
        return model.getId();
    }

    @Override
    public void deleteById(Integer id, LoginUserInfo user) {
        tmsFactoryParamMapper.update(null,
                new UpdateWrapper<TmsFactoryParam>()
                .lambda()
                .set(TmsFactoryParam::getIsdeleted,Constants.ONE)
                .eq(TmsFactoryParam::getId,id)
                .set(TmsFactoryParam::getEditDate,new Date())
                .set(TmsFactoryParam::getEditor,user.getId())
        );
    }

    @Override
    public void delete(TmsFactoryParam tmsFactoryParam) {
        UpdateWrapper<TmsFactoryParam> deleteWrapper = new UpdateWrapper<>(tmsFactoryParam);
        tmsFactoryParamMapper.delete(deleteWrapper);
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        for(Integer id : ids){
            deleteById(id,user);
        }
    }

    @Override
    public void updateById(TmsFactoryParam model) {
        if(tmsFactoryParamMapper.selectCount(new QueryWrapper<TmsFactoryParam>().lambda()
                .eq(TmsFactoryParam::getIsdeleted, Constants.ZERO)
                .ne(TmsFactoryParam::getId,model.getId())
                .eq(TmsFactoryParam::getCode,model.getCode())
        )>0){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，工厂编码不能重复！");
        }
        model.setEditor(model.getLoginUserInfo().getId());
        model.setEditDate(model.getCreateDate());
        tmsFactoryParamMapper.updateById(model);
    }

    @Override
    public void updateByIdInBatch(List<TmsFactoryParam> tmsFactoryParams) {
        if (CollectionUtils.isEmpty(tmsFactoryParams)) {
            return;
        }
        for (TmsFactoryParam tmsFactoryParam: tmsFactoryParams) {
            this.updateById(tmsFactoryParam);
        }
    }

    @Override
    public TmsFactoryParam findById(Integer id) {
        return tmsFactoryParamMapper.selectById(id);
    }

    @Override
    public TmsFactoryParam findOne(TmsFactoryParam tmsFactoryParam) {
        QueryWrapper<TmsFactoryParam> wrapper = new QueryWrapper<>(tmsFactoryParam);
        return tmsFactoryParamMapper.selectOne(wrapper);
    }

    @Override
    public List<TmsFactoryParam> findList(TmsFactoryParam tmsFactoryParam) {
        tmsFactoryParam.setIsdeleted(Constants.ZERO);
        QueryWrapper<TmsFactoryParam> wrapper = new QueryWrapper<>(tmsFactoryParam);
        return tmsFactoryParamMapper.selectList(wrapper);
    }
  
    @Override
    public PageData<TmsFactoryParam> findPage(PageWrap<TmsFactoryParam> pageWrap) {
        IPage<TmsFactoryParam> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<TmsFactoryParam> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        pageWrap.getModel().setIsdeleted(Constants.ZERO);
        queryWrapper.selectAll(TmsFactoryParam.class)
                .selectAs(SystemUser::getRealname,TmsFactoryParam::getEditorName)
                .leftJoin(SystemUser.class,SystemUser::getId,TmsFactoryParam::getEditor);
        if (pageWrap.getModel().getId() != null) {
             queryWrapper.eq(TmsFactoryParam::getId, pageWrap.getModel().getId());
        }
        if (pageWrap.getModel().getCreator() != null) {
             queryWrapper.eq(TmsFactoryParam::getCreator, pageWrap.getModel().getCreator());
        }
        if (pageWrap.getModel().getCreateDate() != null) {
             queryWrapper.ge(TmsFactoryParam::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
             queryWrapper.le(TmsFactoryParam::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
        }
        if (pageWrap.getModel().getEditor() != null) {
             queryWrapper.eq(TmsFactoryParam::getEditor, pageWrap.getModel().getEditor());
        }
        if (pageWrap.getModel().getEditDate() != null) {
             queryWrapper.ge(TmsFactoryParam::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
             queryWrapper.le(TmsFactoryParam::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
        }
        if (pageWrap.getModel().getIsdeleted() != null) {
             queryWrapper.eq(TmsFactoryParam::getIsdeleted, pageWrap.getModel().getIsdeleted());
        }
        if (pageWrap.getModel().getRemark() != null) {
             queryWrapper.eq(TmsFactoryParam::getRemark, pageWrap.getModel().getRemark());
        }
        if (pageWrap.getModel().getCode() != null) {
             queryWrapper.like(TmsFactoryParam::getCode, pageWrap.getModel().getCode());
        }
        if (pageWrap.getModel().getName() != null) {
             queryWrapper.like(TmsFactoryParam::getName, pageWrap.getModel().getName());
        }
        if (pageWrap.getModel().getSortnum() != null) {
             queryWrapper.eq(TmsFactoryParam::getSortnum, pageWrap.getModel().getSortnum());
        }
        if (pageWrap.getModel().getNum1() != null) {
             queryWrapper.eq(TmsFactoryParam::getNum1, pageWrap.getModel().getNum1());
        }
        if (pageWrap.getModel().getNum2() != null) {
             queryWrapper.eq(TmsFactoryParam::getNum2, pageWrap.getModel().getNum2());
        }
        if (pageWrap.getModel().getParam3() != null) {
             queryWrapper.eq(TmsFactoryParam::getParam3, pageWrap.getModel().getParam3());
        }
        if (pageWrap.getModel().getParam4() != null) {
             queryWrapper.eq(TmsFactoryParam::getParam4, pageWrap.getModel().getParam4());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        return PageData.from(tmsFactoryParamMapper.selectPage(page, queryWrapper));
    }

    @Override
    public long count(TmsFactoryParam tmsFactoryParam) {
        QueryWrapper<TmsFactoryParam> wrapper = new QueryWrapper<>(tmsFactoryParam);
        return tmsFactoryParamMapper.selectCount(wrapper);
    }
}

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

@@ -14,6 +14,7 @@
import com.doumee.core.haikang.model.param.respose.*;
import com.doumee.core.haikang.service.HKCarOpenService;
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;
@@ -39,7 +40,9 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;

import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -1273,6 +1276,7 @@
        data.setYesterdayElectricity(getDefaultData());//昨日用电
        getMonthElectricityData(data.getMonthElectricity());//通过安防平获取本月用电量数据
        carbonElec = new BigDecimal(StringUtils.defaultString(data.getMonthElectricity().getTotal(), "0"));

        getLastMonthElectricityData(data.getElectricityQuantity());//通过安防平获取上月用电量数据
        getCurrentDateElectircityData(data.getTodayElectricity(),0);//通过安防平获取今日用电量数据
        getCurrentDateElectircityData(data.getYesterdayElectricity(),-1);//通过安防平获取昨日用电量数据
@@ -1420,7 +1424,6 @@
        }
        if(data == null){
            data = new RegionEnergyListResponse();
            data.setSecondRegionDataList(new ArrayList<>());
            data.setRootValue("0");
            data.setSamePercent("0");
            data.setRingPercent("0");
@@ -1926,4 +1929,32 @@
        return  data;
    }

    /**
     * æŸ¥è¯¢èƒ½è€—用电信息  1=今日；2=本月；3=昨日
     * @return
     */
    @Override
    public List<RegionDataRankingDataResponse> getRegionDataRanking(Integer type){
        RegionDataRankingDataRequest request = new RegionDataRankingDataRequest();
        request.setMeterType(1);
        if(Constants.equalsInteger(type,Constants.ONE)){
            request.setDate(DateUtil.getFomartDate(new Date(),"yyyy-MM-dd"));
            request.setPeriodType("day");
        }else if(Constants.equalsInteger(type,Constants.TWO)){
            request.setDate(DateUtil.getFomartDate(new Date(),"yyyy-MM"));
            request.setPeriodType("month");
        }else{
            request.setDate(DateUtil.getBeforDay(new Date(),1));
            request.setPeriodType("day");
        }
        BaseResponse<List<RegionDataRankingDataResponse>> response = HKService.regionDataRanking(request);
        if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
            return response.getData();
        }else{
            return null;
        }
    }



}

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

@@ -136,15 +136,20 @@
                TMSContants.TopStatusLevel tem = TMSContants.TopStatusLevel.ddsc;
                if(i == 0){
                    tem=TMSContants.TopStatusLevel.yrk;
                } if(i == 1){
                }
                if(i == 1){
                    tem=TMSContants.TopStatusLevel.ydh;
                } if(i == 2){
                }
                if(i == 2){
                    tem=TMSContants.TopStatusLevel.clysz;
                } if(i == 4){
                }
                if(i == 4){
                    tem=TMSContants.TopStatusLevel.ckckz;
                } if(i == 3){
                }
                if(i == 3){
                    tem=TMSContants.TopStatusLevel.ydpzz;
                } if(i == 5){
                }
                if(i == 5){
                    tem=TMSContants.TopStatusLevel.ddsc;
                }
                t.setName(tem.getName());

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

@@ -1,10 +1,8 @@
package com.doumee.service.business.third;

import com.doumee.core.haikang.model.cars.response.CarsAlarmResultListResponse;
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.haikang.model.param.request.RegionDataRankingTypeRequest;
import com.doumee.core.haikang.model.param.respose.*;
import com.doumee.dao.business.model.PlatformWarnEvent;
import com.doumee.dao.web.reqeust.CarsJobAndContractDTO;
import com.doumee.dao.web.response.platformReport.*;
@@ -92,4 +90,6 @@
    List<GeneralVO> todayTotalInList();

    List<CarsAlarmResultListResponse> carsEventList();

    List<RegionDataRankingDataResponse> getRegionDataRanking(Integer type);
}