参数收集清单-操作记录(历史日志)开发。

jero-boot/db/蔚来标准sql/dev_2nd_period.sql

@@ -79,3 +79,19 @@ ALTER TABLE `laws_weilai`.`params_info_publish`
 -- 上报库历史表，增加备注字段  2022-12-12  未同步生产环境
 ALTER TABLE `laws_weilai`.`params_report_detail_log`
     ADD COLUMN `remarks` varchar(4000) NULL COMMENT '备注' AFTER `params_report_detail_id`;
+
+-- 参数收集清单-操作记录(历史日志) 2022-12-26 未同步生产环境
+CREATE TABLE `laws_weilai`.`params_collect_manifest_log`  (
+   `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+   `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+   `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
+   `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+   `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
+   `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+   `log_cn_content` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '中文内容',
+   `log_en_content` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '英文内容',
+   `remarks` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+   `params_manifest_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数清单id',
+   `params_collect_manifest_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数收集清单id',
+   PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '参数收集清单-操作记录(历史日志)' ROW_FORMAT = Dynamic;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestLogEOController.java

@@ -0,0 +1,174 @@
+package com.jero.modules.cert.collect.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestLogEO;
+import com.jero.modules.cert.collect.service.IParamsCollectManifestLogEOService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+* @Description: 参数收集清单-操作记录(历史日志)
+* @Author: jero-boot
+* @Date:   2022-12-26
+* @Version: V1.0
+*/
+@Api(tags="参数收集清单-操作记录(历史日志)")
+@RestController
+@RequestMapping("/paramsCollectManifestLog/paramsCollectManifestLogEO")
+@Slf4j
+public class ParamsCollectManifestLogEOController extends JeroController<ParamsCollectManifestLogEO, IParamsCollectManifestLogEOService> {
+   @Autowired
+   private IParamsCollectManifestLogEOService paramsCollectManifestLogEOService;
+
+   /**
+    * 分页列表查询
+    *
+    * @param paramsCollectManifestLogEO
+    * @param pageNo
+    * @param pageSize
+    * @param req
+    * @return
+    */
+   @AutoLog(value = "参数收集清单-操作记录(历史日志)-分页列表查询")
+   @ApiOperation(value="参数收集清单-操作记录(历史日志)-分页列表查询", notes="参数收集清单-操作记录(历史日志)-分页列表查询")
+   @GetMapping(value = "/page")
+   public Result<?> queryPageList(ParamsCollectManifestLogEO paramsCollectManifestLogEO,
+                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                  @RequestParam(name="cut", defaultValue="cn") String cut,
+                                  HttpServletRequest req) {
+       QueryWrapper<ParamsCollectManifestLogEO> queryWrapper = QueryGenerator.initQueryWrapper(paramsCollectManifestLogEO, req.getParameterMap());
+       Page<ParamsCollectManifestLogEO> page = new Page<ParamsCollectManifestLogEO>(pageNo, pageSize);
+       IPage<ParamsCollectManifestLogEO> pageList = paramsCollectManifestLogEOService.page(page, queryWrapper);
+       List<ParamsCollectManifestLogEO> records = pageList.getRecords();
+       this.paramsCollectManifestLogEOService.disposeData(cut,records);
+       return Result.OK(pageList);
+   }
+
+   /**
+    * 列表查询
+    *
+    * @return
+    */
+   @AutoLog(value = "参数收集清单-操作记录(历史日志)-列表查询")
+   @ApiOperation(value="参数收集清单-操作记录(历史日志)-列表查询", notes="参数收集清单-操作记录(历史日志)-列表查询")
+   @GetMapping(value = "/list")
+   public Result<List<ParamsCollectManifestLogEO>> queryList() {
+       List<ParamsCollectManifestLogEO> list = paramsCollectManifestLogEOService.queryList();
+       return Result.OK(list);
+   }
+
+   /**
+    *   添加
+    *
+    * @param paramsCollectManifestLogEO
+    * @return
+    */
+   @AutoLog(value = "参数收集清单-操作记录(历史日志)-添加")
+   @ApiOperation(value="参数收集清单-操作记录(历史日志)-添加", notes="参数收集清单-操作记录(历史日志)-添加")
+   @PostMapping(value = "/add")
+   public Result<?> add(@Validated @RequestBody ParamsCollectManifestLogEO paramsCollectManifestLogEO) {
+       paramsCollectManifestLogEOService.add(paramsCollectManifestLogEO);
+       return Result.OK("添加成功！");
+   }
+
+   /**
+    *  编辑
+    *
+    * @param paramsCollectManifestLogEO
+    * @return
+    */
+   @AutoLog(value = "参数收集清单-操作记录(历史日志)-编辑")
+   @ApiOperation(value="参数收集清单-操作记录(历史日志)-编辑", notes="参数收集清单-操作记录(历史日志)-编辑")
+   @PutMapping(value = "/edit")
+   public Result<?> edit(@Validated @RequestBody ParamsCollectManifestLogEO paramsCollectManifestLogEO) {
+       paramsCollectManifestLogEOService.editById(paramsCollectManifestLogEO);
+       return Result.OK("编辑成功!");
+   }
+
+   /**
+    *   通过id删除
+    *
+    * @param id
+    * @return
+    */
+   @AutoLog(value = "参数收集清单-操作记录(历史日志)-通过id删除")
+   @ApiOperation(value="参数收集清单-操作记录(历史日志)-通过id删除", notes="参数收集清单-操作记录(历史日志)-通过id删除")
+   @DeleteMapping(value = "/delete")
+   public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+       paramsCollectManifestLogEOService.deleteById(id);
+       return Result.OK("删除成功!");
+   }
+
+   /**
+    *  批量删除
+    *
+    * @param ids
+    * @return
+    */
+   @AutoLog(value = "参数收集清单-操作记录(历史日志)-批量删除")
+   @ApiOperation(value="参数收集清单-操作记录(历史日志)-批量删除", notes="参数收集清单-操作记录(历史日志)-批量删除")
+   @DeleteMapping(value = "/deleteBatch")
+   public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+       this.paramsCollectManifestLogEOService.deleteByIds(Arrays.asList(ids.split(",")));
+       return Result.OK("批量删除成功!");
+   }
+
+   /**
+    * 通过id查询
+    *
+    * @param id
+    * @return
+    */
+   @AutoLog(value = "参数收集清单-操作记录(历史日志)-通过id查询")
+   @ApiOperation(value="参数收集清单-操作记录(历史日志)-通过id查询", notes="参数收集清单-操作记录(历史日志)-通过id查询")
+   @GetMapping(value = "/queryById")
+   public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+       ParamsCollectManifestLogEO paramsCollectManifestLogEO = paramsCollectManifestLogEOService.queryById(id);
+       if(paramsCollectManifestLogEO==null) {
+           return Result.error("未找到对应数据");
+       }
+       return Result.OK(paramsCollectManifestLogEO);
+   }
+
+   /**
+   * 导出excel
+   *
+   * @param request
+   * @param paramsCollectManifestLogEO
+   */
+   @RequestMapping(value = "/exportXls")
+   public ModelAndView exportXls(HttpServletRequest request, ParamsCollectManifestLogEO paramsCollectManifestLogEO) {
+       return super.exportXls(request, paramsCollectManifestLogEO, ParamsCollectManifestLogEO.class, "参数收集清单-操作记录(历史日志)");
+   }
+
+   /**
+     * 通过excel导入数据
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+   @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+   public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+       return super.importExcel(request, response, ParamsCollectManifestLogEO.class);
+   }
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestLogEO.java

@@ -0,0 +1,90 @@
+package com.jero.modules.cert.collect.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+
+/**
+ * @Description: 参数收集清单-操作记录(历史日志)
+ * @Author: jero-boot
+ * @Date:   2022-12-26
+ * @Version: V1.0
+ */
+@Data
+@TableName("params_collect_manifest_log")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="params_collect_manifest_log对象", description="参数收集清单-操作记录(历史日志)")
+public class ParamsCollectManifestLogEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+	/**中文内容*/
+	@Excel(name = "中文内容", width = 15)
+    @ApiModelProperty(value = "中文内容")
+    private String logCnContent;
+
+	/**英文内容*/
+	@Excel(name = "英文内容", width = 15)
+    @ApiModelProperty(value = "英文内容")
+    private String logEnContent;
+
+    /**备注*/
+    @Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+	/**参数清单id*/
+	@Excel(name = "参数清单id", width = 15)
+    @ApiModelProperty(value = "参数清单id")
+    private String paramsManifestId;
+
+	/**参数收集清单id*/
+	@Excel(name = "参数收集清单id", width = 15)
+    @ApiModelProperty(value = "参数收集清单id")
+    private String paramsCollectManifestId;
+
+    @TableField(exist = false)
+    private String logContent;
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestLogEOMapper.java

@@ -0,0 +1,14 @@
+package com.jero.modules.cert.collect.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestLogEO;
+
+/**
+ * @Description: 参数收集清单-操作记录(历史日志)
+ * @Author: jero-boot
+ * @Date:   2022-12-26
+ * @Version: V1.0
+ */
+public interface ParamsCollectManifestLogEOMapper extends BaseMapper<ParamsCollectManifestLogEO> {
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestLogEOMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.paramsCollectManifestLog.mapper.ParamsCollectManifestLogEOMapper">
+    <resultMap id="ParamsCollectManifestLogEOResultMap" type="com.jero.modules.cert.collect.entity.ParamsCollectManifestLogEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="log_cn_content" property="logCnContent" />
+        <result column="log_en_content" property="logEnContent" />
+        <result column="params_manifest_id" property="paramsManifestId" />
+        <result column="params_collect_manifest_id" property="paramsCollectManifestId" />
+    </resultMap>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestLogEOService.java

@@ -0,0 +1,69 @@
+package com.jero.modules.cert.collect.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestLogEO;
+
+import java.util.List;
+
+/**
+ * @Description: 参数收集清单-操作记录(历史日志)
+ * @Author: jero-boot
+ * @Date:   2022-12-26
+ * @Version: V1.0
+ */
+public interface IParamsCollectManifestLogEOService extends IService<ParamsCollectManifestLogEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param paramsCollectManifestLogEO
+	 * @return
+	 */
+    void add(ParamsCollectManifestLogEO paramsCollectManifestLogEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param paramsCollectManifestLogEO
+	 * @return
+	 */
+    void editById(ParamsCollectManifestLogEO paramsCollectManifestLogEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ParamsCollectManifestLogEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ParamsCollectManifestLogEO> queryList();
+
+	/**
+	 * 处理数据
+	 * @param cut
+	 * @param datas
+	 */
+    void disposeData(String cut, List<ParamsCollectManifestLogEO> datas);
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -1147,17 +1147,17 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				}
 			}
 			list.add(map);
-
-			Map<String, Object> operatorMap = new HashMap<>();
-			if(CutEnum.CN.getValue().equals(cut)){
-				operatorMap.put("db_field_txt","操作");
-			}else{
-				operatorMap.put("db_field_txt","Operator");
-			}
-			operatorMap.put("click4", true);
-			list.add(operatorMap);
 		}
 
+		Map<String, Object> operatorMap = new HashMap<>();
+		if(CutEnum.CN.getValue().equals(cut)){
+			operatorMap.put("db_field_txt","操作");
+		}else{
+			operatorMap.put("db_field_txt","Operator");
+		}
+		operatorMap.put("click6", true);
+		list.add(operatorMap);
+
 		list.addAll(indexOfDescription+1, listConfig);
 		return list;
 	}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestLogEOServiceImpl.java

@@ -0,0 +1,108 @@
+package com.jero.modules.cert.collect.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.constant.enums.CutEnum;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestLogEO;
+import com.jero.modules.cert.collect.mapper.ParamsCollectManifestLogEOMapper;
+import com.jero.modules.cert.collect.service.IParamsCollectManifestLogEOService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description: 参数收集清单-操作记录(历史日志)
+ * @Author: jero-boot
+ * @Date:   2022-12-26
+ * @Version: V1.0
+ */
+@Service
+public class ParamsCollectManifestLogEOServiceImpl extends ServiceImpl<ParamsCollectManifestLogEOMapper, ParamsCollectManifestLogEO> implements IParamsCollectManifestLogEOService {
+
+	/**
+	 * 保存
+	 *
+	 * @param paramsCollectManifestLogEO
+	 * @return
+	 */
+	@Override
+    public void add(ParamsCollectManifestLogEO paramsCollectManifestLogEO) {
+        Date now = new Date();
+        paramsCollectManifestLogEO.setCreateTime(now);
+        paramsCollectManifestLogEO.setUpdateTime(now);
+        save(paramsCollectManifestLogEO);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param paramsCollectManifestLogEO
+	 * @return
+	 */
+	@Override
+    public void editById(ParamsCollectManifestLogEO paramsCollectManifestLogEO) {
+    	Date now = new Date();
+        paramsCollectManifestLogEO.setUpdateTime(now);
+    	saveOrUpdate(paramsCollectManifestLogEO);
+    }
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public void deleteById(String id) {
+        removeById(id);
+    }
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+    public void deleteByIds(List<String> ids) {
+        removeByIds(ids);
+    }
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public ParamsCollectManifestLogEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<ParamsCollectManifestLogEO> queryList() {
+        return list();
+    }
+
+	@Override
+	public void disposeData(String cut, List<ParamsCollectManifestLogEO> datas) {
+		if(CollectionUtils.isNotEmpty(datas)){
+			for (ParamsCollectManifestLogEO data : datas) {
+				String logContent = "";
+				if(StringUtils.equals(cut, CutEnum.CN.getValue())){
+					logContent = data.getLogCnContent();
+				}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+					logContent = data.getLogEnContent();
+				}
+				data.setLogContent(logContent);
+			}
+		}
+	}
+}

jero-web/src/components/tableCollection/index.vue

@@ -682,10 +682,11 @@
         let query = {
           pageNo: this.pageNohistory,
           pageSize: this.pageSizehistory,
-          paramsReportDetailId: this.paramsReportDetailId
+          paramsManifestId: this.$route.query.id,
+          paramsCollectManifestId: this.paramsReportDetailId
         }
         this.loading = true
-        getAction('report/detailLog/page', query).then((res) => {
+        getAction('paramsCollectManifestLog/paramsCollectManifestLogEO/page', query).then((res) => {
           if (res.success) {
             this.dataSourcehistory = res.result.records
             this.total = res.result.total
@@ -801,7 +802,7 @@
                     customRender: 'paramsNameDescription'
                   }
                 }
-                if (res.click4) {
+                if (res.click6) {
                   this.columns[index].scopedSlots = {
                     customRender: 'Operation'
                   }