From b311c0d7aad6f77659e39fb4f7900d1f0ef9de93 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 19 七月 2022 08:49:33 +0800
Subject: [PATCH] 巡检计划调整为cmd模式
---
/dev/null | 65 ----------
service-community/src/main/java/com/java110/community/cmd/inspectionPlan/UpdateInspectionPlanStateCmd.java | 54 +++++++++
service-community/src/main/java/com/java110/community/cmd/inspectionPlan/ListInspectionPlansCmd.java | 61 ++-------
service-community/src/main/java/com/java110/community/cmd/inspectionPlan/UpdateInspectionPlanCmd.java | 41 ++++++
service-community/src/main/java/com/java110/community/cmd/inspectionPlan/SaveInspectionPlanCmd.java | 46 +++++++
service-community/src/main/java/com/java110/community/cmd/inspectionPlan/DeleteInspectionPlanCmd.java | 48 ++++++++
6 files changed, 203 insertions(+), 112 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/inspectionPlan/DeleteInspectionPlanListener.java b/service-api/src/main/java/com/java110/api/listener/inspectionPlan/DeleteInspectionPlanListener.java
deleted file mode 100755
index 50a7db6..0000000
--- a/service-api/src/main/java/com/java110/api/listener/inspectionPlan/DeleteInspectionPlanListener.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.java110.api.listener.inspectionPlan;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.inspection.IInspectionBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeInspectionPlanConstant;
-import com.java110.utils.util.Assert;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-
-/**
- * 淇濆瓨灏忓尯渚﹀惉
- * add by wuxw 2019-06-30
- */
-@Java110Listener("deleteInspectionPlanListener")
-public class DeleteInspectionPlanListener extends AbstractServiceApiPlusListener {
-
- @Autowired
- private IInspectionBMO inspectionBMOImpl;
-
- @Override
- protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
- //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
-
- Assert.hasKeyAndValue(reqJson, "inspectionPlanId", "宸℃璁″垝鍚嶇О涓嶈兘涓虹┖");
-
- }
-
- @Override
- protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
- inspectionBMOImpl.deleteInspectionPlan(reqJson, context);
-
- }
-
- @Override
- public String getServiceCode() {
- return ServiceCodeInspectionPlanConstant.DELETE_INSPECTION_PLAN;
- }
-
- @Override
- public HttpMethod getHttpMethod() {
- return HttpMethod.POST;
- }
-
- @Override
- public int getOrder() {
- return DEFAULT_ORDER;
- }
-}
diff --git a/service-api/src/main/java/com/java110/api/listener/inspectionPlan/SaveInspectionPlanListener.java b/service-api/src/main/java/com/java110/api/listener/inspectionPlan/SaveInspectionPlanListener.java
deleted file mode 100755
index 3cc39aa..0000000
--- a/service-api/src/main/java/com/java110/api/listener/inspectionPlan/SaveInspectionPlanListener.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.java110.api.listener.inspectionPlan;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.inspection.IInspectionBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeInspectionPlanConstant;
-import com.java110.utils.util.Assert;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-
-/**
- * 淇濆瓨灏忓尯渚﹀惉
- * add by wuxw 2019-06-30
- */
-@Java110Listener("saveInspectionPlanListener")
-public class SaveInspectionPlanListener extends AbstractServiceApiPlusListener {
- @Autowired
- private IInspectionBMO inspectionBMOImpl;
-
- @Override
- protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
- //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
-
- Assert.hasKeyAndValue(reqJson, "inspectionPlanName", "蹇呭～锛岃濉啓宸℃璁″垝鍚嶇О");
- Assert.hasKeyAndValue(reqJson, "inspectionRouteId", "蹇呭～锛岃濉啓宸℃璺嚎");
- Assert.hasKeyAndValue(reqJson, "inspectionPlanPeriod", "蹇呭～锛岃閫夋嫨鎵ц鍛ㄦ湡");
- Assert.hasKeyAndValue(reqJson, "startTime", "蹇呭～锛岃閫夋嫨璁″垝寮�濮嬫椂闂�");
- Assert.hasKeyAndValue(reqJson, "endTime", "蹇呭～锛岃閫夋嫨缁撴潫鏃堕棿");
- Assert.hasKeyAndValue(reqJson, "signType", "蹇呭～锛岃濉啓绛惧埌鏂瑰紡");
- Assert.hasKeyAndValue(reqJson, "state", "蹇呭～锛岃濉啓绛惧埌鏂瑰紡");
-
- }
-
- @Override
- protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
- inspectionBMOImpl.addInspectionPlan(reqJson, context);
- }
-
- @Override
- public String getServiceCode() {
- return ServiceCodeInspectionPlanConstant.ADD_INSPECTION_PLAN;
- }
-
- @Override
- public HttpMethod getHttpMethod() {
- return HttpMethod.POST;
- }
-
- @Override
- public int getOrder() {
- return DEFAULT_ORDER;
- }
-
-}
diff --git a/service-api/src/main/java/com/java110/api/listener/inspectionPlan/UpdateInspectionPlanListener.java b/service-api/src/main/java/com/java110/api/listener/inspectionPlan/UpdateInspectionPlanListener.java
deleted file mode 100755
index 7d2dfd5..0000000
--- a/service-api/src/main/java/com/java110/api/listener/inspectionPlan/UpdateInspectionPlanListener.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.java110.api.listener.inspectionPlan;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.inspection.IInspectionBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.utils.util.Assert;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeInspectionPlanConstant;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-
-/**
- * 淇濆瓨宸℃璁″垝渚﹀惉
- * add by wuxw 2019-06-30
- */
-@Java110Listener("updateInspectionPlanListener")
-public class UpdateInspectionPlanListener extends AbstractServiceApiPlusListener {
- @Autowired
- private IInspectionBMO inspectionBMOImpl;
- @Override
- protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-
- Assert.hasKeyAndValue(reqJson, "inspectionPlanId", "inspectionPlanId涓嶈兘涓虹┖");
- Assert.hasKeyAndValue(reqJson, "inspectionPlanName", "蹇呭～锛岃濉啓宸℃璁″垝鍚嶇О");
- Assert.hasKeyAndValue(reqJson, "inspectionRouteId", "蹇呭～锛岃濉啓宸℃璺嚎");
- Assert.hasKeyAndValue(reqJson, "inspectionPlanPeriod", "蹇呭～锛岃閫夋嫨鎵ц鍛ㄦ湡");
- Assert.hasKeyAndValue(reqJson, "startTime", "蹇呭～锛岃閫夋嫨璁″垝寮�濮嬫椂闂�");
- Assert.hasKeyAndValue(reqJson, "endTime", "蹇呭～锛岃閫夋嫨缁撴潫鏃堕棿");
- Assert.hasKeyAndValue(reqJson, "signType", "蹇呭～锛岃濉啓绛惧埌鏂瑰紡");
- Assert.hasKeyAndValue(reqJson, "state", "蹇呭～锛岃濉啓绛惧埌鏂瑰紡");
-
- }
-
- @Override
- protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
- inspectionBMOImpl.updateInspectionPlan(reqJson, context);
- }
-
- @Override
- public String getServiceCode() {
- return ServiceCodeInspectionPlanConstant.UPDATE_INSPECTION_PLAN;
- }
-
- @Override
- public HttpMethod getHttpMethod() {
- return HttpMethod.POST;
- }
-
- @Override
- public int getOrder() {
- return DEFAULT_ORDER;
- }
-
-}
diff --git a/service-api/src/main/java/com/java110/api/listener/inspectionPlan/UpdateInspectionPlanStateListener.java b/service-api/src/main/java/com/java110/api/listener/inspectionPlan/UpdateInspectionPlanStateListener.java
deleted file mode 100755
index 896077e..0000000
--- a/service-api/src/main/java/com/java110/api/listener/inspectionPlan/UpdateInspectionPlanStateListener.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.java110.api.listener.inspectionPlan;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.inspection.IInspectionBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.intf.community.IInspectionPlanInnerServiceSMO;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeInspectionPlanConstant;
-import com.java110.utils.util.Assert;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-
-/**
- * 淇濆瓨璁惧渚﹀惉
- * add by wuxw 2019-06-30
- */
-@Java110Listener("updateInspectionPlanStateListener")
-public class UpdateInspectionPlanStateListener extends AbstractServiceApiPlusListener {
-
- @Autowired
- private IInspectionPlanInnerServiceSMO inspectionPlanInnerServiceSMOImpl;
-
- @Autowired
- private IInspectionBMO inspectionBMOImpl;
-
- @Override
- protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-
- Assert.hasKeyAndValue(reqJson, "inspectionPlanId", "inspectionPlanId涓嶈兘涓虹┖");
- Assert.hasKeyAndValue(reqJson, "communityId", "蹇呭～锛岃濉啓灏忓尯淇℃伅");
- Assert.hasKeyAndValue(reqJson, "state", "蹇呭～锛岃濉啓鐘舵��");
-
- }
-
- @Override
- protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
- inspectionBMOImpl.updateInspectionPlanState(reqJson, context);
- }
-
- @Override
- public String getServiceCode() {
- return ServiceCodeInspectionPlanConstant.UPDATE_INSPECTION_PLAN_STATE;
- }
-
- @Override
- public HttpMethod getHttpMethod() {
- return HttpMethod.POST;
- }
-
- @Override
- public int getOrder() {
- return DEFAULT_ORDER;
- }
-
- public IInspectionPlanInnerServiceSMO getInspectionPlanInnerServiceSMOImpl() {
- return inspectionPlanInnerServiceSMOImpl;
- }
-
- public void setInspectionPlanInnerServiceSMOImpl(IInspectionPlanInnerServiceSMO inspectionPlanInnerServiceSMOImpl) {
- this.inspectionPlanInnerServiceSMOImpl = inspectionPlanInnerServiceSMOImpl;
- }
-}
diff --git a/service-community/src/main/java/com/java110/community/cmd/inspectionPlan/DeleteInspectionPlanCmd.java b/service-community/src/main/java/com/java110/community/cmd/inspectionPlan/DeleteInspectionPlanCmd.java
new file mode 100644
index 0000000..fcd4302
--- /dev/null
+++ b/service-community/src/main/java/com/java110/community/cmd/inspectionPlan/DeleteInspectionPlanCmd.java
@@ -0,0 +1,48 @@
+package com.java110.community.cmd.inspectionPlan;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.inspectionPlan.InspectionTaskDto;
+import com.java110.intf.community.IInspectionPlanV1InnerServiceSMO;
+import com.java110.intf.community.IInspectionTaskInnerServiceSMO;
+import com.java110.po.inspection.InspectionPlanPo;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+@Java110Cmd(serviceCode = "inspectionPlan.deleteInspectionPlan")
+public class DeleteInspectionPlanCmd extends Cmd {
+
+ @Autowired
+ private IInspectionTaskInnerServiceSMO inspectionTaskInnerServiceSMOImpl;
+
+ @Autowired
+ private IInspectionPlanV1InnerServiceSMO inspectionPlanV1InnerServiceSMOImpl;
+
+ @Override
+ public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+
+ Assert.hasKeyAndValue(reqJson, "inspectionPlanId", "宸℃璁″垝鍚嶇О涓嶈兘涓虹┖");
+ InspectionTaskDto inspectionTaskDto = new InspectionTaskDto();
+ inspectionTaskDto.setInspectionPlanId(reqJson.getString("inspectionPlanId"));
+ //鏍规嵁宸℃璁″垝id鏌ヨ宸℃浠诲姟
+ List<InspectionTaskDto> inspectionTaskDtos = inspectionTaskInnerServiceSMOImpl.queryInspectionTasks(inspectionTaskDto);
+ Assert.listIsNull(inspectionTaskDtos, "璇ュ贰妫�璁″垝姝ｅ湪浣跨敤锛屼笉鑳藉垹闄わ紒");
+ }
+
+ @Override
+ public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+ InspectionPlanPo inspectionPlanPo = BeanConvertUtil.covertBean(reqJson, InspectionPlanPo.class);
+ int flag = inspectionPlanV1InnerServiceSMOImpl.deleteInspectionPlan(inspectionPlanPo);
+
+ if (flag < 1) {
+ throw new CmdException("鍒犻櫎宸℃璁″垝澶辫触");
+ }
+ }
+}
diff --git a/service-api/src/main/java/com/java110/api/listener/inspectionPlan/ListInspectionPlansListener.java b/service-community/src/main/java/com/java110/community/cmd/inspectionPlan/ListInspectionPlansCmd.java
old mode 100755
new mode 100644
similarity index 78%
rename from service-api/src/main/java/com/java110/api/listener/inspectionPlan/ListInspectionPlansListener.java
rename to service-community/src/main/java/com/java110/community/cmd/inspectionPlan/ListInspectionPlansCmd.java
index 0b83c54..44ad0c5
--- a/service-api/src/main/java/com/java110/api/listener/inspectionPlan/ListInspectionPlansListener.java
+++ b/service-community/src/main/java/com/java110/community/cmd/inspectionPlan/ListInspectionPlansCmd.java
@@ -1,23 +1,22 @@
-package com.java110.api.listener.inspectionPlan;
+package com.java110.community.cmd.inspectionPlan;
import com.alibaba.fastjson.JSONObject;
-import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.intf.community.IInspectionRouteInnerServiceSMO;
-import com.java110.intf.user.IOrgStaffRelInnerServiceSMO;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.inspectionPlan.InspectionPlanDto;
import com.java110.dto.inspectionPlan.InspectionRouteDto;
import com.java110.dto.org.OrgStaffRelDto;
-import com.java110.utils.constant.ServiceCodeInspectionPlanConstant;
+import com.java110.intf.community.IInspectionPlanInnerServiceSMO;
+import com.java110.intf.community.IInspectionRouteInnerServiceSMO;
+import com.java110.intf.user.IOrgStaffRelInnerServiceSMO;
+import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.intf.community.IInspectionPlanInnerServiceSMO;
-import com.java110.dto.inspectionPlan.InspectionPlanDto;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.vo.api.inspectionPlan.ApiInspectionPlanDataVo;
import com.java110.vo.api.inspectionPlan.ApiInspectionPlanVo;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -25,12 +24,8 @@
import java.util.HashSet;
import java.util.List;
-
-/**
- * 鏌ヨ灏忓尯渚﹀惉绫�
- */
-@Java110Listener("listInspectionPlansListener")
-public class ListInspectionPlansListener extends AbstractServiceApiListener {
+@Java110Cmd(serviceCode = "inspectionPlan.listInspectionPlans")
+public class ListInspectionPlansCmd extends Cmd {
@Autowired
private IInspectionPlanInnerServiceSMO inspectionPlanInnerServiceSMOImpl;
@@ -39,41 +34,14 @@
@Autowired
private IInspectionRouteInnerServiceSMO inspectionRouteInnerServiceSMOImpl;
-
@Override
- public String getServiceCode() {
- return ServiceCodeInspectionPlanConstant.LIST_INSPECTION_PLANS;
- }
-
- @Override
- public HttpMethod getHttpMethod() {
- return HttpMethod.GET;
- }
-
-
- @Override
- public int getOrder() {
- return DEFAULT_ORDER;
- }
-
-
- public IInspectionPlanInnerServiceSMO getInspectionPlanInnerServiceSMOImpl() {
- return inspectionPlanInnerServiceSMOImpl;
- }
-
- public void setInspectionPlanInnerServiceSMOImpl(IInspectionPlanInnerServiceSMO inspectionPlanInnerServiceSMOImpl) {
- this.inspectionPlanInnerServiceSMOImpl = inspectionPlanInnerServiceSMOImpl;
- }
-
- @Override
- protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+ public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
super.validatePageInfo(reqJson);
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈灏忓尯ID");
}
@Override
- protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
+ public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
InspectionPlanDto inspectionPlanDto = BeanConvertUtil.covertBean(reqJson, InspectionPlanDto.class);
int count = inspectionPlanInnerServiceSMOImpl.queryInspectionPlansCount(inspectionPlanDto);
@@ -147,6 +115,5 @@
ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiInspectionPlanVo), HttpStatus.OK);
context.setResponseEntity(responseEntity);
-
}
}
diff --git a/service-community/src/main/java/com/java110/community/cmd/inspectionPlan/SaveInspectionPlanCmd.java b/service-community/src/main/java/com/java110/community/cmd/inspectionPlan/SaveInspectionPlanCmd.java
new file mode 100644
index 0000000..728c121
--- /dev/null
+++ b/service-community/src/main/java/com/java110/community/cmd/inspectionPlan/SaveInspectionPlanCmd.java
@@ -0,0 +1,46 @@
+package com.java110.community.cmd.inspectionPlan;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+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.community.IInspectionPlanV1InnerServiceSMO;
+import com.java110.po.inspection.InspectionPlanPo;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+
+@Java110Cmd(serviceCode = "inspectionPlan.saveInspectionPlan")
+public class SaveInspectionPlanCmd extends Cmd {
+
+ @Autowired
+ private IInspectionPlanV1InnerServiceSMO inspectionPlanV1InnerServiceSMOImpl;
+
+ @Override
+ public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+ //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
+
+ Assert.hasKeyAndValue(reqJson, "inspectionPlanName", "蹇呭～锛岃濉啓宸℃璁″垝鍚嶇О");
+ Assert.hasKeyAndValue(reqJson, "inspectionRouteId", "蹇呭～锛岃濉啓宸℃璺嚎");
+ Assert.hasKeyAndValue(reqJson, "inspectionPlanPeriod", "蹇呭～锛岃閫夋嫨鎵ц鍛ㄦ湡");
+ Assert.hasKeyAndValue(reqJson, "startTime", "蹇呭～锛岃閫夋嫨璁″垝寮�濮嬫椂闂�");
+ Assert.hasKeyAndValue(reqJson, "endTime", "蹇呭～锛岃閫夋嫨缁撴潫鏃堕棿");
+ Assert.hasKeyAndValue(reqJson, "signType", "蹇呭～锛岃濉啓绛惧埌鏂瑰紡");
+ Assert.hasKeyAndValue(reqJson, "state", "蹇呭～锛岃濉啓绛惧埌鏂瑰紡");
+ }
+
+ @Override
+ public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+ JSONObject businessInspectionPlan = new JSONObject();
+ businessInspectionPlan.putAll(reqJson);
+ businessInspectionPlan.put("inspectionPlanId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_inspectionPlanId));
+ InspectionPlanPo inspectionPlanPo = BeanConvertUtil.covertBean(businessInspectionPlan, InspectionPlanPo.class);
+ int flag = inspectionPlanV1InnerServiceSMOImpl.saveInspectionPlan(inspectionPlanPo);
+ if (flag < 1) {
+ throw new CmdException("淇濆瓨宸℃璁″垝澶辫触");
+ }
+ }
+}
diff --git a/service-community/src/main/java/com/java110/community/cmd/inspectionPlan/UpdateInspectionPlanCmd.java b/service-community/src/main/java/com/java110/community/cmd/inspectionPlan/UpdateInspectionPlanCmd.java
new file mode 100644
index 0000000..d25f6d1
--- /dev/null
+++ b/service-community/src/main/java/com/java110/community/cmd/inspectionPlan/UpdateInspectionPlanCmd.java
@@ -0,0 +1,41 @@
+package com.java110.community.cmd.inspectionPlan;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.intf.community.IInspectionPlanV1InnerServiceSMO;
+import com.java110.po.inspection.InspectionPlanPo;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+
+@Java110Cmd(serviceCode = "inspectionPlan.updateInspectionPlan")
+public class UpdateInspectionPlanCmd extends Cmd {
+
+ @Autowired
+ private IInspectionPlanV1InnerServiceSMO inspectionPlanV1InnerServiceSMOImpl;
+
+ @Override
+ public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+ Assert.hasKeyAndValue(reqJson, "inspectionPlanId", "inspectionPlanId涓嶈兘涓虹┖");
+ Assert.hasKeyAndValue(reqJson, "inspectionPlanName", "蹇呭～锛岃濉啓宸℃璁″垝鍚嶇О");
+ Assert.hasKeyAndValue(reqJson, "inspectionRouteId", "蹇呭～锛岃濉啓宸℃璺嚎");
+ Assert.hasKeyAndValue(reqJson, "inspectionPlanPeriod", "蹇呭～锛岃閫夋嫨鎵ц鍛ㄦ湡");
+ Assert.hasKeyAndValue(reqJson, "startTime", "蹇呭～锛岃閫夋嫨璁″垝寮�濮嬫椂闂�");
+ Assert.hasKeyAndValue(reqJson, "endTime", "蹇呭～锛岃閫夋嫨缁撴潫鏃堕棿");
+ Assert.hasKeyAndValue(reqJson, "signType", "蹇呭～锛岃濉啓绛惧埌鏂瑰紡");
+ Assert.hasKeyAndValue(reqJson, "state", "蹇呭～锛岃濉啓绛惧埌鏂瑰紡");
+ }
+
+ @Override
+ public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+ InspectionPlanPo inspectionPlanPo = BeanConvertUtil.covertBean(reqJson, InspectionPlanPo.class);
+ int flag = inspectionPlanV1InnerServiceSMOImpl.updateInspectionPlan(inspectionPlanPo);
+ if (flag < 1) {
+ throw new CmdException("淇敼宸℃璁″垝澶辫触");
+ }
+ }
+}
diff --git a/service-community/src/main/java/com/java110/community/cmd/inspectionPlan/UpdateInspectionPlanStateCmd.java b/service-community/src/main/java/com/java110/community/cmd/inspectionPlan/UpdateInspectionPlanStateCmd.java
new file mode 100644
index 0000000..ff4aa97
--- /dev/null
+++ b/service-community/src/main/java/com/java110/community/cmd/inspectionPlan/UpdateInspectionPlanStateCmd.java
@@ -0,0 +1,54 @@
+package com.java110.community.cmd.inspectionPlan;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.inspectionPlan.InspectionPlanDto;
+import com.java110.intf.community.IInspectionPlanInnerServiceSMO;
+import com.java110.intf.community.IInspectionPlanV1InnerServiceSMO;
+import com.java110.po.inspection.InspectionPlanPo;
+import com.java110.utils.constant.BusinessTypeConstant;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+@Java110Cmd(serviceCode = "inspectionPlan.updateInspectionPlanState")
+public class UpdateInspectionPlanStateCmd extends Cmd {
+
+ @Autowired
+ private IInspectionPlanInnerServiceSMO inspectionPlanInnerServiceSMOImpl;
+
+ @Autowired
+ private IInspectionPlanV1InnerServiceSMO inspectionPlanV1InnerServiceSMOImpl;
+
+ @Override
+ public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+ Assert.hasKeyAndValue(reqJson, "inspectionPlanId", "inspectionPlanId涓嶈兘涓虹┖");
+ Assert.hasKeyAndValue(reqJson, "communityId", "蹇呭～锛岃濉啓灏忓尯淇℃伅");
+ Assert.hasKeyAndValue(reqJson, "state", "蹇呭～锛岃濉啓鐘舵��");
+ }
+
+ @Override
+ public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+
+ InspectionPlanDto inspectionPlanDto = new InspectionPlanDto();
+ inspectionPlanDto.setCommunityId(reqJson.getString("communityId"));
+ inspectionPlanDto.setInspectionPlanId(reqJson.getString("inspectionPlanId"));
+ List<InspectionPlanDto> inspectionPlanDtos = inspectionPlanInnerServiceSMOImpl.queryInspectionPlans(inspectionPlanDto);
+
+ Assert.listOnlyOne(inspectionPlanDtos, "鏍规嵁璁″垝ID鏌ヨ鍒板鏉¤褰曪紝璇锋鏌ユ暟鎹�");
+ JSONObject businessInspectionPlan = new JSONObject();
+ businessInspectionPlan.putAll(BeanConvertUtil.beanCovertMap(inspectionPlanDtos.get(0)));
+ businessInspectionPlan.put("state", reqJson.getString("state"));
+ InspectionPlanPo inspectionPlanPo = BeanConvertUtil.covertBean(businessInspectionPlan, InspectionPlanPo.class);
+ int flag = inspectionPlanV1InnerServiceSMOImpl.updateInspectionPlan(inspectionPlanPo);
+ if (flag < 1) {
+ throw new CmdException("淇敼宸℃璁″垝澶辫触");
+ }
+ }
+}
--
Gitblit v1.8.0