From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java | 98 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 86 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java b/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java
index 91429c5..65e16c2 100644
--- a/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java
+++ b/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java
@@ -16,30 +16,47 @@
*/
package org.springblade.modules.property.service.impl;
-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.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import liquibase.pro.packaged.D;
-import liquibase.pro.packaged.P;
+import org.springblade.common.cache.SysCache;
+import org.springblade.common.constant.CommonConstant;
+import org.springblade.common.utils.RoleUtil;
+import org.springblade.common.utils.SpringUtils;
import org.springblade.core.mp.support.Condition;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.DigestUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.pay.entity.AliPayInfo;
import org.springblade.modules.pay.entity.WxPayInfo;
import org.springblade.modules.pay.service.IAliPayService;
import org.springblade.modules.pay.service.IWxPayService;
+import org.springblade.modules.property.entity.PropertyCompanyDistrictEntity;
import org.springblade.modules.property.entity.PropertyCompanyEntity;
+import org.springblade.modules.property.mapper.PropertyCompanyMapper;
+import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
+import org.springblade.modules.property.service.IPropertyCompanyService;
+import org.springblade.modules.property.service.IPropertyDistrictUserService;
import org.springblade.modules.property.vo.PropertyCompanyDetailVO;
import org.springblade.modules.property.vo.PropertyCompanyVO;
-import org.springblade.modules.property.mapper.PropertyCompanyMapper;
-import org.springblade.modules.property.service.IPropertyCompanyService;
import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.property.vo.PropertyDistrictInfo;
import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.entity.UserDept;
import org.springblade.modules.system.service.IDeptService;
+import org.springblade.modules.system.service.IUserDeptService;
+import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 物业公司 服务实现类
@@ -58,6 +75,7 @@
@Autowired
private IAliPayService aliPayService;
+
/**
* 自定义分页
*
@@ -72,16 +90,24 @@
/**
* 物业公司列表查询（不分页）
+ *
* @param propertyCompany
* @return
*/
@Override
public List<PropertyCompanyVO> getPropertyCompanyList(PropertyCompanyVO propertyCompany) {
+ String userRole = AuthUtil.getUserRole();
+ if (!AuthUtil.isAdministrator() && userRole.contains("wygly")) {
+ Long deptId = Func.firstLong(AuthUtil.getDeptId());
+ Dept dept = SysCache.getDept(deptId);
+ propertyCompany.setName(dept.getDeptName());
+ }
return baseMapper.getPropertyCompanyList(propertyCompany);
}
/**
* 物业公司查询对应的用户信息
+ *
* @param propertyCompany
* @return
*/
@@ -101,22 +127,45 @@
dept.setDeptName(propertyCompany.getName());
dept.setFullName(propertyCompany.getName());
// 判断新增还是修改
- if (null != propertyCompany.getId()){
+ if (null != propertyCompany.getId()) {
// 修改
updateById(propertyCompany);
// 修改住址机构信息
dept.setId(propertyCompany.getDeptId());
flag = deptService.updateById(dept);
- }else {
+ } else {
// 查询父级id
QueryWrapper<Dept> wrapper = new QueryWrapper<>();
- wrapper.eq("is_deleted",0).eq("dept_name","物业公司");
+ wrapper.eq("is_deleted", 0).eq("dept_name", "物业公司");
Dept parentDept = deptService.getOne(wrapper);
dept.setParentId(parentDept.getId());
+ dept.setDeptCategory(1);
+ dept.setSort(1);
// 新增机构
flag = deptService.save(dept);
// 新增物业公司
propertyCompany.setDeptId(dept.getId());
+ // 新增用户
+ User user = new User();
+ user.setAccount(propertyCompany.getName());
+ user.setUserType(1);
+ user.setRealName(propertyCompany.getName());
+ user.setName(propertyCompany.getName());
+ user.setPassword(DigestUtil.encrypt(CommonConstant.DEFAULT_PASSWORD));
+ user.setRoleId("1727864473262817281");
+ user.setDeptId(dept.getId().toString());
+ IUserService bean = SpringUtils.getBean(IUserService.class);
+ boolean save = bean.save(user);
+ // 新增用户和机构关联关系
+ if (save) {
+ UserDept userDept = new UserDept();
+ userDept.setUserId(user.getId());
+ userDept.setDeptId(dept.getId());
+ IUserDeptService bean1 = SpringUtils.getBean(IUserDeptService.class);
+ bean1.save(userDept);
+ }
+
+ System.out.println("保存用户结果：" + save);
flag = save(propertyCompany);
}
return flag;
@@ -141,6 +190,7 @@
/**
* 物业公司 自定义详情查询
+ *
* @param propertyCompany
* @return
*/
@@ -153,15 +203,15 @@
public Boolean payConfig(WxPayInfo wxPayInfo, AliPayInfo aliPayInfo) {
boolean wx = wxPayService.saveOrUpdate(wxPayInfo);
boolean ali = aliPayService.saveOrUpdate(aliPayInfo);
- return wx&&ali;
+ return wx && ali;
}
@Override
public PropertyCompanyDetailVO getPayConfig(PropertyCompanyVO propertyCompany) {
- PropertyCompanyDetailVO detail = this.getDetail(propertyCompany);
-
+// PropertyCompanyDetailVO detail = this.getDetail(propertyCompany);
+ PropertyCompanyDetailVO detail = baseMapper.getDetailVO(propertyCompany);
AliPayInfo pA = new AliPayInfo();
@@ -174,4 +224,28 @@
return detail;
}
+
+ /**
+ * 通过用户机构查询
+ *
+ * @return
+ */
+ @Override
+ public PropertyCompanyDetailVO getDetailByDeptId() {
+ String userRole = AuthUtil.getUserRole();
+ if (RoleUtil.isProperty(userRole)) {
+ // 通过用户机构查询用户的物业公司
+ IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
+ PropertyCompanyEntity propertyCompanyEntity = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()).last("limit 1"));
+ if (propertyCompanyEntity != null) {
+ return baseMapper.getDetailVO(BeanUtil.copyProperties(propertyCompanyEntity, PropertyCompanyVO.class));
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public PropertyDistrictInfo getPropertyDistrictInfo(PropertyDistrictInfo propertyDistrictInfo) {
+ return baseMapper.getPropertyDistrictInfo(propertyDistrictInfo);
+ }
}
--
Gitblit v1.9.3