From 30b75d2a83950bc5a77f4820a9c3b4ed5d6c158f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 30 九月 2024 10:14:30 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformCarsDataRequest.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBroadcastLogServiceImpl.java | 22 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformBroadcastLogCloudController.java | 16 +-
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 19 +-
admin/src/api/business/platformBroadcastLog.js | 21 +++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 20 +-
admin/src/components/business/OperaDeviceLedWindow.vue | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java | 2
admin/src/views/business/platformBroadcastLog.vue | 154 +++++++++++++++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 10 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBroadcastLog.java | 9 +
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java | 29 ++++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudTestController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformCarsStatusInfoRequest.java | 14 +
16 files changed, 278 insertions(+), 54 deletions(-)
diff --git a/admin/src/api/business/platformBroadcastLog.js b/admin/src/api/business/platformBroadcastLog.js
new file mode 100644
index 0000000..3f2e9ec
--- /dev/null
+++ b/admin/src/api/business/platformBroadcastLog.js
@@ -0,0 +1,21 @@
+import request from '../../utils/request'
+
+// 鏌ヨ
+export function fetchList (data) {
+ return request.post('/visitsAdmin/cloudService/business/platformBroadcastLog/page', data, {
+ trim: true
+ })
+}
+
+// 鑾峰彇闂ㄧ闆嗗悎-鎻愪緵缁欓棬绂佺粍
+export function getList (data) {
+ return request.post('/visitsAdmin/cloudService/business/platformBroadcastLog/getList', data)
+}
+export function getDeviceRoleList (data) {
+ return request.post('/visitsAdmin/cloudService/business/platformBroadcastLogRole/list', data)
+}
+
+// 淇敼
+export function updateById (data) {
+ return request.post('/visitsAdmin/cloudService/business/platformBroadcastLog/updateById', data)
+}
diff --git a/admin/src/components/business/OperaDeviceLedWindow.vue b/admin/src/components/business/OperaDeviceLedWindow.vue
index 289c955..03cb79a 100644
--- a/admin/src/components/business/OperaDeviceLedWindow.vue
+++ b/admin/src/components/business/OperaDeviceLedWindow.vue
@@ -9,7 +9,7 @@
<el-form-item label="鏄剧ず鍐呭" prop="title">
<el-input v-model="form.title" placeholder="璇疯緭鍏ED灞忔樉绀哄唴瀹�" v-trim/>
</el-form-item>
- <el-form-item label="鎾斁閫熷害" prop="title">
+ <el-form-item label="鎾斁閫熷害" prop="speed">
<el-input type="number" v-model="form.speed" placeholder="璇疯緭鍏ユ挱鏀鹃�熷害(澶т簬0鏁板瓧锛�" v-trim/>
</el-form-item>
</el-form>
diff --git a/admin/src/views/business/platformBroadcastLog.vue b/admin/src/views/business/platformBroadcastLog.vue
new file mode 100644
index 0000000..14c7504
--- /dev/null
+++ b/admin/src/views/business/platformBroadcastLog.vue
@@ -0,0 +1,154 @@
+<template>
+ <TableLayout :permissions="['business:platformbroadcastlog: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="content">
+ <el-input v-model="searchForm.content" placeholder="璇疯緭鍏ュ唴瀹�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="" prop="personType">
+ <el-select v-model="searchForm.deviceType" placeholder="璇烽�夋嫨璁惧绫诲瀷">
+ <el-option label="骞挎挱" value="0"></el-option>
+ <el-option label="LED" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="" prop="eventType">
+ <el-select v-model="searchForm.hkStatus" placeholder="璇烽�夋嫨涓嬪彂鐘舵��">
+ <el-option label="寰呬笅鍙�" value="0"></el-option>
+ <el-option label="涓嬪彂涓�" value="1"></el-option>
+ <el-option label="涓嬪彂鎴愬姛" value="2"></el-option>
+ <el-option label="涓嬪彂澶辫触" value="3"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璧锋鏃堕棿" prop="eventType">
+ <el-date-picker
+ @change="seleTime"
+ v-model="time"
+ type="datetimerange"
+ format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫椂闂�"
+ end-placeholder="缁撴潫鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
+ <el-radio-button label="0">褰撳ぉ</el-radio-button>
+ <el-radio-button label="1">杩�7澶�</el-radio-button>
+ <el-radio-button label="2">杩�30澶�</el-radio-button>
+ </el-radio-group>
+ <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:platformbroadcastlog:exportExcel']">
+<!--
+ <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:platformbroadcastlog:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
+-->
+ </ul>
+ <el-table
+ v-loading="isWorking.search"
+ :data="tableData.list"
+ stripe
+ >
+ <el-table-column prop="deviceType" label="璁惧绫诲瀷" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.deviceType == 0">骞挎挱</span>
+ <span v-if="row.deviceType == 1">LED</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="hkStatus" label="涓嬪彂鐘舵��" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.hkStatus == 0" style="color: #0c6ce3">寰呬笅鍙�</span>
+ <span v-if="row.hkStatus == 1" style="color: #0c6ce3">涓嬪彂涓�</span>
+ <span v-if="row.hkStatus == 2" style="color: green">涓嬪彂鎴愬姛</span>
+ <span v-if="row.hkStatus == 3" style="color: red">涓嬪彂澶辫触</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="name" label="鏍囬" min-width="100px"></el-table-column>
+ <el-table-column prop="info" label="鍐呭" min-width="100px"></el-table-column>
+ <el-table-column prop="ids" label="璁惧缂栫爜" min-width="100px"></el-table-column>
+ <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
+ </el-table>
+ <pagination
+ @size-change="handleSizeChange"
+ @current-change="handlePageChange"
+ :pagination="tableData.pagination"
+ >
+ </pagination>
+ </template>
+ </TableLayout>
+</template>
+
+<script>
+import BaseTable from '@/components/base/BaseTable'
+import TableLayout from '@/layouts/TableLayout'
+import Pagination from '@/components/common/Pagination'
+import { timeForMat } from '@/utils/util'
+export default {
+ name: 'DeviceEvent',
+ extends: BaseTable,
+ components: { TableLayout, Pagination },
+ data () {
+ return {
+ // 鎼滅储
+ searchForm: {
+ name: '',
+ info: '',
+ deviceType: '',
+ hkStatus: '',
+ startTime: '',
+ endTime: '',
+ radio: 0
+ },
+ time: []
+ }
+ },
+ created () {
+ this.config({
+ module: 'LED骞挎挱鎾斁璁板綍',
+ api: '/business/platformBroadcastLog',
+ 'field.id': 'id',
+ 'field.main': 'id'
+ })
+ this.changeRadio('0')
+ },
+ methods: {
+ changeRadio (e) {
+ if (e === '0') {
+ this.searchForm.startTime = timeForMat(0)[0]
+ this.searchForm.endTime = timeForMat(0)[1]
+ this.time = timeForMat(0)
+ } else if (e === '1') {
+ this.searchForm.startTime = timeForMat(6)[0]
+ this.searchForm.endTime = timeForMat(6)[1]
+ this.time = timeForMat(6)
+ } else if (e === '2') {
+ this.searchForm.startTime = timeForMat(29)[0]
+ this.searchForm.endTime = timeForMat(29)[1]
+ this.time = timeForMat(29)
+ }
+ this.search()
+ },
+ seleTime (e) {
+ this.searchForm.startTime = e[0]
+ this.searchForm.endTime = e[1]
+ this.searchForm.radio = null
+ this.search()
+ },
+ reset () {
+ this.$refs.searchForm.resetFields()
+ this.time = []
+ this.searchForm.radio = '0'
+ this.changeRadio('0')
+ this.search()
+ }
+ }
+}
+</script>
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
index 769dbb1..00bda8d 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
@@ -25,6 +25,8 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
@@ -32,6 +34,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedReader;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -43,6 +46,7 @@
*/
@Api(tags = "娴峰悍鏁版嵁鍚屾鎺ュ彛")
@RestController
+@Slf4j
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/hksync")
public class HkSyncCloudController extends BaseController {
@@ -186,6 +190,31 @@
String result = hkSyncPushService.dealPlatformCarsEvent(param,response);
return ApiResponse.success(result);
}
+ @ApiOperation("銆愭捣搴穞est銆戞湀鍙拌溅杈嗙姸鎬佷簨浠惰闃呮帹閫佸鎺ュ鐞嗘帴鍙�")
+ @PostMapping("/push/platform/carstatusTest")
+ @LoginNoRequired
+ public ApiResponse pushPlatformCarStatus(HttpServletRequest request, HttpServletResponse response ){
+ doPringParam(request,"銆愭捣搴穞est銆戞湀鍙拌溅杈嗙姸鎬佷簨浠惰闃呮帹閫佸鎺ュ鐞嗘帴鍙�:\n");
+ return ApiResponse.success(null);
+ }
+ public void doPringParam(HttpServletRequest request,String name) {
+ try {
+ StringBuilder data =new StringBuilder();
+ String line;
+ BufferedReader reader =request.getReader();
+ while(null !=(line = reader.readLine())) {
+ data.append(line);
+ }
+ if(StringUtils.isNotBlank( data.toString())){
+ log.info(name+"=================鍙傛暟锛�"+ data.toString());
+ }else {
+ log.info(name+"=================锛氬弬鏁颁负绌�");
+ }
+ }catch (Exception e){
+
+ log.info(name+"================= 鍙傛暟寮傚父锛�"+e.getMessage());
+ }
+ }
@PreventRepeat
@ApiOperation("銆愭捣搴枫�戝彇娑堣闃呬簨浠�")
@PostMapping("/cancelEventSub")
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformBroadcastLogCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformBroadcastLogCloudController.java
index 0b7d416..1ac263d 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformBroadcastLogCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformBroadcastLogCloudController.java
@@ -1,6 +1,7 @@
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;
@@ -11,7 +12,6 @@
import com.doumee.service.business.PlatformBroadcastLogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -34,14 +34,14 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
- @RequiresPermissions("business:platformbroadcastlog:create")
+ @CloudRequiredPermission("business:platformbroadcastlog:create")
public ApiResponse create(@RequestBody PlatformBroadcastLog platformBroadcastLog) {
return ApiResponse.success(platformBroadcastLogService.create(platformBroadcastLog));
}
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
- @RequiresPermissions("business:platformbroadcastlog:delete")
+ @CloudRequiredPermission("business:platformbroadcastlog:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
platformBroadcastLogService.deleteById(id);
return ApiResponse.success(null);
@@ -49,7 +49,7 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
- @RequiresPermissions("business:platformbroadcastlog:delete")
+ @CloudRequiredPermission("business:platformbroadcastlog:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
@@ -62,7 +62,7 @@
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
- @RequiresPermissions("business:platformbroadcastlog:update")
+ @CloudRequiredPermission("business:platformbroadcastlog:update")
public ApiResponse updateById(@RequestBody PlatformBroadcastLog platformBroadcastLog) {
platformBroadcastLogService.updateById(platformBroadcastLog);
return ApiResponse.success(null);
@@ -70,21 +70,21 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
- @RequiresPermissions("business:platformbroadcastlog:query")
+ @CloudRequiredPermission("business:platformbroadcastlog:query")
public ApiResponse<PageData<PlatformBroadcastLog>> findPage (@RequestBody PageWrap<PlatformBroadcastLog> pageWrap) {
return ApiResponse.success(platformBroadcastLogService.findPage(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
- @RequiresPermissions("business:platformbroadcastlog:exportExcel")
+ @CloudRequiredPermission("business:platformbroadcastlog:exportExcel")
public void exportExcel (@RequestBody PageWrap<PlatformBroadcastLog> pageWrap, HttpServletResponse response) {
ExcelExporter.build(PlatformBroadcastLog.class).export(platformBroadcastLogService.findPage(pageWrap).getRecords(), "鏈堝彴_LED鍜屽箍鎾彁閱掍笅鍙戣褰�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
- @RequiresPermissions("business:platformbroadcastlog:query")
+ @CloudRequiredPermission("business:platformbroadcastlog:query")
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(platformBroadcastLogService.findById(id));
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudTestController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudTestController.java
index 57c8d49..5c0a6a4 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudTestController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudTestController.java
@@ -70,7 +70,7 @@
return new WmsBaseResponse();
}
- private void doPringParam(HttpServletRequest request,String name) {
+ public static void doPringParam(HttpServletRequest request,String name) {
try {
StringBuilder data =new StringBuilder();
String line;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java
index cb10fb7..f3d7125 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java
@@ -116,7 +116,7 @@
param.setEventDest(path+"/platform/workstatus");
param.setEventTypes(new Integer[]{HKConstants.EventTypes.PLATFORM_WORKSTATUS.getKey()});
HKService.cancelEventSub(param);//鍏堝彇娑�
- HKService.eventSub(param);//鏈堝彴宸ヤ綔鐘舵�佷簨浠�
+// HKService.eventSub(param);//鏈堝彴宸ヤ綔鐘舵�佷簨浠�
param.setEventDest(path+"/platform/carstatus");
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 a62463a..c93a503 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
@@ -27,11 +27,12 @@
public static final String ARTEMIS_PATH = "/artemis";
/**
- * 蹇嵎鑿滃崟璺宠浆椤甸潰鍙傛暟
- * 1銆佺患鍚堝畨闃诧細zhaf
- * 2銆佺墿涓氬悗鍕わ細wyhq
- * 3銆佽鏀垮姙鍏細xzbg
- * 4銆佽繍钀ヤ腑蹇冿細yyzx
+ 鍗曠偣鐧诲綍妯″潡鑿滃崟鏍囪瘑锛�
+ 1銆佸畨闃蹭腑蹇冿細afzx
+ 2銆佹秷鎺т腑蹇冿細xkzx
+ 3銆佽兘绠′腑蹇冿細ngzx
+ 4銆侀┚椹惰埍锛歫sc
+ 5銆佽�冨嫟绠＄悊锛歬qgl
*
* 1銆佸畨闃蹭腑蹇冿細afzx
* 2銆佹秷鎺т腑蹇冿細xkzx
@@ -39,12 +40,10 @@
*/
public interface MenuPageId{
String afzx = "afzx";//瀹夐槻涓績
- String zhaf = "zhaf";//娑堟帶涓績
+ String xkzx = "xkzx";//娑堟帶涓績
String ngzx = "ngzx";//鑳界涓績
- String wyhq = "wyhq";//鐗╀笟鍚庡嫟
- String xkzx = "xkzx";//缁煎悎瀹夐槻
- String xzbg = "xzbg";//琛屾斂鍔炲叕
- String yyzx = "yyzx";//杩愯惀涓績
+ String jsc = "jsc";//鐗╀笟鍚庡嫟
+ String kqgl = "kqgl";//鑰冨嫟绠＄悊
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformCarsDataRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformCarsDataRequest.java
index 07de411..a4c954b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformCarsDataRequest.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformCarsDataRequest.java
@@ -1,12 +1,16 @@
package com.doumee.core.haikang.model.param.request.event.parks;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.util.List;
@Data
public class EventPlatformCarsDataRequest {
- private EventPlatformCarsStatusInfoRequest HPVehicleStatus;//
+ @JSONField(name="HPVehicleStatus")
+ @JsonProperty(value = "HPVehicleStatus")
+ private EventPlatformCarsStatusInfoRequest hPVehicleStatus;//
private EventPlatformAttrInfoRequest targetAttrs;//
private String dataType;//HPVehicleStatus
private String sendTime;//2017-04-22T15:39:01.000+08:00
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformCarsStatusInfoRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformCarsStatusInfoRequest.java
index 13d09a8..ae2e55d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformCarsStatusInfoRequest.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformCarsStatusInfoRequest.java
@@ -1,18 +1,26 @@
package com.doumee.core.haikang.model.param.request.event.parks;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class EventPlatformCarsStatusInfoRequest {
- private String HPNo;// 1,杞﹂亾鍙�
+ @JSONField(name="HPNo")
+ @JsonProperty(value = "HPNo")
+ private String hPNo;// 1,杞﹂亾鍙�
private Integer plateScore;//: 80杞︾墝璇勫垎
private String motionStatus;//'leave',杩愬姩鐘舵�� enter#杩涘叆,leave#绂诲紑
private String plateNo;//'A12345',杞︾墝鍙�
private String vehicleDoorStatus;//'open',杞﹂棬鐘舵�伮� open-寮�闂紝close-鍏抽棬
private String stockStatus;//'rear',杞﹀ご杞﹀熬鐘舵�伮� 聽front#杞﹀ご,rear#杞﹀熬
- private EventImageInfoRequest BackgroundImage;//鏈堝彴鑳屾櫙澶у浘
- private EventImageInfoRequest PlatePicture;//杞︾墝鍥�
+ @JSONField(name="BackgroundImage")
+ @JsonProperty(value = "BackgroundImage")
+ private EventImageInfoRequest backgroundImage;//鏈堝彴鑳屾櫙澶у浘
+ @JSONField(name="PlatePicture")
+ @JsonProperty(value = "PlatePicture")
+ private EventImageInfoRequest platePicture;//杞︾墝鍥�
}
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 63508a0..5d5672e 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
@@ -1069,13 +1069,15 @@
* @return
*/
public static String getMenuUrl(Integer type,String token){
- String menuId = HKConstants.MenuPageId.zhaf;
+ String menuId = HKConstants.MenuPageId.afzx;
if(Constants.equalsInteger(type,Constants.ONE)){
- menuId = HKConstants.MenuPageId.wyhq;
+ menuId = HKConstants.MenuPageId.xkzx;
}else if(Constants.equalsInteger(type,Constants.TWO)){
- menuId = HKConstants.MenuPageId.xzbg;
+ menuId = HKConstants.MenuPageId.ngzx;
}else if(Constants.equalsInteger(type,Constants.THREE)){
- menuId = HKConstants.MenuPageId.yyzx;
+ menuId = HKConstants.MenuPageId.jsc;
+ }else if(Constants.equalsInteger(type,Constants.FOUR)){
+ menuId = HKConstants.MenuPageId.kqgl;
}
log.info("銆愭捣搴疯幏鍙栧伐浣滃彴鑿滃崟鍏嶅瘑鐧婚檰璋冩暣鍦板潃銆�================寮�濮�====menuId:"+menuId+"==token:"+token);
try {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBroadcastLog.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBroadcastLog.java
index e6ddd64..7444700 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBroadcastLog.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBroadcastLog.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -100,4 +101,12 @@
@ExcelColumn(name="绫诲瀷 0骞挎挱 1LED")
private Integer deviceType;
+
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @TableField(exist = false)
+ private Date startDate;
+
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @TableField(exist = false)
+ private Date endDate;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
index 7d23ade..b058e6b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
@@ -278,7 +278,8 @@
log.setHkDate(new Date());
log.setDeviceType(Constants.ONE);
log.setObjType(Constants.ONE);
- log.setHkId(device.getHkId());
+ log.setIds(device.getNo());
+ log.setRemark(device.getName());
if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
log.setHkInfo("璇锋眰澶辫触锛�"+JSONObject.toJSONString(response));
log.setHkStatus(Constants.THREE);
@@ -294,5 +295,4 @@
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝灞忓箷鍐呭璁剧疆澶辫触"+(response!=null?response.getMsg():""));
}
}
-
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBroadcastLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBroadcastLogServiceImpl.java
index da1ba0c..b06620d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBroadcastLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBroadcastLogServiceImpl.java
@@ -4,6 +4,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformBroadcastLogMapper;
+import com.doumee.dao.business.model.InterfaceLog;
import com.doumee.dao.business.model.PlatformBroadcastLog;
import com.doumee.service.business.PlatformBroadcastLogService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -98,28 +99,27 @@
.ge(pageWrap.getModel().getEditDate() != null, PlatformBroadcastLog::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()))
.le(pageWrap.getModel().getEditDate() != null, PlatformBroadcastLog::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()))
.eq(pageWrap.getModel().getIsdeleted() != null, PlatformBroadcastLog::getIsdeleted, pageWrap.getModel().getIsdeleted())
- .eq(pageWrap.getModel().getName() != null, PlatformBroadcastLog::getName, pageWrap.getModel().getName())
- .eq(pageWrap.getModel().getRemark() != null, PlatformBroadcastLog::getRemark, pageWrap.getModel().getRemark())
+ .like(pageWrap.getModel().getName() != null, PlatformBroadcastLog::getName, pageWrap.getModel().getName())
+ .like(pageWrap.getModel().getRemark() != null, PlatformBroadcastLog::getRemark, pageWrap.getModel().getRemark())
.eq(pageWrap.getModel().getObjId() != null, PlatformBroadcastLog::getObjId, pageWrap.getModel().getObjId())
.eq(pageWrap.getModel().getObjType() != null, PlatformBroadcastLog::getObjType, pageWrap.getModel().getObjType())
.eq(pageWrap.getModel().getNum() != null, PlatformBroadcastLog::getNum, pageWrap.getModel().getNum())
.eq(pageWrap.getModel().getIds() != null, PlatformBroadcastLog::getIds, pageWrap.getModel().getIds())
- .eq(pageWrap.getModel().getInfo() != null, PlatformBroadcastLog::getInfo, pageWrap.getModel().getInfo())
+ .like(pageWrap.getModel().getInfo() != null, PlatformBroadcastLog::getInfo, pageWrap.getModel().getInfo())
.eq(pageWrap.getModel().getHkId() != null, PlatformBroadcastLog::getHkId, pageWrap.getModel().getHkId())
.eq(pageWrap.getModel().getHkStatus() != null, PlatformBroadcastLog::getHkStatus, pageWrap.getModel().getHkStatus())
.ge(pageWrap.getModel().getHkDate() != null, PlatformBroadcastLog::getHkDate, Utils.Date.getStart(pageWrap.getModel().getHkDate()))
.le(pageWrap.getModel().getHkDate() != null, PlatformBroadcastLog::getHkDate, Utils.Date.getEnd(pageWrap.getModel().getHkDate()))
.eq(pageWrap.getModel().getHkInfo() != null, PlatformBroadcastLog::getHkInfo, pageWrap.getModel().getHkInfo())
.eq(pageWrap.getModel().getBizType() != null, PlatformBroadcastLog::getBizType, pageWrap.getModel().getBizType())
- .eq(pageWrap.getModel().getDeviceType() != null, PlatformBroadcastLog::getDeviceType, pageWrap.getModel().getDeviceType())
- ;
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
+ .eq(pageWrap.getModel().getDeviceType() != null, PlatformBroadcastLog::getDeviceType, pageWrap.getModel().getDeviceType());
+ if (pageWrap.getModel().getStartDate() != null) {
+ queryWrapper.lambda().ge(PlatformBroadcastLog::getCreateDate, pageWrap.getModel().getStartDate());
}
- }
+ if (pageWrap.getModel().getEndDate() != null) {
+ queryWrapper.lambda().le(PlatformBroadcastLog::getCreateDate, pageWrap.getModel().getEndDate());
+ }
+ queryWrapper.lambda().orderByDesc(PlatformBroadcastLog::getCreateDate);
return PageData.from(platformBroadcastLogMapper.selectPage(page, queryWrapper));
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java
index aee048b..a590652 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java
@@ -35,7 +35,6 @@
*/
@Service
public class HkSyncPlatformsServiceImpl extends HkSyncBaseServiceImpl {
-
@Autowired
private PlatformMapper platformMapper;
@Autowired
@@ -257,7 +256,6 @@
}
}
return true;
-
}
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index 1ccf736..99b1e0c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -135,7 +135,7 @@
//鍐嶆彃鍏ユ渶鏂扮殑鍦ㄥ巶浜哄憳
retentionMapper.insert(retentionList);
}
- log.error("銆愭捣搴烽棬绂佷簨浠舵帹閫併��========鎴愬姛=======");
+ log.info("銆愭捣搴烽棬绂佷簨浠舵帹閫併��========鎴愬姛=======");
}catch (Exception e) {
log.error("銆愭捣搴烽棬绂佷簨浠舵帹閫併��========澶辫触=======锛歕n" + e.getMessage());
}finally {
@@ -325,7 +325,7 @@
//鍐嶆彃鍏ユ渶鏂扮殑鍦ㄥ巶浜哄憳
retentionMapper.insert(retentionList);
}
- log.error("銆愭捣搴疯瀹簨浠舵帹閫併��========鎴愬姛=======");
+ log.info("銆愭捣搴疯瀹簨浠舵帹閫併��========鎴愬姛=======");
}catch (Exception e){
log.error("銆愭捣搴疯瀹簨浠舵帹閫併��========澶辫触=======锛歕n"+e.getMessage());
@@ -379,7 +379,7 @@
//鍐嶆彃鍏ユ渶鏂扮殑鍦ㄥ巶浜哄憳
retentionMapper.insert(retentionList);
}
- log.error("銆愭捣搴疯瀹簨浠舵帹閫併��========鎴愬姛=======");
+ log.info("銆愭捣搴疯瀹簨浠舵帹閫併��========鎴愬姛=======");
}catch (Exception e){
log.error("銆愭捣搴疯瀹簨浠舵帹閫併��========澶辫触=======锛歕n"+e.getMessage());
}
@@ -674,7 +674,7 @@
//鍐嶆彃鍏ユ渶鏂扮殑鍦ㄥ巶浜哄憳
retentionMapper.insert(retentionList);
}
- log.error("銆愭捣搴峰仠杞﹀満浜嬩欢鎺ㄩ�併��========鎴愬姛=======");
+ log.info("銆愭捣搴峰仠杞﹀満浜嬩欢鎺ㄩ�併��========鎴愬姛=======");
}catch (Exception e){
log.error("銆愭捣搴峰仠杞﹀満浜嬩欢鎺ㄩ�併��========澶辫触=======锛歕n"+e.getMessage());
@@ -735,7 +735,6 @@
event.setReleaseResult(request.getData().getInResult().getRlsResult().getReleaseResult());
event.setReleaseResultEx(request.getData().getInResult().getRlsResult().getReleaseResultEx());
}
-
if(request.getData().getPicUrl()!=null){
//杞﹁締鍜屽拰杞︾墝鐓х墖
event.setVehiclePicUrl(getHkImgUrl(request.getData().getPicUrl().getVehiclePicUrl()));
@@ -770,9 +769,7 @@
delRetentionList.add(event.getPlateNos());
}
}
-
return event;
-
}
private Retention getRetentionModelByParkRequest(EventParkInfoRequest request) {
@@ -783,7 +780,6 @@
retention.setType(Constants.THREE);
// retention.setDeviceName(request.getSrcName());
// retention.setDeviceIndex(request.getSrcIndex());
-
return retention;
}
@@ -843,7 +839,7 @@
}
}
result = "鎴愬姛";
- log.error("銆愭捣搴锋湀鍙板伐浣滅姸鎬佷簨浠舵帹閫併��========鎴愬姛=======");
+ log.info("銆愭捣搴锋湀鍙板伐浣滅姸鎬佷簨浠舵帹閫併��========鎴愬姛=======");
}catch (Exception e) {
result = "澶辫触"+e.getMessage();
log.error("銆愭捣搴锋湀鍙板伐浣滅姸鎬佷簨浠舵帹閫併��========澶辫触=======锛歕n" + e.getMessage());
@@ -941,7 +937,7 @@
platformEventMapper.insert(eventList);
}
result = "鎴愬姛";
- log.error("銆愭捣搴锋湀鍙拌溅杈嗙姸鎬佷簨浠舵帹閫併��========鎴愬姛=======");
+ log.info("銆愭捣搴锋湀鍙拌溅杈嗙姸鎬佷簨浠舵帹閫併��========鎴愬姛=======");
}catch (Exception e) {
result = "澶辫触"+e.getMessage();
log.error("銆愭捣搴锋湀鍙拌溅杈嗙姸鎬佷簨浠舵帹閫併��========澶辫触=======锛歕n" + e.getMessage());
@@ -1062,6 +1058,7 @@
content = content.replace("${param2}",model.getCarCodeFront());
List<String> broadcastList = new ArrayList<>();
List<String> ledList = new ArrayList<>();
+ String bNames = "";
List<PlatformBroadcastLog> logList = new ArrayList<>();
for(PlatformDevice device : deviceList){
if(StringUtils.isNotBlank(device.getHkId())){
@@ -1075,6 +1072,7 @@
log.setHkDate(new Date());
log.setObjType(Constants.ONE);
log.setIds(device.getHkNo());
+ log.setRemark(device.getName());
log.setInfo(content);
log.setNum(Constants.ONE);
BaseResponse response = dealLedContentBiz(device.getHkNo(),content,speed,1);
@@ -1091,6 +1089,7 @@
ledList.add(device.getHkId());
}else if(Constants.equalsInteger(device.getType(),Constants.ZERO)){
//濡傛灉鏄箍鎾偣
+ bNames += device.getName()+";";
broadcastList.add(device.getHkId());
}
}
@@ -1104,6 +1103,7 @@
log.setHkDate(new Date());
log.setObjType(Constants.ONE);
log.setInfo(content1);
+ log.setRemark(bNames);
log.setNum(Constants.ONE);
log.setIds(String.join(",",broadcastList));
CustomBroadcastRequest request = new CustomBroadcastRequest();
--
Gitblit v1.9.3