From 0950b4eaf72d2b253fbc378f5dd56b59a2a6a4ab Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 19 九月 2024 10:43:07 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 60 +++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudController.java | 125 ++++--
admin/src/views/business/wmsInterfaceLog.vue | 145 ++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 2
admin/src/api/business/wmsInterfaceLog.js | 18 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TransparentChannelBodyParamRequest.java | 12
admin/package-lock.json | 160 ++++----
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsInterfaceLogCloudController.java | 85 ++++
/dev/null | 152 --------
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 39 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TransparentChannelBodyRegionRequest.java | 52 ++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TransparentChannelBodyRequest.java | 31 -
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java | 67 ++-
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java | 13
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudTestController.java | 92 +++++
admin/src/views/business/visitEvent.vue | 5
18 files changed, 710 insertions(+), 352 deletions(-)
diff --git a/admin/package-lock.json b/admin/package-lock.json
index ff48650..88eda86 100644
--- a/admin/package-lock.json
+++ b/admin/package-lock.json
@@ -1876,6 +1876,63 @@
"integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
"dev": true
},
+ "ansi-styles": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "4.1.2",
+ "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true,
+ "optional": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true,
+ "optional": true
+ },
+ "loader-utils": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
+ "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "big.js": "^5.2.2",
+ "emojis-list": "^3.0.0",
+ "json5": "^2.1.2"
+ }
+ },
"ssri": {
"version": "8.0.1",
"resolved": "https://registry.npm.taobao.org/ssri/download/ssri-8.0.1.tgz?cache=0&sync_timestamp=1617826515595&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fssri%2Fdownload%2Fssri-8.0.1.tgz",
@@ -1883,6 +1940,28 @@
"dev": true,
"requires": {
"minipass": "^3.1.1"
+ }
+ },
+ "supports-color": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ },
+ "vue-loader-v16": {
+ "version": "npm:vue-loader@16.8.3",
+ "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
+ "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "chalk": "^4.1.0",
+ "hash-sum": "^2.0.0",
+ "loader-utils": "^2.0.0"
}
}
}
@@ -13904,87 +13983,6 @@
"resolved": "https://registry.npm.taobao.org/hash-sum/download/hash-sum-1.0.2.tgz",
"integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=",
"dev": true
- }
- }
- },
- "vue-loader-v16": {
- "version": "npm:vue-loader@16.8.3",
- "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
- "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
- "dev": true,
- "optional": true,
- "requires": {
- "chalk": "^4.1.0",
- "hash-sum": "^2.0.0",
- "loader-utils": "^2.0.0"
- },
- "dependencies": {
- "ansi-styles": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "dev": true,
- "optional": true,
- "requires": {
- "color-convert": "^2.0.1"
- }
- },
- "chalk": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
- "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
- "dev": true,
- "optional": true,
- "requires": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- }
- },
- "color-convert": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "dev": true,
- "optional": true,
- "requires": {
- "color-name": "~1.1.4"
- }
- },
- "color-name": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
- "dev": true,
- "optional": true
- },
- "has-flag": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
- "dev": true,
- "optional": true
- },
- "loader-utils": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
- "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
- "dev": true,
- "optional": true,
- "requires": {
- "big.js": "^5.2.2",
- "emojis-list": "^3.0.0",
- "json5": "^2.1.2"
- }
- },
- "supports-color": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "dev": true,
- "optional": true,
- "requires": {
- "has-flag": "^4.0.0"
- }
}
}
},
diff --git a/admin/src/api/business/wmsInterfaceLog.js b/admin/src/api/business/wmsInterfaceLog.js
new file mode 100644
index 0000000..f789d8c
--- /dev/null
+++ b/admin/src/api/business/wmsInterfaceLog.js
@@ -0,0 +1,18 @@
+import request from '../../utils/request'
+
+// 鏌ヨ
+export function fetchList (data) {
+ return request.post('/visitsAdmin/cloudService/business/wmsInterfaceLog/page', data, {
+ trim: true
+ })
+}
+
+// 鍒涘缓
+export function create (data) {
+ return request.post('/visitsAdmin/cloudService/business/wmsInterfaceLog/create', data)
+}
+
+// 淇敼
+export function updateById (data) {
+ return request.post('/visitsAdmin/cloudService/business/wmsInterfaceLog/updateById', data)
+}
diff --git a/admin/src/views/business/visitEvent.vue b/admin/src/views/business/visitEvent.vue
index 3300e1f..c53bf54 100644
--- a/admin/src/views/business/visitEvent.vue
+++ b/admin/src/views/business/visitEvent.vue
@@ -13,8 +13,9 @@
</el-form-item>
<el-form-item label="浜嬩欢绫诲瀷" prop="eventType">
<el-select v-model="searchForm.eventType" placeholder="璇烽�夋嫨">
- <el-option label="璁垮鐧昏" value="1392513025"></el-option>
- <el-option label="璁垮绛剧" value="1392513026"></el-option>
+ <el-option label="璁垮鐧昏" value="541200006"></el-option>
+ <el-option label="璁垮绛剧" value="541200007"></el-option>
+ <el-option label="璁垮閫氳" value="541200060"></el-option>
</el-select>
</el-form-item>
<el-form-item label="璧峰鏃堕棿" prop="carNo">
diff --git a/admin/src/views/business/wmsInterfaceLog.vue b/admin/src/views/business/wmsInterfaceLog.vue
new file mode 100644
index 0000000..47bdd43
--- /dev/null
+++ b/admin/src/views/business/wmsInterfaceLog.vue
@@ -0,0 +1,145 @@
+<template>
+ <TableLayout :permissions="['business:wmsinterfacelog: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="type">
+ <el-select v-model="searchForm.type" @change="search" placeholder="璇烽�夋嫨">
+ <el-option label="璋冪敤" value="0"></el-option>
+ <el-option label="鎺ㄩ�佹帴鍙�" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璧锋鏃堕棿" prop="startDate">
+ <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>
+ <el-table
+ v-loading="isWorking.search"
+ :data="tableData.list"
+ stripe
+ >
+ <el-table-column prop="name" label="鎺ュ彛鍚嶇О" min-width="180px"></el-table-column>
+ <el-table-column prop="url" label="鍦板潃淇℃伅" min-width="180px"></el-table-column>
+ <el-table-column label="绫诲瀷" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.type == 0">璋冪敤</span>
+ <span v-if="row.type == 1">鎺ㄩ�佹帴鏀�</span>
+ </template>
+ </el-table-column>
+<!-- <el-table-column label="骞冲彴" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.plat == 0">娴峰悍瀹夐槻骞冲彴</span>
+ <span v-if="row.plat == 1">ERP绯荤粺</span>
+ </template>
+ </el-table-column>-->
+ <el-table-column prop="request" label="璇锋眰鍙傛暟" min-width="100px">
+ <template slot-scope="{row}">
+ <el-button type="text" @click="$refs.operaInterfaceLogWindow.open('璇锋眰鍙傛暟', {content: row.request})">鏌ョ湅</el-button>
+ </template>
+ </el-table-column>
+ <el-table-column prop="repose" label="鍝嶅簲鍙傛暟" min-width="100px">
+ <template slot-scope="{row}">
+ <el-button type="text" @click="$refs.operaInterfaceLogWindow.open('鍝嶅簲鍙傛暟', {content: row.repose})">鏌ョ湅</el-button>
+ </template>
+ </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>
+ <!-- 鏂板缓/淇敼 -->
+ <OperaInterfaceLogWindow ref="operaInterfaceLogWindow" @success="handlePageChange"/>
+ </TableLayout>
+</template>
+
+<script>
+import BaseTable from '@/components/base/BaseTable'
+import TableLayout from '@/layouts/TableLayout'
+import Pagination from '@/components/common/Pagination'
+import OperaInterfaceLogWindow from '@/components/business/OperaInterfaceLogWindow'
+import { timeForMat } from '@/utils/util'
+export default {
+ name: 'InterfaceLog',
+ extends: BaseTable,
+ components: { TableLayout, Pagination, OperaInterfaceLogWindow },
+ data () {
+ return {
+ // 鎼滅储
+ searchForm: {
+ name: '',
+ type: '',
+ endDate: '',
+ startDate: '',
+ radio: '0'
+ },
+ time: []
+ }
+ },
+ created () {
+ this.config({
+ module: '涓夋柟骞冲彴鎺ュ彛浜や簰璁板綍',
+ api: '/business/wmsInterfaceLog',
+ 'field.id': 'id',
+ 'field.main': 'id'
+ })
+ this.changeRadio('0')
+ },
+ methods: {
+ changeRadio (e) {
+ if (e === '0') {
+ this.searchForm.startDate = timeForMat(0)[0]
+ this.searchForm.endDate = timeForMat(0)[1]
+ this.time = timeForMat(0)
+ } else if (e === '1') {
+ this.searchForm.startDate = timeForMat(6)[0]
+ this.searchForm.endDate = timeForMat(6)[1]
+ this.time = timeForMat(6)
+ } else if (e === '2') {
+ this.searchForm.startDate = timeForMat(29)[0]
+ this.searchForm.endDate = timeForMat(29)[1]
+ this.time = timeForMat(29)
+ }
+ this.search()
+ },
+ seleTime (e) {
+ this.searchForm.startDate = e[0]
+ this.searchForm.endDate = e[1]
+ this.searchForm.radio = null
+ this.search()
+ },
+ reset () {
+ this.$refs.searchForm.resetFields()
+ this.searchForm.startDate = ''
+ this.searchForm.endDate = ''
+ this.time = []
+ this.search()
+ }
+ }
+}
+</script>
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index 09a1473..472077e 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -809,6 +809,66 @@
this.info = info;
}
}
+ /**
+ * 鏈堝彴浣滀笟澶у睆鏂囨 鐘舵��
+ * 1銆佹湀鍙扮┖闂诧細1鍙锋湀鍙帮紙鏈堝彴鍚嶇О锛�
+ * 2銆佸彨鍙蜂腑锛�1鍙锋湀鍙� 鐨朅12345 鍙彿涓�
+ * 3銆佷綔涓氫腑锛�1鍙锋湀鍙� 鐨朅12345 浣滀笟涓�
+ * 4銆侀敊璇仠闈狅細1鍙锋湀鍙� 鐨朅12345 褰撳墠杞﹁締閿欒鍋滈潬锛岃灏藉揩椹剁
+ * 5銆佽秴鏃跺仠闈狅細1鍙锋湀鍙� 鐨朅12345 褰撳墠杞﹁締瓒呮椂鍋滈潬锛岃灏藉揩椹剁
+ */
+ public enum PlatformLedContent {
+ IDEL_CONTNET(1, "绌洪棽涓�","{param}" ),
+ CALLING(2, "鍙彿涓�","${param} ${param2} 鍙彿涓�"),
+ WORKING(3, "浣滀笟涓�","${param} ${param2} 浣滀笟涓�" ),
+ WRONG_IN(4, "閿欒鍋滈潬","${param} ${param2} 褰撳墠杞﹁締閿欒鍋滈潬锛岃灏藉揩椹剁" ),
+ TIMEOUT_IN(5, "瓒呮椂鍋滈潬","${param} ${param2} 褰撳墠杞﹁締瓒呮椂鍋滈潬锛岃灏藉揩椹剁" ),
+ ;
+
+ // 鎴愬憳鍙橀噺
+ private int key;
+ private String name;
+ private String info;
+
+ // 鏋勯�犳柟娉�
+ PlatformLedContent(int key, String name,String info ) {
+ this.key = key;
+ this.info = info;
+ this.name = name;
+ }
+ public static String getName(int index) {
+ for (PlatformLedContent c : PlatformLedContent.values()) {
+ if (c.getKey() == index) {
+ return c.name;
+ }
+ }
+ return null;
+ }
+
+ public int getKey() {
+ return key;
+ }
+
+ public void setKey(int key) {
+ this.key = key;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
+ }
/**
* 鏈堝彴浣滀笟 鐘舵��
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 3d751ba..6b9bda1 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
@@ -5,6 +5,7 @@
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.*;
import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest;
import com.doumee.core.haikang.model.param.request.event.parks.EventParkRequest;
@@ -142,6 +143,17 @@
String result = hkSyncPushService.dealVisitEventIccm(param,response);
return ApiResponse.success(result);
}
+ @ApiOperation("銆愭捣搴枫�戣瀹CCM浜嬩欢璁㈤槄鎺ㄩ�佸鎺ュ鐞嗘帴鍙�")
+ @PostMapping("/testLed")
+ @LoginNoRequired
+ public ApiResponse<BaseResponse> testLed(@RequestBody TransparentChannelBodyRequest request, HttpServletResponse response) {
+ TransparentChannelHeadRequest head = new TransparentChannelHeadRequest();
+ head.setAbility("cld");//鍥哄畾鍊�
+ head.setTreatyType("haixuan_led_net");//鍥哄畾鍊�
+ head.setDeviceIndexCode("6a5498e9df924befbb9530e467e5e809");
+ HKService.transparentchannel(head,request);
+ return ApiResponse.success(HKService.transparentchannel(head,request));
+ }
// @PreventRepeat
@ApiOperation("銆愭捣搴枫�戝仠杞﹀満浜嬩欢璁㈤槄鎺ㄩ�佸鎺ュ鐞嗘帴鍙�")
@PostMapping("/push/parks")
@@ -190,7 +202,6 @@
String url = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HTTPS).getCode() +
systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HOST).getCode()
+ HKService.getMenuUrl(type,hkToken);
-
return ApiResponse.success( url);
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsInterfaceLogCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsInterfaceLogCloudController.java
new file mode 100644
index 0000000..e02f0ad
--- /dev/null
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsInterfaceLogCloudController.java
@@ -0,0 +1,85 @@
+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.WmsInterfaceLog;
+import com.doumee.service.business.WmsInterfaceLogService;
+import com.doumee.service.business.WmsInterfaceLogService;
+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;
+
+/**
+ * @author 姹熻箘韫�
+ * @since 2024/04/28 16:06
+ */
+@Api(tags = "WMS鍙版帴鍙ｄ氦浜掕褰�")
+@RestController
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/wmsInterfaceLog")
+public class WmsInterfaceLogCloudController extends BaseController {
+
+ @Autowired
+ private WmsInterfaceLogService wmsInterfaceLogService;
+
+ @PreventRepeat
+ @ApiOperation("鏂板缓")
+ @PostMapping("/create")
+ @CloudRequiredPermission("business:wmsinterfacelog:create")
+ public ApiResponse create(@RequestBody WmsInterfaceLog wmsInterfaceLog,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ return ApiResponse.success( wmsInterfaceLogService.create( wmsInterfaceLog));
+ }
+
+ @ApiOperation("鏍规嵁ID鍒犻櫎")
+ @GetMapping("/delete/{id}")
+ @CloudRequiredPermission("business:wmsinterfacelog:delete")
+ public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ wmsInterfaceLogService.deleteById(id);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鎵归噺鍒犻櫎")
+ @GetMapping("/delete/batch")
+ @CloudRequiredPermission("business:wmsinterfacelog:delete")
+ public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ wmsInterfaceLogService.deleteByIdInBatch(this.getIdList(ids));
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鏍规嵁ID淇敼")
+ @PostMapping("/updateById")
+ @CloudRequiredPermission("business:wmsinterfacelog:update")
+ public ApiResponse updateById(@RequestBody WmsInterfaceLog wmsInterfaceLog,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ wmsInterfaceLogService.updateById( wmsInterfaceLog);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ @PostMapping("/page")
+ @CloudRequiredPermission("business:wmsinterfacelog:query")
+ public ApiResponse<PageData<WmsInterfaceLog>> findPage (@RequestBody PageWrap<WmsInterfaceLog> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ return ApiResponse.success( wmsInterfaceLogService.findPage(pageWrap));
+ }
+
+ @ApiOperation("瀵煎嚭Excel")
+ @PostMapping("/exportExcel")
+ @CloudRequiredPermission("business:wmsinterfacelog:exportExcel")
+ public void exportExcel (@RequestBody PageWrap<WmsInterfaceLog> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ ExcelExporter.build(WmsInterfaceLog.class).export( wmsInterfaceLogService.findPage(pageWrap).getRecords(), "WMS骞冲彴鎺ュ彛浜や簰璁板綍", response);
+ }
+
+ @ApiOperation("鏍规嵁ID鏌ヨ")
+ @GetMapping("/{id}")
+ @CloudRequiredPermission("business:wmsinterfacelog:query")
+ public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ return ApiResponse.success( wmsInterfaceLogService.findById(id));
+ }
+}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudBakController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudBakController.java
deleted file mode 100644
index 87ba124..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudBakController.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package com.doumee.cloud.admin;
-
-import com.alibaba.fastjson.JSONObject;
-import com.doumee.api.BaseController;
-import com.doumee.config.annotation.LoginNoRequired;
-import com.doumee.core.exception.BusinessException;
-import com.doumee.core.utils.Constants;
-import com.doumee.core.wms.model.request.WmsActionNoticeRequest;
-import com.doumee.core.wms.model.request.WmsBaseRequest;
-import com.doumee.core.wms.model.request.WmsInboundNoticeRequest;
-import com.doumee.core.wms.model.request.WmsOutboundNoticeRequest;
-import com.doumee.core.wms.model.response.WmsBaseResponse;
-import com.doumee.service.business.WmsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.BufferedReader;
-
-/**
- * @author 姹熻箘韫�
- * @date 2023/11/30 15:33
- */
-@Api(tags = "WMS骞冲彴鏁版嵁鎺ㄩ�佹帴鍙�")
-@RestController
-@Slf4j
-@LoginNoRequired
-@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/wms/bak")
-public class WmsPushCloudBakController extends BaseController {
-
- @Autowired
- private WmsService wmsService;
-
- @ApiOperation("銆怶MS銆戞帹閫佸叆搴撳崟閫氱煡浠诲姟")
- @PostMapping("/push/inboundNotice")
- @LoginNoRequired
- public WmsBaseResponse inboundNotice(@RequestBody WmsBaseRequest<WmsInboundNoticeRequest> param) {
-
- int success = Constants.ZERO;
- WmsBaseResponse result =null;
- try {
- result = wmsService.inboundNotice(param);
- }catch (BusinessException e){
- log.error("銆怶MS銆戞帹閫佸叆搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
- success = Constants.ONE;
- }catch (Exception e){
- log.error("銆怶MS銆戞帹閫佸叆搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
- e.printStackTrace();
- success = Constants.ONE;
- }finally {
- wmsService.saveInterfaceLog("/wms/push/inboundNotice", "鎺ㄩ�佸叆搴撳崟閫氱煡浠诲姟",JSONObject.toJSONString(param),
- success, JSONObject.toJSONString(result),Constants.ONE);
- }
-
- return result;
- }
-
- @ApiOperation("銆怶MS銆戞帹閫佸嚭搴撳崟閫氱煡浠诲姟")
- @LoginNoRequired
- @PostMapping("/push/outboundNotice")
- public WmsBaseResponse outboundNotice(@RequestBody WmsBaseRequest<WmsOutboundNoticeRequest> param) {
- int success = Constants.ZERO;
- WmsBaseResponse result =null;
- try {
- result = wmsService.outboundNotice(param);
- }catch (BusinessException e){
- log.error("銆怶MS銆戞帹閫佸嚭搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
- success = Constants.ONE;
- }catch (Exception e){
- log.error("銆怶MS銆戞帹閫佸嚭搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
- e.printStackTrace();
- success = Constants.ONE;
- }finally {
- wmsService.saveInterfaceLog("/wms/push/outboundNotice", "鎺ㄩ�佸嚭搴撳崟閫氱煡浠诲姟",JSONObject.toJSONString(param),success
- , JSONObject.toJSONString(result),Constants.ONE);
- }
-
- return result;
- }
- @ApiOperation("銆怶MS銆戞帹閫佸彇娑堝叆搴撳崟閫氱煡浠诲姟")
- @LoginNoRequired
- @PostMapping("/push/cancelInbound")
- public WmsBaseResponse cancelInbound(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
- int success = Constants.ZERO;
- WmsBaseResponse result =null;
- try {
- result = wmsService.cancelInbound(param);
- }catch (BusinessException e){
- log.error("銆怶MS銆戞帹閫佸彇娑堝叆搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
- success = Constants.ONE;
- }catch (Exception e){
- log.error("銆怶MS銆戞帹閫佸彇娑堝叆搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
- e.printStackTrace();
- success = Constants.ONE;
- }finally {
- wmsService.saveInterfaceLog("/wms/push/cancelInbound", "鎺ㄩ�佸彇娑堝叆搴撳崟閫氱煡浠诲姟",JSONObject.toJSONString(param),
- success, JSONObject.toJSONString(result),Constants.ONE);
- }
- return result;
- }
- @ApiOperation("銆怶MS銆戞帹閫佸彇娑堝嚭搴撳崟閫氱煡浠诲姟")
- @LoginNoRequired
- @PostMapping("/push/cancelOutbound")
- public WmsBaseResponse cancelOutbound(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
- int success = Constants.ZERO;
- WmsBaseResponse result =null;
- try {
- result = wmsService.cancelOutbound(param);
- }catch (BusinessException e){
- log.error("銆怶MS銆戞帹閫佸彇娑堝嚭搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
- success = Constants.ONE;
- }catch (Exception e){
- log.error("銆怶MS銆戞帹閫佸彇娑堝嚭搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
- e.printStackTrace();
- success = Constants.ONE;
- }finally {
- wmsService.saveInterfaceLog("/wms/push/cancelOutbound", "鎺ㄩ�佸彇娑堝嚭搴撳崟閫氱煡浠诲姟",
- JSONObject.toJSONString(param), success, JSONObject.toJSONString(result),Constants.ONE);
- }
- return result;
- }
- @ApiOperation("銆怶MS銆戞帹閫佸嚭鍏ュ簱浣滀笟瀹屾垚閫氱煡浠诲姟")
- @LoginNoRequired
- @PostMapping("/push/doneTask")
- public WmsBaseResponse doneTask(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
- int success = Constants.ZERO;
- WmsBaseResponse result = null;
- try {
- result = wmsService.doneTask(param);
- }catch (BusinessException e){
- log.error("銆怶MS銆戞帹閫佸嚭鍏ュ簱浣滀笟瀹屾垚閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
- success = Constants.ONE;
- }catch (Exception e){
- log.error("銆怶MS銆戞帹閫佸嚭鍏ュ簱浣滀笟瀹屾垚閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
- e.printStackTrace();
- success = Constants.ONE;
- }finally {
- wmsService.saveInterfaceLog("/wms/push/doneTask", "鎺ㄩ�佸嚭鍏ュ簱浣滀笟瀹屾垚閫氱煡浠诲姟",JSONObject.toJSONString(param),
- success, JSONObject.toJSONString(result),Constants.ONE);
- }
- return result;
- }
-
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudController.java
index 9b5a429..1ca7bc2 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudController.java
@@ -1,10 +1,8 @@
package com.doumee.cloud.admin;
-import com.alibaba.cloud.commons.io.IOUtils;
import com.alibaba.fastjson.JSONObject;
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
-import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.utils.Constants;
import com.doumee.core.wms.model.request.WmsActionNoticeRequest;
@@ -16,19 +14,11 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.List;
/**
* @author 姹熻箘韫�
@@ -47,58 +37,109 @@
@ApiOperation("銆怶MS銆戞帹閫佸叆搴撳崟閫氱煡浠诲姟")
@PostMapping("/push/inboundNotice")
@LoginNoRequired
- public WmsBaseResponse inboundNotice(HttpServletRequest request, HttpServletResponse response) {
- doPringParam(request,"銆怶MS銆戞帹閫佸叆搴撳崟閫氱煡浠诲姟");
- return new WmsBaseResponse();
+ public WmsBaseResponse inboundNotice(@RequestBody WmsBaseRequest<WmsInboundNoticeRequest> param) {
+ int success = Constants.ZERO;
+ WmsBaseResponse result =null;
+ try {
+ result = wmsService.inboundNotice(param);
+ }catch (BusinessException e){
+ log.error("銆怶MS銆戞帹閫佸叆搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
+ success = Constants.ONE;
+ }catch (Exception e){
+ log.error("銆怶MS銆戞帹閫佸叆搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
+ e.printStackTrace();
+ success = Constants.ONE;
+ }finally {
+ wmsService.saveInterfaceLog("/wms/push/inboundNotice", "鎺ㄩ�佸叆搴撳崟閫氱煡浠诲姟",JSONObject.toJSONString(param),
+ success, JSONObject.toJSONString(result),Constants.ONE);
+ }
+ return result;
}
@ApiOperation("銆怶MS銆戞帹閫佸嚭搴撳崟閫氱煡浠诲姟")
@LoginNoRequired
@PostMapping("/push/outboundNotice")
- public WmsBaseResponse outboundNotice(HttpServletRequest request, HttpServletResponse response) {
- doPringParam(request,"銆怶MS銆戞帹閫佸嚭搴撳崟閫氱煡浠诲姟");
- return new WmsBaseResponse();
+ public WmsBaseResponse outboundNotice(@RequestBody WmsBaseRequest<WmsOutboundNoticeRequest> param) {
+ int success = Constants.ZERO;
+ WmsBaseResponse result =null;
+ try {
+ result = wmsService.outboundNotice(param);
+ }catch (BusinessException e){
+ log.error("銆怶MS銆戞帹閫佸嚭搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
+ success = Constants.ONE;
+ }catch (Exception e){
+ log.error("銆怶MS銆戞帹閫佸嚭搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
+ e.printStackTrace();
+ success = Constants.ONE;
+ }finally {
+ wmsService.saveInterfaceLog("/wms/push/outboundNotice", "鎺ㄩ�佸嚭搴撳崟閫氱煡浠诲姟",JSONObject.toJSONString(param),success
+ , JSONObject.toJSONString(result),Constants.ONE);
+ }
+
+ return result;
}
@ApiOperation("銆怶MS銆戞帹閫佸彇娑堝叆搴撳崟閫氱煡浠诲姟")
@LoginNoRequired
@PostMapping("/push/cancelInbound")
- public WmsBaseResponse cancelInbound(HttpServletRequest request, HttpServletResponse response) {
- doPringParam(request,"銆怶MS銆戞帹閫佸彇娑堝叆搴撳崟閫氱煡浠诲姟");
- return new WmsBaseResponse();
+ public WmsBaseResponse cancelInbound(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
+ int success = Constants.ZERO;
+ WmsBaseResponse result =null;
+ try {
+ result = wmsService.cancelInbound(param);
+ }catch (BusinessException e){
+ log.error("銆怶MS銆戞帹閫佸彇娑堝叆搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
+ success = Constants.ONE;
+ }catch (Exception e){
+ log.error("銆怶MS銆戞帹閫佸彇娑堝叆搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
+ e.printStackTrace();
+ success = Constants.ONE;
+ }finally {
+ wmsService.saveInterfaceLog("/wms/push/cancelInbound", "鎺ㄩ�佸彇娑堝叆搴撳崟閫氱煡浠诲姟",JSONObject.toJSONString(param),
+ success, JSONObject.toJSONString(result),Constants.ONE);
+ }
+ return result;
}
@ApiOperation("銆怶MS銆戞帹閫佸彇娑堝嚭搴撳崟閫氱煡浠诲姟")
@LoginNoRequired
@PostMapping("/push/cancelOutbound")
- public WmsBaseResponse cancelOutbound(HttpServletRequest request, HttpServletResponse response) {
- doPringParam(request,"銆怶MS銆戞帹閫佸彇娑堝嚭搴撳崟閫氱煡浠诲姟");
- return new WmsBaseResponse();
+ public WmsBaseResponse cancelOutbound(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
+ int success = Constants.ZERO;
+ WmsBaseResponse result =null;
+ try {
+ result = wmsService.cancelOutbound(param);
+ }catch (BusinessException e){
+ log.error("銆怶MS銆戞帹閫佸彇娑堝嚭搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
+ success = Constants.ONE;
+ }catch (Exception e){
+ log.error("銆怶MS銆戞帹閫佸彇娑堝嚭搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
+ e.printStackTrace();
+ success = Constants.ONE;
+ }finally {
+ wmsService.saveInterfaceLog("/wms/push/cancelOutbound", "鎺ㄩ�佸彇娑堝嚭搴撳崟閫氱煡浠诲姟",
+ JSONObject.toJSONString(param), success, JSONObject.toJSONString(result),Constants.ONE);
+ }
+ return result;
}
-
@ApiOperation("銆怶MS銆戞帹閫佸嚭鍏ュ簱浣滀笟瀹屾垚閫氱煡浠诲姟")
@LoginNoRequired
@PostMapping("/push/doneTask")
- public WmsBaseResponse doneTask(HttpServletRequest request, HttpServletResponse response) {
- doPringParam(request,"銆怶MS銆戞帹閫佸嚭鍏ュ簱浣滀笟瀹屾垚閫氱煡浠诲姟");
- return new WmsBaseResponse();
- }
-
- private void doPringParam(HttpServletRequest request,String name) {
+ public WmsBaseResponse doneTask(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
+ int success = Constants.ZERO;
+ WmsBaseResponse result = null;
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+"=================锛氬弬鏁颁负绌�");
- }
+ result = wmsService.doneTask(param);
+ }catch (BusinessException e){
+ log.error("銆怶MS銆戞帹閫佸嚭鍏ュ簱浣滀笟瀹屾垚閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
+ success = Constants.ONE;
}catch (Exception e){
-
- log.info(name+"================= 鍙傛暟寮傚父锛�"+e.getMessage());
+ log.error("銆怶MS銆戞帹閫佸嚭鍏ュ簱浣滀笟瀹屾垚閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
+ e.printStackTrace();
+ success = Constants.ONE;
+ }finally {
+ wmsService.saveInterfaceLog("/wms/push/doneTask", "鎺ㄩ�佸嚭鍏ュ簱浣滀笟瀹屾垚閫氱煡浠诲姟",JSONObject.toJSONString(param),
+ success, JSONObject.toJSONString(result),Constants.ONE);
}
+ return result;
}
}
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
new file mode 100644
index 0000000..57c8d49
--- /dev/null
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudTestController.java
@@ -0,0 +1,92 @@
+package com.doumee.cloud.admin;
+
+import com.doumee.api.BaseController;
+import com.doumee.config.annotation.LoginNoRequired;
+import com.doumee.core.utils.Constants;
+import com.doumee.core.wms.model.response.WmsBaseResponse;
+import com.doumee.service.business.WmsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedReader;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+@Api(tags = "WMS骞冲彴鏁版嵁鎺ㄩ�佹帴鍙�")
+@RestController
+@Slf4j
+@LoginNoRequired
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/wms/test")
+public class WmsPushCloudTestController extends BaseController {
+
+ @Autowired
+ private WmsService wmsService;
+
+ @ApiOperation("銆怶MS銆戞帹閫佸叆搴撳崟閫氱煡浠诲姟")
+ @PostMapping("/push/inboundNotice")
+ @LoginNoRequired
+ public WmsBaseResponse inboundNotice(HttpServletRequest request, HttpServletResponse response) {
+ doPringParam(request,"銆怶MS銆戞帹閫佸叆搴撳崟閫氱煡浠诲姟");
+ return new WmsBaseResponse();
+ }
+
+ @ApiOperation("銆怶MS銆戞帹閫佸嚭搴撳崟閫氱煡浠诲姟")
+ @LoginNoRequired
+ @PostMapping("/push/outboundNotice")
+ public WmsBaseResponse outboundNotice(HttpServletRequest request, HttpServletResponse response) {
+ doPringParam(request,"銆怶MS銆戞帹閫佸嚭搴撳崟閫氱煡浠诲姟");
+ return new WmsBaseResponse();
+ }
+ @ApiOperation("銆怶MS銆戞帹閫佸彇娑堝叆搴撳崟閫氱煡浠诲姟")
+ @LoginNoRequired
+ @PostMapping("/push/cancelInbound")
+ public WmsBaseResponse cancelInbound(HttpServletRequest request, HttpServletResponse response) {
+ doPringParam(request,"銆怶MS銆戞帹閫佸彇娑堝叆搴撳崟閫氱煡浠诲姟");
+ return new WmsBaseResponse();
+ }
+ @ApiOperation("銆怶MS銆戞帹閫佸彇娑堝嚭搴撳崟閫氱煡浠诲姟")
+ @LoginNoRequired
+ @PostMapping("/push/cancelOutbound")
+ public WmsBaseResponse cancelOutbound(HttpServletRequest request, HttpServletResponse response) {
+ doPringParam(request,"銆怶MS銆戞帹閫佸彇娑堝嚭搴撳崟閫氱煡浠诲姟");
+ return new WmsBaseResponse();
+ }
+
+ @ApiOperation("銆怶MS銆戞帹閫佸嚭鍏ュ簱浣滀笟瀹屾垚閫氱煡浠诲姟")
+ @LoginNoRequired
+ @PostMapping("/push/doneTask")
+ public WmsBaseResponse doneTask(HttpServletRequest request, HttpServletResponse response) {
+ doPringParam(request,"銆怶MS銆戞帹閫佸嚭鍏ュ簱浣滀笟瀹屾垚閫氱煡浠诲姟");
+ return new WmsBaseResponse();
+ }
+
+ private 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());
+ }
+ }
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TransparentChannelBodyParamRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TransparentChannelBodyParamRequest.java
new file mode 100644
index 0000000..fc61267
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TransparentChannelBodyParamRequest.java
@@ -0,0 +1,12 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TransparentChannelBodyParamRequest {
+ private String indexCode ; // String false 璁惧缂栫爜
+ private Integer operationType ; //Number false 鎿嶄綔绫诲瀷
+ private List<TransparentChannelBodyRegionRequest> regions ; // 鏄剧ず鍖轰俊鎭泦鍚�
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TransparentChannelBodyRegionRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TransparentChannelBodyRegionRequest.java
new file mode 100644
index 0000000..5dd4200
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TransparentChannelBodyRegionRequest.java
@@ -0,0 +1,52 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class TransparentChannelBodyRegionRequest {
+ private Integer regionNo ; // Number false 鏄剧ず鍖哄煙鍙�
+ private Integer regionType ; // Number false 鍖哄煙绫诲瀷(14:鍙戦�佹枃瀛楋紝45锛氳闊虫挱鎶�)
+ private String content ; //String false 鍐呭
+ private Integer circleTimes ; // Number false 寰幆娆℃暟
+ private Integer regionLeftTopXPos ; // Number false 鍖哄煙宸︿笂瑙抶鍧愭爣
+ private Integer regionLeftTopYPos ; //Number false 鍖哄煙宸︿笂瑙抷鍧愭爣
+ private Integer regionRightBottomXPos ; // Number false 鍖哄煙鍙充笅瑙抶鍧愭爣
+ private Integer regionRightBottomYPos ; //Number false 鍖哄煙鍙充笅瑙抷鍧愭爣
+
+
+ /*{
+ "regionNo": 1,
+ "regionType": 14,
+ "content": "娆㈣繋鍏変复: E021--娴橝D1234锛岃繖鏄涓�琛�",
+ "circleTimes": 1,
+ "regionLeftTopXPos": 0,
+ "regionLeftTopYPos": 0,
+ "regionRightBottomXPos": 255,
+ "regionRightBottomYPos": 31,
+ "fontColor": 2,
+ "actionType": 32,
+ "speed": 13,
+ "stayTime": 1,
+ "fontSize": 31
+ }*/
+
+ /**
+ * Number false 婊氬姩鏂瑰紡锛圫TATIC_DISPLAY = 0x01,
+ * // 闈欐鏄剧ず/绔嬪嵆鏄剧ず/缈婚〉鏄剧ず LEFT_MOVE = 0x1C,
+ * // 鍚戝乏绉诲姩 RIGHT_MOVE = 0x1D,
+ * // 鍚戝彸绉诲姩 UP_MOVE = 0x1A,
+ * // 鍚戜笂绉诲姩 DOWN_MOVE = 0x1B,
+ * // 鍚戜笅绉诲姩 LEFT_LOOP = 0x1E,
+ * // 鍚戝乏杩炵画绉诲姩 RIGHT_LOOP = 0x1F,
+ * // 鍚戝彸杩炵画绉诲姩 UP_LOOP = 0x20,
+ * // 鍚戜笂杩炵画绉诲姩 DOWN_LOOP = 0x21,
+ * // 鍚戜笅杩炵画绉诲姩 TWINKLE = 0x29
+ * // 闂儊锛�
+ */
+ private Integer actionType ; //
+ private Integer speed ; // Number false 閫熷害
+ private Integer stayTime ; //Number false 鍋滅暀鏃堕棿
+ private Integer fontSize ; //Number false 瀛椾綋澶у皬
+ private Integer fontColor ; //Number false 瀛椾綋棰滆壊(1:绾㈣壊锛�2锛氱豢鑹诧紝4:榛勮壊锛�8锛氳摑鑹诧紝16锛氱传鑹诧紝32锛氶潚鑹诧紝64锛氱櫧鑹�)
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TransparentChannelBodyRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TransparentChannelBodyRequest.java
index 729b00e..7a8bd4a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TransparentChannelBodyRequest.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TransparentChannelBodyRequest.java
@@ -11,34 +11,5 @@
* regionNo涓�1浠ｈ〃绗竴琛岋紝渚濇绫绘帹锛屼笉鍚屽瀷鍙风殑LED璁惧鏀寔鐨勮鏁板彲鑳戒笉涓�鏍凤紱
*/
private String method ; //String true 鏂规硶鍚嶏紝鎺у埗led蹇呴』鍐機ontrolLedGereral
- private String indexCode ; // String false 璁惧缂栫爜
- private Integer operationType ; //Number false 鎿嶄綔绫诲瀷
- private Integer regionNo ; // Number false 鏄剧ず鍖哄煙鍙�
- private Integer regionType ; // Number false 鍖哄煙绫诲瀷(14:鍙戦�佹枃瀛楋紝45锛氳闊虫挱鎶�)
- private String content ; //String false 鍐呭
- private Integer circleTimes ; // Number false 寰幆娆℃暟
- private Integer regionLeftTopXPos ; // Number false 鍖哄煙宸︿笂瑙抶鍧愭爣
- private Integer regionLeftTopYPos ; //Number false 鍖哄煙宸︿笂瑙抷鍧愭爣
- private Integer regionRightBottomXPos ; // Number false 鍖哄煙鍙充笅瑙抶鍧愭爣
- private Integer regionRightBottomYPos ; //Number false 鍖哄煙鍙充笅瑙抷鍧愭爣
-
- /**
- * Number false 婊氬姩鏂瑰紡锛圫TATIC_DISPLAY = 0x01,
- * // 闈欐鏄剧ず/绔嬪嵆鏄剧ず/缈婚〉鏄剧ず LEFT_MOVE = 0x1C,
- * // 鍚戝乏绉诲姩 RIGHT_MOVE = 0x1D,
- * // 鍚戝彸绉诲姩 UP_MOVE = 0x1A,
- * // 鍚戜笂绉诲姩 DOWN_MOVE = 0x1B,
- * // 鍚戜笅绉诲姩 LEFT_LOOP = 0x1E,
- * // 鍚戝乏杩炵画绉诲姩 RIGHT_LOOP = 0x1F,
- * // 鍚戝彸杩炵画绉诲姩 UP_LOOP = 0x20,
- * // 鍚戜笂杩炵画绉诲姩 DOWN_LOOP = 0x21,
- * // 鍚戜笅杩炵画绉诲姩 TWINKLE = 0x29
- * // 闂儊锛�
- */
- private Integer actionType ; //
- private Integer speed ; // Number false 閫熷害
- private Integer stayTime ; //Number false 鍋滅暀鏃堕棿
- private Integer fontSize ; //Number false 瀛椾綋澶у皬
- private Integer fontColor ; //Number false 瀛椾綋棰滆壊(1:绾㈣壊锛�2锛氱豢鑹诧紝4:榛勮壊锛�8锛氳摑鑹诧紝16锛氱传鑹诧紝32锛氶潚鑹诧紝64锛氱櫧鑹�)
-
+ private TransparentChannelBodyParamRequest params ; // String false 璁惧缂栫爜
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
index caa2824..78d66d0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
@@ -121,6 +121,8 @@
@ApiModelProperty(value = "杞︾墝鍙�")
@ExcelColumn(name="杞︾墝鍙�",index = 5,width = 16)
private String carNo;
+ @ApiModelProperty(value = "璁垮鍗曞彿")
+ private String invoicesNo;
@ApiModelProperty(value = "鐓х墖uri")
private String photoUrl;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
index 0361711..3bb2b2c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
@@ -140,7 +140,7 @@
*/
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
- public void updateByIdInBatch(List<MemberCard> memberCards,Integer type,LoginUserInfo userInfo) {
+ public void updateByIdInBatch(List<MemberCard> memberCards,Integer type,LoginUserInfo userInfo){
if (CollectionUtils.isEmpty(memberCards)) {
return;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 98e102a..46eafd9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -939,6 +939,7 @@
}
public static void saveUserActionBiz(Member updateMember,LoginUserInfo user, Constants.UserActionType type,UserActionJoinMapper userActionMapper,String content) {
+ updateMember.setEditDate(updateMember.getEditDate()==null?new Date():updateMember.getEditDate());
UserAction userAction=new UserAction();
userAction.setIsdeleted(Constants.ZERO);
userAction.setCreateDate(updateMember.getEditDate());
@@ -1082,6 +1083,7 @@
update.setEditor(loginUserInfo.getId());
update.setCanVisit(member.getCanVisit());
memberMapper.updateById(update);
+ member.setEditDate(update.getEditDate());
//璁板綍鎿嶄綔鏃ュ織
saveUserActionBiz(member,loginUserInfo,Constants.equalsInteger(member.getCanVisit(),Constants.ONE)?Constants.UserActionType.CANVISIT:Constants.UserActionType.CANCEL_VISIT,userActionJoinMapper,null);
}
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 76eab7d..9816597 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
@@ -7,9 +7,7 @@
import com.doumee.config.SpringContextUtil;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
-import com.doumee.core.haikang.model.param.request.CustomBroadcastRequest;
-import com.doumee.core.haikang.model.param.request.TransparentChannelBodyRequest;
-import com.doumee.core.haikang.model.param.request.TransparentChannelHeadRequest;
+import com.doumee.core.haikang.model.param.request.*;
import com.doumee.core.haikang.model.param.request.event.acs.EventAcsInfoRequest;
import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest;
import com.doumee.core.haikang.model.param.request.event.acs.EventDeviceDataRequest;
@@ -459,6 +457,9 @@
if(request.getData().getTargetPerson() ==null){
request.getData().setTargetPerson(new EventVisitIccmTargetParamRequest());
}
+ if(request.getData().getVisitorInvoices() == null){
+ request.getData().setVisitorInvoices(new EventVisitIccmInvoiceParamRequest());
+ }
VisitEvent event = new VisitEvent();
event.setIsdeleted(Constants.ZERO);
event.setCreateDate(DateUtil.getISO8601DateByStr2(request.getHappenTime()));
@@ -488,7 +489,7 @@
event.setPhotoUrl(getHkImgUrl(detail.getFacePic()));
event.setPersonName(detail.getVisitorName());
event.setCarNo(detail.getPlateNo());
-
+ event.setInvoicesNo(request.getData().getVisitorInvoices().getInvoicesNo());//璁垮鍗曞彿
event.setIdType(detail.getCertType());
String idnum = detail.getCertNo();
if(StringUtils.isNotBlank(idnum)){
@@ -577,6 +578,7 @@
event.setPhotoUrl(getHkImgUrl(request.getData().getPhotoUrl()));
event.setPersonName(request.getData().getPersonName());
event.setCarNo(request.getData().getCarNo());
+ event.setInvoicesNo(request.getData().getVisitorId());
event.setCaptureUrl(request.getData().getCaptureUrl());
if(StringUtils.isNotBlank(request.getData().getCaptureUrl())){
event.setCaptureUrl(HKConstants.IMG_INDEX+request.getData().getCaptureUrl());
@@ -619,7 +621,6 @@
retention.setMemberId(visits.getMemberId());
// retention.setDeviceName(request.getSrcName());
// retention.setDeviceIndex(request.getSrcIndex());
-
return retention;
}
@@ -1040,24 +1041,30 @@
continue;
}
if(Constants.equalsInteger(device.getType(),Constants.ZERO)){
+
//濡傛灉鏄疞ED
- TransparentChannelBodyRequest request = new TransparentChannelBodyRequest();
+ TransparentChannelBodyRequest body = new TransparentChannelBodyRequest();
TransparentChannelHeadRequest head = new TransparentChannelHeadRequest();
+ TransparentChannelBodyParamRequest request = new TransparentChannelBodyParamRequest();
+ TransparentChannelBodyRegionRequest regions = new TransparentChannelBodyRegionRequest();
head.setAbility("cld");//鍥哄畾鍊�
head.setTreatyType("haixuan_led_net");//鍥哄畾鍊�
head.setDeviceIndexCode(device.getHkId());
- request.setMethod("ControlLedGereral");//鍥哄畾鍊�
+ body.setMethod("ControlLedGereral");//鍥哄畾鍊�
request.setIndexCode(device.getHkId());
- request.setActionType(0);
- request.setContent(content);
request.setOperationType(219);//鍥哄畾鍊�
- request.setRegionNo(1);
- request.setRegionType(14);
- request.setFontColor(1);
- request.setCircleTimes(1);//寰幆娆℃暟
- request.setFontSize(16);//
- request.setStayTime(1);//鍗曚綅锛燂紵
- HKService.transparentchannel(head,request);
+ regions.setActionType(0);
+ regions.setContent(content);
+ regions.setRegionNo(1);
+ regions.setRegionType(14);
+ regions.setFontColor(2);
+ regions.setCircleTimes(1);//寰幆娆℃暟
+ regions.setFontSize(31);//
+ regions.setStayTime(1);//鍗曚綅锛燂紵
+ request.setRegions(new ArrayList<>());
+ request.getRegions().add(regions);
+ body.setParams(request);
+ HKService.transparentchannel(head,body);
}else if(Constants.equalsInteger(device.getType(),Constants.ZERO)){
//濡傛灉鏄箍鎾偣
broadcastList.add(device.getHkId());
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
index 9dac51d..4aed3c4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
@@ -14,6 +14,7 @@
import com.doumee.dao.business.*;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.WmsService;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +37,8 @@
private PlatformGroupMapper platformGroupMapper;
@Autowired
private CarsMapper carsMapper;
+ @Autowired
+ private MemberMapper memberMapper;
@Autowired
private PlatformJobMapper platformJobMapper;
@Autowired
@@ -213,7 +216,6 @@
.last("limit 1" ));
if(job == null){
-
PlatformJob model =dealJobBizInbound(param);
job = new PlatformWmsJob();
job.setCreateDate(new Date());
@@ -282,17 +284,30 @@
job.setIsdeleted(Constants.ZERO);
job.setType(Constants.platformJobType.wxcxh);//榛樿鏄鍗忚溅鍗歌揣
job.setStatus(Constants.PlatformJobStatus.WAIT_CONFIRM.getKey());//榛樿寰呯‘璁ょ姸鎬�
+ job.setBillCode(param.getCarrierBillCode());
+ job.setCarrierName(param.getCarrierName());
+ job.setCarCodeFront(param.getPlateNumber());
+ job.setDrivierPhone(param.getDriverPhone());
+ job.setDriverName(param.getDriverName());
+ //澶勭悊浣滀笟鐨勮溅杈嗐�佸徃鏈恒�佹湀鍙扮粍鍏宠仈鍏崇郴锛屽嵏璐�
+ dealCarPlatformAndDriverInfo(job,0);
+ platformJobMapper.insert(job);
+ return job;
+ }
+
+ private void dealCarPlatformAndDriverInfo(PlatformJob job,int type) {
//鏌ヨ杞﹁締鏄惁鑷湁杞︼紝浠ュ強jobNum琛ㄧず浣嗘眰浣滀笟鏁伴噺锛堥潪宸茬鍥殑浣滀笟鏁�)
Cars car = carsMapper.selectOne(new QueryWrapper<Cars>()
- .select("*,(select count(1) from platform_job b where b.plate_num='"+param.getPlateNumber()+"' and b.status in("+
+ .select("*,(select count(1) from platform_job b where b.plate_num='"+job.getCarCodeFront()+"' and b.status in("+
Constants.PlatformJobStatus.LEAVED.getKey()+")) as jobNum")
.lambda()
.eq(Cars::getIsdeleted,Constants.ZERO)
.eq(Cars::getType,Constants.ONE)
- .eq(Cars::getCode,param.getPlateNumber()));
+ .eq(Cars::getCode,job.getCarCodeFront()));
if(car !=null){
//濡傛灉鏄嚜鏈夌墿娴佽溅
- job.setType(Constants.platformJobType.zycxh);//鑷湁杞﹀嵏璐�
+ job.setType(type==0?Constants.platformJobType.zycxh:Constants.platformJobType.zyczh);//鑷湁杞﹀嵏璐�/瑁呰揣
+ job.setCarCodeBack(job.getCarCodeFront());//鑷湁杞﹂粯璁ゅ墠鍚庤溅鐗屼竴鏍�
if(Constants.equalsInteger(car.getInStatus(),Constants.ONE) && car.getJobNum() == 0) {
//濡傛灉杞﹁締鍦ㄥ洯
job.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());//鍦ㄥ洯鏃犱綔涓氱姸鎬侊紝鍒欒嚜鍔ㄣ�愬凡绛惧埌銆戝鐞�
@@ -303,37 +318,35 @@
.eq(PlatformGroup::getType,Constants.ONE)
.last("limit 1") );//鏌ヨ鍗歌揣鏈堝彴缁勭紪鐮�
job.setPlatformGroupId(group!=null?group.getId():null);
+ Member driver = memberMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
+ .selectAll(Member.class)
+ .selectAs(Company::getCompanyNamePath,Member::getCompanyNamePath)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .eq(Member::getPhone,job.getDrivierPhone())
+ .last("limit 1") );//鏌ヨ瑁呰揣鏈堝彴缁勭紪鐮�
+ if(driver!=null){
+ job.setDriverId(driver.getId());
+ job.setCompanyId(driver.getCompanyId());
+ job.setCompanyNamePath(driver.getCompanyNamePath());
+ }
+
platformJobMapper.insert(job);
- return job;
}
+
private PlatformJob dealJobBizOutbound(WmsOutboundNoticeRequest param) {
PlatformJob job = new PlatformJob();
job.setCreateDate(new Date());
job.setIsdeleted(Constants.ZERO);
job.setType(Constants.platformJobType.wxczh);//榛樿鏄鍗忚溅瑁呭ソ
job.setStatus(Constants.PlatformJobStatus.WAIT_CONFIRM.getKey());//榛樿寰呯‘璁ょ姸鎬�
- //鏌ヨ杞﹁締鏄惁鑷湁杞︼紝浠ュ強jobNum琛ㄧず浣嗘眰浣滀笟鏁伴噺锛堥潪宸茬鍥殑浣滀笟鏁�)
- Cars car = carsMapper.selectOne(new QueryWrapper<Cars>()
- .select("*,(select count(1) from platform_job b where b.plate_num='"+param.getPlateNumber()+"' and b.status in("+
- Constants.PlatformJobStatus.LEAVED.getKey()+")) as jobNum")
- .lambda()
- .eq(Cars::getIsdeleted,Constants.ZERO)
- .eq(Cars::getType,Constants.ONE)
- .eq(Cars::getCode,param.getPlateNumber()));
- if(car !=null){
- //濡傛灉鏄嚜鏈夌墿娴佽溅
- job.setType(Constants.platformJobType.zyczh);//鑷湁杞﹁璐�
- if(Constants.equalsInteger(car.getInStatus(),Constants.ONE) && car.getJobNum() == 0) {
- //濡傛灉杞﹁締鍦ㄥ洯
- job.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());//鍦ㄥ洯鏃犱綔涓氱姸鎬侊紝鍒欒嚜鍔ㄣ�愬凡绛惧埌銆戝鐞�
- }
- }
- PlatformGroup group = platformGroupMapper.selectOne(new QueryWrapper<PlatformGroup>().lambda()
- .eq(PlatformGroup::getIsdeleted,Constants.ZERO)
- .eq(PlatformGroup::getType,Constants.ZERO)
- .last("limit 1") );//鏌ヨ瑁呰揣鏈堝彴缁勭紪鐮�
- job.setPlatformGroupId(group!=null?group.getId():null);
- platformJobMapper.insert(job);
+ job.setBillCode(param.getCarrierBillCode());
+ job.setCarrierName(param.getCarrierName());
+ job.setCarCodeFront(param.getPlateNumber());
+ job.setDrivierPhone(param.getDriverPhone());
+ job.setDriverName(param.getDriverName());
+ //澶勭悊浣滀笟鐨勮溅杈嗐�佸徃鏈恒�佹湀鍙扮粍鍏宠仈鍏崇郴锛岃璐�
+ dealCarPlatformAndDriverInfo(job,1);
return job;
}
/**
--
Gitblit v1.9.3