diff --git a/aucma-admin/src/main/resources/logback.xml b/aucma-admin/src/main/resources/logback.xml index 62cf106..1cbeff4 100644 --- a/aucma-admin/src/main/resources/logback.xml +++ b/aucma-admin/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + diff --git a/aucma-common/src/main/java/com/aucma/common/constant/DmsConstants.java b/aucma-common/src/main/java/com/aucma/common/constant/DmsConstants.java index 285dbe8..083a95d 100644 --- a/aucma-common/src/main/java/com/aucma/common/constant/DmsConstants.java +++ b/aucma-common/src/main/java/com/aucma/common/constant/DmsConstants.java @@ -87,4 +87,9 @@ public class DmsConstants { /** 保养项目状态(0待保养,1保养完成)*/ public static final String DMS_MAINT_PROJECT_STATUS_TO_MAINT="0";//0待保养 public static final String DMS_MAINT_PROJECT_STATUS_COMPLETE="1";//1保养完成 + + /** 设备台账设备状态(0-使用;1-停用;2-报废)*/ + public static final Long DMS_BASE_DEVICE_STATUS_NORMAL = 0L;//0使用(正常) + public static final Long DMS_BASE_DEVICE_STATUS_STOP = 1L;//1停用 + public static final Long DMS_BASE_DEVICE_STATUS_SCRAP = 2L;//2报废 } diff --git a/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsBaseDeviceLedgerMapper.java b/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsBaseDeviceLedgerMapper.java index e4b6791..d07e21e 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsBaseDeviceLedgerMapper.java +++ b/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsBaseDeviceLedgerMapper.java @@ -74,4 +74,12 @@ public interface DmsBaseDeviceLedgerMapper public DmsBaseDeviceLedger selectDmsBaseDeviceLedgerByDeviceCode(String deviceCode); List likeDeviceName(@Param("deviceName") String deviceName); + + /** + * 统计设备列表中状态不正常的设备数量 + * @param deviceIds 设备ID列表 + * @param normalStatus 正常状态值(0=使用) + * @return 异常设备数量 + */ + int countAbnormalDevices(@Param("deviceIds") List deviceIds, @Param("normalStatus") Long normalStatus); } diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBaseDeviceLedgerMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBaseDeviceLedgerMapper.xml index a8a9b8b..eec0b8d 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsBaseDeviceLedgerMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsBaseDeviceLedgerMapper.xml @@ -139,4 +139,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where x.device_name like concat('%',#{deviceName},'%') + + + diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBaseInspectProjectMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBaseInspectProjectMapper.xml index 800fb3e..cc2e87e 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsBaseInspectProjectMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsBaseInspectProjectMapper.xml @@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT SEQ_DMS_INSPECT_PROJ.NEXTVAL FROM DUAL + SELECT HAIWEI.SEQ_DMS_INSPECT_PROJ.NEXTVAL FROM DUAL insert into dms_base_inspect_project diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBaseInspectRouteMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBaseInspectRouteMapper.xml index 5a41d51..bd14408 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsBaseInspectRouteMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsBaseInspectRouteMapper.xml @@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT SEQ_DMS_INSPECT_ROUTE.NEXTVAL FROM DUAL + SELECT HAIWEI.SEQ_DMS_INSPECT_ROUTE.NEXTVAL FROM DUAL insert into dms_base_inspect_route diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBaseInspectStandardMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBaseInspectStandardMapper.xml index adfdf45..8fa6328 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsBaseInspectStandardMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsBaseInspectStandardMapper.xml @@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT SEQ_DMS_INSPECT_STD.NEXTVAL FROM DUAL + SELECT HAIWEI.SEQ_DMS_INSPECT_STD.NEXTVAL FROM DUAL insert into dms_base_inspect_standard diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBaseLubeStandardMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBaseLubeStandardMapper.xml index c060731..5d067bc 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsBaseLubeStandardMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsBaseLubeStandardMapper.xml @@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT SEQ_DMS_LUBE_STD.NEXTVAL FROM DUAL + SELECT HAIWEI.SEQ_DMS_LUBE_STD.NEXTVAL FROM DUAL insert into dms_base_lube_standard diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBaseLubeStationMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBaseLubeStationMapper.xml index 8d37d7a..8dde9f9 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsBaseLubeStationMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsBaseLubeStationMapper.xml @@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT SEQ_DMS_LUBE_STATION.NEXTVAL FROM DUAL + SELECT HAIWEI.SEQ_DMS_LUBE_STATION.NEXTVAL FROM DUAL insert into dms_base_lube_station diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBaseMaintProjectMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBaseMaintProjectMapper.xml index 969e169..b43f979 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsBaseMaintProjectMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsBaseMaintProjectMapper.xml @@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT SEQ_DMS_MAINT_PROJ.NEXTVAL FROM DUAL + SELECT HAIWEI.SEQ_DMS_MAINT_PROJ.NEXTVAL FROM DUAL insert into dms_base_maint_project diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBaseMaintStandardMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBaseMaintStandardMapper.xml index eee22c1..4c6aab3 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsBaseMaintStandardMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsBaseMaintStandardMapper.xml @@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT SEQ_DMS_MAINT_STD.NEXTVAL FROM DUAL + SELECT HAIWEI.SEQ_DMS_MAINT_STD.NEXTVAL FROM DUAL insert into dms_base_maint_standard diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBaseMaintStationMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBaseMaintStationMapper.xml index b58f47b..2a1c009 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsBaseMaintStationMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsBaseMaintStationMapper.xml @@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT SEQ_DMS_MAINT_STATION.NEXTVAL FROM DUAL + SELECT HAIWEI.SEQ_DMS_MAINT_STATION.NEXTVAL FROM DUAL insert into dms_base_maint_station diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBaseShutReasonMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBaseShutReasonMapper.xml index cf3e641..6336185 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsBaseShutReasonMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsBaseShutReasonMapper.xml @@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT SEQ_DMS_SHUT_REASON.NEXTVAL FROM DUAL + SELECT HAIWEI.SEQ_DMS_SHUT_REASON.NEXTVAL FROM DUAL insert into dms_base_shut_reason diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBaseShutTypeMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBaseShutTypeMapper.xml index 4c744aa..5167a94 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsBaseShutTypeMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsBaseShutTypeMapper.xml @@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT SEQ_DMS_SHUT_TYPE.NEXTVAL FROM DUAL + SELECT HAIWEI.SEQ_DMS_SHUT_TYPE.NEXTVAL FROM DUAL insert into dms_base_shut_type diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml index 3a78883..a7e9a14 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml @@ -124,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT seq_dms_bills_fault_instance.NEXTVAL FROM DUAL + SELECT HAIWEI.SEQ_DMS_BILLS_FAULT_INSTANCE.NEXTVAL FROM DUAL insert into dms_bills_fault_instance diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsDispatchMemberMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsDispatchMemberMapper.xml index 9b117a1..eb0f731 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsDispatchMemberMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsDispatchMemberMapper.xml @@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select SEQ_DMS_DISPATCH_MEMBER.nextval as memberId from DUAL + select HAIWEI.SEQ_DMS_DISPATCH_MEMBER.nextval as memberId from DUAL insert into dms_dispatch_member diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsDispatchPlanMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsDispatchPlanMapper.xml index d225706..11591e9 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsDispatchPlanMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsDispatchPlanMapper.xml @@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select SEQ_DMS_DISPATCH_PLAN.nextval as planId from DUAL + select HAIWEI.SEQ_DMS_DISPATCH_PLAN.nextval as planId from DUAL insert into dms_dispatch_plan diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsFaultInstanceActivityMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsFaultInstanceActivityMapper.xml index ed40d17..83b652f 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsFaultInstanceActivityMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsFaultInstanceActivityMapper.xml @@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT seq_fault_instance_activity.NEXTVAL FROM DUAL + SELECT HAIWEI.SEQ_FAULT_INSTANCE_ACTIVITY.NEXTVAL FROM DUAL insert into dms_fault_instance_activity diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsKnowledgeRepairMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsKnowledgeRepairMapper.xml index 77beea0..4c45702 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsKnowledgeRepairMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsKnowledgeRepairMapper.xml @@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT SEQ_DMS_KNOWLEDGE_REPAIR.NEXTVAL FROM DUAL + SELECT HAIWEI.SEQ_DMS_KNOWLEDGE_REPAIR.NEXTVAL FROM DUAL insert into dms_knowledge_repair diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsRepairMaterialMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsRepairMaterialMapper.xml index 3c85261..ff31aa0 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsRepairMaterialMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsRepairMaterialMapper.xml @@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select SEQ_DMS_REPAIR_MATERIAL.nextval as materialId from DUAL + select HAIWEI.SEQ_DMS_REPAIR_MATERIAL.nextval as materialId from DUAL insert into dms_repair_material diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsRepairProjectMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsRepairProjectMapper.xml index 716f93b..ed5e6ef 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsRepairProjectMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsRepairProjectMapper.xml @@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select SEQ_DMS_REPAIR_PROJECT.nextval as projectId from DUAL + select HAIWEI.SEQ_DMS_REPAIR_PROJECT.nextval as projectId from DUAL insert into dms_repair_project diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsRepairRecordMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsRepairRecordMapper.xml index 4d2fe45..2040176 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsRepairRecordMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsRepairRecordMapper.xml @@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select SEQ_DMS_REPAIR_RECORD.nextval as recordId from DUAL + select HAIWEI.SEQ_DMS_REPAIR_RECORD.nextval as recordId from DUAL insert into dms_repair_record diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsRepairWorkOrderMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsRepairWorkOrderMapper.xml index 19372d7..7f06002 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsRepairWorkOrderMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsRepairWorkOrderMapper.xml @@ -109,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select SEQ_DMS_REPAIR_WORK_ORDER.nextval as workOrderId from DUAL + select HAIWEI.SEQ_DMS_REPAIR_WORK_ORDER.nextval as workOrderId from DUAL insert into dms_repair_work_order