From a33990498e32fda774dacf849bfcd660c58da8e7 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 28 四月 2022 15:22:17 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_paicha
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 14 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java
index fbfda6a..726c9e0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java
@@ -19,6 +19,10 @@
import javax.annotation.Resource;
+import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+
/**
* (ComProperty)表服务实现类
*
@@ -48,18 +52,24 @@
if(comPropertyVO!=null){
ComProperty comProperty=new ComProperty();
BeanUtils.copyProperties(comPropertyVO,comProperty);
- AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
- administratorsUserVO.setType(3);
- administratorsUserVO.setAccount(comPropertyVO.getAccount());
- administratorsUserVO.setPassword(comPropertyVO.getPassword());
- administratorsUserVO.setRoleId(comPropertyVO.getRoleId());
- administratorsUserVO.setCommunityId(comPropertyVO.getCommunityId());
- administratorsUserVO.setAreaId(comPropertyVO.getAreaId());
- administratorsUserVO.setName(comPropertyVO.getContactName());
- administratorsUserVO.setPhone(comPropertyVO.getPhone());
- R r=userService.addUserBackstageProperty(administratorsUserVO);
- if(R.isOk(r)){
- comProperty.setUserId(Long.parseLong(r.getData().toString()));
+ if (isNotBlank(comPropertyVO.getAccount())) {
+ AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
+ administratorsUserVO.setType(3);
+ administratorsUserVO.setAccount(comPropertyVO.getAccount());
+ administratorsUserVO.setPassword(comPropertyVO.getPassword());
+ administratorsUserVO.setRoleId(comPropertyVO.getRoleId());
+ administratorsUserVO.setCommunityId(comPropertyVO.getCommunityId());
+ administratorsUserVO.setAreaId(comPropertyVO.getAreaId());
+ administratorsUserVO.setName(comPropertyVO.getContactName());
+ administratorsUserVO.setPhone(comPropertyVO.getPhone());
+ R r=userService.addUserBackstageProperty(administratorsUserVO);
+ if(R.isOk(r)){
+ comProperty.setUserId(Long.parseLong(r.getData().toString()));
+ comProperty.setCreateTime(DateUtil.date());
+ this.comPropertyDao.insert(comProperty);
+ return R.ok();
+ }
+ } else {
comProperty.setCreateTime(DateUtil.date());
this.comPropertyDao.insert(comProperty);
return R.ok();
@@ -97,10 +107,27 @@
administratorsUserVO.setUserId(comProperty.getUserId());
administratorsUserVO.setCommunityId(comProperty.getCommunityId());
userService.deleteUserBackstage(administratorsUserVO);
- this.comPropertyDao.deleteById(id);
- return R.ok();
}
+ this.comPropertyDao.deleteById(id);
+ return R.ok();
}
return R.fail("用户账号错误");
}
+
+ /**
+ * 物业公司详情
+ * @param id
+ * @return
+ */
+ @Override
+ public R detailProperty(Long id) {
+ ComProperty comProperty = comPropertyDao.selectById(id);
+ if (isNull(comProperty)) {
+ return R.fail("资源不存在");
+ }
+ ComPropertyVO comPropertyVO = new ComPropertyVO();
+ BeanUtils.copyProperties(comProperty, comPropertyVO);
+ comPropertyVO.setPassword(null);
+ return R.ok(comPropertyVO);
+ }
}
--
Gitblit v1.7.1