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-sell/src/main/resources/application.yml | 36 ++---------------------------------- 1 files changed, 2 insertions(+), 34 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml index 97fc494..a24b0b5 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml @@ -1,35 +1,3 @@ spring: - profiles: - include: global, database, database-ym, database-pj - -#actutor鐨剋eb绔彛 -management: - server: - port: ${pipIrr.sell.actutorPort} -#web鏈嶅姟绔彛锛�8084 -server: - port: ${pipIrr.sell.webPort} - servlet: - context-path: /sell #web璁块棶涓婁笅鏂囪矾寰� - context-parameters: - #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99 - idSuffix: ${pipIrr.sell.idSuffix} - -#闃块噷鐭俊鏈嶅姟 -aliyun: - sms: - sms-access-key-id: LTAI5tPCmHqfyJ9YnoPorEwt - sms-access-key-secret: sU2CoLdNgcjnf5uPPU2dY7NNGNvOIX - sms-template-code: SMS_460776024 - sms-sign-name: 澶х鑺傛按 - #redis - redis: - host: localhost - #password:鎴戞槸娌¢厤缃瘑鐮佺殑 - port: 6379 - database: 6 #鎿嶄綔鐨勬槸6鍙锋暟鎹簱 - pool: - max-active: 8 #鏈�澶ц繛鎺ユ暟 - max-wait: -1 #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂� -1琛ㄧず鏃犻檺 - max-idle: 4 #杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺� - min-idle: 0 #杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺� \ No newline at end of file + profiles: + include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self -- Gitblit v1.8.0