巡检任务

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

@@ -37,6 +37,7 @@ import lombok.SneakyThrows;
 import org.apache.commons.codec.Charsets;
 import org.energy.modules.inspection.excel.InspectionRouteExcel;
 import org.energy.modules.leger.entity.EquipmentLedger;
+import org.energy.modules.system.entity.Dict;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -220,4 +221,15 @@ public class InspectionRouteController extends DafController {
 		EasyExcel.write(response.getOutputStream(), InspectionRouteExcel.class).sheet("巡检路线").doWrite(list);
 	}
 
+	/**
+	 * 获取路线编号
+	 */
+	@GetMapping("/getRouteList")
+	@ApiOperationSupport(order = 11)
+	@ApiOperation(value = "获取路线编号", notes = "获取路线编号")
+	public R<List<InspectionRoute>> getRouteList() {
+		List<InspectionRoute> routeList = inspectionRouteService.getRouteList();
+		return R.data(routeList);
+	}
+
 }

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

@@ -48,6 +48,7 @@ import com.dayu.daf.core.boot.ctrl.DafController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.net.URLEncoder;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -155,6 +156,19 @@ public class InspectionTasksController extends DafController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入inspectionTasks")
 	public R submit(@Valid @RequestBody InspectionTasks inspectionTasks) {
+		inspectionTasks.setTaskStatus(1L);
+		String date = LocalDate.now().toString().replace("-","");
+		String maxTaskNo = inspectionTasksService.getMaxTaskNo("'%" + date + "%'");
+		int number;
+		if (StringUtil.isNotEmpty(maxTaskNo)){
+			number = Integer.parseInt(maxTaskNo.substring(9));
+			number++;
+		}else{
+			number = 1;
+		}
+		String numFormat = String.format("%04d", number);
+		String taskNo = "R" + date + numFormat;
+		inspectionTasks.setTaskNo(taskNo);
 		return R.status(inspectionTasksService.saveOrUpdate(inspectionTasks));
 	}
 

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

@@ -3,6 +3,9 @@ package org.energy.modules.inspection.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dayu.daf.core.mp.base.BaseEntity;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
@@ -12,7 +15,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 巡检结果实体类
  *
  * @author Daf
- * @since 2024-07-10
+ * @since 2024-07-11
  */
 @Data
 @TableName("i_inspection_result")
@@ -25,8 +28,14 @@ public class InspectionResult extends BaseEntity {
     /**
      * 主键
      */
+	@JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "主键")
     private Long id;
+    /**
+     * 结果编码
+     */
+    @ApiModelProperty(value = "结果编码")
+    private String resultNo;
     /**
      * 巡检任务主键
      */

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

@@ -3,6 +3,9 @@ package org.energy.modules.inspection.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dayu.daf.core.mp.base.BaseEntity;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
@@ -25,6 +28,7 @@ public class InspectionTasks extends BaseEntity {
     /**
      * 主键
      */
+	@JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "主键")
     private Long id;
     /**

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

@@ -10,7 +10,7 @@ import java.util.List;
  * 巡检结果 Mapper 接口
  *
  * @author Daf
- * @since 2024-07-10
+ * @since 2024-07-11
  */
 public interface InspectionResultMapper extends BaseMapper<InspectionResult> {
 

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

@@ -11,6 +11,7 @@
         <result column="update_time" property="updateTime"/>
         <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="execute_start_date" property="executeStartDate"/>
         <result column="happen_reason" property="happenReason"/>

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

@@ -7,6 +7,7 @@ import org.energy.modules.inspection.excel.InspectionRouteExcel;
 import org.energy.modules.inspection.vo.InspectionRouteVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.system.entity.Dict;
 
 import java.util.List;
 
@@ -28,4 +29,9 @@ public interface InspectionRouteMapper extends BaseMapper<InspectionRoute> {
 	List<InspectionRouteVO> selectInspectionRoutePage(IPage page, InspectionRouteVO inspectionRoute);
 
 	List<InspectionRouteExcel> exportData(@Param("ew") Wrapper<InspectionRoute> queryWrapper);
+
+	/**
+	 * 获取路线编号
+	 */
+	List<InspectionRoute> getRouteList();
 }

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

@@ -42,4 +42,8 @@
         FROM i_inspection_route ${ew.customSqlSegment}
     </select>
 
+    <select id="getRouteList" resultMap="inspectionRouteResultMap">
+        select route_no, route_name, type from i_inspection_route where is_deleted = 0
+    </select>
+
 </mapper>

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

@@ -34,4 +34,9 @@ public interface InspectionTasksMapper extends BaseMapper<InspectionTasks> {
 	 */
 	List<InspectionTasksExcel> exportData(@Param("ew") Wrapper<InspectionTasks> queryWrapper);
 
+	/**
+	 * 获取最大任务编号
+	 */
+	String getMaxTaskNO(String date);
+
 }

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

@@ -57,4 +57,9 @@
         FROM i_inspection_tasks ${ew.customSqlSegment}
     </select>
 
+    <select id="getMaxTaskNO" resultType="java.lang.String">
+        SELECT max(task_no)
+        FROM i_inspection_tasks where task_no like ${date}
+    </select>
+
 </mapper>

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

@@ -33,4 +33,9 @@ public interface IInspectionRouteService extends BaseService<InspectionRoute> {
 	 * @return
 	 */
 	List<InspectionRouteExcel> export(Wrapper<InspectionRoute> queryWrapper);
+
+	/**
+	 * 获取路线编号
+	 */
+	List<InspectionRoute> getRouteList();
 }

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

@@ -36,4 +36,11 @@ public interface IInspectionTasksService extends BaseService<InspectionTasks> {
 	 */
 	List<InspectionTasksExcel> export(Wrapper<InspectionTasks> queryWrapper);
 
+	/**
+	 * 获取最大任务编号
+	 *
+	 * @param date
+	 */
+	String getMaxTaskNo(String date);
+
 }

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

@@ -32,4 +32,10 @@ public class InspectionRouteServiceImpl extends BaseServiceImpl<InspectionRouteM
 		return list;
 	}
 
+	@Override
+	public List<InspectionRoute> getRouteList() {
+		List<InspectionRoute> list = baseMapper.getRouteList();
+		return list;
+	}
+
 }

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

@@ -34,4 +34,15 @@ public class InspectionTasksServiceImpl extends BaseServiceImpl<InspectionTasksM
 		return list;
 	}
 
+	/**
+	 * 获取最大任务编号
+	 *
+	 * @param date
+	 */
+	@Override
+	public String getMaxTaskNo(String date){
+		String maxTakNo = baseMapper.getMaxTaskNO(date);
+		return maxTakNo;
+	}
+
 }