From a7f2d48e1bb21a47b5a6bbef6eb79d07a6988406 Mon Sep 17 00:00:00 2001 From: lcr <977192391@qq.com> Date: Thu, 25 Jul 2024 14:19:15 +0800 Subject: [PATCH] 123 --- .../src/main/resources/application.yml | 4 ++-- .../business/controller/ApplyController.java | 4 ++-- .../ruoyi/business/service/IApplyService.java | 2 +- .../service/impl/ApplyPlanServiceImpl.java | 13 +++++++++---- .../service/impl/ApplyServiceImpl.java | 19 ++++++++++++------- .../mapper/business/ApplyPlanMapper.xml | 4 +--- .../core/controller/BaseController.java | 3 ++- .../common/utils/file/FileUploadUtils.java | 4 ++-- 8 files changed, 31 insertions(+), 22 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 908e9db..6e78cb6 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -57,9 +57,9 @@ spring: servlet: multipart: # 单个文件大小 - max-file-size: 10MB + max-file-size: 200MB # 设置总上传的文件大小 - max-request-size: 20MB + max-request-size: 200MB # 服务模块 devtools: restart: diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/controller/ApplyController.java b/ruoyi-business/src/main/java/com/ruoyi/business/controller/ApplyController.java index eb1906a..bf9815c 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/controller/ApplyController.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/controller/ApplyController.java @@ -110,7 +110,7 @@ public class ApplyController extends BaseController { planLogList = qw.in(ApplyPlanLog::getPlanId, planIdList).isNotNull(ApplyPlanLog::getUpdateTime).list(); } startPage(); - List list = applyService.list(planList, planLogList, apply); + List list = applyService.list(apply,planList, planLogList ); return getDataTable(list); } @@ -125,7 +125,7 @@ public class ApplyController extends BaseController { List planList = applyPlanService.lambdaQuery().eq(ApplyPlan::getTaskStatus, PlanRunStatus.FINISH.getKey()).list(); // 获取所有计划记录 List planLogList = applyPlanLogService.list(); - List list = applyService.list(planList, planLogList, apply); + List list = applyService.list(apply,planList, planLogList); ExcelUtil util = new ExcelUtil(ListApplyVO.class); util.exportExcel(response, list, "应用信息管理数据"); } diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/service/IApplyService.java b/ruoyi-business/src/main/java/com/ruoyi/business/service/IApplyService.java index 276dcc7..43db47d 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/service/IApplyService.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/service/IApplyService.java @@ -42,7 +42,7 @@ public interface IApplyService extends IService * @param apply 应用信息管理 * @return 应用信息管理集合 */ - List list(List planList, List planLogList, Apply apply); + List list(Apply apply,List planList, List planLogList); /** * 查询所有应用信息列表 diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/ApplyPlanServiceImpl.java b/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/ApplyPlanServiceImpl.java index 62d512b..0d02947 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/ApplyPlanServiceImpl.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/ApplyPlanServiceImpl.java @@ -121,10 +121,15 @@ public class ApplyPlanServiceImpl extends ServiceImpl list(ApplyPlan applyPlan) { return baseMapper.selectApplyPlanList(applyPlan); } diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/ApplyServiceImpl.java b/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/ApplyServiceImpl.java index d85234b..0ab1270 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/ApplyServiceImpl.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/ApplyServiceImpl.java @@ -9,6 +9,9 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.ruoyi.business.domain.*; import com.ruoyi.business.domain.bo.ApplyStartBO; import com.ruoyi.business.domain.bo.JobQueryBO; @@ -21,9 +24,12 @@ import com.ruoyi.business.service.IResourceLibraryService; import com.ruoyi.business.util.YinDaoHttpUtils; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.core.domain.entity.SysDept; +import com.ruoyi.common.core.page.PageDomain; +import com.ruoyi.common.core.page.TableSupport; import com.ruoyi.common.enums.PlanRunStatus; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.bean.BeanUtils; +import com.ruoyi.common.utils.sql.SqlUtil; import com.ruoyi.system.service.ISysDeptService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -152,19 +158,19 @@ public class ApplyServiceImpl extends ServiceImpl implements */ @Override @DataScope(deptAlias = "apply") - public List list(List planList, List planLogList, Apply apply) { + public List list(Apply apply,List planList, List planLogList) { // 按照appId分组 Map> planMap = planList.stream().collect(Collectors.groupingBy(ApplyPlan::getAppId)); // 日志按照app分组 Map> planLogMap = planLogList.stream().collect(Collectors.groupingBy(ApplyPlanLog::getAppId)); List listApplyVOS = baseMapper.selectApplyList(apply); - List newList = listApplyVOS.stream().map(e -> { + listApplyVOS.forEach(e -> { // 根据appId获取执行计划 List applyPlans = planMap.get(e.getAppId()); // 应用没有设置时间 if (null == applyPlans) { - return e; + return; } // 总计节约时间 （分钟） AtomicReference planTime = new AtomicReference<>(BigDecimal.ZERO); @@ -189,9 +195,8 @@ public class ApplyServiceImpl extends ServiceImpl implements } }); e.setTimeSaving(planTime.get() + ""); - return e; - }).collect(Collectors.toList()); - return newList; + }); + return listApplyVOS; } /** @@ -220,7 +225,7 @@ public class ApplyServiceImpl extends ServiceImpl implements e.setManualTime(apply.getManualTime()); if (PlanRunStatus.FINISH.getKey().equals(e.getTaskStatus())) { // 计算节约时间 - long diff = Long.parseLong(e.getManualTime()) - Long.parseLong(Optional.ofNullable(e.getPlanTime()).orElse("0")); + double diff = Double.parseDouble(e.getManualTime()) - Double.parseDouble(Optional.ofNullable(e.getPlanTime()).orElse("0")); e.setTimeSaving(diff + ""); } applyPlanService.updateById(e); diff --git a/ruoyi-business/src/main/resources/mapper/business/ApplyPlanMapper.xml b/ruoyi-business/src/main/resources/mapper/business/ApplyPlanMapper.xml index 509110f..744a301 100644 --- a/ruoyi-business/src/main/resources/mapper/business/ApplyPlanMapper.xml +++ b/ruoyi-business/src/main/resources/mapper/business/ApplyPlanMapper.xml @@ -103,7 +103,7 @@ plan.dept_id, plan.dept_name, plan.enabled, - plan.create_by, + ifnull((select nick_name from sys_user where user_name = plan.create_by),plan.create_by) as create_by, plan.create_time, plan.update_by, plan.update_time, @@ -114,8 +114,6 @@