diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index bd84c5c..54a0346 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.base.enumutil; +import com.fasterxml.jackson.annotation.JsonFormat; + /** * @Description : * @Reference : @@ -220,6 +222,56 @@ public class CommonEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STATUS { + Enable(1, "启用","fa fa-success cell-fa fa-check"), Disable(2, "禁止","fa fa-disabled cell-fa fa-times-circle"), locking(3, "锁定","fa cell-fa fa-lock"); + + private int value; + private String name; + private String description; + + STATUS() { + } + + STATUS(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getName() { + return name; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].getName(); + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + /** * 功能级别 */ diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java new file mode 100644 index 0000000..c00b0b6 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -0,0 +1,81 @@ +package cn.estsh.i3plus.pojo.base.enumutil; + +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @Date : 2018-10-23 16:10 + * @Modify : + **/ +public class ImppEnumUtil { + + /** + * 组织类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ORGANIZE_YTPE{ +// 1.集团，2.公司，3.工厂 + TYPE_GROUP(1,"集团","组织类型为集团"), + TYPE_COMPANY(2,"公司","组织类型为公司"), + TYPE_FACTORY(3,"工厂","组织类型为集团"), + ; + + private int value; + private String name; + private String description; + + ORGANIZE_YTPE() { + } + + ORGANIZE_YTPE(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getName() { + return name; + } + + public String getDescription() { + return description; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].name; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + +} diff --git a/modules/i3plus-pojo-base/target/classes/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.class b/modules/i3plus-pojo-base/target/classes/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.class index aaaf844..255147a 100644 Binary files a/modules/i3plus-pojo-base/target/classes/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.class and b/modules/i3plus-pojo-base/target/classes/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.class differ diff --git a/modules/i3plus-pojo-base/target/classes/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.class b/modules/i3plus-pojo-base/target/classes/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.class index 131c371..72ab16e 100644 Binary files a/modules/i3plus-pojo-base/target/classes/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.class and b/modules/i3plus-pojo-base/target/classes/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.class differ diff --git a/modules/i3plus-pojo-base/target/classes/cn/estsh/i3plus/pojo/base/jpa/factory/BaseRepositoryFactoryBean$BaseRepositoryFactory.class b/modules/i3plus-pojo-base/target/classes/cn/estsh/i3plus/pojo/base/jpa/factory/BaseRepositoryFactoryBean$BaseRepositoryFactory.class index 77d26a5..5f03354 100644 Binary files a/modules/i3plus-pojo-base/target/classes/cn/estsh/i3plus/pojo/base/jpa/factory/BaseRepositoryFactoryBean$BaseRepositoryFactory.class and b/modules/i3plus-pojo-base/target/classes/cn/estsh/i3plus/pojo/base/jpa/factory/BaseRepositoryFactoryBean$BaseRepositoryFactory.class differ diff --git a/modules/i3plus-pojo-base/target/classes/cn/estsh/i3plus/pojo/base/jpa/factory/BaseRepositoryFactoryBean.class b/modules/i3plus-pojo-base/target/classes/cn/estsh/i3plus/pojo/base/jpa/factory/BaseRepositoryFactoryBean.class index ee61282..bf1db2f 100644 Binary files a/modules/i3plus-pojo-base/target/classes/cn/estsh/i3plus/pojo/base/jpa/factory/BaseRepositoryFactoryBean.class and b/modules/i3plus-pojo-base/target/classes/cn/estsh/i3plus/pojo/base/jpa/factory/BaseRepositoryFactoryBean.class differ diff --git a/modules/i3plus-pojo-base/target/classes/cn/estsh/i3plus/pojo/base/tool/SnowflakeIdMaker.class b/modules/i3plus-pojo-base/target/classes/cn/estsh/i3plus/pojo/base/tool/SnowflakeIdMaker.class index 9e7c153..8ee1345 100644 Binary files a/modules/i3plus-pojo-base/target/classes/cn/estsh/i3plus/pojo/base/tool/SnowflakeIdMaker.class and b/modules/i3plus-pojo-base/target/classes/cn/estsh/i3plus/pojo/base/tool/SnowflakeIdMaker.class differ diff --git a/modules/i3plus-pojo-base/target/i3plus-pojo-base-1.0-SNAPSHOT.jar b/modules/i3plus-pojo-base/target/i3plus-pojo-base-1.0-SNAPSHOT.jar index a6de763..997d948 100644 Binary files a/modules/i3plus-pojo-base/target/i3plus-pojo-base-1.0-SNAPSHOT.jar and b/modules/i3plus-pojo-base/target/i3plus-pojo-base-1.0-SNAPSHOT.jar differ diff --git a/modules/i3plus-pojo-base/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/modules/i3plus-pojo-base/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index e2391c7..7ca6a9f 100644 --- a/modules/i3plus-pojo-base/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/modules/i3plus-pojo-base/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,17 +1,34 @@ cn\estsh\i3plus\pojo\base\jpa\JpaConfig.class cn\estsh\i3plus\pojo\base\tool\SnowflakeIdMaker.class -cn\estsh\i3plus\pojo\base\shirotoken\UserToken.class +cn\estsh\i3plus\pojo\base\enumutil\CommonEnumUtil.class cn\estsh\i3plus\pojo\base\bean\BaseModelBean.class cn\estsh\i3plus\pojo\base\bean\ListPager.class -cn\estsh\i3plus\pojo\base\common\PagerHelper.class -cn\estsh\i3plus\pojo\base\shirotoken\BaseToken.class +cn\estsh\i3plus\pojo\base\enumutil\WmsEnumUtil.class +cn\estsh\i3plus\pojo\base\enumutil\ResourceEnumUtil$MESSAGE.class +cn\estsh\i3plus\pojo\base\enumutil\ImppEnumUtil.class +cn\estsh\i3plus\pojo\base\enumutil\ImppEnumUtil$ORGANIZE_YTPE.class +cn\estsh\i3plus\pojo\base\tool\SqlPack.class cn\estsh\i3plus\pojo\base\jpa\factory\BaseRepositoryFactoryBean$BaseRepositoryFactory.class -cn\estsh\i3plus\pojo\base\bean\OperateUser.class +cn\estsh\i3plus\pojo\base\enumutil\MesEnumUtil.class cn\estsh\i3plus\pojo\base\bean\BaseBean.class -cn\estsh\i3plus\pojo\base\shirotoken\AdminToken.class -cn\estsh\i3plus\pojo\base\jpa\daoimpl\BaseRepositoryImpl.class +cn\estsh\i3plus\pojo\base\enumutil\CommonEnumUtil$TRUE_OR_FALSE.class cn\estsh\i3plus\pojo\base\shirotoken\SaAdminToken.class -cn\estsh\i3plus\pojo\base\jpa\dao\BaseRepository.class -cn\estsh\i3plus\pojo\base\bean\ResultBean.class +cn\estsh\i3plus\pojo\base\tool\HqlPack.class cn\estsh\i3plus\pojo\base\common\Pager.class cn\estsh\i3plus\pojo\base\jpa\factory\BaseRepositoryFactoryBean.class +cn\estsh\i3plus\pojo\base\enumutil\ResourceEnumUtil.class +cn\estsh\i3plus\pojo\base\enumutil\CommonEnumUtil$SYS_LOCALE_RESOURCE_TYPE.class +cn\estsh\i3plus\pojo\base\enumutil\CommonEnumUtil$STATUS.class +cn\estsh\i3plus\pojo\base\enumutil\CommonEnumUtil$METHOD_LEVEL.class +cn\estsh\i3plus\pojo\base\enumutil\CommonEnumUtil$IS_VAILD.class +cn\estsh\i3plus\pojo\base\shirotoken\UserToken.class +cn\estsh\i3plus\pojo\base\common\PagerHelper.class +cn\estsh\i3plus\pojo\base\enumutil\ResourceEnumUtil$EXCEPTION.class +cn\estsh\i3plus\pojo\base\shirotoken\BaseToken.class +cn\estsh\i3plus\pojo\base\enumutil\CommonEnumUtil$IS_DEAL.class +cn\estsh\i3plus\pojo\base\enumutil\CommonEnumUtil$SOFT_TYPE.class +cn\estsh\i3plus\pojo\base\enumutil\CommonEnumUtil$USER_TYPE.class +cn\estsh\i3plus\pojo\base\shirotoken\AdminToken.class +cn\estsh\i3plus\pojo\base\enumutil\CommonEnumUtil$ASC_OR_DESC.class +cn\estsh\i3plus\pojo\base\jpa\daoimpl\BaseRepositoryImpl.class +cn\estsh\i3plus\pojo\base\jpa\dao\BaseRepository.class diff --git a/modules/i3plus-pojo-base/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/modules/i3plus-pojo-base/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 54e0e5e..cc323f6 100644 --- a/modules/i3plus-pojo-base/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/modules/i3plus-pojo-base/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,16 +1,21 @@ D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\common\Pager.java D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\common\PagerHelper.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\enumutil\ImppEnumUtil.java D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\tool\SnowflakeIdMaker.java D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\bean\ListPager.java D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\shirotoken\SaAdminToken.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\tool\HqlPack.java D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\shirotoken\BaseToken.java D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\bean\BaseModelBean.java D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\jpa\daoimpl\BaseRepositoryImpl.java D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\jpa\factory\BaseRepositoryFactoryBean.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\enumutil\WmsEnumUtil.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\enumutil\CommonEnumUtil.java D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\jpa\dao\BaseRepository.java -D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\bean\ResultBean.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\enumutil\MesEnumUtil.java D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\shirotoken\AdminToken.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\enumutil\ResourceEnumUtil.java D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\jpa\JpaConfig.java D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\bean\BaseBean.java -D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\bean\OperateUser.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\tool\SqlPack.java D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\shirotoken\UserToken.java diff --git a/modules/i3plus-pojo-mes/target/i3plus-pojo-mes-1.0-SNAPSHOT.jar b/modules/i3plus-pojo-mes/target/i3plus-pojo-mes-1.0-SNAPSHOT.jar index 68c2b36..5d946cc 100644 Binary files a/modules/i3plus-pojo-mes/target/i3plus-pojo-mes-1.0-SNAPSHOT.jar and b/modules/i3plus-pojo-mes/target/i3plus-pojo-mes-1.0-SNAPSHOT.jar differ diff --git a/modules/i3plus-pojo-model/target/classes/cn/estsh/i3plus/pojo/model/hardware/EsbXmlMessage.class b/modules/i3plus-pojo-model/target/classes/cn/estsh/i3plus/pojo/model/hardware/EsbXmlMessage.class index 3c35f18..f61752d 100644 Binary files a/modules/i3plus-pojo-model/target/classes/cn/estsh/i3plus/pojo/model/hardware/EsbXmlMessage.class and b/modules/i3plus-pojo-model/target/classes/cn/estsh/i3plus/pojo/model/hardware/EsbXmlMessage.class differ diff --git a/modules/i3plus-pojo-model/target/i3plus-pojo-model-1.0-SNAPSHOT.jar b/modules/i3plus-pojo-model/target/i3plus-pojo-model-1.0-SNAPSHOT.jar index a402a7a..8e3ec94 100644 Binary files a/modules/i3plus-pojo-model/target/i3plus-pojo-model-1.0-SNAPSHOT.jar and b/modules/i3plus-pojo-model/target/i3plus-pojo-model-1.0-SNAPSHOT.jar differ diff --git a/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SessionUser.class b/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SessionUser.class index 6d53f32..f9eaa23 100644 Binary files a/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SessionUser.class and b/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SessionUser.class differ diff --git a/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysEmployee.class b/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysEmployee.class index d75d617..90d887d 100644 Binary files a/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysEmployee.class and b/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysEmployee.class differ diff --git a/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.class b/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.class index 311485c..dfe50c4 100644 Binary files a/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.class and b/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.class differ diff --git a/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.class b/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.class index 8b196c9..869754a 100644 Binary files a/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.class and b/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.class differ diff --git a/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysMethod.class b/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysMethod.class index d964d1b..ec55923 100644 Binary files a/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysMethod.class and b/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysMethod.class differ diff --git a/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysMethodRole.class b/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysMethodRole.class index 5d9882f..09bbdc7 100644 Binary files a/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysMethodRole.class and b/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysMethodRole.class differ diff --git a/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysRole.class b/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysRole.class index 5838672..ea8b3ac 100644 Binary files a/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysRole.class and b/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysRole.class differ diff --git a/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysUser.class b/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysUser.class index 25c902e..f26f8be 100644 Binary files a/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysUser.class and b/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysUser.class differ diff --git a/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysUserRole.class b/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysUserRole.class index 932ce6b..e7b8718 100644 Binary files a/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysUserRole.class and b/modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SysUserRole.class differ diff --git a/modules/i3plus-pojo-platform/target/i3plus-pojo-platform-1.0-SNAPSHOT.jar b/modules/i3plus-pojo-platform/target/i3plus-pojo-platform-1.0-SNAPSHOT.jar index b281c1c..ce52c46 100644 Binary files a/modules/i3plus-pojo-platform/target/i3plus-pojo-platform-1.0-SNAPSHOT.jar and b/modules/i3plus-pojo-platform/target/i3plus-pojo-platform-1.0-SNAPSHOT.jar differ diff --git a/modules/i3plus-pojo-platform/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/modules/i3plus-pojo-platform/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index d301d55..928856b 100644 --- a/modules/i3plus-pojo-platform/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/modules/i3plus-pojo-platform/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,12 +1,60 @@ -cn\estsh\i3plus\pojo\platform\bean\SessionUser.class cn\estsh\i3plus\pojo\platform\repository\SysUserRepository.class cn\estsh\i3plus\pojo\platform\bean\SysEmployee.class +cn\estsh\i3plus\pojo\platform\bean\Tool.class +cn\estsh\i3plus\pojo\platform\bean\RefUserDepartment.class +cn\estsh\i3plus\pojo\platform\bean\RefRoleMenu.class +cn\estsh\i3plus\pojo\platform\repository\DepartmentRepository.class +cn\estsh\i3plus\pojo\platform\repository\SysDictionaryRepository.class +cn\estsh\i3plus\pojo\platform\bean\RefUserPosition.class +cn\estsh\i3plus\pojo\platform\repository\SysUserInfoRepository.class +cn\estsh\i3plus\pojo\platform\repository\SysFileRepository.class +cn\estsh\i3plus\pojo\platform\repository\OrganizeRepository.class +cn\estsh\i3plus\pojo\platform\bean\Enterprise.class +cn\estsh\i3plus\pojo\platform\bean\EnterpriseConfig.class +cn\estsh\i3plus\pojo\platform\repository\RefUserPositionRepository.class +cn\estsh\i3plus\pojo\platform\bean\TaskTimedRecording.class +cn\estsh\i3plus\pojo\platform\sqlpack\CoreHqlPack.class +cn\estsh\i3plus\pojo\platform\bean\LogUserLogin.class +cn\estsh\i3plus\pojo\platform\bean\Position.class cn\estsh\i3plus\pojo\platform\bean\SysRole.class cn\estsh\i3plus\pojo\platform\bean\SysUserRole.class -cn\estsh\i3plus\pojo\platform\bean\SysLocaleResource.class +cn\estsh\i3plus\pojo\platform\repository\EnterpriseRepository.class +cn\estsh\i3plus\pojo\platform\bean\SysFile.class +cn\estsh\i3plus\pojo\platform\bean\LogSystem.class +cn\estsh\i3plus\pojo\platform\bean\SysUserInfo.class +cn\estsh\i3plus\pojo\platform\bean\TaskTimed.class +cn\estsh\i3plus\pojo\platform\bean\Organize.class +cn\estsh\i3plus\pojo\platform\bean\RefUserRole.class +cn\estsh\i3plus\pojo\platform\bean\SysLocaleLanguage.class +cn\estsh\i3plus\pojo\platform\bean\SysMessage.class +cn\estsh\i3plus\pojo\platform\repository\RefRoleMenuRepository.class +cn\estsh\i3plus\pojo\platform\bean\SessionUser.class +cn\estsh\i3plus\pojo\platform\bean\Department.class +cn\estsh\i3plus\pojo\platform\bean\SysMenu.class +cn\estsh\i3plus\pojo\platform\repository\TaskTimedRepository.class cn\estsh\i3plus\pojo\platform\bean\SysMethod.class +cn\estsh\i3plus\pojo\platform\repository\LogUserLoginRepository.class +cn\estsh\i3plus\pojo\platform\repository\TaskTimedRecordingRepository.class +cn\estsh\i3plus\pojo\platform\bean\SysDictionary.class +cn\estsh\i3plus\pojo\platform\repository\SysLocaleLanguageRepository.class +cn\estsh\i3plus\pojo\platform\repository\ToolRepository.class +cn\estsh\i3plus\pojo\platform\repository\SysTimeExpressionRepository.class +cn\estsh\i3plus\pojo\platform\repository\SysMessageRepository.class +cn\estsh\i3plus\pojo\platform\bean\SysConfig.class +cn\estsh\i3plus\pojo\platform\bean\SysLocaleResource.class +cn\estsh\i3plus\pojo\platform\repository\LogActionRepository.class cn\estsh\i3plus\pojo\platform\repository\SysLocaleResourceRepository.class -cn\estsh\i3plus\pojo\platform\bean\SysLocaleLanguage.class +cn\estsh\i3plus\pojo\platform\repository\RefUserRoleRepository.class +cn\estsh\i3plus\pojo\platform\repository\ToolTypeRepository.class +cn\estsh\i3plus\pojo\platform\repository\SysRoleRepository.class cn\estsh\i3plus\pojo\platform\bean\SysMethodRole.class cn\estsh\i3plus\pojo\platform\bean\SysUser.class -cn\estsh\i3plus\pojo\platform\repository\SysLocaleLanguageRepository.class +cn\estsh\i3plus\pojo\platform\repository\RefUserDepartmentRepository.class +cn\estsh\i3plus\pojo\platform\repository\EnterpriseConfigRepository.class +cn\estsh\i3plus\pojo\platform\repository\PositionRepository.class +cn\estsh\i3plus\pojo\platform\repository\LogSystemRepository.class +cn\estsh\i3plus\pojo\platform\bean\LogAction.class +cn\estsh\i3plus\pojo\platform\repository\SysConfigRepository.class +cn\estsh\i3plus\pojo\platform\repository\SysMenuRepository.class +cn\estsh\i3plus\pojo\platform\bean\ToolType.class +cn\estsh\i3plus\pojo\platform\bean\SysTimeExpression.class diff --git a/modules/i3plus-pojo-platform/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/modules/i3plus-pojo-platform/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index eedf81a..95397ba 100644 --- a/modules/i3plus-pojo-platform/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/modules/i3plus-pojo-platform/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,12 +1,60 @@ +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\RefUserPosition.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\Tool.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\TaskTimedRecordingRepository.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\RefUserRoleRepository.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\SysMenuRepository.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\SysMenu.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\SysRoleRepository.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\SysUserRepository.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\RefUserDepartmentRepository.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\Department.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\SessionUser.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\SysUserInfoRepository.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\TaskTimed.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\RefRoleMenu.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\LogUserLoginRepository.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\SysLocaleResource.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\ToolRepository.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\TaskTimedRepository.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\PositionRepository.java D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\SysEmployee.java -D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\SysUserRole.java -D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\SysMethodRole.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\SysFileRepository.java D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\SysLocaleLanguageRepository.java D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\SysLocaleLanguage.java -D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\SysLocaleResourceRepository.java D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\SysMethod.java -D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\SysLocaleResource.java -D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\SysUserRepository.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\EnterpriseConfig.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\SysFile.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\SysMethodRole.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\SysLocaleResourceRepository.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\Position.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\RefUserPositionRepository.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\OrganizeRepository.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\SysConfig.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\LogSystem.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\SysDictionary.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\EnterpriseRepository.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\ToolType.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\ToolTypeRepository.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\RefRoleMenuRepository.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\LogAction.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\TaskTimedRecording.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\SysDictionaryRepository.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\EnterpriseConfigRepository.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\Enterprise.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\RefUserDepartment.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\SysTimeExpression.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\SysUserInfo.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\DepartmentRepository.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\SysUserRole.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\SysConfigRepository.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\LogUserLogin.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\LogSystemRepository.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\SysMessageRepository.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\LogActionRepository.java D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\SysRole.java -D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\SessionUser.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\sqlpack\CoreHqlPack.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\repository\SysTimeExpressionRepository.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\Organize.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\RefUserRole.java D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\SysUser.java +D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-platform\src\main\java\cn\estsh\i3plus\pojo\platform\bean\SysMessage.java diff --git a/modules/i3plus-pojo-wms/target/classes/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.class b/modules/i3plus-pojo-wms/target/classes/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.class index 630fd73..f23516a 100644 Binary files a/modules/i3plus-pojo-wms/target/classes/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.class and b/modules/i3plus-pojo-wms/target/classes/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.class differ diff --git a/modules/i3plus-pojo-wms/target/classes/cn/estsh/i3plus/pojo/wms/repository/FactoryStoreRepository.class b/modules/i3plus-pojo-wms/target/classes/cn/estsh/i3plus/pojo/wms/repository/FactoryStoreRepository.class index ec8da45..2c9338f 100644 Binary files a/modules/i3plus-pojo-wms/target/classes/cn/estsh/i3plus/pojo/wms/repository/FactoryStoreRepository.class and b/modules/i3plus-pojo-wms/target/classes/cn/estsh/i3plus/pojo/wms/repository/FactoryStoreRepository.class differ diff --git a/modules/i3plus-pojo-wms/target/i3plus-pojo-wms-1.0-SNAPSHOT.jar b/modules/i3plus-pojo-wms/target/i3plus-pojo-wms-1.0-SNAPSHOT.jar index 319469a..9741600 100644 Binary files a/modules/i3plus-pojo-wms/target/i3plus-pojo-wms-1.0-SNAPSHOT.jar and b/modules/i3plus-pojo-wms/target/i3plus-pojo-wms-1.0-SNAPSHOT.jar differ