From 22c5bf8da7b98075ef04f92e7b51003192a71cd6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 21 八月 2023 09:07:45 +0800
Subject: [PATCH] MOM系统-8-21小问题修改
---
inspect-server/src/main/java/com/yuanchu/mom/controller/MeteringPlanController.java | 10 ++++------
inspect-server/src/main/java/com/yuanchu/mom/pojo/MeteringPlan.java | 8 +++++---
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/MeteringPlanController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/MeteringPlanController.java
index bf35b7b..b17c527 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/MeteringPlanController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/MeteringPlanController.java
@@ -1,7 +1,5 @@
package com.yuanchu.mom.controller;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.MeteringPlan;
import com.yuanchu.mom.service.DeviceService;
import com.yuanchu.mom.service.MeteringPlanService;
@@ -17,10 +15,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
-import java.util.Date;
-import java.util.HashMap;
+import javax.validation.Valid;
import java.util.List;
import java.util.Map;
@@ -50,7 +46,9 @@
private Jwt jwt;
@ApiOperation(value = "璁￠噺璁″垝-->鏂板鎸夐挳")
@PostMapping("/add_plan")
- public Result<?> addMeteringPlan(@RequestHeader("token") String token,@Validated @RequestBody MeteringPlan meteringPlan) throws Exception {
+ public Result<?> addMeteringPlan(@RequestHeader("token") String token, @Validated @RequestBody MeteringPlan meteringPlan) throws Exception {
+ MyUtil.PrintLog(meteringPlan.toString());
+
Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
String id = data.get("id").replaceAll("\"", "");
meteringPlan.setFounder(Integer.valueOf(id));
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/MeteringPlan.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/MeteringPlan.java
index eb1bbeb..496f8b6 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/MeteringPlan.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/MeteringPlan.java
@@ -17,6 +17,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
+import javax.validation.constraints.FutureOrPresent;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@@ -42,20 +43,21 @@
@ApiModelProperty(value = "璁″垝缂栧彿", hidden = true)
private String planNumber;
- @NotNull(message = "璇烽�夋嫨鍒涘缓浜猴紒")
@ApiModelProperty(value = "鍒涘缓浜�", hidden = true)
private Integer founder;
+ @FutureOrPresent(message = "璇烽�夋嫨璁″垝鏃ユ湡")
@ApiModelProperty(value = "璁″垝鏃ユ湡寮�濮�", example = "2023-07-02", dataType = "date", required = true)
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate planDateBegin;
+ @FutureOrPresent(message = "璇烽�夋嫨璁″垝鏃ユ湡")
@ApiModelProperty(value = "璁″垝鏃ユ湡缁撴潫", example = "2023-07-02", dataType = "date", required = true)
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate planDateEnd;
- @NotBlank(message = "璇烽�夋嫨鎴栬杈撳叆璁￠噺鍗曚綅锛�")
- @ApiModelProperty(value = "璁￠噺鍗曚綅", example = "涓婃捣璐ㄦ鎵�", required = true)
+ @NotBlank(message = "璇疯緭鍏ヨ鍒掑崟浣嶏紒")
+ @ApiModelProperty(value = "璁″垝鍗曚綅", example = "涓婃捣璐ㄦ鎵�", required = true)
private String planUnit;
@NotNull(message = "璇烽�夋嫨璐熻矗浜猴紒")
--
Gitblit v1.9.3