optimize

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

@@ -30,8 +30,10 @@ import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.java110.dto.ownerCommittee.OwnerCommitteeDto;
+
 import java.util.List;
 import java.util.ArrayList;
+
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.HttpStatus;
 import org.slf4j.Logger;
@@ -51,34 +53,36 @@ import org.slf4j.LoggerFactory;
 @Java110Cmd(serviceCode = "ownerCommittee.listOwnerCommittee")
 public class ListOwnerCommitteeCmd extends Cmd {
 
-  private static Logger logger = LoggerFactory.getLogger(ListOwnerCommitteeCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(ListOwnerCommitteeCmd.class);
     @Autowired
     private IOwnerCommitteeV1InnerServiceSMO ownerCommitteeV1InnerServiceSMOImpl;
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含小区信息");
+
     }
 
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-           OwnerCommitteeDto ownerCommitteeDto = BeanConvertUtil.covertBean(reqJson, OwnerCommitteeDto.class);
+        OwnerCommitteeDto ownerCommitteeDto = BeanConvertUtil.covertBean(reqJson, OwnerCommitteeDto.class);
 
-           int count = ownerCommitteeV1InnerServiceSMOImpl.queryOwnerCommitteesCount(ownerCommitteeDto);
+        int count = ownerCommitteeV1InnerServiceSMOImpl.queryOwnerCommitteesCount(ownerCommitteeDto);
 
-           List<OwnerCommitteeDto> ownerCommitteeDtos = null;
+        List<OwnerCommitteeDto> ownerCommitteeDtos = null;
 
-           if (count > 0) {
-               ownerCommitteeDtos = ownerCommitteeV1InnerServiceSMOImpl.queryOwnerCommittees(ownerCommitteeDto);
-           } else {
-               ownerCommitteeDtos = new ArrayList<>();
-           }
+        if (count > 0) {
+            ownerCommitteeDtos = ownerCommitteeV1InnerServiceSMOImpl.queryOwnerCommittees(ownerCommitteeDto);
+        } else {
+            ownerCommitteeDtos = new ArrayList<>();
+        }
 
-           ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, ownerCommitteeDtos);
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, ownerCommitteeDtos);
 
-           ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
 
-           cmdDataFlowContext.setResponseEntity(responseEntity);
+        cmdDataFlowContext.setResponseEntity(responseEntity);
     }
 }

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

@@ -22,12 +22,15 @@ import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.intf.user.IOwnerCommitteeContractV1InnerServiceSMO;
 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 com.java110.dto.ownerCommitteeContract.OwnerCommitteeContractDto;
+
 import java.util.List;
 import java.util.ArrayList;
+
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.HttpStatus;
 import org.slf4j.Logger;
@@ -47,34 +50,36 @@ import org.slf4j.LoggerFactory;
 @Java110Cmd(serviceCode = "ownerCommittee.listOwnerCommitteeContract")
 public class ListOwnerCommitteeContractCmd extends Cmd {
 
-  private static Logger logger = LoggerFactory.getLogger(ListOwnerCommitteeContractCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(ListOwnerCommitteeContractCmd.class);
     @Autowired
     private IOwnerCommitteeContractV1InnerServiceSMO ownerCommitteeContractV1InnerServiceSMOImpl;
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含小区信息");
+
     }
 
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-           OwnerCommitteeContractDto ownerCommitteeContractDto = BeanConvertUtil.covertBean(reqJson, OwnerCommitteeContractDto.class);
+        OwnerCommitteeContractDto ownerCommitteeContractDto = BeanConvertUtil.covertBean(reqJson, OwnerCommitteeContractDto.class);
 
-           int count = ownerCommitteeContractV1InnerServiceSMOImpl.queryOwnerCommitteeContractsCount(ownerCommitteeContractDto);
+        int count = ownerCommitteeContractV1InnerServiceSMOImpl.queryOwnerCommitteeContractsCount(ownerCommitteeContractDto);
 
-           List<OwnerCommitteeContractDto> ownerCommitteeContractDtos = null;
+        List<OwnerCommitteeContractDto> ownerCommitteeContractDtos = null;
 
-           if (count > 0) {
-               ownerCommitteeContractDtos = ownerCommitteeContractV1InnerServiceSMOImpl.queryOwnerCommitteeContracts(ownerCommitteeContractDto);
-           } else {
-               ownerCommitteeContractDtos = new ArrayList<>();
-           }
+        if (count > 0) {
+            ownerCommitteeContractDtos = ownerCommitteeContractV1InnerServiceSMOImpl.queryOwnerCommitteeContracts(ownerCommitteeContractDto);
+        } else {
+            ownerCommitteeContractDtos = new ArrayList<>();
+        }
 
-           ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, ownerCommitteeContractDtos);
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, ownerCommitteeContractDtos);
 
-           ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
 
-           cmdDataFlowContext.setResponseEntity(responseEntity);
+        cmdDataFlowContext.setResponseEntity(responseEntity);
     }
 }

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

@@ -15,6 +15,7 @@
  */
 package com.java110.user.cmd.ownerCommittee;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
@@ -22,8 +23,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;
@@ -33,6 +36,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
+ * {"ocId":"","name":"张三","sex":"B","link":"18909711425","idCard":"63212652452455","address":"谁是谁","position":"试试","post":"谁是谁","postDesc":"试试",
+ * "appointTime":"谁是谁","curTime":"试试","state":"1000","remark":"谁是谁",
+ * "contracts":[{"id":"6545bf9d-d1e8-4419-b744-df40d098f9ac","relName":"xxx","name":"xxx","link":"xxx","address":"xxx"}],
+ * "communityId":"2023013154290059"}
  * 类表述：保存
  * 服务编码：ownerCommittee.saveOwnerCommittee
  * 请求路劲：/app/ownerCommittee.SaveOwnerCommittee
@@ -52,14 +59,18 @@ public class SaveOwnerCommitteeCmd extends Cmd {
     @Autowired
     private IOwnerCommitteeV1InnerServiceSMO ownerCommitteeV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IOwnerCommitteeContractV1InnerServiceSMO ownerCommitteeContractV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "name", "请求报文中未包含name");
-Assert.hasKeyAndValue(reqJson, "sex", "请求报文中未包含sex");
-Assert.hasKeyAndValue(reqJson, "link", "请求报文中未包含link");
-Assert.hasKeyAndValue(reqJson, "position", "请求报文中未包含position");
-Assert.hasKeyAndValue(reqJson, "post", "请求报文中未包含post");
-Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
+        Assert.hasKeyAndValue(reqJson, "sex", "请求报文中未包含sex");
+        Assert.hasKeyAndValue(reqJson, "link", "请求报文中未包含link");
+        Assert.hasKeyAndValue(reqJson, "position", "请求报文中未包含position");
+        Assert.hasKeyAndValue(reqJson, "post", "请求报文中未包含post");
+        Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含小区信息");
 
     }
 
@@ -67,7 +78,7 @@ Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       OwnerCommitteePo ownerCommitteePo = BeanConvertUtil.covertBean(reqJson, OwnerCommitteePo.class);
+        OwnerCommitteePo ownerCommitteePo = BeanConvertUtil.covertBean(reqJson, OwnerCommitteePo.class);
         ownerCommitteePo.setOcId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
         int flag = ownerCommitteeV1InnerServiceSMOImpl.saveOwnerCommittee(ownerCommitteePo);
 
@@ -75,6 +86,25 @@ Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
             throw new CmdException("保存数据失败");
         }
 
+        if (!reqJson.containsKey("contracts")) {
+            return;
+        }
+
+        JSONArray contracts = reqJson.getJSONArray("contracts");
+
+        if (contracts == null || contracts.size() < 1) {
+            return;
+        }
+        OwnerCommitteeContractPo ownerCommitteeContractPo = null;
+
+        for (int contractIndex = 0; contractIndex < contracts.size(); contractIndex++) {
+            ownerCommitteeContractPo = BeanConvertUtil.covertBean(contracts.getJSONObject(contractIndex), OwnerCommitteeContractPo.class);
+            ownerCommitteeContractPo.setContractId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+            ownerCommitteeContractPo.setOcId(ownerCommitteePo.getOcId());
+            ownerCommitteeContractV1InnerServiceSMOImpl.saveOwnerCommitteeContract(ownerCommitteeContractPo);
+        }
+
+
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }

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

@@ -58,6 +58,7 @@ public class SaveOwnerCommitteeContractCmd extends Cmd {
 Assert.hasKeyAndValue(reqJson, "name", "请求报文中未包含name");
 Assert.hasKeyAndValue(reqJson, "relName", "请求报文中未包含relName");
 Assert.hasKeyAndValue(reqJson, "link", "请求报文中未包含link");
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含小区信息");
 
     }