manager/orion-visor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

删除所有 as any.

Browse Source
This commit is contained in:
lijiahang
2023-09-21 17:08:33 +08:00
parent d236e57f85
commit 3e55276a13
14 changed files with 40 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
orion-ops-launch/src/main/resources/templates/orion-vue-api.ts.vm
View File

@@ -25,7 +25,7 @@ export interface ${vue.featureEntity}CreateRequest {
* ${table.comment}更新请求
*/
export interface ${vue.featureEntity}UpdateRequest extends ${vue.featureEntity}CreateRequest {
id: number;
id: number | undefined;
}
/**

8
orion-ops-launch/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm
View File

@@ -61,7 +61,7 @@
const title = ref<string>();
const isAddHandle = ref<boolean>(true);
const defaultForm = () => {
const defaultForm = (): ${vue.featureEntity}UpdateRequest & Record<string, any> => {
return {
#foreach($field in ${table.fields})
${field.propertyName}: undefined,
@@ -70,7 +70,7 @@
};
const formRef = ref<any>();
const formModel = reactive<Record<string, any>>(defaultForm());
const formModel = reactive<${vue.featureEntity}UpdateRequest & Record<string, any>>(defaultForm());
const emits = defineEmits(['added', 'updated']);
@@ -110,12 +110,12 @@
}
if (isAddHandle.value) {
// 新增
await create${vue.featureEntity}(formModel as any);
await create${vue.featureEntity}(formModel);
Message.success('创建成功');
emits('added');
} else {
// 修改
await update${vue.featureEntity}(formModel as any);
await update${vue.featureEntity}(formModel);
Message.success('修改成功');
emits('updated');
}

10
orion-ops-launch/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm
View File

@@ -53,7 +53,7 @@
import useLoading from '@/hooks/loading';
import useVisible from '@/hooks/visible';
import formRules from '../types/form.rules';
import { create${vue.featureEntity}, update${vue.featureEntity} } from '@/api/${vue.module}/${vue.feature}';
import { create${vue.featureEntity}, update${vue.featureEntity}, ${vue.featureEntity}UpdateRequest } from '@/api/${vue.module}/${vue.feature}';
import { Message } from '@arco-design/web-vue';
import {} from '../types/enum.types';
import {} from '../types/const';
@@ -65,7 +65,7 @@
const title = ref<string>();
const isAddHandle = ref<boolean>(true);
const defaultForm = () => {
const defaultForm = (): ${vue.featureEntity}UpdateRequest & Record<string, any> => {
return {
#foreach($field in ${table.fields})
${field.propertyName}: undefined,
@@ -74,7 +74,7 @@
};
const formRef = ref<any>();
const formModel = reactive<Record<string, any>>(defaultForm());
const formModel = reactive<${vue.featureEntity}UpdateRequest & Record<string, any>>(defaultForm());
const emits = defineEmits(['added', 'updated']);
@@ -114,12 +114,12 @@
}
if (isAddHandle.value) {
// 新增
await create${vue.featureEntity}(formModel as any);
await create${vue.featureEntity}(formModel);
Message.success('创建成功');
emits('added');
} else {
// 修改
await update${vue.featureEntity}(formModel as any);
await update${vue.featureEntity}(formModel);
Message.success('修改成功');
emits('updated');
}

9
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/dao/HostIdentityDAO.java
View File

@@ -1,5 +1,7 @@
package com.orion.ops.module.asset.dao;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.orion.ops.framework.mybatis.core.mapper.IMapper;
import com.orion.ops.module.asset.entity.domain.HostIdentityDO;
import org.apache.ibatis.annotations.Mapper;
@@ -21,6 +23,11 @@ public interface HostIdentityDAO extends IMapper<HostIdentityDO> {
* @param keyId keyId
* @return effect
*/
int setKeyWithNull(@Param("keyId") Long keyId);
default int setKeyWithNull(@Param("keyId") Long keyId) {
LambdaUpdateWrapper<HostIdentityDO> updateWrapper = Wrappers.<HostIdentityDO>lambdaUpdate()
.set(HostIdentityDO::getKeyId, null)
.eq(HostIdentityDO::getKeyId, keyId);
return this.update(null, updateWrapper);
}
}

6
orion-ops-module-asset/orion-ops-module-asset-service/src/main/resources/mapper/HostIdentityMapper.xml
View File

@@ -21,10 +21,4 @@
id, name, username, password, key_id, create_time, update_time, creator, updater, deleted
</sql>
<update id="setKeyWithNull">
UPDATE host_identity
SET key_id = NULL
WHERE key_id = #{keyId}
</update>
</mapper>

2
orion-ops-ui/src/api/asset/host-identity.ts
View File

@@ -16,7 +16,7 @@ export interface HostIdentityCreateRequest {
* 主机身份更新请求
*/
export interface HostIdentityUpdateRequest extends HostIdentityCreateRequest {
id: number;
id: number | undefined;
useNewPassword?: boolean;
}

2
orion-ops-ui/src/api/asset/host-key.ts
View File

@@ -15,7 +15,7 @@ export interface HostKeyCreateRequest {
* 主机秘钥更新请求
*/
export interface HostKeyUpdateRequest extends HostKeyCreateRequest {
id: number;
id: number | undefined;
useNewPassword?: boolean;
}

2
orion-ops-ui/src/api/system/menu.ts
View File

@@ -20,7 +20,7 @@ export interface MenuCreateRequest {
* 菜单更新请求
*/
export interface MenuUpdateRequest extends MenuCreateRequest {
id: number;
id: number | undefined;
status?: number;
}

2
orion-ops-ui/src/api/user/role.ts
View File

@@ -14,7 +14,7 @@ export interface RoleCreateRequest {
* 角色更新请求
*/
export interface RoleUpdateRequest extends RoleCreateRequest {
id: number;
id: number | undefined;
}
/**

10
orion-ops-ui/src/views/asset/host-identity/components/host-identity-form-modal.vue
View File

@@ -64,7 +64,7 @@
import useLoading from '@/hooks/loading';
import useVisible from '@/hooks/visible';
import formRules from '../types/form.rules';
import { createHostIdentity, updateHostIdentity } from '@/api/asset/host-identity';
import { createHostIdentity, updateHostIdentity, HostIdentityUpdateRequest } from '@/api/asset/host-identity';
import { Message } from '@arco-design/web-vue';
import HostKeySelector from '@/components/asset/host-key/host-key-selector.vue';
@@ -74,7 +74,7 @@
const title = ref<string>();
const isAddHandle = ref<boolean>(true);
const defaultForm = () => {
const defaultForm = (): HostIdentityUpdateRequest & Record<string, any> => {
return {
id: undefined,
name: undefined,
@@ -86,7 +86,7 @@
};
const formRef = ref<any>();
const formModel = reactive<Record<string, any>>(defaultForm());
const formModel = reactive<HostIdentityUpdateRequest & Record<string, any>>(defaultForm());
const emits = defineEmits(['added', 'updated']);
@@ -130,12 +130,12 @@
return false;
}
// 新增
await createHostIdentity(formModel as any);
await createHostIdentity(formModel);
Message.success('创建成功');
emits('added');
} else {
// 修改
await updateHostIdentity(formModel as any);
await updateHostIdentity(formModel);
Message.success('修改成功');
emits('updated');
}

9
orion-ops-ui/src/views/asset/host-identity/types/form.rules.ts
View File

@@ -17,21 +17,12 @@ export const username = [{
}] as FieldRule[];
export const password = [{
required: true,
message: '请输入用户密码'
}, {
maxLength: 512,
message: '用户密码长度不能大于512位'
}] as FieldRule[];
export const keyId = [{
required: true,
message: '请输入秘钥id'
}] as FieldRule[];
export default {
name,
username,
password,
keyId,
} as Record<string, FieldRule | FieldRule[]>;

10
orion-ops-ui/src/views/asset/host-key/components/host-key-form-drawer.vue
View File

@@ -92,7 +92,7 @@
import useLoading from '@/hooks/loading';
import useVisible from '@/hooks/visible';
import formRules from '../types/form.rules';
import { createHostKey, updateHostKey, getHostKey } from '@/api/asset/host-key';
import { createHostKey, updateHostKey, getHostKey, HostKeyUpdateRequest } from '@/api/asset/host-key';
import { FileItem, Message } from '@arco-design/web-vue';
import {} from '../types/enum.types';
import {} from '../types/const';
@@ -105,7 +105,7 @@
const isAddHandle = ref<boolean>(true);
const isViewHandler = ref<boolean>(false);
const defaultForm = () => {
const defaultForm = (): HostKeyUpdateRequest & Record<string, any> => {
return {
id: undefined,
name: undefined,
@@ -117,7 +117,7 @@
};
const formRef = ref<any>();
const formModel = reactive<Record<string, any>>(defaultForm());
const formModel = reactive<HostKeyUpdateRequest & Record<string, any>>(defaultForm());
const emits = defineEmits(['added', 'updated']);
@@ -192,12 +192,12 @@
}
if (isAddHandle.value) {
// 新增
await createHostKey(formModel as any);
await createHostKey(formModel);
Message.success('创建成功');
emits('added');
} else {
// 修改
await updateHostKey(formModel as any);
await updateHostKey(formModel);
Message.success('修改成功');
emits('updated');
}

3
orion-ops-ui/src/views/asset/host/types/table.columns.ts
View File

@@ -12,6 +12,8 @@ const columns = [
title: '主机名称',
dataIndex: 'name',
slotName: 'name',
ellipsis: true,
tooltip: true
}, {
title: '主机编码',
dataIndex: 'code',
@@ -20,6 +22,7 @@ const columns = [
title: '主机地址',
dataIndex: 'address',
slotName: 'address',
width: 260
}, {
title: '标签',
dataIndex: 'tag',

10
orion-ops-ui/src/views/system/menu/components/menu-form-modal.vue
View File

@@ -126,7 +126,7 @@
import { toOptions } from '@/utils/enum';
import IconPicker from '@sanqi377/arco-vue-icon-picker';
import MenuTreeSelector from './menu-tree-selector.vue';
import { createMenu, updateMenu } from '@/api/system/menu';
import { createMenu, updateMenu, MenuUpdateRequest } from '@/api/system/menu';
import { Message } from '@arco-design/web-vue';
const { visible, setVisible } = useVisible();
@@ -135,7 +135,7 @@
const title = ref<string>();
const isAddHandle = ref<boolean>(true);
const defaultForm = () => {
const defaultForm = (): MenuUpdateRequest & Record<string, any> => {
return {
id: undefined,
parentId: 0,
@@ -152,7 +152,7 @@
};
const formRef = ref<any>();
const formModel = reactive<Record<string, any>>(defaultForm());
const formModel = reactive<MenuUpdateRequest & Record<string, any>>(defaultForm());
const emits = defineEmits(['added', 'updated']);
@@ -208,12 +208,12 @@
}
if (isAddHandle.value) {
// 新增
await createMenu(formModel as any);
await createMenu(formModel);
Message.success('创建成功');
emits('added');
} else {
// 修改
await updateMenu(formModel as any);
await updateMenu(formModel);
Message.success('修改成功');
emits('updated');
}