airkoon/cellsysBase
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

一些调整

Browse Source
This commit is contained in:
ag 2024-12-26 11:21:07 +08:00
parent 55f40b09e8
commit dabd0b840a
9 changed files with 19095 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cellsysExtension.js
View File

@ -4,7 +4,7 @@
* @LastEditors: ag 2663588772@qq.com
* @Description:
*/
import { thirdpartyGet, thirdpartyPost } from '@/api/axiosExtension.js';
import { get, post } from './utils/axios';
//第三方数据元数据
class CellsysExtensionMeta {
@ -89,7 +89,7 @@ class CellsysExtensionRecord {
queryThirdpartyData() {
let apiUrl = this.apiUrl;
return new Promise((resolve, reject) => {
thirdpartyGet(apiUrl)
get(apiUrl)
.then((res) => {
this.data = res;
resolve(res);
@ -128,7 +128,7 @@ class CellsysExtensionType {
//表格头数据
let metadataUrl = this.metadataUrl;
return new Promise((resolve, reject) => {
thirdpartyGet(metadataUrl)
get(metadataUrl)
.then((res) => {
// this.data = res;
resolve(res);
@ -142,7 +142,7 @@ class CellsysExtensionType {
//表格内容
let selectUrl = this.selectUrl;
return new Promise((resolve, reject) => {
thirdpartyPost(selectUrl, pageInfo)
post(selectUrl, pageInfo)
.then((res) => {
// this.data = res;
resolve(res);
@ -156,7 +156,7 @@ class CellsysExtensionType {
//插入
let insertUrl = this.insertUrl;
return new Promise((resolve, reject) => {
thirdpartyPost(insertUrl, params)
post(insertUrl, params)
.then((res) => {
// this.data = res;
resolve(res);
@ -170,7 +170,7 @@ class CellsysExtensionType {
//更新
let updateUrl = this.updateUrl;
return new Promise((resolve, reject) => {
thirdpartyPost(updateUrl, params)
post(updateUrl, params)
.then((res) => {
// this.data = res;
resolve(res);
@ -184,7 +184,7 @@ class CellsysExtensionType {
//删除
let deleteUrl = this.deleteUrl;
return new Promise((resolve, reject) => {
thirdpartyPost(deleteUrl, param)
post(deleteUrl, param)
.then((res) => {
// this.data = res;
resolve(res);
@ -195,19 +195,24 @@ class CellsysExtensionType {
});
}
uploadImg(param, progressCallBack){
uploadImg(param, progressCallBack) {
return new Promise((resolve, reject) => {
let config = {
headers: {
'Content-Type': 'multipart/form-data'
'Content-Type': 'multipart/form-data',
},
onUploadProgress:(progressEvent)=>{ //用于上传进度
onUploadProgress: (progressEvent) => {
//用于上传进度
let loaded = progressEvent.loaded,
total = progressEvent.total;
progressCallBack(loaded/total); //上传进度回调
}
}
thirdpartyPost(`${window.GLOBAL["CORS_API"]}/ThirdpartyApi/artwork/api/picture/upload`, param, config)
progressCallBack(loaded / total); //上传进度回调
},
};
post(
`${window.GLOBAL['CORS_API']}/ThirdpartyApi/artwork/api/picture/upload`,
param,
config,
)
.then((res) => {
resolve(res);
})

15
cellsysMember.js
View File

@ -1,5 +1,6 @@
import { Query, QueryTask, QueryType, Operator, CellsysType } from './cellsysUtil.js';
import CellsysEquipment from './cellsysEquipment.js';
import { formatterDate } from './utils/date';
class CellsysMember {
constructor(params) {
@ -45,8 +46,10 @@ class CellsysMember {
this.avatar = params.avatar; // 头像
}
setMemberType(value) {
this.memberType = value;
get dateTimeStr() {
if (this.dateTime) {
return formatterDate(this.dateTime, 'YYYY-MM-DD HH:mm');
}
}
setLeader(value) {
@ -62,10 +65,14 @@ class CellsysMember {
}
//查询用户绑定的设备详情，带组织联合逻辑，无分页
queryBindDeviceDeatil() {
queryBindDeviceDeatil(params = {}) {
let { isUnion } = params;
if (this.macId) {
let query = new Query();
let queryType = QueryType.UnionEquipment;
let queryType = QueryType.Equipment;
if (isUnion) {
queryType = QueryType.UnionEquipment;
}
let queryTask = new QueryTask(queryType);
query.addFilter('macid', Operator.Equals, this.macId);
return new Promise((resolve, reject) => {

57
cellsysOfflinePolygonType.js
View File

@ -1,63 +1,63 @@
import { CellsysPolygonStyle } from './cellsysStyle'
import { CellsysPolygonStyle } from './cellsysStyle';
import CellsysElementType from './cellsysElementType';
import { CellsysType, EditTask, EditType, Query, QueryTask, QueryType } from './cellsysUtil.js';
import { PublishTarget } from './cellsysEnum';
import {hexColorToRgba} from "@/utils/utils";
import { hexColorToRgba } from './utils/utils';
class CellsysOfflinePolygonType extends CellsysElementType {
constructor(params) {
super(params);
this.cellsysType = CellsysType.OfflinePolygonType
this.cellsysType = CellsysType.OfflinePolygonType;
if (!params) {
params = {}
params = {};
}
this.id = params.id
this.name = params.name
this.description = params.description
this.orgId = params.org_id
this.orgName = params.org_name
this.id = params.id;
this.name = params.name;
this.description = params.description;
this.orgId = params.org_id;
this.orgName = params.org_name;
this.style = params.style ? params.style : CellsysPolygonStyle.getDefaultStyle();
this.action = params.action
this.typeCount = params.type_count || 0
this.action = params.action;
this.typeCount = params.type_count || 0;
this.isPublish = params.is_publish || 0;
}
setId(value) {
this.id = value
this.id = value;
}
setName(value) {
this.name = value
this.name = value;
}
setDescription(value) {
this.description = value
this.description = value;
}
setStyle(value) {
this.style = value
this.style = value;
}
getColor() {
return this.style ? this.style.color : '#000000'
return this.style ? this.style.color : '#000000';
}
getFillColor() {
return this.style ? this.style.fillColor : null
return this.style ? this.style.fillColor : null;
}
getFillOpacity() {
return this.style ? this.style.fillOpacity : null
return this.style ? this.style.fillOpacity : null;
}
getCssStyle() {
// return formatterPolygonStyle(this.style)
if (this.style) {
let strokeOpacity = this.style.strokeOpacity;
strokeOpacity = strokeOpacity === null || strokeOpacity === undefined ? 0 : strokeOpacity;
strokeOpacity =
strokeOpacity === null || strokeOpacity === undefined ? 0 : strokeOpacity;
let colors = hexColorToRgba(this.style.strokeColor || '#000000');
colors.push(strokeOpacity);
let border = this.style.weight + 'px ' + 'solid rgba(' + colors.join(',') + ')';
@ -76,18 +76,16 @@ class CellsysOfflinePolygonType extends CellsysElementType {
return null;
}
//发布功能
setPublish(publishStatus, range, ids, isEditable, remark) {
let editTask = new EditTask(EditType.OfflinePublish);
editTask.addParam('_id', this.id);
editTask.addParam("_offline_fence_type_name", this.name);
editTask.addParam('_offline_fence_type_name', this.name);
editTask.addParam('_is_publish', PublishTarget[publishStatus]);
editTask.addParam('_remark', remark);
if (publishStatus !== "noPublish") {
if (range === 1) { //发布到组织
if (publishStatus !== 'noPublish') {
if (range === 1) {
//发布到组织
editTask.addParam('_publish_org', ids);
} else {
editTask.addParam('_publish_group', ids);
@ -104,14 +102,12 @@ class CellsysOfflinePolygonType extends CellsysElementType {
//查询协同数据发布记录列表
synergyDataPublishRecord(dataId, type) {
let query = new Query();
query.setOrder({ create_time: 'desc' });
query.addFilter('data_type', '=', 4);
query.setCurrPage(1);
query.setPageSize(1);
if (dataId) {
query.addFilter('data_id', '=', dataId);
}
@ -123,9 +119,7 @@ class CellsysOfflinePolygonType extends CellsysElementType {
queryTask
.execute(query)
.then((res) => {
resolve(res);
})
.catch((err) => {
reject(err);
@ -141,5 +135,4 @@ class CellsysOfflinePolygonType extends CellsysElementType {
}
}
export default CellsysOfflinePolygonType
export default CellsysOfflinePolygonType;

14
cellsysOrg.js
View File

@ -126,6 +126,14 @@ class CellsysOrg {
return options;
}
get mapOptions() {
if (this.options && this.options['mapOptions']) {
return this.options['mapOptions'];
} else {
return {};
}
}
/**
* 更新组织信息
*/
@ -3578,7 +3586,7 @@ class CellsysOrg {
/**
* 查询组织下所有离线区域信息
*/
queryOfflinePolygons(pageInfo, filters, order) {
queryOfflinePolygons(pageInfo, filters, order, httpConfig) {
let query = new Query();
query.addFilter('org_id', Operator.Equals, this.id);
if (pageInfo) {
@ -3595,7 +3603,9 @@ class CellsysOrg {
} else {
query.setOrder({ id: 'desc' });
}
if (httpConfig) {
query.setHttpConfig(httpConfig);
}
let queryTask = new QueryTask(QueryType.OfflinePolygon, pageInfo ? true : false);
return new Promise((resolve, reject) => {
queryTask

8
cellsysPush.js
View File

@ -37,7 +37,7 @@ const TopicType = {
const createMqttClient = (cellsysPush, cellsysTopic) => {
// let clientId = 'cellsys' + (new Date().getTime()) + Math.floor(Math.random() * 100)
let clientId = getToken() + '.timestamp.' + new Date().getTime();
let clientId = getToken() + cellsysTopic.topicType + new Date().getTime();
let { ip, port, aliasPath, isSSL, username, password } = cellsysPush;
let client;
@ -60,17 +60,19 @@ const createMqttClient = (cellsysPush, cellsysTopic) => {
};
client.connect(options);
client.onConnected = (reconnect) => {
console.log(clientId, '连接建立的clientId');
if (reconnect) {
isLost = false;
clearTimeout(lostTimeCount);
lostTimeCount = null;
console.log(cellsysTopic, 'mq重连topic');
/* console.log(cellsysTopic, 'mq重连topic');*/
}
resolve(client);
};
client.onConnectionLost = (responseObject) => {
console.log(responseObject, '中断对象');
console.log(cellsysTopic, '中断的topic');
console.log(clientId, '中断的clientId');
//连接中断时开始倒计时，2分钟后没有重连成功则执行错误回调;
isLost = true;
lostTimeCount = setTimeout(() => {
@ -228,7 +230,7 @@ class pushTask {
isSSL: isSSL,
};
if (process.env.NODE_ENV === 'development') {
params['ip'] = 'localhost';
params['ip'] = '192.168.2.10';
}
let cloudOptions = this.cellsysOrg ? this.cellsysOrg.cloudOptions : {};

3
cellsysSystem.js
View File

@ -13,6 +13,9 @@ import CellsysMemberType from './cellsysMemberType';
class CellsysSystem {
constructor(params) {}
static token = null;
static hostname = null;
//在边缘工作站上查询设备列表
static querEdgeOrgList() {
let query = new Query();

15
cellsysUtil.js
View File

@ -1,4 +1,4 @@
import * as http from '@/api/axios.js';
import * as http from './utils/axios.js';
const BASE_URL = location.origin;
const IMAGE_URL = '/resources/basePic/cellsysApp';
@ -429,6 +429,8 @@ const AdminQueryType = [
'/v2' + EditType.Group_Update,
'/v2' + EditType.Group_Delete,
'/v2' + EditType.Member_Create,
'/v2' + EditType.EquipmentUser_Create,
'/v2' + EditType.EquipmentUser_Delete,
SubmitType.edgeEquipmentConnect,
QueryType.WifiHotspot,
SubmitType.switchHotspotStatus,
@ -518,6 +520,7 @@ const ThirdpartyObjectType = {
};
class Query {
static bodyParams = true; //设置请求体里需不需要传body
constructor(params) {
if (!params) {
params = {};
@ -575,10 +578,14 @@ class Query {
getQuery() {
let param = this._getParam();
let content = null;
let cellsysContent = param;
if (Query.bodyParams) {
cellsysContent = { body: param };
}
switch (this._type.toLocaleLowerCase()) {
default:
case 'cellsys':
content = { body: param };
content = cellsysContent;
break;
case 'mongodb':
content = param;
@ -614,6 +621,7 @@ class Query {
}
class QueryTask {
static hostName = '';
constructor(url, getPageInfo) {
//过滤java接口
if (url.indexOf('cellsys/api') !== -1) {
@ -625,6 +633,7 @@ class QueryTask {
//接口版本改为V2版本
this.url = '/v2' + url;
}
this.url = QueryTask.hostName + this.url;
this.getPageInfo = getPageInfo; //是否返回分页信息
}
@ -635,6 +644,8 @@ class QueryTask {
} else {
query = new Query();
}
// this.getPageInfo = query.pageSize !== 0;
let type = query.getType();
let httpConfig = query.httpConfig;
switch (type.toLocaleLowerCase()) {

23
utils/axios.js Normal file
View File

@ -0,0 +1,23 @@
import axios from 'axios';
const service = axios.create({
baseURL: '/api', //api 的 base_url，根据开发生产环境配置文件配置
withCredentials: true, // 跨域请求时发送 cookies
timeout: 0,
headers: {
'Content-Type': 'application/json;charset=UTF-8',
},
responseType: 'json',
});
const post = (url, data, config) => {
return service.post(url, data, config);
};
const get = (url, data) => {
return service.get(url, {
params: data,
});
};
export { post, get, service };

18984
utils/mqtt@4.3.7.js Normal file
View File

File diff suppressed because it is too large Load Diff