diff --git a/pom.xml b/pom.xml index 63e2270..6a24f63 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,11 @@ zcloud_gbscommon 1.0.0-SNAPSHOT + + org.apache.shiro + shiro-core + 1.9.0 + diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java index ad555b7..60253d0 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java @@ -88,5 +88,19 @@ public class CorpInfoController { return corpInfoService.corpDepartlist(qry); } + @ApiOperation("修改密码") + @PostMapping("/changePassword/{id}") + public SingleResponse changePassword(@PathVariable Long id){ + corpInfoService.changePassword(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("修改公司名称") + @PostMapping("/changeCompanyName") + public SingleResponse changeCompanyName(@Validated @RequestBody CorpInfoUpdateCmd corpInfoUpdateCmd){ + corpInfoService.changeCompanyName(corpInfoUpdateCmd); + return SingleResponse.buildSuccess(); + } + } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoUpdateExe.java index c5b3582..45f005e 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoUpdateExe.java @@ -30,5 +30,11 @@ public class CorpInfoUpdateExe { throw new BizException("修改失败"); } } + + public void changeCompanyName(CorpInfoUpdateCmd corpInfoUpdateCmd) { + CorpInfoE corpInfoE = new CorpInfoE(); + BeanUtils.copyProperties(corpInfoUpdateCmd, corpInfoE); + corpInfoGateway.changeCompanyName(corpInfoE); + } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/SysUserUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/SysUserUpdateExe.java index e3ce05d..48420dd 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/SysUserUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/SysUserUpdateExe.java @@ -3,12 +3,15 @@ package com.zcloud.basic.info.command; import com.alibaba.cola.exception.BizException; import com.zcloud.basic.info.domain.gateway.SysUserGateway; import com.zcloud.basic.info.domain.model.SysUserE; +import com.zcloud.basic.info.dto.CorpInfoUpdateCmd; import com.zcloud.basic.info.dto.SysUserUpdateCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import javax.validation.constraints.NotEmpty; + /** * web-app @@ -30,5 +33,13 @@ public class SysUserUpdateExe { throw new BizException("修改失败"); } } + + public void changePassword(Long id) { + sysUserGateway.changePassword(id); + } + + public void changeCompanyName(Long userId,String corpName) { + sysUserGateway.changeCompanyName(userId,corpName); + } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java index 4dfc663..26f499f 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java @@ -17,6 +17,7 @@ import com.zcloud.basic.info.persistence.repository.CorpInfoRepository; import com.zcloud.basic.info.persistence.repository.DepartmentRepository; import com.zcloud.gbscommon.utils.PageQueryHelper; import lombok.AllArgsConstructor; +import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; @@ -39,6 +40,7 @@ public class CorpInfoQueryExe { private final CorpInfoCoConvertor corpInfoCoConvertor; private final DepartmentRepository departmentRepository; + /** * 分页 * diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java index 3a862b5..cec10a6 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java @@ -4,21 +4,17 @@ import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.basic.info.api.CorpInfoServiceI; -import com.zcloud.basic.info.command.CorpInfoAddExe; -import com.zcloud.basic.info.command.CorpInfoRemoveExe; -import com.zcloud.basic.info.command.CorpInfoUpdateExe; -import com.zcloud.basic.info.command.SysUserAddExe; +import com.zcloud.basic.info.command.*; import com.zcloud.basic.info.command.query.CorpInfoQueryExe; import com.zcloud.basic.info.dto.*; import com.zcloud.basic.info.dto.clientobject.CorpDepartmentCO; import com.zcloud.basic.info.dto.clientobject.CorpInfoCO; -import com.zcloud.basic.info.enums.UserTypeEnum; +import com.zcloud.basic.info.domain.enums.UserTypeEnum; import com.zcloud.gbscommon.utils.Tools; +import org.apache.shiro.crypto.hash.SimpleHash; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; -import java.util.List; - /** * web-app * @@ -33,6 +29,7 @@ public class CorpInfoServiceImpl implements CorpInfoServiceI { private final CorpInfoRemoveExe corpInfoRemoveExe; private final CorpInfoQueryExe corpInfoQueryExe; private final SysUserAddExe sysUserAddExe; + private final SysUserUpdateExe sysUserUpdateExe; @Override public PageResponse listPage(CorpInfoPageQry qry) { @@ -49,6 +46,7 @@ public class CorpInfoServiceImpl implements CorpInfoServiceI { //新增企业成功后新增企业主账号用户(企业主账号的gbsId与企业的gbsId一致) 2025-10-31 huangyuxuan SysUserAddCmd user = new SysUserAddCmd(); user.setId(userId).setUserId(Tools.get32UUID()).setUsername(cmd.getCorpName()).setName(cmd.getCorpName()) + .setPassword(new SimpleHash("SHA-1",user.getUsername(),"Aa@123456789").toHex()) .setCorpinfoId(id).setUserType(UserTypeEnum.getUserType(cmd.getType())).setStatus("0") .setDepartmentId(id); sysUserAddExe.execute(user); @@ -79,5 +77,17 @@ public class CorpInfoServiceImpl implements CorpInfoServiceI { public PageResponse corpDepartlist(CorpDepartmentQry qry) { return corpInfoQueryExe.corpDepartlist(qry); } + + @Override + public void changePassword(Long id) { + sysUserUpdateExe.changePassword(id); + } + + @Override + public void changeCompanyName(CorpInfoUpdateCmd corpInfoUpdateCmd) { + corpInfoUpdateExe.changeCompanyName(corpInfoUpdateCmd); + Long userId = AuthContext.getUserId(); + sysUserUpdateExe.changeCompanyName(userId,corpInfoUpdateCmd.getCorpName()); + } } diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java index 77143c0..4e98d7d 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java +++ b/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java @@ -31,5 +31,9 @@ public interface CorpInfoServiceI { CorpInfoCO info(Long id); PageResponse corpDepartlist(CorpDepartmentQry qry); + + void changePassword(Long id); + + void changeCompanyName(CorpInfoUpdateCmd corpInfoUpdateCmd); } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java index 934732c..a0cee94 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java @@ -24,5 +24,6 @@ public class CorpInfoPageQry extends PageQuery { * - `ne`: 不等比较查询，对应SQL的!=操作符 */ private String likeCorpinfoId; + private Long corpinfoId; } diff --git a/web-app/src/main/java/com/zcloud/basic/info/enums/CorpTypeEnum.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpTypeEnum.java similarity index 91% rename from web-app/src/main/java/com/zcloud/basic/info/enums/CorpTypeEnum.java rename to web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpTypeEnum.java index 1616e09..4dde900 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/enums/CorpTypeEnum.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpTypeEnum.java @@ -1,4 +1,4 @@ -package com.zcloud.basic.info.enums; +package com.zcloud.basic.info.domain.enums; import lombok.Getter; diff --git a/web-app/src/main/java/com/zcloud/basic/info/enums/UserTypeEnum.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/UserTypeEnum.java similarity index 94% rename from web-app/src/main/java/com/zcloud/basic/info/enums/UserTypeEnum.java rename to web-domain/src/main/java/com/zcloud/basic/info/domain/enums/UserTypeEnum.java index 281a468..2a8abf9 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/enums/UserTypeEnum.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/UserTypeEnum.java @@ -1,4 +1,4 @@ -package com.zcloud.basic.info.enums; +package com.zcloud.basic.info.domain.enums; import lombok.Getter; diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/CorpInfoGateway.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/CorpInfoGateway.java index 4231c07..e1a4d19 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/CorpInfoGateway.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/CorpInfoGateway.java @@ -26,5 +26,7 @@ public interface CorpInfoGateway { Boolean deletedCorpInfoById(Long id); Boolean deletedCorpInfoByIds(Long[] id); + + void changeCompanyName(CorpInfoE corpInfoE); } diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/SysUserGateway.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/SysUserGateway.java index 215d889..17d48e7 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/SysUserGateway.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/SysUserGateway.java @@ -27,5 +27,9 @@ public interface SysUserGateway { Boolean deletedSysUserById(Long id); Boolean deletedSysUserByIds(Long[] id); + + void changePassword(Long id); + + void changeCompanyName(Long userId, String corpName); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/CorpInfoGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/CorpInfoGatewayImpl.java index c40d63e..62aec59 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/CorpInfoGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/CorpInfoGatewayImpl.java @@ -46,5 +46,12 @@ public class CorpInfoGatewayImpl implements CorpInfoGateway { public Boolean deletedCorpInfoByIds(Long[] ids) { return corpInfoRepository.removeByIds(Collections.singletonList(ids)); } + + @Override + public void changeCompanyName(CorpInfoE corpInfoE) { + CorpInfoDO corpInfo = corpInfoRepository.getById(corpInfoE.getId()); + corpInfo.setCorpName(corpInfoE.getCorpName()); + corpInfoRepository.updateById(corpInfo); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/SysUserGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/SysUserGatewayImpl.java index af0a9a1..2b52f22 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/SysUserGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/SysUserGatewayImpl.java @@ -5,6 +5,7 @@ import com.zcloud.basic.info.domain.model.SysUserE; import com.zcloud.basic.info.persistence.dataobject.SysUserDO; import com.zcloud.basic.info.persistence.repository.SysUserRepository; import lombok.AllArgsConstructor; +import org.apache.shiro.crypto.hash.SimpleHash; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -46,5 +47,20 @@ public class SysUserGatewayImpl implements SysUserGateway { public Boolean deletedSysUserByIds(Long[] ids) { return sysUserRepository.removeByIds(Collections.singletonList(ids)); } + + @Override + public void changePassword(Long id) { + SysUserDO user = sysUserRepository.getById(id); + user.setPassword(new SimpleHash("SHA-1",user.getUsername(),"Aa@123456789").toHex()); + sysUserRepository.updateById(user); + } + + @Override + public void changeCompanyName(Long userId, String newCorpName) { + SysUserDO user = sysUserRepository.getById(userId); + user.setName(newCorpName); + user.setPassword(new SimpleHash("SHA-1",newCorpName,"Aa@123456789").toHex()); + sysUserRepository.updateById(user); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java index f0fb725..9e27463 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java @@ -1,5 +1,6 @@ package com.zcloud.basic.info.persistence.repository.impl; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.cola.dto.PageResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -28,10 +29,13 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl listPage(Map parmas) { - IPage iPage = new Query().getPage(parmas); + public PageResponse listPage(Map params) { + IPage iPage = new Query().getPage(params); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + if (ObjectUtil.isNotEmpty(params.get("corpinfoId"))){ + queryWrapper.eq("corpinfo_id",params.get("corpinfoId")); + } queryWrapper.orderByDesc("create_time"); IPage result = corpInfoMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords());