From a23f3acdf2a09dd056778d2217964a1878b66ea6 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期三, 25 三月 2026 15:42:26 +0800
Subject: [PATCH] 大屏首页，AI事件统计，添加当日库区网关掉线的针对文案表述
---
fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java | 39 ++++++++++---------
fzzy-igdss-web/src/main/resources/static/group/index.js | 68 +++++++++++++++++----------------
2 files changed, 56 insertions(+), 51 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java
index 48e673a..b30a1ee 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java
@@ -52,13 +52,12 @@
private SecCameraService cameraService;
@Resource
private BankService bankService;
-
@Resource
private PledgeContractService pledgeContractService;
-
-
@Resource
- private PledgeContractDepotService pledgeContractDepotService;
+ private PledgeContractDepotService pledgeContractDepotService;
+ @Resource
+ private GatewaySerService gatewaySerService;
/**
* 鑾峰彇鐪佸強涓嬪睘甯傚窞闆嗗悎
@@ -137,11 +136,11 @@
if (null == area) {
return null;
}
- List<DicArea> areaChildren = new ArrayList<>();
+ List<DicArea> areaChildren = new ArrayList<>();
List<DicArea> list = new ArrayList<>();
if (Constant.AREA_TYPE_1.equals(area.getType())) {
- //鏌ヨ鎵�鏈夌殑璐ㄦ娂鍚堝悓
+ //鏌ヨ鎵�鏈夌殑璐ㄦ娂鍚堝悓
List<PledgeContract> pledgeContractList = pledgeContractService.listAll(null);
//鏌ヨ鎵�鏈夌殑搴撳尯
List<Dept> depotList = deptService.listDept(null, ContextUtil.getCompanyId(), null);
@@ -158,12 +157,12 @@
IgdsBaseParam param = new IgdsBaseParam();
param.setParentId(pledgeContract.getId());
List<PledgeContractDepot> pledgeContractDepots = pledgeContractDepotService.listAll(param);
- if (null == pledgeContractDepots || pledgeContractDepots.isEmpty()){
+ if (null == pledgeContractDepots || pledgeContractDepots.isEmpty()) {
continue;
}
//鎵惧埌pledgeContractDepots涓殑deptId闆嗗悎锛屽苟鍘婚噸
List<String> deptIdList = pledgeContractDepots.stream().map(PledgeContractDepot::getPledgeDept).distinct().collect(Collectors.toList());
- if( deptIdList.contains(dept.getId())){
+ if (deptIdList.contains(dept.getId())) {
//浠巐ist涓壘鍒板綋鍓嶈川鎶奸摱琛岀殑鏁版嵁
DicArea pledgeBank = null;
int indexBank = -1;
@@ -174,11 +173,11 @@
break;
}
}
- if( null == pledgeBank){
+ if (null == pledgeBank) {
//鏈壘鍒拌川鎶奸摱琛屾暟鎹垯鏂板缓
pledgeBank = new DicArea();
pledgeBank.setCode(pledgeContract.getPledgeBank());
- pledgeBank.setName("璐ㄦ娂閾惰_"+pledgeContract.getPledgeBank());
+ pledgeBank.setName("璐ㄦ娂閾惰_" + pledgeContract.getPledgeBank());
//浠庨摱琛屾暟鎹腑鎵惧埌璐ㄦ娂閾惰鐨勪俊鎭�
for (Bank bank : bankList) {
if (pledgeContract.getPledgeBank().equals(bank.getId())) {
@@ -197,9 +196,9 @@
pledgeBank.getChildren().add(deptDic);
//鏂板璐ㄦ娂閾惰鏁版嵁鍒發ist涓�
areaChildren.add(pledgeBank);
- isPledge=true;
+ isPledge = true;
break;
- }else{
+ } else {
//娣诲姞璐ㄦ娂閾惰涓嬬殑搴撳尯鏁版嵁
DicArea deptDic = new DicArea();
deptDic.setCode(dept.getId());
@@ -211,14 +210,14 @@
}
pledgeBank.getChildren().add(deptDic);
//鏇存柊list涓殑璐ㄦ娂閾惰鏁版嵁
- areaChildren.set(indexBank,pledgeBank);
- isPledge=true;
+ areaChildren.set(indexBank, pledgeBank);
+ isPledge = true;
break;
}
}
}
- if(!isPledge){
+ if (!isPledge) {
DicArea deptDic = new DicArea();
deptDic.setCode(dept.getId());
deptDic.setName(dept.getKqmc());
@@ -231,7 +230,7 @@
}
}
List<DicArea> defaultBankChildren = defaultBank.getChildren();
- if (defaultBankChildren.size()>0) {
+ if (defaultBankChildren.size() > 0) {
areaChildren.add(defaultBank);
}
area.setChildren(areaChildren);
@@ -522,7 +521,11 @@
}
}
}
-
+ //鍒ゆ柇缃戝叧鏄惁鍦ㄧ嚎
+ GatewaySer cacheSerByDeptId = gatewaySerService.getCacheSerByDeptId(dept.getId());
+ if (null == cacheSerByDeptId || (null != cacheSerByDeptId && StringUtils.isNotBlank(cacheSerByDeptId.getStatus()) && cacheSerByDeptId.getStatus().equals(Constant.YN_N))) {
+ deptData.setDailyTotal(-1);
+ }
list.add(deptData);
}
}
@@ -599,7 +602,6 @@
}
-
public GroupGisData getGisDataByCompanyId() {
GroupGisData groupGisData = new GroupGisData();
@@ -662,6 +664,7 @@
return groupGisData;
}
+
/**
* 澶у睆棣栭〉-鎶撴媿璺熻釜淇℃伅
*
diff --git a/fzzy-igdss-web/src/main/resources/static/group/index.js b/fzzy-igdss-web/src/main/resources/static/group/index.js
index a5a3281..c38e7ce 100644
--- a/fzzy-igdss-web/src/main/resources/static/group/index.js
+++ b/fzzy-igdss-web/src/main/resources/static/group/index.js
@@ -98,27 +98,27 @@
html += '<li style="float: left; width: 246px;">';
html += '<div class="item">';
html += '<div class="pic">';
- html += '<img src="'+item.imgName+'" alt="">';
- html += '</div><div class="tit">'+item.snapTime+'</div>';
- html += '<div class="tit" style="white-space: nowrap;">'+deptListMap[item.deptId]+'</div>';
+ html += '<img src="' + item.imgName + '" alt="">';
+ html += '</div><div class="tit">' + item.snapTime + '</div>';
+ html += '<div class="tit" style="white-space: nowrap;">' + deptListMap[item.deptId] + '</div>';
html += '</div></li>';
})
- }else {
+ } else {
$.each(deptAllList, function (index, item) {
html += '<li style="float: left; width: 246px;">';
html += '<div class="item">';
html += '<div class="pic">';
html += '<img src="/img/img-fail.jpg" alt="">';
html += '</div><div class="tit">杩戞湡鏆傛棤鎶撴媿鍥�</div>';
- html += '<div class="tit" style="white-space: nowrap;">'+item.kqmc+'</div>';
+ html += '<div class="tit" style="white-space: nowrap;">' + item.kqmc + '</div>';
html += '</div></li>';
})
}
$("#snapList").html(html);
//鎶撴媿璺熻釜婊氬姩
- jQuery(".block2").slide({ mainCell: ".bd ul", autoPage: true, effect: "topLoop", autoPlay: true, vis: 4 });
- jQuery(".follow").slide({ mainCell: ".bd ul", autoPlay: true, effect: "leftMarquee", vis: 5, interTime: 40 });
+ jQuery(".block2").slide({mainCell: ".bd ul", autoPage: true, effect: "topLoop", autoPlay: true, vis: 4});
+ jQuery(".follow").slide({mainCell: ".bd ul", autoPlay: true, effect: "leftMarquee", vis: 5, interTime: 40});
}
@@ -126,8 +126,8 @@
* 搴撳尯瀹氭椂鍒囨崲
*/
function timing() {
- timer = setInterval(function() {
- if(deptNum === deptList.length){
+ timer = setInterval(function () {
+ if (deptNum === deptList.length) {
deptNum = 0;
}
@@ -148,11 +148,11 @@
//鍔犺浇鎸囧畾鍦板尯鍦板浘鍜岀偣浣�
function renderMapPoints(areaName) {
- if(!areaName){
+ if (!areaName) {
return;
}
var names = areaName.split(",");
- if(names.length < 1){
+ if (names.length < 1) {
return;
}
@@ -167,13 +167,13 @@
geoMap = [];
for (var j = 0; j < names.length; j++) {
for (var i = 0; i < all.length; i++) {
- if(all[i].properties.name === names[j]){
+ if (all[i].properties.name === names[j]) {
map.features.push(all[i]);
// if(all[i].properties.name === "浼婄妬鍝堣惃鍏嬭嚜娌诲窞"){
- geoMap.push({
- name: all[i].properties.centerName,
- value: [all[i].properties.center[0], all[i].properties.center[1], 12]
- });
+ geoMap.push({
+ name: all[i].properties.centerName,
+ value: [all[i].properties.center[0], all[i].properties.center[1], 12]
+ });
// }
// renderMap();
break;
@@ -193,7 +193,7 @@
echarts.registerMap('chinaMapOutline', map);
var option = {
- backgroundColor:'transparent',
+ backgroundColor: 'transparent',
tooltip: {
show: false,
trigger: 'item'
@@ -310,7 +310,7 @@
type: 'effectScatter',
coordinateSystem: 'geo',
data: geoMap,
- symbolSize: function (val) {
+ symbolSize: function (val) {
return val[2];
},
rippleEffect: {
@@ -339,7 +339,7 @@
]
};
- myChart.setOption( option );
+ myChart.setOption(option);
mapChart = {"chart": myChart, "option": option};
}
@@ -354,15 +354,17 @@
var flag = false;
if (deptList != null && deptList.length > 0) {
$.each(deptList, function (index, item) {
- if(item.dailyTotal === 0){
+ if (item.dailyTotal === 0) {
num1 = '褰撴棩涓�鍒囨甯�';
- }else{
- num1 = '褰撴棩鏁伴噺'+ item.dailyTotal + '涓�';
+ } else if (item.dailyTotal < 0) {
+ num1 = '鏈娴嬪埌缃戝叧';
+ } else {
+ num1 = '褰撴棩鏁伴噺' + item.dailyTotal + '涓�';
}
- if(item.warnNum7 === 0){
+ if (item.warnNum7 === 0) {
num7 = '杩戜竷澶╀竴鍒囨甯�';
- }else{
- num7 = '杩戜竷澶╂暟閲�'+ item.warnNum7 + '涓�';
+ } else {
+ num7 = '杩戜竷澶╂暟閲�' + item.warnNum7 + '涓�';
}
html += '<div class="panel-content-body-tr">';
if (item.dailyTotal > 0) {
@@ -379,14 +381,14 @@
// html += '<span class="body-item sp" style="color: #f37b3d;">' + num1+ '</span>';
// html += '<span class="body-item sp" style="color: #f37b3d;">' + num7 + '</span>';
// }else {
- html += '<span class="body-item sp" style="flex: 1.5;">' + item.deptName + '</span>';
- html += '<span class="body-item sp">' + num1 + '</span>';
- html += '<span class="body-item sp">' + num7 + '</span>';
+ html += '<span class="body-item sp" style="flex: 1.5;">' + item.deptName + '</span>';
+ html += '<span class="body-item sp">' + num1 + '</span>';
+ html += '<span class="body-item sp">' + num7 + '</span>';
// }
html += '</div>';
})
}
- if(flag){
+ if (flag) {
$("#panel-title").html('搴撳尯AI浜嬩欢淇℃伅 <i class="dot"></i>');
}
$("#inventoryInfo").html(html);
@@ -441,13 +443,13 @@
function updateDeptMap() {
var points = [];
- $.each(deptList, function(index, item) {
+ $.each(deptList, function (index, item) {
var val = [];
var name = '';
- if(index === deptNum){
+ if (index === deptNum) {
name = item.deptName;
val = [item.jd, item.wd, 17];
- }else {
+ } else {
val = [item.jd, item.wd, 8];
}
points.push({
@@ -563,7 +565,7 @@
function initChart() {
/* 搴撳瓨鍥捐〃鍔犺浇 */
allInventoryChartLoad(
- ['灏忛害', '鐜夌背', '绋昏胺', '鎴愬搧绮�', '鎴愬搧娌�', '鍏朵粬'],
+ ['灏忛害', '鐜夌背', '绋昏胺', '鎴愬搧绮�', '鎴愬搧娌�', '鍏朵粬'],
[1000, 1200, 1500, 1300, 1100, 1600]
);
}
--
Gitblit v1.9.3