Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
11e8dfa4 由 康伟
选项

Merge remote-tracking branch 'origin/master'

2 个父辈 d83370ad d2662a68
内嵌 并排
正在显示 8 个修改的文件 包含 63 行增加 和 37 行删除
sk-base-common/src/main/java/com/skua/modules/alarmtmp/mapper/SysFactoryDeviceMapper.java
......@@ -2,6 +2,7 @@ package com.skua.modules.alarmtmp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.skua.modules.alarmtmp.entity.SysFactoryDevice;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......
sk-base-common/src/main/java/com/skua/modules/alarmtmp/mapper/xml/AlarmRecordHistoryMapper.xml
......@@ -461,22 +461,30 @@ FROM
</select>
<select id="getQualityAlarmList" resultType="java.util.Map">
SELECT
sd.id departId,
sd.depart_name departName,
sa.area_name areaName,
(select count(1)count from alarm_record_history where alarm_rule_type='6' and alarm_param_type='数据长期不变累计时长报警配置' and DATE_FORMAT( record_time, '%Y-%m' ) =#{time} and sd.id=depart_id)invariantCount,
(select count(1)count from alarm_record_history where alarm_rule_type='6' and alarm_param_type='数据超过有效上下限报警配置' and DATE_FORMAT( record_time, '%Y-%m' ) =#{time} and sd.id=depart_id )overCount
FROM
sys_depart sd
left join sys_factory_info sfi on sfi.depart_id=sd.id
left join sys_area sa on sa.id=sfi.pro_county
where depart_type = 1
order by overCount desc
SELECT
sd.id departId,
sd.depart_name departName,
sa.area_name areaName,
(select count(1) count from alarm_record_history
where alarm_rule_type='6'
and alarm_param_type='数据长期不变累计时长报警配置'
and DATE_FORMAT( record_time, '%Y-%m' ) = #{time}
and sd.id=depart_id)invariantCount,
(select count(1) count from alarm_record_history
where alarm_rule_type='6'
and alarm_param_type='数据超过有效上下限报警配置'
and DATE_FORMAT( record_time, '%Y-%m' ) = #{time}
and sd.id=depart_id )overCount
FROM
sys_depart sd
left join sys_factory_info sfi on sfi.depart_id=sd.id
left join sys_area sa on sa.id=sfi.pro_county
where depart_type = 1
order by overCount desc
</select>
<select id="getEquipAlarm" resultType="java.util.Map">
SELECT
SELECT
sfi.depart_id departId,
sfi.depart_name departName,
sa.area_name areaName
......
sk-base-common/src/main/java/com/skua/modules/alarmtmp/service/ISysFactoryDeviceService.java
......@@ -11,4 +11,6 @@ import java.util.List;
public interface ISysFactoryDeviceService extends IService<SysFactoryDevice> {
List<SysFactoryDevice> getList();
List<SysFactoryDevice> getListByDepart(String departId);
}
......
sk-base-common/src/main/java/com/skua/modules/alarmtmp/service/impl/SysFactoryDeviceServiceImpl.java
......@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
......@@ -24,4 +25,18 @@ public class SysFactoryDeviceServiceImpl extends ServiceImpl<SysFactoryDeviceMap
public List<SysFactoryDevice> getList() {
return factoryDeviceMapper.getList();
}
@Override
public List<SysFactoryDevice> getListByDepart(String departId) {
List<SysFactoryDevice> result = new ArrayList<>();
List<SysFactoryDevice> list = factoryDeviceMapper.getList();
if(list.size() > 0){
for (SysFactoryDevice device : list) {
if(departId.equals(device.getDepartId())){
result.add(device);
}
}
}
return result;
}
}
......
sk-module-alarm/src/main/java/com/skua/modules/controller/NewAlarmRecordHistoryController.java
......@@ -46,7 +46,7 @@ import java.util.stream.Collectors;
public class NewAlarmRecordHistoryController {
@Autowired
private AlarmRecordHistoryService alarmRecordHistoryService;
@Autowired
private IFlowService flowService;
@Autowired
......@@ -74,7 +74,6 @@ public class NewAlarmRecordHistoryController {
@ApiOperation(value = "报警记录反馈统计", notes = "报警记录反馈统计")
@GetMapping(value = "/getHandAlarmStatistics")
public Result<Map<String, Object>> getHandAlarmStatistics(AlarmRecordHistoryVO alarmRecordHistoryVO) {
Result<Map<String, Object>> result = new Result<>();
if (StringUtils.isBlank(alarmRecordHistoryVO.getDepartId())) {
String departIds = BaseContextHandler.getDeparts();
......@@ -154,7 +153,7 @@ public class NewAlarmRecordHistoryController {
}
return result;
}
@AutoLog(value = "报警处理")
@ApiOperation(value = "报警处理", notes = "报警处理")
@PostMapping(value = "/task-handle")
......@@ -163,7 +162,7 @@ public class NewAlarmRecordHistoryController {
alarmRecordHistoryService.taskHandle(result,alarmRecordHistory);
return result;
}
/**
* 报警记录 分页列表查询
......@@ -200,4 +199,4 @@ public class NewAlarmRecordHistoryController {
}
}
\ No newline at end of file
}
......
sk-module-alarm/src/main/java/com/skua/modules/quartz/DeviceStatusJob.java
package com.skua.modules.quartz;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.skua.core.util.DateUtils;
import com.skua.modules.alarmtmp.entity.*;
......@@ -20,6 +21,7 @@ import org.springframework.stereotype.Component;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
......@@ -104,11 +106,11 @@ public class DeviceStatusJob implements Job {
List<Map<String, Object>> facList = sysFactoryInfoService.queryAllFacListStatus();
facList.forEach(v -> {
//查询plc状态和网关状态
String factoryId = (String) v.get("depart_id");
String departId = (String) v.get("depart_id");
Integer lineStatusOld = (Integer) v.get("factory_status");
Integer lineStatusNew = -1;
QueryWrapper<SysFactoryDeviceChild> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("depart_id", factoryId);
queryWrapper.eq("depart_id", departId);
List<SysFactoryDeviceChild> list = sysFactoryDeviceChildService.list(queryWrapper);
if (list != null && list.size() > 0) {
boolean flag = false;
......@@ -127,10 +129,8 @@ public class DeviceStatusJob implements Job {
}
if (lineStatusNew == -1) {
//没有配置plc 通过网关判断是否在线
QueryWrapper<SysFactoryDevice> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("depart_id", factoryId);
queryWrapper1.in("device_status", 1, 0);
List<SysFactoryDevice> factoryDevices = sysFactoryDeviceService.list(queryWrapper1);
List<SysFactoryDevice> factoryDevices = new ArrayList<>();
factoryDevices = sysFactoryDeviceService.getListByDepart(departId);
if (factoryDevices != null && factoryDevices.size() > 0) {
boolean flag = false;
for (SysFactoryDevice sysFactoryDevice : factoryDevices) {
......@@ -155,31 +155,30 @@ public class DeviceStatusJob implements Job {
if (lineStatusOld == 1) {
//断线
// todo 断线短信
factoryOffLineStatus(now, factoryId, "add", "fac", factoryId);
factoryOffLineStatus(now, departId, "add", "fac", departId);
//查询报警配置 报警
addAlarmRecord(factoryId, "", now, factoryId, "重要报警", "add", "6", "水厂断线报警配置");
addAlarmRecord(departId, "", now, departId, "重要报警", "add", "6", "水厂断线报警配置");
//更新状态 更新最后在线时间
sysFactoryInfoService.updFacStatus(lineStatusNew, factoryId, now);
sysFactoryInfoService.updFacStatus(lineStatusNew, departId, now);
} else {
//不更新时间最后在线时间
sysFactoryInfoService.updFacStatus(lineStatusNew, factoryId, null);
sysFactoryInfoService.updFacStatus(lineStatusNew, departId, null);
}
} else if (lineStatusNew == 1) {
if (lineStatusOld == 0) {
// 上线
// todo 上线短信
factoryOffLineStatus(now, factoryId, "upd", "fac", factoryId);
factoryOffLineStatus(now, departId, "upd", "fac", departId);
//查询报警配置 报警
addAlarmRecord(factoryId, "", now, factoryId, "重要报警", "upd", "6", "水厂断线报警配置");
addAlarmRecord(departId, "", now, departId, "重要报警", "upd", "6", "水厂断线报警配置");
//更新状态 更新最后在线时间
sysFactoryInfoService.updFacStatus(lineStatusNew, factoryId, now);
sysFactoryInfoService.updFacStatus(lineStatusNew, departId, now);
} else {
//更新状态 更新最后在线时间
sysFactoryInfoService.updFacStatus(lineStatusNew, factoryId, now);
sysFactoryInfoService.updFacStatus(lineStatusNew, departId, now);
}
} else {
//更新状态 更新最后在线时间
sysFactoryInfoService.updFacStatus(lineStatusNew, factoryId, null);
sysFactoryInfoService.updFacStatus(lineStatusNew, departId, null);
}
});
log.info("更新厂站状态成功");
......
sk-module-biz/src/main/java/com/skua/modules/threedimensional/controller/ThreeDController.java
......@@ -119,7 +119,7 @@ public class ThreeDController {
String status = "offline";
String departName = String.valueOf(deviceMap.get("departName"));
String deviceId = String.valueOf(deviceMap.get("deviceId"));
String sql = "SELECT count(1) FROM realtimedata WHERE factoryname ='" + deviceId + "' AND nm like'" + "%IoStatus%'" + " AND v = '" + "1'";
String sql = "SELECT count(1) FROM realtimedata WHERE factoryname ='" + deviceId + "' AND nm like '" + "%IoStatus%'" + " AND v = '" + "1'";
Map<String, Object> countMap = pgDb.queryForMap(sql);
Integer count = Integer.parseInt(String.valueOf(countMap.get("count")));
if (count > 0) {
......
sk-module-system/src/main/java/com/skua/modules/system/mapper/xml/SysFactoryInfoMapper.xml
......@@ -183,7 +183,7 @@
)
ORDER BY
depart_order
</select>
<select id="queryFactoryList" parameterType="java.lang.String"
resultType="com.skua.modules.system.vo.SysFactoryInfo.SysFactoryInfoVO">
......@@ -243,7 +243,9 @@
where depart_id=#{param2}
</update>
<select id="getAllFacListStatus" resultType="java.util.Map">
select depart_id,factory_status from sys_factory_info
select f.depart_id,f.factory_status from sys_factory_info f
left join sys_depart d on f.depart_id = d.id
where d.depart_type = 1 and depart_id not LIKE '%WSC%'
</select>
<select id="queryFactoryListByExport" parameterType="java.lang.String"
resultType="com.skua.modules.system.vo.SysFactoryInfo.SysFactoryInfoVO">
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!