publish 0.8.6

springboot-web/src/main/java/com/tiesheng/core/controller/LogController.java

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tiesheng.core.pojos.dao.CoreLogLogin;
 import com.tiesheng.core.pojos.dao.CoreLogMessage;
 import com.tiesheng.core.pojos.dao.CoreLogOperation;
+import com.tiesheng.core.pojos.dao.CoreLogProcess;
 import com.tiesheng.core.pojos.dto.PageDTO;
+import com.tiesheng.core.pojos.vo.ProcessDetailVo;
 import com.tiesheng.core.service.CoreLogService;
 import com.tiesheng.util.pojos.ApiResp;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -88,4 +90,36 @@ public class LogController {
         return ApiResp.respOK(page.getRecords(), page.getTotal());
     }
 
+
+    /**
+     * 过程日志列表
+     *
+     * @return
+     */
+    @GetMapping("/process/page")
+    public ApiResp<List<CoreLogProcess>> processPage(String type, @Valid PageDTO dto) {
+
+        QueryWrapper<CoreLogProcess> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("is_deleted", 0);
+        if (!StrUtil.isEmpty(type)) {
+            queryWrapper.eq("type", type);
+        }
+        dto.likeColumns(queryWrapper, "title");
+        queryWrapper.orderByDesc("create_time");
+
+        Page<CoreLogProcess> page = dto.pageObj();
+        coreLogService.getCoreLogProcessMapper().selectPage(page, queryWrapper);
+        return ApiResp.respOK(page.getRecords(), page.getTotal());
+    }
+
+    /**
+     * 过程日志详情
+     *
+     * @return
+     */
+    @GetMapping("/process/detail")
+    public ApiResp<ProcessDetailVo> processPage(String id) {
+        ProcessDetailVo processDetail = coreLogService.getProcessDetail(id);
+        return ApiResp.respOK(processDetail);
+    }
 }

springboot-web/src/main/java/com/tiesheng/core/mapper/CoreLogProcessMapper.java

@@ -0,0 +1,7 @@
+package com.tiesheng.core.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.tiesheng.core.pojos.dao.CoreLogProcess;
+
+public interface CoreLogProcessMapper extends BaseMapper<CoreLogProcess> {
+}

springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreLogProcess.java

@@ -0,0 +1,134 @@
+package com.tiesheng.core.pojos.dao;
+
+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.tiesheng.core.pojos.DaoBase;
+import java.util.Date;
+
+/**
+    * 日志-过程
+    */
+@TableName(value = "core_log_process")
+public class CoreLogProcess extends DaoBase {
+    /**
+     * 标题
+     */
+    @TableField(value = "title")
+    private String title;
+
+    /**
+     * 总数
+     */
+    @TableField(value = "total")
+    private Integer total;
+
+    /**
+     * 成功数
+     */
+    @TableField(value = "success_num")
+    private Integer successNum;
+
+    /**
+     * 失败数
+     */
+    @TableField(value = "fail_num")
+    private Integer failNum;
+
+    /**
+     * 类型（import-导入，sync-同步）
+     */
+    @TableField(value = "`type`")
+    private String type;
+
+    /**
+     * 获取标题
+     *
+     * @return title - 标题
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * 设置标题
+     *
+     * @param title 标题
+     */
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    /**
+     * 获取总数
+     *
+     * @return total - 总数
+     */
+    public Integer getTotal() {
+        return total;
+    }
+
+    /**
+     * 设置总数
+     *
+     * @param total 总数
+     */
+    public void setTotal(Integer total) {
+        this.total = total;
+    }
+
+    /**
+     * 获取成功数
+     *
+     * @return success_num - 成功数
+     */
+    public Integer getSuccessNum() {
+        return successNum;
+    }
+
+    /**
+     * 设置成功数
+     *
+     * @param successNum 成功数
+     */
+    public void setSuccessNum(Integer successNum) {
+        this.successNum = successNum;
+    }
+
+    /**
+     * 获取失败数
+     *
+     * @return fail_num - 失败数
+     */
+    public Integer getFailNum() {
+        return failNum;
+    }
+
+    /**
+     * 设置失败数
+     *
+     * @param failNum 失败数
+     */
+    public void setFailNum(Integer failNum) {
+        this.failNum = failNum;
+    }
+
+    /**
+     * 获取类型（import-导入，sync-同步）
+     *
+     * @return type - 类型（import-导入，sync-同步）
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * 设置类型（import-导入，sync-同步）
+     *
+     * @param type 类型（import-导入，sync-同步）
+     */
+    public void setType(String type) {
+        this.type = type;
+    }
+}

springboot-web/src/main/java/com/tiesheng/core/pojos/vo/ProcessDetailVo.java

@@ -0,0 +1,57 @@
+package com.tiesheng.core.pojos.vo;
+
+/**
+ * @author lgc
+ */
+public class ProcessDetailVo {
+
+    private String title;
+
+    private Integer total;
+
+    private Integer successNum;
+
+    private Integer failNum;
+
+    private String type;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public Integer getTotal() {
+        return total;
+    }
+
+    public void setTotal(Integer total) {
+        this.total = total;
+    }
+
+    public Integer getSuccessNum() {
+        return successNum;
+    }
+
+    public void setSuccessNum(Integer successNum) {
+        this.successNum = successNum;
+    }
+
+    public Integer getFailNum() {
+        return failNum;
+    }
+
+    public void setFailNum(Integer failNum) {
+        this.failNum = failNum;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+}

springboot-web/src/main/java/com/tiesheng/core/service/CoreLogService.java

@@ -4,14 +4,14 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.servlet.ServletUtil;
 import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.tiesheng.core.mapper.CoreLogLoginMapper;
 import com.tiesheng.core.mapper.CoreLogMessageMapper;
 import com.tiesheng.core.mapper.CoreLogOperationMapper;
+import com.tiesheng.core.mapper.CoreLogProcessMapper;
 import com.tiesheng.core.pojos.RequestUserInfo;
-import com.tiesheng.core.pojos.dao.CoreLogLogin;
-import com.tiesheng.core.pojos.dao.CoreLogMessage;
-import com.tiesheng.core.pojos.dao.CoreLogOperation;
-import com.tiesheng.core.pojos.dao.CorePlatformUnique;
+import com.tiesheng.core.pojos.dao.*;
+import com.tiesheng.core.pojos.vo.ProcessDetailVo;
 import com.tiesheng.login.config.token.TsTokenConfig;
 import com.tiesheng.login.config.token.bean.TokenBean;
 import com.tiesheng.message.pojos.MessageReqResp;
@@ -37,6 +37,8 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
     CoreLogMessageMapper coreLogMessageMapper;
     @Autowired
     Ip2regionConfig ip2regionConfig;
+    @Autowired
+    CoreLogProcessMapper coreLogProcessMapper;
 
     public CoreLogLoginMapper getLogLoginMapper() {
         return coreLogLoginMapper;
@@ -46,11 +48,56 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
         return coreLogMessageMapper;
     }
 
-    ///////////////////////////////////////////////////////////////////////////
+    public CoreLogProcessMapper getCoreLogProcessMapper() {
+        return coreLogProcessMapper;
+    }
+///////////////////////////////////////////////////////////////////////////
     // 操作日志
     ///////////////////////////////////////////////////////////////////////////
 
 
+    /**
+     * 添加空的过程 返回id 用于更新
+     */
+    public String addProcess() {
+        CoreLogProcess coreLogProcess = new CoreLogProcess();
+        coreLogProcessMapper.insert(coreLogProcess);
+        return coreLogProcess.getId();
+    }
+
+    /**
+     * 更新过程
+     *
+     * @param id         过程id
+     * @param title      过程标题/说明
+     * @param total      总数
+     * @param successNum 成功数
+     * @param failNum    失败数
+     * @param type       类型（import-导出，sync-同步）
+     */
+    public void upProcess(String id, String title, Integer total, Integer successNum, Integer failNum, String type) {
+        CoreLogProcess coreLogProcess = new CoreLogProcess();
+        coreLogProcess.setId(id);
+        coreLogProcess.setTitle(title);
+        coreLogProcess.setTotal(total);
+        coreLogProcess.setSuccessNum(successNum);
+        coreLogProcess.setFailNum(failNum);
+        coreLogProcess.setType(type);
+        coreLogProcessMapper.updateById(coreLogProcess);
+    }
+
+    /**
+     * 根据id 获取过程详情
+     */
+    public ProcessDetailVo getProcessDetail(String id) {
+        QueryWrapper<CoreLogProcess> wrapper = new QueryWrapper<>();
+        wrapper.eq("id", id);
+        CoreLogProcess coreLogProcess = coreLogProcessMapper.selectOne(wrapper);
+        return BeanUtil.copyProperties(coreLogProcess, ProcessDetailVo.class);
+    }
+
+
+
     /**
      * 添加操作日志
      */