optimize delete owner

service-user/src/main/java/com/java110/user/cmd/ownerCommittee/DeleteOwnerCommitteeCmd.java

@@ -22,8 +22,10 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.user.IOwnerCommitteeContractV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerCommitteeV1InnerServiceSMO;
 import com.java110.po.ownerCommittee.OwnerCommitteePo;
+import com.java110.po.ownerCommitteeContract.OwnerCommitteeContractPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -49,6 +51,9 @@ public class DeleteOwnerCommitteeCmd extends Cmd {
     @Autowired
     private IOwnerCommitteeV1InnerServiceSMO ownerCommitteeV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IOwnerCommitteeContractV1InnerServiceSMO ownerCommitteeContractV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "ocId", "ocId不能为空");
@@ -67,6 +72,12 @@ public class DeleteOwnerCommitteeCmd extends Cmd {
             throw new CmdException("删除数据失败");
         }
 
+        OwnerCommitteeContractPo ownerCommitteeContractPo = null;
+
+        ownerCommitteeContractPo = new OwnerCommitteeContractPo();
+        ownerCommitteeContractPo.setOcId(ownerCommitteePo.getOcId());
+        ownerCommitteeContractV1InnerServiceSMOImpl.deleteOwnerCommitteeContract(ownerCommitteeContractPo);
+
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }

service-user/src/main/java/com/java110/user/cmd/ownerCommittee/DeleteOwnerCommitteeContractCmd.java

@@ -1,71 +0,0 @@
-/*
- * Copyright 2017-2020 吴学文 and java110 team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.java110.user.cmd.ownerCommittee;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.Cmd;
-import com.java110.core.event.cmd.CmdEvent;
-import com.java110.intf.user.IOwnerCommitteeContractV1InnerServiceSMO;
-import com.java110.po.ownerCommitteeContract.OwnerCommitteeContractPo;
-import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * 类表述：删除
- * 服务编码：ownerCommitteeContract.deleteOwnerCommitteeContract
- * 请求路劲：/app/ownerCommitteeContract.DeleteOwnerCommitteeContract
- * add by 吴学文 at 2023-03-06 12:01:17 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 官网：http://www.homecommunity.cn
- * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
- * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
- */
-@Java110Cmd(serviceCode = "ownerCommittee.deleteOwnerCommitteeContract")
-public class DeleteOwnerCommitteeContractCmd extends Cmd {
-    private static Logger logger = LoggerFactory.getLogger(DeleteOwnerCommitteeContractCmd.class);
-
-    @Autowired
-    private IOwnerCommitteeContractV1InnerServiceSMO ownerCommitteeContractV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "contractId", "contractId不能为空");
-        Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-        OwnerCommitteeContractPo ownerCommitteeContractPo = BeanConvertUtil.covertBean(reqJson, OwnerCommitteeContractPo.class);
-        int flag = ownerCommitteeContractV1InnerServiceSMOImpl.deleteOwnerCommitteeContract(ownerCommitteeContractPo);
-
-        if (flag < 1) {
-            throw new CmdException("删除数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}

service-user/src/main/java/com/java110/user/cmd/ownerCommittee/SaveOwnerCommitteeCmd.java

@@ -101,6 +101,7 @@ public class SaveOwnerCommitteeCmd extends Cmd {
             ownerCommitteeContractPo = BeanConvertUtil.covertBean(contracts.getJSONObject(contractIndex), OwnerCommitteeContractPo.class);
             ownerCommitteeContractPo.setContractId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
             ownerCommitteeContractPo.setOcId(ownerCommitteePo.getOcId());
+            ownerCommitteeContractPo.setCommunityId(ownerCommitteePo.getCommunityId());
             ownerCommitteeContractV1InnerServiceSMOImpl.saveOwnerCommitteeContract(ownerCommitteeContractPo);
         }
 

service-user/src/main/java/com/java110/user/cmd/ownerCommittee/UpdateOwnerCommitteeCmd.java

@@ -91,6 +91,7 @@ public class UpdateOwnerCommitteeCmd extends Cmd {
             ownerCommitteeContractPo = BeanConvertUtil.covertBean(contracts.getJSONObject(contractIndex), OwnerCommitteeContractPo.class);
             ownerCommitteeContractPo.setContractId(GenerateCodeFactory.getGeneratorId("11"));
             ownerCommitteeContractPo.setOcId(ownerCommitteePo.getOcId());
+            ownerCommitteeContractPo.setCommunityId(ownerCommitteePo.getCommunityId());
             ownerCommitteeContractV1InnerServiceSMOImpl.saveOwnerCommitteeContract(ownerCommitteeContractPo);
         }