张涛 1年前
父节点
当前提交
7c029612d1
共有 35 个文件被更改,包括 921 次插入72 次删除
  1. 13
    13
      admin/src/main/java/com/njyunzhi/admin/controller/CommController.java
  2. 27
    8
      admin/src/main/java/com/njyunzhi/admin/controller/TaCompanyInfoController.java
  3. 139
    0
      admin/src/main/java/com/njyunzhi/admin/controller/TaCompanyRealNameController.java
  4. 4
    0
      admin/src/main/java/com/njyunzhi/admin/dto/RegisterDTO.java
  5. 11
    0
      admin/src/main/java/com/njyunzhi/admin/event/ContentFileUploadEvent.java
  6. 85
    0
      admin/src/main/java/com/njyunzhi/admin/event/ContentFileUploadListener.java
  7. 5
    0
      admin/src/main/java/com/njyunzhi/admin/service/TaCompanyInfoService.java
  8. 15
    0
      admin/src/main/java/com/njyunzhi/admin/service/TaCompanyRealNameService.java
  9. 11
    1
      admin/src/main/java/com/njyunzhi/admin/service/impl/SysLoginServiceImpl.java
  10. 37
    0
      admin/src/main/java/com/njyunzhi/admin/service/impl/TaCompanyInfoServiceImpl.java
  11. 53
    0
      admin/src/main/java/com/njyunzhi/admin/service/impl/TaCompanyRealNameServiceImpl.java
  12. 64
    0
      admin/src/main/java/com/njyunzhi/admin/util/PdfUtil.java
  13. 2
    2
      admin/src/main/resources/application.yml
  14. 13
    0
      common/pom.xml
  15. 3
    8
      platform/src/main/java/com/njyunzhi/platform/controller/TaCompanyInfoController.java
  16. 129
    0
      platform/src/main/java/com/njyunzhi/platform/controller/TaCompanyRealNameController.java
  17. 1
    0
      platform/src/main/java/com/njyunzhi/platform/service/TaCompanyInfoService.java
  18. 15
    0
      platform/src/main/java/com/njyunzhi/platform/service/TaCompanyRealNameService.java
  19. 26
    0
      platform/src/main/java/com/njyunzhi/platform/service/impl/TaCompanyInfoServiceImpl.java
  20. 52
    0
      platform/src/main/java/com/njyunzhi/platform/service/impl/TaCompanyRealNameServiceImpl.java
  21. 1
    0
      pom.xml
  22. 6
    1
      repository/src/main/java/com/njyunzhi/repository/entity/SysLogin.java
  23. 6
    0
      repository/src/main/java/com/njyunzhi/repository/entity/SysUser.java
  24. 8
    3
      repository/src/main/java/com/njyunzhi/repository/entity/TaCompanyBeneficiaryInfo.java
  25. 33
    22
      repository/src/main/java/com/njyunzhi/repository/entity/TaCompanyInfo.java
  26. 8
    7
      repository/src/main/java/com/njyunzhi/repository/entity/TaCompanyLegalInfo.java
  27. 79
    0
      repository/src/main/java/com/njyunzhi/repository/entity/TaCompanyRealName.java
  28. 6
    3
      repository/src/main/java/com/njyunzhi/repository/mapper/TaCompanyBeneficiaryInfoMapper.java
  29. 4
    0
      repository/src/main/java/com/njyunzhi/repository/mapper/TaCompanyInfoMapper.java
  30. 6
    3
      repository/src/main/java/com/njyunzhi/repository/mapper/TaCompanyLegalInfoMapper.java
  31. 16
    0
      repository/src/main/java/com/njyunzhi/repository/mapper/TaCompanyRealNameMapper.java
  32. 14
    0
      repository/src/main/resources/mapper/TaCompanyBeneficiaryInfoMapper.xml
  33. 9
    1
      repository/src/main/resources/mapper/TaCompanyInfoMapper.xml
  34. 14
    0
      repository/src/main/resources/mapper/TaCompanyLegalInfoMapper.xml
  35. 6
    0
      repository/src/main/resources/mapper/TaCompanyRealNameMapper.xml

+ 13
- 13
admin/src/main/java/com/njyunzhi/admin/controller/CommController.java 查看文件

@@ -8,12 +8,14 @@ import com.njyunzhi.framework.accesslimit.AccessLimit;
8 8
 import com.njyunzhi.repository.BaseController;
9 9
 import io.swagger.annotations.Api;
10 10
 import io.swagger.annotations.ApiOperation;
11
+import io.swagger.annotations.ApiParam;
11 12
 import org.springframework.beans.factory.annotation.Autowired;
12
-import org.springframework.web.bind.annotation.GetMapping;
13
-import org.springframework.web.bind.annotation.RequestMapping;
14
-import org.springframework.web.bind.annotation.RestController;
13
+import org.springframework.web.bind.annotation.*;
14
+import org.springframework.web.multipart.MultipartFile;
15 15
 
16 16
 import java.io.IOException;
17
+import java.util.HashMap;
18
+import java.util.Map;
17 19
 
18 20
 @Api(tags = "部分通用接口")
19 21
 @RestController
@@ -23,19 +25,17 @@ public class CommController extends BaseController {
23 25
     @Autowired
24 26
     FileUtil fileUtil;
25 27
 
26
-    @Autowired
27
-    OssUtil ossUtil;
28
-
29 28
 
30 29
     @AccessLimit()
31 30
     @ApiOperation("上传文件")
32
-    @GetMapping("/{client}/upload/policy")
33
-    public SaResult getUploadPolicy() throws IOException {
34
-
35
-        OssUtil.PolicyResponse policy = ossUtil.getPolicy();
36
-
37
-        return SaResult.data(policy);
31
+    @PostMapping("/{client}/upload")
32
+    public SaResult upload(@ApiParam("文件") @RequestPart("file") MultipartFile multipartFile) throws Exception {
33
+        String fileUrl;
34
+        Map<String, Object> result = new HashMap<>();
35
+        fileUrl = fileUtil.saveMultipartFile(multipartFile, null);
36
+        result.put("url", fileUrl);
37
+
38
+        return SaResult.data(result);
38 39
     }
39 40
 
40
-
41 41
 }

+ 27
- 8
admin/src/main/java/com/njyunzhi/admin/controller/TaCompanyInfoController.java 查看文件

@@ -4,12 +4,15 @@ import cn.dev33.satoken.util.SaResult;
4 4
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5 5
 import com.baomidou.mybatisplus.core.metadata.IPage;
6 6
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7
+import com.njyunzhi.admin.event.ContentFileUploadEvent;
7 8
 import com.njyunzhi.admin.service.TaCompanyInfoService;
8 9
 import com.njyunzhi.common.util.StringUtil;
9 10
 import com.njyunzhi.framework.accesslimit.AccessLimit;
10 11
 import com.njyunzhi.framework.log.OpLog;
12
+import com.njyunzhi.framework.util.SpringContextUtil;
11 13
 import com.njyunzhi.repository.BaseController;
12 14
 import com.njyunzhi.repository.entity.TaCompanyInfo;
15
+import com.njyunzhi.repository.entity.TaCompanyRealName;
13 16
 import io.swagger.annotations.Api;
14 17
 import io.swagger.annotations.ApiOperation;
15 18
 import io.swagger.annotations.ApiParam;
@@ -42,6 +45,14 @@ public class TaCompanyInfoController extends BaseController {
42 45
     @ApiOperation("通过ID查询单条数据")
43 46
     @GetMapping("/taCompanyInfo/{id}")
44 47
     public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
48
+
49
+//        if (id.isEmpty()){
50
+//            throw new Exception();
51
+//        }
52
+
53
+
54
+
55
+
45 56
         return SaResult.data(taCompanyInfoService.getById(id));
46 57
     }
47 58
 
@@ -58,10 +69,7 @@ public class TaCompanyInfoController extends BaseController {
58 69
     @GetMapping("/taCompanyInfo")
59 70
     public SaResult list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
60 71
                          @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
61
-                         @ApiParam("企业注册地") @RequestParam(value = "registrationLocation", required = false) String registrationLocation,
62
-                         @ApiParam("企业中文名") @RequestParam(value = "companyNameCn", required = false) String companyNameCn,
63
-                         @ApiParam("企业英文名") @RequestParam(value = "companyNameEn", required = false) String companyNameEn,
64
-                         @ApiParam("是否为上市企业") @RequestParam(value = "isListedCompany", required = false) String isListedCompany,
72
+
65 73
                          @ApiParam("企业类型") @RequestParam(value = "companyType", required = false) String companyType,
66 74
 
67 75
                          @ApiParam("正序排列") @RequestParam(value = "sortAsc", required = false) String sortAsc,
@@ -70,10 +78,7 @@ public class TaCompanyInfoController extends BaseController {
70 78
         String tenantId = getTenantId();
71 79
         IPage<TaCompanyInfo> pg = new Page<>(pageNum, pageSize);
72 80
         QueryWrapper<TaCompanyInfo> queryWrapper = new QueryWrapper<>();
73
-        queryWrapper.like(StringUtil.isNotEmpty(registrationLocation), "registration_location", registrationLocation);
74
-        queryWrapper.like(StringUtil.isNotEmpty(companyNameCn), "company_name_cn", companyNameCn);
75
-        queryWrapper.like(StringUtil.isNotEmpty(companyNameEn), "company_name_en", companyNameEn);
76
-        queryWrapper.eq(StringUtil.isNotEmpty(isListedCompany), "is_listed_company", isListedCompany);
81
+
77 82
         queryWrapper.eq(StringUtil.isNotEmpty(companyType), "company_type", companyType);
78 83
         queryWrapper.eq(StringUtil.isNotEmpty(tenantId), "tenant_id", tenantId);
79 84
         queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
@@ -96,6 +101,20 @@ public class TaCompanyInfoController extends BaseController {
96 101
     public SaResult add(@ApiParam("对象实体") @Validated @RequestBody TaCompanyInfo taCompanyInfo) throws Exception {
97 102
         String tenantId = getTenantId();
98 103
         taCompanyInfo.setTenantId(tenantId);
104
+
105
+        QueryWrapper<TaCompanyInfo> queryWrapper = new QueryWrapper<>();
106
+        queryWrapper.eq("tenant_id", tenantId);
107
+
108
+        TaCompanyInfo taCompanyInfo1 = taCompanyInfoService.getOne(queryWrapper);
109
+        if (taCompanyInfo1 != null) {
110
+            throw new Exception("请勿重复录入公司");
111
+        }
112
+
113
+
114
+        // 异步生成图片
115
+//        if (StringUtil.isNotEmpty(taCompanyInfo.getCompanyBusinessRegistration())) {
116
+//            SpringContextUtil.getAc().publishEvent(new ContentFileUploadEvent(taCompanyInfo));
117
+//        }
99 118
         taCompanyInfoService.save(taCompanyInfo);
100 119
         return SaResult.data(taCompanyInfo);
101 120
     }

+ 139
- 0
admin/src/main/java/com/njyunzhi/admin/controller/TaCompanyRealNameController.java 查看文件

@@ -0,0 +1,139 @@
1
+package com.njyunzhi.admin.controller;
2
+
3
+import cn.dev33.satoken.util.SaResult;
4
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5
+import com.baomidou.mybatisplus.core.metadata.IPage;
6
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7
+import com.njyunzhi.admin.service.TaCompanyRealNameService;
8
+import com.njyunzhi.common.util.StringUtil;
9
+import com.njyunzhi.framework.accesslimit.AccessLimit;
10
+import com.njyunzhi.framework.log.OpLog;
11
+import com.njyunzhi.repository.BaseController;
12
+import com.njyunzhi.repository.entity.TaCompanyRealName;
13
+import io.swagger.annotations.Api;
14
+import io.swagger.annotations.ApiOperation;
15
+import io.swagger.annotations.ApiParam;
16
+import org.springframework.beans.factory.annotation.Autowired;
17
+import org.springframework.validation.annotation.Validated;
18
+import org.springframework.web.bind.annotation.*;
19
+
20
+/**
21
+ * 公司实名认证;(ta_company_real_name)表控制层
22
+ *
23
+ * @author : http://njyunzhi.com
24
+ * @date : 2024-3-1
25
+ */
26
+@Api(tags = "公司实名认证对象功能接口")
27
+@RestController
28
+@RequestMapping("/admin")
29
+public class TaCompanyRealNameController extends BaseController {
30
+
31
+    @Autowired
32
+    private TaCompanyRealNameService taCompanyRealNameService;
33
+
34
+    /**
35
+     * 通过ID查询单条数据
36
+     *
37
+     * @param id 主键
38
+     * @return 实例对象
39
+     */
40
+    @OpLog(module = "公司实名认证", action = "查询单条数据", desc = "ID:{{#id}}")
41
+    @AccessLimit()
42
+    @ApiOperation("通过ID查询单条数据")
43
+    @GetMapping("/taCompanyRealName/{id}")
44
+    public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
45
+        TaCompanyRealName taCompanyRealName = taCompanyRealNameService.getCompanyList(id);
46
+        return SaResult.data(taCompanyRealName);
47
+    }
48
+
49
+    /**
50
+     * 分页查询
51
+     *
52
+     * @param pageNum  当前页码
53
+     * @param pageSize 每页条数
54
+     * @return 查询结果
55
+     */
56
+    @OpLog(module = "公司实名认证", action = "分页列表查询")
57
+    @AccessLimit()
58
+    @ApiOperation("分页查询")
59
+    @GetMapping("/taCompanyRealName")
60
+    public SaResult list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
61
+                         @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
62
+                         @ApiParam("企业注册地") @RequestParam(value = "registrationLocation", required = false) String registrationLocation,
63
+                         @ApiParam("企业中文名") @RequestParam(value = "companyNameCn", required = false) String companyNameCn,
64
+                         @ApiParam("企业英文名") @RequestParam(value = "companyNameEn", required = false) String companyNameEn,
65
+                         @ApiParam("是否为上市企业") @RequestParam(value = "isListedCompany", required = false) String isListedCompany,
66
+                         @ApiParam("正序排列") @RequestParam(value = "sortAsc", required = false) String sortAsc,
67
+                         @ApiParam("倒序排列") @RequestParam(value = "sortDesc", defaultValue = "created_at") String sortDesc) throws Exception {
68
+
69
+        IPage<TaCompanyRealName> pg = new Page<>(pageNum, pageSize);
70
+        QueryWrapper<TaCompanyRealName> queryWrapper = new QueryWrapper<>();
71
+        queryWrapper.like(StringUtil.isNotEmpty(registrationLocation), "registration_location", registrationLocation);
72
+        queryWrapper.like(StringUtil.isNotEmpty(companyNameCn), "company_name_cn", companyNameCn);
73
+        queryWrapper.like(StringUtil.isNotEmpty(companyNameEn), "company_name_en", companyNameEn);
74
+        queryWrapper.eq(StringUtil.isNotEmpty(isListedCompany), "is_listed_company", isListedCompany);
75
+        queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
76
+        queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
77
+        IPage<TaCompanyRealName> result = taCompanyRealNameService.page(pg, queryWrapper);
78
+
79
+        return SaResult.data(result);
80
+    }
81
+
82
+    /**
83
+     * 新增数据
84
+     *
85
+     * @param taCompanyRealName 实例对象
86
+     * @return 实例对象
87
+     */
88
+    @OpLog(module = "公司实名认证", action = "新增数据")
89
+    @AccessLimit()
90
+    @ApiOperation("新增数据")
91
+    @PostMapping("/taCompanyRealName")
92
+    public SaResult add(@ApiParam("对象实体") @Validated @RequestBody TaCompanyRealName taCompanyRealName) throws Exception {
93
+        String tenantId = getTenantId();
94
+        taCompanyRealName.setTenantId(tenantId);
95
+
96
+        QueryWrapper<TaCompanyRealName> queryWrapper = new QueryWrapper<>();
97
+        queryWrapper.eq("tenant_id", tenantId);
98
+
99
+        TaCompanyRealName taCompanyRealName1 = taCompanyRealNameService.getOne(queryWrapper);
100
+        if (taCompanyRealName1 != null) {
101
+            throw new Exception("请勿重复录入公司");
102
+        }
103
+        taCompanyRealNameService.save(taCompanyRealName);
104
+
105
+
106
+        return SaResult.data(taCompanyRealName);
107
+    }
108
+
109
+    /**
110
+     * 更新数据
111
+     *
112
+     * @param taCompanyRealName 实例对象
113
+     * @return 实例对象
114
+     */
115
+    @OpLog(module = "公司实名认证", action = "更新数据")
116
+    @AccessLimit()
117
+    @ApiOperation("更新数据")
118
+    @PutMapping("/taCompanyRealName/{id}")
119
+    public SaResult edit(@ApiParam("对象实体") @Validated @RequestBody TaCompanyRealName taCompanyRealName,
120
+                         @ApiParam("对象ID") @PathVariable String id) throws Exception {
121
+        taCompanyRealNameService.updateById(taCompanyRealName);
122
+        return SaResult.data(taCompanyRealName);
123
+    }
124
+
125
+    /**
126
+     * 通过主键删除数据
127
+     *
128
+     * @param id 主键
129
+     * @return 是否成功
130
+     */
131
+    @OpLog(module = "公司实名认证", action = "删除数据", desc = "ID:{{#id}}")
132
+    @AccessLimit()
133
+    @ApiOperation("通过主键删除数据")
134
+    @DeleteMapping("/taCompanyRealName/{id}")
135
+    public SaResult deleteById(@ApiParam("对象ID") @PathVariable String id) {
136
+        taCompanyRealNameService.removeById(id);
137
+        return SaResult.data("success");
138
+    }
139
+}

+ 4
- 0
admin/src/main/java/com/njyunzhi/admin/dto/RegisterDTO.java 查看文件

@@ -19,7 +19,11 @@ public class RegisterDTO {
19 19
     @ApiModelProperty("商户名")
20 20
     String userName;
21 21
 
22
+    @ApiModelProperty("微信号")
23
+    String wxNum;
22 24
 
25
+    @ApiModelProperty("邀请码")
26
+    String invitationCode;
23 27
 //    @ApiModelProperty("机构/部门")
24 28
 //    String deptId;
25 29
 

+ 11
- 0
admin/src/main/java/com/njyunzhi/admin/event/ContentFileUploadEvent.java 查看文件

@@ -0,0 +1,11 @@
1
+package com.njyunzhi.admin.event;
2
+
3
+import com.njyunzhi.repository.entity.TaCompanyInfo;
4
+import lombok.AllArgsConstructor;
5
+import lombok.Getter;
6
+
7
+@Getter
8
+@AllArgsConstructor
9
+public class ContentFileUploadEvent {
10
+    TaCompanyInfo content;
11
+}

+ 85
- 0
admin/src/main/java/com/njyunzhi/admin/event/ContentFileUploadListener.java 查看文件

@@ -0,0 +1,85 @@
1
+package com.njyunzhi.admin.event;
2
+
3
+
4
+import com.njyunzhi.admin.service.TaCompanyInfoService;
5
+import com.njyunzhi.admin.util.PdfUtil;
6
+import com.njyunzhi.common.util.FileUtil;
7
+import com.njyunzhi.common.util.MimeType;
8
+import com.njyunzhi.common.util.StringUtil;
9
+import com.njyunzhi.repository.entity.TaCompanyInfo;
10
+import lombok.extern.slf4j.Slf4j;
11
+import org.springframework.beans.factory.annotation.Autowired;
12
+import org.springframework.context.event.EventListener;
13
+import org.springframework.scheduling.annotation.Async;
14
+import org.springframework.stereotype.Component;
15
+
16
+import java.io.IOException;
17
+import java.util.ArrayList;
18
+import java.util.List;
19
+
20
+@Slf4j
21
+@Component
22
+public class ContentFileUploadListener {
23
+
24
+    @Autowired
25
+    TaCompanyInfoService taCompanyInfoService;
26
+
27
+    @Autowired
28
+    FileUtil fileUtil;
29
+
30
+
31
+
32
+
33
+    private List<String> transPath(List<String> imageList) {
34
+        if (null == imageList) return null;
35
+
36
+        List<String> list = new ArrayList<>();
37
+        String uploadPath = fileUtil.getUploadPath().replaceAll("\\\\", "/");
38
+
39
+        for (int i = 0; i < imageList.size(); i += 1) {
40
+            String item = imageList.get(i).replaceAll("\\\\", "/").replace(uploadPath, fileUtil.getServerPrefix());
41
+            list.add(item);
42
+        }
43
+
44
+        return list;
45
+    }
46
+
47
+    @Async
48
+    @EventListener
49
+    public void onUploaded(ContentFileUploadEvent event) {
50
+        TaCompanyInfo content = event.getContent();
51
+
52
+        if (null == content || StringUtil.isEmpty(content.getCompanyBusinessRegistration())) {
53
+            log.error("转换文件为图片失败: ID: {}", null == content ? "未知" : content.getCompanyId());
54
+        }
55
+
56
+        List<String> imageList = null;
57
+        String path = content.getCompanyBusinessRegistrationContent().replace(fileUtil.getServerPrefix(), fileUtil.getUploadPath());
58
+
59
+        // 处理 pdf
60
+//        if (MimeType.isPdf(content.getFileType())) {
61
+            try {
62
+                imageList = PdfUtil.toImage(path);
63
+                taCompanyInfoService.updateImageContent(content.getCompanyId(), transPath(imageList));
64
+            } catch (IOException e) {
65
+                // e.printStackTrace();
66
+            }
67
+//            return;
68
+//        }
69
+
70
+//        // 处理 ppt
71
+//        if (MimeType.isPpt(content.getFileType())) {
72
+//            try {
73
+//                imageList = PPTUtil.toImage(path);
74
+//                resourceContentVersionService.updateImageContent(content.getId(), transPath(imageList));
75
+//            } catch (Exception e) {
76
+//                // e.printStackTrace();
77
+//            }
78
+//
79
+//            return;
80
+//        }
81
+        log.error("不支持的文件类型: id: {}", content.getCompanyId());
82
+
83
+    }
84
+}
85
+

+ 5
- 0
admin/src/main/java/com/njyunzhi/admin/service/TaCompanyInfoService.java 查看文件

@@ -3,6 +3,8 @@ package com.njyunzhi.admin.service;
3 3
 import com.njyunzhi.repository.IBaseService;
4 4
 import com.njyunzhi.repository.entity.TaCompanyInfo;
5 5
 
6
+import java.util.List;
7
+
6 8
 /**
7 9
  * 公司基本信息;(ta_company_info)表服务接口
8 10
  *
@@ -11,4 +13,7 @@ import com.njyunzhi.repository.entity.TaCompanyInfo;
11 13
  */
12 14
 public interface TaCompanyInfoService extends IBaseService<TaCompanyInfo> {
13 15
 
16
+//    TaCompanyInfo getCompanyList(String id);
17
+
18
+    void updateImageContent(String companyId, List<String> imageList);
14 19
 }

+ 15
- 0
admin/src/main/java/com/njyunzhi/admin/service/TaCompanyRealNameService.java 查看文件

@@ -0,0 +1,15 @@
1
+package com.njyunzhi.admin.service;
2
+
3
+import com.njyunzhi.repository.IBaseService;
4
+import com.njyunzhi.repository.entity.TaCompanyRealName;
5
+
6
+/**
7
+ * 公司实名认证;(ta_company_real_name)表服务接口
8
+ *
9
+ * @author : http://njyunzhi.com
10
+ * @date : 2024-3-1
11
+ */
12
+public interface TaCompanyRealNameService extends IBaseService<TaCompanyRealName> {
13
+
14
+    TaCompanyRealName getCompanyList(String id);
15
+}

+ 11
- 1
admin/src/main/java/com/njyunzhi/admin/service/impl/SysLoginServiceImpl.java 查看文件

@@ -1,5 +1,7 @@
1 1
 package com.njyunzhi.admin.service.impl;
2 2
 
3
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
3 5
 import com.njyunzhi.admin.common.Constants;
4 6
 import com.njyunzhi.admin.dto.*;
5 7
 import com.njyunzhi.admin.service.SysLoginService;
@@ -109,6 +111,10 @@ public class SysLoginServiceImpl extends BaseServiceImpl<SysLoginMapper, SysLogi
109 111
         ) {
110 112
             sysUser.setPhone(param.getNewPhone());
111 113
             sysUserMapper.updateById(sysUser);
114
+            QueryWrapper<SysLogin> queryWrapper=new QueryWrapper<>();
115
+            queryWrapper.eq("login_name",param.getNewPhone());
116
+            SysLogin sysLogin= sysLoginMapper.selectOne(queryWrapper);
117
+            sysLoginMapper.updateById(sysLogin);
112 118
             return true;
113 119
         } else {
114 120
             throw new Exception("原始密码不正确");
@@ -193,6 +199,8 @@ public class SysLoginServiceImpl extends BaseServiceImpl<SysLoginMapper, SysLogi
193 199
         sysUser.setStatus(Constants.STATUS_NORMAL);
194 200
         sysUser.setTenantId(tenantId);
195 201
         sysUser.setCreatedBy(userId);
202
+        sysUser.setWxNum(registerDTO.getWxNum());
203
+        sysUser.setInvitationCode(registerDTO.getInvitationCode());
196 204
         sysUserMapper.insert(sysUser);
197 205
 
198 206
 
@@ -200,12 +208,14 @@ public class SysLoginServiceImpl extends BaseServiceImpl<SysLoginMapper, SysLogi
200 208
         SysLogin sysLogin = new SysLogin();
201 209
         sysLogin.setLoginId(loginId);
202 210
         sysLogin.setUserId(userId);
203
-        sysLogin.setLoginType("admin.pc");
211
+        sysLogin.setLoginType(registerDTO.getLoginType());
204 212
         sysLogin.setLoginName(registerDTO.getPhone());
205 213
         sysLogin.setPassword(EncryptUtil.md5(EncryptUtil.md5(registerDTO.getPassword()), userId));
206 214
         sysLogin.setStatus(fxTenant.getStatus());
207 215
         sysLogin.setTenantId(tenantId);
208 216
         sysLogin.setCreatedBy(userId);
217
+        sysLogin.setWxNum(registerDTO.getWxNum());
218
+        sysLogin.setInvitationCode(registerDTO.getInvitationCode());
209 219
         sysLoginMapper.insert(sysLogin);
210 220
 
211 221
     }

+ 37
- 0
admin/src/main/java/com/njyunzhi/admin/service/impl/TaCompanyInfoServiceImpl.java 查看文件

@@ -1,11 +1,20 @@
1 1
 package com.njyunzhi.admin.service.impl;
2 2
 
3
+import com.alibaba.fastjson2.JSON;
4
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
3 5
 import com.njyunzhi.admin.service.TaCompanyInfoService;
4 6
 import com.njyunzhi.repository.BaseServiceImpl;
7
+import com.njyunzhi.repository.entity.TaCompanyBeneficiaryInfo;
5 8
 import com.njyunzhi.repository.entity.TaCompanyInfo;
9
+import com.njyunzhi.repository.entity.TaCompanyLegalInfo;
10
+import com.njyunzhi.repository.mapper.TaCompanyBeneficiaryInfoMapper;
6 11
 import com.njyunzhi.repository.mapper.TaCompanyInfoMapper;
12
+import com.njyunzhi.repository.mapper.TaCompanyLegalInfoMapper;
13
+import org.springframework.beans.factory.annotation.Autowired;
7 14
 import org.springframework.stereotype.Service;
8 15
 
16
+import java.util.List;
17
+
9 18
 /**
10 19
  * 公司基本信息;(ta_company_info)表服务实现类
11 20
  *
@@ -15,4 +24,32 @@ import org.springframework.stereotype.Service;
15 24
 @Service
16 25
 public class TaCompanyInfoServiceImpl extends BaseServiceImpl<TaCompanyInfoMapper, TaCompanyInfo> implements TaCompanyInfoService {
17 26
 
27
+    @Autowired
28
+    TaCompanyLegalInfoMapper taCompanyLegalInfoMapper;
29
+
30
+    @Autowired
31
+    TaCompanyBeneficiaryInfoMapper taCompanyBeneficiaryInfoMapper;
32
+
33
+//
34
+//    @Override
35
+//    public TaCompanyInfo getCompanyList(String id) {
36
+//
37
+//        TaCompanyInfo taCompanyInfo=baseMapper.selectById(id);
38
+//        String companyId=taCompanyInfo.getCompanyId();
39
+//        List<TaCompanyLegalInfo> taCompanyLegalInfo=taCompanyLegalInfoMapper.getLegalInfoList(companyId);
40
+//        List<TaCompanyBeneficiaryInfo> taCompanyBeneficiaryInfo=taCompanyBeneficiaryInfoMapper.getBeneficiaryList(companyId);
41
+//
42
+//        taCompanyInfo.setTaCompanyLegalInfoList(taCompanyLegalInfo);
43
+//        taCompanyInfo.setTaCompanyBeneficiaryInfoList(taCompanyBeneficiaryInfo);
44
+//
45
+//        return taCompanyInfo;
46
+//    }
47
+
48
+    @Override
49
+    public void updateImageContent(String companyId, List<String> imageList) {
50
+            UpdateWrapper<TaCompanyInfo> updateWrapper = new UpdateWrapper<>();
51
+            updateWrapper.set("company_business_registration_content", JSON.toJSONString(imageList));
52
+            updateWrapper.eq("company_id", companyId);
53
+            update(updateWrapper);
54
+    }
18 55
 }

+ 53
- 0
admin/src/main/java/com/njyunzhi/admin/service/impl/TaCompanyRealNameServiceImpl.java 查看文件

@@ -0,0 +1,53 @@
1
+package com.njyunzhi.admin.service.impl;
2
+
3
+import com.njyunzhi.admin.service.TaCompanyRealNameService;
4
+import com.njyunzhi.repository.BaseServiceImpl;
5
+import com.njyunzhi.repository.entity.TaCompanyBeneficiaryInfo;
6
+import com.njyunzhi.repository.entity.TaCompanyInfo;
7
+import com.njyunzhi.repository.entity.TaCompanyLegalInfo;
8
+import com.njyunzhi.repository.entity.TaCompanyRealName;
9
+import com.njyunzhi.repository.mapper.TaCompanyBeneficiaryInfoMapper;
10
+import com.njyunzhi.repository.mapper.TaCompanyInfoMapper;
11
+import com.njyunzhi.repository.mapper.TaCompanyLegalInfoMapper;
12
+import com.njyunzhi.repository.mapper.TaCompanyRealNameMapper;
13
+import org.springframework.beans.factory.annotation.Autowired;
14
+import org.springframework.stereotype.Service;
15
+
16
+import java.util.List;
17
+
18
+/**
19
+ * 公司实名认证;(ta_company_real_name)表服务实现类
20
+ *
21
+ * @author : http://www.chiner.pro
22
+ * @date : 2024-3-1
23
+ */
24
+@Service
25
+public class TaCompanyRealNameServiceImpl extends BaseServiceImpl<TaCompanyRealNameMapper, TaCompanyRealName> implements TaCompanyRealNameService {
26
+
27
+
28
+    @Autowired
29
+    TaCompanyLegalInfoMapper taCompanyLegalInfoMapper;
30
+
31
+    @Autowired
32
+    TaCompanyBeneficiaryInfoMapper taCompanyBeneficiaryInfoMapper;
33
+
34
+    @Autowired
35
+    TaCompanyInfoMapper taCompanyInfoMapper;
36
+
37
+
38
+    @Override
39
+    public TaCompanyRealName getCompanyList(String id) {
40
+
41
+        TaCompanyRealName taCompanyRealName = baseMapper.selectById(id);
42
+//        String realCompanyId = taCompanyRealName.getRealCompanyId();
43
+        String tenantId = taCompanyRealName.getTenantId();
44
+        TaCompanyInfo taCompanyInfo = taCompanyInfoMapper.getInfoList(tenantId);
45
+        List<TaCompanyLegalInfo> taCompanyLegalInfo = taCompanyLegalInfoMapper.getLegalInfoList(tenantId);
46
+        List<TaCompanyBeneficiaryInfo> taCompanyBeneficiaryInfo = taCompanyBeneficiaryInfoMapper.getBeneficiaryList(tenantId);
47
+
48
+        taCompanyRealName.setTaCompanyInfo(taCompanyInfo);
49
+        taCompanyRealName.setTaCompanyLegalInfoList(taCompanyLegalInfo);
50
+        taCompanyRealName.setTaCompanyBeneficiaryInfoList(taCompanyBeneficiaryInfo);
51
+        return taCompanyRealName;
52
+    }
53
+}

+ 64
- 0
admin/src/main/java/com/njyunzhi/admin/util/PdfUtil.java 查看文件

@@ -0,0 +1,64 @@
1
+package com.njyunzhi.admin.util;
2
+
3
+import com.njyunzhi.common.util.FileUtilCompression;
4
+import org.apache.pdfbox.pdmodel.PDDocument;
5
+import org.apache.pdfbox.rendering.PDFRenderer;
6
+
7
+import javax.imageio.ImageIO;
8
+import java.awt.image.BufferedImage;
9
+import java.io.ByteArrayOutputStream;
10
+import java.io.File;
11
+import java.io.FileOutputStream;
12
+import java.io.IOException;
13
+import java.util.ArrayList;
14
+import java.util.List;
15
+
16
+public class PdfUtil {
17
+
18
+    /**
19
+     * 将 PDF 转为 png
20
+     * @param pdfFilePath
21
+     * @return
22
+     * @throws IOException
23
+     */
24
+    public static List<String> toImage(String pdfFilePath) throws IOException {
25
+        File file = new File(pdfFilePath);
26
+
27
+        String dir = file.getParent();
28
+        int dot = file.getName().lastIndexOf('.');
29
+        String pdfName = file.getName().substring(0, dot);
30
+        String imgFilePrefix = dir + File.separator + pdfName;
31
+
32
+        PDDocument pdDocument = PDDocument.load(file);
33
+        int pages = pdDocument.getNumberOfPages();
34
+        PDFRenderer renderer = new PDFRenderer(pdDocument);
35
+
36
+        List<String> imageList = new ArrayList<>();
37
+        for (int i = 0; i < pages; i += 1) {
38
+            String imagePath = String.format("%s_%d.jpg", imgFilePrefix, i+1);
39
+            File imgFile = new File(imagePath);
40
+
41
+            // dpi 取 75
42
+            BufferedImage image = renderer.renderImageWithDPI(i, 75);
43
+//            ImageIO.write(image, "jpg", imgFile);
44
+
45
+
46
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
47
+            ImageIO.write(image, "jpg", outputStream);
48
+
49
+            // 最大不能超过6M
50
+            long maxSize = 6 * 1024 * 1024;
51
+            byte[] bytes = FileUtilCompression.compressSize(outputStream.toByteArray(), maxSize, .8f);
52
+            outputStream.close();
53
+            File tmp = new File(imagePath);
54
+            FileOutputStream fos = new FileOutputStream(tmp);
55
+            fos.write(bytes,0, bytes.length);
56
+            fos.flush();
57
+            fos.close();
58
+
59
+            imageList.add(imagePath);
60
+        }
61
+
62
+        return imageList;
63
+    }
64
+}

+ 2
- 2
admin/src/main/resources/application.yml 查看文件

@@ -109,8 +109,8 @@ yz:
109 109
     # 上传目录
110 110
     path: E:/work/public-upload
111 111
     # 文件服务前缀
112
-#    server-prefix: http://192.168.89.25:7777
113
-    server-prefix: http://112.2.2.154:9081
112
+    server-prefix: http://192.168.89.25:7777
113
+#    server-prefix: http://112.2.2.154:9081
114 114
   filter:
115 115
     # 接口列表, 可以不校验 token
116 116
     annList:

+ 13
- 0
common/pom.xml 查看文件

@@ -25,6 +25,19 @@
25 25
         </dependency>
26 26
 
27 27
 
28
+        <dependency>
29
+            <groupId>org.apache.pdfbox</groupId>
30
+            <artifactId>pdfbox</artifactId>
31
+            <version>${pdfbox.version}</version>
32
+        </dependency>
33
+        <dependency>
34
+            <groupId>org.apache.pdfbox</groupId>
35
+            <artifactId>pdfbox-tools</artifactId>
36
+            <version>${pdfbox.version}</version>
37
+        </dependency>
38
+
39
+
40
+
28 41
         <!-- Http请求工具 -->
29 42
         <dependency>
30 43
             <groupId>com.squareup.okhttp3</groupId>

+ 3
- 8
platform/src/main/java/com/njyunzhi/platform/controller/TaCompanyInfoController.java 查看文件

@@ -42,6 +42,7 @@ public class TaCompanyInfoController extends BaseController {
42 42
     @ApiOperation("通过ID查询单条数据")
43 43
     @GetMapping("/taCompanyInfo/{id}")
44 44
     public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
45
+
45 46
         return SaResult.data(taCompanyInfoService.getById(id));
46 47
     }
47 48
 
@@ -58,10 +59,7 @@ public class TaCompanyInfoController extends BaseController {
58 59
     @GetMapping("/taCompanyInfo")
59 60
     public SaResult list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
60 61
                          @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
61
-                         @ApiParam("企业注册地") @RequestParam(value = "registrationLocation", required = false) String registrationLocation,
62
-                         @ApiParam("企业中文名") @RequestParam(value = "companyNameCn", required = false) String companyNameCn,
63
-                         @ApiParam("企业英文名") @RequestParam(value = "companyNameEn", required = false) String companyNameEn,
64
-                         @ApiParam("是否为上市企业") @RequestParam(value = "isListedCompany", required = false) String isListedCompany,
62
+
65 63
                          @ApiParam("企业类型") @RequestParam(value = "companyType", required = false) String companyType,
66 64
 
67 65
                          @ApiParam("正序排列") @RequestParam(value = "sortAsc", required = false) String sortAsc,
@@ -69,10 +67,7 @@ public class TaCompanyInfoController extends BaseController {
69 67
 
70 68
         IPage<TaCompanyInfo> pg = new Page<>(pageNum, pageSize);
71 69
         QueryWrapper<TaCompanyInfo> queryWrapper = new QueryWrapper<>();
72
-        queryWrapper.like(StringUtil.isNotEmpty(registrationLocation),"registration_location",registrationLocation);
73
-        queryWrapper.like(StringUtil.isNotEmpty(companyNameCn),"company_name_cn",companyNameCn);
74
-        queryWrapper.like(StringUtil.isNotEmpty(companyNameEn),"company_name_en",companyNameEn);
75
-        queryWrapper.eq(StringUtil.isNotEmpty(isListedCompany),"is_listed_company",isListedCompany);
70
+
76 71
         queryWrapper.eq(StringUtil.isNotEmpty(companyType),"company_type",companyType);
77 72
         queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
78 73
         queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));

+ 129
- 0
platform/src/main/java/com/njyunzhi/platform/controller/TaCompanyRealNameController.java 查看文件

@@ -0,0 +1,129 @@
1
+package com.njyunzhi.platform.controller;
2
+
3
+import cn.dev33.satoken.util.SaResult;
4
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5
+import com.baomidou.mybatisplus.core.metadata.IPage;
6
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7
+import com.njyunzhi.common.util.StringUtil;
8
+import com.njyunzhi.framework.accesslimit.AccessLimit;
9
+import com.njyunzhi.framework.log.OpLog;
10
+import com.njyunzhi.platform.service.TaCompanyRealNameService;
11
+import com.njyunzhi.repository.BaseController;
12
+import com.njyunzhi.repository.entity.TaCompanyInfo;
13
+import com.njyunzhi.repository.entity.TaCompanyRealName;
14
+import io.swagger.annotations.Api;
15
+import io.swagger.annotations.ApiOperation;
16
+import io.swagger.annotations.ApiParam;
17
+import org.springframework.beans.factory.annotation.Autowired;
18
+import org.springframework.validation.annotation.Validated;
19
+import org.springframework.web.bind.annotation.*;
20
+
21
+/**
22
+ * 公司实名认证;(ta_company_real_name)表控制层
23
+ *
24
+ * @author : http://njyunzhi.com
25
+ * @date : 2024-3-1
26
+ */
27
+@Api(tags = "公司实名认证对象功能接口")
28
+@RestController
29
+@RequestMapping("/")
30
+public class TaCompanyRealNameController extends BaseController {
31
+
32
+    @Autowired
33
+    private TaCompanyRealNameService taCompanyRealNameService;
34
+
35
+    /**
36
+     * 通过ID查询单条数据
37
+     *
38
+     * @param id 主键
39
+     * @return 实例对象
40
+     */
41
+    @OpLog(module = "公司实名认证", action = "查询单条数据", desc = "ID:{{#id}}")
42
+    @AccessLimit()
43
+    @ApiOperation("通过ID查询单条数据")
44
+    @GetMapping("/taCompanyRealName/{id}")
45
+    public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
46
+        TaCompanyRealName taCompanyRealName = taCompanyRealNameService.getCompanyList(id);
47
+
48
+        return SaResult.data(taCompanyRealName);
49
+    }
50
+
51
+    /**
52
+     * 分页查询
53
+     *
54
+     * @param pageNum  当前页码
55
+     * @param pageSize 每页条数
56
+     * @return 查询结果
57
+     */
58
+    @OpLog(module = "公司实名认证", action = "分页列表查询")
59
+    @AccessLimit()
60
+    @ApiOperation("分页查询")
61
+    @GetMapping("/taCompanyRealName")
62
+    public SaResult list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
63
+                         @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
64
+                         @ApiParam("企业注册地") @RequestParam(value = "registrationLocation", required = false) String registrationLocation,
65
+                         @ApiParam("企业中文名") @RequestParam(value = "companyNameCn", required = false) String companyNameCn,
66
+                         @ApiParam("企业英文名") @RequestParam(value = "companyNameEn", required = false) String companyNameEn,
67
+                         @ApiParam("是否为上市企业") @RequestParam(value = "isListedCompany", required = false) String isListedCompany,
68
+                         @ApiParam("正序排列") @RequestParam(value = "sortAsc", required = false) String sortAsc,
69
+                         @ApiParam("倒序排列") @RequestParam(value = "sortDesc", defaultValue = "created_at") String sortDesc) throws Exception {
70
+
71
+        IPage<TaCompanyRealName> pg = new Page<>(pageNum, pageSize);
72
+        QueryWrapper<TaCompanyRealName> queryWrapper = new QueryWrapper<>();
73
+        queryWrapper.like(StringUtil.isNotEmpty(registrationLocation),"registration_location",registrationLocation);
74
+        queryWrapper.like(StringUtil.isNotEmpty(companyNameCn),"company_name_cn",companyNameCn);
75
+        queryWrapper.like(StringUtil.isNotEmpty(companyNameEn),"company_name_en",companyNameEn);
76
+        queryWrapper.eq(StringUtil.isNotEmpty(isListedCompany),"is_listed_company",isListedCompany);
77
+        queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
78
+        queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
79
+        IPage<TaCompanyRealName> result = taCompanyRealNameService.page(pg, queryWrapper);
80
+
81
+        return SaResult.data(result);
82
+    }
83
+
84
+    /**
85
+     * 新增数据
86
+     *
87
+     * @param taCompanyRealName 实例对象
88
+     * @return 实例对象
89
+     */
90
+    @OpLog(module = "公司实名认证", action = "新增数据")
91
+    @AccessLimit()
92
+    @ApiOperation("新增数据")
93
+    @PostMapping("/taCompanyRealName")
94
+    public SaResult add(@ApiParam("对象实体") @Validated @RequestBody TaCompanyRealName taCompanyRealName) throws Exception {
95
+        taCompanyRealNameService.save(taCompanyRealName);
96
+        return SaResult.data(taCompanyRealName);
97
+    }
98
+
99
+    /**
100
+     * 更新数据
101
+     *
102
+     * @param taCompanyRealName 实例对象
103
+     * @return 实例对象
104
+     */
105
+    @OpLog(module = "公司实名认证", action = "更新数据")
106
+    @AccessLimit()
107
+    @ApiOperation("更新数据")
108
+    @PutMapping("/taCompanyRealName/{id}")
109
+    public SaResult edit(@ApiParam("对象实体") @Validated @RequestBody TaCompanyRealName taCompanyRealName,
110
+                         @ApiParam("对象ID") @PathVariable String id) throws Exception {
111
+        taCompanyRealNameService.updateById(taCompanyRealName);
112
+        return SaResult.data(taCompanyRealName);
113
+    }
114
+
115
+    /**
116
+     * 通过主键删除数据
117
+     *
118
+     * @param id 主键
119
+     * @return 是否成功
120
+     */
121
+    @OpLog(module = "公司实名认证", action = "删除数据", desc = "ID:{{#id}}")
122
+    @AccessLimit()
123
+    @ApiOperation("通过主键删除数据")
124
+    @DeleteMapping("/taCompanyRealName/{id}")
125
+    public SaResult deleteById(@ApiParam("对象ID") @PathVariable String id) {
126
+        taCompanyRealNameService.removeById(id);
127
+        return SaResult.data("success");
128
+    }
129
+}

+ 1
- 0
platform/src/main/java/com/njyunzhi/platform/service/TaCompanyInfoService.java 查看文件

@@ -11,4 +11,5 @@ import com.njyunzhi.repository.entity.TaCompanyInfo;
11 11
  */
12 12
 public interface TaCompanyInfoService extends IBaseService<TaCompanyInfo> {
13 13
 
14
+//    TaCompanyInfo getCompanyList(String id);
14 15
 }

+ 15
- 0
platform/src/main/java/com/njyunzhi/platform/service/TaCompanyRealNameService.java 查看文件

@@ -0,0 +1,15 @@
1
+package com.njyunzhi.platform.service;
2
+
3
+import com.njyunzhi.repository.IBaseService;
4
+import com.njyunzhi.repository.entity.TaCompanyRealName;
5
+
6
+/**
7
+ * 公司实名认证;(ta_company_real_name)表服务接口
8
+ *
9
+ * @author : http://njyunzhi.com
10
+ * @date : 2024-3-1
11
+ */
12
+public interface TaCompanyRealNameService extends IBaseService<TaCompanyRealName> {
13
+
14
+    TaCompanyRealName getCompanyList(String id);
15
+}

+ 26
- 0
platform/src/main/java/com/njyunzhi/platform/service/impl/TaCompanyInfoServiceImpl.java 查看文件

@@ -2,10 +2,17 @@ package com.njyunzhi.platform.service.impl;
2 2
 
3 3
 import com.njyunzhi.platform.service.TaCompanyInfoService;
4 4
 import com.njyunzhi.repository.BaseServiceImpl;
5
+import com.njyunzhi.repository.entity.TaCompanyBeneficiaryInfo;
5 6
 import com.njyunzhi.repository.entity.TaCompanyInfo;
7
+import com.njyunzhi.repository.entity.TaCompanyLegalInfo;
8
+import com.njyunzhi.repository.mapper.TaCompanyBeneficiaryInfoMapper;
6 9
 import com.njyunzhi.repository.mapper.TaCompanyInfoMapper;
10
+import com.njyunzhi.repository.mapper.TaCompanyLegalInfoMapper;
11
+import org.springframework.beans.factory.annotation.Autowired;
7 12
 import org.springframework.stereotype.Service;
8 13
 
14
+import java.util.List;
15
+
9 16
 /**
10 17
  * 公司基本信息;(ta_company_info)表服务实现类
11 18
  *
@@ -14,5 +21,24 @@ import org.springframework.stereotype.Service;
14 21
  */
15 22
 @Service
16 23
 public class TaCompanyInfoServiceImpl extends BaseServiceImpl<TaCompanyInfoMapper, TaCompanyInfo> implements TaCompanyInfoService {
24
+    @Autowired
25
+    TaCompanyLegalInfoMapper taCompanyLegalInfoMapper;
26
+
27
+    @Autowired
28
+    TaCompanyBeneficiaryInfoMapper taCompanyBeneficiaryInfoMapper;
29
+
17 30
 
31
+//    @Override
32
+//    public TaCompanyInfo getCompanyList(String id) {
33
+////
34
+////        TaCompanyInfo taCompanyInfo=baseMapper.selectById(id);
35
+////        String companyId=taCompanyInfo.getCompanyId();
36
+////        List<TaCompanyLegalInfo> taCompanyLegalInfo=taCompanyLegalInfoMapper.getLegalInfoList(companyId);
37
+////        List<TaCompanyBeneficiaryInfo> taCompanyBeneficiaryInfo=taCompanyBeneficiaryInfoMapper.getBeneficiaryList(companyId);
38
+////
39
+////        taCompanyInfo.setTaCompanyLegalInfoList(taCompanyLegalInfo);
40
+////        taCompanyInfo.setTaCompanyBeneficiaryInfoList(taCompanyBeneficiaryInfo);
41
+////
42
+////        return taCompanyInfo;
43
+////    }
18 44
 }

+ 52
- 0
platform/src/main/java/com/njyunzhi/platform/service/impl/TaCompanyRealNameServiceImpl.java 查看文件

@@ -0,0 +1,52 @@
1
+package com.njyunzhi.platform.service.impl;
2
+
3
+import com.njyunzhi.platform.service.TaCompanyRealNameService;
4
+import com.njyunzhi.repository.BaseServiceImpl;
5
+import com.njyunzhi.repository.entity.TaCompanyBeneficiaryInfo;
6
+import com.njyunzhi.repository.entity.TaCompanyInfo;
7
+import com.njyunzhi.repository.entity.TaCompanyLegalInfo;
8
+import com.njyunzhi.repository.entity.TaCompanyRealName;
9
+import com.njyunzhi.repository.mapper.TaCompanyBeneficiaryInfoMapper;
10
+import com.njyunzhi.repository.mapper.TaCompanyInfoMapper;
11
+import com.njyunzhi.repository.mapper.TaCompanyLegalInfoMapper;
12
+import com.njyunzhi.repository.mapper.TaCompanyRealNameMapper;
13
+import org.springframework.beans.factory.annotation.Autowired;
14
+import org.springframework.stereotype.Service;
15
+
16
+import java.util.List;
17
+
18
+/**
19
+ * 公司实名认证;(ta_company_real_name)表服务实现类
20
+ *
21
+ * @author : http://www.chiner.pro
22
+ * @date : 2024-3-1
23
+ */
24
+@Service
25
+public class TaCompanyRealNameServiceImpl extends BaseServiceImpl<TaCompanyRealNameMapper, TaCompanyRealName> implements TaCompanyRealNameService {
26
+
27
+    @Autowired
28
+    TaCompanyLegalInfoMapper taCompanyLegalInfoMapper;
29
+
30
+    @Autowired
31
+    TaCompanyBeneficiaryInfoMapper taCompanyBeneficiaryInfoMapper;
32
+
33
+    @Autowired
34
+    TaCompanyInfoMapper taCompanyInfoMapper;
35
+
36
+
37
+    @Override
38
+    public TaCompanyRealName getCompanyList(String id) {
39
+
40
+        TaCompanyRealName taCompanyRealName = baseMapper.selectById(id);
41
+//        String realCompanyId = taCompanyRealName.getRealCompanyId();
42
+        String tenantId = taCompanyRealName.getTenantId();
43
+        TaCompanyInfo taCompanyInfo = taCompanyInfoMapper.getInfoList(tenantId);
44
+        List<TaCompanyLegalInfo> taCompanyLegalInfo = taCompanyLegalInfoMapper.getLegalInfoList(tenantId);
45
+        List<TaCompanyBeneficiaryInfo> taCompanyBeneficiaryInfo = taCompanyBeneficiaryInfoMapper.getBeneficiaryList(tenantId);
46
+
47
+        taCompanyRealName.setTaCompanyInfo(taCompanyInfo);
48
+        taCompanyRealName.setTaCompanyLegalInfoList(taCompanyLegalInfo);
49
+        taCompanyRealName.setTaCompanyBeneficiaryInfoList(taCompanyBeneficiaryInfo);
50
+        return taCompanyRealName;
51
+    }
52
+}

+ 1
- 0
pom.xml 查看文件

@@ -32,6 +32,7 @@
32 32
         <easyexcel.version>3.1.3</easyexcel.version>
33 33
         <thumbnailator.version>0.4.20</thumbnailator.version>
34 34
         <aliyun-oss.version>3.8.0</aliyun-oss.version>
35
+        <pdfbox.version>2.0.29</pdfbox.version>
35 36
     </properties>
36 37
     <dependencies>
37 38
         <!--web依赖-->

+ 6
- 1
repository/src/main/java/com/njyunzhi/repository/entity/SysLogin.java 查看文件

@@ -39,7 +39,12 @@ public class SysLogin implements Serializable,Cloneable{
39 39
     
40 40
     @ApiModelProperty(name = "密码",notes = "")
41 41
     private String password ;
42
-    
42
+
43
+     @ApiModelProperty(name = "邀请码",notes = "")
44
+     private String invitationCode ;
45
+
46
+     @ApiModelProperty(name = "微信号",notes = "")
47
+     private String wxNum ;
43 48
     @ApiModelProperty(name = "状态",notes = "1正常")
44 49
     private Integer status ;
45 50
     

+ 6
- 0
repository/src/main/java/com/njyunzhi/repository/entity/SysUser.java 查看文件

@@ -42,6 +42,12 @@ public class SysUser implements Serializable, Cloneable {
42 42
     @ApiModelProperty(name = "手机", notes = "")
43 43
     private String phone;
44 44
 
45
+
46
+    @ApiModelProperty(name = "邀请码",notes = "")
47
+    private String invitationCode ;
48
+
49
+    @ApiModelProperty(name = "微信号",notes = "")
50
+    private String wxNum ;
45 51
     @ApiModelProperty(name = "岗位ID", notes = "")
46 52
     private String positionId;
47 53
 

+ 8
- 3
repository/src/main/java/com/njyunzhi/repository/entity/TaCompanyBeneficiaryInfo.java 查看文件

@@ -25,9 +25,14 @@ public class TaCompanyBeneficiaryInfo implements Serializable,Cloneable{
25 25
     @ApiModelProperty(name = "受益人id",notes = "")
26 26
     @TableId(value = "beneficiary_id", type = IdType.ASSIGN_UUID)
27 27
     private String beneficiaryId ;
28
-    
29
-    @ApiModelProperty(name = "公司id",notes = "")
30
-    private String companyId ;
28
+
29
+     @NotBlank(message = "受益人姓名不能为空")
30
+     @ApiModelProperty(name = "受益人姓名",notes = "")
31
+     private String beneficiaryName ;
32
+
33
+
34
+     @ApiModelProperty(name = "公司实名认证id",notes = "")
35
+     private String realCompanyId ;
31 36
     
32 37
     @ApiModelProperty(name = "公司法人代表信息id",notes = "")
33 38
     private String companyLegalId ;

+ 33
- 22
repository/src/main/java/com/njyunzhi/repository/entity/TaCompanyInfo.java 查看文件

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
5 5
 import com.baomidou.mybatisplus.annotation.*;
6 6
 import java.io.Serializable;
7 7
 import java.time.LocalDateTime;
8
+import java.util.List;
9
+
8 10
 import lombok.Data;
9 11
 import lombok.EqualsAndHashCode;
10 12
 import lombok.experimental.Accessors;
@@ -28,32 +30,39 @@ public class TaCompanyInfo implements Serializable,Cloneable{
28 30
     
29 31
     @ApiModelProperty(name = "租户号",notes = "")
30 32
     private String tenantId ;
31
-    
32
-    @ApiModelProperty(name = "企业注册地",notes = "")
33
-    private String registrationLocation ;
34
-    
35
-    @NotBlank(message = "企业中文名不能为空")
36
-    @ApiModelProperty(name = "企业中文名",notes = "")
37
-    private String companyNameCn ;
38
-    
39
-    @NotBlank(message = "企业英文名不能为空")
40
-    @ApiModelProperty(name = "企业英文名",notes = "")
41
-    private String companyNameEn ;
42
-    
43
-    @ApiModelProperty(name = "是否为上市企业",notes = "")
44
-    private String isListedCompany ;
45
-    
33
+
34
+
35
+     @ApiModelProperty(name = "公司实名认证id",notes = "")
36
+     private String realCompanyId ;
37
+
38
+//    @ApiModelProperty(name = "企业注册地",notes = "")
39
+//    private String registrationLocation ;
40
+//
41
+//    @NotBlank(message = "企业中文名不能为空")
42
+//    @ApiModelProperty(name = "企业中文名",notes = "")
43
+//    private String companyNameCn ;
44
+//
45
+//    @NotBlank(message = "企业英文名不能为空")
46
+//    @ApiModelProperty(name = "企业英文名",notes = "")
47
+//    private String companyNameEn ;
48
+//
49
+//    @ApiModelProperty(name = "是否为上市企业",notes = " 0:否 1:是")
50
+//    private String isListedCompany ;
51
+
46 52
     @ApiModelProperty(name = "公司注册证书",notes = "")
47
-    private byte[] certificateIncorporation ;
48
-    
53
+    private String certificateIncorporation ;
54
+
55
+     @ApiModelProperty(name = "公司商业登记证PDF",notes = "")
56
+     private String companyBusinessRegistrationContent ;
57
+
49 58
     @ApiModelProperty(name = "公司商业登记证",notes = "")
50
-    private byte[] companyBusinessRegistration ;
59
+    private String companyBusinessRegistration ;
51 60
     
52 61
     @ApiModelProperty(name = "nnc1/最新nar1",notes = "")
53
-    private byte[] nnc1Nar1 ;
62
+    private String nnc1Nar1 ;
54 63
     
55 64
     @ApiModelProperty(name = "其他附件",notes = "")
56
-    private byte[] otherAnnex ;
65
+    private String otherAnnex ;
57 66
     
58 67
     @ApiModelProperty(name = "企业类型 1:私人股份有限公司,2公众股份有限公司,3有股本的公众无限公司,4有股本的私人无限公司",notes = "")
59 68
     private String companyType ;
@@ -96,8 +105,10 @@ public class TaCompanyInfo implements Serializable,Cloneable{
96 105
     
97 106
     @ApiModelProperty(name = "经营场所类型 1:自有办公场所,2:较大租用办公场所 (大于500平方),3:较小租用办公场所 (小于500平方),4:无固定办公场所",notes = "")
98 107
     private String businessPremisesType ;
99
-    
100
-    @ApiModelProperty(name = "创建人",notes = "")
108
+
109
+
110
+
111
+     @ApiModelProperty(name = "创建人",notes = "")
101 112
     @TableField(fill = FieldFill.INSERT)
102 113
     private String createdBy ;
103 114
     

+ 8
- 7
repository/src/main/java/com/njyunzhi/repository/entity/TaCompanyLegalInfo.java 查看文件

@@ -25,9 +25,10 @@ public class TaCompanyLegalInfo implements Serializable,Cloneable{
25 25
     @ApiModelProperty(name = "公司法人代表信息id",notes = "")
26 26
     @TableId(value = "company_legal_id", type = IdType.ASSIGN_UUID)
27 27
     private String companyLegalId ;
28
-    
29
-    @ApiModelProperty(name = "公司id",notes = "")
30
-    private String companyId ;
28
+
29
+
30
+     @ApiModelProperty(name = "公司实名认证id",notes = "")
31
+     private String realCompanyId ;
31 32
     
32 33
     @ApiModelProperty(name = "租户号",notes = "")
33 34
     private String tenantId ;
@@ -42,17 +43,17 @@ public class TaCompanyLegalInfo implements Serializable,Cloneable{
42 43
     private String directorIdType ;
43 44
     
44 45
     @ApiModelProperty(name = "企业董事证件正面",notes = "")
45
-    private byte[] directorIdFront ;
46
+    private String directorIdFront ;
46 47
     
47 48
     @ApiModelProperty(name = "企业董事证件反面",notes = "")
48
-    private byte[] directorIdBack ;
49
+    private String directorIdBack ;
49 50
     
50 51
     @NotBlank(message = "董事中文名不能为空")
51 52
     @ApiModelProperty(name = "董事中文名",notes = "")
52
-    private byte[] directorNameCn ;
53
+    private String directorNameCn ;
53 54
     
54 55
     @ApiModelProperty(name = "董事证件号码",notes = "")
55
-    private byte[] directorIdNo ;
56
+    private String directorIdNo ;
56 57
     
57 58
     @ApiModelProperty(name = "创建人",notes = "")
58 59
     @TableField(fill = FieldFill.INSERT)

+ 79
- 0
repository/src/main/java/com/njyunzhi/repository/entity/TaCompanyRealName.java 查看文件

@@ -0,0 +1,79 @@
1
+package com.njyunzhi.repository.entity;
2
+
3
+import io.swagger.annotations.ApiModel;
4
+import io.swagger.annotations.ApiModelProperty;
5
+import com.baomidou.mybatisplus.annotation.*;
6
+import java.io.Serializable;
7
+import java.time.LocalDateTime;
8
+import java.util.List;
9
+
10
+import lombok.Data;
11
+import lombok.EqualsAndHashCode;
12
+import lombok.experimental.Accessors;
13
+import javax.validation.constraints.NotBlank;
14
+
15
+ /**
16
+ * 公司实名认证;
17
+ * @author : http://www.chiner.pro
18
+ * @date : 2024-3-1
19
+ */
20
+@Data
21
+@EqualsAndHashCode(callSuper = false)
22
+@Accessors(chain = true)
23
+@ApiModel(value = "公司实名认证",description = "")
24
+@TableName("ta_company_real_name")
25
+public class TaCompanyRealName implements Serializable,Cloneable{
26
+    
27
+    @ApiModelProperty(name = "公司实名认证id",notes = "")
28
+    @TableId(value = "real_company_id", type = IdType.ASSIGN_UUID)
29
+    private String realCompanyId ;
30
+    
31
+    @ApiModelProperty(name = "租户号",notes = "")
32
+    private String tenantId ;
33
+    
34
+    @ApiModelProperty(name = "企业注册地",notes = "")
35
+    private String registrationLocation ;
36
+    
37
+    @NotBlank(message = "企业中文名不能为空")
38
+    @ApiModelProperty(name = "企业中文名",notes = "")
39
+    private String companyNameCn ;
40
+    
41
+    @NotBlank(message = "企业英文名不能为空")
42
+    @ApiModelProperty(name = "企业英文名",notes = "")
43
+    private String companyNameEn ;
44
+    
45
+    @ApiModelProperty(name = "是否为上市企业 0:否 1:是",notes = "")
46
+    private String isListedCompany ;
47
+    
48
+    @ApiModelProperty(name = "创建人",notes = "")
49
+    @TableField(fill = FieldFill.INSERT)
50
+    private String createdBy ;
51
+    
52
+    @ApiModelProperty(name = "创建时间",notes = "")
53
+    @TableField(fill = FieldFill.INSERT)
54
+    private LocalDateTime createdAt ;
55
+    
56
+    @ApiModelProperty(name = "更新人",notes = "")
57
+    @TableField(fill = FieldFill.INSERT_UPDATE)
58
+    private String updatedBy ;
59
+    
60
+    @ApiModelProperty(name = "更新时间",notes = "")
61
+    @TableField(fill = FieldFill.INSERT_UPDATE)
62
+    private LocalDateTime updatedAt ;
63
+
64
+
65
+     @ApiModelProperty(name = "法人列表",notes = "")
66
+     @TableField(exist = false)
67
+     private List<TaCompanyLegalInfo> taCompanyLegalInfoList ;
68
+
69
+
70
+     @ApiModelProperty(name = "受益人列表",notes = "")
71
+     @TableField(exist = false)
72
+     private List<TaCompanyBeneficiaryInfo> taCompanyBeneficiaryInfoList ;
73
+
74
+     @ApiModelProperty(name = "公司基本信息表",notes = "")
75
+     @TableField(exist = false)
76
+     private TaCompanyInfo taCompanyInfo ;
77
+
78
+
79
+ }

+ 6
- 3
repository/src/main/java/com/njyunzhi/repository/mapper/TaCompanyBeneficiaryInfoMapper.java 查看文件

@@ -5,12 +5,15 @@ import org.apache.ibatis.annotations.Mapper;
5 5
 import org.apache.ibatis.annotations.Param;
6 6
 import com.njyunzhi.repository.entity.TaCompanyBeneficiaryInfo;
7 7
 
8
- /**
8
+import java.util.List;
9
+
10
+/**
9 11
  * 受益所有人信息;(ta_company_beneficiary_info)表数据库访问层
10 12
  * @author : http://njyunzhi.com
11 13
  * @date : 2024-2-28
12 14
  */
13 15
 @Mapper
14 16
 public interface TaCompanyBeneficiaryInfoMapper  extends BaseMapper<TaCompanyBeneficiaryInfo>{
15
-    
16
-}
17
+
18
+  List<TaCompanyBeneficiaryInfo> getBeneficiaryList(@Param("tenantId") String tenantId);
19
+ }

+ 4
- 0
repository/src/main/java/com/njyunzhi/repository/mapper/TaCompanyInfoMapper.java 查看文件

@@ -3,6 +3,9 @@ package com.njyunzhi.repository.mapper;
3 3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 4
 import com.njyunzhi.repository.entity.TaCompanyInfo;
5 5
 import org.apache.ibatis.annotations.Mapper;
6
+import org.apache.ibatis.annotations.Param;
7
+
8
+import java.util.List;
6 9
 
7 10
 /**
8 11
  * 公司基本信息;(ta_company_info)表数据库访问层
@@ -13,4 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
13 16
 @Mapper
14 17
 public interface TaCompanyInfoMapper extends BaseMapper<TaCompanyInfo> {
15 18
 
19
+    TaCompanyInfo getInfoList(@Param("tenantId") String tenantId);
16 20
 }

+ 6
- 3
repository/src/main/java/com/njyunzhi/repository/mapper/TaCompanyLegalInfoMapper.java 查看文件

@@ -5,12 +5,15 @@ import org.apache.ibatis.annotations.Mapper;
5 5
 import org.apache.ibatis.annotations.Param;
6 6
 import com.njyunzhi.repository.entity.TaCompanyLegalInfo;
7 7
 
8
- /**
8
+import java.util.List;
9
+
10
+/**
9 11
  * 公司法人代表信息;(ta_company_legal_info)表数据库访问层
10 12
  * @author : http://njyunzhi.com
11 13
  * @date : 2024-2-28
12 14
  */
13 15
 @Mapper
14 16
 public interface TaCompanyLegalInfoMapper  extends BaseMapper<TaCompanyLegalInfo>{
15
-    
16
-}
17
+
18
+  List<TaCompanyLegalInfo> getLegalInfoList(@Param("tenantId") String tenantId);
19
+ }

+ 16
- 0
repository/src/main/java/com/njyunzhi/repository/mapper/TaCompanyRealNameMapper.java 查看文件

@@ -0,0 +1,16 @@
1
+package com.njyunzhi.repository.mapper;
2
+
3
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import org.apache.ibatis.annotations.Mapper;
5
+import org.apache.ibatis.annotations.Param;
6
+import com.njyunzhi.repository.entity.TaCompanyRealName;
7
+
8
+ /**
9
+ * 公司实名认证;(ta_company_real_name)表数据库访问层
10
+ * @author : http://njyunzhi.com
11
+ * @date : 2024-3-1
12
+ */
13
+@Mapper
14
+public interface TaCompanyRealNameMapper  extends BaseMapper<TaCompanyRealName>{
15
+    
16
+}

+ 14
- 0
repository/src/main/resources/mapper/TaCompanyBeneficiaryInfoMapper.xml 查看文件

@@ -0,0 +1,14 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3
+
4
+<mapper namespace="com.njyunzhi.repository.mapper.TaCompanyBeneficiaryInfoMapper">
5
+
6
+    <select id="getBeneficiaryList" resultType="com.njyunzhi.repository.entity.TaCompanyBeneficiaryInfo">
7
+        SELECT
8
+        *
9
+        FROM
10
+        ta_company_beneficiary_info b
11
+        WHERE
12
+        b.tenant_id = #{tenantId}
13
+    </select>
14
+</mapper>

+ 9
- 1
repository/src/main/resources/mapper/TaCompanyInfoMapper.xml 查看文件

@@ -2,5 +2,13 @@
2 2
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 3
 
4 4
 <mapper namespace="com.njyunzhi.repository.mapper.TaCompanyInfoMapper">
5
-    
5
+
6
+    <select id="getInfoList" resultType="com.njyunzhi.repository.entity.TaCompanyInfo">
7
+        SELECT
8
+        *
9
+        FROM
10
+        ta_company_info i
11
+        WHERE
12
+        i.tenant_id = #{tenantId}
13
+    </select>
6 14
 </mapper>

+ 14
- 0
repository/src/main/resources/mapper/TaCompanyLegalInfoMapper.xml 查看文件

@@ -0,0 +1,14 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3
+
4
+<mapper namespace="com.njyunzhi.repository.mapper.TaCompanyLegalInfoMapper">
5
+
6
+    <select id="getLegalInfoList" resultType="com.njyunzhi.repository.entity.TaCompanyLegalInfo">
7
+        SELECT
8
+        *
9
+        FROM
10
+        ta_company_legal_info l
11
+        WHERE
12
+        l.tenant_id = #{tenantId}
13
+    </select>
14
+</mapper>

+ 6
- 0
repository/src/main/resources/mapper/TaCompanyRealNameMapper.xml 查看文件

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