1、更新jsonrpc

src/config/route.js

@@ -31,7 +31,7 @@ import userRouter from '../router/userRouter';
 
 
 const routes = userRouter.filter(item => {
-	return !item.meta.permission || store.state.userInfo.menuAuths.includes(item.meta.permission);
+	return !item.meta.permission || store.state.userInfo?.menuAuths?.includes(item.meta.permission);
 })
 
 export default routes;

src/jsonrpc/services/organization.m.js

@@ -15,12 +15,17 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetOrganizationTreeRequest = exports.OrganizationTreeDTO = exports.TeamBaseDTO = exports.UpdateOrganizationRequest = exports.GetOrganizationListRequest = exports.RemoveOrganizationRequest = exports.OrganizationPageRequest = exports.GetOrganizationByKeyRequest = exports.GetOrganizationRequest = exports.OrganizationDTO = exports.CreateOrganizationRequest = void 0;
+exports.GetOrganizationTreeRequest = exports.OrganizationTreeDTO = exports.TeamBaseDTO = exports.UpdateOrganizationRequest = exports.GetOrganizationListRequest = exports.RemoveOrganizationRequest = exports.OrganizationPageRequest = exports.GetOrganizationByKeyRequest = exports.GetOrganizationRequest = exports.OrganizationDTO = exports.CreateOrganizationRequest = exports.CustomTypeEnum = void 0;
 var authentication_m_1 = require("./authentication.m");
+var CustomTypeEnum;
+(function (CustomTypeEnum) {
+    CustomTypeEnum[CustomTypeEnum["General"] = 0] = "General";
+    CustomTypeEnum[CustomTypeEnum["CustomFirst"] = 1] = "CustomFirst";
+})(CustomTypeEnum || (exports.CustomTypeEnum = CustomTypeEnum = {}));
 var CreateOrganizationRequest = /** @class */ (function (_super) {
     __extends(CreateOrganizationRequest, _super);
     function CreateOrganizationRequest(_a) {
-        var code = _a.code, provinceCode = _a.provinceCode, cityCode = _a.cityCode, districtCode = _a.districtCode, townCode = _a.townCode, residenceCode = _a.residenceCode, organizationName = _a.organizationName, contactNumber = _a.contactNumber, logoUrl = _a.logoUrl, address = _a.address, fatherCode = _a.fatherCode, featureCodes = _a.featureCodes, token = _a.token;
+        var code = _a.code, provinceCode = _a.provinceCode, cityCode = _a.cityCode, districtCode = _a.districtCode, townCode = _a.townCode, residenceCode = _a.residenceCode, organizationName = _a.organizationName, contactNumber = _a.contactNumber, logoUrl = _a.logoUrl, address = _a.address, fatherCode = _a.fatherCode, featureCodes = _a.featureCodes, customType = _a.customType, token = _a.token;
         var _this = _super.call(this, {
             token: token,
         }) || this;
@@ -36,6 +41,7 @@ var CreateOrganizationRequest = /** @class */ (function (_super) {
         _this.address = address;
         _this.fatherCode = fatherCode;
         _this.featureCodes = featureCodes;
+        _this.customType = customType || CustomTypeEnum.General;
         _this.token = token;
         return _this;
     }
@@ -52,6 +58,7 @@ var CreateOrganizationRequest = /** @class */ (function (_super) {
             address: map['Address'],
             fatherCode: map['FatherCode'],
             featureCodes: !map['FeatureCodes'] ? [] : Array.from(map['FeatureCodes']),
+            customType: map['CustomType'],
             token: map['Token'],
         });
     };
@@ -81,6 +88,7 @@ var CreateOrganizationRequest = /** @class */ (function (_super) {
             map['FatherCode'] = this.fatherCode;
         if (this.featureCodes != null)
             map['FeatureCodes'] = this.featureCodes;
+        map['CustomType'] = this.customType;
         return map;
     };
     return CreateOrganizationRequest;
@@ -89,7 +97,7 @@ exports.CreateOrganizationRequest = CreateOrganizationRequest;
 var OrganizationDTO = /** @class */ (function (_super) {
     __extends(OrganizationDTO, _super);
     function OrganizationDTO(_a) {
-        var provinceCode = _a.provinceCode, cityCode = _a.cityCode, districtCode = _a.districtCode, townCode = _a.townCode, residenceCode = _a.residenceCode, townName = _a.townName, residenceName = _a.residenceName, organizationName = _a.organizationName, contactNumber = _a.contactNumber, logoUrl = _a.logoUrl, address = _a.address, directors = _a.directors, fatherCode = _a.fatherCode, fatherName = _a.fatherName, featureCodes = _a.featureCodes, code = _a.code, createTime = _a.createTime, updateTime = _a.updateTime;
+        var provinceCode = _a.provinceCode, cityCode = _a.cityCode, districtCode = _a.districtCode, townCode = _a.townCode, residenceCode = _a.residenceCode, townName = _a.townName, residenceName = _a.residenceName, organizationName = _a.organizationName, contactNumber = _a.contactNumber, logoUrl = _a.logoUrl, address = _a.address, directors = _a.directors, fatherCode = _a.fatherCode, fatherName = _a.fatherName, featureCodes = _a.featureCodes, customType = _a.customType, code = _a.code, createTime = _a.createTime, updateTime = _a.updateTime;
         var _this = _super.call(this, {
             code: code,
             createTime: createTime,
@@ -110,6 +118,7 @@ var OrganizationDTO = /** @class */ (function (_super) {
         _this.fatherCode = fatherCode;
         _this.fatherName = fatherName;
         _this.featureCodes = featureCodes;
+        _this.customType = customType || CustomTypeEnum.General;
         _this.code = code;
         _this.createTime = createTime;
         _this.updateTime = updateTime;
@@ -131,6 +140,7 @@ var OrganizationDTO = /** @class */ (function (_super) {
             fatherCode: map['FatherCode'],
             fatherName: map['FatherName'],
             featureCodes: !map['FeatureCodes'] ? [] : Array.from(map['FeatureCodes']),
+            customType: map['CustomType'],
             code: map['Code'],
             createTime: map['CreateTime'] !== null ? new Date(map['CreateTime']) : null,
             updateTime: map['UpdateTime'] !== null ? new Date(map['UpdateTime']) : null,
@@ -168,6 +178,7 @@ var OrganizationDTO = /** @class */ (function (_super) {
             map['FatherName'] = this.fatherName;
         if (this.featureCodes != null)
             map['FeatureCodes'] = this.featureCodes;
+        map['CustomType'] = this.customType;
         return map;
     };
     return OrganizationDTO;
@@ -316,7 +327,7 @@ exports.GetOrganizationListRequest = GetOrganizationListRequest;
 var UpdateOrganizationRequest = /** @class */ (function (_super) {
     __extends(UpdateOrganizationRequest, _super);
     function UpdateOrganizationRequest(_a) {
-        var code = _a.code, provinceCode = _a.provinceCode, cityCode = _a.cityCode, districtCode = _a.districtCode, townCode = _a.townCode, residenceCode = _a.residenceCode, organizationName = _a.organizationName, contactNumber = _a.contactNumber, logoUrl = _a.logoUrl, address = _a.address, fatherCode = _a.fatherCode, featureCodes = _a.featureCodes, token = _a.token;
+        var code = _a.code, provinceCode = _a.provinceCode, cityCode = _a.cityCode, districtCode = _a.districtCode, townCode = _a.townCode, residenceCode = _a.residenceCode, organizationName = _a.organizationName, contactNumber = _a.contactNumber, logoUrl = _a.logoUrl, address = _a.address, fatherCode = _a.fatherCode, featureCodes = _a.featureCodes, customType = _a.customType, token = _a.token;
         var _this = _super.call(this, {
             token: token,
         }) || this;
@@ -332,6 +343,7 @@ var UpdateOrganizationRequest = /** @class */ (function (_super) {
         _this.address = address;
         _this.fatherCode = fatherCode;
         _this.featureCodes = featureCodes;
+        _this.customType = customType || CustomTypeEnum.General;
         _this.token = token;
         return _this;
     }
@@ -348,6 +360,7 @@ var UpdateOrganizationRequest = /** @class */ (function (_super) {
             address: map['Address'],
             fatherCode: map['FatherCode'],
             featureCodes: !map['FeatureCodes'] ? [] : Array.from(map['FeatureCodes']),
+            customType: map['CustomType'],
             token: map['Token'],
         });
     };
@@ -377,6 +390,7 @@ var UpdateOrganizationRequest = /** @class */ (function (_super) {
             map['FatherCode'] = this.fatherCode;
         if (this.featureCodes != null)
             map['FeatureCodes'] = this.featureCodes;
+        map['CustomType'] = this.customType;
         return map;
     };
     return UpdateOrganizationRequest;

src/jsonrpc/services/organization.m.ts

@@ -2,6 +2,11 @@ import { BaseDTO,TokenDTO,AccountType,LoginSource,ApplyTokenRequest,BaseRequest,
 import { CreateAnalyzeConfigRequest,AnalyzeConfigDTO,GetAnalyzeConfigRequest,GetAnalyzeConfigByKeyRequest,PageCollection,AnalyzeConfigPageRequest,RemoveAnalyzeConfigRequest,GetAnalyzeConfigListRequest,UpdateAnalyzeConfigRequest, } from './analyzeConfig.m';
 
 
+export enum CustomTypeEnum {
+	General,
+	CustomFirst,
+}
+
 export class CreateOrganizationRequest extends TokenRequest {
 	code: String;
 	provinceCode: String;
@@ -15,6 +20,7 @@ export class CreateOrganizationRequest extends TokenRequest {
 	address: String;
 	fatherCode: String;
 	featureCodes: String[];
+	customType: CustomTypeEnum;
 
 	constructor({
 		code,
@@ -29,6 +35,7 @@ export class CreateOrganizationRequest extends TokenRequest {
 		address,
 		fatherCode,
 		featureCodes,
+		customType,
 		token,
 	}) {
 		super({
@@ -46,6 +53,7 @@ export class CreateOrganizationRequest extends TokenRequest {
 		this.address = address;
 		this.fatherCode = fatherCode;
 		this.featureCodes = featureCodes;
+		this.customType = customType||CustomTypeEnum.General;
 		this.token = token;
 	}
 
@@ -63,6 +71,7 @@ export class CreateOrganizationRequest extends TokenRequest {
 			address: map['Address'],
 			fatherCode: map['FatherCode'],
 			featureCodes: !map['FeatureCodes'] ? []  :Array.from(map['FeatureCodes']),
+			customType: map['CustomType'] ,
 			token: map['Token'],
 }		);
 	}
@@ -93,6 +102,7 @@ export class CreateOrganizationRequest extends TokenRequest {
 			map['FatherCode'] = this.fatherCode;
 		if(this.featureCodes != null)
 			map['FeatureCodes'] = this.featureCodes;
+		map['CustomType'] = this.customType;
 		return map;
 	}
 }
@@ -113,6 +123,7 @@ export class OrganizationDTO extends BaseDTO {
 	fatherCode: String;
 	fatherName: String;
 	featureCodes: String[];
+	customType: CustomTypeEnum;
 
 	constructor({
 		provinceCode,
@@ -130,6 +141,7 @@ export class OrganizationDTO extends BaseDTO {
 		fatherCode,
 		fatherName,
 		featureCodes,
+		customType,
 		code,
 		createTime,
 		updateTime,
@@ -154,6 +166,7 @@ export class OrganizationDTO extends BaseDTO {
 		this.fatherCode = fatherCode;
 		this.fatherName = fatherName;
 		this.featureCodes = featureCodes;
+		this.customType = customType||CustomTypeEnum.General;
 		this.code = code;
 		this.createTime = createTime;
 		this.updateTime = updateTime;
@@ -176,6 +189,7 @@ export class OrganizationDTO extends BaseDTO {
 			fatherCode: map['FatherCode'],
 			fatherName: map['FatherName'],
 			featureCodes: !map['FeatureCodes'] ? []  :Array.from(map['FeatureCodes']),
+			customType: map['CustomType'] ,
 			code: map['Code'],
 			createTime: map['CreateTime'] !== null ? new Date(map['CreateTime']) : null,
 			updateTime: map['UpdateTime'] !== null ? new Date(map['UpdateTime']) : null,
@@ -214,6 +228,7 @@ export class OrganizationDTO extends BaseDTO {
 			map['FatherName'] = this.fatherName;
 		if(this.featureCodes != null)
 			map['FeatureCodes'] = this.featureCodes;
+		map['CustomType'] = this.customType;
 		return map;
 	}
 }
@@ -396,6 +411,7 @@ export class UpdateOrganizationRequest extends TokenRequest {
 	address: String;
 	fatherCode: String;
 	featureCodes: String[];
+	customType: CustomTypeEnum;
 
 	constructor({
 		code,
@@ -410,6 +426,7 @@ export class UpdateOrganizationRequest extends TokenRequest {
 		address,
 		fatherCode,
 		featureCodes,
+		customType,
 		token,
 	}) {
 		super({
@@ -427,6 +444,7 @@ export class UpdateOrganizationRequest extends TokenRequest {
 		this.address = address;
 		this.fatherCode = fatherCode;
 		this.featureCodes = featureCodes;
+		this.customType = customType||CustomTypeEnum.General;
 		this.token = token;
 	}
 
@@ -444,6 +462,7 @@ export class UpdateOrganizationRequest extends TokenRequest {
 			address: map['Address'],
 			fatherCode: map['FatherCode'],
 			featureCodes: !map['FeatureCodes'] ? []  :Array.from(map['FeatureCodes']),
+			customType: map['CustomType'] ,
 			token: map['Token'],
 }		);
 	}
@@ -474,6 +493,7 @@ export class UpdateOrganizationRequest extends TokenRequest {
 			map['FatherCode'] = this.fatherCode;
 		if(this.featureCodes != null)
 			map['FeatureCodes'] = this.featureCodes;
+		map['CustomType'] = this.customType;
 		return map;
 	}
 }

src/jsonrpc/services/organization.ts

@@ -1,5 +1,5 @@
 import JsonRpcClientBase from '../client_base'
-import {CreateOrganizationRequest,OrganizationDTO,GetOrganizationRequest,GetOrganizationByKeyRequest,OrganizationPageRequest,RemoveOrganizationRequest,GetOrganizationListRequest,UpdateOrganizationRequest,TeamBaseDTO,OrganizationTreeDTO,GetOrganizationTreeRequest,} from  './organization.m'
+import {CustomTypeEnum,CreateOrganizationRequest,OrganizationDTO,GetOrganizationRequest,GetOrganizationByKeyRequest,OrganizationPageRequest,RemoveOrganizationRequest,GetOrganizationListRequest,UpdateOrganizationRequest,TeamBaseDTO,OrganizationTreeDTO,GetOrganizationTreeRequest,} from  './organization.m'
 import { CreateAnalyzeConfigRequest,AnalyzeConfigDTO,GetAnalyzeConfigRequest,GetAnalyzeConfigByKeyRequest,PageCollection,AnalyzeConfigPageRequest,RemoveAnalyzeConfigRequest,GetAnalyzeConfigListRequest,UpdateAnalyzeConfigRequest, } from './analyzeConfig.m';
 
 

src/jsonrpc/services/upgrade.m.js

@@ -64,28 +64,32 @@ exports.CreateUpgradeRequest = CreateUpgradeRequest;
 var UpgradeDTO = /** @class */ (function (_super) {
     __extends(UpgradeDTO, _super);
     function UpgradeDTO(_a) {
-        var version = _a.version, upgradeNotes = _a.upgradeNotes, upgradeFileUrl = _a.upgradeFileUrl, applicableEquipment = _a.applicableEquipment, isGatedLaunch = _a.isGatedLaunch, code = _a.code, createTime = _a.createTime, updateTime = _a.updateTime;
+        var isNeedUpdate = _a.isNeedUpdate, version = _a.version, upgradeNotes = _a.upgradeNotes, upgradeFileUrl = _a.upgradeFileUrl, applicableEquipment = _a.applicableEquipment, isGatedLaunch = _a.isGatedLaunch, isCoerce = _a.isCoerce, code = _a.code, createTime = _a.createTime, updateTime = _a.updateTime;
         var _this = _super.call(this, {
             code: code,
             createTime: createTime,
             updateTime: updateTime,
         }) || this;
+        _this.isNeedUpdate = isNeedUpdate || false;
         _this.version = version;
         _this.upgradeNotes = upgradeNotes;
         _this.upgradeFileUrl = upgradeFileUrl;
         _this.applicableEquipment = applicableEquipment;
         _this.isGatedLaunch = isGatedLaunch || false;
+        _this.isCoerce = isCoerce || false;
         _this.code = code;
         _this.createTime = createTime;
         _this.updateTime = updateTime;
         return _this;
     }
     UpgradeDTO.fromJson = function (map) {
-        return new UpgradeDTO({ version: map['Version'],
+        return new UpgradeDTO({ isNeedUpdate: map['IsNeedUpdate'],
+            version: map['Version'],
             upgradeNotes: map['UpgradeNotes'],
             upgradeFileUrl: map['UpgradeFileUrl'],
             applicableEquipment: !map['ApplicableEquipment'] ? [] : Array.from(map['ApplicableEquipment']),
             isGatedLaunch: map['IsGatedLaunch'],
+            isCoerce: map['IsCoerce'],
             code: map['Code'],
             createTime: map['CreateTime'] !== null ? new Date(map['CreateTime']) : null,
             updateTime: map['UpdateTime'] !== null ? new Date(map['UpdateTime']) : null,
@@ -93,6 +97,7 @@ var UpgradeDTO = /** @class */ (function (_super) {
     };
     UpgradeDTO.prototype.toJson = function () {
         var map = _super.prototype.toJson.call(this);
+        map['IsNeedUpdate'] = this.isNeedUpdate;
         if (this.version != null)
             map['Version'] = this.version;
         if (this.upgradeNotes != null)
@@ -102,6 +107,7 @@ var UpgradeDTO = /** @class */ (function (_super) {
         if (this.applicableEquipment != null)
             map['ApplicableEquipment'] = this.applicableEquipment;
         map['IsGatedLaunch'] = this.isGatedLaunch;
+        map['IsCoerce'] = this.isCoerce;
         return map;
     };
     return UpgradeDTO;

src/jsonrpc/services/upgrade.m.ts

@@ -61,18 +61,22 @@ export class CreateUpgradeRequest extends TokenRequest {
 }
 
 export class UpgradeDTO extends BaseDTO {
+	isNeedUpdate: boolean;
 	version: String;
 	upgradeNotes: String;
 	upgradeFileUrl: String;
 	applicableEquipment: String[];
 	isGatedLaunch: boolean;
+	isCoerce: boolean;
 
 	constructor({
+		isNeedUpdate,
 		version,
 		upgradeNotes,
 		upgradeFileUrl,
 		applicableEquipment,
 		isGatedLaunch,
+		isCoerce,
 		code,
 		createTime,
 		updateTime,
@@ -82,11 +86,13 @@ export class UpgradeDTO extends BaseDTO {
 		createTime,
 		updateTime,
 		});
+		this.isNeedUpdate = isNeedUpdate||false;
 		this.version = version;
 		this.upgradeNotes = upgradeNotes;
 		this.upgradeFileUrl = upgradeFileUrl;
 		this.applicableEquipment = applicableEquipment;
 		this.isGatedLaunch = isGatedLaunch||false;
+		this.isCoerce = isCoerce||false;
 		this.code = code;
 		this.createTime = createTime;
 		this.updateTime = updateTime;
@@ -94,11 +100,13 @@ export class UpgradeDTO extends BaseDTO {
 
 	static fromJson(map: { [key: string]: any }): UpgradeDTO {
 		return new UpgradeDTO( 
-{ 			version: map['Version'],
+{ 			isNeedUpdate: map['IsNeedUpdate'],
+			version: map['Version'],
 			upgradeNotes: map['UpgradeNotes'],
 			upgradeFileUrl: map['UpgradeFileUrl'],
 			applicableEquipment: !map['ApplicableEquipment'] ? []  :Array.from(map['ApplicableEquipment']),
 			isGatedLaunch: map['IsGatedLaunch'],
+			isCoerce: map['IsCoerce'],
 			code: map['Code'],
 			createTime: map['CreateTime'] !== null ? new Date(map['CreateTime']) : null,
 			updateTime: map['UpdateTime'] !== null ? new Date(map['UpdateTime']) : null,
@@ -107,6 +115,7 @@ export class UpgradeDTO extends BaseDTO {
 
 	toJson(): Record<string, unknown> {
 		const map: Record<string, unknown> = super.toJson();
+		map['IsNeedUpdate'] = this.isNeedUpdate;
 		if(this.version != null)
 			map['Version'] = this.version;
 		if(this.upgradeNotes != null)
@@ -116,6 +125,7 @@ export class UpgradeDTO extends BaseDTO {
 		if(this.applicableEquipment != null)
 			map['ApplicableEquipment'] = this.applicableEquipment;
 		map['IsGatedLaunch'] = this.isGatedLaunch;
+		map['IsCoerce'] = this.isCoerce;
 		return map;
 	}
 }