Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev

sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmNumLogs.java

@@ -44,12 +44,27 @@ public class BmNumLogs extends BaseEntity {
     @Excel(name = "实例/任务")
     private String task;
 
+    /**
+     * 任务名称
+     */
+    private String taskName;
+
     /**
     * 规格id
     */
     @Excel(name = "规格id")
     private Integer typeId;
 
+    /**
+     * 规格名称
+     */
+    private String typeName;
+
+    /**
+     * 父级规格名称
+     */
+    private String typeParentName;
+
     /**
      * 数量
      */

sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/BmNumLogsController.java

@@ -27,9 +27,9 @@ public class BmNumLogsController extends BaseController {
     private BmNumLogsService bmNumLogsService;
 
     @GetMapping("/list")
-    public TableDataInfo list() {
+    public TableDataInfo list(BmNumLogs record) {
         startPage();
-        List<BmNumLogs> list = bmNumLogsService.selectAll();
+        List<BmNumLogs> list = bmNumLogsService.selectAll(record);
         return getDataTable(list);
     }
 

sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/BmNumLogsMapper.java

@@ -15,7 +15,7 @@ public interface BmNumLogsMapper {
 
     BmNumLogs selectByPrimaryKey(Integer id);
 
-    List<BmNumLogs> selectAll();
+    List<BmNumLogs> selectAll(BmNumLogs record);
 
     int updateByPrimaryKeySelective(BmNumLogs record);
 

sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/BmNumLogsService.java

@@ -24,8 +24,8 @@ public class BmNumLogsService{
         return bmNumLogsMapper.insert(record);
     }
 
-    public List<BmNumLogs> selectAll() {
+    public List<BmNumLogs> selectAll(BmNumLogs record) {
-        return bmNumLogsMapper.selectAll();
+        return bmNumLogsMapper.selectAll(record);
     }
 
     public int insertSelective(BmNumLogs record) {

sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml

@@ -8,7 +8,10 @@
     <result column="model_title" jdbcType="VARCHAR" property="modelTitle" />
     <result column="method" jdbcType="VARCHAR" property="method" />
     <result column="task" jdbcType="VARCHAR" property="task" />
+    <result column="task_name" jdbcType="VARCHAR" property="taskName" />
     <result column="type_id" jdbcType="INTEGER" property="typeId" />
+    <result column="type_name" jdbcType="VARCHAR" property="typeName" />
+    <result column="type_parent_name" jdbcType="VARCHAR" property="typeParentName" />
     <result column="num" jdbcType="VARCHAR" property="num" />
     <result column="description" jdbcType="VARCHAR" property="description" />
     <result column="json_result" jdbcType="VARCHAR" property="jsonResult" />
@@ -25,18 +28,32 @@
   </sql>
 
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    <!--@mbg.generated-->
     select
-    <include refid="Base_Column_List" />
+    bnl.id, bnl.model_title, bnl.`method`, bnl.task, bnl.type_id, bnl.num, bnl.`description`, bnl.json_result, bnl.`time`, bnl.creator,
-    from bm_num_logs
+    bnl.remark, bnl.`status`, mt.type_name, mt1.type_name as type_parent_name, tt.code as task_name
+    from bm_num_logs bnl
+    left join ma_type mt on bnl.type_id = mt.type_id
+    inner join ma_type mt1 on mt.parent_id = mt1.type_id
+    left join tm_task tt on bnl.task = tt.task_id
     where id = #{id,jdbcType=INTEGER}
   </select>
 
-
   <select id="selectAll" resultMap="BaseResultMap">
     select
-    <include refid="Base_Column_List" />
+      bnl.id, bnl.model_title, bnl.`method`, bnl.task, bnl.type_id, bnl.num, bnl.`description`, bnl.json_result, bnl.`time`, bnl.creator,
-    from bm_num_logs
+      bnl.remark, bnl.`status`, mt.type_name, mt1.type_name as type_parent_name, tt.code as task_name
+    from bm_num_logs bnl
+    left join ma_type mt on bnl.type_id = mt.type_id
+    inner join ma_type mt1 on mt.parent_id = mt1.type_id
+    left join tm_task tt on bnl.task = tt.task_id
+    <where>
+      <if test="modelTitle != null and modelTitle != ''">
+        and bnl.model_title like concat('%', #{modelTitle}, '%')
+      </if>
+      <if test="typeName != null and typeName != ''">
+        and mt1.type_name like concat('%', #{typeName}, '%')
+      </if>
+    </where>
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">

sgzb-ui/src/api/inventoryLogs/index.js

@@ -3,10 +3,14 @@ import request from '@/utils/request'
 
 /* 日志列表 */
 export const getLogsListApi = (data) => {
-    return request.get('/bm_num_logs/list', data)
+    return request.get('/system/bm_num_logs/list', data)
 }
 
 /* 日志详情 */
 export const getLogsDetailsApi = (id) => {
-    return request.get(`/bm_num_logs/selectByPrimaryKey/${id}`)
+    return request.get(`/system/bm_num_logs/selectByPrimaryKey`, {
+        params: {
+            id
+        }
+    })
 }

sgzb-ui/src/views/inventoryLogs/index.vue

@@ -2,88 +2,33 @@
   <!-- 库存日志 -->
   <div class="app-container">
     <el-row>
-            <el-form
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
-                :model="queryParams"
+        <el-form-item label="模块名称" prop="modelTitle">
-                ref="queryForm"
+          <el-input v-model="queryParams.typeName" placeholder="请输入模块名称" clearable style="width: 200px" @keyup.enter.native="handleQuery" />
-                size="small"
-                :inline="true"
-            >
-                <!-- <el-form-item label="模块名称" prop="userName">
-                    <el-input
-                        placeholder="请输入模块名称"
-                        clearable
-                        style="width: 200px"
-                        @keyup.enter.native="handleQuery"
-                    />
         </el-form-item>
-                <el-form-item label="请求方式" prop="phonenumber">
+        <el-form-item label="规格名称" prop="typeName">
-                    <el-input
+          <el-input v-model="queryParams.modelTitle" placeholder="请输入规格名称" clearable style="width: 200px" @keyup.enter.native="handleQuery" />
-                        placeholder="请输入请求方式"
-                        clearable
-                        style="width: 200px"
-                        @keyup.enter.native="handleQuery"
-                    />
-                </el-form-item>
-                <el-form-item label="创建人" prop="status">
-                    <el-select
-                        placeholder="创建人"
-                        clearable
-                        filterable
-                        style="width: 200px"
-                    >
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="请求时间">
-                    <el-date-picker
-                        style="width: 200px"
-                        value-format="yyyy-MM-dd"
-                        type="daterange"
-                        range-separator="-"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                    ></el-date-picker>
         </el-form-item>
         <el-form-item>
-                    <el-button
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-                        type="primary"
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-                        icon="el-icon-search"
+        </el-form-item>
-                        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>
 
     <el-table :data="tableList" border>
-            <el-table-column
+      <el-table-column align="center" label="序号" type="index" width="60" />
-                align="center"
+      <el-table-column align="center" prop="modelTitle" label="模块名称" show-overflow-tooltip />
-                label="序号"
+      <el-table-column show-overflow-tooltip align="center" prop="method" label="请求方式" />
-                type="index"
+      <el-table-column show-overflow-tooltip align="center" prop="requestMethod" label="请求地址" />
-                width="60"
+      <el-table-column show-overflow-tooltip align="center" prop="task" label="实例" />
-            />
+      <el-table-column show-overflow-tooltip align="center" prop="typeParentName" label="机具名称" />
-            <el-table-column
+      <el-table-column show-overflow-tooltip align="center" prop="typeName" label="机具规格" />
-                align="center"
+      <el-table-column show-overflow-tooltip align="center" prop="description" label="描述" />
-                prop="modelTitle"
+      <el-table-column show-overflow-tooltip align="center" prop="time" label="日期" />
-                label="模块名称"
-            />
-            <el-table-column align="center" prop="method" label="请求方式" />
-            <el-table-column align="center" prop="task" label="实例" />
-            <el-table-column align="center" prop="id" label="机具名称" />
-            <el-table-column align="center" prop="typeId" label="机具规格" />
-            <el-table-column align="center" prop="description" label="描述" />
-            <el-table-column align="center" prop="time" label="日期" />
       <el-table-column align="center" label="状态">
         <template slot-scope="{ row }">
-                    <el-tag size="mini" type="success" v-if="row.status == 0"
+          <el-tag size="mini" type="success" v-if="row.status == 0">正常</el-tag>
-                        >正常</el-tag
-                    >
           <el-tag size="mini" type="warning" v-else>异常</el-tag>
         </template>
       </el-table-column>
@@ -91,12 +36,7 @@
       <el-table-column align="center" prop="remark" label="备注" />
       <el-table-column align="center" label="操作">
         <template slot-scope="{ row }">
-                    <el-button
+          <el-button size="mini" type="text" @click="previewLogsDetails(row)">详情</el-button>
-                        size="mini"
-                        type="text"
-                        @click="previewLogsDetails(row.id)"
-                        >详情</el-button
-                    >
         </template>
       </el-table-column>
     </el-table>
@@ -110,11 +50,7 @@
     />
 
     <!-- 详情弹框 -->
-        <el-dialog
+    <el-dialog title="日志详情" :visible.sync="logsDetailsDialogVisible" width="60%">
-            title="日志详情"
-            :visible.sync="logsDetailsDialogVisible"
-            width="60%"
-        >
       <el-descriptions
         class="margin-top"
         :column="3"
@@ -123,12 +59,9 @@
         :labelStyle="commonStyle"
         :contentStyle="commonStyle"
       >
-                <el-descriptions-item
+        <el-descriptions-item v-for="(item, v) in detailsLabelList" :key="v">
-                    v-for="(item, v) in detailsLabelList"
-                    :key="v"
-                >
           <template slot="label">{{ item.label }}</template>
-                    {{ logsDetailsInfoDemo[item.content] || '' }}
+          {{ logsDetailsInfo[item.content] || '' }}
         </el-descriptions-item>
       </el-descriptions>
     </el-dialog>
@@ -142,10 +75,12 @@
   data() {
     return {
       queryParams: {
-                    pageNum: 5,
+        pageNum: 1,
-                    pageSize: 1,
+        pageSize: 10,
+        modelTitle:'',  // 规格名称
+        typeName:'' // 模块名称
       },
-                tableList: [{ id: 1 }, { id: 2 }],
+      tableList: [],
       total: 5,
       logsDetailsInfo: null /* 日志详情 */,
       logsDetailsDialogVisible: false,
@@ -154,34 +89,24 @@
       },
       /* 日志详情label以及内容 */
       detailsLabelList: [
-                    { label: '占位', content: 'vdDemo' },
+        { label: '创建人', content: 'creator' },
-                    { label: '占位', content: 'vdDemo' },
+        { label: '请求方式', content: 'method' },
-                    { label: '占位', content: 'vdDemo' },
+        { label: '模块名称', content: 'modelTitle' },
-                    { label: '占位', content: 'vdDemo' },
+        { label: '请求方式', content: 'requestMethod' }, 
-                    { label: '占位', content: 'vdDemo' },
+        { label: '机具规格', content: 'typeId' }, 
-                    { label: '占位', content: 'vdDemo' },
+        { label: '机具名称', content: 'id' }, 
-                    { label: '占位', content: 'vdDemo' },
+        { label: '日期', content: 'time' }, 
-                    { label: '占位', content: 'vdDemo' },
+        { label: '实例', content: 'task' }, 
-                    { label: '占位', content: 'vdDemo' },
-                    { label: '占位', content: 'vdDemo' },
-                    { label: '占位', content: 'vdDemo' },
-                    { label: '占位', content: 'vdDemo' },
-                    { label: '占位', content: 'vdDemo' },
-                    { label: '占位', content: 'vdDemo' },
-                    { label: '占位', content: 'vdDemo' },
         ],
-                logsDetailsInfoDemo: {
+      logsDetailsInfo: {},
-                    vdDemo: '123',
-                },
     }
   },
   methods: {
     /* 查询列表 */
     async getList() {
-                const { data: res } = await getLogsListApi()
+      const res = await getLogsListApi()
       this.tableList = res.rows
       this.total = res.total
-                console.log(res, '=======日志列表')
     },
     /* 搜索按钮 */
     handleQuery() {
@@ -190,15 +115,16 @@
     /* 重置按钮 */
     resetQuery() {
       this.resetForm('queryForm')
+      this.queryParams.pageNum = 1
+      this.queryParams.pageSize = 10
       this.getList()
     },
     /* 查看详情 */
-            async previewLogsDetails(id) {
+    async previewLogsDetails(row) {
-                // const { data: res } = await getLogsDetailsApi(id)
+      console.log(row, '列表id')
-                // console.log(res, '=======日志详情')
+      const res = await getLogsDetailsApi(row.id)
-
+      this.logsDetailsInfo = res
       this.logsDetailsDialogVisible = true
-                // this.logsDetailsInfo = res
     },
   },
   created() {