diff --git a/.gitignore b/.gitignore index b022aa04..bbc1f90f 100644 --- a/.gitignore +++ b/.gitignore @@ -35,7 +35,6 @@ nbbuild/ dist/ nbdist/ .nb-gradle/ -*.css *.css.map ###################################################################### diff --git a/bin/run-modules-manage.bat b/bin/run-modules-manage.bat new file mode 100644 index 00000000..01b26e20 --- /dev/null +++ b/bin/run-modules-manage.bat @@ -0,0 +1,14 @@ +@echo off +echo. +echo [ Ϣ] ʹ Jar Modules-System ̡ +echo. + +cd %~dp0 +cd ../yanzhu-modules/yanzhu-manage/target + +set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m + +java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar yanzhu-modules-manage.jar + +cd bin +pause \ No newline at end of file diff --git a/yanzhu-auth/pom.xml b/yanzhu-auth/pom.xml index 7fb1ba72..3bff77b8 100644 --- a/yanzhu-auth/pom.xml +++ b/yanzhu-auth/pom.xml @@ -82,7 +82,7 @@ ["java", "-jar", "/${project.build.finalName}.jar"] - + true ${configuration.docker-one-Host} diff --git a/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/utils/poi/ExcelUtil.java b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/utils/poi/ExcelUtil.java index c287c3b5..5a669f60 100644 --- a/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/utils/poi/ExcelUtil.java +++ b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/utils/poi/ExcelUtil.java @@ -98,7 +98,7 @@ public class ExcelUtil /** * 工作表对象 */ - private Sheet sheet; + protected Sheet sheet; /** * 样式列表 @@ -108,7 +108,7 @@ public class ExcelUtil /** * 导入导出数据列表 */ - private List list; + protected List list; /** * 注解列表 diff --git a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysDictData.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/api/domain/SysDictData.java similarity index 100% rename from yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysDictData.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/api/domain/SysDictData.java diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/AttendanceUbiData.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/AttendanceUbiData.java index 0eae0681..1e59f615 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/AttendanceUbiData.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/AttendanceUbiData.java @@ -7,6 +7,7 @@ import com.yanzhu.common.core.annotation.Excel; import com.yanzhu.common.core.web.domain.BaseEntity; import java.util.Date; +import java.util.List; /** * 考勤管理对象 attendance_ubi_data @@ -104,6 +105,26 @@ public class AttendanceUbiData extends BaseEntity private String comName; + private List userIds; + + public List getUserIds() { + return userIds; + } + + private List days; + + public List getDays() { + return days; + } + + public void setDays(List days) { + this.days = days; + } + + public void setUserIds(List userIds) { + this.userIds = userIds; + } + public String getComName() { return comName; } diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/AttendanceUbiDataMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/AttendanceUbiDataMapper.java index 6b999dcd..340f4c9d 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/AttendanceUbiDataMapper.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/AttendanceUbiDataMapper.java @@ -59,4 +59,8 @@ public interface AttendanceUbiDataMapper * @return 结果 */ public int deleteAttendanceUbiDataByIds(Long[] ids); + + List queryStatistics(AttendanceUbiData attendanceUbiData); + + List queryStatisticsByUserIds(AttendanceUbiData attendanceUbiData); } diff --git a/yanzhu-common/yanzhu-common-security/src/main/java/com/yanzhu/common/security/utils/DictUtils.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/security/utils/DictUtils.java similarity index 100% rename from yanzhu-common/yanzhu-common-security/src/main/java/com/yanzhu/common/security/utils/DictUtils.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/security/utils/DictUtils.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysArea.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysArea.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysArea.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysArea.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysConfig.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysConfig.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysConfig.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysConfig.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysMenu.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysMenu.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysMenu.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysMenu.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysNotice.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysNotice.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysNotice.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysNotice.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysPost.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysPost.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysPost.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysPost.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysRoleMenu.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysRoleMenu.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysRoleMenu.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysRoleMenu.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysUserOnline.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysUserOnline.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysUserOnline.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysUserOnline.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysUserPost.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysUserPost.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysUserPost.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysUserPost.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysUserRole.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysUserRole.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/SysUserRole.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/SysUserRole.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/vo/MetaVo.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/vo/MetaVo.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/vo/MetaVo.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/vo/MetaVo.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/vo/RouterVo.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/vo/RouterVo.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/vo/RouterVo.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/vo/RouterVo.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/vo/TreeSelect.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/vo/TreeSelect.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/vo/TreeSelect.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/domain/vo/TreeSelect.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysAreaMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysAreaMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysAreaMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysAreaMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysConfigMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysConfigMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysConfigMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysConfigMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysDeptMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysDeptMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysDeptMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysDeptMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysDictDataMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysDictDataMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysDictDataMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysDictDataMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysDictTypeMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysDictTypeMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysDictTypeMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysDictTypeMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysLogininforMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysLogininforMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysLogininforMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysLogininforMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysMenuMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysMenuMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysMenuMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysMenuMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysNoticeMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysNoticeMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysNoticeMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysNoticeMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysOperLogMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysOperLogMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysOperLogMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysOperLogMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysPostMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysPostMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysPostMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysPostMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysRoleDeptMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysRoleDeptMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysRoleDeptMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysRoleDeptMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysRoleMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysRoleMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysRoleMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysRoleMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysRoleMenuMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysRoleMenuMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysRoleMenuMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysRoleMenuMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysUserMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysUserMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysUserPostMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserPostMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysUserPostMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserPostMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysUserRoleMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserRoleMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysUserRoleMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserRoleMapper.java diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysUserUniopenMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserUniopenMapper.java similarity index 100% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysUserUniopenMapper.java rename to yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysUserUniopenMapper.java diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceUbiDataMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceUbiDataMapper.xml index 808d016f..eca16430 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceUbiDataMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceUbiDataMapper.xml @@ -80,6 +80,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and deviceNo = #{deviceNo} + + +