Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/api/logs.js

@@ -62,3 +62,25 @@
  })
}

export const getLazyList = (data) => {
  return request({
    url: '/api/ubcs-log/localLog/lazy-list',
    method: 'post',
    data: data,
  })
}
export const downLoadLog = (data) => {
  return request({
    url: '/api/ubcs-log/localLog/downLoadLog',
    method: 'post',
    data:data,
  })
}
export const deleteLocalLog = (data) => {
  return request({
    url: '/api/ubcs-log/localLog/deleteLogFile',
    method: 'delete',
    data: data
  })
}


 Source/UBCS-WEB/src/views/monitor/log/authLog.vue

 Source/UBCS-WEB/src/views/monitor/log/localLog.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,207 @@
<template>
  <basic-container>
    <avue-crud ref="crud"
              v-model="form"
              :before-close="beforeClose"
              :before-open="beforeOpen"
              :data="data"
              :option="option"
              :permission="permissionList"
              :table-loading="loading"
              @row-del="rowDel"
              @search-change="searchChange"
              @search-reset="searchReset"
              @selection-change="selectionChange"
              @row-click="clickRowChange"
              @current-change="currentChange"
              @size-change="sizeChange"
              @refresh-change="refreshChange"
              @on-load="onLoad"
              @tree-load="treeLoad">
          <template slot="menu" slot-scope="scope">
              <el-button
                  icon="el-icon-download el-icon--right"
                  size="small"
                  type="text"
                  :loading="downloadLoading"
                  @click="downLoadLogFile(scope.row)"
                  v-if="permissionList.downLoadBtn"
              >下载
              </el-button>
          </template>
    </avue-crud>
  </basic-container>
</template>

<script>
  import {getLazyList, deleteLocalLog,downLoadLog} from "@/api/logs";
  import func from "@/util/func";
  import {mapGetters} from "vuex";

  export default {
    data() {
      return {
        form: {},
        selectionList: [],
        query: {},
        logPath: "",
        loading: true,
        page: {
          pageSize: 10,
          currentPage: 1,
          total: 0
        },
        option: {
          height: "auto",
          lazy: true,
          columnBtn: false,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,
          tree: true,
          border: true,
          index: true,
          selection: true,
          editBtn: false,
          delBtn: true,
          addBtn: false,
          viewBtn: false,
          // menuWidth: 300,
          dialogClickModal: false,
          highlightCurrentRow: true, //行选中时高亮
          rowKey: "logName", //行数据的 Key，用来优化 Table çš„渲染
          column: [
            {
              label: "服务名称",
              prop: "serviceName",
              width:'120',
              search: true
            },
            {
              label: "服务ID",
              prop: "serviceId",
              search: true
            },
            {
              label: "日志路径",
              prop: "logPath",
              width:'160'
            },
            {
              label: "日志名称",
              prop: "logName",
              width:'80',
            },
            {
              label: "日志类型",
              prop: "logType"
            },
            {
              label: "创建时间",
              prop: "createTime",
              width:'180'
            },
            {
              label: "最后修改时间",
              prop: "lastModifier",
              width:'180'
            }
          ]
        },
        data: [],
        downloadLoading: false,
      };
    },
    computed: {
      ...mapGetters(["permission"]),
      permissionList() {
        return {
          delBtn: this.vaildData(this.permission.localLog.localLog_delete, false),
          downLoadBtn: this.vaildData(this.permission.localLog.localLog_dwonload, false)
        };
      }
    },
    methods: {

      downLoadLogFile(row){
          this.downloadLoading = true;
          let logPath = row.hasChildren ?  row.logPath:row.logPath+"\\"+row.logName;
          downLoadLog(Object.assign({},row,{logFullPaths:logPath})).then(res=>{
              func.downloadFileByBlobHandler(res);
              this.downloadLoading = false;
          }).catch((res)=>{
              //this.$message.warning(res)
              this.downloadLoading = false;
          })
      },
      // è¡Œåˆ é™¤
      rowDel(row, index, done) {
          this.$confirm("确定将选择的日志文件删除?", {
              confirmButtonText: "确定",
              cancelButtonText: "取消",
              type: "warning"
          })
          .then(() => {
              let logPath = row.hasChildren ?  row.logPath:row.logPath+"\\"+row.logName;
              return deleteLocalLog(Object.assign({},row,{logFullPaths:logPath}));
          })
          .then(() => {
              this.$message({
                  type: "success",
                  message: "操作成功!"
              });
              // æ•°æ®å›žè°ƒè¿›è¡Œåˆ·æ–°
              done(row);
              //this.onLoad();
          });
      },
      searchReset() {
          this.query = {};
          this.parentId = 0;
          this.onLoad(this.page);
      },
      searchChange(params, done) {
          this.query = params;
          this.parentId = '';
          this.page.currentPage = 1;
          this.onLoad(this.page, params);
          done();
      },
      clickRowChange(row) {
          this.$refs.crud.toggleSelection();
          this.selectionList = row;
          this.$refs.crud.setCurrentRow(row);
          this.$refs.crud.toggleRowSelection(row); //选中当前行
      },
      selectionChange(list) {
          this.selectionList = list;
          this.$refs.crud.setCurrentRow(this.selectionList[list.length - 1]);
      },
      selectionClear() {
          this.selectionList = [];
          this.$refs.crud.toggleSelection();
      },
      refreshChange() {
          this.onLoad(this.page, this.query);
      },
      onLoad(page, params = {}) {
          this.loading = true;
          //Object.assign(params, this.query)
          getLazyList({"logPath": this.logPath}).then(res => {
              this.data = res.data.data;
              this.loading = false;
              this.selectionClear();
          });
      },
      treeLoad(tree, treeNode, resolve) {
          const logPath = tree.logPath;
          getLazyList({"logPath": logPath}).then(res => {
              resolve(res.data.data);
          });
      }
    }
  };
</script>

<style>
</style>

 Source/UBCS-WEB/src/views/monitor/log/loginLog.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,139 @@
<template>
  <basic-container>
    <avue-crud :option="option"
               :table-loading="loading"
               :data="data"
               ref="crud"
               v-model="form"
               :permission="permissionList"
               :page.sync="page"
               :before-open="beforeOpen"
               @search-change="searchChange"
               @search-reset="searchReset"
               @current-change="currentChange"
               @size-change="sizeChange"
               @refresh-change="refreshChange"
               @on-load="onLoad">
    </avue-crud>
  </basic-container>
</template>

<script>
  import {getUsualList, getUsualLogs} from "@/api/logs";
  import {mapGetters} from "vuex";

  export default {
    data() {
      return {
        form: {},
        selectionList: [],
        query: {},
        loading: true,
        page: {
          pageSize: 10,
          currentPage: 1,
          total: 0
        },
        option: {
          height: 'auto',
          calcHeight: 30,
          columnBtn:false,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,
          border: true,
          index: true,
          viewBtn: true,
          editBtn: false,
          addBtn: false,
          delBtn: false,
          menuWidth: 120,
          dialogType: 'drawer',
          column: [
            {
              label: "用户名",
              prop: "serviceId",
              search: true
            },
            {
              label: "姓名",
              prop: "serverHost",
              search: true
            },
            {
              label: "用户id",
              prop: "serverIp"
            },
            {
              label: "模块",
              prop: "env",
              width:'80'
            },
            {
              label: "时间",
              prop: "logLevel"
            },
            {
              label: "操作结果",
              prop: "logId"
            },
            {
              label: "描述",
              prop: "requestUri"
            },
          ]
        },
        data: []
      };
    },
    computed: {
      ...mapGetters(["permission"]),
      permissionList() {
        return {
          viewBtn: this.vaildData(this.permission.log_usual.log_usual_view, false)
        };
      }
    },
    methods: {
      searchReset() {
        this.query = {};
        this.onLoad(this.page);
      },
      searchChange(params, done) {
        this.query = params;
        this.page.currentPage = 1;
        this.onLoad(this.page, params);
        done();
      },
      beforeOpen(done, type) {
        if (["edit", "view"].includes(type)) {
          getUsualLogs(this.form.id).then(res => {
            this.form = res.data.data;
          });
        }
        done();
      },
      currentChange(currentPage){
        this.page.currentPage = currentPage;
      },
      sizeChange(pageSize){
        this.page.pageSize = pageSize;
      },
      refreshChange() {
        this.onLoad(this.page, this.query);
      },
      onLoad(page, params = {}) {
        this.loading = true;
        getUsualList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
          const data = res.data.data;
          this.page.total = data.total;
          this.data = data.records;
          this.loading = false;
        });
      }
    }
  };
</script>

<style>
</style>

 Source/UBCS-WEB/src/views/monitor/log/operateLog.vue

 Source/UBCS-WEB/vue.config.js

@@ -26,9 +26,9 @@
    proxy: {
      '/api': {
        //本地服务接口地址
        // target: 'http://127.0.0.1:37000',
        target: 'http://127.0.0.1:37000',
        // target: 'http://192.168.1.51:37000',
        target: 'http://dev.vci-tech.com:37000',
        // target: 'http://dev.vci-tech.com:37000',
        //yxc
        // target: 'http:// 192.168.0.104:37000',
        // target: 'http://192.168.0.105:37000',

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/utils/HttpUtil.java

@@ -346,7 +346,7 @@
                return result;
            }
        }catch (Throwable e){
            e.printStackTrace();;
            e.printStackTrace();
        }
        return result;
    }

 Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/dto/LocalLogVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,31 @@
package com.vci.ubcs.log.dto;

import com.vci.ubcs.log.entity.LocalLog;
import javafx.scene.Parent;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;
import java.util.List;

/**
 * @author ludc
 * @date 2023/11/23 11:17
 */
@Data
@AllArgsConstructor
@NoArgsConstructor
public class LocalLogVO extends LocalLog implements Serializable {

    /**
     * åºåˆ—化
     */
    private static final long serialVersionUID = 2217599544701726981L;

    /**
     * æ—¥å¿—全路径集合
     */
    private String logFullPaths;

}

 Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/LocalLog.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
package com.vci.ubcs.log.entity;

import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;

/**
 * @author ludc
 * @date 2023/10/31 15:43
 */
@Data
@AllArgsConstructor
@NoArgsConstructor
public class LocalLog implements Serializable {

    /**
     * åºåˆ—化
     */
    private static final long serialVersionUID = 2217599544701726181L;

    /**
     * æ—¥å¿—所属服务名称
     */
    private String serviceName;

    /**
     * æœåŠ¡id
     */
    private String serviceId;

    /**
     * æ—¥å¿—文件所在的路径
     */
    private String logPath;

    /**
     * æ—¥å¿—名称
     */
    private String logName;

    /**
     * æ—¥å¿—类型
     */
    private String logType;

    /**
     * æ—¥å¿—创建时间
     */
    private String createTime;

    /**
     * æ—¥å¿—的最后修改时间
     */
    private String lastModifier;

    /**
     * æ˜¯å¦åŒ…含存在子文件
     */
    private Boolean hasChildren;

}

 Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/LogOperate.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,69 @@
package com.vci.ubcs.log.entity;

import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;

/**
 * æ“ä½œæ—¥å¿—管理:(包括登录日志、操作日志、授权日志，以及管理员的以上三种日志)
 * @author ludc
 * @date 2023/11/24 10:58
 */
@Data
@AllArgsConstructor
@NoArgsConstructor
public class LogOperate implements Serializable {

    /**
     * åºåˆ—化
     */
    private static final long serialVersionUID = 2217599544701724211L;

    /**
     * ä¸»é”®
     */
    private String oid;

    /**
     * ç”¨æˆ·å
     */
    private String userName;

    /**
     * å§“名
     */
    private String realName;

    /**
     * ip地址
     */
    private String ip;

    /**
     * æ¨¡å—
     */
    private String model;

    /**
     * æ“ä½œ
     */
    private String operate;

    /**
     * æ—¶é—´
     */
    private String time;

    /**
     * æ“ä½œç»“æžœ
     */
    private String operateResult;

    /**
     * æè¿°
     */
    private String description;

}

 Source/UBCS/ubcs-ops-api/ubcs-resource-api/src/main/java/com/vci/ubcs/resource/entity/Attach.java

@@ -16,11 +16,13 @@
 */
package com.vci.ubcs.resource.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.tenant.mp.TenantEntity;

/**
@@ -32,7 +34,7 @@
@TableName("pl_attach")
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "Attach对象", description = "附件表")
public class Attach extends TenantEntity {
public class Attach extends BaseEntity {

    private static final long serialVersionUID = 1L;

@@ -66,6 +68,11 @@
     */
    @ApiModelProperty(value = "附件大小")
    private Long attachSize;

    /**
     * ç§Ÿæˆ·ID
     */
    @ApiModelProperty(value = "租户ID")
    @TableField("TENANT_ID")
    private String tenantId;

}

 Source/UBCS/ubcs-ops-api/ubcs-resource-api/src/main/java/com/vci/ubcs/resource/utils/FileDownloadUtil.java

@@ -21,39 +21,39 @@
@Slf4j
public class FileDownloadUtil {

    /**
     * ä¸‹è½½æ–‡ä»¶
     * @param response å“åº”对象
     * @param fileObjectBO æ–‡ä»¶çš„信息，包含文件的输入流
     * @throws IOException ä¸‹è½½å¼‚常会抛出
     */
    public static void downloadFile(HttpServletResponse response, FileObjectBO fileObjectBO) throws IOException {
        downloadFile(response,fileObjectBO,true);
    }
    /**
     * ä¸‹è½½æ–‡ä»¶
     * @param response å“åº”对象
     * @param fileObjectBO æ–‡ä»¶çš„信息，包含文件的输入流
     * @throws IOException ä¸‹è½½å¼‚常会抛出
     */
    public static void downloadFile(HttpServletResponse response, FileObjectBO fileObjectBO) throws IOException {
        downloadFile(response,fileObjectBO,true);
    }

    /**
     * ä¸‹è½½æ–‡ä»¶
     * @param response å“åº”对象
     * @param fileObjectBO æ–‡ä»¶çš„信息，包含文件的输入流
     * @param closeInputStream æ˜¯å¦å…³é—­æµ
     * @throws IOException ä¸‹è½½å‡ºé”™çš„时候抛出异常
     */
    public static void downloadFile(HttpServletResponse response, FileObjectBO fileObjectBO,boolean closeInputStream) throws IOException {
        MediaType mediaType = MediaTypeFactory.getMediaType(fileObjectBO.getBucketName() + "." + fileObjectBO.getFileExtension()).orElse(MediaType.APPLICATION_OCTET_STREAM);
        // è®¾ç½®å¼ºåˆ¶ä¸‹è½½ä¸æ‰“å¼€
        response.setContentType(mediaType.toString()+";application/force-download;charset=UTF-8");
        try{
            String fileName = URLEncoder.encode(fileObjectBO.getName() + "." + fileObjectBO.getFileExtension(), "UTF8");
            response.addHeader("Content-Disposition", "attachment;filename="+ fileName+ ";filename*=utf-8''");
        }catch(Exception e){
            if(log.isErrorEnabled()){
                log.error("设置文件的名称到响应流的时候出错",e);
            }
        }
        response.setCharacterEncoding("UTF-8");
        Cookie cookie = new Cookie("fileDownload", "true");
        cookie.setPath("/");
        response.addCookie(cookie);
    /**
     * ä¸‹è½½æ–‡ä»¶
     * @param response å“åº”对象
     * @param fileObjectBO æ–‡ä»¶çš„信息，包含文件的输入流
     * @param closeInputStream æ˜¯å¦å…³é—­æµ
     * @throws IOException ä¸‹è½½å‡ºé”™çš„时候抛出异常
     */
    public static void downloadFile(HttpServletResponse response, FileObjectBO fileObjectBO,boolean closeInputStream) throws IOException {
        MediaType mediaType = MediaTypeFactory.getMediaType(fileObjectBO.getBucketName() + "." + fileObjectBO.getFileExtension()).orElse(MediaType.APPLICATION_OCTET_STREAM);
        // è®¾ç½®å¼ºåˆ¶ä¸‹è½½ä¸æ‰“å¼€
        response.setContentType(mediaType.toString()+";application/force-download;charset=UTF-8");
        try{
            String fileName = URLEncoder.encode(fileObjectBO.getName() + "." + fileObjectBO.getFileExtension(), "UTF8");
            response.addHeader("Content-Disposition", "attachment;filename="+ fileName+ ";filename*=utf-8''");
        }catch(Exception e){
            if(log.isErrorEnabled()){
                log.error("设置文件的名称到响应流的时候出错",e);
            }
        }
        response.setCharacterEncoding("UTF-8");
        Cookie cookie = new Cookie("fileDownload", "true");
        cookie.setPath("/");
        response.addCookie(cookie);
        if(closeInputStream) {
            try (InputStream ins = (fileObjectBO.getInputStream() != null ? fileObjectBO.getInputStream() : new FileInputStream(fileObjectBO.getFileLocalPath()))) {
                IOUtils.copy(ins, response.getOutputStream());
@@ -76,5 +76,53 @@
                throw e;
            }
        }
    }
    }

    /**
     * ä¸‹è½½æ–‡ä»¶
     * @param response å“åº”对象
     * @param fileObjectBO æ–‡ä»¶çš„信息，包含文件的输入流
     * @param closeInputStream æ˜¯å¦å…³é—­æµ
     * @throws IOException ä¸‹è½½å‡ºé”™çš„时候抛出异常
     */
    public static void downloadFileLocal(HttpServletResponse response, FileObjectBO fileObjectBO,boolean closeInputStream) throws IOException {
        MediaType mediaType = MediaTypeFactory.getMediaType(fileObjectBO.getFileExtension()).orElse(MediaType.APPLICATION_OCTET_STREAM);
        // è®¾ç½®å¼ºåˆ¶ä¸‹è½½ä¸æ‰“å¼€
        response.setContentType(mediaType.toString()+";application/force-download;charset=UTF-8");
        try{
            String fileName = URLEncoder.encode(fileObjectBO.getName(), "UTF8");
            response.addHeader("Content-Disposition", "attachment;filename="+ fileName+ ";filename*=utf-8''");
        }catch(Exception e){
            if(log.isErrorEnabled()){
                log.error("设置文件的名称到响应流的时候出错",e);
            }
        }
        response.setCharacterEncoding("UTF-8");
        Cookie cookie = new Cookie("fileDownload", "true");
        cookie.setPath("/");
        response.addCookie(cookie);
        if(closeInputStream) {
            try (InputStream ins = (fileObjectBO.getInputStream() != null ? fileObjectBO.getInputStream() : new FileInputStream(fileObjectBO.getFileLocalPath()))) {
                IOUtils.copy(ins, response.getOutputStream());
            } catch (IOException e) {
                //有可能客户端的链接
                if (log.isErrorEnabled()) {
                    log.error("写入文件到响应流出错", e);
                }
                throw e;
            }
        }else{
            try {
                InputStream ins = (fileObjectBO.getInputStream() != null ? fileObjectBO.getInputStream() : new FileInputStream(fileObjectBO.getFileLocalPath()));
                IOUtils.copy(ins, response.getOutputStream());
            } catch (IOException e) {
                //有可能客户端的链接
                if (log.isErrorEnabled()) {
                    log.error("写入文件到响应流出错", e);
                }
                throw e;
            }
        }
    }

}

 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/LogApplication.java

@@ -29,7 +29,7 @@
 * @author Chill
 */
@EnableDiscoveryClient
@EnableFeignClients("org.springblade")
@EnableFeignClients(basePackages = {"com.vci.ubcs", "org.springblade"})
@SpringBootApplication
public class LogApplication {


 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogErrorController.java

@@ -25,10 +25,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

import java.util.Map;

 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,83 @@
package com.vci.ubcs.log.controller;

import com.alibaba.fastjson.JSON;
import com.alibaba.nacos.common.utils.StringUtils;
import com.vci.ubcs.log.dto.LocalLogVO;
import com.vci.ubcs.log.service.ILogLocalService;
import com.vci.ubcs.log.entity.LocalLog;
import com.vci.ubcs.resource.utils.FileDownloadUtil;
import com.vci.ubcs.starter.web.util.ControllerUtil;
import com.vci.ubcs.starter.web.util.LangBaseUtil;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.rmi.ServerException;
import java.util.List;
import java.util.Map;

/**
 * æœ¬åœ°ç³»ç»Ÿæ—¥å¿—
 * @author ludc
 * @date 2023/10/31 15:37
 */
@NonDS
@Slf4j
@RestController
@AllArgsConstructor
@RequestMapping("/localLog")
public class LogLocalController {

    private final ILogLocalService logLocalService;

    /**
     * èŽ·å–日志文件列表
     * @param localLog
     * @return
     */
    @PostMapping("/lazy-list")
    public R<List<LocalLog>> getSystemLogList(@RequestBody LocalLog localLog){
         return R.data(logLocalService.getSystemLogList(localLog.getLogPath()));
    }

    /**
     * ä¸‹è½½æ—¥å¿—文件
     * @param localLogVO ä¸‹è½½æ—¥å¿—的全路径集合
     * @param response
     * @return
     */
    @RequestMapping(value = "/downLoadLog",method = {RequestMethod.GET,RequestMethod.POST})
    public void downloadLogByServiceName(@RequestBody LocalLogVO localLogVO, HttpServletResponse response) throws IOException {
        try {
            //ControllerUtil.writeFileToResponse(response,excelName);
            FileDownloadUtil.downloadFileLocal(response, logLocalService.downloadLogByServiceNameAndFileName(localLogVO),true);
        } catch (Throwable e) {
            //如果出错,把错误信息写到text
            String msg = LangBaseUtil.getErrorMsg(e);
            if(StringUtils.isBlank(msg)){
                msg = "未知错误";
            }
            ControllerUtil.writeDataToResponse(response,msg.getBytes(StandardCharsets.UTF_8),null);
        }
    }

    /**
     * åˆ é™¤æ—¥å¿—文件
     * @param localLogVO
     * @return
     * @throws ServerException
     */
    @DeleteMapping("/deleteLogFile")
    public R deleteLogFile(@RequestBody LocalLogVO localLogVO) throws ServerException {
        return logLocalService.deleteLogFile(localLogVO);
    }

}

 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogOperateController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package com.vci.ubcs.log.controller;

import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tenant.annotation.NonDS;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * æ“ä½œæ—¥å¿—管理:(包括登录日志、操作日志、授权日志，以及管理员的以上三种日志)
 * @author ludc
 * @date 2023/11/24 10:43
 */
@NonDS
@Slf4j
@RestController
@AllArgsConstructor
@RequestMapping("/operateLog")
public class LogOperateController {



}

 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/mapper/LogOperateMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.vci.ubcs.log.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.vci.ubcs.log.entity.LogOperate;
import org.apache.ibatis.annotations.Mapper;

/**
 * æ“ä½œæ—¥å¿—管理:(包括登录日志、操作日志、授权日志，以及管理员的以上三种日志)
 * @author ludc
 * @date 2023/11/24 10:50
 */
@Mapper
public interface LogOperateMapper extends BaseMapper<LogOperate> {


}

 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogLocalService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,40 @@
package com.vci.ubcs.log.service;

import com.vci.ubcs.log.dto.LocalLogVO;
import com.vci.ubcs.log.entity.LocalLog;
import com.vci.ubcs.resource.bo.FileObjectBO;
import org.springblade.core.tool.api.R;

import java.rmi.ServerException;
import java.util.List;
import java.util.Map;

/**
 * æœ¬åœ°ç³»ç»Ÿæ—¥å¿—
 * @author ludc
 * @date 2023/10/31 15:38
 */
public interface ILogLocalService {

    /**
     * æŸ¥çœ‹ï¼Œæœ¬åœ°ç³»ç»Ÿæ—¥å¿—列表
     * @param logParentPath
     * @return
     */
    List<LocalLog> getSystemLogList(String logParentPath);

    /**
     * ä¸‹è½½ï¼Œæ ¹æ®æœåŠ¡åæ‰€åœ¨æ–‡ä»¶åå’Œæ–‡ä»¶åä¸‹è½½æ–‡ä»¶
     * @param localLogVO ä¸‹è½½æ—¥å¿—的对象
     * @return æ–‡ä»¶çš„信息
     */
    FileObjectBO downloadLogByServiceNameAndFileName(LocalLogVO localLogVO) throws ServerException;

    /**
     * åˆ é™¤ï¼Œæ ¹æ®æœåŠ¡æ‰€åœ¨æ–‡ä»¶åï¼Œå’Œæ—¥å¿—文件名称删除
     * @param localLogVO
     * @return æ‰§è¡Œç»“æžœ
     */
    R deleteLogFile(LocalLogVO localLogVO) throws ServerException;

}

 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/ILogOperateService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,29 @@
package com.vci.ubcs.log.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.log.entity.LogOperate;

import java.util.List;

/**
 * æ“ä½œæ—¥å¿—管理:(包括登录日志、操作日志、授权日志，以及管理员的以上三种日志)
 * @author ludc
 * @date 2023/11/24 10:50
 */
public interface ILogOperateService extends IService<LogOperate> {

    /**
     * ä¿å­˜æ“ä½œæ—¥å¿—
     * @param logOperate
     * @return
     */
    boolean saveLogOperate(LogOperate logOperate);

    /**
     * æ¡ä»¶æŸ¥è¯¢èŽ·å–日志列表
     * @param logOperate
     * @return
     */
    List<LogOperate> listByCondition(LogOperate logOperate);

}

 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,318 @@
package com.vci.ubcs.log.service.impl;

import com.vci.ubcs.log.dto.LocalLogVO;
import com.vci.ubcs.log.service.ILogLocalService;
import com.vci.ubcs.log.entity.LocalLog;
import com.vci.ubcs.resource.utils.FileUtil;
import com.vci.ubcs.resource.utils.ZipUtil;
import com.vci.ubcs.resource.vo.FileObjectVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.web.util.BeanUtil;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
import org.springblade.core.log.exception.ServiceException;
import com.vci.ubcs.omd.cache.EnumCache;
import com.vci.ubcs.omd.enums.EnumEnum;
import com.vci.ubcs.resource.bo.FileObjectBO;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

import javax.annotation.Resource;
import java.io.*;
import java.net.MalformedURLException;
import java.net.URL;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.attribute.BasicFileAttributes;
import java.rmi.ServerException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;

/**
 * æœ¬åœ°ç³»ç»Ÿæ—¥å¿—
 * @author ludc
 * @date 2023/10/31 15:39
 */
@Service
@Slf4j
public class LogLocalServiceImpl implements ILogLocalService{

    /**
     * å„个服务存放的的父路径
     */
    @Value("${local-log.parent-path:/data1/ubcs/ubcs-server}")
    private String PARENTPATH;

    /**
     * æ—¥å¿—文件的具体位置
     */
    @Value("${local-log.log-path:/target/log}")
    private String LOGPATH;

    /**
     * å½“前操作系统，是否为windows系统
     */
    private Boolean isWindows = true;

    {
        String os = System.getProperty("os.name").toLowerCase();
        //默认就配置为windows的，如果不是当前系统不是windows就需要对其转换为linux的文件路径格式
        if (!os.contains("win")) {
            this.PARENTPATH = this.PARENTPATH.substring(this.PARENTPATH.lastIndexOf(":") + 1).replace("\\", "/");
            this.LOGPATH = this.LOGPATH.replace("\\", "/");
            this.isWindows = false;
        }
    }

    /**
     * åŽ‹ç¼©æ–‡ä»¶çš„工具类
     */
    @Resource
    private ZipUtil zipUtil;

    /**
     * èŽ·å–本地日志列表
     * @param logParentPath
     * @return
     */
    //@Override
    public List<LocalLog> getSystemLogList(String logParentPath) {
        List<LocalLog> localLogs = new ArrayList<>();
        // ä¸ä¸ºç©ºè¯´æ˜Žæ˜¯åŠ è½½å½“前这个服务路径下的日志文件
        if(Func.isNotEmpty(logParentPath)){
            File file = new File(logParentPath);
            if (file.isDirectory()) {
                File[] files = file.listFiles();
                Arrays.stream(files).forEach(item->{
                    // ç»„建日志文件对象
                    LocalLog localLog = new LocalLog();
                    localLog.setLogName(item.getName());
                    localLog.setLogType(getLogType(item.getName()));
                    localLog.setCreateTime(getLastModifiedOrCreatTime(false,logParentPath));
                    localLog.setLastModifier(getLastModifiedOrCreatTime(true,logParentPath));
                    localLog.setLogPath(logParentPath);
                    String serviceId = getServiceId(logParentPath);
                    localLog.setServiceId(serviceId);
                    localLog.setServiceName(getServiceName(serviceId));
                    localLog.setHasChildren(false);
                    localLogs.add(localLog);
                });
            }
        }else {
            File fileDir = new File(PARENTPATH);
            File[] childDir = fileDir.listFiles();
            Arrays.stream(childDir).forEach(dir->{
                if(dir.getName().contains("ubcs_")){
                    String fullPath = dir.getPath() + LOGPATH;
                    File file = new File(fullPath);
                    LocalLog localLog = new LocalLog();
                    localLog.setLastModifier(getLastModifiedOrCreatTime(true,fullPath));
                    localLog.setCreateTime(getLastModifiedOrCreatTime(false,fullPath));
                    localLog.setLogPath(fullPath);
                    String serviceId = getServiceId(file.getPath());
                    localLog.setServiceId(serviceId);
                    String serviceName = getServiceName(serviceId);
                    localLog.setServiceName(serviceName);
                    localLog.setLogType(serviceName+"日志父目录");
                    localLog.setLogName(serviceName+"日志父目录");
                    localLog.setHasChildren(true);
                    localLogs.add(localLog);
                }
            });
        }
        return localLogs;
    }

    /**
     * èŽ·å–文件最后修改或者创建时间
     * @param isModifier
     * @return
     */
    private String getLastModifiedOrCreatTime(boolean isModifier,String pathStr) {
        Path path = FileSystems.getDefault().getPath(pathStr);
        String date = "";
        try {
            BasicFileAttributes attr = Files.readAttributes(path, BasicFileAttributes.class);
            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            // æ˜¯èŽ·å–最后修改时间
            if(isModifier){
                date = dateFormat.format(new Date(attr.lastModifiedTime().toMillis()));
            }else {
                date = dateFormat.format(new Date(attr.creationTime().toMillis()));
            }
        } catch (IOException e) {
            throw new ServiceException("Error reading file date attributes: " + e.getMessage());
        }
        return date;
    }

    /**
     * èŽ·å–日志类型
     * @param fileName
     * @return
     */
    private String getLogType(String fileName){
        //判断日志的的类型
        if (fileName.contains("error")) {
            return "Error";
        } else if (fileName.contains("info")) {
            return "Info";
        } else if (fileName.contains("warning")) {
            return "Warning";
        } else {
            return "Unknown";
        }
    }

    /**
     * èŽ·å–服务ID
     * @param servciePath
     * @return
     */
    private String getServiceId(String servciePath){
        // æ ¹æ®å½“前操作系统来决定是通过什么字符来截取
        String[] parts = servciePath.split(this.isWindows ? "\\\\":"/");
        String extractedString = "";
        if(parts.length > 3){
            extractedString = parts[parts.length - 3];
        }
        return extractedString;
    }

    /**
     * èŽ·å–服务名称
     * @param serViceId
     * @return
     */
    private String getServiceName(String serViceId){
        return EnumCache.getValue(EnumEnum.SERCIVE_NAME_ROLE, serViceId);
    }

    /**
     * æˆªå–路径中的日志文件名称
     * @param logFullPath
     * @return
     */
    private String getLogFileName(String logFullPath){
        // æ ¹æ®å½“前操作系统来决定是通过什么字符来截取
        String[] parts = logFullPath.split(this.isWindows ? "\\\\":"/");
        String logFileName = "";
        if(parts.length > 3){
            logFileName = parts[parts.length - 1];
        }
        return logFileName;
    }

    /**
     * ä¸‹è½½æ—¥å¿—文件
     * @param localLogVO ä¸‹è½½æ—¥å¿—对象
     * @return
     * @throws ServerException
     */
    @Override
    public FileObjectBO downloadLogByServiceNameAndFileName(LocalLogVO localLogVO) throws ServerException {
        if(Func.isEmpty(localLogVO) || Func.isEmpty(localLogVO.getLogPath())){
            throw new ServerException("未获取到该日志路径！");
        }
        FileObjectBO fileObjectBO = new FileObjectBO();
        String logFullPaths = localLogVO.getLogFullPaths();
        // åˆ¤æ–­æ˜¯å¦æ˜¯çˆ¶ç›®å½•
        if(!localLogVO.getHasChildren()){
            //只下载一个日志文件
            File file = new File(logFullPaths);
            if(!file.isFile() || !file.exists()){
                throw new ServerException("本地日志文件路径"+ logFullPaths +"中未找到日志");
            }
            try {
                fileObjectBO.setName(file.getName());
                fileObjectBO.setInputStream(new FileInputStream(file));
                fileObjectBO.setFileLocalPath(logFullPaths);
                fileObjectBO.setFileExtension(".log");
            }catch (Throwable e){
                throw new VciBaseException("获取文件的流有问题",new String[]{logFullPaths},e);
            }
        }else{
            // æ˜¯çˆ¶ç›®å½•ï¼Œæ‰€ä»¥éœ€è¦èŽ·å–到下面的所有子目录
            // æœ‰å¤šä¸ªï¼Œéœ€è¦ä½¿ç”¨zip进行压缩
            String tempFolder = FileUtil.getDefaultTempFolder();
            File[] file1 = new File(logFullPaths).listFiles();
            if(file1.length > 0){
                Arrays.stream(file1).forEach(item->{
                    String fileName = tempFolder + File.separator + System.currentTimeMillis() + ".log";
                    File file = new File(fileName);
                    try {
                        if(!file.exists()) {
                            file.createNewFile();
                        }
                    }catch (Throwable e){
                        throw new VciBaseException("创建文件出错,{0}",new String[]{fileName});
                    }
                    File logFile = new File(item.getPath());
                    if(!logFile.exists() || !logFile.isFile()){
                        throw new VciBaseException("本地日志文件路径"+item.getPath()+"中未找到日志");
                    }

                    try(OutputStream os = new FileOutputStream(file);
                        InputStream ins = new FileInputStream(logFile);
                    ){
                        IOUtils.copy(ins,os);
                    }catch (Throwable e){
                        throw new VciBaseException("下载文件到临时文件夹里出错,{0}",new String[]{fileName});
                    }
                });
                String zipName = new File(tempFolder).getPath() + File.separator + getLogFileName(logFullPaths) + "等"+file1.length + "个文件.zip";
                zipUtil.folderToZipFile(tempFolder,zipName);
                fileObjectBO.setFileLocalPath(zipName);
                fileObjectBO.setFileExtension(".log");
                if(log.isDebugEnabled()){
                    log.debug("下载文件的信息,",zipName);
                }
            }
        }
        return fileObjectBO;
    }

    /**
     * åˆ é™¤æ—¥å¿—文件
     * @param localLogVO æ–‡ä»¶å…¨è·¯å¾„集合
     * @throws ServerException
     */
    @Override
    public R deleteLogFile(LocalLogVO localLogVO) throws ServerException {
        List<String> resMsgs = new ArrayList<>();
        // åˆ¤æ–­æ˜¯å¦æ˜¯æ—¥å¿—顶层目录
        if(localLogVO.getHasChildren()){
            // æ˜¯é¡¶å±‚目录，需要循环去删除包含的所有日志文件
            File parentFile = new File(localLogVO.getLogFullPaths());
            if(parentFile.isDirectory()){
                Arrays.stream(parentFile.listFiles()).forEach(logFile->{
                    if (logFile.exists()) {
                        //删除失败的直接记录下文件名
                        if (!logFile.delete()) {
                            resMsgs.add(getLogFileName(logFile.getPath()));
                        }
                    }
                });
            }
        }else {
            // å•ä¸ªåˆ é™¤
            File file = new File(localLogVO.getLogFullPaths());
            if (file.exists()) {
                //删除失败的直接记录下文件名
                if (!file.delete()) {
                    resMsgs.add(getLogFileName(localLogVO.getLogFullPaths()));
                }
            }
        }
        return resMsgs.size()==0 ? R.success("删除成功!"):R.fail("以下日志文件："+resMsgs.stream().collect(Collectors.joining(","))+"删除失败!");
    }

}

 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogOperateServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,52 @@
package com.vci.ubcs.log.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.vci.ubcs.log.entity.LogOperate;
import com.vci.ubcs.log.mapper.LogOperateMapper;
import com.vci.ubcs.log.service.ILogOperateService;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * æ“ä½œæ—¥å¿—管理:(包括登录日志、操作日志、授权日志，以及管理员的以上三种日志)
 * @author ludc
 * @date 2023/11/24 10:51
 */
@Service
public class LogOperateServiceImpl extends ServiceImpl<LogOperateMapper,LogOperate> implements ILogOperateService {

    @Autowired
    private LogOperateMapper logOperateMapper;

    /**
     * ä¿å­˜æ“ä½œæ—¥å¿—
     * @param logOperate
     * @return
     */
    @Override
    public boolean saveLogOperate(LogOperate logOperate) {
        if(Func.isEmpty(logOperate)){
            return false;
        }
        return SqlHelper.retBool(logOperateMapper.insert(logOperate));
    }

    /**
     * æ¡ä»¶æŸ¥è¯¢èŽ·å–日志列表
     * @param logOperate
     * @return
     */
    @Override
    public List<LogOperate> listByCondition(LogOperate logOperate) {
        QueryWrapper<LogOperate> queryWrapper = Condition.getQueryWrapper(logOperate);
        this.list(queryWrapper);
        return this.list(queryWrapper);
    }

}

 Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/FileController.java

@@ -1,6 +1,7 @@
package com.vci.ubcs.resource.controller;

import com.alibaba.fastjson.JSON;
import com.alibaba.nacos.common.utils.StringUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vci.ubcs.resource.dto.FileObjectDTO;
import com.vci.ubcs.resource.dto.FileReleaseDTO;
@@ -24,6 +25,7 @@
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.List;
@@ -38,36 +40,40 @@
@Slf4j
public class FileController {

    /**
     * æ–‡ä»¶æœåŠ¡
     */
    @Autowired
    private IFileService fileService;
    /**
     * æ–‡ä»¶æœåŠ¡
     */
    @Autowired
    private IFileService fileService;

    /**
     * æ ¹æ®æ–‡ä»¶ä¸»é”®ä¸‹è½½æ–‡ä»¶
     * @param fileOids æ–‡ä»¶çš„主键
     * @param response å“åº”的对象
     * @return æ‰§è¡Œç»“果，只有下载失败的时候才会这样
     */
    /**
     * æ ¹æ®æ–‡ä»¶ä¸»é”®ä¸‹è½½æ–‡ä»¶
     * @param fileOids æ–‡ä»¶çš„主键
     * @param response å“åº”的对象
     * @return æ‰§è¡Œç»“果，只有下载失败的时候才会这样
     */
    @RequestMapping(value = "/downloadFilesByOids",method = {RequestMethod.GET,RequestMethod.POST})
    public String downloadFilesByOids(@RequestParam String fileOids, HttpServletResponse response){
        try{
    public void downloadFilesByOids(@RequestParam String fileOids, HttpServletResponse response) throws IOException {
        try {
            //ControllerUtil.writeFileToResponse(response,excelName);
            FileDownloadUtil.downloadFile(response, fileService.downloadFileByOids(VciBaseUtil.str2List(fileOids)));
        }catch (Throwable e){
            return JSON.toJSONString(R.fail(LangBaseUtil.getErrorMsg(e)));
        } catch (Throwable e) {
            //如果出错,把错误信息写到text
            String msg = LangBaseUtil.getErrorMsg(e);
            if(StringUtils.isBlank(msg)){
                msg = "未知错误";
            }
            ControllerUtil.writeDataToResponse(response,msg.getBytes(StandardCharsets.UTF_8),null);
        }
        //因为设置了响应contentType,所以这儿不能再直接返回R了，可能会导致报错
        return JSON.toJSONString(R.success("下载完成")) ;
    }

    /**
     * æ–‡ä»¶åˆ é™¤
     * @param oids æ–‡ä»¶çš„主键
     * @return æ–‡ä»¶å†…容
     */
    @DeleteMapping("/deleteFile")
    public R deleteFile(@RequestBody Collection<String> oids){
    /**
     * æ–‡ä»¶åˆ é™¤
     * @param oids æ–‡ä»¶çš„主键
     * @return æ–‡ä»¶å†…容
     */
    @DeleteMapping("/deleteFile")
    public R deleteFile(@RequestBody Collection<String> oids){
        try {
            fileService.deleteFiles(oids);
        }catch (Throwable e){
@@ -79,104 +85,104 @@
            log.debug(msg);
            return R.fail(msg);
        }
        return R.success("删除成功");
    }
        return R.success("删除成功");
    }

    /**
     * å‰ç«¯é¡µé¢å•æ–‡ä»¶ä¸Šä¼ ã€‚(先数据，后文件模式上传)
     * @param file ä¸Šä¼ çš„文件
     * @param fileObjectDTO æ–‡ä»¶ä¿¡æ¯ä¼ è¾“对象
     * @return æ–‡ä»¶ä¿¡æ¯æ˜¾ç¤ºå¯¹è±¡
     */
    @PostMapping("/uploadFile")
    public R<FileObjectVO> uploadFile(MultipartFile file, FileObjectDTO fileObjectDTO){
        if (file != null ) {
            return fileService.uploadFile(file, fileObjectDTO);
        } else {
            return R.fail("无上传的文件");
        }
    }
    /**
     * å‰ç«¯é¡µé¢å•æ–‡ä»¶ä¸Šä¼ ã€‚(先数据，后文件模式上传)
     * @param file ä¸Šä¼ çš„文件
     * @param fileObjectDTO æ–‡ä»¶ä¿¡æ¯ä¼ è¾“对象
     * @return æ–‡ä»¶ä¿¡æ¯æ˜¾ç¤ºå¯¹è±¡
     */
    @PostMapping("/uploadFile")
    public R<FileObjectVO> uploadFile(MultipartFile file, FileObjectDTO fileObjectDTO){
        if (file != null ) {
            return fileService.uploadFile(file, fileObjectDTO);
        } else {
            return R.fail("无上传的文件");
        }
    }

    /**
     * åœ¨ä¸Šä¼ æ–‡ä»¶åŽï¼Œä¿å­˜æ–‡ä»¶çš„信息
     * @param fileObjectDTO æ–‡ä»¶ä¿¡æ¯ä¼ è¾“对象
     * @return æ–‡ä»¶ä¿¡æ¯æ˜¾ç¤ºå¯¹è±¡
     */
    @PostMapping("/saveFileAfterUpload")
    public R<FileObjectVO> saveFileAfterUpload( @RequestBody FileObjectDTO fileObjectDTO){
       return fileService.saveFileAfterUpload(fileObjectDTO);
    }
    /**
     * åœ¨ä¸Šä¼ æ–‡ä»¶åŽï¼Œä¿å­˜æ–‡ä»¶çš„信息
     * @param fileObjectDTO æ–‡ä»¶ä¿¡æ¯ä¼ è¾“对象
     * @return æ–‡ä»¶ä¿¡æ¯æ˜¾ç¤ºå¯¹è±¡
     */
    @PostMapping("/saveFileAfterUpload")
    public R<FileObjectVO> saveFileAfterUpload( @RequestBody FileObjectDTO fileObjectDTO){
        return fileService.saveFileAfterUpload(fileObjectDTO);
    }

    /**
     * å°†åŽŸæ•°æ®ä¸‹çš„所有文件共享到其他的业务数据下
     * @param shareDTO æ–‡ä»¶åˆ†äº«
     * @return æ–‡ä»¶ä¿¡æ¯æ˜¾ç¤ºå¯¹è±¡,是多个
     */
    @PostMapping("/shareFiles")
    public R<List<FileObjectVO>> shareFiles(@RequestBody FileShareDTO shareDTO){
        return fileService.shareFiles(shareDTO);
    }
    /**
     * å°†åŽŸæ•°æ®ä¸‹çš„所有文件共享到其他的业务数据下
     * @param shareDTO æ–‡ä»¶åˆ†äº«
     * @return æ–‡ä»¶ä¿¡æ¯æ˜¾ç¤ºå¯¹è±¡,是多个
     */
    @PostMapping("/shareFiles")
    public R<List<FileObjectVO>> shareFiles(@RequestBody FileShareDTO shareDTO){
        return fileService.shareFiles(shareDTO);
    }


    /**
     * ä¿®æ”¹æ–‡ä»¶ä¿¡æ¯(不含文件),注意objectName和filePath不会变化
     * @param fileDTOs æ–‡ä»¶çš„数据对象
     * @return æ‰§è¡Œç»“æžœ
     */
    @PostMapping("/updateFileInfos")
    public R updateFileInfos(@RequestBody Collection<FileObjectDTO> fileDTOs){
        return fileService.updateFileInfos(fileDTOs);
    }
    /**
     * ä¿®æ”¹æ–‡ä»¶ä¿¡æ¯(不含文件),注意objectName和filePath不会变化
     * @param fileDTOs æ–‡ä»¶çš„数据对象
     * @return æ‰§è¡Œç»“æžœ
     */
    @PostMapping("/updateFileInfos")
    public R updateFileInfos(@RequestBody Collection<FileObjectDTO> fileDTOs){
        return fileService.updateFileInfos(fileDTOs);
    }

    /**
     * æ–‡ä»¶ç”Ÿæ•ˆ
     * @param ids æ–‡ä»¶çš„主键
     * @return æ‰§è¡Œç»“æžœ
     */
    @PutMapping("/releasedFiles")
    public R releasedFiles(@RequestBody Collection<String> ids){
        return fileService.releasedFiles(ids);
    }
    /**
     * æ–‡ä»¶ç”Ÿæ•ˆ
     * @param ids æ–‡ä»¶çš„主键
     * @return æ‰§è¡Œç»“æžœ
     */
    @PutMapping("/releasedFiles")
    public R releasedFiles(@RequestBody Collection<String> ids){
        return fileService.releasedFiles(ids);
    }

    /**
     * æ‰¹é‡æŒ‡å®šæ–‡ä»¶ä¸šåŠ¡æ•°æ®åŽç”Ÿæ•ˆ
     * @param releaseDTOS ç”Ÿæ•ˆçš„相关信息
     * @return æ‰§è¡Œç»“æžœ
     */
    @PutMapping("/releasedFilesForOwn")
    public R releasedFilesForOwn(@RequestBody Collection<FileReleaseDTO> releaseDTOS){
        return fileService.releasedFilesForOwn(releaseDTOS);
    }
    /**
     * æ‰¹é‡æŒ‡å®šæ–‡ä»¶ä¸šåŠ¡æ•°æ®åŽç”Ÿæ•ˆ
     * @param releaseDTOS ç”Ÿæ•ˆçš„相关信息
     * @return æ‰§è¡Œç»“æžœ
     */
    @PutMapping("/releasedFilesForOwn")
    public R releasedFilesForOwn(@RequestBody Collection<FileReleaseDTO> releaseDTOS){
        return fileService.releasedFilesForOwn(releaseDTOS);
    }


    /**
     * ä½¿ç”¨ä¸šåŠ¡ç±»åž‹æŸ¥è¯¢æ–‡ä»¶çš„信息，提供给页面调用
     * @param fileQuery æŸ¥è¯¢å¯¹è±¡
     * @return æ–‡ä»¶çš„显示对象
     */
    @RequestMapping(value = "/listFiles",method = {RequestMethod.GET,RequestMethod.POST})
    public R<IPage<FileObjectVO>> listFiles(FileQuery fileQuery, Query query){
        return R.data(fileService.listFiles(fileQuery,query));
    }
    /**
     * ä½¿ç”¨ä¸šåŠ¡ç±»åž‹æŸ¥è¯¢æ–‡ä»¶çš„信息，提供给页面调用
     * @param fileQuery æŸ¥è¯¢å¯¹è±¡
     * @return æ–‡ä»¶çš„显示对象
     */
    @RequestMapping(value = "/listFiles",method = {RequestMethod.GET,RequestMethod.POST})
    public R<IPage<FileObjectVO>> listFiles(FileQuery fileQuery, Query query){
        return R.data(fileService.listFiles(fileQuery,query));
    }

    /**
     * ä½¿ç”¨æ–‡ä»¶ä¸»é”®èŽ·å–对象
     * @param oid ä¸»é”®
     * @return æ–‡ä»¶æ˜¾ç¤ºå¯¹è±¡
     */
    @GetMapping("/get")
    public FileObjectVO get(String oid){
        return fileService.get(oid);
    }
    /**
     * ä½¿ç”¨æ–‡ä»¶ä¸»é”®èŽ·å–对象
     * @param oid ä¸»é”®
     * @return æ–‡ä»¶æ˜¾ç¤ºå¯¹è±¡
     */
    @GetMapping("/get")
    public FileObjectVO get(String oid){
        return fileService.get(oid);
    }

    /**
     * ä½¿ç”¨æ–‡ä»¶çš„主键批量获取对象
     * @param oids æ–‡ä»¶çš„主键集合
     * @return æ–‡ä»¶çš„显示信息
     */
    @GetMapping("/listFilesByOids")
    public List<FileObjectVO> listFilesByOids( Collection<String> oids){
        return fileService.listFilesByOids(oids);
    }
    /**
     * ä½¿ç”¨æ–‡ä»¶çš„主键批量获取对象
     * @param oids æ–‡ä»¶çš„主键集合
     * @return æ–‡ä»¶çš„显示信息
     */
    @GetMapping("/listFilesByOids")
    public List<FileObjectVO> listFilesByOids( Collection<String> oids){
        return fileService.listFilesByOids(oids);
    }

}

 Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application-prod.yml

@@ -23,7 +23,3 @@
  secret-key: Reo4wW8EWF4gSizUmVsNjWfbDZzR3rBYFn5Jehd9
  bucket-name: vci-ubcs

#关闭驼峰命名映射
mybatis-plus:
  configuration:
    map-underscore-to-camel-case: false

 Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/AttachMapper.xml

@@ -22,7 +22,7 @@


    <select id="selectAttachPage" resultMap="attachResultMap">
        select * from blade_attach where is_deleted = 0
        select * from blade_attach where isdeleted = 0
    </select>

</mapper>

 Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/SmsMapper.xml

@@ -24,7 +24,7 @@


    <select id="selectSmsPage" resultMap="smsResultMap">
        select * from pl_sys_sms where is_deleted = 0
        select * from pl_sys_sms where isdeleted = 0
    </select>

</mapper>

 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java

@@ -225,7 +225,7 @@
        try {
            count = dockingPreAttrMappingMapper.selectCount(Wrappers.<DockingPreAttrMapping>query().lambda().eq(DockingPreAttrMapping::getTargetClassifyId, targetClassifyId).eq(DockingPreAttrMapping::getSourceClassifyId,sourceClassifyId));
        }catch (Throwable e){
            e.printStackTrace();;
            e.printStackTrace();
        } finally {
            return  count>0?true:false;
        }

 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java

@@ -471,7 +471,7 @@
            }
            return R.success(message);
        }catch (Throwable e){
            e.printStackTrace();;
            e.printStackTrace();
            log.error("获取数据模型失败"+e);
            R.fail(message);
        }
@@ -537,7 +537,7 @@
            }

        }catch (Throwable e){
            e.printStackTrace();;
            e.printStackTrace();
            log.error("获取申请单状态失败"+e);
            throw  new VciBaseException(message);
        }

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/CodeApplication.java

@@ -16,12 +16,10 @@
 */
package com.vci.ubcs.code;

import com.vci.ubcs.starter.util.VciSpringUtil;
import org.springblade.core.cloud.client.UbcsCloudApplication;
import org.springblade.core.launch.UbcsApplication;
import org.springblade.core.launch.constant.AppConstant;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.stereotype.Component;

/**
 * Code启动器

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java

@@ -71,7 +71,7 @@
            this.setHttpToThreadLocal(request);
            result= universalInterfaceI.syncEditData(dataString,dataType);
        }catch (Throwable e){
            e.printStackTrace();;
            e.printStackTrace();
            logger.error("syncData->"+e.getMessage());
        }
        return result;

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java

@@ -48,7 +48,7 @@
        QueryWrapper<SystemClassifyRole> wrapper = new QueryWrapper<>();
        wrapper.eq("systemOid",systemOid);
        wrapper.eq("systemId",systemId);
        List<SystemClassifyRole> systemClassifyRoles = this.listByIds(roleList.stream().map(SystemClassifyRole ::getOid).collect(Collectors.toList()));;
        List<SystemClassifyRole> systemClassifyRoles = this.listByIds(roleList.stream().map(SystemClassifyRole ::getOid).collect(Collectors.toList()));
        this.remove(wrapper);
        List<SystemClassifyRole> newSCRoles = new ArrayList<>();
        //数据处理

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java

@@ -1961,7 +1961,7 @@
        String sqlHasPage = pageHelper.getLimit() > 0 ? ("select * from (select A.*,rownum RN from (" + sql + whereSubfixForPage) : sql;
        String sqlCount = "select count(1) from " + tableName + SPACE + "t" + SPACE + joinTableList.values().stream().collect(Collectors.joining(SPACE))
                + (StringUtils.isBlank(whereSql) ? "" : " where ") + whereSql;
        String sqlId = "select ID from " + tableName + SPACE + "t" + SPACE + joinTableList.values().stream().collect(Collectors.joining(SPACE))
        String sqlId = "select t.ID from " + tableName + SPACE + "t" + SPACE + joinTableList.values().stream().collect(Collectors.joining(SPACE))
            + (StringUtils.isBlank(whereSql) ? "" : " where ") + whereSql;
        CodeTemplateAttrSqlBO sqlBO = new CodeTemplateAttrSqlBO();
        sqlBO.setTableName(tableName);

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java

@@ -885,7 +885,7 @@
            String idFieldName = attrVOS.stream().filter(s -> VciQueryWrapperForDO.ID_FIELD.equalsIgnoreCase(s.getId())).findFirst().orElseGet(() -> new CodeClassifyTemplateAttrVO()).getName();
            getFieldIndexMap(titleRowData, attrNameIdMap, fieldIndexMap);
            //先不用管属性是否都存在，先转换一下数据
            List<ClientBusinessObject> cboList = new CopyOnWriteArrayList<>();
            List<ClientBusinessObject> cboList = new ArrayList<>();
            String fullPath = getFullPath(classifyFullInfo);
            //我们需要获取到所有的下级分类的oid的路径，因为后面需要
            Map<String/**主键**/, String/**路径**/> childOidPathMap = getChildClassifyPathMap(classifyFullInfo, fullPath);
@@ -2020,9 +2020,10 @@
        //最后弄组合规则
        batchSwitchComponentAttrOnOrder(attrVOS,cboList);
        //3.判断关键属性
        CodeImportResultVO keyResultVO = batchCheckKeyAttrOnOrder(classifyFullInfo, templateVO, cboList,errorMap);
        CodeImportResultVO keyResultVO = batchCheckKeyAttrOnOrder(classifyFullInfo, templateVO, cboList,errorKeyMap);
        Set<String> selfRepeatRowIndexList = keyResultVO.getSelfRepeatRowIndexList();
        Set<String> keyAttrRepeatRowIndexList = keyResultVO.getKeyAttrRepeatRowIndexList();

        Map<String,List<String>>keyAttrOkOidTORepeatOidMap= keyResultVO.getKeyAttrOkOidTORepeatOidMap();
        if(!CollectionUtils.isEmpty(selfRepeatRowIndexList)){
            selfRepeatRowIndexList.stream().forEach(rowIndex->{
@@ -2052,7 +2053,11 @@
                resultDataObjectDetailDO.setMsg(errorMap.getOrDefault(rowIndex,"") + ";关键属性与系统中的重复" );
                resultDataObjectDetailDOs.add(resultDataObjectDetailDO);
                */
                errorKeyMap.put(rowIndex, "关键属性与系统中的重复;" + errorMap.getOrDefault(rowIndex,""));
                Map<String, List<BaseModel>> indexTODataMap=keyResultVO.getIndexTODataMap();
                if(indexTODataMap.containsKey(rowIndex)){
                    List<BaseModel> baseModelList= indexTODataMap.get(rowIndex);
                }
                errorKeyMap.put(rowIndex, "关键属性与系统中的重复;" + errorKeyMap.getOrDefault(rowIndex,""));
            });
        }
        //校验属性是否正确错误信息
@@ -2688,7 +2693,7 @@
                return;
            }
            //final String[] sql = {"select count(*) from " + tableName + " t where 1 = 1 "};
            final String[] sql = {"select id from " + tableName + " t where 1 = 1 "};
            final String[] sql = {"select t.id from " + tableName + " t where 1 = 1 "};
            conditionMap.forEach((key, value) -> {
                if(StringUtils.isBlank(value)||value.equals(QueryOptionConstant.ISNULL)){
                    sql[0] += " and " + key + " is null ";
@@ -3775,7 +3780,7 @@
            if(!CollectionUtils.isEmpty(nullRowIndex)){
                String checkAttr = requiredAttrMap.values().stream().map(CodeClassifyTemplateAttrVO::getName).collect(Collectors.joining(","));
                nullRowIndex.stream().forEach(rowIndex->{
                    errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";校验规则不通过，有校验的属性为" + checkAttr);
                    errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";校验规则必填项不通过，如果有必填属性为空，则填【/】代替,有校验的属性为" + checkAttr);
                });
            }
        }

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java

@@ -1070,7 +1070,7 @@
                }
            });
        }catch (Throwable e){
            e.printStackTrace();;
            e.printStackTrace();
            msg="编码更改/状态更改/删除:"+e.getMessage();
          /*  XMLResultSystemVO XMLResultSystemVO=new XMLResultSystemVO();
            XMLResultSystemVO.setErrorid(errorid);
@@ -1254,7 +1254,7 @@
            issucess=true;
            resultData.setLibrary(libraryVo);
        }catch (Throwable e){
            e.printStackTrace();;
            e.printStackTrace();
            msg="查询分类失败:"+e.getMessage();
        }finally {
            resultData.setErrorid(errorid);
@@ -1473,7 +1473,7 @@
                msg = "接口参数：library æœªæŸ¥è¯¢åˆ°å¯¹åº”的库节点信息";
            }
        }catch (Throwable e){
            e.printStackTrace();;
            e.printStackTrace();
            msg="查询数据失败:"+e.getMessage();
        }finally {
            resultDataVO.setErrorid(errorid);
@@ -1925,7 +1925,7 @@
            issucess=true;
            resultClassifyRuleData.setLibrary(resultLibraryVO);
        }catch (Throwable e){
            e.printStackTrace();;
            e.printStackTrace();
            msg="查询分类失败:"+e.getMessage();
        }finally {
            resultClassifyRuleData.setErrorid(errorid);

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeButtonWrapper.java

@@ -38,7 +38,7 @@

    @Override
    public CodeButtonVO entityVO(CodeButton codebutton) {
        CodeButtonVO codebuttonVO = new CodeButtonVO();;
        CodeButtonVO codebuttonVO = new CodeButtonVO();
        BeanUtilForVCI.copyPropertiesIgnoreCase(codebutton,codebuttonVO);
        Objects.requireNonNull(codebuttonVO);
        codebuttonVO.setUsedpositiontypeText(DictCache.getValue("codeButtonPosition", codebutton.getUsedPositionType()));

 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MdmCountConfigController.java

@@ -30,5 +30,4 @@
        return countConfigService.saveMdmCountConfig(mdmCountConfigVO);
    }


}