Skip to content

csbr-daop / ms-data-circulation-portal-service

Go to a project
Toggle navigation
Toggle navigation pinning
dd9558d6 by xiaojie
Options

【数据资产】 

开发主体增加附件和领域
1 parent cf1c0bf3
Inline Side-by-side
Showing 16 changed files with 299 additions and 191 deletions
src/main/java/com/csbr/qingcloud/portal/controller/EnterpriseAttachmentController.java deleted 100644 → 0
1 package com.csbr.qingcloud.portal.controller;
2
3 import com.csbr.cloud.common.response.CommonRes;
4 import csbr.cloud.entity.annotation.SystemLog;
5 import csbr.cloud.entity.domain.base.vo.PageListVO;
6 import com.csbr.qingcloud.portal.domain.vo.EnterpriseAttachmentQueryVO;
7 import com.csbr.qingcloud.portal.domain.vo.EnterpriseAttachmentRQVO;
8 import com.csbr.qingcloud.portal.domain.vo.EnterpriseAttachmentRSVO;
9 import com.csbr.qingcloud.portal.service.EnterpriseAttachmentService;
10 import io.swagger.v3.oas.annotations.Operation;
11 import io.swagger.v3.oas.annotations.Parameter;
12 import io.swagger.v3.oas.annotations.tags.Tag;
13 import jakarta.annotation.Resource;
14 import jakarta.validation.Valid;
15 import org.springframework.web.bind.annotation.*;
16
17 import java.util.List;
18
19 /**
20 * @program:
21 * @description: 开发主体附件信息-控制器
22 * @author: makejava
23 * @create: 2025-09-05 13:50
24 **/
25 @RestController
26 @RequestMapping("/enterprise-attachment")
27 @Tag(name = "开发主体附件信息-控制器")
28 public class EnterpriseAttachmentController {
29
30 @Resource
31 private EnterpriseAttachmentService enterpriseAttachmentService;
32
33 //region 基本操作
34
35 @PostMapping("/save")
36 @SystemLog(value = "开发主体附件信息-新增")
37 @Operation(summary = "开发主体附件信息-新增")
38 public CommonRes<Boolean> saveEnterpriseAttachment(@RequestBody @Valid EnterpriseAttachmentRQVO vo) {
39 enterpriseAttachmentService.saveEnterpriseAttachment(vo);
40 return CommonRes.success(true);
41 }
42
43 @PutMapping("/update")
44 @SystemLog(value = "开发主体附件信息-修改")
45 @Operation(summary = "开发主体附件信息-修改")
46 public CommonRes<Boolean> updateEnterpriseAttachment(@RequestBody @Valid EnterpriseAttachmentRQVO vo) {
47 enterpriseAttachmentService.updateEnterpriseAttachment(vo);
48 return CommonRes.success(true);
49 }
50
51 @DeleteMapping("/delete")
52 @SystemLog(value = "开发主体附件信息-批量删除")
53 @Operation(summary = "开发主体附件信息-批量删除")
54 public CommonRes<Boolean> removeByGuids(@RequestBody List<String> guids) {
55 enterpriseAttachmentService.removeByGuids(guids);
56 return CommonRes.success(true);
57 }
58
59 @PostMapping("/page-list")
60 @SystemLog(value = "开发主体附件信息-分页")
61 @Operation(summary = "开发主体附件信息-分页")
62 public CommonRes<PageListVO<EnterpriseAttachmentRSVO>> pageList(@RequestBody @Valid EnterpriseAttachmentQueryVO queryVO) {
63 PageListVO<EnterpriseAttachmentRSVO> pageVO = enterpriseAttachmentService.pageList(queryVO);
64 return CommonRes.success(pageVO);
65 }
66
67 @GetMapping("/detail")
68 @SystemLog(value = "开发主体附件信息-详情")
69 @Operation(
70 summary = "开发主体附件信息-详情",
71 parameters = {
72 @Parameter(name = "guid", description = "开发主体附件信息唯一标识", required = true)}
73 )
74 public CommonRes<EnterpriseAttachmentRSVO> getEnterpriseAttachmentDetail(@RequestParam String guid) {
75 EnterpriseAttachmentRSVO vo = enterpriseAttachmentService.getEnterpriseAttachmentDetail(guid);
76 return CommonRes.success(vo);
77 }
78
79 @GetMapping("/get-fileUrl")
80 @SystemLog(value = "开发主体附件信息-查询文件Url地址")
81 @Operation(
82 summary = "开发主体附件信息-查询文件Url地址",
83 parameters = {
84 @Parameter(name = "fileId", description = "文件Id", required = true)},
85 hidden = true
86 )
87 public CommonRes<String> getFileUrl(@RequestParam String fileId) {
88 String fileUrl = enterpriseAttachmentService.getEnterpriseAttachmentUrl(fileId);
89 return CommonRes.success(fileUrl);
90 }
91
92 //endregion
93
94 }
src/main/java/com/csbr/qingcloud/portal/controller/EnterpriseDomainController.java deleted 100644 → 0
1 package com.csbr.qingcloud.portal.controller;
2
3 import com.csbr.cloud.common.response.CommonRes;
4 import csbr.cloud.entity.annotation.SystemLog;
5 import csbr.cloud.entity.domain.base.vo.PageListVO;
6 import com.csbr.qingcloud.portal.domain.vo.EnterpriseDomainQueryVO;
7 import com.csbr.qingcloud.portal.domain.vo.EnterpriseDomainRQVO;
8 import com.csbr.qingcloud.portal.domain.vo.EnterpriseDomainRSVO;
9 import com.csbr.qingcloud.portal.service.EnterpriseDomainService;
10 import io.swagger.v3.oas.annotations.Operation;
11 import io.swagger.v3.oas.annotations.Parameter;
12 import io.swagger.v3.oas.annotations.tags.Tag;
13 import jakarta.annotation.Resource;
14 import jakarta.validation.Valid;
15 import org.springframework.web.bind.annotation.*;
16
17 import java.util.List;
18
19 /**
20 * @program:
21 * @description: 开发主体领域信息-控制器
22 * @author: makejava
23 * @create: 2025-09-12 11:02
24 **/
25 @RestController
26 @RequestMapping("/enterprise-domain")
27 @Tag(name = "开发主体领域信息-控制器")
28 public class EnterpriseDomainController {
29
30 @Resource
31 private EnterpriseDomainService enterpriseDomainService;
32
33 //region 基本操作
34
35 @PostMapping("/save")
36 @SystemLog(value = "开发主体领域信息-新增")
37 @Operation(summary = "开发主体领域信息-新增")
38 public CommonRes<Boolean> saveEnterpriseDomain(@RequestBody @Valid EnterpriseDomainRQVO vo) {
39 enterpriseDomainService.saveEnterpriseDomain(vo);
40 return CommonRes.success(true);
41 }
42
43 @PutMapping("/update")
44 @SystemLog(value = "开发主体领域信息-修改")
45 @Operation(summary = "开发主体领域信息-修改")
46 public CommonRes<Boolean> updateEnterpriseDomain(@RequestBody @Valid EnterpriseDomainRQVO vo) {
47 enterpriseDomainService.updateEnterpriseDomain(vo);
48 return CommonRes.success(true);
49 }
50
51 @DeleteMapping("/delete")
52 @SystemLog(value = "开发主体领域信息-批量删除")
53 @Operation(summary = "开发主体领域信息-批量删除")
54 public CommonRes<Boolean> removeByGuids(@RequestBody List<String> guids) {
55 enterpriseDomainService.removeByGuids(guids);
56 return CommonRes.success(true);
57 }
58
59 @PostMapping("/page-list")
60 @SystemLog(value = "开发主体领域信息-分页")
61 @Operation(summary = "开发主体领域信息-分页")
62 public CommonRes<PageListVO<EnterpriseDomainRSVO>> pageList(@RequestBody @Valid EnterpriseDomainQueryVO queryVO) {
63 PageListVO<EnterpriseDomainRSVO> pageVO = enterpriseDomainService.pageList(queryVO);
64 return CommonRes.success(pageVO);
65 }
66
67 @GetMapping("/detail")
68 @SystemLog(value = "开发主体领域信息-详情")
69 @Operation(
70 summary = "开发主体领域信息-详情",
71 parameters = {
72 @Parameter(name = "guid", description = "开发主体领域信息唯一标识", required = true)}
73 )
74 public CommonRes<EnterpriseDomainRSVO> getEnterpriseDomainDetail(@RequestParam String guid) {
75 EnterpriseDomainRSVO vo = enterpriseDomainService.getEnterpriseDomainDetail(guid);
76 return CommonRes.success(vo);
77 }
78
79 //endregion
80
81 }
src/main/java/com/csbr/qingcloud/portal/domain/vo/EnterpriseAttachmentRQVO.java
1 package com.csbr.qingcloud.portal.domain.vo; 1 package com.csbr.qingcloud.portal.domain.vo;
2 2
3 import io.swagger.v3.oas.annotations.media.Schema; 3 import io.swagger.v3.oas.annotations.media.Schema;
4 import com.fasterxml.jackson.annotation.JsonFormat; 4 import jakarta.validation.constraints.NotBlank;
5 import jakarta.validation.constraints.Size; 5 import jakarta.validation.constraints.Size;
6 import lombok.Data; 6 import lombok.Data;
7
7 import java.math.BigDecimal; 8 import java.math.BigDecimal;
8 import java.util.Date;
9 9
10 /** 10 /**
11 * @program: 11 * @program:
...@@ -39,10 +39,17 @@ public class EnterpriseAttachmentRQVO { ...@@ -39,10 +39,17 @@ public class EnterpriseAttachmentRQVO {
39 private String enterpriseGuid; 39 private String enterpriseGuid;
40 40
41 /** 41 /**
42 * 文件唯一标识
43 */
44 @Schema(description = "文件唯一标识")
45 private String fileId;
46
47 /**
42 * 文件名称 48 * 文件名称
43 */ 49 */
44 @Schema(description = "文件名称") 50 @Schema(description = "文件名称")
45 @Size(max = 50, message = "文件名称长度超过50") 51 @Size(max = 50, message = "文件名称长度超过50")
52 @NotBlank(message = "文件名称为空.")
46 private String fileName; 53 private String fileName;
47 54
48 /** 55 /**
...@@ -50,6 +57,7 @@ public class EnterpriseAttachmentRQVO { ...@@ -50,6 +57,7 @@ public class EnterpriseAttachmentRQVO {
50 */ 57 */
51 @Schema(description = "文件类型【详情 开发主体附件类型数据字典】") 58 @Schema(description = "文件类型【详情 开发主体附件类型数据字典】")
52 @Size(max = 10, message = "文件类型【详情 开发主体附件类型数据字典】长度超过10") 59 @Size(max = 10, message = "文件类型【详情 开发主体附件类型数据字典】长度超过10")
60 @NotBlank(message = "文件类型为空.")
53 private String fileType; 61 private String fileType;
54 62
55 /** 63 /**
...@@ -63,6 +71,7 @@ public class EnterpriseAttachmentRQVO { ...@@ -63,6 +71,7 @@ public class EnterpriseAttachmentRQVO {
63 */ 71 */
64 @Schema(description = "文件地址") 72 @Schema(description = "文件地址")
65 @Size(max = 500, message = "文件地址长度超过500") 73 @Size(max = 500, message = "文件地址长度超过500")
74 @NotBlank(message = "文件地址为空.")
66 private String fileUrl; 75 private String fileUrl;
67 76
68 /******** 库表存储属性 需处理 *****/ 77 /******** 库表存储属性 需处理 *****/
......
src/main/java/com/csbr/qingcloud/portal/domain/vo/EnterpriseAttachmentRSVO.java
1 package com.csbr.qingcloud.portal.domain.vo; 1 package com.csbr.qingcloud.portal.domain.vo;
2 2
3 import com.csbr.cloud.common.annotations.SystemParamsDict;
3 import io.swagger.v3.oas.annotations.media.Schema; 4 import io.swagger.v3.oas.annotations.media.Schema;
4 import com.fasterxml.jackson.annotation.JsonFormat;
5 import lombok.Data; 5 import lombok.Data;
6
6 import java.math.BigDecimal; 7 import java.math.BigDecimal;
7 import java.util.Date;
8 8
9 /** 9 /**
10 * @program: 10 * @program:
...@@ -47,6 +47,13 @@ public class EnterpriseAttachmentRSVO { ...@@ -47,6 +47,13 @@ public class EnterpriseAttachmentRSVO {
47 private String fileType; 47 private String fileType;
48 48
49 /** 49 /**
50 * 文件类型名称
51 */
52 @Schema(description = "文件类型名称")
53 @SystemParamsDict(dictTypeName = "文件类型", codeFieldName = "fileType")
54 private String fileTypeName;
55
56 /**
50 * 文件大小 57 * 文件大小
51 */ 58 */
52 @Schema(description = "文件大小") 59 @Schema(description = "文件大小")
......
src/main/java/com/csbr/qingcloud/portal/domain/vo/EnterpriseDomainRQVO.java
1 package com.csbr.qingcloud.portal.domain.vo; 1 package com.csbr.qingcloud.portal.domain.vo;
2 2
3 import io.swagger.v3.oas.annotations.media.Schema;
4 import com.fasterxml.jackson.annotation.JsonFormat; 3 import com.fasterxml.jackson.annotation.JsonFormat;
4 import io.swagger.v3.oas.annotations.media.Schema;
5 import jakarta.validation.constraints.NotBlank;
6 import jakarta.validation.constraints.NotNull;
7 import jakarta.validation.constraints.Pattern;
5 import jakarta.validation.constraints.Size; 8 import jakarta.validation.constraints.Size;
6 import lombok.Data; 9 import lombok.Data;
10
7 import java.util.Date; 11 import java.util.Date;
8 12
9 /** 13 /**
...@@ -24,13 +28,6 @@ public class EnterpriseDomainRQVO { ...@@ -24,13 +28,6 @@ public class EnterpriseDomainRQVO {
24 private String guid; 28 private String guid;
25 29
26 /** 30 /**
27 * 企业唯一标识
28 */
29 @Schema(description = "企业唯一标识")
30 @Size(max = 32, message = "企业唯一标识长度超过32")
31 private String tenantGuid;
32
33 /**
34 * 企业认证唯一标识 31 * 企业认证唯一标识
35 */ 32 */
36 @Schema(description = "企业认证唯一标识") 33 @Schema(description = "企业认证唯一标识")
...@@ -42,6 +39,7 @@ public class EnterpriseDomainRQVO { ...@@ -42,6 +39,7 @@ public class EnterpriseDomainRQVO {
42 */ 39 */
43 @Schema(description = "领域代码") 40 @Schema(description = "领域代码")
44 @Size(max = 10, message = "领域代码长度超过10") 41 @Size(max = 10, message = "领域代码长度超过10")
42 @NotBlank(message = "领域代码为空.")
45 private String domainId; 43 private String domainId;
46 44
47 /** 45 /**
...@@ -49,20 +47,23 @@ public class EnterpriseDomainRQVO { ...@@ -49,20 +47,23 @@ public class EnterpriseDomainRQVO {
49 */ 47 */
50 @Schema(description = "授权协议号") 48 @Schema(description = "授权协议号")
51 @Size(max = 50, message = "授权协议号长度超过50") 49 @Size(max = 50, message = "授权协议号长度超过50")
50 @NotBlank(message = "授权协议号为空.")
52 private String authId; 51 private String authId;
53 52
54 /** 53 /**
55 * 协议开始日期 54 * 协议开始日期
56 */ 55 */
57 @Schema(description = "协议开始日期") 56 @Schema(description = "协议开始日期")
58 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") 57 @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
58 @NotNull(message = "协议开始日期为空.")
59 private Date domainStartTime; 59 private Date domainStartTime;
60 60
61 /** 61 /**
62 * 协议结束日期 62 * 协议结束日期
63 */ 63 */
64 @Schema(description = "协议结束日期") 64 @Schema(description = "协议结束日期")
65 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") 65 @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
66 @NotNull(message = "协议结束日期为空.")
66 private Date domainEndTime; 67 private Date domainEndTime;
67 68
68 /** 69 /**
...@@ -70,6 +71,7 @@ public class EnterpriseDomainRQVO { ...@@ -70,6 +71,7 @@ public class EnterpriseDomainRQVO {
70 */ 71 */
71 @Schema(description = "协议签订人") 72 @Schema(description = "协议签订人")
72 @Size(max = 20, message = "协议签订人长度超过20") 73 @Size(max = 20, message = "协议签订人长度超过20")
74 @NotBlank(message = "协议签订人为空.")
73 private String signee; 75 private String signee;
74 76
75 /** 77 /**
...@@ -77,6 +79,8 @@ public class EnterpriseDomainRQVO { ...@@ -77,6 +79,8 @@ public class EnterpriseDomainRQVO {
77 */ 79 */
78 @Schema(description = "协议状态，如10【10-生效中；20-已终止】") 80 @Schema(description = "协议状态，如10【10-生效中；20-已终止】")
79 @Size(max = 10, message = "协议状态，如10【10-生效中；20-已终止】长度超过10") 81 @Size(max = 10, message = "协议状态，如10【10-生效中；20-已终止】长度超过10")
82 @NotBlank(message = "协议状态为空.")
83 @Pattern(regexp = "^10|20$", message = "领域代码应该为10、20中的值。")
80 private String domainStatus; 84 private String domainStatus;
81 85
82 /******** 库表存储属性 需处理 *****/ 86 /******** 库表存储属性 需处理 *****/
......
src/main/java/com/csbr/qingcloud/portal/domain/vo/EnterpriseDomainRSVO.java
1 package com.csbr.qingcloud.portal.domain.vo; 1 package com.csbr.qingcloud.portal.domain.vo;
2 2
3 import io.swagger.v3.oas.annotations.media.Schema; 3 import com.csbr.cloud.common.annotations.SystemParamsDict;
4 import com.fasterxml.jackson.annotation.JsonFormat; 4 import com.fasterxml.jackson.annotation.JsonFormat;
5 import io.swagger.v3.oas.annotations.media.Schema;
5 import lombok.Data; 6 import lombok.Data;
7
6 import java.util.Date; 8 import java.util.Date;
7 9
8 /** 10 /**
...@@ -39,6 +41,10 @@ public class EnterpriseDomainRSVO { ...@@ -39,6 +41,10 @@ public class EnterpriseDomainRSVO {
39 @Schema(description = "领域代码") 41 @Schema(description = "领域代码")
40 private String domainId; 42 private String domainId;
41 43
44 @Schema(title = "领域名称")
45 @SystemParamsDict(dictTypeName = "领域", codeFieldName = "domainId")
46 private String domainIdName;
47
42 /** 48 /**
43 * 授权协议号 49 * 授权协议号
44 */ 50 */
...@@ -71,6 +77,10 @@ public class EnterpriseDomainRSVO { ...@@ -71,6 +77,10 @@ public class EnterpriseDomainRSVO {
71 @Schema(description = "协议状态，如10【10-生效中；20-已终止】") 77 @Schema(description = "协议状态，如10【10-生效中；20-已终止】")
72 private String domainStatus; 78 private String domainStatus;
73 79
80 @Schema(title = "协议状态名称")
81 @SystemParamsDict(dictTypeName = "协议状态", codeFieldName = "domainStatus")
82 private String domainStatusName;
83
74 /******** 库表存储属性 需处理 *****/ 84 /******** 库表存储属性 需处理 *****/
75 85
76 /******** 自定义扩展 *****/ 86 /******** 自定义扩展 *****/
......
src/main/java/com/csbr/qingcloud/portal/domain/vo/EnterpriseRQVO.java
...@@ -3,9 +3,11 @@ package com.csbr.qingcloud.portal.domain.vo; ...@@ -3,9 +3,11 @@ package com.csbr.qingcloud.portal.domain.vo;
3 import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO; 3 import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
4 import io.swagger.v3.oas.annotations.media.Schema; 4 import io.swagger.v3.oas.annotations.media.Schema;
5 import com.fasterxml.jackson.annotation.JsonFormat; 5 import com.fasterxml.jackson.annotation.JsonFormat;
6 import jakarta.validation.Valid;
6 import lombok.Data; 7 import lombok.Data;
7 import java.math.BigDecimal; 8 import java.math.BigDecimal;
8 import java.util.Date; 9 import java.util.Date;
10 import java.util.List;
9 11
10 /** 12 /**
11 * @program: D:/git/ms-data-circulation-portal-service 13 * @program: D:/git/ms-data-circulation-portal-service
...@@ -175,10 +177,23 @@ public class EnterpriseRQVO extends FlowRQBaseVO { ...@@ -175,10 +177,23 @@ public class EnterpriseRQVO extends FlowRQBaseVO {
175 @Schema(description = "业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃；B 变更中； 默认 N】") 177 @Schema(description = "业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃；B 变更中； 默认 N】")
176 private String bizApproveState; 178 private String bizApproveState;
177 179
180 @Schema(description = "组织机构性质")
181 private String institutionType;
182
183 @Schema(description = "详细地址")
184 private String detailedAddress;
185
178 /******** 库表存储属性 需处理 *****/ 186 /******** 库表存储属性 需处理 *****/
179 187
180 /******** 自定义扩展 *****/ 188 /******** 自定义扩展 *****/
181 189
182 /******** 子对象 *****/ 190 /******** 子对象 *****/
183 191
192 @Schema(description = "开发主体附件信息")
193 private List<EnterpriseAttachmentRQVO> attachmentRQVOS;
194
195 @Schema(description = "开发主体领域信息")
196 @Valid
197 private List<EnterpriseDomainRQVO> domainRQVOS;
198
184 } 199 }
......
src/main/java/com/csbr/qingcloud/portal/domain/vo/EnterpriseRSVO.java
1 package com.csbr.qingcloud.portal.domain.vo; 1 package com.csbr.qingcloud.portal.domain.vo;
2 2
3 import com.csbr.cloud.common.annotations.SystemParamsDict;
3 import io.swagger.v3.oas.annotations.media.Schema; 4 import io.swagger.v3.oas.annotations.media.Schema;
4 import com.fasterxml.jackson.annotation.JsonFormat; 5 import com.fasterxml.jackson.annotation.JsonFormat;
5 import lombok.Data; 6 import lombok.Data;
...@@ -198,6 +199,16 @@ public class EnterpriseRSVO { ...@@ -198,6 +199,16 @@ public class EnterpriseRSVO {
198 @Schema(title = "跨平台审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)") 199 @Schema(title = "跨平台审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
199 private String crossPlatformApproveState; 200 private String crossPlatformApproveState;
200 201
202 @Schema(description = "组织机构性质")
203 private String institutionType;
204
205 @Schema(description = "组织机构性质名称")
206 @SystemParamsDict(dictTypeName = "组织机构性质", codeFieldName = "institutionType")
207 private String institutionTypeName;
208
209 @Schema(description = "详细地址")
210 private String detailedAddress;
211
201 /******** 库表存储属性 需处理 *****/ 212 /******** 库表存储属性 需处理 *****/
202 213
203 /******** 自定义扩展 *****/ 214 /******** 自定义扩展 *****/
...@@ -216,4 +227,10 @@ public class EnterpriseRSVO { ...@@ -216,4 +227,10 @@ public class EnterpriseRSVO {
216 227
217 /******** 子对象 *****/ 228 /******** 子对象 *****/
218 229
230 @Schema(description = "开发主体附件信息返回参数")
231 private List<EnterpriseAttachmentRSVO> attachmentRSVOS;
232
233 @Schema(description = "开发主体领域信息返回参数")
234 private List<EnterpriseDomainRSVO> domainRSVOS;
235
219 } 236 }
......
src/main/java/com/csbr/qingcloud/portal/feign/DaopCommonFeign.java 0 → 100644
1 package com.csbr.qingcloud.portal.feign;
2
3 import com.csbr.cloud.common.config.FastCallFeignConfiguration;
4 import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
5 import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
6 import org.springframework.cloud.openfeign.FeignClient;
7 import org.springframework.core.io.ByteArrayResource;
8 import org.springframework.http.MediaType;
9 import org.springframework.http.ResponseEntity;
10 import org.springframework.web.bind.annotation.RequestMapping;
11 import org.springframework.web.bind.annotation.RequestMethod;
12 import org.springframework.web.bind.annotation.RequestParam;
13
14 /**
15 * @program:
16 * @description: 公共服务调用
17 * @author: lixiang
18 * @create: 2023-11-07 17:55
19 **/
20 @FeignClient(value = "ms-daop-common-service", configuration = FastCallFeignConfiguration.class)
21 public interface DaopCommonFeign {
22 /**
23 * 下载文件流
24 * @param filePath
25 * @return
26 */
27 @HystrixCommand(fallbackMethod = "CommonUtil.sleepFallback", commandProperties =
28 {
29 @HystrixProperty(name = "execution.isolation.thread.timeoutInMilliseconds", value = "9000")
30 })
31 @RequestMapping(value = "/obs/download-file-stream",method = RequestMethod.GET, produces = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
32 ResponseEntity<ByteArrayResource> downloadFile(@RequestParam(value = "filePath", required = true) String filePath);
33
34 }
src/main/java/com/csbr/qingcloud/portal/mybatis/entity/MfEnterprise.java
...@@ -187,4 +187,9 @@ public class MfEnterprise extends BaseDO { ...@@ -187,4 +187,9 @@ public class MfEnterprise extends BaseDO {
187 @Name("业务审批状态") 187 @Name("业务审批状态")
188 private String bizApproveState; 188 private String bizApproveState;
189 189
190 @Name("组织机构性质")
191 private String institutionType;
192
193 @Name("详细地址")
194 private String detailedAddress;
190 } 195 }
......
src/main/java/com/csbr/qingcloud/portal/mybatis/entity/MfEnterpriseChangeApprove.java
...@@ -205,4 +205,10 @@ public class MfEnterpriseChangeApprove extends BaseDO { ...@@ -205,4 +205,10 @@ public class MfEnterpriseChangeApprove extends BaseDO {
205 @Name("数据类型") 205 @Name("数据类型")
206 private String dataType; 206 private String dataType;
207 207
208 @Name("组织机构性质")
209 private String institutionType;
210
211 @Name("详细地址")
212 private String detailedAddress;
213
208 } 214 }
......
src/main/java/com/csbr/qingcloud/portal/service/EnterpriseAttachmentService.java
...@@ -83,4 +83,27 @@ public interface EnterpriseAttachmentService { ...@@ -83,4 +83,27 @@ public interface EnterpriseAttachmentService {
83 * @return 83 * @return
84 */ 84 */
85 String getEnterpriseAttachmentUrl(String fileId); 85 String getEnterpriseAttachmentUrl(String fileId);
86
87 /**
88 * 批量新增开发主体附件信息
89 * @param attachmentRQVOS
90 * @param guid
91 * @param isRequired
92 */
93 void batchSave(List<EnterpriseAttachmentRQVO> attachmentRQVOS, String guid, Boolean isRequired);
94
95 /**
96 * 删除开发主体附件信息
97 * @param enterpriseGuids
98 */
99 void removeByEnterpriseGuids(List<String> enterpriseGuids);
100
101 /**
102 * 批量修改开发主体附件信息
103 * @param attachmentRQVOS
104 * @param guid
105 * @param isRequired
106 */
107 void batchUpdate(List<EnterpriseAttachmentRQVO> attachmentRQVOS, String guid, Boolean isRequired);
108
86 } 109 }
......
src/main/java/com/csbr/qingcloud/portal/service/EnterpriseDomainService.java
1 package com.csbr.qingcloud.portal.service; 1 package com.csbr.qingcloud.portal.service;
2 2
3 import csbr.cloud.entity.domain.base.vo.PageListVO;
4 import com.csbr.qingcloud.portal.domain.vo.EnterpriseDomainQueryVO; 3 import com.csbr.qingcloud.portal.domain.vo.EnterpriseDomainQueryVO;
5 import com.csbr.qingcloud.portal.domain.vo.EnterpriseDomainRQVO; 4 import com.csbr.qingcloud.portal.domain.vo.EnterpriseDomainRQVO;
6 import com.csbr.qingcloud.portal.domain.vo.EnterpriseDomainRSVO; 5 import com.csbr.qingcloud.portal.domain.vo.EnterpriseDomainRSVO;
6 import csbr.cloud.entity.domain.base.vo.PageListVO;
7 7
8 import java.util.List; 8 import java.util.List;
9 9
...@@ -69,4 +69,23 @@ public interface EnterpriseDomainService { ...@@ -69,4 +69,23 @@ public interface EnterpriseDomainService {
69 */ 69 */
70 void removeHandleByGuids(List<String> guids); 70 void removeHandleByGuids(List<String> guids);
71 71
72 /**
73 * 批量新增开发主体领域信息
74 * @param domainRQVOS
75 * @param guid
76 */
77 void batchSave(List<EnterpriseDomainRQVO> domainRQVOS, String guid);
78
79 /**
80 * 删除开发主体领域信息
81 * @param enterpriseGuids
82 */
83 void removeByEnterpriseGuids(List<String> enterpriseGuids);
84
85 /**
86 * 批量新增开发主体领域信息
87 * @param domainRQVOS
88 * @param guid
89 */
90 void batchUpdate(List<EnterpriseDomainRQVO> domainRQVOS, String guid);
72 } 91 }
......
src/main/java/com/csbr/qingcloud/portal/service/impl/EnterpriseAttachmentServiceImpl.java
1 package com.csbr.qingcloud.portal.service.impl; 1 package com.csbr.qingcloud.portal.service.impl;
2 2
3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
4 import com.baomidou.mybatisplus.core.toolkit.Wrappers; 5 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
5 import com.csbr.cloud.common.enums.SystemError; 6 import com.csbr.cloud.common.enums.SystemError;
6 import com.csbr.cloud.common.exception.CsbrSystemException; 7 import com.csbr.cloud.common.exception.CsbrSystemException;
...@@ -8,6 +9,7 @@ import com.csbr.cloud.common.util.CommonUtil; ...@@ -8,6 +9,7 @@ import com.csbr.cloud.common.util.CommonUtil;
8 import com.csbr.cloud.common.util.CsbrBeanUtil; 9 import com.csbr.cloud.common.util.CsbrBeanUtil;
9 import com.csbr.cloud.common.util.MessageSourceUtil; 10 import com.csbr.cloud.common.util.MessageSourceUtil;
10 import com.csbr.qingcloud.portal.domain.vo.dataExchange.*; 11 import com.csbr.qingcloud.portal.domain.vo.dataExchange.*;
12 import com.csbr.qingcloud.portal.feign.DaopCommonFeign;
11 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise; 13 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise;
12 import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseService; 14 import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseService;
13 import csbr.cloud.entity.domain.base.vo.PageListVO; 15 import csbr.cloud.entity.domain.base.vo.PageListVO;
...@@ -17,18 +19,27 @@ import com.csbr.qingcloud.portal.domain.vo.EnterpriseAttachmentRSVO; ...@@ -17,18 +19,27 @@ import com.csbr.qingcloud.portal.domain.vo.EnterpriseAttachmentRSVO;
17 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseAttachment; 19 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseAttachment;
18 import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseAttachmentService; 20 import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseAttachmentService;
19 import com.csbr.qingcloud.portal.service.EnterpriseAttachmentService; 21 import com.csbr.qingcloud.portal.service.EnterpriseAttachmentService;
22 import csbr.cloud.entity.domain.easyexcel.MockMultipartFile;
20 import csbr.cloud.entity.enums.ApprovalStateEnum; 23 import csbr.cloud.entity.enums.ApprovalStateEnum;
21 import jakarta.annotation.Resource; 24 import jakarta.annotation.Resource;
22 import lombok.extern.slf4j.Slf4j; 25 import lombok.extern.slf4j.Slf4j;
23 import org.apache.commons.collections.CollectionUtils; 26 import org.apache.commons.collections.CollectionUtils;
24 import org.apache.commons.lang3.ObjectUtils; 27 import org.apache.commons.lang3.ObjectUtils;
25 import org.apache.commons.lang3.StringUtils; 28 import org.apache.commons.lang3.StringUtils;
29 import org.springframework.core.io.ByteArrayResource;
30 import org.springframework.http.HttpStatus;
31 import org.springframework.http.ResponseEntity;
26 import org.springframework.stereotype.Service; 32 import org.springframework.stereotype.Service;
27 import org.springframework.transaction.annotation.Transactional; 33 import org.springframework.transaction.annotation.Transactional;
34 import org.springframework.web.multipart.MultipartFile;
28 35
36 import java.math.BigDecimal;
37 import java.net.URLDecoder;
38 import java.nio.charset.StandardCharsets;
29 import java.util.ArrayList; 39 import java.util.ArrayList;
30 import java.util.Collections; 40 import java.util.Collections;
31 import java.util.List; 41 import java.util.List;
42 import java.util.Locale;
32 43
33 /** 44 /**
34 * @program: 45 * @program:
...@@ -57,6 +68,9 @@ public class EnterpriseAttachmentServiceImpl implements EnterpriseAttachmentServ ...@@ -57,6 +68,9 @@ public class EnterpriseAttachmentServiceImpl implements EnterpriseAttachmentServ
57 @Resource 68 @Resource
58 private MfEnterpriseService mfEnterpriseService; 69 private MfEnterpriseService mfEnterpriseService;
59 70
71 @Resource
72 private DaopCommonFeign daopCommonFeign;
73
60 /** 74 /**
61 * 开发主体附件信息分页查询 75 * 开发主体附件信息分页查询
62 * @author makejava 76 * @author makejava
...@@ -266,6 +280,59 @@ public class EnterpriseAttachmentServiceImpl implements EnterpriseAttachmentServ ...@@ -266,6 +280,59 @@ public class EnterpriseAttachmentServiceImpl implements EnterpriseAttachmentServ
266 return null; 280 return null;
267 } 281 }
268 282
283 @Override
284 @Transactional
285 public void batchSave(List<EnterpriseAttachmentRQVO> attachmentRQVOS, String guid, Boolean isRequired) {
286 if (ObjectUtils.isNotEmpty(attachmentRQVOS)) {
287 List<MfEnterpriseAttachment> attachmentList = new ArrayList<>();
288 for (EnterpriseAttachmentRQVO attachmentRQVO : attachmentRQVOS) {
289 attachmentRQVO.setEnterpriseGuid(guid);
290 // 获取文件大小
291 // 下载文件流
292 String fileUrl = attachmentRQVO.getFileUrl();
293 String url = URLDecoder.decode(fileUrl.split("\\?AccessKeyId")[0], StandardCharsets.UTF_8);
294 String fileName = attachmentRQVO.getFileName().split("\\.")[0];
295 MultipartFile multipartFile = null;
296 ResponseEntity<ByteArrayResource> responseEntity = daopCommonFeign.downloadFile(url);
297 if (HttpStatus.OK.equals(responseEntity.getStatusCode()) && ObjectUtils.isNotEmpty(responseEntity.getBody())) {
298 multipartFile = new MockMultipartFile(fileName, fileName, "application/octet-stream", responseEntity.getBody().getByteArray());
299 }
300 if (multipartFile == null || multipartFile.isEmpty()) {
301 attachmentRQVO.setFileSize(BigDecimal.ZERO);
302 } else {
303 attachmentRQVO.setFileSize(BigDecimal.valueOf(multipartFile.getSize() / 1024.0));
304 }
305 attachmentRQVO.setFileId("enterprise_" + CommonUtil.newGuid().toUpperCase(Locale.ROOT));
306
307 MfEnterpriseAttachment mfEnterpriseAttachment = convertToEntity(attachmentRQVO);
308 mfEnterpriseAttachmentService.csbrAddEntity(mfEnterpriseAttachment);
309 attachmentList.add(mfEnterpriseAttachment);
310 }
311 mfEnterpriseAttachmentService.saveBatch(attachmentList);
312 }
313 }
314
315 @Transactional
316 @Override
317 public void removeByEnterpriseGuids(List<String> enterpriseGuids) {
318 if (CollectionUtils.isEmpty(enterpriseGuids)) {
319 return;
320 }
321 LambdaUpdateWrapper<MfEnterpriseAttachment> updateWrapper = Wrappers.lambdaUpdate(MfEnterpriseAttachment.class);
322 updateWrapper.in(MfEnterpriseAttachment::getEnterpriseGuid, enterpriseGuids);
323 mfEnterpriseAttachmentService.remove(updateWrapper);
324 }
325
326 @Override
327 @Transactional
328 public void batchUpdate(List<EnterpriseAttachmentRQVO> attachmentRQVOS, String guid, Boolean isRequired) {
329 // 删除开发主体附件信息
330 removeByEnterpriseGuids(Collections.singletonList(guid));
331
332 // 批量新增开发主体附件信息
333 batchSave(attachmentRQVOS, guid, isRequired);
334 }
335
269 /** 336 /**
270 * 开发主体附件信息新新增前置处理 337 * 开发主体附件信息新新增前置处理
271 * @author makejava 338 * @author makejava
......
src/main/java/com/csbr/qingcloud/portal/service/impl/EnterpriseDomainServiceImpl.java
1 package com.csbr.qingcloud.portal.service.impl; 1 package com.csbr.qingcloud.portal.service.impl;
2 2
3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
5 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
4 import com.csbr.cloud.common.enums.SystemError; 6 import com.csbr.cloud.common.enums.SystemError;
5 import com.csbr.cloud.common.exception.CsbrSystemException; 7 import com.csbr.cloud.common.exception.CsbrSystemException;
6 import com.csbr.cloud.common.util.CommonUtil; 8 import com.csbr.cloud.common.util.CommonUtil;
...@@ -16,6 +18,7 @@ import com.csbr.qingcloud.portal.service.EnterpriseDomainService; ...@@ -16,6 +18,7 @@ import com.csbr.qingcloud.portal.service.EnterpriseDomainService;
16 import jakarta.annotation.Resource; 18 import jakarta.annotation.Resource;
17 import lombok.extern.slf4j.Slf4j; 19 import lombok.extern.slf4j.Slf4j;
18 import org.apache.commons.collections.CollectionUtils; 20 import org.apache.commons.collections.CollectionUtils;
21 import org.apache.commons.lang3.ObjectUtils;
19 import org.apache.commons.lang3.StringUtils; 22 import org.apache.commons.lang3.StringUtils;
20 import org.springframework.stereotype.Service; 23 import org.springframework.stereotype.Service;
21 import org.springframework.transaction.annotation.Transactional; 24 import org.springframework.transaction.annotation.Transactional;
...@@ -180,6 +183,42 @@ public class EnterpriseDomainServiceImpl implements EnterpriseDomainService { ...@@ -180,6 +183,42 @@ public class EnterpriseDomainServiceImpl implements EnterpriseDomainService {
180 } 183 }
181 } 184 }
182 185
186 @Override
187 @Transactional
188 public void batchSave(List<EnterpriseDomainRQVO> domainRQVOS, String guid) {
189 if (ObjectUtils.isNotEmpty(domainRQVOS)) {
190 List<MfEnterpriseDomain> enterpriseDomains = new ArrayList<>();
191 for (EnterpriseDomainRQVO enterpriseDomainRQVO : domainRQVOS) {
192 MfEnterpriseDomain entity = convertToEntity(enterpriseDomainRQVO);
193 entity.setEnterpriseGuid(guid);
194 mfEnterpriseDomainService.csbrAddEntity(entity);
195 enterpriseDomains.add(entity);
196 }
197 mfEnterpriseDomainService.saveBatch(enterpriseDomains);
198 }
199 }
200
201 @Transactional
202 @Override
203 public void removeByEnterpriseGuids(List<String> enterpriseGuids) {
204 if (CollectionUtils.isEmpty(enterpriseGuids)) {
205 return;
206 }
207 LambdaUpdateWrapper<MfEnterpriseDomain> updateWrapper = Wrappers.lambdaUpdate(MfEnterpriseDomain.class);
208 updateWrapper.in(MfEnterpriseDomain::getEnterpriseGuid, enterpriseGuids);
209 mfEnterpriseDomainService.remove(updateWrapper);
210 }
211
212 @Override
213 @Transactional
214 public void batchUpdate(List<EnterpriseDomainRQVO> domainRQVOS, String guid) {
215 // 删除开发主体附件信息
216 removeByEnterpriseGuids(Collections.singletonList(guid));
217
218 // 批量新增开发主体附件信息
219 batchSave(domainRQVOS, guid);
220 }
221
183 /** 222 /**
184 * 开发主体领域信息新新增前置处理 223 * 开发主体领域信息新新增前置处理
185 * @author makejava 224 * @author makejava
......
src/main/java/com/csbr/qingcloud/portal/service/impl/EnterpriseServiceImpl.java
...@@ -31,6 +31,8 @@ import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseChangeApprove; ...@@ -31,6 +31,8 @@ import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseChangeApprove;
31 import com.csbr.qingcloud.portal.mybatis.service.MfDemandService; 31 import com.csbr.qingcloud.portal.mybatis.service.MfDemandService;
32 import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseChangeApproveService; 32 import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseChangeApproveService;
33 import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseService; 33 import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseService;
34 import com.csbr.qingcloud.portal.service.EnterpriseAttachmentService;
35 import com.csbr.qingcloud.portal.service.EnterpriseDomainService;
34 import com.csbr.qingcloud.portal.service.EnterpriseService; 36 import com.csbr.qingcloud.portal.service.EnterpriseService;
35 import com.csbr.qingcloud.portal.util.ChangeInfoUtil; 37 import com.csbr.qingcloud.portal.util.ChangeInfoUtil;
36 import com.csbr.qingcloud.portal.util.DateUtil; 38 import com.csbr.qingcloud.portal.util.DateUtil;
...@@ -45,6 +47,7 @@ import org.apache.commons.collections.CollectionUtils; ...@@ -45,6 +47,7 @@ import org.apache.commons.collections.CollectionUtils;
45 import org.apache.commons.lang3.ObjectUtils; 47 import org.apache.commons.lang3.ObjectUtils;
46 import org.apache.commons.lang3.StringUtils; 48 import org.apache.commons.lang3.StringUtils;
47 import org.springframework.beans.factory.annotation.Autowired; 49 import org.springframework.beans.factory.annotation.Autowired;
50 import org.springframework.beans.factory.annotation.Value;
48 import org.springframework.stereotype.Service; 51 import org.springframework.stereotype.Service;
49 import org.springframework.transaction.annotation.Transactional; 52 import org.springframework.transaction.annotation.Transactional;
50 53
...@@ -70,6 +73,9 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris ...@@ -70,6 +73,9 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
70 73
71 private static final String SysFuncCode = "QYRZ"; 74 private static final String SysFuncCode = "QYRZ";
72 75
76 @Value("${enterpriseAttachment.isRequired:false}")
77 private Boolean isRequired;
78
73 @Autowired 79 @Autowired
74 private ZQConfig zqConfig; 80 private ZQConfig zqConfig;
75 81
...@@ -106,6 +112,12 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris ...@@ -106,6 +112,12 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
106 @Resource 112 @Resource
107 private ConfigureFeign configureFeign; 113 private ConfigureFeign configureFeign;
108 114
115 @Resource
116 private EnterpriseAttachmentService enterpriseAttachmentService;
117
118 @Resource
119 private EnterpriseDomainService enterpriseDomainService;
120
109 /** 121 /**
110 * 企业信息分页查询 122 * 企业信息分页查询
111 * @author xcq 123 * @author xcq
...@@ -785,6 +797,14 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris ...@@ -785,6 +797,14 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
785 enterpriseChangeApprove.setSourceGuid(entity.getGuid()); 797 enterpriseChangeApprove.setSourceGuid(entity.getGuid());
786 enterpriseChangeApprove.setDataType("0"); 798 enterpriseChangeApprove.setDataType("0");
787 mfEnterpriseChangeApproveService.save(enterpriseChangeApprove); 799 mfEnterpriseChangeApproveService.save(enterpriseChangeApprove);
800
801 // 新增附件信息
802 List<EnterpriseAttachmentRQVO> attachmentRQVOS = rqVO.getAttachmentRQVOS();
803 enterpriseAttachmentService.batchSave(attachmentRQVOS, entity.getGuid(), isRequired);
804
805 // 新增领域信息
806 List<EnterpriseDomainRQVO> domainRQVOS = rqVO.getDomainRQVOS();
807 enterpriseDomainService.batchSave(domainRQVOS, entity.getGuid());
788 } 808 }
789 809
790 /** 810 /**
...@@ -855,6 +875,14 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris ...@@ -855,6 +875,14 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
855 enterpriseChangeApprove.setSourceGuid(entity.getGuid()); 875 enterpriseChangeApprove.setSourceGuid(entity.getGuid());
856 enterpriseChangeApprove.setDataType("0"); 876 enterpriseChangeApprove.setDataType("0");
857 mfEnterpriseChangeApproveService.updateById(enterpriseChangeApprove); 877 mfEnterpriseChangeApproveService.updateById(enterpriseChangeApprove);
878
879 // 新增附件信息
880 List<EnterpriseAttachmentRQVO> attachmentRQVOS = rqVO.getAttachmentRQVOS();
881 enterpriseAttachmentService.batchUpdate(attachmentRQVOS, entity.getGuid(), isRequired);
882
883 // 新增领域信息
884 List<EnterpriseDomainRQVO> domainRQVOS = rqVO.getDomainRQVOS();
885 enterpriseDomainService.batchUpdate(domainRQVOS, entity.getGuid());
858 } 886 }
859 887
860 888
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!