巡检任务

src/main/java/org/energy/modules/inspection/controller/InspectionResultController.java

@@ -15,6 +15,7 @@
  */
 package org.energy.modules.inspection.controller;
 
+import com.xkcoding.http.util.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -26,6 +27,7 @@ import com.dayu.daf.core.mp.support.Condition;
 import com.dayu.daf.core.mp.support.Query;
 import com.dayu.daf.core.tool.api.R;
 import com.dayu.daf.core.tool.utils.Func;
+import org.energy.modules.inspection.entity.InspectionTasks;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -107,7 +109,18 @@ public class InspectionResultController extends DafController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入inspectionResult")
-	public R submit(@Valid @RequestBody InspectionResult inspectionResult) {
+	public R submit(@Valid @RequestBody InspectionResult inspectionResult, @ApiParam(value = "编号", required = true) @RequestParam String taskNo) {
+		inspectionResult.setTaskNo(taskNo);
+		String maxResultNo = inspectionResultService.getMaxResultNo("'%" + taskNo + "%'");
+		int number;
+		if (StringUtil.isNotEmpty(maxResultNo)){
+			number = Integer.parseInt(maxResultNo.substring(13));
+			number++;
+		}else{
+			number = 1;
+		}
+		String numFormat = String.format("%04d", number);
+		String resultNo = taskNo + numFormat;
 		return R.status(inspectionResultService.saveOrUpdate(inspectionResult));
 	}
 

src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java

@@ -247,4 +247,15 @@ public class InspectionRouteController extends DafController {
 		return R.data(routeList);
 	}
 
+	/**
+	 * 获取路线编号
+	 */
+	@GetMapping("/getDetailList")
+	@ApiOperationSupport(order = 12)
+	@ApiOperation(value = "获取路线信息", notes = "获取路线信息")
+	public R<InspectionRoute> getDetailList(String routeNo) {
+		InspectionRoute DetailList = inspectionRouteService.getDetailList("'" + routeNo + "'");
+		return R.data(DetailList);
+	}
+
 }

src/main/java/org/energy/modules/inspection/entity/InspectionResult.java

@@ -37,20 +37,15 @@ public class InspectionResult extends BaseEntity {
     @ApiModelProperty(value = "结果编码")
     private String resultNo;
     /**
-     * 巡检任务主键
+     * 任务编码
      */
-    @ApiModelProperty(value = "巡检任务主键")
+    @ApiModelProperty(value = "任务编码")
-    private Long inspectionRaskId;
+    private String taskNo;
     /**
      * 任务执行开始时间
      */
     @ApiModelProperty(value = "任务执行开始时间")
     private String executeStartDate;
-    /**
-     * 发生原因
-     */
-    @ApiModelProperty(value = "发生原因")
-    private String happenReason;
     /**
      * 任务执行结束时间
      */
@@ -61,11 +56,6 @@ public class InspectionResult extends BaseEntity {
      */
     @ApiModelProperty(value = "巡检结果")
     private String inspectiontResult;
-    /**
-     * 处理过程描述
-     */
-    @ApiModelProperty(value = "处理过程描述")
-    private String processDescription;
     /**
      * 巡检报告
      */

src/main/java/org/energy/modules/inspection/entity/InspectionTasks.java

@@ -37,20 +37,20 @@ public class InspectionTasks extends BaseEntity {
     @ApiModelProperty(value = "任务编码")
     private String taskNo;
     /**
-     * 巡检对象主键
+     * 对象编码
      */
-    @ApiModelProperty(value = "巡检对象主键")
+    @ApiModelProperty(value = "对象编码")
-    private Long inspectionObjId;
+    private String objectNo;
     /**
-     * 巡检路线主键
+     * 路线编码
      */
-    @ApiModelProperty(value = "巡检路线主键")
+    @ApiModelProperty(value = "路线编码")
-    private Long inspectionRouteId;
+    private String routeNo;
     /**
-     * 巡检计划主键
+     * 计划编码
      */
-    @ApiModelProperty(value = "巡检计划主键")
+    @ApiModelProperty(value = "计划编码")
-    private Long inspectionPlanId;
+    private String planNo;
     /**
      * 任务名称
      */

src/main/java/org/energy/modules/inspection/mapper/InspectionResultMapper.java

@@ -23,4 +23,9 @@ public interface InspectionResultMapper extends BaseMapper<InspectionResult> {
 	 */
 	List<InspectionResultVO> selectInspectionResultPage(IPage page, InspectionResultVO inspectionResult);
 
+	/**
+	 * 获取最大结果编号
+	 */
+	String getMaxResultNo(String taskNo);
+
 }

src/main/java/org/energy/modules/inspection/mapper/InspectionResultMapper.xml

@@ -12,12 +12,10 @@
         <result column="update_user" property="updateUser"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="result_no" property="resultNo"/>
-        <result column="inspection_rask_id" property="inspectionRaskId"/>
+        <result column="task_no" property="taskNo"/>
         <result column="execute_start_date" property="executeStartDate"/>
-        <result column="happen_reason" property="happenReason"/>
         <result column="execute_end_date" property="executeEndDate"/>
         <result column="inspectiont_result" property="inspectiontResult"/>
-        <result column="process_description" property="processDescription"/>
         <result column="inspection_report" property="inspectionReport"/>
     </resultMap>
 
@@ -26,4 +24,8 @@
         select * from i_inspection_result where is_deleted = 0
     </select>
 
+    <select id="getMaxResultNo" resultMap="inspectionResultResultMap">
+        select max(result_no) from i_inspection_result where result_no like ${taskNo}
+    </select>
+
 </mapper>

src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.java

@@ -39,4 +39,9 @@ public interface InspectionRouteMapper extends BaseMapper<InspectionRoute> {
 	 * 获取最大编号
 	 */
 	String getMaxNo(String date);
+
+	/**
+	 * 获取路线的信息
+	 */
+	InspectionRoute getDetailList(String routeNo);
 }

src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml

@@ -51,4 +51,8 @@
         FROM i_inspection_route where route_no like ${date}
     </select>
 
+    <select id="getDetailList" resultMap="inspectionRouteResultMap">
+        select route_name, type from i_inspection_route where route_no = ${route_no}
+    </select>
+
 </mapper>

src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml

@@ -12,9 +12,9 @@
         <result column="update_user" property="updateUser"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="task_no" property="taskNo"/>
-        <result column="inspection_obj_id" property="inspectionObjId"/>
+        <result column="object_no" property="objectNo"/>
-        <result column="inspection_route_id" property="inspectionRouteId"/>
+        <result column="route_no" property="routeNo"/>
-        <result column="inspection_plan_id" property="inspectionPlanId"/>
+        <result column="plan_no" property="planNo"/>
         <result column="task_name" property="taskName"/>
         <result column="station" property="station"/>
         <result column="responsible_person" property="responsiblePerson"/>

src/main/java/org/energy/modules/inspection/service/IInspectionResultService.java

@@ -22,4 +22,11 @@ public interface IInspectionResultService extends BaseService<InspectionResult>
 	 */
 	IPage<InspectionResultVO> selectInspectionResultPage(IPage<InspectionResultVO> page, InspectionResultVO inspectionResult);
 
+	/**
+	 * 获取最大结果编号
+	 *
+	 * @param taskNo
+	 */
+	String getMaxResultNo(String taskNo);
+
 }

src/main/java/org/energy/modules/inspection/service/IInspectionRouteService.java

@@ -45,4 +45,9 @@ public interface IInspectionRouteService extends BaseService<InspectionRoute> {
 	 * @param date
 	 */
 	String getMaxNo(String date);
+
+	/**
+	 * 获取路线的信息
+	 */
+	InspectionRoute getDetailList(String routeNo);
 }

src/main/java/org/energy/modules/inspection/service/impl/InspectionResultServiceImpl.java

@@ -22,4 +22,15 @@ public class InspectionResultServiceImpl extends BaseServiceImpl<InspectionResul
 		return page.setRecords(baseMapper.selectInspectionResultPage(page, inspectionResult));
 	}
 
+	/**
+	 * 获取最大结果编号
+	 *
+	 * @param taskNo
+	 */
+	@Override
+	public String getMaxResultNo(String taskNo){
+		String maxResultNo = baseMapper.getMaxResultNo(taskNo);
+		return maxResultNo;
+	}
+
 }

src/main/java/org/energy/modules/inspection/service/impl/InspectionRouteServiceImpl.java

@@ -44,4 +44,10 @@ public class InspectionRouteServiceImpl extends BaseServiceImpl<InspectionRouteM
 		return maxNo;
 	}
 
+	@Override
+	public InspectionRoute getDetailList(String routeNo) {
+		InspectionRoute DetailList = baseMapper.getDetailList(routeNo);
+		return DetailList;
+	}
+
 }