From 049defee13085c7eb2f0c704f37a3c728fbfd80d Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Fri, 30 Dec 2022 13:33:23 +0800 Subject: [PATCH 1/4] =?UTF-8?q?ftp=E4=B8=AD=E6=96=87=E4=B9=B1=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/anomaly/service/impl/FileUploadedServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/FileUploadedServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/FileUploadedServiceImpl.java index d571d37d..daf2df21 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/FileUploadedServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/FileUploadedServiceImpl.java @@ -1,5 +1,6 @@ package com.foreverwin.mesnac.anomaly.service.impl; +import cn.hutool.core.util.CharsetUtil; import cn.hutool.extra.ftp.Ftp; import com.foreverwin.mesnac.anomaly.service.FileUploadedService; import com.foreverwin.mesnac.common.util.StringUtil; @@ -193,7 +194,7 @@ public class FileUploadedServiceImpl implements FileUploadedService { //上传附件名称 String fileName = fileItem.getName(); try { - Ftp ftp = new Ftp(host, port,username,password); + Ftp ftp = new Ftp(host, port,username,password, CharsetUtil.CHARSET_GBK); ftp.upload(ftpPath, fileName, fileItem.getInputStream()); ftp.close(); } catch (IOException e) { From 656e443199fc27869673cb28df6c9b1a9bedb435 Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Fri, 30 Dec 2022 13:51:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=9B=BE=E7=BA=B8?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=85=B3=E9=97=ADsftp=E8=BF=9E=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/common/service/impl/FileServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/FileServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/FileServiceImpl.java index 3d77ed22..ebd607f8 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/FileServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/FileServiceImpl.java @@ -257,10 +257,9 @@ public class FileServiceImpl implements FileService { } } catch (Exception e) { e.printStackTrace(); + } finally { + jSchClient.close(); } -// finally { -// jSchClient.close(); -// } } } From 737c4351cf5879d6925ae8cb4d78ffadc5770414 Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Wed, 4 Jan 2023 14:02:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=9B=9E=E4=BC=A0mes=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=97=B6=E5=AD=98=E5=82=A8=E7=89=A9=E6=96=99?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/anomaly/controller/AbnormalBillController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java index 58bbb7cc..edbee773 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java @@ -459,7 +459,7 @@ public class AbnormalBillController { try{ abnormalBill.setHandle(HandleEnum.ABNORMAL_BILL.getHandle(site,abnormalBill.getAbnormalNo())); - abnormalBill.setItemBo(HandleEnum.ITEM.getHandle(site,abnormalBill.getItemBo(),"A")); + abnormalBill.setItemBo(null); abnormalBillService.programConfirm(abnormalBill,abnormalBillDispose); return new ResultVo(ResultCode.SUCCESS,"BPM方案确认回传成功"); }catch(Exception e){ From 0e1595f70135cab3568795ef8a5860e5c2cbd708 Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Wed, 4 Jan 2023 15:53:41 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=A8=BC=E5=8A=A8?= =?UTF-8?q?=E7=8E=87=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anomaly/controller/ReportController.java | 14 +++++++++++ .../mesnac/anomaly/mapper/ReportMapper.java | 7 ++++++ .../mesnac/anomaly/service/ReportService.java | 7 ++++++ .../service/impl/ReportServiceImpl.java | 13 +++++++++++ .../main/resources/mapper/ReportMapper.xml | 23 +++++++++++++++++++ 5 files changed, 64 insertions(+) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java index 8af5e438..0fb04c97 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java @@ -628,6 +628,20 @@ public class ReportController { } } + /** + * 设备稼动率报表 + * @param + * @return + */ + @GetMapping("/operationRateOfEquipmentReport") + public R operationRateOfEquipmentReport(@RequestParam(required = false) Map paramMap){ + try { + return R.ok(reportService.operationRateOfEquipmentReport(paramMap)); + } catch (Exception e) { + return R.failed(e.getMessage()); + } + } + /** * 工时看板 * @param diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java index fe5edea4..6d4de263 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java @@ -328,4 +328,11 @@ public interface ReportMapper { * @return */ List> inventoryTableSave(Map paramMap); + + /** + * 设备稼动率报表 + * @param paramMap + * @return + */ + List> operationRateOfEquipmentReport(Map paramMap); } diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java index 69e1c893..a20fb615 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java @@ -320,4 +320,11 @@ public interface ReportService { * @return */ List> inventoryTableSave(Map paramMap); + + /** + * 设备稼动率报表 + * @param paramMap + * @return + */ + List> operationRateOfEquipmentReport(Map paramMap); } diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java index 6aa32011..9b143d7a 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java @@ -1786,6 +1786,19 @@ public class ReportServiceImpl implements ReportService { return reportMapper.inventoryTableSave(paramMap); } + /** + * 设备稼动率报表 + * @param paramMap + * @return + */ + @Override + public List> operationRateOfEquipmentReport(Map paramMap) { + String site = CommonMethods.getSite(); + paramMap.put("site", site); + paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage()); + return reportMapper.operationRateOfEquipmentReport(paramMap); + } + /** * 工时统计报表 * @param paramMap diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index 9fbc9610..18bc83c6 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -3307,6 +3307,29 @@ SELECT zab.CREATED_DATE_TIME, + \ No newline at end of file