diff --git a/.gitignore b/.gitignore index bc7d29a6..e5cc31db 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,8 @@ .LSOverride # Icon must end with two \r -Icon +Icon + # Thumbnails ._* @@ -52,3 +53,4 @@ $RECYCLE.BIN/ # Windows shortcuts *.lnk +/buildpackage/src/main/resources/banner.txt diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java index 247ce809..3240e712 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java @@ -6,12 +6,8 @@ import com.hzya.frame.mdm.entity.MdmQuery; import com.hzya.frame.mdm.entity.MdmVo; import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; import com.hzya.frame.mdm.mdmModule.dao.IMdmModuleDao; -import com.hzya.frame.sys.application.api.entity.SysApplicationApiDto; -import com.hzya.frame.sys.application.api.entity.SysApplicationApiVo; import com.hzya.frame.sys.entity.FormmainDeleteDto; -import com.hzya.frame.sys.entity.FormmainDto; import com.hzya.frame.sys.entity.ModuleDto; -import com.hzya.frame.sys.entity.TemplateQuery; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; diff --git a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java index b6c3383b..a2f6aadc 100644 --- a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java @@ -49,25 +49,17 @@ import com.hzya.frame.mdm.mdmModuleViewDetail.entity.MdmModuleViewDetailEntity; import com.hzya.frame.mdm.mdmTableCodeRule.dao.IMdmTableCodeRuleDao; import com.hzya.frame.mdm.mdmTableCodeRule.entity.MdmTableCodeRuleEntity; import com.hzya.frame.mdm.service.IMdmService; -import com.hzya.frame.sys.application.entity.SysApplicationDto; -import com.hzya.frame.sys.application.entity.SysApplicationVo; import com.hzya.frame.sys.entity.FormmainDeleteDto; import com.hzya.frame.sys.entity.ModuleDto; -import com.hzya.frame.sys.entity.TemplateKeyValue; -import com.hzya.frame.sys.entity.TemplateQuery; import com.hzya.frame.sys.module.dao.IModuleMapper; import com.hzya.frame.sys.module.entity.Module; import com.hzya.frame.sys.roleModule.dao.IRoleModuleMapper; import com.hzya.frame.sys.roleModule.entity.RoleModule; -import com.hzya.frame.sys.template.entity.Template; -import com.hzya.frame.sys.testReturn.entity.TestReturn; import com.hzya.frame.sys.userRole.dao.IUserRoleMapper; import com.hzya.frame.sys.userRole.entity.UserRole; -import com.hzya.frame.sys.userTemplateView.entity.UserTemplateView; import com.hzya.frame.uuid.UUIDUtils; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; -import org.checkerframework.checker.units.qual.A; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/service/src/main/java/com/hzya/frame/serviceUtil/DsDataSourceUtil.java b/service/src/main/java/com/hzya/frame/serviceUtil/DsDataSourceUtil.java index 0be0d2ce..d45a817a 100644 --- a/service/src/main/java/com/hzya/frame/serviceUtil/DsDataSourceUtil.java +++ b/service/src/main/java/com/hzya/frame/serviceUtil/DsDataSourceUtil.java @@ -5,8 +5,8 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; import com.baomidou.dynamic.datasource.exception.CannotFindDataSourceException; import com.hzya.frame.datasource.DataSourceUtilProperties; -import com.hzya.frame.sys.application.entity.SysApplicationDatasourceDto; import com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity; +import com.hzya.frame.sysnew.application.entity.SysApplicationDatasourceDto; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/service/src/main/java/com/hzya/frame/sys/dataSource/dao/impl/SysDataSourceDaoImpl.java b/service/src/main/java/com/hzya/frame/sys/dataSource/dao/impl/SysDataSourceDaoImpl.java index 4bcc0c5a..0f9948f1 100644 --- a/service/src/main/java/com/hzya/frame/sys/dataSource/dao/impl/SysDataSourceDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sys/dataSource/dao/impl/SysDataSourceDaoImpl.java @@ -4,8 +4,6 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity; import com.hzya.frame.sys.dataSource.dao.ISysDataSourceDao; import com.hzya.frame.sys.dataSource.entity.SysDataSourceVo; -import com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity; -import com.hzya.frame.sys.messageManage.entity.SysMessageManagePageVo; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; diff --git a/service/src/main/java/com/hzya/frame/sys/dataSource/service/impl/SysDataSourceServiceImpl.java b/service/src/main/java/com/hzya/frame/sys/dataSource/service/impl/SysDataSourceServiceImpl.java index ac2a036d..bb700ac3 100644 --- a/service/src/main/java/com/hzya/frame/sys/dataSource/service/impl/SysDataSourceServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sys/dataSource/service/impl/SysDataSourceServiceImpl.java @@ -5,19 +5,13 @@ import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.hzya.frame.serviceUtil.DsDataSourceUtil; -import com.hzya.frame.sys.appApi.entity.AppApi; -import com.hzya.frame.sys.appApi.entity.AppApiDto; -import com.hzya.frame.sys.appApi.entity.AppApiListVo; import com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity; import com.hzya.frame.sys.dataSource.dao.ISysDataSourceDao; import com.hzya.frame.sys.dataSource.entity.SysDataSourceVo; import com.hzya.frame.sys.dataSource.service.ISysDataSourceService; -import com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity; -import com.hzya.frame.sys.messageManageDetail.entity.SysMessageManageDetailEntity; import com.hzya.frame.uuid.UUIDUtils; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; -import com.hzya.frame.web.exception.BaseSystemException; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.Resource; diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/living/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java index 1a8362a9..be3692a5 100644 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/living/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sys/integrationtask/living/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java @@ -1,8 +1,5 @@ package com.hzya.frame.sys.integrationtask.living.dao.impl; -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hzya.frame.sys.appApi.entity.AppApi; -import com.hzya.frame.sys.application.api.entity.SysApplicationApiVo; import com.hzya.frame.sys.integrationtask.living.entity.IntegrationTaskLivingDetailsEntity; import com.hzya.frame.sys.integrationtask.living.entity.IntegrationTaskLivingDetailsVo; import org.springframework.stereotype.Repository; @@ -37,9 +34,5 @@ public class IntegrationTaskLivingDetailsDaoImpl extends MybatisGenericDao) super.selectList(getSqlIdPrifx() + "queryFastIntegrationTaskLivingDetails", integrationTaskLivingDetailsEntity); } -// @DS("sowow_sqlserver_test") -// @Override -// public List queryErrorDetailsId(IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity) throws Exception { -// return super.selectList(getSqlIdPrifx() + "queryErrorDetailsId", integrationTaskLivingDetailsEntity); -// } + } diff --git a/service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/dao/impl/IntegrationTaskMonitoringDaoImpl.java b/service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/dao/impl/IntegrationTaskMonitoringDaoImpl.java index ddf2278f..caa6ba3b 100644 --- a/service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/dao/impl/IntegrationTaskMonitoringDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sys/integrationtask/monitoring/dao/impl/IntegrationTaskMonitoringDaoImpl.java @@ -1,13 +1,10 @@ package com.hzya.frame.sys.integrationtask.monitoring.dao.impl; -import com.hzya.frame.sys.application.entity.SysApplicationDto; -import com.hzya.frame.sys.application.entity.SysApplicationVo; import com.hzya.frame.sys.integrationtask.monitoring.entity.IntegrationTaskMonitoringEntity; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; import com.hzya.frame.sys.integrationtask.monitoring.dao.IIntegrationTaskMonitoringDao; -import java.util.List; /** * @description: 集成任务任务监控 dao diff --git a/service/src/main/java/com/hzya/frame/sys/service/IEsbService.java b/service/src/main/java/com/hzya/frame/sys/service/IEsbService.java index bfa6a169..54ac4250 100644 --- a/service/src/main/java/com/hzya/frame/sys/service/IEsbService.java +++ b/service/src/main/java/com/hzya/frame/sys/service/IEsbService.java @@ -1,7 +1,7 @@ package com.hzya.frame.sys.service; import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.sys.messageManageLog.entity.SysMessageManageLogEntity; +import com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogEntity; import com.hzya.frame.web.entity.JsonResultEntity; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/sys/service/impl/EsbServiceImpl.java b/service/src/main/java/com/hzya/frame/sys/service/impl/EsbServiceImpl.java index c4356f9a..0a25502b 100644 --- a/service/src/main/java/com/hzya/frame/sys/service/impl/EsbServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sys/service/impl/EsbServiceImpl.java @@ -10,31 +10,26 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.serviceUtil.ServiceUtil; import com.hzya.frame.sys.appApi.entity.AppApi; -import com.hzya.frame.sys.appApi.entity.AppApiDto; import com.hzya.frame.sys.appApi.service.IAppApiService; import com.hzya.frame.sys.entity.EsbReturnEntity; import com.hzya.frame.sys.entity.EsbSendEntity; -import com.hzya.frame.sys.messageManage.dao.ISysMessageManageDao; -import com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity; -import com.hzya.frame.sys.messageManageDetail.dao.ISysMessageManageDetailDao; -import com.hzya.frame.sys.messageManageDetail.entity.SysMessageManageDetailEntity; -import com.hzya.frame.sys.messageManageDetail.service.impl.SysMessageManageDetailServiceImpl; -import com.hzya.frame.sys.messageManageLog.dao.ISysMessageManageLogDao; -import com.hzya.frame.sys.messageManageLog.entity.SysMessageManageLogEntity; +import com.hzya.frame.sysnew.messageManage.dao.ISysMessageManageDao; +import com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity; +import com.hzya.frame.sysnew.messageManageDetail.dao.ISysMessageManageDetailDao; +import com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity; +import com.hzya.frame.sysnew.messageManageLog.dao.ISysMessageManageLogDao; +import com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogEntity; import com.hzya.frame.sys.service.IEsbService; import com.hzya.frame.sys.sysenum.SysEnum; import com.hzya.frame.uuid.UUIDUtils; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; -import com.hzya.frame.web.exception.BaseSystemException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.task.TaskExecutor; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import javax.crypto.MacSpi; import java.util.ArrayList; import java.util.Date; import java.util.LinkedHashMap; diff --git a/service/src/main/java/com/hzya/frame/sys/application/api/dao/ISysApplicationApiDao.java b/service/src/main/java/com/hzya/frame/sysnew/application/api/dao/ISysApplicationApiDao.java similarity index 64% rename from service/src/main/java/com/hzya/frame/sys/application/api/dao/ISysApplicationApiDao.java rename to service/src/main/java/com/hzya/frame/sysnew/application/api/dao/ISysApplicationApiDao.java index cafed003..ab5ddcde 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/api/dao/ISysApplicationApiDao.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/api/dao/ISysApplicationApiDao.java @@ -1,9 +1,9 @@ -package com.hzya.frame.sys.application.api.dao; +package com.hzya.frame.sysnew.application.api.dao; -import com.hzya.frame.sys.application.api.entity.SysApplicationApiDto; -import com.hzya.frame.sys.application.api.entity.SysApplicationApiEntity; +import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiDto; +import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity; import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.sys.application.api.entity.SysApplicationApiVo; +import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiVo; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/sys/application/api/dao/impl/SysApplicationApiDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/api/dao/impl/SysApplicationApiDaoImpl.java similarity index 69% rename from service/src/main/java/com/hzya/frame/sys/application/api/dao/impl/SysApplicationApiDaoImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/application/api/dao/impl/SysApplicationApiDaoImpl.java index 2f27b86b..dc62c166 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/api/dao/impl/SysApplicationApiDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/api/dao/impl/SysApplicationApiDaoImpl.java @@ -1,12 +1,9 @@ -package com.hzya.frame.sys.application.api.dao.impl; +package com.hzya.frame.sysnew.application.api.dao.impl; -import com.hzya.frame.sys.appApi.entity.AppApi; -import com.hzya.frame.sys.application.api.entity.SysApplicationApiDto; -import com.hzya.frame.sys.application.api.entity.SysApplicationApiEntity; -import com.hzya.frame.sys.application.api.dao.ISysApplicationApiDao; -import com.hzya.frame.sys.application.api.entity.SysApplicationApiVo; -import com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity; -import com.hzya.frame.sys.dataSource.entity.SysDataSourceVo; +import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiDto; +import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity; +import com.hzya.frame.sysnew.application.api.dao.ISysApplicationApiDao; +import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiVo; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; diff --git a/service/src/main/java/com/hzya/frame/sys/application/api/entity/SysApplicationApiDto.java b/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiDto.java similarity index 97% rename from service/src/main/java/com/hzya/frame/sys/application/api/entity/SysApplicationApiDto.java rename to service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiDto.java index 2f195698..4de0d23b 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/api/entity/SysApplicationApiDto.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiDto.java @@ -1,4 +1,4 @@ -package com.hzya.frame.sys.application.api.entity; +package com.hzya.frame.sysnew.application.api.entity; import com.hzya.frame.web.entity.BaseEntity; diff --git a/service/src/main/java/com/hzya/frame/sys/application/api/entity/SysApplicationApiEntity.java b/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.java similarity index 98% rename from service/src/main/java/com/hzya/frame/sys/application/api/entity/SysApplicationApiEntity.java rename to service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.java index 63e3dce5..bb861f1e 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/api/entity/SysApplicationApiEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.java @@ -1,4 +1,4 @@ -package com.hzya.frame.sys.application.api.entity; +package com.hzya.frame.sysnew.application.api.entity; import java.util.Date; import com.hzya.frame.web.entity.BaseEntity; diff --git a/service/src/main/java/com/hzya/frame/sys/application/api/entity/SysApplicationApiEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.xml similarity index 96% rename from service/src/main/java/com/hzya/frame/sys/application/api/entity/SysApplicationApiEntity.xml rename to service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.xml index 05503384..53e163fe 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/api/entity/SysApplicationApiEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.xml @@ -1,9 +1,9 @@ - + + type="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity"> @@ -111,7 +111,7 @@ WHERE + parameterType="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity"> select count(1) from sys_application_api and id = #{id} @@ -203,7 +203,7 @@ WHERE + parameterType="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity"> select from sys_application_api @@ -309,7 +309,7 @@ WHERE - insert into sys_application_api( @@ -437,7 +437,7 @@ WHERE org_id = values(org_id) - + update sys_application_api set api_status = #{apiStatus}, @@ -477,13 +477,13 @@ WHERE where id = #{id} - + update sys_application_api set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} + parameterType="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity"> update sys_application_api set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} and id = #{id} @@ -523,8 +523,8 @@ where id = #{id} delete from sys_application_api where id = #{id} - select a.id, a.catalogue_id AS catalogueId, @@ -577,7 +577,7 @@ where id = #{id} order by a.sorts asc - + @@ -630,7 +630,7 @@ where id = #{id} - select a.id, a.catalogue_id AS catalogueId, @@ -675,7 +675,7 @@ where id = #{id} - select from sys_application_api_auth @@ -62,7 +62,7 @@ - select count(1) from sys_application_api_auth and id = #{id} @@ -84,7 +84,7 @@ - select from sys_application_api_auth @@ -108,7 +108,7 @@ - select from sys_application_api_auth @@ -132,7 +132,7 @@ - + insert into sys_application_api_auth( id , @@ -197,7 +197,7 @@ sts = values(sts), org_id = values(org_id) - + update sys_application_api_auth set app_id = #{appId}, @@ -215,12 +215,12 @@ update sys_application_api_auth set where id = #{id} - + update sys_application_api_auth set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - + update sys_application_api_auth set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} and id = #{id} diff --git a/service/src/main/java/com/hzya/frame/sys/application/apiAuth/service/ISysApplicationApiAuthService.java b/service/src/main/java/com/hzya/frame/sysnew/application/apiAuth/service/ISysApplicationApiAuthService.java similarity index 66% rename from service/src/main/java/com/hzya/frame/sys/application/apiAuth/service/ISysApplicationApiAuthService.java rename to service/src/main/java/com/hzya/frame/sysnew/application/apiAuth/service/ISysApplicationApiAuthService.java index b51d3b25..44cf0041 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/apiAuth/service/ISysApplicationApiAuthService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/apiAuth/service/ISysApplicationApiAuthService.java @@ -1,6 +1,6 @@ -package com.hzya.frame.sys.application.apiAuth.service; +package com.hzya.frame.sysnew.application.apiAuth.service; -import com.hzya.frame.sys.application.apiAuth.entity.SysApplicationApiAuthEntity; +import com.hzya.frame.sysnew.application.apiAuth.entity.SysApplicationApiAuthEntity; import com.hzya.frame.basedao.service.IBaseService; /** * 三方调用系统表(SysApplicationApiAuth)表服务接口 diff --git a/service/src/main/java/com/hzya/frame/sys/application/apiAuth/service/impl/SysApplicationApiAuthServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/apiAuth/service/impl/SysApplicationApiAuthServiceImpl.java similarity index 70% rename from service/src/main/java/com/hzya/frame/sys/application/apiAuth/service/impl/SysApplicationApiAuthServiceImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/application/apiAuth/service/impl/SysApplicationApiAuthServiceImpl.java index cb1bfb99..4b666f66 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/apiAuth/service/impl/SysApplicationApiAuthServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/apiAuth/service/impl/SysApplicationApiAuthServiceImpl.java @@ -1,8 +1,8 @@ -package com.hzya.frame.sys.application.apiAuth.service.impl; +package com.hzya.frame.sysnew.application.apiAuth.service.impl; -import com.hzya.frame.sys.application.apiAuth.entity.SysApplicationApiAuthEntity; -import com.hzya.frame.sys.application.apiAuth.dao.ISysApplicationApiAuthDao; -import com.hzya.frame.sys.application.apiAuth.service.ISysApplicationApiAuthService; +import com.hzya.frame.sysnew.application.apiAuth.entity.SysApplicationApiAuthEntity; +import com.hzya.frame.sysnew.application.apiAuth.dao.ISysApplicationApiAuthDao; +import com.hzya.frame.sysnew.application.apiAuth.service.ISysApplicationApiAuthService; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.Resource; diff --git a/service/src/main/java/com/hzya/frame/sys/application/apiAythDetail/dao/ISysApplicationApiAuthDetailDao.java b/service/src/main/java/com/hzya/frame/sysnew/application/apiAythDetail/dao/ISysApplicationApiAuthDetailDao.java similarity index 73% rename from service/src/main/java/com/hzya/frame/sys/application/apiAythDetail/dao/ISysApplicationApiAuthDetailDao.java rename to service/src/main/java/com/hzya/frame/sysnew/application/apiAythDetail/dao/ISysApplicationApiAuthDetailDao.java index 3853c50c..e9873b62 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/apiAythDetail/dao/ISysApplicationApiAuthDetailDao.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/apiAythDetail/dao/ISysApplicationApiAuthDetailDao.java @@ -1,6 +1,6 @@ -package com.hzya.frame.sys.application.apiAythDetail.dao; +package com.hzya.frame.sysnew.application.apiAythDetail.dao; -import com.hzya.frame.sys.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity; +import com.hzya.frame.sysnew.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity; import com.hzya.frame.basedao.dao.IBaseDao; /** diff --git a/service/src/main/java/com/hzya/frame/sys/application/apiAythDetail/dao/impl/SysApplicationApiAuthDetailDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/apiAythDetail/dao/impl/SysApplicationApiAuthDetailDaoImpl.java similarity index 74% rename from service/src/main/java/com/hzya/frame/sys/application/apiAythDetail/dao/impl/SysApplicationApiAuthDetailDaoImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/application/apiAythDetail/dao/impl/SysApplicationApiAuthDetailDaoImpl.java index 07f076b7..f5c6fe5c 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/apiAythDetail/dao/impl/SysApplicationApiAuthDetailDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/apiAythDetail/dao/impl/SysApplicationApiAuthDetailDaoImpl.java @@ -1,7 +1,7 @@ -package com.hzya.frame.sys.application.apiAythDetail.dao.impl; +package com.hzya.frame.sysnew.application.apiAythDetail.dao.impl; -import com.hzya.frame.sys.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity; -import com.hzya.frame.sys.application.apiAythDetail.dao.ISysApplicationApiAuthDetailDao; +import com.hzya.frame.sysnew.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity; +import com.hzya.frame.sysnew.application.apiAythDetail.dao.ISysApplicationApiAuthDetailDao; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; /** diff --git a/service/src/main/java/com/hzya/frame/sys/application/apiAythDetail/entity/SysApplicationApiAuthDetailEntity.java b/service/src/main/java/com/hzya/frame/sysnew/application/apiAythDetail/entity/SysApplicationApiAuthDetailEntity.java similarity index 96% rename from service/src/main/java/com/hzya/frame/sys/application/apiAythDetail/entity/SysApplicationApiAuthDetailEntity.java rename to service/src/main/java/com/hzya/frame/sysnew/application/apiAythDetail/entity/SysApplicationApiAuthDetailEntity.java index 3183ddce..b734110b 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/apiAythDetail/entity/SysApplicationApiAuthDetailEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/apiAythDetail/entity/SysApplicationApiAuthDetailEntity.java @@ -1,4 +1,4 @@ -package com.hzya.frame.sys.application.apiAythDetail.entity; +package com.hzya.frame.sysnew.application.apiAythDetail.entity; import java.util.Date; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/sys/application/apiAythDetail/entity/SysApplicationApiAuthDetailEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/application/apiAythDetail/entity/SysApplicationApiAuthDetailEntity.xml similarity index 92% rename from service/src/main/java/com/hzya/frame/sys/application/apiAythDetail/entity/SysApplicationApiAuthDetailEntity.xml rename to service/src/main/java/com/hzya/frame/sysnew/application/apiAythDetail/entity/SysApplicationApiAuthDetailEntity.xml index 7a78e4a1..4008260c 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/apiAythDetail/entity/SysApplicationApiAuthDetailEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/application/apiAythDetail/entity/SysApplicationApiAuthDetailEntity.xml @@ -1,8 +1,8 @@ - + - + @@ -38,7 +38,7 @@ from sys_application_api_auth_detail where sts = 'Y' and id = #{id} - select from sys_application_api_auth_detail @@ -62,7 +62,7 @@ - select count(1) from sys_application_api_auth_detail and id = #{id} @@ -84,7 +84,7 @@ - select from sys_application_api_auth_detail @@ -108,7 +108,7 @@ - select from sys_application_api_auth_detail @@ -132,7 +132,7 @@ - + insert into sys_application_api_auth_detail( id , @@ -197,7 +197,7 @@ sts = values(sts), org_id = values(org_id) - + update sys_application_api_auth_detail set app_id = #{appId}, @@ -215,12 +215,12 @@ update sys_application_api_auth_detail set where id = #{id} - + update sys_application_api_auth_detail set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - + update sys_application_api_auth_detail set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} and id = #{id} @@ -237,7 +237,7 @@ update sys_application_api_auth_detail set sts= 'N' ,modify_time = #{modify_tim delete from sys_application_api_auth_detail where id = #{id} - + update sys_application_api_auth_detail set sts = 'N' where sts = 'Y' and app_id = #{appId} diff --git a/service/src/main/java/com/hzya/frame/sys/application/apiAythDetail/service/ISysApplicationApiAuthDetailService.java b/service/src/main/java/com/hzya/frame/sysnew/application/apiAythDetail/service/ISysApplicationApiAuthDetailService.java similarity index 66% rename from service/src/main/java/com/hzya/frame/sys/application/apiAythDetail/service/ISysApplicationApiAuthDetailService.java rename to service/src/main/java/com/hzya/frame/sysnew/application/apiAythDetail/service/ISysApplicationApiAuthDetailService.java index 7b2d506d..d80cc598 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/apiAythDetail/service/ISysApplicationApiAuthDetailService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/apiAythDetail/service/ISysApplicationApiAuthDetailService.java @@ -1,6 +1,6 @@ -package com.hzya.frame.sys.application.apiAythDetail.service; +package com.hzya.frame.sysnew.application.apiAythDetail.service; -import com.hzya.frame.sys.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity; +import com.hzya.frame.sysnew.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity; import com.hzya.frame.basedao.service.IBaseService; /** * 应用api关联三方调用系统表(SysApplicationApiAuthDetail)表服务接口 diff --git a/service/src/main/java/com/hzya/frame/sys/application/apiAythDetail/service/impl/SysApplicationApiAuthDetailServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/apiAythDetail/service/impl/SysApplicationApiAuthDetailServiceImpl.java similarity index 69% rename from service/src/main/java/com/hzya/frame/sys/application/apiAythDetail/service/impl/SysApplicationApiAuthDetailServiceImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/application/apiAythDetail/service/impl/SysApplicationApiAuthDetailServiceImpl.java index 89a18ffc..7df63d93 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/apiAythDetail/service/impl/SysApplicationApiAuthDetailServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/apiAythDetail/service/impl/SysApplicationApiAuthDetailServiceImpl.java @@ -1,8 +1,8 @@ -package com.hzya.frame.sys.application.apiAythDetail.service.impl; +package com.hzya.frame.sysnew.application.apiAythDetail.service.impl; -import com.hzya.frame.sys.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity; -import com.hzya.frame.sys.application.apiAythDetail.dao.ISysApplicationApiAuthDetailDao; -import com.hzya.frame.sys.application.apiAythDetail.service.ISysApplicationApiAuthDetailService; +import com.hzya.frame.sysnew.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity; +import com.hzya.frame.sysnew.application.apiAythDetail.dao.ISysApplicationApiAuthDetailDao; +import com.hzya.frame.sysnew.application.apiAythDetail.service.ISysApplicationApiAuthDetailService; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.Resource; diff --git a/service/src/main/java/com/hzya/frame/sys/application/apiPara/dao/ISysApplicationApiParaDao.java b/service/src/main/java/com/hzya/frame/sysnew/application/apiPara/dao/ISysApplicationApiParaDao.java similarity index 67% rename from service/src/main/java/com/hzya/frame/sys/application/apiPara/dao/ISysApplicationApiParaDao.java rename to service/src/main/java/com/hzya/frame/sysnew/application/apiPara/dao/ISysApplicationApiParaDao.java index 0c19d8fc..c0f196dc 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/apiPara/dao/ISysApplicationApiParaDao.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/apiPara/dao/ISysApplicationApiParaDao.java @@ -1,6 +1,6 @@ -package com.hzya.frame.sys.application.apiPara.dao; +package com.hzya.frame.sysnew.application.apiPara.dao; -import com.hzya.frame.sys.application.apiPara.entity.SysApplicationApiParaEntity; +import com.hzya.frame.sysnew.application.apiPara.entity.SysApplicationApiParaEntity; import com.hzya.frame.basedao.dao.IBaseDao; /** diff --git a/service/src/main/java/com/hzya/frame/sys/application/apiPara/dao/impl/SysApplicationApiParaDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/apiPara/dao/impl/SysApplicationApiParaDaoImpl.java similarity index 65% rename from service/src/main/java/com/hzya/frame/sys/application/apiPara/dao/impl/SysApplicationApiParaDaoImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/application/apiPara/dao/impl/SysApplicationApiParaDaoImpl.java index f56ec664..75289e26 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/apiPara/dao/impl/SysApplicationApiParaDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/apiPara/dao/impl/SysApplicationApiParaDaoImpl.java @@ -1,7 +1,7 @@ -package com.hzya.frame.sys.application.apiPara.dao.impl; +package com.hzya.frame.sysnew.application.apiPara.dao.impl; -import com.hzya.frame.sys.application.apiPara.entity.SysApplicationApiParaEntity; -import com.hzya.frame.sys.application.apiPara.dao.ISysApplicationApiParaDao; +import com.hzya.frame.sysnew.application.apiPara.entity.SysApplicationApiParaEntity; +import com.hzya.frame.sysnew.application.apiPara.dao.ISysApplicationApiParaDao; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; /** diff --git a/service/src/main/java/com/hzya/frame/sys/application/apiPara/entity/SysApplicationApiParaEntity.java b/service/src/main/java/com/hzya/frame/sysnew/application/apiPara/entity/SysApplicationApiParaEntity.java similarity index 85% rename from service/src/main/java/com/hzya/frame/sys/application/apiPara/entity/SysApplicationApiParaEntity.java rename to service/src/main/java/com/hzya/frame/sysnew/application/apiPara/entity/SysApplicationApiParaEntity.java index 116d6d9e..c6765d92 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/apiPara/entity/SysApplicationApiParaEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/apiPara/entity/SysApplicationApiParaEntity.java @@ -1,10 +1,5 @@ -package com.hzya.frame.sys.application.apiPara.entity; +package com.hzya.frame.sysnew.application.apiPara.entity; -import java.util.Date; - -import cn.dev33.satoken.stp.StpUtil; -import com.hzya.frame.sys.org.entity.Org; -import com.hzya.frame.uuid.UUIDUtils; import com.hzya.frame.web.entity.BaseEntity; /** * 接口环境参数表(SysApplicationApiPara)实体类 diff --git a/service/src/main/java/com/hzya/frame/sys/application/apiPara/entity/SysApplicationApiParaEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/application/apiPara/entity/SysApplicationApiParaEntity.xml similarity index 93% rename from service/src/main/java/com/hzya/frame/sys/application/apiPara/entity/SysApplicationApiParaEntity.xml rename to service/src/main/java/com/hzya/frame/sysnew/application/apiPara/entity/SysApplicationApiParaEntity.xml index 69764d6d..6229a63d 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/apiPara/entity/SysApplicationApiParaEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/application/apiPara/entity/SysApplicationApiParaEntity.xml @@ -1,8 +1,8 @@ - + - + @@ -38,7 +38,7 @@ from sys_application_api_para where sts = 'Y' and id = #{id} - select from sys_application_api_para @@ -62,7 +62,7 @@ - select count(1) from sys_application_api_para and id = #{id} @@ -84,7 +84,7 @@ - select from sys_application_api_para @@ -108,7 +108,7 @@ - select from sys_application_api_para @@ -132,7 +132,7 @@ - + insert into sys_application_api_para( id , @@ -197,7 +197,7 @@ modify_time = values(modify_time), modify_user_id = values(modify_user_id) - + update sys_application_api_para set app_id = #{appId}, @@ -215,12 +215,12 @@ update sys_application_api_para set where id = #{id} - + update sys_application_api_para set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - + update sys_application_api_para set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} and id = #{id} diff --git a/service/src/main/java/com/hzya/frame/sys/application/apiPara/service/ISysApplicationApiParaService.java b/service/src/main/java/com/hzya/frame/sysnew/application/apiPara/service/ISysApplicationApiParaService.java similarity index 66% rename from service/src/main/java/com/hzya/frame/sys/application/apiPara/service/ISysApplicationApiParaService.java rename to service/src/main/java/com/hzya/frame/sysnew/application/apiPara/service/ISysApplicationApiParaService.java index 7293381b..d21d252d 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/apiPara/service/ISysApplicationApiParaService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/apiPara/service/ISysApplicationApiParaService.java @@ -1,6 +1,6 @@ -package com.hzya.frame.sys.application.apiPara.service; +package com.hzya.frame.sysnew.application.apiPara.service; -import com.hzya.frame.sys.application.apiPara.entity.SysApplicationApiParaEntity; +import com.hzya.frame.sysnew.application.apiPara.entity.SysApplicationApiParaEntity; import com.hzya.frame.basedao.service.IBaseService; /** * 接口环境参数表(SysApplicationApiPara)表服务接口 diff --git a/service/src/main/java/com/hzya/frame/sys/application/apiPara/service/impl/SysApplicationApiParaServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/apiPara/service/impl/SysApplicationApiParaServiceImpl.java similarity index 70% rename from service/src/main/java/com/hzya/frame/sys/application/apiPara/service/impl/SysApplicationApiParaServiceImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/application/apiPara/service/impl/SysApplicationApiParaServiceImpl.java index f8c9b6b2..92d71c66 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/apiPara/service/impl/SysApplicationApiParaServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/apiPara/service/impl/SysApplicationApiParaServiceImpl.java @@ -1,8 +1,8 @@ -package com.hzya.frame.sys.application.apiPara.service.impl; +package com.hzya.frame.sysnew.application.apiPara.service.impl; -import com.hzya.frame.sys.application.apiPara.entity.SysApplicationApiParaEntity; -import com.hzya.frame.sys.application.apiPara.dao.ISysApplicationApiParaDao; -import com.hzya.frame.sys.application.apiPara.service.ISysApplicationApiParaService; +import com.hzya.frame.sysnew.application.apiPara.entity.SysApplicationApiParaEntity; +import com.hzya.frame.sysnew.application.apiPara.dao.ISysApplicationApiParaDao; +import com.hzya.frame.sysnew.application.apiPara.service.ISysApplicationApiParaService; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.Resource; diff --git a/service/src/main/java/com/hzya/frame/sys/application/apiType/dao/ISysApplicationApiTypeDao.java b/service/src/main/java/com/hzya/frame/sysnew/application/apiType/dao/ISysApplicationApiTypeDao.java similarity index 71% rename from service/src/main/java/com/hzya/frame/sys/application/apiType/dao/ISysApplicationApiTypeDao.java rename to service/src/main/java/com/hzya/frame/sysnew/application/apiType/dao/ISysApplicationApiTypeDao.java index 81feb27c..621d7b33 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/apiType/dao/ISysApplicationApiTypeDao.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/apiType/dao/ISysApplicationApiTypeDao.java @@ -1,6 +1,6 @@ -package com.hzya.frame.sys.application.apiType.dao; +package com.hzya.frame.sysnew.application.apiType.dao; -import com.hzya.frame.sys.application.apiType.entity.SysApplicationApiTypeEntity; +import com.hzya.frame.sysnew.application.apiType.entity.SysApplicationApiTypeEntity; import com.hzya.frame.basedao.dao.IBaseDao; /** diff --git a/service/src/main/java/com/hzya/frame/sys/application/apiType/dao/impl/SysApplicationApiTypeDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/apiType/dao/impl/SysApplicationApiTypeDaoImpl.java similarity index 73% rename from service/src/main/java/com/hzya/frame/sys/application/apiType/dao/impl/SysApplicationApiTypeDaoImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/application/apiType/dao/impl/SysApplicationApiTypeDaoImpl.java index 810709c4..12897a27 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/apiType/dao/impl/SysApplicationApiTypeDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/apiType/dao/impl/SysApplicationApiTypeDaoImpl.java @@ -1,7 +1,7 @@ -package com.hzya.frame.sys.application.apiType.dao.impl; +package com.hzya.frame.sysnew.application.apiType.dao.impl; -import com.hzya.frame.sys.application.apiType.entity.SysApplicationApiTypeEntity; -import com.hzya.frame.sys.application.apiType.dao.ISysApplicationApiTypeDao; +import com.hzya.frame.sysnew.application.apiType.entity.SysApplicationApiTypeEntity; +import com.hzya.frame.sysnew.application.apiType.dao.ISysApplicationApiTypeDao; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; /** diff --git a/service/src/main/java/com/hzya/frame/sys/application/apiType/entity/SysApplicationApiTypeEntity.java b/service/src/main/java/com/hzya/frame/sysnew/application/apiType/entity/SysApplicationApiTypeEntity.java similarity index 91% rename from service/src/main/java/com/hzya/frame/sys/application/apiType/entity/SysApplicationApiTypeEntity.java rename to service/src/main/java/com/hzya/frame/sysnew/application/apiType/entity/SysApplicationApiTypeEntity.java index 62418281..b7e76366 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/apiType/entity/SysApplicationApiTypeEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/apiType/entity/SysApplicationApiTypeEntity.java @@ -1,4 +1,4 @@ -package com.hzya.frame.sys.application.apiType.entity; +package com.hzya.frame.sysnew.application.apiType.entity; import java.util.Date; import com.hzya.frame.web.entity.BaseEntity; diff --git a/service/src/main/java/com/hzya/frame/sys/application/apiType/entity/SysApplicationApiTypeEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/application/apiType/entity/SysApplicationApiTypeEntity.xml similarity index 92% rename from service/src/main/java/com/hzya/frame/sys/application/apiType/entity/SysApplicationApiTypeEntity.xml rename to service/src/main/java/com/hzya/frame/sysnew/application/apiType/entity/SysApplicationApiTypeEntity.xml index 99646b9a..d0d9e9fe 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/apiType/entity/SysApplicationApiTypeEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/application/apiType/entity/SysApplicationApiTypeEntity.xml @@ -1,8 +1,8 @@ - + - + @@ -34,7 +34,7 @@ from sys_application_api_type where sts = 'Y' and id = #{id} - select from sys_application_api_type @@ -56,7 +56,7 @@ - select count(1) from sys_application_api_type and id = #{id} @@ -76,7 +76,7 @@ - select count(1) from sys_application_api_type and id != #{id} @@ -94,7 +94,7 @@ - select from sys_application_api_type @@ -116,7 +116,7 @@ - select from sys_application_api_type @@ -138,7 +138,7 @@ - + insert into sys_application_api_type( id , @@ -197,7 +197,7 @@ modify_time = values(modify_time), modify_user_id = values(modify_user_id) - + update sys_application_api_type set app_id = #{appId}, @@ -213,12 +213,12 @@ update sys_application_api_type set where id = #{id} - + update sys_application_api_type set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - + update sys_application_api_type set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} and id = #{id} diff --git a/service/src/main/java/com/hzya/frame/sys/application/apiType/service/ISysApplicationApiTypeService.java b/service/src/main/java/com/hzya/frame/sysnew/application/apiType/service/ISysApplicationApiTypeService.java similarity index 65% rename from service/src/main/java/com/hzya/frame/sys/application/apiType/service/ISysApplicationApiTypeService.java rename to service/src/main/java/com/hzya/frame/sysnew/application/apiType/service/ISysApplicationApiTypeService.java index 106284a9..716c0c15 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/apiType/service/ISysApplicationApiTypeService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/apiType/service/ISysApplicationApiTypeService.java @@ -1,6 +1,6 @@ -package com.hzya.frame.sys.application.apiType.service; +package com.hzya.frame.sysnew.application.apiType.service; -import com.hzya.frame.sys.application.apiType.entity.SysApplicationApiTypeEntity; +import com.hzya.frame.sysnew.application.apiType.entity.SysApplicationApiTypeEntity; import com.hzya.frame.basedao.service.IBaseService; /** * 目录表(SysApplicationApiType)表服务接口 diff --git a/service/src/main/java/com/hzya/frame/sys/application/apiType/service/impl/SysApplicationApiTypeServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/apiType/service/impl/SysApplicationApiTypeServiceImpl.java similarity index 69% rename from service/src/main/java/com/hzya/frame/sys/application/apiType/service/impl/SysApplicationApiTypeServiceImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/application/apiType/service/impl/SysApplicationApiTypeServiceImpl.java index d36fda2f..ff2bb058 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/apiType/service/impl/SysApplicationApiTypeServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/apiType/service/impl/SysApplicationApiTypeServiceImpl.java @@ -1,8 +1,8 @@ -package com.hzya.frame.sys.application.apiType.service.impl; +package com.hzya.frame.sysnew.application.apiType.service.impl; -import com.hzya.frame.sys.application.apiType.entity.SysApplicationApiTypeEntity; -import com.hzya.frame.sys.application.apiType.dao.ISysApplicationApiTypeDao; -import com.hzya.frame.sys.application.apiType.service.ISysApplicationApiTypeService; +import com.hzya.frame.sysnew.application.apiType.entity.SysApplicationApiTypeEntity; +import com.hzya.frame.sysnew.application.apiType.dao.ISysApplicationApiTypeDao; +import com.hzya.frame.sysnew.application.apiType.service.ISysApplicationApiTypeService; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.Resource; diff --git a/service/src/main/java/com/hzya/frame/sys/application/dao/ISysApplicationDao.java b/service/src/main/java/com/hzya/frame/sysnew/application/dao/ISysApplicationDao.java similarity index 57% rename from service/src/main/java/com/hzya/frame/sys/application/dao/ISysApplicationDao.java rename to service/src/main/java/com/hzya/frame/sysnew/application/dao/ISysApplicationDao.java index 0f615bda..e689f5a3 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/dao/ISysApplicationDao.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/dao/ISysApplicationDao.java @@ -1,9 +1,9 @@ -package com.hzya.frame.sys.application.dao; +package com.hzya.frame.sysnew.application.dao; -import com.hzya.frame.sys.application.entity.SysApplicationDto; -import com.hzya.frame.sys.application.entity.SysApplicationEntity; +import com.hzya.frame.sysnew.application.entity.SysApplicationDto; +import com.hzya.frame.sysnew.application.entity.SysApplicationEntity; import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.sys.application.entity.SysApplicationVo; +import com.hzya.frame.sysnew.application.entity.SysApplicationVo; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/sys/application/dao/impl/SysApplicationDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/dao/impl/SysApplicationDaoImpl.java similarity index 60% rename from service/src/main/java/com/hzya/frame/sys/application/dao/impl/SysApplicationDaoImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/application/dao/impl/SysApplicationDaoImpl.java index 616e6058..758112fb 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/dao/impl/SysApplicationDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/dao/impl/SysApplicationDaoImpl.java @@ -1,11 +1,9 @@ -package com.hzya.frame.sys.application.dao.impl; +package com.hzya.frame.sysnew.application.dao.impl; -import com.hzya.frame.sys.appApi.entity.AppApiDto; -import com.hzya.frame.sys.appApi.entity.AppApiListVo; -import com.hzya.frame.sys.application.entity.SysApplicationDto; -import com.hzya.frame.sys.application.entity.SysApplicationEntity; -import com.hzya.frame.sys.application.dao.ISysApplicationDao; -import com.hzya.frame.sys.application.entity.SysApplicationVo; +import com.hzya.frame.sysnew.application.entity.SysApplicationDto; +import com.hzya.frame.sysnew.application.entity.SysApplicationEntity; +import com.hzya.frame.sysnew.application.dao.ISysApplicationDao; +import com.hzya.frame.sysnew.application.entity.SysApplicationVo; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; diff --git a/service/src/main/java/com/hzya/frame/sys/application/database/dao/ISysApplicationDatabaseDao.java b/service/src/main/java/com/hzya/frame/sysnew/application/database/dao/ISysApplicationDatabaseDao.java similarity index 66% rename from service/src/main/java/com/hzya/frame/sys/application/database/dao/ISysApplicationDatabaseDao.java rename to service/src/main/java/com/hzya/frame/sysnew/application/database/dao/ISysApplicationDatabaseDao.java index ec3bc699..110ab6e0 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/database/dao/ISysApplicationDatabaseDao.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/database/dao/ISysApplicationDatabaseDao.java @@ -1,6 +1,6 @@ -package com.hzya.frame.sys.application.database.dao; +package com.hzya.frame.sysnew.application.database.dao; -import com.hzya.frame.sys.application.database.entity.SysApplicationDatabaseEntity; +import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity; import com.hzya.frame.basedao.dao.IBaseDao; /** diff --git a/service/src/main/java/com/hzya/frame/sys/application/database/dao/impl/SysApplicationDatabaseDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/database/dao/impl/SysApplicationDatabaseDaoImpl.java similarity index 65% rename from service/src/main/java/com/hzya/frame/sys/application/database/dao/impl/SysApplicationDatabaseDaoImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/application/database/dao/impl/SysApplicationDatabaseDaoImpl.java index 0bbb2213..332f2092 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/database/dao/impl/SysApplicationDatabaseDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/database/dao/impl/SysApplicationDatabaseDaoImpl.java @@ -1,7 +1,7 @@ -package com.hzya.frame.sys.application.database.dao.impl; +package com.hzya.frame.sysnew.application.database.dao.impl; -import com.hzya.frame.sys.application.database.entity.SysApplicationDatabaseEntity; -import com.hzya.frame.sys.application.database.dao.ISysApplicationDatabaseDao; +import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity; +import com.hzya.frame.sysnew.application.database.dao.ISysApplicationDatabaseDao; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; /** diff --git a/service/src/main/java/com/hzya/frame/sys/application/database/entity/SysApplicationDatabaseEntity.java b/service/src/main/java/com/hzya/frame/sysnew/application/database/entity/SysApplicationDatabaseEntity.java similarity index 96% rename from service/src/main/java/com/hzya/frame/sys/application/database/entity/SysApplicationDatabaseEntity.java rename to service/src/main/java/com/hzya/frame/sysnew/application/database/entity/SysApplicationDatabaseEntity.java index 63313bf3..03aa04df 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/database/entity/SysApplicationDatabaseEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/database/entity/SysApplicationDatabaseEntity.java @@ -1,4 +1,4 @@ -package com.hzya.frame.sys.application.database.entity; +package com.hzya.frame.sysnew.application.database.entity; import java.util.Date; import com.hzya.frame.web.entity.BaseEntity; diff --git a/service/src/main/java/com/hzya/frame/sys/application/database/entity/SysApplicationDatabaseEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/application/database/entity/SysApplicationDatabaseEntity.xml similarity index 94% rename from service/src/main/java/com/hzya/frame/sys/application/database/entity/SysApplicationDatabaseEntity.xml rename to service/src/main/java/com/hzya/frame/sysnew/application/database/entity/SysApplicationDatabaseEntity.xml index 96e1796f..67637941 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/database/entity/SysApplicationDatabaseEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/application/database/entity/SysApplicationDatabaseEntity.xml @@ -1,8 +1,8 @@ - + - + @@ -44,7 +44,7 @@ from sys_application_database where sts = 'Y' and id = #{id} - select from sys_application_database @@ -71,7 +71,7 @@ - select count(1) from sys_application_database and id = #{id} @@ -96,7 +96,7 @@ - select from sys_application_database @@ -123,7 +123,7 @@ - select from sys_application_database @@ -150,7 +150,7 @@ - + insert into sys_application_database( id , @@ -224,7 +224,7 @@ modify_time = values(modify_time), modify_user_id = values(modify_user_id) - + update sys_application_database set app_id = #{appId}, @@ -245,12 +245,12 @@ update sys_application_database set where id = #{id} - + update sys_application_database set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - + update sys_application_database set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} and id = #{id} diff --git a/service/src/main/java/com/hzya/frame/sys/application/database/service/ISysApplicationDatabaseService.java b/service/src/main/java/com/hzya/frame/sysnew/application/database/service/ISysApplicationDatabaseService.java similarity index 65% rename from service/src/main/java/com/hzya/frame/sys/application/database/service/ISysApplicationDatabaseService.java rename to service/src/main/java/com/hzya/frame/sysnew/application/database/service/ISysApplicationDatabaseService.java index 9eff0b3b..9f4ad126 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/database/service/ISysApplicationDatabaseService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/database/service/ISysApplicationDatabaseService.java @@ -1,6 +1,6 @@ -package com.hzya.frame.sys.application.database.service; +package com.hzya.frame.sysnew.application.database.service; -import com.hzya.frame.sys.application.database.entity.SysApplicationDatabaseEntity; +import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity; import com.hzya.frame.basedao.service.IBaseService; /** * 数据源表(SysApplicationDatabase)表服务接口 diff --git a/service/src/main/java/com/hzya/frame/sys/application/database/service/impl/SysApplicationDatabaseServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/database/service/impl/SysApplicationDatabaseServiceImpl.java similarity index 69% rename from service/src/main/java/com/hzya/frame/sys/application/database/service/impl/SysApplicationDatabaseServiceImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/application/database/service/impl/SysApplicationDatabaseServiceImpl.java index 4500c036..1f799bc6 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/database/service/impl/SysApplicationDatabaseServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/database/service/impl/SysApplicationDatabaseServiceImpl.java @@ -1,8 +1,8 @@ -package com.hzya.frame.sys.application.database.service.impl; +package com.hzya.frame.sysnew.application.database.service.impl; -import com.hzya.frame.sys.application.database.entity.SysApplicationDatabaseEntity; -import com.hzya.frame.sys.application.database.dao.ISysApplicationDatabaseDao; -import com.hzya.frame.sys.application.database.service.ISysApplicationDatabaseService; +import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity; +import com.hzya.frame.sysnew.application.database.dao.ISysApplicationDatabaseDao; +import com.hzya.frame.sysnew.application.database.service.ISysApplicationDatabaseService; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.Resource; diff --git a/service/src/main/java/com/hzya/frame/sys/application/entity/SysApplicationDatasourceDto.java b/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationDatasourceDto.java similarity index 80% rename from service/src/main/java/com/hzya/frame/sys/application/entity/SysApplicationDatasourceDto.java rename to service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationDatasourceDto.java index 9d3dd9ca..91dc23cc 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/entity/SysApplicationDatasourceDto.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationDatasourceDto.java @@ -1,8 +1,8 @@ -package com.hzya.frame.sys.application.entity; +package com.hzya.frame.sysnew.application.entity; -import com.hzya.frame.sys.application.apiPara.entity.SysApplicationApiParaEntity; -import com.hzya.frame.sys.application.database.entity.SysApplicationDatabaseEntity; +import com.hzya.frame.sysnew.application.apiPara.entity.SysApplicationApiParaEntity; +import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/sys/application/entity/SysApplicationDto.java b/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationDto.java similarity index 96% rename from service/src/main/java/com/hzya/frame/sys/application/entity/SysApplicationDto.java rename to service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationDto.java index 56d76dc8..5a797b9a 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/entity/SysApplicationDto.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationDto.java @@ -1,8 +1,8 @@ -package com.hzya.frame.sys.application.entity; +package com.hzya.frame.sysnew.application.entity; -import com.hzya.frame.sys.application.apiPara.entity.SysApplicationApiParaEntity; -import com.hzya.frame.sys.application.database.entity.SysApplicationDatabaseEntity; +import com.hzya.frame.sysnew.application.apiPara.entity.SysApplicationApiParaEntity; +import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/sys/application/entity/SysApplicationEntity.java b/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationEntity.java similarity index 98% rename from service/src/main/java/com/hzya/frame/sys/application/entity/SysApplicationEntity.java rename to service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationEntity.java index b1d686df..0e9a8131 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/entity/SysApplicationEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationEntity.java @@ -1,4 +1,4 @@ -package com.hzya.frame.sys.application.entity; +package com.hzya.frame.sysnew.application.entity; import java.util.Date; import com.hzya.frame.web.entity.BaseEntity; diff --git a/service/src/main/java/com/hzya/frame/sys/application/entity/SysApplicationEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationEntity.xml similarity index 96% rename from service/src/main/java/com/hzya/frame/sys/application/entity/SysApplicationEntity.xml rename to service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationEntity.xml index 03f3acf0..2187fa57 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/entity/SysApplicationEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationEntity.xml @@ -1,8 +1,8 @@ - + - + @@ -66,7 +66,7 @@ from sys_application where sts = 'Y' and id = #{id} - select from sys_application @@ -104,7 +104,7 @@ - select count(1) from sys_application and id = #{id} @@ -140,7 +140,7 @@ - select from sys_application @@ -178,7 +178,7 @@ - select from sys_application @@ -216,7 +216,7 @@ - + insert into sys_application( id , @@ -325,7 +325,7 @@ modify_time = values(modify_time), modify_user_id = values(modify_user_id) - + update sys_application set app_logo = #{appLogo}, @@ -357,12 +357,12 @@ update sys_application set where id = #{id} - + update sys_application set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - + update sys_application set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} and id = #{id} @@ -394,7 +394,7 @@ update sys_application set sts= 'N' ,modify_time = #{modify_time},modify_user_i delete from sys_application where id = #{id} - select a.id as id ,a.app_logo as appLogo diff --git a/service/src/main/java/com/hzya/frame/sys/application/entity/SysApplicationVo.java b/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationVo.java similarity index 98% rename from service/src/main/java/com/hzya/frame/sys/application/entity/SysApplicationVo.java rename to service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationVo.java index cf0957ed..cb3bf8a6 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/entity/SysApplicationVo.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationVo.java @@ -1,4 +1,4 @@ -package com.hzya.frame.sys.application.entity; +package com.hzya.frame.sysnew.application.entity; /** diff --git a/service/src/main/java/com/hzya/frame/sys/application/plugin/dao/ISysApplicationPluginDao.java b/service/src/main/java/com/hzya/frame/sysnew/application/plugin/dao/ISysApplicationPluginDao.java similarity index 63% rename from service/src/main/java/com/hzya/frame/sys/application/plugin/dao/ISysApplicationPluginDao.java rename to service/src/main/java/com/hzya/frame/sysnew/application/plugin/dao/ISysApplicationPluginDao.java index 96427ff2..61d0df20 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/plugin/dao/ISysApplicationPluginDao.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/plugin/dao/ISysApplicationPluginDao.java @@ -1,7 +1,7 @@ -package com.hzya.frame.sys.application.plugin.dao; +package com.hzya.frame.sysnew.application.plugin.dao; -import com.hzya.frame.sys.application.plugin.entity.SysApplicationPluginDto; -import com.hzya.frame.sys.application.plugin.entity.SysApplicationPluginEntity; +import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginDto; +import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity; import com.hzya.frame.basedao.dao.IBaseDao; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/sys/application/plugin/dao/impl/SysApplicationPluginDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/plugin/dao/impl/SysApplicationPluginDaoImpl.java similarity index 65% rename from service/src/main/java/com/hzya/frame/sys/application/plugin/dao/impl/SysApplicationPluginDaoImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/application/plugin/dao/impl/SysApplicationPluginDaoImpl.java index 8c74196a..5a790057 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/plugin/dao/impl/SysApplicationPluginDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/plugin/dao/impl/SysApplicationPluginDaoImpl.java @@ -1,9 +1,9 @@ -package com.hzya.frame.sys.application.plugin.dao.impl; +package com.hzya.frame.sysnew.application.plugin.dao.impl; -import com.hzya.frame.sys.application.api.entity.SysApplicationApiVo; -import com.hzya.frame.sys.application.plugin.entity.SysApplicationPluginDto; -import com.hzya.frame.sys.application.plugin.entity.SysApplicationPluginEntity; -import com.hzya.frame.sys.application.plugin.dao.ISysApplicationPluginDao; +import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiVo; +import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginDto; +import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity; +import com.hzya.frame.sysnew.application.plugin.dao.ISysApplicationPluginDao; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; diff --git a/service/src/main/java/com/hzya/frame/sys/application/plugin/entity/SysApplicationPluginDto.java b/service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginDto.java similarity index 95% rename from service/src/main/java/com/hzya/frame/sys/application/plugin/entity/SysApplicationPluginDto.java rename to service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginDto.java index 3040fa74..54a3dc3f 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/plugin/entity/SysApplicationPluginDto.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginDto.java @@ -1,4 +1,4 @@ -package com.hzya.frame.sys.application.plugin.entity; +package com.hzya.frame.sysnew.application.plugin.entity; import com.hzya.frame.web.entity.BaseEntity; diff --git a/service/src/main/java/com/hzya/frame/sys/application/plugin/entity/SysApplicationPluginEntity.java b/service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginEntity.java similarity index 96% rename from service/src/main/java/com/hzya/frame/sys/application/plugin/entity/SysApplicationPluginEntity.java rename to service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginEntity.java index 2ee0fe08..7aa5471a 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/plugin/entity/SysApplicationPluginEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginEntity.java @@ -1,4 +1,4 @@ -package com.hzya.frame.sys.application.plugin.entity; +package com.hzya.frame.sysnew.application.plugin.entity; import java.util.Date; import com.hzya.frame.web.entity.BaseEntity; diff --git a/service/src/main/java/com/hzya/frame/sys/application/plugin/entity/SysApplicationPluginEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginEntity.xml similarity index 94% rename from service/src/main/java/com/hzya/frame/sys/application/plugin/entity/SysApplicationPluginEntity.xml rename to service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginEntity.xml index 9e10bc6d..1338856a 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/plugin/entity/SysApplicationPluginEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginEntity.xml @@ -1,8 +1,8 @@ - + - + @@ -44,7 +44,7 @@ from sys_application_plugin where sts = 'Y' and id = #{id} - select from sys_application_plugin @@ -71,7 +71,7 @@ - select count(1) from sys_application_plugin and id = #{id} @@ -96,7 +96,7 @@ - select from sys_application_plugin @@ -123,7 +123,7 @@ - select from sys_application_plugin @@ -150,7 +150,7 @@ - + insert into sys_application_plugin( id , @@ -224,7 +224,7 @@ sts = values(sts), org_id = values(org_id) - + update sys_application_plugin set app_id = #{appId}, @@ -245,12 +245,12 @@ update sys_application_plugin set where id = #{id} - + update sys_application_plugin set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - + update sys_application_plugin set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} and id = #{id} @@ -274,7 +274,7 @@ update sys_application_plugin set sts= 'N' ,modify_time = #{modify_time},modify - select from sys_application_plugin diff --git a/service/src/main/java/com/hzya/frame/sys/application/plugin/service/ISysApplicationPluginService.java b/service/src/main/java/com/hzya/frame/sysnew/application/plugin/service/ISysApplicationPluginService.java similarity index 65% rename from service/src/main/java/com/hzya/frame/sys/application/plugin/service/ISysApplicationPluginService.java rename to service/src/main/java/com/hzya/frame/sysnew/application/plugin/service/ISysApplicationPluginService.java index 5a28b9c2..65b438cb 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/plugin/service/ISysApplicationPluginService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/plugin/service/ISysApplicationPluginService.java @@ -1,6 +1,6 @@ -package com.hzya.frame.sys.application.plugin.service; +package com.hzya.frame.sysnew.application.plugin.service; -import com.hzya.frame.sys.application.plugin.entity.SysApplicationPluginEntity; +import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity; import com.hzya.frame.basedao.service.IBaseService; /** * 插件表(SysApplicationPlugin)表服务接口 diff --git a/service/src/main/java/com/hzya/frame/sys/application/plugin/service/impl/SysApplicationPluginServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/plugin/service/impl/SysApplicationPluginServiceImpl.java similarity index 70% rename from service/src/main/java/com/hzya/frame/sys/application/plugin/service/impl/SysApplicationPluginServiceImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/application/plugin/service/impl/SysApplicationPluginServiceImpl.java index 4d5788fc..2ed5ac0b 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/plugin/service/impl/SysApplicationPluginServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/plugin/service/impl/SysApplicationPluginServiceImpl.java @@ -1,8 +1,8 @@ -package com.hzya.frame.sys.application.plugin.service.impl; +package com.hzya.frame.sysnew.application.plugin.service.impl; -import com.hzya.frame.sys.application.plugin.entity.SysApplicationPluginEntity; -import com.hzya.frame.sys.application.plugin.dao.ISysApplicationPluginDao; -import com.hzya.frame.sys.application.plugin.service.ISysApplicationPluginService; +import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity; +import com.hzya.frame.sysnew.application.plugin.dao.ISysApplicationPluginDao; +import com.hzya.frame.sysnew.application.plugin.service.ISysApplicationPluginService; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.Resource; diff --git a/service/src/main/java/com/hzya/frame/sys/application/service/ISysApplicationService.java b/service/src/main/java/com/hzya/frame/sysnew/application/service/ISysApplicationService.java similarity index 98% rename from service/src/main/java/com/hzya/frame/sys/application/service/ISysApplicationService.java rename to service/src/main/java/com/hzya/frame/sysnew/application/service/ISysApplicationService.java index 565f9038..a588a995 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/service/ISysApplicationService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/service/ISysApplicationService.java @@ -1,7 +1,7 @@ -package com.hzya.frame.sys.application.service; +package com.hzya.frame.sysnew.application.service; import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.sys.application.entity.SysApplicationEntity; +import com.hzya.frame.sysnew.application.entity.SysApplicationEntity; import com.hzya.frame.basedao.service.IBaseService; import com.hzya.frame.web.entity.JsonResultEntity; diff --git a/service/src/main/java/com/hzya/frame/sys/application/service/impl/ApplicationCache.java b/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/ApplicationCache.java similarity index 89% rename from service/src/main/java/com/hzya/frame/sys/application/service/impl/ApplicationCache.java rename to service/src/main/java/com/hzya/frame/sysnew/application/service/impl/ApplicationCache.java index 66b4abc9..dc0747d0 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/service/impl/ApplicationCache.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/ApplicationCache.java @@ -1,13 +1,13 @@ -package com.hzya.frame.sys.application.service.impl; +package com.hzya.frame.sysnew.application.service.impl; -import com.hzya.frame.sys.application.api.dao.ISysApplicationApiDao; -import com.hzya.frame.sys.application.api.entity.SysApplicationApiEntity; -import com.hzya.frame.sys.application.apiAuth.dao.ISysApplicationApiAuthDao; -import com.hzya.frame.sys.application.apiAuth.entity.SysApplicationApiAuthEntity; -import com.hzya.frame.sys.application.apiAythDetail.dao.ISysApplicationApiAuthDetailDao; -import com.hzya.frame.sys.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity; -import com.hzya.frame.sys.application.dao.ISysApplicationDao; -import com.hzya.frame.sys.application.entity.SysApplicationEntity; +import com.hzya.frame.sysnew.application.api.dao.ISysApplicationApiDao; +import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity; +import com.hzya.frame.sysnew.application.apiAuth.dao.ISysApplicationApiAuthDao; +import com.hzya.frame.sysnew.application.apiAuth.entity.SysApplicationApiAuthEntity; +import com.hzya.frame.sysnew.application.apiAythDetail.dao.ISysApplicationApiAuthDetailDao; +import com.hzya.frame.sysnew.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity; +import com.hzya.frame.sysnew.application.dao.ISysApplicationDao; +import com.hzya.frame.sysnew.application.entity.SysApplicationEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/service/src/main/java/com/hzya/frame/sys/application/service/impl/SysApplicationServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java similarity index 96% rename from service/src/main/java/com/hzya/frame/sys/application/service/impl/SysApplicationServiceImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java index 0f85c8d4..628b9957 100644 --- a/service/src/main/java/com/hzya/frame/sys/application/service/impl/SysApplicationServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java @@ -1,4 +1,4 @@ -package com.hzya.frame.sys.application.service.impl; +package com.hzya.frame.sysnew.application.service.impl; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.extra.servlet.ServletUtil; @@ -7,48 +7,43 @@ import com.baomidou.dynamic.datasource.annotation.DSTransactional; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.hzya.frame.serviceUtil.DsDataSourceUtil; -import com.hzya.frame.sys.application.api.dao.ISysApplicationApiDao; -import com.hzya.frame.sys.application.api.entity.SysApplicationApiDto; -import com.hzya.frame.sys.application.api.entity.SysApplicationApiEntity; -import com.hzya.frame.sys.application.api.entity.SysApplicationApiVo; -import com.hzya.frame.sys.application.apiAuth.dao.ISysApplicationApiAuthDao; -import com.hzya.frame.sys.application.apiAuth.entity.SysApplicationApiAuthDto; -import com.hzya.frame.sys.application.apiAuth.entity.SysApplicationApiAuthEntity; -import com.hzya.frame.sys.application.apiAythDetail.dao.ISysApplicationApiAuthDetailDao; -import com.hzya.frame.sys.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity; -import com.hzya.frame.sys.application.apiPara.dao.ISysApplicationApiParaDao; -import com.hzya.frame.sys.application.apiPara.entity.SysApplicationApiParaEntity; -import com.hzya.frame.sys.application.apiType.dao.ISysApplicationApiTypeDao; -import com.hzya.frame.sys.application.apiType.entity.SysApplicationApiTypeEntity; -import com.hzya.frame.sys.application.database.dao.ISysApplicationDatabaseDao; -import com.hzya.frame.sys.application.database.entity.SysApplicationDatabaseEntity; -import com.hzya.frame.sys.application.entity.SysApplicationDatasourceDto; -import com.hzya.frame.sys.application.entity.SysApplicationDto; -import com.hzya.frame.sys.application.entity.SysApplicationEntity; -import com.hzya.frame.sys.application.dao.ISysApplicationDao; -import com.hzya.frame.sys.application.entity.SysApplicationVo; -import com.hzya.frame.sys.application.plugin.dao.ISysApplicationPluginDao; -import com.hzya.frame.sys.application.plugin.entity.SysApplicationPluginDto; -import com.hzya.frame.sys.application.plugin.entity.SysApplicationPluginEntity; -import com.hzya.frame.sys.application.service.ISysApplicationService; -import com.hzya.frame.sys.dataSource.entity.SysDataSourceEntity; -import com.hzya.frame.sys.dataSource.entity.SysDataSourceVo; -import com.hzya.frame.sys.messageManage.dao.ISysMessageManageDao; -import com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity; -import com.hzya.frame.sys.messageManage.entity.SysMessageManagePageVo; -import com.hzya.frame.sys.messageManageDetail.dao.ISysMessageManageDetailDao; -import com.hzya.frame.sys.messageManageDetail.entity.SysMessageManageDetailEntity; -import com.hzya.frame.sys.messageManageLog.dao.ISysMessageManageLogDao; -import com.hzya.frame.sys.messageManageLog.entity.SysMessageManageLogEntity; -import com.hzya.frame.sys.messageManageLog.entity.SysMessageManageLogPageVo; -import com.hzya.frame.sys.messageManageLogDetail.service.ISysMessageManageLogDetailService; +import com.hzya.frame.sysnew.application.api.dao.ISysApplicationApiDao; +import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiDto; +import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity; +import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiVo; +import com.hzya.frame.sysnew.application.apiAuth.dao.ISysApplicationApiAuthDao; +import com.hzya.frame.sysnew.application.apiAuth.entity.SysApplicationApiAuthDto; +import com.hzya.frame.sysnew.application.apiAuth.entity.SysApplicationApiAuthEntity; +import com.hzya.frame.sysnew.application.apiAythDetail.dao.ISysApplicationApiAuthDetailDao; +import com.hzya.frame.sysnew.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity; +import com.hzya.frame.sysnew.application.apiPara.dao.ISysApplicationApiParaDao; +import com.hzya.frame.sysnew.application.apiPara.entity.SysApplicationApiParaEntity; +import com.hzya.frame.sysnew.application.apiType.dao.ISysApplicationApiTypeDao; +import com.hzya.frame.sysnew.application.apiType.entity.SysApplicationApiTypeEntity; +import com.hzya.frame.sysnew.application.database.dao.ISysApplicationDatabaseDao; +import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity; +import com.hzya.frame.sysnew.application.entity.SysApplicationDatasourceDto; +import com.hzya.frame.sysnew.application.entity.SysApplicationDto; +import com.hzya.frame.sysnew.application.entity.SysApplicationEntity; +import com.hzya.frame.sysnew.application.dao.ISysApplicationDao; +import com.hzya.frame.sysnew.application.entity.SysApplicationVo; +import com.hzya.frame.sysnew.application.plugin.dao.ISysApplicationPluginDao; +import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginDto; +import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity; +import com.hzya.frame.sysnew.application.service.ISysApplicationService; +import com.hzya.frame.sysnew.messageManage.dao.ISysMessageManageDao; +import com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity; +import com.hzya.frame.sysnew.messageManageDetail.dao.ISysMessageManageDetailDao; +import com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity; +import com.hzya.frame.sysnew.messageManageLog.dao.ISysMessageManageLogDao; +import com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogEntity; +import com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogPageVo; import com.hzya.frame.util.AESUtil; import com.hzya.frame.util.IPHelper; import com.hzya.frame.uuid.UUIDUtils; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; @@ -109,14 +104,11 @@ public class SysApplicationServiceImpl extends BaseService doEsbTask(sysMessageManageLogEntity)); - //sysMessageManageLogDao.save(sysMessageManageLogEntity); - //doEsbTask(sysMessageManageLogEntity); - } /** @@ -1987,11 +1972,6 @@ public class SysApplicationServiceImpl extends BaseService implements ISysIntegratedForegroundTaskDao{ +public class SysIntegratedForegroundTaskDaoImpl extends MybatisGenericDao implements ISysIntegratedForegroundTaskDao { } diff --git a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTask/entity/SysIntegratedForegroundTaskEntity.java b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/entity/SysIntegratedForegroundTaskEntity.java similarity index 90% rename from service/src/main/java/com/hzya/frame/sys/integratedForegroundTask/entity/SysIntegratedForegroundTaskEntity.java rename to service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/entity/SysIntegratedForegroundTaskEntity.java index 165c780f..109e95a0 100644 --- a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTask/entity/SysIntegratedForegroundTaskEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/entity/SysIntegratedForegroundTaskEntity.java @@ -1,13 +1,14 @@ -package com.hzya.frame.sys.integratedForegroundTask.entity; +package com.hzya.frame.sysnew.integratedForegroundTask.entity; + +import cn.dev33.satoken.stp.StpUtil; +import com.hzya.frame.sysnew.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity; +import com.hzya.frame.sysnew.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity; +import com.hzya.frame.uuid.UUIDUtils; +import com.hzya.frame.web.entity.BaseEntity; import java.util.Date; import java.util.List; -import cn.dev33.satoken.stp.StpUtil; -import com.hzya.frame.sys.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity; -import com.hzya.frame.sys.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity; -import com.hzya.frame.uuid.UUIDUtils; -import com.hzya.frame.web.entity.BaseEntity; /** * 集成前台任务主表(SysIntegratedForegroundTask)实体类 * diff --git a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTask/entity/SysIntegratedForegroundTaskEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/entity/SysIntegratedForegroundTaskEntity.xml similarity index 93% rename from service/src/main/java/com/hzya/frame/sys/integratedForegroundTask/entity/SysIntegratedForegroundTaskEntity.xml rename to service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/entity/SysIntegratedForegroundTaskEntity.xml index fd9444f6..78fd315d 100644 --- a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTask/entity/SysIntegratedForegroundTaskEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/entity/SysIntegratedForegroundTaskEntity.xml @@ -1,8 +1,8 @@ - + - + @@ -32,7 +32,7 @@ ,org_id - select from sys_integrated_foreground_task @@ -56,7 +56,7 @@ - select count(1) from sys_integrated_foreground_task and id = #{id} @@ -78,7 +78,7 @@ - select from sys_integrated_foreground_task @@ -102,7 +102,7 @@ - select from sys_integrated_foreground_task @@ -131,7 +131,7 @@ from sys_integrated_foreground_task where id = #{ id } and sts='Y' - + insert into sys_integrated_foreground_task( id , @@ -196,7 +196,7 @@ sts = values(sts), org_id = values(org_id) - + update sys_integrated_foreground_task set workshop_name = #{workshopName}, @@ -214,12 +214,12 @@ update sys_integrated_foreground_task set where id = #{id} - + update sys_integrated_foreground_task set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - + update sys_integrated_foreground_task set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} and id = #{id} diff --git a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTask/service/ISysIntegratedForegroundTaskService.java b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/service/ISysIntegratedForegroundTaskService.java similarity index 91% rename from service/src/main/java/com/hzya/frame/sys/integratedForegroundTask/service/ISysIntegratedForegroundTaskService.java rename to service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/service/ISysIntegratedForegroundTaskService.java index 73645cf7..bed9aa66 100644 --- a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTask/service/ISysIntegratedForegroundTaskService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/service/ISysIntegratedForegroundTaskService.java @@ -1,8 +1,8 @@ -package com.hzya.frame.sys.integratedForegroundTask.service; +package com.hzya.frame.sysnew.integratedForegroundTask.service; import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.sys.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity; import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.sysnew.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity; import com.hzya.frame.web.entity.JsonResultEntity; /** diff --git a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTask/service/impl/SysIntegratedForegroundTaskServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/service/impl/SysIntegratedForegroundTaskServiceImpl.java similarity index 93% rename from service/src/main/java/com/hzya/frame/sys/integratedForegroundTask/service/impl/SysIntegratedForegroundTaskServiceImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/service/impl/SysIntegratedForegroundTaskServiceImpl.java index a7d1b750..7ca8544c 100644 --- a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTask/service/impl/SysIntegratedForegroundTaskServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/service/impl/SysIntegratedForegroundTaskServiceImpl.java @@ -1,28 +1,26 @@ -package com.hzya.frame.sys.integratedForegroundTask.service.impl; +package com.hzya.frame.sysnew.integratedForegroundTask.service.impl; import cn.dev33.satoken.stp.StpUtil; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.hzya.frame.base.PluginBaseEntity; -import com.hzya.frame.sys.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity; -import com.hzya.frame.sys.integratedForegroundTask.dao.ISysIntegratedForegroundTaskDao; -import com.hzya.frame.sys.integratedForegroundTask.service.ISysIntegratedForegroundTaskService; -import com.hzya.frame.sys.integratedForegroundTaskDetail.dao.ISysIntegratedForegroundTaskDetailDao; -import com.hzya.frame.sys.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity; -import com.hzya.frame.sys.integratedForegroundTaskParameter.dao.ISysIntegratedForegroundTaskParameterDao; -import com.hzya.frame.sys.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity; -import com.hzya.frame.sys.plugArg.entity.SysPlugArgEntity; -import com.hzya.frame.sys.plugArgDeatil.entity.SysPlugArgDetailEntity; +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.sysnew.integratedForegroundTaskDetail.dao.ISysIntegratedForegroundTaskDetailDao; +import com.hzya.frame.sysnew.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity; +import com.hzya.frame.sysnew.integratedForegroundTaskParameter.dao.ISysIntegratedForegroundTaskParameterDao; +import com.hzya.frame.sysnew.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity; +import com.hzya.frame.sysnew.integratedForegroundTask.dao.ISysIntegratedForegroundTaskDao; +import com.hzya.frame.sysnew.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity; +import com.hzya.frame.sysnew.integratedForegroundTask.service.ISysIntegratedForegroundTaskService; import com.hzya.frame.util.PluginUtils; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.task.TaskExecutor; import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.Resource; -import com.hzya.frame.basedao.service.impl.BaseService; +import javax.annotation.Resource; import java.util.Date; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskDetail/dao/ISysIntegratedForegroundTaskDetailDao.java b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskDetail/dao/ISysIntegratedForegroundTaskDetailDao.java similarity index 56% rename from service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskDetail/dao/ISysIntegratedForegroundTaskDetailDao.java rename to service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskDetail/dao/ISysIntegratedForegroundTaskDetailDao.java index bdefcb6a..5e6f5318 100644 --- a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskDetail/dao/ISysIntegratedForegroundTaskDetailDao.java +++ b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskDetail/dao/ISysIntegratedForegroundTaskDetailDao.java @@ -1,7 +1,7 @@ -package com.hzya.frame.sys.integratedForegroundTaskDetail.dao; +package com.hzya.frame.sysnew.integratedForegroundTaskDetail.dao; -import com.hzya.frame.sys.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity; -import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.sysnew.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity; /** * 集成前台任务明细表(sys_integrated_foreground_task_detail: table)表数据库访问层 diff --git a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskDetail/dao/impl/SysIntegratedForegroundTaskDetailDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskDetail/dao/impl/SysIntegratedForegroundTaskDetailDaoImpl.java similarity index 57% rename from service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskDetail/dao/impl/SysIntegratedForegroundTaskDetailDaoImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskDetail/dao/impl/SysIntegratedForegroundTaskDetailDaoImpl.java index 01529126..1742859a 100644 --- a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskDetail/dao/impl/SysIntegratedForegroundTaskDetailDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskDetail/dao/impl/SysIntegratedForegroundTaskDetailDaoImpl.java @@ -1,9 +1,10 @@ -package com.hzya.frame.sys.integratedForegroundTaskDetail.dao.impl; +package com.hzya.frame.sysnew.integratedForegroundTaskDetail.dao.impl; -import com.hzya.frame.sys.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity; -import com.hzya.frame.sys.integratedForegroundTaskDetail.dao.ISysIntegratedForegroundTaskDetailDao; -import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.sysnew.integratedForegroundTaskDetail.dao.ISysIntegratedForegroundTaskDetailDao; +import com.hzya.frame.sysnew.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity; +import org.springframework.stereotype.Repository; + /** * 集成前台任务明细表(SysIntegratedForegroundTaskDetail)表数据库访问层 * @@ -11,7 +12,7 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao; * @since 2024-03-18 14:35:29 */ @Repository(value = "SysIntegratedForegroundTaskDetailDaoImpl") -public class SysIntegratedForegroundTaskDetailDaoImpl extends MybatisGenericDao implements ISysIntegratedForegroundTaskDetailDao{ +public class SysIntegratedForegroundTaskDetailDaoImpl extends MybatisGenericDao implements ISysIntegratedForegroundTaskDetailDao { } diff --git a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskDetail/entity/SysIntegratedForegroundTaskDetailEntity.java b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskDetail/entity/SysIntegratedForegroundTaskDetailEntity.java similarity index 96% rename from service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskDetail/entity/SysIntegratedForegroundTaskDetailEntity.java rename to service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskDetail/entity/SysIntegratedForegroundTaskDetailEntity.java index cf8b8abd..7eeda900 100644 --- a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskDetail/entity/SysIntegratedForegroundTaskDetailEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskDetail/entity/SysIntegratedForegroundTaskDetailEntity.java @@ -1,10 +1,11 @@ -package com.hzya.frame.sys.integratedForegroundTaskDetail.entity; - -import java.util.Date; +package com.hzya.frame.sysnew.integratedForegroundTaskDetail.entity; import cn.dev33.satoken.stp.StpUtil; import com.hzya.frame.uuid.UUIDUtils; import com.hzya.frame.web.entity.BaseEntity; + +import java.util.Date; + /** * 集成前台任务明细表(SysIntegratedForegroundTaskDetail)实体类 * diff --git a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskDetail/entity/SysIntegratedForegroundTaskDetailEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskDetail/entity/SysIntegratedForegroundTaskDetailEntity.xml similarity index 93% rename from service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskDetail/entity/SysIntegratedForegroundTaskDetailEntity.xml rename to service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskDetail/entity/SysIntegratedForegroundTaskDetailEntity.xml index 46695e57..f9c35743 100644 --- a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskDetail/entity/SysIntegratedForegroundTaskDetailEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskDetail/entity/SysIntegratedForegroundTaskDetailEntity.xml @@ -1,8 +1,8 @@ - + - + @@ -36,7 +36,7 @@ ,org_id - select from sys_integrated_foreground_task_detail @@ -62,7 +62,7 @@ - select count(1) from sys_integrated_foreground_task_detail and id = #{id} @@ -86,7 +86,7 @@ - select from sys_integrated_foreground_task_detail @@ -112,7 +112,7 @@ - select from sys_integrated_foreground_task_detail @@ -138,7 +138,7 @@ - + insert into sys_integrated_foreground_task_detail( id , @@ -209,7 +209,7 @@ sts = values(sts), org_id = values(org_id) - + update sys_integrated_foreground_task_detail set formmain_id = #{formmainId}, @@ -229,12 +229,12 @@ update sys_integrated_foreground_task_detail set where id = #{id} - + update sys_integrated_foreground_task_detail set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - + update sys_integrated_foreground_task_detail set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} and id = #{id} diff --git a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskDetail/service/ISysIntegratedForegroundTaskDetailService.java b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskDetail/service/ISysIntegratedForegroundTaskDetailService.java similarity index 64% rename from service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskDetail/service/ISysIntegratedForegroundTaskDetailService.java rename to service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskDetail/service/ISysIntegratedForegroundTaskDetailService.java index 76938c63..f2bc7351 100644 --- a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskDetail/service/ISysIntegratedForegroundTaskDetailService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskDetail/service/ISysIntegratedForegroundTaskDetailService.java @@ -1,7 +1,8 @@ -package com.hzya.frame.sys.integratedForegroundTaskDetail.service; +package com.hzya.frame.sysnew.integratedForegroundTaskDetail.service; -import com.hzya.frame.sys.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity; import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.sysnew.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity; + /** * 集成前台任务明细表(SysIntegratedForegroundTaskDetail)表服务接口 * diff --git a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskDetail/service/impl/SysIntegratedForegroundTaskDetailServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskDetail/service/impl/SysIntegratedForegroundTaskDetailServiceImpl.java similarity index 62% rename from service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskDetail/service/impl/SysIntegratedForegroundTaskDetailServiceImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskDetail/service/impl/SysIntegratedForegroundTaskDetailServiceImpl.java index 30720f2f..448b10e3 100644 --- a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskDetail/service/impl/SysIntegratedForegroundTaskDetailServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskDetail/service/impl/SysIntegratedForegroundTaskDetailServiceImpl.java @@ -1,12 +1,12 @@ -package com.hzya.frame.sys.integratedForegroundTaskDetail.service.impl; +package com.hzya.frame.sysnew.integratedForegroundTaskDetail.service.impl; -import com.hzya.frame.sys.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity; -import com.hzya.frame.sys.integratedForegroundTaskDetail.dao.ISysIntegratedForegroundTaskDetailDao; -import com.hzya.frame.sys.integratedForegroundTaskDetail.service.ISysIntegratedForegroundTaskDetailService; -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.Resource; import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.sysnew.integratedForegroundTaskDetail.dao.ISysIntegratedForegroundTaskDetailDao; +import com.hzya.frame.sysnew.integratedForegroundTaskDetail.entity.SysIntegratedForegroundTaskDetailEntity; +import com.hzya.frame.sysnew.integratedForegroundTaskDetail.service.ISysIntegratedForegroundTaskDetailService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + /** * 集成前台任务明细表(SysIntegratedForegroundTaskDetail)表服务实现类 * diff --git a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskParameter/dao/ISysIntegratedForegroundTaskParameterDao.java b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/dao/ISysIntegratedForegroundTaskParameterDao.java similarity index 74% rename from service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskParameter/dao/ISysIntegratedForegroundTaskParameterDao.java rename to service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/dao/ISysIntegratedForegroundTaskParameterDao.java index 31231f1d..4ad4bd5a 100644 --- a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskParameter/dao/ISysIntegratedForegroundTaskParameterDao.java +++ b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/dao/ISysIntegratedForegroundTaskParameterDao.java @@ -1,7 +1,7 @@ -package com.hzya.frame.sys.integratedForegroundTaskParameter.dao; +package com.hzya.frame.sysnew.integratedForegroundTaskParameter.dao; -import com.hzya.frame.sys.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity; import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.sysnew.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskParameter/dao/impl/SysIntegratedForegroundTaskParameterDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/dao/impl/SysIntegratedForegroundTaskParameterDaoImpl.java similarity index 67% rename from service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskParameter/dao/impl/SysIntegratedForegroundTaskParameterDaoImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/dao/impl/SysIntegratedForegroundTaskParameterDaoImpl.java index d086896f..efc93c95 100644 --- a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskParameter/dao/impl/SysIntegratedForegroundTaskParameterDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/dao/impl/SysIntegratedForegroundTaskParameterDaoImpl.java @@ -1,10 +1,9 @@ -package com.hzya.frame.sys.integratedForegroundTaskParameter.dao.impl; +package com.hzya.frame.sysnew.integratedForegroundTaskParameter.dao.impl; -import com.hzya.frame.sys.application.entity.SysApplicationVo; -import com.hzya.frame.sys.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity; -import com.hzya.frame.sys.integratedForegroundTaskParameter.dao.ISysIntegratedForegroundTaskParameterDao; -import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.sysnew.integratedForegroundTaskParameter.dao.ISysIntegratedForegroundTaskParameterDao; +import com.hzya.frame.sysnew.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity; +import org.springframework.stereotype.Repository; import java.util.List; @@ -15,7 +14,7 @@ import java.util.List; * @since 2024-03-26 14:30:43 */ @Repository(value = "SysIntegratedForegroundTaskParameterDaoImpl") -public class SysIntegratedForegroundTaskParameterDaoImpl extends MybatisGenericDao implements ISysIntegratedForegroundTaskParameterDao{ +public class SysIntegratedForegroundTaskParameterDaoImpl extends MybatisGenericDao implements ISysIntegratedForegroundTaskParameterDao { @Override public List entity_list_base_by_create(SysIntegratedForegroundTaskParameterEntity entity) { diff --git a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.java b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.java similarity index 94% rename from service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.java rename to service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.java index e47298a5..3ae60fda 100644 --- a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.java @@ -1,10 +1,11 @@ -package com.hzya.frame.sys.integratedForegroundTaskParameter.entity; - -import java.util.Date; +package com.hzya.frame.sysnew.integratedForegroundTaskParameter.entity; import cn.dev33.satoken.stp.StpUtil; import com.hzya.frame.uuid.UUIDUtils; import com.hzya.frame.web.entity.BaseEntity; + +import java.util.Date; + /** * 集成前台任务参数表(SysIntegratedForegroundTaskParameter)实体类 * diff --git a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.xml similarity index 91% rename from service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.xml rename to service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.xml index d03b9476..1f2cfc6d 100644 --- a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.xml @@ -1,8 +1,8 @@ - + - + @@ -30,7 +30,7 @@ ,org_id - select from sys_integrated_foreground_task_parameter @@ -53,7 +53,7 @@ - select count(1) from sys_integrated_foreground_task_parameter and id = #{id} @@ -74,7 +74,7 @@ - select from sys_integrated_foreground_task_parameter @@ -97,7 +97,7 @@ - select from sys_integrated_foreground_task_parameter @@ -120,7 +120,7 @@ - + insert into sys_integrated_foreground_task_parameter( id , @@ -182,7 +182,7 @@ sts = values(sts), org_id = values(org_id) - + update sys_integrated_foreground_task_parameter set formmain_id = #{formmainId}, @@ -199,12 +199,12 @@ update sys_integrated_foreground_task_parameter set where id = #{id} - + update sys_integrated_foreground_task_parameter set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - + update sys_integrated_foreground_task_parameter set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} and id = #{id} @@ -222,14 +222,14 @@ update sys_integrated_foreground_task_parameter set sts= 'N' ,modify_time = #{m - select a.id ,a.formmain_id ,a.in_parameter ,a.remark ,a.sorts - ,b.login_code as create_user_id + ,p.person_name as create_user_id ,a.create_time ,a.modify_user_id ,a.modify_time @@ -237,6 +237,7 @@ update sys_integrated_foreground_task_parameter set sts= 'N' ,modify_time = #{m ,a.org_id from sys_integrated_foreground_task_parameter a LEFT JOIN sys_user b on b.id = a.create_user_id and b.sts = 'Y' + LEFT JOIN sys_person p on p.id = b.person_id and p.sts = 'Y' and a.id = #{id} and a.formmain_id = #{formmainId} diff --git a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskParameter/service/ISysIntegratedForegroundTaskParameterService.java b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/service/ISysIntegratedForegroundTaskParameterService.java similarity index 64% rename from service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskParameter/service/ISysIntegratedForegroundTaskParameterService.java rename to service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/service/ISysIntegratedForegroundTaskParameterService.java index d1a53fb3..915771a1 100644 --- a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskParameter/service/ISysIntegratedForegroundTaskParameterService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/service/ISysIntegratedForegroundTaskParameterService.java @@ -1,7 +1,8 @@ -package com.hzya.frame.sys.integratedForegroundTaskParameter.service; +package com.hzya.frame.sysnew.integratedForegroundTaskParameter.service; -import com.hzya.frame.sys.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity; import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.sysnew.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity; + /** * 集成前台任务参数表(SysIntegratedForegroundTaskParameter)表服务接口 * diff --git a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskParameter/service/impl/SysIntegratedForegroundTaskParameterServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/service/impl/SysIntegratedForegroundTaskParameterServiceImpl.java similarity index 62% rename from service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskParameter/service/impl/SysIntegratedForegroundTaskParameterServiceImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/service/impl/SysIntegratedForegroundTaskParameterServiceImpl.java index 059a9eec..13a95544 100644 --- a/service/src/main/java/com/hzya/frame/sys/integratedForegroundTaskParameter/service/impl/SysIntegratedForegroundTaskParameterServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/service/impl/SysIntegratedForegroundTaskParameterServiceImpl.java @@ -1,12 +1,12 @@ -package com.hzya.frame.sys.integratedForegroundTaskParameter.service.impl; +package com.hzya.frame.sysnew.integratedForegroundTaskParameter.service.impl; -import com.hzya.frame.sys.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity; -import com.hzya.frame.sys.integratedForegroundTaskParameter.dao.ISysIntegratedForegroundTaskParameterDao; -import com.hzya.frame.sys.integratedForegroundTaskParameter.service.ISysIntegratedForegroundTaskParameterService; -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.Resource; import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.sysnew.integratedForegroundTaskParameter.dao.ISysIntegratedForegroundTaskParameterDao; +import com.hzya.frame.sysnew.integratedForegroundTaskParameter.entity.SysIntegratedForegroundTaskParameterEntity; +import com.hzya.frame.sysnew.integratedForegroundTaskParameter.service.ISysIntegratedForegroundTaskParameterService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + /** * 集成前台任务参数表(SysIntegratedForegroundTaskParameter)表服务实现类 * diff --git a/service/src/main/java/com/hzya/frame/sys/messageManage/dao/ISysMessageManageDao.java b/service/src/main/java/com/hzya/frame/sysnew/messageManage/dao/ISysMessageManageDao.java similarity index 66% rename from service/src/main/java/com/hzya/frame/sys/messageManage/dao/ISysMessageManageDao.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManage/dao/ISysMessageManageDao.java index 31fd2cfe..bd1b0459 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManage/dao/ISysMessageManageDao.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManage/dao/ISysMessageManageDao.java @@ -1,8 +1,8 @@ -package com.hzya.frame.sys.messageManage.dao; +package com.hzya.frame.sysnew.messageManage.dao; -import com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity; import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.sys.messageManage.entity.SysMessageManagePageVo; +import com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity; +import com.hzya.frame.sysnew.messageManage.entity.SysMessageManagePageVo; import java.util.List; @@ -19,7 +19,7 @@ public interface ISysMessageManageDao extends IBaseDao + * @return java.util.List **/ List queryListByPageVo(SysMessageManageEntity entity); diff --git a/service/src/main/java/com/hzya/frame/sys/messageManage/dao/impl/SysMessageManageDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/messageManage/dao/impl/SysMessageManageDaoImpl.java similarity index 74% rename from service/src/main/java/com/hzya/frame/sys/messageManage/dao/impl/SysMessageManageDaoImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManage/dao/impl/SysMessageManageDaoImpl.java index 2621485e..f1bab5da 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManage/dao/impl/SysMessageManageDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManage/dao/impl/SysMessageManageDaoImpl.java @@ -1,11 +1,10 @@ -package com.hzya.frame.sys.messageManage.dao.impl; +package com.hzya.frame.sysnew.messageManage.dao.impl; -import com.hzya.frame.sys.appApi.entity.AppApi; -import com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity; -import com.hzya.frame.sys.messageManage.dao.ISysMessageManageDao; -import com.hzya.frame.sys.messageManage.entity.SysMessageManagePageVo; -import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.sysnew.messageManage.dao.ISysMessageManageDao; +import com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity; +import com.hzya.frame.sysnew.messageManage.entity.SysMessageManagePageVo; +import org.springframework.stereotype.Repository; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/sys/messageManage/entity/SysMessageManageEntity.java b/service/src/main/java/com/hzya/frame/sysnew/messageManage/entity/SysMessageManageEntity.java similarity index 92% rename from service/src/main/java/com/hzya/frame/sys/messageManage/entity/SysMessageManageEntity.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManage/entity/SysMessageManageEntity.java index 927be778..1244252a 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManage/entity/SysMessageManageEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManage/entity/SysMessageManageEntity.java @@ -1,10 +1,10 @@ -package com.hzya.frame.sys.messageManage.entity; +package com.hzya.frame.sysnew.messageManage.entity; + +import com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity; +import com.hzya.frame.web.entity.BaseEntity; -import java.util.Date; import java.util.List; -import com.hzya.frame.sys.messageManageDetail.entity.SysMessageManageDetailEntity; -import com.hzya.frame.web.entity.BaseEntity; /** * 消息管理主表(SysMessageManage)实体类 * diff --git a/service/src/main/java/com/hzya/frame/sys/messageManage/entity/SysMessageManageEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/messageManage/entity/SysMessageManageEntity.xml similarity index 94% rename from service/src/main/java/com/hzya/frame/sys/messageManage/entity/SysMessageManageEntity.xml rename to service/src/main/java/com/hzya/frame/sysnew/messageManage/entity/SysMessageManageEntity.xml index dccd94a5..a4968ef5 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManage/entity/SysMessageManageEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManage/entity/SysMessageManageEntity.xml @@ -1,9 +1,9 @@ - + + type="com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity"> @@ -38,7 +38,7 @@ + parameterType="com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity"> select count(1) from sys_message_manage and id = #{id} @@ -91,7 +91,7 @@ + parameterType="com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity"> select from sys_message_manage @@ -145,7 +145,7 @@ - insert into sys_message_manage( @@ -249,7 +249,7 @@ org_id = values(org_id) - + update sys_message_manage set theme = #{theme}, @@ -269,13 +269,13 @@ where id = #{id} - + update sys_message_manage set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} + parameterType="com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity"> update sys_message_manage set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} and id = #{id} @@ -300,8 +300,8 @@ where id = #{id} - SELECT a.id AS id, a.theme AS theme, diff --git a/service/src/main/java/com/hzya/frame/sys/messageManage/entity/SysMessageManagePageVo.java b/service/src/main/java/com/hzya/frame/sysnew/messageManage/entity/SysMessageManagePageVo.java similarity index 94% rename from service/src/main/java/com/hzya/frame/sys/messageManage/entity/SysMessageManagePageVo.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManage/entity/SysMessageManagePageVo.java index 79acf250..50c346dd 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManage/entity/SysMessageManagePageVo.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManage/entity/SysMessageManagePageVo.java @@ -1,6 +1,4 @@ -package com.hzya.frame.sys.messageManage.entity; - -import com.hzya.frame.web.entity.BaseEntity; +package com.hzya.frame.sysnew.messageManage.entity; /** * @Author lvleigang diff --git a/service/src/main/java/com/hzya/frame/sys/messageManage/service/ISysMessageManageService.java b/service/src/main/java/com/hzya/frame/sysnew/messageManage/service/ISysMessageManageService.java similarity index 93% rename from service/src/main/java/com/hzya/frame/sys/messageManage/service/ISysMessageManageService.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManage/service/ISysMessageManageService.java index 1d5f2507..4293211f 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManage/service/ISysMessageManageService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManage/service/ISysMessageManageService.java @@ -1,8 +1,8 @@ -package com.hzya.frame.sys.messageManage.service; +package com.hzya.frame.sysnew.messageManage.service; import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity; import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity; import com.hzya.frame.web.entity.JsonResultEntity; /** diff --git a/service/src/main/java/com/hzya/frame/sys/messageManage/service/impl/SysMessageManageServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/messageManage/service/impl/SysMessageManageServiceImpl.java similarity index 93% rename from service/src/main/java/com/hzya/frame/sys/messageManage/service/impl/SysMessageManageServiceImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManage/service/impl/SysMessageManageServiceImpl.java index d1b7c7af..388cc5ec 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManage/service/impl/SysMessageManageServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManage/service/impl/SysMessageManageServiceImpl.java @@ -1,35 +1,27 @@ -package com.hzya.frame.sys.messageManage.service.impl; +package com.hzya.frame.sysnew.messageManage.service.impl; import cn.dev33.satoken.stp.StpUtil; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.hzya.frame.sys.appApi.entity.AppApi; -import com.hzya.frame.sys.appApi.entity.AppApiDto; -import com.hzya.frame.sys.appApi.entity.AppApiListVo; -import com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity; -import com.hzya.frame.sys.messageManage.dao.ISysMessageManageDao; -import com.hzya.frame.sys.messageManage.entity.SysMessageManagePageVo; -import com.hzya.frame.sys.messageManage.service.ISysMessageManageService; -import com.hzya.frame.sys.messageManageDetail.dao.ISysMessageManageDetailDao; -import com.hzya.frame.sys.messageManageDetail.entity.SysMessageManageDetailEntity; -import com.hzya.frame.sys.templateView.entity.TemplateView; +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.sysnew.messageManageDetail.dao.ISysMessageManageDetailDao; +import com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity; +import com.hzya.frame.sysnew.messageManage.dao.ISysMessageManageDao; +import com.hzya.frame.sysnew.messageManage.entity.SysMessageManageEntity; +import com.hzya.frame.sysnew.messageManage.entity.SysMessageManagePageVo; +import com.hzya.frame.sysnew.messageManage.service.ISysMessageManageService; import com.hzya.frame.uuid.UUIDUtils; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; -import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import javax.annotation.Resource; - -import com.hzya.frame.basedao.service.impl.BaseService; - -import java.util.Collection; import java.util.Date; import java.util.HashSet; import java.util.List; import java.util.Set; -import java.util.stream.Collectors; /** * 消息管理主表(SysMessageManage)表服务实现类 diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageDetail/dao/ISysMessageManageDetailDao.java b/service/src/main/java/com/hzya/frame/sysnew/messageManageDetail/dao/ISysMessageManageDetailDao.java similarity index 67% rename from service/src/main/java/com/hzya/frame/sys/messageManageDetail/dao/ISysMessageManageDetailDao.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManageDetail/dao/ISysMessageManageDetailDao.java index b8abf6d1..f375c5ca 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageDetail/dao/ISysMessageManageDetailDao.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageDetail/dao/ISysMessageManageDetailDao.java @@ -1,7 +1,7 @@ -package com.hzya.frame.sys.messageManageDetail.dao; +package com.hzya.frame.sysnew.messageManageDetail.dao; -import com.hzya.frame.sys.messageManageDetail.entity.SysMessageManageDetailEntity; import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity; /** * 消息管理明细表(sys_message_manage_detail: table)表数据库访问层 diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageDetail/dao/impl/SysMessageManageDetailDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/messageManageDetail/dao/impl/SysMessageManageDetailDaoImpl.java similarity index 65% rename from service/src/main/java/com/hzya/frame/sys/messageManageDetail/dao/impl/SysMessageManageDetailDaoImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManageDetail/dao/impl/SysMessageManageDetailDaoImpl.java index 13142377..1794f8d0 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageDetail/dao/impl/SysMessageManageDetailDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageDetail/dao/impl/SysMessageManageDetailDaoImpl.java @@ -1,9 +1,9 @@ -package com.hzya.frame.sys.messageManageDetail.dao.impl; +package com.hzya.frame.sysnew.messageManageDetail.dao.impl; -import com.hzya.frame.sys.messageManageDetail.entity.SysMessageManageDetailEntity; -import com.hzya.frame.sys.messageManageDetail.dao.ISysMessageManageDetailDao; -import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.sysnew.messageManageDetail.dao.ISysMessageManageDetailDao; +import com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity; +import org.springframework.stereotype.Repository; /** * 消息管理明细表(SysMessageManageDetail)表数据库访问层 diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageDetail/entity/SysMessageManageDetailEntity.java b/service/src/main/java/com/hzya/frame/sysnew/messageManageDetail/entity/SysMessageManageDetailEntity.java similarity index 96% rename from service/src/main/java/com/hzya/frame/sys/messageManageDetail/entity/SysMessageManageDetailEntity.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManageDetail/entity/SysMessageManageDetailEntity.java index c6174148..225cea83 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageDetail/entity/SysMessageManageDetailEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageDetail/entity/SysMessageManageDetailEntity.java @@ -1,7 +1,7 @@ -package com.hzya.frame.sys.messageManageDetail.entity; +package com.hzya.frame.sysnew.messageManageDetail.entity; -import java.util.Date; import com.hzya.frame.web.entity.BaseEntity; + /** * 消息管理明细表(SysMessageManageDetail)实体类 * diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageDetail/entity/SysMessageManageDetailEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/messageManageDetail/entity/SysMessageManageDetailEntity.xml similarity index 94% rename from service/src/main/java/com/hzya/frame/sys/messageManageDetail/entity/SysMessageManageDetailEntity.xml rename to service/src/main/java/com/hzya/frame/sysnew/messageManageDetail/entity/SysMessageManageDetailEntity.xml index 04e41401..fde5ed64 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageDetail/entity/SysMessageManageDetailEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageDetail/entity/SysMessageManageDetailEntity.xml @@ -1,9 +1,9 @@ - + + type="com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity"> @@ -42,7 +42,7 @@ + parameterType="com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity"> select count(1) from sys_message_manage_detail and id = #{id} @@ -98,7 +98,7 @@ + parameterType="com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity"> select from sys_message_manage_detail @@ -162,7 +162,7 @@ insert into sys_message_manage_detail( @@ -247,7 +247,7 @@ + parameterType="com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity"> update sys_message_manage_detail set formmain_id = #{formmainId}, @@ -270,13 +270,13 @@ + parameterType="com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity"> update sys_message_manage_detail set sts= 'N',modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} + parameterType="com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity"> update sys_message_manage_detail set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} and id = #{id} diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageDetail/service/ISysMessageManageDetailService.java b/service/src/main/java/com/hzya/frame/sysnew/messageManageDetail/service/ISysMessageManageDetailService.java similarity index 66% rename from service/src/main/java/com/hzya/frame/sys/messageManageDetail/service/ISysMessageManageDetailService.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManageDetail/service/ISysMessageManageDetailService.java index 55be03c3..58112e81 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageDetail/service/ISysMessageManageDetailService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageDetail/service/ISysMessageManageDetailService.java @@ -1,7 +1,7 @@ -package com.hzya.frame.sys.messageManageDetail.service; +package com.hzya.frame.sysnew.messageManageDetail.service; -import com.hzya.frame.sys.messageManageDetail.entity.SysMessageManageDetailEntity; import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity; /** * 消息管理明细表(SysMessageManageDetail)表服务接口 diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageDetail/service/impl/SysMessageManageDetailServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/messageManageDetail/service/impl/SysMessageManageDetailServiceImpl.java similarity index 68% rename from service/src/main/java/com/hzya/frame/sys/messageManageDetail/service/impl/SysMessageManageDetailServiceImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManageDetail/service/impl/SysMessageManageDetailServiceImpl.java index ed58e66b..c0046496 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageDetail/service/impl/SysMessageManageDetailServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageDetail/service/impl/SysMessageManageDetailServiceImpl.java @@ -1,14 +1,11 @@ -package com.hzya.frame.sys.messageManageDetail.service.impl; - -import com.hzya.frame.sys.messageManageDetail.entity.SysMessageManageDetailEntity; -import com.hzya.frame.sys.messageManageDetail.dao.ISysMessageManageDetailDao; -import com.hzya.frame.sys.messageManageDetail.service.ISysMessageManageDetailService; -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; - -import javax.annotation.Resource; +package com.hzya.frame.sysnew.messageManageDetail.service.impl; import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.sysnew.messageManageDetail.dao.ISysMessageManageDetailDao; +import com.hzya.frame.sysnew.messageManageDetail.entity.SysMessageManageDetailEntity; +import com.hzya.frame.sysnew.messageManageDetail.service.ISysMessageManageDetailService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; /** * 消息管理明细表(SysMessageManageDetail)表服务实现类 diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageLog/dao/ISysMessageManageLogDao.java b/service/src/main/java/com/hzya/frame/sysnew/messageManageLog/dao/ISysMessageManageLogDao.java similarity index 80% rename from service/src/main/java/com/hzya/frame/sys/messageManageLog/dao/ISysMessageManageLogDao.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManageLog/dao/ISysMessageManageLogDao.java index 7bcc12eb..32dd3094 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageLog/dao/ISysMessageManageLogDao.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageLog/dao/ISysMessageManageLogDao.java @@ -1,8 +1,8 @@ -package com.hzya.frame.sys.messageManageLog.dao; +package com.hzya.frame.sysnew.messageManageLog.dao; -import com.hzya.frame.sys.messageManageLog.entity.SysMessageManageLogEntity; import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.sys.messageManageLog.entity.SysMessageManageLogPageVo; +import com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogEntity; +import com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogPageVo; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageLog/dao/impl/SysMessageManageLogDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/messageManageLog/dao/impl/SysMessageManageLogDaoImpl.java similarity index 81% rename from service/src/main/java/com/hzya/frame/sys/messageManageLog/dao/impl/SysMessageManageLogDaoImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManageLog/dao/impl/SysMessageManageLogDaoImpl.java index 20e2af1e..7f0c0ba2 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageLog/dao/impl/SysMessageManageLogDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageLog/dao/impl/SysMessageManageLogDaoImpl.java @@ -1,12 +1,10 @@ -package com.hzya.frame.sys.messageManageLog.dao.impl; +package com.hzya.frame.sysnew.messageManageLog.dao.impl; -import com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity; -import com.hzya.frame.sys.messageManage.entity.SysMessageManagePageVo; -import com.hzya.frame.sys.messageManageLog.entity.SysMessageManageLogEntity; -import com.hzya.frame.sys.messageManageLog.dao.ISysMessageManageLogDao; -import com.hzya.frame.sys.messageManageLog.entity.SysMessageManageLogPageVo; -import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.sysnew.messageManageLog.dao.ISysMessageManageLogDao; +import com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogEntity; +import com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogPageVo; +import org.springframework.stereotype.Repository; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageLog/entity/SysMessageManageLogEntity.java b/service/src/main/java/com/hzya/frame/sysnew/messageManageLog/entity/SysMessageManageLogEntity.java similarity index 98% rename from service/src/main/java/com/hzya/frame/sys/messageManageLog/entity/SysMessageManageLogEntity.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManageLog/entity/SysMessageManageLogEntity.java index f9a8c406..64553bb0 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageLog/entity/SysMessageManageLogEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageLog/entity/SysMessageManageLogEntity.java @@ -1,9 +1,9 @@ -package com.hzya.frame.sys.messageManageLog.entity; - -import java.util.Date; -import java.util.List; +package com.hzya.frame.sysnew.messageManageLog.entity; import com.hzya.frame.web.entity.BaseEntity; + +import java.util.List; + /** * 消息管理日志(SysMessageManageLog)实体类 * diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageLog/entity/SysMessageManageLogEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/messageManageLog/entity/SysMessageManageLogEntity.xml similarity index 95% rename from service/src/main/java/com/hzya/frame/sys/messageManageLog/entity/SysMessageManageLogEntity.xml rename to service/src/main/java/com/hzya/frame/sysnew/messageManageLog/entity/SysMessageManageLogEntity.xml index f6aee9d9..80e8803d 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageLog/entity/SysMessageManageLogEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageLog/entity/SysMessageManageLogEntity.xml @@ -1,9 +1,9 @@ - + + type="com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogEntity"> @@ -56,7 +56,7 @@ + parameterType="com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogEntity"> select count(1) from sys_message_manage_log and id = #{id} @@ -126,7 +126,7 @@ + + parameterType="com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogEntity"> select from sys_message_manage_log @@ -275,7 +275,7 @@ - insert into sys_message_manage_log( @@ -394,7 +394,7 @@ org_id = values(org_id) - + update sys_message_manage_log set message_manage_id = #{messageManageId}, @@ -424,13 +424,13 @@ + parameterType="com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogEntity"> update sys_message_manage_log set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} + parameterType="com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogEntity"> update sys_message_manage_log set sts= 'N',modify_time = #{modify_time},modify_user_id = #{modify_user_id} and id = #{id} @@ -464,8 +464,8 @@ where id = #{id} - - + + @@ -532,8 +532,8 @@ where id = #{id} + parameterType="com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogEntity"> SELECT id FROM diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageLog/entity/SysMessageManageLogPageVo.java b/service/src/main/java/com/hzya/frame/sysnew/messageManageLog/entity/SysMessageManageLogPageVo.java similarity index 98% rename from service/src/main/java/com/hzya/frame/sys/messageManageLog/entity/SysMessageManageLogPageVo.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManageLog/entity/SysMessageManageLogPageVo.java index 258794f0..be7ab3e2 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageLog/entity/SysMessageManageLogPageVo.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageLog/entity/SysMessageManageLogPageVo.java @@ -1,7 +1,6 @@ -package com.hzya.frame.sys.messageManageLog.entity; +package com.hzya.frame.sysnew.messageManageLog.entity; import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzya.frame.web.entity.BaseEntity; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageLog/service/ISysMessageManageLogService.java b/service/src/main/java/com/hzya/frame/sysnew/messageManageLog/service/ISysMessageManageLogService.java similarity index 92% rename from service/src/main/java/com/hzya/frame/sys/messageManageLog/service/ISysMessageManageLogService.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManageLog/service/ISysMessageManageLogService.java index c4b69a09..4e24697e 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageLog/service/ISysMessageManageLogService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageLog/service/ISysMessageManageLogService.java @@ -1,8 +1,8 @@ -package com.hzya.frame.sys.messageManageLog.service; +package com.hzya.frame.sysnew.messageManageLog.service; import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.sys.messageManageLog.entity.SysMessageManageLogEntity; import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogEntity; import com.hzya.frame.web.entity.JsonResultEntity; /** diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageLog/service/impl/SysMessageManageLogServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/messageManageLog/service/impl/SysMessageManageLogServiceImpl.java similarity index 89% rename from service/src/main/java/com/hzya/frame/sys/messageManageLog/service/impl/SysMessageManageLogServiceImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManageLog/service/impl/SysMessageManageLogServiceImpl.java index ecfe2e2e..57ac60d6 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageLog/service/impl/SysMessageManageLogServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageLog/service/impl/SysMessageManageLogServiceImpl.java @@ -1,36 +1,32 @@ -package com.hzya.frame.sys.messageManageLog.service.impl; +package com.hzya.frame.sysnew.messageManageLog.service.impl; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.hzya.frame.sys.messageManage.entity.SysMessageManageEntity; -import com.hzya.frame.sys.messageManage.entity.SysMessageManagePageVo; -import com.hzya.frame.sys.messageManageDetail.entity.SysMessageManageDetailEntity; -import com.hzya.frame.sys.messageManageLog.entity.SysMessageManageLogEntity; -import com.hzya.frame.sys.messageManageLog.dao.ISysMessageManageLogDao; -import com.hzya.frame.sys.messageManageLog.entity.SysMessageManageLogPageVo; -import com.hzya.frame.sys.messageManageLog.service.ISysMessageManageLogService; -import com.hzya.frame.sys.messageManageLogBack.dao.ISysMessageManageLogBackDao; -import com.hzya.frame.sys.messageManageLogBack.detail.server.ISysMessageManageLogDetailBackService; -import com.hzya.frame.sys.messageManageLogBack.service.ISysMessageManageLogBackService; -import com.hzya.frame.sys.messageManageLogDetail.dao.ISysMessageManageLogDetailDao; -import com.hzya.frame.sys.messageManageLogDetail.entity.SysMessageManageLogDetailEntity; +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.sysnew.messageManageLogBack.detail.server.ISysMessageManageLogDetailBackService; +import com.hzya.frame.sysnew.messageManageLogBack.service.ISysMessageManageLogBackService; +import com.hzya.frame.sysnew.messageManageLogDetail.dao.ISysMessageManageLogDetailDao; +import com.hzya.frame.sysnew.messageManageLogDetail.entity.SysMessageManageLogDetailEntity; import com.hzya.frame.sys.service.IEsbService; +import com.hzya.frame.sysnew.messageManageLog.dao.ISysMessageManageLogDao; +import com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogEntity; +import com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogPageVo; +import com.hzya.frame.sysnew.messageManageLog.service.ISysMessageManageLogService; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; -import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import javax.annotation.Resource; - -import com.hzya.frame.basedao.service.impl.BaseService; - import java.text.SimpleDateFormat; import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import java.util.*; +import java.util.Calendar; +import java.util.Date; +import java.util.List; /** * 消息管理日志(SysMessageManageLog)表服务实现类 diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageLogBack/dao/ISysMessageManageLogBackDao.java b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/dao/ISysMessageManageLogBackDao.java similarity index 55% rename from service/src/main/java/com/hzya/frame/sys/messageManageLogBack/dao/ISysMessageManageLogBackDao.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/dao/ISysMessageManageLogBackDao.java index 69df2021..212147c7 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageLogBack/dao/ISysMessageManageLogBackDao.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/dao/ISysMessageManageLogBackDao.java @@ -1,10 +1,8 @@ -package com.hzya.frame.sys.messageManageLogBack.dao; +package com.hzya.frame.sysnew.messageManageLogBack.dao; import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.sys.messageManageLog.entity.SysMessageManageLogEntity; -import com.hzya.frame.sys.messageManageLogBack.entity.SysMessageManageLogBackEntity; -import com.hzya.frame.web.entity.BaseResult; -import com.hzya.frame.web.entity.JsonResultEntity; +import com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogEntity; +import com.hzya.frame.sysnew.messageManageLogBack.entity.SysMessageManageLogBackEntity; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageLogBack/dao/impl/SysMessageManageLogDaoBackImpl.java b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/dao/impl/SysMessageManageLogDaoBackImpl.java similarity index 68% rename from service/src/main/java/com/hzya/frame/sys/messageManageLogBack/dao/impl/SysMessageManageLogDaoBackImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/dao/impl/SysMessageManageLogDaoBackImpl.java index b485bea0..2fbdd524 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageLogBack/dao/impl/SysMessageManageLogDaoBackImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/dao/impl/SysMessageManageLogDaoBackImpl.java @@ -1,9 +1,9 @@ -package com.hzya.frame.sys.messageManageLogBack.dao.impl; +package com.hzya.frame.sysnew.messageManageLogBack.dao.impl; import com.hzya.frame.basedao.dao.MybatisGenericDao; -import com.hzya.frame.sys.messageManageLog.entity.SysMessageManageLogEntity; -import com.hzya.frame.sys.messageManageLogBack.dao.ISysMessageManageLogBackDao; -import com.hzya.frame.sys.messageManageLogBack.entity.SysMessageManageLogBackEntity; +import com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogEntity; +import com.hzya.frame.sysnew.messageManageLogBack.dao.ISysMessageManageLogBackDao; +import com.hzya.frame.sysnew.messageManageLogBack.entity.SysMessageManageLogBackEntity; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageLogBack/detail/dao/ISysMessageManageLogDetailBackDao.java b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/detail/dao/ISysMessageManageLogDetailBackDao.java similarity index 53% rename from service/src/main/java/com/hzya/frame/sys/messageManageLogBack/detail/dao/ISysMessageManageLogDetailBackDao.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/detail/dao/ISysMessageManageLogDetailBackDao.java index df9bfd41..7c71a559 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageLogBack/detail/dao/ISysMessageManageLogDetailBackDao.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/detail/dao/ISysMessageManageLogDetailBackDao.java @@ -1,8 +1,8 @@ -package com.hzya.frame.sys.messageManageLogBack.detail.dao; +package com.hzya.frame.sysnew.messageManageLogBack.detail.dao; import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.sys.messageManageLogBack.detail.entity.SysMessageManageLogDetailBackEntity; -import com.hzya.frame.sys.messageManageLogDetail.entity.SysMessageManageLogDetailEntity; +import com.hzya.frame.sysnew.messageManageLogDetail.entity.SysMessageManageLogDetailEntity; +import com.hzya.frame.sysnew.messageManageLogBack.detail.entity.SysMessageManageLogDetailBackEntity; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageLogBack/detail/dao/impl/SysMessageManageLogDetailBackDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/detail/dao/impl/SysMessageManageLogDetailBackDaoImpl.java similarity index 66% rename from service/src/main/java/com/hzya/frame/sys/messageManageLogBack/detail/dao/impl/SysMessageManageLogDetailBackDaoImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/detail/dao/impl/SysMessageManageLogDetailBackDaoImpl.java index a2d9e3fd..750d5592 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageLogBack/detail/dao/impl/SysMessageManageLogDetailBackDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/detail/dao/impl/SysMessageManageLogDetailBackDaoImpl.java @@ -1,9 +1,9 @@ -package com.hzya.frame.sys.messageManageLogBack.detail.dao.impl; +package com.hzya.frame.sysnew.messageManageLogBack.detail.dao.impl; import com.hzya.frame.basedao.dao.MybatisGenericDao; -import com.hzya.frame.sys.messageManageLogBack.detail.dao.ISysMessageManageLogDetailBackDao; -import com.hzya.frame.sys.messageManageLogBack.detail.entity.SysMessageManageLogDetailBackEntity; -import com.hzya.frame.sys.messageManageLogDetail.entity.SysMessageManageLogDetailEntity; +import com.hzya.frame.sysnew.messageManageLogDetail.entity.SysMessageManageLogDetailEntity; +import com.hzya.frame.sysnew.messageManageLogBack.detail.dao.ISysMessageManageLogDetailBackDao; +import com.hzya.frame.sysnew.messageManageLogBack.detail.entity.SysMessageManageLogDetailBackEntity; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageLogBack/detail/entity/SysMessageManageLogDetailBackEntity.java b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/detail/entity/SysMessageManageLogDetailBackEntity.java similarity index 95% rename from service/src/main/java/com/hzya/frame/sys/messageManageLogBack/detail/entity/SysMessageManageLogDetailBackEntity.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/detail/entity/SysMessageManageLogDetailBackEntity.java index ec0b6c2f..a1bccaa6 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageLogBack/detail/entity/SysMessageManageLogDetailBackEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/detail/entity/SysMessageManageLogDetailBackEntity.java @@ -1,6 +1,7 @@ -package com.hzya.frame.sys.messageManageLogBack.detail.entity; +package com.hzya.frame.sysnew.messageManageLogBack.detail.entity; import com.hzya.frame.web.entity.BaseEntity; + /** * * @content 消息管理日志明细备份(SysMessageManageLogDetail)实体类 diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageLogBack/detail/entity/SysMessageManageLogDetailBackEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/detail/entity/SysMessageManageLogDetailBackEntity.xml similarity index 94% rename from service/src/main/java/com/hzya/frame/sys/messageManageLogBack/detail/entity/SysMessageManageLogDetailBackEntity.xml rename to service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/detail/entity/SysMessageManageLogDetailBackEntity.xml index 4a7cec84..d8200586 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageLogBack/detail/entity/SysMessageManageLogDetailBackEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/detail/entity/SysMessageManageLogDetailBackEntity.xml @@ -1,9 +1,9 @@ - + + type="com.hzya.frame.sysnew.messageManageLogBack.detail.entity.SysMessageManageLogDetailBackEntity"> @@ -34,7 +34,7 @@ + parameterType="com.hzya.frame.sysnew.messageManageLogBack.detail.entity.SysMessageManageLogDetailBackEntity"> select count(1) from sys_message_manage_log_detail_back and id = #{id} @@ -82,7 +82,7 @@ + parameterType="com.hzya.frame.sysnew.messageManageLogBack.detail.entity.SysMessageManageLogDetailBackEntity"> select from sys_message_manage_log_detail_back @@ -139,7 +139,7 @@ - insert into sys_message_manage_log_detail_back( diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageLogBack/detail/server/ISysMessageManageLogDetailBackService.java b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/detail/server/ISysMessageManageLogDetailBackService.java similarity index 59% rename from service/src/main/java/com/hzya/frame/sys/messageManageLogBack/detail/server/ISysMessageManageLogDetailBackService.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/detail/server/ISysMessageManageLogDetailBackService.java index e7e51524..f281490d 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageLogBack/detail/server/ISysMessageManageLogDetailBackService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/detail/server/ISysMessageManageLogDetailBackService.java @@ -1,9 +1,8 @@ -package com.hzya.frame.sys.messageManageLogBack.detail.server; +package com.hzya.frame.sysnew.messageManageLogBack.detail.server; import com.hzya.frame.basedao.service.IBaseService; -import com.hzya.frame.sys.messageManageLogBack.detail.entity.SysMessageManageLogDetailBackEntity; -import com.hzya.frame.sys.messageManageLogDetail.entity.SysMessageManageLogDetailEntity; -import com.hzya.frame.web.entity.JsonResultEntity; +import com.hzya.frame.sysnew.messageManageLogDetail.entity.SysMessageManageLogDetailEntity; +import com.hzya.frame.sysnew.messageManageLogBack.detail.entity.SysMessageManageLogDetailBackEntity; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageLogBack/detail/server/impl/SysMessageManageLogDetailBackServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/detail/server/impl/SysMessageManageLogDetailBackServiceImpl.java similarity index 65% rename from service/src/main/java/com/hzya/frame/sys/messageManageLogBack/detail/server/impl/SysMessageManageLogDetailBackServiceImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/detail/server/impl/SysMessageManageLogDetailBackServiceImpl.java index f2c654af..6cbd6109 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageLogBack/detail/server/impl/SysMessageManageLogDetailBackServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/detail/server/impl/SysMessageManageLogDetailBackServiceImpl.java @@ -1,14 +1,11 @@ -package com.hzya.frame.sys.messageManageLogBack.detail.server.impl; +package com.hzya.frame.sysnew.messageManageLogBack.detail.server.impl; import cn.hutool.core.collection.CollUtil; import com.hzya.frame.basedao.service.impl.BaseService; -import com.hzya.frame.sys.messageManageLogBack.detail.dao.ISysMessageManageLogDetailBackDao; -import com.hzya.frame.sys.messageManageLogBack.detail.entity.SysMessageManageLogDetailBackEntity; -import com.hzya.frame.sys.messageManageLogBack.detail.server.ISysMessageManageLogDetailBackService; -import com.hzya.frame.sys.messageManageLogDetail.dao.ISysMessageManageLogDetailDao; -import com.hzya.frame.sys.messageManageLogDetail.entity.SysMessageManageLogDetailEntity; -import com.hzya.frame.sys.messageManageLogDetail.service.ISysMessageManageLogDetailService; -import com.hzya.frame.web.entity.JsonResultEntity; +import com.hzya.frame.sysnew.messageManageLogDetail.entity.SysMessageManageLogDetailEntity; +import com.hzya.frame.sysnew.messageManageLogBack.detail.dao.ISysMessageManageLogDetailBackDao; +import com.hzya.frame.sysnew.messageManageLogBack.detail.entity.SysMessageManageLogDetailBackEntity; +import com.hzya.frame.sysnew.messageManageLogBack.detail.server.ISysMessageManageLogDetailBackService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageLogBack/entity/SysMessageManageLogBackEntity.java b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/entity/SysMessageManageLogBackEntity.java similarity index 98% rename from service/src/main/java/com/hzya/frame/sys/messageManageLogBack/entity/SysMessageManageLogBackEntity.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/entity/SysMessageManageLogBackEntity.java index 07703451..82a75f2e 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageLogBack/entity/SysMessageManageLogBackEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/entity/SysMessageManageLogBackEntity.java @@ -1,4 +1,4 @@ -package com.hzya.frame.sys.messageManageLogBack.entity; +package com.hzya.frame.sysnew.messageManageLogBack.entity; import com.hzya.frame.web.entity.BaseEntity; diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageLogBack/entity/SysMessageManageLogBackEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/entity/SysMessageManageLogBackEntity.xml similarity index 96% rename from service/src/main/java/com/hzya/frame/sys/messageManageLogBack/entity/SysMessageManageLogBackEntity.xml rename to service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/entity/SysMessageManageLogBackEntity.xml index 6a9a3b4c..4bd5ff28 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageLogBack/entity/SysMessageManageLogBackEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/entity/SysMessageManageLogBackEntity.xml @@ -1,9 +1,9 @@ - + + type="com.hzya.frame.sysnew.messageManageLogBack.entity.SysMessageManageLogBackEntity"> @@ -56,7 +56,7 @@ + parameterType="com.hzya.frame.sysnew.messageManageLogBack.entity.SysMessageManageLogBackEntity"> select count(1) from sys_message_manage_log_back and id = #{id} @@ -126,7 +126,7 @@ + + parameterType="com.hzya.frame.sysnew.messageManageLogBack.entity.SysMessageManageLogBackEntity"> select from sys_message_manage_log_back @@ -272,7 +272,7 @@ - insert into sys_message_manage_log_back( @@ -378,7 +378,7 @@ org_id = values(org_id) - + update sys_message_manage_log_back set message_manage_id = #{messageManageId}, @@ -408,13 +408,13 @@ + parameterType="com.hzya.frame.sysnew.messageManageLogBack.entity.SysMessageManageLogBackEntity"> update sys_message_manage_log_back set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} + parameterType="com.hzya.frame.sysnew.messageManageLogBack.entity.SysMessageManageLogBackEntity"> update sys_message_manage_log_back set sts= 'N',modify_time = #{modify_time},modify_user_id = #{modify_user_id} and id = #{id} @@ -446,8 +446,8 @@ where id = #{id} delete from sys_message_manage_log_back where id = #{id} - SELECT a.id AS id, a.message_manage_id AS messageManageId, diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageLogBack/service/ISysMessageManageLogBackService.java b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/service/ISysMessageManageLogBackService.java similarity index 61% rename from service/src/main/java/com/hzya/frame/sys/messageManageLogBack/service/ISysMessageManageLogBackService.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/service/ISysMessageManageLogBackService.java index 28b11ff0..39e0acac 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageLogBack/service/ISysMessageManageLogBackService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/service/ISysMessageManageLogBackService.java @@ -1,9 +1,8 @@ -package com.hzya.frame.sys.messageManageLogBack.service; +package com.hzya.frame.sysnew.messageManageLogBack.service; import com.hzya.frame.basedao.service.IBaseService; -import com.hzya.frame.sys.messageManageLog.entity.SysMessageManageLogEntity; -import com.hzya.frame.sys.messageManageLogBack.entity.SysMessageManageLogBackEntity; -import com.hzya.frame.web.entity.JsonResultEntity; +import com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogEntity; +import com.hzya.frame.sysnew.messageManageLogBack.entity.SysMessageManageLogBackEntity; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageLogBack/service/impl/SysMessageManageLogBackServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/service/impl/SysMessageManageLogBackServiceImpl.java similarity index 67% rename from service/src/main/java/com/hzya/frame/sys/messageManageLogBack/service/impl/SysMessageManageLogBackServiceImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/service/impl/SysMessageManageLogBackServiceImpl.java index 0c246cc8..57fd030a 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageLogBack/service/impl/SysMessageManageLogBackServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogBack/service/impl/SysMessageManageLogBackServiceImpl.java @@ -1,17 +1,11 @@ -package com.hzya.frame.sys.messageManageLogBack.service.impl; +package com.hzya.frame.sysnew.messageManageLogBack.service.impl; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; import com.hzya.frame.basedao.service.impl.BaseService; -import com.hzya.frame.sys.messageManageLog.entity.SysMessageManageLogEntity; -import com.hzya.frame.sys.messageManageLogBack.dao.ISysMessageManageLogBackDao; -import com.hzya.frame.sys.messageManageLogBack.entity.SysMessageManageLogBackEntity; -import com.hzya.frame.sys.messageManageLogBack.service.ISysMessageManageLogBackService; -import com.hzya.frame.web.entity.BaseResult; -import com.hzya.frame.web.entity.JsonResultEntity; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; +import com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogEntity; +import com.hzya.frame.sysnew.messageManageLogBack.dao.ISysMessageManageLogBackDao; +import com.hzya.frame.sysnew.messageManageLogBack.entity.SysMessageManageLogBackEntity; +import com.hzya.frame.sysnew.messageManageLogBack.service.ISysMessageManageLogBackService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageLogDetail/dao/ISysMessageManageLogDetailDao.java b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogDetail/dao/ISysMessageManageLogDetailDao.java similarity index 81% rename from service/src/main/java/com/hzya/frame/sys/messageManageLogDetail/dao/ISysMessageManageLogDetailDao.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManageLogDetail/dao/ISysMessageManageLogDetailDao.java index dfac04db..24d9f11c 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageLogDetail/dao/ISysMessageManageLogDetailDao.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogDetail/dao/ISysMessageManageLogDetailDao.java @@ -1,8 +1,7 @@ -package com.hzya.frame.sys.messageManageLogDetail.dao; +package com.hzya.frame.sysnew.messageManageLogDetail.dao; import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.sys.messageManageLog.entity.SysMessageManageLogEntity; -import com.hzya.frame.sys.messageManageLogDetail.entity.SysMessageManageLogDetailEntity; +import com.hzya.frame.sysnew.messageManageLogDetail.entity.SysMessageManageLogDetailEntity; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageLogDetail/dao/impl/SysMessageManageLogDetailDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogDetail/dao/impl/SysMessageManageLogDetailDaoImpl.java similarity index 83% rename from service/src/main/java/com/hzya/frame/sys/messageManageLogDetail/dao/impl/SysMessageManageLogDetailDaoImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManageLogDetail/dao/impl/SysMessageManageLogDetailDaoImpl.java index dfccd269..b88d6cae 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageLogDetail/dao/impl/SysMessageManageLogDetailDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogDetail/dao/impl/SysMessageManageLogDetailDaoImpl.java @@ -1,8 +1,8 @@ -package com.hzya.frame.sys.messageManageLogDetail.dao.impl; +package com.hzya.frame.sysnew.messageManageLogDetail.dao.impl; import com.hzya.frame.basedao.dao.MybatisGenericDao; -import com.hzya.frame.sys.messageManageLogDetail.dao.ISysMessageManageLogDetailDao; -import com.hzya.frame.sys.messageManageLogDetail.entity.SysMessageManageLogDetailEntity; +import com.hzya.frame.sysnew.messageManageLogDetail.dao.ISysMessageManageLogDetailDao; +import com.hzya.frame.sysnew.messageManageLogDetail.entity.SysMessageManageLogDetailEntity; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageLogDetail/entity/SysMessageManageLogDetailEntity.java b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogDetail/entity/SysMessageManageLogDetailEntity.java similarity index 95% rename from service/src/main/java/com/hzya/frame/sys/messageManageLogDetail/entity/SysMessageManageLogDetailEntity.java rename to service/src/main/java/com/hzya/frame/sysnew/messageManageLogDetail/entity/SysMessageManageLogDetailEntity.java index 8e4118c4..08a67614 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageLogDetail/entity/SysMessageManageLogDetailEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogDetail/entity/SysMessageManageLogDetailEntity.java @@ -1,6 +1,7 @@ -package com.hzya.frame.sys.messageManageLogDetail.entity; +package com.hzya.frame.sysnew.messageManageLogDetail.entity; import com.hzya.frame.web.entity.BaseEntity; + /** * * @content 消息管理日志明细(SysMessageManageLogDetail)实体类 diff --git a/service/src/main/java/com/hzya/frame/sys/messageManageLogDetail/entity/SysMessageManageLogDetailEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogDetail/entity/SysMessageManageLogDetailEntity.xml similarity index 92% rename from service/src/main/java/com/hzya/frame/sys/messageManageLogDetail/entity/SysMessageManageLogDetailEntity.xml rename to service/src/main/java/com/hzya/frame/sysnew/messageManageLogDetail/entity/SysMessageManageLogDetailEntity.xml index 72e46541..c12fe5ed 100644 --- a/service/src/main/java/com/hzya/frame/sys/messageManageLogDetail/entity/SysMessageManageLogDetailEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/messageManageLogDetail/entity/SysMessageManageLogDetailEntity.xml @@ -1,9 +1,9 @@ - + + type="com.hzya.frame.sysnew.messageManageLogDetail.entity.SysMessageManageLogDetailEntity"> @@ -34,7 +34,7 @@ + parameterType="com.hzya.frame.sysnew.messageManageLogDetail.entity.SysMessageManageLogDetailEntity"> select count(1) from sys_message_manage_log_detail and id = #{id} @@ -82,7 +82,7 @@ + parameterType="com.hzya.frame.sysnew.messageManageLogDetail.entity.SysMessageManageLogDetailEntity"> select from sys_message_manage_log_detail @@ -139,7 +139,7 @@ - insert into sys_message_manage_log_detail( @@ -214,7 +214,7 @@ + - select count(1) from sys_plug_arg and id = #{id} @@ -78,7 +78,7 @@ - select from sys_plug_arg @@ -107,7 +107,7 @@ from sys_plug_arg where id = #{ id } and sts='Y' - select from sys_plug_arg @@ -131,7 +131,7 @@ - + insert into sys_plug_arg( id , @@ -197,7 +197,7 @@ sts = values(sts), org_id = values(org_id) - + update sys_plug_arg set id = #{id}, @@ -216,13 +216,13 @@ update sys_plug_arg set where id = #{id} - + update sys_plug_arg set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - + update sys_plug_arg set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} and id = #{id} diff --git a/service/src/main/java/com/hzya/frame/sys/plugArg/service/ISysPlugArgService.java b/service/src/main/java/com/hzya/frame/sysnew/plugArg/service/ISysPlugArgService.java similarity index 94% rename from service/src/main/java/com/hzya/frame/sys/plugArg/service/ISysPlugArgService.java rename to service/src/main/java/com/hzya/frame/sysnew/plugArg/service/ISysPlugArgService.java index e0e10378..d311adbb 100644 --- a/service/src/main/java/com/hzya/frame/sys/plugArg/service/ISysPlugArgService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/plugArg/service/ISysPlugArgService.java @@ -1,8 +1,8 @@ -package com.hzya.frame.sys.plugArg.service; +package com.hzya.frame.sysnew.plugArg.service; import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.sys.plugArg.entity.SysPlugArgEntity; import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.sysnew.plugArg.entity.SysPlugArgEntity; import com.hzya.frame.web.entity.JsonResultEntity; /** diff --git a/service/src/main/java/com/hzya/frame/sys/plugArg/service/impl/SysPlugArgServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/plugArg/service/impl/SysPlugArgServiceImpl.java similarity index 92% rename from service/src/main/java/com/hzya/frame/sys/plugArg/service/impl/SysPlugArgServiceImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/plugArg/service/impl/SysPlugArgServiceImpl.java index 65f5f021..900cce7d 100644 --- a/service/src/main/java/com/hzya/frame/sys/plugArg/service/impl/SysPlugArgServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/plugArg/service/impl/SysPlugArgServiceImpl.java @@ -1,27 +1,19 @@ -package com.hzya.frame.sys.plugArg.service.impl; +package com.hzya.frame.sysnew.plugArg.service.impl; import cn.dev33.satoken.stp.StpUtil; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.hzya.frame.sys.application.entity.SysApplicationDto; -import com.hzya.frame.sys.application.entity.SysApplicationEntity; -import com.hzya.frame.sys.application.entity.SysApplicationVo; -import com.hzya.frame.sys.plugArg.entity.SysPlugArgEntity; -import com.hzya.frame.sys.plugArg.dao.ISysPlugArgDao; -import com.hzya.frame.sys.plugArg.service.ISysPlugArgService; -import com.hzya.frame.sys.plugArgDeatil.dao.ISysPlugArgDetailDao; -import com.hzya.frame.sys.plugArgDeatil.entity.SysPlugArgDetailEntity; -import com.hzya.frame.util.AESUtil; -import com.hzya.frame.uuid.UUIDUtils; +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.sysnew.plugArgDeatil.dao.ISysPlugArgDetailDao; +import com.hzya.frame.sysnew.plugArgDeatil.entity.SysPlugArgDetailEntity; +import com.hzya.frame.sysnew.plugArg.dao.ISysPlugArgDao; +import com.hzya.frame.sysnew.plugArg.entity.SysPlugArgEntity; +import com.hzya.frame.sysnew.plugArg.service.ISysPlugArgService; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; -import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; - -import javax.annotation.Resource; - -import com.hzya.frame.basedao.service.impl.BaseService; +import org.springframework.stereotype.Service; import java.util.Date; import java.util.List; diff --git a/service/src/main/java/com/hzya/frame/sys/plugArgDeatil/dao/ISysPlugArgDetailDao.java b/service/src/main/java/com/hzya/frame/sysnew/plugArgDeatil/dao/ISysPlugArgDetailDao.java similarity index 57% rename from service/src/main/java/com/hzya/frame/sys/plugArgDeatil/dao/ISysPlugArgDetailDao.java rename to service/src/main/java/com/hzya/frame/sysnew/plugArgDeatil/dao/ISysPlugArgDetailDao.java index ae2243f4..41c5f374 100644 --- a/service/src/main/java/com/hzya/frame/sys/plugArgDeatil/dao/ISysPlugArgDetailDao.java +++ b/service/src/main/java/com/hzya/frame/sysnew/plugArgDeatil/dao/ISysPlugArgDetailDao.java @@ -1,7 +1,7 @@ -package com.hzya.frame.sys.plugArgDeatil.dao; +package com.hzya.frame.sysnew.plugArgDeatil.dao; -import com.hzya.frame.sys.plugArgDeatil.entity.SysPlugArgDetailEntity; -import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.sysnew.plugArgDeatil.entity.SysPlugArgDetailEntity; /** * 参数设置明细表(sys_plug_arg_detail: table)表数据库访问层 diff --git a/service/src/main/java/com/hzya/frame/sys/plugArgDeatil/dao/impl/SysPlugArgDetailDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/plugArgDeatil/dao/impl/SysPlugArgDetailDaoImpl.java similarity index 56% rename from service/src/main/java/com/hzya/frame/sys/plugArgDeatil/dao/impl/SysPlugArgDetailDaoImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/plugArgDeatil/dao/impl/SysPlugArgDetailDaoImpl.java index cdf2f33e..521bb589 100644 --- a/service/src/main/java/com/hzya/frame/sys/plugArgDeatil/dao/impl/SysPlugArgDetailDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/plugArgDeatil/dao/impl/SysPlugArgDetailDaoImpl.java @@ -1,9 +1,10 @@ -package com.hzya.frame.sys.plugArgDeatil.dao.impl; +package com.hzya.frame.sysnew.plugArgDeatil.dao.impl; -import com.hzya.frame.sys.plugArgDeatil.entity.SysPlugArgDetailEntity; -import com.hzya.frame.sys.plugArgDeatil.dao.ISysPlugArgDetailDao; -import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.sysnew.plugArgDeatil.dao.ISysPlugArgDetailDao; +import com.hzya.frame.sysnew.plugArgDeatil.entity.SysPlugArgDetailEntity; +import org.springframework.stereotype.Repository; + /** * 参数设置明细表(SysPlugArgDetail)表数据库访问层 * @@ -11,7 +12,7 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao; * @since 2024-03-18 14:33:25 */ @Repository(value = "SysPlugArgDetailDaoImpl") -public class SysPlugArgDetailDaoImpl extends MybatisGenericDao implements ISysPlugArgDetailDao{ +public class SysPlugArgDetailDaoImpl extends MybatisGenericDao implements ISysPlugArgDetailDao { } diff --git a/service/src/main/java/com/hzya/frame/sys/plugArgDeatil/entity/SysPlugArgDetailEntity.java b/service/src/main/java/com/hzya/frame/sysnew/plugArgDeatil/entity/SysPlugArgDetailEntity.java similarity index 94% rename from service/src/main/java/com/hzya/frame/sys/plugArgDeatil/entity/SysPlugArgDetailEntity.java rename to service/src/main/java/com/hzya/frame/sysnew/plugArgDeatil/entity/SysPlugArgDetailEntity.java index 6ba0155c..451c26b9 100644 --- a/service/src/main/java/com/hzya/frame/sys/plugArgDeatil/entity/SysPlugArgDetailEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/plugArgDeatil/entity/SysPlugArgDetailEntity.java @@ -1,11 +1,11 @@ -package com.hzya.frame.sys.plugArgDeatil.entity; +package com.hzya.frame.sysnew.plugArgDeatil.entity; + +import cn.dev33.satoken.stp.StpUtil; +import com.hzya.frame.uuid.UUIDUtils; +import com.hzya.frame.web.entity.BaseEntity; import java.util.Date; -import cn.dev33.satoken.stp.StpUtil; -import com.hzya.frame.sys.plugArg.entity.SysPlugArgEntity; -import com.hzya.frame.uuid.UUIDUtils; -import com.hzya.frame.web.entity.BaseEntity; /** * 参数设置明细表(SysPlugArgDetail)实体类 * diff --git a/service/src/main/java/com/hzya/frame/sys/plugArgDeatil/entity/SysPlugArgDetailEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/plugArgDeatil/entity/SysPlugArgDetailEntity.xml similarity index 94% rename from service/src/main/java/com/hzya/frame/sys/plugArgDeatil/entity/SysPlugArgDetailEntity.xml rename to service/src/main/java/com/hzya/frame/sysnew/plugArgDeatil/entity/SysPlugArgDetailEntity.xml index 7d462d47..49543da7 100644 --- a/service/src/main/java/com/hzya/frame/sys/plugArgDeatil/entity/SysPlugArgDetailEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/plugArgDeatil/entity/SysPlugArgDetailEntity.xml @@ -1,9 +1,9 @@ - + + type="com.hzya.frame.sysnew.plugArgDeatil.entity.SysPlugArgDetailEntity"> @@ -36,7 +36,7 @@ + parameterType="com.hzya.frame.sysnew.plugArgDeatil.entity.SysPlugArgDetailEntity"> select count(1) from sys_plug_arg_detail and id = #{id} @@ -86,7 +86,7 @@ + parameterType="com.hzya.frame.sysnew.plugArgDeatil.entity.SysPlugArgDetailEntity"> select from sys_plug_arg_detail @@ -141,7 +141,7 @@ - insert into sys_plug_arg_detail( @@ -216,7 +216,7 @@ org_id = values(org_id) - + update sys_plug_arg_detail set formmain_id = #{formmainId}, @@ -235,13 +235,13 @@ where id = #{id} - + update sys_plug_arg_detail set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} + parameterType="com.hzya.frame.sysnew.plugArgDeatil.entity.SysPlugArgDetailEntity"> update sys_plug_arg_detail set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} and id = #{id} diff --git a/service/src/main/java/com/hzya/frame/sys/plugArgDeatil/service/ISysPlugArgDetailService.java b/service/src/main/java/com/hzya/frame/sysnew/plugArgDeatil/service/ISysPlugArgDetailService.java similarity index 67% rename from service/src/main/java/com/hzya/frame/sys/plugArgDeatil/service/ISysPlugArgDetailService.java rename to service/src/main/java/com/hzya/frame/sysnew/plugArgDeatil/service/ISysPlugArgDetailService.java index 6121a46f..9e8defe1 100644 --- a/service/src/main/java/com/hzya/frame/sys/plugArgDeatil/service/ISysPlugArgDetailService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/plugArgDeatil/service/ISysPlugArgDetailService.java @@ -1,7 +1,8 @@ -package com.hzya.frame.sys.plugArgDeatil.service; +package com.hzya.frame.sysnew.plugArgDeatil.service; -import com.hzya.frame.sys.plugArgDeatil.entity.SysPlugArgDetailEntity; import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.sysnew.plugArgDeatil.entity.SysPlugArgDetailEntity; + /** * 参数设置明细表(SysPlugArgDetail)表服务接口 * diff --git a/service/src/main/java/com/hzya/frame/sys/plugArgDeatil/service/impl/SysPlugArgDetailServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/plugArgDeatil/service/impl/SysPlugArgDetailServiceImpl.java similarity index 63% rename from service/src/main/java/com/hzya/frame/sys/plugArgDeatil/service/impl/SysPlugArgDetailServiceImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/plugArgDeatil/service/impl/SysPlugArgDetailServiceImpl.java index c52402a9..ccd7262d 100644 --- a/service/src/main/java/com/hzya/frame/sys/plugArgDeatil/service/impl/SysPlugArgDetailServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/plugArgDeatil/service/impl/SysPlugArgDetailServiceImpl.java @@ -1,12 +1,12 @@ -package com.hzya.frame.sys.plugArgDeatil.service.impl; +package com.hzya.frame.sysnew.plugArgDeatil.service.impl; -import com.hzya.frame.sys.plugArgDeatil.entity.SysPlugArgDetailEntity; -import com.hzya.frame.sys.plugArgDeatil.dao.ISysPlugArgDetailDao; -import com.hzya.frame.sys.plugArgDeatil.service.ISysPlugArgDetailService; -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.Resource; import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.sysnew.plugArgDeatil.dao.ISysPlugArgDetailDao; +import com.hzya.frame.sysnew.plugArgDeatil.entity.SysPlugArgDetailEntity; +import com.hzya.frame.sysnew.plugArgDeatil.service.ISysPlugArgDetailService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + /** * 参数设置明细表(SysPlugArgDetail)表服务实现类 * diff --git a/service/src/main/java/com/hzya/frame/sys/plugin/service/IPluginService.java b/service/src/main/java/com/hzya/frame/sysnew/plugin/service/IPluginService.java similarity index 90% rename from service/src/main/java/com/hzya/frame/sys/plugin/service/IPluginService.java rename to service/src/main/java/com/hzya/frame/sysnew/plugin/service/IPluginService.java index db2e02ac..361f439c 100644 --- a/service/src/main/java/com/hzya/frame/sys/plugin/service/IPluginService.java +++ b/service/src/main/java/com/hzya/frame/sysnew/plugin/service/IPluginService.java @@ -1,4 +1,4 @@ -package com.hzya.frame.sys.plugin.service; +package com.hzya.frame.sysnew.plugin.service; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.web.entity.JsonResultEntity; @@ -19,7 +19,7 @@ public interface IPluginService { JsonResultEntity queryPlugins(JSONObject jsonObject); /*** - * 查询所有插件数据 + * 根据插件类型查询插件数据 * @Author 👻👻👻👻👻👻👻👻 gjh * @Date 2023-08-07 10:12 * @param jsonObject @@ -28,7 +28,7 @@ public interface IPluginService { JsonResultEntity queryPluginsByType(JSONObject jsonObject); /*** - * 查询所有插件数据 + * 根据插件ID查询插件数据 * @Author 👻👻👻👻👻👻👻👻 gjh * @Date 2023-08-07 10:12 * @param jsonObject diff --git a/service/src/main/java/com/hzya/frame/sys/plugin/service/impl/PluginServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/plugin/service/impl/PluginServiceImpl.java similarity index 94% rename from service/src/main/java/com/hzya/frame/sys/plugin/service/impl/PluginServiceImpl.java rename to service/src/main/java/com/hzya/frame/sysnew/plugin/service/impl/PluginServiceImpl.java index f9fede60..2aba127f 100644 --- a/service/src/main/java/com/hzya/frame/sys/plugin/service/impl/PluginServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/plugin/service/impl/PluginServiceImpl.java @@ -1,12 +1,10 @@ -package com.hzya.frame.sys.plugin.service.impl; +package com.hzya.frame.sysnew.plugin.service.impl; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.base.PluginBaseEntity; import com.hzya.frame.base.PluginBaseEntityVo; -import com.hzya.frame.base.SystemPluginInitializer; -import com.hzya.frame.stringutil.StringUtil; -import com.hzya.frame.sys.plugin.service.IPluginService; +import com.hzya.frame.sysnew.plugin.service.IPluginService; import com.hzya.frame.util.PluginUtils; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; @@ -57,7 +55,6 @@ public class PluginServiceImpl implements IPluginService { pluginBaseEntityVo.setPluginLabel(list.get(i).getPluginLabel()); pluginBaseEntityVo.setPluginType(list.get(i).getPluginType()); voList.add(pluginBaseEntityVo); - //System.out.println("插件名称：" + list.get(i).getPluginName()); } } return BaseResult.getSuccessMessageEntity(voList); diff --git a/service/src/main/java/com/hzya/frame/sysnew/popedomInterface/service/impl/InterfaceCache.java b/service/src/main/java/com/hzya/frame/sysnew/popedomInterface/service/impl/InterfaceCache.java index 914a656c..913fb44f 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/popedomInterface/service/impl/InterfaceCache.java +++ b/service/src/main/java/com/hzya/frame/sysnew/popedomInterface/service/impl/InterfaceCache.java @@ -1,13 +1,13 @@ package com.hzya.frame.sysnew.popedomInterface.service.impl; -import com.hzya.frame.sys.application.api.dao.ISysApplicationApiDao; -import com.hzya.frame.sys.application.api.entity.SysApplicationApiEntity; -import com.hzya.frame.sys.application.apiAuth.dao.ISysApplicationApiAuthDao; -import com.hzya.frame.sys.application.apiAuth.entity.SysApplicationApiAuthEntity; -import com.hzya.frame.sys.application.apiAythDetail.dao.ISysApplicationApiAuthDetailDao; -import com.hzya.frame.sys.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity; -import com.hzya.frame.sys.application.dao.ISysApplicationDao; -import com.hzya.frame.sys.application.entity.SysApplicationEntity; +import com.hzya.frame.sysnew.application.api.dao.ISysApplicationApiDao; +import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity; +import com.hzya.frame.sysnew.application.apiAuth.dao.ISysApplicationApiAuthDao; +import com.hzya.frame.sysnew.application.apiAuth.entity.SysApplicationApiAuthEntity; +import com.hzya.frame.sysnew.application.apiAythDetail.dao.ISysApplicationApiAuthDetailDao; +import com.hzya.frame.sysnew.application.apiAythDetail.entity.SysApplicationApiAuthDetailEntity; +import com.hzya.frame.sysnew.application.dao.ISysApplicationDao; +import com.hzya.frame.sysnew.application.entity.SysApplicationEntity; import com.hzya.frame.sysnew.popedomInterface.dao.ISysPopedomInterfaceDao; import com.hzya.frame.sysnew.popedomInterface.entity.SysPopedomInterfaceEntity; import com.hzya.frame.sysnew.role.dao.ISysRoleDao; diff --git a/service/src/main/java/com/hzya/frame/sysnew/user/service/impl/SysUserServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/user/service/impl/SysUserServiceImpl.java index 1511749f..3c5f37fc 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/user/service/impl/SysUserServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/user/service/impl/SysUserServiceImpl.java @@ -550,6 +550,7 @@ public class SysUserServiceImpl extends BaseService imple } interfaceCache.reloadData("4"); interfaceCache.reloadData("5"); + interfaceCache.reloadData("6"); return BaseResult.getSuccessMessageEntity("保存权限成功"); } diff --git a/webapp/src/main/java/com/hzya/frame/webapp/entrance/controler/EntranceController.java b/webapp/src/main/java/com/hzya/frame/webapp/entrance/controler/EntranceController.java index 22d2f211..cad48373 100644 --- a/webapp/src/main/java/com/hzya/frame/webapp/entrance/controler/EntranceController.java +++ b/webapp/src/main/java/com/hzya/frame/webapp/entrance/controler/EntranceController.java @@ -1,6 +1,6 @@ package com.hzya.frame.webapp.entrance.controler; -import com.hzya.frame.sys.application.service.ISysApplicationService; +import com.hzya.frame.sysnew.application.service.ISysApplicationService; import com.hzya.frame.sys.entity.EsbReturnEntity; import com.hzya.frame.sys.file.download.entity.FileDownloadEntity; import com.hzya.frame.sys.file.download.service.IFileDownloadService; diff --git a/webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java b/webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java index af390a4e..1fe2bf2c 100644 --- a/webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java +++ b/webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java @@ -96,7 +96,7 @@ public class EntranceServiceImpl implements IEntranceService { SysInterfaceEntity sysInterfaceEntity = (SysInterfaceEntity) interfaceCache.get("6","beanName"+service+"interfacName"+serviceMethod); if(sysInterfaceEntity == null || sysInterfaceEntity.getId() == null){ //todo 接口权限验证 - //return BaseResult.getFailureMessageEntity("用户无访问权限，请联系管理员"); + return BaseResult.getFailureMessageEntity("用户无访问权限，请联系管理员"); } //查询用户权限 if(!flag){ @@ -122,7 +122,7 @@ public class EntranceServiceImpl implements IEntranceService { } if(!flag){ //todo 接口权限验证 - //return BaseResult.getFailureMessageEntity("用户无访问权限，请联系管理员"); + return BaseResult.getFailureMessageEntity("用户无访问权限，请联系管理员"); } } catch (NotLoginException e) { logger.error("token无效"); diff --git a/webapp/src/main/java/com/hzya/frame/webapp/web/listener/InitCommandLineRunner.java b/webapp/src/main/java/com/hzya/frame/webapp/web/listener/InitCommandLineRunner.java index 1d747412..81fc5f3a 100644 --- a/webapp/src/main/java/com/hzya/frame/webapp/web/listener/InitCommandLineRunner.java +++ b/webapp/src/main/java/com/hzya/frame/webapp/web/listener/InitCommandLineRunner.java @@ -3,7 +3,7 @@ package com.hzya.frame.webapp.web.listener; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.hzya.frame.base.PluginBaseEntity; -import com.hzya.frame.sys.application.service.impl.ApplicationCache; +import com.hzya.frame.sysnew.application.service.impl.ApplicationCache; import com.hzya.frame.sysnew.popedomInterface.service.impl.InterfaceCache; import com.hzya.frame.util.PluginUtils; import com.hzya.frame.web.action.ApplicationContextUtil; @@ -12,7 +12,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.ApplicationListener; -import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; import javax.annotation.Resource;