From 47040d658be5bb6daa489efc9482eb9dba199480 Mon Sep 17 00:00:00 2001
From: Dayu <1010@qq.com>
Date: Thu, 11 Jul 2024 14:21:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/InspectionRouteController.java      | 12 ++++++++++++
 .../controller/InspectionTasksController.java      | 14 ++++++++++++++
 .../inspection/entity/InspectionResult.java        | 11 ++++++++++-
 .../modules/inspection/entity/InspectionTasks.java |  4 ++++
 .../inspection/mapper/InspectionResultMapper.java  |  2 +-
 .../inspection/mapper/InspectionResultMapper.xml   |  1 +
 .../inspection/mapper/InspectionRouteMapper.java   |  6 ++++++
 .../inspection/mapper/InspectionRouteMapper.xml    |  4 ++++
 .../inspection/mapper/InspectionTasksMapper.java   |  5 +++++
 .../inspection/mapper/InspectionTasksMapper.xml    |  5 +++++
 .../service/IInspectionRouteService.java           |  5 +++++
 .../service/IInspectionTasksService.java           |  7 +++++++
 .../service/impl/InspectionRouteServiceImpl.java   |  6 ++++++
 .../service/impl/InspectionTasksServiceImpl.java   | 11 +++++++++++
 14 files changed, 91 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java b/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java
index cf70f6a..e6cb910 100644
--- a/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java
+++ b/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);
+	}
+
 }
diff --git a/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java b/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java
index b9dbebd..12f5bc8 100644
--- a/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java
+++ b/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));
 	}
 
diff --git a/src/main/java/org/energy/modules/inspection/entity/InspectionResult.java b/src/main/java/org/energy/modules/inspection/entity/InspectionResult.java
index 93b0677..f96cb3d 100644
--- a/src/main/java/org/energy/modules/inspection/entity/InspectionResult.java
+++ b/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;
     /**
      * 巡检任务主键
      */
diff --git a/src/main/java/org/energy/modules/inspection/entity/InspectionTasks.java b/src/main/java/org/energy/modules/inspection/entity/InspectionTasks.java
index c137664..284254c 100644
--- a/src/main/java/org/energy/modules/inspection/entity/InspectionTasks.java
+++ b/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;
     /**
diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionResultMapper.java b/src/main/java/org/energy/modules/inspection/mapper/InspectionResultMapper.java
index b669d19..32128b0 100644
--- a/src/main/java/org/energy/modules/inspection/mapper/InspectionResultMapper.java
+++ b/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> {
 
diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionResultMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionResultMapper.xml
index 2a9bc9c..6d7ecaa 100644
--- a/src/main/java/org/energy/modules/inspection/mapper/InspectionResultMapper.xml
+++ b/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"/>
diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.java b/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.java
index f0fd7f8..b1824ba 100644
--- a/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.java
+++ b/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();
 }
diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml
index 3220385..acd15ae 100644
--- a/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml
+++ b/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>
diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.java b/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.java
index 8095438..a113ec5 100644
--- a/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.java
+++ b/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);
+
 }
diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml
index 8a433b9..1a8c6c3 100644
--- a/src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml
+++ b/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>
diff --git a/src/main/java/org/energy/modules/inspection/service/IInspectionRouteService.java b/src/main/java/org/energy/modules/inspection/service/IInspectionRouteService.java
index ee5bff3..b89db29 100644
--- a/src/main/java/org/energy/modules/inspection/service/IInspectionRouteService.java
+++ b/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();
 }
diff --git a/src/main/java/org/energy/modules/inspection/service/IInspectionTasksService.java b/src/main/java/org/energy/modules/inspection/service/IInspectionTasksService.java
index 912114a..eca4878 100644
--- a/src/main/java/org/energy/modules/inspection/service/IInspectionTasksService.java
+++ b/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);
+
 }
diff --git a/src/main/java/org/energy/modules/inspection/service/impl/InspectionRouteServiceImpl.java b/src/main/java/org/energy/modules/inspection/service/impl/InspectionRouteServiceImpl.java
index 3966456..bfa0292 100644
--- a/src/main/java/org/energy/modules/inspection/service/impl/InspectionRouteServiceImpl.java
+++ b/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;
+	}
+
 }
diff --git a/src/main/java/org/energy/modules/inspection/service/impl/InspectionTasksServiceImpl.java b/src/main/java/org/energy/modules/inspection/service/impl/InspectionTasksServiceImpl.java
index dd60773..2918508 100644
--- a/src/main/java/org/energy/modules/inspection/service/impl/InspectionTasksServiceImpl.java
+++ b/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;
+	}
+
 }