From 18ab70b5f19fce88ba91c08689f2f39bb9784ecf Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 25 十一月 2025 16:18:15 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 2
admin/src/views/business/deviceBroadcast.vue | 12 +-
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketchCustomer.java | 3
admin/src/views/business/deviceBroadcastChannel.vue | 103 +++++++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/ClusterCustomKMeans.java | 20 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java | 31 +++-
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 12 +-
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java | 5
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/TspSolver.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java | 147 ++++++++++++++++++++++++
13 files changed, 317 insertions(+), 29 deletions(-)
diff --git a/admin/src/views/business/deviceBroadcast.vue b/admin/src/views/business/deviceBroadcast.vue
index c10e474..4731caa 100644
--- a/admin/src/views/business/deviceBroadcast.vue
+++ b/admin/src/views/business/deviceBroadcast.vue
@@ -23,10 +23,10 @@
>
<el-table-column label="搴忓彿" width="55" fixed><template slot-scope="scope" >{{scope.$index+1}}</template></el-table-column>
<el-table-column prop="name" label="鍚嶇О"></el-table-column>
- <el-table-column prop="hkId" label="骞挎挱鐐瑰敮涓�鏍囪瘑" min-width="200"></el-table-column>
- <el-table-column prop="channelInfo" label="骞挎挱鐐圭被鍨�"></el-table-column>
- <el-table-column prop="channelNo" label="閫氶亾鍙�"></el-table-column>
- <el-table-column prop="regionName" label="鍖哄煙鍚嶇О"></el-table-column>
+ <el-table-column prop="hkId" label="鍞竴鏍囪瘑" min-width="200"></el-table-column>
+ <el-table-column prop="channelInfo" label="绫诲瀷"></el-table-column>
+ <el-table-column prop="channelNo" label="璁惧鍙�"></el-table-column>
+ <el-table-column prop="regionName" label="鍖哄煙缂栫爜"></el-table-column>
<el-table-column prop="hkDate" label="鍚屾鏃堕棿"></el-table-column>
</el-table>
<pagination
@@ -37,7 +37,7 @@
</pagination>
</template>
<!-- 鏂板缓/淇敼 -->
-<!-- <OperaDeviceWindow ref="operaDeviceWindow" @success="handlePageChange"/>-->
+ <OperaDeviceWindow ref="operaDeviceWindow" @success="handlePageChange"/>
</TableLayout>
</template>
@@ -59,7 +59,7 @@
regionPathName: '',
isEntrance: '',
online: '',
- type: 3
+ type: 4
},
options: []
}
diff --git a/admin/src/views/business/deviceBroadcastChannel.vue b/admin/src/views/business/deviceBroadcastChannel.vue
new file mode 100644
index 0000000..c10e474
--- /dev/null
+++ b/admin/src/views/business/deviceBroadcastChannel.vue
@@ -0,0 +1,103 @@
+<template>
+ <TableLayout :permissions="['business:device:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form-item title="鍚嶇О" prop="name">
+ <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <ul class="toolbar">
+ <li><el-button type="primary" @click="synchronousData">鍚屾</el-button></li>
+ </ul>
+ <el-table
+ :height="tableHeightNew"
+ v-loading="isWorking.search"
+ :data="tableData.list"
+ stripe
+ >
+ <el-table-column label="搴忓彿" width="55" fixed><template slot-scope="scope" >{{scope.$index+1}}</template></el-table-column>
+ <el-table-column prop="name" label="鍚嶇О"></el-table-column>
+ <el-table-column prop="hkId" label="骞挎挱鐐瑰敮涓�鏍囪瘑" min-width="200"></el-table-column>
+ <el-table-column prop="channelInfo" label="骞挎挱鐐圭被鍨�"></el-table-column>
+ <el-table-column prop="channelNo" label="閫氶亾鍙�"></el-table-column>
+ <el-table-column prop="regionName" label="鍖哄煙鍚嶇О"></el-table-column>
+ <el-table-column prop="hkDate" label="鍚屾鏃堕棿"></el-table-column>
+ </el-table>
+ <pagination
+ @size-change="handleSizeChange"
+ @current-change="handlePageChange"
+ :pagination="tableData.pagination"
+ >
+ </pagination>
+ </template>
+ <!-- 鏂板缓/淇敼 -->
+<!-- <OperaDeviceWindow ref="operaDeviceWindow" @success="handlePageChange"/>-->
+ </TableLayout>
+</template>
+
+<script>
+import BaseTable from '@/components/base/BaseTable'
+import TableLayout from '@/layouts/TableLayout'
+import Pagination from '@/components/common/Pagination'
+import OperaDeviceWindow from '@/components/business/OperaDeviceWindow'
+import { syncDevices, updateEntranceById } from '@/api/business/device'
+export default {
+ name: 'Device',
+ extends: BaseTable,
+ components: { TableLayout, Pagination, OperaDeviceWindow },
+ data () {
+ return {
+ // 鎼滅储
+ searchForm: {
+ doorName: '',
+ regionPathName: '',
+ isEntrance: '',
+ online: '',
+ type: 3
+ },
+ options: []
+ }
+ },
+ created () {
+ this.config({
+ module: '璁惧淇℃伅琛�',
+ api: '/business/device',
+ 'field.id': 'id',
+ 'field.main': 'id'
+ })
+ this.search()
+ },
+ methods: {
+ changeManufature(e, row) {
+ updateEntranceById({
+ id: row.id,
+ isEntrance: e
+ })
+ },
+ synchronousData () {
+ this.$dialog.actionConfirm('鎿嶄綔纭鎻愰啋', '鎮ㄧ‘璁ゅ悓姝ュ叏閮ㄤ俊鎭悧锛�')
+ .then(() => {
+ this.isWorking.delete = true
+ syncDevices({type: 3})
+ .then(res => {
+ this.$tip.apiSuccess(res || '鍚屾鎴愬姛')
+ this.search()
+ })
+ .catch(e => {
+ // this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.isWorking.delete = false
+ })
+ })
+ .catch(() => {})
+ }
+ }
+}
+</script>
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index 119bf72..c867e07 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -58,7 +58,7 @@
public static final String SIGN_IN_ATTENTION ="SIGN_IN_ATTENTION" ;
public static final String SIGN_IN_QRCODE_PREFIX ="SIGN_IN_QRCODE_PREFIX" ;
public static final String JK_PLAN_MAX_CLUSTER ="JK_PLAN_MAX_CLUSTER" ;
- public static final String JK_PLAN_DISTANCECLUSTER ="JK_PLAN_DISTANCECLUSTER" ;
+ public static final String JK_PLAN_DISTANCE_CLUSTER ="JK_PLAN_DISTANCE_CLUSTER" ;
/**
* 鎿嶄綔绫诲瀷锛岀敤浜庡仛鎺ュ彛楠岃瘉鍒嗙粍
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 1d9c9fd..5ca947a 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
@@ -118,6 +118,9 @@
}else if(Constants.equalsInteger(param.getType(),Constants.THREE)){
//鍚屾骞挎挱
result = hkSyncDeviceService.syncHkBroadcast(param);
+ }else if(Constants.equalsInteger(param.getType(),Constants.FOUR)){
+ //鍚屾骞挎挱
+ result = hkSyncDeviceService.syncHkBroadcastDevice(param);
}
return ApiResponse.success(result);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index ebb020f..0ed4fb4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -1424,17 +1424,17 @@
*鍒嗛〉鑾峰彇骞挎挱鐐癸紙鍒嗛〉锛�
* @return
*/
- public static BaseResponse<BaseListPageResponse<FetchAudioChannelInfoResponse>> fetchAudioDevice(FetchAudioChannelRequest param){
- log.info("銆愭捣搴疯幏鍙栧垎椤佃幏鍙栧箍鎾偣銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ public static BaseResponse<BaseListPageResponse<FetchAudioDeviceInfoResponse>> fetchAudioDevice(FetchAudioDeviceRequest param){
+ log.info("銆愭捣搴疯幏鍙栧垎椤佃幏鍙栧箍鎾澶囥��================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.fetchAudioDevice(JSONObject.toJSONString(param));
TypeReference typeReference =
- new TypeReference< BaseResponse<BaseListPageResponse<FetchAudioChannelInfoResponse>> >(){};
- BaseResponse<BaseListPageResponse<FetchAudioChannelInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
- logResult(result,"娴峰悍鑾峰彇鍒嗛〉鑾峰彇骞挎挱鐐�");
+ new TypeReference< BaseResponse<BaseListPageResponse<FetchAudioDeviceInfoResponse>> >(){};
+ BaseResponse<BaseListPageResponse<FetchAudioDeviceInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鑾峰彇鍒嗛〉鑾峰彇骞挎挱璁惧");
return result;
}catch (Exception e){
- log.error("銆愭捣搴疯幏鍙栧垎椤佃幏鍙栧箍鎾偣銆�================澶辫触====锛歕n"+ e.getMessage());
+ log.error("銆愭捣搴疯幏鍙栧垎椤佃幏鍙栧箍鎾澶囥��================澶辫触====锛歕n"+ e.getMessage());
}
return null;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/ClusterCustomKMeans.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/ClusterCustomKMeans.java
index 773ceaa..8915a9b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/ClusterCustomKMeans.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/ClusterCustomKMeans.java
@@ -1,9 +1,7 @@
package com.doumee.core.tsp;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.request.SketchCateModel;
@@ -78,6 +76,7 @@
cList.add(doublePointNew.getCustomer());
sketchCateModel.setTotalNum(Constants.formatBigdecimal(sketchCateModel.getTotalNum()).add(Constants.formatBigdecimal(doublePointNew.getCustomer().getTotalNum())));
}
+ sortPointByCenterPoint(cluster,cList);
sketchCateModel.setCustomerList(cList);
sketchCateModel.setStartPoint(cList.get(0));
sketchCateModel.setTotalCustomer(cList.size());
@@ -86,6 +85,21 @@
return list;
}
+ private void sortPointByCenterPoint(CentroidCluster<DoublePointNew> cluster, List<JkSketchCustomer> cList) {
+ double clat = Constants.formatBigdecimal(cList.get(0).getLatitude()).doubleValue();
+ double clong = Constants.formatBigdecimal(cList.get(0).getLongitude()).doubleValue();
+ if(cluster!=null || cluster.getCenter() != null || cluster.getCenter().getPoint() != null && cluster.getCenter().getPoint().length>=2){
+ clong = cluster.getCenter().getPoint()[1];
+ clat = cluster.getCenter().getPoint()[0];
+ }
+ for(JkSketchCustomer c : cList){
+ double latDiff = Constants.formatBigdecimal(c.getLatitude()).doubleValue() - clat;
+ double lonDiff = Constants.formatBigdecimal(c.getLongitude()).doubleValue() - clong;
+ c.setDistanceCenter(Math.sqrt(latDiff * latDiff + lonDiff * lonDiff)); // 娆ф皬璺濈
+ }
+ Collections.sort(cList, (p1, p2) -> Double.compare(p1.getDistanceCenter(), p2.getDistanceCenter()));
+ }
+
public class DoublePointNew extends DoublePoint{
private JkSketchCustomer customer;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/TspSolver.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/TspSolver.java
index b19f7f3..9e3c01d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/TspSolver.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/TspSolver.java
@@ -134,12 +134,13 @@
// 鎵ц绠楁硶
Assignment solution = routing.solveWithParameters(searchParameters);
if(solution ==null){
+ log.error("瑙勫垝缁撴潫=============鏈壘鍒版渶浼樿矾绾匡紒" );
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈壘鍒版渶浼樿矾绾匡紒");
}
// 鎵撳嵃璺嚎
resultSolution(data, routing, manager, solution);
long end =System.currentTimeMillis();
- log.error("瑙勫垝缁撴潫=============鑰楁椂=========="+(end -start)+"锛坢s锛�"+(end -start)/1000 +"s"+(end -start)/60/1000 +"m");
+ log.error("瑙勫垝缁撴潫=============鑰楁椂=========="+(end -start)+"锛坢s锛�"+(end -start)/1000 +"s"+(end -start)/60/1000 +"m");
}
static void resultSolution( DataModel data, RoutingModel routing, RoutingIndexManager manager, Assignment solution) {
long maxRouteDistance = 0;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
index 2896604..d051ff7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
@@ -70,8 +70,8 @@
@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
- @ApiModelProperty(value = "绫诲瀷 0闂ㄧ 1杞﹀簱 2LED 3骞挎挱", example = "1")
- @ExcelColumn(name="绫诲瀷 0闂ㄧ 1杞﹀簱 2LED 3骞挎挱")
+ @ApiModelProperty(value = "绫诲瀷 0闂ㄧ 1杞﹀簱 2LED 3骞挎挱鐐� 4骞挎挱璁惧", example = "1")
+ @ExcelColumn(name="绫诲瀷 0闂ㄧ 1杞﹀簱 2LED 3骞挎挱鐐� 4骞挎挱璁惧")
private Integer type;
@ApiModelProperty(value = "鏄惁鍥尯鍑哄叆鍙� 0涓嶆槸 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍥尯鍑哄叆鍙� 0涓嶆槸 1鏄�")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketchCustomer.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketchCustomer.java
index 8894d2e..8b990bf 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketchCustomer.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketchCustomer.java
@@ -143,6 +143,9 @@
//@ExcelColumn(name="鐘舵�� 0姝ｅ父 绂佺敤")
@TableField(exist = false)
private String endSteps;
+ @ApiModelProperty(value = "璺濈涓績鐐硅窛绂�", example = "1")
+ @TableField(exist = false)
+ private double distanceCenter;
@ApiModelProperty(value = "鍚岀彮缁勯棿瀹㈡埛浣嶇疆璺濈鏁扮粍锛孾{a:12,b:100},{a:13,b:200},...],a锛氬鎴风紪鐮侊紝b锛氫笌瀹㈡埛a涔嬮棿鐨勮窛绂�")
@TableField(exist = false)
private List<DistanceMapParam> distanceMapParamList;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java
index c30d332..c7b3189 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java
@@ -97,6 +97,7 @@
String syncHkLed(Device param);
String syncHkBroadcast(Device param);
+ String syncHkBroadcastDevice(Device param);
String dealVisitEventIccm(EventVisitIccmRequest param, HttpServletResponse response);
String dealPlatformStatusEvent(EventPlatformRequest param, HttpServletResponse response);
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 93a8f1c..95f0717 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
@@ -500,7 +500,6 @@
c.setNeedList(Constants.equalsInteger(model.getForceUpdate(),0)?needList:customerList);
return c;
}
-
/**
* 寮�濮嬪紓姝ユ墽琛岀嚎璺紭鍖栦换鍔�
* @param model
@@ -512,7 +511,7 @@
int maxnum =100,distance = 500;
try {
maxnum = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.JK_PLAN_MAX_CLUSTER).getCode());
- distance = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.JK_PLAN_DISTANCECLUSTER).getCode());
+ distance = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.JK_PLAN_DISTANCE_CLUSTER).getCode());
}catch (Exception e){
}
List<JkSketchCustomer> allCustomerList = model.getCustomerList();
@@ -547,13 +546,18 @@
//鏋勯�犱紭鍖栨暟鎹ā鍨�
dataModel.initDataInfo(vehicleNumber1,demands1,demands2,vehicleCapacities1,distanceMatrix1,vehicleMaxNodes);
TspSolver.startSearch(dataModel);
+ JkSketch nowModel = jkSketchMapper.selectById(model.getId());
+ if(StringUtils.equals(model.getJobId(), nowModel.getJobId())){
+ log.error( "浼樺寲缁撴灉宸插け鏁堬紝闈炴渶杩戜竴娆℃搷浣滐紒");
+ return;
+ }
dealSearchSolution(model, customerList,dataModel);
}catch (Exception e){
e.printStackTrace();
jkSketchMapper.update(null,new UpdateWrapper<JkSketch>().lambda()
.eq(JkSketch::getId,model.getId() )
.eq(JkSketch::getJobId,model.getJobId() )
- .set(JkSketch::getPlanLineInfo,"鏈�杩戜竴娆＄嚎璺紭鍖栧け璐ワ紒")
+ .set(JkSketch::getPlanLineInfo,"鏈�杩戜竴娆＄嚎璺紭鍖栧け璐ワ紒"+e.getMessage())
.set(JkSketch::getStatus,Constants.THREE)
.set(JkSketch::getPlanLineEndDate,new Date()));
}
@@ -654,7 +658,7 @@
int maxnum =100,distance = 500;
try {
maxnum = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.JK_PLAN_MAX_CLUSTER).getCode());
- distance = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.JK_PLAN_DISTANCECLUSTER).getCode());
+ distance = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.JK_PLAN_DISTANCE_CLUSTER).getCode());
}catch (Exception e){
}
int totalNum = 0;
@@ -700,6 +704,11 @@
if(dataModel.getSolutions()==null || dataModel.getSolutions().size()==0){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"绾胯矾銆�"+line.getLineName()+"銆戣皟鏁村け璐� 锛屾湭鑾峰緱鏈�浼樹氦閫氳鍒掓柟妗堬紒");
}
+ JkSketch nowModel = jkSketchMapper.selectById(model.getId());
+ if(StringUtils.equals(model.getJobId(), nowModel.getJobId())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"绾胯矾銆�"+line.getLineName()+"銆戣皟鏁村け璐� 锛岄潪鏈�杩戜竴娆℃搷浣滐紒");
+ }
+
TspSolverSolutions so = dataModel.getSolutions().get(0);
List<Integer> routes = so.getRouteIndex();
totalDistance += so.getDistance();
@@ -738,7 +747,7 @@
jkSketchCustomerMapper.updateById(allList);
}
jkSketchMapper.update(null,new UpdateWrapper<JkSketch>().lambda()
-// .eq(JkSketch::getId,model.getId() )
+ .eq(JkSketch::getId,model.getId() )
.eq(JkSketch::getJobId,model.getJobId() )
.set(success,JkSketch::getDistance,totalDistance)
.set(JkSketch::getPlanLineInfo,success?"鏈�杩戜竴娆＄嚎璺皟鏁存垚鍔�":"鏈�杩戜竴娆＄嚎璺皟鏁村け璐ワ紒")
@@ -946,14 +955,14 @@
int index =0;
for(JkSketchCustomer c : customers){
if(index ==0){
- if(c.getStartDistance() >0){
+ if(Constants.formatLongNum(c.getStartDistance()) >0){
lineDistance+= Constants.formatLongNum(c.getStartDistance());
}else{
lineDistance += DistanceCalculator.calculateDistanceDecinal(c.getLatitude(),c.getLongitude(),cLatitude,cLongitude);
}
}
if(index == customers.size()-1){
- if(c.getEndDistance() >0){
+ if(Constants.formatLongNum(c.getEndDistance())>0){
lineDistance+= Constants.formatLongNum(c.getEndDistance());
}else{
lineDistance += DistanceCalculator.calculateDistanceDecinal(c.getLatitude(),c.getLongitude(),cLatitude,cLongitude);
@@ -1085,11 +1094,13 @@
.set(JkSketchLine::getIsdeleted,Constants.ONE)
.eq(JkSketchLine::getIsdeleted,Constants.ZERO)
.eq(JkSketchLine::getType,Constants.ONE)
+ .eq(JkSketchLine::getSketchId,model.getId())
.eq(JkSketchLine::getDateInfo,model.getDateInfo()));
jkSketchCustomerMapper.update(null,new UpdateWrapper<JkSketchCustomer>().lambda()
.set(JkSketchCustomer::getIsdeleted,Constants.ONE)
.eq(JkSketchCustomer::getIsdeleted,Constants.ZERO)
.eq(JkSketchCustomer::getType,Constants.ONE)
+ .eq(JkSketchCustomer::getSketchId,model.getId())
.eq(JkSketchCustomer::getDateInfo,model.getDateInfo()));
if(sketchLineList.size()>0){
jkSketchLineMapper.insert(sketchLineList);
@@ -1107,7 +1118,7 @@
}
jkSketchMapper.update(null,new UpdateWrapper<JkSketch>().lambda()
.eq(JkSketch::getId,model.getId() )
- .eq(JkSketch::getJobId,model.getJobId() )
+// .eq(JkSketch::getJobId,model.getJobId() )
.set(JkSketch::getLineNum,sketchLineList.size() )
.set(JkSketch::getOptStatus,Constants.ONE)//宸茬敓鎴愪紭鍖栫嚎璺�
.set(JkSketch::getDistance,totalDistance)
@@ -1117,7 +1128,7 @@
}else{
jkSketchMapper.update(null,new UpdateWrapper<JkSketch>().lambda()
.eq(JkSketch::getId,model.getId() )
- .eq(JkSketch::getJobId,model.getJobId() )
+// .eq(JkSketch::getJobId,model.getJobId() )
.set(JkSketch::getPlanLineInfo,"鏈�杩戜竴娆＄嚎璺紭鍖栧け璐�,鏈壘鍒版渶浼樿矾绾匡紒")
.set(JkSketch::getStatus,Constants.THREE)
.set(JkSketch::getPlanLineEndDate,date));
@@ -1184,11 +1195,13 @@
.set(JkSketchLine::getIsdeleted,Constants.ONE)
.eq(JkSketchLine::getIsdeleted,Constants.ZERO)
.eq(JkSketchLine::getType,Constants.ONE)
+ .eq(JkSketchLine::getSketchId,model.getId())
.eq(JkSketchLine::getDateInfo,model.getDateInfo()));
jkSketchCustomerMapper.update(null,new UpdateWrapper<JkSketchCustomer>().lambda()
.set(JkSketchCustomer::getIsdeleted,Constants.ONE)
.eq(JkSketchCustomer::getIsdeleted,Constants.ZERO)
.eq(JkSketchCustomer::getType,Constants.ONE)
+ .eq(JkSketchCustomer::getSketchId,model.getId())
.eq(JkSketchCustomer::getDateInfo,model.getDateInfo()));
if(sketchLineList.size()>0){
jkSketchLineMapper.insert(sketchLineList);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java
index 54013e0..8e8fac2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java
@@ -84,6 +84,11 @@
return null;
}
@Override
+ public String syncHkBroadcastDevice(Device param){
+
+ return null;
+ }
+ @Override
// @Async
public String syncPrivilege(PrivilegeGroupRequest param){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
index be1567d..5ee45e1 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
@@ -197,6 +197,48 @@
Constants.DEALING_HK_SYNCDEVICE =false;
}
}
+ @Override
+// @Async
+ public String syncHkBroadcastDevice(Device param){
+ if(Constants.DEALING_HK_SYNCDEVICE){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鍚屾浠诲姟姝ｅ湪鎵ц鍝︼紝璇风◢鍚庢煡鐪嬬粨鏋滐紒") ;
+ }
+ Constants.DEALING_HK_SYNCDEVICE =true;
+ try {
+ List<Device> deleteList = new ArrayList<>();
+ List<Device> addList = new ArrayList<>();
+ List<Device> editList = new ArrayList<>();
+ Date date = new Date();
+ //鏌ヨ鍏ㄩ儴骞挎挱鐐硅澶囨暟鎹�
+ List<Device> allList = deviceMapper.selectList(new QueryWrapper<Device>().lambda()
+ .eq(Device::getType,Constants.FOUR));
+ List<FetchAudioDeviceInfoResponse> allHkList = getAllBroadcastDeviceList();
+ /**
+ * 鑾峰彇澧炲垹鏀规暟鎹泦鍚�
+ */
+ getBroadcastDeviceDataChangeList(allList,allHkList,addList,editList,deleteList,date);
+ if(deleteList.size()>0){
+ //閫昏緫鍒犻櫎
+ for(Device d : deleteList){
+ deviceMapper.updateById(d);
+ }
+ }
+ if(addList.size()>0){
+ deviceMapper.insert(addList);
+ }
+ if(editList.size()>0){
+ for(Device d : editList){
+ deviceMapper.updateById(d);
+ }
+ }
+ return "鍚屾鏁版嵁锛氭柊澧炪��"+addList.size()+"銆戞潯锛屾洿鏂般��"+editList.size()+"銆戞潯锛屽垹闄ゃ��"+deleteList.size()+"銆戞潯";
+ }catch (Exception e){
+ e.printStackTrace();
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "鍚屾澶辫触锛�");
+ }finally {
+ Constants.DEALING_HK_SYNCDEVICE =false;
+ }
+ }
private void getBroadcastDataChangeList(List<Device> allList, List<FetchAudioChannelInfoResponse> allHkList, List<Device> addList, List<Device> editList, List<Device> deleteList, Date date) {
if(allHkList!=null && allHkList.size()>0){
@@ -218,6 +260,27 @@
}
//鍒ゆ柇鑾峰彇鍒犻櫎鐨勯棬绂佽澶囷紝閫昏緫鍒犻櫎
getDeleteBroadcastList(allList,allHkList,deleteList,date);
+ }
+ private void getBroadcastDeviceDataChangeList(List<Device> allList, List<FetchAudioDeviceInfoResponse> allHkList, List<Device> addList, List<Device> editList, List<Device> deleteList, Date date) {
+ if(allHkList!=null && allHkList.size()>0){
+ //鑾峰彇娴峰悍鍏ㄩ儴闂ㄧ缁勬暟鎹�
+ for(FetchAudioDeviceInfoResponse device : allHkList){
+ Device model = getExistedBroadcastDevice(device,allList);
+ if(model !=null){
+ //濡傛灉宸插瓨鍦紝鍒欐洿鏂版暟鎹�
+ model = initBroadcastDeviceDataByHkData(model,device,date);
+ editList.add(model);
+ }else{
+ //濡傛灉涓嶅瓨鍦紝鍒欐柊澧炴暟鎹�
+ model = new Device();
+ model = initBroadcastDeviceDataByHkData(model,device,date);
+ model.setIsEntrance(Constants.ZERO);
+ addList.add(model);
+ }
+ }
+ }
+ //鍒ゆ柇鑾峰彇鍒犻櫎鐨勯棬绂佽澶囷紝閫昏緫鍒犻櫎
+ getDeleteBroadcastDeviceList(allList,allHkList,deleteList,date);
}
@Override
@@ -332,6 +395,39 @@
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝娴峰悍鍚屾鏁版嵁澶辫触~");
}
BaseListPageResponse<FetchAudioChannelInfoResponse> r = response.getData();
+ curTotal += 100;
+ if(curTotal >= r.getTotal()){
+ hasNext = false;
+ }
+ if(r.getList() == null || r.getList().size()==0){
+ hasNext =false;
+ }else{
+ allDoorList.addAll(r.getList());
+ }
+ curPage++;
+ }
+ return allDoorList;
+ }
+ /**
+ * 鑾峰彇鍏ㄩ儴骞挎挱鐐规暟鎹�
+ * @return
+ */
+ public List<FetchAudioDeviceInfoResponse> getAllBroadcastDeviceList(){
+ List<FetchAudioDeviceInfoResponse> allDoorList = new ArrayList<>();
+ Date date = new Date();
+ boolean hasNext = true;
+ int curTotal = 0;
+ int curPage = 1;
+ while (hasNext){
+ //鍒嗛〉閬嶅巻寰幆鏌ヨ鎵�鏈夐棬绂佽澶囨暟鎹�
+ FetchAudioDeviceRequest param = new FetchAudioDeviceRequest();
+ param.setPageNo(curPage);
+ param.setPageSize(100);
+ BaseResponse<BaseListPageResponse<FetchAudioDeviceInfoResponse>> response = HKService.fetchAudioDevice(param);
+ if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝娴峰悍鍚屾鏁版嵁澶辫触~");
+ }
+ BaseListPageResponse<FetchAudioDeviceInfoResponse> r = response.getData();
curTotal += 100;
if(curTotal >= r.getTotal()){
hasNext = false;
@@ -463,6 +559,21 @@
model.setResourceType(device.getAudioChannelType());
model.setStatus(device.getState());
model.setRegionName(device.getRegionName());
+ return model;
+ }
+ private Device initBroadcastDeviceDataByHkData(Device model, FetchAudioDeviceInfoResponse device, Date date) {
+ model.setIsdeleted(Constants.ZERO);
+ model.setHkDate(date);
+ model.setHkId(device.getDeviceIndexCode());
+ model.setName(device.getDeviceName());
+ model.setHkStatus(Constants.ONE);
+ model.setType(Constants.THREE);
+ model.setChannelNo(device.getDeviceCode());
+ model.setChannelInfo(device.getDeviceType());
+ model.setResourceType(device.getDeviceType());
+ model.setStatus(Constants.ZERO);
+ model.setRemark(device.getDesc());
+ model.setRegionName(device.getRegionIndexCode());
return model;
}
private Device initDoorDataByHkData(Device model, DoorsInfoResponse door, Date date, List<AcsDeviceInfoResponse> allHkList) {
@@ -614,6 +725,17 @@
}
return null;
}
+ private Device getExistedBroadcastDevice(FetchAudioDeviceInfoResponse device, List<Device> allList) {
+ if(allList.size()>0){
+ for(Device r : allList){
+ if(StringUtils.equals(r.getHkId(), device.getDeviceIndexCode())){
+ //琛ㄧず鏈垹闄�
+ return r;
+ }
+ }
+ }
+ return null;
+ }
private Device getExistedDevice(AcsDeviceInfoResponse device, List<Device> allList) {
if(allList.size()>0){
for(Device r : allList){
@@ -662,6 +784,17 @@
private void getDeleteBroadcastList(List<Device> allList, List<FetchAudioChannelInfoResponse> allHkList,List<Device> deleteList ,Date date) {
if(allList!=null && allList.size()>0){
for(Device device : allList){
+ if(isDeletedBroadcast(device,allHkList)){
+ device.setIsdeleted(Constants.ONE);
+ device.setEditDate(date);
+ deleteList.add(device);
+ }
+ }
+ }
+ }
+ private void getDeleteBroadcastDeviceList(List<Device> allList, List<FetchAudioDeviceInfoResponse> allHkList,List<Device> deleteList ,Date date) {
+ if(allList!=null && allList.size()>0){
+ for(Device device : allList){
if(isDeletedBroadcastDevice(device,allHkList)){
device.setIsdeleted(Constants.ONE);
device.setEditDate(date);
@@ -695,7 +828,7 @@
return true;
}
- private boolean isDeletedBroadcastDevice(Device device, List<FetchAudioChannelInfoResponse> allHkList) {
+ private boolean isDeletedBroadcast(Device device, List<FetchAudioChannelInfoResponse> allHkList) {
if(allHkList.size()>0){
for(FetchAudioChannelInfoResponse r : allHkList){
if(StringUtils.equals(device.getHkId(), r.getAudioChannelIndexCode())){
@@ -707,6 +840,18 @@
return true;
}
+ private boolean isDeletedBroadcastDevice(Device device, List<FetchAudioDeviceInfoResponse> allHkList) {
+ if(allHkList.size()>0){
+ for(FetchAudioDeviceInfoResponse r : allHkList){
+ if(StringUtils.equals(device.getHkId(), r.getDeviceIndexCode())){
+ //琛ㄧず鏈垹闄�
+ return false;
+ }
+ }
+ }
+ return true;
+
+ }
private boolean isDeletedDevice(Device device, List<AcsDeviceInfoResponse> allHkList) {
if(allHkList.size()>0){
for(AcsDeviceInfoResponse r : allHkList){
--
Gitblit v1.9.3