diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IBaseConfigController.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IBaseConfigController.java index a0f8491e2c8f08e2ca4bf866daded2598a1d108d..f4f7dc564e864b9994a956623e585f82253c87df 100644 --- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IBaseConfigController.java +++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IBaseConfigController.java @@ -27,9 +27,8 @@ import java.util.List; * @author chenqi * @date 2021/05/24 */ -@FeignClient("projectPlan") +@FeignClient("projectplan-provider") @RequestMapping("baseConfig") -@Api("BaseConfig") public interface IBaseConfigController { @PostMapping("/initBudgetDeptSwitch") diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectLibrary.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectLibrary.java new file mode 100644 index 0000000000000000000000000000000000000000..582fcb53a32730be277b198e0d1d2db711d86a67 --- /dev/null +++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectLibrary.java @@ -0,0 +1,19 @@ +package com.seasky.projectplan.api; + +import com.seasky.core.common.Result; +import com.seasky.projectplan.dto.projectlibrary.ProjectLibraryCmd; +import io.swagger.annotations.Api; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + + +@FeignClient("projectplan-provider") +@RequestMapping("projectLibrary") +@Api("椤圭洰搴�") +public interface IProjectLibrary { + + @PostMapping("/saveProjectLibrary") + Result<Object> saveProjectLibrary(@RequestBody ProjectLibraryCmd cmd); +} diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectlibrary/ProjectLibraryCmd.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectlibrary/ProjectLibraryCmd.java new file mode 100644 index 0000000000000000000000000000000000000000..72e9840d7d3ee140f46783eebdfcd2db0760b9fc --- /dev/null +++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectlibrary/ProjectLibraryCmd.java @@ -0,0 +1,29 @@ +package com.seasky.projectplan.dto.projectlibrary; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 椤圭洰搴� qry + * + * @author chenqi + * @date 2021/05/31 + */ +@Data +public class ProjectLibraryCmd { + @ApiModelProperty("骞翠唤") + private Integer year; + + @ApiModelProperty("椤圭洰鍚嶇О") + private String projectName; + + @ApiModelProperty("閮ㄩ棬缂栧彿") + private String deptCode; + + @ApiModelProperty("璐熻矗浜�") + private String chargePerson; + + @ApiModelProperty("绫诲瀷鍒楄〃") + private String typeList; + +} diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectlibrary/ProjectLibraryDeptQry.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectlibrary/ProjectLibraryDeptQry.java new file mode 100644 index 0000000000000000000000000000000000000000..2db6e3c830c1074047c58eec66ec6006ca63795b --- /dev/null +++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectlibrary/ProjectLibraryDeptQry.java @@ -0,0 +1,20 @@ +package com.seasky.projectplan.dto.projectlibrary; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 椤圭洰搴撻儴闂� qry + * + * @author chenqi + * @date 2021/05/31 + */ +@Data +public class ProjectLibraryDeptQry { + @ApiModelProperty("骞翠唤") + private Integer year; + + @ApiModelProperty("椤圭洰鍚嶇О") + private String projectName; + +} diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectlibrary/ProjectLibraryQry.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectlibrary/ProjectLibraryQry.java new file mode 100644 index 0000000000000000000000000000000000000000..76809a72544dd8606f8c172b70444b33a955f3a9 --- /dev/null +++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectlibrary/ProjectLibraryQry.java @@ -0,0 +1,26 @@ +package com.seasky.projectplan.dto.projectlibrary; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 椤圭洰搴� qry + * + * @author chenqi + * @date 2021/05/31 + */ +@Data +public class ProjectLibraryQry { + @ApiModelProperty("骞翠唤") + private Integer year; + + @ApiModelProperty("椤圭洰鍚嶇О") + private String projectName; + + @ApiModelProperty("閮ㄩ棬缂栧彿") + private String deptCode; + + @ApiModelProperty("绫诲瀷鍒楄〃") + private String typeList; + +} diff --git a/ServiceSite/pom.xml b/ServiceSite/pom.xml index 8316777d4212392944e9aa08a0521675ee4b27ce..8982e3a4bf40911ae179d15d707a746a4b7cf358 100644 --- a/ServiceSite/pom.xml +++ b/ServiceSite/pom.xml @@ -76,6 +76,13 @@ <artifactId>projectplan-api</artifactId> <version>0.0.4-20210527.021441-10</version> </dependency> + <dependency> + <groupId>com.seasky</groupId> + <artifactId>projectplan-api</artifactId> + <version>0.0.4-SNAPSHOT</version> +<!-- <version>0.0.4-20210527.021441-10</version>--> + <scope>compile</scope> + </dependency> <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/application/command/assembler/ProjectLibraryAssembler.java b/ServiceSite/src/main/java/com/seasky/projectplan/application/command/assembler/ProjectLibraryAssembler.java new file mode 100644 index 0000000000000000000000000000000000000000..02c1a8885d2d50da630244b0e960d79844700dd8 --- /dev/null +++ b/ServiceSite/src/main/java/com/seasky/projectplan/application/command/assembler/ProjectLibraryAssembler.java @@ -0,0 +1,10 @@ +package com.seasky.projectplan.application.command.assembler; + +/** + * 椤圭洰搴� 姹囩紪 + * + * @author chenqi + * @date 2021/05/31 + */ +public class ProjectLibraryAssembler { +} diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectlibrary/AProjectLibrarySvr.java b/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectlibrary/AProjectLibrarySvr.java new file mode 100644 index 0000000000000000000000000000000000000000..c727e044a0dd4f9fee0d259cfa13059ed2f7dc08 --- /dev/null +++ b/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectlibrary/AProjectLibrarySvr.java @@ -0,0 +1,15 @@ +package com.seasky.projectplan.application.command.projectlibrary; + +import com.seasky.projectplan.dto.projectlibrary.ProjectLibraryCmd; + +/** + * 椤圭洰搴� svr + * + * @author chenqi + * @date 2021/05/31 + */ +public interface AProjectLibrarySvr { + + + void saveProjectLibrary(ProjectLibraryCmd cmd); +} diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectlibrary/AProjectLibrarySvrImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectlibrary/AProjectLibrarySvrImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..4831c64d249ecf74a65f8772ac1c8948e06bf5a7 --- /dev/null +++ b/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectlibrary/AProjectLibrarySvrImpl.java @@ -0,0 +1,18 @@ +package com.seasky.projectplan.application.command.projectlibrary; + +import com.seasky.projectplan.dto.projectlibrary.ProjectLibraryCmd; +import org.springframework.stereotype.Service; + +/** + * 椤圭洰搴搒vr impl + * + * @author chenqi + * @date 2021/05/31 + */ +@Service +public class AProjectLibrarySvrImpl implements AProjectLibrarySvr { + @Override + public void saveProjectLibrary(ProjectLibraryCmd cmd) { + + } +} diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/domain/aggregate/projectlibrary/ProjectLibraryAgg.java b/ServiceSite/src/main/java/com/seasky/projectplan/domain/aggregate/projectlibrary/ProjectLibraryAgg.java index 0e84866c880a910da8dc3701c33ce19c59020d13..cdcfe0ffeb72717f4fb425dc188d10b15ca8913d 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/domain/aggregate/projectlibrary/ProjectLibraryAgg.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/domain/aggregate/projectlibrary/ProjectLibraryAgg.java @@ -1,6 +1,7 @@ package com.seasky.projectplan.domain.aggregate.projectlibrary; +import com.seasky.core.ddd.base.BaseAggregate; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -9,7 +10,7 @@ import lombok.NoArgsConstructor; import java.math.BigDecimal; /** - * 椤圭洰鍥句功棣哸gg + * 椤圭洰搴揳gg * * @author chenqi * @date 2021/05/11 @@ -18,9 +19,8 @@ import java.math.BigDecimal; @NoArgsConstructor @AllArgsConstructor @Builder -public class ProjectLibraryAgg { +public class ProjectLibraryAgg extends BaseAggregate { - private Long id; /** * 骞翠唤 */ @@ -34,4 +34,22 @@ public class ProjectLibraryAgg { */ private BigDecimal planMoney; + @Override + protected String iniDescribeName() { + return "椤圭洰搴�"; + } + + /** + * 璁剧疆骞翠唤 + */ + public void setYear(){ + + } + + /** + * 鍩虹淇敼淇℃伅 + */ + public void setModfiy(){ + + } } diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseConfigController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseConfigController.java index 46f8cbeb2a56787ecdb4916ab2020beccbda66ce..8511d68926df5a394b6e219d5138b088badd2360 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseConfigController.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseConfigController.java @@ -37,7 +37,7 @@ import static com.seasky.core.common.Response.ok; * @author chenqi * @date 2021/05/24 */ -@Api(tags = "缁忚垂涓嬭揪API") +@Api(tags = "鍩虹閰嶇疆API") @RestController public class BaseConfigController implements IBaseConfigController { @Resource diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectLibraryController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectLibraryController.java new file mode 100644 index 0000000000000000000000000000000000000000..cc90fffd0f60b12d0ff2f02cef03dc4b58fcd1d5 --- /dev/null +++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectLibraryController.java @@ -0,0 +1,30 @@ +package com.seasky.projectplan.interfaces.controller; + +import com.seasky.core.common.Result; +import com.seasky.projectplan.api.IProjectLibrary; +import com.seasky.projectplan.application.command.projectlibrary.AProjectLibrarySvr; +import com.seasky.projectplan.dto.projectlibrary.ProjectLibraryCmd; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 椤圭洰搴揂PI + * + * @author chenqi + * @date 2021/05/31 + */ +@RestController +@Api("椤圭洰搴� api") +public class ProjectLibraryController implements IProjectLibrary { + + @Resource + AProjectLibrarySvr service; + + @Override + public Result<Object> saveProjectLibrary(ProjectLibraryCmd cmd) { + service.saveProjectLibrary(cmd); + return null; + } +}