service-api/src/main/java/com/java110/api/listener/inspectionPlan/DeleteInspectionPlanListener.java
File was deleted service-api/src/main/java/com/java110/api/listener/inspectionPlan/SaveInspectionPlanListener.java
File was deleted service-api/src/main/java/com/java110/api/listener/inspectionPlan/UpdateInspectionPlanListener.java
File was deleted service-api/src/main/java/com/java110/api/listener/inspectionPlan/UpdateInspectionPlanStateListener.java
File was deleted service-community/src/main/java/com/java110/community/cmd/inspectionPlan/DeleteInspectionPlanCmd.java
New file @@ -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("删除巡检计划失败"); } } } service-community/src/main/java/com/java110/community/cmd/inspectionPlan/ListInspectionPlansCmd.javaold mode 100755 new mode 100644
File was renamed from service-api/src/main/java/com/java110/api/listener/inspectionPlan/ListInspectionPlansListener.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); } } service-community/src/main/java/com/java110/community/cmd/inspectionPlan/SaveInspectionPlanCmd.java
New file @@ -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("保存巡检计划失败"); } } } service-community/src/main/java/com/java110/community/cmd/inspectionPlan/UpdateInspectionPlanCmd.java
New file @@ -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("修改巡检计划失败"); } } } service-community/src/main/java/com/java110/community/cmd/inspectionPlan/UpdateInspectionPlanStateCmd.java
New file @@ -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("修改巡检计划失败"); } } }