From 3e05f5ddebdbea4d46f61e0f4905762f9903082d Mon Sep 17 00:00:00 2001 From: qianyu <617189624@qq.com> Date: Mon, 22 May 2023 15:05:18 +0800 Subject: [PATCH 1/3] 230508 --- log.path_IS_UNDEFINED/sys-user.log | 7 + .../SysProcessCategoryController.java | 123 ++++++++++++++ .../system/domain/SysProcessCategory.java | 159 ++++++++++++++++++ .../mapper/SysProcessCategoryMapper.java | 61 +++++++ .../service/ISysProcessCategoryService.java | 61 +++++++ .../impl/SysProcessCategoryServiceImpl.java | 94 +++++++++++ .../system/SysProcessCategoryMapper.xml | 87 ++++++++++ .../templates/system/processCategory/add.html | 55 ++++++ .../system/processCategory/edit.html | 56 ++++++ .../processCategory/processCategory.html | 119 +++++++++++++ 10 files changed, 822 insertions(+) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProcessCategoryController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProcessCategory.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProcessCategoryMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProcessCategoryService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProcessCategoryServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/system/SysProcessCategoryMapper.xml create mode 100644 ruoyi-admin/src/main/resources/templates/system/processCategory/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/processCategory/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html diff --git a/log.path_IS_UNDEFINED/sys-user.log b/log.path_IS_UNDEFINED/sys-user.log index 6d837b28..122a5e27 100644 --- a/log.path_IS_UNDEFINED/sys-user.log +++ b/log.path_IS_UNDEFINED/sys-user.log @@ -71,3 +71,10 @@ 05:43:56.129 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== 05:43:56.129 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== 05:44:26.717 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] +15:03:41.889 [Thread-46] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== +15:03:41.889 [Thread-46] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== +15:03:41.890 [Thread-46] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== +15:04:37.822 [Thread-58] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== +15:04:37.823 [Thread-58] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== +15:06:44.047 [Thread-71] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== +15:06:44.048 [Thread-71] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProcessCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProcessCategoryController.java new file mode 100644 index 00000000..edf35557 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProcessCategoryController.java @@ -0,0 +1,123 @@ +package com.ruoyi.system.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.system.domain.SysProcessCategory; +import com.ruoyi.system.service.ISysProcessCategoryService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 制程类别明细Controller + * + * @author ruoyi + * @date 2023-05-22 + */ +@Controller +@RequestMapping("/system/processCategory") +public class SysProcessCategoryController extends BaseController +{ + private String prefix = "system/processCategory"; + + @Autowired + private ISysProcessCategoryService sysProcessCategoryService; + + @RequiresPermissions("system:processCategory:view") + @GetMapping() + public String processCategory() + { + return prefix + "/processCategory"; + } + + /** + * 查询制程类别明细列表 + */ + @RequiresPermissions("system:processCategory:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(SysProcessCategory sysProcessCategory) + { + startPage(); + List list = sysProcessCategoryService.selectSysProcessCategoryList(sysProcessCategory); + return getDataTable(list); + } + + /** + * 导出制程类别明细列表 + */ + @RequiresPermissions("system:processCategory:export") + @Log(title = "制程类别明细", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(SysProcessCategory sysProcessCategory) + { + List list = sysProcessCategoryService.selectSysProcessCategoryList(sysProcessCategory); + ExcelUtil util = new ExcelUtil(SysProcessCategory.class); + return util.exportExcel(list, "制程类别明细数据"); + } + + /** + * 新增制程类别明细 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存制程类别明细 + */ + @RequiresPermissions("system:processCategory:add") + @Log(title = "制程类别明细", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(SysProcessCategory sysProcessCategory) + { + return toAjax(sysProcessCategoryService.insertSysProcessCategory(sysProcessCategory)); + } + + /** + * 修改制程类别明细 + */ + @GetMapping("/edit/{processCategoryId}") + public String edit(@PathVariable("processCategoryId") Long processCategoryId, ModelMap mmap) + { + SysProcessCategory sysProcessCategory = sysProcessCategoryService.selectSysProcessCategoryById(processCategoryId); + mmap.put("sysProcessCategory", sysProcessCategory); + return prefix + "/edit"; + } + + /** + * 修改保存制程类别明细 + */ + @RequiresPermissions("system:processCategory:edit") + @Log(title = "制程类别明细", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(SysProcessCategory sysProcessCategory) + { + return toAjax(sysProcessCategoryService.updateSysProcessCategory(sysProcessCategory)); + } + + /** + * 删除制程类别明细 + */ + @RequiresPermissions("system:processCategory:remove") + @Log(title = "制程类别明细", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(sysProcessCategoryService.deleteSysProcessCategoryByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProcessCategory.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProcessCategory.java new file mode 100644 index 00000000..28e56dd2 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProcessCategory.java @@ -0,0 +1,159 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 制程类别明细对象 sys_process_category + * + * @author ruoyi + * @date 2023-05-22 + */ +public class SysProcessCategory extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 制程类别id */ + private Long processCategoryId; + + /** 制程类别编号 */ + @Excel(name = "制程类别编号") + private String processCategoryCode; + + /** 制程描述 */ + @Excel(name = "制程描述") + private String processDescription; + + /** 工时产量 */ + @Excel(name = "工时产量") + private String workHourOutput; + + /** 标准加工费 */ + @Excel(name = "标准加工费") + private String standardConversionCost; + + /** 财务实际加工费 */ + @Excel(name = "财务实际加工费") + private String actualProcessingCost; + + /** 录入时间 */ + private String firstAddTime; + + /** 修改时间 */ + private String updateInfoTime; + + /** 备用一 */ + private String standbyOne; + + /** 备用二 */ + private String standbyTwo; + + public void setProcessCategoryId(Long processCategoryId) + { + this.processCategoryId = processCategoryId; + } + + public Long getProcessCategoryId() + { + return processCategoryId; + } + public void setProcessCategoryCode(String processCategoryCode) + { + this.processCategoryCode = processCategoryCode; + } + + public String getProcessCategoryCode() + { + return processCategoryCode; + } + public void setProcessDescription(String processDescription) + { + this.processDescription = processDescription; + } + + public String getProcessDescription() + { + return processDescription; + } + public void setWorkHourOutput(String workHourOutput) + { + this.workHourOutput = workHourOutput; + } + + public String getWorkHourOutput() + { + return workHourOutput; + } + public void setStandardConversionCost(String standardConversionCost) + { + this.standardConversionCost = standardConversionCost; + } + + public String getStandardConversionCost() + { + return standardConversionCost; + } + public void setActualProcessingCost(String actualProcessingCost) + { + this.actualProcessingCost = actualProcessingCost; + } + + public String getActualProcessingCost() + { + return actualProcessingCost; + } + public void setFirstAddTime(String firstAddTime) + { + this.firstAddTime = firstAddTime; + } + + public String getFirstAddTime() + { + return firstAddTime; + } + public void setUpdateInfoTime(String updateInfoTime) + { + this.updateInfoTime = updateInfoTime; + } + + public String getUpdateInfoTime() + { + return updateInfoTime; + } + public void setStandbyOne(String standbyOne) + { + this.standbyOne = standbyOne; + } + + public String getStandbyOne() + { + return standbyOne; + } + public void setStandbyTwo(String standbyTwo) + { + this.standbyTwo = standbyTwo; + } + + public String getStandbyTwo() + { + return standbyTwo; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("processCategoryId", getProcessCategoryId()) + .append("processCategoryCode", getProcessCategoryCode()) + .append("processDescription", getProcessDescription()) + .append("workHourOutput", getWorkHourOutput()) + .append("standardConversionCost", getStandardConversionCost()) + .append("actualProcessingCost", getActualProcessingCost()) + .append("firstAddTime", getFirstAddTime()) + .append("updateInfoTime", getUpdateInfoTime()) + .append("standbyOne", getStandbyOne()) + .append("standbyTwo", getStandbyTwo()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProcessCategoryMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProcessCategoryMapper.java new file mode 100644 index 00000000..c7d18fb1 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProcessCategoryMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.SysProcessCategory; + +/** + * 制程类别明细Mapper接口 + * + * @author ruoyi + * @date 2023-05-22 + */ +public interface SysProcessCategoryMapper +{ + /** + * 查询制程类别明细 + * + * @param processCategoryId 制程类别明细ID + * @return 制程类别明细 + */ + public SysProcessCategory selectSysProcessCategoryById(Long processCategoryId); + + /** + * 查询制程类别明细列表 + * + * @param sysProcessCategory 制程类别明细 + * @return 制程类别明细集合 + */ + public List selectSysProcessCategoryList(SysProcessCategory sysProcessCategory); + + /** + * 新增制程类别明细 + * + * @param sysProcessCategory 制程类别明细 + * @return 结果 + */ + public int insertSysProcessCategory(SysProcessCategory sysProcessCategory); + + /** + * 修改制程类别明细 + * + * @param sysProcessCategory 制程类别明细 + * @return 结果 + */ + public int updateSysProcessCategory(SysProcessCategory sysProcessCategory); + + /** + * 删除制程类别明细 + * + * @param processCategoryId 制程类别明细ID + * @return 结果 + */ + public int deleteSysProcessCategoryById(Long processCategoryId); + + /** + * 批量删除制程类别明细 + * + * @param processCategoryIds 需要删除的数据ID + * @return 结果 + */ + public int deleteSysProcessCategoryByIds(String[] processCategoryIds); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProcessCategoryService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProcessCategoryService.java new file mode 100644 index 00000000..c0f8f18c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProcessCategoryService.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.SysProcessCategory; + +/** + * 制程类别明细Service接口 + * + * @author ruoyi + * @date 2023-05-22 + */ +public interface ISysProcessCategoryService +{ + /** + * 查询制程类别明细 + * + * @param processCategoryId 制程类别明细ID + * @return 制程类别明细 + */ + public SysProcessCategory selectSysProcessCategoryById(Long processCategoryId); + + /** + * 查询制程类别明细列表 + * + * @param sysProcessCategory 制程类别明细 + * @return 制程类别明细集合 + */ + public List selectSysProcessCategoryList(SysProcessCategory sysProcessCategory); + + /** + * 新增制程类别明细 + * + * @param sysProcessCategory 制程类别明细 + * @return 结果 + */ + public int insertSysProcessCategory(SysProcessCategory sysProcessCategory); + + /** + * 修改制程类别明细 + * + * @param sysProcessCategory 制程类别明细 + * @return 结果 + */ + public int updateSysProcessCategory(SysProcessCategory sysProcessCategory); + + /** + * 批量删除制程类别明细 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteSysProcessCategoryByIds(String ids); + + /** + * 删除制程类别明细信息 + * + * @param processCategoryId 制程类别明细ID + * @return 结果 + */ + public int deleteSysProcessCategoryById(Long processCategoryId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProcessCategoryServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProcessCategoryServiceImpl.java new file mode 100644 index 00000000..d9e34da4 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProcessCategoryServiceImpl.java @@ -0,0 +1,94 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.SysProcessCategoryMapper; +import com.ruoyi.system.domain.SysProcessCategory; +import com.ruoyi.system.service.ISysProcessCategoryService; +import com.ruoyi.common.core.text.Convert; + +/** + * 制程类别明细Service业务层处理 + * + * @author ruoyi + * @date 2023-05-22 + */ +@Service +public class SysProcessCategoryServiceImpl implements ISysProcessCategoryService +{ + @Autowired + private SysProcessCategoryMapper sysProcessCategoryMapper; + + /** + * 查询制程类别明细 + * + * @param processCategoryId 制程类别明细ID + * @return 制程类别明细 + */ + @Override + public SysProcessCategory selectSysProcessCategoryById(Long processCategoryId) + { + return sysProcessCategoryMapper.selectSysProcessCategoryById(processCategoryId); + } + + /** + * 查询制程类别明细列表 + * + * @param sysProcessCategory 制程类别明细 + * @return 制程类别明细 + */ + @Override + public List selectSysProcessCategoryList(SysProcessCategory sysProcessCategory) + { + return sysProcessCategoryMapper.selectSysProcessCategoryList(sysProcessCategory); + } + + /** + * 新增制程类别明细 + * + * @param sysProcessCategory 制程类别明细 + * @return 结果 + */ + @Override + public int insertSysProcessCategory(SysProcessCategory sysProcessCategory) + { + return sysProcessCategoryMapper.insertSysProcessCategory(sysProcessCategory); + } + + /** + * 修改制程类别明细 + * + * @param sysProcessCategory 制程类别明细 + * @return 结果 + */ + @Override + public int updateSysProcessCategory(SysProcessCategory sysProcessCategory) + { + return sysProcessCategoryMapper.updateSysProcessCategory(sysProcessCategory); + } + + /** + * 删除制程类别明细对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteSysProcessCategoryByIds(String ids) + { + return sysProcessCategoryMapper.deleteSysProcessCategoryByIds(Convert.toStrArray(ids)); + } + + /** + * 删除制程类别明细信息 + * + * @param processCategoryId 制程类别明细ID + * @return 结果 + */ + @Override + public int deleteSysProcessCategoryById(Long processCategoryId) + { + return sysProcessCategoryMapper.deleteSysProcessCategoryById(processCategoryId); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysProcessCategoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysProcessCategoryMapper.xml new file mode 100644 index 00000000..0dbbcd8e --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/system/SysProcessCategoryMapper.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + select process_category_id, process_category_code, process_description, work_hour_output, standard_conversion_cost, actual_processing_cost, first_add_time, update_info_time, standby_one, standby_two from sys_process_category + + + + + + + + insert into sys_process_category + + process_category_code, + process_description, + work_hour_output, + standard_conversion_cost, + actual_processing_cost, + standby_one, + standby_two, + first_add_time, + + + #{processCategoryCode}, + #{processDescription}, + #{workHourOutput}, + #{standardConversionCost}, + #{actualProcessingCost}, + #{standbyOne}, + #{standbyTwo}, + NOW(), + + + + + update sys_process_category + + process_category_code = #{processCategoryCode}, + process_description = #{processDescription}, + work_hour_output = #{workHourOutput}, + standard_conversion_cost = #{standardConversionCost}, + actual_processing_cost = #{actualProcessingCost}, + standby_one = #{standbyOne}, + standby_two = #{standbyTwo}, + update_info_time = CONCAT_WS(',',NOW(),update_info_time), + + where process_category_id = #{processCategoryId} + + + + delete from sys_process_category where process_category_id = #{processCategoryId} + + + + delete from sys_process_category where process_category_id in + + #{processCategoryId} + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/processCategory/add.html b/ruoyi-admin/src/main/resources/templates/system/processCategory/add.html new file mode 100644 index 00000000..edd1fe84 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/processCategory/add.html @@ -0,0 +1,55 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/processCategory/edit.html b/ruoyi-admin/src/main/resources/templates/system/processCategory/edit.html new file mode 100644 index 00000000..27e71cb7 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/processCategory/edit.html @@ -0,0 +1,56 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html b/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html new file mode 100644 index 00000000..9b188a1c --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html @@ -0,0 +1,119 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file From e12f7c5a137358b15b5dedf3b3ffc858bb0e3d50 Mon Sep 17 00:00:00 2001 From: qianyu <617189624@qq.com> Date: Mon, 22 May 2023 16:53:04 +0800 Subject: [PATCH 2/3] 230508 --- log.path_IS_UNDEFINED/sys-user.log | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/log.path_IS_UNDEFINED/sys-user.log b/log.path_IS_UNDEFINED/sys-user.log index 122a5e27..f6341a47 100644 --- a/log.path_IS_UNDEFINED/sys-user.log +++ b/log.path_IS_UNDEFINED/sys-user.log @@ -78,3 +78,17 @@ 15:04:37.823 [Thread-58] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== 15:06:44.047 [Thread-71] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== 15:06:44.048 [Thread-71] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== +15:09:56.249 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== +15:09:56.250 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== +16:22:07.587 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== +16:22:07.588 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== +16:36:44.603 [Thread-44] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== +16:36:44.605 [Thread-44] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== +16:37:42.929 [Thread-57] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== +16:37:42.931 [Thread-57] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== +16:42:28.515 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== +16:42:28.516 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== +16:47:48.237 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] +16:49:13.428 [Thread-54] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== +16:49:13.429 [Thread-54] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== +16:49:13.429 [Thread-54] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== From 7f4f2562b00f1dff2c9b63328b7a715ff4602130 Mon Sep 17 00:00:00 2001 From: qianyu <617189624@qq.com> Date: Thu, 25 May 2023 16:26:43 +0800 Subject: [PATCH 3/3] 230508 --- log.path_IS_UNDEFINED/sys-user.log | 95 +------------------ .../controller/WorkOrderDetailController.java | 2 - .../deliveryGoodsDetail.html | 30 +++--- .../deliveryGoodsNotice.html | 2 + .../manufacture/deliveryGoodsNotice/edit.html | 4 +- .../deliveryGoodsDetail.html | 30 +++--- .../deliveryGoodsNotice.html | 2 + .../manufacture/deliveryGoodsNotice/edit.html | 4 +- 8 files changed, 43 insertions(+), 126 deletions(-) diff --git a/log.path_IS_UNDEFINED/sys-user.log b/log.path_IS_UNDEFINED/sys-user.log index f6341a47..8856af41 100644 --- a/log.path_IS_UNDEFINED/sys-user.log +++ b/log.path_IS_UNDEFINED/sys-user.log @@ -1,94 +1 @@ -02:45:48.343 [Thread-50] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== -02:45:48.345 [Thread-50] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -02:45:48.345 [Thread-50] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -02:46:13.209 [Thread-63] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -02:46:13.210 [Thread-63] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -02:56:50.770 [Thread-76] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -02:56:50.771 [Thread-76] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -02:58:05.003 [Thread-89] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -02:58:05.004 [Thread-89] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -02:59:22.821 [Thread-102] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -02:59:22.822 [Thread-102] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -03:00:33.014 [Thread-115] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -03:00:33.014 [Thread-115] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -03:01:35.920 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] -03:12:25.938 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== -03:12:25.939 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -03:12:25.939 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -03:13:11.692 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] -03:25:43.689 [Thread-52] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== -03:25:43.691 [Thread-52] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -03:25:43.691 [Thread-52] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -03:26:10.292 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] -03:29:00.385 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== -03:29:00.386 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -03:29:00.386 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -03:29:29.460 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] -03:30:50.965 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== -03:30:50.966 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -03:30:50.966 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -03:31:30.040 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -03:31:30.040 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -03:32:01.221 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] -03:38:04.722 [Thread-51] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== -03:38:04.723 [Thread-51] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -03:38:04.723 [Thread-51] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -03:38:24.901 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] -03:38:44.027 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== -03:38:44.027 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -03:38:44.028 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -03:39:14.527 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] -03:40:16.399 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== -03:40:16.399 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -03:40:16.399 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -03:40:43.506 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] -03:46:32.686 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== -03:46:32.687 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -03:46:32.687 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -03:47:14.778 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] -03:53:30.687 [Thread-52] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== -03:53:30.687 [Thread-52] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -03:53:30.687 [Thread-52] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -03:54:04.703 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] -04:04:44.447 [Thread-65] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== -04:04:44.450 [Thread-65] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -04:04:44.450 [Thread-65] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -04:05:02.344 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -04:05:02.345 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -04:05:38.817 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] -04:15:55.337 [Thread-53] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== -04:15:55.338 [Thread-53] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -04:15:55.338 [Thread-53] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -04:17:20.638 [Thread-66] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -04:17:20.638 [Thread-66] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -04:22:55.116 [Thread-79] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -04:22:55.117 [Thread-79] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -04:23:29.151 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== -04:23:29.151 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -04:23:29.152 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -04:24:32.097 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] -05:43:56.126 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== -05:43:56.129 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -05:43:56.129 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -05:44:26.717 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] -15:03:41.889 [Thread-46] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== -15:03:41.889 [Thread-46] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -15:03:41.890 [Thread-46] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -15:04:37.822 [Thread-58] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -15:04:37.823 [Thread-58] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -15:06:44.047 [Thread-71] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -15:06:44.048 [Thread-71] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -15:09:56.249 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -15:09:56.250 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -16:22:07.587 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -16:22:07.588 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -16:36:44.603 [Thread-44] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -16:36:44.605 [Thread-44] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -16:37:42.929 [Thread-57] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -16:37:42.931 [Thread-57] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -16:42:28.515 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -16:42:28.516 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -16:47:48.237 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] -16:49:13.428 [Thread-54] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== -16:49:13.429 [Thread-54] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -16:49:13.429 [Thread-54] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== +09:20:32.487 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/WorkOrderDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/WorkOrderDetailController.java index 37a4769c..85bfbf1b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/WorkOrderDetailController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/WorkOrderDetailController.java @@ -101,9 +101,7 @@ public class WorkOrderDetailController extends BaseController // 反序列化 List workOrderDetailList = JSONObject.parseArray(data, WorkOrderDetail.class); - for (int i=0;i -
+ -
+ -
+ -
+