diff --git a/collect-sdry/pom.xml b/collect-sdry/pom.xml index f01de27..ab35174 100644 --- a/collect-sdry/pom.xml +++ b/collect-sdry/pom.xml @@ -11,8 +11,6 @@ http://maven.apache.org - - com.docus common-collect @@ -20,6 +18,7 @@ compile + @@ -132,8 +131,6 @@ ${project.build.directory}/dataConfig - - diff --git a/collect-sdry/src/main/resources/bootstrap.yml b/collect-sdry/src/main/resources/bootstrap.yml index 3c777b4..3ac23a3 100644 --- a/collect-sdry/src/main/resources/bootstrap.yml +++ b/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: diff --git a/collect-sdry/src/main/resources/logback.xml b/collect-sdry/src/main/resources/logback.xml index 23dc795..5edc7af 100644 --- a/collect-sdry/src/main/resources/logback.xml +++ b/collect-sdry/src/main/resources/logback.xml @@ -49,7 +49,7 @@ - + diff --git a/his-sysem/pom.xml b/his-sysem/pom.xml index cf6974b..670db89 100644 --- a/his-sysem/pom.xml +++ b/his-sysem/pom.xml @@ -25,16 +25,56 @@ - - - src/main/java - - **/*.xml - - - - src/main/resources - - + + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.2.0 + + + copy-resources + package + + copy-resources + + + + + src/main/resources/mapper + + **/*.* + + + + ../collect-sdry/target/collect-sdry/his-mapper + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + **/*.xml + + + + diff --git a/his-sysem/src/main/java/com/docus/server/his/common/DSKeyConstants.java b/his-sysem/src/main/java/com/docus/server/his/common/DSKeyConstants.java new file mode 100644 index 0000000..6263b29 --- /dev/null +++ b/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"; + +} diff --git a/his-sysem/src/main/java/com/docus/server/his/infrastructure/HisSysDao.java b/his-sysem/src/main/java/com/docus/server/his/infrastructure/HisSysDao.java index 0aac326..aa4e7f9 100644 --- a/his-sysem/src/main/java/com/docus/server/his/infrastructure/HisSysDao.java +++ b/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 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 deptListView = hisDeptMapper.getDeptListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize); + System.out.println(JSON.toJSON(deptListView)); + return deptListView; } diff --git a/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisDeptMapper.java b/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisDeptMapper.java index ec9ddc0..6ade2f4 100644 --- a/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisDeptMapper.java +++ b/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 getDeptListView(@Param("startDate") Date startDate, @Param("endDate") Date endDate, @Param("offset") long offset, @Param("pageSize") long pageSize); + List getDeptListView(@Param("startDate") Date startDate, + @Param("endDate") Date endDate, + @Param("offset") int offset, + @Param("pageSize") int pageSize); } diff --git a/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisTBasicMapper.java b/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisTBasicMapper.java index 5037e03..3831be0 100644 --- a/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisTBasicMapper.java +++ b/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 getTBasicListView(@Param("startDate") Date startDate, @Param("endDate") Date endDate, - @Param("offset") long offset, - @Param("pageSize") long pageSize); + @Param("offset") int offset, + @Param("pageSize") int pageSize); } diff --git a/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisUserMapper.java b/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisUserMapper.java index 1f112e5..48e9597 100644 --- a/his-sysem/src/main/java/com/docus/server/his/infrastructure/mapper/HisUserMapper.java +++ b/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 getUserListView(@Param("startDate") Date startDate, @Param("endDate") Date endDate, - @Param("offset") long offset, - @Param("pageSize") long pageSize); + @Param("offset") int offset, + @Param("pageSize") int pageSize); } diff --git a/pom.xml b/pom.xml index 7822d49..98d30f0 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,10 @@ - + + com.docus + docus-knife4j-starter + com.docus docus-tool-starter