F

admin/src/main/java/com/njyunzhi/admin/controller/SysLoginController.java

@@ -2,10 +2,10 @@ package com.njyunzhi.admin.controller;
 
 import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.util.SaResult;
-import com.njyunzhi.admin.dto.ChangePasswordDTO;
-import com.njyunzhi.admin.dto.LoginDTO;
+import com.njyunzhi.admin.dto.*;
 import com.njyunzhi.admin.service.FxTenantService;
 import com.njyunzhi.admin.service.SysLoginService;
+import com.njyunzhi.admin.service.SysUserService;
 import com.njyunzhi.common.util.StringUtil;
 import com.njyunzhi.repository.BaseController;
 import com.njyunzhi.repository.entity.FxTenant;
@@ -34,34 +34,58 @@ public class SysLoginController extends BaseController {
     private SysLoginService sysLoginService;
     @Autowired
     private FxTenantService fxTenantService;
-
-    @PostMapping("/login")
-    @ApiOperation(value = "后台登录", notes = "后台登录", httpMethod = "POST", response = SaResult.class)
-    public SaResult login(@ApiParam("登录参数") @RequestBody LoginDTO loginParm) throws Exception {
-        FxTenant fxTenant = fxTenantService.getById(loginParm.getTenantId());
-        if (fxTenant == null) {
-            throw new Exception("沒有此租戶");
+    @Autowired
+    private SysUserService sysUserService;
+
+    @PostMapping("/register")
+    @ApiOperation(value = "注册", notes = "注册", httpMethod = "POST", response = SaResult.class)
+    public SaResult register(@ApiParam("注册参数") @RequestBody RegisterDTO registerDTO) throws Exception {
+        long cnt = sysUserService.countBy("user_name", registerDTO.getUserName());
+        if (cnt > 0) {
+            return SaResult.error("租户名称重复");
         }
-        if (fxTenant.getStatus().equals(0)) {
-            throw new Exception("未激活");
 
+         cnt = sysUserService.countBy("phone", registerDTO.getPhone());
+        if (cnt > 0) {
+            return SaResult.error("手机号码重复");
         }
 
-        if (fxTenant.getStatus().equals(2)) {
-            throw new Exception("停用");
 
-        }
 
+        sysLoginService.registersMerchant(registerDTO);
+
+        return SaResult.ok("注册成功");
+    }
 
-        if (StringUtil.isEmpty(loginParm.getTenantId())) {
-            throw new Exception("所属租户不能为空");
-        }
+
+    @PostMapping("/login")
+    @ApiOperation(value = "后台登录", notes = "后台登录", httpMethod = "POST", response = SaResult.class)
+    public SaResult login(@ApiParam("登录参数") @RequestBody LoginDTO loginParm) throws Exception {
+//        String loginName=loginParm.getLoginName();
+//        FxTenant fxTenant = fxTenantService.getById(loginParm.getTenantId());
+//        if (fxTenant == null) {
+//            throw new Exception("沒有此租戶");
+//        }
+//        if (fxTenant.getStatus().equals(0)) {
+//            throw new Exception("未激活");
+//
+//        }
+//
+//        if (fxTenant.getStatus().equals(2)) {
+//            throw new Exception("停用");
+//
+//        }
+
+
+//        if (StringUtil.isEmpty(loginParm.getTenantId())) {
+//            throw new Exception("所属租户不能为空");
+//        }
 
         if (StringUtil.isEmpty(loginParm.getLoginName()) || StringUtil.isEmpty(loginParm.getPassword())) {
             return SaResult.error("登录用户或者密码不能为空");
         }
 
-        SysUser sysUser = sysLoginService.login(loginParm,fxTenant.getTenantId());
+        SysUser sysUser = sysLoginService.login(loginParm);
 
         StpUtil.login(sysUser.getUserId());
         String tokenValue = StpUtil.getTokenValue();
@@ -99,4 +123,41 @@ public class SysLoginController extends BaseController {
         return SaResult.ok("密码修改成功");
     }
 
+
+    @PutMapping("/change-phone")
+    @ApiOperation(value = "修改手机号", notes = "修改手机号", httpMethod = "PUT", response = SaResult.class)
+    public SaResult changePhone(@ApiParam("修改手机参数") @RequestBody ChangePhoneDTO param) throws Exception {
+        if (StringUtil.isEmpty(param.getOriginPhone()) || StringUtil.isEmpty(param.getNewPhone())) {
+            return SaResult.error("原始手机号或新手机号不能为空");
+        }
+
+        SysUser sysUser = (SysUser) currentUser();
+
+        boolean isOk = sysLoginService.changePhone(sysUser, param);
+        if (!isOk) {
+            SaResult.error("修改失败, 请重试");
+        }
+
+        return SaResult.ok("手机号修改成功");
+    }
+
+
+    @PutMapping("/change-email")
+    @ApiOperation(value = "修改邮箱", notes = "修改邮箱", httpMethod = "PUT", response = SaResult.class)
+    public SaResult changeEmail(@ApiParam("修改邮箱参数") @RequestBody ChangeEmailDTO param) throws Exception {
+        if (StringUtil.isEmpty(param.getOriginEmail()) || StringUtil.isEmpty(param.getNewEmail())) {
+            return SaResult.error("原始邮箱或新邮箱不能为空");
+        }
+
+        SysUser sysUser = (SysUser) currentUser();
+
+        boolean isOk = sysLoginService.changeEmail(sysUser, param);
+        if (!isOk) {
+            SaResult.error("修改失败, 请重试");
+        }
+
+        return SaResult.ok("邮箱修改成功");
+    }
+
+
 }

admin/src/main/java/com/njyunzhi/admin/controller/TaCompanyBeneficiaryInfoController.java

@@ -0,0 +1,120 @@
+package com.njyunzhi.admin.controller;
+
+import cn.dev33.satoken.util.SaResult;
+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.njyunzhi.admin.service.TaCompanyBeneficiaryInfoService;
+import com.njyunzhi.common.util.StringUtil;
+import com.njyunzhi.framework.accesslimit.AccessLimit;
+import com.njyunzhi.framework.log.OpLog;
+import com.njyunzhi.repository.BaseController;
+import com.njyunzhi.repository.entity.TaCompanyBeneficiaryInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 受益所有人信息;(ta_company_beneficiary_info)表控制层
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2024-2-28
+ */
+@Api(tags = "受益所有人信息对象功能接口")
+@RestController
+@RequestMapping("/admin")
+public class TaCompanyBeneficiaryInfoController extends BaseController {
+
+    @Autowired
+    private TaCompanyBeneficiaryInfoService taCompanyBeneficiaryInfoService;
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    @OpLog(module = "受益所有人信息", action = "查询单条数据", desc = "ID：{{#id}}")
+    @AccessLimit()
+    @ApiOperation("通过ID查询单条数据")
+    @GetMapping("/taCompanyBeneficiaryInfo/{id}")
+    public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        return SaResult.data(taCompanyBeneficiaryInfoService.getById(id));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param pageNum  当前页码
+     * @param pageSize 每页条数
+     * @return 查询结果
+     */
+    @OpLog(module = "受益所有人信息", action = "分页列表查询")
+    @AccessLimit()
+    @ApiOperation("分页查询")
+    @GetMapping("/taCompanyBeneficiaryInfo")
+    public SaResult list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                         @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                         @ApiParam("正序排列") @RequestParam(value = "sortAsc", required = false) String sortAsc,
+                         @ApiParam("倒序排列") @RequestParam(value = "sortDesc", defaultValue = "created_at") String sortDesc) throws Exception {
+
+        IPage<TaCompanyBeneficiaryInfo> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaCompanyBeneficiaryInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
+        queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
+        IPage<TaCompanyBeneficiaryInfo> result = taCompanyBeneficiaryInfoService.page(pg, queryWrapper);
+
+        return SaResult.data(result);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param taCompanyBeneficiaryInfo 实例对象
+     * @return 实例对象
+     */
+    @OpLog(module = "受益所有人信息", action = "新增数据")
+    @AccessLimit()
+    @ApiOperation("新增数据")
+    @PostMapping("/taCompanyBeneficiaryInfo")
+    public SaResult add(@ApiParam("对象实体") @Validated @RequestBody TaCompanyBeneficiaryInfo taCompanyBeneficiaryInfo) throws Exception {
+        String tenantId = getTenantId();
+        taCompanyBeneficiaryInfo.setTenantId(tenantId);
+        taCompanyBeneficiaryInfoService.save(taCompanyBeneficiaryInfo);
+        return SaResult.data(taCompanyBeneficiaryInfo);
+    }
+
+    /**
+     * 更新数据
+     *
+     * @param taCompanyBeneficiaryInfo 实例对象
+     * @return 实例对象
+     */
+    @OpLog(module = "受益所有人信息", action = "更新数据")
+    @AccessLimit()
+    @ApiOperation("更新数据")
+    @PutMapping("/taCompanyBeneficiaryInfo/{id}")
+    public SaResult edit(@ApiParam("对象实体") @Validated @RequestBody TaCompanyBeneficiaryInfo taCompanyBeneficiaryInfo,
+                         @ApiParam("对象ID") @PathVariable String id) throws Exception {
+        taCompanyBeneficiaryInfoService.updateById(taCompanyBeneficiaryInfo);
+        return SaResult.data(taCompanyBeneficiaryInfo);
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @OpLog(module = "受益所有人信息", action = "删除数据", desc = "ID：{{#id}}")
+    @AccessLimit()
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/taCompanyBeneficiaryInfo/{id}")
+    public SaResult deleteById(@ApiParam("对象ID") @PathVariable String id) {
+        taCompanyBeneficiaryInfoService.removeById(id);
+        return SaResult.data("success");
+    }
+}

admin/src/main/java/com/njyunzhi/admin/controller/TaCompanyInfoController.java

@@ -0,0 +1,133 @@
+package com.njyunzhi.admin.controller;
+
+import cn.dev33.satoken.util.SaResult;
+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.njyunzhi.admin.service.TaCompanyInfoService;
+import com.njyunzhi.common.util.StringUtil;
+import com.njyunzhi.framework.accesslimit.AccessLimit;
+import com.njyunzhi.framework.log.OpLog;
+import com.njyunzhi.repository.BaseController;
+import com.njyunzhi.repository.entity.TaCompanyInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 公司基本信息;(ta_company_info)表控制层
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2024-2-28
+ */
+@Api(tags = "公司基本信息对象功能接口")
+@RestController
+@RequestMapping("/admin")
+public class TaCompanyInfoController extends BaseController {
+
+    @Autowired
+    private TaCompanyInfoService taCompanyInfoService;
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    @OpLog(module = "公司基本信息", action = "查询单条数据", desc = "ID：{{#id}}")
+    @AccessLimit()
+    @ApiOperation("通过ID查询单条数据")
+    @GetMapping("/taCompanyInfo/{id}")
+    public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        return SaResult.data(taCompanyInfoService.getById(id));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param pageNum  当前页码
+     * @param pageSize 每页条数
+     * @return 查询结果
+     */
+    @OpLog(module = "公司基本信息", action = "分页列表查询")
+    @AccessLimit()
+    @ApiOperation("分页查询")
+    @GetMapping("/taCompanyInfo")
+    public SaResult list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                         @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                         @ApiParam("企业注册地") @RequestParam(value = "registrationLocation", required = false) String registrationLocation,
+                         @ApiParam("企业中文名") @RequestParam(value = "companyNameCn", required = false) String companyNameCn,
+                         @ApiParam("企业英文名") @RequestParam(value = "companyNameEn", required = false) String companyNameEn,
+                         @ApiParam("是否为上市企业") @RequestParam(value = "isListedCompany", required = false) String isListedCompany,
+                         @ApiParam("企业类型") @RequestParam(value = "companyType", required = false) String companyType,
+
+                         @ApiParam("正序排列") @RequestParam(value = "sortAsc", required = false) String sortAsc,
+                         @ApiParam("倒序排列") @RequestParam(value = "sortDesc", defaultValue = "created_at") String sortDesc) throws Exception {
+
+        String tenantId = getTenantId();
+        IPage<TaCompanyInfo> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaCompanyInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtil.isNotEmpty(registrationLocation), "registration_location", registrationLocation);
+        queryWrapper.like(StringUtil.isNotEmpty(companyNameCn), "company_name_cn", companyNameCn);
+        queryWrapper.like(StringUtil.isNotEmpty(companyNameEn), "company_name_en", companyNameEn);
+        queryWrapper.eq(StringUtil.isNotEmpty(isListedCompany), "is_listed_company", isListedCompany);
+        queryWrapper.eq(StringUtil.isNotEmpty(companyType), "company_type", companyType);
+        queryWrapper.eq(StringUtil.isNotEmpty(tenantId), "tenant_id", tenantId);
+        queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
+        queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
+        IPage<TaCompanyInfo> result = taCompanyInfoService.page(pg, queryWrapper);
+
+        return SaResult.data(result);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param taCompanyInfo 实例对象
+     * @return 实例对象
+     */
+    @OpLog(module = "公司基本信息", action = "新增数据")
+    @AccessLimit()
+    @ApiOperation("新增数据")
+    @PostMapping("/taCompanyInfo")
+    public SaResult add(@ApiParam("对象实体") @Validated @RequestBody TaCompanyInfo taCompanyInfo) throws Exception {
+        String tenantId = getTenantId();
+        taCompanyInfo.setTenantId(tenantId);
+        taCompanyInfoService.save(taCompanyInfo);
+        return SaResult.data(taCompanyInfo);
+    }
+
+    /**
+     * 更新数据
+     *
+     * @param taCompanyInfo 实例对象
+     * @return 实例对象
+     */
+    @OpLog(module = "公司基本信息", action = "更新数据")
+    @AccessLimit()
+    @ApiOperation("更新数据")
+    @PutMapping("/taCompanyInfo/{id}")
+    public SaResult edit(@ApiParam("对象实体") @Validated @RequestBody TaCompanyInfo taCompanyInfo,
+                         @ApiParam("对象ID") @PathVariable String id) throws Exception {
+        taCompanyInfoService.updateById(taCompanyInfo);
+        return SaResult.data(taCompanyInfo);
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @OpLog(module = "公司基本信息", action = "删除数据", desc = "ID：{{#id}}")
+    @AccessLimit()
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/taCompanyInfo/{id}")
+    public SaResult deleteById(@ApiParam("对象ID") @PathVariable String id) {
+        taCompanyInfoService.removeById(id);
+        return SaResult.data("success");
+    }
+}

admin/src/main/java/com/njyunzhi/admin/controller/TaCompanyLegalInfoController.java

@@ -0,0 +1,120 @@
+package com.njyunzhi.admin.controller;
+
+import cn.dev33.satoken.util.SaResult;
+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.njyunzhi.admin.service.TaCompanyLegalInfoService;
+import com.njyunzhi.common.util.StringUtil;
+import com.njyunzhi.framework.accesslimit.AccessLimit;
+import com.njyunzhi.framework.log.OpLog;
+import com.njyunzhi.repository.BaseController;
+import com.njyunzhi.repository.entity.TaCompanyLegalInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 公司法人代表信息;(ta_company_legal_info)表控制层
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2024-2-28
+ */
+@Api(tags = "公司法人代表信息对象功能接口")
+@RestController
+@RequestMapping("/admin")
+public class TaCompanyLegalInfoController extends BaseController {
+
+    @Autowired
+    private TaCompanyLegalInfoService taCompanyLegalInfoService;
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    @OpLog(module = "公司法人代表信息", action = "查询单条数据", desc = "ID：{{#id}}")
+    @AccessLimit()
+    @ApiOperation("通过ID查询单条数据")
+    @GetMapping("/taCompanyLegalInfo/{id}")
+    public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        return SaResult.data(taCompanyLegalInfoService.getById(id));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param pageNum  当前页码
+     * @param pageSize 每页条数
+     * @return 查询结果
+     */
+    @OpLog(module = "公司法人代表信息", action = "分页列表查询")
+    @AccessLimit()
+    @ApiOperation("分页查询")
+    @GetMapping("/taCompanyLegalInfo")
+    public SaResult list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                         @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                         @ApiParam("正序排列") @RequestParam(value = "sortAsc", required = false) String sortAsc,
+                         @ApiParam("倒序排列") @RequestParam(value = "sortDesc", defaultValue = "created_at") String sortDesc) throws Exception {
+
+        IPage<TaCompanyLegalInfo> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaCompanyLegalInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
+        queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
+        IPage<TaCompanyLegalInfo> result = taCompanyLegalInfoService.page(pg, queryWrapper);
+
+        return SaResult.data(result);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param taCompanyLegalInfo 实例对象
+     * @return 实例对象
+     */
+    @OpLog(module = "公司法人代表信息", action = "新增数据")
+    @AccessLimit()
+    @ApiOperation("新增数据")
+    @PostMapping("/taCompanyLegalInfo")
+    public SaResult add(@ApiParam("对象实体") @Validated @RequestBody TaCompanyLegalInfo taCompanyLegalInfo) throws Exception {
+        String tenantId = getTenantId();
+        taCompanyLegalInfo.setTenantId(tenantId);
+        taCompanyLegalInfoService.save(taCompanyLegalInfo);
+        return SaResult.data(taCompanyLegalInfo);
+    }
+
+    /**
+     * 更新数据
+     *
+     * @param taCompanyLegalInfo 实例对象
+     * @return 实例对象
+     */
+    @OpLog(module = "公司法人代表信息", action = "更新数据")
+    @AccessLimit()
+    @ApiOperation("更新数据")
+    @PutMapping("/taCompanyLegalInfo/{id}")
+    public SaResult edit(@ApiParam("对象实体") @Validated @RequestBody TaCompanyLegalInfo taCompanyLegalInfo,
+                         @ApiParam("对象ID") @PathVariable String id) throws Exception {
+        taCompanyLegalInfoService.updateById(taCompanyLegalInfo);
+        return SaResult.data(taCompanyLegalInfo);
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @OpLog(module = "公司法人代表信息", action = "删除数据", desc = "ID：{{#id}}")
+    @AccessLimit()
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/taCompanyLegalInfo/{id}")
+    public SaResult deleteById(@ApiParam("对象ID") @PathVariable String id) {
+        taCompanyLegalInfoService.removeById(id);
+        return SaResult.data("success");
+    }
+}

admin/src/main/java/com/njyunzhi/admin/dto/ChangeEmailDTO.java

@@ -0,0 +1,18 @@
+package com.njyunzhi.admin.dto;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description="修改邮箱")
+public class ChangeEmailDTO {
+
+
+    @ApiModelProperty("原始邮箱")
+    String originEmail;
+
+    @ApiModelProperty("新邮箱")
+    String newEmail;
+}

admin/src/main/java/com/njyunzhi/admin/dto/ChangePhoneDTO.java

@@ -0,0 +1,19 @@
+package com.njyunzhi.admin.dto;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description="修改手机号")
+public class ChangePhoneDTO {
+
+
+    @ApiModelProperty("原始手机号")
+    String originPhone;
+
+    @ApiModelProperty("新手机号")
+    String newPhone;
+}

admin/src/main/java/com/njyunzhi/admin/dto/LoginDTO.java

@@ -17,6 +17,6 @@ public class LoginDTO {
     @ApiModelProperty("登录密码")
     String password;
 
-    @ApiModelProperty("租户ID")
-    String tenantId;
+//    @ApiModelProperty("租户ID")
+//    String tenantId;
 }

admin/src/main/java/com/njyunzhi/admin/dto/RegisterDTO.java

@@ -0,0 +1,32 @@
+package com.njyunzhi.admin.dto;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "修改邮箱")
+public class RegisterDTO {
+
+    //    @ApiModelProperty("登录账号")
+//    String loginName;
+    @ApiModelProperty("商户手机号")
+    String phone;
+    @ApiModelProperty("登录密码")
+    String password;
+
+    @ApiModelProperty("商户名")
+    String userName;
+
+
+//    @ApiModelProperty("机构/部门")
+//    String deptId;
+
+//    @ApiModelProperty("租户号")
+//    String tenantId;
+
+    @ApiModelProperty("登录类型")
+    String loginType;
+
+}

admin/src/main/java/com/njyunzhi/admin/service/SysLoginService.java

@@ -1,8 +1,6 @@
 package com.njyunzhi.admin.service;
 
-import com.njyunzhi.admin.dto.ChangePasswordDTO;
-import com.njyunzhi.admin.dto.LoginDTO;
-import com.njyunzhi.admin.dto.ResetPasswordDTO;
+import com.njyunzhi.admin.dto.*;
 import com.njyunzhi.repository.IBaseService;
 import com.njyunzhi.repository.entity.SysLogin;
 import com.njyunzhi.repository.entity.SysUser;
@@ -14,9 +12,16 @@ import com.njyunzhi.repository.entity.SysUser;
  */
 public interface SysLoginService extends IBaseService<SysLogin> {
 
-     SysUser login(LoginDTO loginParm,String tenantId) throws Exception;
+     SysUser login(LoginDTO loginParm) throws Exception;
 
     boolean changePassword(SysUser sysUser, ChangePasswordDTO param) throws Exception;
 
     void resetPassword(SysUser sysUser, ResetPasswordDTO newPassword);
+
+    boolean changePhone(SysUser sysUser, ChangePhoneDTO param);
+
+
+    boolean changeEmail(SysUser sysUser, ChangeEmailDTO param);
+
+    void registersMerchant(RegisterDTO registerDTO);
 }

admin/src/main/java/com/njyunzhi/admin/service/TaCompanyBeneficiaryInfoService.java

@@ -0,0 +1,14 @@
+package com.njyunzhi.admin.service;
+
+import com.njyunzhi.repository.IBaseService;
+import com.njyunzhi.repository.entity.TaCompanyBeneficiaryInfo;
+
+/**
+ * 受益所有人信息;(ta_company_beneficiary_info)表服务接口
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2024-2-28
+ */
+public interface TaCompanyBeneficiaryInfoService extends IBaseService<TaCompanyBeneficiaryInfo> {
+
+}

admin/src/main/java/com/njyunzhi/admin/service/TaCompanyInfoService.java

@@ -0,0 +1,14 @@
+package com.njyunzhi.admin.service;
+
+import com.njyunzhi.repository.IBaseService;
+import com.njyunzhi.repository.entity.TaCompanyInfo;
+
+/**
+ * 公司基本信息;(ta_company_info)表服务接口
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2024-2-28
+ */
+public interface TaCompanyInfoService extends IBaseService<TaCompanyInfo> {
+
+}

admin/src/main/java/com/njyunzhi/admin/service/TaCompanyLegalInfoService.java

@@ -0,0 +1,14 @@
+package com.njyunzhi.admin.service;
+
+import com.njyunzhi.repository.IBaseService;
+import com.njyunzhi.repository.entity.TaCompanyLegalInfo;
+
+/**
+ * 公司法人代表信息;(ta_company_legal_info)表服务接口
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2024-2-28
+ */
+public interface TaCompanyLegalInfoService extends IBaseService<TaCompanyLegalInfo> {
+
+}

admin/src/main/java/com/njyunzhi/admin/service/framework/UserService.java

@@ -28,25 +28,25 @@ public class UserService implements IUserService {
 
     @Override
     public Object getUserBy(Object loginId) throws Exception {
-        if (null == loginId) return null;
-        String clientType = request.getHeader("x-client-type");
-        String tenantId = request.getHeader("x-tenant-id");
-        System.out.println("---------head--------------");
-        System.out.println(clientType);
-
-        //h5租户端
-        if (clientType.equals("h5.admin")) {
-            TaPerson taPerson = taPersonService.getById((String) loginId);
-            if (taPerson != null && taPerson.getPhone() != null) {
-                return sysUserService.getSysuser(taPerson.getPhone(), tenantId);
-            } else {
-                return null;
-            }
-        }
-        //h5用户端
-        if (clientType.equals("h5.member")) {
-            return null;
-        }
+//        if (null == loginId) return null;
+//        String clientType = request.getHeader("x-client-type");
+//        String tenantId = request.getHeader("x-tenant-id");
+//        System.out.println("---------head--------------");
+//        System.out.println(clientType);
+//
+//        //h5租户端
+//        if (clientType.equals("h5.admin")) {
+//            TaPerson taPerson = taPersonService.getById((String) loginId);
+//            if (taPerson != null && taPerson.getPhone() != null) {
+//                return sysUserService.getSysuser(taPerson.getPhone(), tenantId);
+//            } else {
+//                return null;
+//            }
+//        }
+//        //h5用户端
+//        if (clientType.equals("h5.member")) {
+//            return null;
+//        }
 
         //PC租户端
 //  if (clientType.equals("pc.admin")) {

admin/src/main/java/com/njyunzhi/admin/service/impl/SysLoginServiceImpl.java

@@ -1,19 +1,17 @@
 package com.njyunzhi.admin.service.impl;
 
 import com.njyunzhi.admin.common.Constants;
-import com.njyunzhi.admin.dto.ChangePasswordDTO;
-import com.njyunzhi.admin.dto.LoginDTO;
-import com.njyunzhi.admin.dto.ResetPasswordDTO;
+import com.njyunzhi.admin.dto.*;
 import com.njyunzhi.admin.service.SysLoginService;
 import com.njyunzhi.common.util.EncryptUtil;
 import com.njyunzhi.common.util.StringUtil;
 import com.njyunzhi.repository.BaseServiceImpl;
-import com.njyunzhi.repository.entity.SysLogin;
-import com.njyunzhi.repository.entity.SysUser;
-import com.njyunzhi.repository.mapper.SysLoginMapper;
-import com.njyunzhi.repository.mapper.SysUserMapper;
+import com.njyunzhi.repository.entity.*;
+import com.njyunzhi.repository.mapper.*;
+import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 登录信息表;(sys_login)表服务实现类
@@ -27,13 +25,28 @@ public class SysLoginServiceImpl extends BaseServiceImpl<SysLoginMapper, SysLogi
     @Autowired
     SysUserMapper sysUserMapper;
 
+    @Autowired
+    FxTenantMapper fxTenantMapper;
+    @Autowired
+    SysDeptMapper sysDeptMapper;
+    @Autowired
+    SysLoginMapper sysLoginMapper;
+
+
+    @Autowired
+    TaCompanyInfoMapper taCompanyInfoMapper;
+    @Autowired
+    TaCompanyBeneficiaryInfoMapper taCompanyBeneficiaryInfoMapper;
+    @Autowired
+    TaCompanyLegalInfoMapper taCompanyLegalInfoMapper;
+
     private boolean checkPassword(String src, String targ, String salt) {
         String newPass = EncryptUtil.md5(src, salt);
         return targ.equals(newPass);
     }
 
     @Override
-    public SysUser login(LoginDTO loginParm, String tenantId) throws Exception {
+    public SysUser login(LoginDTO loginParm) throws Exception {
 
         SysLogin sysLogin = baseMapper.getInfoBy(loginParm.getLoginType(), loginParm.getLoginName());
         if (null == sysLogin) {
@@ -62,10 +75,10 @@ public class SysLoginServiceImpl extends BaseServiceImpl<SysLoginMapper, SysLogi
         if (user.getTenantId() == null) {
             throw new Exception("该账户的租户信息异常");
         }
-        if (!user.getTenantId().equals(tenantId)) {
-            throw new Exception("该账户的租户信息错误");
-
-        }
+//        if (!user.getTenantId().equals(tenantId)) {
+//            throw new Exception("该账户的租户信息错误");
+//
+//        }
 
         return user;
     }
@@ -88,4 +101,112 @@ public class SysLoginServiceImpl extends BaseServiceImpl<SysLoginMapper, SysLogi
         String newPasswordStr = EncryptUtil.md5(newPassword.getPassword(), sysUser.getUserId());
         baseMapper.updateUserPassword(sysUser.getUserId(), newPasswordStr);
     }
+
+    @SneakyThrows
+    @Override
+    public boolean changePhone(SysUser sysUser, ChangePhoneDTO param) {
+        if (sysUser.getPhone().equals(param.getOriginPhone())
+        ) {
+            sysUser.setPhone(param.getNewPhone());
+            sysUserMapper.updateById(sysUser);
+            return true;
+        } else {
+            throw new Exception("原始密码不正确");
+        }
+
+    }
+
+    @SneakyThrows
+    @Override
+    public boolean changeEmail(SysUser sysUser, ChangeEmailDTO param) {
+        if (sysUser.getEmail().equals(param.getOriginEmail())
+        ) {
+            sysUser.setEmail(param.getNewEmail());
+            sysUserMapper.updateById(sysUser);
+            return true;
+        } else {
+            throw new Exception("原始邮箱不正确");
+        }
+    }
+
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void registersMerchant(RegisterDTO registerDTO) {
+        String tenantId = StringUtil.UUID();
+        String deptId = StringUtil.UUID();
+        String userId = StringUtil.UUID();
+        String loginId = StringUtil.UUID();
+        String companyId = StringUtil.UUID();
+        String companyLegalId = StringUtil.UUID();
+
+//        创建租户
+        FxTenant fxTenant = new FxTenant();
+        fxTenant.setTenantId(tenantId);
+        fxTenant.setLoginId(loginId);
+        fxTenant.setStatus(Constants.STATUS_NORMAL);
+        fxTenant.setTenantName(registerDTO.getUserName());
+        fxTenant.setPhone(registerDTO.getPhone());
+        fxTenantMapper.insert(fxTenant);
+//
+////        创建公司 三个表  基本信息表  法人代表表 受益人表
+////        TaCompanyInfo taCompanyInfo
+//        TaCompanyInfo taCompanyInfo = new TaCompanyInfo();
+//        taCompanyInfo.setCompanyId(companyId);
+//        taCompanyInfo.setTenantId(tenantId);
+////        taCompanyInfo.setCompanyNameCn(registerDTO.getUserName());
+//        taCompanyInfoMapper.insert(taCompanyInfo);
+//
+//        TaCompanyLegalInfo taCompanyLegalInfo = new TaCompanyLegalInfo();
+//        taCompanyLegalInfo.setCompanyId(companyId);
+//        taCompanyLegalInfo.setTenantId(tenantId);
+//        taCompanyLegalInfo.setCompanyLegalId(companyLegalId);
+//        taCompanyLegalInfoMapper.insert(taCompanyLegalInfo);
+//
+//        TaCompanyBeneficiaryInfo taCompanyBeneficiaryInfo = new TaCompanyBeneficiaryInfo();
+//        taCompanyBeneficiaryInfo.setCompanyId(companyId);
+//        taCompanyBeneficiaryInfo.setTenantId(tenantId);
+//        taCompanyBeneficiaryInfo.setCompanyLegalId(companyLegalId);
+//        taCompanyBeneficiaryInfoMapper.insert(taCompanyBeneficiaryInfo);
+
+        // 创建租户机构
+        SysDept sysDept = new SysDept();
+        sysDept.setDeptId(deptId);
+        sysDept.setDeptCode("100");
+        sysDept.setDeptName(registerDTO.getUserName());
+        sysDept.setParentId(Constants.ROOT_TREE);
+        sysDept.setSortNo(1);
+        sysDept.setStatus(Constants.STATUS_NORMAL);
+        sysDept.setTenantId(tenantId);
+        sysDept.setTenantName(registerDTO.getUserName());
+        sysDept.setCreatedBy(userId);
+        sysDeptMapper.insert(sysDept);
+
+
+        // 创建租户账户
+        SysUser sysUser = new SysUser();
+        sysUser.setUserId(userId);
+        sysUser.setUserName(registerDTO.getUserName());
+        sysUser.setPhone(registerDTO.getPhone());
+        sysUser.setDeptId(deptId);
+        sysUser.setIsAdmin(0);
+        sysUser.setStatus(Constants.STATUS_NORMAL);
+        sysUser.setTenantId(tenantId);
+        sysUser.setCreatedBy(userId);
+        sysUserMapper.insert(sysUser);
+
+
+        // 创建登录信息
+        SysLogin sysLogin = new SysLogin();
+        sysLogin.setLoginId(loginId);
+        sysLogin.setUserId(userId);
+        sysLogin.setLoginType("admin.pc");
+        sysLogin.setLoginName(registerDTO.getPhone());
+        sysLogin.setPassword(EncryptUtil.md5(EncryptUtil.md5(registerDTO.getPassword()), userId));
+        sysLogin.setStatus(fxTenant.getStatus());
+        sysLogin.setTenantId(tenantId);
+        sysLogin.setCreatedBy(userId);
+        sysLoginMapper.insert(sysLogin);
+
+    }
 }

admin/src/main/java/com/njyunzhi/admin/service/impl/TaCompanyBeneficiaryInfoServiceImpl.java

@@ -0,0 +1,18 @@
+package com.njyunzhi.admin.service.impl;
+
+import com.njyunzhi.admin.service.TaCompanyBeneficiaryInfoService;
+import com.njyunzhi.repository.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.njyunzhi.repository.entity.TaCompanyBeneficiaryInfo;
+import com.njyunzhi.repository.mapper.TaCompanyBeneficiaryInfoMapper;
+
+/**
+* 受益所有人信息;(ta_company_beneficiary_info)表服务实现类
+* @author : http://www.chiner.pro
+* @date : 2024-2-28
+*/
+@Service
+public class TaCompanyBeneficiaryInfoServiceImpl extends BaseServiceImpl<TaCompanyBeneficiaryInfoMapper, TaCompanyBeneficiaryInfo> implements TaCompanyBeneficiaryInfoService {
+
+}

admin/src/main/java/com/njyunzhi/admin/service/impl/TaCompanyInfoServiceImpl.java

@@ -0,0 +1,18 @@
+package com.njyunzhi.admin.service.impl;
+
+import com.njyunzhi.admin.service.TaCompanyInfoService;
+import com.njyunzhi.repository.BaseServiceImpl;
+import com.njyunzhi.repository.entity.TaCompanyInfo;
+import com.njyunzhi.repository.mapper.TaCompanyInfoMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * 公司基本信息;(ta_company_info)表服务实现类
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2024-2-28
+ */
+@Service
+public class TaCompanyInfoServiceImpl extends BaseServiceImpl<TaCompanyInfoMapper, TaCompanyInfo> implements TaCompanyInfoService {
+
+}

admin/src/main/java/com/njyunzhi/admin/service/impl/TaCompanyLegalInfoServiceImpl.java

@@ -0,0 +1,18 @@
+package com.njyunzhi.admin.service.impl;
+
+import com.njyunzhi.admin.service.TaCompanyLegalInfoService;
+import com.njyunzhi.repository.BaseServiceImpl;
+import com.njyunzhi.repository.entity.TaCompanyLegalInfo;
+import com.njyunzhi.repository.mapper.TaCompanyLegalInfoMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * 公司法人代表信息;(ta_company_legal_info)表服务实现类
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2024-2-28
+ */
+@Service
+public class TaCompanyLegalInfoServiceImpl extends BaseServiceImpl<TaCompanyLegalInfoMapper, TaCompanyLegalInfo> implements TaCompanyLegalInfoService {
+
+}

admin/src/main/resources/application.yml

@@ -38,7 +38,7 @@ spring:
     # Redis数据库索引
     database: 3
     # Redis服务器地址
-    host: 192.168.89.147
+    host: 192.168.89.10
     # Redis服务器连接端口
     port: 6379
     # Redis服务器连接密码（默认为空）
@@ -118,8 +118,8 @@ yz:
       - /swagger-resources/**
       - /v2/**
       - /static/**
-      - /h5/**
       - /admin/login
+      - /admin/register
   # 租户系统
   tenant:
     # 默认不启用

db/global_funding(支付).pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.6.0",
   "createdTime": "2024-2-26 20:14:20",
-  "updatedTime": "2024-2-26 21:06:47",
+  "updatedTime": "2024-2-27 10:39:37",
   "dbConns": [],
   "profile": {
     "default": {
@@ -3291,6 +3291,23 @@
           "id": "C32AC37A-0A50-4F09-9895-8552B68B4D51",
           "extProps": {}
         },
+        {
+          "defKey": "email",
+          "defName": "邮箱",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "6ADFA1B7-B0B7-490F-B59C-DACCD5A2500E"
+        },
         {
           "defKey": "phone",
           "defName": "手机",
@@ -3688,7 +3705,8 @@
           "hideInGraph": true
         }
       ],
-      "correlations": []
+      "correlations": [],
+      "notes": {}
     },
     {
       "id": "880FA077-9E05-4DC0-BA00-560116009D16",
@@ -5013,6 +5031,422 @@
       ],
       "correlations": [],
       "indexes": []
+    },
+    {
+      "id": "E681CB95-A1DC-4B07-859C-10232F89EA4E",
+      "env": {
+        "base": {
+          "nameSpace": "com.njyunzhi.admin",
+          "codeRoot": "SysDept"
+        },
+        "template": {
+          "JavaMybatisPlus": {
+            "Controller": {
+              "suffix": "controller/{{=it.codeRoot}}Controller.java",
+              "enable": true
+            },
+            "Service": {
+              "suffix": "service/{{=it.codeRoot}}Service.java",
+              "enable": true
+            },
+            "ServiceImpl": {
+              "suffix": "service/impl/{{=it. codeRoot}}ServiceImpl.java",
+              "enable": true
+            },
+            "Mapper": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.java",
+              "enable": false
+            },
+            "Mapper.xml": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.xml",
+              "enable": false
+            },
+            "Entity": {
+              "suffix": "entity/{{=it.codeRoot}}.java",
+              "enable": false
+            }
+          }
+        },
+        "custom": {}
+      },
+      "defKey": "sys_dept",
+      "defName": "部门表",
+      "comment": "",
+      "properties": {},
+      "nameTemplate": "{defKey}[{defName}]",
+      "headers": [
+        {
+          "refKey": "hideInGraph",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "defKey",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "defName",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "primaryKey",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "notNull",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "autoIncrement",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "domain",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "type",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "len",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "scale",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "comment",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "refDict",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "defaultValue",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "isStandard",
+          "hideInGraph": false
+        },
+        {
+          "refKey": "uiHint",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "extProps",
+          "hideInGraph": true
+        }
+      ],
+      "fields": [
+        {
+          "defKey": "dept_id",
+          "defName": "机构ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": true,
+          "notNull": true,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": null,
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "726DF23D-B389-482C-8A83-CD882FB21B8F",
+          "uiHint": null
+        },
+        {
+          "defKey": "dept_code",
+          "defName": "机构编码",
+          "comment": "",
+          "type": "VARCHAR",
+          "len": 64,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": null,
+          "extProps": {},
+          "domain": null,
+          "id": "F8BA4F99-125F-4249-9678-A8BBAB3F352B",
+          "uiHint": null
+        },
+        {
+          "defKey": "dept_name",
+          "defName": "机构名称",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": null,
+          "extProps": {},
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+          "id": "940B4065-3A04-42F6-B7CB-265742DD38C1",
+          "uiHint": null
+        },
+        {
+          "defKey": "parent_id",
+          "defName": "上级单位",
+          "comment": "-1为根级目录",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": null,
+          "extProps": {},
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "A893979D-88C9-402E-A601-18E4D7872FCF",
+          "uiHint": null
+        },
+        {
+          "defKey": "sort_no",
+          "defName": "排序",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": null,
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "A20379C0-271E-4E48-9375-05561D29E496",
+          "uiHint": null
+        },
+        {
+          "defKey": "status",
+          "defName": "状态",
+          "comment": "",
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "1",
+          "hideInGraph": true,
+          "refDict": null,
+          "uiHint": null,
+          "id": "76D66252-B46B-4FCA-B2F3-0EA78F744C94"
+        },
+        {
+          "defKey": "tenant_id",
+          "defName": "租户号",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "refDict": null,
+          "extProps": {},
+          "notes": {},
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "attr4": "",
+          "attr5": "",
+          "attr6": "",
+          "attr7": "",
+          "attr8": "",
+          "attr9": "",
+          "id": "459A4C24-D208-4C5B-A3FD-0E8F555A6233",
+          "uiHint": null
+        },
+        {
+          "defKey": "tenant_name",
+          "defName": "租户名称",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "refDict": null,
+          "extProps": {},
+          "notes": {},
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "attr4": "",
+          "attr5": "",
+          "attr6": "",
+          "attr7": "",
+          "attr8": "",
+          "attr9": "",
+          "id": "F2E965FE-A1AA-4F24-92BB-79F1DF4451F3",
+          "uiHint": null
+        },
+        {
+          "defKey": "created_by",
+          "defName": "创建人",
+          "comment": "",
+          "type": "VARCHAR",
+          "len": 255,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "refDict": null,
+          "extProps": {},
+          "notes": {},
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "attr4": "",
+          "attr5": "",
+          "attr6": "",
+          "attr7": "",
+          "attr8": "",
+          "attr9": "",
+          "id": "3BF9CDFA-F632-4DA0-9DBB-FCCE207290F4",
+          "domain": null,
+          "uiHint": null
+        },
+        {
+          "defKey": "created_at",
+          "defName": "创建时间",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "CURRENT_TIMESTAMP",
+          "hideInGraph": true,
+          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+          "refDict": null,
+          "extProps": {},
+          "notes": {},
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "attr4": "",
+          "attr5": "",
+          "attr6": "",
+          "attr7": "",
+          "attr8": "",
+          "attr9": "",
+          "id": "F4377BE1-22DD-4D6F-A3DD-2C94C3E0329D",
+          "uiHint": null
+        },
+        {
+          "defKey": "updated_by",
+          "defName": "更新人",
+          "comment": "",
+          "type": "VARCHAR",
+          "len": 255,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "refDict": null,
+          "extProps": {},
+          "notes": {},
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "attr4": "",
+          "attr5": "",
+          "attr6": "",
+          "attr7": "",
+          "attr8": "",
+          "attr9": "",
+          "id": "397FFAB8-3494-493F-A507-7E5C540D4B5F",
+          "domain": null,
+          "uiHint": null
+        },
+        {
+          "defKey": "updated_at",
+          "defName": "更新时间",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+          "refDict": null,
+          "extProps": {},
+          "notes": {},
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "attr4": "",
+          "attr5": "",
+          "attr6": "",
+          "attr7": "",
+          "attr8": "",
+          "attr9": "",
+          "id": "C134F08D-E36F-489E-B480-91E9B75291C4",
+          "uiHint": null
+        },
+        {
+          "defKey": "deleted",
+          "defName": "删除标志",
+          "comment": "1删除,0正常",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "0",
+          "hideInGraph": true,
+          "refDict": null,
+          "extProps": {},
+          "notes": {},
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "attr4": "",
+          "attr5": "",
+          "attr6": "",
+          "attr7": "",
+          "attr8": "",
+          "attr9": "",
+          "id": "78EDFB66-F20B-4EC1-9384-5DFF01899543",
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "uiHint": null
+        }
+      ],
+      "correlations": [],
+      "indexes": [],
+      "notes": {}
     }
   ],
   "views": [],

platform/src/main/java/com/njyunzhi/platform/controller/FxTenantController.java

@@ -44,6 +44,7 @@ public class FxTenantController extends BaseController {
     @ApiOperation("通过ID查询单条数据")
     @GetMapping("/fxTenant/{id}")
     public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+
         return SaResult.data(fxTenantService.getById(id));
     }
 

platform/src/main/java/com/njyunzhi/platform/controller/TaCompanyBeneficiaryInfoController.java

@@ -0,0 +1,118 @@
+package com.njyunzhi.platform.controller;
+
+import cn.dev33.satoken.util.SaResult;
+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.njyunzhi.common.util.StringUtil;
+import com.njyunzhi.framework.accesslimit.AccessLimit;
+import com.njyunzhi.framework.log.OpLog;
+import com.njyunzhi.platform.service.TaCompanyBeneficiaryInfoService;
+import com.njyunzhi.repository.BaseController;
+import com.njyunzhi.repository.entity.TaCompanyBeneficiaryInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 受益所有人信息;(ta_company_beneficiary_info)表控制层
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2024-2-28
+ */
+@Api(tags = "受益所有人信息对象功能接口")
+@RestController
+@RequestMapping("/")
+public class TaCompanyBeneficiaryInfoController extends BaseController {
+
+    @Autowired
+    private TaCompanyBeneficiaryInfoService taCompanyBeneficiaryInfoService;
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    @OpLog(module = "受益所有人信息", action = "查询单条数据", desc = "ID：{{#id}}")
+    @AccessLimit()
+    @ApiOperation("通过ID查询单条数据")
+    @GetMapping("/taCompanyBeneficiaryInfo/{id}")
+    public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        return SaResult.data(taCompanyBeneficiaryInfoService.getById(id));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param pageNum  当前页码
+     * @param pageSize 每页条数
+     * @return 查询结果
+     */
+    @OpLog(module = "受益所有人信息", action = "分页列表查询")
+    @AccessLimit()
+    @ApiOperation("分页查询")
+    @GetMapping("/taCompanyBeneficiaryInfo")
+    public SaResult list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                         @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                         @ApiParam("正序排列") @RequestParam(value = "sortAsc", required = false) String sortAsc,
+                         @ApiParam("倒序排列") @RequestParam(value = "sortDesc", defaultValue = "created_at") String sortDesc) throws Exception {
+
+        IPage<TaCompanyBeneficiaryInfo> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaCompanyBeneficiaryInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
+        queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
+        IPage<TaCompanyBeneficiaryInfo> result = taCompanyBeneficiaryInfoService.page(pg, queryWrapper);
+
+        return SaResult.data(result);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param taCompanyBeneficiaryInfo 实例对象
+     * @return 实例对象
+     */
+    @OpLog(module = "受益所有人信息", action = "新增数据")
+    @AccessLimit()
+    @ApiOperation("新增数据")
+    @PostMapping("/taCompanyBeneficiaryInfo")
+    public SaResult add(@ApiParam("对象实体") @Validated @RequestBody TaCompanyBeneficiaryInfo taCompanyBeneficiaryInfo) throws Exception {
+        taCompanyBeneficiaryInfoService.save(taCompanyBeneficiaryInfo);
+        return SaResult.data(taCompanyBeneficiaryInfo);
+    }
+
+    /**
+     * 更新数据
+     *
+     * @param taCompanyBeneficiaryInfo 实例对象
+     * @return 实例对象
+     */
+    @OpLog(module = "受益所有人信息", action = "更新数据")
+    @AccessLimit()
+    @ApiOperation("更新数据")
+    @PutMapping("/taCompanyBeneficiaryInfo/{id}")
+    public SaResult edit(@ApiParam("对象实体") @Validated @RequestBody TaCompanyBeneficiaryInfo taCompanyBeneficiaryInfo,
+                         @ApiParam("对象ID") @PathVariable String id) throws Exception {
+        taCompanyBeneficiaryInfoService.updateById(taCompanyBeneficiaryInfo);
+        return SaResult.data(taCompanyBeneficiaryInfo);
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @OpLog(module = "受益所有人信息", action = "删除数据", desc = "ID：{{#id}}")
+    @AccessLimit()
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/taCompanyBeneficiaryInfo/{id}")
+    public SaResult deleteById(@ApiParam("对象ID") @PathVariable String id) {
+        taCompanyBeneficiaryInfoService.removeById(id);
+        return SaResult.data("success");
+    }
+}

platform/src/main/java/com/njyunzhi/platform/controller/TaCompanyInfoController.java

@@ -0,0 +1,129 @@
+package com.njyunzhi.platform.controller;
+
+import cn.dev33.satoken.util.SaResult;
+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.njyunzhi.common.util.StringUtil;
+import com.njyunzhi.framework.accesslimit.AccessLimit;
+import com.njyunzhi.framework.log.OpLog;
+import com.njyunzhi.platform.service.TaCompanyInfoService;
+import com.njyunzhi.repository.BaseController;
+import com.njyunzhi.repository.entity.TaCompanyInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 公司基本信息;(ta_company_info)表控制层
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2024-2-28
+ */
+@Api(tags = "公司基本信息对象功能接口")
+@RestController
+@RequestMapping("/")
+public class TaCompanyInfoController extends BaseController {
+
+    @Autowired
+    private TaCompanyInfoService taCompanyInfoService;
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    @OpLog(module = "公司基本信息", action = "查询单条数据", desc = "ID：{{#id}}")
+    @AccessLimit()
+    @ApiOperation("通过ID查询单条数据")
+    @GetMapping("/taCompanyInfo/{id}")
+    public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        return SaResult.data(taCompanyInfoService.getById(id));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param pageNum  当前页码
+     * @param pageSize 每页条数
+     * @return 查询结果
+     */
+    @OpLog(module = "公司基本信息", action = "分页列表查询")
+    @AccessLimit()
+    @ApiOperation("分页查询")
+    @GetMapping("/taCompanyInfo")
+    public SaResult list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                         @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                         @ApiParam("企业注册地") @RequestParam(value = "registrationLocation", required = false) String registrationLocation,
+                         @ApiParam("企业中文名") @RequestParam(value = "companyNameCn", required = false) String companyNameCn,
+                         @ApiParam("企业英文名") @RequestParam(value = "companyNameEn", required = false) String companyNameEn,
+                         @ApiParam("是否为上市企业") @RequestParam(value = "isListedCompany", required = false) String isListedCompany,
+                         @ApiParam("企业类型") @RequestParam(value = "companyType", required = false) String companyType,
+
+                         @ApiParam("正序排列") @RequestParam(value = "sortAsc", required = false) String sortAsc,
+                         @ApiParam("倒序排列") @RequestParam(value = "sortDesc", defaultValue = "created_at") String sortDesc) throws Exception {
+
+        IPage<TaCompanyInfo> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaCompanyInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtil.isNotEmpty(registrationLocation),"registration_location",registrationLocation);
+        queryWrapper.like(StringUtil.isNotEmpty(companyNameCn),"company_name_cn",companyNameCn);
+        queryWrapper.like(StringUtil.isNotEmpty(companyNameEn),"company_name_en",companyNameEn);
+        queryWrapper.eq(StringUtil.isNotEmpty(isListedCompany),"is_listed_company",isListedCompany);
+        queryWrapper.eq(StringUtil.isNotEmpty(companyType),"company_type",companyType);
+        queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
+        queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
+        IPage<TaCompanyInfo> result = taCompanyInfoService.page(pg, queryWrapper);
+
+        return SaResult.data(result);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param taCompanyInfo 实例对象
+     * @return 实例对象
+     */
+    @OpLog(module = "公司基本信息", action = "新增数据")
+    @AccessLimit()
+    @ApiOperation("新增数据")
+    @PostMapping("/taCompanyInfo")
+    public SaResult add(@ApiParam("对象实体") @Validated @RequestBody TaCompanyInfo taCompanyInfo) throws Exception {
+        taCompanyInfoService.save(taCompanyInfo);
+        return SaResult.data(taCompanyInfo);
+    }
+
+    /**
+     * 更新数据
+     *
+     * @param taCompanyInfo 实例对象
+     * @return 实例对象
+     */
+    @OpLog(module = "公司基本信息", action = "更新数据")
+    @AccessLimit()
+    @ApiOperation("更新数据")
+    @PutMapping("/taCompanyInfo/{id}")
+    public SaResult edit(@ApiParam("对象实体") @Validated @RequestBody TaCompanyInfo taCompanyInfo,
+                         @ApiParam("对象ID") @PathVariable String id) throws Exception {
+        taCompanyInfoService.updateById(taCompanyInfo);
+        return SaResult.data(taCompanyInfo);
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @OpLog(module = "公司基本信息", action = "删除数据", desc = "ID：{{#id}}")
+    @AccessLimit()
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/taCompanyInfo/{id}")
+    public SaResult deleteById(@ApiParam("对象ID") @PathVariable String id) {
+        taCompanyInfoService.removeById(id);
+        return SaResult.data("success");
+    }
+}

platform/src/main/java/com/njyunzhi/platform/controller/TaCompanyLegalInfoController.java

@@ -0,0 +1,118 @@
+package com.njyunzhi.platform.controller;
+
+import cn.dev33.satoken.util.SaResult;
+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.njyunzhi.common.util.StringUtil;
+import com.njyunzhi.framework.accesslimit.AccessLimit;
+import com.njyunzhi.framework.log.OpLog;
+import com.njyunzhi.platform.service.TaCompanyLegalInfoService;
+import com.njyunzhi.repository.BaseController;
+import com.njyunzhi.repository.entity.TaCompanyLegalInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 公司法人代表信息;(ta_company_legal_info)表控制层
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2024-2-28
+ */
+@Api(tags = "公司法人代表信息对象功能接口")
+@RestController
+@RequestMapping("/")
+public class TaCompanyLegalInfoController extends BaseController {
+
+    @Autowired
+    private TaCompanyLegalInfoService taCompanyLegalInfoService;
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    @OpLog(module = "公司法人代表信息", action = "查询单条数据", desc = "ID：{{#id}}")
+    @AccessLimit()
+    @ApiOperation("通过ID查询单条数据")
+    @GetMapping("/taCompanyLegalInfo/{id}")
+    public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        return SaResult.data(taCompanyLegalInfoService.getById(id));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param pageNum  当前页码
+     * @param pageSize 每页条数
+     * @return 查询结果
+     */
+    @OpLog(module = "公司法人代表信息", action = "分页列表查询")
+    @AccessLimit()
+    @ApiOperation("分页查询")
+    @GetMapping("/taCompanyLegalInfo")
+    public SaResult list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                         @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                         @ApiParam("正序排列") @RequestParam(value = "sortAsc", required = false) String sortAsc,
+                         @ApiParam("倒序排列") @RequestParam(value = "sortDesc", defaultValue = "created_at") String sortDesc) throws Exception {
+
+        IPage<TaCompanyLegalInfo> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaCompanyLegalInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
+        queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
+        IPage<TaCompanyLegalInfo> result = taCompanyLegalInfoService.page(pg, queryWrapper);
+
+        return SaResult.data(result);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param taCompanyLegalInfo 实例对象
+     * @return 实例对象
+     */
+    @OpLog(module = "公司法人代表信息", action = "新增数据")
+    @AccessLimit()
+    @ApiOperation("新增数据")
+    @PostMapping("/taCompanyLegalInfo")
+    public SaResult add(@ApiParam("对象实体") @Validated @RequestBody TaCompanyLegalInfo taCompanyLegalInfo) throws Exception {
+        taCompanyLegalInfoService.save(taCompanyLegalInfo);
+        return SaResult.data(taCompanyLegalInfo);
+    }
+
+    /**
+     * 更新数据
+     *
+     * @param taCompanyLegalInfo 实例对象
+     * @return 实例对象
+     */
+    @OpLog(module = "公司法人代表信息", action = "更新数据")
+    @AccessLimit()
+    @ApiOperation("更新数据")
+    @PutMapping("/taCompanyLegalInfo/{id}")
+    public SaResult edit(@ApiParam("对象实体") @Validated @RequestBody TaCompanyLegalInfo taCompanyLegalInfo,
+                         @ApiParam("对象ID") @PathVariable String id) throws Exception {
+        taCompanyLegalInfoService.updateById(taCompanyLegalInfo);
+        return SaResult.data(taCompanyLegalInfo);
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @OpLog(module = "公司法人代表信息", action = "删除数据", desc = "ID：{{#id}}")
+    @AccessLimit()
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/taCompanyLegalInfo/{id}")
+    public SaResult deleteById(@ApiParam("对象ID") @PathVariable String id) {
+        taCompanyLegalInfoService.removeById(id);
+        return SaResult.data("success");
+    }
+}

platform/src/main/java/com/njyunzhi/platform/service/TaCompanyBeneficiaryInfoService.java

@@ -0,0 +1,14 @@
+package com.njyunzhi.platform.service;
+
+import com.njyunzhi.repository.IBaseService;
+import com.njyunzhi.repository.entity.TaCompanyBeneficiaryInfo;
+
+/**
+ * 受益所有人信息;(ta_company_beneficiary_info)表服务接口
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2024-2-28
+ */
+public interface TaCompanyBeneficiaryInfoService extends IBaseService<TaCompanyBeneficiaryInfo> {
+
+}

platform/src/main/java/com/njyunzhi/platform/service/TaCompanyInfoService.java

@@ -0,0 +1,14 @@
+package com.njyunzhi.platform.service;
+
+import com.njyunzhi.repository.IBaseService;
+import com.njyunzhi.repository.entity.TaCompanyInfo;
+
+/**
+ * 公司基本信息;(ta_company_info)表服务接口
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2024-2-28
+ */
+public interface TaCompanyInfoService extends IBaseService<TaCompanyInfo> {
+
+}

platform/src/main/java/com/njyunzhi/platform/service/TaCompanyLegalInfoService.java

@@ -0,0 +1,14 @@
+package com.njyunzhi.platform.service;
+
+import com.njyunzhi.repository.IBaseService;
+import com.njyunzhi.repository.entity.TaCompanyLegalInfo;
+
+/**
+ * 公司法人代表信息;(ta_company_legal_info)表服务接口
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2024-2-28
+ */
+public interface TaCompanyLegalInfoService extends IBaseService<TaCompanyLegalInfo> {
+
+}

platform/src/main/java/com/njyunzhi/platform/service/impl/TaCompanyBeneficiaryInfoServiceImpl.java

@@ -0,0 +1,18 @@
+package com.njyunzhi.platform.service.impl;
+
+import com.njyunzhi.repository.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.njyunzhi.repository.entity.TaCompanyBeneficiaryInfo;
+import com.njyunzhi.repository.mapper.TaCompanyBeneficiaryInfoMapper;
+import com.njyunzhi.platform.service.TaCompanyBeneficiaryInfoService;
+
+ /**
+ * 受益所有人信息;(ta_company_beneficiary_info)表服务实现类
+ * @author : http://www.chiner.pro
+ * @date : 2024-2-28
+ */
+@Service
+public class TaCompanyBeneficiaryInfoServiceImpl extends BaseServiceImpl<TaCompanyBeneficiaryInfoMapper, TaCompanyBeneficiaryInfo> implements TaCompanyBeneficiaryInfoService {
+    
+}

platform/src/main/java/com/njyunzhi/platform/service/impl/TaCompanyInfoServiceImpl.java

@@ -0,0 +1,18 @@
+package com.njyunzhi.platform.service.impl;
+
+import com.njyunzhi.platform.service.TaCompanyInfoService;
+import com.njyunzhi.repository.BaseServiceImpl;
+import com.njyunzhi.repository.entity.TaCompanyInfo;
+import com.njyunzhi.repository.mapper.TaCompanyInfoMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * 公司基本信息;(ta_company_info)表服务实现类
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2024-2-28
+ */
+@Service
+public class TaCompanyInfoServiceImpl extends BaseServiceImpl<TaCompanyInfoMapper, TaCompanyInfo> implements TaCompanyInfoService {
+
+}

platform/src/main/java/com/njyunzhi/platform/service/impl/TaCompanyLegalInfoServiceImpl.java

@@ -0,0 +1,18 @@
+package com.njyunzhi.platform.service.impl;
+
+import com.njyunzhi.platform.service.TaCompanyLegalInfoService;
+import com.njyunzhi.repository.BaseServiceImpl;
+import com.njyunzhi.repository.entity.TaCompanyLegalInfo;
+import com.njyunzhi.repository.mapper.TaCompanyLegalInfoMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * 公司法人代表信息;(ta_company_legal_info)表服务实现类
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2024-2-28
+ */
+@Service
+public class TaCompanyLegalInfoServiceImpl extends BaseServiceImpl<TaCompanyLegalInfoMapper, TaCompanyLegalInfo> implements TaCompanyLegalInfoService {
+
+}

platform/src/main/resources/application.yml

@@ -38,7 +38,7 @@ spring:
     # Redis数据库索引
     database: 3
     # Redis服务器地址
-    host: 192.168.89.147
+    host: 192.168.89.10
     # Redis服务器连接端口
     port: 6379
     # Redis服务器连接密码（默认为空）

repository/src/main/java/com/njyunzhi/repository/BaseController.java

@@ -2,6 +2,7 @@ package com.njyunzhi.repository;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.njyunzhi.common.util.StringUtil;
+import com.njyunzhi.repository.entity.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;

repository/src/main/java/com/njyunzhi/repository/entity/SysUser.java

@@ -12,71 +12,75 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.List;
 
- /**
+/**
  * 用户管理;
+ *
  * @author : http://www.chiner.pro
  * @date : 2023-10-25
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value = "用户管理",description = "")
+@ApiModel(value = "用户管理", description = "")
 @TableName("sys_user")
-public class SysUser implements Serializable,Cloneable{
-    
-    @ApiModelProperty(name = "用户ID",notes = "")
+public class SysUser implements Serializable, Cloneable {
+
+    @ApiModelProperty(name = "用户ID", notes = "")
     @TableId(value = "user_id", type = IdType.ASSIGN_UUID)
-    private String userId ;
-    
+    private String userId;
+
     @NotBlank(message = "用户名称不能为空")
-    @ApiModelProperty(name = "用户名称",notes = "")
-    private String userName ;
-    
-    @ApiModelProperty(name = "头像",notes = "")
-    private String avatar ;
-    
-    @ApiModelProperty(name = "手机",notes = "")
-    private String phone ;
-    
-    @ApiModelProperty(name = "岗位ID",notes = "")
-    private String positionId ;
-    
-    @ApiModelProperty(name = "部门ID",notes = "")
-    private String deptId ;
-    
-    @ApiModelProperty(name = "标签",notes = "")
-    private String tag ;
-    
-    @ApiModelProperty(name = "状态",notes = "")
-    private Integer status ;
-    
-    @ApiModelProperty(name = "是否管理员",notes = "")
-    private Integer isAdmin ;
-    
-    @ApiModelProperty(name = "租户号",notes = "")
-    private String tenantId ;
-    
-    @ApiModelProperty(name = "创建人",notes = "")
+    @ApiModelProperty(name = "用户名称", notes = "")
+    private String userName;
+
+    @ApiModelProperty(name = "头像", notes = "")
+    private String avatar;
+
+    @ApiModelProperty(name = "邮箱", notes = "")
+    private String email;
+
+    @ApiModelProperty(name = "手机", notes = "")
+    private String phone;
+
+    @ApiModelProperty(name = "岗位ID", notes = "")
+    private String positionId;
+
+    @ApiModelProperty(name = "部门ID", notes = "")
+    private String deptId;
+
+    @ApiModelProperty(name = "标签", notes = "")
+    private String tag;
+
+    @ApiModelProperty(name = "状态", notes = "")
+    private Integer status;
+
+    @ApiModelProperty(name = "是否管理员", notes = "")
+    private Integer isAdmin;
+
+    @ApiModelProperty(name = "租户号", notes = "")
+    private String tenantId;
+
+    @ApiModelProperty(name = "创建人", notes = "")
     @TableField(fill = FieldFill.INSERT)
-    private String createdBy ;
-    
-    @ApiModelProperty(name = "创建时间",notes = "")
+    private String createdBy;
+
+    @ApiModelProperty(name = "创建时间", notes = "")
     @TableField(fill = FieldFill.INSERT)
-    private LocalDateTime createdAt ;
-    
-    @ApiModelProperty(name = "更新人",notes = "")
+    private LocalDateTime createdAt;
+
+    @ApiModelProperty(name = "更新人", notes = "")
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updatedBy ;
-    
-    @ApiModelProperty(name = "更新时间",notes = "")
+    private String updatedBy;
+
+    @ApiModelProperty(name = "更新时间", notes = "")
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    private LocalDateTime updatedAt ;
-    
-    @ApiModelProperty(name = "删除标志",notes = "1删除,0正常")
+    private LocalDateTime updatedAt;
+
+    @ApiModelProperty(name = "删除标志", notes = "1删除,0正常")
     @TableField(fill = FieldFill.INSERT)
-    private Integer deleted ;
+    private Integer deleted;
 
-     @ApiModelProperty(name = "角色列表")
-     @TableField(exist = false)
-     private List<SysRole> roleList;
+    @ApiModelProperty(name = "角色列表")
+    @TableField(exist = false)
+    private List<SysRole> roleList;
 }

repository/src/main/java/com/njyunzhi/repository/entity/TaCompanyBeneficiaryInfo.java

@@ -0,0 +1,60 @@
+package com.njyunzhi.repository.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import javax.validation.constraints.NotBlank;
+
+ /**
+ * 受益所有人信息;
+ * @author : http://www.chiner.pro
+ * @date : 2024-2-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "受益所有人信息",description = "")
+@TableName("ta_company_beneficiary_info")
+public class TaCompanyBeneficiaryInfo implements Serializable,Cloneable{
+    
+    @ApiModelProperty(name = "受益人id",notes = "")
+    @TableId(value = "beneficiary_id", type = IdType.ASSIGN_UUID)
+    private String beneficiaryId ;
+    
+    @ApiModelProperty(name = "公司id",notes = "")
+    private String companyId ;
+    
+    @ApiModelProperty(name = "公司法人代表信息id",notes = "")
+    private String companyLegalId ;
+    
+    @ApiModelProperty(name = "租户号",notes = "")
+    private String tenantId ;
+    
+    @ApiModelProperty(name = "持股比例",notes = "")
+    private String shareholdingRatio ;
+    
+    @ApiModelProperty(name = "股权架构图",notes = "")
+    private byte[] equityStructureChart ;
+    
+    @ApiModelProperty(name = "创建人",notes = "")
+    @TableField(fill = FieldFill.INSERT)
+    private String createdBy ;
+    
+    @ApiModelProperty(name = "创建时间",notes = "")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createdAt ;
+    
+    @ApiModelProperty(name = "更新人",notes = "")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updatedBy ;
+    
+    @ApiModelProperty(name = "更新时间",notes = "")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updatedAt ;
+
+}

repository/src/main/java/com/njyunzhi/repository/entity/TaCompanyInfo.java

@@ -0,0 +1,116 @@
+package com.njyunzhi.repository.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import javax.validation.constraints.NotBlank;
+
+ /**
+ * 公司基本信息;
+ * @author : http://www.chiner.pro
+ * @date : 2024-2-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "公司基本信息",description = "")
+@TableName("ta_company_info")
+public class TaCompanyInfo implements Serializable,Cloneable{
+    
+    @ApiModelProperty(name = "公司id",notes = "")
+    @TableId(value = "company_id", type = IdType.ASSIGN_UUID)
+    private String companyId ;
+    
+    @ApiModelProperty(name = "租户号",notes = "")
+    private String tenantId ;
+    
+    @ApiModelProperty(name = "企业注册地",notes = "")
+    private String registrationLocation ;
+    
+    @NotBlank(message = "企业中文名不能为空")
+    @ApiModelProperty(name = "企业中文名",notes = "")
+    private String companyNameCn ;
+    
+    @NotBlank(message = "企业英文名不能为空")
+    @ApiModelProperty(name = "企业英文名",notes = "")
+    private String companyNameEn ;
+    
+    @ApiModelProperty(name = "是否为上市企业",notes = "")
+    private String isListedCompany ;
+    
+    @ApiModelProperty(name = "公司注册证书",notes = "")
+    private byte[] certificateIncorporation ;
+    
+    @ApiModelProperty(name = "公司商业登记证",notes = "")
+    private byte[] companyBusinessRegistration ;
+    
+    @ApiModelProperty(name = "nnc1/最新nar1",notes = "")
+    private byte[] nnc1Nar1 ;
+    
+    @ApiModelProperty(name = "其他附件",notes = "")
+    private byte[] otherAnnex ;
+    
+    @ApiModelProperty(name = "企业类型 1:私人股份有限公司,2公众股份有限公司,3有股本的公众无限公司,4有股本的私人无限公司",notes = "")
+    private String companyType ;
+    
+    @ApiModelProperty(name = "商业登记号",notes = "")
+    private String businessRegistrationNum ;
+    
+    @ApiModelProperty(name = "注册 国家",notes = "")
+    private String registerCountry ;
+    
+    @ApiModelProperty(name = "注册 省/地区",notes = "")
+    private String registerProvinceRegion ;
+    
+    @ApiModelProperty(name = "注册 市",notes = "")
+    private String registerCity ;
+    
+    @ApiModelProperty(name = "注册具体地址",notes = "")
+    private String registerSpecificAddress ;
+    
+    @ApiModelProperty(name = "注册 邮政编码",notes = "")
+    private String registerPostalCode ;
+    
+    @ApiModelProperty(name = "实际经营 国家",notes = "")
+    private String realityCountry ;
+    
+    @ApiModelProperty(name = "实际经营 省/地区",notes = "")
+    private String realityProvinceRegion ;
+    
+    @ApiModelProperty(name = "实际经营 市",notes = "")
+    private String realityCity ;
+    
+    @ApiModelProperty(name = "实际经营 具体地址",notes = "")
+    private String realitySpecificAddress ;
+    
+    @ApiModelProperty(name = "实际经营 邮政编码",notes = "")
+    private String realityPostalCode ;
+    
+    @ApiModelProperty(name = "雇员人数 1:员工人数超过200人,2员工人数50-200人,3员工人数少于50人",notes = "")
+    private String numEmployees ;
+    
+    @ApiModelProperty(name = "经营场所类型 1:自有办公场所,2:较大租用办公场所 (大于500平方),3:较小租用办公场所 (小于500平方),4:无固定办公场所",notes = "")
+    private String businessPremisesType ;
+    
+    @ApiModelProperty(name = "创建人",notes = "")
+    @TableField(fill = FieldFill.INSERT)
+    private String createdBy ;
+    
+    @ApiModelProperty(name = "创建时间",notes = "")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createdAt ;
+    
+    @ApiModelProperty(name = "更新人",notes = "")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updatedBy ;
+    
+    @ApiModelProperty(name = "更新时间",notes = "")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updatedAt ;
+
+}

repository/src/main/java/com/njyunzhi/repository/entity/TaCompanyLegalInfo.java

@@ -0,0 +1,73 @@
+package com.njyunzhi.repository.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import javax.validation.constraints.NotBlank;
+
+ /**
+ * 公司法人代表信息;
+ * @author : http://www.chiner.pro
+ * @date : 2024-2-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "公司法人代表信息",description = "")
+@TableName("ta_company_legal_info")
+public class TaCompanyLegalInfo implements Serializable,Cloneable{
+    
+    @ApiModelProperty(name = "公司法人代表信息id",notes = "")
+    @TableId(value = "company_legal_id", type = IdType.ASSIGN_UUID)
+    private String companyLegalId ;
+    
+    @ApiModelProperty(name = "公司id",notes = "")
+    private String companyId ;
+    
+    @ApiModelProperty(name = "租户号",notes = "")
+    private String tenantId ;
+    
+    @ApiModelProperty(name = "身份  conpanyDirector:企业董事,authorizedPerson:授权人",notes = "")
+    private String identity ;
+    
+    @ApiModelProperty(name = "企业董事国家",notes = "")
+    private String directorCountry ;
+    
+    @ApiModelProperty(name = "企业董事证件类型",notes = "")
+    private String directorIdType ;
+    
+    @ApiModelProperty(name = "企业董事证件正面",notes = "")
+    private byte[] directorIdFront ;
+    
+    @ApiModelProperty(name = "企业董事证件反面",notes = "")
+    private byte[] directorIdBack ;
+    
+    @NotBlank(message = "董事中文名不能为空")
+    @ApiModelProperty(name = "董事中文名",notes = "")
+    private byte[] directorNameCn ;
+    
+    @ApiModelProperty(name = "董事证件号码",notes = "")
+    private byte[] directorIdNo ;
+    
+    @ApiModelProperty(name = "创建人",notes = "")
+    @TableField(fill = FieldFill.INSERT)
+    private String createdBy ;
+    
+    @ApiModelProperty(name = "创建时间",notes = "")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createdAt ;
+    
+    @ApiModelProperty(name = "更新人",notes = "")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updatedBy ;
+    
+    @ApiModelProperty(name = "更新时间",notes = "")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updatedAt ;
+
+}

repository/src/main/java/com/njyunzhi/repository/mapper/TaCompanyBeneficiaryInfoMapper.java

@@ -0,0 +1,16 @@
+package com.njyunzhi.repository.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import com.njyunzhi.repository.entity.TaCompanyBeneficiaryInfo;
+
+ /**
+ * 受益所有人信息;(ta_company_beneficiary_info)表数据库访问层
+ * @author : http://njyunzhi.com
+ * @date : 2024-2-28
+ */
+@Mapper
+public interface TaCompanyBeneficiaryInfoMapper  extends BaseMapper<TaCompanyBeneficiaryInfo>{
+    
+}

repository/src/main/java/com/njyunzhi/repository/mapper/TaCompanyInfoMapper.java

@@ -0,0 +1,16 @@
+package com.njyunzhi.repository.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njyunzhi.repository.entity.TaCompanyInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 公司基本信息;(ta_company_info)表数据库访问层
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2024-2-28
+ */
+@Mapper
+public interface TaCompanyInfoMapper extends BaseMapper<TaCompanyInfo> {
+
+}

repository/src/main/java/com/njyunzhi/repository/mapper/TaCompanyLegalInfoMapper.java

@@ -0,0 +1,16 @@
+package com.njyunzhi.repository.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import com.njyunzhi.repository.entity.TaCompanyLegalInfo;
+
+ /**
+ * 公司法人代表信息;(ta_company_legal_info)表数据库访问层
+ * @author : http://njyunzhi.com
+ * @date : 2024-2-28
+ */
+@Mapper
+public interface TaCompanyLegalInfoMapper  extends BaseMapper<TaCompanyLegalInfo>{
+    
+}

repository/src/main/resources/mapper/TaCompanyInfoMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.njyunzhi.repository.mapper.TaCompanyInfoMapper">
+    
+</mapper>