yinq
/
aucma-mes-back
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://175.27.215.92:3000/yinq/aucma-mes-back

Browse Source
master
yinq 6 months ago
parent 05d4abf88d 9f8be6f952
commit 8331cdadf2
11 changed files with 145 additions and 50 deletions
Show Stats Download Patch File Download Diff File

38
aucma-api/src/main/java/com/aucma/api/task/SAPTask.java
Unescape Escape View File

@ -5,11 +5,14 @@ import com.aucma.api.domain.dto.SAPPortDto;
import com.aucma.api.domain.dto.WERKSDto;
import com.aucma.api.service.ISAPPortService;
import com.aucma.base.domain.BaseOrderInfo;
import com.aucma.base.mapper.PublicMapper;
import com.aucma.base.service.IBaseOrderInfoService;
import com.aucma.base.service.IRecordDnbInstantService;
import com.aucma.common.utils.DateUtils;
import com.aucma.production.domain.BaseBomInfo;
import com.aucma.production.service.IBaseBomInfoService;
import com.aucma.production.service.IProductPlanInfoService;
import com.aucma.report.service.IDeviceAlarmRecordService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@ -36,6 +39,15 @@ public class SAPTask {
@Autowired
private IBaseOrderInfoService orderInfoService;
@Autowired
private IDeviceAlarmRecordService deviceAlarmRecordService;
@Autowired
private IRecordDnbInstantService recordDnbInstantService;
@Autowired
private PublicMapper publicMapper;
/**
* SAP物料主数据定时任务
* @param factoryCode
@ -148,4 +160,30 @@ public class SAPTask {
return sapPortDto;
}
/***
* 定时任务：定期删除设备报警记录信息
*/
public void DeleteDeviceAlarmRecordTable(Long dates){
deviceAlarmRecordService.deleteDeviceAlarmRecordByDates(dates);
System.out.println("删除设备报警记录数据库中数据");
}
/**
* 定时任务：定期删除电实时数据信息
* */
public void DeleteRecordDnbInstant(Long dates){
recordDnbInstantService.deleteRecordDnbInstantByDates(dates);
System.out.println("删除电实时数据");
}
/**
*
* 定时任务：定期删除门体发泡设备数据
* */
public void DeleteDOORFOAMREMACHINE(Long dates){
publicMapper.DeleteDOORFOAMREMACHINE(dates);
System.out.println("删除门体发泡数据");
}
}

17
aucma-base/src/main/java/com/aucma/base/mapper/PublicMapper.java
Unescape Escape View File

@ -0,0 +1,17 @@
package com.aucma.base.mapper;
import com.aucma.common.annotation.DataSource;
import com.aucma.common.enums.DataSourceType;
import org.springframework.stereotype.Repository;
/**
* @ClassName : PublicMapper
* @Description :
* @Author :
* @Date: 2024-03-30 17:29
*/
@Repository
public interface PublicMapper {
@DataSource(value = DataSourceType.SLAVE)
int DeleteDOORFOAMREMACHINE(Long dates);
}

18
aucma-base/src/main/java/com/aucma/base/mapper/RecordDnbInstantMapper.java
Unescape Escape View File

@ -5,15 +5,15 @@ import com.aucma.base.domain.RecordDnbInstant;
/**
* 电实时数据Mapper接口
*
*
* @author Yinq
* @date 2023-09-26
*/
public interface RecordDnbInstantMapper
public interface RecordDnbInstantMapper
{
/**
* 查询电实时数据
*
*
* @param objId 电实时数据主键
* @return 电实时数据
*/
@ -21,7 +21,7 @@ public interface RecordDnbInstantMapper
/**
* 查询电实时数据列表
*
*
* @param recordDnbInstant 电实时数据
* @return 电实时数据集合
*/
@ -29,7 +29,7 @@ public interface RecordDnbInstantMapper
/**
* 新增电实时数据
*
*
* @param recordDnbInstant 电实时数据
* @return 结果
*/
@ -37,7 +37,7 @@ public interface RecordDnbInstantMapper
/**
* 修改电实时数据
*
*
* @param recordDnbInstant 电实时数据
* @return 结果
*/
@ -45,7 +45,7 @@ public interface RecordDnbInstantMapper
/**
* 删除电实时数据
*
*
* @param objId 电实时数据主键
* @return 结果
*/
@ -53,9 +53,11 @@ public interface RecordDnbInstantMapper
/**
* 批量删除电实时数据
*
*
* @param objIds 需要删除的数据主键集合
* @return 结果
*/
public int deleteRecordDnbInstantByObjIds(Long[] objIds);
int deleteRecordDnbInstantByDates(Long dates);
}

18
aucma-base/src/main/java/com/aucma/base/service/IRecordDnbInstantService.java
Unescape Escape View File

@ -5,15 +5,15 @@ import com.aucma.base.domain.RecordDnbInstant;
/**
* 电实时数据Service接口
*
*
* @author Yinq
* @date 2023-09-26
*/
public interface IRecordDnbInstantService
public interface IRecordDnbInstantService
{
/**
* 查询电实时数据
*
*
* @param objId 电实时数据主键
* @return 电实时数据
*/
@ -21,7 +21,7 @@ public interface IRecordDnbInstantService
/**
* 查询电实时数据列表
*
*
* @param recordDnbInstant 电实时数据
* @return 电实时数据集合
*/
@ -29,7 +29,7 @@ public interface IRecordDnbInstantService
/**
* 新增电实时数据
*
*
* @param recordDnbInstant 电实时数据
* @return 结果
*/
@ -37,7 +37,7 @@ public interface IRecordDnbInstantService
/**
* 修改电实时数据
*
*
* @param recordDnbInstant 电实时数据
* @return 结果
*/
@ -45,7 +45,7 @@ public interface IRecordDnbInstantService
/**
* 批量删除电实时数据
*
*
* @param objIds 需要删除的电实时数据主键集合
* @return 结果
*/
@ -53,9 +53,11 @@ public interface IRecordDnbInstantService
/**
* 删除电实时数据信息
*
*
* @param objId 电实时数据主键
* @return 结果
*/
public int deleteRecordDnbInstantByObjId(Long objId);
int deleteRecordDnbInstantByDates(long dates);
}

21
aucma-base/src/main/java/com/aucma/base/service/impl/RecordDnbInstantServiceImpl.java
Unescape Escape View File

@ -9,19 +9,19 @@ import com.aucma.base.service.IRecordDnbInstantService;
/**
* 电实时数据Service业务层处理
*
*
* @author Yinq
* @date 2023-09-26
*/
@Service
public class RecordDnbInstantServiceImpl implements IRecordDnbInstantService
public class RecordDnbInstantServiceImpl implements IRecordDnbInstantService
{
@Autowired
private RecordDnbInstantMapper recordDnbInstantMapper;
/**
* 查询电实时数据
*
*
* @param objId 电实时数据主键
* @return 电实时数据
*/
@ -33,7 +33,7 @@ public class RecordDnbInstantServiceImpl implements IRecordDnbInstantService
/**
* 查询电实时数据列表
*
*
* @param recordDnbInstant 电实时数据
* @return 电实时数据
*/
@ -45,7 +45,7 @@ public class RecordDnbInstantServiceImpl implements IRecordDnbInstantService
/**
* 新增电实时数据
*
*
* @param recordDnbInstant 电实时数据
* @return 结果
*/
@ -57,7 +57,7 @@ public class RecordDnbInstantServiceImpl implements IRecordDnbInstantService
/**
* 修改电实时数据
*
*
* @param recordDnbInstant 电实时数据
* @return 结果
*/
@ -69,7 +69,7 @@ public class RecordDnbInstantServiceImpl implements IRecordDnbInstantService
/**
* 批量删除电实时数据
*
*
* @param objIds 需要删除的电实时数据主键
* @return 结果
*/
@ -81,7 +81,7 @@ public class RecordDnbInstantServiceImpl implements IRecordDnbInstantService
/**
* 删除电实时数据信息
*
*
* @param objId 电实时数据主键
* @return 结果
*/
@ -90,4 +90,9 @@ public class RecordDnbInstantServiceImpl implements IRecordDnbInstantService
{
return recordDnbInstantMapper.deleteRecordDnbInstantByObjId(objId);
}
@Override
public int deleteRecordDnbInstantByDates(long dates) {
return recordDnbInstantMapper.deleteRecordDnbInstantByDates(dates);
}
}

11
aucma-base/src/main/resources/mapper/base/PublicMapper.xml
Unescape Escape View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aucma.base.mapper.PublicMapper">
<delete id="DeleteDOORFOAMREMACHINE" parameterType="Long">
delete
from DOOR_FOAMREMACHINE
where (sysdate-#{dates})>CREATED_TIME
</delete>
</mapper>

5
aucma-base/src/main/resources/mapper/base/RecordDnbInstantMapper.xml
Unescape Escape View File

@ -183,4 +183,7 @@
#{objId}
</foreach>
</delete>
</mapper>
<delete id="deleteRecordDnbInstantByDates" parameterType="Long">
delete from record_dnb_instant where (sysdate-#{dates})>COLLECT_TIME
</delete>
</mapper>

18
aucma-report/src/main/java/com/aucma/report/mapper/DeviceAlarmRecordMapper.java
Unescape Escape View File

@ -5,15 +5,15 @@ import com.aucma.report.domain.DeviceAlarmRecord;
/**
* 设备报警记录Mapper接口
*
*
* @author Yinq
* @date 2024-03-26
*/
public interface DeviceAlarmRecordMapper
public interface DeviceAlarmRecordMapper
{
/**
* 查询设备报警记录
*
*
* @param objId 设备报警记录主键
* @return 设备报警记录
*/
@ -21,7 +21,7 @@ public interface DeviceAlarmRecordMapper
/**
* 查询设备报警记录列表
*
*
* @param deviceAlarmRecord 设备报警记录
* @return 设备报警记录集合
*/
@ -29,7 +29,7 @@ public interface DeviceAlarmRecordMapper
/**
* 新增设备报警记录
*
*
* @param deviceAlarmRecord 设备报警记录
* @return 结果
*/
@ -37,7 +37,7 @@ public interface DeviceAlarmRecordMapper
/**
* 修改设备报警记录
*
*
* @param deviceAlarmRecord 设备报警记录
* @return 结果
*/
@ -45,7 +45,7 @@ public interface DeviceAlarmRecordMapper
/**
* 删除设备报警记录
*
*
* @param objId 设备报警记录主键
* @return 结果
*/
@ -53,9 +53,11 @@ public interface DeviceAlarmRecordMapper
/**
* 批量删除设备报警记录
*
*
* @param objIds 需要删除的数据主键集合
* @return 结果
*/
public int deleteDeviceAlarmRecordByObjIds(Long[] objIds);
int deleteDeviceAlarmRecordByDates(Long dates);
}

21
aucma-report/src/main/java/com/aucma/report/service/IDeviceAlarmRecordService.java
Unescape Escape View File

@ -5,15 +5,15 @@ import com.aucma.report.domain.DeviceAlarmRecord;
/**
* 设备报警记录Service接口
*
*
* @author Yinq
* @date 2024-03-26
*/
public interface IDeviceAlarmRecordService
public interface IDeviceAlarmRecordService
{
/**
* 查询设备报警记录
*
*
* @param objId 设备报警记录主键
* @return 设备报警记录
*/
@ -21,7 +21,7 @@ public interface IDeviceAlarmRecordService
/**
* 查询设备报警记录列表
*
*
* @param deviceAlarmRecord 设备报警记录
* @return 设备报警记录集合
*/
@ -29,7 +29,7 @@ public interface IDeviceAlarmRecordService
/**
* 新增设备报警记录
*
*
* @param deviceAlarmRecord 设备报警记录
* @return 结果
*/
@ -37,7 +37,7 @@ public interface IDeviceAlarmRecordService
/**
* 修改设备报警记录
*
*
* @param deviceAlarmRecord 设备报警记录
* @return 结果
*/
@ -45,7 +45,7 @@ public interface IDeviceAlarmRecordService
/**
* 批量删除设备报警记录
*
*
* @param objIds 需要删除的设备报警记录主键集合
* @return 结果
*/
@ -53,9 +53,14 @@ public interface IDeviceAlarmRecordService
/**
* 删除设备报警记录信息
*
*
* @param objId 设备报警记录主键
* @return 结果
*/
public int deleteDeviceAlarmRecordByObjId(Long objId);
/**
* 根据传入天数删除设备报警记录信息
* */
public int deleteDeviceAlarmRecordByDates(Long dates);
}

21
aucma-report/src/main/java/com/aucma/report/service/impl/DeviceAlarmRecordServiceImpl.java
Unescape Escape View File

@ -9,19 +9,19 @@ import com.aucma.report.service.IDeviceAlarmRecordService;
/**
* 设备报警记录Service业务层处理
*
*
* @author Yinq
* @date 2024-03-26
*/
@Service
public class DeviceAlarmRecordServiceImpl implements IDeviceAlarmRecordService
public class DeviceAlarmRecordServiceImpl implements IDeviceAlarmRecordService
{
@Autowired
private DeviceAlarmRecordMapper deviceAlarmRecordMapper;
/**
* 查询设备报警记录
*
*
* @param objId 设备报警记录主键
* @return 设备报警记录
*/
@ -33,7 +33,7 @@ public class DeviceAlarmRecordServiceImpl implements IDeviceAlarmRecordService
/**
* 查询设备报警记录列表
*
*
* @param deviceAlarmRecord 设备报警记录
* @return 设备报警记录
*/
@ -45,7 +45,7 @@ public class DeviceAlarmRecordServiceImpl implements IDeviceAlarmRecordService
/**
* 新增设备报警记录
*
*
* @param deviceAlarmRecord 设备报警记录
* @return 结果
*/
@ -57,7 +57,7 @@ public class DeviceAlarmRecordServiceImpl implements IDeviceAlarmRecordService
/**
* 修改设备报警记录
*
*
* @param deviceAlarmRecord 设备报警记录
* @return 结果
*/
@ -69,7 +69,7 @@ public class DeviceAlarmRecordServiceImpl implements IDeviceAlarmRecordService
/**
* 批量删除设备报警记录
*
*
* @param objIds 需要删除的设备报警记录主键
* @return 结果
*/
@ -81,7 +81,7 @@ public class DeviceAlarmRecordServiceImpl implements IDeviceAlarmRecordService
/**
* 删除设备报警记录信息
*
*
* @param objId 设备报警记录主键
* @return 结果
*/
@ -90,4 +90,9 @@ public class DeviceAlarmRecordServiceImpl implements IDeviceAlarmRecordService
{
return deviceAlarmRecordMapper.deleteDeviceAlarmRecordByObjId(objId);
}
@Override
public int deleteDeviceAlarmRecordByDates(Long dates) {
return deviceAlarmRecordMapper.deleteDeviceAlarmRecordByDates(dates);
}
}

7
aucma-report/src/main/resources/mapper/report/DeviceAlarmRecordMapper.xml
Unescape Escape View File

@ -134,4 +134,9 @@
#{objId}
</foreach>
</delete>
</mapper>
<delete id="deleteDeviceAlarmRecordByDates" parameterType="Long">
delete
from RECORD_ALARM_DEVICE
where (sysdate-#{dates})>ALARM_TIME
</delete>
</mapper>

Write Preview
Loading…
Cancel
Save