From 4558adddaef81753e04d74a865abb318afb71e9b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 16 十二月 2025 17:01:55 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireDeviceStatusListResponse.java | 2
admin/src/components/business/OperaJkSketchLineListWindow.vue | 13 +++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java | 17 ++-
server/system_gateway/src/main/resources/bootstrap-dev.yml | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRuleDetail.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 140 +++++++++++++++++++++++++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PageRegionInfoResponse.java | 4 +
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/CarmeraListVO.java | 2
10 files changed, 174 insertions(+), 14 deletions(-)
diff --git a/admin/src/components/business/OperaJkSketchLineListWindow.vue b/admin/src/components/business/OperaJkSketchLineListWindow.vue
index c1e0e32..4d35f22 100644
--- a/admin/src/components/business/OperaJkSketchLineListWindow.vue
+++ b/admin/src/components/business/OperaJkSketchLineListWindow.vue
@@ -17,7 +17,8 @@
<div style="display: flex;margin-top: 20px" class="orange">
<div style="flex: 1" >绾胯矾鍘熷鎬昏矾绋嬶細
<span v-if="(model.originDistance ||0) > 0 || (model.status||0) != 0" class="red" style="font-weight: bold"> {{((model.originDistance ||0)/1000).toFixed(2)}}</span>
- <span v-if="(model.originDistance ||0) == 0 && (model.status||0) == 0" class="blue" style="font-weight: bold;cursor: pointer" @click="initDistance"> 鐐瑰嚮鑾峰彇 </span> 鍏噷锛�
+ <span v-if="(model.originDistance ||0) == 0 && (model.status||0) == 0 && !distancing" class="blue" style="font-weight: bold;cursor: pointer" @click="initDistance"> 鐐瑰嚮鑾峰彇 </span>
+ <span v-if="(model.originDistance ||0) == 0 && (model.status||0) == 0 && distancing" class="red" style="font-weight: bold;cursor: pointer"> 姝ｅ湪鑾峰彇 </span> 鍏噷锛�
<span v-if="model.status ==2">浼樺寲鍚庢�昏矾绋�:<span class="green" style="font-weight: bold"> {{((model.distance ||0)/1000).toFixed(2)}} </span> 鍏噷</span>
</div>
</div>
@@ -103,6 +104,7 @@
data () {
return {
// 琛ㄥ崟鏁版嵁
+ distancing:false,
model: {
},
dataList: [],
@@ -121,6 +123,7 @@
this.visible = true
this.model = target
this.loadList()
+ this.distancing =false
if(this.model.optStatus === 1){
this.loadListNew()
}
@@ -143,6 +146,10 @@
},
initDistance () {
var that = this
+ if(this.distancing){
+ return
+ }
+ this.distancing=true
initOriginDistance({
id: this.model.id
}).then(res => {
@@ -151,6 +158,10 @@
that.model.distance = res.distance
that.loadList()
}
+ }).catch(e => {
+ this.$tip.apiFailed(e)
+ }).finally(() => {
+ that.distancing = false
})
},
viewCustomer (row) {
diff --git a/server/system_gateway/src/main/resources/bootstrap-dev.yml b/server/system_gateway/src/main/resources/bootstrap-dev.yml
index acef110..a375799 100644
--- a/server/system_gateway/src/main/resources/bootstrap-dev.yml
+++ b/server/system_gateway/src/main/resources/bootstrap-dev.yml
@@ -7,7 +7,7 @@
discovery:
server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
- namespace: wuhu_visit_dev1
+ namespace: wuhu_visit_dev
username: nacos
password: nacos
gateway:
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
index 7be6fdf..d965373 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
@@ -320,11 +320,10 @@
@PostMapping("/regionList")
public ApiResponse<List<PageRegionInfoResponse> > getRegionList(HttpServletResponse response, @RequestHeader(Constants.HEADER_USER_TOKEN) String token ){
CarmeraListVO param =new CarmeraListVO();
- param.setWithCameras(1);
+ param.setWithCameras(2);
List<PageRegionInfoResponse> result = new ArrayList<>();
try {
result = boardService.getRegionTree( param);
-
}catch (Exception e){
}
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
index 49606a5..2e1efaa 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
@@ -16,7 +16,7 @@
discovery:
server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
- namespace: wuhu_visit_dev1
+ namespace: wuhu_visit_dev
username: nacos
password: nacos
knife4j:
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireDeviceStatusListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireDeviceStatusListResponse.java
index b9f0d5b..5d66e3c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireDeviceStatusListResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireDeviceStatusListResponse.java
@@ -10,7 +10,7 @@
private String regionName;// String false
private String deviceIndexCode;// String false
private String deviceType;// Number false
- private String unitStatus ;//Number false
+ private Integer unitStatus ;//Number false閮ㄤ欢鐘舵�侊紝0锛氭湭娉ㄥ唽 1锛氭甯� 2: 淇涓� 3锛氬紓甯哥姸鎬侊紙淇涓姸鎬佺洰鍓嶆病鐢ㄥ埌锛屾湭娉ㄥ唽鏃惰澶囨病鏈夊湪绂荤嚎鐘舵�侊級 绌�-鎵�鏈夌姸鎬�
private String online;// Number false
private String collectTime;// String false
private String faultType;// String false
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PageRegionInfoResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PageRegionInfoResponse.java
index 0937cce..981013a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PageRegionInfoResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PageRegionInfoResponse.java
@@ -21,4 +21,8 @@
private List<PageRegionInfoResponse> childList;
@ApiModelProperty(value = "鐩戞帶鐐归泦鍚�")
private List<CarmeraListVO> carmeraList;
+ @ApiModelProperty(value = "娑堥槻浼犳劅鍣ㄩ泦鍚�")
+ private List<CarmeraListVO> deviceList;
+ @ApiModelProperty(value = "娑堥槻璁惧闆嗗悎")
+ private List<CarmeraListVO> sensorList;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRuleDetail.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRuleDetail.java
index 612982b..6eacb96 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRuleDetail.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRuleDetail.java
@@ -84,6 +84,9 @@
@ApiModelProperty(value = "鐩戞帶鐐逛富閿�")
@ExcelColumn(name="鐩戞帶鐐逛富閿�")
private String deviceId;
+ @ApiModelProperty(value = "鍏宠仈璁惧绫诲瀷 0-鐩戞帶鐐� 1-娑堥槻璁惧 2-娑堥槻浼犳劅鍣�")
+ @ExcelColumn(name="鍏宠仈璁惧绫诲瀷 0-鐩戞帶鐐� 1-娑堥槻璁惧 2-娑堥槻浼犳劅鍣�")
+ private Integer deviceType;
@ApiModelProperty(value = "鍛婅绫诲瀷缂栫爜")
@TableField(exist = false)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/CarmeraListVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/CarmeraListVO.java
index 2546492..e7a3843 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/CarmeraListVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/CarmeraListVO.java
@@ -12,7 +12,7 @@
@Data
public class CarmeraListVO {
- @ApiModelProperty(value = "鐩戞帶鐐瑰悕绉�")
+ @ApiModelProperty(value = "璁惧鍚嶇О")
private String name;
@ApiModelProperty(value = "鍞竴绱㈠紩")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java
index 03a5919..4f4f587 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java
@@ -246,10 +246,13 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ョ嚎璺凡琚紭鍖栵紝宸叉棤娉曡绠楀師濮嬭矾绾胯矾绋嬫暟");
}
checkJketchCustomerLocation(model,true);
- model.setEditDate(new Date());
- model.setDistance(model.getOriginDistance());
- jkSketchMapper.updateById(model);
- return model;
+ JkSketch update = new JkSketch();
+ update.setId(model.getId());
+ update.setEditDate(new Date());
+ update.setDistance(model.getOriginDistance());
+ update.setOriginDistance(model.getOriginDistance());
+ jkSketchMapper.updateById(update);
+ return update;
}
@Override
@@ -641,7 +644,7 @@
queryWrapper.selectAll(JkSketchCustomer.class )
.selectAs(JkCustomer::getName,JkSketchCustomer::getName)
.selectAs(JkCustomer::getCode,JkSketchCustomer::getCode)
- .selectAs(JkCustomer::getDistance,JkSketchCustomer::getDistanceJson)
+// .selectAs(JkCustomer::getDistance,JkSketchCustomer::getDistanceJson)
.selectAs(JkCustomer::getLongitude,JkSketchCustomer::getLongitude)
.selectAs(JkCustomer::getLatitude,JkSketchCustomer::getLatitude)
.selectAs(JkCustomer::getStartDistance,JkSketchCustomer::getStartDistance)
@@ -766,7 +769,7 @@
queryWrapper.selectAll(JkSketchCustomer.class )
.selectAs(JkCustomer::getName,JkSketchCustomer::getName)
.selectAs(JkCustomer::getCode,JkSketchCustomer::getCode)
- .selectAs(JkCustomer::getDistance,JkSketchCustomer::getDistanceJson)
+// .selectAs(JkCustomer::getDistance,JkSketchCustomer::getDistanceJson)
.selectAs(JkCustomer::getLongitude,JkSketchCustomer::getLongitude)
.selectAs(JkCustomer::getLatitude,JkSketchCustomer::getLatitude)
.selectAs(JkCustomer::getStartDistance,JkSketchCustomer::getStartDistance)
@@ -1252,7 +1255,7 @@
.selectAs(JkCustomer::getName,JkSketchCustomer::getName)
.selectAs(JkCustomer::getCode,JkSketchCustomer::getCode)
.selectAs(JkCustomer::getDistanceStatus,JkSketchCustomer::getDistanceStatus)
- .selectAs(JkCustomer::getDistance,JkSketchCustomer::getDistanceJson)
+// .selectAs(JkCustomer::getDistance,JkSketchCustomer::getDistanceJson)
.selectAs(JkCustomer::getLongitude,JkSketchCustomer::getLongitude)
.selectAs(JkCustomer::getLatitude,JkSketchCustomer::getLatitude)
.selectAs(JkCustomer::getStartDistance,JkSketchCustomer::getStartDistance)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index 552d487..fe4025f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -244,9 +244,45 @@
}
if(Constants.equalsInteger(req.getWithCameras(),Constants.ONE)){
initReginCameralList(allList,req.getName());//鑾峰彇鍏ㄩ儴鐩戞帶鐐规暟鎹�
+ }else if(Constants.equalsInteger(req.getWithCameras(),Constants.TWO)){
+ initReginCameralList(allList,req.getName());//鑾峰彇鍏ㄩ儴鐩戞帶鐐规暟鎹�
+ initReginFireDeviveList(allList,req.getName());//鑾峰彇鍏ㄩ儴鐩戞帶鐐规暟鎹�
+ initReginSensorList(allList,req.getName());//鑾峰彇鍏ㄩ儴鐩戞帶鐐规暟鎹�
}
List<PageRegionInfoResponse> data = new RegionTreeVO(allList).buildTree();
return data;
+ }
+ private void initReginFireDeviveList(List<PageRegionInfoResponse> allList,String name) {
+ List<CarmeraListVO> carmeraListVOList = fireDeviceList();
+ if(carmeraListVOList!=null && carmeraListVOList.size()>0){
+ for(PageRegionInfoResponse p : allList){
+ for(CarmeraListVO c : carmeraListVOList){
+ if(StringUtils.equals(p.getIndexCode(),c.getReginCode())
+ && (StringUtils.contains(c.getName(),name) ||StringUtils.isBlank(name))){
+ if(p.getCarmeraList()==null){
+ p.setCarmeraList(new ArrayList<>());
+ }
+ p.getCarmeraList().add(c);
+ }
+ }
+ }
+ }
+ }
+ private void initReginSensorList(List<PageRegionInfoResponse> allList,String name) {
+ List<CarmeraListVO> carmeraListVOList = sensorList();
+ if(carmeraListVOList!=null && carmeraListVOList.size()>0){
+ for(PageRegionInfoResponse p : allList){
+ for(CarmeraListVO c : carmeraListVOList){
+ if(StringUtils.equals(p.getIndexCode(),c.getReginCode())
+ && (StringUtils.contains(c.getName(),name) ||StringUtils.isBlank(name))){
+ if(p.getCarmeraList()==null){
+ p.setCarmeraList(new ArrayList<>());
+ }
+ p.getCarmeraList().add(c);
+ }
+ }
+ }
+ }
}
private void initReginCameralList(List<PageRegionInfoResponse> allList,String name) {
CarmeraListVO re = new CarmeraListVO();
@@ -346,6 +382,110 @@
}
return data;
}
+ public List<CarmeraListVO> sensorList(){
+ List<SensorStatusListResponse> allList = new ArrayList<>();
+ boolean hasNext = true;
+ int curTotal = 0;
+ int curPage = 1;
+ while (hasNext){
+ //鍒嗛〉閬嶅巻寰幆鏌ヨ鎵�鏈夐棬绂佽澶囨暟鎹�
+ SensorStatusListRequest param = new SensorStatusListRequest();
+ param.setRegionIndexCode("-1");
+ param.setPageSize(100);
+ param.setPageNo(curPage);
+ BaseResponse<BaseListPageResponse<SensorStatusListResponse>> response = HKService.sensorStatusSearch(param);
+ if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝娴峰悍鍚屾鏁版嵁澶辫触~");
+ }
+ BaseListPageResponse<SensorStatusListResponse> r = response.getData();
+ curTotal += 100;
+ if(curTotal >= r.getTotal()){
+ hasNext = false;
+ }
+ if(r.getList() == null || r.getList().size()==0){
+ hasNext =false;
+ }else{
+ allList.addAll(r.getList());
+ }
+ curPage++;
+ }
+
+ List<CarmeraListVO> data = new ArrayList<>();
+ for(SensorStatusListResponse p : allList){
+ CarmeraListVO t = new CarmeraListVO();
+ t.setIndexCode(p.getIndexCode());
+ t.setReginCode(p.getRegionIndexCode());
+ t.setName(p.getCn());
+ t.setStatus(p.getUnitStatus());
+ //0锛氭湭娉ㄥ唽 1锛氭甯� 2: 淇涓� 3锛氬紓甯哥姸鎬�
+ if(t.getStatus()!=null && t.getStatus() == 0){
+ t.setStatusName("鏈敞鍐�");
+ }
+ if(t.getStatus()!=null && t.getStatus() == 1){
+ t.setStatusName("姝ｅ父");
+ }
+ if(t.getStatus()!=null && t.getStatus() == 2){
+ t.setStatusName("淇涓�");
+ }
+ if(t.getStatus()!=null && t.getStatus() == 3){
+ t.setStatusName("寮傚父鐘舵��");
+ }
+ data.add(t);
+ }
+ return data;
+ }
+ public List<CarmeraListVO> fireDeviceList(){
+ List<FireDeviceStatusListResponse> allList = new ArrayList<>();
+ boolean hasNext = true;
+ int curTotal = 0;
+ int curPage = 1;
+ while (hasNext){
+ //鍒嗛〉閬嶅巻寰幆鏌ヨ鎵�鏈夐棬绂佽澶囨暟鎹�
+ FireDeviceStatuslListRequest param = new FireDeviceStatuslListRequest();
+ param.setRegionIndexCode("-1");
+ param.setPageSize(100);
+ param.setPageNo(curPage);
+ BaseResponse<BaseListPageResponse<FireDeviceStatusListResponse>> response = HKService.fireDeviceStatusSearch(param);
+ if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝娴峰悍鍚屾鏁版嵁澶辫触~");
+ }
+ BaseListPageResponse<FireDeviceStatusListResponse> r = response.getData();
+ curTotal += 100;
+ if(curTotal >= r.getTotal()){
+ hasNext = false;
+ }
+ if(r.getList() == null || r.getList().size()==0){
+ hasNext =false;
+ }else{
+ allList.addAll(r.getList());
+ }
+ curPage++;
+ }
+
+ List<CarmeraListVO> data = new ArrayList<>();
+ for(FireDeviceStatusListResponse p : allList){
+ CarmeraListVO t = new CarmeraListVO();
+ t.setIndexCode(p.getIndexCode());
+ t.setReginCode(p.getRegionIndexCode());
+ t.setName(p.getCn());
+ t.setStatus(p.getUnitStatus());
+ //0锛氭湭娉ㄥ唽 1锛氭甯� 2: 淇涓� 3锛氬紓甯哥姸鎬�
+ if(t.getStatus()!=null && t.getStatus() == 0){
+ t.setStatusName("鏈敞鍐�");
+ }
+ if(t.getStatus()!=null && t.getStatus() == 1){
+ t.setStatusName("姝ｅ父");
+ }
+ if(t.getStatus()!=null && t.getStatus() == 2){
+ t.setStatusName("淇涓�");
+ }
+ if(t.getStatus()!=null && t.getStatus() == 3){
+ t.setStatusName("寮傚父鐘舵��");
+ }
+ data.add(t);
+ }
+ return data;
+ }
@Override
public List<PageFireChannelInfoResponse> fireChannelList(){
List<PageFireChannelInfoResponse> allList = new ArrayList<>();
--
Gitblit v1.9.3