From 814b7dfb73f8ae763023a4fd2835bbead8c66a93 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 17 九月 2021 17:53:06 +0800
Subject: [PATCH] 一键报警,物业平台相关功能修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgMapper.xml | 71 ++
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/util/MyAESUtil.java | 17
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActCommitteeDao.java | 28 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActCommitteeApi.java | 87 +++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialOrgService.java | 50 +
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 45 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialOrgApi.java | 75 ++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java | 245 +++++++++
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/util/JPushUtil.java | 6
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialOrgDao.java | 27 +
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActCommitteeApi.java | 74 ++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 71 ++
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/message/AlarmMessage.java | 3
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmVO.java | 3
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyAlarmApi.java | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 10
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 9
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActCommitteeService.java | 45 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrg.java | 252 +++++++++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgServiceImpl.java | 112 ++++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActCommittee.java | 73 ++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java | 5
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActCommitteeServiceImpl.java | 108 ++++
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 13
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActCommitteeMapper.xml | 37 +
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialOrgApi.java | 73 ++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActCommiteeVO.java | 66 ++
27 files changed, 1,586 insertions(+), 21 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java
index c9a6565..67d144f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java
@@ -7,6 +7,9 @@
import java.util.Date;
+/**
+ * @author zzj
+ */
@Data
@ApiModel
public class CommonPage {
@@ -46,4 +49,6 @@
private Date statusEndTime;
@ApiModelProperty("编号")
private String serialNo;
+ @ApiModelProperty("小区id")
+ private Long areaId;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActCommiteeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActCommiteeVO.java
new file mode 100644
index 0000000..f206cf0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActCommiteeVO.java
@@ -0,0 +1,66 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("业主委员会实体")
+public class ComActCommiteeVO {
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "主键")
+ private Integer id;
+
+ /**
+ * 名称
+ */
+ @ApiModelProperty(value = "名称")
+ private String name;
+
+ /**
+ * 联系人
+ */
+ @ApiModelProperty(value = "联系人")
+ private String contactName;
+
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty(value = "联系电话")
+ private String phone;
+
+ /**
+ * 小区id
+ */
+ @ApiModelProperty(value = "小区id")
+ private Long areaId;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+
+ /**
+ * 社区id
+ */
+ private Long communityId;
+
+ @ApiModelProperty("账号")
+ private String account;
+
+ @ApiModelProperty("密码")
+ private String password;
+
+ @ApiModelProperty("权限id")
+ private Long roleId;
+
+ @ApiModelProperty("小区名称")
+ private String areaName;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java
new file mode 100644
index 0000000..619fec3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java
@@ -0,0 +1,245 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("社会组织实体参数")
+public class ComActSocialOrgVO {
+ /**
+ * ID
+ */
+ @ApiModelProperty(value = "ID")
+ private Long id;
+
+ /**
+ * 单位名称
+ */
+ @ApiModelProperty(value = "单位名称")
+ private String name;
+
+ /**
+ * 工商登记号
+ */
+ @ApiModelProperty(value = "工商登记号")
+ private String businessNumber;
+
+ /**
+ * 成立时间
+ */
+ @ApiModelProperty(value = "成立时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date buildDate;
+
+ /**
+ * 机构代码
+ */
+ @ApiModelProperty(value = "机构代码")
+ private String agencyCode;
+
+ /**
+ * 微信公众号
+ */
+ @ApiModelProperty(value = "微信公众号")
+ private String weixinOfficialAccounts;
+
+ /**
+ * 单位类别： 1 社会团体、2 民办非企业单位、3 基金会
+ */
+ @ApiModelProperty(value = "单位类别： 1 社会团体、2 民办非企业单位、3 基金会")
+ private Integer companyType;
+
+ /**
+ * 注册资金（万元）
+ */
+ @ApiModelProperty(value = "注册资金（万元）")
+ private Integer registFee;
+
+ /**
+ * 资产总额（万元）
+ */
+ @ApiModelProperty(value = "资产总额（万元）")
+ private Integer assetsTotal;
+
+ /**
+ * 净资产（万元）
+ */
+ @ApiModelProperty(value = "净资产（万元）")
+ private Integer assetsNet;
+
+ /**
+ * 销售额（万元）
+ */
+ @ApiModelProperty(value = "销售额（万元）")
+ private Double salesFee;
+
+ /**
+ * 上年纳税额（万元）
+ */
+ @ApiModelProperty(value = "上年纳税额（万元）")
+ private Double taxesLastYear;
+
+ /**
+ * 职工人数（人）
+ */
+ @ApiModelProperty(value = "职工人数（人）")
+ private Integer staffCount;
+
+ /**
+ * 通讯地址
+ */
+ @ApiModelProperty(value = "通讯地址")
+ private String maillingAddr;
+
+ /**
+ * 邮编
+ */
+ @ApiModelProperty(value = "邮编")
+ private String postCode;
+
+ /**
+ * 官方网址
+ */
+ @ApiModelProperty(value = "官方网址")
+ private String officialUrl;
+
+ /**
+ * 法人姓名
+ */
+ @ApiModelProperty(value = "法人姓名")
+ private String corporationName;
+
+ /**
+ * 法人性别0女1男
+ */
+ @ApiModelProperty(value = "法人性别0女1男")
+ private String corporationGen;
+
+ /**
+ * 法人工作电话
+ */
+ @ApiModelProperty(value = "法人工作电话")
+ private String corporationOfficePhone;
+
+ /**
+ * 法人职位
+ */
+ @ApiModelProperty(value = "法人职位")
+ private String corporationPosition;
+
+ /**
+ * 法人手机
+ */
+ @ApiModelProperty(value = "法人手机")
+ private String corporationPhone;
+
+ /**
+ * 法人邮箱
+ */
+ @ApiModelProperty(value = "法人邮箱")
+ private String corporationEmail;
+
+ /**
+ * 联系人姓名
+ */
+ @ApiModelProperty(value = "联系人姓名")
+ private String contactName;
+
+ /**
+ * 联系人性别0女1男
+ */
+ @ApiModelProperty(value = "联系人性别0女1男")
+ private String contactGen;
+
+ /**
+ * 联系人工作电话
+ */
+ @ApiModelProperty(value = "联系人工作电话")
+ private String contactOfficePhone;
+
+ /**
+ * 联系人职位
+ */
+ @ApiModelProperty(value = "联系人职位")
+ private String contactPosition;
+
+ /**
+ * 联系人手机
+ */
+ @ApiModelProperty(value = "联系人手机")
+ private String contactPhone;
+
+ /**
+ * 联系人邮箱
+ */
+ @ApiModelProperty(value = "联系人邮箱")
+ private String contactEmail;
+
+ /**
+ * 业务范围/专业领域
+ */
+ @ApiModelProperty(value = "业务范围/专业领域")
+ private String businessScope;
+
+ /**
+ * 运营情况及行业影响（含所获荣誉）
+ */
+ @ApiModelProperty(value = "运营情况及行业影响（含所获荣誉）")
+ private String businessImpact;
+
+ /**
+ * 附件（以逗号隔开）
+ */
+ @ApiModelProperty(value = "附件（以逗号隔开）")
+ private String attachUrl;
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ /**
+ * 更新人
+ */
+ @ApiModelProperty(value = "更新人")
+ private Long updateBy;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ private Long communityId;
+
+ /**
+ * 登录用户id
+ */
+ @ApiModelProperty(value = "登录用户id")
+ private Long userId;
+
+ @ApiModelProperty("账号")
+ private String account;
+
+ @ApiModelProperty("密码")
+ private String password;
+
+ @ApiModelProperty("权限id")
+ private Long roleId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmVO.java
index 81d6d88..f619077 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmVO.java
@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.property;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -27,6 +28,7 @@
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
/**
* 位置信息
@@ -62,6 +64,7 @@
* 处理时间
*/
@ApiModelProperty(value = "处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date solveTime;
/**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 721600b..dc673de 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -3,6 +3,7 @@
import java.util.List;
import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.*;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
@@ -5192,4 +5193,74 @@
*/
@PostMapping("/activity/default-praise")
R timedTaskActivityDefaultPraise();
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialOrg/queryAll")
+ R comActSocialOrgSelectAll(CommonPage commonPage);
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialOrg 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialOrg")
+ R comActSocialOrgInsert(@RequestBody ComActSocialOrgVO comActSocialOrg);
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialOrg 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialOrg/update")
+ R comActSocialOrgUpdate(@RequestBody ComActSocialOrgVO comActSocialOrg);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialOrg/del")
+ R comActSocialOrgDelete(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActCommittee/queryAll")
+ R comActCommitteeSelectAll(@RequestBody CommonPage commonPage);
+ /**
+ * 新增数据
+ *
+ * @param comActCommittee 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActCommittee")
+ R comActCommitteeInsert(@RequestBody ComActCommiteeVO comActCommittee);
+ /**
+ * 修改数据
+ *
+ * @param comActCommittee 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActCommittee/update")
+ R comActCommitteeUpdate(@RequestBody ComActCommiteeVO comActCommittee);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActCommittee/del")
+ R comActCommitteeDelete(@RequestParam("id") Long id);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
index a2ccedf..b5a9824 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -312,6 +312,16 @@
R addUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO);
/**
+ * 新增社区后台物业，社会组织，业主委员会账户
+ *
+ * @param administratorsUserVO
+ * 账户信息
+ * @return 新增结果
+ */
+ @PostMapping("adduserbackstageproperty")
+ R addUserBackstageProperty(@RequestBody AdministratorsUserVO administratorsUserVO);
+
+ /**
* 编辑运营、社区后台账户
*
* @param administratorsUserVO
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActCommitteeApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActCommitteeApi.java
new file mode 100644
index 0000000..b34b7ff
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActCommitteeApi.java
@@ -0,0 +1,74 @@
+package com.panzhihua.community_backstage.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActCommiteeVO;
+import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @author zzj
+ */
+@Slf4j
+@Api(tags = {"业主委员会"})
+@RestController
+@RequestMapping("/comActCommittee")
+public class ComActCommitteeApi extends BaseController {
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "业主委员会列表",response = ComActCommiteeVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return this.communityService.comActCommitteeSelectAll(commonPage);
+ }
+ /**
+ * 新增数据
+ *
+ * @param comActCommiteeVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("新增业主委员会")
+ @PostMapping
+ public R insert(@RequestBody ComActCommiteeVO comActCommiteeVO) {
+ comActCommiteeVO.setCommunityId(this.getCommunityId());
+ return this.communityService.comActCommitteeInsert(comActCommiteeVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActCommiteeVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改业主委员会")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActCommiteeVO comActCommiteeVO) {
+ return this.communityService.comActCommitteeUpdate(comActCommiteeVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除业主委员会")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.communityService.comActCommitteeDelete(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialOrgApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialOrgApi.java
new file mode 100644
index 0000000..144e71e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialOrgApi.java
@@ -0,0 +1,73 @@
+package com.panzhihua.community_backstage.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @author zzj
+ */
+@Slf4j
+@Api(tags = {"社会组织"})
+@RestController
+@RequestMapping("/comActSocialOrg")
+public class ComActSocialOrgApi extends BaseController {
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "社会组织列表",response = ComActSocialOrgVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return this.communityService.comActSocialOrgSelectAll(commonPage);
+ }
+ /**
+ * 新增数据
+ *
+ * @param comActSocialOrg 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("新增社会组织")
+ @PostMapping
+ public R insert(@RequestBody ComActSocialOrgVO comActSocialOrg) {
+ comActSocialOrg.setCommunityId(this.getCommunityId());
+ return this.communityService.comActSocialOrgInsert(comActSocialOrg);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialOrg 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改社会组织")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActSocialOrgVO comActSocialOrg) {
+ return this.communityService.comActSocialOrgUpdate(comActSocialOrg);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除社会组织")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.communityService.comActSocialOrgDelete(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/util/MyAESUtil.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/util/MyAESUtil.java
index a408f0e..a31afe5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/util/MyAESUtil.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/util/MyAESUtil.java
@@ -58,21 +58,4 @@
return null;
}
}
-
- public static void main(String[] args) throws Exception {
- /*
- * 此处使用AES-128-ECB加密模式，key需要为16位。
- */
- String cKey = "jkl;POIU1234++==";
- // 需要加密的字串
- String cSrc = "www.gowhere.so";
- System.out.println(cSrc);
- // 加密
- String enString = MyAESUtil.Encrypt(cSrc, cKey);
- System.out.println("加密后的字串是：" + enString);
-
- // 解密
- String DeString = MyAESUtil.Decrypt(enString, cKey);
- System.out.println("解密后的字串是：" + DeString);
- }
}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActCommitteeApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActCommitteeApi.java
new file mode 100644
index 0000000..515ed28
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActCommitteeApi.java
@@ -0,0 +1,87 @@
+package com.panzhihua.service_community.api;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.api.ApiController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.vos.community.ComActCommiteeVO;
+import com.panzhihua.service_community.entity.ComActCommittee;
+import com.panzhihua.service_community.service.ComActCommitteeService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * (ComActCommittee)表控制层
+ *
+ * @author makejava
+ * @since 2021-09-17 13:55:44
+ */
+@RestController
+@RequestMapping("comActCommittee")
+public class ComActCommitteeApi {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private ComActCommitteeService comActCommitteeService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return this.comActCommitteeService.pageList(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Serializable id) {
+ return R.ok(this.comActCommitteeService.getById(id));
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActCommittee 实体对象
+ * @return 新增结果
+ */
+ @PostMapping
+ public R insert(@RequestBody ComActCommiteeVO comActCommittee) {
+ return this.comActCommitteeService.insert(comActCommittee);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActCommittee 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/update")
+ public R update(@RequestBody ComActCommiteeVO comActCommittee) {
+ return this.comActCommitteeService.update(comActCommittee);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.comActCommitteeService.delete(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialOrgApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialOrgApi.java
new file mode 100644
index 0000000..52c0fbc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialOrgApi.java
@@ -0,0 +1,75 @@
+package com.panzhihua.service_community.api;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.api.ApiController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
+import com.panzhihua.service_community.entity.ComActSocialOrg;
+import com.panzhihua.service_community.service.ComActSocialOrgService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 社会组织(ComActSocialOrg)表控制层
+ *
+ * @author makejava
+ * @since 2021-09-17 10:45:31
+ */
+@RestController
+@RequestMapping("comActSocialOrg")
+public class ComActSocialOrgApi {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private ComActSocialOrgService comActSocialOrgService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return this.comActSocialOrgService.pageList(commonPage);
+ }
+ /**
+ * 新增数据
+ *
+ * @param comActSocialOrg 实体对象
+ * @return 新增结果
+ */
+ @PostMapping
+ public R insert(@RequestBody ComActSocialOrgVO comActSocialOrg) {
+ return this.comActSocialOrgService.insert(comActSocialOrg);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialOrg 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/update")
+ public R update(@RequestBody ComActSocialOrgVO comActSocialOrg) {
+ return this.comActSocialOrgService.update(comActSocialOrg);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.comActSocialOrgService.delete(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActCommitteeDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActCommitteeDao.java
new file mode 100644
index 0000000..767eea4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActCommitteeDao.java
@@ -0,0 +1,28 @@
+package com.panzhihua.service_community.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.community.ComActCommiteeVO;
+import org.apache.ibatis.annotations.Mapper;
+import com.panzhihua.service_community.entity.ComActCommittee;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * (ComActCommittee)表数据库访问层
+ *
+ * @author makejava
+ * @since 2021-09-17 13:55:43
+ */
+@Mapper
+public interface ComActCommitteeDao extends BaseMapper<ComActCommittee> {
+ /**
+ * 分页查询
+ * @param page
+ * @param commonPage
+ * @return
+ */
+ IPage<ComActCommiteeVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialOrgDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialOrgDao.java
new file mode 100644
index 0000000..9ccff44
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialOrgDao.java
@@ -0,0 +1,27 @@
+package com.panzhihua.service_community.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
+import org.apache.ibatis.annotations.Mapper;
+import com.panzhihua.service_community.entity.ComActSocialOrg;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 社会组织(ComActSocialOrg)表数据库访问层
+ *
+ * @author makejava
+ * @since 2021-09-17 10:45:30
+ */
+@Mapper
+public interface ComActSocialOrgDao extends BaseMapper<ComActSocialOrg> {
+ /**
+ * 分页查询
+ * @param page
+ * @param commonPage
+ * @return
+ */
+ IPage<ComActSocialOrgVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActCommittee.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActCommittee.java
new file mode 100644
index 0000000..ebc509c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActCommittee.java
@@ -0,0 +1,73 @@
+package com.panzhihua.service_community.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * (ComActCommittee)表实体类
+ *
+ * @author makejava
+ * @since 2021-09-17 13:55:43
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("")
+public class ComActCommittee implements Serializable {
+
+ private static final long serialVersionUID = -95815418574862374L;
+
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "主键")
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 名称
+ */
+ @ApiModelProperty(value = "名称")
+ private String name;
+
+ /**
+ * 联系人
+ */
+ @ApiModelProperty(value = "联系人")
+ private String contactName;
+
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty(value = "联系电话")
+ private String phone;
+
+ /**
+ * 小区id
+ */
+ @ApiModelProperty(value = "小区id")
+ private Long areaId;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrg.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrg.java
new file mode 100644
index 0000000..4879e3a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrg.java
@@ -0,0 +1,252 @@
+package com.panzhihua.service_community.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 社会组织(ComActSocialOrg)表实体类
+ *
+ * @author makejava
+ * @since 2021-09-17 10:45:21
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("社会组织")
+public class ComActSocialOrg implements Serializable {
+
+ private static final long serialVersionUID = 597028379524285428L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value = "ID")
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 单位名称
+ */
+ @ApiModelProperty(value = "单位名称")
+ private String name;
+
+ /**
+ * 工商登记号
+ */
+ @ApiModelProperty(value = "工商登记号")
+ private String businessNumber;
+
+ /**
+ * 成立时间
+ */
+ @ApiModelProperty(value = "成立时间")
+ private Date buildDate;
+
+ /**
+ * 机构代码
+ */
+ @ApiModelProperty(value = "机构代码")
+ private String agencyCode;
+
+ /**
+ * 微信公众号
+ */
+ @ApiModelProperty(value = "微信公众号")
+ private String weixinOfficialAccounts;
+
+ /**
+ * 单位类别： 1 社会团体、2 民办非企业单位、3 基金会
+ */
+ @ApiModelProperty(value = "单位类别： 1 社会团体、2 民办非企业单位、3 基金会")
+ private Integer companyType;
+
+ /**
+ * 注册资金（万元）
+ */
+ @ApiModelProperty(value = "注册资金（万元）")
+ private Integer registFee;
+
+ /**
+ * 资产总额（万元）
+ */
+ @ApiModelProperty(value = "资产总额（万元）")
+ private Integer assetsTotal;
+
+ /**
+ * 净资产（万元）
+ */
+ @ApiModelProperty(value = "净资产（万元）")
+ private Integer assetsNet;
+
+ /**
+ * 销售额（万元）
+ */
+ @ApiModelProperty(value = "销售额（万元）")
+ private Double salesFee;
+
+ /**
+ * 上年纳税额（万元）
+ */
+ @ApiModelProperty(value = "上年纳税额（万元）")
+ private Double taxesLastYear;
+
+ /**
+ * 职工人数（人）
+ */
+ @ApiModelProperty(value = "职工人数（人）")
+ private Integer staffCount;
+
+ /**
+ * 通讯地址
+ */
+ @ApiModelProperty(value = "通讯地址")
+ private String maillingAddr;
+
+ /**
+ * 邮编
+ */
+ @ApiModelProperty(value = "邮编")
+ private String postCode;
+
+ /**
+ * 官方网址
+ */
+ @ApiModelProperty(value = "官方网址")
+ private String officialUrl;
+
+ /**
+ * 法人姓名
+ */
+ @ApiModelProperty(value = "法人姓名")
+ private String corporationName;
+
+ /**
+ * 法人性别0女1男
+ */
+ @ApiModelProperty(value = "法人性别0女1男")
+ private String corporationGen;
+
+ /**
+ * 法人工作电话
+ */
+ @ApiModelProperty(value = "法人工作电话")
+ private String corporationOfficePhone;
+
+ /**
+ * 法人职位
+ */
+ @ApiModelProperty(value = "法人职位")
+ private String corporationPosition;
+
+ /**
+ * 法人手机
+ */
+ @ApiModelProperty(value = "法人手机")
+ private String corporationPhone;
+
+ /**
+ * 法人邮箱
+ */
+ @ApiModelProperty(value = "法人邮箱")
+ private String corporationEmail;
+
+ /**
+ * 联系人姓名
+ */
+ @ApiModelProperty(value = "联系人姓名")
+ private String contactName;
+
+ /**
+ * 联系人性别0女1男
+ */
+ @ApiModelProperty(value = "联系人性别0女1男")
+ private String contactGen;
+
+ /**
+ * 联系人工作电话
+ */
+ @ApiModelProperty(value = "联系人工作电话")
+ private String contactOfficePhone;
+
+ /**
+ * 联系人职位
+ */
+ @ApiModelProperty(value = "联系人职位")
+ private String contactPosition;
+
+ /**
+ * 联系人手机
+ */
+ @ApiModelProperty(value = "联系人手机")
+ private String contactPhone;
+
+ /**
+ * 联系人邮箱
+ */
+ @ApiModelProperty(value = "联系人邮箱")
+ private String contactEmail;
+
+ /**
+ * 业务范围/专业领域
+ */
+ @ApiModelProperty(value = "业务范围/专业领域")
+ private String businessScope;
+
+ /**
+ * 运营情况及行业影响（含所获荣誉）
+ */
+ @ApiModelProperty(value = "运营情况及行业影响（含所获荣誉）")
+ private String businessImpact;
+
+ /**
+ * 附件（以逗号隔开）
+ */
+ @ApiModelProperty(value = "附件（以逗号隔开）")
+ private String attachUrl;
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+
+ /**
+ * 更新人
+ */
+ @ApiModelProperty(value = "更新人")
+ private Long updateBy;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ private Date updateAt;
+
+ private Long communityId;
+
+ /**
+ * 登录用户id
+ */
+ @ApiModelProperty(value = "登录用户id")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActCommitteeService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActCommitteeService.java
new file mode 100644
index 0000000..376e79c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActCommitteeService.java
@@ -0,0 +1,45 @@
+package com.panzhihua.service_community.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActCommiteeVO;
+import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
+import com.panzhihua.service_community.entity.ComActCommittee;
+
+/**
+ * (ComActCommittee)表服务接口
+ *
+ * @author makejava
+ * @since 2021-09-17 13:55:44
+ */
+public interface ComActCommitteeService extends IService<ComActCommittee> {
+ /**
+ * 分页查询
+ * @param commonPage
+ * @return
+ */
+ R pageList(CommonPage commonPage);
+
+
+ /**
+ * 新增
+ * @param comActCommiteeVO
+ * @return
+ */
+ R insert(ComActCommiteeVO comActCommiteeVO);
+
+ /**
+ * 更新
+ * @param comActCommiteeVO
+ * @return
+ */
+ R update(ComActCommiteeVO comActCommiteeVO);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ R delete(Long id);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialOrgService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialOrgService.java
new file mode 100644
index 0000000..84aec78
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialOrgService.java
@@ -0,0 +1,50 @@
+package com.panzhihua.service_community.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
+import com.panzhihua.service_community.entity.ComActSocialOrg;
+
+/**
+ * 社会组织(ComActSocialOrg)表服务接口
+ *
+ * @author makejava
+ * @since 2021-09-17 10:45:30
+ */
+public interface ComActSocialOrgService extends IService<ComActSocialOrg> {
+ /**
+ * 分页查询
+ * @param commonPage
+ * @return
+ */
+ R pageList(CommonPage commonPage);
+
+ /**
+ * id查询详情
+ * @param id
+ * @return
+ */
+ R selectById(Long id);
+
+ /**
+ * 新增
+ * @param comActSocialOrgVO
+ * @return
+ */
+ R insert(ComActSocialOrgVO comActSocialOrgVO);
+
+ /**
+ * 更新
+ * @param comActSocialOrgVO
+ * @return
+ */
+ R update(ComActSocialOrgVO comActSocialOrgVO);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ R delete(Long id);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActCommitteeServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActCommitteeServiceImpl.java
new file mode 100644
index 0000000..e19f721
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActCommitteeServiceImpl.java
@@ -0,0 +1,108 @@
+package com.panzhihua.service_community.service.impl;
+
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActCommiteeVO;
+import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.service_community.entity.ComActCommittee;
+import com.panzhihua.service_community.dao.ComActCommitteeDao;
+import com.panzhihua.service_community.entity.ComActSocialOrg;
+import com.panzhihua.service_community.service.ComActCommitteeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+/**
+ * (ComActCommittee)表服务实现类
+ *
+ * @author makejava
+ * @since 2021-09-17 13:55:44
+ */
+@Slf4j
+@Service
+public class ComActCommitteeServiceImpl extends ServiceImpl<ComActCommitteeDao, ComActCommittee> implements ComActCommitteeService {
+ @Resource
+ private ComActCommitteeDao comActCommitteeDao;
+ @Resource
+ private UserService userService;
+ @Override
+ public R pageList(CommonPage commonPage) {
+ return R.ok(this.comActCommitteeDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R insert(ComActCommiteeVO comActCommiteeVO) {
+ if(comActCommiteeVO!=null){
+ ComActCommittee comActCommittee=new ComActCommittee();
+ BeanUtils.copyProperties(comActCommiteeVO,comActCommittee);
+ AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
+ administratorsUserVO.setType(3);
+ administratorsUserVO.setAccount(comActCommiteeVO.getAccount());
+ administratorsUserVO.setPassword(comActCommiteeVO.getPassword());
+ administratorsUserVO.setRoleId(comActCommiteeVO.getRoleId());
+ R r=userService.addUserBackstageProperty(administratorsUserVO);
+ if(R.isOk(r)){
+ comActCommiteeVO.setUserId(Long.parseLong(r.getData().toString()));
+ comActCommittee.setCreateTime(DateUtil.date());
+ this.comActCommitteeDao.insert(comActCommittee);
+ return R.ok();
+ }
+ }
+ return R.fail();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R update(ComActCommiteeVO comActCommiteeVO) {
+ if(comActCommiteeVO!=null){
+ if(!comActCommiteeVO.getAccount().isEmpty()||!comActCommiteeVO.getPassword().isEmpty()){
+ AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
+ administratorsUserVO.setUserId(comActCommiteeVO.getUserId());
+ administratorsUserVO.setAccount(comActCommiteeVO.getAccount());
+ administratorsUserVO.setPassword(comActCommiteeVO.getPassword());
+ R r=userService.putUserBackstage(administratorsUserVO);
+ if(R.isOk(r)){
+ ComActCommittee comActCommittee=new ComActCommittee();
+ BeanUtils.copyProperties(comActCommiteeVO,comActCommittee);
+ this.comActCommitteeDao.updateById(comActCommittee);
+ return R.ok();
+ }
+ return R.fail("账号密码修改失败");
+ }
+ else {
+ ComActCommittee comActCommittee=new ComActCommittee();
+ BeanUtils.copyProperties(comActCommiteeVO,comActCommittee);
+ this.comActCommitteeDao.updateById(comActCommittee);
+ return R.ok();
+ }
+ }
+ return R.fail();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R delete(Long id) {
+ ComActCommittee comActCommittee=comActCommitteeDao.selectById(id);
+ if(comActCommittee!=null){
+ if(comActCommittee.getUserId()!=null){
+ AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
+ administratorsUserVO.setUserId(comActCommittee.getUserId());
+ R r=userService.deleteUserBackstage(administratorsUserVO);
+ if(R.isOk(r)){
+ this.comActCommitteeDao.deleteById(id);
+ return R.ok();
+ }
+ return R.fail("账号删除失败");
+ }
+ }
+ return R.fail("用户账号错误");
+ }
+}
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
new file mode 100644
index 0000000..cd66bcf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgServiceImpl.java
@@ -0,0 +1,112 @@
+package com.panzhihua.service_community.service.impl;
+
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+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.entity.ComActSocialOrg;
+import com.panzhihua.service_community.dao.ComActSocialOrgDao;
+import com.panzhihua.service_community.service.ComActSocialOrgService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+/**
+ * 社会组织(ComActSocialOrg)表服务实现类
+ *
+ * @author makejava
+ * @since 2021-09-17 10:45:30
+ */
+@Slf4j
+@Service
+public class ComActSocialOrgServiceImpl extends ServiceImpl<ComActSocialOrgDao, ComActSocialOrg> implements ComActSocialOrgService {
+@Resource
+private ComActSocialOrgDao comActSocialOrgDao;
+@Resource
+private UserService userService;
+ @Override
+ public R pageList(CommonPage commonPage) {
+ return R.ok(comActSocialOrgDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
+ }
+
+ @Override
+ public R selectById(Long id) {
+ return null;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R insert(ComActSocialOrgVO comActSocialOrgVO) {
+ if(comActSocialOrgVO!=null){
+ ComActSocialOrg comActSocialOrg=new ComActSocialOrg();
+ BeanUtils.copyProperties(comActSocialOrgVO,comActSocialOrg);
+ AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
+ administratorsUserVO.setType(3);
+ administratorsUserVO.setAccount(comActSocialOrgVO.getAccount());
+ administratorsUserVO.setPassword(comActSocialOrgVO.getPassword());
+ administratorsUserVO.setRoleId(comActSocialOrgVO.getRoleId());
+ R r=userService.addUserBackstageProperty(administratorsUserVO);
+ if(R.isOk(r)){
+ comActSocialOrg.setUserId(Long.parseLong(r.getData().toString()));
+ comActSocialOrg.setCreateAt(DateUtil.date());
+ this.comActSocialOrgDao.insert(comActSocialOrg);
+ return R.ok();
+ }
+ }
+ 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();
+ }
+ }
+ return R.fail();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R delete(Long id) {
+ ComActSocialOrg comActSocialOrg=comActSocialOrgDao.selectById(id);
+ if(comActSocialOrg!=null){
+ 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("账号删除失败");
+ }
+ }
+ return R.fail("用户账号错误");
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActCommitteeMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActCommitteeMapper.xml
new file mode 100644
index 0000000..1589aaf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActCommitteeMapper.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.panzhihua.service_community.dao.ComActCommitteeDao">
+
+ <resultMap type="com.panzhihua.service_community.entity.ComActCommittee" id="ComActCommitteeBaseResultMap">
+ <result property="id" column="id"/>
+ <result property="name" column="name"/>
+ <result property="contactName" column="contact_name"/>
+ <result property="phone" column="phone"/>
+ <result property="areaId" column="area_id"/>
+ <result property="userId" column="user_id"/>
+ <result property="createTime" column="create_time"/>
+ </resultMap>
+
+ <select id="pageList" resultType="com.panzhihua.common.model.vos.community.ComActCommiteeVO">
+ select t.*,t1.account,t1.password,t2.area_name as areaName from com_act_committee t
+ left join sys_user t1 on t.user_id = t1.user_id
+ left join com_mng_struct_area t2 on t.area_id = t2.id
+ <where>
+ 1=1
+ <if test="commonPage.systemName!=null and commonPage.systemName !=''">
+ and t2.area_name like concat(#{systemName},'%')
+ </if>
+ <if test="commonPage.name!=null and commonPage.name!=''">
+ and t.name like concat(#{name},'%')
+ </if>
+ <if test="commonPage.phone!=null and commonPage.phone!=''">
+ and t.phone like concat(#{phone},'%')
+ </if>
+ <if test="commonPage.username!=null and commonPage.username!=''">
+ and t.contact_name like concat(#{username},'%')
+ </if>
+ </where>
+ order by t.create_time desc
+ </select>
+
+</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgMapper.xml
new file mode 100644
index 0000000..09eed9c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgMapper.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.panzhihua.service_community.dao.ComActSocialOrgDao">
+
+ <resultMap type="com.panzhihua.service_community.entity.ComActSocialOrg" id="ComActSocialOrgBaseResultMap">
+ <result property="id" column="id"/>
+ <result property="name" column="name"/>
+ <result property="businessNumber" column="business_number"/>
+ <result property="buildDate" column="build_date"/>
+ <result property="agencyCode" column="agency_code"/>
+ <result property="weixinOfficialAccounts" column="weixin_official_accounts"/>
+ <result property="companyType" column="company_type"/>
+ <result property="registFee" column="regist_fee"/>
+ <result property="assetsTotal" column="assets_total"/>
+ <result property="assetsNet" column="assets_net"/>
+ <result property="salesFee" column="sales_fee"/>
+ <result property="taxesLastYear" column="taxes_last_year"/>
+ <result property="staffCount" column="staff_count"/>
+ <result property="maillingAddr" column="mailling_addr"/>
+ <result property="postCode" column="post_code"/>
+ <result property="officialUrl" column="official_url"/>
+ <result property="corporationName" column="corporation_name"/>
+ <result property="corporationGen" column="corporation_gen"/>
+ <result property="corporationOfficePhone" column="corporation_office_phone"/>
+ <result property="corporationPosition" column="corporation_position"/>
+ <result property="corporationPhone" column="corporation_phone"/>
+ <result property="corporationEmail" column="corporation_email"/>
+ <result property="contactName" column="contact_name"/>
+ <result property="contactGen" column="contact_gen"/>
+ <result property="contactOfficePhone" column="contact_office_phone"/>
+ <result property="contactPosition" column="contact_position"/>
+ <result property="contactPhone" column="contact_phone"/>
+ <result property="contactEmail" column="contact_email"/>
+ <result property="businessScope" column="business_scope"/>
+ <result property="businessImpact" column="business_impact"/>
+ <result property="attachUrl" column="attach_url"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createAt" column="create_at"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateAt" column="update_at"/>
+ <result property="communityId" column="community_id"/>
+ <result property="userId" column="user_id"/>
+ </resultMap>
+
+ <select id="pageList" resultType="com.panzhihua.common.model.vos.community.ComActSocialOrgVO">
+ select t.*,t1.account,t1.password from com_act_social_org t left join sys_user t1 on t.user_id = t1.user_id
+ <where>
+ 1=1
+ <if test="commonPage.type!=null">
+ and t.type =#{commonPage.type}
+ </if>
+ <if test="commonPage.name!=null and commonPage.name!=''">
+ and t.name like concat(#{commonPage.name},'%')
+ </if>
+ <if test="commonPage.serialNo!=null and commonPage.serialNo!=''">
+ and t.agencyCode like concat(#{commonPage.serialNo},'%')
+ </if>
+ <if test="commonPage.username!=null and commonPage.username!=''">
+ and t.corporation_name like concat(#{commonPage.username},'%')
+ </if>
+ <if test="commonPage.systemName!=null and commonPage.systemName!=''">
+ and t.contact_name like concat(#{commonPage.systemName},'%')
+ </if>
+ <if test="commonPage.paramId!=null">
+ and t.community_id =#{commonPage.paramId}
+ </if>
+ </where>
+ order by t.create_at desc
+ </select>
+
+</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyAlarmApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyAlarmApi.java
index f74e666..f7bdc7e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyAlarmApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyAlarmApi.java
@@ -64,7 +64,7 @@
ComPropertyAlarm comPropertyAlarm=new ComPropertyAlarm();
BeanUtils.copyProperties(comPropertyAlarmVO,comPropertyAlarm);
comPropertyAlarm.setCreateTime(DateUtil.date());
- return R.ok(this.comPropertyAlarmService.insert(comPropertyAlarm));
+ return this.comPropertyAlarmService.insert(comPropertyAlarm);
}
/**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/message/AlarmMessage.java b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/message/AlarmMessage.java
index 15d4c87..eed16c8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/message/AlarmMessage.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/message/AlarmMessage.java
@@ -11,6 +11,9 @@
import javax.annotation.Resource;
+/**
+ * @author zzj
+ */
@Component
@Slf4j
public class AlarmMessage {
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/util/JPushUtil.java b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/util/JPushUtil.java
index 3f31b37..08cc430 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/util/JPushUtil.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/util/JPushUtil.java
@@ -13,6 +13,7 @@
import cn.jpush.api.push.model.notification.IosNotification;
import cn.jpush.api.push.model.notification.Notification;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
import java.util.Map;
@@ -28,8 +29,9 @@
/** 设置好账号的app_key和masterSecret是必须的
用自己创建以用后的APP_KEY和MASTER_SECRET
替换即可，后期可写到yml配置文件中*/
- private static String APP_KEY = "a13e73a76eb2a9abd434451c";
- private static String MASTER_SECRET = "98d696e5ae5bfb329cd32a8e";
+ @Value("{JPush.APP_KEY}")
+ private static String APP_KEY = "6db03724d207e0debcca68af";
+ private static String MASTER_SECRET = "8ba46c3e30e1fd2cea0b246e";
// 极光推送>>Android
//Map<String, String> parm是我自己传过来的参数,可以自定义参数
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
index 9582e1e..23dd8c5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -369,6 +369,19 @@
}
/**
+ * 新增社区后台物业，社会组织，业主委员会账户
+ *
+ * @param administratorsUserVO
+ * 账户信息
+ * @return 新增结果
+ */
+ @PostMapping("adduserbackstageproperty")
+ public R adduserbackstageproperty(@RequestBody AdministratorsUserVO administratorsUserVO) {
+
+ return userService.addUserBackstageProperty(administratorsUserVO);
+ }
+
+ /**
* 删除后台用户
*
* @param administratorsUserVO
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
index aab1a9f..69b68ce 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -229,6 +229,15 @@
R addUserBackstage(AdministratorsUserVO administratorsUserVO);
/**
+ * 新增社区后台物业，社会组织，业主委员会账户
+ *
+ * @param administratorsUserVO
+ * 账户信息
+ * @return 新增结果
+ */
+ R addUserBackstageProperty(AdministratorsUserVO administratorsUserVO);
+
+ /**
* 编辑运营、社区后台账户
*
* @param administratorsUserVO
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index fbbada2..f6dde45 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -239,6 +239,9 @@
loginUserInfoVO.setAccount(name);
loginUserInfoVO.setType(sysUserDO.getType());
loginUserInfoVO.setIsRealNamed(sysUserDO.getIdCard() != null);// 暂时 身份证判断实名制
+ if(sysUserDO.getCommunityId()!=null){
+ loginUserInfoVO.setCommunityId(sysUserDO.getCommunityId());
+ }
List<SysRoleDO> roleDOList = roleDAO.selectByUserId(sysUserDO.getUserId());
Set<String> set = new HashSet<>();
if (!ObjectUtils.isEmpty(roleDOList)) {
@@ -999,7 +1002,47 @@
sysUserRoleDO.setRoleId(roleDO.getRoleId());
int insert1 = sysUserRoleDAO.insert(sysUserRoleDO);
if (insert1 > 0) {
- return R.ok();
+ return R.ok(userId);
+ }
+ }
+ return R.fail();
+ }
+
+ @Override
+ public R addUserBackstageProperty(AdministratorsUserVO administratorsUserVO) {
+ SysUserDO sysUserDO = new SysUserDO();
+ Long roleId = administratorsUserVO.getRoleId();
+ SysRoleDO roleDO = roleDAO.selectById(roleId);
+ if (ObjectUtils.isEmpty(roleDO)) {
+ return R.fail("角色不存在");
+ }
+ String encode = new BCryptPasswordEncoder().encode(administratorsUserVO.getPassword());
+ administratorsUserVO.setPassword(encode);
+ BeanUtils.copyProperties(administratorsUserVO, sysUserDO);
+ int insert = 0;
+ try {
+ insert = userDao.insert(sysUserDO);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("新增后台用户报错【{}】", e.getMessage());
+ if (e.getMessage().contains("union_phone_type")) {
+ throw new ServiceException("手机号已经存在");
+ } else if (e.getMessage().contains("union_account_type")) {
+ throw new ServiceException("账户已经存在");
+ }
+
+ }
+ if (insert > 0) {
+ SysUserDO sysUserDO1 = userDao
+ .selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, administratorsUserVO.getType())
+ .eq(SysUserDO::getAccount, administratorsUserVO.getAccount()));
+ Long userId = sysUserDO1.getUserId();
+ SysUserRoleDO sysUserRoleDO = new SysUserRoleDO();
+ sysUserRoleDO.setUserId(userId);
+ sysUserRoleDO.setRoleId(roleDO.getRoleId());
+ int insert1 = sysUserRoleDAO.insert(sysUserRoleDO);
+ if (insert1 > 0) {
+ return R.ok(userId);
}
}
return R.fail();
--
Gitblit v1.7.1