From 7aa43e7f0edb7680762b3ffaed7f944742bfc0ea Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 06 三月 2026 09:57:59 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 2
admin/src/views/business/deviceBroadcast.vue | 122 ++++--------------------
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java | 31 ++++-
admin/src/views/business/deviceBroadcastChannel.vue | 75 +-------------
server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/ClusterCustomKMeans.java | 20 +++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java | 18 +--
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 | 15 +++
8 files changed, 90 insertions(+), 196 deletions(-)
diff --git a/admin/src/views/business/deviceBroadcast.vue b/admin/src/views/business/deviceBroadcast.vue
index 6722735..4731caa 100644
--- a/admin/src/views/business/deviceBroadcast.vue
+++ b/admin/src/views/business/deviceBroadcast.vue
@@ -12,48 +12,22 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:device:create', 'business:device:delete']">
- <li><el-button type="primary" :loading="isWorking.delete" @click="synchronousData">鍚屾</el-button></li>
- <li><el-button type="primary" @click="$refs.operaDeviceWindow.open('鏂板缓骞挎挱')" icon="el-icon-plus" v-permissions="['business:device:create']">鏂板缓</el-button></li>
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:device:delete']">鍒犻櫎</el-button></li>
- </ul>
+ <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 type="selection" width="55"></el-table-column>
<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="鍞竴鏍囪瘑" ></el-table-column>
- <el-table-column prop="regionPathName" label="鎵�鍦ㄤ綅缃�"></el-table-column>
- <el-table-column prop="no" label="搴忓垪鍙�" ></el-table-column>
- <el-table-column prop="ip" label="IP鍦板潃" ></el-table-column>
- <el-table-column prop="port" label="绔彛" ></el-table-column>
- <el-table-column prop="doorId" label="璐﹀彿"></el-table-column>
- <el-table-column prop="doorName" label="瀵嗙爜" align="center">
- <template slot-scope="{row}">
- <span :class=" 'blue'">{{row.showPwd?row.doorName:'******'}}</span>
- <el-button style="margin-left: 10px" v-if="row.doorName!=null"
- @click.native.p.prevent="showPassward(row)" type="text">
- <i class="el-icon-view" :class="row.showPwd?'red':'blue'" :title="row.showPwd?'闅愯棌':'鏄剧ず'"></i>
- </el-button>
- </template>
- </el-table-column>
- <el-table-column prop="editDate" label="鏈�杩戞洿鏂版椂闂�"></el-table-column>
- <el-table-column
- label="鎿嶄綔"
- align="center"
- min-width="120"
- fixed="right"
- >
- <template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaDeviceWindow.open('缂栬緫骞挎挱', row)" icon="el-icon-edit" v-permissions="['business:device:update']">缂栬緫</el-button>
- <el-button type="text" @click="send(row)" icon="el-icon-edit" v-permissions="['business:device:update']">鍙戦�佹挱鎶�</el-button>
- <el-button type="text" class="red" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:device:delete']">鍒犻櫎</el-button>
- </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"
@@ -62,26 +36,8 @@
>
</pagination>
</template>
- <el-dialog
- :visible.sync="visibleSend"
- style="z-index: 100000"
- append-to-body
- width="50%"
- height="50%"
- :title="'鍙戦�佹挱鎶�-'+ form.name"
- >
- <el-form :model="form" ref="form" >
- <el-form-item label="鎾姤鍐呭" prop="name" required>
- <el-input v-model="form.sendInfo" type="textarea" placeholder="璇疯緭鍏ユ挱鎶ュ唴瀹�" v-trim/>
- </el-form-item>
- </el-form>
- <template v-slot:footer >
- <el-button @click="sendBobao()" type="primary" :loading="isWorkSending">纭</el-button>
- <el-button @click="sendClose()">杩斿洖</el-button>
- </template>
- </el-dialog>
<!-- 鏂板缓/淇敼 -->
- <OperaDeviceBroadcastWindow ref="operaDeviceWindow" @success="handlePageChange"/>
+ <OperaDeviceWindow ref="operaDeviceWindow" @success="handlePageChange"/>
</TableLayout>
</template>
@@ -89,12 +45,12 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
-import OperaDeviceBroadcastWindow from '@/components/business/OperaDeviceBroadcastWindow'
-import { syncDevices } from '@/api/business/device'
+import OperaDeviceWindow from '@/components/business/OperaDeviceWindow'
+import { syncDevices, updateEntranceById } from '@/api/business/device'
export default {
name: 'Device',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaDeviceBroadcastWindow },
+ components: { TableLayout, Pagination, OperaDeviceWindow },
data () {
return {
// 鎼滅储
@@ -105,14 +61,6 @@
online: '',
type: 4
},
- isWorkSending: false,
- form: {
- sendInfo: '',
- id: '',
- hkId: '',
- name: ''
- },
- visibleSend: false,
options: []
}
},
@@ -126,53 +74,23 @@
this.search()
},
methods: {
- showPassward (row) {
- if (!row.showPwd) {
- this.$set(row, 'showPwd', true)
- } else {
- this.$set(row, 'showPwd', false)
- }
- },
- sendBobao () {
- if (!this.form.sendInfo) {
- return
- }
- this.$dialog.actionConfirm('纭杩涜骞挎挱鎾姤鍚楋紵', '鎿嶄綔纭鎻愰啋')
- .then(() => {
- this.isWorkSending = true
- this.api.sendBobao(this.form)
- .then(res => {
- this.$tip.apiSuccess(res || '鎾姤璇锋眰鎴愬姛')
- this.sendClose()
- })
- .catch(e => {
- })
- .finally(() => {
- this.isWorkSending = false
- })
- })
- .catch(() => {})
- },
- send (row) {
- this.visibleSend = true
- this.form = { sendInfo: '', id: row.id, hkId: row.hkId, name: row.name }
- },
- sendClose () {
- this.visibleSend = false
- this.isWorkSending = false
- this.form = { sendInfo: '', id: '', hkId: '', name: '' }
+ changeManufature(e, row) {
+ updateEntranceById({
+ id: row.id,
+ isEntrance: e
+ })
},
synchronousData () {
this.$dialog.actionConfirm('鎿嶄綔纭鎻愰啋', '鎮ㄧ‘璁ゅ悓姝ュ叏閮ㄤ俊鎭悧锛�')
.then(() => {
this.isWorking.delete = true
- syncDevices({ type: 4 })
+ syncDevices({type: 3})
.then(res => {
this.$tip.apiSuccess(res || '鍚屾鎴愬姛')
this.search()
})
.catch(e => {
- // this.$tip.apiFailed(e)
+ // this.$tip.apiFailed(e)
})
.finally(() => {
this.isWorking.delete = false
diff --git a/admin/src/views/business/deviceBroadcastChannel.vue b/admin/src/views/business/deviceBroadcastChannel.vue
index 63bc99c..c10e474 100644
--- a/admin/src/views/business/deviceBroadcastChannel.vue
+++ b/admin/src/views/business/deviceBroadcastChannel.vue
@@ -28,16 +28,6 @@
<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-column
- label="鎿嶄綔"
- align="center"
- min-width="120"
- fixed="right"
- >
- <template slot-scope="{row}">
- <el-button type="text" @click="send(row)" icon="el-icon-edit" >鍙戦�佹挱鎶�</el-button>
- </template>
- </el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
@@ -47,24 +37,7 @@
</pagination>
</template>
<!-- 鏂板缓/淇敼 -->
- <el-dialog
- :visible.sync="visibleSend"
- style="z-index: 100000"
- append-to-body
- width="50%"
- height="50%"
- :title="'鍙戦�佹挱鎶�-'+ form.name"
- >
- <el-form :model="form" ref="form" >
- <el-form-item label="鎾姤鍐呭" prop="name" required>
- <el-input v-model="form.sendInfo" type="textarea" placeholder="璇疯緭鍏ユ挱鎶ュ唴瀹�" v-trim/>
- </el-form-item>
- </el-form>
- <template v-slot:footer >
- <el-button @click="sendBobao()" type="primary" :loading="isWorkSending">纭</el-button>
- <el-button @click="sendClose()">杩斿洖</el-button>
- </template>
- </el-dialog>
+<!-- <OperaDeviceWindow ref="operaDeviceWindow" @success="handlePageChange"/>-->
</TableLayout>
</template>
@@ -72,11 +45,12 @@
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 },
+ components: { TableLayout, Pagination, OperaDeviceWindow },
data () {
return {
// 鎼滅储
@@ -87,14 +61,6 @@
online: '',
type: 3
},
- isWorkSending: false,
- form: {
- sendInfo: '',
- id: '',
- hkId: '',
- name: ''
- },
- visibleSend: false,
options: []
}
},
@@ -108,36 +74,7 @@
this.search()
},
methods: {
- sendBobao () {
- if (!this.form.sendInfo) {
- return
- }
- this.$dialog.actionConfirm('纭杩涜骞挎挱鎾姤鍚楋紵', '鎿嶄綔纭鎻愰啋')
- .then(() => {
- this.isWorkSending = true
- this.api.sendBobao(this.form)
- .then(res => {
- this.$tip.apiSuccess(res || '鎾姤璇锋眰鎴愬姛')
- this.sendClose()
- })
- .catch(e => {
- })
- .finally(() => {
- this.isWorkSending = false
- })
- })
- .catch(() => {})
- },
- send (row) {
- this.visibleSend = true
- this.form = { sendInfo: '', id: row.id, hkId: row.hkId, name: row.name }
- },
- sendClose () {
- this.visibleSend = false
- this.isWorkSending = false
- this.form = { sendInfo: '', id: '', hkId: '', name: '' }
- },
- changeManufature (e, row) {
+ changeManufature(e, row) {
updateEntranceById({
id: row.id,
isEntrance: e
@@ -147,13 +84,13 @@
this.$dialog.actionConfirm('鎿嶄綔纭鎻愰啋', '鎮ㄧ‘璁ゅ悓姝ュ叏閮ㄤ俊鎭悧锛�')
.then(() => {
this.isWorking.delete = true
- syncDevices({ type: 3 })
+ syncDevices({type: 3})
.then(res => {
this.$tip.apiSuccess(res || '鍚屾鎴愬姛')
this.search()
})
.catch(e => {
- // this.$tip.apiFailed(e)
+ // this.$tip.apiFailed(e)
})
.finally(() => {
this.isWorking.delete = false
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_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 88110bc..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
@@ -1,7 +1,5 @@
package com.doumee.dao.business.model;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
@@ -11,7 +9,6 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
-import java.math.BigDecimal;
import java.util.Date;
/**
@@ -73,8 +70,8 @@
@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
- @ApiModelProperty(value = "绫诲瀷 0闂ㄧ 1杞﹀簱 2LED 3骞挎挱鐐� 4骞挎挱璁惧 5鏂矾鍣ㄧ┖寮� 6娴峰悍鐢佃〃", example = "1")
- @ExcelColumn(name="绫诲瀷 0闂ㄧ 1杞﹀簱 2LED 3骞挎挱鐐� 4骞挎挱璁惧 5鏂矾鍣ㄧ┖寮� 6娴峰悍鐢佃〃")
+ @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鏄�")
@@ -156,12 +153,11 @@
@ApiModelProperty(value = "闂ㄧ鐐瑰悕绉�")
@ExcelColumn(name="闂ㄧ鐐瑰悕绉�")
private String doorName;
- @ApiModelProperty(value = "鎾姤鍐呭")
- @TableField(exist = false)
- private String sendInfo;
- @ApiModelProperty(value = "閰嶇疆鍙傛暟")
- @TableField(exist = false)
- private JSONObject doorNameObj;
+
+
+
+
+
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/HkSyncDeviceServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
index 3ab1b89..61bcb7d 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
@@ -584,6 +584,21 @@
}
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) {
AcsDeviceInfoResponse device = getDeviceByDoorid(door.getParentIndexCode(),allHkList);
model.setIsdeleted(Constants.ZERO);
--
Gitblit v1.9.3