From 5589528feb385d7881f8dbf9314b3abf5d4f4e9e Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 27 一月 2023 19:21:11 +0800
Subject: [PATCH] 优化 房屋页面查询功能
---
service-community/src/main/java/com/java110/community/cmd/inspectionItem/DeleteInspectionItemCmd.java | 71 ++++++++++++++++++++++++++++++-----
1 files changed, 60 insertions(+), 11 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/inspectionItem/DeleteInspectionItemCmd.java b/service-community/src/main/java/com/java110/community/cmd/inspectionItem/DeleteInspectionItemCmd.java
index 0472666..aad9ce4 100644
--- a/service-community/src/main/java/com/java110/community/cmd/inspectionItem/DeleteInspectionItemCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/inspectionItem/DeleteInspectionItemCmd.java
@@ -19,18 +19,28 @@
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.inspectionItemTitle.InspectionItemTitleDto;
+import com.java110.dto.inspectionItemTitleValue.InspectionItemTitleValueDto;
+import com.java110.dto.inspectionPlan.InspectionDto;
+import com.java110.intf.community.IInspectionItemTitleV1InnerServiceSMO;
+import com.java110.intf.community.IInspectionItemTitleValueV1InnerServiceSMO;
import com.java110.intf.community.IInspectionItemV1InnerServiceSMO;
+import com.java110.intf.community.IInspectionPointV1InnerServiceSMO;
import com.java110.po.inspectionItem.InspectionItemPo;
+import com.java110.po.inspectionItemTitle.InspectionItemTitlePo;
+import com.java110.po.inspectionItemTitleValue.InspectionItemTitleValuePo;
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;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
/**
* 绫昏〃杩帮細鍒犻櫎
* 鏈嶅姟缂栫爜锛歩nspectionItem.deleteInspectionItem
@@ -42,30 +52,69 @@
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
@Java110Cmd(serviceCode = "inspectionItem.deleteInspectionItem")
-public class DeleteInspectionItemCmd extends AbstractServiceCmdListener {
- private static Logger logger = LoggerFactory.getLogger(DeleteInspectionItemCmd.class);
+public class DeleteInspectionItemCmd extends Cmd {
+
+ private static Logger logger = LoggerFactory.getLogger(DeleteInspectionItemCmd.class);
@Autowired
private IInspectionItemV1InnerServiceSMO inspectionItemV1InnerServiceSMOImpl;
+ @Autowired
+ private IInspectionPointV1InnerServiceSMO iInspectionPointV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IInspectionItemTitleV1InnerServiceSMO iInspectionItemTitleV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IInspectionItemTitleValueV1InnerServiceSMO iInspectionItemTitleValueV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "itemId", "itemId涓嶈兘涓虹┖");
-Assert.hasKeyAndValue(reqJson, "communityId", "communityId涓嶈兘涓虹┖");
-
+ Assert.hasKeyAndValue(reqJson, "communityId", "communityId涓嶈兘涓虹┖");
}
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
- InspectionItemPo inspectionItemPo = BeanConvertUtil.covertBean(reqJson, InspectionItemPo.class);
+ InspectionItemPo inspectionItemPo = BeanConvertUtil.covertBean(reqJson, InspectionItemPo.class);
+ InspectionDto inspectionDto = new InspectionDto();
+ inspectionDto.setItemId(inspectionItemPo.getItemId());
+ List<InspectionDto> inspectionDtos = iInspectionPointV1InnerServiceSMOImpl.queryInspectionPoints(inspectionDto);
+ if (inspectionDtos != null && inspectionDtos.size() > 0) {
+ throw new IllegalArgumentException("璇ュ贰妫�椤圭洰涓嬫湁宸℃鐐癸紝璇峰厛鍒犻櫎宸℃鐐癸紒");
+ }
int flag = inspectionItemV1InnerServiceSMOImpl.deleteInspectionItem(inspectionItemPo);
-
if (flag < 1) {
throw new CmdException("鍒犻櫎鏁版嵁澶辫触");
}
-
+ InspectionItemTitleDto inspectionItemTitleDto = new InspectionItemTitleDto();
+ inspectionItemTitleDto.setItemId(inspectionItemPo.getItemId());
+ List<InspectionItemTitleDto> inspectionItemTitleDtos = iInspectionItemTitleV1InnerServiceSMOImpl.queryInspectionItemTitles(inspectionItemTitleDto);
+ if (inspectionItemTitleDtos != null && inspectionItemTitleDtos.size() > 0) {
+ for (InspectionItemTitleDto inspectionItemTitle : inspectionItemTitleDtos) {
+ InspectionItemTitlePo inspectionItemTitlePo = new InspectionItemTitlePo();
+ inspectionItemTitlePo.setTitleId(inspectionItemTitle.getTitleId());
+ //鍒犻櫎宸℃椤圭洰涓嬬殑棰樼洰
+ int i = iInspectionItemTitleV1InnerServiceSMOImpl.deleteInspectionItemTitle(inspectionItemTitlePo);
+ if (i < 1) {
+ throw new CmdException("鍒犻櫎鏁版嵁澶辫触");
+ }
+ InspectionItemTitleValueDto inspectionItemTitleValueDto = new InspectionItemTitleValueDto();
+ inspectionItemTitleValueDto.setTitleId(inspectionItemTitle.getTitleId());
+ List<InspectionItemTitleValueDto> inspectionItemTitleValueDtos = iInspectionItemTitleValueV1InnerServiceSMOImpl.queryInspectionItemTitleValues(inspectionItemTitleValueDto);
+ if (inspectionItemTitleValueDtos != null && inspectionItemTitleValueDtos.size() > 0) {
+ for (InspectionItemTitleValueDto inspectionItemTitleValue : inspectionItemTitleValueDtos) {
+ InspectionItemTitleValuePo inspectionItemTitleValuePo = new InspectionItemTitleValuePo();
+ inspectionItemTitleValuePo.setValueId(inspectionItemTitleValue.getValueId());
+ int count = iInspectionItemTitleValueV1InnerServiceSMOImpl.deleteInspectionItemTitleValue(inspectionItemTitleValuePo);
+ if (count < 1) {
+ throw new CmdException("鍒犻櫎鏁版嵁澶辫触");
+ }
+ }
+ }
+ }
+ }
cmdDataFlowContext.setResponseEntity(ResultVo.success());
}
}
--
Gitblit v1.8.0