From 29167f6c5d895749f369fadbcd4b3c0a3a17052c Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 14 九月 2022 15:40:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sanshuohuitang_dev' into sanshuohuitang_dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoIndustryCenterServiceImpl.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoIndustryCenterServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoIndustryCenterServiceImpl.java
index da4ca4e..2550246 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoIndustryCenterServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoIndustryCenterServiceImpl.java
@@ -1,8 +1,9 @@
package com.panzhihua.service_community.service.impl;
import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.db.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.model.dtos.community.sanshuo.ComSanShuoIndustryCenterDTO;
import com.panzhihua.common.model.vos.R;
@@ -13,8 +14,8 @@
import com.panzhihua.service_community.dao.SysUserDao;
import com.panzhihua.service_community.entity.ComSanshuoIndustryCenter;
import com.panzhihua.service_community.entity.SysUser;
-import com.panzhihua.service_community.util.MyAESUtil;
import com.panzhihua.service_community.service.ComSanShuoIndustryCenterService;
+import com.panzhihua.service_community.util.MyAESUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -53,6 +54,9 @@
public R addOrUpdate(ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO) {
ComSanshuoIndustryCenter comSanshuoIndustryCenter = comSanshuoIndustryCenterDao.selectOne(new QueryWrapper<ComSanshuoIndustryCenter>().eq("name", comSanShuoIndustryCenterDTO.getName()));
if (isNull(comSanShuoIndustryCenterDTO.getId())){
+ if (nonNull(comSanshuoIndustryCenter)){
+ return R.fail("业务中心已存在");
+ }
ComSanshuoIndustryCenter center=new ComSanshuoIndustryCenter();
BeanUtil.copyProperties(comSanShuoIndustryCenterDTO,center);
//添加
@@ -64,8 +68,8 @@
AdministratorsUserVO user=new AdministratorsUserVO();
user.setUserId(Snowflake.getId());
user.setAccount(comSanShuoIndustryCenterDTO.getAccount());
- user.setType(11);
user.setName(comSanShuoIndustryCenterDTO.getName());
+ user.setType(12);
try {
user.setPassword(MyAESUtil.Encrypt(comSanShuoIndustryCenterDTO.getPassword(),"Ryo7M3n8loC5Abcd"));
} catch (Exception e) {
@@ -74,9 +78,6 @@
return userService.sanShuoAddUser(user);
}
}else {
- if (nonNull(comSanshuoIndustryCenter)){
- return R.fail("业务中心已存在");
- }
ComSanshuoIndustryCenter center=new ComSanshuoIndustryCenter();
BeanUtil.copyProperties(comSanShuoIndustryCenterDTO,center);
center.setUpdateTime(new Date());
@@ -87,4 +88,15 @@
}
return R.fail("操作失败");
}
+
+ @Override
+ public R resetPassword(ComSanshuoIndustryCenter center) {
+ try {
+ String pass=MyAESUtil.Encrypt(center.getPassword(), "Ryo7M3n8loC5Abcd");
+ return userService.sanShuoResetPassword(center.getAccount(), pass);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return R.fail();
+ }
}
--
Gitblit v1.7.1