From 9e8d09ec8c825872f732f98cad402cbc6a85959a Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 25 十二月 2025 19:50:39 +0800
Subject: [PATCH] Gis大屏库区弹窗提交
---
fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java | 64 +++++++++++++++++++++
fzzy-igdss-web/src/main/resources/static/group/gis.js | 56 +++++++++---------
fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupDeptData.java | 2
fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java | 2
4 files changed, 93 insertions(+), 31 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupDeptData.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupDeptData.java
index d0591a2..e87ae71 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupDeptData.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupDeptData.java
@@ -14,7 +14,7 @@
/**
* 鐩戠搴撳尯淇℃伅
*/
- private String deptId; //琛屾斂鍖哄垝缂栫爜
+ private String deptId; //搴撳尯缂栫爜
private String code; //琛屾斂鍖哄垝缂栫爜
private String county; //琛屾斂鍖哄悕绉�
private String deptName; //搴撳尯鍚嶇О
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java b/fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java
index 12a61a6..94feed3 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java
@@ -121,7 +121,7 @@
view.put("allArea", allArea);
//鑾峰彇鎵�鏈夊簱鍖�
- List<Dept> deptList = groupManager.getAllDept(user.getCompanyId());
+ List<GroupDeptData> deptList = groupManager.getDeptData(user.getCompanyId());
view.put("deptList", deptList);
//缁熻淇℃伅
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 b985e36..f65256e 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
@@ -125,6 +125,70 @@
return deptService.listDept(null, companyId, null);
}
+ /**
+ * 鑾峰彇搴撳尯灏佽淇℃伅
+ * @param companyId
+ * @return
+ */
+ public List<GroupDeptData> getDeptData(String companyId) {
+
+ List<GroupDeptData> list = new ArrayList<>();
+ GroupDeptData deptData;
+ List<Dept> deptList = deptService.getDeptData();
+ if (null != deptList && !deptList.isEmpty()) {
+ List<Depot> depotList;
+ for (Dept dept : deptList) {
+ deptData = new GroupDeptData();
+ deptData.setDeptId(dept.getId());
+ deptData.setDeptName(dept.getKqmc());
+ deptData.setCode(dept.getXzqhdm());
+ deptData.setCounty(dept.getXzqhmc());
+ deptData.setJd(dept.getJd());
+ deptData.setWd(dept.getWd());
+
+ //缁熻浠撳簱鏁�
+ depotList = depotService.getCacheDepotList(dept.getCompanyId(), dept.getId());
+ if (null != depotList && !depotList.isEmpty()) {
+ for (Depot depot : depotList) {
+ deptData.setDepotNumber(deptData.getDepotNumber() + 1);
+
+ if(StringUtils.isNotBlank(depot.getPledgeBank())){
+ deptData.setDepotBankNumber(deptData.getDepotBankNumber() + 1);
+ }
+
+ if(null == depot.getStorageReal()){
+ depot.setStorageReal(0.0);
+ }
+ deptData.setStorageNum(deptData.getStorageNum() + depot.getStorageReal()/1000);
+ }
+ }
+
+ //缁熻鍑哄叆搴撴暟閲�
+ InoutParam inoutParam = new InoutParam();
+ inoutParam.setDeptId(dept.getId());
+ inoutParam.setCompanyId(companyId);
+ inoutParam.setStart(DateUtil.getCurZero(new Date()));
+ inoutParam.setEnd(DateUtil.getNextZero(new Date()));
+ List<InoutRecord> inoutRecords = inoutRecordService.listInout(inoutParam);
+ if (null != inoutRecords && !inoutRecords.isEmpty()) {
+ for (InoutRecord inoutRecord : inoutRecords) {
+ if (Constant.TYPE_IN.equals(inoutRecord.getType())) {
+ deptData.setInNum(deptData.getInNum() + 1);
+ }
+ if (Constant.TYPE_OUT.equals(inoutRecord.getType())){
+ deptData.setOutNum(deptData.getOutNum() + 1);
+
+ }
+ }
+ }
+
+ list.add(deptData);
+ }
+ }
+
+ return list;
+ }
+
/**
* 澶у睆棣栭〉缁熻淇℃伅锛氫紒涓氭暟銆佸簱鍖烘暟銆佷粨搴撴暟銆佽川鎶间粨鏁般�佹暎绮強鎴愬搧绮暟銆佸垎鍝佺搴撳瓨鏁�
diff --git a/fzzy-igdss-web/src/main/resources/static/group/gis.js b/fzzy-igdss-web/src/main/resources/static/group/gis.js
index 6e104f9..5c84d60 100644
--- a/fzzy-igdss-web/src/main/resources/static/group/gis.js
+++ b/fzzy-igdss-web/src/main/resources/static/group/gis.js
@@ -14,7 +14,7 @@
//鎵�鏈夊簱鍖�
if (deptList) {
for (var i = 0; i < deptList.length; i++) {
- deptListMap[deptList[i].id] = deptList[i];
+ deptListMap[deptList[i].deptId] = deptList[i];
}
}
//鎵�鏈夌渷甯�
@@ -175,7 +175,7 @@
if (province && province.length > 0) {
var str1 = province.substring(0, 2);
for (var i = 0; i < deptList.length; i++){
- if(deptList[i].xzqhdm.startsWith(str1)){
+ if(deptList[i].code.startsWith(str1)){
list.push(deptList[i]);
}
}
@@ -184,7 +184,7 @@
if (city && city.length > 0) {
var str2 = city.substring(0, 4);
for (var i = 0; i < deptList.length; i++) {
- if(deptList[i].xzqhdm.startsWith(str2)){
+ if(deptList[i].code.startsWith(str2)){
list.push(deptList[i]);
}
}
@@ -192,7 +192,7 @@
//鍖哄幙
if (county && county.length > 0) {
for (var i = 0; i < deptList.length; i++) {
- if(deptList[i].xzqhdm === county){
+ if(deptList[i].code === county){
list.push(deptList[i]);
}
}
@@ -306,13 +306,12 @@
html += "<div class=\"sup-menu-box\">" +
"<p>" +
"<span class=\"i-icon32 fl\"><img src=\"/img/web/group/icon-kuqu.png\"/></span>" +
- "<a href=\"#\" onclick=\"showAreaInfo('" + areas[k].id + "')\">" + areas[k].kqmc + "</a>" +
+ "<a href=\"#\" onclick=\"showAreaInfo('" + areas[k].deptId + "')\">" + areas[k].deptName + "</a>" +
"</p>" +
"</div>";
}
}
- html += "</li>" +
- "</ul>";
+ html += "</li></ul>";
}
} else {
//娌℃湁瀛愯妭鐐癸紝鐩存帴灏辨槸搴撳尯
@@ -325,13 +324,12 @@
"<i class=\"i-icon fl\"><img src=\"/img/web/group/icon-sj.png\"/></i>" +
"<a href=\"###\" onclick=\"renderAreas('" + areas[k].code + "')\">" +
"<span class=\"i-icon32 fl\"><img src=\"/img/web/group/icon-kuqu.png\"/></span>" +
- (areas[k].name ? areas[k].name : "") +
+ (areas[k].deptName ? areas[k].deptName : "") +
"</a>" +
"</div>";
html += "<div class=\"sup-menu-box\">" +
"</div>";
- html += "</li>" +
- "</ul>";
+ html += "</li></ul>";
}
}
@@ -467,7 +465,7 @@
* 鍒涘缓淇℃伅绐楀彛
*/
function createInfoWindow(deptArea) {
- var deptAreaId = deptArea.id;
+ var deptAreaId = deptArea.deptId;
var content = "<div class=\"BMap_bubble_pop\" style=\"padding: 0px 8px; position: relative; top:0px !important;left:0px !important;cursor: default; border: 1px solid rgb(221, 221, 221); background-color: rgb(255, 255, 255); border-radius: 10px; left: 837px; top: -46px; width: 376px;\">" +
"<div class=\"BMap_bubble_top\" style=\"height:31px\">" +
"<div class=\"BMap_bubble_title\" style=\"line-height: 30px; overflow: hidden; height: 30px; white-space: nowrap; color: rgb(51, 51, 51); width: 376px;\">" +
@@ -486,10 +484,10 @@
'<div style=\"height:100%;box-sizing:border-box;\">' +
'<div style="height: 34px;">' +
'<div style="width: 320px;float: left;">';
- if (deptArea.kqmc.length > 17) {
- content += '<h3 style="margin:0 0 10px 0;line-height:24px;font-size:14px;color:#fff;">' + (deptArea.kqmc ? deptArea.kqmc : "娌℃湁鑾峰彇鍒板簱鍖轰俊鎭�") + '</h3>';
+ if (deptArea.deptName.length > 17) {
+ content += '<h3 style="margin:0 0 10px 0;line-height:24px;font-size:14px;color:#fff;">' + (deptArea.deptName ? deptArea.deptName : "娌℃湁鑾峰彇鍒板簱鍖轰俊鎭�") + '</h3>';
} else {
- content += '<h3 style="margin:0 0 10px 0;line-height:24px;font-size:18px;color:#fff;">' + (deptArea.kqmc ? deptArea.kqmc : "娌℃湁鑾峰彇鍒板簱鍖轰俊鎭�") + '</h3>';
+ content += '<h3 style="margin:0 0 10px 0;line-height:24px;font-size:18px;color:#fff;">' + (deptArea.deptName ? deptArea.deptName : "娌℃湁鑾峰彇鍒板簱鍖轰俊鎭�") + '</h3>';
}
content += '</div>' +
'<div style="width: 40px;float: left;">' +
@@ -497,38 +495,38 @@
'</div>' +
'</div>' +
- '<p style="line-height:24px;font-size:12px;color:#fff;margin-right: 15px;"><img src="/img/web/group/icon-address.png" alt="" style="float:left;width: 16px;height: 16px;margin-right:3px;margin-top: 5px;"/>' + (deptArea.kqdz ? deptArea.kqdz + "(" + deptArea.jd + "," + deptArea.wd + ")" : "娌℃湁鑾峰彇鍒板簱鍖轰俊鎭�") + '</P>' +
+ '<p style="line-height:24px;font-size:12px;color:#fff;margin-right: 15px;"><img src="/img/web/group/icon-address.png" alt="" style="float:left;width: 16px;height: 16px;margin-right:3px;margin-top: 5px;"/>' + (deptArea.county ? deptArea.county : "娌℃湁鑾峰彇鍒板簱鍖轰俊鎭�") + '</P>' +
'<div class="right-topInfo-kd " style="height: 80px;width: 270px;margin: 5px auto 10px auto;">' +
'<div class="right-topInfo-kd-item">' +
- '<h3>绮粨涓暟(涓�)</h3>' +
- '<p>' + (deptArea.cfs ? deptArea.cfs : 0) + '</p>' +
+ '<h3>褰撴棩鍏ュ簱鍗曟暟(涓�)</h3>' +
+ '<p>' + (deptArea.inNum) + '</p>' +
'</div>' +
'<div class="right-topInfo-kd-item">' +
- '<h3>娌圭綈涓暟(涓�)</h3>' +
- '<p>' + (deptArea.cfs ? deptArea.cfs : 0) + '</p>' +
+ '<h3>褰撴棩鍑哄簱鍗曟暟(涓�)</h3>' +
+ '<p>' + (deptArea.outNum) + '</p>' +
'</div>' +
'</div>' +
'<ul class="right-topInfo-kd-list right-topInfo-jg sup-topInfo-list">' +
'<li>';
- if (deptArea.cfs && (deptArea.cfs + "").length > 4) {
- content += '<p style="font-size: 22px">' + (deptArea.cfs ? deptArea.cfs.toFixed(3) : 0) + '</p>';
+ if (deptArea.depotNumber && (deptArea.depotNumber + "").length > 4) {
+ content += '<p style="font-size: 22px">' + (deptArea.depotNumber) + '</p>';
} else {
- content += '<p style="font-size: 22px">' + (deptArea.cfs ? deptArea.cfs.toFixed(3) : 0) + '</p>';
+ content += '<p style="font-size: 22px">' + (deptArea.depotNumber) + '</p>';
}
- content += '<h3>绮鍌ㄩ噺(鍚�)</h3>' +
+ content += '<h3>浠撳簱鏁�(涓�)</h3>' +
'</li>' +
'<li>';
- if (deptArea.cfs && (deptArea.cfs + "").length > 4) {
- content += '<p style="font-size: 22px">' + (deptArea.cfs ? deptArea.cfs.toFixed(3) : 0) + '</p>';
+ if (deptArea.depotBankNumber && (deptArea.depotBankNumber + "").length > 4) {
+ content += '<p style="font-size: 22px">' + (deptArea.depotBankNumber) + '</p>';
} else {
- content += '<p style="font-size: 22px">' + (deptArea.cfs ? deptArea.cfs.toFixed(3) : 0) + '</p>';
+ content += '<p style="font-size: 22px">' + (deptArea.depotBankNumber) + '</p>';
}
- content += '<h3>妞嶇墿娌瑰偍閲�(鍚�)</h3>' +
+ content += '<h3>璐ㄦ娂浠撴暟(涓�)</h3>' +
'</li>' +
'<li>' +
- '<p style="font-size: 22px" >' + (deptArea.zdmj ? deptArea.zdmj : 0) + '</p>' +
- '<h3>鍗犲湴闈㈢Н锛堛帯锛�</h3>' +
+ '<p style="font-size: 22px" >' + (deptArea.storageNum) + '</p>' +
+ '<h3>搴撳瓨鏁帮紙鍚級</h3>' +
'</li>' +
'</ul>' +
'<a href="javaScript:;" onclick="toHomeDetail(\'' + deptAreaId + '\')" class="sup-deatil-link"><img src="/img/web/group/spu-detail-btn.png" alt="" style="width:100%;height:100%;"/></a>' +
--
Gitblit v1.9.3