From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期四, 17 四月 2025 14:22:59 +0800 Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划,是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。 --- pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/LoginVo.java | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/LoginVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/LoginVo.java index 253858b..57ff5e4 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/LoginVo.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/LoginVo.java @@ -21,12 +21,27 @@ @Schema(description = "鎵嬫満鍙�", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "鎵嬫満鍙蜂笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null //@NotNull(message = "鎵嬫満鍙蜂笉鑳戒负绌�") //涓嶈兘涓簄ull浣嗘槸鍙互涓虹┖ - @Length(message = "鎵嬫満鍙峰繀椤粄min}浣�", min = 11, max = 11) + //@Length(message = "鎵嬫満鍙峰繀椤粄min}浣�", min = 11, max = 11) public String phone ; @Schema(description = "瀵嗙爜", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "瀵嗙爜涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null - @Length(message = "瀵嗙爜蹇呴』{min}浣�", min = 6, max = 6) + @Length(message = "瀵嗙爜涓嶅皬浜巤min}浣�", min = 5, max = 30) public String password ; + + @Schema(description = "缁勭粐鍗曚綅", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "缁勭粐鍗曚綅涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null + @Length(message = "缁勭粐鍗曚綅鏍囩蹇呴』澶т簬{min}浣�", min = 2) + public String orgTag ; + + /** + * 鍥惧舰楠岃瘉鐮乼oken锛屽嵆session鐨刱ey + */ + private String token; + + /** + * 鍥惧舰楠岃瘉鐮佺粨鏋� + */ + private String code; } -- Gitblit v1.8.0