Lianxun_Java.git

parent: 73ec3b16 | 补丁 | 提交 | ignore whitespace

wuxw

2025-03-04 6acbc7e0b50fdfb5f32eafedda6b9b8cc0e9ff73

优化完成巡检计划

3个文件已修改

3个文件已添加

	service-community/src/main/java/com/java110/community/cmd/inspection/QueryAdminInspectionTaskDetailCmd.java	56 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service-community/src/main/java/com/java110/community/cmd/inspection/QueryAdminRouteInspectionTaskCmd.java	57 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service-community/src/main/java/com/java110/community/cmd/inspection/QueryInspectionTaskDetailCmd.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service-community/src/main/java/com/java110/community/cmd/inspection/QueryRouteInspectionTaskCmd.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service-community/src/main/java/com/java110/community/cmd/inspectionTaskDetail/ListAdminInspectionTaskDetailsCmd.java	81 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service-community/src/main/java/com/java110/community/cmd/inspectionTaskDetail/ListInspectionTaskDetailsCmd.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 service-community/src/main/java/com/java110/community/cmd/inspection/QueryAdminInspectionTaskDetailCmd.java

New file
@@ -0,0 +1,56 @@
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.InspectionTaskDetailDto;
import com.java110.intf.community.IInspectionTaskDetailV1InnerServiceSMO;
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.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;

/**
 * 查询巡检明细
 */
@Java110Cmd(serviceCode = "inspection.queryAdminInspectionTaskDetail")
public class QueryAdminInspectionTaskDetailCmd extends Cmd {

    @Autowired
    private IInspectionTaskDetailV1InnerServiceSMO inspectionTaskDetailV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        super.validatePageInfo(reqJson);
        super.validateAdmin(context);
        Assert.hasKeyAndValue(reqJson, "taskId", "未包含任务ID");
    }

    @Override
    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        InspectionTaskDetailDto inspectionTaskDetailDto = BeanConvertUtil.covertBean(reqJson, InspectionTaskDetailDto.class);
        int count = inspectionTaskDetailV1InnerServiceSMOImpl.queryInspectionTaskDetailsCount(inspectionTaskDetailDto);
        List<InspectionTaskDetailDto> inspectionTaskDetails = null;
        if (count > 0) {
            inspectionTaskDetails = BeanConvertUtil.covertBeanList(
                    inspectionTaskDetailV1InnerServiceSMOImpl.queryInspectionTaskDetails(inspectionTaskDetailDto),
                    InspectionTaskDetailDto.class);
        } else {
            inspectionTaskDetails = new ArrayList<>();
        }
        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, inspectionTaskDetails);

        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);

        context.setResponseEntity(responseEntity);
    }
}

 service-community/src/main/java/com/java110/community/cmd/inspection/QueryAdminRouteInspectionTaskCmd.java

New file
@@ -0,0 +1,57 @@
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.InspectionTaskDto;
import com.java110.intf.community.IInspectionTaskV1InnerServiceSMO;
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.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;

/**
 * 查询巡检点对应的巡检任务
 */
@Java110Cmd(serviceCode = "inspection.queryAdminRouteInspectionTask")
public class QueryAdminRouteInspectionTaskCmd extends Cmd {

    @Autowired
    private IInspectionTaskV1InnerServiceSMO inspectionTaskV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        super.validatePageInfo(reqJson);
        super.validateAdmin(context);
        Assert.hasKeyAndValue(reqJson, "inspectionRouteId", "未包含巡检点");
    }

    @Override
    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        InspectionTaskDto inspectionTaskDto = BeanConvertUtil.covertBean(reqJson, InspectionTaskDto.class);

        int count = inspectionTaskV1InnerServiceSMOImpl.queryRouteInspectionTasksCount(inspectionTaskDto);

        List<InspectionTaskDto> inspectionTaskDtos = null;

        if (count > 0) {
            inspectionTaskDtos = BeanConvertUtil.covertBeanList(inspectionTaskV1InnerServiceSMOImpl.queryRouteInspectionTasks(inspectionTaskDto), InspectionTaskDto.class);
        } else {
            inspectionTaskDtos = new ArrayList<>();
        }
        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, inspectionTaskDtos);

        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);

        context.setResponseEntity(responseEntity);
    }
}

 service-community/src/main/java/com/java110/community/cmd/inspection/QueryInspectionTaskDetailCmd.java

@@ -34,6 +34,7 @@
    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        super.validatePageInfo(reqJson);
        super.validateProperty(context);
        Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区ID");
        Assert.hasKeyAndValue(reqJson, "taskId", "未包含任务ID");
    }

 service-community/src/main/java/com/java110/community/cmd/inspection/QueryRouteInspectionTaskCmd.java

@@ -31,7 +31,7 @@
    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        super.validatePageInfo(reqJson);

        super.validateProperty(context);
        Assert.hasKeyAndValue(reqJson, "inspectionRouteId", "未包含巡检点");
        Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区");
    }

 service-community/src/main/java/com/java110/community/cmd/inspectionTaskDetail/ListAdminInspectionTaskDetailsCmd.java

New file
@@ -0,0 +1,81 @@
package com.java110.community.cmd.inspectionTaskDetail;

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.file.FileRelDto;
import com.java110.dto.inspection.InspectionTaskDetailDto;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.community.IInspectionTaskDetailInnerServiceSMO;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.MappingConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.vo.api.inspectionTaskDetail.ApiInspectionTaskDetailDataVo;
import com.java110.vo.api.inspectionTaskDetail.ApiInspectionTaskDetailVo;
import com.java110.vo.api.junkRequirement.PhotoVo;
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 = "inspectionTaskDetail.listAdminInspectionTaskDetails")
public class ListAdminInspectionTaskDetailsCmd extends Cmd {

    @Autowired
    private IInspectionTaskDetailInnerServiceSMO inspectionTaskDetailInnerServiceSMOImpl;

    @Autowired
    private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;

    @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 {
        InspectionTaskDetailDto inspectionTaskDetailDto = BeanConvertUtil.covertBean(reqJson, InspectionTaskDetailDto.class);
        int count = inspectionTaskDetailInnerServiceSMOImpl.queryInspectionTaskDetailsCount(inspectionTaskDetailDto);
        List<ApiInspectionTaskDetailDataVo> inspectionTaskDetails = null;
        if (count > 0) {
            inspectionTaskDetails = BeanConvertUtil.covertBeanList(inspectionTaskDetailInnerServiceSMOImpl.queryInspectionTaskDetails(inspectionTaskDetailDto), ApiInspectionTaskDetailDataVo.class);
            refreshPhotos(inspectionTaskDetails);
        } else {
            inspectionTaskDetails = new ArrayList<>();
        }
        ApiInspectionTaskDetailVo apiInspectionTaskDetailVo = new ApiInspectionTaskDetailVo();
        apiInspectionTaskDetailVo.setTotal(count);
        apiInspectionTaskDetailVo.setRecords((int) Math.ceil((double) count / (double) reqJson.getInteger("row")));
        apiInspectionTaskDetailVo.setInspectionTaskDetails(inspectionTaskDetails);
        ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiInspectionTaskDetailVo), HttpStatus.OK);
        context.setResponseEntity(responseEntity);
    }

    private void refreshPhotos(List<ApiInspectionTaskDetailDataVo> inspectionTaskDetails) {
        List<PhotoVo> photoVos = null;
        PhotoVo photoVo = null;
        String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN,"IMG_PATH");
        for (ApiInspectionTaskDetailDataVo inspectionTaskDetail : inspectionTaskDetails) {
            if(!"20200407".equals(inspectionTaskDetail.getState())){
                continue;
            }
            FileRelDto fileRelDto = new FileRelDto();
            fileRelDto.setObjId(inspectionTaskDetail.getTaskDetailId());
            List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
            photoVos = new ArrayList<>();
            for (FileRelDto tmpFileRelDto : fileRelDtos) {
                photoVo = new PhotoVo();
                photoVo.setUrl(tmpFileRelDto.getFileRealName().startsWith("http")?tmpFileRelDto.getFileRealName():imgUrl+tmpFileRelDto.getFileRealName());
                photoVos.add(photoVo);
            }
            inspectionTaskDetail.setPhotos(photoVos);
        }
    }
}

 service-community/src/main/java/com/java110/community/cmd/inspectionTaskDetail/ListInspectionTaskDetailsCmd.java

@@ -36,6 +36,7 @@
    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
        super.validatePageInfo(reqJson);
        super.validateProperty(context);
        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");

    }

New file
			@@ -0,0 +1,56 @@
			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.InspectionTaskDetailDto;
			import com.java110.intf.community.IInspectionTaskDetailV1InnerServiceSMO;
			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.springframework.http.HttpStatus;
			import org.springframework.http.ResponseEntity;

			import java.text.ParseException;
			import java.util.ArrayList;
			import java.util.List;

			/**
			* 查询巡检明细
			*/
			@Java110Cmd(serviceCode = "inspection.queryAdminInspectionTaskDetail")
			public class QueryAdminInspectionTaskDetailCmd extends Cmd {

			@Autowired
			private IInspectionTaskDetailV1InnerServiceSMO inspectionTaskDetailV1InnerServiceSMOImpl;

			@Override
			public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
			super.validatePageInfo(reqJson);
			super.validateAdmin(context);
			Assert.hasKeyAndValue(reqJson, "taskId", "未包含任务ID");
			}

			@Override
			public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
			InspectionTaskDetailDto inspectionTaskDetailDto = BeanConvertUtil.covertBean(reqJson, InspectionTaskDetailDto.class);
			int count = inspectionTaskDetailV1InnerServiceSMOImpl.queryInspectionTaskDetailsCount(inspectionTaskDetailDto);
			List<InspectionTaskDetailDto> inspectionTaskDetails = null;
			if (count > 0) {
			inspectionTaskDetails = BeanConvertUtil.covertBeanList(
			inspectionTaskDetailV1InnerServiceSMOImpl.queryInspectionTaskDetails(inspectionTaskDetailDto),
			InspectionTaskDetailDto.class);
			} else {
			inspectionTaskDetails = new ArrayList<>();
			}
			ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, inspectionTaskDetails);

			ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);

			context.setResponseEntity(responseEntity);
			}
			}

New file
			@@ -0,0 +1,57 @@
			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.InspectionTaskDto;
			import com.java110.intf.community.IInspectionTaskV1InnerServiceSMO;
			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.springframework.http.HttpStatus;
			import org.springframework.http.ResponseEntity;

			import java.text.ParseException;
			import java.util.ArrayList;
			import java.util.List;

			/**
			* 查询巡检点对应的巡检任务
			*/
			@Java110Cmd(serviceCode = "inspection.queryAdminRouteInspectionTask")
			public class QueryAdminRouteInspectionTaskCmd extends Cmd {

			@Autowired
			private IInspectionTaskV1InnerServiceSMO inspectionTaskV1InnerServiceSMOImpl;

			@Override
			public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
			super.validatePageInfo(reqJson);
			super.validateAdmin(context);
			Assert.hasKeyAndValue(reqJson, "inspectionRouteId", "未包含巡检点");
			}

			@Override
			public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
			InspectionTaskDto inspectionTaskDto = BeanConvertUtil.covertBean(reqJson, InspectionTaskDto.class);

			int count = inspectionTaskV1InnerServiceSMOImpl.queryRouteInspectionTasksCount(inspectionTaskDto);

			List<InspectionTaskDto> inspectionTaskDtos = null;

			if (count > 0) {
			inspectionTaskDtos = BeanConvertUtil.covertBeanList(inspectionTaskV1InnerServiceSMOImpl.queryRouteInspectionTasks(inspectionTaskDto), InspectionTaskDto.class);
			} else {
			inspectionTaskDtos = new ArrayList<>();
			}
			ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, inspectionTaskDtos);

			ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);

			context.setResponseEntity(responseEntity);
			}
			}

			@@ -34,6 +34,7 @@
			@Override
			public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
			super.validatePageInfo(reqJson);
			super.validateProperty(context);
			Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区ID");
			Assert.hasKeyAndValue(reqJson, "taskId", "未包含任务ID");
			}

			@@ -31,7 +31,7 @@
			@Override
			public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
			super.validatePageInfo(reqJson);

			super.validateProperty(context);
			Assert.hasKeyAndValue(reqJson, "inspectionRouteId", "未包含巡检点");
			Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区");
			}

New file
			@@ -0,0 +1,81 @@
			package com.java110.community.cmd.inspectionTaskDetail;

			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.file.FileRelDto;
			import com.java110.dto.inspection.InspectionTaskDetailDto;
			import com.java110.intf.common.IFileRelInnerServiceSMO;
			import com.java110.intf.community.IInspectionTaskDetailInnerServiceSMO;
			import com.java110.utils.cache.MappingCache;
			import com.java110.utils.constant.MappingConstant;
			import com.java110.utils.exception.CmdException;
			import com.java110.utils.util.Assert;
			import com.java110.utils.util.BeanConvertUtil;
			import com.java110.vo.api.inspectionTaskDetail.ApiInspectionTaskDetailDataVo;
			import com.java110.vo.api.inspectionTaskDetail.ApiInspectionTaskDetailVo;
			import com.java110.vo.api.junkRequirement.PhotoVo;
			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 = "inspectionTaskDetail.listAdminInspectionTaskDetails")
			public class ListAdminInspectionTaskDetailsCmd extends Cmd {

			@Autowired
			private IInspectionTaskDetailInnerServiceSMO inspectionTaskDetailInnerServiceSMOImpl;

			@Autowired
			private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;

			@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 {
			InspectionTaskDetailDto inspectionTaskDetailDto = BeanConvertUtil.covertBean(reqJson, InspectionTaskDetailDto.class);
			int count = inspectionTaskDetailInnerServiceSMOImpl.queryInspectionTaskDetailsCount(inspectionTaskDetailDto);
			List<ApiInspectionTaskDetailDataVo> inspectionTaskDetails = null;
			if (count > 0) {
			inspectionTaskDetails = BeanConvertUtil.covertBeanList(inspectionTaskDetailInnerServiceSMOImpl.queryInspectionTaskDetails(inspectionTaskDetailDto), ApiInspectionTaskDetailDataVo.class);
			refreshPhotos(inspectionTaskDetails);
			} else {
			inspectionTaskDetails = new ArrayList<>();
			}
			ApiInspectionTaskDetailVo apiInspectionTaskDetailVo = new ApiInspectionTaskDetailVo();
			apiInspectionTaskDetailVo.setTotal(count);
			apiInspectionTaskDetailVo.setRecords((int) Math.ceil((double) count / (double) reqJson.getInteger("row")));
			apiInspectionTaskDetailVo.setInspectionTaskDetails(inspectionTaskDetails);
			ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiInspectionTaskDetailVo), HttpStatus.OK);
			context.setResponseEntity(responseEntity);
			}

			private void refreshPhotos(List<ApiInspectionTaskDetailDataVo> inspectionTaskDetails) {
			List<PhotoVo> photoVos = null;
			PhotoVo photoVo = null;
			String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN,"IMG_PATH");
			for (ApiInspectionTaskDetailDataVo inspectionTaskDetail : inspectionTaskDetails) {
			if(!"20200407".equals(inspectionTaskDetail.getState())){
			continue;
			}
			FileRelDto fileRelDto = new FileRelDto();
			fileRelDto.setObjId(inspectionTaskDetail.getTaskDetailId());
			List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
			photoVos = new ArrayList<>();
			for (FileRelDto tmpFileRelDto : fileRelDtos) {
			photoVo = new PhotoVo();
			photoVo.setUrl(tmpFileRelDto.getFileRealName().startsWith("http")?tmpFileRelDto.getFileRealName():imgUrl+tmpFileRelDto.getFileRealName());
			photoVos.add(photoVo);
			}
			inspectionTaskDetail.setPhotos(photoVos);
			}
			}
			}

			@@ -36,6 +36,7 @@
			@Override
			public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
			super.validatePageInfo(reqJson);
			super.validateProperty(context);
			Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");

			}