LICENSEold mode 100644 new mode 100755
README-EN.mdold mode 100644 new mode 100755
README.mdold mode 100644 new mode 100755
db/Dockerfileold mode 100644 new mode 100755
db/herb-20240318.sqlold mode 100644 new mode 100755
db/herb.sqlold mode 100644 new mode 100755
db/nacos.sqlold mode 100644 new mode 100755
db/nginx/nginx.keyold mode 100644 new mode 100755
db/nginx/nginx.pemold mode 100644 new mode 100755
db/origin/jeecgboot-mysql-5.7.sqlold mode 100644 new mode 100755
db/origin/tables_nacos.sqlold mode 100644 new mode 100755
db/origin/tables_xxl_job.sqlold mode 100644 new mode 100755
db/ÆäËûÊý¾Ý¿â/jeecgboot-oracle11g.dmpold mode 100644 new mode 100755 Binary files differ
db/ÆäËûÊý¾Ý¿â/jeecgboot-oracle11g.sqlold mode 100644 new mode 100755
db/ÆäËûÊý¾Ý¿â/jeecgboot-sqlserver2019.sqlold mode 100644 new mode 100755
db/ÆäËûÊý¾Ý¿â/oracle11g_dmp˵Ã÷.txtold mode 100644 new mode 100755
db/ÔöÁ¿SQL/3.4.4µ½3.5.0µÄ²Ëµ¥Éý¼¶½Å±¾.sqlold mode 100644 new mode 100755
db/ÔöÁ¿SQL/3.4.4µ½3.5.0±í½á¹¹Éý¼¶½Å±¾.sqlold mode 100644 new mode 100755
db/ÔöÁ¿SQL/°æ±¾Éý¼¶ËµÃ÷.txtold mode 100644 new mode 100755
doc/²¼ÊðÊÖ²á.docxold mode 100644 new mode 100755 Binary files differ
docker-compose.ymlold mode 100644 new mode 100755
jeecg-boot-base-core/pom.xmlold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/api/CommonAPI.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/DataLogDTO.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/FileDownDTO.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/FileUploadDTO.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/LogDTO.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/OnlineAuthDTO.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/BusMessageDTO.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/BusTemplateMessageDTO.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/MessageDTO.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateDTO.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateMessageDTO.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/UrlMatchEnum.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoDict.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLog.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLowApp.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/Dict.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/DynamicTable.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/OnlineAuth.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonCacheConstant.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,8 @@ package org.jeecg.common.constant; public interface CommonCacheConstant { //redisç¼åç§æ·æ°æ® String SYS_CACHE_TENANT = "sys:cache:tenant"; //redisç¼ååç§æ·ä¸è®¾å¤ä¿¡æ¯ String DRY_CACHE_TENANT_EQUS = "dry:cache:tenant::equs"; } jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonSendStatus.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/DrySocketConst.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/DynamicTableConstant.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/FillRuleConstant.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/MqttConstant.javaold mode 100644 new mode 100755
@@ -5,6 +5,13 @@ */ public interface MqttConstant { /**************************** MQTTè§è² start *************************************/ String ROLE_ADMIN = "admin"; String ROLE_USER = "user"; /**************************** MQTTè§è² end *************************************/ /**************************ç³»ç»è®¢é strat*******************************/ //ä¸çº¿è®¢é String MQTT_TOPIC_ONLINE = "$SYS/brokers/+/clients/+/connected"; @@ -24,7 +31,11 @@ String MOBILE_QUERY_EQU_STATU = MOBILE_UP_PREFIX + "/query/equ/statu"; //移å¨ç«¯è¿ç¨è¯·æ±æ令 String MOBILE_REQ_EQU_CMD = MOBILE_UP_PREFIX + "/req/equ/cmd"; /**************************移å¨ç«¯åæå¡ç«¯è¯·æ±æ令end*******************************/ /**************************æå¡ç«¯å移å¨ç«¯ååºæ令start*******************************/ @@ -35,11 +46,63 @@ String SERVICE_RES_EQU_STATU = SERVICE_DOWN_PREFIX + "/%s/statu"; //è¿å移å¨ç«¯è¿ç¨è¯·æ±æ令 String SERVICE_RES_EQU_CMD = SERVICE_DOWN_PREFIX + "/%s/cmd"; /**************************æå¡ç«¯å移å¨ç«¯ååºæ令end*******************************/ /**************************æå¡ç«¯å移å¨ç«¯åé广æstart*******************************/ //广æç±»åæ¨éæ å ³ç§»å¨ç«¯è®¾å¤idï¼åææå¨çº¿ç§»å¨ç«¯åé String SERVICE_BROADCAST_PREFIX = "service/broadcast"; //æå¡ç«¯ååç§æ·å®¢æ·ç«¯åéå®æ¶æ é广æ String SERVICE_BROADCAST_TENANT_REAL_FAULT = SERVICE_BROADCAST_PREFIX + "/real/fault/%s" ; /**************************æå¡ç«¯å移å¨ç«¯åé广æend*******************************/ /**************************ç§æ·ç«¯åæå¡ç«¯åéæ°æ®start*******************************/ String TENANT_UP_PREFIX = "tenant/up"; String TENANT_UP_PREFIX_REALTIME_DATA = TENANT_UP_PREFIX + "/realTime/data"; String TENANT_UP_PREFIX_FAULT_DATA = TENANT_UP_PREFIX + "/fault/data"; String TENANT_UP_PREFIX_REAL_FAULT_DATA = TENANT_UP_PREFIX + "/real/fault/data"; String TENANT_UP_PREFIX_EQU = TENANT_UP_PREFIX + "/equipment"; /**************************ç§æ·ç«¯åæå¡ç«¯åéæ°æ®end*******************************/ /**************************æå¡ç«¯åç§æ·ç«¯è¯·æ±æ°æ®start*******************************/ String SERVICE_REQ_PREFIX = "service/req"; /**************************æå¡ç«¯åç§æ·ç«¯è¯·æ±æ°æ®end*******************************/ /**************************start*******************************/ /**************************end*******************************/ //redisç¼å String MQTT_ONLINE_CLIENT = "mqtt:online:client::"; //client String MQTT_REAL_FAULT = "mqtt:real:fault"; //service(cloud) //å¨çº¿å®¢æ·ç«¯ String MQTT_ONLINE_CLIENT = "mqtt:online:client:%s"; //ææç§æ·çå®æ¶æ¥è¦ï¼%sï¼ç§æ·idï¼ String MQTT_CLOUD_REAL_FAULT = "mqtt:real:fault:%s"; } jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ServiceNameConstants.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/SymbolConstant.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/TenantConstant.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/VxeSocketConst.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/WebsocketConst.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/CgformEnum.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/FileTypeEnum.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/LowAppAopEnum.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/MessageTypeEnum.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/ModuleType.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/OperateTypeEnum.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/RoleIndexConfigEnum.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/SensitiveDecode.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/SensitiveEncode.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/SensitiveField.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/aspect/SensitiveDataAspect.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/enums/SensitiveEnum.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/util/SensitiveInfoUtil.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/es/QueryStringBuilder.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBoot401Exception.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootException.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/handler/IFillRuleHandler.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/annotation/EnumDict.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/service/JeecgService.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/service/impl/JeecgServiceImpl.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/MatchTypeEnum.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryCondition.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryRuleEnum.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JeecgDataAutorUtils.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/ComboModel.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictModel.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictModelMany.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictQuery.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DynamicDataSourceModel.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SelectTreeModel.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysCategoryModel.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysDepartModel.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysFilesModel.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysPermissionDataRuleModel.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysUserCacheInfo.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/BrowserType.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/BrowserUtils.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsEnum.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsHelper.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FillRuleUtil.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/HTMLUtils.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ImportExcelUtil.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/IpUtils.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/Md5Util.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MinioUtil.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MyClassLoader.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PmsUtil.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ReflectHelper.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestDesformUtil.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SqlInjectionUtil.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SysAnnmentTypeEnum.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/TokenUtils.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/UUIDGenerator.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/YouBianCodeUtil.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DbTypeUtils.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DynamicDBUtil.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/FreemarkerParseFactory.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/EncryptedString.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/FileTypeFilter.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/StrAttackFilter.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/JdbcSecurityUtil.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/SecurityTools.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/MyKeyPair.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecurityReq.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecurityResp.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecuritySignReq.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecuritySignResp.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/ObjectParseUtil.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleEnum.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleVo.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiConfig.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/CorsFilterCondition.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidConfig.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgBaseConfig.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgCloudCondition.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/RestTemplateConfig.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/StaticConfig.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/WebSocketConfig.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/RequestBodyReserveFilter.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/WebsocketFilter.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/JeecgTenantParser.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.javaold mode 100644 new mode 100755
@@ -75,6 +75,10 @@ TENANT_TABLE.add("dry_herb_type"); TENANT_TABLE.add("dry_order"); TENANT_TABLE.add("dry_shop"); TENANT_TABLE.add("dry_herb_formula"); TENANT_TABLE.add("dry_herb_formula_his"); TENANT_TABLE.add("dry_fault_record"); } old mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/ThreadLocalDataHelper.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/aspect/DynamicTableAspect.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/interceptor/DynamicDatasourceInterceptor.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/MinioConfig.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/OssConfiguration.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/JwtToken.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/ResourceCheckFilter.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthConfiguration.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthInterceptor.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/BodyReaderHttpServletRequestWrapper.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/SignUtil.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/thirdapp/ThirdAppConfig.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/thirdapp/ThirdAppTypeConfig.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/thirdapp/ThirdAppTypeItemVo.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/vo/DomainUrl.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/vo/Path.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/config/vo/Shiro.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/BaseCommonMapper.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/xml/BaseCommonMapper.xmlold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/BaseCommonService.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.javaold mode 100644 new mode 100755
jeecg-boot-base-core/src/main/resources/static/pca.jsonold mode 100644 new mode 100755
jeecg-module-demo/pom.xmlold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoFeignController.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoProviderController.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/JcloudDemoService.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/impl/JcloudDemoServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/xxljob/TestJobHandler.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/MockController.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area_mini.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area_options.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_0.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_1.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_2.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_3.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_31.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/getTubiao.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/graphreport_chart.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/permission.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/permission_no_page.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/role.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/service.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/sysdatalog.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/task_process.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/user.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/user_info.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/userinfo.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_activity.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_projects.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_radar.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_teams.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/controller/VxeMockController.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/entity/MockEntity.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/ddjh.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/ddjh_s8.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/dlglong.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/websocket/VxeSocket.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/online/OnlCgformDemoController.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/BigScreenTemplatController.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDynamicDataController.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderErpMainController.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderCustomer.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderMain.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderTicket.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JoaDemo.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgDemoMapper.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderCustomerMapper.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderMainMapper.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderTicketMapper.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JoaDemoMapper.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xmlold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderCustomerMapper.xmlold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderMainMapper.xmlold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderTicketMapper.xmlold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JoaDemoMapper.xmlold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDemoService.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDynamicDataService.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderCustomerService.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderMainService.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderTicketService.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJoaDemoService.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDynamicDataServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderCustomerServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderMainServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderTicketServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JoaDemoServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/vo/JeecgOrderMainPage.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxljob/TestJobHandler.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/controller/DlMockController.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/entity/MockEntity.javaold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/json/ddjh.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/json/ddjh_s8.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/json/dlglong.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template1/css/easyui.cssold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template1/css/jquery-ui.cssold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template1/css/main_design1.cssold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template1/css/room.cssold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/content_comm.pngjeecg-module-demo/src/main/resources/static/bigscreen/template1/images/content_comm1.pngjeecg-module-demo/src/main/resources/static/bigscreen/template1/images/content_down.pngjeecg-module-demo/src/main/resources/static/bigscreen/template1/images/content_down1.pngjeecg-module-demo/src/main/resources/static/bigscreen/template1/images/index.gifjeecg-module-demo/src/main/resources/static/bigscreen/template1/images/index1.gifjeecg-module-demo/src/main/resources/static/bigscreen/template1/images/screenbg_design1.jpgjeecg-module-demo/src/main/resources/static/bigscreen/template1/images/war_room_main.jpgjeecg-module-demo/src/main/resources/static/bigscreen/template1/js/big_design1.jsold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/china.jsold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/echarts-wordcloud.jsold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/echarts.min.jsold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/geoCoord.jsold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/jquery.easyui.min.jsold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/jquery.min.jsold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/resize.jsold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/room.jsold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template2/css/style.cssold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/arrow.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/bg_img03.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/bg_img04.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/border_bg01.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/box_title.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/chart_icon.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/chart_icon_on.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/close.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/close_icon.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/data_icon.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/data_icon_on.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/fangda.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/index_bg.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/jian.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/line-blue.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/line_bg.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/line_img.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/menu_btn.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/menu_on.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/next.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/people_iocn.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/plus.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/popUP_bg.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/prev.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/select_icon.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/select_icon_on.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/selsct_time.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/settings_icon.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/settings_icon_on.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/teacher_icon.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/title_bg01.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/title_border.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/title_line.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/weather_img01.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/ÖÐÓê.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/ÖÐÓêת´óÓê.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/ÖÐÑ©.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/ÖÐѩת´óÑ©.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/¶³Óê.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/¶àÔÆ.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/´ó±©Óê.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/´ó±©Ñ©.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/´óÓê.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/´óÓêת±©Óê.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/´óÑ©.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/´óѩת±©Ñ©.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/СÓê.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/СÓêתÖÐÓê.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/Сѩ.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/СѩתÖÐÑ©.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/ǿɳ³¾±©.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/Ñïɳ.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/Çç.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/±©Óê.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/±©Óêת´ó±©Óê.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/±©Ñ©.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/ɳ³¾±©.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/¸¡³¾.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/ÌØ´ó±©Óê.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/Òõ.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/ÕóÓê.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/ÕóÑ©.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/Óê¼ÓÑ©.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/À×ÕóÓê.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/À×ÕóÓê¼Ó±ù±¢.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/Îí.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/ö².pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/js/base.jsold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/china.jsold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/data/city.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/data/guangdong.jsold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/echarts.min.jsold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/jquery-3.3.1.min.jsold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/extend/layer.ext.jsold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/laydate.jsold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/need/laydate.cssold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/skins/danlan/icon.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/skins/danlan/laydate.cssold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/skins/default/icon.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/skins/default/laydate.cssold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layer.min.jsold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/data/chatlog.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/data/friend.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/data/group.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/data/groups.jsonold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/layim.cssold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/layim.jsold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/loading.gifjeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/icon-ext.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/icon.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/icon_ext.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/loading-0.gifjeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/loading-1.gifjeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/loading-2.gifjeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/textbg.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_ico0.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_loading0.gifjeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_loading1.gifjeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_loading2.gifjeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_loading3.gifjeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_title0.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/layer.cssold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/layer.ext.cssold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/moon/default.pngjeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/moon/style.cssold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/pop_base.jsold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/rem.jsold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/templates/bigscreen/template1/index.ftlold mode 100644 new mode 100755
jeecg-module-demo/src/main/resources/templates/bigscreen/template2/index.ftlold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-api/pom.xmlold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/api/DryHelloApi.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/api/EmqxApi.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/api/EmqxApi.txtold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/api/JeecgSystemApi.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,18 @@ package org.jeecg.modules.dry.api; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.dry.api.fallback.JeecgSystemFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @FeignClient(value = "ichd-system", fallbackFactory = JeecgSystemFallback.class) @Component public interface JeecgSystemApi { @GetMapping(value = "/sys/dict/getDictText/{dictCode}/{key}") Result<String> getDictText(@PathVariable("dictCode") String dictCode, @PathVariable("key") String key); } jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/api/fallback/DryHelloFallback.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/api/fallback/JeecgSystemFallback.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,25 @@ package org.jeecg.modules.dry.api.fallback; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.jeecg.modules.dry.api.DryHelloApi; import org.jeecg.modules.dry.api.JeecgSystemApi; import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; /** * @author JeecgBoot */ @Slf4j @Component public class JeecgSystemFallback implements FallbackFactory<JeecgSystemApi> { @Setter private Throwable cause; @Override public JeecgSystemApi create(Throwable throwable) { log.error("å¾®æå¡æ¥å£è°ç¨å¤±è´¥ï¼ {}", cause); return null; } } jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/common/CacheConstants.javaold mode 100644 new mode 100755
@@ -12,7 +12,9 @@ WORK_ORDER("workOrder","å·¥åMAP"), EQP_MAP("eqpMap", "设å¤MAP,key:tenantId+equipmentId"); EQP_MAP("eqpMap", "设å¤MAP,key:tenantId+equipmentId"), NEAR_TEN("nearTen", "æè¿å次æçåæ¶èå¹³å,key:tenantId+orderCode+equipmentId"); private String code; private String text; jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/common/CommonDict.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/common/OPCUA.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,273 @@ //package org.jeecg.modules.dry.common; // //import lombok.extern.slf4j.Slf4j; //import org.eclipse.milo.opcua.sdk.client.OpcUaClient; //import org.eclipse.milo.opcua.sdk.client.api.identity.AnonymousProvider; //import org.eclipse.milo.opcua.sdk.client.api.subscriptions.UaSubscription; //import org.eclipse.milo.opcua.sdk.client.api.subscriptions.UaSubscriptionManager; //import org.eclipse.milo.opcua.sdk.client.nodes.UaNode; //import org.eclipse.milo.opcua.sdk.client.subscriptions.ManagedDataItem; //import org.eclipse.milo.opcua.sdk.client.subscriptions.ManagedSubscription; //import org.eclipse.milo.opcua.stack.core.AttributeId; //import org.eclipse.milo.opcua.stack.core.Identifiers; //import org.eclipse.milo.opcua.stack.core.UaException; //import org.eclipse.milo.opcua.stack.core.security.SecurityPolicy; //import org.eclipse.milo.opcua.stack.core.types.builtin.*; //import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger; //import org.eclipse.milo.opcua.stack.core.types.enumerated.MonitoringMode; //import org.eclipse.milo.opcua.stack.core.types.enumerated.TimestampsToReturn; //import org.eclipse.milo.opcua.stack.core.types.structured.MonitoredItemCreateRequest; //import org.eclipse.milo.opcua.stack.core.types.structured.MonitoringParameters; //import org.eclipse.milo.opcua.stack.core.types.structured.ReadValueId; // //import java.nio.file.Files; //import java.nio.file.Path; //import java.nio.file.Paths; //import java.util.ArrayList; //import java.util.List; //import java.util.Objects; //import java.util.concurrent.CountDownLatch; //import java.util.concurrent.atomic.AtomicInteger; // // //@Slf4j //public class OPCUA { // // private static AtomicInteger atomic = new AtomicInteger(1); // // å®ä¹æå¡ç«¯å°å // private final static String endPointUrl = "opc.tcp://127.0.0.1:49320"; // // // /** // * å建OPC UA客æ·ç«¯ // * @return // * @throws Exception // */ // public static OpcUaClient createClient() throws Exception { // // Path securityTempDir = Paths.get(System.getProperty("java.io.tmpdir"), "security"); // Files.createDirectories(securityTempDir); // if (!Files.exists(securityTempDir)) { // throw new Exception("unable to create security dir: " + securityTempDir); // } // return OpcUaClient.create(endPointUrl, // endpoints -> // endpoints.stream() // .filter(e -> e.getSecurityPolicyUri().equals(SecurityPolicy.None.getUri())) // .findFirst(), // configBuilder -> // configBuilder // .setApplicationName(LocalizedText.english("eclipse milo opc-ua client")) // .setApplicationUri("urn:eclipse:milo:examples:client") // //访é®æ¹å¼ // .setIdentityProvider(new AnonymousProvider()) // .setRequestTimeout(UInteger.valueOf(5000)) // .build() // ); // } // // /** // * éåæ å½¢èç¹ // * // * @param client OPC UA客æ·ç«¯ // * @param uaNode èç¹ // * @throws Exception // */ // public static void browseNode(OpcUaClient client, UaNode uaNode) throws Exception { // List<? extends UaNode> nodes; // if (uaNode == null) { // nodes = client.getAddressSpace().browseNodes(Identifiers.ObjectsFolder); // } else { // nodes = client.getAddressSpace().browseNodes(uaNode); // } // for (UaNode nd : nodes) { // //æé¤ç³»ç»è¡æ§èç¹ï¼è¿äºç³»ç»æ§èç¹å称ä¸è¬é½æ¯ä»¥"_"å¼å¤´ // if (Objects.requireNonNull(nd.getBrowseName().getName()).contains("_")) { // continue; // } // System.out.println("Node= " + nd.getBrowseName().getName()); // browseNode(client, nd); // } // } // // // /** // * 读åèç¹æ°æ® // * // * @param client OPC UA客æ·ç«¯ // * @throws Exception // */ // public static void readNode(OpcUaClient client) throws Exception { // int namespaceIndex = 2; // String identifier = "TD-01.SB-01.AG-01"; // //èç¹ // NodeId nodeId = new NodeId(namespaceIndex, identifier); // //读åèç¹æ°æ® // DataValue value = client.readValue(0.0, TimestampsToReturn.Neither, nodeId).get(); // // System.out.println(identifier + ": " + String.valueOf(value.getValue().getValue())); // } // // // /** // * åå ¥èç¹æ°æ® // * // * @param client // * @throws Exception // */ // public static void writeNodeValue(OpcUaClient client) throws Exception { // //èç¹ // NodeId nodeId = new NodeId(2, "TD-01.SB-01.AG-01"); // short i = 3; // //å建æ°æ®å¯¹è±¡,æ¤å¤çæ°æ®å¯¹è±¡ä¸å®è¦å®ä¹ç±»åï¼ä¸ç¶ä¼åºç°ç±»åé误ï¼å¯¼è´æ æ³åå ¥ // DataValue nowValue = new DataValue(new Variant(i), null, null); // //åå ¥èç¹æ°æ® // StatusCode statusCode = client.writeValue(nodeId, nowValue).join(); // System.out.println("ç»æï¼" + statusCode.isGood()); // } // // // /** // * 订é (å个) // * // * @param client // * @throws Exception // */ // public static void subscribe(OpcUaClient client) throws Exception { // //å建åå¸é´é1000msç订é 对象 // client // .getSubscriptionManager() // .createSubscription(1000.0) // .thenAccept(t -> { // //èç¹ // NodeId nodeId = new NodeId(2, "TD-01.SB-01.AG-01"); // ReadValueId readValueId = new ReadValueId(nodeId, AttributeId.Value.uid(), null, null); // //å建çæ§çåæ° // MonitoringParameters parameters = new MonitoringParameters(UInteger.valueOf(atomic.getAndIncrement()), 1000.0, null, UInteger.valueOf(10), true); // //å建çæ§é¡¹è¯·æ± // //该请æ±æåç¨äºå建订é ã // MonitoredItemCreateRequest request = new MonitoredItemCreateRequest(readValueId, MonitoringMode.Reporting, parameters); // List<MonitoredItemCreateRequest> requests = new ArrayList<>(); // requests.add(request); // //å建çæ§é¡¹ï¼å¹¶ä¸æ³¨ååéå¼æ¹åæ¶åçåè°å½æ°ã // t.createMonitoredItems( // TimestampsToReturn.Both, // requests, // (item, id) -> item.setValueConsumer((it, val) -> { // System.out.println("nodeid :" + it.getReadValueId().getNodeId()); // System.out.println("value :" + val.getValue().getValue()); // }) // ); // }).get(); // // //æç»è®¢é // Thread.sleep(Long.MAX_VALUE); // } // // // /** // * æ¹é订é // * // * @param client // * @throws Exception // */ //// private static void managedSubscriptionEvent(OpcUaClient client) throws Exception { //// final CountDownLatch eventLatch = new CountDownLatch(1); //// //// //å¤ç订é ä¸å¡ //// handlerNode(client); //// //// //æç»çå¬ //// eventLatch.await(); //// } // // /** // * å¤ç订é ä¸å¡ // * // * @param client OPC UA客æ·ç«¯ // */ // public static void handlerNode(OpcUaClient client) { // try { // //å建订é // ManagedSubscription subscription = ManagedSubscription.create(client); // // //ä½ æéè¦è®¢é çkey // List<String> key = new ArrayList<>(); // key.add("éé 1.è®¾å¤ 1.æ è®° 1"); // key.add("éé 1.è®¾å¤ 1.æ è®° 2"); // // List<NodeId> nodeIdList = new ArrayList<>(); // for (String s : key) { // nodeIdList.add(new NodeId(2, s)); // } // // //çå¬ // List<ManagedDataItem> dataItemList = subscription.createDataItems(nodeIdList); // for (ManagedDataItem managedDataItem : dataItemList) { // managedDataItem.addDataValueListener((t) -> { // System.out.println(managedDataItem.getNodeId().getIdentifier().toString() + ":" + t.getValue().getValue().toString()); // }); // } // } catch (Exception e) { // e.printStackTrace(); // } // } // // /** // * èªå®ä¹è®¢é çå¬ // */ // public static class CustomSubscriptionListener implements UaSubscriptionManager.SubscriptionListener { // // private OpcUaClient client; // // CustomSubscriptionListener(OpcUaClient client) { // this.client = client; // } // // public void onKeepAlive(UaSubscription subscription, DateTime publishTime) { // log.debug("onKeepAlive"); // } // // public void onStatusChanged(UaSubscription subscription, StatusCode status) { // log.debug("onStatusChanged"); // } // // public void onPublishFailure(UaException exception) { // log.debug("onPublishFailure"); // } // // public void onNotificationDataLost(UaSubscription subscription) { // log.debug("onNotificationDataLost"); // } // // /** // * éè¿æ¶ å°è¯æ¢å¤ä¹åç订é å¤±è´¥æ¶ ä¼è°ç¨æ¤æ¹æ³ // * @param uaSubscription 订é // * @param statusCode ç¶æ // */ // public void onSubscriptionTransferFailed(UaSubscription uaSubscription, StatusCode statusCode) { // log.debug("æ¢å¤è®¢é 失败 éè¦éæ°è®¢é "); // //å¨åè°æ¹æ³ä¸éæ°è®¢é // handlerNode(client); // } // } // // /** // * æ¹é订é // * // * @param client // * @throws Exception // */ // public static void managedSubscriptionEvent(OpcUaClient client) throws Exception { // final CountDownLatch eventLatch = new CountDownLatch(1); // // //æ·»å 订é çå¬å¨ï¼ç¨äºå¤çæ线éè¿åç订é é®é¢ // client.getSubscriptionManager().addSubscriptionListener(new CustomSubscriptionListener(client)); // // //å¤ç订é ä¸å¡ // handlerNode(client); // // //æç»çå¬ // eventLatch.await(); // } //} jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryEqpType.javaold mode 100644 new mode 100755
@@ -44,6 +44,15 @@ @Excel(name = "name", width = 15) @ApiModelProperty(value = "name") private String name; @Excel(name = "å¹²ç¥æç", width = 15) @ApiModelProperty(value = "å¹²ç¥æç") private String dryEfficiency; @Excel(name = "è¸æ±½åè", width = 15) @ApiModelProperty(value = "è¸æ±½åè") private String steamConsumption; @Excel(name = "çµè½åè", width = 15) @ApiModelProperty(value = "çµè½åè") private String powerConsumption; /**å建人*/ @ApiModelProperty(value = "å建人") private String createBy; jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryEquipment.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryFaultRecord.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,106 @@ package org.jeecg.modules.dry.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** * @Description: dry_eqp_fault * @Author: jeecg-boot * @Date: 2024-11-13 * @Version: V1.0 */ @Data @TableName("dry_fault_record") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="dry_eqp_fault对象", description="dry_eqp_fault") public class DryFaultRecord implements Serializable { private static final long serialVersionUID = 1L; /**id*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "id") private String id; /**å·¥åid*/ @Excel(name = "å·¥åid", width = 15) @ApiModelProperty(value = "å·¥åid") private String orderId; @Excel(name = "ç§æ·id", width = 15) @ApiModelProperty(value = "ç§æ·id") private Integer tenantId; /**æ éå称*/ @Excel(name = "æ éå称", width = 15) @ApiModelProperty(value = "æ éå称") private String faultName; /**æ écode*/ @Excel(name = "æ écode", width = 15) @ApiModelProperty(value = "å·¥åid") private String faultCode; /**æ éç±»å*/ @Excel(name = "æ éç±»å", width = 15) @ApiModelProperty(value = "æ éç±»å") private Integer faultType; /**æ éæè¿°*/ @Excel(name = "æ éæè¿°", width = 15) @ApiModelProperty(value = "æ éæè¿°") private String faultDesc; /**æ éç¶æ*/ @Excel(name = "æ éç¶æ", width = 15) @ApiModelProperty(value = "æ éç¶æ") private Integer faultStatu; /**å¼å§æ¶é´*/ @Excel(name = "å¼å§æ¶é´", width = 15, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "å¼å§æ¶é´") private Date startTime; /**ç»ææ¶é´*/ @Excel(name = "ç»ææ¶é´", width = 15, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "ç»ææ¶é´") private Date endTime; /**å建人*/ @ApiModelProperty(value = "å建人") private String createBy; /**å建æ¥æ*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "å建æ¥æ") private Date createTime; /**æ´æ°äºº*/ @ApiModelProperty(value = "æ´æ°äºº") private String updateBy; /**æ´æ°æ¥æ*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "æ´æ°æ¥æ") private Date updateTime; public DryFaultRecord() { } public DryFaultRecord(String orderId,Integer tenantId, String faultName,Integer faultType, Date startTime, Date endTime) { this.orderId = orderId; this.tenantId = tenantId; this.faultName = faultName; this.startTime = startTime; this.endTime = endTime; this.faultType = faultType; } } jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHelloEntity.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerb.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerbFormula.javaold mode 100644 new mode 100755
@@ -1,15 +1,14 @@ package org.jeecg.modules.dry.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.jeecg.modules.dry.vo.RealTimeDataVo; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; @@ -36,20 +35,32 @@ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "id") private String id; /**é æ¹ç¼å·*/ @Excel(name = "é æ¹ç¼å·", width = 15) @ApiModelProperty(value = "é æ¹ç¼å·") private String code; /**è¯æid*/ @Excel(name = "è¯æid", width = 15, dictTable = "dry_herb", dicText = "name", dicCode = "id") @Dict(dictTable = "dry_herb", dicText = "name", dicCode = "id") @Excel(name = "è¯æid", width = 15, dictTable = "dry_herb_info", dicText = "name", dicCode = "id") @Dict(dictTable = "dry_herb_info", dicText = "name", dicCode = "id") @ApiModelProperty(value = "è¯æid") private String herbId; /**è¯æå称*/ @Excel(name = "è¯æå称", width = 15) @ApiModelProperty(value = "è¯æå称") private String herbName; /**é æ¹å称*/ @Excel(name = "é æ¹å称", width = 15) @ApiModelProperty(value = "é æ¹å称") private String name; /**è¯ææ¼é³*/ @Excel(name = "è¯ææ¼é³", width = 15) @ApiModelProperty(value = "è¯ææ¼é³") private String pinyin; /**设å¤ç±»å*/ @Excel(name = "设å¤ç±»å", width = 15, dictTable = "dry_eqp_type", dicText = "name", dicCode = "id") @Dict(dictTable = "dry_eqp_type", dicText = "name", dicCode = "id") @ApiModelProperty(value = "设å¤ç±»å") private String eqpType; /**é æ¹åç±»*/ @Excel(name = "é æ¹åç±»", width = 15) @ApiModelProperty(value = "é æ¹åç±»") private String category; /**ç®æ å«æ°´ç*/ @Excel(name = "ç®æ å«æ°´ç", width = 15) @ApiModelProperty(value = "ç®æ å«æ°´ç") @@ -66,6 +77,10 @@ @Excel(name = "çé£æ¸©åº¦", width = 15) @ApiModelProperty(value = "çé£æ¸©åº¦") private Double windTemp; /**åå§é£æºé¢ç*/ @Excel(name = "åå§é£æºé¢ç", width = 15) @ApiModelProperty(value = "åå§é£æºé¢ç") private Integer fanSpeed; /**ç¯å¢æ¸©åº¦*/ @Excel(name = "ç¯å¢æ¸©åº¦", width = 15) @ApiModelProperty(value = "ç¯å¢æ¸©åº¦") @@ -82,6 +97,15 @@ @Excel(name = "ç¿»æ次æ°", width = 15) @ApiModelProperty(value = "ç¿»æ次æ°") private Integer turn; /**å«æ°´çè¡¥å¿*/ @Excel(name = "å«æ°´çè¡¥å¿", width = 15) @ApiModelProperty(value = "å«æ°´çè¡¥å¿") private Double moisOffset; /**å·é£æ¶é¿*/ @Excel(name = "å·é£æ¶é¿", width = 15) @ApiModelProperty(value = "å·é£æ¶é¿") private Integer coolingDuration; /**ç§æ·id*/ @Excel(name = "ç§æ·id", width = 15) @ApiModelProperty(value = "ç§æ·id") @@ -102,4 +126,19 @@ @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "æ´æ°æ¶é´") private Date updateTime; public DryHerbFormula(){} public DryHerbFormula(RealTimeDataVo realTimeDataVo) { this.code = realTimeDataVo.getIndex() + ""; this.delay = realTimeDataVo.getDelay(); this.name = realTimeDataVo.getName(); this.delay = realTimeDataVo.getDelay(); this.turn = realTimeDataVo.getTurntime(); this.feed = realTimeDataVo.getWeight1(); this.target = realTimeDataVo.getMoisture3(); this.windTemp = realTimeDataVo.getTemp3(); this.et = realTimeDataVo.getTime1(); this.tenantId = realTimeDataVo.getTenantid(); } } jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerbFormulaHis.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,145 @@ package org.jeecg.modules.dry.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** * @Description: é æ¹è®°å½ * @Author: jeecg-boot * @Date: 2024-08-19 * @Version: V1.0 */ @Data @TableName("dry_herb_formula_his") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="dry_herb_formula_his对象", description="é æ¹è®°å½") public class DryHerbFormulaHis implements Serializable { private static final long serialVersionUID = 1L; /**id*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "id") private String id; /**设å¤*/ @Excel(name = "设å¤", width = 15, dictTable = "dry_equipment", dicText = "name", dicCode = "id") @Dict(dictTable = "dry_equipment", dicText = "name", dicCode = "id") @ApiModelProperty(value = "设å¤") private String eqpId; /**å·¥åå·*/ @Excel(name = "å·¥åå·", width = 15) @ApiModelProperty(value = "å·¥åå·") private String orderCode; /**å·¥åæ¶é´*/ @Excel(name = "å·¥åæ¶é´", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "å·¥åæ¶é´") private Date orderTime; /**ç´¢å¼*/ @Excel(name = "ç´¢å¼", width = 15) @ApiModelProperty(value = "ç´¢å¼") private String formulaIndex; /**ç¼ç */ @Excel(name = "ç¼ç ", width = 15) @ApiModelProperty(value = "ç¼ç ") private String code; /**å称*/ @Excel(name = "å称", width = 15) @ApiModelProperty(value = "å称") private String name; /**ç±»å*/ @Excel(name = "ç±»å", width = 15) @ApiModelProperty(value = "ç±»å") private String typ; /**ab*/ @Excel(name = "ab", width = 15) @ApiModelProperty(value = "ab") private String ab; /**ææéï¼çï¼*/ @Excel(name = "ææéï¼çï¼", width = 15) @ApiModelProperty(value = "ææéï¼çï¼") private Double weight1; /**åå§éé*/ @Excel(name = "åå§éé", width = 15) @ApiModelProperty(value = "åå§éé") private Double weight2; /**å¹²ç¥æ»æ¶é´*/ @ApiModelProperty(value = "å¹²ç¥æ»æ¶é´") private Integer times; /**çé£æ¸©åº¦*/ @Excel(name = "çé£æ¸©åº¦", width = 15) @ApiModelProperty(value = "çé£æ¸©åº¦") private Double temp1; /**ç¯å¢æ¸©åº¦*/ @Excel(name = "ç¯å¢æ¸©åº¦", width = 15) @ApiModelProperty(value = "ç¯å¢æ¸©åº¦") private Double temp2; /**ç¯å¢æ¹¿åº¦*/ @Excel(name = "ç¯å¢æ¹¿åº¦", width = 15) @ApiModelProperty(value = "ç¯å¢æ¹¿åº¦") private Double temp3; /**è¡æ延æ¶ms*/ @Excel(name = "è¡æ延æ¶ms", width = 15) @ApiModelProperty(value = "è¡æ延æ¶ms") private Double delay; /**ç¿»æ次æ°*/ @Excel(name = "ç¿»æ次æ°", width = 15) @ApiModelProperty(value = "ç¿»æ次æ°") private Integer turntime; /**åå§å«æ°´ç*/ @Excel(name = "åå§å«æ°´ç", width = 15) @ApiModelProperty(value = "åå§å«æ°´ç") private Double moisture1; /**ç®æ å«æ°´ç*/ @Excel(name = "ç®æ å«æ°´ç", width = 15) @ApiModelProperty(value = "ç®æ å«æ°´ç") private Double moisture3; /**è¯æåç±»*/ @Excel(name = "è¯æåç±»", width = 15) @ApiModelProperty(value = "è¯æåç±»") private Integer mtype; /**å«æ°´çè¡¥å¿*/ @Excel(name = "å«æ°´çè¡¥å¿", width = 15) @ApiModelProperty(value = "å«æ°´çè¡¥å¿") private Double moisoffset; /**å·é£æ¶é¿*/ @Excel(name = "å·é£æ¶é¿", width = 15) @ApiModelProperty(value = "å·é£æ¶é¿") private Double coldwind; /**ç§æ·id*/ @Excel(name = "ç§æ·id", width = 15) @ApiModelProperty(value = "ç§æ·id") private Integer tenantId; /**å建人*/ @ApiModelProperty(value = "å建人") private String createBy; /**å建æ¶é´*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "å建æ¶é´") private Date createTime; /**æ´æ°äºº*/ @ApiModelProperty(value = "æ´æ°äºº") private String updateBy; /**æ´æ°æ¶é´*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "æ´æ°æ¶é´") private Date updateTime; } jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerbInfo.javaold mode 100644 new mode 100755
@@ -9,6 +9,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecg.common.aspect.annotation.Dict; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; @@ -49,6 +50,11 @@ @Excel(name = "è±æå", width = 15) @ApiModelProperty(value = "è±æå") private String english; /**è¯æåç±»*/ @Excel(name = "è¯æåç±»", width = 15, dictTable = "dry_herb_type", dicText = "name", dicCode = "id") @Dict(dictTable = "dry_herb_type", dicText = "name", dicCode = "id") @ApiModelProperty(value = "è¯æåç±»") private String type; /**è¯ç¨é¨ä½*/ @Excel(name = "è¯ç¨é¨ä½", width = 15) @ApiModelProperty(value = "è¯ç¨é¨ä½") jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerbType.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOpcDevice.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrder.javaold mode 100644 new mode 100755
@@ -48,7 +48,7 @@ private String code; /**è¯æ*/ @Excel(name = "è¯æ", width = 15, dictTable = "dry_herb", dicText = "name", dicCode = "id") @Dict(dictTable = "dry_herb", dicText = "name", dicCode = "id") @Dict(dictTable = "dry_herb_formula", dicText = "name", dicCode = "id") @ApiModelProperty(value = "è¯æ") private String herbId; /**è¯æ*/ @@ -138,6 +138,7 @@ private Date updateTime; /**å·¥åç¶æ*/ @Excel(name = "å·¥åç¶æ", width = 15) @Dict(dicCode = "dry_order_status") @ApiModelProperty(value = "å·¥åç¶æ") private Integer orderStatus; /**æä½äºº*/ jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrderTrend.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryProdRecord.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryResult.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryShop.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/util/DryUtil.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/util/HerbUtil.javaold mode 100644 new mode 100755
@@ -1,170 +1,170 @@ package org.jeecg.modules.dry.util; import ai.djl.Device; import ai.djl.Model; import ai.djl.inference.Predictor; import ai.djl.modality.Classifications; import ai.djl.modality.cv.Image; import ai.djl.modality.cv.ImageFactory; import ai.djl.modality.cv.transform.*; import ai.djl.modality.cv.translator.ImageClassificationTranslator; import ai.djl.translate.Translator; import lombok.extern.slf4j.Slf4j; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.ResourcePatternResolver; import org.springframework.stereotype.Component; import javax.imageio.ImageIO; import javax.imageio.stream.ImageOutputStream; import java.awt.*; import java.awt.image.BufferedImage; import java.io.*; import java.util.ArrayList; import java.util.List; @Slf4j @Component public class HerbUtil { //è§å®è¾å ¥å°ºå¯¸ private static final int INPUT_SIZE = 224; private static final int TARGET_SIZE = 256; //æ ç¾æ件 ä¸ç§ç±»å«ååå ä¸è¡ private List<String> herbNames; //ç¨äºè¯å« Predictor<Image, Classifications> predictor; //模å private Model model; public HerbUtil() { //å è½½æ ç¾å°herbNamesä¸ this.loadHerbNames(); //åå§å模åå·¥ä½ this.init(); } public List<Classifications.Classification> predict(InputStream inputStream) { List<Classifications.Classification> result = new ArrayList<>(); Image input = this.resizeImage(inputStream); try { Classifications output = predictor.predict(input); System.out.println("æ¨æµä¸ºï¼" + output.best().getClassName() + ", æ¦çï¼" + output.best().getProbability()); System.out.println(output); result = output.topK(); } catch (Exception e) { log.error("è¯æè¯å«å¼å¸¸ï¼ï¼"); log.error(input.toString()); log.error(predictor.toString()); e.printStackTrace(); } return result; } private void loadHerbNames() { BufferedReader reader = null; herbNames = new ArrayList<>(); try { InputStream in = HerbUtil.class.getClassLoader().getResourceAsStream("class.txt"); reader = new BufferedReader(new InputStreamReader(in)); String name = null; while ((name = reader.readLine()) != null) { herbNames.add(name); } System.out.println(herbNames); } catch (Exception e) { e.printStackTrace(); } finally { if (reader != null) { try { reader.close(); } catch (IOException e) { e.printStackTrace(); } } } } private void init() { Translator<Image, Classifications> translator = ImageClassificationTranslator.builder() //ä¸é¢çtransformæ ¹æ®èªå·±çæ¹ .addTransform(new CenterCrop(INPUT_SIZE,INPUT_SIZE)) .addTransform(new ToTensor()) .addTransform(new Normalize( new float[] {0.485f, 0.456f, 0.406f}, new float[] {0.229f, 0.224f, 0.225f})) //è½½å ¥æææ ç¾è¿å» .optSynset(herbNames) //æç»æ¾ç¤ºæ¦çæé«ç5个 .optTopK(5) .build(); //é便起å Model model = Model.newInstance("model", Device.cpu()); try { // ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); // Resource[] resources = resolver.getResources("../pytorch/model34.pt"); // Resource resource = resources[0]; File f = new File("../pytorch/model34.pt"); InputStream inputStream = new FileInputStream(f); // InputStream inputStream = HerbUtil.class.getClassLoader().getResourceAsStream("model34.pt"); if (inputStream == null) { throw new RuntimeException("æ¾ä¸å°æ¨¡åæ件"); } model.load(inputStream); predictor = model.newPredictor(translator); } catch (Exception e) { e.printStackTrace(); } } private Image resizeImage(InputStream inputStream) { BufferedImage input = null; try { input = ImageIO.read(inputStream); } catch (IOException e) { e.printStackTrace(); } int iw = input.getWidth(), ih = input.getHeight(); int w = 256, h = 256; double scale = Math.max(1. * w / iw, 1. * h / ih); int nw = (int) (iw * scale), nh = (int) (ih * scale); java.awt.Image img; //åªæ太é¿æ太宽æä¼ä¿ç横纵æ¯ï¼å¡«å é¢è² // boolean needResize = 1. * iw / ih > 1.4 || 1. * ih / iw > 1.4; // if (needResize) { img = input.getScaledInstance(nw, nh, BufferedImage.SCALE_SMOOTH); // } else { // img = input.getScaledInstance(INPUT_SIZE, INPUT_SIZE, BufferedImage.SCALE_SMOOTH); // } BufferedImage out = new BufferedImage(nw, nh, BufferedImage.TYPE_INT_RGB); Graphics g = out.getGraphics(); //å å°æ´ä¸ª224*224åºåå¡«å 128 128 128é¢è² g.setColor(new Color(255, 255, 255)); g.fillRect(0, 0, nw, nh); out.getGraphics().drawImage(img, 0, 0, null); ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); try { ImageOutputStream imageOutputStream = ImageIO.createImageOutputStream(outputStream); ImageIO.write(out, "jpg", imageOutputStream); //å»Dççææ ImageIO.write(out, "jpg", new File("E:\\out.jpg")); InputStream is = new ByteArrayInputStream(outputStream.toByteArray()); return ImageFactory.getInstance().fromInputStream(is); } catch (IOException e) { e.printStackTrace(); throw new RuntimeException("å¾ç转æ¢å¤±è´¥"); } } } //package org.jeecg.modules.dry.util; // //import ai.djl.Device; //import ai.djl.Model; //import ai.djl.inference.Predictor; //import ai.djl.modality.Classifications; //import ai.djl.modality.cv.Image; //import ai.djl.modality.cv.ImageFactory; //import ai.djl.modality.cv.transform.*; //import ai.djl.modality.cv.translator.ImageClassificationTranslator; //import ai.djl.translate.Translator; //import lombok.extern.slf4j.Slf4j; //import org.springframework.core.io.Resource; //import org.springframework.core.io.support.PathMatchingResourcePatternResolver; //import org.springframework.core.io.support.ResourcePatternResolver; //import org.springframework.stereotype.Component; // //import javax.imageio.ImageIO; //import javax.imageio.stream.ImageOutputStream; //import java.awt.*; //import java.awt.image.BufferedImage; //import java.io.*; //import java.util.ArrayList; //import java.util.List; // //@Slf4j //@Component //public class HerbUtil { // // //è§å®è¾å ¥å°ºå¯¸ // private static final int INPUT_SIZE = 224; // // private static final int TARGET_SIZE = 256; // // //æ ç¾æ件 ä¸ç§ç±»å«ååå ä¸è¡ // private List<String> herbNames; // // //ç¨äºè¯å« // Predictor<Image, Classifications> predictor; // // //模å // private Model model; // // public HerbUtil() { // //å è½½æ ç¾å°herbNamesä¸ // this.loadHerbNames(); // //åå§å模åå·¥ä½ // this.init(); // // // // } // // public List<Classifications.Classification> predict(InputStream inputStream) { // List<Classifications.Classification> result = new ArrayList<>(); // Image input = this.resizeImage(inputStream); // try { // Classifications output = predictor.predict(input); // System.out.println("æ¨æµä¸ºï¼" + output.best().getClassName() // + ", æ¦çï¼" + output.best().getProbability()); // System.out.println(output); // result = output.topK(); // } catch (Exception e) { // log.error("è¯æè¯å«å¼å¸¸ï¼ï¼"); // log.error(input.toString()); // log.error(predictor.toString()); // e.printStackTrace(); // } // return result; // } // // private void loadHerbNames() { // BufferedReader reader = null; // herbNames = new ArrayList<>(); // try { // InputStream in = HerbUtil.class.getClassLoader().getResourceAsStream("class.txt"); // reader = new BufferedReader(new InputStreamReader(in)); // String name = null; // while ((name = reader.readLine()) != null) { // herbNames.add(name); // } // System.out.println(herbNames); // } catch (Exception e) { // e.printStackTrace(); // } finally { // if (reader != null) { // try { // reader.close(); // } catch (IOException e) { // e.printStackTrace(); // } // } // } // } // // private void init() { // Translator<Image, Classifications> translator = ImageClassificationTranslator.builder() // //ä¸é¢çtransformæ ¹æ®èªå·±çæ¹ // .addTransform(new CenterCrop(INPUT_SIZE,INPUT_SIZE)) // // .addTransform(new ToTensor()) // .addTransform(new Normalize( // new float[] {0.485f, 0.456f, 0.406f}, // new float[] {0.229f, 0.224f, 0.225f})) // // //è½½å ¥æææ ç¾è¿å» // .optSynset(herbNames) // //æç»æ¾ç¤ºæ¦çæé«ç5个 // .optTopK(5) // .build(); // //é便起å // Model model = Model.newInstance("model", Device.cpu()); // try { //// ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); //// Resource[] resources = resolver.getResources("../pytorch/model34.pt"); // // Resource resource = resources[0]; // File f = new File("../pytorch/model34.pt"); // // InputStream inputStream = new FileInputStream(f); // // InputStream inputStream = HerbUtil.class.getClassLoader().getResourceAsStream("model34.pt"); // if (inputStream == null) { // throw new RuntimeException("æ¾ä¸å°æ¨¡åæ件"); // } // model.load(inputStream); // // predictor = model.newPredictor(translator); // } catch (Exception e) { // e.printStackTrace(); // } // } // // private Image resizeImage(InputStream inputStream) { // BufferedImage input = null; // try { // input = ImageIO.read(inputStream); // } catch (IOException e) { // e.printStackTrace(); // } // int iw = input.getWidth(), ih = input.getHeight(); // int w = 256, h = 256; // double scale = Math.max(1. * w / iw, 1. * h / ih); // int nw = (int) (iw * scale), nh = (int) (ih * scale); // java.awt.Image img; // //åªæ太é¿æ太宽æä¼ä¿ç横纵æ¯ï¼å¡«å é¢è² // // boolean needResize = 1. * iw / ih > 1.4 || 1. * ih / iw > 1.4; // // if (needResize) { // img = input.getScaledInstance(nw, nh, BufferedImage.SCALE_SMOOTH); // // } else { // // img = input.getScaledInstance(INPUT_SIZE, INPUT_SIZE, BufferedImage.SCALE_SMOOTH); // // } // BufferedImage out = new BufferedImage(nw, nh, BufferedImage.TYPE_INT_RGB); // Graphics g = out.getGraphics(); // //å å°æ´ä¸ª224*224åºåå¡«å 128 128 128é¢è² // g.setColor(new Color(255, 255, 255)); // g.fillRect(0, 0, nw, nh); // out.getGraphics().drawImage(img, 0, 0, null); // ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); // try { // ImageOutputStream imageOutputStream = ImageIO.createImageOutputStream(outputStream); // ImageIO.write(out, "jpg", imageOutputStream); // //å»Dççææ // ImageIO.write(out, "jpg", new File("E:\\out.jpg")); // InputStream is = new ByteArrayInputStream(outputStream.toByteArray()); // return ImageFactory.getInstance().fromInputStream(is); // } catch (IOException e) { // e.printStackTrace(); // throw new RuntimeException("å¾ç转æ¢å¤±è´¥"); // } // } //} jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/BaseParam.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,35 @@ package org.jeecg.modules.dry.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @Data @XmlRootElement(name = "BaseParam") @XmlAccessorType(XmlAccessType.FIELD) public class BaseParam { /**ç´¢å¼*/ @XmlElement(name = "index") @ApiModelProperty(value = "ç´¢å¼") private String index; /**ç¼ç */ @XmlElement(name = "code") @ApiModelProperty(value = "ç¼ç ") private String code; /**å称*/ @XmlElement(name = "name") @ApiModelProperty(value = "å称") private String name; /**ç±»å*/ @XmlElement(name = "typ") @ApiModelProperty(value = "ç±»å") private String typ; /**ab*/ @XmlElement(name = "ab") @ApiModelProperty(value = "ab") private String ab; } jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/CommandMessageVo.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryEquipmentVo.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,94 @@ package org.jeecg.modules.dry.vo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.experimental.Accessors; import org.jeecg.common.aspect.annotation.Dict; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; /** * @Description: å¹²ç¥æº * @Author: jeecg-boot * @Date: 2023-03-08 * @Version: V1.0 */ @Data @EqualsAndHashCode(callSuper = false) @ToString public class DryEquipmentVo implements Serializable { /**id*/ @ApiModelProperty(value = "id") private String id; /**设å¤ç¼å·*/ @Excel(name = "设å¤ç¼å·", width = 15) @ApiModelProperty(value = "设å¤ç¼å·") private String code; /**设å¤å称*/ @Excel(name = "设å¤å称", width = 15) @ApiModelProperty(value = "设å¤å称") private String name; /**设å¤ç±»å*/ @Excel(name = "设å¤ç±»å", width = 15, dictTable = "dry_eqp_type", dicText = "name", dicCode = "id") @Dict(dictTable = "dry_eqp_type", dicText = "name", dicCode = "id") @ApiModelProperty(value = "设å¤ç±»å") private String type; /**设å¤æè¿°*/ @Excel(name = "设å¤æè¿°", width = 15) @ApiModelProperty(value = "设å¤æè¿°") private String remark; /**车é´id*/ @Excel(name = "车é´id", width = 15, dictTable = "dry_shop", dicText = "name", dicCode = "id") @Dict(dictTable = "dry_shop", dicText = "name", dicCode = "id") @ApiModelProperty(value = "车é´id") private String shopId; /**å¯ç¨ç¶æ*/ @Excel(name = "å¯ç¨ç¶æ", width = 15) @ApiModelProperty(value = "å¯ç¨ç¶æ") private String enable; /**å建人*/ @ApiModelProperty(value = "å建人") private String createBy; /**å建æ¥æ*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "å建æ¥æ") private Date createTime; /**æ´æ°äºº*/ @ApiModelProperty(value = "æ´æ°äºº") private String updateBy; /**æ´æ°æ¥æ*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "æ´æ°æ¥æ") private Date updateTime; /**ç§æ·id*/ @Excel(name = "ç§æ·id", width = 15) @ApiModelProperty(value = "ç§æ·id") private Integer tenantId; /**设å¤IP*/ @Excel(name = "设å¤IP", width = 15) @ApiModelProperty(value = "设å¤IP") private String ip; @Excel(name = "å¹²ç¥æç", width = 15) @ApiModelProperty(value = "å¹²ç¥æç") private String dryEfficiency; @Excel(name = "è¸æ±½åè", width = 15) @ApiModelProperty(value = "è¸æ±½åè") private String steamConsumption; @Excel(name = "çµè½åè", width = 15) @ApiModelProperty(value = "çµè½åè") private String powerConsumption; } jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryFault.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryFaultRecordVo.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,32 @@ package org.jeecg.modules.dry.vo; import lombok.Data; import org.jeecg.modules.dry.entity.DryFaultRecord; import java.io.Serializable; import java.util.Date; /** */ @Data public class DryFaultRecordVo extends DryFaultRecord implements Serializable { private static final long serialVersionUID = 1L; //redisæ éç»æææ¯ private Integer eCount; //设å¤å称 private String equName; //ç§æ·å称 private String tenantName; public DryFaultRecordVo() { } public DryFaultRecordVo(String orderId, Integer tenantId, String faultName, Integer faultType, Date startTime, Date endTime, Integer eCount, String equName, String tenantName) { super(orderId, tenantId, faultName, faultType, startTime, endTime); this.eCount = eCount; this.equName = equName; this.tenantName = tenantName; } } jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryHelloPage.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryHerbFormulaHisVo.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,94 @@ package org.jeecg.modules.dry.vo; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; import org.jeecg.modules.dry.entity.DryHerbFormula; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; @Data @NoArgsConstructor @ApiModel(value="dry_herb_formula_his vo对象", description="é æ¹è®°å½VO") public class DryHerbFormulaHisVo implements Serializable { /**设å¤*/ @ApiModelProperty(value = "设å¤") private String eqp; /**å·¥åå·*/ @ApiModelProperty(value = "å·¥åå·") private String orderCode; /**å·¥åæ¶é´*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "å·¥åæ¶é´") private Date orderTime; /**ç´¢å¼*/ @ApiModelProperty(value = "ç´¢å¼") private String index; /**ç¼ç */ @ApiModelProperty(value = "ç¼ç ") private String code; /**å称*/ @ApiModelProperty(value = "å称") private String name; /**ç±»å*/ @ApiModelProperty(value = "ç±»å") private String typ; /**ab*/ @ApiModelProperty(value = "ab") private String ab; /**ææéï¼çï¼*/ @ApiModelProperty(value = "ææéï¼çï¼") private Double weight1; /**åå§éé*/ @ApiModelProperty(value = "åå§éé") private Double weight2; /**å¹²ç¥æ»æ¶é´*/ @ApiModelProperty(value = "å¹²ç¥æ»æ¶é´") private Integer times; /**çé£æ¸©åº¦*/ @ApiModelProperty(value = "çé£æ¸©åº¦") private Double temp1; /**ç¯å¢æ¸©åº¦*/ @ApiModelProperty(value = "ç¯å¢æ¸©åº¦") private Double temp2; /**ç¯å¢æ¹¿åº¦*/ @ApiModelProperty(value = "ç¯å¢æ¹¿åº¦") private Double temp3; /**è¡æ延æ¶ms*/ @ApiModelProperty(value = "è¡æ延æ¶ms") private Double delay; /**ç¿»æ次æ°*/ @ApiModelProperty(value = "ç¿»æ次æ°") private Integer turntime; /**åå§å«æ°´ç*/ @ApiModelProperty(value = "åå§å«æ°´ç") private Double moisture1; /**ç®æ å«æ°´ç*/ @ApiModelProperty(value = "ç®æ å«æ°´ç") private Double moisture3; /**è¯æåç±»*/ @ApiModelProperty(value = "è¯æåç±»") private Integer mtype; /**å«æ°´çè¡¥å¿*/ @ApiModelProperty(value = "å«æ°´çè¡¥å¿") private Double moisoffset; /**å·é£æ¶é¿*/ @ApiModelProperty(value = "å·é£æ¶é¿") private Double coldwind; /**ç§æ·id*/ @ApiModelProperty(value = "ç§æ·id") private Integer tenantId; } jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryHerbInfoVo.javaold mode 100644 new mode 100755
@@ -6,6 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.ToString; import org.jeecg.common.aspect.annotation.Dict; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; @@ -39,6 +40,11 @@ @Excel(name = "è±æå", width = 15) @ApiModelProperty(value = "è±æå") private String english; /**è¯æåç±»*/ @Excel(name = "è¯æåç±»", width = 15, dictTable = "dry_herb_type", dicText = "name", dicCode = "id") @Dict(dictTable = "dry_herb_type", dicText = "name", dicCode = "id") @ApiModelProperty(value = "è¯æåç±»") private String type; /**è¯ç¨é¨ä½*/ @Excel(name = "è¯ç¨é¨ä½", width = 15) @ApiModelProperty(value = "è¯ç¨é¨ä½") jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOpcMsgVo.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderTrendVo.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.javaold mode 100644 new mode 100755
@@ -163,7 +163,7 @@ private String warning; /**ç¶æ**/ private Map<String, Object> eqp_state; // private Map<String, Object> eqp_state; /**设å¤ç¶æ**/ private String eqp_status; @@ -175,6 +175,10 @@ */ private Double reduce; /**å¹³åæç**/ private Double efficAvg; /**å¹³åæ±½è**/ private Double steamAvg;
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,10 @@ package org.jeecg.modules.dry.vo; import lombok.Data; @Data public class DryRecentOrderAvg { private Double efficAvg; private Double steamAvg; private Double wattAvg; } jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/Formula.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,24 @@ package org.jeecg.modules.dry.vo; import lombok.Data; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @Data @XmlRootElement(name = "Formula") @XmlAccessorType(XmlAccessType.FIELD) public class Formula { @XmlElement(name = "BaseParam") private BaseParam baseParam; @XmlElement(name = "WaterParam") private WaterParam waterParam; @XmlElement(name = "TypeParam") private TypeParam typeParam; @XmlElement(name = "OffsetParam") private OffsetParam offsetParam; } jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/Formulas.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,17 @@ package org.jeecg.modules.dry.vo; import lombok.Data; import lombok.NoArgsConstructor; import javax.xml.bind.annotation.*; import java.util.ArrayList; import java.util.List; @Data @NoArgsConstructor @XmlRootElement(name = "Formulas") @XmlAccessorType(XmlAccessType.FIELD) public class Formulas { @XmlElement(name = "Formula") private List<Formula> dryFormulaList = new ArrayList<>(); } jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/MoEquVo.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/OffsetParam.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,24 @@ package org.jeecg.modules.dry.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @Data @XmlRootElement(name = "OffsetParam") @XmlAccessorType(XmlAccessType.FIELD) public class OffsetParam { /**å«æ°´çè¡¥å¿*/ @XmlElement(name = "moisoffset") @ApiModelProperty(value = "å«æ°´çè¡¥å¿") private Double moisoffset; /**å·é£æ¶é¿*/ @XmlElement(name = "coldwind") @ApiModelProperty(value = "å·é£æ¶é¿") private Double coldwind; } jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/RealTimeDataVo.javaold mode 100644 new mode 100755
@@ -1,5 +1,6 @@ package org.jeecg.modules.dry.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import io.swagger.models.auth.In; import lombok.Data; @@ -13,6 +14,8 @@ @Data @ToString public class RealTimeDataVo { private static final long serialVersionUID = 1L; /**å·¥åID*/ private String orderId; @@ -91,7 +94,7 @@ private Integer ai_time; private List<DryEquipment> eqpCodes; // private List<DryEquipment> eqpCodes; /**æ¥ç®¡ç¶æ 0ï¼èªå¨ 1ï¼æå¨ */ @@ -113,7 +116,7 @@ private Integer workorder_status; /**åé¨ä½ç¶æ**/ private Map<String, Object> eqp_state; // private Map<String, Object> eqp_state; /**设å¤ç¶æ**/ private String eqp_status; @@ -137,6 +140,7 @@ private String report_head_num ; //æ°é--16æ¡/355.8Kg private String report_head_machine ; //è®¾å¤ private String report_head_accepter; //æ¥æ人 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") private Date report_head_date ; //ç产æ¥æ private String report_head_leader ; //çç»é¿ private String report_head_techer ; //å·¥èºå @@ -172,6 +176,7 @@ private Boolean report_clean_door ; //é¨çªæ¸ ç private Boolean report_clean_box ; //ç®±ä½æ¸ ç private Boolean report_clean_record ; //ç产记å½æ¸ ç @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") private Date report_clean_date ; //æ¸ åºæ¥æ private String report_clean_man ; //æ¸ åºäºº private Boolean report_clean_confirm ; //æ¸ åºç¡®è®¤ jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/SocketMsgVo.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/StatisticsDataVo.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,87 @@ package org.jeecg.modules.dry.vo; import lombok.Data; import lombok.ToString; import org.jeecg.modules.dry.entity.DryEquipment; import java.util.Date; import java.util.List; import java.util.Map; @Data @ToString public class StatisticsDataVo { /**å·¥åID*/ private String orderId; /**å·¥åå·*/ private String workorder; /**é æ¹ç´¢å¼*/ private Integer index; /**è¯æå称*/ private String name; /**ç§æ·ID*/ private Integer tenantid; /**设å¤ç¼å·*/ private String machineid; /**æ é**/ private String eqp_fault; /**设å¤æ¥è¦**/ private String eqp_warning; /**---------------------ç产记å½ç¸å ³å段å®ä¹---s-------------------------*/ private Boolean report_flag; // æ交æ å¿ private String report_head_name; // åå private String report_head_batch ; //æ¹æ¬¡ private String report_head_num ; //æ°é--16æ¡/355.8Kg private String report_head_machine ; //è®¾å¤ private String report_head_accepter; //æ¥æ人 private Date report_head_date ; //ç产æ¥æ private String report_head_leader ; //çç»é¿ private String report_head_techer ; //å·¥èºå //æ£æ¥ private Boolean report_check_field ; //ç产ç°åº private Boolean report_check_file ; //æ§è¡æ件 private Boolean report_check_tag ; //ç©ææ 示 private Boolean report_check_tool ; //称éå¨å · private String report_check_man ; //æ£æ¥äºº private Boolean report_check_status; //æ£æ¥æ åµ private String report_check_qa ; //QA private String report_check_record ; //å¼å¸¸è®°å½ //ç产 private Boolean report_product_view ; //å¤è§æ£æ¥ private Boolean report_product_wind ; //å¹é£ private Boolean report_product_sun ; //æ private Boolean report_product_low_dry ; //ä½æ¸©å¹²ç¥ private Boolean report_product_dry ; //å¹²ç¥ private String report_product_start ; //å¼å§æ¶é´ private String report_product_end ; //ç»ææ¶é´ private Integer report_product_total ; //å¹²ç¥æ»æ¶é´ private Boolean report_product_check ; //å¹²ç¥æ£æ¥ private String report_product_man1 ; //æä½äºº private String report_product_man2 ; //å¤æ ¸äºº private Double report_product_weight ; //æä½åéé private Double report_product_waste ; //åºææ°é private Double report_product_use ; //æ¶ç private String report_product_qa ; //QA //æ¸ åº private Boolean report_clean_machine ; //设å¤æ¸ ç private Boolean report_clean_waste ; //åºææ¸ ç private Boolean report_clean_tool ; //å·¥å ·æ¸ ç private Boolean report_clean_door ; //é¨çªæ¸ ç private Boolean report_clean_box ; //ç®±ä½æ¸ ç private Boolean report_clean_record ; //ç产记å½æ¸ ç private Date report_clean_date ; //æ¸ åºæ¥æ private String report_clean_man ; //æ¸ åºäºº private Boolean report_clean_confirm ; //æ¸ åºç¡®è®¤ private String report_clean_qa ; //QA /**---------------------ç产记å½ç¸å ³å段å®ä¹---e-------------------------*/ } jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/TypeParam.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,20 @@ package org.jeecg.modules.dry.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @Data @XmlRootElement(name = "TypeParam") @XmlAccessorType(XmlAccessType.FIELD) public class TypeParam { /**è¯æåç±»*/ @XmlElement(name = "mtype") @ApiModelProperty(value = "è¯æåç±»") private Integer mtype; } jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/WaterParam.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,55 @@ package org.jeecg.modules.dry.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @Data @XmlRootElement(name = "WaterParam") @XmlAccessorType(XmlAccessType.FIELD) public class WaterParam { /**ææéï¼çï¼*/ @XmlElement(name = "weight1") @ApiModelProperty(value = "ææéï¼çï¼") private Double weight1; /**åå§éé*/ @XmlElement(name = "weight2") @ApiModelProperty(value = "åå§éé") private Double weight2; /**å¹²ç¥æ»æ¶é´*/ @XmlElement(name = "times") @ApiModelProperty(value = "å¹²ç¥æ»æ¶é´") private Integer times; /**çé£æ¸©åº¦*/ @XmlElement(name = "temp1") @ApiModelProperty(value = "çé£æ¸©åº¦") private Double temp1; /**ç¯å¢æ¸©åº¦*/ @XmlElement(name = "temp2") @ApiModelProperty(value = "ç¯å¢æ¸©åº¦") private Double temp2; /**ç¯å¢æ¹¿åº¦*/ @XmlElement(name = "temp3") @ApiModelProperty(value = "ç¯å¢æ¹¿åº¦") private Double temp3; /**è¡æ延æ¶ms*/ @XmlElement(name = "delay") @ApiModelProperty(value = "è¡æ延æ¶ms") private Double delay; /**ç¿»æ次æ°*/ @XmlElement(name = "turntime") @ApiModelProperty(value = "ç¿»æ次æ°") private Integer turntime; /**åå§å«æ°´ç*/ @XmlElement(name = "moisture1") @ApiModelProperty(value = "åå§å«æ°´ç") private Double moisture1; /**ç®æ å«æ°´ç*/ @XmlElement(name = "moisture3") @ApiModelProperty(value = "ç®æ å«æ°´ç") private Double moisture3; } jeecg-module-dry/jeecg-module-dry-biz/pom.xmlold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEqpTypeController.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.javaold mode 100644 new mode 100755
@@ -1,5 +1,6 @@ package org.jeecg.modules.dry.controller; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -9,6 +10,8 @@ import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import cn.hutool.core.bean.BeanUtil; import org.jeecg.common.api.vo.Result; import org.jeecg.common.config.TenantContext; import org.jeecg.common.system.query.QueryGenerator; @@ -16,6 +19,7 @@ import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; import org.jeecg.modules.dry.common.CacheConstants; import org.jeecg.modules.dry.entity.DryEqpType; import org.jeecg.modules.dry.entity.DryEquipment; import org.jeecg.modules.dry.service.IDryEqpTypeService; import org.jeecg.modules.dry.service.IDryEquipmentService; @@ -25,12 +29,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.jeecg.modules.dry.vo.DryEquipmentVo; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.base.controller.JeecgController; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -92,7 +98,7 @@ @ApiOperation(value="æ¥è¯¢ææå¹²ç¥æº", notes="æ¥è¯¢ææå¹²ç¥æº") @GetMapping(value = "/listAll") public Result<List<DryEquipment>> queryAllEquipment(DryEquipment dryEquipment, HttpServletRequest req) { public Result<List<DryEquipmentVo>> queryAllEquipment(DryEquipment dryEquipment, HttpServletRequest req) { //------------------------------------------------------------------------------------------------ //æ¯å¦å¼å¯ç³»ç»ç®¡ç模åçå¤ç§æ·æ°æ®é离ãSAASå¤ç§æ·æ¨¡å¼ã if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){ @@ -101,13 +107,38 @@ //------------------------------------------------------------------------------------------------ QueryWrapper<DryEquipment> queryWrapper = QueryGenerator.initQueryWrapper(dryEquipment, req.getParameterMap()); queryWrapper.orderByAsc("code"); List<DryEquipment> eqps = dryEquipmentService.list(queryWrapper); eqps.stream().forEach(item -> { item.setType(dryEqpTypeService.getById(item.getType()).getName()); }); return Result.OK(eqps); List<DryEquipmentVo> equipmentVos = getDryEquipmentVos(queryWrapper); return Result.OK(equipmentVos); } @NotNull private List<DryEquipmentVo> getDryEquipmentVos(QueryWrapper<DryEquipment> queryWrapper) { queryWrapper.orderByAsc("code"); List<DryEquipment> eqps = dryEquipmentService.list(queryWrapper); List<DryEquipmentVo> equipmentVos = new ArrayList<>(); eqps.stream().forEach(item -> { DryEquipmentVo dryEquipmentVo = BeanUtil.toBean(item, DryEquipmentVo.class); DryEqpType dryEqpType = dryEqpTypeService.getById(item.getType()); dryEquipmentVo.setType(dryEqpType.getName()); dryEquipmentVo.setDryEfficiency(dryEqpType.getDryEfficiency()); dryEquipmentVo.setSteamConsumption(dryEqpType.getSteamConsumption()); dryEquipmentVo.setPowerConsumption(dryEqpType.getPowerConsumption()); equipmentVos.add(dryEquipmentVo); }); return equipmentVos; } @ApiOperation(value="æ¥è¯¢ç§æ·ææå¹²ç¥æº", notes="æ¥è¯¢ç§æ·ææå¹²ç¥æº") @GetMapping(value = "/listTenantEqp") public Result<List<DryEquipmentVo>> queryTenantAllEquipment(DryEquipment dryEquipment, HttpServletRequest req) { TenantContext.setTenant(dryEquipment.getTenantId()+""); QueryWrapper<DryEquipment> queryWrapper = QueryGenerator.initQueryWrapper(dryEquipment, req.getParameterMap()); List<DryEquipmentVo> equipmentVos = getDryEquipmentVos(queryWrapper); return Result.OK(equipmentVos); } @@ -139,6 +170,7 @@ @RequiresPermissions("dry:dry_equipment:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result<String> edit(@RequestBody DryEquipment dryEquipment) { // å é¤redisç¼å redisUtil.del(CacheConstants.RedisKeyEnum.EQP_MAP.getCode()); dryEquipmentService.updateById(dryEquipment); @@ -186,13 +218,18 @@ //@AutoLog(value = "å¹²ç¥æº-éè¿idæ¥è¯¢") @ApiOperation(value="å¹²ç¥æº-éè¿idæ¥è¯¢", notes="å¹²ç¥æº-éè¿idæ¥è¯¢") @GetMapping(value = "/queryById") public Result<DryEquipment> queryById(@RequestParam(name="id",required=true) String id) { public Result<DryEquipmentVo> queryById(@RequestParam(name="id",required=true) String id) { DryEquipment dryEquipment = dryEquipmentService.getById(id); dryEquipment.setType(dryEqpTypeService.getById(dryEquipment.getType()).getName()); DryEquipmentVo dryEquipmentVo = BeanUtil.toBean(dryEquipment, DryEquipmentVo.class); DryEqpType dryEqpType = dryEqpTypeService.getById(dryEquipment.getType()); dryEquipmentVo.setType(dryEqpType.getName()); dryEquipmentVo.setDryEfficiency(dryEqpType.getDryEfficiency()); dryEquipmentVo.setSteamConsumption(dryEqpType.getSteamConsumption()); dryEquipmentVo.setPowerConsumption(dryEqpType.getPowerConsumption()); if(dryEquipment==null) { return Result.error("æªæ¾å°å¯¹åºæ°æ®"); } return Result.OK(dryEquipment); return Result.OK(dryEquipmentVo); } /** jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryFaultRecordController.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,184 @@ package org.jeecg.modules.dry.controller; import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.jeecg.common.api.vo.Result; import org.jeecg.common.config.TenantContext; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.modules.dry.entity.DryFaultRecord; import org.jeecg.modules.dry.service.IDryFaultRecordService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; import org.apache.shiro.authz.annotation.RequiresPermissions; /** * @Description: dry_eqp_fault * @Author: jeecg-boot * @Date: 2024-11-13 * @Version: V1.0 */ @Api(tags="dry_eqp_fault") @RestController @RequestMapping("/dry/dryEqpFault") @Slf4j public class DryFaultRecordController extends JeecgController<DryFaultRecord, IDryFaultRecordService> { @Autowired private IDryFaultRecordService dryEqpFaultService; /** * å页å表æ¥è¯¢ * * @param dryEqpFault * @param pageNo * @param pageSize * @param req * @return */ //@AutoLog(value = "dry_eqp_fault-å页å表æ¥è¯¢") @ApiOperation(value="dry_eqp_fault-å页å表æ¥è¯¢", notes="dry_eqp_fault-å页å表æ¥è¯¢") @GetMapping(value = "/list") public Result<IPage<DryFaultRecord>> queryPageList(DryFaultRecord dryEqpFault, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { QueryWrapper<DryFaultRecord> queryWrapper = QueryGenerator.initQueryWrapper(dryEqpFault, req.getParameterMap()); Page<DryFaultRecord> page = new Page<DryFaultRecord>(pageNo, pageSize); IPage<DryFaultRecord> pageList = dryEqpFaultService.page(page, queryWrapper); return Result.OK(pageList); } @RequestMapping(value = "/queryByOrderId", method = RequestMethod.GET) public Result<List<DryFaultRecord>> queryByOrderId(@RequestParam(name="orderId",required=true) String orderId, @RequestParam(name="tenantId",required=true) String tenantId) { TenantContext.setTenant(tenantId); Result<List<DryFaultRecord>> result = new Result<List<DryFaultRecord>>(); try { List<DryFaultRecord> pageList = dryEqpFaultService.queryByOrderId(orderId); result.setResult(pageList); result.setSuccess(true); } catch (Exception e) { log.error(e.getMessage(),e); } return result; } /** * æ·»å * * @param dryEqpFault * @return */ @AutoLog(value = "dry_eqp_fault-æ·»å ") @ApiOperation(value="dry_eqp_fault-æ·»å ", notes="dry_eqp_fault-æ·»å ") @RequiresPermissions("org.jeecg.modules.dry.mqtt:dry_eqp_fault:add") @PostMapping(value = "/add") public Result<String> add(@RequestBody DryFaultRecord dryEqpFault) { dryEqpFaultService.save(dryEqpFault); return Result.OK("æ·»å æåï¼"); } /** * ç¼è¾ * * @param dryEqpFault * @return */ @AutoLog(value = "dry_eqp_fault-ç¼è¾") @ApiOperation(value="dry_eqp_fault-ç¼è¾", notes="dry_eqp_fault-ç¼è¾") @RequiresPermissions("org.jeecg.modules.dry.mqtt:dry_eqp_fault:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result<String> edit(@RequestBody DryFaultRecord dryEqpFault) { dryEqpFaultService.updateById(dryEqpFault); return Result.OK("ç¼è¾æå!"); } /** * éè¿idå é¤ * * @param id * @return */ @AutoLog(value = "dry_eqp_fault-éè¿idå é¤") @ApiOperation(value="dry_eqp_fault-éè¿idå é¤", notes="dry_eqp_fault-éè¿idå é¤") @RequiresPermissions("org.jeecg.modules.dry.mqtt:dry_eqp_fault:delete") @DeleteMapping(value = "/delete") public Result<String> delete(@RequestParam(name="id",required=true) String id) { dryEqpFaultService.removeById(id); return Result.OK("å é¤æå!"); } /** * æ¹éå é¤ * * @param ids * @return */ @AutoLog(value = "dry_eqp_fault-æ¹éå é¤") @ApiOperation(value="dry_eqp_fault-æ¹éå é¤", notes="dry_eqp_fault-æ¹éå é¤") @RequiresPermissions("org.jeecg.modules.dry.mqtt:dry_eqp_fault:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.dryEqpFaultService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("æ¹éå é¤æå!"); } /** * éè¿idæ¥è¯¢ * * @param id * @return */ //@AutoLog(value = "dry_eqp_fault-éè¿idæ¥è¯¢") @ApiOperation(value="dry_eqp_fault-éè¿idæ¥è¯¢", notes="dry_eqp_fault-éè¿idæ¥è¯¢") @GetMapping(value = "/queryById") public Result<DryFaultRecord> queryById(@RequestParam(name="id",required=true) String id) { DryFaultRecord dryEqpFault = dryEqpFaultService.getById(id); if(dryEqpFault==null) { return Result.error("æªæ¾å°å¯¹åºæ°æ®"); } return Result.OK(dryEqpFault); } /** * 导åºexcel * * @param request * @param dryEqpFault */ @RequiresPermissions("org.jeecg.modules.dry.mqtt:dry_eqp_fault:exportXls") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, DryFaultRecord dryEqpFault) { return super.exportXls(request, dryEqpFault, DryFaultRecord.class, "dry_eqp_fault"); } /** * éè¿excelå¯¼å ¥æ°æ® * * @param request * @param response * @return */ @RequiresPermissions("org.jeecg.modules.dry.mqtt:dry_eqp_fault:importExcel") @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, DryFaultRecord.class); } } jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryHelloController.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryHerbController.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryHerbFormulaController.javaold mode 100644 new mode 100755
@@ -81,6 +81,7 @@ return Result.OK(pageList); } /** * æ·»å * jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryHerbFormulaHisController.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,178 @@ package org.jeecg.modules.dry.controller; import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.stream.Collectors; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.dry.entity.DryHerbFormulaHis; import org.jeecg.modules.dry.service.IDryHerbFormulaHisService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; import org.apache.shiro.authz.annotation.RequiresPermissions; /** * @Description: é æ¹è®°å½ * @Author: jeecg-boot * @Date: 2024-08-19 * @Version: V1.0 */ @Api(tags="é æ¹è®°å½") @RestController @RequestMapping("/dry/dryHerbFormulaHis") @Slf4j public class DryHerbFormulaHisController extends JeecgController<DryHerbFormulaHis, IDryHerbFormulaHisService> { @Autowired private IDryHerbFormulaHisService dryHerbFormulaHisService; /** * å页å表æ¥è¯¢ * * @param dryHerbFormulaHis * @param pageNo * @param pageSize * @param req * @return */ //@AutoLog(value = "é æ¹è®°å½-å页å表æ¥è¯¢") @ApiOperation(value="é æ¹è®°å½-å页å表æ¥è¯¢", notes="é æ¹è®°å½-å页å表æ¥è¯¢") @GetMapping(value = "/list") public Result<IPage<DryHerbFormulaHis>> queryPageList(DryHerbFormulaHis dryHerbFormulaHis, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { QueryWrapper<DryHerbFormulaHis> queryWrapper = QueryGenerator.initQueryWrapper(dryHerbFormulaHis, req.getParameterMap()); Page<DryHerbFormulaHis> page = new Page<DryHerbFormulaHis>(pageNo, pageSize); IPage<DryHerbFormulaHis> pageList = dryHerbFormulaHisService.page(page, queryWrapper); return Result.OK(pageList); } /** * æ·»å * * @param dryHerbFormulaHis * @return */ @AutoLog(value = "é æ¹è®°å½-æ·»å ") @ApiOperation(value="é æ¹è®°å½-æ·»å ", notes="é æ¹è®°å½-æ·»å ") @RequiresPermissions("dry:dry_herb_formula_his:add") @PostMapping(value = "/add") public Result<String> add(@RequestBody DryHerbFormulaHis dryHerbFormulaHis) { dryHerbFormulaHisService.save(dryHerbFormulaHis); return Result.OK("æ·»å æåï¼"); } /** * ç¼è¾ * * @param dryHerbFormulaHis * @return */ @AutoLog(value = "é æ¹è®°å½-ç¼è¾") @ApiOperation(value="é æ¹è®°å½-ç¼è¾", notes="é æ¹è®°å½-ç¼è¾") @RequiresPermissions("dry:dry_herb_formula_his:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result<String> edit(@RequestBody DryHerbFormulaHis dryHerbFormulaHis) { dryHerbFormulaHisService.updateById(dryHerbFormulaHis); return Result.OK("ç¼è¾æå!"); } /** * éè¿idå é¤ * * @param id * @return */ @AutoLog(value = "é æ¹è®°å½-éè¿idå é¤") @ApiOperation(value="é æ¹è®°å½-éè¿idå é¤", notes="é æ¹è®°å½-éè¿idå é¤") @RequiresPermissions("dry:dry_herb_formula_his:delete") @DeleteMapping(value = "/delete") public Result<String> delete(@RequestParam(name="id",required=true) String id) { dryHerbFormulaHisService.removeById(id); return Result.OK("å é¤æå!"); } /** * æ¹éå é¤ * * @param ids * @return */ @AutoLog(value = "é æ¹è®°å½-æ¹éå é¤") @ApiOperation(value="é æ¹è®°å½-æ¹éå é¤", notes="é æ¹è®°å½-æ¹éå é¤") @RequiresPermissions("dry:dry_herb_formula_his:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.dryHerbFormulaHisService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("æ¹éå é¤æå!"); } /** * éè¿idæ¥è¯¢ * * @param id * @return */ //@AutoLog(value = "é æ¹è®°å½-éè¿idæ¥è¯¢") @ApiOperation(value="é æ¹è®°å½-éè¿idæ¥è¯¢", notes="é æ¹è®°å½-éè¿idæ¥è¯¢") @GetMapping(value = "/queryById") public Result<DryHerbFormulaHis> queryById(@RequestParam(name="id",required=true) String id) { DryHerbFormulaHis dryHerbFormulaHis = dryHerbFormulaHisService.getById(id); if(dryHerbFormulaHis==null) { return Result.error("æªæ¾å°å¯¹åºæ°æ®"); } return Result.OK(dryHerbFormulaHis); } /** * 导åºexcel * * @param request * @param dryHerbFormulaHis */ @RequiresPermissions("dry:dry_herb_formula_his:exportXls") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, DryHerbFormulaHis dryHerbFormulaHis) { return super.exportXls(request, dryHerbFormulaHis, DryHerbFormulaHis.class, "é æ¹è®°å½"); } /** * éè¿excelå¯¼å ¥æ°æ® * * @param request * @param response * @return */ @RequiresPermissions("dry:dry_herb_formula_his:importExcel") @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, DryHerbFormulaHis.class); } } jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryHerbInfoController.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryHerbTypeController.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOpcDeviceController.javaold mode 100644 new mode 100755
@@ -30,6 +30,7 @@ import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; @@ -50,6 +51,7 @@ @RestController @RequestMapping("/dry/dryOpcDevice") @Slf4j @ConditionalOnProperty(name = "kangaroohy.milo.enabled", havingValue = "true") public class DryOpcDeviceController extends JeecgController<DryOpcDevice, IDryOpcDeviceService> { @Autowired private IDryOpcDeviceService dryOpcDeviceService; @@ -58,7 +60,7 @@ @Autowired private MiloService miloService; /** * å页å表æ¥è¯¢ * @@ -99,7 +101,7 @@ return Result.OK(list); } /** * æ·»å * @@ -114,7 +116,7 @@ dryOpcDeviceService.save(dryOpcDevice); return Result.OK("æ·»å æåï¼"); } /** * ç¼è¾ * @@ -129,7 +131,7 @@ dryOpcDeviceService.updateById(dryOpcDevice); return Result.OK("ç¼è¾æå!"); } /** * éè¿idå é¤ * @@ -144,7 +146,7 @@ dryOpcDeviceService.removeById(id); return Result.OK("å é¤æå!"); } /** * æ¹éå é¤ * @@ -159,7 +161,7 @@ this.dryOpcDeviceService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("æ¹éå é¤æå!"); } /** * éè¿idæ¥è¯¢ * jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOrderController.javaold mode 100644 new mode 100755
@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSONObject; import org.jeecg.common.api.vo.Result; import org.jeecg.common.config.TenantContext; @@ -21,6 +22,8 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.modules.dry.service.IDryOrderTrendService; import org.jeecg.modules.dry.vo.DryOrderTrendVo; import org.jeecg.modules.dry.vo.DryOrderVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -43,6 +46,9 @@ public class DryOrderController extends JeecgController<DryOrder, IDryOrderService> { @Autowired private IDryOrderService dryOrderService; @Autowired private IDryOrderTrendService dryOrderTrendService; /** * å页å表æ¥è¯¢ @@ -142,7 +148,22 @@ return Result.OK("æ¹éå é¤æå!"); } /** /** * æ¹éä¸åå·¥å * @param ids * @return */ @AutoLog(value = "å¹²ç¥å·¥å-æ¹éä¸å") @ApiOperation(value="å¹²ç¥å·¥å-æ¹éä¸å", notes="å¹²ç¥å·¥å-æ¹éä¸å") @RequiresPermissions("dry:dry_order:edit") @PostMapping(value = "/sendBatch") public Result<String> sendBatch(@RequestParam(name="ids",required=true) String ids) { this.dryOrderService.sendByIds(Arrays.asList(ids.split(","))); return Result.OK("æ¹éä¸åæå!"); } /** * éè¿idæ¥è¯¢ * * @param id @@ -159,6 +180,20 @@ return Result.OK(dryOrder); } @ApiOperation(value="å¹²ç¥å·¥å-æ¥è¯¢è¿ç¨è¶å¿æ°æ®", notes="æ¥è¯¢è¿ç¨è¶å¿æ°æ®") @GetMapping(value = "/queryOrderTrendById") public Result<DryOrderVo> queryOrderTrendById(@RequestParam(name="id",required=true) String id) { DryOrder dryOrder = dryOrderService.getById(id); DryOrderVo orderVo; if(dryOrder ==null) { return Result.error("æªæ¾å°å¯¹åºæ°æ®"); } orderVo = BeanUtil.toBean(dryOrder, DryOrderVo.class); List<DryOrderTrendVo> trendVos = dryOrderTrendService.listByOrderId(orderVo.getId()); orderVo.setDetailList(trendVos); return Result.OK(orderVo); } /** * 导åºexcel * jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOrderTrendController.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryProdRecordController.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryRealTimeDataController.javaold mode 100644 new mode 100755
@@ -3,25 +3,44 @@ import ai.djl.modality.Classifications; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.thread.ThreadUtil; import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.dry.entity.DryHerbInfo; import org.jeecg.common.config.TenantContext; import org.jeecg.common.constant.MqttConstant; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.IpUtils; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; import org.jeecg.modules.dry.entity.*; import org.jeecg.modules.dry.mqtt.MqttConfig; import org.jeecg.modules.dry.mqtt.MqttUtil; import org.jeecg.modules.dry.service.*; import org.jeecg.modules.dry.util.HerbUtil; import org.jeecg.modules.dry.vo.CommandMessageVo; import org.jeecg.modules.dry.vo.DryHerbInfoVo; import org.jeecg.modules.dry.vo.RealTimeDataVo; //import org.jeecg.modules.dry.util.HerbUtil; import org.jeecg.modules.dry.vo.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; import java.io.InputStream; import java.io.StringWriter; import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -37,10 +56,32 @@ private IDryRealTimeDataService dryRealTimeDataService; @Autowired private HerbUtil herbUtil; private IDryHerbFormulaService dryHerbFormulaService; @Autowired private IDryHerbInfoService dryHerbInfoService; @Autowired private IDryEqpTypeService dryEqpTypeService; // @Autowired // private HerbUtil herbUtil; @Autowired private MqttUtil mqttUtil; @Autowired private MqttConfig mqttConfig; @Autowired private IDryHerbInfoService herbInfoService; @Autowired private IDryHerbFormulaHisService dryHerbFormulaHisService; @Autowired private IDryEquipmentService dryEquipmentService; @ApiOperation(value="æµè¯", notes="è¿åHello") @@ -51,7 +92,21 @@ @ApiOperation(value="æ¥æ¶å®æ¶æ°æ®Json", notes="设å¤å®æ¶æ°æ®ä¸ä¼ ") @PostMapping("/sendRealTimeDataJson") public Result<?> realTimeDataJson(@RequestBody RealTimeDataVo realTimeDataVo) { public Result<?> realTimeDataJson(@RequestBody RealTimeDataVo realTimeDataVo) { try { if ("user".equals(mqttConfig.getRole())){ MqttMessage mqttMessage = new MqttMessage(); mqttMessage.setQos(0); mqttMessage.setPayload(JSONObject.toJSONString(realTimeDataVo).getBytes()); mqttUtil.getMqttClient().publish(MqttConstant.TENANT_UP_PREFIX_REALTIME_DATA,mqttMessage); //å¤çæ éä¿¡æ¯ dryRealTimeDataService.fitFultRecord(realTimeDataVo); } } catch (MqttException e) { e.printStackTrace(); } return dryRealTimeDataService.realTimeDataHandle(realTimeDataVo); } @@ -85,43 +140,149 @@ return dryRealTimeDataService.sendSocketMsg(msgVo); } // // @ApiOperation(value = "è¯æè¯å«") // @PostMapping("/identify") // public Result<?> identify(@RequestParam("file") MultipartFile file) throws Exception { // try { // if (file.isEmpty()) { // throw new RuntimeException("ä¸ä¼ æ件ä¸è½ä¸ºç©º"); // } // InputStream inputStream = file.getInputStream(); // List<Classifications.Classification> predict = herbUtil.predict(inputStream); // // if(predict.size()>0) { // Map<String, Double> collect = predict.stream().collect(Collectors.toMap(Classifications.Classification::getClassName, Classifications.Classification::getProbability)); // // // List<DryHerbInfoVo> voList = new ArrayList<>(); // Set<String> strings = collect.keySet(); // List<DryHerbInfo> list = herbInfoService.list(new LambdaQueryWrapper<DryHerbInfo>().in(DryHerbInfo::getPinyin, strings)); // list.forEach(item -> { // DryHerbInfoVo dryHerbInfoVo = new DryHerbInfoVo(); // BeanUtil.copyProperties(item, dryHerbInfoVo); // dryHerbInfoVo.setProbabily(collect.get(item.getPinyin())); // voList.add(dryHerbInfoVo); // }); // // List<DryHerbInfoVo> collect1 = voList.stream().sorted(Comparator.comparing(DryHerbInfoVo::getProbabily, Comparator.reverseOrder())). // collect(Collectors.toList()); // // return Result.ok(collect1); // } else { // return Result.error("AIè¯å«æå¡å¼å¸¸"); // } // // } catch (Exception e) { // e.printStackTrace(); // return Result.error("AIè¯å«æå¡å¼å¸¸"); // } // } @ApiOperation(value = "è¯æè¯å«") @PostMapping("/identify") public Result<?> identify(@RequestParam("file") MultipartFile file) throws Exception { try { if (file.isEmpty()) { throw new RuntimeException("ä¸ä¼ æ件ä¸è½ä¸ºç©º"); } InputStream inputStream = file.getInputStream(); List<Classifications.Classification> predict = herbUtil.predict(inputStream); if(predict.size()>0) { Map<String, Double> collect = predict.stream().collect(Collectors.toMap(Classifications.Classification::getClassName, Classifications.Classification::getProbability)); List<DryHerbInfoVo> voList = new ArrayList<>(); Set<String> strings = collect.keySet(); List<DryHerbInfo> list = herbInfoService.list(new LambdaQueryWrapper<DryHerbInfo>().in(DryHerbInfo::getPinyin, strings)); list.forEach(item -> { DryHerbInfoVo dryHerbInfoVo = new DryHerbInfoVo(); BeanUtil.copyProperties(item, dryHerbInfoVo); dryHerbInfoVo.setProbabily(collect.get(item.getPinyin())); voList.add(dryHerbInfoVo); }); List<DryHerbInfoVo> collect1 = voList.stream().sorted(Comparator.comparing(DryHerbInfoVo::getProbabily, Comparator.reverseOrder())). collect(Collectors.toList()); return Result.ok(collect1); /** * æ ¹æ®è®¾å¤åç§æ·æ¥è¯¢è¯¥è®¾å¤ç±»åçå¹²ç¥é æ¹ï¼å°é æ¹è½¬æxmlæ ¼å¼ï¼ä»¥å符串æ¹å¼è¿å * @param tenantId * @param eqpCode * @return * @throws JAXBException */ @ApiOperation(value="å¹²ç¥é æ¹è·å", notes="å¹²ç¥é æ¹ä¸å") @GetMapping(value = "/queryFormula") public Result<String> queryFormulaByEqpType(Integer tenantId, String eqpCode) throws JAXBException { //è·årequest HttpServletRequest request = SpringContextUtils.getHttpServletRequest(); // è·å请æ±ä¸»æºçIPå°å String ip = IpUtils.getIpAddr(request); DryEquipment dryEquipment = dryEquipmentService.selectByTenantIdEquipmentId(tenantId+ "", eqpCode); if (dryEquipment != null) { if (dryEquipment.getIp().equals(ip)) { } else { return Result.error("AIè¯å«æå¡å¼å¸¸"); return Result.error("设å¤IPå°åæªé ç½®ï¼" + ip); } } else { return Result.error("设å¤ä¸åå¨"); } LambdaQueryWrapper<DryHerbFormula> queryWrapper = new LambdaQueryWrapper<DryHerbFormula>(); queryWrapper.eq(DryHerbFormula::getEqpType, dryEquipment.getType()) .eq(DryHerbFormula::getTenantId, tenantId); List<DryHerbFormula> list = dryHerbFormulaService.list(queryWrapper); Formulas formulas = new Formulas(); list.forEach(item -> { DryHerbInfo byId = dryHerbInfoService.getById(item.getHerbId()); if (byId!=null) { item.setPinyin(byId.getPinyin()); item.setName(byId.getName()); } Formula formula = new Formula(); BaseParam baseParam = new BaseParam(); WaterParam waterParam = new WaterParam(); TypeParam typeParam = new TypeParam(); OffsetParam offsetParam = new OffsetParam(); baseParam.setCode(item.getCode()); baseParam.setIndex(item.getCode()); baseParam.setName(item.getName()); baseParam.setAb(item.getName()); baseParam.setTyp(item.getCategory()); waterParam.setDelay(Double.valueOf(item.getDelay())); waterParam.setMoisture3(item.getTarget()); waterParam.setWeight1(Double.valueOf(item.getFeed())); waterParam.setTimes(item.getEt()); waterParam.setTemp1(item.getWindTemp()); waterParam.setTemp2(item.getEnvTemp()); waterParam.setTemp3(item.getEnvHum()); waterParam.setTurntime(item.getTurn()); typeParam.setMtype(Integer.valueOf(item.getCategory())); offsetParam.setMoisoffset(item.getMoisOffset()); offsetParam.setColdwind(Double.valueOf(item.getCoolingDuration())); formula.setBaseParam(baseParam); formula.setWaterParam(waterParam); formula.setTypeParam(typeParam); formula.setOffsetParam(offsetParam); formulas.getDryFormulaList().add(formula); }); // ævos转æ¢æxml // å建JAXBContextå®ä¾ JAXBContext jaxbContext = JAXBContext.newInstance(Formulas.class); // å建Marshallerå®ä¾ Marshaller marshaller = jaxbContext.createMarshaller(); // 设置æ¯å¦æ ¼å¼åè¾åº marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, false); // å°å¯¹è±¡åºååå°å符串 StringWriter writer = new StringWriter(); marshaller.marshal(formulas, writer); return Result.OK("请æ±æå",writer.toString()); } @ApiOperation(value="å¹²ç¥é æ¹ä¸æ¥", notes="å¹²ç¥é æ¹è®°å½ä¸æ¥") @PostMapping(value = "/sendFormulaHistory") public Result<?> sendFormulaHistory(DryHerbFormulaHisVo hisVo) { //è·årequest HttpServletRequest request = SpringContextUtils.getHttpServletRequest(); // è·å请æ±ä¸»æºçIPå°å String ip = IpUtils.getIpAddr(request); DryHerbFormulaHis his = new DryHerbFormulaHis(); BeanUtil.copyProperties(hisVo, his); his.setFormulaIndex(hisVo.getIndex()); DryEquipment dryEquipment = dryEquipmentService.selectByTenantIdEquipmentId(hisVo.getTenantId() + "", hisVo.getEqp()); if (dryEquipment != null) { if (dryEquipment.getIp().equals(ip)) { his.setEqpId(dryEquipment.getId()); } else { return Result.error("设å¤IPå°åæªé ç½®ï¼" + ip); } } catch (Exception e) { e.printStackTrace(); return Result.error("AIè¯å«æå¡å¼å¸¸"); } else { return Result.error("设å¤ä¸åå¨"); } dryHerbFormulaHisService.save(his); return Result.OK("ä¿åæå"); } } jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryResultController.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryShopController.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/MobileController.javaold mode 100644 new mode 100755
@@ -18,7 +18,9 @@ import org.jeecg.config.mybatis.MybatisPlusSaasConfig; import org.jeecg.modules.dry.api.EmqxApi; import org.jeecg.modules.dry.entity.DryEquipment; import org.jeecg.modules.dry.entity.DryFaultRecord; import org.jeecg.modules.dry.service.IDryEquipmentService; import org.jeecg.modules.dry.service.IDryFaultRecordService; import org.jeecg.modules.dry.vo.MoEquVo; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -40,6 +42,8 @@ public class MobileController { @Autowired private IDryEquipmentService dryEquipmentService; @Autowired private IDryFaultRecordService faultRecordService; @Autowired private RedisUtil redisUtil; @@ -64,18 +68,27 @@ return Result.OK(voPage); } @ApiOperation(value = "设å¤æ¥è¦æ°æ®", notes = "设å¤æ¥è¦æ°æ®å表æ¥è¯¢") @GetMapping(value = "/fault/list") public Result<IPage<DryFaultRecord>> queryFaultList(DryFaultRecord faultRecord, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req){ int tenantId = oConvertUtils.getInt(TenantContext.getTenant(), 0); QueryWrapper<DryFaultRecord> queryWrapper = QueryGenerator.initQueryWrapper(faultRecord, req.getParameterMap()); Page<DryFaultRecord> page = new Page<DryFaultRecord>(pageNo, pageSize); IPage<DryFaultRecord> pageList = faultRecordService.page(page, queryWrapper); return Result.OK(pageList); } private void comp(IPage<DryEquipment> pageList, Page<MoEquVo> page) { //å½åç§æ·id int tenantId = oConvertUtils.getInt(TenantContext.getTenant(), 0); List<MoEquVo> collect = pageList.getRecords().stream().map(item -> { MoEquVo vo = new MoEquVo(); BeanUtils.copyProperties(item, vo); String clientid = "client-" + tenantId + "-" + item.getCode(); JSONObject client = (JSONObject) redisUtil.get(MqttConstant.MQTT_ONLINE_CLIENT + clientid); //JSONObject client = (JSONObject) redisUtil.hget(MqttConstant.MQTT_ONLINE_CLIENT ,tenantId); JSONObject client = (JSONObject) redisUtil.hget(String.format(MqttConstant.MQTT_ONLINE_CLIENT,tenantId),clientid); //ç»è£ ç¶ææ°æ® if (client != null) { vo.setOnline(true); jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/OpcController.javaold mode 100644 new mode 100755
@@ -15,6 +15,7 @@ import org.jeecg.modules.dry.service.IDryOpcDeviceService; import org.jeecg.modules.dry.vo.CommandMessageVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -31,6 +32,7 @@ @RestController @RequestMapping("/dry/opc") @Slf4j @ConditionalOnProperty(name = "kangaroohy.milo.enabled", havingValue = "true") public class OpcController { @Autowired jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/listener/InitListener.javaold mode 100644 new mode 100755
@@ -1,21 +1,12 @@ package org.jeecg.modules.dry.listener; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.google.common.io.ByteStreams; import org.eclipse.milo.opcua.sdk.client.OpcUaClient; import org.jeecg.modules.dry.common.CacheConstants; import org.jeecg.modules.dry.common.CommonDict; import org.jeecg.modules.dry.vo.DryFault; import org.springframework.boot.context.event.ApplicationStartedEvent; import org.springframework.context.ApplicationListener; import org.springframework.stereotype.Component; import java.io.IOException; import java.io.InputStream; import java.util.HashMap; import java.util.List; import java.util.Map; //@Component jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/DryEqpTypeMapper.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/DryEquipmentMapper.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/DryFaultRecordMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,14 @@ package org.jeecg.modules.dry.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.dry.entity.DryFaultRecord; /** * @Description: dry_eqp_fault * @Author: jeecg-boot * @Date: 2024-11-13 * @Version: V1.0 */ public interface DryFaultRecordMapper extends BaseMapper<DryFaultRecord> { } jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/DryHelloMapper.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/DryHerbFormulaHisMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,17 @@ package org.jeecg.modules.dry.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.dry.entity.DryHerbFormulaHis; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: é æ¹è®°å½ * @Author: jeecg-boot * @Date: 2024-08-19 * @Version: V1.0 */ public interface DryHerbFormulaHisMapper extends BaseMapper<DryHerbFormulaHis> { } jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/DryHerbFormulaMapper.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/DryHerbInfoMapper.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/DryHerbMapper.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/DryHerbTypeMapper.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/DryOpcDeviceMapper.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/DryOrderMapper.javaold mode 100644 new mode 100755
@@ -3,6 +3,7 @@ import org.apache.ibatis.annotations.Param; import org.jeecg.modules.dry.entity.DryOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.dry.vo.DryRecentOrderAvg; import java.util.List; @@ -15,4 +16,6 @@ public interface DryOrderMapper extends BaseMapper<DryOrder> { List<String> queryMonthOverview(@Param("month") String month, @Param("tenantId") int tenantId); DryRecentOrderAvg queryRecentOrderAvg(@Param("tenantId") Integer tenantId, @Param("herbName") String herbName); } jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/DryOrderTrendMapper.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/DryProdRecordMapper.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/DryResultMapper.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/DryShopMapper.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/xml/DryEqpTypeMapper.xmlold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/xml/DryEquipmentMapper.xmlold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/xml/DryFaultRecordMapper.xml
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="org.jeecg.modules.dry.mapper.DryFaultRecordMapper"> </mapper> jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/xml/DryHerbFormulaHisMapper.xml
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="org.jeecg.modules.dry.mapper.DryHerbFormulaHisMapper"> </mapper> jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/xml/DryHerbFormulaMapper.xmlold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/xml/DryHerbInfoMapper.xmlold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/xml/DryHerbMapper.xmlold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/xml/DryHerbTypeMapper.xmlold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/xml/DryOpcDeviceMapper.xmlold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/xml/DryOrderMapper.xmlold mode 100644 new mode 100755
@@ -8,4 +8,13 @@ and tenant_id = #{tenantId} group by orderTime order by orderTime desc </select> <select id="queryRecentOrderAvg" resultType="org.jeecg.modules.dry.vo.DryRecentOrderAvg"> select avg(a.xiaolv) efficAvg,avg(a.zq) steamAvg,avg(a.dn) wattAvg from ( select (origin_weight-yield)/dry_time*60 xiaolv, steam/(origin_weight-yield) zq, watt/(origin_weight-yield) dn from dry_order where tenant_id = #{tenantId} and herb_name = #{herbName} and dry_time > 0 order by order_time desc limit 10 ) a </select> </mapper> jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/xml/DryOrderTrendMapper.xmlold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/xml/DryProdRecordMapper.xmlold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/xml/DryResultMapper.xmlold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/xml/DryShopMapper.xmlold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqMessage.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,37 @@ package org.jeecg.modules.dry.mqtt; import lombok.Data; /** * Mqttæ¶æ¯è½½ä½ * @param <T> */ @Data public class MqMessage<T> { private T data; private String tentId; private String topic; public MqMessage() { } public MqMessage(T data, String tentId) { this.data = data; this.tentId = tentId; } public MqMessage(T data, String tentId,String topic) { this.data = data; this.tentId = tentId; this.topic = topic; } @Override public String toString() { return "MqMessage{" + "data=" + data + ", tentId='" + tentId + '\'' + ", topic='" + topic + '\'' + '}'; } } jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttConfig.javaold mode 100644 new mode 100755
@@ -3,6 +3,7 @@ import cn.hutool.core.thread.ThreadUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.eclipse.paho.client.mqttv3.*; import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; @@ -14,12 +15,14 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.core.RedisTemplate; import java.util.*; /** * mqtt */ @Data @Slf4j @Configuration public class MqttConfig { @@ -42,6 +45,8 @@ private RedisUtil redisUtil; @Autowired private EmqxApi emqxApi; @Autowired private RedisTemplate redisTemplate; @Bean @@ -92,6 +97,16 @@ //订é 移å¨ç«¯ä¸è¡æ令 mqttClient.subscribe(MqttConstant.MOBILE_UP); System.err.println("admin订é " + MqttConstant.MOBILE_UP); // 订é ç§æ·å®æ¶æ°æ® mqttClient.subscribe(MqttConstant.TENANT_UP_PREFIX_REALTIME_DATA); System.out.println("admin订é " + MqttConstant.TENANT_UP_PREFIX_REALTIME_DATA); // 订é ç§æ·æ¥è¦æ°æ® mqttClient.subscribe(MqttConstant.TENANT_UP_PREFIX_REAL_FAULT_DATA); System.out.println("admin订é " + MqttConstant.TENANT_UP_PREFIX_REAL_FAULT_DATA); mqttClient.subscribe(MqttConstant.TENANT_UP_PREFIX_FAULT_DATA); System.out.println("admin订é " + MqttConstant.TENANT_UP_PREFIX_FAULT_DATA); mqttClient.subscribe(MqttConstant.TENANT_UP_PREFIX_EQU); System.out.println("admin订é " + MqttConstant.TENANT_UP_PREFIX_EQU); initClients(); break; @@ -99,6 +114,7 @@ case "user": //æ®é客æ·ç«¯åªé订é èªèº«ç¸å ³æ¶æ¯ mqttClient.subscribe(MqttConstant.SERVICE_DOWN_PREFIX + "/" + mqttClientId + "/#"); mqttClient.subscribe(MqttConstant.SERVICE_REQ_PREFIX); System.err.println("user订é " + MqttConstant.SERVICE_DOWN_PREFIX + "/" + mqttClientId + "/#"); break; @@ -122,7 +138,7 @@ @Override public void run() { // å¨è¿éç¼åå®æ¶æ§è¡çä»»å¡é»è¾ System.out.println("å®æ¶ä»»å¡æ§è¡ï¼" + new java.util.Date()); //System.out.println("å®æ¶ä»»å¡æ§è¡ï¼" + new java.util.Date()); if (mqttUtil.getMqttClient() == null || !mqttUtil.getMqttClient().isConnected()) { try { conn(); @@ -142,7 +158,14 @@ * æå¡ç«¯ï¼adminè§è²ï¼å¯å¨æ¶æ¥è¯¢ææ设å¤å¹¶ç¼åå°redis */ private void initClients() { redisUtil.del(MqttConstant.MQTT_ONLINE_CLIENT); //åå§åæ¶å å é¤ææå¨çº¿è®¾å¤ Set keys = redisTemplate.keys( String.format(MqttConstant.MQTT_ONLINE_CLIENT,"*")); if (keys != null && !keys.isEmpty()) { keys.forEach(key -> System.out.println("åå§åå é¤å¨çº¿è®¾å¤: " + key)); redisTemplate.delete(keys); } else { System.out.println("åå§åæ å¨çº¿è®¾å¤: " + MqttConstant.MQTT_ONLINE_CLIENT); } JSONObject clients = emqxApi.queryEmqx(EmqxApi.CMD_CLIENTS); //TODO æ ¹æ®emqxè¿åç¼åå®ä½ç±» @@ -163,17 +186,23 @@ //æ¯å¦è¿æ¥ Boolean connected = obj.getBoolean("connected"); item.put("connected", connected); // String[] info = clientid.split("-"); item.put("type", info[0]); item.put("tenantId", info[1]); item.put("code", info[2]); //æ ¹æ®clientid解æ(注æé ç½®æ件ä¸clientidæ ¼å¼ ä¾ï¼client-1000) try { String[] info = clientid.split("-"); item.put("type", info[0]); item.put("tenantId", info[1]); //item.put("code", info[2]); if (connected) { redisUtil.set(MqttConstant.MQTT_ONLINE_CLIENT + clientid, item); if (connected) { redisUtil.hset(String.format(MqttConstant.MQTT_ONLINE_CLIENT,item.get("tenantId").toString()) , clientid, item); } }catch (Exception e){ e.printStackTrace(); } } } } jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.javaold mode 100644 new mode 100755
@@ -1,199 +1,396 @@ package org.jeecg.modules.dry.mqtt; import cn.hutool.core.thread.ThreadUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.formula.functions.T; import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken; import org.eclipse.paho.client.mqttv3.MqttCallback; import org.eclipse.paho.client.mqttv3.MqttMessage; import org.jeecg.common.config.TenantContext; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.MqttConstant; import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.modules.dry.api.EmqxApi; import org.jeecg.modules.dry.entity.DryEqpType; import org.jeecg.modules.dry.entity.DryEquipment; import org.jeecg.modules.dry.entity.DryFaultRecord; import org.jeecg.modules.dry.entity.DryShop; import org.jeecg.modules.dry.service.*; import org.jeecg.modules.dry.vo.DryEquipmentVo; import org.jeecg.modules.dry.vo.DryFaultRecordVo; import org.jeecg.modules.dry.vo.RealTimeDataVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @Slf4j @Component @Scope("prototype") public class MqttSampleCallback implements MqttCallback { @Value(value = "${jeecg.mqtt.role}") private String role; @Autowired private MqttUtil mqttUtil; @Autowired private EmqxApi emqxApi; @Autowired private BaseCommonService baseCommonService; @Autowired private RedisUtil redisUtil; @Value(value = "${jeecg.mqtt.role}") private String role; @Autowired private MqttUtil mqttUtil; @Autowired private EmqxApi emqxApi; @Autowired private BaseCommonService baseCommonService; @Autowired private RedisUtil redisUtil; @Autowired private IDryRealTimeDataService realTimeDataService; @Override public void connectionLost(Throwable throwable) { System.err.println("è¿æ¥æå¼ï¼ï¼æ线"); } @Autowired private IDryEquipmentService equipmentService; @Override public void messageArrived(String topic, MqttMessage mqttMessage) throws Exception { System.out.println("æ¶å°æ¶æ¯: \n topicï¼" + topic + "\n Qosï¼" + mqttMessage.getQos() + "\n payloadï¼" + new String(mqttMessage.getPayload())); @Autowired private IDryEqpTypeService eqpTypeService; switch (role) { // 管çå case "admin": @Autowired private IDryShopService dryShopService; @Autowired private IDryFaultRecordService faultRecordService; @Override public void connectionLost(Throwable throwable) { System.err.println("è¿æ¥æå¼ï¼ï¼æ线"); System.err.println("è¿æ¥æå¼ï¼ï¼" + throwable.toString()); } @Override public void messageArrived(String topic, MqttMessage mqttMessage) { System.out.println("æ¶å°æ¶æ¯: \n topicï¼" + topic + "\n Qosï¼" + mqttMessage.getQos() + "\n payloadï¼" + new String(mqttMessage.getPayload())); switch (role) { // 管çå case "admin": String message = new String(mqttMessage.getPayload()); JSONObject messageJson = JSONObject.parseObject(message); if (topic.startsWith("$SYS/brokers/") && topic.endsWith("connected")) { JSONObject client = (JSONObject) redisUtil.get(String.format(MqttConstant.MQTT_ONLINE_CLIENT,messageJson.get("clientid").toString().split("-")[1]) + messageJson.get("clientid")); if (client == null) { JSONObject item = new JSONObject(); //username item.put("username", messageJson.get("username")); //è¿æ¥æ¶é´ Long st = messageJson.getLong("connected_at"); String upTime = DateUtils.timestamptoStr(st, DateUtils.datetimeFormat.get()); item.put("connectedAt", upTime); //clientid String clientid = messageJson.getString("clientid"); item.put("clientid", clientid); //æ¯å¦è¿æ¥ item.put("connected", true); //æ ¹æ®clientid解æ(注æé ç½®æ件ä¸clientidæ ¼å¼ ä¾ï¼client-1000) try { String[] info = clientid.split("-"); item.put("type", info[0]); item.put("tenantId", info[1]); //item.put("code", info[2]); } catch (Exception e) { e.printStackTrace(); } redisUtil.hset(String.format(MqttConstant.MQTT_ONLINE_CLIENT,item.get("tenantId") ), clientid, item); System.err.println(String.format("设å¤: %sä¸çº¿", clientid)); } } if (topic.startsWith("$SYS/brokers/") && topic.endsWith("disconnected")) { try { String clientid = messageJson.getString("clientid"); redisUtil.hdel(String.format(MqttConstant.MQTT_ONLINE_CLIENT,clientid.split("-")[1]), clientid); System.err.println(String.format("设å¤: %sä¸çº¿", clientid)); } catch (Exception e) { e.printStackTrace(); } } parseAdminCommand(topic, mqttMessage); break; // æ®éç¨æ· case "user": System.err.println("user"); try { parseUserCommand(topic, mqttMessage); } catch (Exception e) { e.printStackTrace(); } break; } } @Override public void deliveryComplete(IMqttDeliveryToken iMqttDeliveryToken) { System.err.println("æ¶æ¯ä¼ éæå"); } // 解æadminè§è²æ令 private void parseAdminCommand(String topic, MqttMessage mqttMessage) { String message = new String(mqttMessage.getPayload()); JSONObject messageJson = JSONObject.parseObject(message); if (topic.startsWith("$SYS/brokers/") && topic.endsWith("connected")) { JSONObject client = (JSONObject) redisUtil.get(MqttConstant.MQTT_ONLINE_CLIENT + messageJson.get("clientid")); if (client == null) { JSONObject item = new JSONObject(); //username item.put("username", messageJson.get("username")); //è¿æ¥æ¶é´ Long st = messageJson.getLong("connected_at"); String upTime = DateUtils.timestamptoStr(st, DateUtils.datetimeFormat.get()); item.put("connectedAt", upTime); //clientid String clientid = messageJson.getString("clientid"); item.put("clientid", clientid); //æ¯å¦è¿æ¥ item.put("connected", true); // String[] info = clientid.split("-"); item.put("type", info[0]); item.put("tenantId", info[1]); item.put("code", info[2]); //请æ±ç客æ·ç«¯(æå¡ç«¯åªæ¨éæ°æ®å°è¯·æ±ç客æ·ç«¯) StringBuilder req = new StringBuilder(); if (messageJson.containsKey("req")) { req.append(messageJson.get("req")); } //åç«¯ä¼ åæ¶é´æ³è½¬æ¢ if (messageJson.containsKey("timestamp")) { messageJson.put("timestamp", DateUtils.zone2Str(messageJson.get("timestamp").toString())); } // å®æ¶æ°æ®ä¸ä¼ 太é¢ç¹ä¸æ°æ®å å®¹è¶ è¿å段大å°ä¸è®°å½æ¥å¿ if (!topic.equals(MqttConstant.TENANT_UP_PREFIX_REALTIME_DATA) && !topic.equals(MqttConstant.TENANT_UP_PREFIX_FAULT_DATA)) { // baseCommonService.addLog(message, CommonConstant.LOG_TYPE_MQTT, CommonConstant.OPERATE_MQTT_1); } redisUtil.set(MqttConstant.MQTT_ONLINE_CLIENT + clientid, item); System.err.println(String.format("设å¤: %sä¸çº¿", clientid)); } switch (topic) { // æ¥è¯¢è®¾å¤å¨çº¿ case MqttConstant.MOBILE_QUERY_EQU_STATU: System.err.println("adminæ¶å°" + topic); // æ ¹æ®è®¾å¤idæ¥è¯¢è®¾å¤mqttå¨çº¿ç¶æ String clientId = messageJson.getString("clientId"); JSONObject client = (JSONObject) redisUtil.hget(String.format(MqttConstant.MQTT_ONLINE_CLIENT,clientId.split("-")[1]) , clientId); ThreadUtil.execute(() -> { if (client == null || client.isEmpty()) { JSONObject res = new JSONObject(); res.put("success", false); res.put("msg", "æ¥è¯¢å¤±è´¥"); try { MqttMessage sendMessage = new MqttMessage(res.toJSONString().getBytes()); sendMessage.setQos(0); mqttUtil.getMqttClient().publish(String.format(MqttConstant.SERVICE_RES_EQU_STATU, req), sendMessage); } catch (Exception e) { e.printStackTrace(); } return; } client.put("success", true); client.put("msg", "æ¥è¯¢æå"); try { MqttMessage sendMessage = new MqttMessage(client.toJSONString().getBytes()); sendMessage.setQos(0); mqttUtil.getMqttClient().publish(String.format(MqttConstant.SERVICE_RES_EQU_STATU, req), sendMessage); baseCommonService.addLog(client.toString(), CommonConstant.LOG_TYPE_MQTT, CommonConstant.OPERATE_MQTT_2); } catch (Exception e) { e.printStackTrace(); } }); break; // æ¥æ¶è®¾å¤å®æ¶æ°æ® case MqttConstant.TENANT_UP_PREFIX_REALTIME_DATA: ThreadUtil.execute(() -> { try { RealTimeDataVo vo = JSON.parseObject(message, RealTimeDataVo.class); realTimeDataService.realTimeDataHandle(vo); } catch (Exception e) { e.printStackTrace(); } }); break; //åç§æ·ä¸ä¼ çå®æ¶æ¥è¦æ°æ® case MqttConstant.TENANT_UP_PREFIX_REAL_FAULT_DATA: MqMessage<Map<String, DryFaultRecordVo>> realFaultMessage = JSON.parseObject(message, new TypeReference<MqMessage<Map<String, DryFaultRecordVo>>>() { }); //æ éæ°æ® Map<String, DryFaultRecordVo> dryFaultMap = realFaultMessage.getData(); //ç§æ·id String tentId = realFaultMessage.getTentId(); //æ¶å°ç§æ·å®æ¶æ¥è¦æ°æ®åå ¥redis //转æ¢ä¸º Map<String, Object> Map<String, Object> objectMap = dryFaultMap.entrySet().stream() .collect(Collectors.toMap( Map.Entry::getKey, entry -> (Object) entry.getValue() )); redisUtil.hmset(String.format(MqttConstant.MQTT_CLOUD_REAL_FAULT,realFaultMessage.getTentId()), objectMap); //广æåéç»åç§æ·ä¸ç§»å¨è®¾å¤ if(dryFaultMap.isEmpty()){ return; } String recTopic = String.format(MqttConstant.SERVICE_BROADCAST_TENANT_REAL_FAULT, tentId); //æ°æ®è½¬æ¢ List<DryFaultRecordVo> faultList = new ArrayList<DryFaultRecordVo>((dryFaultMap.values())); MqMessage< List<DryFaultRecordVo>> mqMessage = new MqMessage<>(faultList,tentId,recTopic); //åé广æ System.err.println("广æç»ï¼" + recTopic); sendMqttMessage(MqttConstant.SERVICE_BROADCAST_TENANT_REAL_FAULT,mqMessage); break; // æ¥æ¶è®¾å¤æ¥è¦æ°æ® case MqttConstant.TENANT_UP_PREFIX_FAULT_DATA: ThreadUtil.execute(() -> { try { MqMessage<List<DryFaultRecord>> faultMessage = JSON.parseObject(message, new TypeReference<MqMessage<List<DryFaultRecord>>>() { }); // List<DryFaultRecord> faultRecords = JSON.parseArray(jsonObject.get("data").toString(), DryFaultRecord.class); System.err.println(faultMessage.toString()); faultRecordService.saveBatch(faultMessage.getData()); } catch (Exception e) { e.printStackTrace(); } }); break; case MqttConstant.TENANT_UP_PREFIX_EQU: ThreadUtil.execute(() -> { try { Object equObj = messageJson.get("equipment"); DryEquipment equipment = JSON.parseObject(equObj.toString(), DryEquipment.class); TenantContext.setTenant(equipment.getTenantId() + ""); DryEquipment dryEquipment = equipmentService.selectByTenantIdEquipmentId(equipment.getTenantId() + "", equipment.getCode()); if (dryEquipment == null) { equipmentService.save(equipment); } Object typeObj = messageJson.get("eqpType"); DryEqpType eqpType = JSON.parseObject(typeObj.toString(), DryEqpType.class); DryEqpType dryEqpType = eqpTypeService.getById(eqpType.getId()); if (dryEqpType == null) { eqpTypeService.save(eqpType); } // è·å设å¤æå±è½¦é´ Object shopObj = messageJson.get("shop"); DryShop shop = JSON.parseObject(shopObj.toString(), DryShop.class); DryShop dryShop = dryShopService.getById(shop.getId()); if (dryShop == null) { dryShopService.save(shop); } } catch (Exception e) { e.printStackTrace(); } }); } if (topic.startsWith("$SYS/brokers/") && topic.endsWith("disconnected")) { String clientid = messageJson.getString("clientid"); redisUtil.del(MqttConstant.MQTT_ONLINE_CLIENT + clientid); System.err.println(String.format("设å¤: %sä¸çº¿", clientid)); } // 解æuserè§è²æ令 private void parseUserCommand(String topic, MqttMessage mqttMessage) { String message = new String(mqttMessage.getPayload()); JSONObject messageJson = JSONObject.parseObject(message); //请æ±ç客æ·ç«¯(æå¡ç«¯åªæ¨éæ°æ®å°è¯·æ±ç客æ·ç«¯) StringBuilder req = new StringBuilder(); if (messageJson.containsKey("req")) { req.append(messageJson.get("req")); } parseAdminCommand(topic, mqttMessage); //åç«¯ä¼ åæ¶é´æ³è½¬æ¢ if (messageJson.containsKey("timestamp")) { messageJson.put("timestamp", DateUtils.zone2Str(messageJson.get("timestamp").toString())); } break; // æ®éç¨æ· case "user": System.err.println("user"); parseUserCommand(topic, mqttMessage); break; switch (topic) { case MqttConstant.MOBILE_REQ_EQU_CMD: System.err.println("useræ¶å°" + topic); System.err.println(message); ThreadUtil.execute(() -> { //TODO åPLCåéå¼å ³æºæä½ï¼å¹¶è¿åä¿¡æ¯ JSONObject res = new JSONObject(); res.put("success", true); res.put("msg", "æä½æå"); try { MqttMessage sendMessage = new MqttMessage(JSONObject.toJSONString(res).getBytes()); sendMessage.setQos(0); mqttUtil.getMqttClient().publish(String.format(MqttConstant.SERVICE_RES_EQU_CMD, req), sendMessage); baseCommonService.addLog(res.toString(), CommonConstant.LOG_TYPE_MQTT, CommonConstant.OPERATE_MQTT_2); } catch (Exception e) { e.printStackTrace(); } }); break; case MqttConstant.SERVICE_REQ_PREFIX: log.debug("æ¶å°è®¾å¤è¯¦ç»ä¿¡æ¯æ¥è¯¢è¯·æ±"); ThreadUtil.execute(() -> { String tenantId = messageJson.getString("tenantId"); String clientId = mqttUtil.getMqttClient().getClientId(); String tenant = clientId.substring(clientId.lastIndexOf("_") + 1); if (tenantId != null && tenantId.equals(tenant)) { TenantContext.setTenant(tenantId); // æ ¹æ®è®¾å¤ç¼ç æ¥è¯¢è®¾å¤ä¿¡æ¯ String code = messageJson.getString("code"); DryEquipment equipmentVo = equipmentService.selectByTenantIdEquipmentId(tenantId, code); // æ ¹æ®è®¾å¤è½¦é´idæ¥è¯¢è½¦é´ä¿¡æ¯ DryShop shop = dryShopService.getById(equipmentVo.getShopId()); // æ ¹æ®è®¾å¤ç±»åIDæ¥è¯¢è®¾å¤ç±»åä¿¡æ¯ DryEqpType eqpType = eqpTypeService.getById(equipmentVo.getType()); JSONObject res = new JSONObject(); res.put("tenant", tenantId); res.put("equipment", equipmentVo); res.put("shop", shop); res.put("eqpType", eqpType); try { MqttMessage sendMessage = new MqttMessage(res.toJSONString().getBytes()); sendMessage.setQos(0); mqttUtil.getMqttClient().publish(MqttConstant.TENANT_UP_PREFIX_EQU, sendMessage); // baseCommonService.addLog(res.toString(), CommonConstant.LOG_TYPE_MQTT, CommonConstant.OPERATE_MQTT_2); } catch (Exception e) { e.printStackTrace(); } } }); break; } } } @Override public void deliveryComplete(IMqttDeliveryToken iMqttDeliveryToken) { System.err.println("æ¶æ¯ä¼ éæå"); } // 解æadminè§è²æ令 private void parseAdminCommand(String topic, MqttMessage mqttMessage) { String message = new String(mqttMessage.getPayload()); JSONObject messageJson = JSONObject.parseObject(message); //请æ±ç客æ·ç«¯(æå¡ç«¯åªæ¨éæ°æ®å°è¯·æ±ç客æ·ç«¯) StringBuilder req = new StringBuilder(); if (messageJson.containsKey("req")) { req.append(messageJson.get("req")); } //åç«¯ä¼ åæ¶é´æ³è½¬æ¢ if (messageJson.containsKey("timestamp")) { messageJson.put("timestamp", DateUtils.zone2Str(messageJson.get("timestamp").toString())); } baseCommonService.addLog(message, CommonConstant.LOG_TYPE_MQTT, CommonConstant.OPERATE_MQTT_1); switch (topic) { // æ¥è¯¢è®¾å¤å¨çº¿ case MqttConstant.MOBILE_QUERY_EQU_STATU: System.err.println("adminæ¶å°" + topic); // æ ¹æ®è®¾å¤idæ¥è¯¢è®¾å¤mqttå¨çº¿ç¶æ String clientId = messageJson.getString("clientId"); JSONObject client = (JSONObject) redisUtil.get(MqttConstant.MQTT_ONLINE_CLIENT + clientId); /** * åéæ¶æ¯ * @param topic 订é * @param mqMessage æ¶æ¯ä½ */ private void sendMqttMessage(String topic, MqMessage mqMessage){ ThreadUtil.execute(() -> { if (client == null || client.isEmpty()) { JSONObject res = new JSONObject(); res.put("success", false); res.put("msg", "æ¥è¯¢å¤±è´¥"); try { MqttMessage sendMessage = new MqttMessage(res.toJSONString().getBytes()); sendMessage.setQos(0); mqttUtil.getMqttClient().publish(String.format(MqttConstant.SERVICE_RES_EQU_STATU, req), sendMessage); } catch (Exception e) { e.printStackTrace(); MqttMessage sendMessage = new MqttMessage(JSONObject.toJSONString(mqMessage).getBytes()); sendMessage.setQos(0); mqttUtil.getMqttClient().publish(String.format(topic, mqMessage.getTentId()), sendMessage); }catch (Exception e){ e.printStackTrace(); } return; } client.put("success", true); client.put("msg", "æ¥è¯¢æå"); try { MqttMessage sendMessage = new MqttMessage(client.toJSONString().getBytes()); sendMessage.setQos(0); mqttUtil.getMqttClient().publish(String.format(MqttConstant.SERVICE_RES_EQU_STATU, req), sendMessage); baseCommonService.addLog(client.toString(), CommonConstant.LOG_TYPE_MQTT, CommonConstant.OPERATE_MQTT_2); } catch (Exception e) { e.printStackTrace(); } }); break; } } // 解æuserè§è²æ令 private void parseUserCommand(String topic, MqttMessage mqttMessage) { String message = new String(mqttMessage.getPayload()); JSONObject messageJson = JSONObject.parseObject(message); //请æ±ç客æ·ç«¯(æå¡ç«¯åªæ¨éæ°æ®å°è¯·æ±ç客æ·ç«¯) StringBuilder req = new StringBuilder(); if (messageJson.containsKey("req")) { req.append(messageJson.get("req")); } //åç«¯ä¼ åæ¶é´æ³è½¬æ¢ if (messageJson.containsKey("timestamp")) { messageJson.put("timestamp", DateUtils.zone2Str(messageJson.get("timestamp").toString())); } switch (topic) { case MqttConstant.MOBILE_REQ_EQU_CMD: System.err.println("useræ¶å°" + topic); System.err.println(message); ThreadUtil.execute(() -> { //TODO åPLCåéå¼å ³æºæä½ï¼å¹¶è¿åä¿¡æ¯ JSONObject res = new JSONObject(); res.put("success", true); res.put("msg", "æä½æå"); try { MqttMessage sendMessage = new MqttMessage(JSONObject.toJSONString(res).getBytes()); sendMessage.setQos(0); mqttUtil.getMqttClient().publish(String.format(MqttConstant.SERVICE_RES_EQU_CMD, req), sendMessage); baseCommonService.addLog(res.toString(), CommonConstant.LOG_TYPE_MQTT, CommonConstant.OPERATE_MQTT_2); } catch (Exception e) { e.printStackTrace(); } }); break; } } } jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttUtil.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/runner/OpcCustomRunner.javaold mode 100644 new mode 100755
@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -17,6 +18,7 @@ @Component @Slf4j @ConditionalOnProperty(name = "kangaroohy.milo.enabled", havingValue = "true") public class OpcCustomRunner implements ApplicationRunner { @Autowired private MiloService miloService; jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryEqpTypeService.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryEquipmentService.javaold mode 100644 new mode 100755
@@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; /** * @Description: å¹²ç¥æº @@ -16,4 +17,11 @@ DryEquipment selectByTenantIdEquipmentId(String tenantId, String equipmentId); /** * æ¥è¯¢ç§æ·ä¸ææè®¾å¤ * @param tenantId * @return */ Map<String,DryEquipment> queryEquByTenantId(Integer tenantId); } jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryFaultRecordService.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,18 @@ package org.jeecg.modules.dry.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.dry.entity.DryFaultRecord; import java.util.List; /** * @Description: dry_eqp_fault * @Author: jeecg-boot * @Date: 2024-11-13 * @Version: V1.0 */ public interface IDryFaultRecordService extends IService<DryFaultRecord> { List<DryFaultRecord> queryByOrderId(String orderId); } jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryHelloService.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryHerbFormulaHisService.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,14 @@ package org.jeecg.modules.dry.service; import org.jeecg.modules.dry.entity.DryHerbFormulaHis; import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: é æ¹è®°å½ * @Author: jeecg-boot * @Date: 2024-08-19 * @Version: V1.0 */ public interface IDryHerbFormulaHisService extends IService<DryHerbFormulaHis> { } jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryHerbFormulaService.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryHerbInfoService.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryHerbService.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryHerbTypeService.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryOpcDeviceService.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryOrderService.javaold mode 100644 new mode 100755
@@ -19,4 +19,8 @@ void saveRealTimeData(DryOrderVo orderVo); List<String> queryMonthOverview(String month, int tenantId); void queryRecentOrderAvg(DryOrderVo orderVo); void sendByIds(List<String> list); } jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryOrderTrendService.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryProdRecordService.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryRealTimeDataService.javaold mode 100644 new mode 100755
@@ -3,6 +3,7 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.modules.dry.vo.CommandMessageVo; import org.jeecg.modules.dry.vo.RealTimeDataVo; import org.jeecg.modules.dry.vo.StatisticsDataVo; public interface IDryRealTimeDataService { Result<?> realTimeDataHandle(RealTimeDataVo realTimeDataVo); @@ -12,4 +13,13 @@ Result<?> sendSocketMsg(CommandMessageVo msgVo); Result<?> queryWorkshopStatistics(RealTimeDataVo realTimeDataVo); Result<?> statisticsDataHandle(StatisticsDataVo statsDataVo); /** * éè¿å®æ¶æ°æ®æ¶éå¤çæ éä¿¡æ¯ * @param realTimeDataVo * @return */ Result<?> fitFultRecord(RealTimeDataVo realTimeDataVo); } jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryResultService.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryShopService.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEqpTypeServiceImpl.javaold mode 100644 new mode 100755
@@ -1,5 +1,6 @@ package org.jeecg.modules.dry.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.jeecg.modules.dry.entity.DryEqpType; import org.jeecg.modules.dry.mapper.DryEqpTypeMapper; import org.jeecg.modules.dry.service.IDryEqpTypeService; jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryEquipmentServiceImpl.javaold mode 100644 new mode 100755
@@ -1,17 +1,23 @@ package org.jeecg.modules.dry.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.jeecg.common.config.TenantContext; import org.jeecg.common.constant.CommonCacheConstant; import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.dry.common.CacheConstants; import org.jeecg.modules.dry.entity.DryEquipment; import org.jeecg.modules.dry.mapper.DryEquipmentMapper; import org.jeecg.modules.dry.service.IDryEquipmentService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; /** * @Description: å¹²ç¥æº @@ -24,6 +30,8 @@ @Autowired private RedisUtil redisUtil; @Override public DryEquipment selectByTenantIdEquipmentId(String tenantId, String equipmentId) { DryEquipment dryEquipment = (DryEquipment) redisUtil.hget(CacheConstants.RedisKeyEnum.EQP_MAP.getCode(), tenantId + equipmentId); @@ -31,6 +39,7 @@ List<DryEquipment> list = this.list(); for (DryEquipment equipment : list) { redisUtil.hset(CacheConstants.RedisKeyEnum.EQP_MAP.getCode(),equipment.getTenantId()+equipment.getCode(),equipment); // 设置è¿ææ¶é´ if ((equipment.getTenantId()+equipment.getCode()).equals(tenantId + equipmentId)) { dryEquipment = equipment; } @@ -38,4 +47,20 @@ } return dryEquipment; } @Override @Cacheable(cacheNames = CommonCacheConstant.DRY_CACHE_TENANT_EQUS, key = "#tenantId" , unless = "#result == null " ) public Map<String,DryEquipment> queryEquByTenantId(Integer tenantId) { TenantContext.setTenant(tenantId +""); QueryWrapper<DryEquipment> queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(DryEquipment::getTenantId,tenantId); List<DryEquipment> equipmentList = this.list(queryWrapper); Map<String, DryEquipment> userMap = equipmentList.stream() .collect(Collectors.toMap( DryEquipment::getCode, Function.identity(), (existingValue, newValue) -> existingValue // å¦æé®å²çªï¼ä¿çæ§å¼ )); return userMap; } } jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryFaultRecordServiceImpl.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,28 @@ package org.jeecg.modules.dry.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.jeecg.modules.dry.entity.DryFaultRecord; import org.jeecg.modules.dry.mapper.DryFaultRecordMapper; import org.jeecg.modules.dry.service.IDryFaultRecordService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.util.List; /** * @Description: dry_eqp_fault * @Author: jeecg-boot * @Date: 2024-11-13 * @Version: V1.0 */ @Service public class DryFaultRecordServiceImpl extends ServiceImpl<DryFaultRecordMapper, DryFaultRecord> implements IDryFaultRecordService { @Override public List<DryFaultRecord> queryByOrderId(String orderId) { LambdaQueryWrapper<DryFaultRecord> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(DryFaultRecord::getOrderId, orderId); return baseMapper.selectList(queryWrapper); } } jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryHelloServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryHerbFormulaHisServiceImpl.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,19 @@ package org.jeecg.modules.dry.service.impl; import org.jeecg.modules.dry.entity.DryHerbFormulaHis; import org.jeecg.modules.dry.mapper.DryHerbFormulaHisMapper; import org.jeecg.modules.dry.service.IDryHerbFormulaHisService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: é æ¹è®°å½ * @Author: jeecg-boot * @Date: 2024-08-19 * @Version: V1.0 */ @Service public class DryHerbFormulaHisServiceImpl extends ServiceImpl<DryHerbFormulaHisMapper, DryHerbFormulaHis> implements IDryHerbFormulaHisService { } jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryHerbFormulaServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryHerbInfoServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryHerbServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryHerbTypeServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryOpcDeviceServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryOrderServiceImpl.javaold mode 100644 new mode 100755
@@ -1,15 +1,21 @@ package org.jeecg.modules.dry.service.impl; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.dry.common.CacheConstants; import org.jeecg.modules.dry.entity.DryOrder; import org.jeecg.modules.dry.mapper.DryOrderMapper; import org.jeecg.modules.dry.service.IDryOrderService; import org.jeecg.modules.dry.vo.DryOrderVo; import org.jeecg.modules.dry.vo.DryRecentOrderAvg; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.util.List; /** * @Description: å¹²ç¥å·¥å @@ -21,6 +27,8 @@ @Service public class DryOrderServiceImpl extends ServiceImpl<DryOrderMapper, DryOrder> implements IDryOrderService { @Autowired private RedisUtil redisUtil; @Override public void saveRealTimeData(DryOrderVo orderVo) { log.info("ä¿åå®æ¶æ°æ®ï¼" + orderVo.toString()); @@ -31,4 +39,31 @@ public List<String> queryMonthOverview(String month, int tenantId) { return baseMapper.queryMonthOverview(month, tenantId); } @Override public void queryRecentOrderAvg(DryOrderVo orderVo) { DryRecentOrderAvg recentOrderAvg = (DryRecentOrderAvg) redisUtil.hget(CacheConstants.RedisKeyEnum.NEAR_TEN.getCode(), orderVo.getTenantId() + "_" + orderVo.getCode() + "_" + orderVo.getEquId()); if (recentOrderAvg != null) { orderVo.setEfficAvg(recentOrderAvg.getEfficAvg()); orderVo.setSteamAvg(recentOrderAvg.getSteamAvg()); orderVo.setWattAvg(recentOrderAvg.getWattAvg()); } else { DryRecentOrderAvg orderAvg = baseMapper.queryRecentOrderAvg(orderVo.getTenantId(), orderVo.getHerbName()); if(orderAvg != null) { redisUtil.hset(CacheConstants.RedisKeyEnum.NEAR_TEN.getCode(), orderVo.getTenantId() + "_" + orderVo.getCode() + "_" + orderVo.getEquId(),orderAvg,60*10); orderVo.setEfficAvg(orderAvg.getEfficAvg()); orderVo.setSteamAvg(orderAvg.getSteamAvg()); orderVo.setWattAvg(orderAvg.getWattAvg()); } } } @Override public void sendByIds(List<String> list) { LambdaUpdateWrapper<DryOrder> wrapper = new LambdaUpdateWrapper<>(); wrapper.in(DryOrder::getId,list).set(DryOrder::getOrderStatus,1); baseMapper.update(null,wrapper); } } jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryOrderTrendServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryProdRecordServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.javaold mode 100644 new mode 100755
@@ -1,41 +1,40 @@ package org.jeecg.modules.dry.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.thread.ThreadUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.mina.core.service.IoAcceptor; import org.apache.mina.core.service.IoHandler; import org.apache.commons.lang3.StringUtils; import org.apache.mina.core.session.IoSession; import org.jeecg.common.api.CommonAPI; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; import org.jeecg.common.api.vo.Result; import org.jeecg.common.config.TenantContext; import org.jeecg.common.config.mqtoken.UserTokenContext; import org.jeecg.common.constant.CommonCacheConstant; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.MqttConstant; import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.modules.dry.common.CacheConstants; import org.jeecg.modules.dry.entity.*; import org.jeecg.modules.dry.mqtt.MqMessage; import org.jeecg.modules.dry.mqtt.MqttUtil; import org.jeecg.modules.dry.service.*; import org.jeecg.modules.dry.socket.ServerHandler; import org.jeecg.modules.dry.socket.SocketServerConfig; import org.jeecg.modules.dry.util.DryUtil; import org.jeecg.modules.dry.vo.*; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.io.IOException; import java.io.ObjectOutputStream; import java.net.Socket; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; import java.util.*; import java.util.stream.Collectors; @Slf4j @Service @@ -49,6 +48,9 @@ private IDryHerbService herbService; @Autowired private IDryHerbFormulaService dryHerbFormulaService; @Autowired private IDryEquipmentService equipmentService; @Autowired @@ -58,11 +60,16 @@ private IDryProdRecordService prodRecordService; @Autowired private CommonAPI commonAPI; private IDryFaultRecordService faultRecordService; private String token; @Value(value = "${jeecg.mqtt.role}") private String role; @Autowired private MqttUtil mqttUtil; public String getTemporaryToken() { if (token == null) { @@ -96,10 +103,15 @@ // æ ¹æ®ç§æ·idåå·¥åå·æ¥è¯¢æ°æ®åºæ¯å¦æè®°å½ï¼æåè¿åï¼æ²¡æåæ°å¢ä¸æ¡åè¿å orderVo = getOrSaveDryOrderVoDB(realTimeDataVo); } if (orderVo == null) { log.error("å·¥åä¸åå¨ï¼å·¥åå·ï¼"+realTimeDataVo.getWorkorder()+",设å¤ï¼" + realTimeDataVo.getMachineid() +",è¯æï¼" + realTimeDataVo.getName()); return Result.error("å·¥åä¸åå¨"); } // 2 æ´æ°å·¥åå®æ¶æ°æ® // 2.1 å°å·¥åä¸çæ°æ®æ¿æ¢ä¸ºææ°æ°æ® realTimeDataVo.setOrderId(orderVo.getId()); orderVo.setInitial(realTimeDataVo.getMoisture1()); orderVo.setDryTime(realTimeDataVo.getTime3()); orderVo.setDelay(realTimeDataVo.getDelay()); @@ -124,7 +136,7 @@ orderVo.setState_valve(realTimeDataVo.getState_valve()); orderVo.setOrderStatus(realTimeDataVo.getWorkorder_status()); orderVo.setEqp_status(realTimeDataVo.getEqp_status()); orderVo.setEqp_state(realTimeDataVo.getEqp_state()); // orderVo.setEqp_state(realTimeDataVo.getEqp_state()); orderVo.setWarning(realTimeDataVo.getEqp_warning()); orderVo.setFault(realTimeDataVo.getEqp_fault()); orderVo.setLevel(realTimeDataVo.getLevel()); @@ -186,7 +198,7 @@ orderVo.getBellowsTemp().put(realTimeDataVo.getTime3(), realTimeDataVo.getTemp2()); // 2.3 æ´æ°å°redisç¼å redisUtil.hset(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode(), realTimeDataVo.getTenantid()+"_"+realTimeDataVo.getMachineid(),orderVo, 600000); realTimeDataVo.getTenantid()+"_"+realTimeDataVo.getMachineid(),orderVo, 60*60); return Result.ok(); } @@ -219,6 +231,7 @@ } // 3 æ°æ®åºæ²¡æåæ°å¢ä¸æ¡æ°æ® } else { orderVo = saveNewOrder(realTimeDataVo); } return orderVo; @@ -229,17 +242,26 @@ * @param realTimeDataVo * @return */ @NotNull private DryOrderVo saveNewOrder(RealTimeDataVo realTimeDataVo) { DryOrderVo orderVo; // æ¥è¯¢è¯æ DryHerb herb = queryHerbByIndexTenant(realTimeDataVo); // æ¥è¯¢è®¾å¤ DryEquipment equ = queryEquipmentByCodeTenant(realTimeDataVo); if (equ == null) { log.error("æªæ¾å°è®¾å¤ï¼"+realTimeDataVo.getIndex() +","+realTimeDataVo.getName() +",æºå°ï¼" + realTimeDataVo.getMachineid()); return null; } // æ¥è¯¢è¯æ DryHerbFormula herbFormula = queryHerbByIndexTenant(realTimeDataVo); if (herbFormula == null) { log.error("æªæ¾å°è¯æï¼"+realTimeDataVo.getIndex() +","+realTimeDataVo.getName() +",æºå°ï¼" + realTimeDataVo.getMachineid()); return null; } // å建æ°å·¥å orderVo = new DryOrderVo(realTimeDataVo); orderVo.setHerbId(herb.getId()); orderVo.setHerbId(herbFormula.getId()); orderVo.setEquId(equ.getId()); DryOrder dryOrder = BeanUtil.toBean(orderVo, DryOrder.class); boolean save = dryOrderService.save(dryOrder); @@ -258,8 +280,24 @@ queryWrapper.eq(DryEquipment::getCode, realTimeDataVo.getMachineid()); DryEquipment one = equipmentService.getOne(queryWrapper); if (one == null) { one = new DryEquipment(realTimeDataVo); equipmentService.save(one); log.error(role+"ä¿åå®æ¶æ°æ®ï¼æªæ¾å°è®¾å¤ï¼"+realTimeDataVo.getMachineid()); // one = new DryEquipment(realTimeDataVo); // equipmentService.save(one); if (MqttConstant.ROLE_ADMIN.equals(role)) { MqttMessage mqttMessage = new MqttMessage(); mqttMessage.setQos(0); JSONObject object = new JSONObject(); object.put("code", realTimeDataVo.getMachineid()); object.put("tenantId", realTimeDataVo.getTenantid()); mqttMessage.setPayload(object.toJSONString().getBytes()); try { mqttUtil.getMqttClient().publish(MqttConstant.SERVICE_REQ_PREFIX ,mqttMessage); }catch (MqttException e) { e.printStackTrace(); } } return null; } return one; } @@ -269,14 +307,16 @@ * @param realTimeDataVo * @return */ private DryHerb queryHerbByIndexTenant(RealTimeDataVo realTimeDataVo) { LambdaQueryWrapper<DryHerb> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(DryHerb::getTenantId, realTimeDataVo.getTenantid()); queryWrapper.eq(DryHerb::getCode, realTimeDataVo.getIndex()); DryHerb one = herbService.getOne(queryWrapper); private DryHerbFormula queryHerbByIndexTenant(RealTimeDataVo realTimeDataVo) { LambdaQueryWrapper<DryHerbFormula> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(DryHerbFormula::getTenantId, realTimeDataVo.getTenantid()); queryWrapper.eq(DryHerbFormula::getName, realTimeDataVo.getName()); DryHerbFormula one = dryHerbFormulaService.getOne(queryWrapper); if (one == null) { one = new DryHerb(realTimeDataVo); herbService.save(one); one = new DryHerbFormula(realTimeDataVo); DryEquipment dryEquipment = equipmentService.selectByTenantIdEquipmentId(realTimeDataVo.getTenantid() + "", realTimeDataVo.getMachineid()); one.setEqpType(dryEquipment.getType()); dryHerbFormulaService.save(one); } return one; } @@ -288,8 +328,8 @@ */ private void saveOrderTrendVo(DryOrderTrendVo trendVo, DryOrderVo orderVo) { //å¤æ å®æ¶å«æ°´ç æ å®æ¶ééæ没æååï¼æåååæ´æ° if(orderVo.getTrendVo() == null || trendVo.getWeight() < orderVo.getTrendVo().getWeight() if(orderVo.getTrendVo() == null && trendVo != null && trendVo.getWeight() > 0 || orderVo.getTrendVo()!=null && trendVo.getWeight() < orderVo.getTrendVo().getWeight() ) { DryOrder byId = dryOrderService.getById(orderVo.getId()); // å°ææ°ç»ææ´æ°å°å·¥å @@ -315,43 +355,57 @@ public Result<?> queryMachineRealTImeData(RealTimeDataVo realTimeDataVo) { TenantContext.setTenant(realTimeDataVo.getTenantid()+""); // æ¥è¯¢æææºå°,æ¥è¯¢è¯å¥ç»è£ LambdaQueryWrapper<DryEquipment> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(DryEquipment::getTenantId, realTimeDataVo.getTenantid()); queryWrapper.eq(DryEquipment::getEnable, "Y"); queryWrapper.orderByAsc(DryEquipment::getCode); // æ¥è¯¢æææºå° List<DryEquipment> dryEquipments = equipmentService.list(queryWrapper); // æºå°å表ï¼ç¨äºæçå¯¹æ¯ List<String> list = new ArrayList<>(); // æçå表ï¼ç¨äºæçå¯¹æ¯ List<Double> dList = new ArrayList<>(); // æ¥è¯¢å½åæºå°å·¥å DryOrderVo orderVo = (DryOrderVo) redisUtil.hget(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode(), realTimeDataVo.getTenantid() + "_" + realTimeDataVo.getMachineid()); try { try { // å¦ææå¯ç¨æºå° if (dryEquipments != null && dryEquipments.size() > 0) { // æ¥è¯¢å ¶å®æºå°å·¥å dryEquipments.stream().forEach(item -> { // è·åå·¥å DryOrderVo order = (DryOrderVo) redisUtil.hget(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode(), realTimeDataVo.getTenantid() + "_" + item.getCode()); list.add(item.getName().substring(0, item.getName().indexOf('#')+1)); if (order != null) { // 计ç®å¹²ç¥æçï¼ç¨äºå¯¹æ¯ DryOrderTrendVo dryOrderTrendVo = order.getDetailList().get(order.getDetailList().size() - 1); double v = order.getOriginWeight() - dryOrderTrendVo.getWeight(); if (dryEquipments != null && dryEquipments.size() > 0) { dryEquipments.stream().forEach(item -> { DryOrderVo order = (DryOrderVo) redisUtil.hget(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode(), realTimeDataVo.getTenantid() + "_" + item.getCode()); if (order != null) { double v = order.getOriginWeight() - order.getYield(); list.add(item.getName().substring(0, item.getName().indexOf('#')+1)); if (v > 0 && order.getDryTime()>0) { DecimalFormat df = new DecimalFormat("#.00"); dList.add(Double.valueOf(df.format(v / order.getDryTime() * 60))); } else { dList.add(50d); } if (v > 0 && dryOrderTrendVo.getTotalTime()>0) { DecimalFormat df = new DecimalFormat("#.00"); dList.add(Double.valueOf(df.format(v / dryOrderTrendVo.getTotalTime() * 60))); } else { dList.add(50d); } }); } if (orderVo != null) { orderVo.setCompEqpNum(list); orderVo.setCompEqpEffic(dList); } }catch (Exception e) { e.printStackTrace(); } else { // å¦æ没æç产ï¼æçç½®0 dList.add(0d); } }); } if (orderVo != null) { // å°æç对æ¯æ°æ®æ¾å ¥å½åæºå°å®æ¶æ°æ®ä¸è¿å orderVo.setCompEqpNum(list); orderVo.setCompEqpEffic(dList); // æ¥è¯¢è¿å次æçåè½è½èå¹³å dryOrderService.queryRecentOrderAvg(orderVo); } }catch (Exception e) { e.printStackTrace(); } return Result.ok(orderVo); } @@ -419,4 +473,162 @@ //redisUtil.get(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode() return Result.OK(orderVo); } @Override public Result<?> statisticsDataHandle(StatisticsDataVo statsDataVo) { return null; } @Override public Result<?> fitFultRecord(RealTimeDataVo vo) { TenantContext.setTenant(vo.getTenantid()+""); ThreadUtil.execute(() -> { try { //解æåå¨æ¥è¦æ°æ® List<DryFaultRecord> faultRecords1 = fitFault(vo.getEqp_fault(), vo.getWorkorder(), vo.getTenantid(), vo.getMachineid(), 1); List<DryFaultRecord> faultRecords2 = fitFault(vo.getEqp_warning(), vo.getWorkorder(), vo.getTenantid(), vo.getMachineid(), 2); faultRecords1.addAll(faultRecords2); //å¤çç»æåï¼å°redisä¸å®æ¶æ°æ®åéè³äºæå¡å¨ Map<Object, Object> toCloudFaultMap = redisUtil.hmget(MqttConstant.MQTT_REAL_FAULT); if(!toCloudFaultMap.isEmpty()){ MqMessage< Map<Object, Object>> message = new MqMessage<>(); message.setData(toCloudFaultMap); message.setTentId(vo.getTenantid()+""); MqttMessage mqttMessage = new MqttMessage(); mqttMessage.setQos(0); mqttMessage.setPayload(JSON.toJSONString(message).getBytes()); mqttUtil.getMqttClient().publish(MqttConstant.TENANT_UP_PREFIX_REAL_FAULT_DATA,mqttMessage); } //è¦ä¿åçåå²æ é if(!faultRecords1.isEmpty()){ MqMessage<List<DryFaultRecord>> message = new MqMessage<>(); message.setData(faultRecords1); message.setTentId(vo.getTenantid()+""); MqttMessage mqttMessage = new MqttMessage(); mqttMessage.setQos(0); mqttMessage.setPayload((JSON.toJSONString(message).getBytes())); mqttUtil.getMqttClient().publish(MqttConstant.TENANT_UP_PREFIX_FAULT_DATA,mqttMessage); } } catch (Exception e) { e.printStackTrace(); } }); return null; } /** * 解æåå¨æ éæ°æ® * TODO ä¿è¯ååæ§ * @param fault æ éæ°æ® * @param orderId å·¥å * @param tenantId ç§æ· * @param machineId è®¾å¤ * @param faultType æ éç±»å * @return ç»è£ 好æ éæ°æ® */ private List<DryFaultRecord> fitFault(String fault, String orderId,Integer tenantId,String machineId,Integer faultType){ List<DryFaultRecord> result = new ArrayList<>(); //æ°æ®æ ·æ¬ï¼"eqp_fault": "æ»çéè¶ æ¶-æ¥è¦,é£æºè¿æµæ¥è¦,æ»çåè¶ æ¶-æ¥è¦,é£ç®±åæ¥è¦", System.err.println((faultType == 1 ? "ç±»åï¼æ é" : "ç±»åï¼æ¥è¦") + DateUtils.formatDateTime()+"--"+fault); //redisä¸çæ é Map<Object, Object> rFauMap = redisUtil.hmget(MqttConstant.MQTT_REAL_FAULT); Map<String, Object> redFauMap = rFauMap.entrySet().stream() .collect(Collectors.toMap( entry -> entry.getKey().toString(), // é®è½¬æ¢ä¸ºå符串 entry -> entry.getValue() )); //没æçæå·¥åçæ éæ°æ®ä¸åå¨ if(StringUtils.isEmpty(orderId)){ return result; } if(StringUtils.isEmpty(fault) && rFauMap.isEmpty()){ return result; } //1.解ææ°æ® String[] eqpFaults = fault.split(","); Map<String,DryFaultRecord> addFauMap = new HashMap<>(); Map<String,DryFaultRecord> realFauMap = new HashMap<>(); for (int i = 0; i < eqpFaults.length; i++) { String eqpFault = eqpFaults[i]; //é¿å 空å符串 if(StringUtils.isEmpty(eqpFault.trim())) continue; //1.1æ£æ¥mqttä¸æ¯å¦å·²åå¨è¿ä¸ªæ é String redisKey = String.format("%s_%s_%s", tenantId, machineId,eqpFault).trim(); realFauMap.put(redisKey, new DryFaultRecord()); DryFaultRecordVo rFault = (DryFaultRecordVo) redisUtil.hget(MqttConstant.MQTT_REAL_FAULT,redisKey); //1.2å¦æredisä¸åå¨ååå ¥ï¼åæ éå¼å§ï¼ if(rFault ==null){ //ç»è£ ç¼åæ°æ® // DryFaultRecord faultRecord = new DryFaultRecord(orderId,tenantId,eqpFault,faultType,new Date(),null); // addFauMap.put(redisKey,faultRecord); Map<String, DryEquipment> equipmentMap = equipmentService.queryEquByTenantId(tenantId); String tenantName = (String) redisUtil.hget(CommonCacheConstant.SYS_CACHE_TENANT, tenantId + ""); DryFaultRecordVo vo = new DryFaultRecordVo(orderId,tenantId,eqpFault,faultType,new Date(),null,1,equipmentMap.get(machineId).getName(),tenantName); addFauMap.put(redisKey,vo); }else { //å¦ææ°æ®å·²åå¨ï¼ä¸è®¡æ°å¤§äº1å°±é置计æ°ï¼è®¡æ°3次åå¤å®æ éç»æï¼3次ä¹åéæ°ä¸æ¥æ é说ææ éè¿å¨æç» éè¦éæ°è®¡æ°ï¼ if(rFault.getECount()!=null && rFault.getECount() > 1){ rFault.setECount(1); redisUtil.hset(MqttConstant.MQTT_REAL_FAULT,redisKey,rFault); System.err.println("æ¥è¦æ¬¡æ°éç½® clear clear ï¼key-"+redisKey); } } } //1.3ç¼åè³redis //å并æ°æ® addFauMap.forEach((key, value) -> redFauMap.putIfAbsent(key, value)); //没ææ°æ éæ°æ®ä¸ç¨è¦ç if(!addFauMap.isEmpty()){ redisUtil.hmset(MqttConstant.MQTT_REAL_FAULT,redFauMap); } //2æ£æµå·²ç»æçæ é //2.1å¦æå®æ¶æ°æ®ä¸åå¨redisåå¨å代表æ éç»æï¼åå ¥æ°æ®åº Map<Object, Object> curFauMap = redisUtil.hmget(MqttConstant.MQTT_REAL_FAULT); curFauMap.keySet().stream() //ç¹å«æ³¨æï¼å¤ä¸ªæ¥è¦ç±»åå ±ç¨æ¹æ³éè¦åºåç±»å .filter(key -> !realFauMap.containsKey(key) && ((DryFaultRecordVo)curFauMap.get(key)).getFaultType() == faultType) .forEach(key -> { DryFaultRecordVo vo = (DryFaultRecordVo)redFauMap.get(key); vo.setECount(vo.getECount()+1); if(redisUtil.hget(MqttConstant.MQTT_REAL_FAULT,key.toString())!=null){ //æ´æ°æ¬¡æ° redisUtil.hset(MqttConstant.MQTT_REAL_FAULT,key.toString(),vo); System.err.println("æ¥è¦æ¬¡æ°æ´æ°ï¼key-"+key); } if(vo.getECount()>=3){ vo.setEndTime(new Date()); //TODO ç»æè¶ è¿æ个æ¶é´åºé´å¤å®ä¸ºé误æ°æ® faultRecordService.save(vo); redisUtil.hdel(MqttConstant.MQTT_REAL_FAULT,key); result.add(vo); System.err.println((faultType == 1 ? "ç±»åï¼æ é" : "ç±»åï¼æ¥è¦") + DateUtils.formatDateTime()+"åå ¥æ°æ®åº"); } }); return result; } } jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryResultServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryShopServiceImpl.javaold mode 100644 new mode 100755
@@ -1,5 +1,6 @@ package org.jeecg.modules.dry.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.jeecg.modules.dry.entity.DryShop; import org.jeecg.modules.dry.mapper.DryShopMapper; import org.jeecg.modules.dry.service.IDryShopService; jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/socket/MinaConfig.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/socket/ServerHandler.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/socket/ServerReceiveThread.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/socket/SocketServerConfig.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/websocket/DrySocket.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/websocket/DrySocket1.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,223 @@ //package org.jeecg.modules.dry.websocket; // //import cn.hutool.core.bean.BeanUtil; //import com.alibaba.fastjson.JSON; //import com.alibaba.fastjson.JSONObject; //import lombok.extern.slf4j.Slf4j; //import org.jeecg.common.constant.DrySocketConst; //import org.jeecg.common.util.SpringContextUtils; //import org.jeecg.modules.dry.service.IDryRealTimeDataService; //import org.jeecg.modules.dry.vo.RealTimeDataVo; //import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.stereotype.Component; // //import javax.websocket.*; //import javax.websocket.server.PathParam; //import javax.websocket.server.ServerEndpoint; //import java.util.Collection; //import java.util.HashMap; //import java.util.Map; // //@Slf4j //@Component //@ServerEndpoint("/drySocket/{tenantId}/{machineId}") //public class DrySocket { // // /** // * å½å session // */ // private Session session; // /** // * å½åç§æ·id // */ // private String tenantId; // /** // * 设å¤idï¼ç¨äºæ è¯åä¸ç§æ·ï¼ä¸å设å¤çæ°æ® // */ // private String machineId; // /** // * å½åsocketå¯ä¸id // */ // private String socketId; // // /** // * ç§æ·è¿æ¥æ± ï¼å å«å个ç§æ·çææsocketè¿æ¥ï¼ // * å 为ä¸ä¸ªç§æ·å¯è½æå¼å¤ä¸ªè®¾å¤ï¼å¤ä¸ªè®¾å¤å°±ä¼æå¤ä¸ªè¿æ¥ï¼ // * keyæ¯tenantIdï¼valueæ¯Map对象ï¼åMapçkeyæ¯machineIdï¼valueæ¯drySocket对象 // */ // private Map<String, Map<String, DrySocket>> tenantPool = new HashMap<>(); // /** // * è¿æ¥æ± ï¼å å«ææWebSocketè¿æ¥ï¼ // * keyæ¯socketIdï¼valueæ¯drySocket对象 // */ // private Map<String, DrySocket> machinePool = new HashMap<>(); // // /** // * è·åæ个ç§æ·ææçè®¾å¤ // */ // public Map<String, DrySocket> getTenantPool(String tenantId) { // return tenantPool.computeIfAbsent(tenantId, k -> new HashMap<>(5)); // } // // /** // * åå½åç§æ·åéæ¶æ¯ // * // * @param message æ¶æ¯å 容 // */ // public void sendMessage(String message) { // try { // this.session.getAsyncRemote().sendText(message); // } catch (Exception e) { // log.error("ãdrySocketãæ¶æ¯åé失败ï¼" + e.getMessage()); // } // } // // /** // * å°è£ æ¶æ¯json // * // * @param data æ¶æ¯å 容 // */ // public static String packageMessage(String type, Object data) { // JSONObject message = new JSONObject(); // message.put(DrySocketConst.TYPE, type); // message.put(DrySocketConst.DATA, data); // return message.toJSONString(); // } // // /** // * åæå®ç§æ·çææ设å¤åéæ¶æ¯ // * // * @param tenantId æ¥æ¶æ¶æ¯çç§æ·ID // * @param message æ¶æ¯å 容 // */ // public void sendMessageTo(String tenantId, String message) { // Collection<DrySocket> values = getTenantPool(tenantId).values(); // if (values.size() > 0) { // for (DrySocket socketItem : values) { // socketItem.sendMessage(message); // } // } else { // log.warn("ãdrySocketãæ¶æ¯åé失败ï¼tenantId\"" + tenantId + "\"ä¸åå¨ææªå¨çº¿ï¼"); // } // } // // /** // * åæå®ç§æ·çæå®è®¾å¤åéæ¶æ¯ // * // * @param tenantId æ¥æ¶æ¶æ¯çç§æ·ID // * @param message æ¶æ¯å 容 // */ // public void sendMessageTo(String tenantId, String machineId, String message) { // DrySocket socketItem = getTenantPool(tenantId).get(machineId); // if (socketItem != null) { // socketItem.sendMessage(message); // } else { // log.warn("ãdrySocketãæ¶æ¯åé失败ï¼tenantId\"" + tenantId + "\"çmachineId\"" + machineId + "\"ä¸åå¨ææªå¨çº¿ï¼"); // } // } // // /** // * åå¤ä¸ªç§æ·çææ设å¤åéæ¶æ¯ // * // * @param tenantIds æ¥æ¶æ¶æ¯çç§æ·IDæ°ç» // * @param message æ¶æ¯å 容 // */ // public void sendMessageTo(String[] tenantIds, String message) { // for (String tenantId : tenantIds) { // this.sendMessageTo(tenantId, message); // } // } // // /** // * åææç§æ·çææ设å¤åéæ¶æ¯ // * // * @param message æ¶æ¯å 容 // */ // public void sendMessageToAll(String message) { // for (DrySocket socketItem : machinePool.values()) { // socketItem.sendMessage(message); // } // } // // /** // * websocket å¼å¯è¿æ¥ // */ // @OnOpen // public void onOpen(Session session, @PathParam("tenantId") String tenantId, @PathParam("machineId") String machineId) { // try { // this.tenantId = tenantId; // this.machineId = machineId; // this.socketId = tenantId + machineId; // this.session = session; // // machinePool.put(this.socketId, this); // getTenantPool(tenantId).put(this.machineId, this); // // log.info("ãdrySocketãææ°çè¿æ¥ï¼æ»æ°ä¸º:" + machinePool.size()); // log.info("ssss"+tenantPool.size()); // } catch (Exception ignored) { // } // } // // /** // * websocket æå¼è¿æ¥ // */ // @OnClose // public void onClose() { // try { // machinePool.remove(this.socketId); // getTenantPool(this.tenantId).remove(this.machineId); // // log.info("ãdrySocketãè¿æ¥æå¼ï¼æ»æ°ä¸º:" + machinePool.size()); // } catch (Exception ignored) { // } // } // // /** // * websocket æ¶å°æ¶æ¯ // */ // @OnMessage // public void onMessage(String message) { // log.info("ãdrySocketãonMessage:" + message); // IDryRealTimeDataService realTimeDataService = SpringContextUtils.getBean(IDryRealTimeDataService.class); // JSONObject json; // try { // json = JSON.parseObject(message); // } catch (Exception e) { // log.warn("ãdrySocketãæ¶å°ä¸åæ³çæ¶æ¯:" + message); // return; // } // String type = json.getString(DrySocketConst.TYPE); // switch (type) { // // å¿è·³æ£æµ // case DrySocketConst.TYPE_HB: // this.sendMessage(DrySocket.packageMessage(type, true)); // break; // // å®æ¶æ°æ®å¤ç // case DrySocketConst.TYPE_RDT: // Object o = json.get(DrySocketConst.DATA); // RealTimeDataVo realTimeDataVo = BeanUtil.toBean(o, RealTimeDataVo.class); // realTimeDataService.realTimeDataHandle(realTimeDataVo); // break; // // default: // log.warn("ãdrySocketãæ¶å°ä¸è¯å«çæ¶æ¯ç±»å:" + type); // break; // } // // // } // // /** * é ç½®é误信æ¯å¤ç * @param session * @param t */ // @OnError // public void onError(Session session, Throwable t) { // ////ä»ä¹é½ä¸æ³æå°é½å»æå°±å¥½äº // log.info("ãwebsocketæ¶æ¯ãåºç°æªç¥é误 "); ////æå°é误信æ¯ï¼å¦æä½ ä¸æ³æå°é误信æ¯ï¼å»æå°±å¥½äº ////è¿éæå°çä¹æ¯ java.io.EOFException: null // t.printStackTrace(); // } // // //} jeecg-module-dry/jeecg-module-dry-start/Dockerfileold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-start/pom.xmlold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-start/src/main/java/org/jeecg/JeecgDryCloudApplication.javaold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-start/src/main/resources/application.ymlold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-start/src/main/resources/class.txtold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-start/src/main/resources/fault.jsonold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-start/src/main/resources/logback-spring.xmlold mode 100644 new mode 100755
jeecg-module-dry/jeecg-module-dry-start/src/main/resources/model.ptold mode 100644 new mode 100755 Binary files differ
jeecg-module-dry/jeecg-module-dry-start/src/main/resources/model1.ptold mode 100644 new mode 100755 Binary files differ
jeecg-module-dry/jeecg-module-dry-start/src/main/resources/model34.ptold mode 100644 new mode 100755 Binary files differ
jeecg-module-dry/jeecg-module-dry-start/src/main/test/com/lanbao/AiTest.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,27 @@ //package com.lanbao; // //import ai.djl.modality.Classifications; //import org.jeecg.modules.dry.util.HerbUtil; //import org.junit.Test; // //import java.io.File; //import java.io.FileInputStream; //import java.io.FileNotFoundException; //import java.io.InputStream; //import java.util.List; // //public class AiTest { // @Test // public void test() { // try { // String img = "E:\\testImg\\szp1.jpg"; // HerbUtil herbUtil = new HerbUtil(); // File file = new File(img); // InputStream is = new FileInputStream(file); // List<Classifications.Classification> predict = herbUtil.predict(is); // System.out.println(predict); // } catch (FileNotFoundException e) { // throw new RuntimeException(e); // } // } //} jeecg-module-dry/jeecg-module-dry-start/src/main/test/com/lanbao/SocketTest.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,40 @@ package com.lanbao; import com.alibaba.fastjson.JSONObject; import org.apache.commons.collections.MapUtils; import org.jeecg.modules.dry.vo.SocketMsgVo; import org.junit.Test; import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.net.Socket; import java.nio.channels.SocketChannel; import java.util.HashMap; import java.util.Map; public class SocketTest { public static void main(String[] args) { Map<String, Integer> mapA = new HashMap<>(); mapA.put("apple", 10); mapA.put("banana", 20); mapA.put("orange", 30); mapA.put("hah", 30); Map<String, Integer> mapB = new HashMap<>(); mapB.put("apple", 10); mapB.put("pineapple", 40); mapB.put("dd", 40); // æ£æ¥ mapB ä¸ç¼ºå°çé® // æ£æ¥ mapB ä¸ç¼ºå°çé® mapA.keySet().stream() .filter(key -> !mapB.containsKey(key)) .forEach(key -> System.out.println("Map B ä¸ç¼ºå°çé®: " + key)); } @Test public void test(){ } } jeecg-module-dry/jeecg-module-dry-start/src/main/test/java/com/lanbao/AiTest.java
ÎļþÒÑɾ³ý jeecg-module-dry/jeecg-module-dry-start/src/main/test/java/com/lanbao/SocketTest.java
ÎļþÒÑɾ³ý jeecg-module-dry/pom.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/pom.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/factory/SysBaseAPIFallbackFactory.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/config/FeignConfig.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-api/jeecg-system-local-api/pom.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-api/pom.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/.gitattributesold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/pom.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/init/CodeGenerateDbConfig.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/init/CodeTemplateInitListener.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/init/RedisInitListener.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,32 @@ package org.jeecg.config.init; import org.jeecg.common.constant.CommonCacheConstant; import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.system.entity.SysTenant; import org.jeecg.modules.system.service.ISysTenantService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.event.ApplicationStartedEvent; import org.springframework.context.ApplicationListener; import org.springframework.stereotype.Component; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @Component public class RedisInitListener implements ApplicationListener<ApplicationStartedEvent> { @Autowired private RedisUtil redisUtil; @Autowired private ISysTenantService sysTenantService; @Override public void onApplicationEvent(ApplicationStartedEvent event) { //æ¥è¯¢ææç§æ·ä¿¡æ¯å¹¶ç¼åè³redis List<SysTenant> tenantList = sysTenantService.list(); //list转map Map<String, Object> tenantMap = tenantList.stream() .collect(Collectors.toMap(t -> String.valueOf(t.getId()), t -> (Object) t.getName(), (existingValue, newValue) -> existingValue)); redisUtil.hmset(CommonCacheConstant.SYS_CACHE_TENANT,tenantMap); } } jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/init/SystemInitListener.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/init/TomcatFactoryConfig.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/aop/TenantLog.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/aop/TenantPackUserLogAspect.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/SystemApiController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/cas/controller/CasClientController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/cas/util/CasServiceUtil.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/cas/util/XmlUtils.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SysMessageController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SysMessageTemplateController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/TestSocketController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/entity/MsgParams.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/entity/SysMessage.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/entity/SysMessageTemplate.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/enums/RangeDateEnum.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/enums/Vue3MessageHrefEnum.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/ISendMsgHandle.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/enums/SendMsgStatusEnum.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/enums/SendMsgTypeEnum.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/DdSendMsgHandle.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/EmailSendMsgHandle.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/QywxSendMsgHandle.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/SmsSendMsgHandle.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/SystemSendMsgHandle.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/WxSendMsgHandle.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/job/SendMsgJob.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/mapper/SysMessageMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/mapper/SysMessageTemplateMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/mapper/xml/SysMessageMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/mapper/xml/SysMessageTemplateMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/service/ISysMessageService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/service/ISysMessageTemplateService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/service/impl/SysMessageServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/service/impl/SysMessageTemplateServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/util/PushMsgUtil.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/websocket/SocketHandler.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/websocket/WebSocket.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/monitor/controller/ActuatorRedisController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/monitor/domain/RedisInfo.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/monitor/exception/RedisConnectException.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/monitor/service/RedisService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/monitor/service/impl/MailHealthIndicator.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/monitor/service/impl/RedisServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ngalain/aop/LogRecordAspect.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ngalain/controller/NgAlainController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ngalain/service/NgAlainService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/oss/controller/OssFileController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/oss/entity/OssFile.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/oss/mapper/OssFileMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/oss/service/IOssFileService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/oss/service/impl/OssFileServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/AsyncJob.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleJob.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleParamJob.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/QuartzJobMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/xml/QuartzJobMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/service/IQuartzJobService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/service/impl/QuartzJobServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCheckRuleController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCommentController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataLogController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataSourceController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFilesController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFillRuleController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFormFileController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysGatewayRouteController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysLogController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPositionController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUploadController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserAgentController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserOnlineController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdAppController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysAnnouncementSend.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCategory.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysComment.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataLog.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataSource.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDict.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDictItem.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFiles.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFillRule.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFormFile.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysGatewayRoute.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysLog.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPackPermission.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPermission.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPermissionDataRule.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPosition.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRole.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRoleIndex.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRolePermission.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenant.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPack.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPackUser.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAccount.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserAgent.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserRole.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserTenant.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCategoryMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCheckRuleMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCommentMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDataSourceMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartPermissionMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRolePermissionMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleUserMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysFilesMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysFillRuleMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysFormFileMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysGatewayRouteMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysLogMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPackPermissionMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPositionMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRoleIndexMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRoleMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRolePermissionMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTenantMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTenantPackMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTenantPackUserMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysThirdAccountMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserAgentMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserRoleMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserTenantMapper.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysCategoryMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysCheckRuleMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysCommentMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDataLogMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDataSourceMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartPermissionMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRoleMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRolePermissionMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRoleUserMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictItemMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysFillRuleMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysGatewayRouteMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysLogMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPackPermissionMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionDataRuleMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPositionMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleIndexMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTenantMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTenantPackMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTenantPackUserMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysThirdAccountMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserAgentMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserTenantMapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/DepartIdModel.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysDictTree.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysLoginModel.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysUserSysDepartModel.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/ThirdLoginModel.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/TreeModel.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/TreeSelectModel.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/rule/CategoryCodeRule.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/rule/OrderNumberRule.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/rule/OrgCodeRule.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/security/DictQueryBlackListHandler.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCategoryService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCheckRuleService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCommentService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataLogService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataSourceService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartPermissionService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRolePermissionService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRoleService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartRoleUserService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictItemService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFilesService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFillRuleService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFormFileService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysGatewayRouteService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysLogService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPackPermissionService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPermissionDataRuleService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPermissionService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPositionService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleIndexService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRolePermissionService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantPackService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysThirdAccountService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserAgentService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserRoleService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserTenantService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IThirdAppService.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ImportFileServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementSendServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCategoryServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCheckRuleServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCommentServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDataLogServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDataSourceServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartPermissionServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRolePermissionServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleUserServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictItemServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFilesServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFillRuleServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFormFileServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysGatewayRouteServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysLogServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPackPermissionServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionDataRuleImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPositionServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRoleIndexServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRoleServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserAgentServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserRoleServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserTenantServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/RandImageUtil.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/SecurityUtil.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/XssUtils.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysCommentFileVo.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysCommentVO.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysDepartUsersVO.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysDictPage.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysFileLogVo.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysFilesVo.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserDepVo.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserOnlineVO.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserRoleCountVo.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserRoleVO.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserTenantVo.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/UserAvatar.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/DepartAndUserInfo.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/DepartInfo.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/SysDictVo.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/UpdateDepartInfo.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantDepartAuthInfo.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantPackAuth.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantPackModel.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantPackUser.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantPackUserCount.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/UserDepart.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/UserPosition.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/thirdapp/JdtDepartmentTreeVo.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/thirdapp/JwDepartmentTreeVo.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/thirdapp/SyncInfoVo.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/blob.ftlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeComponents.ftlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeForm.ftlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeImport.ftlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/vue3Jvxepopup.ftlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/vue3popup.ftlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/init/initValue.ftlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/init/initValueSub.ftlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/sql/menu_insert.ftlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/validatorRulesTemplate/core.ftlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/validatorRulesTemplate/main.ftlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/validatorRulesTemplate/native/vue3CoreNative.ftlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/validatorRulesTemplate/native/vue3MainNative.ftlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/validatorRulesTemplate/sub-vue3.ftlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/validatorRulesTemplate/sub.ftlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}_menu_insert.sqlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}_menu_insert.sqlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__api.tsiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}_menu_insert.sqlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}_menu_insert.sqlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/${entityName}_menu_insert.sqlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}_menu_insert.sqlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__api.tsiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}_menu_insert.sqlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}_menu_insert.sqlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/[1-n]List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}_menu_insert.sqlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/[1-n]List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}_menu_insert.sqlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/subTables/[1-n]SubTable.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}_menu_insert.sqlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/subTables/[1-n]SubTable.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}_menu_insert.sqlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}_menu_insert.sqlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__api.tsiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}_menu_insert.sqlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}_menu_insert.sqlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}_menu_insert.sqlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue-app/${entityName}Form.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue-app/${entityName}List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue3/modules/${entityName}Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/entity/${entityPackage}/${entityName}.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/mapper/${entityPackage}/${entityName}Mapper.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/mapper/${entityPackage}/xml/${entityName}Mapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/service/${entityPackage}/I${entityName}Service.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/service/${entityPackage}/impl/${entityName}ServiceImpl.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/${entityName}List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal__Style#Drawer.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue3/${entityPackage}/${entityName}List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue3/${entityPackage}/${entityName}__api.tsiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue3/${entityPackage}/${entityName}__data.tsiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/vue3/${entityPackage}/modules/${entityName}Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue3/modules/${entityName}Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javaiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/[1-n]List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue3/[1-n]List.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue3/modules/${entityName}Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue3/modules/[1-n]Modal.vueiold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/static/demo1.htmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/LICENSEold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/build/pdf.jsold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/build/pdf.worker.jsold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/78-EUC-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/78-EUC-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/78-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/78-RKSJ-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/78-RKSJ-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/78-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/78ms-RKSJ-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/78ms-RKSJ-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/83pv-RKSJ-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/90ms-RKSJ-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/90ms-RKSJ-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/90msp-RKSJ-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/90msp-RKSJ-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/90pv-RKSJ-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/90pv-RKSJ-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Add-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Add-RKSJ-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Add-RKSJ-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Add-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-0.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-1.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-2.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-3.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-4.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-5.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-6.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-CNS1-UCS2.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-GB1-0.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-GB1-1.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-GB1-2.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-GB1-3.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-GB1-4.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-GB1-5.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-GB1-UCS2.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-0.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-1.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-2.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-3.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-4.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-5.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-6.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-Japan1-UCS2.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-0.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-1.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-2.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Adobe-Korea1-UCS2.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/B5-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/B5-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/B5pc-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/B5pc-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/CNS-EUC-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/CNS-EUC-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/CNS1-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/CNS1-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/CNS2-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/CNS2-V.bcmapold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/ETHK-B5-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/ETHK-B5-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/ETen-B5-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/ETen-B5-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/ETenms-B5-H.bcmapold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/ETenms-B5-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/EUC-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/EUC-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Ext-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Ext-RKSJ-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Ext-RKSJ-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Ext-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/GB-EUC-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/GB-EUC-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/GB-H.bcmapold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/GB-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/GBK-EUC-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/GBK-EUC-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/GBK2K-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/GBK2K-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/GBKp-EUC-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/GBKp-EUC-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/GBT-EUC-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/GBT-EUC-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/GBT-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/GBT-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/GBTpc-EUC-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/GBTpc-EUC-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/GBpc-EUC-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/GBpc-EUC-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/HKdla-B5-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/HKdla-B5-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/HKdlb-B5-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/HKdlb-B5-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/HKgccs-B5-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/HKgccs-B5-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/HKm314-B5-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/HKm314-B5-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/HKm471-B5-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/HKm471-B5-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/HKscs-B5-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/HKscs-B5-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Hankaku.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Hiragana.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/KSC-EUC-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/KSC-EUC-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/KSC-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/KSC-Johab-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/KSC-Johab-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/KSC-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/KSCms-UHC-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/KSCms-UHC-HW-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/KSCms-UHC-HW-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/KSCms-UHC-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/KSCpc-EUC-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/KSCpc-EUC-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Katakana.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/LICENSEold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/NWP-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/NWP-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/RKSJ-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/RKSJ-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/Roman.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniCNS-UCS2-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniCNS-UCS2-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniCNS-UTF16-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniCNS-UTF16-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniCNS-UTF32-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniCNS-UTF32-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniCNS-UTF8-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniCNS-UTF8-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniGB-UCS2-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniGB-UCS2-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniGB-UTF16-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniGB-UTF16-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniGB-UTF32-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniGB-UTF32-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniGB-UTF8-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniGB-UTF8-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-HW-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-HW-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniJIS-UCS2-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniJIS-UTF16-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniJIS-UTF16-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniJIS-UTF32-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniJIS-UTF32-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniJIS-UTF8-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniJIS-UTF8-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF16-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF16-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF32-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF32-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF8-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniJIS2004-UTF8-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniJISPro-UCS2-HW-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniJISPro-UCS2-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniJISPro-UTF8-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniJISX0213-UTF32-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniJISX0213-UTF32-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniJISX02132004-UTF32-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniJISX02132004-UTF32-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniKS-UCS2-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniKS-UCS2-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniKS-UTF16-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniKS-UTF16-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniKS-UTF32-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniKS-UTF32-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniKS-UTF8-H.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/UniKS-UTF8-V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/V.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/cmaps/WP-Symbol.bcmapold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/compatibility.jsold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/compressed.tracemonkey-pldi-09.pdfold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/debugger.jsold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/annotation-check.svgold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/annotation-comment.svgold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/annotation-help.svgold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/annotation-insert.svgold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/annotation-key.svgold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/annotation-newparagraph.svgold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/annotation-noicon.svgold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/annotation-note.svgold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/annotation-paragraph.svgold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/findbarButton-next-rtl.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/findbarButton-next-rtl@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/findbarButton-next.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/findbarButton-next@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/findbarButton-previous-rtl.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/findbarButton-previous-rtl@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/findbarButton-previous.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/findbarButton-previous@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/grab.curold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/grabbing.curold mode 100644 new mode 100755 Binary files differ
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/loading-icon.gifjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/loading-small.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/loading-small@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/secondaryToolbarButton-documentProperties.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/secondaryToolbarButton-documentProperties@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/secondaryToolbarButton-firstPage.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/secondaryToolbarButton-firstPage@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/secondaryToolbarButton-handTool.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/secondaryToolbarButton-handTool@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/secondaryToolbarButton-lastPage.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/secondaryToolbarButton-lastPage@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCcw.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCcw@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCw.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/secondaryToolbarButton-rotateCw@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/shadow.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/texture.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-bookmark.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-bookmark@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-download.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-download@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-menuArrows.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-menuArrows@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-openFile.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-openFile@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-pageDown-rtl.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-pageDown-rtl@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-pageDown.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-pageDown@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-pageUp-rtl.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-pageUp-rtl@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-pageUp.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-pageUp@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-presentationMode.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-presentationMode@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-print.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-print@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-search.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-search@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle-rtl.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle-rtl@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-secondaryToolbarToggle@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle-rtl.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle-rtl@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-sidebarToggle@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-viewAttachments.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-viewAttachments@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-viewOutline-rtl.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-viewOutline-rtl@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-viewOutline.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-viewOutline@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-viewThumbnail.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-viewThumbnail@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-zoomIn.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-zoomIn@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-zoomOut.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/images/toolbarButton-zoomOut@2x.pngjeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/l10n.jsold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/locale/locale.propertiesold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/locale/zh-CN/viewer.propertiesold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/viewer.cssold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/viewer.htmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/viewer.jsold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/static/view/userlist.htmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/templates/announcement/showContent.ftlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/templates/demo3.ftlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/templates/pdfPreviewIframe.ftlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-biz/src/main/resources/templates/thirdLogin.ftlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-start/Dockerfileold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-start/README.mdold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-start/pom.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemApplication.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/codegenerate/JeecgOneGUI.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/codegenerate/JeecgOneToMainUtil.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.ymlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.ymlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-start/src/main/resources/application-test.ymlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-start/src/main/resources/application.ymlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-start/src/main/resources/banner.txtold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_config.propertiesold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_database.propertiesold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-start/src/main/resources/logback-spring.xmlold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/SampleTest.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/TestMain.javaold mode 100644 new mode 100755
jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SysUserTest.javaold mode 100644 new mode 100755
jeecg-module-system/pom.xmlold mode 100644 new mode 100755
jeecg-server-cloud/docker-compose-base.ymlold mode 100644 new mode 100755
jeecg-server-cloud/docker-compose.ymlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-gateway/Dockerfileold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-gateway/README.mdold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-gateway/pom.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/JeecgGatewayApplication.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/config/GatewayRoutersConfig.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/config/RateLimiterConfiguration.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/config/RouterDataType.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/fallback/FallbackController.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/fallback/HystrixFallbackHandler.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/fallback/sentinel/GatewaySentinelExceptionConfig.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/fallback/sentinel/SentinelBlockRequestHandler.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/filter/GlobalAccessTokenFilter.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/filter/SentinelFilterContextConfig.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/LoderRouderHandler.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/MySwaggerResourceProvider.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/SwaggerResourceController.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/repository/DynamicRouteService.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/repository/MyInMemoryRouteDefinitionRepository.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/vo/GatewayRouteVo.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/vo/MyRouteDefinition.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-gateway/src/main/resources/application.ymlold mode 100644 new mode 100755
@@ -27,8 +27,8 @@ allowedOriginPatterns: "*" allowedMethods: "*" allowedHeaders: "*" # inetutils: # preferred-networks: 192.168 inetutils: preferred-networks: 192.168 #Sentinelé ç½® sentinel: transport: jeecg-server-cloud/jeecg-cloud-gateway/src/main/resources/logback-spring.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-nacos/Dockerfileold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-nacos/README.mdold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-nacos/docs/config/jeecg-dev.yamlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-nacos/docs/config/jeecg-gateway-dev.yamlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-nacos/docs/config/jeecg-gateway-router.jsonold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-nacos/docs/config/jeecg.yamlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-nacos/docs/config/·Ö¿â·Ö±í/jeecg-sharding-multi.yamlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-nacos/docs/config/·Ö¿â·Ö±í/jeecg-sharding.yamlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-nacos/pom.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-nacos/src/main/java/com/alibaba/nacos/JeecgNacosApplication.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-cloud-nacos/src/main/resources/application.ymlold mode 100644 new mode 100755
@@ -12,9 +12,9 @@ db: num: 1 password: '0': ${MYSQL-PWD:123456} '0': ${MYSQL-PWD:root} url: '0': jdbc:mysql://${MYSQL-HOST:jeecg-boot-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:nacos}?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true '0': jdbc:mysql://${MYSQL-HOST:localhost}:${MYSQL-PORT:3306}/${MYSQL-DB:nacos-herb}?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true user: '0': ${MYSQL-USER:root} management: jeecg-server-cloud/jeecg-demo-cloud-start/Dockerfileold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-demo-cloud-start/README.mdold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-demo-cloud-start/pom.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-demo-cloud-start/src/main/java/org/jeecg/JeecgDemoCloudApplication.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-demo-cloud-start/src/main/resources/application.ymlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-demo-cloud-start/src/main/resources/logback-spring.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-system-cloud-start/Dockerfileold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-system-cloud-start/README.mdold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-system-cloud-start/pom.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/application.ymlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/jeecg/jeecg_config.propertiesold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/jeecg/jeecg_database.propertiesold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/logback-spring.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-monitor/README.mdold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-monitor/pom.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-monitor/src/main/java/org/jeecg/monitor/JeecgMonitorApplication.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-monitor/src/main/java/org/jeecg/monitor/config/SecuritySecureConfig.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-monitor/src/main/resources/application.ymlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/Dockerfileold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/README.mdold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/pom.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/JeecgSentinelApplication.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/constants/SentinelConStants.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AuthorityRuleController.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DegradeController.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/ParamFlowRuleController.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/SystemController.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/base/BaseRuleController.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/gateway/GatewayApiController.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/gateway/GatewayFlowRuleController.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/v2/FlowControllerV2.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/NacosConfigProperties.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/SentinelConfig.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/authority/AuthorityRuleNacosProvider.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/authority/AuthorityRuleNacosPublisher.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/degrade/DegradeRuleNacosProvider.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/degrade/DegradeRuleNacosPublisher.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/entity/AuthorityRuleCorrectEntity.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/entity/ParamFlowRuleCorrectEntity.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/flow/FlowRuleNacosProvider.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/flow/FlowRuleNacosPublisher.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/gateway/GateWayApiNacosProvider.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/gateway/GateWayApiNacosPublisher.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/gateway/GateWayFlowRulesNacosProvider.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/gateway/GateWayFlowRulesNacosPublisher.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/paramflow/ParamFlowRuleNacosProvider.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/paramflow/ParamFlowRuleNacosPublisher.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/system/SystemRuleNacosProvider.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/system/SystemRuleNacosPublisher.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/resources/application.ymlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/pom.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/constant/CloudConstant.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/client/JeecgTestClient.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/client/JeecgTestClientDyn.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/controller/JeecgTestFeignController.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/factory/JeecgTestClientFactory.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/fallback/JeecgTestFallback.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/lock/DemoLockTest.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/xxljob/DemoJobHandler.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/xxljob/XxclJobTest.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/pom.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/constant/CloudConstant.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/controller/JeecgMqTestController.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/event/DemoBusEvent.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/listener/HelloReceiver1.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/listener/HelloReceiver2.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/listener/HelloReceiver3.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/listener/HelloTimeReceiver.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/db/seata.sqlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/pom.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/java/org/jeecg/SeataAccountApplication.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/java/org/jeecg/modules/test/seata/account/controller/SeataAccountController.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/java/org/jeecg/modules/test/seata/account/entity/SeataAccount.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/java/org/jeecg/modules/test/seata/account/mapper/SeataAccountMapper.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/java/org/jeecg/modules/test/seata/account/service/SeataAccountService.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/java/org/jeecg/modules/test/seata/account/service/impl/SeataAccountServiceImpl.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/resources/application.ymlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/resources/sql/schema-account.sqlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/pom.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/SeataOrderApplication.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/controller/SeataOrderController.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/dto/PlaceOrderRequest.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/dto/ReduceBalanceRequest.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/dto/ReduceStockRequest.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/entity/SeataOrder.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/enums/OrderStatus.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/feign/AccountClient.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/feign/ProductClient.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/mapper/SeataOrderMapper.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/service/SeataOrderService.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/service/impl/SeataOrderServiceImpl.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/resources/application.ymlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/resources/sql/schema-order.sqlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/pom.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/java/org/jeecg/SeataProductApplication.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/java/org/jeecg/modules/test/seata/product/controller/SeataProductController.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/java/org/jeecg/modules/test/seata/product/entity/SeataProduct.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/java/org/jeecg/modules/test/seata/product/mapper/SeataProductMapper.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/java/org/jeecg/modules/test/seata/product/service/SeataProductService.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/java/org/jeecg/modules/test/seata/product/service/impl/SeataProductServiceImpl.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/resources/application.ymlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/resources/sql/schema-product.sqlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/pom.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/doc/db.sqlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/pom.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/algorithm/StandardModTableShardAlgorithm.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/controller/JeecgShardingDemoController.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/entity/ShardingSysLog.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/mapper/ShardingSysLogMapper.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/mapper/xml/ShardingSysLogMapper.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/service/IShardingSysLogService.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/service/impl/ShardingSysLogServiceImpl.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/resources/application-sharding-multi.ymlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/resources/application-sharding.ymlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/pom.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/Dockerfileold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/README.mdold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/doc/db/tables_xxl_job.sqlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/pom.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/XxlJobAdminApplication.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/IndexController.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobApiController.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobCodeController.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobGroupController.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobInfoController.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobLogController.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/UserController.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/annotation/PermissionLimit.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/interceptor/CookieInterceptor.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/interceptor/WebMvcConfig.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/alarm/JobAlarm.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/alarm/JobAlarmer.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/cron/CronExpression.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/exception/XxlJobException.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/model/XxlJobGroup.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/model/XxlJobInfo.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/model/XxlJobLog.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/model/XxlJobLogGlue.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/model/XxlJobLogReport.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/model/XxlJobRegistry.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/model/XxlJobUser.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/old/RemoteHttpJobBean.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/old/XxlJobDynamicScheduler.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/old/XxlJobThreadPool.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/route/ExecutorRouteStrategyEnum.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/route/ExecutorRouter.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteBusyover.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteConsistentHash.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFirst.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLFU.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLRU.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLast.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRandom.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRound.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/scheduler/XxlJobScheduler.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/thread/JobLogReportHelper.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/thread/JobLosedMonitorHelper.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/thread/JobTriggerPoolHelper.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/trigger/TriggerTypeEnum.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/util/CookieUtil.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/util/FtlUtil.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/util/I18nUtil.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/util/JacksonUtil.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/util/LocalCacheUtil.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/dao/XxlJobGroupDao.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/dao/XxlJobInfoDao.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/dao/XxlJobLogDao.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/dao/XxlJobLogGlueDao.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/dao/XxlJobLogReportDao.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/dao/XxlJobRegistryDao.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/dao/XxlJobUserDao.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/service/LoginService.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/service/XxlJobService.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.javaold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/application.ymlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/i18n/message_en.propertiesold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/i18n/message_zh_CN.propertiesold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/i18n/message_zh_TC.propertiesold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/logback.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/mybatis-mapper/XxlJobLogMapper.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/mybatis-mapper/XxlJobLogReportMapper.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/mybatis-mapper/XxlJobRegistryMapper.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/mybatis-mapper/XxlJobUserMapper.xmlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/Ionicons/css/ionicons.min.cssold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.eotold mode 100644 new mode 100755 Binary files differ
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.svgold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.ttfold mode 100644 new mode 100755 Binary files differ
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.woffold mode 100644 new mode 100755 Binary files differ
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/PACE/pace.min.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/PACE/themes/blue/pace-theme-flash.cssold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/bootstrap-daterangepicker/daterangepicker.cssold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/bootstrap-daterangepicker/daterangepicker.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/bootstrap/css/bootstrap.min.cssold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/bootstrap/css/bootstrap.min.css.mapold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.eotold mode 100644 new mode 100755 Binary files differ
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.svgold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttfold mode 100644 new mode 100755 Binary files differ
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.woffold mode 100644 new mode 100755 Binary files differ
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff2old mode 100644 new mode 100755 Binary files differ
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/bootstrap/js/bootstrap.min.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.cssold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/datatables.net/js/jquery.dataTables.min.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/fastclick/fastclick.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/font-awesome/css/font-awesome.css.mapold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/font-awesome/css/font-awesome.min.cssold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/FontAwesome.otfold mode 100644 new mode 100755 Binary files differ
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.eotold mode 100644 new mode 100755 Binary files differ
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.svgold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.ttfold mode 100644 new mode 100755 Binary files differ
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.woffold mode 100644 new mode 100755 Binary files differ
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.woff2old mode 100644 new mode 100755 Binary files differ
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/jquery-slimscroll/jquery.slimscroll.min.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/jquery/jquery.min.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/bower_components/moment/moment.min.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/dist/css/AdminLTE.min.cssold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/dist/css/skins/_all-skins.min.cssold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/dist/js/adminlte.min.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/plugins/iCheck/icheck.min.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/plugins/iCheck/square/blue.cssold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/plugins/iCheck/square/blue.pngjeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/adminlte/plugins/iCheck/square/blue@2x.pngjeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/favicon.icojeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/js/common.1.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/js/index.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/js/jobcode.index.1.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/js/jobgroup.index.1.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/js/jobinfo.index.1.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/js/joblog.detail.1.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/js/joblog.index.1.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/js/login.1.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/js/user.index.1.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/plugins/codemirror/addon/hint/anyword-hint.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/plugins/codemirror/addon/hint/show-hint.cssold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/plugins/codemirror/addon/hint/show-hint.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/plugins/codemirror/lib/codemirror.cssold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/plugins/codemirror/lib/codemirror.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/plugins/codemirror/mode/clike/clike.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/plugins/codemirror/mode/javascript/javascript.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/plugins/codemirror/mode/php/php.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/plugins/codemirror/mode/powershell/powershell.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/plugins/codemirror/mode/python/python.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/plugins/codemirror/mode/shell/shell.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/plugins/cronGen/cronGen.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/plugins/cronGen/cronGen_en.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/plugins/echarts/echarts.common.min.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/plugins/jquery/jquery.cookie.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/plugins/jquery/jquery.validate.min.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/plugins/layer/layer.jsold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/plugins/layer/theme/default/icon-ext.pngjeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/plugins/layer/theme/default/icon.pngjeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/plugins/layer/theme/default/layer.cssold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/plugins/layer/theme/default/loading-0.gifjeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/plugins/layer/theme/default/loading-1.gifjeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/static/plugins/layer/theme/default/loading-2.gifjeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/templates/common/common.exception.ftlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/templates/common/common.macro.ftlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/templates/help.ftlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/templates/index.ftlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/templates/jobcode/jobcode.index.ftlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/templates/jobgroup/jobgroup.index.ftlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/templates/jobinfo/jobinfo.index.ftlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/templates/joblog/joblog.detail.ftlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/templates/joblog/joblog.index.ftlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/templates/login.ftlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/templates/user/user.index.ftlold mode 100644 new mode 100755
jeecg-server-cloud/jeecg-visual/pom.xmlold mode 100644 new mode 100755
jeecg-server-cloud/pom.xmlold mode 100644 new mode 100755
jrebel-classpath-17592.jarBinary files differ
pom.xmlold mode 100644 new mode 100755
