将his库的xml打包到外面进行file扫描测试

collect-sdry/pom.xml

@@ -11,8 +11,6 @@
     <url>http://maven.apache.org</url>
 
     <dependencies>
-
-
         <dependency>
             <groupId>com.docus</groupId>
             <artifactId>common-collect</artifactId>
@@ -20,6 +18,7 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
+
     <build>
         <resources>
             <resource>
@@ -132,8 +131,6 @@
                             <outputDirectory>${project.build.directory}/dataConfig</outputDirectory>
                         </configuration>
                     </execution>
-
-
                 </executions>
             </plugin>
             <!-- 打jar包时忽略配置文件 -->

collect-sdry/src/main/resources/bootstrap.yml

@@ -59,7 +59,7 @@ mybatis-plus:
     db-config:
       field-strategy: NOT_EMPTY
       db-type: MYSQL
-  mapper-locations: classpath*:/mapper/*Mapper.xml
+  mapper-locations: classpath*:/mapper/*Mapper.xml,file:/his-mapper/*Mapper.xml
   type-enums-package: com.docus.server.collect.web.enums
 xxl:
   job:

collect-sdry/src/main/resources/logback.xml

@@ -49,7 +49,7 @@
 
 
     <springProfile name="dev">
-        <root level="INFO">
+        <root level="debug">
             <appender-ref ref="console"/>
         </root>
 

his-sysem/pom.xml

@@ -25,16 +25,56 @@
     </dependencies>
 
     <build>
-        <resources>
+        <!--        <resources>-->
-            <resource>
+        <!--            <resource>-->
-                <directory>src/main/java</directory>
+        <!--                <directory>src/main/java</directory>-->
-                <includes>
+        <!--                <includes>-->
-                    <include>**/*.xml</include>
+        <!--                    <include>**/*.xml</include>-->
-                </includes>
+        <!--                </includes>-->
-            </resource>
+        <!--            </resource>-->
-            <resource>
+        <!--            <resource>-->
-                <directory>src/main/resources</directory>
+        <!--                <directory>src/main/resources</directory>-->
-            </resource>
+        <!--            </resource>-->
-        </resources>
+        <!--        </resources>-->
+
+        <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources/mapper</directory>
+                                    <includes>
+                                        <include>**/*.*</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                            <outputDirectory>../collect-sdry/target/collect-sdry/his-mapper</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.0</version>
+                <configuration>
+                    <excludes>
+                        <exclude>**/*.xml</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 </project>

his-sysem/src/main/java/com/docus/server/his/common/DSKeyConstants.java

@@ -0,0 +1,11 @@
+package com.docus.server.his.common;
+
+/**
+ * @author linrf
+ * @date 2023/6/9 11:19
+ */
+public class DSKeyConstants {
+
+    public static final String DS_KEY = "his";
+
+}

his-sysem/src/main/java/com/docus/server/his/infrastructure/HisSysDao.java

@@ -1,5 +1,6 @@
 package com.docus.server.his.infrastructure;
 
+import com.docus.core.util.json.JSON;
 import com.docus.server.his.infrastructure.mapper.HisDeptMapper;
 import com.docus.server.his.infrastructure.mapper.HisTBasicMapper;
 import com.docus.server.his.infrastructure.mapper.HisUserMapper;
@@ -22,7 +23,11 @@ public class HisSysDao {
 
 
     public List<DeptDTO> getDeptListView(Date startDate, Date endDate, int pageNum, int pageSize) {
-        return hisDeptMapper.getDeptListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+        System.out.println("getDeptListView" + startDate + endDate + pageNum + pageSize);
+        System.out.println("hisDeptMapper" + hisDeptMapper);
+        List<DeptDTO> deptListView = hisDeptMapper.getDeptListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+        System.out.println(JSON.toJSON(deptListView));
+        return deptListView;
     }
 
 

his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisDeptMapper.java

@@ -1,6 +1,7 @@
 package com.docus.server.his.infrastructure.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.docus.server.his.common.DSKeyConstants;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -9,10 +10,13 @@ import java.util.Date;
 import java.util.List;
 
 @Mapper
-@DS("his")
+@DS(DSKeyConstants.DS_KEY)
 public interface HisDeptMapper {
 
-    List<DeptDTO> getDeptListView(@Param("startDate") Date startDate, @Param("endDate") Date endDate, @Param("offset") long offset, @Param("pageSize") long pageSize);
+    List<DeptDTO> getDeptListView(@Param("startDate") Date startDate,
+                                  @Param("endDate") Date endDate,
+                                  @Param("offset") int offset,
+                                  @Param("pageSize") int pageSize);
 
 
 }

his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisTBasicMapper.java

@@ -1,6 +1,7 @@
 package com.docus.server.his.infrastructure.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.docus.server.his.common.DSKeyConstants;
 import com.docus.server.record.pojo.dto.TBasicDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -9,13 +10,13 @@ import java.util.Date;
 import java.util.List;
 
 @Mapper
-@DS("his")
+@DS(DSKeyConstants.DS_KEY)
 public interface HisTBasicMapper {
 
     List<TBasicDTO> getTBasicListView(@Param("startDate") Date startDate,
                                       @Param("endDate") Date endDate,
-                                      @Param("offset") long offset,
+                                      @Param("offset") int offset,
-                                      @Param("pageSize") long pageSize);
+                                      @Param("pageSize") int pageSize);
 
 
 }

his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisUserMapper.java

@@ -1,6 +1,7 @@
 package com.docus.server.his.infrastructure.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.docus.server.his.common.DSKeyConstants;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -9,13 +10,13 @@ import java.util.Date;
 import java.util.List;
 
 @Mapper
-@DS("his")
+@DS(DSKeyConstants.DS_KEY)
 public interface HisUserMapper {
 
     List<UserDTO> getUserListView(@Param("startDate") Date startDate,
                                   @Param("endDate") Date endDate,
-                                  @Param("offset") long offset,
+                                  @Param("offset") int offset,
-                                  @Param("pageSize") long pageSize);
+                                  @Param("pageSize") int pageSize);
 
 
 }

pom.xml

@@ -108,7 +108,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
+        <dependency>
+            <groupId>com.docus</groupId>
+            <artifactId>docus-knife4j-starter</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.docus</groupId>
             <artifactId>docus-tool-starter</artifactId>