From b437ca4b3ba3fadc821e4b01398c3257e540fcb7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 31 十二月 2024 14:40:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java | 1 +
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 +-
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 ++--
server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java | 2 +-
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 ++++
9 files changed, 20 insertions(+), 7 deletions(-)
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 977d9a4..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);
}
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/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/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/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_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);
}
--
Gitblit v1.9.3