From 538841b44f780506fcd18ba082ee34527015aa68 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 2 Feb 2024 10:55:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=89=8B=E6=8C=81?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E9=A1=B9=E4=B8=8D=E8=89=AF=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E9=80=BB=E8=BE=91+=E6=8A=A5=E5=B7=A5=E6=89=93=E5=8D=B0v.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MesReportWorkController.java | 5 ++++ .../java/com/op/mes/domain/MesReportWork.java | 29 +++++++++++++++++++ .../op/mes/mapper/MesReportWorkMapper.java | 2 ++ .../op/mes/service/IMesReportWorkService.java | 2 ++ .../impl/MesReportWorkServiceImpl.java | 8 +++-- .../mapper/mes/MesReportWorkMapper.xml | 20 ++++++++++++- .../op/quality/controller/QuaController.java | 4 +-- .../com/op/quality/domain/QcDefectType.java | 9 ++++++ .../mapper/QcCheckUnqualifiedMapper.java | 2 ++ .../service/IQcCheckTaskIncomeService.java | 2 ++ .../impl/QcCheckTaskIncomeServiceImpl.java | 20 +++++++++---- .../impl/QcCheckTaskProduceServiceImpl.java | 13 +++++++++ .../QcCheckTaskWarehousingServiceImpl.java | 11 ++++++- .../quality/QcCheckUnqualifiedMapper.xml | 8 +++++ 14 files changed, 124 insertions(+), 11 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java index 32a2566e..539f3510 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java @@ -411,6 +411,11 @@ public class MesReportWorkController extends BaseController { return rlist; } + /**获取报工打印信息**/ + @PutMapping("/getPutInOrderList") + public AjaxResult getPutInOrderList(@RequestBody MesReportWork mesReportWorks) { + return success(mesReportWorkService.getPutInOrderList(mesReportWorks)); + } public static void main(String args[]){ DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:00:00"); diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java index bc45ed0d..cab779e9 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java @@ -221,6 +221,35 @@ public class MesReportWork extends BaseEntity { private String workCenter; private String shiftId; private String keywords; + private String workshopName; + //凭证 + private String voucher; + //版本 + private String version; + + public String getVoucher() { + return voucher; + } + + public void setVoucher(String voucher) { + this.voucher = voucher; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getWorkshopName() { + return workshopName; + } + + public void setWorkshopName(String workshopName) { + this.workshopName = workshopName; + } public String getKeywords() { return keywords; diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java index 153d45bb..c703d11b 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java @@ -129,4 +129,6 @@ public interface MesReportWorkMapper { List selectMesReportWorkList_S(MesReportWork mesReportWork); int reportSapCancel(MesReportWork mesReportWork); + + List getPutInOrderList(MesReportWork mesReportWorks); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java index 95d9f2cb..f2ae05f3 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java @@ -103,4 +103,6 @@ public interface IMesReportWorkService { List selectMesReportWorkList_S(MesReportWork mesReportWork); int reportSapCancel(MesReportWork mesReportWork); + + List getPutInOrderList(MesReportWork mesReportWorks); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java index d0cf34fc..645a4a90 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java @@ -184,6 +184,12 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { return m; } + @Override + @DS("#header.poolName") + public List getPutInOrderList(MesReportWork mesReportWorks) { + return mesReportWorkMapper.getPutInOrderList(mesReportWorks); + } + /** * 修改报工报表 * @@ -458,8 +464,6 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { return dtos; } - - public static void main(String[] args) { Calendar calendar = Calendar.getInstance(); Date now = calendar.getTime(); diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index b42d8677..16b9b6ee 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -640,8 +640,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY mrw.create_time DESC + - + insert into mes_report_work id, diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java index 572ff945..fefd949c 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java @@ -240,10 +240,10 @@ public class QuaController extends BaseController { } /**不良类型**/ - @PutMapping("/getDefectListPDA") + @PostMapping("/getDefectListPDA") public List getDefectListPDA(@RequestBody QcDefectType qcDefectType) { DynamicDataSourceContextHolder.push(qcDefectType.getFactoryCode()); - return qcCheckTaskIncomeService.getDefectList(qcDefectType); + return qcCheckTaskIncomeService.getDefectListPDA(qcDefectType); } /**获取生产工单列表**/ diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectType.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectType.java index e2546318..1ac75b82 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectType.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectType.java @@ -73,6 +73,15 @@ public class QcDefectType extends BaseEntity { // 创建日期结束 private String createTimeEnd; + private String checkType; + + public String getCheckType() { + return checkType; + } + + public void setCheckType(String checkType) { + this.checkType = checkType; + } public List getCreateTimeArray() { return createTimeArray; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java index 8e0e0b29..1fb93f47 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java @@ -89,4 +89,6 @@ public interface QcCheckUnqualifiedMapper { int repeatCheckTaskDefect(QcCheckTaskIncome recheck); int repeatCheckTaskDetail(QcCheckTaskIncome recheck); int repeatCheckTaskUser(QcCheckTaskIncome recheck); + + List getDefectListPDA(QcDefectType qcDefectType); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java index 48a1a7be..f30c09e5 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java @@ -89,4 +89,6 @@ public interface IQcCheckTaskIncomeService { List getProductWorkOrder(QcCheckTaskIncome qcCheckTaskIncome); List getCkeckProjectXJList(QcCheckTaskIncome qcCheckTaskIncome); + + List getDefectListPDA(QcDefectType qcDefectType); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index 9fe4772b..ad81540b 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -170,6 +170,15 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { return 0;//没有找到检测项目 } + /**qc_sample_rule**/ + QcCheckTaskIncome sampQua = new QcCheckTaskIncome(); + sampQua.setCheckType(qcCheckTaskIncome.getCheckType()); + sampQua.setQuality(qcCheckTaskIncome.getQuality()); + String sampNum = qcSampleRuleMapper.getSampNum(sampQua); + if(StringUtils.isNotBlank(sampNum)){ + qcCheckTaskIncome.setSampleQuality(new BigDecimal(sampNum)); + } + /**qc_check_task**/ String beLongId = IdUtils.fastSimpleUUID(); qcCheckTaskIncome.setRecordId(beLongId); @@ -238,11 +247,6 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { } } qcCheckTaskIncome.setNoOkQuality(noOkQuality); - /**qc_sample_rule**/ - String sampNum = qcSampleRuleMapper.getSampNum(qcCheckTaskIncome); - if(StringUtils.isNotBlank(sampNum)){ - qcCheckTaskIncome.setSampleQuality(new BigDecimal(sampNum)); - } /**qc_check_task**/ qcCheckTaskIncomeMapper.insertQcCheckTaskIncome(qcCheckTaskIncome); @@ -478,6 +482,12 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { return qcCheckUnqualifiedMapper.getDefectList(qcDefectType); } + @Override + @DS("#header.poolName") + public List getDefectListPDA(QcDefectType qcDefectType) { + return qcCheckUnqualifiedMapper.getDefectListPDA(qcDefectType); + } + @Override @DS("#header.poolName") public List getLLWorkOrder(QcCheckTaskIncome qcCheckTaskIncome) { diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java index b4811f46..cb363579 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java @@ -79,6 +79,9 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService @Autowired private IQcCheckTaskDefectService qcCheckTaskDefectService; + @Autowired + private QcSampleRuleMapper qcSampleRuleMapper; + /** * 查询生产过程检验任务 * @@ -226,6 +229,16 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService } } qcCheckTaskProduce.setNoOkQuality(noOkQuality); + + /**qc_sample_rule**/ + QcCheckTaskIncome sampQua = new QcCheckTaskIncome(); + sampQua.setCheckType(qcCheckTaskProduce.getCheckType()); + sampQua.setQuality(qcCheckTaskProduce.getQuality()); + String sampNum = qcSampleRuleMapper.getSampNum(sampQua); + if(StringUtils.isNotBlank(sampNum)){ + qcCheckTaskProduce.setSampleQuality(new BigDecimal(sampNum)); + } + /**qc_check_task**/ qcCheckTaskProduceMapper.insertQcCheckTaskProduce(qcCheckTaskProduce); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java index d1af1d7a..39756c02 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java @@ -56,6 +56,8 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin private QcCheckTaskIncomeMapper qcCheckTaskIncomeMapper; @Autowired private IQcCheckTaskDefectService qcCheckTaskDefectService; + @Autowired + private QcSampleRuleMapper qcSampleRuleMapper; /** * 查询成品入库检验任务 @@ -208,7 +210,14 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin } } qcCheckTaskWarehousing.setNoOkQuality(noOkQuality); - + /**qc_sample_rule**/ + QcCheckTaskIncome sampQua = new QcCheckTaskIncome(); + sampQua.setCheckType(qcCheckTaskWarehousing.getCheckType()); + sampQua.setQuality(qcCheckTaskWarehousing.getQuality()); + String sampNum = qcSampleRuleMapper.getSampNum(sampQua); + if(StringUtils.isNotBlank(sampNum)){ + qcCheckTaskWarehousing.setSampleQuality(new BigDecimal(sampNum)); + } /**qc_check_task**/ int n = qcCheckTaskWarehousingMapper.insertQcCheckTaskWarehousing(qcCheckTaskWarehousing); logger.info("qc_check_task:"+n+"成功"); diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml index 4d6a4555..49984939 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml @@ -138,6 +138,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and wpp.work_order like concat like ('%',#{orderNo}) order by wpp.create_time desc + insert into qc_check_unqualified From 0df08e1953549cff8a62c1e7d957ad35c132c2a7 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 2 Feb 2024 13:30:47 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=89=93=E5=8D=B0v.20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/mes/MesReportWorkMapper.xml | 6 ++++-- .../op-plan/src/main/java/com/op/plan/domain/ProOrder.java | 2 +- .../java/com/op/sap/service/impl/SapOrderServiceImpl.java | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index 16b9b6ee..3baa8388 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -650,13 +650,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mrw.quantity_feedback quantityFeedback, mrw.unit, pow.factory_code factoryCode, - equ.workshop_name workshopName + equ.workshop_name workshopName, + pow.attr2 version from mes_report_work mrw left join pro_order_workorder pow on mrw.workorder_code = pow.workorder_code left join base_equipment equ on equ.equipment_code = mrw.machine_code + left join pro_order po on po.order_code = pow.order_code where mrw.parent_order = '0' and mrw.workorder_code = #{workorderCode} - and mrw.del_flag = '0' + and mrw.del_flag = '0' and po.del_flag = '0' diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java index 3e6128ca..d9371de2 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java @@ -101,7 +101,7 @@ public class ProOrder extends TreeEntity { /** $column.columnComment */ private String atrr1; - /** $column.columnComment */ + /** 订单版本*/ private String atrr2; /** $column.columnComment */ diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java index 8fbf248b..675b2d44 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java @@ -120,7 +120,8 @@ public class SapOrderServiceImpl implements SapOrderService { String ERNAM = maraTable.getString("ERNAM"); String ERDAT = maraTable.getString("ERDAT"); String STTXT = maraTable.getString("STTXT"); - log.info("订单输出------："+"订单号：" + AUFNR + " - 订单类型：" + AUART + " - 上级订单编号：" + MAUFNR + " - 物料号：" + PLNBEZ + " - 物料描述（短文本）：" + MAKTX + String VERID = maraTable.getString("VERID"); + log.info("订单输出------："+"订单号：" + AUFNR + " - 订单类型：" + AUART + "-生产版本:"+ VERID +" -上级订单编号：" + MAUFNR + " - 物料号：" + PLNBEZ + " - 物料描述（短文本）：" + MAKTX + " - 订单的计划工厂：" + PWERK + " - 订单数量总计：" + GAMNG + " - 基本计量单位：" + GMEIN + " - 任务清单组码：" + PLNNR + " - 基本开始日期：" + GSTRP + " - 基本完成日期：" + GLTRP + " - 输入者：" + ERNAM + " - 创建日期：" + ERDAT + " - 系统状态：" + STTXT); // System.out.println("订单号：" + AUFNR + " - 订单类型：" + AUART + " - 上级订单编号：" + MAUFNR + " - 物料号：" + PLNBEZ + " - 物料描述（短文本）：" + MAKTX @@ -131,6 +132,7 @@ public class SapOrderServiceImpl implements SapOrderService { proOrder.setPlanFactoryCode(PWERK); proOrder.setOrderCode(AUFNR); proOrder.setOrderType(AUART); + proOrder.setAtrr2(VERID); proOrder.setProdCode(PLNBEZ); proOrder.setProdDesc(MAKTX); proOrder.setQuantity(Long.parseLong(GAMNG.substring(0, GAMNG.indexOf(".")))); From 4fa7fb922234988c56c333c6e5cf19b2851dcdd8 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Fri, 2 Feb 2024 16:06:47 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=82=B9/=E5=B7=A1=E6=A3=80=E3=80=81?= =?UTF-8?q?=E4=BF=9D=E5=85=BB=E5=8A=A0=E5=B0=8F=E6=97=B6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DeviceTaskController.java | 2 + .../service/impl/DevicePDAServiceImpl.java | 136 ++++++++++-------- .../service/impl/DeviceTaskServiceImpl.java | 129 +++++++++-------- .../mapper/device/DeviceTaskMapper.xml | 12 +- .../mapper/device/SparePartsLedgerMapper.xml | 1 - 5 files changed, 154 insertions(+), 126 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/DeviceTaskController.java b/op-modules/op-device/src/main/java/com/op/device/controller/DeviceTaskController.java index 31c5595b..4900c1c0 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/DeviceTaskController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/DeviceTaskController.java @@ -31,6 +31,7 @@ public class DeviceTaskController { */ @PostMapping("/createSpotCheckPlanTask") public R createSpotCheckPlanTask() { + System.out.println("点检判断"); AjaxResult result = taskService.createSpotCheckPlanTask(); if(result.isSuccess()){ return R.ok("点检计划生成成功"); @@ -57,6 +58,7 @@ public class DeviceTaskController { */ @PostMapping("/createMaintenancePlanTask") public R createMaintenancePlanTask() { + System.out.println("保养判断"); AjaxResult result = taskService.createMaintenancePlanTask(); if(result.isSuccess()){ return R.ok("保养计划生成成功"); diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java index 78b74187..3b292125 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java @@ -102,33 +102,41 @@ public class DevicePDAServiceImpl implements IDevicePDAService { List handleList = new ArrayList<>(); long nowTime = DateUtils.getNowDate().getTime(); long dayMs = 86400000l; - if (orderList!=null) { + long hourMs = 1000 * 60 * 60; + if (orderList != null) { for (EquOrder order : orderList) { long diff = nowTime - order.getCreateTime().getTime(); - if (order.getPlanLoopType().equals("day")){ - if (diff < (dayMs * Long.valueOf(order.getPlanLoop()))) { - handleList.add(order); - } - } - if (order.getPlanLoopType().equals("week")){ - if (diff < (dayMs*7 * Long.valueOf(order.getPlanLoop()))) { - handleList.add(order); - } - } - if (order.getPlanLoopType().equals("month")){ - if (diff < (dayMs*30 * Long.valueOf(order.getPlanLoop()))) { - handleList.add(order); - } - } - if (order.getPlanLoopType().equals("season")){ - if (diff < (dayMs*30*3 * Long.valueOf(order.getPlanLoop()))) { - handleList.add(order); - } - } - if (order.getPlanLoopType().equals("year")){ - if (diff < (dayMs*365 * Long.valueOf(order.getPlanLoop()))) { - handleList.add(order); - } + switch (order.getPlanLoopType()) { + case "hour": + if (diff < 1000 * 60 * 60 * Long.valueOf(order.getPlanLoop())) { + handleList.add(order); + } + break; + case "day": + if (diff < (dayMs * Long.valueOf(order.getPlanLoop()))) { + handleList.add(order); + } + break; + case "week": + if (diff < (dayMs * 7 * Long.valueOf(order.getPlanLoop()))) { + handleList.add(order); + } + break; + case "month": + if (diff < (dayMs * 30 * Long.valueOf(order.getPlanLoop()))) { + handleList.add(order); + } + break; + case "season": + if (diff < (dayMs * 30 * 3 * Long.valueOf(order.getPlanLoop()))) { + handleList.add(order); + } + break; + case "year": + if (diff < (dayMs * 365 * Long.valueOf(order.getPlanLoop()))) { + handleList.add(order); + } + break; } } } @@ -395,7 +403,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { equOrder.setOrderEnd(DateUtils.getNowDate()); // 用时（分钟） long diff = equOrder.getOrderEnd().getTime() - equOrder.getOrderStart().getTime(); - equOrder.setOrderCostTime(String.valueOf(diff/60000)); + equOrder.setOrderCostTime(String.valueOf(diff / 60000)); // 创建设备对象用于更新设备状态 Equipment equ = new Equipment(); equ.setEquipmentCode(equOrder.getEquipmentCode()); @@ -403,10 +411,10 @@ public class DevicePDAServiceImpl implements IDevicePDAService { // 费用 BigDecimal sparePartsCost = equSpareApplyMapper.getSparePartsCost(equOrder.getOrderCode()); BigDecimal orderCost = equOrder.getOrderCost(); - if (orderCost!=null) { - if (sparePartsCost==null) { + if (orderCost != null) { + if (sparePartsCost == null) { equOrder.setOrderCost(orderCost); - }else { + } else { equOrder.setOrderCost(sparePartsCost.add(orderCost)); } } @@ -664,6 +672,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { /** * 查询设备 + * * @param equipmentCode * @return */ @@ -703,7 +712,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { for (EquOrderStandard standardList : standardLists) { //每个检查标准里面的照片 String imageType = "4"; - List files = equOrderStandardMapper.getBaseFileBatch(standardList.getId(),imageType); + List files = equOrderStandardMapper.getBaseFileBatch(standardList.getId(), imageType); if (!CollectionUtils.isEmpty(files)) { standardList.setPicturePaths(files); } @@ -752,7 +761,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { equRepairWorkOrder.setWorkEndTime(DateUtils.getNowDate()); //2.计算维修工单用时 - if(list.getWorkStartTime()!= null && equRepairWorkOrder.getWorkEndTime()!= null){ + if (list.getWorkStartTime() != null && equRepairWorkOrder.getWorkEndTime() != null) { //2.1计算日期差值 ZoneId zoneId = ZoneId.systemDefault(); @@ -769,18 +778,18 @@ public class DevicePDAServiceImpl implements IDevicePDAService { double hours = tempDateTime.until(end, ChronoUnit.HOURS); // tempDateTime = tempDateTime.plusHours(hours); - double minutes = ((tempDateTime.until(end, ChronoUnit.MINUTES)*1.0)%60)/60; + double minutes = ((tempDateTime.until(end, ChronoUnit.MINUTES) * 1.0) % 60) / 60; // tempDateTime = tempDateTime.plusMinutes(minutes); - double seconds = ((tempDateTime.until(end, ChronoUnit.SECONDS)*1.0)%3600)/3600; + double seconds = ((tempDateTime.until(end, ChronoUnit.SECONDS) * 1.0) % 3600) / 3600; double hour = BigDecimal.valueOf(hours + minutes + seconds).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); //2.2查询完好率报表 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); String time = sdf.format(equRepairWorkOrder.getWorkEndTime()); - EquOperation equOperation = equOperationMapper.selectEquipmentIntegrityRate(time,equRepairWorkOrder.getEquipmentCode()); + EquOperation equOperation = equOperationMapper.selectEquipmentIntegrityRate(time, equRepairWorkOrder.getEquipmentCode()); //2.3修改完好率报表 - if(equOperation != null){ + if (equOperation != null) { if (list.getWorkDownMachine().equals("1")) { DecimalFormat df = new DecimalFormat("#.##"); //实际运行时间 = 实际运行时间 - 故障时间 @@ -791,10 +800,10 @@ public class DevicePDAServiceImpl implements IDevicePDAService { BigDecimal operationTimeBD = new BigDecimal(equOperation.getOperationTime());//运行时间 equOperation.setActualOperationTime(String.valueOf(df.format(result)));//实际运行时间 equOperation.setFaultTime(String.valueOf(faultTime));//故障时间 - equOperation.setFailureRate(faultTimeBD.multiply(new BigDecimal(100)).divide(operationTimeBD,2, RoundingMode.HALF_UP).toString()+"%"); - equOperation.setShutdownTimes(equOperation.getShutdownTimes()+1);//停机次数加1 + equOperation.setFailureRate(faultTimeBD.multiply(new BigDecimal(100)).divide(operationTimeBD, 2, RoundingMode.HALF_UP).toString() + "%"); + equOperation.setShutdownTimes(equOperation.getShutdownTimes() + 1);//停机次数加1 } - equOperation.setFailureTimes(equOperation.getFailureTimes()+1);//故障次数加1 + equOperation.setFailureTimes(equOperation.getFailureTimes() + 1);//故障次数加1 equOperation.setUpdateBy(SecurityUtils.getUsername()); equOperation.setUpdateTime(DateUtils.getNowDate()); equOperationMapper.updateEquOperation(equOperation); @@ -803,7 +812,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { ////3.更新每一项点检/巡检检查项信息 //判空 - if(StringUtils.isNotEmpty(equRepairWorkOrder.getDetailList())){ + if (StringUtils.isNotEmpty(equRepairWorkOrder.getDetailList())) { List checkLists = equRepairWorkOrder.getDetailList(); for (EquOrder checkList : checkLists) { checkList.setUpdateBy(SecurityUtils.getUsername()); @@ -812,7 +821,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { for (EquOrderStandard standardList : standardLists) { //先删除每个检查项标准图片 String imageType = "4"; - equOrderStandardMapper.deleteBaseFileBySourceId(standardList.getId(),imageType); + equOrderStandardMapper.deleteBaseFileBySourceId(standardList.getId(), imageType); //图片批量新增 if (StringUtils.isNotEmpty(standardList.getPicturePath())) { String[] ids = standardList.getPicturePath().split(","); @@ -844,7 +853,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { ////4.新建申领单 //判空 - if(StringUtils.isNotEmpty(equRepairWorkOrder.getApplyList())){ + if (StringUtils.isNotEmpty(equRepairWorkOrder.getApplyList())) { List equSpareApplies = equRepairWorkOrder.getApplyList(); for (EquSpareApply equSpareApply : equSpareApplies) { //生成领料单code @@ -954,26 +963,26 @@ public class DevicePDAServiceImpl implements IDevicePDAService { List firstTree = new ArrayList<>(); // 判空 if (!CollectionUtils.isEmpty(firstLevel)) { - for(EquFaultType equFaultType : firstLevel){ - EquFaultTypeTree equFaultTypeParentTree = new EquFaultTypeTree(); - equFaultTypeParentTree.setValue(equFaultType.getDictValue()); - equFaultTypeParentTree.setLabel(equFaultType.getDictLabel()); - //二级 - List secondLevel = equFaultTypeMapper.selectSecondLevelList(equFaultType.getDictValue()); - // 二级list - List secondTree = new ArrayList<>(); - // 判空 - if (!CollectionUtils.isEmpty(secondLevel)) { - for(EquFaultType second : secondLevel) { - EquFaultTypeTree equFaultTypeChildTree = new EquFaultTypeTree(); - equFaultTypeChildTree.setValue(second.getFaultCode()); - equFaultTypeChildTree.setLabel(second.getFaultSubclass()); - secondTree.add(equFaultTypeChildTree); - } - } - equFaultTypeParentTree.setChildren(secondTree); - firstTree.add(equFaultTypeParentTree); - } + for (EquFaultType equFaultType : firstLevel) { + EquFaultTypeTree equFaultTypeParentTree = new EquFaultTypeTree(); + equFaultTypeParentTree.setValue(equFaultType.getDictValue()); + equFaultTypeParentTree.setLabel(equFaultType.getDictLabel()); + //二级 + List secondLevel = equFaultTypeMapper.selectSecondLevelList(equFaultType.getDictValue()); + // 二级list + List secondTree = new ArrayList<>(); + // 判空 + if (!CollectionUtils.isEmpty(secondLevel)) { + for (EquFaultType second : secondLevel) { + EquFaultTypeTree equFaultTypeChildTree = new EquFaultTypeTree(); + equFaultTypeChildTree.setValue(second.getFaultCode()); + equFaultTypeChildTree.setLabel(second.getFaultSubclass()); + secondTree.add(equFaultTypeChildTree); + } + } + equFaultTypeParentTree.setChildren(secondTree); + firstTree.add(equFaultTypeParentTree); + } } return success(firstTree); } @@ -992,11 +1001,12 @@ public class DevicePDAServiceImpl implements IDevicePDAService { /** * 更新设备运行记录 + * * @param equipmentCode * @param operationType 开机/停机 - * @param type 保养/维修 + * @param type 保养/维修 */ - private void updateOperationRecord(String equipmentCode,String operationType,String type) { + private void updateOperationRecord(String equipmentCode, String operationType, String type) { // 设备最后一条运行记录 EquOperationRecord lastRecord = equOperationRecordMapper.selectLastOperationRecordByEquipmentCode(equipmentCode); // 如果在维修中则不添加运行记录 diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java index dc3652ed..ef618dfa 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java @@ -134,9 +134,9 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { new LinkedBlockingQueue()); try { dateSources.forEach(dateSource -> { - logger.info("++++++++++++" + dateSource.get("poolName") + "++++巡检开始++++++++++"); - Runnable run = () -> createPatrolCheckPlanFunc(dateSource.get("poolName")); - executorService.execute(run); + logger.info("++++++++++++" + dateSource.get("poolName") + "++++巡检开始++++++++++"); + Runnable run = () -> createPatrolCheckPlanFunc(dateSource.get("poolName")); + executorService.execute(run); }); } catch (Exception e) { logger.error("service == dataClearTask == exception", e); @@ -180,6 +180,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { /** * 设备运行记录生成 + * * @return */ @Override @@ -213,6 +214,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { /** * 设备运行记录数据库备份（每年） + * * @return */ @Override @@ -244,19 +246,19 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { return success(); } - public void createSpotCheckPlanFunc(String poolName){ + public void createSpotCheckPlanFunc(String poolName) { DynamicDataSourceContextHolder.push(poolName);// 这是数据源的key /**equ_plan equ_plan_equ**/ EquPlan equPlan = new EquPlan(); equPlan.setPlanType("spotInspection"); List plans = deviceTaskMapper.getPlans(equPlan); - for(EquPlan plan:plans){ + for (EquPlan plan : plans) { EquOrder hasTask = deviceTaskMapper.getNewTaskOrder(plan); - if(hasTask==null || Integer.parseInt(plan.getPlanLoop())<= hasTask.getDays()){ + if (hasTask == null || Integer.parseInt(plan.getPlanLoop()) <= hasTask.getDays() || checkHourTask(hasTask, plan)) { //生成点检计划 int m = this.createOrderPlan(plan); - if(m==0){ + if (m == 0) { error("equ_order相关添加失败"); } } @@ -264,19 +266,19 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { logger.info("++++++++++++" + poolName + "++++点检结束++++++++++"); } - public void createPatrolCheckPlanFunc(String poolName){ + public void createPatrolCheckPlanFunc(String poolName) { DynamicDataSourceContextHolder.push(poolName);// 这是数据源的key /**equ_plan equ_plan_equ**/ EquPlan equPlan = new EquPlan(); equPlan.setPlanType("inspection"); List plans = deviceTaskMapper.getPlans(equPlan); - for(EquPlan plan:plans){ + for (EquPlan plan : plans) { EquOrder hasTask = deviceTaskMapper.getNewTaskOrder(plan); - if(hasTask==null || Integer.parseInt(plan.getPlanLoop())<= hasTask.getDays()){ + if (hasTask == null || Integer.parseInt(plan.getPlanLoop()) <= hasTask.getDays() || checkHourTask(hasTask, plan)) { //生成巡检计划 int m = this.createOrderPlan(plan); - if(m==0){ + if (m == 0) { error("equ_order相关添加失败"); } } @@ -284,29 +286,29 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { logger.info("++++++++++++" + poolName + "++++巡检结束++++++++++"); } - public void createMaintenancePlanFunc(String poolName){ + public void createMaintenancePlanFunc(String poolName) { DynamicDataSourceContextHolder.push(poolName);// 这是数据源的key /**equ_plan equ_plan_equ**/ EquPlan equPlan = new EquPlan(); equPlan.setPlanType("maintenance"); List plans = deviceTaskMapper.getPlans(equPlan); - for(EquPlan plan:plans){ + for (EquPlan plan : plans) { EquOrder hasTask = null; - if("1".equals(plan.getCalculationRule())){ + if ("1".equals(plan.getCalculationRule())) { //根据order_start//1按上次保养时间 hasTask = deviceTaskMapper.getNewTaskOrder0(plan); - }else if("0".equals(plan.getCalculationRule())){ + } else if ("0".equals(plan.getCalculationRule())) { //根据createTime//0按固定周期 hasTask = deviceTaskMapper.getNewTaskOrder(plan); - }else if("2".equals(plan.getCalculationRule())){ + } else if ("2".equals(plan.getCalculationRule())) { //单次生成保养计划 } - if(hasTask==null || Integer.parseInt(plan.getPlanLoop())<= hasTask.getDays()){ + if (hasTask == null || Integer.parseInt(plan.getPlanLoop()) <= hasTask.getDays() || checkHourTask(hasTask, plan)) { //生成保养计划 int m = this.createOrderPlan(plan); - if(m==0){ + if (m == 0) { error("equ_order相关添加失败"); } } @@ -314,7 +316,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { logger.info("++++++++++++" + poolName + "++++保养结束++++++++++"); } - private int createOrderPlan(EquPlan plan){ + private int createOrderPlan(EquPlan plan) { Date nowtime = DateUtils.getNowDate(); String createBy = "job"; String factory = plan.getFactoryCode(); @@ -322,21 +324,21 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { /**equ_plan->equ_order********************************************************************/ EquOrder order = new EquOrder(); //源->目标 - BeanUtils.copyProperties(plan,order); + BeanUtils.copyProperties(plan, order); order.setOrderId(IdUtils.fastSimpleUUID()); order.setCreateBy(createBy); order.setCreateTime(nowtime); // 流水号 - String serialNum = String.format("%03d",equOrderMapper.selectSerialNumber()); - String orderCode = "O"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD)+serialNum; + String serialNum = String.format("%03d", equOrderMapper.selectSerialNumber()); + String orderCode = "O" + DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + serialNum; order.setOrderCode(orderCode); - if("1".equals(plan.getUpkeep())) {//1委外工单 - order.setOutsourceCode("BW"+orderCode); + if ("1".equals(plan.getUpkeep())) {//1委外工单 + order.setOutsourceCode("BW" + orderCode); } /**equ_order**/ sce = equOrderMapper.insertEquOrder(order); - System.out.println(plan.getPlanCode()+"========equ_order:"+sce); + System.out.println(plan.getPlanCode() + "========equ_order:" + sce); /**equ_plan_equ_spare->equ_spare_apply*************************************************************/ EquPlanEquSpare equPlanEquSpare = new EquPlanEquSpare(); equPlanEquSpare.setParentCode(plan.getPlanEquId()); @@ -347,7 +349,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { for (EquPlanEquSpare spare : spares) { EquSpareApply apply = new EquSpareApply(); apply.setApplyId(IdUtils.fastSimpleUUID()); - apply.setApplyCode("A"+orderCode+String.format("%02d",applySerialNum)); + apply.setApplyCode("A" + orderCode + String.format("%02d", applySerialNum)); applySerialNum++; apply.setSpareCode(spare.getMaterialCode()); apply.setSpareName(spare.getMaterialDesc()); @@ -381,13 +383,13 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { List standards = new ArrayList<>(); List standards0 = null; - for(EquPlanDetail itme:details){ + for (EquPlanDetail itme : details) { String detailId = IdUtils.fastSimpleUUID(); EquPlanStandard standardqo = new EquPlanStandard(); //equ_plan_detail的id standardqo.setParentCode(itme.getId()); standards0 = equPlanStandardMapper.selectEquPlanStandardList(standardqo); - for(EquPlanStandard standard:standards0) { + for (EquPlanStandard standard : standards0) { standard.setId(IdUtils.fastSimpleUUID()); standard.setCreateTime(nowtime); standard.setCreateBy(createBy); @@ -403,19 +405,19 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { itme.setDelFlag("0"); itme.setParentCode(orderCode); } - if(!CollectionUtils.isEmpty(details)) { + if (!CollectionUtils.isEmpty(details)) { sce = equOrderDetailMapper.insertEquOrderDetails(details); System.out.println(plan.getPlanCode() + "========equ_order_detail:" + sce); } /**equ_plan_standard->equ_order_standard*******************************************************/ - if(!CollectionUtils.isEmpty(standards)) { + if (!CollectionUtils.isEmpty(standards)) { sce = equOrderStandardMapper.insertEquOrderStandards(standards); System.out.println(plan.getPlanCode() + "========equ_order_standard:" + sce); } /**equ_plan_person->equ_order_standard*********************************************************/ - if("1".equals(plan.getUpkeep())){//1委外 + if ("1".equals(plan.getUpkeep())) {//1委外 EquOutsourceWork equOutsourceWork = new EquOutsourceWork(); - BeanUtils.copyProperties(plan,equOutsourceWork); + BeanUtils.copyProperties(plan, equOutsourceWork); equOutsourceWork.setWorkId(IdUtils.fastSimpleUUID()); equOutsourceWork.setWorkCode(order.getOutsourceCode()); equOutsourceWork.setWorkType("1");//1委外保养0委外维修 @@ -425,7 +427,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { equOutsourceWork.setRepairCode(orderCode); sce = equOutsourceWorkMapper.insertEquOutsourceWork(equOutsourceWork); System.out.println(plan.getPlanCode() + "========equ_outsource_work:" + sce); - }else { + } else { EquPlanPerson equPlanPerson = new EquPlanPerson(); equPlanPerson.setPlanCode(plan.getPlanCode()); List persons = equPlanPersonMapper.selectEquPlanPersonList(equPlanPerson); @@ -445,7 +447,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { return sce; } - private void createEquipmentOperation(String poolName){ + private void createEquipmentOperation(String poolName) { DynamicDataSourceContextHolder.push(poolName);// 这是数据源的key // 当天未生成过运行记录 int checkNum = equOperationMapper.checkInsertOperation(); @@ -457,7 +459,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { // 统一处理数据 for (EquOperation operation : operationList) { operation.setId(IdUtils.fastSimpleUUID());// id - operation.setFactoryCode(poolName.replace("ds_",""));// 工厂 + operation.setFactoryCode(poolName.replace("ds_", ""));// 工厂 operation.setOperationTime(DateUtils.getTime());// 日期 operation.setOperationTime(operationTime);// 运行时间（默认运行时间） operation.setActualOperationTime(operationTime);// 实际运行时间（默认运行时间） @@ -468,18 +470,18 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { int batchSize = 100;// 批次数量 // 分批次处理 - int batchCount = (operationList.size() + batchSize - 1)/batchSize;// 计算批次数量 - for (int i = 0;i < batchCount; i++) { + int batchCount = (operationList.size() + batchSize - 1) / batchSize;// 计算批次数量 + for (int i = 0; i < batchCount; i++) { int startIndex = i * batchSize;// 索引开始值 - int endIndex = Math.min((i + 1)*batchSize,operationList.size());// 索引结束值 + int endIndex = Math.min((i + 1) * batchSize, operationList.size());// 索引结束值 // 截取列表 - List subList = operationList.subList(startIndex,endIndex); + List subList = operationList.subList(startIndex, endIndex); int num = equOperationMapper.insertEquOperationByBatch(subList); - System.out.println("数据源:"+poolName+"--->"+"第"+(i+1)+"轮"+"开始索引:"+startIndex+"________结束索引:"+endIndex+"________成功插入数量:"+num); + System.out.println("数据源:" + poolName + "--->" + "第" + (i + 1) + "轮" + "开始索引:" + startIndex + "________结束索引:" + endIndex + "________成功插入数量:" + num); } - }else { - System.out.println("数据源:"+poolName+"当天生成过运行记录"); + } else { + System.out.println("数据源:" + poolName + "当天生成过运行记录"); } } @@ -494,28 +496,43 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { int insertSize = 100;// 新增批次数量 // 分批次备份 - int batchCount = (insertNum + insertSize - 1)/insertSize;// 计算批次数量 - for (int i = 0;i < batchCount; i++) { + int batchCount = (insertNum + insertSize - 1) / insertSize;// 计算批次数量 + for (int i = 0; i < batchCount; i++) { int startIndex = i * insertSize;// 索引开始值 - int endIndex = Math.min((i + 1)*insertSize,insertNum);// 索引结束值 + int endIndex = Math.min((i + 1) * insertSize, insertNum);// 索引结束值 // 备份至数据库 - int num = equOperationMapper.backupOperation(startIndex,insertSize); + int num = equOperationMapper.backupOperation(startIndex, insertSize); - System.out.println("数据源:"+poolName+"--->"+"第"+(i+1)+"轮备份"+"开始索引:"+startIndex+"________结束索引:"+endIndex+"________成功插入数量:"+num); + System.out.println("数据源:" + poolName + "--->" + "第" + (i + 1) + "轮备份" + "开始索引:" + startIndex + "________结束索引:" + endIndex + "________成功插入数量:" + num); } // 删除源数据库数据 int delSize = 100;// 删除批次数量 - for (int i = 0; i < insertNum/delSize+1; i++) { + for (int i = 0; i < insertNum / delSize + 1; i++) { // 在源数据库中删除 int num = equOperationMapper.deleteOperation(delSize); - System.out.println("数据源:"+poolName+"--->"+"第"+(i+1)+"轮删除"+"------>成功删除数量:"+num); + System.out.println("数据源:" + poolName + "--->" + "第" + (i + 1) + "轮删除" + "------>成功删除数量:" + num); } - }else { - System.out.println("数据源:"+poolName+"---->"+"年份:"+( LocalDate.now().getYear()-2) +"--->已备份"); + } else { + System.out.println("数据源:" + poolName + "---->" + "年份:" + (LocalDate.now().getYear() - 2) + "--->已备份"); + } + } + + // 循环类型为小时 + private boolean checkHourTask(EquOrder order, EquPlan plan) { + if (order == null) { + return true; + } + Long loop = 1L; + Long diff = 0L; + + if (plan.getPlanLoopType().equals("hour")) { + loop = Long.valueOf(plan.getPlanLoop()) * 60 * 60 * 1000; + diff = DateUtils.getNowDate().getTime() - order.getCreateTime().getTime(); } + return diff >= loop; } public static void main(String[] args) { @@ -523,14 +540,14 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { int batchSize = 200;// 批次数量 // 分批次处理 - int batchCount = (500 + batchSize - 1)/batchSize;// 计算批次数量 - for (int i = 0;i < batchCount; i++) { + int batchCount = (500 + batchSize - 1) / batchSize;// 计算批次数量 + for (int i = 0; i < batchCount; i++) { int startIndex = i * batchSize; - int endIndex = Math.min((i + 1)*batchSize,500); - System.out.println("第"+i+"轮"+"开始:"+startIndex+"------结束:"+endIndex); + int endIndex = Math.min((i + 1) * batchSize, 500); + System.out.println("第" + i + "轮" + "开始:" + startIndex + "------结束:" + endIndex); } - System.out.println("------>"+batchCount); + System.out.println("------>" + batchCount); } } diff --git a/op-modules/op-device/src/main/resources/mapper/device/DeviceTaskMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/DeviceTaskMapper.xml index 4189a69a..ace6103e 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/DeviceTaskMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/DeviceTaskMapper.xml @@ -38,12 +38,12 @@