diff --git a/ServiceSite/facade/src/main/java/com/seasky/adjustproject/api/IAttachmentController.java b/ServiceSite/facade/src/main/java/com/seasky/adjustproject/api/IAttachmentController.java index 2b4acca29be5b42d8d44b6b034e2a16997b46ff6..832585a3cf87474c3d1feba63971745854bb984d 100644 --- a/ServiceSite/facade/src/main/java/com/seasky/adjustproject/api/IAttachmentController.java +++ b/ServiceSite/facade/src/main/java/com/seasky/adjustproject/api/IAttachmentController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @Author wangxingjun * @Data 2022/4/22 15:52 */ -@FeignClient("dddtemplate-provider") +@FeignClient("seaskyadjust") @RequestMapping("attachment") public interface IAttachmentController { diff --git a/ServiceSite/facade/src/main/java/com/seasky/adjustproject/api/ITestController.java b/ServiceSite/facade/src/main/java/com/seasky/adjustproject/api/ITestController.java deleted file mode 100644 index 500f16a45f976a884404d57eecc5fdc13619e46f..0000000000000000000000000000000000000000 --- a/ServiceSite/facade/src/main/java/com/seasky/adjustproject/api/ITestController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.seasky.adjustproject.api; - -import com.seasky.core.common.Result; -import com.seasky.adjustproject.dto.test.TestCmd; -import com.seasky.adjustproject.dto.test.TestQueryOut; -import com.seasky.adjustproject.dto.test.TestQueryQry; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; - -import java.io.UnsupportedEncodingException; - -@FeignClient("dddtemplate-provider") -@RequestMapping("test") -@Api("Test") -public interface ITestController { - - @ApiOperation("1.testQ") - @PostMapping(path = "/pc/v1/queryList") - Result<TestQueryOut> testQ(@RequestBody TestQueryQry testQry); - - @ApiOperation("2.testExport") - @PostMapping(path = "/pc/v1/export") - ResponseEntity<byte[]> testExcelExport(@RequestBody TestQueryQry testQry) throws UnsupportedEncodingException; - - @ApiOperation("3.testSave") - @PostMapping(path = "/pc/v1/save") - Result<Long> testSave(@RequestBody TestCmd testCmd); - - @ApiOperation("4.testSubmit") - @PostMapping(path = "/pc/v1/submit") - Result<Long> testSubmit(@RequestBody TestCmd testCmd); - - @ApiOperation("5.testSaveAndSubmit") - @PostMapping(path = "/pc/v1/saveandsubmit") - Result<Long> testSaveAndSubmit(@RequestBody TestCmd testCmd); -} diff --git a/ServiceSite/facade/src/main/java/com/seasky/adjustproject/api/ITestWebService.java b/ServiceSite/facade/src/main/java/com/seasky/adjustproject/api/ITestWebService.java deleted file mode 100644 index d4bf404ad9d6991aee54de4ad35ec9b9fe6c0310..0000000000000000000000000000000000000000 --- a/ServiceSite/facade/src/main/java/com/seasky/adjustproject/api/ITestWebService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.seasky.adjustproject.api; - -import com.seasky.core.common.Result; -import com.seasky.adjustproject.dto.test.TestQueryOut; -import com.seasky.adjustproject.dto.test.TestQueryQry; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebService; - -@WebService(name = "TestService", targetNamespace = "http://www.seaskysh.com") -public interface ITestWebService { - @WebMethod - Result<TestQueryOut> testQ(@WebParam TestQueryQry testQry); -} - diff --git a/ServiceSite/facade/src/main/java/com/seasky/adjustproject/dto/out/SplitItemPlanCheckOut.java b/ServiceSite/facade/src/main/java/com/seasky/adjustproject/dto/out/SplitItemPlanCheckOut.java new file mode 100644 index 0000000000000000000000000000000000000000..ab2d1e45b3babee0011d0b18e27b0b879d49afc2 --- /dev/null +++ b/ServiceSite/facade/src/main/java/com/seasky/adjustproject/dto/out/SplitItemPlanCheckOut.java @@ -0,0 +1,46 @@ +package com.seasky.adjustproject.dto.out; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author zhouquan + * @Data 2022/4/22 11:27 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class SplitItemPlanCheckOut { + + @ApiModelProperty("涓婚敭id") + private Long id; + + @ApiModelProperty("椤圭洰缂栧彿") + private String sourceProjectCode; + + @ApiModelProperty("椤圭洰鍚嶇О") + private String sourceProjectName; + + @ApiModelProperty("鎵€灞炵粡璐�") + private String fundName; + + @ApiModelProperty("涓昏礋璐d汉") + private String ownerName; + + @ApiModelProperty("绗竴璐熻矗浜�") + private String oneOwnerName; + + @ApiModelProperty("鎷嗗垎椤圭洰缂栧彿") + private String targetProjectCode; + + @ApiModelProperty("鎷嗗垎椤圭洰鍚嶇О") + private String targetProjectName; + + @ApiModelProperty("绗簩璐熻矗浜�") + private String secondOwnerName; + + @ApiModelProperty("椤圭洰鐘舵€�") + private String state; +} diff --git a/ServiceSite/facade/src/main/java/com/seasky/adjustproject/dto/qry/SplitItemPlanCheckQry.java b/ServiceSite/facade/src/main/java/com/seasky/adjustproject/dto/qry/SplitItemPlanCheckQry.java new file mode 100644 index 0000000000000000000000000000000000000000..96f16fb8e28376dca88c770159030d7e3a9c0d7d --- /dev/null +++ b/ServiceSite/facade/src/main/java/com/seasky/adjustproject/dto/qry/SplitItemPlanCheckQry.java @@ -0,0 +1,41 @@ +package com.seasky.adjustproject.dto.qry; + +import com.seasky.core.ddd.base.objects.BaseDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotNull; + +/** + * @Author zhouquan + * @Data 2022/4/22 11:22 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@AllArgsConstructor +@NoArgsConstructor +public class SplitItemPlanCheckQry extends BaseDTO { + + @ApiModelProperty("琚媶鍒嗛」鐩紪鍙�") + private String sourceProjectCode; + + @ApiModelProperty("琚媶鍒嗛」鐩悕绉�") + private String sourceProjectName; + + @ApiModelProperty("缁忚垂鍚嶇О") + private String fundName; + + @ApiModelProperty("绗竴璐熻矗浜哄悕绉�") + private String oneOwnerName; + + @NotNull(message = "椤电爜涓嶈兘涓虹┖") + @ApiModelProperty(value = "椤电爜",example = "1") + private Integer pageIndex; + + @NotNull(message = "鍒嗛〉澶у皬涓嶈兘涓虹┖") + @ApiModelProperty(value = "鍒嗛〉澶у皬",example = "10") + private Integer pageSize; +} diff --git a/ServiceSite/facade/src/main/java/com/seasky/adjustproject/dto/test/TestCmd.java b/ServiceSite/facade/src/main/java/com/seasky/adjustproject/dto/test/TestCmd.java deleted file mode 100644 index 86a7d326e29050a3dbddcbf4ac49af4363a804b3..0000000000000000000000000000000000000000 --- a/ServiceSite/facade/src/main/java/com/seasky/adjustproject/dto/test/TestCmd.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.seasky.adjustproject.dto.test; - - -import com.seasky.core.ddd.base.objects.BaseDTO; -import lombok.Data; - -/** - * 绀轰緥cmd - * 姝ょ被涓篊绾挎帴鍙d紶鍏ョ殑鍙傛暟绫� 鍦―DD缁撴瀯涓睘浜巃pplication灞傜殑 DTO绫� - * 闇€瑕佺户鎵� BaseDto - * @author XueYawei - * @date 2020/12/07 - */ -@Data -public class TestCmd extends BaseDTO { - /** - * 鍚嶅瓧 - */ - private String name; - /** - * 缂栧彿 - */ - private String code; - /** - * 鎬у埆 - */ - private String sex; - /** - * 骞撮緞 - */ - private Integer age; -} diff --git a/ServiceSite/facade/src/main/java/com/seasky/adjustproject/dto/test/TestQueryOut.java b/ServiceSite/facade/src/main/java/com/seasky/adjustproject/dto/test/TestQueryOut.java deleted file mode 100644 index 0e59aade9cd66e73238d832166983ae14b319bfe..0000000000000000000000000000000000000000 --- a/ServiceSite/facade/src/main/java/com/seasky/adjustproject/dto/test/TestQueryOut.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.seasky.adjustproject.dto.test; - - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.seasky.core.ddd.base.objects.BaseDTO; -import com.seasky.core.enums.Available; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.Date; - -/** - * 娴嬭瘯Out绫� - * - * @author XueYawei - * @date 2020/12/07 - * JsonInclude(JsonInclude.Include.ALWAYS) ---> 浠讳綍鎯呭喌涓嬮兘搴忓垪鍖栬瀛楁 ,鏁版嵁搴撹繑鍥炲€间负绌烘椂,浠嶇劧杩斿洖璇ュ瓧娈电粰鍓嶇 涓旇瀛楁涓� null - */ -@Data -@NoArgsConstructor -@JsonInclude(JsonInclude.Include.ALWAYS) -public class TestQueryOut extends BaseDTO implements Serializable { - /** - * 涓婚敭 - */ - private Long id; - /** - * 鍚嶅瓧 - */ - private String name; - /** - * 缂栧彿 - */ - private String code; - /** - * 鎬у埆 - */ - private String sex; - /** - * 骞撮緞 - */ - private Integer age; - - - protected Date createDate; - - protected Long creator; - - protected Long updator; - - protected Date updateDate; - - protected Available available; - - protected String remark; - - protected Date versionDate; - -} diff --git a/ServiceSite/facade/src/main/java/com/seasky/adjustproject/dto/test/TestQueryQry.java b/ServiceSite/facade/src/main/java/com/seasky/adjustproject/dto/test/TestQueryQry.java deleted file mode 100644 index 094940bab2e0b50b46cf0b11d4ea21527c9db46f..0000000000000000000000000000000000000000 --- a/ServiceSite/facade/src/main/java/com/seasky/adjustproject/dto/test/TestQueryQry.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.seasky.adjustproject.dto.test; - -import com.seasky.core.ddd.base.objects.BaseDTO; -import lombok.Data; - -/** - * 娴嬭瘯qry - * - * @author XueYawei - * @date 2020/12/07 - */ -@Data -public class TestQueryQry extends BaseDTO { - - /** - * 鍚嶅瓧 - */ - private String name; - /** - * 缂栧彿 - */ - private String code; - /** - * 鎬у埆 - */ - private String sex; - /** - * 骞撮緞 - */ - private Integer age; - - - private Integer pageIndex; - - private Integer pageSize; -} diff --git a/ServiceSite/facade/src/main/java/com/seasky/adjustproject/enums/EnumTest.java b/ServiceSite/facade/src/main/java/com/seasky/adjustproject/enums/EnumTest.java deleted file mode 100644 index f06c0cd403a9826ffe511169df99f9886c58f3f5..0000000000000000000000000000000000000000 --- a/ServiceSite/facade/src/main/java/com/seasky/adjustproject/enums/EnumTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.seasky.adjustproject.enums; - -public enum EnumTest { -} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/application/command/api/SplitItemPlanCommandSvr.java b/ServiceSite/src/main/java/com/seasky/adjustproject/application/command/api/SplitItemPlanCommandSvr.java new file mode 100644 index 0000000000000000000000000000000000000000..eb1b52d6edaf4c1918d171d45678dc060646f787 --- /dev/null +++ b/ServiceSite/src/main/java/com/seasky/adjustproject/application/command/api/SplitItemPlanCommandSvr.java @@ -0,0 +1,18 @@ +package com.seasky.adjustproject.application.command.api; + +import com.seasky.adjustproject.infrastructure.dataobject.po.SplitItemPlanPO; +import com.seasky.core.base.BaseService; + +import java.util.List; + +/** + * @Author zhouquan + * @Data 2022/4/23 14:34 + */ +public interface SplitItemPlanCommandSvr extends BaseService<SplitItemPlanPO> { + /** + * 鏍规嵁id鍒犻櫎 + * @param ids + */ + void removeSplitItemPlan(List<Long> ids); +} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/application/command/assembler/TestAssembler.java b/ServiceSite/src/main/java/com/seasky/adjustproject/application/command/assembler/TestAssembler.java deleted file mode 100644 index ffc90a8f5a91277aac3d4bb4f77972a9c1229e70..0000000000000000000000000000000000000000 --- a/ServiceSite/src/main/java/com/seasky/adjustproject/application/command/assembler/TestAssembler.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.seasky.adjustproject.application.command.assembler; - - -import com.seasky.core.ddd.utils.MapperUtils; -import com.seasky.adjustproject.domain.aggregate.test.TestAggregate; -import com.seasky.adjustproject.dto.test.TestCmd; - -import java.util.HashMap; -import java.util.Map; - -/** - * 绀轰緥宸ュ巶绫� - * - * @author XueYawei - * @date 2020/12/07 - */ -public class TestAssembler { - - - /** - * 鏋勫缓绀轰緥鑱氬悎鏍� - * - * @param testCmd 娴嬭瘯cmd - * @return {@link TestAggregate} - */ - public static TestAggregate buildTestAggregate(TestCmd testCmd) { - //杞崲瀵瑰簲閿€糾ap - Map<String, String> map = new HashMap<>(3); - TestAggregate testAggregate = MapperUtils.INSTANCE.map(TestAggregate.class,testCmd); - return testAggregate; - } -} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/application/command/service/SplitItemPlanCommandSvrImpl.java b/ServiceSite/src/main/java/com/seasky/adjustproject/application/command/service/SplitItemPlanCommandSvrImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..21e4fc5afc83f969a3f237809d91f937f925cc6d --- /dev/null +++ b/ServiceSite/src/main/java/com/seasky/adjustproject/application/command/service/SplitItemPlanCommandSvrImpl.java @@ -0,0 +1,49 @@ +package com.seasky.adjustproject.application.command.service; + +import cn.hutool.core.util.ObjectUtil; +import com.seasky.adjustproject.application.command.api.SplitItemPlanCommandSvr; +import com.seasky.adjustproject.domain.aggregate.splitItemPlan.SplitItemPlanAggregate; +import com.seasky.adjustproject.domain.common.enums.FlowStateEnum; +import com.seasky.adjustproject.domain.service.api.SplitItemPlanDomainService; +import com.seasky.adjustproject.infrastructure.dataobject.po.SplitItemPlanPO; +import com.seasky.adjustproject.infrastructure.db.mapper.table.SplitItemPlanMapper; +import com.seasky.core.base.AbstractService; +import com.seasky.core.common.ResponseCode; +import com.seasky.core.util.ExceptionUtil; +import org.apache.commons.lang3.ObjectUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * @Author zhouquan + * @Data 2022/4/23 14:35 + */ +@Service +public class SplitItemPlanCommandSvrImpl extends AbstractService<SplitItemPlanPO, SplitItemPlanMapper> implements SplitItemPlanCommandSvr { + + @Autowired + private SplitItemPlanDomainService splitItemPlanDomainService; + + //璁ヽhecked渚嬪涔熷洖婊� + @Override + @Transactional(rollbackFor = Exception.class) + public void removeSplitItemPlan(List<Long> ids) { + //鍏堝垽鏂璱d鏄惁涓虹┖ + if (ObjectUtils.isEmpty(ids) || ids.size() <= 0) { + throw ExceptionUtil.getException(ResponseCode.DATA_VERIFY_NULL_POINTER, "鍏ュ弬id涓嶈兘涓虹┖"); + } + for (Long id : ids) { + SplitItemPlanAggregate splitItemPlanAggregate = splitItemPlanDomainService.findByPersistentId(id); + if (!splitItemPlanAggregate.getState().equals(FlowStateEnum.getValue("1"))){ + throw ExceptionUtil.getException(ResponseCode.BUNISESS_EXCEPTION,"id[" + id + "]娴佺▼宸插彂璧蜂笉鑳藉垹闄�"); + } + if (ObjectUtil.isNull(splitItemPlanAggregate)){ + throw ExceptionUtil.getException(ResponseCode.DATA_VERIFY_NULL_POINTER,"id[" + id +"]瀵瑰簲鐨勪俊鎭笉瀛樺湪"); + } + splitItemPlanDomainService.remove(splitItemPlanAggregate); + } + } +} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/application/command/test/TestCmdService.java b/ServiceSite/src/main/java/com/seasky/adjustproject/application/command/test/TestCmdService.java deleted file mode 100644 index f6cb9f5e6bd79c0267037b64e38495cf1521682c..0000000000000000000000000000000000000000 --- a/ServiceSite/src/main/java/com/seasky/adjustproject/application/command/test/TestCmdService.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.seasky.adjustproject.application.command.test; - -import com.seasky.adjustproject.dto.test.TestCmd; - -public interface TestCmdService { - /** - * 淇濆瓨绀轰緥 - * - * @param testCmd 娴嬭瘯cmd - * @return int - */ - Long SaveTest(TestCmd testCmd); - - /** - * 鎻愪氦绀轰緥 - * - * @param testCmd 娴嬭瘯cmd - * @return int - */ - Long SubmitTest(TestCmd testCmd); - - /** - * 淇濆瓨骞舵彁浜ょず渚� - * - * @param testCmd 娴嬭瘯cmd - * @return int - */ - Long SavaAndSubmitTest(TestCmd testCmd); - - void Delete(TestCmd testCmd); -} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/application/query/TestQueryService.java b/ServiceSite/src/main/java/com/seasky/adjustproject/application/query/TestQueryService.java deleted file mode 100644 index 367930b3d0ad6644855bd45deec61174b6910a07..0000000000000000000000000000000000000000 --- a/ServiceSite/src/main/java/com/seasky/adjustproject/application/query/TestQueryService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.seasky.adjustproject.application.query; - - -import com.seasky.core.base.BaseService; -import com.seasky.adjustproject.dto.test.TestQueryOut; -import com.seasky.adjustproject.dto.test.TestQueryQry; -import com.seasky.adjustproject.infrastructure.dataobject.po.TestPo; - -import java.util.List; - -/** - * 娴嬭瘯鏌ヨ鏈嶅姟 - * - * @author XueYawei - * @date 2020/12/07 - */ -public interface TestQueryService extends BaseService<TestPo> { - - - /** - * 鏌ヨ娴嬭瘯 - * - * @param testQry 娴嬭瘯qry - * @return {@link TestQueryOut} - */ - List<TestQueryOut> queryTestList(TestQueryQry testQry); -} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/application/query/adjust_plan/AdjustPlanQueryService.java b/ServiceSite/src/main/java/com/seasky/adjustproject/application/query/adjust_plan/AdjustPlanQueryService.java deleted file mode 100644 index 84bb6b8177f473bfbc203fa49598361ba1089acc..0000000000000000000000000000000000000000 --- a/ServiceSite/src/main/java/com/seasky/adjustproject/application/query/adjust_plan/AdjustPlanQueryService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.seasky.adjustproject.application.query.adjust_plan; - - -/** - * 璋冩暣璁″垝Q绾挎帴鍙� - * @author wxy 2022/4/21 10:10 -*/ -public interface AdjustPlanQueryService { -} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/application/query/splitItemPlan/SplitItemPlanQuerySvr.java b/ServiceSite/src/main/java/com/seasky/adjustproject/application/query/splitItemPlan/SplitItemPlanQuerySvr.java new file mode 100644 index 0000000000000000000000000000000000000000..7c2f3f29b0953719b385db992643acbed5b7dec0 --- /dev/null +++ b/ServiceSite/src/main/java/com/seasky/adjustproject/application/query/splitItemPlan/SplitItemPlanQuerySvr.java @@ -0,0 +1,28 @@ +package com.seasky.adjustproject.application.query.splitItemPlan; + + +import com.seasky.adjustproject.dto.out.SplitItemPlanCheckOut; +import com.seasky.adjustproject.dto.qry.SplitItemPlanCheckQry; +import com.seasky.adjustproject.infrastructure.dataobject.po.SplitItemPlanPO; +import com.seasky.core.base.BaseService; +import com.seasky.core.common.Pagination; +import org.springframework.validation.annotation.Validated; + +import javax.validation.Valid; + +/** + * @Author zhouquan + * @Data 2022/4/22 11:11 + */ +@Validated +public interface SplitItemPlanQuerySvr extends BaseService<SplitItemPlanPO> { + + /** + * 椤圭洰鎷嗗垎瀹℃牳妯″潡鏉′欢鏌ヨ + * @param splitItemPlanCheckQry + * @return + */ + Pagination<SplitItemPlanCheckOut> querySplitItemPlanCheckPage(@Valid SplitItemPlanCheckQry splitItemPlanCheckQry); + + +} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/flow/FlowAggregate.java b/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/flow/FlowAggregate.java deleted file mode 100644 index fdb0b35d261774e9a11a32e809b0cb2cb7108d77..0000000000000000000000000000000000000000 --- a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/flow/FlowAggregate.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.seasky.adjustproject.domain.aggregate.flow; - -import lombok.Data; - -@Data -public class FlowAggregate { - private String status; - private String userCode; - private String flowID; - - public void submit(String userCode){ - this.userCode = userCode; - } -} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/message/MessageAggregate.java b/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/message/MessageAggregate.java deleted file mode 100644 index 6369e75d001c486bce6b92ba4480b39a0eeb8fa1..0000000000000000000000000000000000000000 --- a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/message/MessageAggregate.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.seasky.adjustproject.domain.aggregate.message; - -public class MessageAggregate { - -} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/splitItemPlan/SplitItemPlanAggregate.java b/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/splitItemPlan/SplitItemPlanAggregate.java new file mode 100644 index 0000000000000000000000000000000000000000..3129964aca355d18abc4391b5f4e86489ca1ff5a --- /dev/null +++ b/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/splitItemPlan/SplitItemPlanAggregate.java @@ -0,0 +1,125 @@ +package com.seasky.adjustproject.domain.aggregate.splitItemPlan; + +import com.seasky.adjustproject.domain.aggregate.value.MainProjectInfoVO; +import com.seasky.adjustproject.domain.aggregate.value.ProjectInfoVO; +import com.seasky.core.common.ResponseCode; +import com.seasky.core.ddd.base.BaseAggregate; +import com.seasky.core.util.ExceptionUtil; +import lombok.*; + +/** + * @Author zhouquan + * @Data 2022/4/20 14:35 + */ +@Getter +@NoArgsConstructor +@AllArgsConstructor +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class SplitItemPlanAggregate extends BaseAggregate { + + /** + * 骞翠唤 + */ + private Integer year; + + /** + * 瀹℃牳鐘舵€� + */ + private String state; + + /** + * 琚媶鍒嗛」鐩俊鎭� + */ + private MainProjectInfoVO mainProjectInfoVo; + + /** + * 鎷嗗垎鍚庨」鐩俊鎭� + */ + private ProjectInfoVO projectInfoVo; + + /** + * 娴佺▼瀹炰緥id + */ + private Long processId; + + /** + * 娴佹按鍙� + */ + private String businessNumber; + + /** + * 缁忚垂鍚嶇О + */ + private String fundName; + + /** + * 缁忚垂缂栧彿 + */ + private String fundCode; + + /** + * 妯℃澘鍚嶇О + */ + private String templateName; + + /** + * 妯℃澘缂栧彿 + */ + private String templateCode; + + /** + * 鍥炲啓娴佺▼id + * @param processId + */ + public void setProcessId(Long processId){ + this.processId = processId; + } + + /** + * 鍥炲啓瀹℃牳鐘舵€� + * @param state + */ + public void setState(String state){ + this.state = state; + } + + /** + * 甯歌鏍¢獙 + */ + public void verify(){ + if (this.getBusinessNumber() == null){ + throw ExceptionUtil.getException(ResponseCode.DATA_VERIFY_NULL_POINTER,"娴佹按鍙蜂笉鑳戒负绌�"); + } + if (this.getYear() == null){ + throw ExceptionUtil.getException(ResponseCode.DATA_VERIFY_NULL_POINTER,"骞翠唤涓嶈兘涓虹┖"); + } + if (this.getProjectInfoVo() == null ){ + throw ExceptionUtil.getException(ResponseCode.DATA_VERIFY_NULL_POINTER,"鎷嗗垎鍚庨」鐩俊鎭笉鑳戒负绌�"); + } + if (this.getMainProjectInfoVo() == null){ + throw ExceptionUtil.getException(ResponseCode.DATA_VERIFY_NULL_POINTER,"琚媶鍒嗛」鐩俊鎭笉鑳戒负绌�"); + } + } + + /** + * 鍩虹鍐呭淇敼 + * 涓嶈兘杩涜鏇存敼鐨勫瓧娈碉細id锛宲rocessId锛宻tate + * @param splitItemPlanAggregate + */ + public void setModify(SplitItemPlanAggregate splitItemPlanAggregate){ + this.year = splitItemPlanAggregate.getYear(); + this.businessNumber = splitItemPlanAggregate.getBusinessNumber(); + this.mainProjectInfoVo = splitItemPlanAggregate.getMainProjectInfoVo(); + this.projectInfoVo = splitItemPlanAggregate.getProjectInfoVo(); + this.fundCode = splitItemPlanAggregate.getFundCode(); + this.fundName = splitItemPlanAggregate.getFundName(); + this.templateCode = splitItemPlanAggregate.getTemplateCode(); + this.templateName = splitItemPlanAggregate.getTemplateName(); + } + + @Override + protected String iniDescribeName() { + return "椤圭洰鎷嗗垎璁″垝Agg"; + } +} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/splitItemPlan/SplitItemPlanRepository.java b/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/splitItemPlan/SplitItemPlanRepository.java new file mode 100644 index 0000000000000000000000000000000000000000..dc148564f4ac02c1938657660d9b4321d407c5ec --- /dev/null +++ b/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/splitItemPlan/SplitItemPlanRepository.java @@ -0,0 +1,11 @@ +package com.seasky.adjustproject.domain.aggregate.splitItemPlan; + +import com.seasky.core.ddd.base.DddRepository; + +/** + * @Author zhouquan + * @Data 2022/4/20 15:20 + */ +public interface SplitItemPlanRepository extends DddRepository<SplitItemPlanAggregate> { + +} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/test/TestAggregate.java b/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/test/TestAggregate.java deleted file mode 100644 index 8209c6488ca549ea53a8aa8f7d3d459b37226772..0000000000000000000000000000000000000000 --- a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/test/TestAggregate.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.seasky.adjustproject.domain.aggregate.test; - - -import com.seasky.core.ddd.base.BaseAggregate; -import lombok.*; - -/** - * 绀轰緥鑱氬悎鏍� - * - * @author XueYawei - * @date 2020/12/07 - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -@ToString(callSuper = true) -@EqualsAndHashCode(callSuper = true) -public class TestAggregate extends BaseAggregate { - - /** - * 鍚嶅瓧 - */ - private String name; - /** - * 缂栧彿 - */ - private String code; - /** - * 鎬у埆 - */ - private String sex; - /** - * 骞撮緞 - */ - private Integer age; - - /** - * 鐘舵€� - */ - private String status; - - @Override - protected String iniDescribeName() { - return "绀轰緥"; - } - - public TestAggregate updata(TestAggregate aggregate) { - // 杩涜鏍¢獙 渚嬪骞撮緞澶т簬0 灏忎簬 150 - // name code涓笉鑳芥湁鐗规畩瀛楃绛� - this.name = aggregate.name; - this.code = aggregate.code; - this.sex = aggregate.sex; - this.age = aggregate.age; - this.id = aggregate.id; - return this; - } - - public TestAggregate submit(String status) { - this.status = status; - return this; - } - - public String BuildSubmitMessage() { - return ""; - } -} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/test/TestRepository.java b/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/test/TestRepository.java deleted file mode 100644 index 47da3a4f1c25958b7b802ca0ae58580d72160af4..0000000000000000000000000000000000000000 --- a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/test/TestRepository.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.seasky.adjustproject.domain.aggregate.test; - -import com.seasky.core.ddd.base.DddRepository; - -/** - * 绀轰緥瀛樺偍搴� - * - * @author XueYawei - * @date 2020/12/07 - */ -public interface TestRepository extends DddRepository<TestAggregate> { - /** - * 淇濆瓨绀轰緥 - * - * @param testAggregate 绀轰緥鑱氬悎鏍� - * @return int - */ - int saveTest(TestAggregate testAggregate); -} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/value/ProjectInfoVo.java b/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/value/MainProjectInfoVO.java similarity index 50% rename from ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/value/ProjectInfoVo.java rename to ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/value/MainProjectInfoVO.java index bfdfeda58b20ba8de3753c19a013f58d8859f168..13afe9b1a42585f366b8cc2a491690508f913ad5 100644 --- a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/value/ProjectInfoVo.java +++ b/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/value/MainProjectInfoVO.java @@ -3,23 +3,34 @@ package com.seasky.adjustproject.domain.aggregate.value; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; /** - * 璋冨噺椤圭洰淇℃伅 - * @author wxy 2022/4/20 16:31 -*/ + * 琚媶鍒嗛」鐩俊鎭� + * + * @Author zhouquan + * @Data 2022/4/20 14:53 + */ +@Data @AllArgsConstructor @NoArgsConstructor -@Data -@Accessors(chain = true) -public class ProjectInfoVO { - /** 椤圭洰鍚嶇О **/ +public class MainProjectInfoVO { + /** + * 椤圭洰鍚嶇О 瀵瑰簲SplitItemPlanPo閲岄潰鐨剆ourceProjectName + */ private String projectName; - /** 椤圭洰缂栧彿 **/ + + /** + * 椤圭洰缂栧彿 鍚屼笂 + */ private String projectCode; - /** 璐熻矗浜哄鍚� **/ - private String ownerName; - /** 璐熻矗浜虹紪鍙� **/ + + /** + * 璐熻矗浜哄伐鍙� + */ private String ownerCode; + + /** + * 璐熻矗浜哄鍚� + */ + private String ownerName; } diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/value/ProjectInfoVO.java b/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/value/ProjectInfoVO.java index bfdfeda58b20ba8de3753c19a013f58d8859f168..660ce1d4f1646f5ad7edc59abd75bd96fedada13 100644 --- a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/value/ProjectInfoVO.java +++ b/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/value/ProjectInfoVO.java @@ -5,21 +5,70 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import java.util.List; + /** - * 璋冨噺椤圭洰淇℃伅 - * @author wxy 2022/4/20 16:31 -*/ + * 鎷嗗垎鍚庨」鐩俊鎭�,璋冨噺椤圭洰淇℃伅 鍏敤 + * @Author zhouquan,wxy + * @Data 2022/4/20 15:02 + */ +@Data @AllArgsConstructor @NoArgsConstructor -@Data @Accessors(chain = true) public class ProjectInfoVO { - /** 椤圭洰鍚嶇О **/ + /** + * 椤圭洰鍚嶇О 瀵瑰簲SplitItemPlanPo閲岄潰鐨則argetProjectName + */ private String projectName; - /** 椤圭洰缂栧彿 **/ + + /** + * 椤圭洰缂栧彿 鍚屼笂 + */ private String projectCode; - /** 璐熻矗浜哄鍚� **/ - private String ownerName; - /** 璐熻矗浜虹紪鍙� **/ + + /** + * 璐熻矗浜哄伐鍙� + */ private String ownerCode; + + /** + * 璐熻矗浜哄鍚� + */ + private String ownerName; + + /** + * 鎷嗗垎鍚庨」鐩墍灞為儴闂ㄥ悕绉� + */ + private String targetDepartmentName; + + /** + * 鎷嗗垎鍚庨」鐩墍灞為儴闂ㄧ紪鍙� + */ + private String targetDepartmentCode; + + /** + * 绗竴璐熻矗浜哄鍚� + */ + private String oneOwnerName; + + /** + * 绗竴璐熻矗浜哄伐鍙� + */ + private String oneOwnerCode; + + /** + * 绗簩璐熻矗浜哄伐鍙� + */ + private String secondOwnerCode; + + /** + * 绗簩璐熻矗浜哄鍚� + */ + private String secondOwnerName; + + /** + * 璋冩暣棰濆害淇℃伅 + */ + private List<AdjustFundVO> adjustFundVoList; } diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/value/TestVO.java b/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/value/TestVO.java deleted file mode 100644 index 3cf0914a8e7e8392788aec38d9b4482587110e9b..0000000000000000000000000000000000000000 --- a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/aggregate/value/TestVO.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.seasky.adjustproject.domain.aggregate.value; - -public class TestVO { -} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/event/DeleteTestEvent.java b/ServiceSite/src/main/java/com/seasky/adjustproject/domain/event/DeleteTestEvent.java deleted file mode 100644 index 785fc14fef0f68956fe9c5f56a4364ea05c65f9b..0000000000000000000000000000000000000000 --- a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/event/DeleteTestEvent.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.seasky.adjustproject.domain.event; - -import com.seasky.core.common.SpringContainer; -import org.springframework.context.ApplicationEvent; -import org.springframework.stereotype.Service; - -@Service -public class DeleteTestEvent extends ApplicationEvent { - - public DeleteTestEvent() { - super(""); - } - - DeleteTestEvent(String userCode){ - super(userCode); - } - - /** - * 鍙戝竷娑堟伅 - */ - public void DeleteVerify(String userCode){ - ApplicationEvent event = new DeleteTestEvent(userCode); - SpringContainer.getContainer().publishEvent(event); - } - -} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/event/SendMessageEvent.java b/ServiceSite/src/main/java/com/seasky/adjustproject/domain/event/SendMessageEvent.java deleted file mode 100644 index 5d9e5969ff2dd3085a0e938c5c871f49ba984028..0000000000000000000000000000000000000000 --- a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/event/SendMessageEvent.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.seasky.adjustproject.domain.event; - -import com.seasky.core.common.SpringContainer; -import org.springframework.context.ApplicationEvent; -import org.springframework.stereotype.Service; - -/** - * 瀹氫箟涓€涓彂閫佹秷鎭殑event - * - */ -@Service -public class SendMessageEvent extends ApplicationEvent { - String message; // 娑堟伅鍐呭 - public String getMessage(){ - return this.message; - } - - String user; - public String getUser(){ - return this.user; - } - - public SendMessageEvent() { - super(""); - } - - SendMessageEvent(String message,String user){ - super(message); - this.message = message; - this.user = user; - } - - /** - * 鍙戝竷娑堟伅 - */ - public void send(String message, String user){ - ApplicationEvent event = new SendMessageEvent(message, user); - SpringContainer.getContainer().publishEvent(event); - } - -} \ No newline at end of file diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/primitive/TestPrimitive.java b/ServiceSite/src/main/java/com/seasky/adjustproject/domain/primitive/TestPrimitive.java deleted file mode 100644 index d4a18dbee4c730aff86bc8f0201b3a8a2abb3b5e..0000000000000000000000000000000000000000 --- a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/primitive/TestPrimitive.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.seasky.adjustproject.domain.primitive; - -public class TestPrimitive { -} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/service/FlowDomainServiceImpl.java b/ServiceSite/src/main/java/com/seasky/adjustproject/domain/service/FlowDomainServiceImpl.java deleted file mode 100644 index ca06ab76c1c0839eb827057d7123d22a1e711f85..0000000000000000000000000000000000000000 --- a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/service/FlowDomainServiceImpl.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.seasky.adjustproject.domain.service; - -import com.seasky.adjustproject.domain.event.DeleteTestEvent; -import org.springframework.context.event.EventListener; -import org.springframework.core.annotation.Order; -import org.springframework.stereotype.Service; - -@Service -public class FlowDomainServiceImpl { - - @EventListener - @Order(0) - public void deleteTestVerify(DeleteTestEvent event) { - // 杩涜鍒犻櫎test鐨勬牎楠� - System.out.println("娴佺▼鏀跺埌鍒犻櫎浜嬩欢锛屽弬鏁�:" + event.getSource());//鑾峰彇鍙傛暟 - } -} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/service/SendEmailDomainServiceImpl.java b/ServiceSite/src/main/java/com/seasky/adjustproject/domain/service/SendEmailDomainServiceImpl.java deleted file mode 100644 index 3b7055f3f0556e640e1ca35c0c0466827c676a8f..0000000000000000000000000000000000000000 --- a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/service/SendEmailDomainServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.seasky.adjustproject.domain.service; - -import com.seasky.adjustproject.domain.event.SendMessageEvent; -import org.springframework.context.event.EventListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; - -@Service -public class SendEmailDomainServiceImpl { - - @EventListener - @Async - public void send(SendMessageEvent event) { - // 鎶奺vent杞垚 鍙戦€侀偖浠剁殑鑱氬悎 - // 鐒跺悗鍘诲彂閫佹秷鎭� - System.out.println("閭欢娑堟伅鏀跺埌浜嬩欢锛屽弬鏁�:" + event.getMessage());//鑾峰彇鍙傛暟 - } -} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/service/SendWXDomainServiceImpl.java b/ServiceSite/src/main/java/com/seasky/adjustproject/domain/service/SendWXDomainServiceImpl.java deleted file mode 100644 index 21e01f730caa90fb94fa1846050b927a59c51519..0000000000000000000000000000000000000000 --- a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/service/SendWXDomainServiceImpl.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.seasky.adjustproject.domain.service; - -import com.seasky.adjustproject.domain.event.SendMessageEvent; -import org.springframework.context.event.EventListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; - -@Service -public class SendWXDomainServiceImpl { - @EventListener - @Async - public void send(SendMessageEvent event) { - // 鎶奺vent杞垚 鍙戦€佸井淇$殑鑱氬悎 - // 鐒跺悗鍘诲彂閫佹秷鎭� - System.out.println("寰俊娑堟伅鏀跺埌浜嬩欢锛屽弬鏁�:" + event.getMessage());//鑾峰彇鍙傛暟 - } -} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/service/SplitItemPlanDomainServiceImpl.java b/ServiceSite/src/main/java/com/seasky/adjustproject/domain/service/SplitItemPlanDomainServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..4a0cb8216fb416846ea1b9a76e16b27452faa96f --- /dev/null +++ b/ServiceSite/src/main/java/com/seasky/adjustproject/domain/service/SplitItemPlanDomainServiceImpl.java @@ -0,0 +1,42 @@ +package com.seasky.adjustproject.domain.service; + +import com.seasky.adjustproject.domain.aggregate.splitItemPlan.SplitItemPlanAggregate; +import com.seasky.adjustproject.domain.aggregate.splitItemPlan.SplitItemPlanRepository; +import com.seasky.adjustproject.domain.service.api.SplitItemPlanDomainService; +import com.seasky.core.common.ResponseCode; +import com.seasky.core.util.ExceptionUtil; +import org.apache.commons.lang3.ObjectUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * @Author zhouquan + * @Data 2022/4/23 15:32 + */ +@Service +public class SplitItemPlanDomainServiceImpl implements SplitItemPlanDomainService { + @Autowired + private SplitItemPlanRepository splitItemPlanRepository; + + + /** + * 鑾峰彇璋冩暣棰嗗煙鏁版嵁 + * @param id + * @return + */ + @Override + public SplitItemPlanAggregate findByPersistentId(Long id) { + return splitItemPlanRepository.findByPersistentId(id); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void remove(SplitItemPlanAggregate splitItemPlanAggregate) { + SplitItemPlanAggregate splitItemPlanAggregate1 = splitItemPlanRepository.findByPersistentId(splitItemPlanAggregate.getId()); + if (ObjectUtils.isEmpty(splitItemPlanAggregate1)){ + throw ExceptionUtil.getException(ResponseCode.DATA_VERIFY_NULL_POINTER,"鏁版嵁涓嶅瓨鍦�"); + } + splitItemPlanRepository.remove(splitItemPlanAggregate); + } +} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/domain/service/api/SplitItemPlanDomainService.java b/ServiceSite/src/main/java/com/seasky/adjustproject/domain/service/api/SplitItemPlanDomainService.java new file mode 100644 index 0000000000000000000000000000000000000000..a9ff532975543b2c6532c87dc0f6e47c9311c98d --- /dev/null +++ b/ServiceSite/src/main/java/com/seasky/adjustproject/domain/service/api/SplitItemPlanDomainService.java @@ -0,0 +1,22 @@ +package com.seasky.adjustproject.domain.service.api; + +import com.seasky.adjustproject.domain.aggregate.splitItemPlan.SplitItemPlanAggregate; + +/** + * @Author zhouquan + * @Data 2022/4/23 15:31 + */ +public interface SplitItemPlanDomainService { + /** + * 鑾峰彇鎷嗗垎棰嗗煙鏁版嵁 + * @param id + * @return + */ + SplitItemPlanAggregate findByPersistentId(Long id); + + /** + * 鍒犻櫎椤圭洰鎷嗗垎璁″垝 + * @param splitItemPlanAggregate + */ + void remove(SplitItemPlanAggregate splitItemPlanAggregate); +} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/dataobject/po/SplitItemFundInfoPO.java b/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/dataobject/po/SplitItemFundInfoPO.java new file mode 100644 index 0000000000000000000000000000000000000000..05bcdc413175d9d5f0dc7a5dd78e02a04db51c33 --- /dev/null +++ b/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/dataobject/po/SplitItemFundInfoPO.java @@ -0,0 +1,49 @@ +package com.seasky.adjustproject.infrastructure.dataobject.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + * @Author zhouquan + * @Data 2022/4/20 15:42 + * + * 椤圭洰鎷嗗垎鍚庨搴︿俊鎭〃po + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@TableName(value = "split_item_fund_info",autoResultMap = true) +public class SplitItemFundInfoPO extends BasePO{ + + @TableField("split_item_plan_id") + @ApiModelProperty("椤圭洰鎷嗗垎璁″垝ID") + private Long splitItemPlanId; + + @TableField("source_subject_name") + @ApiModelProperty("椤圭洰璋冨噺棰濆害鍚嶇О") + private String sourceSubjectName; + + @TableField("source_subject_code") + @ApiModelProperty("椤圭洰璋冨噺棰濆害缂栧彿") + private String sourceSubjectCode; + + @TableField("target_subject_name") + @ApiModelProperty("椤圭洰璋冨棰濆害鍚嶇О") + private String targetSubjectName; + + @TableField("target_subject_code") + @ApiModelProperty("椤圭洰璋冨棰濆害缂栧彿") + private String targetSubjectCode; + + @TableField("adjust_money") + @ApiModelProperty("鍒嗛厤閲戦") + private BigDecimal adjustMoney; +} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/dataobject/po/SplitItemPlanPO.java b/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/dataobject/po/SplitItemPlanPO.java new file mode 100644 index 0000000000000000000000000000000000000000..c44e8bde5f7e673e607ed18f94e2768d8861edf0 --- /dev/null +++ b/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/dataobject/po/SplitItemPlanPO.java @@ -0,0 +1,104 @@ +package com.seasky.adjustproject.infrastructure.dataobject.po; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author zhouquan + * @Data 2022/4/20 15:42 + * + * 椤圭洰鎷嗗垎璁″垝琛╬o + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@TableName(value = "split_item_plan",autoResultMap = true) +public class SplitItemPlanPO extends BasePO { + + @TableField("process_id") + @ApiModelProperty("娴佺▼瀹炰緥id") + private Long processId; + + @TableField("source_project_name") + @ApiModelProperty("琚媶鍒嗛」鐩悕绉�") + private String sourceProjectName; + + @TableField("source_project_code") + @ApiModelProperty("琚媶鍒嗛」鐩紪鍙�") + private String sourceProjectCode; + + @TableField("target_project_name") + @ApiModelProperty("鎷嗗垎鍚庨」鐩悕绉�") + private String targetProjectName; + + @TableField("target_project_code") + @ApiModelProperty("鎷嗗垎鍚庨」鐩紪鍙�") + private String targetProjectCode; + + @TableField("target_department_name") + @ApiModelProperty("鎷嗗垎鍚庨」鐩墍灞為儴闂ㄥ悕绉�") + private String targetDepartmentName; + + @TableField("target_department_code") + @ApiModelProperty("鎷嗗垎鍚庨」鐩墍灞為儴闂ㄧ紪鍙�") + private String targetDepartmentCode; + + @TableField("owner_name") + @ApiModelProperty("椤圭洰璐熻矗浜哄悕绉�") + private String ownerName; + + @TableField("owner_code") + @ApiModelProperty("椤圭洰璐熻矗浜虹紪鍙�") + private String ownerCode; + + @TableField("one_owner_name") + @ApiModelProperty("绗竴璐熻矗浜哄悕绉�") + private String oneOwnerName; + + @TableField("one_owner_code") + @ApiModelProperty("绗竴璐熻矗浜虹紪鍙�") + private String oneOwnerCode; + + @TableField("second_owner_name") + @ApiModelProperty("绗簩璐熻矗浜哄悕绉�") + private String secondOwnerName; + + @TableField("second_owner_code") + @ApiModelProperty("绗簩璐熻矗浜虹紪鍙�") + private String secondOwnerCode; + + @TableField("year") + @ApiModelProperty("骞翠唤") + private Integer year; + + @TableField("state") + @ApiModelProperty("瀹℃牳鐘舵€�") + private String state; + + @TableField("business_number") + @ApiModelProperty("娴佹按鍙�") + private String businessNumber; + + @TableField("fund_name") + @ApiModelProperty("缁忚垂鍚嶇О") + private String fundName; + + @TableField("fund_code") + @ApiModelProperty("缁忚垂缂栧彿") + private String fundCode; + + @TableField("template_name") + @ApiModelProperty("妯℃澘鍚嶇О") + private String templateName; + + @TableField("template_code") + @ApiModelProperty("妯℃澘缂栧彿") + private String templateCode; +} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/dataobject/po/TestPo.java b/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/dataobject/po/TestPo.java deleted file mode 100644 index 1a55d8c3fc59cf8f0a808df35c7b14335383f261..0000000000000000000000000000000000000000 --- a/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/dataobject/po/TestPo.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.seasky.adjustproject.infrastructure.dataobject.po; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 绀轰緥Po绫� - * - * @author XueYawei - * @date 2020/12/07 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@TableName(value = "tb_user",autoResultMap = true) -public class TestPo extends BasePO { - @TableField("name") - private String name; - @TableField("code") - private String code; - @TableField("sex") - private String sex; - @TableField("age") - private Integer age; - - - -} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/db/mapper/table/SplitItemFundInfoMapper.java b/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/db/mapper/table/SplitItemFundInfoMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..bddf7794866fe06eef38d5e0f03498ea2b6f4530 --- /dev/null +++ b/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/db/mapper/table/SplitItemFundInfoMapper.java @@ -0,0 +1,13 @@ +package com.seasky.adjustproject.infrastructure.db.mapper.table; + +import com.seasky.adjustproject.infrastructure.dataobject.po.SplitItemFundInfoPO; +import com.seasky.core.base.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * @Author zhouquan + * @Data 2022/4/20 16:47 + */ +@Mapper +public interface SplitItemFundInfoMapper extends BaseMapper<SplitItemFundInfoPO> { +} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/db/mapper/table/SplitItemPlanMapper.java b/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/db/mapper/table/SplitItemPlanMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..933d0b221769eb5e64a86372b49f5d872894176c --- /dev/null +++ b/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/db/mapper/table/SplitItemPlanMapper.java @@ -0,0 +1,19 @@ +package com.seasky.adjustproject.infrastructure.db.mapper.table; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.seasky.adjustproject.dto.out.SplitItemPlanCheckOut; +import com.seasky.adjustproject.dto.qry.SplitItemPlanCheckQry; +import com.seasky.adjustproject.infrastructure.dataobject.po.SplitItemPlanPO; +import com.seasky.core.base.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @Author zhouquan + * @Data 2022/4/20 16:46 + */ +@Mapper +public interface SplitItemPlanMapper extends BaseMapper<SplitItemPlanPO> { + + Page<SplitItemPlanPO> querySplitItemPlanCheckPage(Page<SplitItemPlanCheckOut> page, @Param("pm")SplitItemPlanCheckQry splitItemPlanCheckQry); +} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/db/mapper/table/TestMapper.java b/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/db/mapper/table/TestMapper.java deleted file mode 100644 index 52d9fe863f89721b6169c6815c0d701f9fee48fe..0000000000000000000000000000000000000000 --- a/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/db/mapper/table/TestMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.seasky.adjustproject.infrastructure.db.mapper.table; - -import com.seasky.core.base.BaseMapper; -import com.seasky.adjustproject.dto.test.TestQueryQry; -import com.seasky.adjustproject.infrastructure.dataobject.po.TestPo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 绀轰緥鏄犲皠鍣� - * - * @author XueYawei - * @date 2020/12/08 - */ -@Mapper -public interface TestMapper extends BaseMapper<TestPo> { - - /** - * 閫夋嫨鐢ㄦ埛鍒楄〃 - * - * @param testQry 绀轰緥qry - * @return {@link List<TestPo>} - */ - List<TestPo> selectUserList(@Param("pm") TestQueryQry testQry); - - -} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/db/mapper/xml/SplitItemFundInfoMapper.xml b/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/db/mapper/xml/SplitItemFundInfoMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..57fe8baaf5b2ca80eb6adf6af294ba3209b514e6 --- /dev/null +++ b/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/db/mapper/xml/SplitItemFundInfoMapper.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.seasky.adjustproject.infrastructure.db.mapper.table.SplitItemFundInfoMapper"> + + + +</mapper> \ No newline at end of file diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/db/mapper/xml/SplitItemPlanMapper.xml b/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/db/mapper/xml/SplitItemPlanMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..7c730be9627fe7d502a5dc6c7ed069c43eacc8cc --- /dev/null +++ b/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/db/mapper/xml/SplitItemPlanMapper.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.seasky.adjustproject.infrastructure.db.mapper.table.SplitItemPlanMapper"> + + <select id="selectIdPage" resultType="java.lang.Long"> + select id from split_item_plan + <where> + available = 'YES' + <if test="pm.sourceProjectCode != null and pm.sourceProjectCode != ''"> + and source_project_code like concat('%',#{pm.sourceProjectCode},'%') + </if> + <if test="pm.sourceProjectName != null and pm.sourceProjectName != ''"> + and source_project_name like concat('%',#{pm.sourceProjectName},'%') + </if> + <if test="pm.fundName != null and pm.fundName != ''"> + and fund_name like concat('%',#{pm.fundName},'%') + </if> + <if test="pm.oneOwnerName != null and pm.oneOwnerName != ''"> + and one_owner_name like concat('%',#{pm.oneOwnerName},'%') + </if> + </where> + order by create_date desc + </select> +</mapper> \ No newline at end of file diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/db/mapper/xml/TestMapper.xml b/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/db/mapper/xml/TestMapper.xml deleted file mode 100644 index 270cd457b0490e9450fbcf463e652b95b1c98f16..0000000000000000000000000000000000000000 --- a/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/db/mapper/xml/TestMapper.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.seasky.adjustproject.infrastructure.db.mapper.table.TestMapper"> - - - <select id="selectIdPage" resultType="java.lang.Long"> - select id from tb_user - <where> - available = 'YES' - <if test="cm.name != null and cm.name != ''"> - and name = #{cm.name} - </if> - <if test="cm.code != null and cm.code != ''"> - and code = #{cm.code} - </if> - <if test="cm.age != null "> - and age = #{cm.age} - </if> - <if test="cm.sex != null and cm.sex != ''"> - and sex = #{cm.sex} - </if> - </where> - </select> - - - - <select id="selectUserList" resultType="com.seasky.adjustproject.infrastructure.dataobject.po.TestPo"> - select * from tb_user - <where> - available = 'YES' - <if test="pm.name != null and pm.name != ''"> - and name = #{pm.name} - </if> - <if test="pm.code != null and pm.code != ''"> - and code = #{pm.code} - </if> - <if test="pm.age != null "> - and age = #{pm.age} - </if> - <if test="pm.sex != null and pm.sex != ''"> - and sex = #{pm.sex} - </if> - - </where> - </select> -</mapper> \ No newline at end of file diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/reader/splitItemPlan/SplitItemPlanQueryConvert.java b/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/reader/splitItemPlan/SplitItemPlanQueryConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..1be0bd1e74b9c64c08c6125d0243b40a5fd864bf --- /dev/null +++ b/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/reader/splitItemPlan/SplitItemPlanQueryConvert.java @@ -0,0 +1,27 @@ +package com.seasky.adjustproject.infrastructure.reader.splitItemPlan; + +import com.seasky.adjustproject.dto.out.SplitItemPlanCheckOut; +import com.seasky.adjustproject.infrastructure.dataobject.po.SplitItemPlanPO; +import com.seasky.core.common.Pagination; +import com.seasky.core.ddd.utils.MapperUtils; + +import java.util.List; + +/** + * @Author zhouquan + * @Data 2022/4/22 14:29 + */ +public class SplitItemPlanQueryConvert { + public static List<SplitItemPlanCheckOut> poToOut(List<SplitItemPlanPO> splitItemPlanPo){ + return MapperUtils.INSTANCE.mapAsList(SplitItemPlanCheckOut.class,splitItemPlanPo); + } + + public static Pagination<SplitItemPlanCheckOut> poToPaginationOut(Pagination<SplitItemPlanPO> page){ + Pagination<SplitItemPlanCheckOut> pageOut = new Pagination<>(page.getCurrent(), page.getSize()); + // listPo杞琽ut + List<SplitItemPlanCheckOut> splitItemPlanCheckOuts = SplitItemPlanQueryConvert.poToOut(page.getRecords()); + pageOut.setTotal(page.getTotal()); + pageOut.setRecords(splitItemPlanCheckOuts); + return pageOut; + } +} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/reader/splitItemPlan/SplitItemPlanQuerySvrImpl.java b/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/reader/splitItemPlan/SplitItemPlanQuerySvrImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..63156b311fb17652a580cec4b633b460210def34 --- /dev/null +++ b/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/reader/splitItemPlan/SplitItemPlanQuerySvrImpl.java @@ -0,0 +1,34 @@ +package com.seasky.adjustproject.infrastructure.reader.splitItemPlan; + + +import com.seasky.adjustproject.application.query.splitItemPlan.SplitItemPlanQuerySvr; +import com.seasky.adjustproject.dto.out.SplitItemPlanCheckOut; +import com.seasky.adjustproject.dto.qry.SplitItemPlanCheckQry; +import com.seasky.adjustproject.infrastructure.dataobject.po.SplitItemPlanPO; +import com.seasky.adjustproject.infrastructure.db.mapper.table.SplitItemPlanMapper; +import com.seasky.core.base.AbstractService; +import com.seasky.core.common.Pagination; +import com.seasky.core.ddd.utils.MapperUtils; +import org.springframework.stereotype.Service; + + +/** + * @Author zhouquan + * @Data 2022/4/22 11:12 + */ +@Service +public class SplitItemPlanQuerySvrImpl extends AbstractService<SplitItemPlanPO,SplitItemPlanMapper> implements SplitItemPlanQuerySvr { + + + @Override + public Pagination<SplitItemPlanCheckOut> querySplitItemPlanCheckPage(SplitItemPlanCheckQry splitItemPlanCheckQry) { + // qry杞琾o + SplitItemPlanPO map = MapperUtils.INSTANCE.map(SplitItemPlanPO.class, splitItemPlanCheckQry); + //SplitItemPlanPo splitItemPlanPo = new SplitItemPlanPo(); + // 鏋勫缓鍒嗛〉鏉′欢 + Pagination<SplitItemPlanPO> pagination = new Pagination<>(splitItemPlanCheckQry.getPageIndex(), splitItemPlanCheckQry.getPageSize()); + // 鍒嗛〉鏌ヨ + Pagination<SplitItemPlanPO> page = page(map, pagination); + return SplitItemPlanQueryConvert.poToPaginationOut(page); + } +} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/repository/splitItemPlan/SplitItemPlanConvert.java b/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/repository/splitItemPlan/SplitItemPlanConvert.java new file mode 100644 index 0000000000000000000000000000000000000000..df241b69799dec17f672c82388771bc22b44aa35 --- /dev/null +++ b/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/repository/splitItemPlan/SplitItemPlanConvert.java @@ -0,0 +1,90 @@ +package com.seasky.adjustproject.infrastructure.repository.splitItemPlan; + +import com.seasky.adjustproject.domain.aggregate.splitItemPlan.SplitItemPlanAggregate; +import com.seasky.adjustproject.domain.aggregate.value.AdjustFundVO; +import com.seasky.adjustproject.domain.aggregate.value.MainProjectInfoVO; +import com.seasky.adjustproject.domain.aggregate.value.ProjectInfoVO; +import com.seasky.adjustproject.infrastructure.dataobject.po.SplitItemFundInfoPO; +import com.seasky.adjustproject.infrastructure.dataobject.po.SplitItemPlanPO; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author zhouquan + * @Data 2022/4/20 15:30 + */ +public class SplitItemPlanConvert { + + /** + * 椤圭洰鎷嗗垎璁″垝琛╬o杞」鐩媶鍒哸gg + * @param projectSplitPlanPo + * @return + */ + public static SplitItemPlanAggregate SplitItemPlanPoToAgg(SplitItemPlanPO projectSplitPlanPo, List<SplitItemFundInfoPO> splitItemFundInfoPoList){ + List<AdjustFundVO> adjustFundVoList = new ArrayList<>(); + if (splitItemFundInfoPoList.size() > 0) { + splitItemFundInfoPoList.forEach(item->{ + AdjustFundVO adjustFundVo = new AdjustFundVO(); + adjustFundVo.setAdjustMoney(item.getAdjustMoney()) + .setSourceSubjectCode(item.getSourceSubjectCode()) + .setSourceSubjectName(item.getSourceSubjectName()) + .setTargetSubjectCode(item.getTargetSubjectCode()) + .setTargetSubjectCode(item.getTargetSubjectCode()); + adjustFundVoList.add(adjustFundVo); + }); + } + MainProjectInfoVO mainProjectInfoVo = new MainProjectInfoVO(projectSplitPlanPo.getSourceProjectName(), + projectSplitPlanPo.getSourceProjectCode(), + null, + null); + ProjectInfoVO projectInfoVo = new ProjectInfoVO(projectSplitPlanPo.getTargetProjectName(), + projectSplitPlanPo.getTargetProjectCode(), + projectSplitPlanPo.getOwnerCode(), + projectSplitPlanPo.getOwnerName(), + projectSplitPlanPo.getTargetDepartmentName(), + projectSplitPlanPo.getTargetDepartmentCode(), + projectSplitPlanPo.getOneOwnerName(), + projectSplitPlanPo.getOneOwnerCode(), + projectSplitPlanPo.getSecondOwnerCode(), + projectSplitPlanPo.getSecondOwnerName(), + adjustFundVoList); + return new SplitItemPlanAggregate(projectSplitPlanPo.getYear(), + projectSplitPlanPo.getState(), + mainProjectInfoVo, + projectInfoVo, + projectSplitPlanPo.getProcessId(), + projectSplitPlanPo.getBusinessNumber(), + projectSplitPlanPo.getFundName(), + projectSplitPlanPo.getFundCode(), + projectSplitPlanPo.getTemplateName(), + projectSplitPlanPo.getTemplateCode()); + + } + + public static SplitItemPlanPO SplitItemPlanAggToSplitItemPlanPo(SplitItemPlanAggregate splitItemPlanAggregate){ + + return new SplitItemPlanPO( + splitItemPlanAggregate.getProcessId(), + splitItemPlanAggregate.getMainProjectInfoVo().getProjectName(), + splitItemPlanAggregate.getMainProjectInfoVo().getProjectCode(), + splitItemPlanAggregate.getProjectInfoVo().getProjectName(), + splitItemPlanAggregate.getProjectInfoVo().getProjectCode(), + splitItemPlanAggregate.getProjectInfoVo().getTargetDepartmentName(), + splitItemPlanAggregate.getProjectInfoVo().getTargetDepartmentCode(), + splitItemPlanAggregate.getProjectInfoVo().getOwnerName(), + splitItemPlanAggregate.getProjectInfoVo().getOwnerCode(), + splitItemPlanAggregate.getProjectInfoVo().getOneOwnerName(), + splitItemPlanAggregate.getProjectInfoVo().getOneOwnerCode(), + splitItemPlanAggregate.getProjectInfoVo().getSecondOwnerName(), + splitItemPlanAggregate.getProjectInfoVo().getSecondOwnerCode(), + splitItemPlanAggregate.getYear(), + splitItemPlanAggregate.getState(), + splitItemPlanAggregate.getBusinessNumber(), + splitItemPlanAggregate.getFundName(), + splitItemPlanAggregate.getFundCode(), + splitItemPlanAggregate.getTemplateName(), + splitItemPlanAggregate.getTemplateCode() + ); + } +} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/repository/splitItemPlan/SplitItemPlanRepositoryImpl.java b/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/repository/splitItemPlan/SplitItemPlanRepositoryImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..40c7bba8793b85a41e8f54436b2d57fdc2286439 --- /dev/null +++ b/ServiceSite/src/main/java/com/seasky/adjustproject/infrastructure/repository/splitItemPlan/SplitItemPlanRepositoryImpl.java @@ -0,0 +1,80 @@ +package com.seasky.adjustproject.infrastructure.repository.splitItemPlan; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.seasky.adjustproject.domain.aggregate.splitItemPlan.SplitItemPlanAggregate; +import com.seasky.adjustproject.domain.aggregate.splitItemPlan.SplitItemPlanRepository; +import com.seasky.adjustproject.infrastructure.dataobject.po.SplitItemFundInfoPO; +import com.seasky.adjustproject.infrastructure.dataobject.po.SplitItemPlanPO; +import com.seasky.adjustproject.infrastructure.db.mapper.table.SplitItemFundInfoMapper; +import com.seasky.adjustproject.infrastructure.db.mapper.table.SplitItemPlanMapper; +import com.seasky.core.base.AbstractService; +import com.seasky.core.ddd.base.DomainKeysMap; +import org.apache.commons.lang3.ObjectUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @Author zhouquan + * @Data 2022/4/20 15:31 + */ +@Service +public class SplitItemPlanRepositoryImpl extends AbstractService<SplitItemPlanPO, SplitItemPlanMapper> implements SplitItemPlanRepository { + + @Autowired + private SplitItemFundInfoMapper splitItemFundInfoMapper; + + @Override + public Long save(SplitItemPlanAggregate aggregate) { + SplitItemPlanPO splitItemPlanPo = SplitItemPlanConvert.SplitItemPlanAggToSplitItemPlanPo(aggregate); + if (ObjectUtils.isNotEmpty(aggregate.getLogicStamp())){ + switch (aggregate.getLogicStamp()) { + case INSERT: + insert(splitItemPlanPo); + aggregate.setId(splitItemPlanPo.getId()); + break; + case UPDATE: + update(splitItemPlanPo); + break; + default: + break; + } + } + + return aggregate.getId(); + } + + @Override + public void remove(SplitItemPlanAggregate aggregate) { + //鍒犻櫎椤圭洰鎷嗗垎璁″垝琛ㄤ俊鎭� + logicDelete(aggregate.getId()); + //杩樿鍒犻櫎鍏宠仈鐨� 椤圭洰鎷嗗垎鍚庨搴︿俊鎭〃 + Map<String,Object> maps = new HashMap<>(1); + maps.put("split_item_plan_id",aggregate.getId()); + splitItemFundInfoMapper.deleteByMap(maps); + } + + @Override + public SplitItemPlanAggregate findByDomainKey(DomainKeysMap domainKeysMap) { + return null; + } + + @Override + public Boolean isExistsByDomainKey(DomainKeysMap domainKeysMap) { + return null; + } + + @Override + public SplitItemPlanAggregate findByPersistentId(Long persistentId) { + SplitItemPlanPO projectSplitPlanPo = get(persistentId); + SplitItemPlanAggregate splitItemPlanAggregate = null; + if (ObjectUtils.isNotEmpty(projectSplitPlanPo)){ + List<SplitItemFundInfoPO> splitItemFundInfoPoList = splitItemFundInfoMapper.selectList(new QueryWrapper<SplitItemFundInfoPO>().eq("split_item_plan_id", persistentId)); + splitItemPlanAggregate = SplitItemPlanConvert.SplitItemPlanPoToAgg(projectSplitPlanPo,splitItemFundInfoPoList); + } + return splitItemPlanAggregate; + } +} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/interfaces/rpc/TestRPC.java b/ServiceSite/src/main/java/com/seasky/adjustproject/interfaces/rpc/TestRPC.java deleted file mode 100644 index 657cf6e9b0107b7ebc009db609853d671fc244c5..0000000000000000000000000000000000000000 --- a/ServiceSite/src/main/java/com/seasky/adjustproject/interfaces/rpc/TestRPC.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.seasky.adjustproject.interfaces.rpc; - -public class TestRPC { -} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/interfaces/soap/SOAPConfig.java b/ServiceSite/src/main/java/com/seasky/adjustproject/interfaces/soap/SOAPConfig.java deleted file mode 100644 index af146e54613d7dda3b18428afa4e6e1b4027661b..0000000000000000000000000000000000000000 --- a/ServiceSite/src/main/java/com/seasky/adjustproject/interfaces/soap/SOAPConfig.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.seasky.adjustproject.interfaces.soap; - -import com.seasky.adjustproject.api.ITestWebService; -import org.apache.cxf.Bus; -import org.apache.cxf.bus.spring.SpringBus; -import org.apache.cxf.jaxws.EndpointImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import javax.xml.ws.Endpoint; - - -@Configuration -public class SOAPConfig { - @Autowired - private ITestWebService testWebServiceImpl; - - @Autowired - private ITestWebService test2WebServiceImpl; - - /** - * Apache CXF 鏍稿績鏋舵瀯鏄互BUS涓烘牳蹇冿紝鏁村悎鍏朵粬缁勪欢銆� - * Bus鏄疌XF鐨勪富骞�, 涓哄叡浜祫婧愭彁渚涗竴涓彲閰嶇疆鐨勫満鎵€锛屼綔鐢ㄧ被浼间簬Spring鐨凙pplicationContext锛岃繖浜涘叡浜祫婧愬寘鎷� - * WSDl绠$悊鍣ㄣ€佺粦瀹氬伐鍘傜瓑銆傞€氳繃瀵笲US杩涜鎵╁睍锛屽彲浠ユ柟渚垮湴瀹圭撼鑷繁鐨勮祫婧愶紝鎴栬€呮浛鎹㈢幇鏈夌殑璧勬簮銆傞粯璁us瀹炵幇鍩轰簬Spring鏋舵瀯锛� - * 閫氳繃渚濊禆娉ㄥ叆锛屽湪杩愯鏃跺皢缁勪欢涓茶仈璧锋潵銆侭usFactory璐熻矗Bus鐨勫垱寤恒€傞粯璁ょ殑BusFactory鏄疭pringBusFactory锛屽搴斾簬榛樿 - * 鐨凚us瀹炵幇銆傚湪鏋勯€犺繃绋嬩腑锛孲pringBusFactory浼氭悳绱ETA-INF/cxf锛堝寘鍚湪 CXF 鐨刯ar涓級涓嬬殑鎵€鏈塨ean閰嶇疆鏂囦欢銆� - * 鏍规嵁杩欎簺閰嶇疆鏂囦欢鏋勫缓涓€涓狝pplicationContext銆傚紑鍙戣€呬篃鍙互鎻愪緵鑷繁鐨勯厤缃枃浠舵潵瀹氬埗Bus銆� - */ - @Bean(name = Bus.DEFAULT_BUS_ID) - public SpringBus springBus() { - return new SpringBus(); - } - - /** - * 姝ゆ柟娉曚綔鐢ㄦ槸鏀瑰彉椤圭洰涓湇鍔″悕鐨勫墠缂€鍚嶏紝姝ゅ127.0.0.1鎴栬€卨ocalhost涓嶈兘璁块棶鏃讹紝璇蜂娇鐢╥pconfig鏌ョ湅鏈満ip鏉ヨ闂� - * 姝ゆ柟娉曡娉ㄩ噴鍚�, 鍗充笉鏀瑰彉鍓嶇紑鍚�(榛樿鏄痵ervices), wsdl璁块棶鍦板潃涓� http://127.0.0.1:8080/services/ws/api?wsdl - * 鍘绘帀娉ㄩ噴鍚巜sdl璁块棶鍦板潃涓猴細http://127.0.0.1:8080/soap/ws/api?wsdl - * http://127.0.0.1:8080/soap/鍒楀嚭鏈嶅姟鍒楄〃 鎴� http://127.0.0.1:8080/soap/ws/api?wsdl 鏌ョ湅瀹為檯鐨勬湇鍔� - * 鏂板缓Servlet璁板緱闇€瑕佸湪鍚姩绫绘坊鍔犳敞瑙o細@ServletComponentScan - * - * 濡傛灉鍚姩鏃跺嚭鐜伴敊璇細not loaded because DispatcherServlet Registration found non dispatcher servlet dispatcherServlet - * 鍙兘鏄痵pringboot涓巆fx鐗堟湰涓嶅吋瀹广€� - * 鍚屾椂鍦╯pring boot2.0.6涔嬪悗鐨勭増鏈笌xcf闆嗘垚锛屼笉闇€瑕佸湪瀹氫箟浠ヤ笅鏂规硶锛岀洿鎺ュ湪application.properties閰嶇疆鏂囦欢涓坊鍔狅細 - * cxf.path=/service锛堥粯璁ゆ槸services锛� - */ - //@Bean - //public ServletRegistrationBean dispatcherServlet() { - // return new ServletRegistrationBean(new CXFServlet(), "/soap/*"); - //} - - @Bean - public Endpoint testendpoint() { - EndpointImpl endpoint = new EndpointImpl(springBus(), testWebServiceImpl); - endpoint.publish("/ws/api"); - return endpoint; - } - - @Bean - public Endpoint test2endpoint() { - EndpointImpl endpoint = new EndpointImpl(springBus(), test2WebServiceImpl); - endpoint.publish("/ws/api2"); - return endpoint; - } -} diff --git a/ServiceSite/src/main/java/com/seasky/adjustproject/interfaces/soap/TestWebService.java b/ServiceSite/src/main/java/com/seasky/adjustproject/interfaces/soap/TestWebService.java deleted file mode 100644 index c1b36d90327de42c20df6f37f6dbc49bb822a739..0000000000000000000000000000000000000000 --- a/ServiceSite/src/main/java/com/seasky/adjustproject/interfaces/soap/TestWebService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.seasky.adjustproject.interfaces.soap; - -import com.seasky.core.common.ResponseCode; -import com.seasky.core.common.Result; -import com.seasky.adjustproject.api.ITestWebService; -import com.seasky.adjustproject.application.query.TestQueryService; -import com.seasky.adjustproject.dto.test.TestQueryOut; -import com.seasky.adjustproject.dto.test.TestQueryQry; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import javax.jws.WebService; -import static com.seasky.core.common.Response.ok; - -@Component -@WebService(name = "TestService", targetNamespace = "http://www.seaskysh.com", - endpointInterface = "com.seasky.adjustproject.api.ITestWebService") -public class TestWebService implements ITestWebService { - @Autowired - private TestQueryService testQueryService; - - @Override - public Result<TestQueryOut> testQ(TestQueryQry testQry) { - return ok(ResponseCode.SUCCESS, testQueryService.queryTestList(testQry)); - } -}