From 6518c722cbd542436787da4f864ef5ce26837d21 Mon Sep 17 00:00:00 2001 From: 刘小明 <liuxm_a@163.com> Date: 星期六, 12 十月 2024 16:06:18 +0800 Subject: [PATCH] 优化配置 --- pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoOth/OthStatisticWorkloadMapper.java | 3 ++- pms-parent/pms-global/src/main/resources/application-global.yml | 4 ++-- pms-parent/pms-global/src/main/resources/mapper/OthStatisticWorkloadMapper.xml | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoOth/OthStatisticWorkloadMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoOth/OthStatisticWorkloadMapper.java index 3e2ddee..6ef592b 100644 --- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoOth/OthStatisticWorkloadMapper.java +++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoOth/OthStatisticWorkloadMapper.java @@ -1,6 +1,7 @@ package com.dy.pmsGlobal.daoOth; import com.dy.pmsGlobal.pojoOth.OthStatisticWorkload; +import org.apache.ibatis.annotations.Param; import java.time.LocalDate; import java.util.Date; @@ -27,5 +28,5 @@ Date selectMaxDate(); - void insertBatch(Date startDt, Date endDt); + void insertBatch(@Param("startDt")Date startDt, @Param("endDt") Date endDt); } diff --git a/pms-parent/pms-global/src/main/resources/application-global.yml b/pms-parent/pms-global/src/main/resources/application-global.yml index 745cfc0..ab631cb 100644 --- a/pms-parent/pms-global/src/main/resources/application-global.yml +++ b/pms-parent/pms-global/src/main/resources/application-global.yml @@ -2,8 +2,8 @@ servlet: multipart: # 鍓嶇涓婁紶鏂囦欢锛岄檺鍒跺崟涓枃浠剁殑澶у皬鍜岄檺鍒舵墍鏈夋枃浠剁殑澶у皬 - max-file-size: 20MB - max-request-size: 25MB + max-file-size: 500MB + max-request-size: 5000MB logging: charset: console: UTF-8 diff --git a/pms-parent/pms-global/src/main/resources/mapper/OthStatisticWorkloadMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/OthStatisticWorkloadMapper.xml index 88aac97..c67ca1f 100644 --- a/pms-parent/pms-global/src/main/resources/mapper/OthStatisticWorkloadMapper.xml +++ b/pms-parent/pms-global/src/main/resources/mapper/OthStatisticWorkloadMapper.xml @@ -70,7 +70,7 @@ ,user_name,type,node_content ,number) WITH total as (select - DISTINCT(t.device_no),t.curr_node,t.node_content,t.number,p.pro_name, p.plan_name,u.id user_id,u.`name` user_name + DISTINCT(t.device_no) device_no,t.curr_node,t.node_content,t.number,p.pro_name, p.plan_name,u.id user_id,u.`name` user_name FROM (select * from sta_device_production_log_past where repair_id IS NULL and out_time BETWEEN #{startDt} AND #{endDt} -- Gitblit v1.8.0