From 96a2b1c68aa545abbf8245b0b2859b342fa6e63d Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 19 十二月 2024 10:18:19 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/RegionDataRankingTypeRequest.java | 13
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java | 24 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/RegionDataRankingDataRequest.java | 18 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 2
admin/src/components/business/OperaTmsFactoryParamWindow.vue | 58 +++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformWaterGasForExcelVO.java | 10
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 39 ++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TmsFactoryParam.java | 86 +++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java | 4
server/system_service/src/main/resources/mappers/SystemUserMapper.xml | 3
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java | 17 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/EnergyTotalDataRequest.java | 15
admin/src/api/business/tmsFactoryParam.js | 40 ++
server/db/business.tms_factory_param.permissions.sql | 6
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 1
server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java | 5
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java | 15
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TmsFactoryParamServiceImpl.java | 194 +++++++++++
admin/src/views/business/tmsFactoryParam.vue | 88 +++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/EnergyTotalDataResponse.java | 24 +
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsFactoryParamCloudController.java | 93 +++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/TmsFactoryParamMapper.java | 13
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/TmsFactoryParamService.java | 98 +++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 33 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 17 +
server/system_service/src/main/java/com/doumee/dao/system/SystemUserMapper.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java | 8
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java | 14
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/RegionDataRankingDataResponse.java | 18 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/EnergyModelDataVO.java | 5
31 files changed, 932 insertions(+), 34 deletions(-)
diff --git a/admin/src/api/business/tmsFactoryParam.js b/admin/src/api/business/tmsFactoryParam.js
new file mode 100644
index 0000000..cba0950
--- /dev/null
+++ b/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
+ }
+ })
+}
diff --git a/admin/src/components/business/OperaTmsFactoryParamWindow.vue b/admin/src/components/business/OperaTmsFactoryParamWindow.vue
new file mode 100644
index 0000000..c246c9c
--- /dev/null
+++ b/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="璇疯緭鍏MS缂栫爜" 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>
diff --git a/admin/src/views/business/tmsFactoryParam.vue b/admin/src/views/business/tmsFactoryParam.vue
new file mode 100644
index 0000000..9e3ea9f
--- /dev/null
+++ b/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>
diff --git a/server/db/business.tms_factory_param.permissions.sql b/server/db/business.tms_factory_param.permissions.sql
new file mode 100644
index 0000000..0424602
--- /dev/null
+++ b/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);
+
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
index 81534b6..4726292 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
+++ b/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()
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/SystemUserMapper.java b/server/system_service/src/main/java/com/doumee/dao/system/SystemUserMapper.java
index d4cec01..7ab1d53 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/SystemUserMapper.java
+++ b/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);
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java b/server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java
index d313c60..3759842 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java
+++ b/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;
+
+
+
}
diff --git a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
index 9bc91f7..0b358d4 100644
--- a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
+++ b/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>
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java
index 260731b..8bc1987 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java
+++ b/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));
+ }
+
+
+
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsFactoryParamCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsFactoryParamCloudController.java
new file mode 100644
index 0000000..f907066
--- /dev/null
+++ b/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));
+ }
+}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java
index 2a23a82..9fc64e3 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java
+++ b/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);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
index 2993237..161e8f3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
+++ b/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","淇濆瓨鐢ㄦ埛鍙妎penId缁戝畾淇℃伅寰俊鍏紬鍙�"};//淇濆瓨鐢ㄦ埛鍙妎penId缁戝畾淇℃伅寰俊鍏紬鍙�
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娑堥槻璁惧绫诲瀷
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
index aad1de4..f05520f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
+++ b/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);
+ }
/**
* 鑾峰彇闂ㄧ鐐瑰垪琛�
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/EnergyTotalDataRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/EnergyTotalDataRequest.java
new file mode 100644
index 0000000..807d5dd
--- /dev/null
+++ b/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;
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/RegionDataRankingDataRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/RegionDataRankingDataRequest.java
new file mode 100644
index 0000000..53eed3c
--- /dev/null
+++ b/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;
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/RegionDataRankingTypeRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/RegionDataRankingTypeRequest.java
new file mode 100644
index 0000000..0745469
--- /dev/null
+++ b/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;
+
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/EnergyTotalDataResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/EnergyTotalDataResponse.java
new file mode 100644
index 0000000..63c0829
--- /dev/null
+++ b/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 ;
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/RegionDataRankingDataResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/RegionDataRankingDataResponse.java
new file mode 100644
index 0000000..e1d6a50
--- /dev/null
+++ b/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;
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index d610bbf..cbc861d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/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;
+ }
+
/**
*鍒嗛〉鏌ヨ娑堥槻璁惧閮ㄤ欢鐘舵��
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/TmsFactoryParamMapper.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/TmsFactoryParamMapper.java
new file mode 100644
index 0000000..1018d6a
--- /dev/null
+++ b/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> {
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java
index 684f6ba..ebb9145 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java
+++ b/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 = "闄勪欢淇℃伅")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java
index fe584b5..a90b863 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java
+++ b/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 = "鍓嶈溅鐗屽彿")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TmsFactoryParam.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TmsFactoryParam.java
new file mode 100644
index 0000000..f396de4
--- /dev/null
+++ b/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;
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformWaterGasForExcelVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformWaterGasForExcelVO.java
index bccfb6e..4f9b1e8 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformWaterGasForExcelVO.java
+++ b/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 = "鏁伴噺 (鐢ㄧ數椤匡紝鐢ㄧ數搴︼紱 娌硅�桳锛�", 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;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/EnergyModelDataVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/EnergyModelDataVO.java
index e06bc95..e7f65f7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/EnergyModelDataVO.java
+++ b/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;
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/TmsFactoryParamService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/TmsFactoryParamService.java
new file mode 100644
index 0000000..ad533e7
--- /dev/null
+++ b/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宸ュ巶閰嶇疆淇℃伅琛⊿ervice瀹氫箟
+ * @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);
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index 9f5485e..d8fce9b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/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){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TmsFactoryParamServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TmsFactoryParamServiceImpl.java
new file mode 100644
index 0000000..ebc5c4f
--- /dev/null
+++ b/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宸ュ巶閰嶇疆淇℃伅琛⊿ervice瀹炵幇
+ * @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);
+ }
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index bc83623..19ca4b2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/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;
+ }
+ }
+
+
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
index f0f2918..e49a6fc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
+++ b/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());
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
index c7f9572..927ec61 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
+++ b/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);
}
--
Gitblit v1.9.3