模型信息

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/ModelInfo.java

@@ -47,11 +47,11 @@ public class ModelInfo extends BaseEntity {
      * 模型参数
      */
     @Excel(name = "模型参数")
-    private String modelParms;
+    private String modelParams;
 
     /**
      * 数据参数
      */
     @Excel(name = "数据参数")
-    private String dataParms;
+    private String dataParams;
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/ModelServiceImpl.java

@@ -17,7 +17,6 @@ import com.phm.common.constant.Constants;
 import com.phm.common.exception.GlobalException;
 import com.phm.common.utils.file.FileUploadUtils;
 import com.phm.common.utils.ip.IpUtils;
-import com.phm.common.utils.uuid.Seq;
 import com.phm.manage.domain.ModelInfo;
 import com.phm.manage.domain.SortieParameter;
 import com.phm.manage.domain.dto.ModelRequest;
@@ -106,7 +105,7 @@ public class ModelServiceImpl implements IModelService {
         }
         String url;
         try {
-            url = getFileUrl(modelInfo.getDataParms(), sortieParameter.getDataPath());
+            url = getFileUrl(modelInfo.getDataParams(), sortieParameter.getDataPath());
         } catch (IOException e) {
             log.error(e.getMessage());
             throw new GlobalException("上传文件失败");
@@ -133,7 +132,7 @@ public class ModelServiceImpl implements IModelService {
     }
 
     private static Map<String, String> getParmsMap(ModelInfo modelInfo) {
-        String modelParms = modelInfo.getModelParms();
+        String modelParms = modelInfo.getModelParams();
         if (ObjectUtil.isEmpty(modelParms)) {
             return new HashMap<>();
         }

PHM-admin/phm-manage/src/main/resources/mapper/manage/ModelInfoMapper.xml

@@ -9,8 +9,8 @@
         <result property="name" column="name"/>
         <result property="type" column="tye"/>
         <result property="url" column="url"/>
-        <result property="modelParms" column="model_parms"/>
-        <result property="dataParms" column="data_parms"/>
+        <result property="modelParams" column="model_params"/>
+        <result property="dataParams" column="data_params"/>
         <result property="isDelete" column="is_delete"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
@@ -23,8 +23,8 @@
                name,
                type,
                url,
-               model_parms,
-               data_parms,
+               model_params,
+               data_params,
                is_delete,
                create_by,
                create_time,
@@ -39,9 +39,9 @@
             <if test="name != null  and name != ''">and name = #{name}</if>
             <if test="type != null  and type != ''">and type = #{type}</if>
             <if test="url != null  and url != ''">and url = #{url}</if>
-            <if test="modelParms != null  and modelParms != ''">and model_parms =
-                #{modelParms}</if>
-            <if test="dataParms != null  and dataParms != ''">and data_parms =
+            <if test="modelParams != null  and modelParams != ''">and model_parms =
+                #{modelParams}</if>
+            <if test="dataParams != null  and dataParams != ''">and data_parms =
                 #{parms}</if>
             <if test="isDelete != null ">and is_delete = #{isDelete}</if>
         </where>
@@ -59,8 +59,8 @@
             <if test="name != null">name,</if>
             <if test="type != null">type,</if>
             <if test="url != null">url,</if>
-            <if test="modelParms != null">model_parms,</if>
-            <if test="dataParms != null">data_parms,</if>
+            <if test="modelParams != null">model_params,</if>
+            <if test="dataParams != null">data_params,</if>
             <if test="isDelete != null">is_delete,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -72,8 +72,8 @@
             <if test="name != null">#{name},</if>
             <if test="type != null">#{type},</if>
             <if test="url != null">#{url},</if>
-            <if test="modelParms != null">#{modelParms},</if>
-            <if test="dataParms != null">#{dataParms},</if>
+            <if test="modelParams != null">#{modelParams},</if>
+            <if test="dataParams != null">#{dataParams},</if>
             <if test="isDelete != null">#{isDelete},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -88,8 +88,8 @@
             <if test="name != null">name = #{name},</if>
             <if test="type != null">type = #{type},</if>
             <if test="url != null">url = #{url},</if>
-            <if test="modelParms != null">model_parms = #{modelParms},</if>
-            <if test="dataParms != null">data_parms = #{dataParms},</if>
+            <if test="modelParams != null">model_params = #{modelParams},</if>
+            <if test="dataParams != null">data_params = #{dataParams},</if>
             <if test="isDelete != null">is_delete = #{isDelete},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

PHM-web/src/api/manage/model.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询模型参数信息列表
+export function listModel(query) {
+  return request({
+    url: '/manage/model/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询模型参数信息详细
+export function getModel(id) {
+  return request({
+    url: '/manage/model/' + id,
+    method: 'get'
+  })
+}
+
+// 新增模型参数信息
+export function addModel(data) {
+  return request({
+    url: '/manage/model',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改模型参数信息
+export function updateModel(data) {
+  return request({
+    url: '/manage/model',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除模型参数信息
+export function delModel(id) {
+  return request({
+    url: '/manage/model/' + id,
+    method: 'delete'
+  })
+}

PHM-web/src/views/manage/falseAlarmRestrainModel/index.vue

@@ -86,7 +86,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" border :data="falseAlarmRestrainModelList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="falseAlarmRestrainModelList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="模型名称" align="center" prop="modelName" />
       <el-table-column label="模型Url" align="center" prop="modelUrl" />

PHM-web/src/views/manage/model/index.vue

@@ -0,0 +1,412 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="模型连接" prop="url">
+        <el-input
+          v-model="queryParams.url"
+          placeholder="请输入模型连接"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['manage:model:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['manage:model:edit']"
+          >修改</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['manage:model:remove']"
+          >删除</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['manage:model:export']"
+          >导出</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="modelList"
+      border
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="名称" align="center" prop="name" />
+      <el-table-column label="模型连接" align="center" prop="url" />
+      <el-table-column label="模型参数" align="center" prop="modelParams" />
+      <el-table-column label="数据参数" align="center" prop="dataParams" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['manage:model:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['manage:model:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改模型参数信息对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="800px"
+      :close-on-click-modal="false"
+      append-to-body
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row :gutter="80">
+          <el-col :span="10">
+            <el-form-item label="模型名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入模型名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="模型Url" prop="url">
+              <el-input v-model="form.url" placeholder="请输入模型Url" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="80">
+          <el-col :span="20">
+            <el-form-item label="数据参数" prop="dataParams">
+              <el-select
+                v-model="form.dataParamsArr"
+                placeholder="请选择数据参数"
+                multiple
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.basic_parameters_sorties"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-divider content-position="left">模型参数</el-divider>
+        <el-row :gutter="80">
+          <el-col :span="12">
+            <el-form-item>
+              <el-button @click="addModelForms" icon="el-icon-plus"></el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item
+          v-for="(item, index) in form.modelParamsArr"
+          :key="index"
+          label-width="100px"
+        >
+          <div class="dynamicAdd">
+            <el-input
+              v-model="item.key"
+              style="width: 200px"
+              placeholder="请输入模型参数属性名"
+            ></el-input>
+            <span> ----- </span>
+            <el-input
+              v-model="item.value"
+              style="width: 200px"
+              placeholder="请输入模型参数属性值"
+            ></el-input>
+            <el-button
+              @click.prevent="removeModelForm(item)"
+              icon="el-icon-minus"
+              style="margin-left: 20px; border: none"
+            ></el-button>
+          </div>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listModel,
+  getModel,
+  delModel,
+  addModel,
+  updateModel,
+} from "@/api/manage/model";
+
+export default {
+  name: "Model",
+  dicts: ["basic_parameters_sorties"],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 模型参数信息表格数据
+      modelList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        url: null,
+        modelParams: null,
+        dataParams: null,
+      },
+      // 表单参数
+      form: {
+        id: null,
+        name: null,
+        type: 1,
+        url: null,
+        modelParamsArr: [],
+        dataParamsArr: [],
+      },
+      // 表单校验
+      rules: {
+        name: [
+          { required: true, message: "模型名称不能为空", trigger: "blur" },
+        ],
+        url: [{ required: true, message: "模型url不能为空", trigger: "blur" }],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询模型参数信息列表 */
+    getList() {
+      this.loading = true;
+      listModel(this.queryParams).then((response) => {
+        this.modelList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 新增模型表单
+    addModelForms() {
+      this.form.modelParamsArr.push({
+        key: "",
+        value: "",
+      });
+    },
+    removeModelForm(item) {
+      var index = this.form.modelParamsArr.indexOf(item);
+      if (index !== -1) {
+        this.form.modelParamsArr.splice(index, 1);
+      }
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        name: null,
+        type: 1,
+        url: null,
+        modelParamsArr: [],
+        dataParamsArr: [],
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加模型参数信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getModel(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改模型参数信息";
+        this.toObj()
+      });
+    },
+    toStr() {
+      this.form.modelParams = JSON.stringify(this.form.modelParamsArr)
+      this.form.dataParams = JSON.stringify(this.form.dataParamsArr)
+    },
+    toObj() {
+      // this.form.modelParamsArr = JSON.parse(this.form.modelParams)
+      // this.form.dataParamsArr = JSON.parse(this.form.dataParams)
+      this.form.modelParamsArr = []
+      this.form.dataParamsArr = []
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          this.toStr()
+          if (this.form.id != null) {
+            updateModel(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addModel(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除模型参数信息编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delModel(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "manage/model/export",
+        {
+          ...this.queryParams,
+        },
+        `model_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>

PHM-web/src/views/system/dept/index.vue

@@ -51,6 +51,7 @@
     <el-table
       v-if="refreshTable"
       v-loading="loading"
+      border
       :data="deptList"
       row-key="deptId"
       :default-expand-all="isExpandAll"