提交版本

.idea/compiler.xml

@@ -7,9 +7,10 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="common" />
+        <module name="visualInventory" />
         <module name="logging" />
         <module name="system" />
+        <module name="common" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
@@ -38,6 +39,7 @@
       <module name="flowable-ui-task-frontend" target="1.8" />
       <module name="flowable-ui-task-logic" target="1.8" />
       <module name="flowable-ui-task-rest" target="1.8" />
+      <module name="stocktaking" target="17" />
       <module name="yxkLibraryIntegratedManage" target="17" />
     </bytecodeTargetLevel>
   </component>
@@ -47,7 +49,9 @@
       <module name="common" options="-parameters" />
       <module name="flowable" options="-parameters" />
       <module name="logging" options="-parameters" />
+      <module name="stocktaking" options="-parameters" />
       <module name="system" options="-parameters" />
+      <module name="visualInventory" options="-parameters" />
       <module name="yxkLibraryIntegratedManege" options="-parameters" />
     </option>
   </component>

.idea/encodings.xml

@@ -5,5 +5,6 @@
     <file url="file://$PROJECT_DIR$/logging/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/system/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/system/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/visualInventory/src/main/java" charset="UTF-8" />
   </component>
 </project>

.idea/misc.xml

@@ -12,6 +12,8 @@
         <option value="$PROJECT_DIR$/common/pom.xml" />
         <option value="$PROJECT_DIR$/logging/pom.xml" />
         <option value="$PROJECT_DIR$/flowable-ui/pom.xml" />
+        <option value="$PROJECT_DIR$/bookstore/pom.xml" />
+        <option value="$PROJECT_DIR$/visualInventory/pom.xml" />
       </list>
     </option>
     <option name="ignoredFiles">

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

common/pom.xml

@@ -52,6 +52,31 @@
             <version>3.1.1</version>
         </dependency>
 
+        <!-- 文件保存 -->
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+            <version>8.0.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.elasticsearch.client</groupId>
+            <artifactId>elasticsearch-rest-client</artifactId>
+            <version>7.15.2</version>
+        </dependency>
+        <dependency>
+            <groupId>co.elastic.clients</groupId>
+            <artifactId>elasticsearch-java</artifactId>
+            <version>8.12.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.elasticsearch.client</groupId>
+            <artifactId>elasticsearch-rest-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.elasticsearch.client</groupId>
+            <artifactId>elasticsearch-rest-client</artifactId>
+        </dependency>
+
 
     </dependencies>
 </project>

common/src/main/java/com/yxkLibraryIntegratedManage/config/ElasticSearchConfig.java

@@ -0,0 +1,80 @@
+package com.yxkLibraryIntegratedManage.config;
+
+import co.elastic.clients.elasticsearch.ElasticsearchClient;
+import co.elastic.clients.json.jackson.JacksonJsonpMapper;
+import co.elastic.clients.transport.ElasticsearchTransport;
+import co.elastic.clients.transport.rest_client.RestClientTransport;
+import org.apache.http.HttpHost;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
+import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestClientBuilder;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.util.StringUtils;
+
+@Configuration
+public class ElasticSearchConfig {
+
+    @Value("${elasticsearch.host}")
+    private String host;
+    @Value("${elasticsearch.port}")
+    private int port;
+    @Value("${elasticsearch.hosts}")
+    private String hosts;
+    @Value("${elasticsearch.username}")
+    private String username;
+    @Value("${elasticsearch.password}")
+    private String password;
+    @Value("${elasticsearch.apikey}")
+    private String apikey;
+
+    @Bean(name="elasticsearchClient")
+    public ElasticsearchClient elasticsearchClient(){
+        HttpHost[] httpHosts = toHttpHost();
+        final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+        credentialsProvider.setCredentials(
+                AuthScope.ANY, new UsernamePasswordCredentials(username, password));
+
+        RestClientBuilder builder = RestClient.builder(httpHosts);
+        builder.setRequestConfigCallback(
+                new RestClientBuilder.RequestConfigCallback() {
+                    @Override
+                    public RequestConfig.Builder customizeRequestConfig(
+                            RequestConfig.Builder requestConfigBuilder) {
+                        return requestConfigBuilder.setSocketTimeout(60000).setConnectTimeout(5000);
+                    }
+                });
+        builder.setHttpClientConfigCallback(new RestClientBuilder.HttpClientConfigCallback() {
+            @Override
+            public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpAsyncClientBuilder) {
+
+                return httpAsyncClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+            }
+        });
+        RestClient restClient = builder.build();
+        ElasticsearchTransport transport = new RestClientTransport(restClient,new JacksonJsonpMapper());
+        return new ElasticsearchClient(transport);
+    }
+
+    private HttpHost[] toHttpHost() {
+        if (!StringUtils.hasLength(hosts)) {
+            throw new RuntimeException("invalid elasticsearch configuration. elasticsearch.hosts不能为空！");
+        }
+        // 多个IP逗号隔开
+        String[] hostArray = hosts.split(",");
+        HttpHost[] httpHosts = new HttpHost[hostArray.length];
+        HttpHost httpHost;
+        for (int i = 0; i < hostArray.length; i++) {
+            String[] strings = hostArray[i].split(":");
+            httpHost = new HttpHost(strings[0], Integer.parseInt(strings[1]), "http");
+            httpHosts[i] = httpHost;
+        }
+        return httpHosts;
+    }
+}

common/src/main/java/com/yxkLibraryIntegratedManage/config/SwaggerConfig.java

@@ -65,7 +65,7 @@ public class SwaggerConfig {
 
     private ApiInfo apiInfo() {
         return new ApiInfoBuilder()
-                .description("智能库房综合管理系统")
+                .description("图书馆综合管理系统")
                 .title("接口文档")
                 .version("1.0")
                 .build();

common/src/main/java/com/yxkLibraryIntegratedManage/dto/EmployeeProperties.java

@@ -0,0 +1,60 @@
+package com.yxkLibraryIntegratedManage.dto;
+
+
+import com.yxkLibraryIntegratedManage.utils.FileUploader;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author XuZhen
+ * @Description: 配置文件参数.
+ * @ClassName: EmployeeProperties.
+ * @Date 2019-9-17 08:57:43
+ */
+@Component
+@ConfigurationProperties(prefix = "myemployee")
+public class EmployeeProperties {
+    private String accessKey;
+    private String secretKey;
+    private String linkurl;
+    private Integer linkport;
+
+    public String getAccessKey() {
+        return accessKey;
+    }
+
+    public void setAccessKey(String accessKey) {
+        this.accessKey = accessKey;
+    }
+
+    public String getSecretKey() {
+        return secretKey;
+    }
+
+    public void setSecretKey(String secretKey) {
+        this.secretKey = secretKey;
+    }
+
+    public String getLinkurl() {
+        return linkurl;
+    }
+
+    public void setLinkurl(String linkurl) {
+        this.linkurl = linkurl;
+    }
+
+    public Integer getLinkport() {
+        return linkport;
+    }
+
+    public void setLinkport(Integer linkport) {
+        this.linkport = linkport;
+    }
+
+    @Bean
+    public int initStatic() {
+        FileUploader.setProperties(this);
+        return 0;
+    }
+}

common/src/main/java/com/yxkLibraryIntegratedManage/dto/SortDTO.java

@@ -0,0 +1,14 @@
+package com.yxkLibraryIntegratedManage.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SortDTO {
+
+    private String id;
+
+    private Integer isSequence;
+
+}

common/src/main/java/com/yxkLibraryIntegratedManage/utils/BeanToMapConverter.java

@@ -0,0 +1,21 @@
+package com.yxkLibraryIntegratedManage.utils;
+
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.util.Map;
+
+public class BeanToMapConverter {
+    
+    private static final ObjectMapper objectMapper = new ObjectMapper();
+
+    public static Map<String,Object> convertToMap(Object obj){
+        try {
+            return objectMapper.convertValue(obj,Map.class);
+        }catch (Exception e){
+            e.printStackTrace();
+            return null;
+        }
+    }
+    
+}

common/src/main/java/com/yxkLibraryIntegratedManage/utils/ExcelUtil.java

@@ -1,10 +1,10 @@
 package com.yxkLibraryIntegratedManage.utils;
 
-import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -17,12 +17,67 @@ public class ExcelUtil {
     private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
     private static SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
+    /**
+     * 导出Excel
+     * @param sheetName sheet名称
+     * @param title 标题
+     * @param values 内容
+     * @param wb HSSFWorkbook对象
+     * @return
+     */
+    public static XSSFWorkbook getXSSFWorkbook(String sheetName,String []title,String [][]values, XSSFWorkbook wb){
+
+        // 第一步，创建一个HSSFWorkbook，对应一个Excel文件
+        if(wb == null){
+            wb = new XSSFWorkbook();
+        }
+
+        // 第二步，在workbook中添加一个sheet,对应Excel文件中的sheet
+        XSSFSheet sheet = wb.createSheet(sheetName);
+
+        // 第三步，在sheet中添加表头第0行,注意老版本poi对Excel的行数列数有限制
+        XSSFRow row = sheet.createRow(0);
+
+        // 第四步，创建单元格，并设置值表头 设置表头居中
+        XSSFCellStyle style = wb.createCellStyle();
+        style.setAlignment(HorizontalAlignment.CENTER); // 创建一个居中格式
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+
+        //声明列对象
+        XSSFCell cell = null;
+
+        //创建标题
+        for(int i=0;i<title.length;i++){
+            cell = row.createCell(i);
+            cell.setCellValue(title[i]);
+            cell.setCellStyle(style);
+        }
+
+        //创建内容
+        for(int i=0;i<values.length;i++){
+            row = sheet.createRow(i + 1);
+            for(int j=0;j<values[i].length;j++){
+                XSSFCell newCell = row.createCell(j);
+                //将内容按顺序赋给对应的列对象
+                newCell.setCellValue(values[i][j]);
+                newCell.setCellStyle(style);
+            }
+        }
 
-    public static XSSFWorkbook createUnifyExcel(String fileName,String[] mark,String[] title, List<Map<String,Object>> list){
+        //自适应单元格
+        for (int i = 0; i < sheet.getLastRowNum(); i++) {
+            sheet.autoSizeColumn(i);
+            sheet.setColumnWidth(i, sheet.getColumnWidth(i) * 17 / 10);
+        }
+
+        return wb;
+    }
+
+    public static XSSFWorkbook getXSSFWorkbook(String sheetName,String []title,String [][]values,String []title1,String [][]values1, XSSFWorkbook workbook){
         // 创建一个工作薄
-        XSSFWorkbook workbook = new XSSFWorkbook();
+        workbook = new XSSFWorkbook();
         // 创建一个工作表
-        XSSFSheet sheet = workbook.createSheet(fileName);
+        XSSFSheet sheet = workbook.createSheet(sheetName);
 
         // 设置表头字体格式
         XSSFFont headersFont = workbook.createFont();
@@ -52,56 +107,71 @@ public class ExcelUtil {
         textStyle.setBorderLeft(BorderStyle.THIN);
         textStyle.setBorderTop(BorderStyle.THIN);
         textStyle.setFont(dataSetFont);
-        textStyle.setDataFormat(49);
         // 数据内容对齐方式：居中
         textStyle.setAlignment(HorizontalAlignment.CENTER);
         textStyle.setVerticalAlignment(VerticalAlignment.CENTER);
 
-        XSSFCellStyle bodyStyle = workbook.createCellStyle();
-        bodyStyle.setFont(dataSetFont);
-        bodyStyle.setDataFormat(49);
-        // 数据内容对齐方式：居中
-        bodyStyle.setAlignment(HorizontalAlignment.CENTER);
-        bodyStyle.setVerticalAlignment(VerticalAlignment.CENTER);
-
-        //行
-        int index = 1;
-        XSSFRow fondsTitleRow = sheet.createRow(0);
-        for(int i = 0;i<title.length;i++){
-            XSSFCell cell = fondsTitleRow.createCell(i);
-            cell.setCellStyle(textStyle);
+        Integer rowIndex = 0;
+
+        // 第三步，在sheet中添加表头第0行,注意老版本poi对Excel的行数列数有限制
+        XSSFRow thisTitle = sheet.createRow(rowIndex);
+
+        //创建标题
+        for(int i=0;i<title.length;i++){
+            XSSFCell cell = thisTitle.createCell(i);
             cell.setCellValue(title[i]);
-            sheet.setDefaultColumnStyle(i,bodyStyle);
+            cell.setCellStyle(headersStyle);
         }
 
-        for(Map<String,Object> map : list){
-            XSSFRow fondsValueRow = sheet.createRow(index);
-            XSSFCell fondsValueCell0 = fondsValueRow.createCell(0);fondsValueCell0.setCellValue(index);fondsValueCell0.setCellStyle(textStyle);
-            int columnIndex = 1;
-            for(String t : mark){
-                XSSFCell fondsValueCell = fondsValueRow.createCell(columnIndex);fondsValueCell.setCellType(CellType.STRING);fondsValueCell.setCellValue(map.get(t)==null?"":map.get(t)+"");fondsValueCell.setCellStyle(textStyle);
-                columnIndex++;
+        rowIndex++;
+        //创建内容
+        for(int i=0;i<values.length;i++){
+            XSSFRow valueRow = sheet.createRow(rowIndex);
+            for(int j=0;j<values[i].length;j++){
+                XSSFCell newCell = valueRow.createCell(j);
+                //将内容按顺序赋给对应的列对象
+                newCell.setCellValue(values[i][j]);
+                newCell.setCellStyle(textStyle);
             }
-            index++;
+            rowIndex++;
+
+            XSSFRow sonTitleRow = sheet.createRow(rowIndex);
+            for(int t=0;t<title1.length;t++){
+                XSSFCell sonTitleCell = sonTitleRow.createCell(t);
+                sonTitleCell.setCellValue(title1[t]);
+                sonTitleCell.setCellStyle(headersStyle);
+            }
+            rowIndex++;
+            for(int v = 0;v<values1.length;v++){
+                XSSFRow sonValueRow = sheet.createRow(rowIndex);
+                for(int v1=0;v1<values1[v].length;v1++){
+                    XSSFCell sonValueCell = sonValueRow.createCell(v1);
+                    //将内容按顺序赋给对应的列对象
+                    sonValueCell.setCellValue(values1[v][v1]);
+                    sonValueCell.setCellStyle(textStyle);
+                }
+                rowIndex++;
+            }
+            rowIndex++;
         }
+
         //自适应单元格
         for (int i = 0; i < sheet.getLastRowNum(); i++) {
             sheet.autoSizeColumn(i);
             sheet.setColumnWidth(i, sheet.getColumnWidth(i) * 17 / 10);
         }
+
         return workbook;
     }
 
-    public static XSSFWorkbook createFourCheckExcel(String fileName,Map<String,Object> currentReportMap,List<Map<String,Object>> reportDetailsList){
+    public static XSSFWorkbook getTwoSheetXSSFWorkbook(String sheetName1,String sheetName2,String []title1,String []title2,String [][]values1,String [][]values2, XSSFWorkbook workbook){
         // 创建一个工作薄
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        // 创建一个工作表
-        XSSFSheet sheet = workbook.createSheet(fileName);
+        workbook = new XSSFWorkbook();
 
         // 设置表头字体格式
         XSSFFont headersFont = workbook.createFont();
         headersFont.setColor(XSSFFont.DEFAULT_FONT_COLOR);
-        headersFont.setFontHeightInPoints((short) 26);
+        headersFont.setFontHeightInPoints((short) 14);
         headersFont.setBold(true);
 
         // 设置正文字体格式
@@ -119,20 +189,6 @@ public class ExcelUtil {
         // 表头内容对齐方式：居中
         headersStyle.setAlignment(HorizontalAlignment.CENTER);
 
-        // 创建标题文本样式
-        XSSFCellStyle titleTextStyle = workbook.createCellStyle();
-        titleTextStyle.setBorderBottom(BorderStyle.THIN);
-        titleTextStyle.setBorderRight(BorderStyle.THIN);
-        titleTextStyle.setBorderLeft(BorderStyle.THIN);
-        titleTextStyle.setBorderTop(BorderStyle.THIN);
-        titleTextStyle.setFont(dataSetFont);
-        titleTextStyle.setDataFormat(49);
-        // 数据内容对齐方式：居中
-        titleTextStyle.setAlignment(HorizontalAlignment.CENTER);
-        titleTextStyle.setVerticalAlignment(VerticalAlignment.CENTER);
-        titleTextStyle.setFillForegroundColor(IndexedColors.GREY_40_PERCENT.getIndex()); // 设置前景颜色为黄色
-        titleTextStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND); // 设置前景填充样式
-
         // 创建文本样式
         XSSFCellStyle textStyle = workbook.createCellStyle();
         textStyle.setBorderBottom(BorderStyle.THIN);
@@ -140,263 +196,85 @@ public class ExcelUtil {
         textStyle.setBorderLeft(BorderStyle.THIN);
         textStyle.setBorderTop(BorderStyle.THIN);
         textStyle.setFont(dataSetFont);
-        textStyle.setDataFormat(49);
         // 数据内容对齐方式：居中
         textStyle.setAlignment(HorizontalAlignment.CENTER);
         textStyle.setVerticalAlignment(VerticalAlignment.CENTER);
 
-        XSSFCellStyle bodyStyle = workbook.createCellStyle();
-        bodyStyle.setFont(dataSetFont);
-        bodyStyle.setDataFormat(49);
-        // 数据内容对齐方式：居中
-        bodyStyle.setAlignment(HorizontalAlignment.CENTER);
-        bodyStyle.setVerticalAlignment(VerticalAlignment.CENTER);
-
-        //合并单元格
-        sheet.addMergedRegion(new CellRangeAddress(0,0,0,3));
-        sheet.addMergedRegion(new CellRangeAddress(5,5,1,3));
-
-        XSSFRow fondsTitleRow = sheet.createRow(0);
-        XSSFCell row0cell = fondsTitleRow.createCell(0);
-        row0cell.setCellValue("四性检测结果");
-        row0cell.setCellStyle(headersStyle);
-
-        XSSFRow row1 = sheet.createRow(1);
-        XSSFCell row1cell1 = row1.createCell(0);
-        row1cell1.setCellValue("检测范围");
-        row1cell1.setCellStyle(titleTextStyle);
-        XSSFCell row1cell2 = row1.createCell(1);
-        row1cell2.setCellValue("真实性、完整性、可用性、安全性");
-        row1cell2.setCellStyle(textStyle);
-        XSSFCell row1cell3 = row1.createCell(2);
-        row1cell3.setCellValue("检测结论");
-        row1cell3.setCellStyle(titleTextStyle);
-        XSSFCell row1cell4 = row1.createCell(3);
-        row1cell4.setCellValue((Integer)currentReportMap.get("failNum") == 0 ? "通过" : "不通过");
-        row1cell4.setCellStyle(textStyle);
-
-        XSSFRow row2 = sheet.createRow(2);
-        XSSFCell row2cell1 = row2.createCell(0);
-        row2cell1.setCellValue("检测耗时");
-        row2cell1.setCellStyle(titleTextStyle);
-        XSSFCell row2cell2 = row2.createCell(1);
-        row2cell2.setCellValue(currentReportMap.get("checkTime")+"ms");
-        row2cell2.setCellStyle(textStyle);
-        XSSFCell row2cell3 = row2.createCell(2);
-        row2cell3.setCellValue("检测总数");
-        row2cell3.setCellStyle(titleTextStyle);
-        XSSFCell row2cell4 = row2.createCell(3);
-        row2cell4.setCellValue(currentReportMap.get("checkNum")==null?"":currentReportMap.get("checkNum")+"");
-        row2cell4.setCellStyle(textStyle);
-
-        XSSFRow row3 = sheet.createRow(3);
-        XSSFCell row3cell1 = row3.createCell(0);
-        row3cell1.setCellValue("所属门类");
-        row3cell1.setCellStyle(titleTextStyle);
-        XSSFCell row3cell2 = row3.createCell(1);
-        row3cell2.setCellValue(currentReportMap.get("categoryName")+"");
-        row3cell2.setCellStyle(textStyle);
-        XSSFCell row3cell3 = row3.createCell(2);
-        row3cell3.setCellValue("所在级别");
-        row3cell3.setCellStyle(titleTextStyle);
-        XSSFCell row3cell4 = row3.createCell(3);
-        row3cell4.setCellValue("2".equals(currentReportMap.get("categoryLevel")+"")?"案卷级":"文件级");
-        row3cell4.setCellStyle(textStyle);
-
-        XSSFRow row4 = sheet.createRow(4);
-        XSSFCell row4cell1 = row4.createCell(0);
-        row4cell1.setCellValue("档案档号");
-        row4cell1.setCellStyle(titleTextStyle);
-        XSSFCell row4cell2 = row4.createCell(1);
-        row4cell2.setCellValue(currentReportMap.get("archivesNo")+"");
-        row4cell2.setCellStyle(textStyle);
-        XSSFCell row4cell3 = row4.createCell(2);
-        row4cell3.setCellValue("档案题名");
-        row4cell3.setCellStyle(titleTextStyle);
-        XSSFCell row4cell4 = row4.createCell(3);
-        row4cell4.setCellValue(currentReportMap.get("archivesName")+"");
-        row4cell4.setCellStyle(textStyle);
-
-        XSSFRow row5 = sheet.createRow(5);
-        XSSFCell row5cell1 = row5.createCell(0);
-        row5cell1.setCellValue("检测详情");
-        row5cell1.setCellStyle(titleTextStyle);
-        XSSFCell row5cell2 = row5.createCell(1);
-        row5cell2.setCellValue("总共检测 "+currentReportMap.get("checkNum")+" 项；通过 "+currentReportMap.get("passNum")+" 项；未通过 "+currentReportMap.get("failNum")+" 项");
-        row5cell2.setCellStyle(textStyle);
-        XSSFCell row5cell3 = row5.createCell(2);
-        row5cell3.setCellValue("");
-        row5cell3.setCellStyle(textStyle);
-        XSSFCell row5cell4 = row5.createCell(3);
-        row5cell4.setCellValue("");
-        row5cell4.setCellStyle(textStyle);
-
-        //行
-        int index = 6;
-
-        for(int k=1;k<=4;k++){
-            index++;
-            XSSFRow row7 = sheet.createRow(index);
-            XSSFCell row7cell1 = row7.createCell(0);
-            row7cell1.setCellValue("序号");
-            row7cell1.setCellStyle(titleTextStyle);
-            XSSFCell row7cell2 = row7.createCell(1);
-            row7cell2.setCellValue("一级分类");
-            row7cell2.setCellStyle(titleTextStyle);
-            XSSFCell row7cell3 = row7.createCell(2);
-            row7cell3.setCellValue("二级分类");
-            row7cell3.setCellStyle(titleTextStyle);
-            XSSFCell row7cell4 = row7.createCell(3);
-            row7cell4.setCellValue("编号");
-            row7cell4.setCellStyle(titleTextStyle);
-            XSSFCell row7cell5 = row7.createCell(4);
-            row7cell5.setCellValue("检测项目");
-            row7cell5.setCellStyle(titleTextStyle);
-            XSSFCell row7cell6 = row7.createCell(5);
-            row7cell6.setCellValue("检测目的");
-            row7cell6.setCellStyle(titleTextStyle);
-            XSSFCell row7cell7 = row7.createCell(6);
-            row7cell7.setCellValue("检测对象");
-            row7cell7.setCellStyle(titleTextStyle);
-            XSSFCell row7cell8 = row7.createCell(7);
-            row7cell8.setCellValue("检测依据和方法");
-            row7cell8.setCellStyle(titleTextStyle);
-            XSSFCell row7cell9 = row7.createCell(8);
-            row7cell9.setCellValue("检测结果");
-            row7cell9.setCellStyle(titleTextStyle);
-            XSSFCell row7cell10 = row7.createCell(9);
-            row7cell10.setCellValue("检测详情");
-            row7cell10.setCellStyle(titleTextStyle);
-            index++;
-
-            int this1 = 1;
-
-            for(Map<String,Object> map:reportDetailsList){
-                String detectionCode = map.get("detectionCode")+"";
-                if(detectionCode.indexOf("GD-"+k)>-1){
-                    XSSFRow row = sheet.createRow(index);
-                    XSSFCell cell1 = row.createCell(0);
-                    cell1.setCellValue(this1);
-                    cell1.setCellStyle(textStyle);
-                    XSSFCell cell2 = row.createCell(1);
-                    cell2.setCellValue(map.get("primaryClassId")+"");
-                    cell2.setCellStyle(textStyle);
-                    XSSFCell cell3 = row.createCell(2);
-                    cell3.setCellValue(map.get("secondaryClassId")+"");
-                    cell3.setCellStyle(textStyle);
-                    XSSFCell cell4 = row.createCell(3);
-                    cell4.setCellValue(map.get("detectionCode")+"");
-                    cell4.setCellStyle(textStyle);
-                    XSSFCell cell5 = row.createCell(4);
-                    cell5.setCellValue(map.get("detectionProject")+"");
-                    cell5.setCellStyle(textStyle);
-                    XSSFCell cell6 = row.createCell(5);
-                    cell6.setCellValue(map.get("detectionObjective")+"");
-                    cell6.setCellStyle(textStyle);
-                    XSSFCell cell7 = row.createCell(6);
-                    cell7.setCellValue(map.get("detectionObject")+"");
-                    cell7.setCellStyle(textStyle);
-                    XSSFCell cell8 = row.createCell(7);
-                    cell8.setCellValue(map.get("detectionAccording")+"");
-                    cell8.setCellStyle(textStyle);
-                    XSSFCell cell9 = row.createCell(8);
-                    cell9.setCellValue(map.get("checkResult")+"");
-                    cell9.setCellStyle(textStyle);
-                    XSSFCell cell10 = row.createCell(9);
-                    cell10.setCellValue(map.get("checkDetails")==null?"":map.get("checkDetails")+"");
-                    cell10.setCellStyle(textStyle);
-
-                    index++;
-                    this1++;
-                }
-            }
-        }
-
-//        for(Map<String,Object> map : list){
-//            XSSFRow fondsValueRow = sheet.createRow(index);
-//            XSSFCell fondsValueCell0 = fondsValueRow.createCell(0);fondsValueCell0.setCellValue(index);fondsValueCell0.setCellStyle(textStyle);
-//            int columnIndex = 1;
-//            for(String t : mark){
-//                XSSFCell fondsValueCell = fondsValueRow.createCell(columnIndex);fondsValueCell.setCellType(CellType.STRING);fondsValueCell.setCellValue(map.get(t)==null?"":map.get(t)+"");fondsValueCell.setCellStyle(textStyle);
-//                columnIndex++;
-//            }
-//            index++;
-//        }
+        // 创建第一个工作表
+        XSSFSheet sheet1 = workbook.createSheet(sheetName1);
+        Integer rowIndex1 = 0;
+        XSSFRow thisTitle1 = sheet1.createRow(rowIndex1);
 
-        //自适应单元格
-        for (int i = 0; i < sheet.getLastRowNum(); i++) {
-            sheet.autoSizeColumn(i);
-            sheet.setColumnWidth(i, sheet.getColumnWidth(i) * 17 / 10);
+        //创建标题
+        for(int i=0;i<title1.length;i++){
+            XSSFCell cell = thisTitle1.createCell(i);
+            cell.setCellValue(title1[i]);
+            cell.setCellStyle(headersStyle);
         }
-        return workbook;
-    }
 
-    /**
-     * 导出Excel
-     * @param sheetName sheet名称
-     * @param title 标题
-     * @param values 内容
-     * @param wb HSSFWorkbook对象
-     * @return
-     */
-    public static HSSFWorkbook getHSSFWorkbook(String sheetName,String []title,String [][]values, HSSFWorkbook wb){
+        rowIndex1++;
 
-        // 第一步，创建一个HSSFWorkbook，对应一个Excel文件
-        if(wb == null){
-            wb = new HSSFWorkbook();
+        //创建内容
+        for(int i=0;i<values1.length;i++){
+            XSSFRow row = sheet1.createRow(i + 1);
+            for(int j=0;j<values1[i].length;j++){
+                XSSFCell newCell = row.createCell(j);
+                //将内容按顺序赋给对应的列对象
+                newCell.setCellValue(values1[i][j]);
+                newCell.setCellStyle(textStyle);
+            }
         }
 
-        // 第二步，在workbook中添加一个sheet,对应Excel文件中的sheet
-        HSSFSheet sheet = wb.createSheet(sheetName);
-
-        // 第三步，在sheet中添加表头第0行,注意老版本poi对Excel的行数列数有限制
-        HSSFRow row = sheet.createRow(0);
-
-        // 第四步，创建单元格，并设置值表头 设置表头居中
-        HSSFCellStyle style = wb.createCellStyle();
-        style.setAlignment(HorizontalAlignment.CENTER); // 创建一个居中格式
-        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        //自适应单元格
+        for (int i = 0; i < sheet1.getLastRowNum(); i++) {
+            sheet1.autoSizeColumn(i);
+            sheet1.setColumnWidth(i, sheet1.getColumnWidth(i) * 17 / 10);
+        }
 
-        //声明列对象
-        HSSFCell cell = null;
+        // 创建第二个工作表
+        XSSFSheet sheet2 = workbook.createSheet(sheetName2);
+        Integer rowIndex2 = 0;
+        XSSFRow thisTitle2 = sheet2.createRow(rowIndex2);
 
         //创建标题
-        for(int i=0;i<title.length;i++){
-            cell = row.createCell(i);
-            cell.setCellValue(title[i]);
-            cell.setCellStyle(style);
+        for(int i=0;i<title1.length;i++){
+            XSSFCell cell = thisTitle2.createCell(i);
+            cell.setCellValue(title2[i]);
+            cell.setCellStyle(headersStyle);
         }
 
+        rowIndex2++;
+
         //创建内容
-        for(int i=0;i<values.length;i++){
-            row = sheet.createRow(i + 1);
-            for(int j=0;j<values[i].length;j++){
-                HSSFCell newCell = row.createCell(j);
+        for(int i=0;i<values2.length;i++){
+            XSSFRow row = sheet2.createRow(i + 1);
+            for(int j=0;j<values2[i].length;j++){
+                XSSFCell newCell = row.createCell(j);
                 //将内容按顺序赋给对应的列对象
-                newCell.setCellValue(values[i][j]);
-                newCell.setCellStyle(style);
+                newCell.setCellValue(values2[i][j]);
+                newCell.setCellStyle(textStyle);
             }
         }
-        return wb;
-    }
 
+        //自适应单元格
+        for (int i = 0; i < sheet2.getLastRowNum(); i++) {
+            sheet2.autoSizeColumn(i);
+            sheet2.setColumnWidth(i, sheet2.getColumnWidth(i) * 17 / 10);
+        }
+
+        return workbook;
+    }
 
 
     //发送响应流方法
-    public static void setResponseHeader(HttpServletResponse response, String fileName) {
+    public static void setResponseHeader(HttpServletRequest request, HttpServletResponse response, String fileName) {
+
         try {
-            try {
-                fileName = new String(fileName.getBytes(),"UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-            response.setContentType("application/octet-stream;charset=UTF-8");
-            response.setHeader("Content-Disposition", "attachment;filename="+ URLEncoder.encode(fileName,"utf-8")+".xlsx");
-            response.addHeader("Pargam", "no-cache");
-            response.addHeader("Cache-Control", "no-cache");
-        } catch (Exception ex) {
-            ex.printStackTrace();
+            response.setCharacterEncoding(request.getCharacterEncoding());
+            response.setContentType("application/octet-stream");
+            response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(fileName,request.getCharacterEncoding())+".xlsx");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
         }
     }
 }

common/src/main/java/com/yxkLibraryIntegratedManage/utils/FileUploader.java

@@ -0,0 +1,177 @@
+package com.yxkLibraryIntegratedManage.utils;
+
+import com.yxkLibraryIntegratedManage.dto.EmployeeProperties;
+import io.minio.*;
+import io.minio.errors.MinioException;
+import io.minio.http.Method;
+import io.minio.messages.Item;
+import org.apache.commons.compress.utils.IOUtils;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+public class FileUploader {
+    private static EmployeeProperties employee;
+
+    public static void setProperties(EmployeeProperties employee) {
+        FileUploader.employee = employee;
+    }
+
+
+    /**
+     * @param objectName  存储桶中的对象名称
+     * @param stream      流上传
+     * @param contentType 流的内容类型 application/octet-stream
+     */
+    public static boolean addImage(String bucketName, String objectName, InputStream stream, String contentType) {
+        boolean flag = false;
+        String url = "http://"+employee.getLinkurl()+":"+employee.getLinkport();
+        try {
+            MinioClient minioClient = MinioClient.builder().endpoint(url)
+                    .endpoint(employee.getLinkurl(),employee.getLinkport(),false)
+                    .credentials(employee.getAccessKey(),employee.getSecretKey())
+                    .build();
+            boolean found = minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucketName).build());
+            if (!found) {
+                minioClient.makeBucket(MakeBucketArgs.builder()
+                        .bucket(bucketName)
+                        .build());
+            }
+            minioClient.putObject(
+                    PutObjectArgs.builder()
+                            .bucket(bucketName) //上传到指定桶里面
+                            .object(objectName)//文件在minio中存储的名字
+                            //p1:上传的文件流；p2:上传文件总大小；p3：上传的分片大小
+                            .stream(stream, stream.available(), -1) //上传分片文件流大小，如果分文件上传可以采用这种形式
+                            .contentType(contentType) //文件的类型
+                            .build());
+            flag = true;
+        } catch (MinioException e) {
+            e.printStackTrace();
+            flag = false;
+        } catch (Exception e) {
+            e.printStackTrace();
+            flag = false;
+        }
+        return flag;
+    }
+
+    /**
+     * 根据bucketName和objectName获取图片信息
+     *
+     * @return
+     */
+    public static byte[] getImage(String bucketName, String objectName) {
+        byte[] data = null;
+        String url = "http://"+employee.getLinkurl()+":"+employee.getLinkport();
+        try {
+            MinioClient minioClient = MinioClient.builder().endpoint(url)
+                    .endpoint(employee.getLinkurl(),employee.getLinkport(),false)
+                    .credentials(employee.getAccessKey(),employee.getSecretKey())
+                    .build();
+            InputStream stream = minioClient.getObject(
+                    GetObjectArgs.builder()
+                            .bucket(bucketName)
+                            .object(objectName).build());
+            byte[] buf = new byte[1024];
+            int bytesRead;
+            ByteArrayOutputStream bao = new ByteArrayOutputStream();
+            while ((bytesRead = stream.read(buf, 0, buf.length)) >= 0) {
+                bao.write(buf, 0, bytesRead);
+            }
+            // Close the input stream.
+            stream.close();
+            data = bao.toByteArray();
+        } catch (MinioException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return data;
+    }
+
+    public static ByteArrayOutputStream updateMinIOImages(String bucketName,List<String> objectNames){
+        String url = "http://"+employee.getLinkurl()+":"+employee.getLinkport();
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        ZipOutputStream zos = new ZipOutputStream(baos);
+        try {
+            MinioClient minioClient = MinioClient.builder().endpoint(url)
+                    .endpoint(employee.getLinkurl(),employee.getLinkport(),false)
+                    .credentials(employee.getAccessKey(),employee.getSecretKey())
+                    .build();
+            for (String objectName : objectNames) {
+                try {
+                    InputStream stream = minioClient.getObject(
+                            GetObjectArgs.builder()
+                                    .bucket(bucketName)
+                                    .object(objectName).build());
+                    ZipEntry zipEntry = new ZipEntry(objectName);
+                    zos.putNextEntry(zipEntry);
+                    IOUtils.copy(stream, zos);
+                    zos.closeEntry();
+                }catch (Exception e) {
+                    System.out.println("Error downloading object " + objectName + ": " + e.getMessage());
+                }
+            }
+            zos.close();
+        } catch (IOException e) {
+            System.out.println("Error creating zip: " + e.getMessage());
+        }
+        return baos;
+    }
+
+
+    /**
+     * 根据bucketName和objectName获取图片路径
+     *
+     * @return
+     */
+    public static String getImageUrl(String bucketName, String objectName) {
+        String imgUrl = "";
+        String url = "http://"+employee.getLinkurl()+":"+employee.getLinkport();
+        try {
+            MinioClient minioClient = MinioClient.builder().endpoint(url)
+                    .endpoint(employee.getLinkurl(),employee.getLinkport(),false)
+                    .credentials(employee.getAccessKey(),employee.getSecretKey())
+                    .build();
+            imgUrl = minioClient.getPresignedObjectUrl(
+                    GetPresignedObjectUrlArgs.builder()
+                            .method(Method.GET)
+                            .bucket(bucketName)
+                            .object(objectName)
+                            .expiry(1, TimeUnit.HOURS)
+                            .build()
+            );
+        } catch (MinioException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return imgUrl;
+    }
+
+    /**
+     * 根据bucketName和objectName删除图片信息
+     */
+    public static void deleteImage(String bucketName, String objectName) {
+        String url = "http://"+employee.getLinkurl()+":"+employee.getLinkport();
+        try {
+            MinioClient minioClient = MinioClient.builder().endpoint(url)
+                    .endpoint(employee.getLinkurl(),employee.getLinkport(),false)
+                    .credentials(employee.getAccessKey(),employee.getSecretKey())
+                    .build();
+            minioClient.removeObject(RemoveObjectArgs.builder().bucket(bucketName).object(objectName).build());
+        } catch (MinioException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}

common/src/main/java/com/yxkLibraryIntegratedManage/utils/StringUtils.java

@@ -50,6 +50,16 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
         });
     }
 
+    public static boolean areEqual(String str1, String str2) {
+        if (str1 == null && str2 == null) {
+            return true;
+        } else if (str1 == null || str2 == null) {
+            return false;
+        } else {
+            return str1.equals(str2);
+        }
+    }
+
     /**
      * 驼峰命名法工具
      *

common/target/maven-archiver/pom.properties

@@ -0,0 +1,3 @@
+artifactId=common
+groupId=com.yxkLibraryIntegratedManage
+version=1.0

common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,75 @@
+com\yxkLibraryIntegratedManage\base\BaseEntity.class
+com\yxkLibraryIntegratedManage\config\SwaggerConfig.class
+com\yxkLibraryIntegratedManage\utils\enums\RequestMethodEnum.class
+com\yxkLibraryIntegratedManage\utils\SecurityUtils.class
+com\yxkLibraryIntegratedManage\exception\BaseException.class
+com\yxkLibraryIntegratedManage\utils\StringUtils.class
+com\yxkLibraryIntegratedManage\exception\BadConfigurationException.class
+com\yxkLibraryIntegratedManage\utils\RedisUtils.class
+com\yxkLibraryIntegratedManage\config\FastJsonRedisSerializer.class
+com\yxkLibraryIntegratedManage\config\WebMvcConfig.class
+com\yxkLibraryIntegratedManage\utils\enums\DataStatusEnum.class
+com\yxkLibraryIntegratedManage\utils\CacheKey.class
+com\yxkLibraryIntegratedManage\utils\EncryptUtils.class
+com\yxkLibraryIntegratedManage\base\BaseDTO.class
+com\yxkLibraryIntegratedManage\annotaion\DataPermission.class
+com\yxkLibraryIntegratedManage\utils\CallBack.class
+com\yxkLibraryIntegratedManage\utils\QueryHelp$1.class
+com\yxkLibraryIntegratedManage\config\RedisConfig$1.class
+com\yxkLibraryIntegratedManage\config\FileProperties.class
+com\yxkLibraryIntegratedManage\utils\ChinesePinyinUtil.class
+com\yxkLibraryIntegratedManage\utils\HttpUtils$1.class
+com\yxkLibraryIntegratedManage\config\ElasticSearchConfig.class
+com\yxkLibraryIntegratedManage\dto\EmployeeProperties.class
+com\yxkLibraryIntegratedManage\config\AuditorConfig.class
+com\yxkLibraryIntegratedManage\utils\PageUtil.class
+com\yxkLibraryIntegratedManage\utils\RsaUtils.class
+com\yxkLibraryIntegratedManage\config\YsPermissionConfig.class
+com\yxkLibraryIntegratedManage\utils\DataStatusConst.class
+com\yxkLibraryIntegratedManage\utils\MessageUtils.class
+com\yxkLibraryIntegratedManage\config\SwaggerDataConfig.class
+com\yxkLibraryIntegratedManage\utils\FileUtil.class
+com\yxkLibraryIntegratedManage\utils\BeanToMapConverter.class
+com\yxkLibraryIntegratedManage\utils\enums\ResponseStatus.class
+com\yxkLibraryIntegratedManage\config\SwaggerDataConfig$1.class
+com\yxkLibraryIntegratedManage\utils\CloseUtil.class
+com\yxkLibraryIntegratedManage\utils\ExcelUtil.class
+com\yxkLibraryIntegratedManage\annotaion\Query$Type.class
+com\yxkLibraryIntegratedManage\dto\SortDTO.class
+com\yxkLibraryIntegratedManage\annotaion\rest\AnonymousGetMapping.class
+com\yxkLibraryIntegratedManage\utils\HttpServletUtil.class
+com\yxkLibraryIntegratedManage\annotaion\Query$Join.class
+com\yxkLibraryIntegratedManage\utils\IpUtils.class
+com\yxkLibraryIntegratedManage\utils\NanoIdUtils.class
+com\yxkLibraryIntegratedManage\utils\ValidationUtil.class
+com\yxkLibraryIntegratedManage\config\FileProperties$YsPath.class
+com\yxkLibraryIntegratedManage\utils\SpringUtils.class
+com\yxkLibraryIntegratedManage\utils\AdminConstant.class
+com\yxkLibraryIntegratedManage\config\RedisConfig.class
+com\yxkLibraryIntegratedManage\config\RsaProperties.class
+com\yxkLibraryIntegratedManage\utils\SpringContextHolder.class
+com\yxkLibraryIntegratedManage\base\BaseMapper.class
+com\yxkLibraryIntegratedManage\config\SwaggerDataConfig$Page.class
+com\yxkLibraryIntegratedManage\annotaion\rest\AnonymousPutMapping.class
+com\yxkLibraryIntegratedManage\config\StringRedisSerializer.class
+com\yxkLibraryIntegratedManage\utils\QueryHelp.class
+com\yxkLibraryIntegratedManage\config\ElasticSearchConfig$1.class
+com\yxkLibraryIntegratedManage\utils\RequestHolder.class
+com\yxkLibraryIntegratedManage\utils\enums\DataScopeEnum.class
+com\yxkLibraryIntegratedManage\utils\ApiResponse.class
+com\yxkLibraryIntegratedManage\config\ElasticSearchConfig$2.class
+com\yxkLibraryIntegratedManage\utils\ThrowableUtil.class
+com\yxkLibraryIntegratedManage\utils\HttpUtils.class
+com\yxkLibraryIntegratedManage\utils\RsaUtils$RsaKeyPair.class
+com\yxkLibraryIntegratedManage\annotaion\Query.class
+com\yxkLibraryIntegratedManage\utils\FileUploader.class
+com\yxkLibraryIntegratedManage\annotaion\rest\AnonymousPostMapping.class
+com\yxkLibraryIntegratedManage\annotaion\AnonymousAccess.class
+com\yxkLibraryIntegratedManage\base\BaseEntity$Update.class
+com\yxkLibraryIntegratedManage\utils\DateUtils.class
+com\yxkLibraryIntegratedManage\exception\hander\GlobalExceptionHandler.class
+com\yxkLibraryIntegratedManage\utils\FileCopyUtil.class
+com\yxkLibraryIntegratedManage\annotaion\rest\AnonymousDeleteMapping.class
+com\yxkLibraryIntegratedManage\base\BaseEntity$Create.class
+com\yxkLibraryIntegratedManage\utils\PageSort.class
+com\yxkLibraryIntegratedManage\utils\AdminConstant$Url.class

common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,58 @@
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\RsaUtils.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\enums\ResponseStatus.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\AdminConstant.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\ExcelUtil.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\base\BaseDTO.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\dto\SortDTO.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\CloseUtil.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\base\BaseEntity.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\annotaion\AnonymousAccess.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\config\FileProperties.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\HttpServletUtil.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\exception\BadConfigurationException.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\RedisUtils.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\config\RsaProperties.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\enums\RequestMethodEnum.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\enums\DataScopeEnum.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\NanoIdUtils.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\PageSort.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\annotaion\rest\AnonymousDeleteMapping.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\SpringUtils.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\FileUtil.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\ApiResponse.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\CallBack.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\config\YsPermissionConfig.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\SpringContextHolder.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\SecurityUtils.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\StringUtils.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\QueryHelp.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\DataStatusConst.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\ChinesePinyinUtil.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\ValidationUtil.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\DateUtils.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\RequestHolder.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\MessageUtils.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\BeanToMapConverter.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\CacheKey.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\annotaion\rest\AnonymousPutMapping.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\PageUtil.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\annotaion\rest\AnonymousGetMapping.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\ThrowableUtil.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\FileUploader.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\config\AuditorConfig.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\config\SwaggerConfig.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\annotaion\rest\AnonymousPostMapping.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\base\BaseMapper.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\config\ElasticSearchConfig.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\config\RedisConfig.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\dto\EmployeeProperties.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\annotaion\DataPermission.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\config\WebMvcConfig.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\HttpUtils.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\annotaion\Query.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\exception\BaseException.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\enums\DataStatusEnum.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\EncryptUtils.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\exception\hander\GlobalExceptionHandler.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\FileCopyUtil.java
+D:\backstage\yxkLibraryIntegratedManage\common\src\main\java\com\yxkLibraryIntegratedManage\utils\IpUtils.java

logging/src/main/java/com/yxkLibraryIntegratedManage/repository/LoginLogRepository.java

@@ -13,7 +13,9 @@ import java.util.Map;
 public interface LoginLogRepository extends JpaRepository<LoginLog, String>, JpaSpecificationExecutor<LoginLog> {
 
     @Query(nativeQuery = true,
-            countQuery = "select count(1) from login_log t " +
+            countQuery = "select count(1) from login_log t left join sys_user u on t.account = u.username " +
+                    "left join sys_depts d on u.dept_id = d.depts_id " +
+                    "left join sys_fonds f on d.fonds_id = f.fonds_id " +
                     "where if(?1 is null,1=1,t.username like ?1) " +
                     "and if(?2 is null,1=1,t.det like ?2) " +
                     "and if(?3 is null,1=1,t.account like ?3) " +