From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealAssetsServiceImpl.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealAssetsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealAssetsServiceImpl.java
index 8b7652f..6c1d348 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealAssetsServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealAssetsServiceImpl.java
@@ -1,9 +1,18 @@
package com.panzhihua.service_community.service.impl;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.enums.RealAssetsCategoryType;
import com.panzhihua.common.enums.RealAssetsFloorType;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.ExportRealAssetsExcelDTO;
@@ -16,12 +25,6 @@
import com.panzhihua.service_community.model.dos.ComMngRealAssetsDO;
import com.panzhihua.service_community.model.dos.ComMngStructBuildTypeDO;
import com.panzhihua.service_community.service.ComMngRealAssetsService;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
/**
* @description: 实有资产
@@ -29,7 +32,8 @@
* @date: 2021/3/19 11:55
*/
@Service
-public class ComMngRealAssetsServiceImpl extends ServiceImpl<ComMngRealAssetsDAO, ComMngRealAssetsDO> implements ComMngRealAssetsService {
+public class ComMngRealAssetsServiceImpl extends ServiceImpl<ComMngRealAssetsDAO, ComMngRealAssetsDO>
+ implements ComMngRealAssetsService {
@Resource
private ComMngRealAssetsDAO comMngRealAssetsDAO;
@@ -56,7 +60,7 @@
@Override
public R saveComMngRealAssets(ComMngRealAssetsVO comMngRealAssetsVO) {
if (null != comMngRealAssetsVO.getId() && comMngRealAssetsVO.getId() != 0) {
- //修改
+ // 修改
ComMngRealAssetsDO comMngRealAssetsDO = comMngRealAssetsDAO.selectById(comMngRealAssetsVO.getId());
BeanUtils.copyProperties(comMngRealAssetsVO, comMngRealAssetsDO);
int update = comMngRealAssetsDAO.updateById(comMngRealAssetsDO);
@@ -104,7 +108,8 @@
List<ComMngRealAssetsDO> comMngRealAssetsDOS = new ArrayList<>();
List<ComMngStructBuildTypeDO> buildTypeDOS = buildTypeDAO.selectList(new LambdaQueryWrapper<>());
list.forEach(l -> {
- ComMngStructBuildTypeDO buildTypeDO = buildTypeDOS.stream().filter(buildType -> buildType.getName().equals(l.getBuildTypeName())).findFirst().orElse(null);
+ ComMngStructBuildTypeDO buildTypeDO = buildTypeDOS.stream()
+ .filter(buildType -> buildType.getName().equals(l.getBuildTypeName())).findFirst().orElse(null);
if (buildTypeDO == null) {
throw new ServiceException("不存在类型建筑类型：" + l.getBuildTypeName());
}
@@ -119,6 +124,12 @@
} else if (l.getFloorType().equals(RealAssetsFloorType.LOW.getInfo())) {
comMngRealAssetsDO.setFloorType(RealAssetsFloorType.LOW.getCode());
}
+ if (l.getCategory().equals(RealAssetsCategoryType.PUBLIC.getInfo())) {
+ comMngRealAssetsDO.setCategory(RealAssetsCategoryType.PUBLIC.getCode());
+ }
+ if (l.getCategory().equals(RealAssetsCategoryType.BUILD.getInfo())) {
+ comMngRealAssetsDO.setCategory(RealAssetsCategoryType.BUILD.getCode());
+ }
comMngRealAssetsDOS.add(comMngRealAssetsDO);
});
boolean batch = this.saveBatch(comMngRealAssetsDOS);
--
Gitblit v1.7.1