[新增功能](main)

- 修改密码
 - 修改企业名称

pom.xml

@@ -20,6 +20,11 @@
       <artifactId>zcloud_gbscommon</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.shiro</groupId>
+      <artifactId>shiro-core</artifactId>
+      <version>1.9.0</version>
+    </dependency>
   </dependencies>
   <dependencyManagement>
     <dependencies>

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();
+    }
+
 }
 

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);
+    }
 }
 

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);
+    }
 }
 

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;
 
+
     /**
      * 分页
      *

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.*;
-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.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<CorpInfoCO> 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<CorpDepartmentCO> 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());
+    }
 }
 

web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java

@@ -31,5 +31,9 @@ public interface CorpInfoServiceI {
     CorpInfoCO info(Long id);
 
     PageResponse<CorpDepartmentCO> corpDepartlist(CorpDepartmentQry qry);
+
+    void changePassword(Long id);
+
+    void changeCompanyName(CorpInfoUpdateCmd corpInfoUpdateCmd);
 }
 

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;
 }
 

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;
 

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;
 

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);
 }
 

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);
 }
 

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);
+    }
 }
 

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);
+    }
 }
 

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<CorpInfoMapper, C
     private final CorpInfoMapper corpInfoMapper;
 
     @Override
-    public PageResponse<CorpInfoDO> listPage(Map<String, Object> parmas) {
+    public PageResponse<CorpInfoDO> listPage(Map<String, Object> params) {
-        IPage<CorpInfoDO> iPage = new Query<CorpInfoDO>().getPage(parmas);
+        IPage<CorpInfoDO> iPage = new Query<CorpInfoDO>().getPage(params);
         QueryWrapper<CorpInfoDO> 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<CorpInfoDO> result = corpInfoMapper.selectPage(iPage, queryWrapper);
         return PageHelper.pageToResponse(result, result.getRecords());