springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java
@@ -9,8 +9,10 @@ import com.panzhihua.common.model.vos.user.AdministratorsUserVO; import com.panzhihua.common.service.user.UserService; import com.panzhihua.common.utlis.Snowflake; import com.panzhihua.service_community.entity.ComEvent; import com.panzhihua.service_community.entity.ComSanshuoExpert; import com.panzhihua.service_community.service.ComSanShuoExpertService; import com.panzhihua.service_community.service.IComEventService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -19,6 +21,7 @@ import javax.annotation.Resource; import javax.xml.crypto.Data; import java.util.Date; import java.util.List; /** * 三说会堂调解专家控制器 @@ -31,6 +34,8 @@ private ComSanShuoExpertService comSanShuoExpertService; @Resource private UserService userService; @Resource private IComEventService comEventService; /** * 添加专家 @@ -83,6 +88,10 @@ @DeleteMapping("/remove") public R remove(@RequestParam("id")Long id){ //TODO 是否有为解决事件 List<ComEvent> list = comEventService.list(new QueryWrapper<ComEvent>().lambda().eq(ComEvent::getSpecialistId, id).in(ComEvent::getEventProcessStatus, (1), (2), (5))); if (list.size()!=0){ return R.fail("有未调解完成事件，无法删除！"); } ComSanshuoExpert expert = comSanShuoExpertService.getById(id); expert.setStatus(0); expert.setDelFlag(0); @@ -96,6 +105,7 @@ public R resetPassword(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO){ ComSanshuoExpert expert = comSanShuoExpertService.getById(comSanshuoExpertDTO.getId()); expert.setPassword(comSanshuoExpertDTO.getPassword()); userService.sanShuoResetPassword(comSanshuoExpertDTO.getAccount(),comSanshuoExpertDTO.getPassword() ); return R.ok(comSanShuoExpertService.updateById(expert)); }
@@ -5,11 +5,14 @@ import com.panzhihua.common.model.dtos.community.sanshuo.ComSanShuoIndustryCenterDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.service.user.UserService; import com.panzhihua.service_community.entity.ComEvent; import com.panzhihua.service_community.entity.ComSanshuoIndustryCenter; import com.panzhihua.service_community.service.ComSanShuoIndustryCenterService; import com.panzhihua.service_community.service.IComEventService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; /** * 三说会堂业务中心管理控制器 @@ -21,6 +24,8 @@ private ComSanShuoIndustryCenterService comSanShuoIndustryCenterService; @Resource private UserService userService; @Resource private IComEventService comEventService; @GetMapping("/list") public R list(@RequestParam(value = "keyWord", required = false) String keyWord, @@ -61,6 +66,10 @@ */ @DeleteMapping("/remove") public R remove(@RequestParam("id") Long id) { List<ComEvent> list = comEventService.list(new QueryWrapper<ComEvent>().lambda().eq(ComEvent::getSpecialistId, id).in(ComEvent::getEventProcessStatus, (1), (2), (5))); if (list.size()!=0){ return R.fail("有未调解完成事件，无法删除！"); } ComSanshuoIndustryCenter center = comSanShuoIndustryCenterService.getById(id); center.setDelFlag(0); center.setStatus(0); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java
@@ -82,7 +82,7 @@ int insert = comSanshuoExpertDao.insert(expert); if (insert>0){ try { comSanshuoExpertDTO.setPassword(MyAESUtil.Encrypt(comSanshuoExpertDTO.getPassword(),"Ryo7M3n8loC5Abcd")); comSanshuoExpertDTO.setPassword(comSanshuoExpertDTO.getPassword()); } catch (Exception e) { e.printStackTrace(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoIndustryCenterServiceImpl.java
@@ -71,7 +71,7 @@ user.setName(comSanShuoIndustryCenterDTO.getName()); user.setType(12); try { user.setPassword(MyAESUtil.Encrypt(comSanShuoIndustryCenterDTO.getPassword(),"Ryo7M3n8loC5Abcd")); user.setPassword(comSanShuoIndustryCenterDTO.getPassword()); } catch (Exception e) { e.printStackTrace(); } @@ -92,8 +92,7 @@ @Override public R resetPassword(ComSanshuoIndustryCenter center) { try { String pass=MyAESUtil.Encrypt(center.getPassword(), "Ryo7M3n8loC5Abcd"); return userService.sanShuoResetPassword(center.getAccount(), pass); return userService.sanShuoResetPassword(center.getAccount(), center.getPassword()); } catch (Exception e) { e.printStackTrace(); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -3757,7 +3757,7 @@ sysUserDO.setCreateAt(new Date()); sysUserDO.setUserId(administratorsUserVO.getUserId()); sysUserDO.setAccount(administratorsUserVO.getAccount()); sysUserDO.setPassword(administratorsUserVO.getPassword()); sysUserDO.setPassword(new BCryptPasswordEncoder().encode(administratorsUserVO.getPassword())); sysUserDO.setName(administratorsUserVO.getName()); if (nonNull(administratorsUserVO.getImageUrl())){ sysUserDO.setImageUrl(administratorsUserVO.getImageUrl()); @@ -3788,7 +3788,7 @@ public R resetPassExpertOrIndustryCenter(String account,String password) { SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().eq("account", account)); if (nonNull(sysUserDO)){ sysUserDO.setPassword(password); sysUserDO.setPassword(new BCryptPasswordEncoder().encode(password)); userDao.updateById(sysUserDO); return R.ok(); }
