feat(dms): 修改日志文件位置、修改dms所有mapper使用索引

- 新增 countAbnormalDevices 方法统计异常设备数量
- 添加设备台账状态常量定义(使用、停用、报废)
- 修复多个数据表插入操作中的序列引用前缀问题
- 更新日志文件存储路径配置
master
zangch@mesnac.com 6 days ago
parent 42ae0d364e
commit f56a6d03a6

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- 日志存放路径 -->
<property name="log.path" value="/home/aucma-mes/logs" />
<property name="log.path" value="D:/aucma_mes/aucma_back/logs" />
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />

@ -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报废
}

@ -74,4 +74,12 @@ public interface DmsBaseDeviceLedgerMapper
public DmsBaseDeviceLedger selectDmsBaseDeviceLedgerByDeviceCode(String deviceCode);
List<DmsBaseDeviceLedger> likeDeviceName(@Param("deviceName") String deviceName);
/**
*
* @param deviceIds ID
* @param normalStatus 0=使
* @return
*/
int countAbnormalDevices(@Param("deviceIds") List<Long> deviceIds, @Param("normalStatus") Long normalStatus);
}

@ -139,4 +139,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where
x.device_name like concat('%',#{deviceName},'%')
</select>
<!-- 统计设备列表中状态不正常的设备数量 -->
<select id="countAbnormalDevices" resultType="java.lang.Integer">
SELECT COUNT(1)
FROM base_deviceledger
WHERE OBJ_ID IN
<foreach item="id" collection="deviceIds" open="(" separator="," close=")">
#{id}
</foreach>
AND DEVICE_STATUS != #{normalStatus}
</select>
</mapper>

@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertDmsBaseInspectProject" parameterType="DmsBaseInspectProject">
<selectKey keyProperty="inspectProjectId" resultType="long" order="BEFORE">
SELECT SEQ_DMS_INSPECT_PROJ.NEXTVAL FROM DUAL
SELECT HAIWEI.SEQ_DMS_INSPECT_PROJ.NEXTVAL FROM DUAL
</selectKey>
insert into dms_base_inspect_project
<trim prefix="(" suffix=")" suffixOverrides=",">

@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertDmsBaseInspectRoute" parameterType="DmsBaseInspectRoute">
<selectKey keyProperty="inspectRouteId" resultType="long" order="BEFORE">
SELECT SEQ_DMS_INSPECT_ROUTE.NEXTVAL FROM DUAL
SELECT HAIWEI.SEQ_DMS_INSPECT_ROUTE.NEXTVAL FROM DUAL
</selectKey>
insert into dms_base_inspect_route
<trim prefix="(" suffix=")" suffixOverrides=",">

@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertDmsBaseInspectStandard" parameterType="DmsBaseInspectStandard">
<selectKey keyProperty="inspectStandardId" resultType="long" order="BEFORE">
SELECT SEQ_DMS_INSPECT_STD.NEXTVAL FROM DUAL
SELECT HAIWEI.SEQ_DMS_INSPECT_STD.NEXTVAL FROM DUAL
</selectKey>
insert into dms_base_inspect_standard
<trim prefix="(" suffix=")" suffixOverrides=",">

@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertDmsBaseLubeStandard" parameterType="DmsBaseLubeStandard">
<selectKey keyProperty="lubeStandardId" resultType="long" order="BEFORE">
SELECT SEQ_DMS_LUBE_STD.NEXTVAL FROM DUAL
SELECT HAIWEI.SEQ_DMS_LUBE_STD.NEXTVAL FROM DUAL
</selectKey>
insert into dms_base_lube_standard
<trim prefix="(" suffix=")" suffixOverrides=",">

@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertDmsBaseLubeStation" parameterType="DmsBaseLubeStation">
<selectKey keyProperty="lubeStationId" resultType="long" order="BEFORE">
SELECT SEQ_DMS_LUBE_STATION.NEXTVAL FROM DUAL
SELECT HAIWEI.SEQ_DMS_LUBE_STATION.NEXTVAL FROM DUAL
</selectKey>
insert into dms_base_lube_station
<trim prefix="(" suffix=")" suffixOverrides=",">

@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertDmsBaseMaintProject" parameterType="DmsBaseMaintProject">
<selectKey keyProperty="maintProjectId" resultType="long" order="BEFORE">
SELECT SEQ_DMS_MAINT_PROJ.NEXTVAL FROM DUAL
SELECT HAIWEI.SEQ_DMS_MAINT_PROJ.NEXTVAL FROM DUAL
</selectKey>
insert into dms_base_maint_project
<trim prefix="(" suffix=")" suffixOverrides=",">

@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertDmsBaseMaintStandard" parameterType="DmsBaseMaintStandard">
<selectKey keyProperty="maintStandardId" resultType="long" order="BEFORE">
SELECT SEQ_DMS_MAINT_STD.NEXTVAL FROM DUAL
SELECT HAIWEI.SEQ_DMS_MAINT_STD.NEXTVAL FROM DUAL
</selectKey>
insert into dms_base_maint_standard
<trim prefix="(" suffix=")" suffixOverrides=",">

@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertDmsBaseMaintStation" parameterType="DmsBaseMaintStation">
<selectKey keyProperty="maintStationId" resultType="long" order="BEFORE">
SELECT SEQ_DMS_MAINT_STATION.NEXTVAL FROM DUAL
SELECT HAIWEI.SEQ_DMS_MAINT_STATION.NEXTVAL FROM DUAL
</selectKey>
insert into dms_base_maint_station
<trim prefix="(" suffix=")" suffixOverrides=",">

@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertDmsBaseShutReason" parameterType="DmsBaseShutReason">
<selectKey keyProperty="shutReasonId" resultType="long" order="BEFORE">
SELECT SEQ_DMS_SHUT_REASON.NEXTVAL FROM DUAL
SELECT HAIWEI.SEQ_DMS_SHUT_REASON.NEXTVAL FROM DUAL
</selectKey>
insert into dms_base_shut_reason
<trim prefix="(" suffix=")" suffixOverrides=",">

@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertDmsBaseShutType" parameterType="DmsBaseShutType">
<selectKey keyProperty="shutTypeId" resultType="long" order="BEFORE">
SELECT SEQ_DMS_SHUT_TYPE.NEXTVAL FROM DUAL
SELECT HAIWEI.SEQ_DMS_SHUT_TYPE.NEXTVAL FROM DUAL
</selectKey>
insert into dms_base_shut_type
<trim prefix="(" suffix=")" suffixOverrides=",">

@ -124,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertDmsBillsFaultInstance" parameterType="DmsBillsFaultInstance">
<selectKey keyProperty="repairInstanceId" resultType="long" order="BEFORE">
SELECT seq_dms_bills_fault_instance.NEXTVAL FROM DUAL
SELECT HAIWEI.SEQ_DMS_BILLS_FAULT_INSTANCE.NEXTVAL FROM DUAL
</selectKey>
insert into dms_bills_fault_instance
<trim prefix="(" suffix=")" suffixOverrides=",">

@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertDmsDispatchMember" parameterType="DmsDispatchMember">
<selectKey keyProperty="memberId" resultType="long" order="BEFORE">
select SEQ_DMS_DISPATCH_MEMBER.nextval as memberId from DUAL
select HAIWEI.SEQ_DMS_DISPATCH_MEMBER.nextval as memberId from DUAL
</selectKey>
insert into dms_dispatch_member
<trim prefix="(" suffix=")" suffixOverrides=",">

@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertDmsDispatchPlan" parameterType="DmsDispatchPlan">
<selectKey keyProperty="planId" resultType="long" order="BEFORE">
select SEQ_DMS_DISPATCH_PLAN.nextval as planId from DUAL
select HAIWEI.SEQ_DMS_DISPATCH_PLAN.nextval as planId from DUAL
</selectKey>
insert into dms_dispatch_plan
<trim prefix="(" suffix=")" suffixOverrides=",">

@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertDmsFaultInstanceActivity" parameterType="DmsFaultInstanceActivity">
<selectKey keyProperty="instanceActivityId" resultType="long" order="BEFORE">
SELECT seq_fault_instance_activity.NEXTVAL FROM DUAL
SELECT HAIWEI.SEQ_FAULT_INSTANCE_ACTIVITY.NEXTVAL FROM DUAL
</selectKey>
insert into dms_fault_instance_activity
<trim prefix="(" suffix=")" suffixOverrides=",">

@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertDmsKnowledgeRepair" parameterType="DmsKnowledgeRepair">
<selectKey keyProperty="knowledgeRepairId" resultType="long" order="BEFORE">
SELECT SEQ_DMS_KNOWLEDGE_REPAIR.NEXTVAL FROM DUAL
SELECT HAIWEI.SEQ_DMS_KNOWLEDGE_REPAIR.NEXTVAL FROM DUAL
</selectKey>
insert into dms_knowledge_repair
<trim prefix="(" suffix=")" suffixOverrides=",">

@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertDmsRepairMaterial" parameterType="DmsRepairMaterial">
<selectKey keyProperty="materialId" resultType="long" order="BEFORE">
select SEQ_DMS_REPAIR_MATERIAL.nextval as materialId from DUAL
select HAIWEI.SEQ_DMS_REPAIR_MATERIAL.nextval as materialId from DUAL
</selectKey>
insert into dms_repair_material
<trim prefix="(" suffix=")" suffixOverrides=",">

@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertDmsRepairProject" parameterType="DmsRepairProject">
<selectKey keyProperty="projectId" resultType="long" order="BEFORE">
select SEQ_DMS_REPAIR_PROJECT.nextval as projectId from DUAL
select HAIWEI.SEQ_DMS_REPAIR_PROJECT.nextval as projectId from DUAL
</selectKey>
insert into dms_repair_project
<trim prefix="(" suffix=")" suffixOverrides=",">

@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertDmsRepairRecord" parameterType="DmsRepairRecord">
<selectKey keyProperty="recordId" resultType="long" order="BEFORE">
select SEQ_DMS_REPAIR_RECORD.nextval as recordId from DUAL
select HAIWEI.SEQ_DMS_REPAIR_RECORD.nextval as recordId from DUAL
</selectKey>
insert into dms_repair_record
<trim prefix="(" suffix=")" suffixOverrides=",">

@ -109,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertDmsRepairWorkOrder" parameterType="DmsRepairWorkOrder">
<selectKey keyProperty="workOrderId" resultType="long" order="BEFORE">
select SEQ_DMS_REPAIR_WORK_ORDER.nextval as workOrderId from DUAL
select HAIWEI.SEQ_DMS_REPAIR_WORK_ORDER.nextval as workOrderId from DUAL
</selectKey>
insert into dms_repair_work_order
<trim prefix="(" suffix=")" suffixOverrides=",">

Loading…
Cancel
Save