java110-bean/src/main/java/com/java110/dto/inspection/InspectionPlanDto.java
@@ -40,6 +40,8 @@ private String inspectionPlanId; private String state; private String communityId; private String communityName; private String staffId; private Date createTime; private String statusCd = "0"; @@ -317,4 +319,12 @@ public void setStaffNameLike(String staffNameLike) { this.staffNameLike = staffNameLike; } public String getCommunityName() { return communityName; } public void setCommunityName(String communityName) { this.communityName = communityName; } } service-community/src/main/java/com/java110/community/cmd/inspection/ListAdminInspectionPlanStaffsCmd.java
New file @@ -0,0 +1,61 @@ package com.java110.community.cmd.inspection; 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.inspection.InspectionPlanStaffDto; import com.java110.intf.community.IInspectionPlanStaffInnerServiceSMO; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.api.inspectionPlanStaff.ApiInspectionPlanStaffDataVo; import com.java110.vo.api.inspectionPlanStaff.ApiInspectionPlanStaffVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import java.util.ArrayList; import java.util.List; @Java110Cmd(serviceCode = "inspection.listAdminInspectionPlanStaffs") public class ListAdminInspectionPlanStaffsCmd extends Cmd { @Autowired private IInspectionPlanStaffInnerServiceSMO inspectionPlanStaffInnerServiceSMOImpl; @Override public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException { super.validatePageInfo(reqJson); super.validateAdmin(context); } @Override public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException { InspectionPlanStaffDto inspectionPlanStaffDto = BeanConvertUtil.covertBean(reqJson, InspectionPlanStaffDto.class); int count = inspectionPlanStaffInnerServiceSMOImpl.queryInspectionPlanStaffsCount(inspectionPlanStaffDto); List<ApiInspectionPlanStaffDataVo> inspectionPlanStaffs = null; if (count > 0) { inspectionPlanStaffs = BeanConvertUtil.covertBeanList(inspectionPlanStaffInnerServiceSMOImpl.queryInspectionPlanStaffs(inspectionPlanStaffDto), ApiInspectionPlanStaffDataVo.class); } else { inspectionPlanStaffs = new ArrayList<>(); } ApiInspectionPlanStaffVo apiInspectionPlanStaffVo = new ApiInspectionPlanStaffVo(); apiInspectionPlanStaffVo.setTotal(count); apiInspectionPlanStaffVo.setRecords((int) Math.ceil((double) count / (double) reqJson.getInteger("row"))); apiInspectionPlanStaffVo.setInspectionPlanStaffs(inspectionPlanStaffs); ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiInspectionPlanStaffVo), HttpStatus.OK); context.setResponseEntity(responseEntity); } } service-community/src/main/java/com/java110/community/cmd/inspection/ListInspectionPlanStaffsCmd.java
@@ -29,6 +29,7 @@ @Override public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException { super.validatePageInfo(reqJson); super.validateProperty(context); Assert.hasKeyAndValue(reqJson, "communityId", "小区信息不能为空"); } service-community/src/main/java/com/java110/community/cmd/inspectionPlan/ListAdminInspectionPlansCmd.java
New file @@ -0,0 +1,144 @@ 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.community.CommunityDto; import com.java110.dto.inspection.InspectionPlanDto; import com.java110.dto.inspection.InspectionPlanStaffDto; import com.java110.dto.repair.RepairDto; import com.java110.intf.community.ICommunityV1InnerServiceSMO; import com.java110.intf.community.IInspectionPlanStaffV1InnerServiceSMO; import com.java110.intf.community.IInspectionPlanV1InnerServiceSMO; 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.utils.util.ListUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import java.util.ArrayList; import java.util.List; @Java110Cmd(serviceCode = "inspectionPlan.listAdminInspectionPlans") public class ListAdminInspectionPlansCmd extends Cmd { @Autowired private IInspectionPlanV1InnerServiceSMO inspectionPlanV1InnerServiceSMOImpl; @Autowired private IOrgStaffRelInnerServiceSMO iOrgStaffRelInnerServiceSMO; @Autowired private IInspectionRouteInnerServiceSMO inspectionRouteInnerServiceSMOImpl; @Autowired private IInspectionPlanStaffV1InnerServiceSMO inspectionPlanStaffV1InnerServiceSMOImpl; @Autowired private ICommunityV1InnerServiceSMO communityV1InnerServiceSMOImpl; @Override public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException { super.validatePageInfo(reqJson); super.validateAdmin(context); } @Override public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException { InspectionPlanDto inspectionPlanDto = BeanConvertUtil.covertBean(reqJson, InspectionPlanDto.class); int count = inspectionPlanV1InnerServiceSMOImpl.queryInspectionPlansCount(inspectionPlanDto); List<InspectionPlanDto> inspectionPlans = null; if (count > 0) { inspectionPlans = BeanConvertUtil.covertBeanList(inspectionPlanV1InnerServiceSMOImpl.queryInspectionPlans(inspectionPlanDto), InspectionPlanDto.class); queryStaffs(inspectionPlans); } else { inspectionPlans = new ArrayList<>(); } refreshCommunityName(inspectionPlans); ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, inspectionPlans); ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK); context.setResponseEntity(responseEntity); } private void refreshCommunityName(List<InspectionPlanDto> inspectionPlans) { if(ListUtil.isNull(inspectionPlans)){ return; } List<String> communityIds = new ArrayList<>(); for (InspectionPlanDto inspectionPlanDto : inspectionPlans) { communityIds.add(inspectionPlanDto.getCommunityId()); } if(ListUtil.isNull(communityIds)){ return ; } CommunityDto communityDto = new CommunityDto(); communityDto.setCommunityIds(communityIds.toArray(new String[communityIds.size()])); List<CommunityDto> communityDtos = communityV1InnerServiceSMOImpl.queryCommunitys(communityDto); if(ListUtil.isNull(communityDtos)){ return; } for (InspectionPlanDto inspectionPlanDto : inspectionPlans) { for (CommunityDto tCommunityDto : communityDtos) { if (!inspectionPlanDto.getCommunityId().equals(tCommunityDto.getCommunityId())) { continue; } inspectionPlanDto.setCommunityName(tCommunityDto.getName()); } } } /** * 查询员工 * * @param inspectionPlans */ private void queryStaffs(List<InspectionPlanDto> inspectionPlans) { if (ListUtil.isNull(inspectionPlans)) { return; } List<String> planIds = new ArrayList<>(); for (InspectionPlanDto inspectionPlanDto : inspectionPlans) { planIds.add(inspectionPlanDto.getInspectionPlanId()); } InspectionPlanStaffDto inspectionPlanStaffDto = new InspectionPlanStaffDto(); inspectionPlanStaffDto.setInspectionPlanIds(planIds.toArray(new String[planIds.size()])); inspectionPlanStaffDto.setCommunityId(inspectionPlans.get(0).getCommunityId()); List<InspectionPlanStaffDto> inspectionPlanStaffDtos = inspectionPlanStaffV1InnerServiceSMOImpl.queryInspectionPlanStaffs(inspectionPlanStaffDto); if (ListUtil.isNull(inspectionPlanStaffDtos)) { return; } List<InspectionPlanStaffDto> staffDtos = null; for (InspectionPlanDto inspectionPlanDto : inspectionPlans) { staffDtos = new ArrayList<>(); for (InspectionPlanStaffDto tmpInspectionPlanStaffDto : inspectionPlanStaffDtos) { if (inspectionPlanDto.getInspectionPlanId().equals(tmpInspectionPlanStaffDto.getInspectionPlanId())) { staffDtos.add(tmpInspectionPlanStaffDto); } } inspectionPlanDto.setStaffs(staffDtos); } } } service-community/src/main/java/com/java110/community/cmd/inspectionPlan/ListInspectionPlansCmd.java
@@ -47,6 +47,7 @@ public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException { super.validatePageInfo(reqJson); Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含小区ID"); super.validateProperty(context); } @Override service-community/src/main/java/com/java110/community/cmd/inspectionRoute/ListAdminInspectionRoutePointsCmd.java
New file @@ -0,0 +1,190 @@ package com.java110.community.cmd.inspectionRoute; 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.community.CommunityDto; import com.java110.dto.inspection.InspectionRoutePointRelDto; import com.java110.dto.room.RoomDto; import com.java110.dto.unit.FloorAndUnitDto; import com.java110.intf.community.ICommunityInnerServiceSMO; import com.java110.intf.community.IInspectionRoutePointRelInnerServiceSMO; import com.java110.intf.community.IRoomInnerServiceSMO; import com.java110.intf.community.IUnitInnerServiceSMO; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.api.inspectionPoint.ApiInspectionPointDataVo; import com.java110.vo.api.inspectionPoint.ApiInspectionPointVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import java.util.ArrayList; import java.util.List; @Java110Cmd(serviceCode = "inspectionRoute.listAdminInspectionRoutePoints") public class ListAdminInspectionRoutePointsCmd extends Cmd { @Autowired private IInspectionRoutePointRelInnerServiceSMO inspectionRoutePointRelInnerServiceSMOImpl; @Autowired private IRoomInnerServiceSMO roomInnerServiceSMOImpl; @Autowired private ICommunityInnerServiceSMO communityInnerServiceSMOImpl; @Autowired private IUnitInnerServiceSMO unitInnerServiceSMOImpl; @Override public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException { super.validatePageInfo(reqJson); super.validateAdmin(context); } @Override public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException { InspectionRoutePointRelDto inspectionRoutePointRelDto = BeanConvertUtil.covertBean(reqJson, InspectionRoutePointRelDto.class); int count = inspectionRoutePointRelInnerServiceSMOImpl.queryInspectionRoutePointRelsCount(inspectionRoutePointRelDto); List<ApiInspectionPointDataVo> inspectionPoints = null; if (count > 0) { inspectionPoints = BeanConvertUtil.covertBeanList(inspectionRoutePointRelInnerServiceSMOImpl.queryInspectionRoutePointRels(inspectionRoutePointRelDto), ApiInspectionPointDataVo.class); } else { inspectionPoints = new ArrayList<>(); } ApiInspectionPointVo apiInspectionPointVo = new ApiInspectionPointVo(); apiInspectionPointVo.setTotal(count); apiInspectionPointVo.setRecords((int) Math.ceil((double) count / (double) reqJson.getInteger("row"))); apiInspectionPointVo.setInspectionPoints(inspectionPoints); ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiInspectionPointVo), HttpStatus.OK); context.setResponseEntity(responseEntity); } private void refreshMachines(List<ApiInspectionPointDataVo> inspectionPoints) { //批量处理 小区 refreshCommunitys(inspectionPoints); //批量处理单元信息 refreshUnits(inspectionPoints); //批量处理 房屋信息 refreshRooms(inspectionPoints); } /** * 处理小区信息 */ private void refreshCommunitys(List<ApiInspectionPointDataVo> inspectionPoints) { List<String> communityIds = new ArrayList<String>(); List<ApiInspectionPointDataVo> inspectionPointDataVo = new ArrayList<>(); for (ApiInspectionPointDataVo inspectionPoint : inspectionPoints) { if (!"2000".equals(inspectionPoint.getLocationTypeCd()) && !"3000".equals(inspectionPoint.getLocationTypeCd())) { communityIds.add(inspectionPoint.getLocationObjId()); inspectionPointDataVo.add(inspectionPoint); } } if (communityIds.size() < 1) { return; } String[] tmpCommunityIds = communityIds.toArray(new String[communityIds.size()]); CommunityDto communityDto = new CommunityDto(); communityDto.setCommunityIds(tmpCommunityIds); //根据 userId 查询用户信息 List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto); for (ApiInspectionPointDataVo inspectionPoint : inspectionPointDataVo) { for (CommunityDto tmpCommunityDto : communityDtos) { if (inspectionPoint.getLocationObjId().equals(tmpCommunityDto.getCommunityId())) { inspectionPoint.setLocationObjName(tmpCommunityDto.getName() + " " + inspectionPoint.getLocationTypeName()); } } } } /** * 获取批量单元 * * @param inspectionPoints * @return 批量userIds 信息 */ private void refreshUnits(List<ApiInspectionPointDataVo> inspectionPoints) { List<String> unitIds = new ArrayList<String>(); List<ApiInspectionPointDataVo> tmpInspectionPoints = new ArrayList<>(); for (ApiInspectionPointDataVo inspectionPointDataVo : inspectionPoints) { if ("2000".equals(inspectionPointDataVo.getLocationTypeCd())) { unitIds.add(inspectionPointDataVo.getLocationObjId()); tmpInspectionPoints.add(inspectionPointDataVo); } } if (unitIds.size() < 1) { return; } String[] tmpUnitIds = unitIds.toArray(new String[unitIds.size()]); FloorAndUnitDto floorAndUnitDto = new FloorAndUnitDto(); floorAndUnitDto.setUnitIds(tmpUnitIds); //根据 userId 查询用户信息 List<FloorAndUnitDto> unitDtos = unitInnerServiceSMOImpl.getFloorAndUnitInfo(floorAndUnitDto); for (ApiInspectionPointDataVo inspectionPointDataVo : tmpInspectionPoints) { for (FloorAndUnitDto tmpUnitDto : unitDtos) { if (inspectionPointDataVo.getLocationObjId().equals(tmpUnitDto.getUnitId())) { inspectionPointDataVo.setLocationObjName(tmpUnitDto.getFloorNum() + "栋" + tmpUnitDto.getUnitNum() + "单元"); BeanConvertUtil.covertBean(tmpUnitDto, inspectionPointDataVo); } } } } /** * 获取批量单元 */ private void refreshRooms(List<ApiInspectionPointDataVo> inspectionPoints) { List<String> roomIds = new ArrayList<String>(); List<ApiInspectionPointDataVo> tmpInspectionPoint = new ArrayList<>(); for (ApiInspectionPointDataVo inspectionPointDataVo : inspectionPoints) { if ("3000".equals(inspectionPointDataVo.getLocationTypeCd())) { roomIds.add(inspectionPointDataVo.getLocationObjId()); tmpInspectionPoint.add(inspectionPointDataVo); } } if (roomIds.size() < 1) { return; } String[] tmpRoomIds = roomIds.toArray(new String[roomIds.size()]); RoomDto roomDto = new RoomDto(); roomDto.setRoomIds(tmpRoomIds); roomDto.setCommunityId(inspectionPoints.get(0).getCommunityId()); //根据 userId 查询用户信息 List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto); for (ApiInspectionPointDataVo inspectionPointDataVo : tmpInspectionPoint) { for (RoomDto tmpRoomDto : roomDtos) { if (inspectionPointDataVo.getLocationObjId().equals(tmpRoomDto.getRoomId())) { inspectionPointDataVo.setLocationObjName(tmpRoomDto.getFloorNum() + "栋" + tmpRoomDto.getUnitNum() + "单元" + tmpRoomDto.getRoomNum() + "室"); BeanConvertUtil.covertBean(tmpRoomDto, inspectionPoints); } } } } } service-community/src/main/java/com/java110/community/cmd/inspectionRoute/ListAdminInspectionRoutesCmd.java
New file @@ -0,0 +1,58 @@ package com.java110.community.cmd.inspectionRoute; 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.inspection.InspectionRouteDto; import com.java110.intf.community.IInspectionRouteInnerServiceSMO; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.api.inspectionRoute.ApiInspectionRouteDataVo; import com.java110.vo.api.inspectionRoute.ApiInspectionRouteVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import java.util.ArrayList; import java.util.List; @Java110Cmd(serviceCode = "inspectionRoute.listAdminInspectionRoutes") public class ListAdminInspectionRoutesCmd extends Cmd { @Autowired private IInspectionRouteInnerServiceSMO inspectionRouteInnerServiceSMOImpl; @Override public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException { super.validatePageInfo(reqJson); super.validateAdmin(context); } @Override public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException { InspectionRouteDto inspectionRouteDto = BeanConvertUtil.covertBean(reqJson, InspectionRouteDto.class); int count = inspectionRouteInnerServiceSMOImpl.queryInspectionRoutesCount(inspectionRouteDto); List<ApiInspectionRouteDataVo> inspectionRoutes = null; if (count > 0) { inspectionRoutes = BeanConvertUtil.covertBeanList(inspectionRouteInnerServiceSMOImpl.queryInspectionRoutes(inspectionRouteDto), ApiInspectionRouteDataVo.class); } else { inspectionRoutes = new ArrayList<>(); } ApiInspectionRouteVo apiInspectionRouteVo = new ApiInspectionRouteVo(); apiInspectionRouteVo.setTotal(count); apiInspectionRouteVo.setRecords((int) Math.ceil((double) count / (double) reqJson.getInteger("row"))); apiInspectionRouteVo.setInspectionRoutes(inspectionRoutes); ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiInspectionRouteVo), HttpStatus.OK); context.setResponseEntity(responseEntity); } } service-community/src/main/java/com/java110/community/cmd/inspectionRoute/ListInspectionRoutePointsCmd.java
@@ -43,6 +43,7 @@ @Override public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException { super.validatePageInfo(reqJson); super.validateProperty(context); Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空"); } service-community/src/main/java/com/java110/community/cmd/inspectionRoute/ListInspectionRoutesCmd.java
@@ -28,6 +28,7 @@ @Override public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException { super.validatePageInfo(reqJson); super.validateProperty(context); Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空"); }