企业入驻完善改动

src/main/java/com/god/system/controller/SysFirmController.java

@@ -1,8 +1,10 @@
 package com.god.system.controller;
 
 import com.god.common.core.domain.Result;
-import com.god.system.domain.Firm;
+import com.god.common.security.utils.SecurityUtils;
+import com.god.system.domain.SysFirm;
 import com.god.system.domain.req.FirmDataReq;
+import com.god.system.domain.req.QueryFirm;
 import com.god.system.service.SysFirmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -25,26 +27,27 @@ public class SysFirmController {
      * @return
      */
     @GetMapping("findFirmData")
-    public Result<Firm> findFirmData(){
+    public Result<SysFirm> findFirmData(){
-        Firm firm = sysFirmService.findFirmDataByUserId();
+        SysFirm sysFirm = sysFirmService.findFirmDataByUserId();
-        return Result.success(firm);
+        return Result.success(sysFirm);
     }
 
-    /**
-     * 企业认证
-     */
-    @PostMapping("insertFirm")
-    public Result insertFirm(@RequestBody @Validated FirmDataReq firmDataReq){
-        sysFirmService.insertFirm(Firm.FirmDataReqBuild(firmDataReq));
-        return Result.success();
-    }
 
     /**
-     * 修改企业认证信息
+     * 企业进行激活认证
      */
     @PostMapping("updateFirm")
     public Result updateFirm(@RequestBody @Validated FirmDataReq firmDataReq){
-        sysFirmService.updateFirmData(Firm.FirmDataReqBuild(firmDataReq));
+        sysFirmService.updateFirmData(SysFirm.FirmDataReqBuild(firmDataReq));
+        return Result.success();
+    }
+
+    /**
+     * 管理审核企业认证
+     */
+    @PostMapping("checkFirm")
+    public Result checkFirm(@RequestBody @Validated QueryFirm queryFirm){
+        sysFirmService.checkFirm(queryFirm);
         return Result.success();
     }
 }

src/main/java/com/god/system/controller/SysUserController.java

@@ -9,6 +9,7 @@ import com.god.common.log.annotation.Log;
 import com.god.common.log.enums.BusinessType;
 import com.god.common.security.annotation.InnerAuth;
 import com.god.common.security.annotation.RequiresPermissions;
+import com.god.common.security.annotation.RequiresRoles;
 import com.god.common.security.utils.SecurityUtils;
 import com.god.common.system.domain.SysDept;
 import com.god.common.system.domain.SysRole;
@@ -290,4 +291,15 @@ public class SysUserController extends BaseController {
     public Result deptTree (SysDept dept) {
         return success(deptService.selectDeptTreeList(dept));
     }
+
+    /**
+     * 管理员创建进本的企业账号
+     * @return
+     */
+    @RequiresRoles("admin")
+    @PostMapping("/registerFirm")
+    public Result registerFirm(@RequestBody SysUser sysUser){
+        userService.registerFirm(sysUser);
+        return Result.success();
+    }
 }

src/main/java/com/god/system/domain/SysFirm.java

@@ -19,13 +19,13 @@ import javax.validation.constraints.NotEmpty;
 @Builder
 @TableName("sys_fire")
 @NotEmpty(message = "参数不能为空")
-public class Firm {
+public class SysFirm {
     /**
      * 参数主键
      */
     @Excel(name = "参数主键", cellType = Excel.ColumnType.NUMERIC)
     @TableId( type = IdType.AUTO)
-    private Long userId;
+    private Long firmId;
 
     /**
      * 企业名称
@@ -48,9 +48,14 @@ public class Firm {
     @NotEmpty(message = "公司地址不能为空")
     private String address;
 
-    public static Firm FirmDataReqBuild(FirmDataReq firmDataReq){
+    /**
-        return Firm.builder()
+     * 企业审核状态 0待激活  1待审核  2审核失败 3已激活
-                .userId(firmDataReq.getUserId())
+     */
+    private Integer status;
+
+    public static SysFirm FirmDataReqBuild(FirmDataReq firmDataReq){
+        return SysFirm.builder()
+                .firmId(firmDataReq.getUserId())
                 .fireName(firmDataReq.getFireName())
                 .registeredAmount(firmDataReq.getRegisteredAmount())
                 .address(firmDataReq.getAddress())

src/main/java/com/god/system/domain/req/QueryFirm.java

@@ -0,0 +1,33 @@
+package com.god.system.domain.req;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @description: 查询、审核参数等
+ * @Author fst
+ * @date 2023/11/22 21:35
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class QueryFirm {
+
+    /**
+     * 审核参数 企业id
+     */
+    private Integer firmId;
+
+    /**
+     * 审核参数 审核id
+     */
+    private Integer userId;
+
+    /**
+     * 审核的结果  1通过  2驳回
+     */
+    private Integer status;
+
+
+}

src/main/java/com/god/system/mapper/SysFirmMapper.java

@@ -1,15 +1,13 @@
 package com.god.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.god.system.domain.Firm;
+import com.god.system.domain.SysFirm;
-import com.god.system.domain.req.FirmDataReq;
-import org.apache.ibatis.annotations.Param;
 
 /**
  * @author DongZl
  * @description: 配置mybatis配置
  * @Date 2023-11-13 上午 10:05
  */
-public interface SysFirmMapper  extends BaseMapper<Firm> {
+public interface SysFirmMapper  extends BaseMapper<SysFirm> {
 
 }

src/main/java/com/god/system/service/SysFirmService.java

@@ -1,33 +1,36 @@
 package com.god.system.service;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.god.system.domain.Firm;
+import com.god.system.domain.SysFirm;
-import com.god.system.domain.req.FirmDataReq;
+import com.god.system.domain.req.QueryFirm;
-
-import java.util.List;
 
 /**
  * @author DongZl
  * @description: 配置plus业务层
  * @Date 2023-11-13 上午 10:06
  */
-public interface SysFirmService extends IService<Firm>{
+public interface SysFirmService extends IService<SysFirm>{
     /**
      * 根据用户id查询企业
      * @return FirmDataReq
      */
-    Firm findFirmDataByUserId ();
+    SysFirm findFirmDataByUserId ();
 
     /**
      * 企业入驻
      */
-    void insertFirm (Firm firm);
+    void insertFirm (SysFirm sysFirm);
 
     /**
      * 修改企业信息
      */
-    public void updateFirmData (Firm firm);
+    public void updateFirmData (SysFirm sysFirm);
+
+    /**
+     * 企业入驻审核
+     * @param queryFirm
+     */
+    public void checkFirm(QueryFirm queryFirm);
 
 
 }

src/main/java/com/god/system/service/SysRoleService.java

@@ -188,4 +188,6 @@ public interface SysRoleService extends IService<SysRole> {
      * @return 结果
      */
     public int insertAuthUsers (Long roleId, Long[] userIds);
+
+
 }

src/main/java/com/god/system/service/SysUserService.java

@@ -225,4 +225,13 @@ public interface SysUserService extends IService<SysUser> {
      * @return 结果
      */
     public String importUser (List<SysUser> userList, Boolean isUpdateSupport, String operName);
+
+    /**
+     * 给用户添加角色，添加企业角色中间表
+     * @param userId
+     */
+    public void insertFirmRole(Long userId);
+
+
+    void registerFirm(SysUser sysUser);
 }

src/main/java/com/god/system/service/impl/SysFirmServiceImpl.java

@@ -6,31 +6,27 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.god.common.core.exception.ServiceException;
 import com.god.common.core.utils.StringUtils;
 import com.god.common.security.utils.SecurityUtils;
-import com.god.system.domain.Firm;
+import com.god.system.domain.SysFirm;
-import com.god.system.domain.req.FirmDataReq;
+import com.god.system.domain.req.QueryFirm;
 import com.god.system.mapper.SysFirmMapper;
 import com.god.system.service.SysFirmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-
-import java.rmi.server.ServerCloneException;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-
 /**
  * @author DongZl
  * @description: 配置plus业务实现层
  * @Date 2023-11-13 上午 10:06
  */
 @Service
-public class SysFirmServiceImpl extends ServiceImpl<SysFirmMapper,Firm> implements SysFirmService{
+public class SysFirmServiceImpl extends ServiceImpl<SysFirmMapper, SysFirm> implements SysFirmService{
 
     @Autowired
     private SysFirmMapper sysFirmMapper;
 
+    @Autowired
+    private SysRoleServiceImpl sysRoleService;
+
 
     /**
      * 根据用户查询企业
@@ -38,43 +34,57 @@ public class SysFirmServiceImpl extends ServiceImpl<SysFirmMapper,Firm> implemen
      * @return firmDataReq
      */
     @Override
-    public Firm findFirmDataByUserId() {
+    public SysFirm findFirmDataByUserId() {
         Long userId = SecurityUtils.getUserId();
-        QueryWrapper<Firm> firmDataReqQueryWrapper = new QueryWrapper<>();
+        QueryWrapper<SysFirm> firmDataReqQueryWrapper = new QueryWrapper<>();
         firmDataReqQueryWrapper.eq(true,"userId",userId);
-        Firm firm = sysFirmMapper.selectById(firmDataReqQueryWrapper);
+        SysFirm sysFirm = sysFirmMapper.selectById(firmDataReqQueryWrapper);
-        if (StringUtils.isNull(firm)){
+        if (StringUtils.isNull(sysFirm)){
             throw  new ServiceException("请先进行企业认证");
         }
-        return firm;
+        return sysFirm;
     }
 
     /**
      * 企业入驻
-     * @param firm
+     * @param sysFirm
      */
     @Override
-    public void insertFirm(Firm firm) {
+    public void insertFirm(SysFirm sysFirm) {
-        Long userId = SecurityUtils.getUserId();
+        sysFirm.setStatus(0);
-        firm.setUserId(userId);
+        int insert = sysFirmMapper.insert(sysFirm);
-        boolean save = this.save(firm);
+        if (insert<1){
-        if (!save){
             throw  new ServiceException("企业认证失败");
         }
     }
 
     /**
-     * 更改企业信息
+     * 企业激活
-     * @param firm
+     * @param sysFirm
      */
     @Override
-    public void updateFirmData(Firm firm) {
+    public void updateFirmData(SysFirm sysFirm) {
         Long userId = SecurityUtils.getUserId();
-        firm.setUserId(userId);
+        sysFirm.setFirmId(userId);
-        UpdateWrapper<Firm> firmUpdateWrapper = new UpdateWrapper<>();
+        //状态是待审核状态
-        boolean update = this.update(firm, firmUpdateWrapper);
+        sysFirm.setStatus(1);
-        if (!update){
+        int i = sysFirmMapper.updateById(sysFirm);
-            throw  new ServiceException("修改失败");
+        if (i<1){
+            throw  new ServiceException("企业认证异常");
         }
     }
+
+    /**
+     * 企业入驻审核
+     * @param queryFirm
+     */
+    @Override
+    public void checkFirm(QueryFirm queryFirm) {
+        //修改企业状态
+        UpdateWrapper<SysFirm> firmUpdateWrapper = new UpdateWrapper<>();
+        firmUpdateWrapper.eq("firmId",queryFirm.getFirmId()).set("status",queryFirm.getStatus());
+        //通过mybatis-plus进行修改
+        sysFirmMapper.update(null,firmUpdateWrapper);
+
+    }
 }

src/main/java/com/god/system/service/impl/SysRoleServiceImpl.java

@@ -55,6 +55,8 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         return roleMapper.selectRoleList(role);
     }
 
+
+
     /**
      * 根据用户ID查询角色
      *
@@ -396,4 +398,10 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         }
         return userRoleMapper.batchUserRole(list);
     }
+
+    /**
+     * 给用户添加企业角色
+     * @param userId
+     */
+
 }

src/main/java/com/god/system/service/impl/SysUserServiceImpl.java

@@ -10,10 +10,12 @@ import com.god.common.datascope.annotation.DataScope;
 import com.god.common.security.utils.SecurityUtils;
 import com.god.common.system.domain.SysRole;
 import com.god.common.system.domain.SysUser;
+import com.god.system.domain.SysFirm;
 import com.god.system.domain.SysPost;
 import com.god.system.domain.SysUserPost;
 import com.god.system.domain.SysUserRole;
 import com.god.system.mapper.*;
+import com.god.system.service.SysFirmService;
 import com.god.system.service.SysUserService;
 import com.god.system.service.SysConfigService;
 import org.slf4j.Logger;
@@ -28,6 +30,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static com.god.common.core.utils.SpringUtils.*;
+
 /**
  * 用户 业务层处理
  *
@@ -50,6 +54,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     private SysUserPostMapper userPostMapper;
     @Autowired
     private SysConfigService configService;
+    @Autowired
+    private SysFirmService sysFirmService;
+
 
     /**
      * 根据条件分页查询用户列表
@@ -219,7 +226,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
             SysUser user = new SysUser();
             user.setUserId(userId);
-            List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);
+            List<SysUser> users = getAopProxy(this).selectUserList(user);
             if (StringUtils.isEmpty(users)) {
                 throw new ServiceException("没有权限访问用户数据！");
             }
@@ -500,4 +507,34 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return successMsg.toString();
     }
 
+    /**
+     * 给对应用户添加企业角色
+     * @param userId
+     */
+    @Override
+    public void insertFirmRole(Long userId) {
+        SysUserRole sysUserRole = new SysUserRole();
+        sysUserRole.setRoleId(100L);
+        sysUserRole.setUserId(userId);
+        int i = userRoleMapper.insert(sysUserRole);
+    }
+
+    @Override
+    @Transactional
+    public void registerFirm(SysUser sysUser) {
+        int insert = userMapper.insert(sysUser);
+        //获取新注册用户id
+        Long userId = sysUser.getUserId();
+        //添加新用户企业基本信息数据
+        SysFirm sysFirm = new SysFirm();
+        sysFirm.setFirmId(userId);
+        sysFirm.setStatus(0);
+        sysFirmService.insertFirm(sysFirm);
+        //分配角色
+        insertFirmRole(userId);
+        if (insert<1){
+            throw new ServiceException("企业基本账号注册失败");
+        }
+    }
+
 }