From cc43c9e4f1ff6dad52ba64095b7cb40841816809 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 31 十二月 2024 18:10:36 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/system_service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java | 2
server/system_service/src/main/java/com/doumee/api/system/SystemUserController.java | 1
server/system_service/src/main/java/com/doumee/dao/system/dto/NoticesDTO.java | 2
admin/src/api/system/user.js | 3 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java | 4 +-
server/system_gateway/src/main/resources/bootstrap.yml | 2
server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java | 2
server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java | 8 ++++
admin/src/views/vehicle/driver.vue | 12 +++--
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWaterGasCloudController.java | 10 ++++-
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformWaterGasForExcelVO.java | 4 +-
admin/src/views/system/user.vue | 1
server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java | 15 ++++++-
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java | 2
server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java | 1
server/system_service/src/main/resources/mappers/SystemUserMapper.xml | 6 ---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 1
server/system_service/src/main/java/com/doumee/dao/system/dto/ResetSystemUserPwdDTO.java | 4 ++
server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java | 15 +++++++
server/system_service/src/main/java/com/doumee/config/mybatis/MyBatisInterceptor.java | 14 +++---
server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java | 1
21 files changed, 77 insertions(+), 33 deletions(-)
diff --git a/admin/src/api/system/user.js b/admin/src/api/system/user.js
index 13b4a1f..95f6c87 100644
--- a/admin/src/api/system/user.js
+++ b/admin/src/api/system/user.js
@@ -4,6 +4,9 @@
export function fetchList (data) {
return request.post('/visitsAdmin/cloudService/system/user/page', data)
}
+export function pageDriverList (data) {
+ return request.post('/visitsAdmin/cloudService/system/user/pageDriver', data)
+}
// 鏂板缓
export function create (data) {
diff --git a/admin/src/views/system/user.vue b/admin/src/views/system/user.vue
index 73d74f4..af66120 100644
--- a/admin/src/views/system/user.vue
+++ b/admin/src/views/system/user.vue
@@ -65,6 +65,7 @@
</template>
</el-table-column>
<el-table-column prop="mobile" label="鎵嬫満鍙风爜" min-width="100px"></el-table-column>
+ <el-table-column prop="openid" label="寰俊openid" min-width="100px"></el-table-column>
<!-- <el-table-column prop="email" label="閭" min-width="180px"></el-table-column>-->
<!-- <el-table-column prop="birthday" label="鐢熸棩" sortable="custom" sort-by="BIRTHDAY" min-width="100px"></el-table-column>-->
<el-table-column prop="roles" label="瑙掕壊" min-width="160px" class-name="table-column-strings">
diff --git a/admin/src/views/vehicle/driver.vue b/admin/src/views/vehicle/driver.vue
index 811908f..cf19c1e 100644
--- a/admin/src/views/vehicle/driver.vue
+++ b/admin/src/views/vehicle/driver.vue
@@ -3,8 +3,10 @@
<QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear">
</QueryForm>
<el-table v-loading="loading" :data="list" stripe row-key="id" class="mb20" default-expand-all>
+ <el-table-column prop="username" label="鐧诲綍璐﹀彿" min-width="100"></el-table-column>
<el-table-column prop="realname" label="濮撳悕" min-width="100"></el-table-column>
- <el-table-column prop="mobile" label="鎵嬫満鍙�" min-width="100"></el-table-column>
+ <el-table-column prop="openid" label="寰俊openid" min-width="100px"></el-table-column>
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" sortable="custom" sort-by="CREATE_TIME" min-width="140px"></el-table-column>
</el-table>
<pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
</div>
@@ -13,7 +15,7 @@
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
-import { fetchList } from '@/api/system/user.js'
+import { pageDriverList } from '@/api/system/user.js'
export default {
components: {
QueryForm,
@@ -53,10 +55,10 @@
getList(page) {
const { filters, pagination } = this
pagination.page = page || pagination.page
- fetchList({
+ pageDriverList({
model: {
...filters,
- memberType: 0
+ type: 0
},
...pagination
}).then(res => {
@@ -77,4 +79,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/java/com/doumee/api/gateway/JwtAuthController.java b/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java
index a2648dc..be5add3 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,7 +151,6 @@
return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
}
}
- @PreventRepeat(limit = 10, lockTime = 10000)
@ApiOperation("鍙告満楠岃瘉鐮佺櫥褰�")
@PostMapping("/loginDriverWithCode")
@LoginNoRequired
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/api/cloud/SystemUserCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java
index 882d368..cb1b9bb 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java
@@ -58,6 +58,7 @@
@CloudRequiredPermission("system:user:resetPwd")
public ApiResponse resetPwd (@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated @RequestBody ResetSystemUserPwdDTO dto) {
dto.setOperaUserId(this.getLoginUser(token).getId());
+ dto.setNeedChangePwd(Constants.ZERO);
systemUserBiz.resetPwd(dto);
return ApiResponse.success(null);
}
@@ -111,6 +112,13 @@
return ApiResponse.success(systemUserService.findPage(pageWrap));
}
+ @ApiOperation("鍒嗛〉鏌ヨ鍙告満鍒楄〃")
+ @PostMapping("/pageDriver")
+ @CloudRequiredPermission("system:user:query")
+ public ApiResponse<PageData<SystemUser>> findDriverPage (@RequestBody PageWrap<SystemUser> pageWrap) {
+ return ApiResponse.success(systemUserService.findDriverPage(pageWrap));
+ }
+
@ApiOperation("鏌ヨ鎵�鏈夌郴缁熺敤鎴�")
@PostMapping("/findAllList")
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemUserController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemUserController.java
index e7db500..2c3bf75 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemUserController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemUserController.java
@@ -59,6 +59,7 @@
@RequiresPermissions("system:user:resetPwd")
public ApiResponse resetPwd (@Validated @RequestBody ResetSystemUserPwdDTO dto, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
dto.setOperaUserId(this.getLoginUser(token).getId());
+ dto.setNeedChangePwd(Constants.ZERO);
systemUserBiz.resetPwd(dto);
return ApiResponse.success(null);
}
diff --git a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
index 40e2ebc..ea90ca1 100644
--- a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
+++ b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
@@ -140,7 +140,7 @@
updateUserDto.setId(dto.getId());
updateUserDto.setUpdateUser(dto.getOperaUserId());
updateUserDto.setPassword(Utils.Secure.encryptPassword(dto.getPassword(), systemUser.getSalt()));
- updateUserDto.setNeedChangePwd(Constants.ZERO);
+ updateUserDto.setNeedChangePwd(dto.getNeedChangePwd());
systemUserService.updateById(updateUserDto);
}
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/dao/system/dto/NoticesDTO.java b/server/system_service/src/main/java/com/doumee/dao/system/dto/NoticesDTO.java
index abd294b..f358497 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/dto/NoticesDTO.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/dto/NoticesDTO.java
@@ -36,7 +36,7 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endDate;
- @ApiModelProperty(value = "0璁垮瀹℃壒 1璁垮鎶ュ 2鐢ㄨ溅瀹℃壒 3闅愭偅澶勭悊 4鐗╂祦杞﹀鎵� 5绯荤粺绯荤粺")
+ @ApiModelProperty(value = "0璁垮瀹℃壒 1璁垮鎶ュ 2鐢ㄨ溅瀹℃壒 3闅愭偅澶勭悊 4鐗╂祦杞﹀鎵� 5绯荤粺绯荤粺 7瀹夐槻骞冲彴寰呭姙")
private Integer type;
@ApiModelProperty(value = "鍙湅鏈锛�1=鏄紱0=鍚�")
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/dto/ResetSystemUserPwdDTO.java b/server/system_service/src/main/java/com/doumee/dao/system/dto/ResetSystemUserPwdDTO.java
index 8b6f43c..5b04f6c 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/dto/ResetSystemUserPwdDTO.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/dto/ResetSystemUserPwdDTO.java
@@ -26,4 +26,8 @@
@ApiModelProperty(value = "鎿嶄綔浜�", hidden = true)
private Integer operaUserId;
+
+ @ApiModelProperty(value = "鏄惁闇�瑕佸己鍒舵洿鏂板瘑鐮� 0鏄� 1鍚�", hidden = true)
+ private Integer needChangePwd;
+
}
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 b59b242..3440f15 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
@@ -80,6 +80,7 @@
* @date 2023/03/21 14:49
*/
PageData<SystemUserListVO> findPage(PageWrap<QuerySystemUserDTO> pageWrap);
+ PageData<SystemUser> findDriverPage(PageWrap<SystemUser> pageWrap);
List<SystemUser> findAllList(SystemUser pageWrap);
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java
index 0bc7693..c71f2ca 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java
@@ -178,7 +178,7 @@
queryWrapper.eq(Objects.nonNull(noticesDTO.getType()),Notices::getType,noticesDTO.getType());
// queryWrapper.eq(Objects.nonNull(noticesDTO.getMemberId()),Notices::getUserId,noticesDTO.getMemberId());
queryWrapper.like(StringUtils.isNotBlank(noticesDTO.getTitle()),Notices::getTitle,noticesDTO.getTitle());
- queryWrapper.orderByDesc(Notices::getId);
+ queryWrapper.orderByDesc(Notices::getCreateDate);
PageData<Notices> pageData = PageData.from(noticesMapper.selectJoinPage(page,Notices.class, queryWrapper));
if(noticesDTO.getQueryType().equals(Constants.ZERO)){
for (Notices notices:pageData.getRecords()) {
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 00d21b3..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
@@ -35,6 +35,7 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -58,8 +59,10 @@
private MemberMapper memberMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Lazy
@Autowired
private SystemUserMapper systemUserMapper;
+ @Lazy
@Autowired
private SmsEmailMapper smsEmailMapper;
@@ -74,9 +77,10 @@
@Lazy
@Autowired
private SystemPermissionService systemPermissionService;
-
+ @Lazy
@Autowired
private CaptchaService captchaService;
+ @Lazy
@Autowired
private SystemLoginLogService systemLoginLogService;
@@ -411,6 +415,7 @@
}
@Override
+ @Transactional
public LoginUserInfo loginDriverWithCode(LoginPhoneDTO param, ServerHttpRequest request) {
isCaptcheValide(param.getPhone(),param.getCode());//妫�鏌ラ獙璇佺爜
@@ -446,6 +451,7 @@
systemUser = new SystemUser();
systemUser.setCreateTime(new Date());
+ systemUser.setCreateUser(1);
systemUser.setDeleted(Boolean.FALSE);
systemUser.setUsername(param.getPhone());
systemUser.setRealname(null);
@@ -458,14 +464,17 @@
systemUser.setSource(Constants.TWO);
systemUser.setOpenid(param.getOpenid());
systemUserMapper.insert(systemUser);
+ }else{
+ if(!Constants.equalsInteger(systemUser.getType(),Constants.memberType.driver)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇蜂娇鐢ㄦ纭殑鍙告満璐﹀彿鐧婚檰锛�");
+ }
}
-
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);
+ LoginUserInfo userInfo = LoginUserInfo.from(systemUser, null, null,company,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 c6f6dba..fbdccaa 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
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
@@ -163,6 +165,19 @@
}
return PageData.from(new PageInfo<>(userList));
}
+ @Override
+ public PageData<SystemUser> findDriverPage(PageWrap<SystemUser> pageWrap) {
+ IPage<SystemUser> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ QueryWrapper<SystemUser> queryWrapper = new QueryWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ queryWrapper.lambda()
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getRealname()),SystemUser::getRealname,pageWrap.getModel().getRealname())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getMobile()),SystemUser::getMobile,pageWrap.getModel().getMobile())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getUsername()),SystemUser::getUsername,pageWrap.getModel().getUsername())
+ .eq( pageWrap.getModel().getType()!=null,SystemUser::getType,pageWrap.getModel().getType())
+ .eq (SystemUser::getDeleted,Constants.ZERO);
+ return PageData.from(systemUserMapper.selectPage(page, queryWrapper));
+ }
@Override
public long count(SystemUser systemUser) {
diff --git a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
index 262a4b3..1907ebc 100644
--- a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
@@ -69,14 +69,8 @@
<if test="dto.memberType != null ">
AND usr.`type` = #{dto.memberType}
</if>
- <if test="dto.memberType != null ">
- AND usr.`type` = #{dto.memberType}
- </if>
<if test="dto.workStatus != null ">
AND m.WORK_STATUS = #{dto.workStatus}
- </if>
- <if test="dto.memberType != null ">
- AND m.`type` = #{dto.memberType}
</if>
<if test="dto.companyId != null ">
AND usr.COMPANY_ID = #{dto.companyId}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWaterGasCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWaterGasCloudController.java
index 09dd59b..4fd1a75 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWaterGasCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWaterGasCloudController.java
@@ -87,14 +87,20 @@
public void exportExcel (@RequestBody PageWrap<PlatformWaterGas> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
List<PlatformWaterGas> waterGasPageData = platformWaterGasService.findPage(pageWrap).getRecords();
if(Objects.nonNull(pageWrap.getModel())
- && Objects.nonNull(pageWrap.getModel().getType()) && !Constants.equalsInteger(pageWrap.getModel().getType(),Constants.TWO)){
+ && Objects.nonNull(pageWrap.getModel().getType()) && !Constants.equalsInteger(pageWrap.getModel().getType(),Constants.TWO)){
List<PlatformWaterGasForExcelVO> pageData = new ArrayList<>();
for (PlatformWaterGas platformWaterGas:waterGasPageData) {
PlatformWaterGasForExcelVO platformWaterGasForExcelVO = new PlatformWaterGasForExcelVO();
BeanUtils.copyProperties(platformWaterGas,platformWaterGasForExcelVO);
pageData.add(platformWaterGasForExcelVO);
}
- ExcelExporter.build(PlatformWaterGasForExcelVO.class).export(pageData, Constants.equalsInteger(pageWrap.getModel().getType(),Constants.ZERO)?"鏈堝彴_鐢ㄦ按淇℃伅璁板綍琛�":"鏈堝彴_鐢ㄦ皵淇℃伅璁板綍琛�", response);
+ String title = "鏈堝彴_寰幆鐑熺璁板綍琛�";
+ if(Constants.equalsInteger(pageWrap.getModel().getType(),Constants.ZERO)){
+ title = "鏈堝彴_鐢ㄦ按淇℃伅璁板綍琛�";
+ }else if(Constants.equalsInteger(pageWrap.getModel().getType(),Constants.ONE)){
+ title = "鏈堝彴_鐢ㄦ皵淇℃伅璁板綍琛�";
+ }
+ ExcelExporter.build(PlatformWaterGasForExcelVO.class).export(pageData, title, response);
}else{
ExcelExporter.build(PlatformWaterGas.class).export(waterGasPageData, "鏈堝彴_娌硅�椾俊鎭褰曡〃", response);
}
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);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformWaterGasForExcelVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformWaterGasForExcelVO.java
index 4f9b1e8..5011515 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformWaterGasForExcelVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformWaterGasForExcelVO.java
@@ -29,8 +29,8 @@
@ExcelColumn(name="浣跨敤鏈堜唤",index = 2,dateFormat="yyyy-MM",width = 10)
private Date timeInfo;
- @ApiModelProperty(value = "绫诲瀷 0鐢ㄦ按 1鐢ㄦ皵 2鐢ㄦ补", example = "1")
- @ExcelColumn(name="绫诲瀷",valueMapping = "0=鐢ㄦ按;1=鐢ㄦ皵;2=鐢ㄦ补;",index = 0,width = 10)
+ @ApiModelProperty(value = "绫诲瀷 0鐢ㄦ按 1鐢ㄦ皵 2鐢ㄦ补 3鐑熺", example = "1")
+ @ExcelColumn(name="绫诲瀷",valueMapping = "0=鐢ㄦ按;1=鐢ㄦ皵;2=鐢ㄦ补;3=鐑熺;",index = 0,width = 10)
private Integer type;
@ApiModelProperty(value = "鏁伴噺 (鐢ㄧ數椤匡紝鐢ㄧ數搴︼紱 娌硅�桳锛�", example = "1")
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 bb87627..bd4c13c 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
@@ -1583,6 +1583,7 @@
dto.setPassword(resetPasswordDTO.getPassword());
dto.setId(systemUser.getId());
dto.setOperaUserId(systemUser.getId());
+ dto.setNeedChangePwd(Constants.ONE);
systemUserBiz.resetPwd(dto);
}
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 a02e691..5854665 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
@@ -264,7 +264,7 @@
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")){
+ if(response ==null || !StringUtils.equals(response.getCode(),"0")){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝浠诲姟鍒拌揣鎻愪氦澶辫触锛岃绋嶅悗閲嶈瘯锛�");
}
return true;
@@ -286,7 +286,7 @@
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")){
+ if(response ==null ||!StringUtils.equals(response.getCode(),"0")){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝浠诲姟鍒拌揣鎻愪氦澶辫触锛岃绋嶅悗閲嶈瘯锛�");
}
return true;
--
Gitblit v1.9.3