Skip to content

D
device-new-platform
Commit 90490eb8 authored by 赵啸非's avatar 赵啸非
Browse files
Options

站点地图修改

parent 29c39755
Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 76 deletions
device-manager-ui/admin/src/components/Map.vue
View file @ 90490eb8
......@@ -18,7 +18,7 @@
<el-amap-marker
v-for="(marker, index) in markers"
:key="'marker' + index"
:events="markerEvents"
:events="events"
:position="marker.position"
:label="marker.label"
:icon="marker.icon"
......@@ -45,7 +45,7 @@
</template>
<script>
import { AMapManager } from "vue-amap";
import { AMapManager, lazyAMapApiLoaderInstance } from "vue-amap";
let amapManager = new AMapManager();
export default {
......@@ -74,20 +74,24 @@ export default {
},
},
methods: {
setMarker(lng, lat, address) {
refresh(data){
console.log("刷新数据",data)
this.markersData=data
this.markersData.map((item) => {
this.setMarker(item.lng, item.lat, item.address,item.siteId);
});
},
setMarker(lng, lat, address,siteId) {
if (!lng && !lat) return;
const size = (address || "").length * 5;
// this.marker = {
// position: [lng, lat],
// };
// this.markers.push([lng, lat])
let markerLabel = {
label: { content: address, offset: [30, 70] },
position: [lng, lat],
icon: require("@/assets/images/ego_box_img_normal.png"),
extData: { projectId: "1" },
extData: { siteId: siteId},
};
this.markers.push(markerLabel)
......@@ -116,6 +120,7 @@ export default {
},
},
data() {
let self = this
return {
searchEvents: {
init: (e) => {},
......@@ -124,36 +129,29 @@ export default {
markers: [],
geocoder: null,
amapManager,
zoom: 10,
zoom: 8,
center: [104.007767, 30.568308],
marker: {},
events: {
init: (e) => {
this.geocoder = new AMap.Geocoder();
console.log("markersData", this.markersData);
// this.markersData.map((item) => {
// this.setMarker(item.lng, item.lat, item.address);
// });
this.markersData.map((item) => {
this.setMarker(item.lng, item.lat, item.address);
});
console.log(this.markers);
// this.center = [lng, lat]
// const {lng, lat, address} = this.originData;
// this.setMarker(lng, lat, address);
// if(lng) {
// this.center = [lng, lat]
// }
},
click: (e) => {
const { lat, lng } = e.lnglat;
this.geocoder.getAddress([lng, lat], (status, result) => {
if (status === "complete" && result.info === "OK") {
const address = result.regeocode.formattedAddress;
this.setMarker(lng, lat, address);
this.center = [lng, lat];
}
});
alert(e.target.getExtData().siteId)
// const { lat, lng } = e.lnglat;
// this.geocoder.getAddress([lng, lat], (status, result) => {
// if (status === "complete" && result.info === "OK") {
// const address = result.regeocode.formattedAddress;
// this.setMarker(lng, lat, address);
// this.center = [lng, lat];
// }
// });
},
},
// 一些工具插件
......
device-manager-ui/admin/src/views/sitestat/maplist.vue
View file @ 90490eb8
......@@ -36,12 +36,7 @@
<el-col :span="18" :xs="12">
<Map :markersData="originData" />
<Map ref="map" :markersData="originData" />
</el-col>
</el-row>
......@@ -68,6 +63,18 @@ export default {
created() {
this.pageInfo.list='/sitestat/list'
this.$get("/sitestat/maplist", {}).then(({ data }) => {
this.originData= data.data.map(i=>{
let obj={}
obj.lng=i.longitude
obj.lat=i.latitude
obj.address=i.siteName
obj.siteId=i.id
return obj
})
this.$refs.map.refresh(this.originData);
});
this.$get("/sitestat/siteTree", {}).then(({ data }) => {
this.areaData = data.siteTree;
});
......@@ -135,20 +142,15 @@ export default {
//分页查询站点业务列表 todo
// this.siteMatterTable.siteId = node.id;
//this.getSiteMatterTableData();
this.query = { siteId: node.id };
// this.query = { siteId: node.id };
// this.getData();
}
},
},
data() {
return {
isExport: false,
originData:[{
lng:104.25,
lat:30.554,
address:"新津地区",
}],
originData:[],
config: {
search: [
{
......
device-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java
View file @ 90490eb8
......@@ -36,19 +36,20 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
@Override
public void excuteTask(ITask task) throws AppException {
UserPdu userPdu = new UserPdu();
userPdu.setPage(1);
userPdu.setSize(-1);
String resp = userFeign.findAllUser(userPdu);
log.info("resp:{}",resp);
JSONObject jsonObject = JSONObject.parseObject(resp);
if (jsonObject.getInteger("code") == 1) {
List<UserPdu> userList = jsonObject.getJSONObject("data").getObject("data", new TypeReference<List<UserPdu>>() {
});
log.info("userList:{}", JSON.toJSONString(userList));
}
return;
// UserPdu userPdu = new UserPdu();
// userPdu.setPage(1);
// userPdu.setSize(-1);
// String resp = userFeign.findAllUser(userPdu);
// log.info("resp:{}",resp);
// JSONObject jsonObject = JSONObject.parseObject(resp);
// if (jsonObject.getInteger("code") == 1) {
// List<UserPdu> userList = jsonObject.getJSONObject("data").getObject("data", new TypeReference<List<UserPdu>>() {
// });
//
// log.info("userList:{}", JSON.toJSONString(userList));
//
// }
}
......
device-manager/src/main/java/com/mortals/xhx/module/sitestat/web/SitestatController.java
View file @ 90490eb8
......@@ -7,6 +7,7 @@ import com.mortals.framework.model.Context;
import com.mortals.framework.service.IAuthTokenService;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.pdu.site.SitePdu;
import com.mortals.xhx.common.pdu.user.UserPdu;
import com.mortals.xhx.feign.site.ISiteFeign;
import com.mortals.xhx.feign.user.IUserFeign;
......@@ -51,26 +52,30 @@ public class SitestatController extends BaseCRUDJsonBodyMappingController<Sitest
super.init(model, context);
//todo 模拟登陆鉴权
UserPdu userPdu = new UserPdu();
userPdu.setLoginName("admin");
userPdu.setPassword("admin");
userPdu.setSecurityCode("8888");
String loginResp = userFeign.portalLogin(userPdu);
JSONObject loginRespJson = JSON.parseObject(loginResp);
String token = loginRespJson.getJSONObject("data").getString("token");
log.info("token:{}", token);
// String token = authTokenService.getToken(request);
String resp = siteFeign.siteTree(token);
log.info("siteTree:{}", resp);
JSONObject jsonObject = JSON.parseObject(resp);
Integer code = jsonObject.getInteger("code");
if (code == YesNoEnum.YES.getValue()) {
JSONArray siteTreeArray = jsonObject.getJSONObject("data").getJSONArray("siteTree");
model.put("siteTree", siteTreeArray);
}
// UserPdu userPdu = new UserPdu();
// userPdu.setLoginName("admin");
// userPdu.setPassword("admin");
// userPdu.setSecurityCode("8888");
// String loginResp = userFeign.portalLogin(userPdu);
// JSONObject loginRespJson = JSON.parseObject(loginResp);
// String token = loginRespJson.getJSONObject("data").getString("token");
// log.info("token:{}", token);
// // String token = authTokenService.getToken(request);
// String resp = siteFeign.siteTree(token);
//
// log.info("siteTree:{}", resp);
// JSONObject jsonObject = JSON.parseObject(resp);
//
// Integer code = jsonObject.getInteger("code");
// if (code == YesNoEnum.YES.getValue()) {
// JSONArray siteTreeArray = jsonObject.getJSONObject("data").getJSONArray("siteTree");
// model.put("siteTree", siteTreeArray);
// }
}
......@@ -95,6 +100,30 @@ public class SitestatController extends BaseCRUDJsonBodyMappingController<Sitest
}
/**
* 站点列表
*/
@GetMapping(value = "maplist")
public String maplist() {
JSONObject jsonObject = new JSONObject();
String busiDesc = this.getModuleDesc() + "构建站点列表";
try {
// TODO: 2022/7/6 管理员角色 获取所有站点列表
SitePdu sitePdu = new SitePdu();
sitePdu.setPage(1);
sitePdu.setSize(-1);
String siteListResp = siteFeign.list(sitePdu);
return siteListResp;
} catch (Exception e) {
log.error("站点异常", e);
jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
jsonObject.put(KEY_RESULT_MSG, super.convertException(e));
}
return jsonObject.toJSONString();
}
/**
* 站点信息
*/
......@@ -111,7 +140,7 @@ public class SitestatController extends BaseCRUDJsonBodyMappingController<Sitest
if (code == YesNoEnum.YES.getValue()) {
jsonObject.put(KEY_RESULT_DATA, respJson.getJSONObject("data"));
}
jsonObject.put(KEY_RESULT_MSG, busiDesc+"成功！");
jsonObject.put(KEY_RESULT_MSG, busiDesc + "成功！");
} catch (Exception e) {
log.error("获取站点异常", e);
jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment