From 91e0ce07529aa2d32ec4526377b35e91f2588fb3 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Fri, 7 Jun 2024 16:59:20 +0800 Subject: [PATCH] =?UTF-8?q?merge:=E5=86=B2=E7=AA=81=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MdPbPapervehicleServiceImpl.java | 7 +- .../nl/modules/tools/domain/LocalStorage.java | 75 ------------------- .../repository/LocalStorageRepository.java | 31 -------- .../tools/rest/LocalStorageController.java | 2 +- .../tools/service/LocalStorageService.java | 2 +- .../service/impl/LocalStorageServiceImpl.java | 22 +++--- .../service/mapstruct/LocalStorageMapper.java | 2 +- .../service/quartz/utils/QuartzManage.java | 2 +- .../secutiry/impl/OnlineUserService.java | 1 + .../service/tools/dao/ToolLocalStorage.java | 11 +++ .../nl/wms/sch/manage/AutoSaveIvtExcel.java | 12 +-- .../wms/sch/manage/AutoSaveIvtExcelTwo.java | 12 +-- .../nl/wms/sch/manage/AutoSendIvtExcel.java | 23 +++--- .../nl/wms/sch/manage/AutoSendSalesIvt.java | 10 +-- .../service/impl/CheckOutBillServiceImpl.java | 2 +- 15 files changed, 64 insertions(+), 150 deletions(-) delete mode 100644 lms/nladmin-system/src/main/java/org/nl/modules/tools/domain/LocalStorage.java delete mode 100644 lms/nladmin-system/src/main/java/org/nl/modules/tools/repository/LocalStorageRepository.java diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java index a60938b57..bec262a5b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java @@ -16,6 +16,7 @@ import org.nl.modules.common.exception.BadRequestException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.Map; import java.util.Set; @@ -28,7 +29,7 @@ import java.util.Set; @Service public class MdPbPapervehicleServiceImpl extends ServiceImpl implements IMdPbPapervehicleService { - @Autowired + @Resource private MdPbPapervehicleMapper mdPbPapervehicleMapper; @Override @@ -46,7 +47,7 @@ public class MdPbPapervehicleServiceImpl extends ServiceImpl, JpaSpecificationExecutor { - - @Query(value = "select a from LocalStorage a where a.name = ?1") - LocalStorage findByName(String name); -} diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java b/lms/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java index 8a246280d..0a9dc362e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java @@ -21,7 +21,7 @@ //import org.nl.modules.common.exception.BadRequestException; //import org.nl.modules.common.utils.FileUtil; //import org.nl.modules.logging.annotation.Log; -//import org.nl.modules.tools.domain.LocalStorage; +// //import org.nl.modules.tools.service.LocalStorageService; //import org.nl.modules.tools.service.dto.LocalStorageQueryCriteria; //import org.springframework.data.domain.Pageable; diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/LocalStorageService.java b/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/LocalStorageService.java index e66076cb4..88b210af3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/LocalStorageService.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/LocalStorageService.java @@ -16,7 +16,7 @@ //package org.nl.modules.tools.service; // // -//import org.nl.modules.tools.domain.LocalStorage; +// //import org.nl.modules.tools.service.dto.LocalStorageDto; //import org.nl.modules.tools.service.dto.LocalStorageQueryCriteria; //import org.springframework.data.domain.Pageable; diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java index 16350b1a8..a10979465 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java @@ -29,8 +29,8 @@ //import org.nl.modules.common.utils.PageUtil; //import org.nl.modules.common.utils.QueryHelp; //import org.nl.modules.common.utils.ValidationUtil; -//import org.nl.modules.tools.domain.LocalStorage; -//import org.nl.modules.tools.repository.LocalStorageRepository; +// +// //import org.nl.modules.tools.service.LocalStorageService; //import org.nl.modules.tools.service.dto.LocalStorageDto; //import org.nl.modules.tools.service.dto.LocalStorageQueryCriteria; @@ -56,24 +56,24 @@ //@RequiredArgsConstructor //public class LocalStorageServiceImpl implements LocalStorageService { // -// private final LocalStorageRepository localStorageRepository; +// private final IToolLocalStorageService IToolLocalStorageService; // private final LocalStorageMapper localStorageMapper; // private final FileProperties properties; // // @Override // public Object queryAll(LocalStorageQueryCriteria criteria, Pageable pageable) { -// Page page = localStorageRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), pageable); +// Page page = IToolLocalStorageService.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), pageable); // return PageUtil.toPage(page.map(localStorageMapper::toDto)); // } // // @Override // public List queryAll(LocalStorageQueryCriteria criteria) { -// return localStorageMapper.toDto(localStorageRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder))); +// return localStorageMapper.toDto(IToolLocalStorageService.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder))); // } // // @Override // public LocalStorageDto findById(Long id) { -// LocalStorage localStorage = localStorageRepository.findById(id).orElseGet(LocalStorage::new); +// LocalStorage localStorage = IToolLocalStorageService.findById(id).orElseGet(LocalStorage::new); // ValidationUtil.isNull(localStorage.getId(), "LocalStorage", "id", id); // return localStorageMapper.toDto(localStorage); // } @@ -98,7 +98,7 @@ // type, // FileUtil.getSize(multipartFile.getSize()) // ); -// return localStorageRepository.save(localStorage); +// return IToolLocalStorageService.save(localStorage); // } catch (Exception e) { // FileUtil.del(file); // throw e; @@ -108,19 +108,19 @@ // @Override // @Transactional(rollbackFor = Exception.class) // public void update(LocalStorage resources) { -// LocalStorage localStorage = localStorageRepository.findById(resources.getId()).orElseGet(LocalStorage::new); +// LocalStorage localStorage = IToolLocalStorageService.findById(resources.getId()).orElseGet(LocalStorage::new); // ValidationUtil.isNull(localStorage.getId(), "LocalStorage", "id", resources.getId()); // localStorage.copy(resources); -// localStorageRepository.save(localStorage); +// IToolLocalStorageService.save(localStorage); // } // // @Override // @Transactional(rollbackFor = Exception.class) // public void deleteAll(Long[] ids) { // for (Long id : ids) { -// LocalStorage storage = localStorageRepository.findById(id).orElseGet(LocalStorage::new); +// LocalStorage storage = IToolLocalStorageService.findById(id).orElseGet(LocalStorage::new); // FileUtil.del(storage.getPath()); -// localStorageRepository.delete(storage); +// IToolLocalStorageService.delete(storage); // } // } // diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/mapstruct/LocalStorageMapper.java b/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/mapstruct/LocalStorageMapper.java index 95a01f418..feb750c9e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/mapstruct/LocalStorageMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/mapstruct/LocalStorageMapper.java @@ -19,7 +19,7 @@ //import org.mapstruct.Mapper; //import org.mapstruct.ReportingPolicy; //import org.nl.modules.common.base.BaseMapper; -//import org.nl.modules.tools.domain.LocalStorage; +// //import org.nl.modules.tools.service.dto.LocalStorageDto; // ///** diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/utils/QuartzManage.java b/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/utils/QuartzManage.java index 0da1b22f4..7249dd404 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/utils/QuartzManage.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/utils/QuartzManage.java @@ -22,7 +22,7 @@ import static org.quartz.TriggerBuilder.newTrigger; public class QuartzManage { private static final String JOB_NAME = "TASK_"; - @Resource(name = "scheduler") + @Resource(name = "quartzScheduler") private Scheduler scheduler; public void addJob(SysQuartzJob quartzJob) { diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java b/lms/nladmin-system/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java index eab7d4c85..cee757682 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java @@ -39,6 +39,7 @@ import org.nl.system.service.user.ISysUserService; import org.nl.system.service.user.dao.SysUser; import org.nl.system.service.user.dto.OnlineUserDto; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Pageable; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.scheduling.annotation.Async; diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/tools/dao/ToolLocalStorage.java b/lms/nladmin-system/src/main/java/org/nl/system/service/tools/dao/ToolLocalStorage.java index 6b4dc307c..9498bf10b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/tools/dao/ToolLocalStorage.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/tools/dao/ToolLocalStorage.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import java.io.Serializable; @@ -16,6 +17,7 @@ import java.io.Serializable; * @since 2022-12-20 */ @Data +@NoArgsConstructor @EqualsAndHashCode(callSuper = false) @TableName("tool_local_storage") public class ToolLocalStorage implements Serializable { @@ -78,5 +80,14 @@ public class ToolLocalStorage implements Serializable { */ private String update_time; + public ToolLocalStorage(String realName, String name, String suffix, String path, String type, String size) { + this.real_name = realName; + this.name = name; + this.suffix = suffix; + this.path = path; + this.type = type; + this.size = size; + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSaveIvtExcel.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSaveIvtExcel.java index 81b4e0ead..aed3fe96a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSaveIvtExcel.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSaveIvtExcel.java @@ -14,12 +14,14 @@ import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.nl.modules.common.config.FileProperties; import org.nl.modules.common.utils.FileUtil; -import org.nl.modules.tools.domain.LocalStorage; -import org.nl.modules.tools.repository.LocalStorageRepository; + + import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.system.service.param.impl.SysParamServiceImpl; +import org.nl.system.service.tools.IToolLocalStorageService; +import org.nl.system.service.tools.dao.ToolLocalStorage; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; import org.springframework.stereotype.Component; @@ -39,7 +41,7 @@ public class AutoSaveIvtExcel { private final FileProperties properties; - private final LocalStorageRepository localStorageRepository; + private final IToolLocalStorageService iToolLocalStorageService; @SneakyThrows public void run() { @@ -106,14 +108,14 @@ public class AutoSaveIvtExcel { String nowStr = format.format(date) + "-"; String path = properties.getPath().getPath() + type + File.separator + nowStr + "0库存报表.xls"; FileOutputStream fileOut = new FileOutputStream(path); - LocalStorage localStorage = new LocalStorage( + ToolLocalStorage localStorage = new ToolLocalStorage( nowStr + "0库存报表.xls", nowStr + "0库存报表", "xls", path, type, ""); - localStorageRepository.save(localStorage); + iToolLocalStorageService.save(localStorage); workbook.write(fileOut); fileOut.close(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSaveIvtExcelTwo.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSaveIvtExcelTwo.java index 0bf92d7ed..fe59b55e1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSaveIvtExcelTwo.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSaveIvtExcelTwo.java @@ -12,9 +12,11 @@ import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.nl.modules.common.config.FileProperties; import org.nl.modules.common.utils.FileUtil; -import org.nl.modules.tools.domain.LocalStorage; -import org.nl.modules.tools.repository.LocalStorageRepository; + + import org.nl.modules.wql.WQL; +import org.nl.system.service.tools.IToolLocalStorageService; +import org.nl.system.service.tools.dao.ToolLocalStorage; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; import org.springframework.stereotype.Component; @@ -34,7 +36,7 @@ public class AutoSaveIvtExcelTwo { private final FileProperties properties; - private final LocalStorageRepository localStorageRepository; + private final IToolLocalStorageService iToolLocalStorageService; @SneakyThrows public void run() { @@ -101,14 +103,14 @@ public class AutoSaveIvtExcelTwo { String nowStr = format.format(date) + "-"; String path = properties.getPath().getPath() + type + File.separator + nowStr + "8库存报表.xls"; FileOutputStream fileOut = new FileOutputStream(path); - LocalStorage localStorage = new LocalStorage( + ToolLocalStorage localStorage = new ToolLocalStorage( nowStr + "8库存报表.xls", nowStr + "8库存报表", "xls", path, type, ""); - localStorageRepository.save(localStorage); + iToolLocalStorageService.save(localStorage); workbook.write(fileOut); fileOut.close(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendIvtExcel.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendIvtExcel.java index c5b72f57e..29034d559 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendIvtExcel.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendIvtExcel.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -16,12 +17,14 @@ import org.hibernate.criterion.Example; import org.nl.modules.common.config.FileProperties; import org.nl.modules.common.utils.FileUtil; import org.nl.modules.common.utils.ValidationUtil; -import org.nl.modules.tools.domain.LocalStorage; -import org.nl.modules.tools.repository.LocalStorageRepository; + + import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.system.service.param.impl.SysParamServiceImpl; +import org.nl.system.service.tools.IToolLocalStorageService; +import org.nl.system.service.tools.dao.ToolLocalStorage; import org.nl.wms.ext.mes.service.LmsToMesService; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; @@ -44,7 +47,7 @@ public class AutoSendIvtExcel { private final FileProperties properties; - private final LocalStorageRepository localStorageRepository; + private final IToolLocalStorageService iToolLocalStorageService; private final LmsToMesService lmsToMesService; @@ -113,22 +116,22 @@ public class AutoSendIvtExcel { String nowStr = format.format(date); String path = properties.getPath().getPath() + type + File.separator + "当天库存报表.xls"; FileOutputStream fileOut = new FileOutputStream(path); - - LocalStorage localStorage1 = new LocalStorage(); + + ToolLocalStorage localStorage1 = new ToolLocalStorage(); localStorage1.setName("当天库存报表"); - LocalStorage local = localStorageRepository.findByName("当天库存报表"); + ToolLocalStorage local = iToolLocalStorageService.getOne(new QueryWrapper().eq("name","当天库存报表")); if (ObjectUtil.isNotEmpty(local)){ - local.setUpdateTime(DateUtil.date().toTimestamp()); - localStorageRepository.save(local); + local.setUpdate_time(DateUtil.now()); + iToolLocalStorageService.save(local); }else { - LocalStorage localStorage = new LocalStorage( + ToolLocalStorage localStorage = new ToolLocalStorage( "当天库存报表.xls", "当天库存报表", "xls", path, type, ""); - localStorageRepository.save(localStorage); + iToolLocalStorageService.save(localStorage); } workbook.write(fileOut); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendSalesIvt.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendSalesIvt.java index 6e5b0ea98..cef67884b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendSalesIvt.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendSalesIvt.java @@ -21,12 +21,12 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.nl.common.utils.IdUtil; import org.nl.modules.common.config.FileProperties; import org.nl.modules.common.utils.FileUtil; -import org.nl.modules.tools.domain.LocalStorage; -import org.nl.modules.tools.repository.LocalStorageRepository; + import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.system.service.param.impl.SysParamServiceImpl; +import org.nl.system.service.tools.IToolLocalStorageService; import org.nl.wms.createmsg.CreateMsg; import org.nl.wms.ext.mes.service.LmsToMesService; import org.redisson.api.RLock; @@ -50,7 +50,7 @@ public class AutoSendSalesIvt { private final FileProperties properties; - private final LocalStorageRepository localStorageRepository; + private final org.nl.system.service.tools.IToolLocalStorageService IToolLocalStorageService; private final LmsToMesService lmsToMesService; @@ -269,7 +269,7 @@ public class AutoSendSalesIvt { .map(row -> row.getDoubleValue("canuse_qty")) .reduce(Double::sum).orElse(0.000); resultJson.put("day5", NumberUtil.round(qty90, 3)); - + // 合计 double day_sum = NumberUtil.add(qty15, qty15_30, qty31_60, qty61_90, qty90).doubleValue(); resultJson.put("day_sum", NumberUtil.round(day_sum, 3)); @@ -495,7 +495,7 @@ public class AutoSendSalesIvt { path, type, ""); - localStorageRepository.save(localStorage);*/ + IToolLocalStorageService.save(localStorage);*/ // 调用接口传送图片名称 JSONObject resultParam = lmsToMesService.sendSalesIvtMsg(fileName); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index cabbfb7e6..d3d4109ab 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -16,10 +16,10 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.common.utils.CodeUtil; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.FileUtil; -import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder;