From 3c884ccd7b51edf3b36840bf99de5edaa41a38a7 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 12 十月 2022 19:05:28 +0800
Subject: [PATCH] 三说会堂事件流程处理
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgServiceImpl.java | 81 ++++++++++++++++++++++++++--------------
1 files changed, 52 insertions(+), 29 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgServiceImpl.java
index cd66bcf..a55482d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgServiceImpl.java
@@ -8,8 +8,11 @@
import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.service_community.dao.ComActDAO;
+import com.panzhihua.service_community.entity.ComActCommittee;
import com.panzhihua.service_community.entity.ComActSocialOrg;
import com.panzhihua.service_community.dao.ComActSocialOrgDao;
+import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.service.ComActSocialOrgService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -31,6 +34,8 @@
private ComActSocialOrgDao comActSocialOrgDao;
@Resource
private UserService userService;
+@Resource
+private ComActDAO comActDAO;
@Override
public R pageList(CommonPage commonPage) {
return R.ok(comActSocialOrgDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
@@ -38,7 +43,7 @@
@Override
public R selectById(Long id) {
- return null;
+ return R.ok(comActSocialOrgDao.detail(id));
}
@Override
@@ -51,7 +56,29 @@
administratorsUserVO.setType(3);
administratorsUserVO.setAccount(comActSocialOrgVO.getAccount());
administratorsUserVO.setPassword(comActSocialOrgVO.getPassword());
- administratorsUserVO.setRoleId(comActSocialOrgVO.getRoleId());
+ //根据roleId判断是普通社会组织还是定制三社
+ if(comActSocialOrgVO.getRoleId()==null){
+ administratorsUserVO.setSocialType(2);
+ administratorsUserVO.setRoleId(777777777L);
+ comActSocialOrg.setIsSociety(1);
+ Long affiliatedUnit = comActSocialOrg.getAffiliatedUnit();
+ Integer affiliatedUnitType = comActSocialOrg.getAffiliatedUnitType();
+ if (affiliatedUnitType.equals(2)) {
+ administratorsUserVO.setCommunityId(affiliatedUnit);
+ ComActDO comActDO = comActDAO.selectById(affiliatedUnit);
+ comActSocialOrg.setStreetId(comActDO.getStreetId());
+ }
+ administratorsUserVO.setName(comActSocialOrgVO.getCorporationName());
+ } else {
+ administratorsUserVO.setRoleId(comActSocialOrgVO.getRoleId());
+ if(comActSocialOrg.getCommunityId()!=null){
+ administratorsUserVO.setCommunityId(comActSocialOrg.getCommunityId());
+ ComActDO comActDO = comActDAO.selectById(comActSocialOrg.getCommunityId());
+ comActSocialOrg.setStreetId(comActDO.getStreetId());
+ }
+ administratorsUserVO.setName(comActSocialOrgVO.getContactName());
+ }
+ administratorsUserVO.setPhone(comActSocialOrgVO.getContactPhone());
R r=userService.addUserBackstageProperty(administratorsUserVO);
if(R.isOk(r)){
comActSocialOrg.setUserId(Long.parseLong(r.getData().toString()));
@@ -59,34 +86,32 @@
this.comActSocialOrgDao.insert(comActSocialOrg);
return R.ok();
}
+ return R.fail("账号或手机号已存在");
}
return R.fail();
}
@Override
- @Transactional(rollbackFor = Exception.class)
public R update(ComActSocialOrgVO comActSocialOrgVO) {
if(comActSocialOrgVO!=null){
- if(!comActSocialOrgVO.getAccount().isEmpty()||!comActSocialOrgVO.getPassword().isEmpty()){
- AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
- administratorsUserVO.setUserId(comActSocialOrgVO.getUserId());
- administratorsUserVO.setAccount(comActSocialOrgVO.getAccount());
- administratorsUserVO.setPassword(comActSocialOrgVO.getPassword());
- R r=userService.putUserBackstage(administratorsUserVO);
- if(R.isOk(r)){
- ComActSocialOrg comActSocialOrg=new ComActSocialOrg();
- BeanUtils.copyProperties(comActSocialOrgVO,comActSocialOrg);
- this.comActSocialOrgDao.updateById(comActSocialOrg);
- return R.ok();
- }
- return R.fail("账号密码修改失败");
- }
- else {
- ComActSocialOrg comActSocialOrg=new ComActSocialOrg();
- BeanUtils.copyProperties(comActSocialOrgVO,comActSocialOrg);
- this.comActSocialOrgDao.updateById(comActSocialOrg);
- return R.ok();
- }
+ ComActSocialOrg comActSocialOrg=new ComActSocialOrg();
+ BeanUtils.copyProperties(comActSocialOrgVO,comActSocialOrg);
+ AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
+ if(comActSocialOrgVO.getRoleId() == null) {
+ administratorsUserVO.setRoleId(777777777L);
+ } else {
+ administratorsUserVO.setRoleId(comActSocialOrgVO.getRoleId());
+ }
+ ComActSocialOrg comPropertyBase=this.comActSocialOrgDao.selectById(comActSocialOrgVO.getId());
+ administratorsUserVO.setUserId(comPropertyBase.getUserId());
+ administratorsUserVO.setLastLoginTime(DateUtil.date());
+ administratorsUserVO.setAccount(comActSocialOrgVO.getAccount());
+ administratorsUserVO.setPassword(comActSocialOrgVO.getPassword());
+ Integer status = comActSocialOrgVO.getStatus();
+ administratorsUserVO.setStatus(status.equals(0) ? 2 : 1);
+ this.userService.putUserBackstage(administratorsUserVO);
+ this.comActSocialOrgDao.updateById(comActSocialOrg);
+ return R.ok();
}
return R.fail();
}
@@ -99,12 +124,10 @@
if(comActSocialOrg.getUserId()!=null){
AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
administratorsUserVO.setUserId(comActSocialOrg.getUserId());
- R r=userService.deleteUserBackstage(administratorsUserVO);
- if(R.isOk(r)){
- this.comActSocialOrgDao.deleteById(id);
- return R.ok();
- }
- return R.fail("账号删除失败");
+ administratorsUserVO.setCommunityId(comActSocialOrg.getCommunityId());
+ userService.deleteUserBackstage(administratorsUserVO);
+ this.comActSocialOrgDao.deleteById(id);
+ return R.ok();
}
}
return R.fail("用户账号错误");
--
Gitblit v1.7.1