From b36a08875084bca2ab0a23595918a09d7a4aef7b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 31 十二月 2024 09:21:53 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/vehicle/driver.vue | 2 +-
server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java | 2 +-
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java | 2 +-
server/system_gateway/src/main/resources/bootstrap.yml | 2 +-
server/system_service/src/main/java/com/doumee/config/mybatis/MyBatisInterceptor.java | 14 +++++++-------
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/admin/src/views/vehicle/driver.vue b/admin/src/views/vehicle/driver.vue
index 811908f..6f5ccd0 100644
--- a/admin/src/views/vehicle/driver.vue
+++ b/admin/src/views/vehicle/driver.vue
@@ -77,4 +77,4 @@
}
</script>
-<style lang="scss" scoped></style>
\ No newline at end of file
+<style lang="scss" scoped></style>
diff --git a/server/system_gateway/src/main/resources/bootstrap.yml b/server/system_gateway/src/main/resources/bootstrap.yml
index 7a7cd02..099da4a 100644
--- a/server/system_gateway/src/main/resources/bootstrap.yml
+++ b/server/system_gateway/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: self
+ active: pro
application:
name: system_gateway
# 瀹夊叏閰嶇疆
diff --git a/server/system_service/src/main/java/com/doumee/config/mybatis/MyBatisInterceptor.java b/server/system_service/src/main/java/com/doumee/config/mybatis/MyBatisInterceptor.java
index 1fd7fc5..111543f 100644
--- a/server/system_service/src/main/java/com/doumee/config/mybatis/MyBatisInterceptor.java
+++ b/server/system_service/src/main/java/com/doumee/config/mybatis/MyBatisInterceptor.java
@@ -50,13 +50,13 @@
if (target == null)
return invocation.proceed();
// 鍒涘缓璇彞
- if (SqlCommandType.INSERT == sqlCommandType) {
- this.handleOperaStatement(target, CREATE_TIME, CREATE_USER);
- }
- // 鏇存柊璇彞
- else if (SqlCommandType.UPDATE == sqlCommandType) {
- this.handleOperaStatement(target, UPDATE_TIME, UPDATE_USER);
- }
+// if (SqlCommandType.INSERT == sqlCommandType) {
+// this.handleOperaStatement(target, CREATE_TIME, CREATE_USER);
+// }
+// // 鏇存柊璇彞
+// else if (SqlCommandType.UPDATE == sqlCommandType) {
+// this.handleOperaStatement(target, UPDATE_TIME, UPDATE_USER);
+// }
return invocation.proceed();
}
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 6848ff9..f4928cc 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
@@ -451,6 +451,7 @@
systemUser = new SystemUser();
systemUser.setCreateTime(new Date());
+ systemUser.setCreateUser(1);
systemUser.setDeleted(Boolean.FALSE);
systemUser.setUsername(param.getPhone());
systemUser.setRealname(null);
@@ -468,7 +469,6 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇蜂娇鐢ㄦ纭殑鍙告満璐﹀彿鐧婚檰锛�");
}
}
-
dealOpenIdBiz(systemUser,param.getOpenid());
Company company = new Company();
if(Objects.nonNull(systemUser.getCompanyId())){
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 9595f70..649ab9c 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
@@ -99,7 +99,7 @@
public ApiResponse<TmsDriveTaskInfoResponse> getDriverTaskDetail(@RequestBody TmsDriverTaskInfoRequest request ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(tmsService.getDriverTaskDetail(request));
}
- @ApiOperation("銆怲MS銆戝徃鏈轰换鍔″惎鍔�")
+ @ApiOperation("銆怲MS銆戝徃鏈轰换鍔″惎杩�")
@PostMapping("/driverStart")
public ApiResponse driverStart(@RequestBody TmsDriverStartAndArrivalRequest request ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
tmsService.driverStart(request);
--
Gitblit v1.9.3