From a6f9e7d4faf7c1c536111e0db7f3317cbda9ddb1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 30 十二月 2024 18:24:05 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java | 5
server/visits/dmvisit_screen/src/main/java/com/doumee/service/impl/ScreenServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverTaskParameterRequest.java | 18 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverTaskListRequest.java | 21 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberJoinMapper.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java | 7
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java | 57 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskProductDetailsResponse.java | 28 +
server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarDriverServiceImpl.java | 5
server/system_service/src/main/java/com/doumee/dao/system/dto/LoginPhoneDTO.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderNoFinishListRequest.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncImgServiceImpl.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java | 64 +++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskListResponse.java | 49 ++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java | 30 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveMapper.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 11
server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsEmailColudController.java | 17
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromSelfServiceImpl.java | 2
server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java | 1
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerParamCloudController.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVisitFromHKServiceImpl.java | 2
server/system_service/src/main/java/com/doumee/dao/business/model/vo/ValidPhoneCodeVO.java | 2
server/system_service/src/main/java/com/doumee/dao/business/model/Member.java | 0
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskPalletDetailsResponse.java | 24 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerParamService.java | 1
admin/src/api/business/smsEmail.js | 8
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java | 16
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/SmsEmailService.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java | 3
server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverTaskInfoRequest.java | 19 +
server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java | 92 +++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskTransportStopsResponse.java | 26 +
server/system_service/src/main/java/com/doumee/dao/business/dao/MemberMapper.java | 12
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java | 10
admin/src/views/business/smsEmail.vue | 152 ++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWaterGasServiceImpl.java | 9
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberRoleJoinMapper.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java | 84 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitParkServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsPagerRequest.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverStartAndArrivalRequest.java | 20 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java | 3
/dev/null | 20 -
server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java | 17 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 5
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskInfoResponse.java | 53 +++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 2
81 files changed, 846 insertions(+), 149 deletions(-)
diff --git a/admin/src/api/business/smsEmail.js b/admin/src/api/business/smsEmail.js
new file mode 100644
index 0000000..7ac56c2
--- /dev/null
+++ b/admin/src/api/business/smsEmail.js
@@ -0,0 +1,8 @@
+import request from '../../utils/request'
+
+// 鏌ヨ
+export function fetchList (data) {
+ return request.post('/visitsAdmin/cloudService/business/smsEmail/page', data, {
+ trim: true
+ })
+}
diff --git a/admin/src/views/business/smsEmail.vue b/admin/src/views/business/smsEmail.vue
new file mode 100644
index 0000000..7ff336a
--- /dev/null
+++ b/admin/src/views/business/smsEmail.vue
@@ -0,0 +1,152 @@
+<template>
+ <TableLayout :permissions="['business:carevent:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="" prop="phone">
+ <el-input v-model="searchForm.phone" placeholder="璇疯緭鍏ユ墜鏈哄彿/閭鍦板潃" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="" prop="type">
+ <el-select v-model="searchForm.type" @keypress.enter.native="search" clearable placeholder="绫诲瀷">
+ <el-option label="鐭俊" value="0"></el-option>
+ <el-option label="閭" value="1"></el-option>
+ <el-option label="寰俊鍏紬鍙烽�氱煡" value="2"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="" prop="objType">
+ <el-select v-model="searchForm.objType" @keypress.enter.native="search" clearable 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-option label="鐢ㄨ溅鐢宠" value="4"></el-option>
+ <el-option label="浼氳瀹や俊鎭�" value="5"></el-option>
+ <el-option label="鐗╂祦杞﹂绾�" value="6"></el-option>
+ <el-option label="鐗╂祦杞︿綔涓�" value="7"></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>
+ <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
+ <el-table-column prop="phone" label="鎵嬫満鍙�/閭" min-width="150px">
+ <template slot-scope="{ row }">
+ <span v-if="row.type == 0">{{ row.phone }}</span>
+ <span v-if="row.type == 1">{{ row.email }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="title" label="鏍囬" min-width="100px"></el-table-column>
+ <el-table-column prop="content" label="鍐呭" min-width="300px"></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>
+ <span v-if="row.type == 2">寰俊鍏紬鍙烽�氱煡</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鐘舵��" min-width="100px">
+ <template slot-scope="{ row }">
+ <span v-if="row.status == 0">鏈娇鐢�</span>
+ <span v-if="row.status == 1">宸蹭娇鐢�</span>
+ <span v-if="row.status == 2">绛夊緟鍙戦��</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="涓氬姟绫诲瀷" min-width="100px">
+ <template slot-scope="{ row }">
+ <span v-if="row.objType == 0">楠岃瘉鐮�</span>
+ <span v-if="row.objType == 1">璁垮</span>
+ <span v-if="row.objType == 2">璁垮鎶ュ</span>
+ <span v-if="row.objType == 3">闅愭偅闅忔墜鎷�</span>
+ <span v-if="row.objType == 4">鐢ㄨ溅鐢宠</span>
+ <span v-if="row.objType == 5">浼氳瀹や俊鎭�</span>
+ <span v-if="row.objType == 6">鐗╂祦杞﹂绾�</span>
+ <span v-if="row.objType == 7">鐗╂祦杞︿綔涓�</span>
+ </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>
+ </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: 'CarEvent',
+ extends: BaseTable,
+ components: { TableLayout, Pagination },
+ data() {
+ return {
+ // 鎼滅储
+ searchForm: {
+ phone: '',
+ type: null,
+ objType: null,
+ startTime: '',
+ endTime: '',
+ radio: '0'
+ },
+ time: []
+ }
+ },
+ created() {
+ this.config({
+ module: '鐭俊閭鍙戦�佽褰�',
+ api: '/business/smsEmail',
+ 'field.id': 'id',
+ 'field.main': 'id'
+ })
+ this.changeRadio('0')
+ this.search()
+ },
+ methods: {
+ reset() {
+ this.$refs.searchForm.resetFields()
+ this.searchForm.radio = '0'
+ this.changeRadio('0')
+ this.time = []
+ this.search()
+ },
+ 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()
+ }
+ }
+}
+</script>
diff --git a/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java b/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java
index 3ccf2be..a2648dc 100644
--- a/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java
+++ b/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java
@@ -151,6 +151,23 @@
return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
}
}
+ @PreventRepeat(limit = 10, lockTime = 10000)
+ @ApiOperation("鍙告満楠岃瘉鐮佺櫥褰�")
+ @PostMapping("/loginDriverWithCode")
+ @LoginNoRequired
+ public ApiResponse<String> loginDriverWithCode (@Validated @RequestBody LoginPhoneDTO dto, ServerWebExchange serverWebExchange) {
+ try {
+ ServerHttpRequest request = serverWebExchange.getRequest();
+ LoginUserInfo user = systemLoginService.loginDriverWithCode(dto,request);
+ String token = jwtTokenUtil.generateToken(user);
+ return ApiResponse.success(token);
+ }catch (BusinessException e){
+ return ApiResponse.failed(e.getCode(),e.getMessage());
+ }catch (Exception e){
+ e.printStackTrace();
+ return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
+ }
+ }
/**
* 鍒锋柊JWT浠ょ墝,鐢ㄦ棫鐨勪护鐗屾崲鏂扮殑浠ょ墝
diff --git a/server/system_service/src/main/java/com/doumee/dao/business/dao/MemberMapper.java b/server/system_service/src/main/java/com/doumee/dao/business/dao/MemberMapper.java
new file mode 100644
index 0000000..6aaddf5
--- /dev/null
+++ b/server/system_service/src/main/java/com/doumee/dao/business/dao/MemberMapper.java
@@ -0,0 +1,12 @@
+package com.doumee.dao.business.dao;
+
+import com.doumee.dao.business.model.Member;
+import com.github.yulichang.base.MPJBaseMapper;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+public interface MemberMapper extends MPJBaseMapper<Member> {
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java
similarity index 100%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
rename to server/system_service/src/main/java/com/doumee/dao/business/model/Member.java
diff --git a/server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java b/server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java
index a8f68d5..65570b2 100644
--- a/server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java
+++ b/server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java
@@ -93,5 +93,11 @@
@ApiModelProperty(value = "闄勪欢闆嗗悎")
@TableField(exist = false)
private List<Map<String,Object>> fileList;
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @TableField(exist = false)
+ private Date startTime;
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @TableField(exist = false)
+ private Date endTime;
}
diff --git a/server/system_service/src/main/java/com/doumee/dao/business/model/vo/ValidPhoneCodeVO.java b/server/system_service/src/main/java/com/doumee/dao/business/model/vo/ValidPhoneCodeVO.java
index 02fd369..7558c6d 100644
--- a/server/system_service/src/main/java/com/doumee/dao/business/model/vo/ValidPhoneCodeVO.java
+++ b/server/system_service/src/main/java/com/doumee/dao/business/model/vo/ValidPhoneCodeVO.java
@@ -29,4 +29,6 @@
@ApiModelProperty(value = "鎵嬫満鍙�", example = "1")
private String phone;
+ @ApiModelProperty(value = "openid", example = "1")
+ private String openId;
}
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/dto/LoginPhoneDTO.java b/server/system_service/src/main/java/com/doumee/dao/system/dto/LoginPhoneDTO.java
index 4646b5f..6dc5f3e 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/dto/LoginPhoneDTO.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/dto/LoginPhoneDTO.java
@@ -21,4 +21,6 @@
@NotBlank(message = "楠岃瘉鐮佷笉鑳戒负绌�")
@ApiModelProperty(value = "楠岃瘉鐮�")
private String code;
+ @ApiModelProperty(value = "openid")
+ private String openid;
}
diff --git a/server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java b/server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java
index c55524f..77bdddb 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java
@@ -30,10 +30,10 @@
LoginUserInfo driverLogin(LoginDTO dto, ServerHttpRequest request);
+ LoginUserInfo loginDriverWithCode(LoginPhoneDTO dto, ServerHttpRequest request);
/**
* 鏍规嵁 openId鐧诲綍
* @param userId
- * @param request
* @return
*/
String loginByUserId(Integer userId);
diff --git a/server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java b/server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java
index 2fe3b3c..b59b242 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java
@@ -2,6 +2,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.vo.ValidPhoneCodeVO;
import com.doumee.dao.system.dto.QuerySystemUserDTO;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.system.vo.SystemUserListVO;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
index 91a5fb8..00d21b3 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.jwt.JwtTokenUtil;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
@@ -9,8 +10,10 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.Company;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.SmsEmail;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.dto.LoginByOpenidDTO;
@@ -21,6 +24,7 @@
import com.doumee.service.system.*;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationException;
@@ -49,6 +53,11 @@
@Lazy
@Autowired
private SystemUserService systemUserService;
+ @Lazy
+ @Autowired
+ private MemberMapper memberMapper;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@Autowired
private SystemUserMapper systemUserMapper;
@@ -376,6 +385,89 @@
LoginUserInfo userInfo = LoginUserInfo.from(user, null, null,company,null);
return userInfo;
}
+ public void isCaptcheValide( String phone, String captche) {
+ SmsEmail model = smsEmailMapper.selectOne(new QueryWrapper<SmsEmail>().lambda()
+ .eq(SmsEmail::getType, Constants.ZERO)
+ .eq(SmsEmail::getPhone, phone)
+ .eq(SmsEmail::getRemark, captche)
+ .eq(SmsEmail::getIsdeleted, Constants.ZERO)
+ );
+ if(model == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝楠岃瘉鐮佷笉姝ｇ‘锛岃閲嶆柊鍙戦�佸啀璇曪紒");
+ }
+ if(!Constants.equalsInteger(model.getStatus(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝楠岃瘉鐮佸凡澶辨晥锛岃閲嶆柊鍙戦�佸啀璇曪紒");
+ }
+ if(model.getCreateDate() !=null &&
+ System.currentTimeMillis() - model.getCreateDate().getTime() > 3*60*1000){
+ model.setStatus(Constants.ONE);
+ model.setEditDate(new Date());
+ smsEmailMapper.updateById(model);
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝楠岃瘉鐮佸凡澶辨晥锛岃閲嶆柊鍙戦�佸啀璇晘");
+ }
+ model.setStatus(Constants.ONE);
+ model.setEditDate(new Date());
+ smsEmailMapper.updateById(model);
+ }
+
+ @Override
+ public LoginUserInfo loginDriverWithCode(LoginPhoneDTO param, ServerHttpRequest request) {
+ isCaptcheValide(param.getPhone(),param.getCode());//妫�鏌ラ獙璇佺爜
+
+ SystemLoginLog loginLog = new SystemLoginLog();
+ loginLog.setLoginUsername(param.getPhone());
+ loginLog.setLoginTime(new Date());
+ loginLog.setReason("銆愬叕浼楀彿銆戝徃鏈虹楠岃瘉鐮佺櫥闄嗭細openid="+param.getOpenid());
+ loginLog.setSystemVersion(systemVersion);
+// loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
+ if(request!=null&&request.getHeaders()!=null && request.getHeaders().size()>0){
+ loginLog.setIp(Utils.User_Client.getIP(request));
+ loginLog.setPlatform(Utils.User_Client.getPlatform(request));
+ loginLog.setClientInfo(Utils.User_Client.getBrowser(request));
+ loginLog.setOsInfo(Utils.User_Client.getOS(request));
+ }
+ loginLog.setServerIp(Utils.Server.getIP());
+ // 鏍规嵁鐢ㄦ埛鍚嶆煡璇㈢敤鎴峰璞�
+ SystemUser queryDto = new SystemUser();
+ queryDto.setUsername(param.getPhone());
+ queryDto.setDeleted(Boolean.FALSE);
+ SystemUser systemUser = systemUserService.findOne(queryDto);
+ if (systemUser == null) {
+ String salt = RandomStringUtils.randomAlphabetic(6);
+ Member member = new Member();
+ member.setCreateDate(new Date());
+ member.setIsdeleted(Constants.ZERO);
+ member.setType(Constants.memberType.driver);
+ member.setPhone(param.getPhone());
+ member.setStatus(Constants.ZERO);
+ member.setOpenid(param.getOpenid());
+ member.setPassward(Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.INITIAL_PASSWORD).getCode(), salt));
+ memberMapper.insert(member);
+
+ systemUser = new SystemUser();
+ systemUser.setCreateTime(new Date());
+ systemUser.setDeleted(Boolean.FALSE);
+ systemUser.setUsername(param.getPhone());
+ systemUser.setRealname(null);
+ systemUser.setMemberId(member.getId());
+ systemUser.setMobile(param.getPhone());
+ systemUser.setSalt(salt);
+ systemUser.setPassword(member.getPassward());
+ systemUser.setStatus(Constants.ZERO);
+ systemUser.setType(Constants.memberType.driver);
+ systemUser.setSource(Constants.TWO);
+ systemUser.setOpenid(param.getOpenid());
+ systemUserMapper.insert(systemUser);
+ }
+
+ dealOpenIdBiz(systemUser,param.getOpenid());
+ Company company = new Company();
+ if(Objects.nonNull(systemUser.getCompanyId())){
+ company = companyMapper.selectById(systemUser.getCompanyId());
+ }
+ LoginUserInfo userInfo = LoginUserInfo.from(systemUser, null, null,null,null);
+ return userInfo;
+ }
/**
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
index bf8ef74..c6f6dba 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
@@ -8,6 +8,8 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.model.Company;
+import com.doumee.dao.business.model.SmsEmail;
+import com.doumee.dao.business.model.vo.ValidPhoneCodeVO;
import com.doumee.dao.system.SystemUserJoinMapper;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.dto.QuerySystemUserDTO;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerParamCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerParamCloudController.java
index 042c1a0..b62c4c3 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerParamCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerParamCloudController.java
@@ -8,7 +8,6 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
-import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.business.model.HiddenDangerParam;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.HiddenDangerParamService;
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 8bc1987..9ce05c9 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
@@ -31,6 +31,7 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.PostConstruct;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
index f2d0c6f..d3556e0 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
@@ -13,20 +13,15 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.request.LaborMemberDTO;
-import com.doumee.dao.admin.request.MemberImport;
import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.business.dto.RegisterDriverDTO;
-import com.doumee.dao.business.dto.ResetPasswordDTO;
import com.doumee.dao.business.model.Member;
-import com.doumee.dao.business.model.MemberCard;
-import com.doumee.dao.business.model.MemberRole;
import com.doumee.dao.system.dto.UpdatePwdDto;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.ext.ERPSyncService;
import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromHKServiceImpl;
import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromSelfServiceImpl;
import io.swagger.annotations.*;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsEmailColudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsEmailColudController.java
index 70857a2..0cf4bc7 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsEmailColudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsEmailColudController.java
@@ -1,6 +1,7 @@
package com.doumee.cloud.admin;
import com.doumee.api.BaseController;
+import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
@@ -8,10 +9,13 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.model.SmsConfig;
import com.doumee.dao.business.model.SmsEmail;
import com.doumee.dao.business.model.vo.ValidPhoneCodeVO;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.third.EmayService;
+import com.doumee.service.system.SystemUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -55,8 +59,19 @@
smsEmailService.validPhoneCaptcha(param);
return ApiResponse.success("璇锋眰鎴愬姛");
}
+ @LoginNoRequired
+ @PreventRepeat
+ @ApiOperation("鏍规嵁鎵嬫満鍙峰拰楠岃瘉鐮佹牎楠岋紝骞跺畬鎴愬徃鏈烘敞鍐屽拰杩斿洖鍙告満淇℃伅")
+ @PostMapping("/validDriverPhone")
+ public ApiResponse<SystemUser> validDriverPhone(@RequestBody ValidPhoneCodeVO param) {
+ return ApiResponse.success(smsEmailService.validDriverPhone(param));
+ }
-
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ @PostMapping("/page")
+ public ApiResponse<PageData<SmsEmail>> findPage (@RequestBody PageWrap<SmsEmail> pageWrap) {
+ return ApiResponse.success(smsEmailService.findPage(pageWrap));
+ }
@LoginNoRequired
@PreventRepeat
@ApiOperation("鑷畾涔夌煭淇″唴瀹�")
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java
index 287af7d..9595f70 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java
@@ -3,25 +3,18 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.tms.model.request.*;
import com.doumee.core.tms.model.response.*;
import com.doumee.core.utils.Constants;
-import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.service.business.third.TmsService;
-import com.doumee.service.business.third.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 org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.BufferedReader;
import java.util.List;
/**
@@ -54,7 +47,7 @@
param.setParameters( new TmsOrderListParamRequest());
}
if(param.getPager() == null){
- param.setPager( new TmsOrderListPagerRequest());
+ param.setPager( new TmsPagerRequest());
}
if(param.getPager().getPage() == null){
param.getPager().setPage(1);
@@ -74,9 +67,49 @@
@LoginNoRequired
@PostMapping("/orderInfo")
public ApiResponse<TmsOrderInfoResponse> ordreInfo(@RequestBody TmsOrderInfoRequest request ) {
-
return ApiResponse.success(tmsService.orderInfo(request));
}
-
+ @ApiOperation("銆怲MS銆戝徃鏈哄緟鍔炰换鍔″垪琛ㄦ帴鍙�")
+ @PostMapping("/taskList")
+ public ApiResponse<TmsBasePageResponse<TmsDriveTaskListResponse>> taskList(@RequestBody TmsDriverTaskListRequest param ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ if(param == null){
+ param = new TmsDriverTaskListRequest();
+ }
+ if(param.getParameters() == null){
+ param.setParameters( new TmsDriverTaskParameterRequest());
+ }
+ if(param.getPager() == null){
+ param.setPager( new TmsPagerRequest());
+ }
+ if(param.getPager().getPage() == null){
+ param.getPager().setPage(1);
+ }
+ if(param.getPager().getRows() == null){
+ param.getPager().setRows(10);
+ }
+ /* if(StringUtils.isBlank(param.getParameters().getDriverTel())){
+ param.getParameters().setDriverTel("00000000000");//鎵嬫満鍙峰繀濉�
+ }*/
+ LoginUserInfo user = this.getLoginUser(token);
+ param.getParameters().setDriverTel(user.getUsername());
+ return ApiResponse.success(tmsService.getDriverTaskList(param));
+ }
+ @ApiOperation("銆怲MS銆戝緟鍔炰换鍔¤鎯呮帴鍙�")
+ @PostMapping("/taskDetail")
+ public ApiResponse<TmsDriveTaskInfoResponse> getDriverTaskDetail(@RequestBody TmsDriverTaskInfoRequest request ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ return ApiResponse.success(tmsService.getDriverTaskDetail(request));
+ }
+ @ApiOperation("銆怲MS銆戝徃鏈轰换鍔″惎鍔�")
+ @PostMapping("/driverStart")
+ public ApiResponse driverStart(@RequestBody TmsDriverStartAndArrivalRequest request ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ tmsService.driverStart(request);
+ return ApiResponse.success(null);
+ }
+ @ApiOperation("銆怲MS銆戝徃鏈轰换鍔″埌璐ф彁浜�")
+ @PostMapping("/driverArrival")
+ public ApiResponse driverArrival(@RequestBody TmsDriverStartAndArrivalRequest request ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ tmsService.driverArrival(request);
+ return ApiResponse.success(null);
+ }
}
diff --git a/server/visits/dmvisit_screen/src/main/java/com/doumee/service/impl/ScreenServiceImpl.java b/server/visits/dmvisit_screen/src/main/java/com/doumee/service/impl/ScreenServiceImpl.java
index 24a6682..84853ab 100644
--- a/server/visits/dmvisit_screen/src/main/java/com/doumee/service/impl/ScreenServiceImpl.java
+++ b/server/visits/dmvisit_screen/src/main/java/com/doumee/service/impl/ScreenServiceImpl.java
@@ -14,6 +14,7 @@
import com.doumee.dao.business.join.VisitEventJoinMapper;
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.doumee.model.*;
import com.doumee.service.ScreenService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
index be422bb..61779cf 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
@@ -24,6 +24,10 @@
String[] getSevenArrivalStatusAndDetails = new String[]{"/tms/zhyt/getSevenArrivalStatusAndDetails", "銆怲MS銆戣繎7鏃ュ埌璐ф儏鍐�(鍚槑缁�)"};//3.13杩�7鏃ュ埌璐ф儏鍐�(鍚槑缁�)
String[] getNotFinishOrderList = new String[]{"/tms/zhyt/getNotFinishOrderList", "銆怲MS銆戞湭瀹屾垚璁㈠崟"};//3.13鏈畬鎴愯鍗�
String[] getOutboundCapability = new String[]{"/tms/zhyt/getOutboundCapability", "銆怲MS銆戝嚭搴撹兘鍔涚粺璁�"};//3.14鍑哄簱鑳藉姏缁熻
+ String[] getDriverTaskList = new String[]{"/tms/zhyt/getDriverTaskList", "銆怲MS銆戞煡璇㈠徃鏈烘墍鏈変唬鍔炰换鍔°��"};//3.15鏌ヨ鍙告満鎵�鏈変唬鍔炰换鍔°��
+ String[] getDriverTaskDetail = new String[]{"/tms/zhyt/getDriverTaskDetail", "銆怲MS銆戝徃鏈哄緟鍔炰换鍔¤鎯呫��"};//3.16鍙告満寰呭姙浠诲姟璇︽儏銆�
+ String[] driverStart = new String[]{"/tms/zhyt/driverStartAndArrival", "銆怲MS銆戝徃鏈哄惎杩愩��"};//3.17鍙告満鍚繍
+ String[] driverArrival = new String[]{"/tms/zhyt/driverStartAndArrival", "銆怲MS銆戝徃鏈哄埌璐с��"};//3.18鍙告満鍒拌揣
}
public enum TopStatusLevel {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverStartAndArrivalRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverStartAndArrivalRequest.java
new file mode 100644
index 0000000..a48221d
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverStartAndArrivalRequest.java
@@ -0,0 +1,20 @@
+package com.doumee.core.tms.model.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms鍙告満浠诲姟鍚姩鍒拌揣璇锋眰鍙傛暟")
+public class TmsDriverStartAndArrivalRequest {
+ @ApiModelProperty(value = "浠ｅ姙浠诲姟id" )
+ private String id ;//鏄� 瀛楃涓� 浠ｅ姙浠诲姟id
+ @ApiModelProperty(value = "涓氬姟绫诲瀷 0锛氬惎杩� 1锛氬埌璐�" )
+ private String optType ;//鏄� 瀛楃涓� 涓氬姟绫诲瀷 0锛氬惎杩� 1锛氬埌璐�
+ @ApiModelProperty(value = "鍋滈潬绔欑偣" )
+ private Integer stopNumber;// 鏄� 鏁板瓧 鍋滈潬绔欑偣
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverTaskInfoRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverTaskInfoRequest.java
new file mode 100644
index 0000000..eca5132
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverTaskInfoRequest.java
@@ -0,0 +1,19 @@
+package com.doumee.core.tms.model.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms鍙告満浠诲姟璇︽儏璇锋眰鍙傛暟")
+public class TmsDriverTaskInfoRequest {
+ @ApiModelProperty(value = "浠ｅ姙浠诲姟id" )
+ private String id ;//鏄� 瀛楃涓� 浠ｅ姙浠诲姟id
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverTaskListRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverTaskListRequest.java
new file mode 100644
index 0000000..a6680e6
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverTaskListRequest.java
@@ -0,0 +1,21 @@
+package com.doumee.core.tms.model.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms鍙告満鎵�鏈変唬鍔炰换鍔¤姹傚弬鏁�")
+public class TmsDriverTaskListRequest {
+
+ @ApiModelProperty(value = "鍙告満鐢佃瘽鍙傛暟" )
+ private TmsDriverTaskParameterRequest parameters; //鏄� 闆嗗悎 鍖哄煙ID闆嗗悎
+ @ApiModelProperty(value = "鍒嗛〉鍙傛暟" )
+ private TmsPagerRequest pager; // 鍚� 闆嗗悎 鍚堝悓鍙烽泦鍚�
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverTaskParameterRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverTaskParameterRequest.java
new file mode 100644
index 0000000..3e20927
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverTaskParameterRequest.java
@@ -0,0 +1,18 @@
+package com.doumee.core.tms.model.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms鍙告満鎵�鏈変唬鍔炰换鍔¤姹傛槑缁嗗弬鏁�")
+public class TmsDriverTaskParameterRequest {
+ @ApiModelProperty(value = "鍙告満鐢佃瘽" )
+ private String driverTel; // 鏄� 鍙告満鐢佃瘽
+ @ApiModelProperty(value = "杩愬崟鍙�" )
+ private String transportCode; // 鏄� 杩愬崟鍙�
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java
index 52a9fb0..6f77c8d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java
@@ -3,8 +3,6 @@
import io.swagger.annotations.ApiModel;
import lombok.Data;
-import java.util.List;
-
/**
* @author 姹熻箘韫�
* @date 2023/11/23 14:03
@@ -15,6 +13,6 @@
private TmsOrderListParamRequest parameters; //鏄� 闆嗗悎 鍖哄煙ID闆嗗悎
- private TmsOrderListPagerRequest pager; // 鍚� 闆嗗悎 鍚堝悓鍙烽泦鍚�
+ private TmsPagerRequest pager; // 鍚� 闆嗗悎 鍚堝悓鍙烽泦鍚�
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderNoFinishListRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderNoFinishListRequest.java
index 5461766..3c100e9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderNoFinishListRequest.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderNoFinishListRequest.java
@@ -13,6 +13,6 @@
private TmsOrderNoFinishListParamRequest parameters; //鏄� 闆嗗悎 鍖哄煙ID闆嗗悎
- private TmsOrderListPagerRequest pager; // 鍚� 闆嗗悎 鍚堝悓鍙烽泦鍚�
+ private TmsPagerRequest pager; // 鍚� 闆嗗悎 鍚堝悓鍙烽泦鍚�
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListPagerRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsPagerRequest.java
similarity index 73%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListPagerRequest.java
rename to server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsPagerRequest.java
index efd2fe5..8ddb8cc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListPagerRequest.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsPagerRequest.java
@@ -3,15 +3,13 @@
import io.swagger.annotations.ApiModel;
import lombok.Data;
-import java.util.List;
-
/**
* @author 姹熻箘韫�
* @date 2023/11/23 14:03
*/
@Data
-@ApiModel("tms鍚堝悓鍒楄〃椤电爜璇锋眰鍙傛暟")
-public class TmsOrderListPagerRequest {
+@ApiModel("tms鍒嗛〉鍒楄〃椤电爜璇锋眰鍙傛暟")
+public class TmsPagerRequest {
private Integer page ;//鏄� 鏁板瓧 褰撳墠椤�
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskInfoResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskInfoResponse.java
new file mode 100644
index 0000000..c7216bd
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskInfoResponse.java
@@ -0,0 +1,53 @@
+package com.doumee.core.tms.model.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms鍙告満浠诲姟璇︽儏杩斿洖鍙傛暟")
+public class TmsDriveTaskInfoResponse {
+ @ApiModelProperty(value = "浠诲姟id" )
+ private String id ; //瀛楃涓� 浠诲姟id
+
+ @ApiModelProperty(value = "杩愯緭鍗曞彿" )
+ private String transportCode ; //瀛楃涓� 杩愯緭鍗曞彿
+ @ApiModelProperty(value = "杞︾墝鍙�" )
+ private String plateNumber; // 瀛楃涓� 杞︾墝鍙�
+ @ApiModelProperty(value = "鍙告満鎵嬫満鍙风爜" )
+ private String driverTel ; // 瀛楃涓� 鍙告満鎵嬫満鍙风爜
+ @ApiModelProperty(value = "鐗╂枡绫诲瀷 1锛氭垚鍝�, 2:鎵樼洏" )
+ private String materialType ; //瀛楃涓� 鐗╂枡绫诲瀷 1锛氭垚鍝�, 2:鎵樼洏
+ @ApiModelProperty(value = "涓氬姟绫诲瀷 1: 鎴愬搧閿�鍞�, 2: 鎴愬搧绉诲簱, 3: 绌烘墭鐩�-宸ヤ笟璋冨墏, 4: 绌烘墭鐩�-鍟嗕笟鍥炴敹, 5: 绌烘墭鐩�-鎵樼洏甯﹀洖" )
+ private String businessType; // 瀛楃涓�
+ @ApiModelProperty(value = "浠诲姟鐘舵�� 0: 寰呮墽琛�, 1: 鎵ц涓紙鍦ㄩ�旓級, 2:瀹屾垚锛堝埌璐э級" )
+ private String logisticsStatus ; //瀛楃涓�
+ @ApiModelProperty(value = "鎵胯繍鍟�" )
+ private String carrierName ; //瀛楃涓�
+ @ApiModelProperty(value = "鍙戣揣鐐�" )
+ private String startCity; // 瀛楃涓� 鍙戣揣鐐�
+ @ApiModelProperty(value = "鍗歌揣鐐�" )
+ private String endCity ; //瀛楃涓�
+ @ApiModelProperty(value = "浠诲姟涓嬭揪鏃堕棿" )
+ private String receiveDate ; //瀛楃涓�
+ @ApiModelProperty(value = "鍙告満濮撳悕" )
+ private String driverName; // 瀛楃涓�
+ @ApiModelProperty(value = "鏄惁鎵樼洏鑱旇繍 1锛氭槸 0锛氬惁" )
+ private String isPalletTransport; // 瀛楃涓�
+ @ApiModelProperty(value = "鍝佽鏄庣粏" )
+ private List<TmsDriveTaskProductDetailsResponse> productDetails;//鍝佽鏄庣粏
+ @ApiModelProperty(value = "鎵樼洏鏄庣粏" )
+ private List<TmsDriveTaskPalletDetailsResponse> palletDetails;//鎵樼洏鏄庣粏
+ @ApiModelProperty(value = "浠诲姟娴佺▼" )
+ private List<TmsDriveTaskTransportStopsResponse> transportStops;//浠诲姟娴佺▼
+
+
+
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskListResponse.java
new file mode 100644
index 0000000..ddc471f
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskListResponse.java
@@ -0,0 +1,49 @@
+package com.doumee.core.tms.model.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms鍙告満浠诲姟鍒楀垪琛ㄨ繑鍥炲弬鏁�")
+public class TmsDriveTaskListResponse {
+ @ApiModelProperty(value = "浠诲姟id" )
+ private String id ; //瀛楃涓� 浠诲姟id
+
+ @ApiModelProperty(value = "杩愯緭鍗曞彿" )
+ private String transportCode ; //瀛楃涓� 杩愯緭鍗曞彿
+
+ @ApiModelProperty(value = "杞︾墝鍙�" )
+ private String plateNumber; // 瀛楃涓� 杞︾墝鍙�
+
+ @ApiModelProperty(value = "鍙告満鎵嬫満鍙风爜" )
+ private String driverTel; // 瀛楃涓� 鍙告満鎵嬫満鍙风爜
+
+ @ApiModelProperty(value = "鐗╂枡绫诲瀷 1锛氭垚鍝�, 2:鎵樼洏" )
+ private String materialType; // 瀛楃涓�
+
+ @ApiModelProperty(value = "涓氬姟绫诲瀷1: 鎴愬搧閿�鍞�, 2: 鎴愬搧绉诲簱, 3: 绌烘墭鐩�-宸ヤ笟璋冨墏, 4: 绌烘墭鐩�-鍟嗕笟鍥炴敹, 5: 绌烘墭鐩�-鎵樼洏甯﹀洖" )
+ private String businessType; // 瀛楃涓�
+
+ @ApiModelProperty(value = "浠诲姟鐘舵�� 0: 寰呮墽琛�,1: 鎵ц涓紙鍦ㄩ�旓級, 2:瀹屾垚锛堝埌璐э級" )
+ private String logisticsStatus ; //瀛楃涓�
+ @ApiModelProperty(value = "鎵胯繍鍟�" )
+ private String carrierName; // 瀛楃涓� 鎵胯繍鍟�
+
+ @ApiModelProperty(value = "鍙戣揣鐐�" )
+ private String startCityName; // 瀛楃涓� 鍙戣揣鐐�
+
+ @ApiModelProperty(value = "鍗歌揣鐐�" )
+ private String endCityName; // 瀛楃涓� 鍗歌揣鐐�
+
+ @ApiModelProperty(value = "浠诲姟涓嬭揪鏃堕棿" )
+ private String receiveDate; // 瀛楃涓� 浠诲姟涓嬭揪鏃堕棿
+
+
+
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskPalletDetailsResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskPalletDetailsResponse.java
new file mode 100644
index 0000000..5a79b3a
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskPalletDetailsResponse.java
@@ -0,0 +1,24 @@
+package com.doumee.core.tms.model.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms鍙告満浠诲姟鎵樼洏鏄庣粏杩斿洖鍙傛暟")
+public class TmsDriveTaskPalletDetailsResponse {
+ @ApiModelProperty(value = "瑙勬牸" )
+ private String standardsCode;// 瀛楃涓� 瑙勬牸
+ @ApiModelProperty(value = "鏁伴噺" )
+ private BigDecimal palletNum ;//鏁板瓧 鏁伴噺
+ @ApiModelProperty(value = "鏉愭枡" )
+ private String palletType;// 瀛楃涓� 鏉愭枡
+
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskProductDetailsResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskProductDetailsResponse.java
new file mode 100644
index 0000000..fff6748
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskProductDetailsResponse.java
@@ -0,0 +1,28 @@
+package com.doumee.core.tms.model.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms浜у搧瑙勬牸鏄庣粏杩斿洖鍙傛暟")
+public class TmsDriveTaskProductDetailsResponse {
+ @ApiModelProperty(value = "鍝佽鍚嶇О" )
+ private String productName;// 瀛楃涓� 鍝佽鍚嶇О
+ @ApiModelProperty(value = "鏁伴噺" )
+ private BigDecimal packageSize;// 鏁板瓧 鏁伴噺
+ @ApiModelProperty(value = "鏈�鏃╁埌璐ф棩鏈�" )
+ private String earliestReachDate ;//瀛楃涓� 鏈�鏃╁埌璐ф棩鏈�
+ @ApiModelProperty(value = "鏈�鏅氬埌璐ф棩鏈�" )
+ private String latestReachDate ;//瀛楃涓� 鏈�鏅氬埌璐ф棩鏈�
+ @ApiModelProperty(value = "鍚堝悓鍙�" )
+ private String contractNumber ;//瀛楃涓� 鍚堝悓鍙�
+
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskTransportStopsResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskTransportStopsResponse.java
new file mode 100644
index 0000000..8bccd1c
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskTransportStopsResponse.java
@@ -0,0 +1,26 @@
+package com.doumee.core.tms.model.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms鍙告満浠诲姟浠诲姟娴佺▼杩斿洖鍙傛暟")
+public class TmsDriveTaskTransportStopsResponse {
+ @ApiModelProperty(value = "杩愯緭鍗昳d" )
+ private String tmId;// 瀛楃涓� 杩愯緭鍗昳d
+ @ApiModelProperty(value = "鍋滈潬鐐�" )
+ private String stopNumber;// 鏁板瓧 鍋滈潬鐐�
+ @ApiModelProperty(value = "鍒拌揣鍦�" )
+ private String receiveLocation ;//瀛楃涓� 鍒拌揣鍦�
+ @ApiModelProperty(value = "鍒拌揪鏃堕棿 鏈夊�煎垯宸茬粡鍒拌揪" )
+ private String actualArrivedDate;// 瀛楃涓� 鍒拌揪鏃堕棿 鏈夊�煎垯宸茬粡鍒拌揪
+
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
index 166742b..e0b2b76 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
@@ -1,26 +1,16 @@
package com.doumee.core.wx.wxPlat;
-import cn.emay.sdk.util.json.gson.JsonObject;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
-import com.doumee.core.utils.Http;
import com.doumee.core.utils.HttpsUtil;
-import com.doumee.dao.business.MemberMapper;
-import com.doumee.dao.business.VisitsMapper;
import com.doumee.dao.business.WxNoticeConfigMapper;
import com.doumee.dao.business.model.*;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import lombok.extern.slf4j.Slf4j;
-import me.chanjar.weixin.common.error.WxErrorException;
-import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
-import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage;
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateFormatUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.*;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveMapper.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveMapper.java
index a2847db..ec0f02f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveMapper.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveMapper.java
@@ -2,9 +2,6 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.Approve;
-import com.doumee.dao.business.model.Member;
-
-import java.util.List;
/**
* @author 姹熻箘韫�
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java
deleted file mode 100644
index f0cb9ad..0000000
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.doumee.dao.business;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.doumee.dao.business.model.Member;
-import com.github.yulichang.base.MPJBaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-/**
- * @author 姹熻箘韫�
- * @date 2023/11/30 15:33
- */
-public interface MemberMapper extends MPJBaseMapper<Member> {
-
-}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberJoinMapper.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberJoinMapper.java
index dee96b3..2044c97 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberJoinMapper.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberJoinMapper.java
@@ -2,7 +2,6 @@
import com.doumee.dao.business.model.Member;
import com.github.yulichang.base.mapper.MPJJoinMapper;
-import org.springframework.stereotype.Repository;
/**
* @author T14
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberRoleJoinMapper.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberRoleJoinMapper.java
index 8eb63a7..791fe02 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberRoleJoinMapper.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberRoleJoinMapper.java
@@ -1,6 +1,5 @@
package com.doumee.dao.business.join;
-import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberRole;
import com.github.yulichang.base.mapper.MPJJoinMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java
index 453b324..166e758 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java
@@ -9,7 +9,7 @@
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.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
index c0fa8a7..b2cd685 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
@@ -10,7 +10,7 @@
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.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
index cc60188..1db6fd3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
@@ -9,7 +9,7 @@
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.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerParamService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerParamService.java
index b7e3640..4cd2c5f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerParamService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerParamService.java
@@ -1,7 +1,6 @@
package com.doumee.service.business;
import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.LoginUserModel;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.HiddenDangerParam;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
index 24554db..80568fa 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
@@ -8,15 +8,11 @@
import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.admin.response.StagingDataVO;
import com.doumee.dao.business.dto.RegisterDriverDTO;
-import com.doumee.dao.business.dto.ResetPasswordDTO;
import com.doumee.dao.business.model.Member;
-import com.doumee.dao.business.model.MemberRole;
-import com.doumee.dao.web.reqeust.AccountLoginDTO;
import com.doumee.dao.web.reqeust.CheckVisitedDTO;
import com.doumee.dao.web.reqeust.VisitMemberDTO;
import com.doumee.dao.web.response.MemberVO;
import com.doumee.dao.web.response.WxAuthorizeVO;
-import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/SmsEmailService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/SmsEmailService.java
index 6e42669..f3f7b5a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/SmsEmailService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/SmsEmailService.java
@@ -4,6 +4,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.SmsEmail;
import com.doumee.dao.business.model.vo.ValidPhoneCodeVO;
+import com.doumee.dao.system.model.SystemUser;
import java.util.List;
@@ -101,4 +102,6 @@
void sendWaitingSmsNotice();
void validPhoneCaptcha(ValidPhoneCodeVO param);
+
+ SystemUser validDriverPhone(ValidPhoneCodeVO param);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index 7794166..613d663 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -19,6 +19,7 @@
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.dto.ApproveDTO;
@@ -27,6 +28,7 @@
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.ApproveDataVO;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.dto.NoticesDTO;
import com.doumee.dao.system.join.NoticesJoinMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
index b3b0653..fbf4ad6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
@@ -12,6 +12,7 @@
import com.doumee.dao.business.PlatformReasonMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.doumee.service.business.ApproveTemplService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarDriverServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarDriverServiceImpl.java
index 598ad6c..83055f2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarDriverServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarDriverServiceImpl.java
@@ -8,22 +8,21 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CarDriverMapper;
-import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.doumee.service.business.CarDriverService;
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 lombok.extern.java.Log;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import javax.smartcardio.Card;
import java.util.Date;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
index bbb7b8f..13fc797 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
@@ -10,6 +10,7 @@
import com.doumee.dao.business.join.CarEventJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.CarEventVo;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemDictDataMapper;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.CarEventService;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
index fbeefdc..120c174 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
@@ -10,6 +10,7 @@
import com.doumee.core.wx.wxPlat.WxPlatConstants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.join.ApproveJoinMapper;
@@ -18,6 +19,7 @@
import com.doumee.dao.business.vo.ApproveDataVO;
import com.doumee.dao.business.vo.DateIntervalVO;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.join.NoticesJoinMapper;
import com.doumee.dao.system.model.Notices;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
index fd24758..dfadce2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
@@ -1,7 +1,5 @@
package com.doumee.service.business.impl;
-import cn.hutool.core.util.IdcardUtil;
-import cn.hutool.core.util.PhoneUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -13,18 +11,17 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.ScientificNotationTUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.request.CarsImport;
import com.doumee.dao.admin.request.CarsQuery;
-import com.doumee.dao.admin.request.MemberImport;
import com.doumee.dao.admin.response.CarsDTO;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.join.CarJoinMapper;
-import com.doumee.dao.business.join.ParkBookJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.CarsService;
import com.doumee.service.business.impl.hksync.HkSyncParkServiceImpl;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index e7aa1ca..5f76792 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -24,7 +24,7 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.request.UpdateCompanySortDTO;
import com.doumee.dao.admin.response.CompanyDTO;
-import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.dao.join.CompanyJoinMapper;
import com.doumee.dao.business.model.Company;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
index 539a632..8f2954a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
@@ -14,6 +14,7 @@
import com.doumee.dao.business.join.DeviceEventJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.DeviceEventVo;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemDictDataMapper;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.DeviceEventService;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
index 52ddd89..e503612 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
@@ -13,6 +13,7 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.join.MemberRoleJoinMapper;
import com.doumee.dao.business.model.DeviceRole;
import com.doumee.dao.business.model.Empower;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java
index ebdb331..584e2e5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java
@@ -12,7 +12,6 @@
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.HiddenDanger;
import com.doumee.dao.business.model.HiddenDangerLog;
-import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.HiddenDangerLogService;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
index 29c0893..4384def 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
@@ -8,8 +8,9 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.HiddenDangerParamMapper;
-import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.doumee.service.business.HiddenDangerParamService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
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 d8fce9b..2054ba1 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
@@ -18,9 +18,11 @@
import com.doumee.core.wx.wxPlat.WxPlatConstants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.MultifileMapper;
import com.doumee.dao.system.SystemUserMapper;
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 3bb2b2c..5e62c02 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
@@ -19,6 +19,7 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.join.MemberCardJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Member;
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 24ceeb7..a426f9c 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
@@ -31,11 +31,13 @@
import com.doumee.dao.admin.response.StagingDataVO;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dto.RegisterDriverDTO;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.join.RetentionJoinMapper;
import com.doumee.dao.business.join.UserActionJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.model.SystemUser;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
index ce9947d..399e656 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
@@ -6,12 +6,12 @@
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.CarsMapper;
import com.doumee.dao.business.ParkBookMapper;
import com.doumee.dao.business.ParksMapper;
import com.doumee.dao.business.join.ParkBookJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.doumee.service.business.ParkBookService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -22,7 +22,6 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -30,7 +29,6 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.Objects;
/**
* 杞﹁締棰勭害璁板綍淇℃伅琛⊿ervice瀹炵幇
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
index fe68667..f3398ca 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
@@ -13,12 +13,14 @@
import com.doumee.core.wx.wxPlat.WxPlatConstants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.join.ApproveJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.ApproveDataVO;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.join.NoticesJoinMapper;
import com.doumee.dao.system.model.Notices;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
index a5e76bf..3549483 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -20,6 +20,7 @@
import com.doumee.core.wx.wxPlat.WxPlatConstants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.join.PlatformJobJoinMapper;
@@ -35,7 +36,6 @@
import com.doumee.dao.web.response.DriverHomeVO;
import com.doumee.dao.web.response.LineUpVO;
import com.doumee.dao.web.response.PlatformWorkVO;
-import com.doumee.dao.web.response.platformReport.WholeProvinceBoardVO;
import com.doumee.service.business.PlatformJobService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -58,7 +58,6 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.net.URLEncoder;
import java.util.*;
import java.util.Date;
import java.util.concurrent.TimeUnit;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWaterGasServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWaterGasServiceImpl.java
index c6c6e11..a0756e8 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWaterGasServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWaterGasServiceImpl.java
@@ -4,19 +4,13 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.LoginUserModel;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
-import com.doumee.core.utils.ScientificNotationTUtil;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.admin.request.MemberImport;
import com.doumee.dao.admin.request.PlatformGasImport;
import com.doumee.dao.business.PlatformWaterGasMapper;
-import com.doumee.dao.business.model.Company;
-import com.doumee.dao.business.model.Member;
-import com.doumee.dao.business.model.PlatformReason;
import com.doumee.dao.business.model.PlatformWaterGas;
import com.doumee.dao.openapi.request.GasByMonthRequest;
import com.doumee.dao.openapi.request.WaterByMonthRequest;
@@ -28,15 +22,12 @@
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.apache.commons.lang3.StringUtils;
-import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.multipart.MultipartFile;
import java.math.BigDecimal;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
index 7c16f43..ad60730 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
@@ -7,7 +7,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.ProblemLogMapper;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.join.ProblemLogJoinMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
index f41237c..b7e018f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
@@ -1,6 +1,5 @@
package com.doumee.service.business.impl;
-import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.doumee.core.model.LoginUserInfo;
@@ -11,7 +10,6 @@
import com.doumee.dao.admin.request.OptionsObject;
import com.doumee.dao.admin.response.ProblemDTO;
import com.doumee.dao.business.ProblemsMapper;
-import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Problems;
import com.doumee.dao.web.response.ProblemsVO;
import com.doumee.service.business.ProblemsService;
@@ -22,7 +20,6 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.apache.shiro.SecurityUtils;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
index 914e063..502ea87 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
@@ -13,15 +13,19 @@
import com.doumee.core.utils.*;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.vo.ValidPhoneCodeVO;
+import com.doumee.dao.business.model.Member;
+import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.third.EmayService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -42,6 +46,10 @@
@Autowired
private SmsEmailMapper smsEmailMapper;
+ @Autowired
+ private SystemUserMapper systemUserMapper;
+ @Autowired
+ private MemberMapper memberMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@Autowired
@@ -84,6 +92,45 @@
public void validPhoneCaptcha(ValidPhoneCodeVO param){
isCaptcheValide(smsEmailMapper,param.getPhone(),param.getCode());
}
+ @Override
+ public SystemUser validDriverPhone(ValidPhoneCodeVO param){
+ isCaptcheValide(smsEmailMapper,param.getPhone(),param.getCode());
+
+ SystemUser systemUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted,Constants.ZERO)
+ .and(i->i.eq(SystemUser::getMobile,param.getPhone()).or().eq(SystemUser::getUsername,param.getPhone()))
+ .last("limit 1"));
+ if(systemUser !=null){
+ return systemUser;
+ }
+ String salt = RandomStringUtils.randomAlphabetic(6);
+ Member member = new Member();
+ member.setCreateDate(new Date());
+ member.setIsdeleted(Constants.ZERO);
+ member.setType(Constants.memberType.driver);
+ member.setPhone(param.getPhone());
+ member.setStatus(Constants.ZERO);
+ member.setOpenid(param.getOpenId());
+ member.setPassward(Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.INITIAL_PASSWORD).getCode(), salt));
+ memberMapper.insert(member);
+
+ systemUser = new SystemUser();
+ systemUser.setCreateTime(new Date());
+ systemUser.setDeleted(Boolean.FALSE);
+ systemUser.setUsername(param.getPhone());
+ systemUser.setRealname(null);
+ systemUser.setMemberId(member.getId());
+ systemUser.setMobile(param.getPhone());
+ systemUser.setSalt(salt);
+ systemUser.setPassword(member.getPassward());
+ systemUser.setStatus(Constants.ZERO);
+ systemUser.setType(Constants.memberType.driver);
+ systemUser.setSource(Constants.TWO);
+ systemUser.setOpenid(param.getOpenId());
+ systemUserMapper.insert(systemUser);
+ return systemUser;
+ }
+
@Override
public Integer create(SmsEmail smsEmail) {
smsEmailMapper.insert(smsEmail);
@@ -228,7 +275,10 @@
queryWrapper.lambda().eq(SmsEmail::getContent, pageWrap.getModel().getContent());
}
if (pageWrap.getModel().getPhone() != null) {
- queryWrapper.lambda().eq(SmsEmail::getPhone, pageWrap.getModel().getPhone());
+ queryWrapper.lambda().and(wr ->{
+ wr.like(SmsEmail::getPhone, pageWrap.getModel().getPhone())
+ .or().like(SmsEmail::getEmail, pageWrap.getModel().getPhone());
+ });
}
if (pageWrap.getModel().getEmail() != null) {
queryWrapper.lambda().eq(SmsEmail::getEmail, pageWrap.getModel().getEmail());
@@ -245,13 +295,11 @@
if (pageWrap.getModel().getObjType() != null) {
queryWrapper.lambda().eq(SmsEmail::getObjType, pageWrap.getModel().getObjType());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
+ queryWrapper.lambda().ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
+ SmsEmail::getCreateDate, pageWrap.getModel().getStartTime())
+ .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
+ SmsEmail::getCreateDate, pageWrap.getModel().getEndTime())
+ .orderByDesc(SmsEmail::getCreateDate);
return PageData.from(smsEmailMapper.selectPage(page, queryWrapper));
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
index ee00da0..f6f561e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
@@ -13,7 +13,6 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
-import com.doumee.dao.admin.request.MemberImport;
import com.doumee.dao.admin.request.TrainTimeImport;
import com.doumee.dao.business.EmpowerMapper;
import com.doumee.dao.business.MemberRoleMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java
index 0f6b7f3..e1fc2a6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java
@@ -16,7 +16,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import org.apache.catalina.User;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitParkServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitParkServiceImpl.java
index 4b60a4b..a1a6029 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitParkServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitParkServiceImpl.java
@@ -2,10 +2,10 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.core.utils.Utils;
import com.doumee.dao.business.VisitParkMapper;
import com.doumee.dao.business.join.VisitParkJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.doumee.service.business.VisitParkService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index 761b297..bb87627 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -13,23 +13,21 @@
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.BaseResponse;
-import com.doumee.core.haikang.model.param.request.FacePictureCheckRequest;
import com.doumee.core.haikang.model.param.request.VisitAppointmentOutRequest;
import com.doumee.core.haikang.model.param.request.VisitAppointmentRequest;
-import com.doumee.core.haikang.model.param.respose.FacePictureCheckResponse;
import com.doumee.core.haikang.model.param.respose.VisitAppointmentResponse;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.*;
-import com.doumee.core.wx.WXConstant;
import com.doumee.core.wx.wxPlat.WxPlatConstants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.admin.response.InterestedListVO;
import com.doumee.dao.admin.response.PCWorkPlatformDataVO;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.dto.ResetPasswordDTO;
@@ -37,6 +35,7 @@
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.dto.ResetSystemUserPwdDTO;
import com.doumee.dao.system.join.NoticesJoinMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index 4f1f3ba..091422e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -27,10 +27,12 @@
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.join.CarEventJoinMapper;
import com.doumee.dao.business.join.DeviceEventJoinMapper;
import com.doumee.dao.business.join.VisitEventJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.doumee.service.business.ext.ERPSyncService;
import com.doumee.service.business.InterfaceLogService;
import com.doumee.service.business.impl.MemberServiceImpl;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
index 2bbdd90..f20bf30 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
@@ -16,9 +16,10 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.DeviceMapper;
import com.doumee.dao.business.MemberCardMapper;
-import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.join.EmpowerJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncImgServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncImgServiceImpl.java
index 887c3f7..23f1ad4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncImgServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncImgServiceImpl.java
@@ -8,9 +8,10 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.FtpUtil;
-import com.doumee.core.utils.HttpsUtil;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java
index c60d1f6..237179c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
@@ -13,24 +12,11 @@
import com.doumee.core.haikang.model.param.respose.*;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
-import com.doumee.core.utils.ImageBase64Util;
-import com.doumee.core.wx.wxPlat.WxPlatNotice;
-import com.doumee.dao.business.DeviceRoleMapper;
-import com.doumee.dao.business.MemberMapper;
-import com.doumee.dao.business.RetentionMapper;
-import com.doumee.dao.business.join.VisitsJoinMapper;
-import com.doumee.dao.business.model.DeviceRole;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.model.Member;
-import com.doumee.dao.business.model.Retention;
-import com.doumee.dao.business.model.Visits;
-import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.join.NoticesJoinMapper;
import com.doumee.dao.system.model.Notices;
-import com.doumee.dao.system.model.SystemUser;
-import com.doumee.service.system.NoticesService;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
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 a4f79cd..a3da3de 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
@@ -19,28 +19,21 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.web.reqeust.SavePlatformWarnEventDTO;
-import com.doumee.service.business.PlatformJobService;
import com.doumee.service.business.impl.PlatformWarnEventServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.util.EntityUtils;
-import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
index d596c52..ef1becb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
@@ -17,8 +17,10 @@
import com.doumee.core.utils.ImageBase64Util;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.ext.ERPSyncService;
@@ -28,7 +30,6 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
-import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java
index 5e862c1..3f5d870 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java
@@ -16,9 +16,10 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
-import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.doumee.service.business.impl.hksync.HkSyncBaseServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromSelfServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromSelfServiceImpl.java
index 573762b..2cdc824 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromSelfServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromSelfServiceImpl.java
@@ -17,7 +17,7 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
-import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Member;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java
index 7d6fefc..02a6ef0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java
@@ -19,6 +19,7 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.model.Cars;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.impl.hksync.HkSyncBaseServiceImpl;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVisitFromHKServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVisitFromHKServiceImpl.java
index 188e7f4..5f009bb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVisitFromHKServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVisitFromHKServiceImpl.java
@@ -16,7 +16,7 @@
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.VisitsMapper;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.model.Member;
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 1313475..23fe63a 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
@@ -1,7 +1,5 @@
package com.doumee.service.business.impl.thrid;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
@@ -16,7 +14,6 @@
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.tms.model.TMSContants;
import com.doumee.core.tms.model.request.TmsFacrotyCodeListRequest;
import com.doumee.core.tms.model.request.TmsOrderNoFinishListRequest;
import com.doumee.core.tms.model.request.TmsOutQtyAndVehicleQtyRequest;
@@ -32,6 +29,7 @@
import com.doumee.dao.business.join.PlatformWarnEventJoinMapper;
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.web.reqeust.CarsJobAndContractDTO;
import com.doumee.dao.web.response.platformReport.*;
import com.doumee.service.business.impl.PlatformJobServiceImpl;
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 405f54a..a02e691 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
@@ -3,6 +3,8 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.tms.model.TMSContants;
import com.doumee.core.tms.model.request.*;
import com.doumee.core.tms.model.response.*;
@@ -10,6 +12,7 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.HttpsUtil;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.third.TmsService;
@@ -208,6 +211,87 @@
}
/**
+ * 鏌ヨ鍙告満鎵�鏈変唬鍔炰换鍔�
+ * @param param 鍙傛暟
+ * @return TmsBaseResponse
+ */
+ @Override
+ public TmsBasePageResponse<TmsDriveTaskListResponse> getDriverTaskList(TmsDriverTaskListRequest param){
+ String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+ +TMSContants.InterfacePath.getDriverTaskList[0];
+
+ url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.getDriverTaskList[0];
+ TmsBaseResponse<TmsBasePageResponse<TmsDriveTaskListResponse> > response = sendHttpRequest(url,TMSContants.InterfacePath.getDriverTaskList[1],JSONObject.toJSONString(param)
+ ,new TypeReference< TmsBaseResponse<TmsBasePageResponse<TmsDriveTaskListResponse>>>(){});
+ if(response ==null || response.getData() == null){
+ return new TmsBasePageResponse<>();
+ }
+ return response.getData();
+ }
+ /**
+ * 鍙告満寰呭姙浠诲姟璇︽儏
+ * @param param 鍙傛暟
+ * @return TmsBaseResponse
+ */
+ @Override
+ public TmsDriveTaskInfoResponse getDriverTaskDetail(TmsDriverTaskInfoRequest param){
+ if(StringUtils.isBlank(param.getId()) ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+ +TMSContants.InterfacePath.getDriverTaskDetail[0];
+
+ url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.getDriverTaskDetail[0];
+ TmsBaseResponse<TmsDriveTaskInfoResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.getDriverTaskDetail[1],JSONObject.toJSONString(param)
+ ,new TypeReference< TmsBaseResponse<TmsDriveTaskInfoResponse>>(){});
+ if(response ==null || response.getData() == null){
+ return new TmsDriveTaskInfoResponse();
+ }
+ return response.getData();
+ }
+ /**
+ * 鍙告満鍚繍
+ * @param param 鍙傛暟
+ * @return TmsBaseResponse
+ */
+ @Override
+ public boolean driverStart(TmsDriverStartAndArrivalRequest param){
+ if(StringUtils.isBlank(param.getId()) || StringUtils.isBlank(param.getOptType())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+ +TMSContants.InterfacePath.driverStart[0];
+ url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.driverStart[0];
+ TmsBaseResponse<TmsDriveTaskInfoResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.driverStart[1],JSONObject.toJSONString(param)
+ ,new TypeReference< TmsBaseResponse<TmsDriveTaskInfoResponse>>(){});
+ if(response ==null || response.getData() == null || !StringUtils.equals(response.getCode(),"0")){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝浠诲姟鍒拌揣鎻愪氦澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+ }
+ return true;
+ }
+ /**
+ * 鍙告満鍒拌揣
+ * @param param 鍙傛暟
+ * @return TmsBaseResponse
+ */
+ @Override
+ public boolean driverArrival(TmsDriverStartAndArrivalRequest param){
+ if(StringUtils.isBlank(param.getId())
+ || StringUtils.isBlank(param.getOptType())
+ || param.getStopNumber() == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+ +TMSContants.InterfacePath.driverArrival[0];
+ url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.driverArrival[0];
+ TmsBaseResponse<TmsDriveTaskInfoResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.driverArrival[1],JSONObject.toJSONString(param)
+ ,new TypeReference< TmsBaseResponse<TmsDriveTaskInfoResponse>>(){});
+ if(response ==null || response.getData() == null ||!StringUtils.equals(response.getCode(),"0")){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝浠诲姟鍒拌揣鎻愪氦澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+ }
+ return true;
+ }
+ /**
* 鍑哄簱鑳藉姏缁熻
* 鏌ヨ鏌愪釜鍘�/鍏ㄩ儴鍘傜殑浠婃棩璁″垝閲忋�佷粖鏃ュ嚭搴撻噺銆佷粖鏃ユ湭鍑哄簱閲忔暟鎹��
* @param param 鍙傛暟
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
index 24a8dfd..6ad06ee 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
@@ -11,14 +11,15 @@
import com.doumee.core.wms.model.request.*;
import com.doumee.core.wms.model.response.WmsBaseDataResponse;
import com.doumee.core.wms.model.response.WmsBaseResponse;
-import com.doumee.core.wms.model.response.WmsBaseDataResponse;
import com.doumee.core.wx.wxPlat.WxPlatConstants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.impl.SmsEmailServiceImpl;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java
index 9266774..ed8210f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java
@@ -1,7 +1,12 @@
package com.doumee.service.business.third;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.doumee.core.tms.model.TMSContants;
import com.doumee.core.tms.model.request.*;
import com.doumee.core.tms.model.response.*;
+import com.doumee.core.utils.Constants;
+import org.apache.commons.lang3.StringUtils;
import java.util.List;
@@ -70,5 +75,28 @@
*/
List<TmsOutQtyAndVehicleQtyResponse> getOutQtyAndVehicleQty(TmsOutQtyAndVehicleQtyRequest param );
-
+ /**
+ * 鏌ヨ鍙告満鎵�鏈変唬鍔炰换鍔�
+ * @param param 鍙傛暟
+ * @return TmsBaseResponse
+ */
+ TmsBasePageResponse<TmsDriveTaskListResponse> getDriverTaskList(TmsDriverTaskListRequest param);
+ /**
+ * 鍙告満寰呭姙浠诲姟璇︽儏
+ * @param param 鍙傛暟
+ * @return TmsBaseResponse
+ */
+ TmsDriveTaskInfoResponse getDriverTaskDetail(TmsDriverTaskInfoRequest param);
+ /**
+ * 鍙告満鍚繍
+ * @param param 鍙傛暟
+ * @return TmsBaseResponse
+ */
+ boolean driverStart(TmsDriverStartAndArrivalRequest param);
+ /**
+ * 鍙告満鍒拌揣
+ * @param param 鍙傛暟
+ * @return TmsBaseResponse
+ */
+ boolean driverArrival(TmsDriverStartAndArrivalRequest param);
}
--
Gitblit v1.9.3