diff --git a/pom.xml b/pom.xml index 2d66715..481f85e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ 4.0.0 com.zcloud - integrated_whb_admin + integrated_mini_admin 0.0.1-SNAPSHOT war - integrated_whb_admin - integrated_whb_admin for Spring Boot + integrated_mini_admin + integrated_mini_admin for Spring Boot org.springframework.boot @@ -535,7 +535,7 @@ --> - integrated_whb_admin + integrated_mini_admin org.springframework.boot diff --git a/src/main/java/com/zcloud/FHmainApplication.java b/src/main/java/com/zcloud/AdminApplication.java similarity index 79% rename from src/main/java/com/zcloud/FHmainApplication.java rename to src/main/java/com/zcloud/AdminApplication.java index ade21f2..5f29b1b 100644 --- a/src/main/java/com/zcloud/FHmainApplication.java +++ b/src/main/java/com/zcloud/AdminApplication.java @@ -8,17 +8,17 @@ import org.springframework.cache.annotation.EnableCaching; import org.springframework.scheduling.annotation.EnableScheduling; /** - * 说明：启动类 + * 说明：启动类 * 作者：luoxiaobao * 官网：www.qdkjchina.com */ -@SpringBootApplication//去除冲突 +@SpringBootApplication//去除冲突 @MapperScan("com.zcloud.mapper") @EnableCaching @EnableScheduling // 2.开启定时任务 -public class FHmainApplication { +public class AdminApplication { public static void main(String[] args) { - SpringApplication.run(FHmainApplication.class, args); + SpringApplication.run(AdminApplication.class, args); } -} \ No newline at end of file +} diff --git a/src/main/java/com/zcloud/SpringBootStartApplication.java b/src/main/java/com/zcloud/SpringBootStartApplication.java index 1cffc08..7333eb7 100644 --- a/src/main/java/com/zcloud/SpringBootStartApplication.java +++ b/src/main/java/com/zcloud/SpringBootStartApplication.java @@ -9,9 +9,9 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer * 官网：www.qdkjchina.com */ public class SpringBootStartApplication extends SpringBootServletInitializer { - + @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { - return builder.sources(FHmainApplication.class); //这里要指向原先用main方法执行的FHmainApplication启动类 + return builder.sources(AdminApplication.class); //这里要指向原先用main方法执行的FHmainApplication启动类 } -} \ No newline at end of file +} diff --git a/src/main/java/com/zcloud/controller/aiwarnning/AppVerificationController.java b/src/main/java/com/zcloud/controller/aiwarnning/AppVerificationController.java index 6b54aab..c2d42c6 100644 --- a/src/main/java/com/zcloud/controller/aiwarnning/AppVerificationController.java +++ b/src/main/java/com/zcloud/controller/aiwarnning/AppVerificationController.java @@ -2,10 +2,9 @@ package com.zcloud.controller.aiwarnning; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.register.QyRegisterMapper; +import com.zcloud.mapper.dsno2.register.QyRegisterMapper; import com.zcloud.util.Base64Utils; import com.zcloud.util.ReturnMap; -import com.zcloud.util.UuidUtil; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; diff --git a/src/main/java/com/zcloud/mapper/dsno2/agency/AgentNumberMapper.java b/src/main/java/com/zcloud/mapper/dsno1/agency/AgentNumberMapper.java similarity index 97% rename from src/main/java/com/zcloud/mapper/dsno2/agency/AgentNumberMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/agency/AgentNumberMapper.java index 666c265..1f2fae0 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/agency/AgentNumberMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/agency/AgentNumberMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.agency; +package com.zcloud.mapper.dsno1.agency; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/alarm/DBAlarmMapper.java b/src/main/java/com/zcloud/mapper/dsno1/alarm/DBAlarmMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno2/alarm/DBAlarmMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/alarm/DBAlarmMapper.java index 9e6a0be..fb9d1a8 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/alarm/DBAlarmMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/alarm/DBAlarmMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.alarm; +package com.zcloud.mapper.dsno1.alarm; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/alarm/DeviceCorpMapper.java b/src/main/java/com/zcloud/mapper/dsno1/alarm/DeviceCorpMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno2/alarm/DeviceCorpMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/alarm/DeviceCorpMapper.java index 9068511..612619b 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/alarm/DeviceCorpMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/alarm/DeviceCorpMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.alarm; +package com.zcloud.mapper.dsno1.alarm; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno2/api/EducationApiMapper.java b/src/main/java/com/zcloud/mapper/dsno1/api/EducationApiMapper.java similarity index 93% rename from src/main/java/com/zcloud/mapper/dsno2/api/EducationApiMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/api/EducationApiMapper.java index c6c5368..f37b102 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/api/EducationApiMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/api/EducationApiMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.api; +package com.zcloud.mapper.dsno1.api; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/api/OtherApiMapper.java b/src/main/java/com/zcloud/mapper/dsno1/api/OtherApiMapper.java similarity index 88% rename from src/main/java/com/zcloud/mapper/dsno2/api/OtherApiMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/api/OtherApiMapper.java index 025f2d7..e96e92b 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/api/OtherApiMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/api/OtherApiMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.api; +package com.zcloud.mapper.dsno1.api; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/api/PreventionApiMapper.java b/src/main/java/com/zcloud/mapper/dsno1/api/PreventionApiMapper.java similarity index 98% rename from src/main/java/com/zcloud/mapper/dsno2/api/PreventionApiMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/api/PreventionApiMapper.java index 90082fc..ae8a79b 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/api/PreventionApiMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/api/PreventionApiMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.api; +package com.zcloud.mapper.dsno1.api; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/billing/BillingManageMapper.java b/src/main/java/com/zcloud/mapper/dsno1/billing/BillingManageMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno2/billing/BillingManageMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/billing/BillingManageMapper.java index bf3d4ce..646450f 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/billing/BillingManageMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/billing/BillingManageMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.billing; +package com.zcloud.mapper.dsno1.billing; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno2/check/CheckRecordMapper.java b/src/main/java/com/zcloud/mapper/dsno1/check/CheckRecordMapper.java similarity index 98% rename from src/main/java/com/zcloud/mapper/dsno2/check/CheckRecordMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/check/CheckRecordMapper.java index b489c5d..782bda6 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/check/CheckRecordMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/check/CheckRecordMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.check; +package com.zcloud.mapper.dsno1.check; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno2/check/CheckUserMapper.java b/src/main/java/com/zcloud/mapper/dsno1/check/CheckUserMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno2/check/CheckUserMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/check/CheckUserMapper.java index 54a5de5..6bf4b54 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/check/CheckUserMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/check/CheckUserMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.check; +package com.zcloud.mapper.dsno1.check; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno2/check/ListStatisticsMapper.java b/src/main/java/com/zcloud/mapper/dsno1/check/ListStatisticsMapper.java similarity index 97% rename from src/main/java/com/zcloud/mapper/dsno2/check/ListStatisticsMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/check/ListStatisticsMapper.java index 0e3620d..9f9d2cb 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/check/ListStatisticsMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/check/ListStatisticsMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.check; +package com.zcloud.mapper.dsno1.check; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno2/check/RecordItemMapper.java b/src/main/java/com/zcloud/mapper/dsno1/check/RecordItemMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno2/check/RecordItemMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/check/RecordItemMapper.java index 9ec40d7..decc671 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/check/RecordItemMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/check/RecordItemMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.check; +package com.zcloud.mapper.dsno1.check; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno2/corp/AllWorkItemMapper.java b/src/main/java/com/zcloud/mapper/dsno1/corp/AllWorkItemMapper.java similarity index 97% rename from src/main/java/com/zcloud/mapper/dsno2/corp/AllWorkItemMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/corp/AllWorkItemMapper.java index ee1225c..46ed3db 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/corp/AllWorkItemMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/corp/AllWorkItemMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.corp; +package com.zcloud.mapper.dsno1.corp; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/corp/CorpFuncMapper.java b/src/main/java/com/zcloud/mapper/dsno1/corp/CorpFuncMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno2/corp/CorpFuncMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/corp/CorpFuncMapper.java index e689639..3fdc221 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/corp/CorpFuncMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/corp/CorpFuncMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.corp; +package com.zcloud.mapper.dsno1.corp; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno2/corp/CorpInfo2Mapper.java b/src/main/java/com/zcloud/mapper/dsno1/corp/CorpInfo2Mapper.java similarity index 89% rename from src/main/java/com/zcloud/mapper/dsno2/corp/CorpInfo2Mapper.java rename to src/main/java/com/zcloud/mapper/dsno1/corp/CorpInfo2Mapper.java index 56a032d..4f832ed 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/corp/CorpInfo2Mapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/corp/CorpInfo2Mapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.corp; +package com.zcloud.mapper.dsno1.corp; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/corp/CorpInfoMapper.java b/src/main/java/com/zcloud/mapper/dsno1/corp/CorpInfoMapper.java similarity index 99% rename from src/main/java/com/zcloud/mapper/dsno2/corp/CorpInfoMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/corp/CorpInfoMapper.java index f083b55..0549253 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/corp/CorpInfoMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/corp/CorpInfoMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.corp; +package com.zcloud.mapper.dsno1.corp; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno2/corp/CorpPlsInfoMapper.java b/src/main/java/com/zcloud/mapper/dsno1/corp/CorpPlsInfoMapper.java similarity index 93% rename from src/main/java/com/zcloud/mapper/dsno2/corp/CorpPlsInfoMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/corp/CorpPlsInfoMapper.java index 19e83a3..4ecf3b1 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/corp/CorpPlsInfoMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/corp/CorpPlsInfoMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.corp; +package com.zcloud.mapper.dsno1.corp; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/corp/CorpScoreMapper.java b/src/main/java/com/zcloud/mapper/dsno1/corp/CorpScoreMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno2/corp/CorpScoreMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/corp/CorpScoreMapper.java index f9e46fa..31f81fc 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/corp/CorpScoreMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/corp/CorpScoreMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.corp; +package com.zcloud.mapper.dsno1.corp; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/corp/CorpTimeMapper.java b/src/main/java/com/zcloud/mapper/dsno1/corp/CorpTimeMapper.java similarity index 97% rename from src/main/java/com/zcloud/mapper/dsno2/corp/CorpTimeMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/corp/CorpTimeMapper.java index d9f34c1..7bff51e 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/corp/CorpTimeMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/corp/CorpTimeMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.corp; +package com.zcloud.mapper.dsno1.corp; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno2/corp/CorpTypeMapper.java b/src/main/java/com/zcloud/mapper/dsno1/corp/CorpTypeMapper.java similarity index 97% rename from src/main/java/com/zcloud/mapper/dsno2/corp/CorpTypeMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/corp/CorpTypeMapper.java index 9b4fc69..36b7470 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/corp/CorpTypeMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/corp/CorpTypeMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.corp; +package com.zcloud.mapper.dsno1.corp; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno2/corp/CorpTypeToDeptMapper.java b/src/main/java/com/zcloud/mapper/dsno1/corp/CorpTypeToDeptMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno2/corp/CorpTypeToDeptMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/corp/CorpTypeToDeptMapper.java index 0fe95dd..597e050 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/corp/CorpTypeToDeptMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/corp/CorpTypeToDeptMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.corp; +package com.zcloud.mapper.dsno1.corp; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno2/corp/CorpinfoRelatedMapper.java b/src/main/java/com/zcloud/mapper/dsno1/corp/CorpinfoRelatedMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno2/corp/CorpinfoRelatedMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/corp/CorpinfoRelatedMapper.java index 771f802..8d4770e 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/corp/CorpinfoRelatedMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/corp/CorpinfoRelatedMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.corp; +package com.zcloud.mapper.dsno1.corp; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno2/corp/ElectronicFenceMapper.java b/src/main/java/com/zcloud/mapper/dsno1/corp/ElectronicFenceMapper.java similarity index 89% rename from src/main/java/com/zcloud/mapper/dsno2/corp/ElectronicFenceMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/corp/ElectronicFenceMapper.java index be8a00c..0b24ffe 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/corp/ElectronicFenceMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/corp/ElectronicFenceMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.corp; +package com.zcloud.mapper.dsno1.corp; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/corp/FuncMapper.java b/src/main/java/com/zcloud/mapper/dsno1/corp/FuncMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno2/corp/FuncMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/corp/FuncMapper.java index d625705..2c553f4 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/corp/FuncMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/corp/FuncMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.corp; +package com.zcloud.mapper.dsno1.corp; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno2/corp/ImplementationManagementMapper.java b/src/main/java/com/zcloud/mapper/dsno1/corp/ImplementationManagementMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno2/corp/ImplementationManagementMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/corp/ImplementationManagementMapper.java index 102f034..20f71dd 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/corp/ImplementationManagementMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/corp/ImplementationManagementMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.corp; +package com.zcloud.mapper.dsno1.corp; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/corp/MaintenanceFlowMapper.java b/src/main/java/com/zcloud/mapper/dsno1/corp/MaintenanceFlowMapper.java similarity index 97% rename from src/main/java/com/zcloud/mapper/dsno2/corp/MaintenanceFlowMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/corp/MaintenanceFlowMapper.java index 4b0b97a..800433e 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/corp/MaintenanceFlowMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/corp/MaintenanceFlowMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.corp; +package com.zcloud.mapper.dsno1.corp; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/corp/MaintenanceManagementMapper.java b/src/main/java/com/zcloud/mapper/dsno1/corp/MaintenanceManagementMapper.java similarity index 94% rename from src/main/java/com/zcloud/mapper/dsno2/corp/MaintenanceManagementMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/corp/MaintenanceManagementMapper.java index 2ec3d4f..b6322f9 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/corp/MaintenanceManagementMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/corp/MaintenanceManagementMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.corp; +package com.zcloud.mapper.dsno1.corp; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/corp/MaintenanceUserInfoMapper.java b/src/main/java/com/zcloud/mapper/dsno1/corp/MaintenanceUserInfoMapper.java similarity index 98% rename from src/main/java/com/zcloud/mapper/dsno2/corp/MaintenanceUserInfoMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/corp/MaintenanceUserInfoMapper.java index 48fe6a5..f447bc2 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/corp/MaintenanceUserInfoMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/corp/MaintenanceUserInfoMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.corp; +package com.zcloud.mapper.dsno1.corp; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/corp/MfolderMapper.java b/src/main/java/com/zcloud/mapper/dsno1/corp/MfolderMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno2/corp/MfolderMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/corp/MfolderMapper.java index 975c941..43c1ebb 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/corp/MfolderMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/corp/MfolderMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.corp; +package com.zcloud.mapper.dsno1.corp; import java.util.List; diff --git a/src/main/java/com/zcloud/mapper/dsno2/corp/QualificationsMapper.java b/src/main/java/com/zcloud/mapper/dsno1/corp/QualificationsMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno2/corp/QualificationsMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/corp/QualificationsMapper.java index 6a11357..8971913 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/corp/QualificationsMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/corp/QualificationsMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.corp; +package com.zcloud.mapper.dsno1.corp; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/corp/VIPAdjustmentLogMapper.java b/src/main/java/com/zcloud/mapper/dsno1/corp/VIPAdjustmentLogMapper.java similarity index 85% rename from src/main/java/com/zcloud/mapper/dsno2/corp/VIPAdjustmentLogMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/corp/VIPAdjustmentLogMapper.java index 70f3d41..e6553f7 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/corp/VIPAdjustmentLogMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/corp/VIPAdjustmentLogMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.corp; +package com.zcloud.mapper.dsno1.corp; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/dockingManagement/KeyProcessesMapper.java b/src/main/java/com/zcloud/mapper/dsno1/dockingManagement/KeyProcessesMapper.java similarity index 94% rename from src/main/java/com/zcloud/mapper/dsno2/dockingManagement/KeyProcessesMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/dockingManagement/KeyProcessesMapper.java index 3384bbf..291e214 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/dockingManagement/KeyProcessesMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/dockingManagement/KeyProcessesMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.dockingManagement; +package com.zcloud.mapper.dsno1.dockingManagement; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/dockingManagement/ResponsiblePersonMapper.java b/src/main/java/com/zcloud/mapper/dsno1/dockingManagement/ResponsiblePersonMapper.java similarity index 94% rename from src/main/java/com/zcloud/mapper/dsno2/dockingManagement/ResponsiblePersonMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/dockingManagement/ResponsiblePersonMapper.java index 6677157..1f39c83 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/dockingManagement/ResponsiblePersonMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/dockingManagement/ResponsiblePersonMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.dockingManagement; +package com.zcloud.mapper.dsno1.dockingManagement; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/dockingManagement/SpecialInspectionMapper.java b/src/main/java/com/zcloud/mapper/dsno1/dockingManagement/SpecialInspectionMapper.java similarity index 94% rename from src/main/java/com/zcloud/mapper/dsno2/dockingManagement/SpecialInspectionMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/dockingManagement/SpecialInspectionMapper.java index a7b8e29..deb59cd 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/dockingManagement/SpecialInspectionMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/dockingManagement/SpecialInspectionMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.dockingManagement; +package com.zcloud.mapper.dsno1.dockingManagement; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/feedback/AppFeedbackMapper.java b/src/main/java/com/zcloud/mapper/dsno1/feedback/AppFeedbackMapper.java similarity index 93% rename from src/main/java/com/zcloud/mapper/dsno2/feedback/AppFeedbackMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/feedback/AppFeedbackMapper.java index 4db054d..d6c988b 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/feedback/AppFeedbackMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/feedback/AppFeedbackMapper.java @@ -1,10 +1,10 @@ -package com.zcloud.mapper.dsno2.feedback; +package com.zcloud.mapper.dsno1.feedback; import java.util.List; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -/** +/** * 说明：app意见反馈 * 作者：luoxiaobao * 时间：2021-01-13 @@ -17,42 +17,42 @@ public interface AppFeedbackMapper{ * @throws Exception */ void save(PageData pd); - + /**删除 * @param pd * @throws Exception */ void delete(PageData pd); - + /**修改 * @param pd * @throws Exception */ void edit(PageData pd); - + /**列表 * @param page * @throws Exception */ List datalistPage(Page page); - + /**列表(全部) * @param pd * @throws Exception */ List listAll(PageData pd); - + /**通过id获取数据 * @param pd * @throws Exception */ PageData findById(PageData pd); - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception */ void deleteAll(String[] ArrayDATA_IDS); - + } diff --git a/src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandard/CommonItemMapper.java b/src/main/java/com/zcloud/mapper/dsno1/hiddenDangerCheckStandard/CommonItemMapper.java similarity index 94% rename from src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandard/CommonItemMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/hiddenDangerCheckStandard/CommonItemMapper.java index e64e891..2c60f99 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandard/CommonItemMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/hiddenDangerCheckStandard/CommonItemMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.hiddenDangerCheckStandard; +package com.zcloud.mapper.dsno1.hiddenDangerCheckStandard; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandard/CommonMapper.java b/src/main/java/com/zcloud/mapper/dsno1/hiddenDangerCheckStandard/CommonMapper.java similarity index 93% rename from src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandard/CommonMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/hiddenDangerCheckStandard/CommonMapper.java index c755055..6e5981b 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandard/CommonMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/hiddenDangerCheckStandard/CommonMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.hiddenDangerCheckStandard; +package com.zcloud.mapper.dsno1.hiddenDangerCheckStandard; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandard/DictionaryMapper.java b/src/main/java/com/zcloud/mapper/dsno1/hiddenDangerCheckStandard/DictionaryMapper.java similarity index 94% rename from src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandard/DictionaryMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/hiddenDangerCheckStandard/DictionaryMapper.java index 769b115..e26d0f3 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/hiddenDangerCheckStandard/DictionaryMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/hiddenDangerCheckStandard/DictionaryMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.hiddenDangerCheckStandard; +package com.zcloud.mapper.dsno1.hiddenDangerCheckStandard; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/notice/NoticeCorpMapper.java b/src/main/java/com/zcloud/mapper/dsno1/notice/NoticeCorpMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno2/notice/NoticeCorpMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/notice/NoticeCorpMapper.java index 8e3bcd9..7bada35 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/notice/NoticeCorpMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/notice/NoticeCorpMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.notice; +package com.zcloud.mapper.dsno1.notice; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno2/notice/NoticeCorpUserIdMapper.java b/src/main/java/com/zcloud/mapper/dsno1/notice/NoticeCorpUserIdMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno2/notice/NoticeCorpUserIdMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/notice/NoticeCorpUserIdMapper.java index dcad8f3..32a67c0 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/notice/NoticeCorpUserIdMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/notice/NoticeCorpUserIdMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.notice; +package com.zcloud.mapper.dsno1.notice; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno2/notice/NoticeLogMapper.java b/src/main/java/com/zcloud/mapper/dsno1/notice/NoticeLogMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno2/notice/NoticeLogMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/notice/NoticeLogMapper.java index b84577e..f4a6133 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/notice/NoticeLogMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/notice/NoticeLogMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.notice; +package com.zcloud.mapper.dsno1.notice; import java.util.List; diff --git a/src/main/java/com/zcloud/mapper/dsno2/notice/NoticeRemindLogMapper.java b/src/main/java/com/zcloud/mapper/dsno1/notice/NoticeRemindLogMapper.java similarity index 90% rename from src/main/java/com/zcloud/mapper/dsno2/notice/NoticeRemindLogMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/notice/NoticeRemindLogMapper.java index b3f66fb..f613688 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/notice/NoticeRemindLogMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/notice/NoticeRemindLogMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.notice; +package com.zcloud.mapper.dsno1.notice; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/notice/NoticeTemplateMapper.java b/src/main/java/com/zcloud/mapper/dsno1/notice/NoticeTemplateMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno2/notice/NoticeTemplateMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/notice/NoticeTemplateMapper.java index 32cd200..8d96070 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/notice/NoticeTemplateMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/notice/NoticeTemplateMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.notice; +package com.zcloud.mapper.dsno1.notice; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno2/notice/ServiceNoticeMapper.java b/src/main/java/com/zcloud/mapper/dsno1/notice/ServiceNoticeMapper.java similarity index 97% rename from src/main/java/com/zcloud/mapper/dsno2/notice/ServiceNoticeMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/notice/ServiceNoticeMapper.java index a06bdf6..9cc50b3 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/notice/ServiceNoticeMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/notice/ServiceNoticeMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.notice; +package com.zcloud.mapper.dsno1.notice; import java.util.List; diff --git a/src/main/java/com/zcloud/mapper/dsno2/risk/IdeRepositoryMapper.java b/src/main/java/com/zcloud/mapper/dsno1/risk/IdeRepositoryMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno2/risk/IdeRepositoryMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/risk/IdeRepositoryMapper.java index 489bf4c..1e8bbe9 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/risk/IdeRepositoryMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/risk/IdeRepositoryMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.risk; +package com.zcloud.mapper.dsno1.risk; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno2/risk/ResourceCorpMapper.java b/src/main/java/com/zcloud/mapper/dsno1/risk/ResourceCorpMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno2/risk/ResourceCorpMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/risk/ResourceCorpMapper.java index 00ac8a3..400fe12 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/risk/ResourceCorpMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/risk/ResourceCorpMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.risk; +package com.zcloud.mapper.dsno1.risk; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno2/scheduling/ShiftWorkPeriodMapper.java b/src/main/java/com/zcloud/mapper/dsno1/scheduling/ShiftWorkPeriodMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno2/scheduling/ShiftWorkPeriodMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/scheduling/ShiftWorkPeriodMapper.java index e5324e7..eaabc9b 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/scheduling/ShiftWorkPeriodMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/scheduling/ShiftWorkPeriodMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.scheduling; +package com.zcloud.mapper.dsno1.scheduling; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno2/scheduling/ShiftWorkRulesMapper.java b/src/main/java/com/zcloud/mapper/dsno1/scheduling/ShiftWorkRulesMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno2/scheduling/ShiftWorkRulesMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/scheduling/ShiftWorkRulesMapper.java index 4205cf8..87e70b1 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/scheduling/ShiftWorkRulesMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/scheduling/ShiftWorkRulesMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.scheduling; +package com.zcloud.mapper.dsno1.scheduling; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/AdminDepartmentMapper.java b/src/main/java/com/zcloud/mapper/dsno1/system/AdminDepartmentMapper.java similarity index 98% rename from src/main/java/com/zcloud/mapper/dsno2/system/AdminDepartmentMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/system/AdminDepartmentMapper.java index 0b38321..af8ca81 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/system/AdminDepartmentMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/system/AdminDepartmentMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.system; +package com.zcloud.mapper.dsno1.system; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/ButtonrightsMapper.java b/src/main/java/com/zcloud/mapper/dsno1/system/ButtonrightsMapper.java similarity index 94% rename from src/main/java/com/zcloud/mapper/dsno2/system/ButtonrightsMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/system/ButtonrightsMapper.java index 3f3dcd6..1676952 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/system/ButtonrightsMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/system/ButtonrightsMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.system; +package com.zcloud.mapper.dsno1.system; import java.util.List; @@ -10,37 +10,37 @@ import com.zcloud.entity.PageData; * 官网：www.qdkjchina.com */ public interface ButtonrightsMapper { - + /**列表(全部)左连接按钮表,查出安全权限标识(主副职角色综合) * @param pd * @throws Exception */ List listAllBrAndQxnameByZF(String[] ROLE_IDS); - + /**列表(全部)左连接按钮表,查出安全权限标识(主职角色) * @param pd * @throws Exception */ List listAllBrAndQxname(PageData pd); - + /**列表(全部) * @param pd * @throws Exception */ List listAll(PageData pd); - + /**通过(角色ID和按钮ID)获取数据 * @param pd * @throws Exception */ PageData findById(PageData pd); - + /**删除 * @param pd * @throws Exception */ void delete(PageData pd); - + /**新增 * @param pd * @throws Exception diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/ComponentMapper.java b/src/main/java/com/zcloud/mapper/dsno1/system/ComponentMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno2/system/ComponentMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/system/ComponentMapper.java index b99e49b..be618df 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/system/ComponentMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/system/ComponentMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.system; +package com.zcloud.mapper.dsno1.system; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/DatajurMapper.java b/src/main/java/com/zcloud/mapper/dsno1/system/DatajurMapper.java similarity index 92% rename from src/main/java/com/zcloud/mapper/dsno2/system/DatajurMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/system/DatajurMapper.java index 08e626d..3645f93 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/system/DatajurMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/system/DatajurMapper.java @@ -1,8 +1,8 @@ -package com.zcloud.mapper.dsno2.system; +package com.zcloud.mapper.dsno1.system; import com.zcloud.entity.PageData; -/** +/** * 说明： 组织数据权限Mapper * 作者：luoxiaobao * 官网：www.qdkjchina.com @@ -14,24 +14,24 @@ public interface DatajurMapper{ * @throws Exception */ public void save(PageData pd)throws Exception; - + /**修改 * @param pd * @throws Exception */ public void edit(PageData pd)throws Exception; - + /**通过id获取数据 * @param pd * @throws Exception */ public PageData findById(PageData pd)throws Exception; - + /**取出某用户的组织数据权限 * @param pd * @throws Exception */ public PageData getDEPARTMENT_IDS(String USERNAME)throws Exception; - + } diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/DepartmentMapper.java b/src/main/java/com/zcloud/mapper/dsno1/system/DepartmentMapper.java similarity index 98% rename from src/main/java/com/zcloud/mapper/dsno2/system/DepartmentMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/system/DepartmentMapper.java index e1dc7af..0e96646 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/system/DepartmentMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/system/DepartmentMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.system; +package com.zcloud.mapper.dsno1.system; import java.util.List; diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/DictionariesMapper.java b/src/main/java/com/zcloud/mapper/dsno1/system/DictionariesMapper.java similarity index 97% rename from src/main/java/com/zcloud/mapper/dsno2/system/DictionariesMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/system/DictionariesMapper.java index 295f1ce..291ce55 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/system/DictionariesMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/system/DictionariesMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.system; +package com.zcloud.mapper.dsno1.system; import java.util.List; diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/FHlogMapper.java b/src/main/java/com/zcloud/mapper/dsno1/system/FHlogMapper.java similarity index 92% rename from src/main/java/com/zcloud/mapper/dsno2/system/FHlogMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/system/FHlogMapper.java index f96abf6..e4ad2f4 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/system/FHlogMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/system/FHlogMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.system; +package com.zcloud.mapper.dsno1.system; import java.util.List; @@ -11,25 +11,25 @@ import com.zcloud.entity.PageData; * 官网：www.qdkjchina.com */ public interface FHlogMapper { - + /**新增 * @param pd * @throws Exception */ void save(PageData pd); - + /**删除 * @param pd * @throws Exception */ void delete(PageData pd); - + /**列表 * @param page * @throws Exception */ List datalistPage(Page page); - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/FhButtonMapper.java b/src/main/java/com/zcloud/mapper/dsno1/system/FhButtonMapper.java similarity index 94% rename from src/main/java/com/zcloud/mapper/dsno2/system/FhButtonMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/system/FhButtonMapper.java index e9c6cd9..2cc2744 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/system/FhButtonMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/system/FhButtonMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.system; +package com.zcloud.mapper.dsno1.system; import java.util.List; @@ -17,41 +17,41 @@ public interface FhButtonMapper { * @throws Exception */ List listAll(PageData pd); - + /**列表(带分页) * @param page * @throws Exception */ List datalistPage(Page page); - + /**删除 * @param pd * @throws Exception */ void delete(PageData pd); - + /**新增 * @param pd * @throws Exception */ void save(PageData pd); - + /**修改 * @param pd * @throws Exception */ void edit(PageData pd); - + /**通过id获取数据 * @param pd * @throws Exception */ PageData findById(PageData pd); - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception */ void deleteAll(String[] ArrayDATA_IDS); - + } diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/FhsmsMapper.java b/src/main/java/com/zcloud/mapper/dsno1/system/FhsmsMapper.java similarity index 94% rename from src/main/java/com/zcloud/mapper/dsno2/system/FhsmsMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/system/FhsmsMapper.java index c5fe51d..882af53 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/system/FhsmsMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/system/FhsmsMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.system; +package com.zcloud.mapper.dsno1.system; import java.util.List; @@ -11,53 +11,53 @@ import com.zcloud.entity.PageData; * 官网：www.qdkjchina.com */ public interface FhsmsMapper { - + /**新增 * @param pd * @throws Exception */ public void save(PageData pd); - + /**删除 * @param pd * @throws Exception */ public void delete(PageData pd); - + /**修改 * @param pd * @throws Exception */ public void edit(PageData pd); - + /**列表 * @param page * @throws Exception */ public List datalistPage(Page page); - + /**列表(全部) * @param pd * @throws Exception */ public List listAll(PageData pd); - + /**通过id获取数据 * @param pd * @throws Exception */ public PageData findById(PageData pd); - + /**获取未读总数 * @param pd * @throws Exception */ public PageData findFhsmsCount(String USERNAME); - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception */ public void deleteAll(String[] ArrayDATA_IDS); - + } diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/FileUploadLogMapper.java b/src/main/java/com/zcloud/mapper/dsno1/system/FileUploadLogMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno2/system/FileUploadLogMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/system/FileUploadLogMapper.java index 1ee711a..4ec1398 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/system/FileUploadLogMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/system/FileUploadLogMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.system; +package com.zcloud.mapper.dsno1.system; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/ImgFileMapper.java b/src/main/java/com/zcloud/mapper/dsno1/system/ImgFileMapper.java similarity index 97% rename from src/main/java/com/zcloud/mapper/dsno2/system/ImgFileMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/system/ImgFileMapper.java index ae9f1c3..57d04d9 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/system/ImgFileMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/system/ImgFileMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.system; +package com.zcloud.mapper.dsno1.system; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/ImgFilesMapper.java b/src/main/java/com/zcloud/mapper/dsno1/system/ImgFilesMapper.java similarity index 97% rename from src/main/java/com/zcloud/mapper/dsno2/system/ImgFilesMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/system/ImgFilesMapper.java index ffe91bd..3077ddb 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/system/ImgFilesMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/system/ImgFilesMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.system; +package com.zcloud.mapper.dsno1.system; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/MSMLoginMapper.java b/src/main/java/com/zcloud/mapper/dsno1/system/MSMLoginMapper.java similarity index 93% rename from src/main/java/com/zcloud/mapper/dsno2/system/MSMLoginMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/system/MSMLoginMapper.java index 76dd145..9f52792 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/system/MSMLoginMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/system/MSMLoginMapper.java @@ -1,10 +1,10 @@ -package com.zcloud.mapper.dsno2.system; +package com.zcloud.mapper.dsno1.system; import java.util.List; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -/** +/** * 说明：短信记录 * 作者：luoxiaobao * 时间：2021-02-26 @@ -17,44 +17,44 @@ public interface MSMLoginMapper{ * @throws Exception */ void save(PageData pd); - + /**删除 * @param pd * @throws Exception */ void delete(PageData pd); - + /**修改 * @param pd * @throws Exception */ void edit(PageData pd); - + /**列表 * @param page * @throws Exception */ List datalistPage(Page page); - + /**列表(全部) * @param pd * @throws Exception */ List listAll(PageData pd); - + /**通过id获取数据 * @param pd * @throws Exception */ PageData findById(PageData pd); - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception */ void deleteAll(String[] ArrayDATA_IDS); - + List getCountByCorpInfoIds(Page page); - + } diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/MenuMapper.java b/src/main/java/com/zcloud/mapper/dsno1/system/MenuMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno2/system/MenuMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/system/MenuMapper.java index 9c1d116..9b970cf 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/system/MenuMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/system/MenuMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.system; +package com.zcloud.mapper.dsno1.system; import java.util.List; diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/OfficeMapper.java b/src/main/java/com/zcloud/mapper/dsno1/system/OfficeMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno2/system/OfficeMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/system/OfficeMapper.java index 428cbcd..4e5a816 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/system/OfficeMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/system/OfficeMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.system; +package com.zcloud.mapper.dsno1.system; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/PhotoMapper.java b/src/main/java/com/zcloud/mapper/dsno1/system/PhotoMapper.java similarity index 90% rename from src/main/java/com/zcloud/mapper/dsno2/system/PhotoMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/system/PhotoMapper.java index 4a32fcd..cef204d 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/system/PhotoMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/system/PhotoMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.system; +package com.zcloud.mapper.dsno1.system; import com.zcloud.entity.PageData; @@ -8,19 +8,19 @@ import com.zcloud.entity.PageData; * 官网：www.qdkjchina.com */ public interface PhotoMapper { - + /**新增 * @param pd * @throws Exception */ void save(PageData pd); - + /**修改 * @param pd * @throws Exception */ void edit(PageData pd); - + /**通过id获取数据 * @param pd * @throws Exception diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/PostMapper.java b/src/main/java/com/zcloud/mapper/dsno1/system/PostMapper.java similarity index 93% rename from src/main/java/com/zcloud/mapper/dsno2/system/PostMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/system/PostMapper.java index e90f228..35682de 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/system/PostMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/system/PostMapper.java @@ -1,10 +1,10 @@ -package com.zcloud.mapper.dsno2.system; +package com.zcloud.mapper.dsno1.system; import java.util.List; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -/** +/** * 说明：岗位管理 * 作者：luoxiaobao * 时间：2020-12-28 @@ -17,42 +17,42 @@ public interface PostMapper{ * @throws Exception */ void save(PageData pd); - + /**删除 * @param pd * @throws Exception */ void delete(PageData pd); - + /**修改 * @param pd * @throws Exception */ void edit(PageData pd); - + /**列表 * @param page * @throws Exception */ List datalistPage(Page page); - + /**列表(全部) * @param pd * @throws Exception */ List listAll(PageData pd); - + /**通过id获取数据 * @param pd * @throws Exception */ PageData findById(PageData pd); - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception */ void deleteAll(String[] ArrayDATA_IDS); - + } diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/RoleMapper.java b/src/main/java/com/zcloud/mapper/dsno1/system/RoleMapper.java similarity index 98% rename from src/main/java/com/zcloud/mapper/dsno2/system/RoleMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/system/RoleMapper.java index 48f15cf..5a35d95 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/system/RoleMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/system/RoleMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.system; +package com.zcloud.mapper.dsno1.system; import java.util.List; diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/RouteMapper.java b/src/main/java/com/zcloud/mapper/dsno1/system/RouteMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno2/system/RouteMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/system/RouteMapper.java index 72c387d..3a89f54 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/system/RouteMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/system/RouteMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.system; +package com.zcloud.mapper.dsno1.system; import com.zcloud.entity.PageData; import com.zcloud.entity.system.Route; diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/SMSManagementMapper.java b/src/main/java/com/zcloud/mapper/dsno1/system/SMSManagementMapper.java similarity index 93% rename from src/main/java/com/zcloud/mapper/dsno2/system/SMSManagementMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/system/SMSManagementMapper.java index 6bcca7e..9b3b9cc 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/system/SMSManagementMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/system/SMSManagementMapper.java @@ -1,10 +1,10 @@ -package com.zcloud.mapper.dsno2.system; +package com.zcloud.mapper.dsno1.system; import java.util.List; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -/** +/** * 说明：短信管理 * 作者：luoxiaobao * 时间：2021-01-21 @@ -17,43 +17,43 @@ public interface SMSManagementMapper{ * @throws Exception */ void save(PageData pd); - + /**删除 * @param pd * @throws Exception */ void delete(PageData pd); - + /**修改 * @param pd * @throws Exception */ void edit(PageData pd); void editIsEnable(PageData pd); - + /**列表 * @param page * @throws Exception */ List datalistPage(Page page); - + /**列表(全部) * @param pd * @throws Exception */ List listAll(PageData pd); - + /**通过id获取数据 * @param pd * @throws Exception */ PageData findById(PageData pd); - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception */ void deleteAll(String[] ArrayDATA_IDS); - + } diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/ScheduleMapper.java b/src/main/java/com/zcloud/mapper/dsno1/system/ScheduleMapper.java similarity index 91% rename from src/main/java/com/zcloud/mapper/dsno2/system/ScheduleMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/system/ScheduleMapper.java index 269f9cd..4365e97 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/system/ScheduleMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/system/ScheduleMapper.java @@ -1,13 +1,13 @@ -package com.zcloud.mapper.dsno2.system; +package com.zcloud.mapper.dsno1.system; import java.util.List; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -/** +/** * 说明： 日程安排Mapper - * 作者：zCloud + * 作者：zCloud * 官网： * @version */ @@ -18,42 +18,42 @@ public interface ScheduleMapper{ * @throws Exception */ void save(PageData pd); - + /**删除 * @param pd * @throws Exception */ void delete(PageData pd); - + /**修改 * @param pd * @throws Exception */ void edit(PageData pd); - + /**列表 * @param page * @throws Exception */ List datalistPage(Page page); - + /**列表(全部) * @param pd * @throws Exception */ List listAll(PageData pd); - + /**通过id获取数据 * @param pd * @throws Exception */ PageData findById(PageData pd); - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception */ void deleteAll(String[] ArrayDATA_IDS); - + } diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/SysPathMapper.java b/src/main/java/com/zcloud/mapper/dsno1/system/SysPathMapper.java similarity index 93% rename from src/main/java/com/zcloud/mapper/dsno2/system/SysPathMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/system/SysPathMapper.java index 7f941bb..2572d7b 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/system/SysPathMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/system/SysPathMapper.java @@ -1,10 +1,10 @@ -package com.zcloud.mapper.dsno2.system; +package com.zcloud.mapper.dsno1.system; import java.util.List; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -/** +/** * 说明：系统访问路径 * 作者：luoxiaobao * 时间：2021-05-28 @@ -17,42 +17,42 @@ public interface SysPathMapper{ * @throws Exception */ void save(PageData pd); - + /**删除 * @param pd * @throws Exception */ void delete(PageData pd); - + /**修改 * @param pd * @throws Exception */ void edit(PageData pd); - + /**列表 * @param page * @throws Exception */ List datalistPage(Page page); - + /**列表(全部) * @param pd * @throws Exception */ List listAll(PageData pd); - + /**通过id获取数据 * @param pd * @throws Exception */ PageData findById(PageData pd); - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception */ void deleteAll(String[] ArrayDATA_IDS); - + } diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/UeditorMapper.java b/src/main/java/com/zcloud/mapper/dsno1/system/UeditorMapper.java similarity index 90% rename from src/main/java/com/zcloud/mapper/dsno2/system/UeditorMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/system/UeditorMapper.java index 3973dcf..10a4ff3 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/system/UeditorMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/system/UeditorMapper.java @@ -1,38 +1,38 @@ -package com.zcloud.mapper.dsno2.system; +package com.zcloud.mapper.dsno1.system; import com.zcloud.entity.PageData; -/** +/** * 说明： 富文本编辑器内容缓存Mapper * 作者：luoxiaobao * 官网：www.qdkjchina.com * @version */ public interface UeditorMapper{ - + /**通过id获取数据 * @param pd * @throws Exception */ PageData findById(PageData pd); - + /**修改 * @param pd * @throws Exception */ void edit(PageData pd); - + /**删除 * @param pd * @throws Exception */ void delete(PageData pd); - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception */ void deleteAll(String[] ArrayDATA_IDS); - + } diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/UsersMapper.java b/src/main/java/com/zcloud/mapper/dsno1/system/UsersMapper.java similarity index 99% rename from src/main/java/com/zcloud/mapper/dsno2/system/UsersMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/system/UsersMapper.java index 0b1ba56..6d70add 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/system/UsersMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/system/UsersMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.system; +package com.zcloud.mapper.dsno1.system; import java.util.List; diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/VersionManagerMapper.java b/src/main/java/com/zcloud/mapper/dsno1/system/VersionManagerMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno2/system/VersionManagerMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/system/VersionManagerMapper.java index 26a85c2..127be0e 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/system/VersionManagerMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/system/VersionManagerMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.system; +package com.zcloud.mapper.dsno1.system; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/VersionUrlMapper.java b/src/main/java/com/zcloud/mapper/dsno1/system/VersionUrlMapper.java similarity index 94% rename from src/main/java/com/zcloud/mapper/dsno2/system/VersionUrlMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/system/VersionUrlMapper.java index 5a1e56b..ddd1bd8 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/system/VersionUrlMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/system/VersionUrlMapper.java @@ -1,10 +1,10 @@ -package com.zcloud.mapper.dsno2.system; +package com.zcloud.mapper.dsno1.system; import java.util.List; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -/** +/** * 说明：APP版本访问路径 * 作者：luoxiaobao * 时间：2021-04-25 @@ -17,48 +17,48 @@ public interface VersionUrlMapper{ * @throws Exception */ void save(PageData pd); - + /**删除 * @param pd * @throws Exception */ void delete(PageData pd); - + /**修改 * @param pd * @throws Exception */ void edit(PageData pd); - + /**列表 * @param page * @throws Exception */ List datalistPage(Page page); - + /**列表(全部) * @param pd * @throws Exception */ List listAll(PageData pd); - + /**通过id获取数据 * @param pd * @throws Exception */ PageData findById(PageData pd); - + /**通过Version获取数据 * @param pd * @throws Exception */ PageData findByVersion(PageData pd); - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception */ void deleteAll(String[] ArrayDATA_IDS); - + } diff --git a/src/main/java/com/zcloud/mapper/dsno2/termLibrary/HiddenTermLibraryMapper.java b/src/main/java/com/zcloud/mapper/dsno1/termLibrary/HiddenTermLibraryMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno2/termLibrary/HiddenTermLibraryMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/termLibrary/HiddenTermLibraryMapper.java index cdb6175..dfe003f 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/termLibrary/HiddenTermLibraryMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/termLibrary/HiddenTermLibraryMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.termLibrary; +package com.zcloud.mapper.dsno1.termLibrary; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/termLibrary/RiskTermLibraryMapper.java b/src/main/java/com/zcloud/mapper/dsno1/termLibrary/RiskTermLibraryMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno2/termLibrary/RiskTermLibraryMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/termLibrary/RiskTermLibraryMapper.java index c606823..a3c4318 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/termLibrary/RiskTermLibraryMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/termLibrary/RiskTermLibraryMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.termLibrary; +package com.zcloud.mapper.dsno1.termLibrary; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/token/TokenMapper.java b/src/main/java/com/zcloud/mapper/dsno1/token/TokenMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno2/token/TokenMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/token/TokenMapper.java index 106b875..47771fc 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/token/TokenMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/token/TokenMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.token; +package com.zcloud.mapper.dsno1.token; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno2/tools/CodeEditorMapper.java b/src/main/java/com/zcloud/mapper/dsno1/tools/CodeEditorMapper.java similarity index 94% rename from src/main/java/com/zcloud/mapper/dsno2/tools/CodeEditorMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/tools/CodeEditorMapper.java index 9360c31..787a556 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/tools/CodeEditorMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/tools/CodeEditorMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.tools; +package com.zcloud.mapper.dsno1.tools; import java.util.List; diff --git a/src/main/java/com/zcloud/mapper/dsno2/tools/CreateCodeMapper.java b/src/main/java/com/zcloud/mapper/dsno1/tools/CreateCodeMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno2/tools/CreateCodeMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/tools/CreateCodeMapper.java index e414980..6211098 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/tools/CreateCodeMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/tools/CreateCodeMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.tools; +package com.zcloud.mapper.dsno1.tools; import java.util.List; diff --git a/src/main/java/com/zcloud/mapper/dsno2/video/AIWarningMapper.java b/src/main/java/com/zcloud/mapper/dsno1/video/AIWarningMapper.java similarity index 97% rename from src/main/java/com/zcloud/mapper/dsno2/video/AIWarningMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/video/AIWarningMapper.java index 3feec66..eed178b 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/video/AIWarningMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/video/AIWarningMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.video; +package com.zcloud.mapper.dsno1.video; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/video/CorpInfo4Mapper.java b/src/main/java/com/zcloud/mapper/dsno1/video/CorpInfo4Mapper.java similarity index 87% rename from src/main/java/com/zcloud/mapper/dsno2/video/CorpInfo4Mapper.java rename to src/main/java/com/zcloud/mapper/dsno1/video/CorpInfo4Mapper.java index 3f9d58e..70cfa3c 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/video/CorpInfo4Mapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/video/CorpInfo4Mapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.video; +package com.zcloud.mapper.dsno1.video; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno2/video/VideoManagerMapper.java b/src/main/java/com/zcloud/mapper/dsno1/video/VideoManagerMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno2/video/VideoManagerMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/video/VideoManagerMapper.java index f83e3ab..15743de 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/video/VideoManagerMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/video/VideoManagerMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.video; +package com.zcloud.mapper.dsno1.video; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno2/video/VideoMapper.java b/src/main/java/com/zcloud/mapper/dsno1/video/VideoMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno2/video/VideoMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/video/VideoMapper.java index 786e40b..ac99e24 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/video/VideoMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/video/VideoMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.video; +package com.zcloud.mapper.dsno1.video; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno2/visit/CorpVisitMapper.java b/src/main/java/com/zcloud/mapper/dsno1/visit/CorpVisitMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno2/visit/CorpVisitMapper.java rename to src/main/java/com/zcloud/mapper/dsno1/visit/CorpVisitMapper.java index 67a06a3..2c58d02 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/visit/CorpVisitMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno1/visit/CorpVisitMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno2.visit; +package com.zcloud.mapper.dsno1.visit; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno3/courseware/DataCoursewareMapper.java b/src/main/java/com/zcloud/mapper/dsno2/courseware/DataCoursewareMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno3/courseware/DataCoursewareMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/courseware/DataCoursewareMapper.java index ddb77ab..a47d2c1 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/courseware/DataCoursewareMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/courseware/DataCoursewareMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.courseware; +package com.zcloud.mapper.dsno2.courseware; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/courseware/QuestionMapper.java b/src/main/java/com/zcloud/mapper/dsno2/courseware/QuestionMapper.java similarity index 98% rename from src/main/java/com/zcloud/mapper/dsno3/courseware/QuestionMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/courseware/QuestionMapper.java index 5d0a480..6a45909 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/courseware/QuestionMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/courseware/QuestionMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.courseware; +package com.zcloud.mapper.dsno2.courseware; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/courseware/VideoCoursewareMapper.java b/src/main/java/com/zcloud/mapper/dsno2/courseware/VideoCoursewareMapper.java similarity index 97% rename from src/main/java/com/zcloud/mapper/dsno3/courseware/VideoCoursewareMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/courseware/VideoCoursewareMapper.java index 6b5358d..1b1d87a 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/courseware/VideoCoursewareMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/courseware/VideoCoursewareMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.courseware; +package com.zcloud.mapper.dsno2.courseware; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/curriculum/ChapterMapper.java b/src/main/java/com/zcloud/mapper/dsno2/curriculum/ChapterMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno3/curriculum/ChapterMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/curriculum/ChapterMapper.java index d7476c3..8e47f49 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/curriculum/ChapterMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/curriculum/ChapterMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.curriculum; +package com.zcloud.mapper.dsno2.curriculum; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno3/curriculum/CourseStudentRelationMapper.java b/src/main/java/com/zcloud/mapper/dsno2/curriculum/CourseStudentRelationMapper.java similarity index 97% rename from src/main/java/com/zcloud/mapper/dsno3/curriculum/CourseStudentRelationMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/curriculum/CourseStudentRelationMapper.java index 91b7085..7f6b66d 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/curriculum/CourseStudentRelationMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/curriculum/CourseStudentRelationMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.curriculum; +package com.zcloud.mapper.dsno2.curriculum; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/curriculum/CoursemiddleMapper.java b/src/main/java/com/zcloud/mapper/dsno2/curriculum/CoursemiddleMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno3/curriculum/CoursemiddleMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/curriculum/CoursemiddleMapper.java index a03d39a..263d6c8 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/curriculum/CoursemiddleMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/curriculum/CoursemiddleMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.curriculum; +package com.zcloud.mapper.dsno2.curriculum; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/curriculum/CoursepapersMapper.java b/src/main/java/com/zcloud/mapper/dsno2/curriculum/CoursepapersMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno3/curriculum/CoursepapersMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/curriculum/CoursepapersMapper.java index 528ee8d..42db6fb 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/curriculum/CoursepapersMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/curriculum/CoursepapersMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.curriculum; +package com.zcloud.mapper.dsno2.curriculum; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/curriculum/CurriculumMapper.java b/src/main/java/com/zcloud/mapper/dsno2/curriculum/CurriculumMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno3/curriculum/CurriculumMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/curriculum/CurriculumMapper.java index b4007a3..53b2bf9 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/curriculum/CurriculumMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/curriculum/CurriculumMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.curriculum; +package com.zcloud.mapper.dsno2.curriculum; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -30,13 +30,13 @@ public interface CurriculumMapper { * @throws Exception */ void edit(PageData pd); - + /**启用禁用 * @param pd * @throws Exception */ void editState(PageData pd); - + /**列表 * @param page * @throws Exception diff --git a/src/main/java/com/zcloud/mapper/dsno3/curriculum/KcmiddlekjMapper.java b/src/main/java/com/zcloud/mapper/dsno2/curriculum/KcmiddlekjMapper.java similarity index 97% rename from src/main/java/com/zcloud/mapper/dsno3/curriculum/KcmiddlekjMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/curriculum/KcmiddlekjMapper.java index c8f6ab4..cc11aff 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/curriculum/KcmiddlekjMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/curriculum/KcmiddlekjMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.curriculum; +package com.zcloud.mapper.dsno2.curriculum; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno1/depository/HiddenLibraryMapper.java b/src/main/java/com/zcloud/mapper/dsno2/depository/HiddenLibraryMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno1/depository/HiddenLibraryMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/depository/HiddenLibraryMapper.java index c81e96d..9a491a0 100644 --- a/src/main/java/com/zcloud/mapper/dsno1/depository/HiddenLibraryMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/depository/HiddenLibraryMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno1.depository; +package com.zcloud.mapper.dsno2.depository; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno1/depository/LabelFactoryMapper.java b/src/main/java/com/zcloud/mapper/dsno2/depository/LabelFactoryMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno1/depository/LabelFactoryMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/depository/LabelFactoryMapper.java index cfe5198..5a94de7 100644 --- a/src/main/java/com/zcloud/mapper/dsno1/depository/LabelFactoryMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/depository/LabelFactoryMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno1.depository; +package com.zcloud.mapper.dsno2.depository; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno1/depository/LibraryLabelsMapper.java b/src/main/java/com/zcloud/mapper/dsno2/depository/LibraryLabelsMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno1/depository/LibraryLabelsMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/depository/LibraryLabelsMapper.java index 36a8275..2c83447 100644 --- a/src/main/java/com/zcloud/mapper/dsno1/depository/LibraryLabelsMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/depository/LibraryLabelsMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno1.depository; +package com.zcloud.mapper.dsno2.depository; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno1/depository/LibraryLogMapper.java b/src/main/java/com/zcloud/mapper/dsno2/depository/LibraryLogMapper.java similarity index 90% rename from src/main/java/com/zcloud/mapper/dsno1/depository/LibraryLogMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/depository/LibraryLogMapper.java index 0b04a0b..a5317c9 100644 --- a/src/main/java/com/zcloud/mapper/dsno1/depository/LibraryLogMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/depository/LibraryLogMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno1.depository; +package com.zcloud.mapper.dsno2.depository; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno1/depository/TextInfoMapper.java b/src/main/java/com/zcloud/mapper/dsno2/depository/TextInfoMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno1/depository/TextInfoMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/depository/TextInfoMapper.java index b56c5b7..ebe89ab 100644 --- a/src/main/java/com/zcloud/mapper/dsno1/depository/TextInfoMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/depository/TextInfoMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno1.depository; +package com.zcloud.mapper.dsno2.depository; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno1/depository/TextLibraryMapper.java b/src/main/java/com/zcloud/mapper/dsno2/depository/TextLibraryMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno1/depository/TextLibraryMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/depository/TextLibraryMapper.java index 37628a1..4892fcf 100644 --- a/src/main/java/com/zcloud/mapper/dsno1/depository/TextLibraryMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/depository/TextLibraryMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno1.depository; +package com.zcloud.mapper.dsno2.depository; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno1/filemanager/MfolderStipulateMapper.java b/src/main/java/com/zcloud/mapper/dsno2/filemanager/MfolderStipulateMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno1/filemanager/MfolderStipulateMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/filemanager/MfolderStipulateMapper.java index 0a29ab7..5452de4 100644 --- a/src/main/java/com/zcloud/mapper/dsno1/filemanager/MfolderStipulateMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/filemanager/MfolderStipulateMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno1.filemanager; +package com.zcloud.mapper.dsno2.filemanager; import java.util.List; diff --git a/src/main/java/com/zcloud/mapper/dsno1/hidden/HiddenCheckMapper.java b/src/main/java/com/zcloud/mapper/dsno2/hidden/HiddenCheckMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno1/hidden/HiddenCheckMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/hidden/HiddenCheckMapper.java index e4818ab..316a446 100644 --- a/src/main/java/com/zcloud/mapper/dsno1/hidden/HiddenCheckMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/hidden/HiddenCheckMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno1.hidden; +package com.zcloud.mapper.dsno2.hidden; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno1/hidden/HiddenMapper.java b/src/main/java/com/zcloud/mapper/dsno2/hidden/HiddenMapper.java similarity index 98% rename from src/main/java/com/zcloud/mapper/dsno1/hidden/HiddenMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/hidden/HiddenMapper.java index 115181b..203bbff 100644 --- a/src/main/java/com/zcloud/mapper/dsno1/hidden/HiddenMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/hidden/HiddenMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno1.hidden; +package com.zcloud.mapper.dsno2.hidden; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno1/hidden/HiddenSchemeMapper.java b/src/main/java/com/zcloud/mapper/dsno2/hidden/HiddenSchemeMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno1/hidden/HiddenSchemeMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/hidden/HiddenSchemeMapper.java index e05983e..a362456 100644 --- a/src/main/java/com/zcloud/mapper/dsno1/hidden/HiddenSchemeMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/hidden/HiddenSchemeMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno1.hidden; +package com.zcloud.mapper.dsno2.hidden; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/onlinexxks/CoursectkMapper.java b/src/main/java/com/zcloud/mapper/dsno2/onlinexxks/CoursectkMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno3/onlinexxks/CoursectkMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/onlinexxks/CoursectkMapper.java index aefe8c5..49bcfde 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/onlinexxks/CoursectkMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/onlinexxks/CoursectkMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.onlinexxks; +package com.zcloud.mapper.dsno2.onlinexxks; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/onlinexxks/CourserecordMapper.java b/src/main/java/com/zcloud/mapper/dsno2/onlinexxks/CourserecordMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno3/onlinexxks/CourserecordMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/onlinexxks/CourserecordMapper.java index 462a8ce..dab7aab 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/onlinexxks/CourserecordMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/onlinexxks/CourserecordMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.onlinexxks; +package com.zcloud.mapper.dsno2.onlinexxks; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/onlinexxks/StageexamctkMapper.java b/src/main/java/com/zcloud/mapper/dsno2/onlinexxks/StageexamctkMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno3/onlinexxks/StageexamctkMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/onlinexxks/StageexamctkMapper.java index 67bbfaa..231f7ae 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/onlinexxks/StageexamctkMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/onlinexxks/StageexamctkMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.onlinexxks; +package com.zcloud.mapper.dsno2.onlinexxks; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/onlinexxks/StageexammiddleMapper.java b/src/main/java/com/zcloud/mapper/dsno2/onlinexxks/StageexammiddleMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno3/onlinexxks/StageexammiddleMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/onlinexxks/StageexammiddleMapper.java index a267237..3792f9e 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/onlinexxks/StageexammiddleMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/onlinexxks/StageexammiddleMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.onlinexxks; +package com.zcloud.mapper.dsno2.onlinexxks; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/onlinexxks/VideocoursewareRecordMapper.java b/src/main/java/com/zcloud/mapper/dsno2/onlinexxks/VideocoursewareRecordMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno3/onlinexxks/VideocoursewareRecordMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/onlinexxks/VideocoursewareRecordMapper.java index 20b3c1b..3f7b458 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/onlinexxks/VideocoursewareRecordMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/onlinexxks/VideocoursewareRecordMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.onlinexxks; +package com.zcloud.mapper.dsno2.onlinexxks; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno3/paper/StageExamPaperCoursewareMapper.java b/src/main/java/com/zcloud/mapper/dsno2/paper/StageExamPaperCoursewareMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno3/paper/StageExamPaperCoursewareMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/paper/StageExamPaperCoursewareMapper.java index 4e0afe9..9beec0f 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/paper/StageExamPaperCoursewareMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/paper/StageExamPaperCoursewareMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.paper; +package com.zcloud.mapper.dsno2.paper; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/paper/StageExamPaperInputQuestionMapper.java b/src/main/java/com/zcloud/mapper/dsno2/paper/StageExamPaperInputQuestionMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno3/paper/StageExamPaperInputQuestionMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/paper/StageExamPaperInputQuestionMapper.java index 8a6335d..6468421 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/paper/StageExamPaperInputQuestionMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/paper/StageExamPaperInputQuestionMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.paper; +package com.zcloud.mapper.dsno2.paper; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/paper/StageExamPaperQuestionMapper.java b/src/main/java/com/zcloud/mapper/dsno2/paper/StageExamPaperQuestionMapper.java similarity index 97% rename from src/main/java/com/zcloud/mapper/dsno3/paper/StageExamPaperQuestionMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/paper/StageExamPaperQuestionMapper.java index b4685a3..2c70989 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/paper/StageExamPaperQuestionMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/paper/StageExamPaperQuestionMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.paper; +package com.zcloud.mapper.dsno2.paper; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/paper/StageexampaperInputMapper.java b/src/main/java/com/zcloud/mapper/dsno2/paper/StageexampaperInputMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno3/paper/StageexampaperInputMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/paper/StageexampaperInputMapper.java index 84895f2..125e1e3 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/paper/StageexampaperInputMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/paper/StageexampaperInputMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.paper; +package com.zcloud.mapper.dsno2.paper; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/paper/StageexampaperMapper.java b/src/main/java/com/zcloud/mapper/dsno2/paper/StageexampaperMapper.java similarity index 97% rename from src/main/java/com/zcloud/mapper/dsno3/paper/StageexampaperMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/paper/StageexampaperMapper.java index 8a687d3..f26a1a6 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/paper/StageexampaperMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/paper/StageexampaperMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.paper; +package com.zcloud.mapper.dsno2.paper; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/questionnaire/QuestionitemMapper.java b/src/main/java/com/zcloud/mapper/dsno2/questionnaire/QuestionitemMapper.java similarity index 98% rename from src/main/java/com/zcloud/mapper/dsno3/questionnaire/QuestionitemMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/questionnaire/QuestionitemMapper.java index ee262c6..0c6586d 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/questionnaire/QuestionitemMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/questionnaire/QuestionitemMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.questionnaire; +package com.zcloud.mapper.dsno2.questionnaire; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/questionnaire/SurveyMapper.java b/src/main/java/com/zcloud/mapper/dsno2/questionnaire/SurveyMapper.java similarity index 97% rename from src/main/java/com/zcloud/mapper/dsno3/questionnaire/SurveyMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/questionnaire/SurveyMapper.java index d8853bd..f40fd45 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/questionnaire/SurveyMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/questionnaire/SurveyMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.questionnaire; +package com.zcloud.mapper.dsno2.questionnaire; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/questionnaire/SurveyanswerMapper.java b/src/main/java/com/zcloud/mapper/dsno2/questionnaire/SurveyanswerMapper.java similarity index 98% rename from src/main/java/com/zcloud/mapper/dsno3/questionnaire/SurveyanswerMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/questionnaire/SurveyanswerMapper.java index 71185c1..cc825b0 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/questionnaire/SurveyanswerMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/questionnaire/SurveyanswerMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.questionnaire; +package com.zcloud.mapper.dsno2.questionnaire; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/questionnaire/SurveycorpinfoMapper.java b/src/main/java/com/zcloud/mapper/dsno2/questionnaire/SurveycorpinfoMapper.java similarity index 98% rename from src/main/java/com/zcloud/mapper/dsno3/questionnaire/SurveycorpinfoMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/questionnaire/SurveycorpinfoMapper.java index 0dd26a3..ba4dd38 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/questionnaire/SurveycorpinfoMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/questionnaire/SurveycorpinfoMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.questionnaire; +package com.zcloud.mapper.dsno2.questionnaire; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/questionnaire/SurveyquestionMapper.java b/src/main/java/com/zcloud/mapper/dsno2/questionnaire/SurveyquestionMapper.java similarity index 98% rename from src/main/java/com/zcloud/mapper/dsno3/questionnaire/SurveyquestionMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/questionnaire/SurveyquestionMapper.java index 9c50247..82734f1 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/questionnaire/SurveyquestionMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/questionnaire/SurveyquestionMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.questionnaire; +package com.zcloud.mapper.dsno2.questionnaire; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/register/QyRegisterMapper.java b/src/main/java/com/zcloud/mapper/dsno2/register/QyRegisterMapper.java similarity index 78% rename from src/main/java/com/zcloud/mapper/dsno3/register/QyRegisterMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/register/QyRegisterMapper.java index 62e7bad..a33e1f8 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/register/QyRegisterMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/register/QyRegisterMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.register; +package com.zcloud.mapper.dsno2.register; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/relation/CoursewareRelationMapper.java b/src/main/java/com/zcloud/mapper/dsno2/relation/CoursewareRelationMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno3/relation/CoursewareRelationMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/relation/CoursewareRelationMapper.java index b89f5f6..9c2ca22 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/relation/CoursewareRelationMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/relation/CoursewareRelationMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.relation; +package com.zcloud.mapper.dsno2.relation; import java.util.List; import com.zcloud.entity.Page; diff --git a/src/main/java/com/zcloud/mapper/dsno1/risk/RiskPointMapper.java b/src/main/java/com/zcloud/mapper/dsno2/risk/RiskPointMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno1/risk/RiskPointMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/risk/RiskPointMapper.java index d52086f..2547377 100644 --- a/src/main/java/com/zcloud/mapper/dsno1/risk/RiskPointMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/risk/RiskPointMapper.java @@ -1,10 +1,10 @@ -package com.zcloud.mapper.dsno1.risk; +package com.zcloud.mapper.dsno2.risk; import java.util.List; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -/** +/** * 说明：风险点台账 * 作者：luoxiaobao * 时间：2020-12-29 @@ -14,35 +14,35 @@ public interface RiskPointMapper{ /**新增 * @param pd - * @return + * @return * @throws Exception */ void save(PageData pd); - + /**删除 * @param pd * @throws Exception */ void delete(PageData pd); - + /**删除 * @param pd * @throws Exception */ void deleteRes(PageData pd); - + /**修改 * @param pd * @throws Exception */ void edit(PageData pd); - + /**列表 * @param page * @throws Exception */ List datalistPage(Page page); - + /**列表(全部) * @param pd * @throws Exception @@ -55,19 +55,19 @@ public interface RiskPointMapper{ * @throws Exception */ PageData findById(PageData pd); - + /**通过id获取数据 * @param pd * @throws Exception */ PageData findByIdRes(PageData pd); - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception */ void deleteAll(String[] ArrayDATA_IDS); - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception @@ -80,9 +80,9 @@ public interface RiskPointMapper{ * @throws Exception */ List datalistPageForNameLikes(Page page); - + void editLonAndLat(PageData pd); - + String countByCorpInfo (PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/dsno1/risk/RiskUnitMapper.java b/src/main/java/com/zcloud/mapper/dsno2/risk/RiskUnitMapper.java similarity index 97% rename from src/main/java/com/zcloud/mapper/dsno1/risk/RiskUnitMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/risk/RiskUnitMapper.java index a54fa8c..a050463 100644 --- a/src/main/java/com/zcloud/mapper/dsno1/risk/RiskUnitMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/risk/RiskUnitMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno1.risk; +package com.zcloud.mapper.dsno2.risk; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/task/CourseExamMapper.java b/src/main/java/com/zcloud/mapper/dsno2/task/CourseExamMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno3/task/CourseExamMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/task/CourseExamMapper.java index d9693bc..2da3965 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/task/CourseExamMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/task/CourseExamMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.task; +package com.zcloud.mapper.dsno2.task; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/task/CourseExamRecordMapper.java b/src/main/java/com/zcloud/mapper/dsno2/task/CourseExamRecordMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno3/task/CourseExamRecordMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/task/CourseExamRecordMapper.java index ab76326..f66b3b3 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/task/CourseExamRecordMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/task/CourseExamRecordMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.task; +package com.zcloud.mapper.dsno2.task; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/task/CourseStudyMapper.java b/src/main/java/com/zcloud/mapper/dsno2/task/CourseStudyMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno3/task/CourseStudyMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/task/CourseStudyMapper.java index 3a60ca8..04979d4 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/task/CourseStudyMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/task/CourseStudyMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.task; +package com.zcloud.mapper.dsno2.task; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/task/CourseStudyRecordMapper.java b/src/main/java/com/zcloud/mapper/dsno2/task/CourseStudyRecordMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno3/task/CourseStudyRecordMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/task/CourseStudyRecordMapper.java index c148f39..46367c6 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/task/CourseStudyRecordMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/task/CourseStudyRecordMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.task; +package com.zcloud.mapper.dsno2.task; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/task/CourseStudyVideoRecordMapper.java b/src/main/java/com/zcloud/mapper/dsno2/task/CourseStudyVideoRecordMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno3/task/CourseStudyVideoRecordMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/task/CourseStudyVideoRecordMapper.java index 6696678..26393cf 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/task/CourseStudyVideoRecordMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/task/CourseStudyVideoRecordMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.task; +package com.zcloud.mapper.dsno2.task; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/task/StageExamMapper.java b/src/main/java/com/zcloud/mapper/dsno2/task/StageExamMapper.java similarity index 97% rename from src/main/java/com/zcloud/mapper/dsno3/task/StageExamMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/task/StageExamMapper.java index febe7d0..2774059 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/task/StageExamMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/task/StageExamMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.task; +package com.zcloud.mapper.dsno2.task; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/task/StageExamRecordMapper.java b/src/main/java/com/zcloud/mapper/dsno2/task/StageExamRecordMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno3/task/StageExamRecordMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/task/StageExamRecordMapper.java index c411404..9ee6022 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/task/StageExamRecordMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/task/StageExamRecordMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.task; +package com.zcloud.mapper.dsno2.task; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/task/StageStudentRelationMapper.java b/src/main/java/com/zcloud/mapper/dsno2/task/StageStudentRelationMapper.java similarity index 98% rename from src/main/java/com/zcloud/mapper/dsno3/task/StageStudentRelationMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/task/StageStudentRelationMapper.java index 4811585..93f450c 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/task/StageStudentRelationMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/task/StageStudentRelationMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.task; +package com.zcloud.mapper.dsno2.task; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/task/StudyTaskMapper.java b/src/main/java/com/zcloud/mapper/dsno2/task/StudyTaskMapper.java similarity index 97% rename from src/main/java/com/zcloud/mapper/dsno3/task/StudyTaskMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/task/StudyTaskMapper.java index ea6a96e..c04b4af 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/task/StudyTaskMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/task/StudyTaskMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.task; +package com.zcloud.mapper.dsno2.task; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/task/StudytaskCurriculumMapper.java b/src/main/java/com/zcloud/mapper/dsno2/task/StudytaskCurriculumMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno3/task/StudytaskCurriculumMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/task/StudytaskCurriculumMapper.java index 5e93f42..a06fcca 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/task/StudytaskCurriculumMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/task/StudytaskCurriculumMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.task; +package com.zcloud.mapper.dsno2.task; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/task/StudytaskSignMapper.java b/src/main/java/com/zcloud/mapper/dsno2/task/StudytaskSignMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno3/task/StudytaskSignMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/task/StudytaskSignMapper.java index ff523db..4e792f9 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/task/StudytaskSignMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/task/StudytaskSignMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.task; +package com.zcloud.mapper.dsno2.task; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/teacher/TeacherCertificateMapper.java b/src/main/java/com/zcloud/mapper/dsno2/teacher/TeacherCertificateMapper.java similarity index 97% rename from src/main/java/com/zcloud/mapper/dsno3/teacher/TeacherCertificateMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/teacher/TeacherCertificateMapper.java index d20e445..44e9bba 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/teacher/TeacherCertificateMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/teacher/TeacherCertificateMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.teacher; +package com.zcloud.mapper.dsno2.teacher; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mapper/dsno3/teacher/TeacherMapper.java b/src/main/java/com/zcloud/mapper/dsno2/teacher/TeacherMapper.java similarity index 96% rename from src/main/java/com/zcloud/mapper/dsno3/teacher/TeacherMapper.java rename to src/main/java/com/zcloud/mapper/dsno2/teacher/TeacherMapper.java index 7d45856..3e5acf8 100644 --- a/src/main/java/com/zcloud/mapper/dsno3/teacher/TeacherMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/teacher/TeacherMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.dsno3.teacher; +package com.zcloud.mapper.dsno2.teacher; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/service/alarm/impl/DBAlarmServiceImpl.java b/src/main/java/com/zcloud/service/alarm/impl/DBAlarmServiceImpl.java index 103f246..f13dcdf 100644 --- a/src/main/java/com/zcloud/service/alarm/impl/DBAlarmServiceImpl.java +++ b/src/main/java/com/zcloud/service/alarm/impl/DBAlarmServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.alarm.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.alarm.DBAlarmMapper; +import com.zcloud.mapper.dsno1.alarm.DBAlarmMapper; import com.zcloud.service.alarm.DBAlarmService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zcloud/service/alarm/impl/DeviceCorpServiceImpl.java b/src/main/java/com/zcloud/service/alarm/impl/DeviceCorpServiceImpl.java index ec69aa5..458786a 100644 --- a/src/main/java/com/zcloud/service/alarm/impl/DeviceCorpServiceImpl.java +++ b/src/main/java/com/zcloud/service/alarm/impl/DeviceCorpServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.alarm.impl; import java.util.List; -import com.zcloud.mapper.dsno2.alarm.DeviceCorpMapper; +import com.zcloud.mapper.dsno1.alarm.DeviceCorpMapper; import com.zcloud.service.alarm.DeviceCorpService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zcloud/service/api/impl/EducationApiServiceImpl.java b/src/main/java/com/zcloud/service/api/impl/EducationApiServiceImpl.java index 64690d4..f16cf12 100644 --- a/src/main/java/com/zcloud/service/api/impl/EducationApiServiceImpl.java +++ b/src/main/java/com/zcloud/service/api/impl/EducationApiServiceImpl.java @@ -1,7 +1,7 @@ package com.zcloud.service.api.impl; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.api.EducationApiMapper; +import com.zcloud.mapper.dsno1.api.EducationApiMapper; import com.zcloud.service.api.EducationApiService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zcloud/service/api/impl/OtherApiServiceImpl.java b/src/main/java/com/zcloud/service/api/impl/OtherApiServiceImpl.java index 2a4aae8..6049f5a 100644 --- a/src/main/java/com/zcloud/service/api/impl/OtherApiServiceImpl.java +++ b/src/main/java/com/zcloud/service/api/impl/OtherApiServiceImpl.java @@ -1,7 +1,7 @@ package com.zcloud.service.api.impl; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.api.OtherApiMapper; +import com.zcloud.mapper.dsno1.api.OtherApiMapper; import com.zcloud.service.api.OtherApiService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zcloud/service/api/impl/PreventionApiServiceImpl.java b/src/main/java/com/zcloud/service/api/impl/PreventionApiServiceImpl.java index 8ff988a..b233cc6 100644 --- a/src/main/java/com/zcloud/service/api/impl/PreventionApiServiceImpl.java +++ b/src/main/java/com/zcloud/service/api/impl/PreventionApiServiceImpl.java @@ -1,7 +1,7 @@ package com.zcloud.service.api.impl; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.api.PreventionApiMapper; +import com.zcloud.mapper.dsno1.api.PreventionApiMapper; import com.zcloud.service.api.PreventionApiService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zcloud/service/bus/impl/AIWarningServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/AIWarningServiceImpl.java index 0f2222b..b4adfd8 100644 --- a/src/main/java/com/zcloud/service/bus/impl/AIWarningServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/AIWarningServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.video.AIWarningMapper; +import com.zcloud.mapper.dsno1.video.AIWarningMapper; import com.zcloud.service.bus.AIWarningService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zcloud/service/bus/impl/AgentNumberServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/AgentNumberServiceImpl.java index 5a80f5d..9896938 100644 --- a/src/main/java/com/zcloud/service/bus/impl/AgentNumberServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/AgentNumberServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.agency.AgentNumberMapper; +import com.zcloud.mapper.dsno1.agency.AgentNumberMapper; import com.zcloud.service.bus.AgentNumberService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zcloud/service/bus/impl/AllWorkItemServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/AllWorkItemServiceImpl.java index 3675a5b..3de93ea 100644 --- a/src/main/java/com/zcloud/service/bus/impl/AllWorkItemServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/AllWorkItemServiceImpl.java @@ -1,6 +1,6 @@ package com.zcloud.service.bus.impl; -import com.zcloud.mapper.dsno2.corp.AllWorkItemMapper; +import com.zcloud.mapper.dsno1.corp.AllWorkItemMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/BillingManageServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/BillingManageServiceImpl.java index 59dd81c..2b0ef06 100644 --- a/src/main/java/com/zcloud/service/bus/impl/BillingManageServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/BillingManageServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.billing.BillingManageMapper; +import com.zcloud.mapper.dsno1.billing.BillingManageMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/CheckRecordServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/CheckRecordServiceImpl.java index c89f26d..7d801fd 100644 --- a/src/main/java/com/zcloud/service/bus/impl/CheckRecordServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/CheckRecordServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.check.CheckRecordMapper; +import com.zcloud.mapper.dsno1.check.CheckRecordMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/CheckUserServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/CheckUserServiceImpl.java index 57305b7..870fe0c 100644 --- a/src/main/java/com/zcloud/service/bus/impl/CheckUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/CheckUserServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.check.CheckUserMapper; +import com.zcloud.mapper.dsno1.check.CheckUserMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/CorpFuncServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/CorpFuncServiceImpl.java index 2e0ce96..6fd5570 100644 --- a/src/main/java/com/zcloud/service/bus/impl/CorpFuncServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/CorpFuncServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.corp.CorpFuncMapper; +import com.zcloud.mapper.dsno1.corp.CorpFuncMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/CorpInfo2ServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/CorpInfo2ServiceImpl.java index 94a832e..5e1b7d8 100644 --- a/src/main/java/com/zcloud/service/bus/impl/CorpInfo2ServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/CorpInfo2ServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.corp.CorpInfo2Mapper; +import com.zcloud.mapper.dsno1.corp.CorpInfo2Mapper; import com.zcloud.service.bus.CorpInfo2Service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zcloud/service/bus/impl/CorpInfo4ServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/CorpInfo4ServiceImpl.java index 01dab65..ea99da2 100644 --- a/src/main/java/com/zcloud/service/bus/impl/CorpInfo4ServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/CorpInfo4ServiceImpl.java @@ -3,7 +3,7 @@ package com.zcloud.service.bus.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.service.bus.CorpInfo4Service; -import com.zcloud.mapper.dsno2.video.CorpInfo4Mapper; +import com.zcloud.mapper.dsno1.video.CorpInfo4Mapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/CorpInfoServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/CorpInfoServiceImpl.java index 399d5e1..db6a086 100644 --- a/src/main/java/com/zcloud/service/bus/impl/CorpInfoServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/CorpInfoServiceImpl.java @@ -2,8 +2,8 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.corp.CorpInfoMapper; -import com.zcloud.mapper.dsno2.corp.ImplementationManagementMapper; +import com.zcloud.mapper.dsno1.corp.CorpInfoMapper; +import com.zcloud.mapper.dsno1.corp.ImplementationManagementMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/CorpPlsInfoServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/CorpPlsInfoServiceImpl.java index 3ad9119..85b1ea3 100644 --- a/src/main/java/com/zcloud/service/bus/impl/CorpPlsInfoServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/CorpPlsInfoServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import com.alibaba.fastjson.JSONObject; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.corp.CorpPlsInfoMapper; +import com.zcloud.mapper.dsno1.corp.CorpPlsInfoMapper; import com.zcloud.service.bus.CorpPlsInfoService; import com.zcloud.service.system.DepartmentService; import com.zcloud.service.system.OfficeService; diff --git a/src/main/java/com/zcloud/service/bus/impl/CorpTimeServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/CorpTimeServiceImpl.java index 56f716d..1283522 100644 --- a/src/main/java/com/zcloud/service/bus/impl/CorpTimeServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/CorpTimeServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.corp.CorpTimeMapper; +import com.zcloud.mapper.dsno1.corp.CorpTimeMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/CorpVisitServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/CorpVisitServiceImpl.java index de4e2e7..5087e8a 100644 --- a/src/main/java/com/zcloud/service/bus/impl/CorpVisitServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/CorpVisitServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.visit.CorpVisitMapper; +import com.zcloud.mapper.dsno1.visit.CorpVisitMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/CorpinfoRelatedServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/CorpinfoRelatedServiceImpl.java index 9478e1e..4a9edb0 100644 --- a/src/main/java/com/zcloud/service/bus/impl/CorpinfoRelatedServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/CorpinfoRelatedServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.corp.CorpinfoRelatedMapper; +import com.zcloud.mapper.dsno1.corp.CorpinfoRelatedMapper; import com.zcloud.service.bus.CorpinfoRelatedService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zcloud/service/bus/impl/ElectronicFenceServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/ElectronicFenceServiceImpl.java index f13c50f..16b1070 100644 --- a/src/main/java/com/zcloud/service/bus/impl/ElectronicFenceServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/ElectronicFenceServiceImpl.java @@ -1,16 +1,12 @@ package com.zcloud.service.bus.impl; -import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.corp.ElectronicFenceMapper; -import com.zcloud.service.bus.CorpInfoService; +import com.zcloud.mapper.dsno1.corp.ElectronicFenceMapper; import com.zcloud.service.bus.ElectronicFenceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.List; - /** * 说明：企业管理 * 作者：luoxiaobao diff --git a/src/main/java/com/zcloud/service/bus/impl/FuncServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/FuncServiceImpl.java index 155ba3d..eee5ec2 100644 --- a/src/main/java/com/zcloud/service/bus/impl/FuncServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/FuncServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.corp.FuncMapper; +import com.zcloud.mapper.dsno1.corp.FuncMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/HiddenCheckServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/HiddenCheckServiceImpl.java index 9343eb0..044c4bf 100644 --- a/src/main/java/com/zcloud/service/bus/impl/HiddenCheckServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/HiddenCheckServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno1.hidden.HiddenCheckMapper; +import com.zcloud.mapper.dsno2.hidden.HiddenCheckMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/HiddenSchemeServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/HiddenSchemeServiceImpl.java index 8d0a142..5f1fd0d 100644 --- a/src/main/java/com/zcloud/service/bus/impl/HiddenSchemeServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/HiddenSchemeServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno1.hidden.HiddenSchemeMapper;import org.springframework.beans.factory.annotation.Autowired; +import com.zcloud.mapper.dsno2.hidden.HiddenSchemeMapper;import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.zcloud.service.bus.HiddenSchemeService; diff --git a/src/main/java/com/zcloud/service/bus/impl/HiddenServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/HiddenServiceImpl.java index bfc215e..3f79860 100644 --- a/src/main/java/com/zcloud/service/bus/impl/HiddenServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/HiddenServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno1.hidden.HiddenMapper; +import com.zcloud.mapper.dsno2.hidden.HiddenMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/IdeRepositoryServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/IdeRepositoryServiceImpl.java index 128c6ba..bbbb3af 100644 --- a/src/main/java/com/zcloud/service/bus/impl/IdeRepositoryServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/IdeRepositoryServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.risk.IdeRepositoryMapper; +import com.zcloud.mapper.dsno1.risk.IdeRepositoryMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/ImgFileServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/ImgFileServiceImpl.java index 48cc546..8fb2a2e 100644 --- a/src/main/java/com/zcloud/service/bus/impl/ImgFileServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/ImgFileServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.system.ImgFileMapper; +import com.zcloud.mapper.dsno1.system.ImgFileMapper; import com.zcloud.service.bus.ImgFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zcloud/service/bus/impl/ImgFilesServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/ImgFilesServiceImpl.java index cfd45be..84dc385 100644 --- a/src/main/java/com/zcloud/service/bus/impl/ImgFilesServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/ImgFilesServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.system.ImgFilesMapper; +import com.zcloud.mapper.dsno1.system.ImgFilesMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/ListStatisticsServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/ListStatisticsServiceImpl.java index aac71a7..861d3c7 100644 --- a/src/main/java/com/zcloud/service/bus/impl/ListStatisticsServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/ListStatisticsServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.check.ListStatisticsMapper; +import com.zcloud.mapper.dsno1.check.ListStatisticsMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/MSMLoginServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/MSMLoginServiceImpl.java index 7b9fbcc..f7be546 100644 --- a/src/main/java/com/zcloud/service/bus/impl/MSMLoginServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/MSMLoginServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.system.MSMLoginMapper; +import com.zcloud.mapper.dsno1.system.MSMLoginMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/MaintenanceFlowServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/MaintenanceFlowServiceImpl.java index b53b549..8cf8036 100644 --- a/src/main/java/com/zcloud/service/bus/impl/MaintenanceFlowServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/MaintenanceFlowServiceImpl.java @@ -1,7 +1,7 @@ package com.zcloud.service.bus.impl; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.corp.MaintenanceFlowMapper; +import com.zcloud.mapper.dsno1.corp.MaintenanceFlowMapper; import com.zcloud.service.bus.MaintenanceFlowService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zcloud/service/bus/impl/MaintenanceManagementServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/MaintenanceManagementServiceImpl.java index 67586ae..8931fc3 100644 --- a/src/main/java/com/zcloud/service/bus/impl/MaintenanceManagementServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/MaintenanceManagementServiceImpl.java @@ -1,7 +1,7 @@ package com.zcloud.service.bus.impl; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.corp.MaintenanceManagementMapper; +import com.zcloud.mapper.dsno1.corp.MaintenanceManagementMapper; import com.zcloud.service.bus.MaintenanceManagementService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zcloud/service/bus/impl/MaintenanceUserInfoServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/MaintenanceUserInfoServiceImpl.java index 01add60..2090b98 100644 --- a/src/main/java/com/zcloud/service/bus/impl/MaintenanceUserInfoServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/MaintenanceUserInfoServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.corp.MaintenanceUserInfoMapper; +import com.zcloud.mapper.dsno1.corp.MaintenanceUserInfoMapper; import com.zcloud.service.bus.MaintenanceUserInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zcloud/service/bus/impl/NoticeCorpServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/NoticeCorpServiceImpl.java index cc39db5..4c79723 100644 --- a/src/main/java/com/zcloud/service/bus/impl/NoticeCorpServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/NoticeCorpServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.notice.NoticeCorpMapper; +import com.zcloud.mapper.dsno1.notice.NoticeCorpMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/NoticeCorpUserIdServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/NoticeCorpUserIdServiceImpl.java index 921d61e..c6dd76d 100644 --- a/src/main/java/com/zcloud/service/bus/impl/NoticeCorpUserIdServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/NoticeCorpUserIdServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.notice.NoticeCorpUserIdMapper; +import com.zcloud.mapper.dsno1.notice.NoticeCorpUserIdMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/NoticeLogServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/NoticeLogServiceImpl.java index 550f53c..55ca016 100644 --- a/src/main/java/com/zcloud/service/bus/impl/NoticeLogServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/NoticeLogServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.notice.NoticeLogMapper; +import com.zcloud.mapper.dsno1.notice.NoticeLogMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/QualificationsServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/QualificationsServiceImpl.java index 99a7b67..5ddb371 100644 --- a/src/main/java/com/zcloud/service/bus/impl/QualificationsServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/QualificationsServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.corp.QualificationsMapper; +import com.zcloud.mapper.dsno1.corp.QualificationsMapper; import com.zcloud.service.bus.QualificationsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zcloud/service/bus/impl/RecordItemServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/RecordItemServiceImpl.java index 9ec6f17..523c6f3 100644 --- a/src/main/java/com/zcloud/service/bus/impl/RecordItemServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/RecordItemServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.check.RecordItemMapper; +import com.zcloud.mapper.dsno1.check.RecordItemMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/ResourceCorpServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/ResourceCorpServiceImpl.java index a57aed2..01df5a7 100644 --- a/src/main/java/com/zcloud/service/bus/impl/ResourceCorpServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/ResourceCorpServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.risk.ResourceCorpMapper; +import com.zcloud.mapper.dsno1.risk.ResourceCorpMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/RiskPointServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/RiskPointServiceImpl.java index 03f8ae4..985415e 100644 --- a/src/main/java/com/zcloud/service/bus/impl/RiskPointServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/RiskPointServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno1.risk.RiskPointMapper; +import com.zcloud.mapper.dsno2.risk.RiskPointMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/SMSManagementServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/SMSManagementServiceImpl.java index e7d69c9..8e9d4cc 100644 --- a/src/main/java/com/zcloud/service/bus/impl/SMSManagementServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/SMSManagementServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.system.SMSManagementMapper; +import com.zcloud.mapper.dsno1.system.SMSManagementMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/ScheduleServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/ScheduleServiceImpl.java index 4321aab..f5210d3 100644 --- a/src/main/java/com/zcloud/service/bus/impl/ScheduleServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/ScheduleServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.system.ScheduleMapper; +import com.zcloud.mapper.dsno1.system.ScheduleMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/ServiceNoticeServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/ServiceNoticeServiceImpl.java index f07322e..06af286 100644 --- a/src/main/java/com/zcloud/service/bus/impl/ServiceNoticeServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/ServiceNoticeServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.notice.ServiceNoticeMapper; +import com.zcloud.mapper.dsno1.notice.ServiceNoticeMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/ShiftWorkPeriodServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/ShiftWorkPeriodServiceImpl.java index 7839d5e..e807606 100644 --- a/src/main/java/com/zcloud/service/bus/impl/ShiftWorkPeriodServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/ShiftWorkPeriodServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.scheduling.ShiftWorkPeriodMapper; +import com.zcloud.mapper.dsno1.scheduling.ShiftWorkPeriodMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/ShiftWorkRulesServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/ShiftWorkRulesServiceImpl.java index 77f2583..e53feca 100644 --- a/src/main/java/com/zcloud/service/bus/impl/ShiftWorkRulesServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/ShiftWorkRulesServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.scheduling.ShiftWorkRulesMapper; +import com.zcloud.mapper.dsno1.scheduling.ShiftWorkRulesMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/SysPathServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/SysPathServiceImpl.java index 5b65565..a1e80c8 100644 --- a/src/main/java/com/zcloud/service/bus/impl/SysPathServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/SysPathServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.system.SysPathMapper; +import com.zcloud.mapper.dsno1.system.SysPathMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/TokenServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/TokenServiceImpl.java index eb237c5..f94c74e 100644 --- a/src/main/java/com/zcloud/service/bus/impl/TokenServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/TokenServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.token.TokenMapper; +import com.zcloud.mapper.dsno1.token.TokenMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/VIPAdjustmentLogServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/VIPAdjustmentLogServiceImpl.java index c1e0fc7..8ddd76b 100644 --- a/src/main/java/com/zcloud/service/bus/impl/VIPAdjustmentLogServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/VIPAdjustmentLogServiceImpl.java @@ -1,7 +1,7 @@ package com.zcloud.service.bus.impl; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.corp.VIPAdjustmentLogMapper; +import com.zcloud.mapper.dsno1.corp.VIPAdjustmentLogMapper; import com.zcloud.service.bus.VIPAdjustmentLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zcloud/service/bus/impl/VersionManagerServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/VersionManagerServiceImpl.java index 8da0689..c06e9c7 100644 --- a/src/main/java/com/zcloud/service/bus/impl/VersionManagerServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/VersionManagerServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.system.VersionManagerMapper; +import com.zcloud.mapper.dsno1.system.VersionManagerMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/VersionUrlServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/VersionUrlServiceImpl.java index 8932f40..e18ea0d 100644 --- a/src/main/java/com/zcloud/service/bus/impl/VersionUrlServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/VersionUrlServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.system.VersionUrlMapper; +import com.zcloud.mapper.dsno1.system.VersionUrlMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/VideoManagerServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/VideoManagerServiceImpl.java index 4d9fd7f..2687f2c 100644 --- a/src/main/java/com/zcloud/service/bus/impl/VideoManagerServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/VideoManagerServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.video.VideoManagerMapper; +import com.zcloud.mapper.dsno1.video.VideoManagerMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/bus/impl/VideoServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/VideoServiceImpl.java index 8f40671..41f3cfd 100644 --- a/src/main/java/com/zcloud/service/bus/impl/VideoServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/VideoServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.bus.impl; import java.util.List; -import com.zcloud.mapper.dsno2.video.VideoMapper; +import com.zcloud.mapper.dsno1.video.VideoMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/depository/impl/HiddenLibraryServiceImpl.java b/src/main/java/com/zcloud/service/depository/impl/HiddenLibraryServiceImpl.java index 19bf47d..1088b1d 100644 --- a/src/main/java/com/zcloud/service/depository/impl/HiddenLibraryServiceImpl.java +++ b/src/main/java/com/zcloud/service/depository/impl/HiddenLibraryServiceImpl.java @@ -3,7 +3,7 @@ package com.zcloud.service.depository.impl; import com.alibaba.excel.EasyExcel; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno1.depository.HiddenLibraryMapper; +import com.zcloud.mapper.dsno2.depository.HiddenLibraryMapper; import com.zcloud.service.depository.HiddenLibraryService; import com.zcloud.service.system.DictionariesService; import com.zcloud.util.Warden; diff --git a/src/main/java/com/zcloud/service/depository/impl/LabelFacoryServiceImpl.java b/src/main/java/com/zcloud/service/depository/impl/LabelFacoryServiceImpl.java index 01215d0..e79f29e 100644 --- a/src/main/java/com/zcloud/service/depository/impl/LabelFacoryServiceImpl.java +++ b/src/main/java/com/zcloud/service/depository/impl/LabelFacoryServiceImpl.java @@ -3,7 +3,7 @@ package com.zcloud.service.depository.impl; import com.alibaba.fastjson.JSONArray; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno1.depository.LabelFactoryMapper; +import com.zcloud.mapper.dsno2.depository.LabelFactoryMapper; import com.zcloud.service.depository.LabelFactoryService; import com.zcloud.util.DateUtil; import com.zcloud.util.Jurisdiction; diff --git a/src/main/java/com/zcloud/service/depository/impl/RiskUnitServiceImpl.java b/src/main/java/com/zcloud/service/depository/impl/RiskUnitServiceImpl.java index 2dcc772..a07d0fc 100644 --- a/src/main/java/com/zcloud/service/depository/impl/RiskUnitServiceImpl.java +++ b/src/main/java/com/zcloud/service/depository/impl/RiskUnitServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.depository.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno1.risk.RiskUnitMapper; +import com.zcloud.mapper.dsno2.risk.RiskUnitMapper; import com.zcloud.service.depository.RiskUnitService; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zcloud/service/depository/impl/TextLibraryServiceImpl.java b/src/main/java/com/zcloud/service/depository/impl/TextLibraryServiceImpl.java index 73d9a41..5c7daa5 100644 --- a/src/main/java/com/zcloud/service/depository/impl/TextLibraryServiceImpl.java +++ b/src/main/java/com/zcloud/service/depository/impl/TextLibraryServiceImpl.java @@ -2,27 +2,19 @@ package com.zcloud.service.depository.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno1.depository.LibraryLabelsMapper; -import com.zcloud.mapper.dsno1.depository.LibraryLogMapper; -import com.zcloud.mapper.dsno1.depository.TextInfoMapper; -import com.zcloud.mapper.dsno1.depository.TextLibraryMapper; +import com.zcloud.mapper.dsno2.depository.LibraryLabelsMapper; +import com.zcloud.mapper.dsno2.depository.LibraryLogMapper; +import com.zcloud.mapper.dsno2.depository.TextInfoMapper; +import com.zcloud.mapper.dsno2.depository.TextLibraryMapper; import com.zcloud.service.depository.TextLibraryService; import com.zcloud.util.*; import org.apache.commons.lang.StringUtils; -import org.apache.poi.xwpf.usermodel.*; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.STJc; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; -import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; -import java.io.BufferedOutputStream; -import java.io.FileOutputStream; -import java.io.OutputStream; -import java.nio.charset.StandardCharsets; -import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; diff --git a/src/main/java/com/zcloud/service/dockingManagement/impl/KeyProcessesServiceImpl.java b/src/main/java/com/zcloud/service/dockingManagement/impl/KeyProcessesServiceImpl.java index 0bd52a6..68c3a4e 100644 --- a/src/main/java/com/zcloud/service/dockingManagement/impl/KeyProcessesServiceImpl.java +++ b/src/main/java/com/zcloud/service/dockingManagement/impl/KeyProcessesServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.dockingManagement.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.dockingManagement.KeyProcessesMapper; +import com.zcloud.mapper.dsno1.dockingManagement.KeyProcessesMapper; import com.zcloud.service.dockingManagement.KeyProcessesService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zcloud/service/dockingManagement/impl/ResponsiblePersonServiceImpl.java b/src/main/java/com/zcloud/service/dockingManagement/impl/ResponsiblePersonServiceImpl.java index cb66473..29a4aa4 100644 --- a/src/main/java/com/zcloud/service/dockingManagement/impl/ResponsiblePersonServiceImpl.java +++ b/src/main/java/com/zcloud/service/dockingManagement/impl/ResponsiblePersonServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.dockingManagement.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.dockingManagement.ResponsiblePersonMapper; +import com.zcloud.mapper.dsno1.dockingManagement.ResponsiblePersonMapper; import com.zcloud.service.dockingManagement.ResponsiblePersonService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zcloud/service/dockingManagement/impl/SpecialInspectionServiceImpl.java b/src/main/java/com/zcloud/service/dockingManagement/impl/SpecialInspectionServiceImpl.java index f056c58..1510a12 100644 --- a/src/main/java/com/zcloud/service/dockingManagement/impl/SpecialInspectionServiceImpl.java +++ b/src/main/java/com/zcloud/service/dockingManagement/impl/SpecialInspectionServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.dockingManagement.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.dockingManagement.SpecialInspectionMapper; +import com.zcloud.mapper.dsno1.dockingManagement.SpecialInspectionMapper; import com.zcloud.service.dockingManagement.SpecialInspectionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zcloud/service/filemanager/impl/MfolderServiceImpl.java b/src/main/java/com/zcloud/service/filemanager/impl/MfolderServiceImpl.java index 20e944d..cfc7abe 100644 --- a/src/main/java/com/zcloud/service/filemanager/impl/MfolderServiceImpl.java +++ b/src/main/java/com/zcloud/service/filemanager/impl/MfolderServiceImpl.java @@ -3,7 +3,7 @@ package com.zcloud.service.filemanager.impl; import java.util.ConcurrentModificationException; import java.util.List; -import com.zcloud.mapper.dsno2.corp.MfolderMapper; +import com.zcloud.mapper.dsno1.corp.MfolderMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/filemanager/impl/MfolderStipulateServiceImpl.java b/src/main/java/com/zcloud/service/filemanager/impl/MfolderStipulateServiceImpl.java index 07c63a6..6501f42 100644 --- a/src/main/java/com/zcloud/service/filemanager/impl/MfolderStipulateServiceImpl.java +++ b/src/main/java/com/zcloud/service/filemanager/impl/MfolderStipulateServiceImpl.java @@ -3,7 +3,7 @@ package com.zcloud.service.filemanager.impl; import java.util.ConcurrentModificationException; import java.util.List; -import com.zcloud.mapper.dsno1.filemanager.MfolderStipulateMapper; +import com.zcloud.mapper.dsno2.filemanager.MfolderStipulateMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CommonItemServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CommonItemServiceImpl.java index ad2bfab..9f5f04e 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CommonItemServiceImpl.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CommonItemServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.hiddenDangerCheckStandard.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.hiddenDangerCheckStandard.CommonItemMapper; +import com.zcloud.mapper.dsno1.hiddenDangerCheckStandard.CommonItemMapper; import com.zcloud.service.hiddenDangerCheckStandard.CommonItemService; import com.zcloud.service.hiddenDangerCheckStandard.CommonService; import com.zcloud.service.hiddenDangerCheckStandard.DictionaryService; diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CommonServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CommonServiceImpl.java index 1ab0abb..4cc89f8 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CommonServiceImpl.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/CommonServiceImpl.java @@ -3,7 +3,7 @@ package com.zcloud.service.hiddenDangerCheckStandard.impl; import com.alibaba.excel.EasyExcel; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.hiddenDangerCheckStandard.CommonMapper; +import com.zcloud.mapper.dsno1.hiddenDangerCheckStandard.CommonMapper; import com.zcloud.service.hiddenDangerCheckStandard.CommonItemService; import com.zcloud.service.hiddenDangerCheckStandard.CommonService; import com.zcloud.service.hiddenDangerCheckStandard.DictionaryService; diff --git a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/DictionaryServiceImpl.java b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/DictionaryServiceImpl.java index 8c874d6..936c2e9 100644 --- a/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/DictionaryServiceImpl.java +++ b/src/main/java/com/zcloud/service/hiddenDangerCheckStandard/impl/DictionaryServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.hiddenDangerCheckStandard.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.hiddenDangerCheckStandard.DictionaryMapper; +import com.zcloud.mapper.dsno1.hiddenDangerCheckStandard.DictionaryMapper; import com.zcloud.service.hiddenDangerCheckStandard.DictionaryService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/notice/impl/NoticeRemindLogServiceImpl.java b/src/main/java/com/zcloud/service/notice/impl/NoticeRemindLogServiceImpl.java index c2988a1..eada0cf 100644 --- a/src/main/java/com/zcloud/service/notice/impl/NoticeRemindLogServiceImpl.java +++ b/src/main/java/com/zcloud/service/notice/impl/NoticeRemindLogServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.notice.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.notice.NoticeRemindLogMapper; +import com.zcloud.mapper.dsno1.notice.NoticeRemindLogMapper; import com.zcloud.service.notice.NoticeRemindLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zcloud/service/notice/impl/NoticeTemplateServiceImpl.java b/src/main/java/com/zcloud/service/notice/impl/NoticeTemplateServiceImpl.java index 9dc0a7a..5dabfd5 100644 --- a/src/main/java/com/zcloud/service/notice/impl/NoticeTemplateServiceImpl.java +++ b/src/main/java/com/zcloud/service/notice/impl/NoticeTemplateServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.notice.impl; import java.util.List; -import com.zcloud.mapper.dsno2.notice.NoticeTemplateMapper; +import com.zcloud.mapper.dsno1.notice.NoticeTemplateMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/ChapterServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/ChapterServiceImpl.java index 3b8c32a..f8c92d8 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/ChapterServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/ChapterServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.curriculum.ChapterMapper; +import com.zcloud.mapper.dsno2.curriculum.ChapterMapper; import com.zcloud.service.onlinexxks.ChapterService; /** diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/CourseExamRecordServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/CourseExamRecordServiceImpl.java index 4383ed6..162ff07 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/CourseExamRecordServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/CourseExamRecordServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.task.CourseExamRecordMapper; +import com.zcloud.mapper.dsno2.task.CourseExamRecordMapper; import com.zcloud.service.onlinexxks.CourseExamRecordService; /** diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/CourseExamServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/CourseExamServiceImpl.java index 4703cfb..8e0ec66 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/CourseExamServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/CourseExamServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.task.CourseExamMapper; +import com.zcloud.mapper.dsno2.task.CourseExamMapper; import com.zcloud.service.onlinexxks.CourseExamRecordService; import com.zcloud.service.onlinexxks.CourseExamService; import com.zcloud.service.onlinexxks.CourseStudentRelationService; diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/CourseStudentRelationServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/CourseStudentRelationServiceImpl.java index 628ed5a..3d98d43 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/CourseStudentRelationServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/CourseStudentRelationServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.curriculum.CourseStudentRelationMapper; +import com.zcloud.mapper.dsno2.curriculum.CourseStudentRelationMapper; import com.zcloud.service.onlinexxks.CourseStudentRelationService; import com.zcloud.service.system.UsersService; import com.zcloud.util.UuidUtil; diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/CourseStudyRecordServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/CourseStudyRecordServiceImpl.java index 734f434..4614120 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/CourseStudyRecordServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/CourseStudyRecordServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.task.CourseStudyRecordMapper; +import com.zcloud.mapper.dsno2.task.CourseStudyRecordMapper; import com.zcloud.service.onlinexxks.CourseStudyRecordService; /** diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/CourseStudyServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/CourseStudyServiceImpl.java index 53b8dd2..a24f507 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/CourseStudyServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/CourseStudyServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.task.CourseStudyMapper; +import com.zcloud.mapper.dsno2.task.CourseStudyMapper; import com.zcloud.service.onlinexxks.CourseStudentRelationService; import com.zcloud.service.onlinexxks.CourseStudyRecordService; import com.zcloud.service.onlinexxks.CourseStudyService; diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/CourseStudyVideoRecordServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/CourseStudyVideoRecordServiceImpl.java index a42cd57..e93da3f 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/CourseStudyVideoRecordServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/CourseStudyVideoRecordServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.task.CourseStudyVideoRecordMapper; +import com.zcloud.mapper.dsno2.task.CourseStudyVideoRecordMapper; import com.zcloud.service.onlinexxks.CourseStudyVideoRecordService; /** diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/CoursectkServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/CoursectkServiceImpl.java index df810b6..45e0676 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/CoursectkServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/CoursectkServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.onlinexxks.CoursectkMapper; +import com.zcloud.mapper.dsno2.onlinexxks.CoursectkMapper; import com.zcloud.service.onlinexxks.CoursectkService; /** diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/CoursemiddleServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/CoursemiddleServiceImpl.java index c70bb16..f07f72e 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/CoursemiddleServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/CoursemiddleServiceImpl.java @@ -9,7 +9,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.curriculum.CoursemiddleMapper; +import com.zcloud.mapper.dsno2.curriculum.CoursemiddleMapper; import com.zcloud.service.onlinexxks.CoursemiddleService; import com.zcloud.util.DateUtil; import com.zcloud.util.Jurisdiction; diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/CoursepapersServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/CoursepapersServiceImpl.java index 97bc529..e4b8a4a 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/CoursepapersServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/CoursepapersServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.curriculum.CoursepapersMapper; +import com.zcloud.mapper.dsno2.curriculum.CoursepapersMapper; import com.zcloud.service.onlinexxks.CoursemiddleService; import com.zcloud.service.onlinexxks.CoursepapersService; import com.zcloud.service.onlinexxks.QuestionService; diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/CourserecordServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/CourserecordServiceImpl.java index d736761..8179ead 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/CourserecordServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/CourserecordServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.onlinexxks.CourserecordMapper; +import com.zcloud.mapper.dsno2.onlinexxks.CourserecordMapper; import com.zcloud.service.onlinexxks.CourserecordService; /** diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/CoursewareRelationServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/CoursewareRelationServiceImpl.java index cfdbf97..337f465 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/CoursewareRelationServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/CoursewareRelationServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.relation.CoursewareRelationMapper; +import com.zcloud.mapper.dsno2.relation.CoursewareRelationMapper; import com.zcloud.service.onlinexxks.CoursewareRelationService; import com.zcloud.util.Tools; import com.zcloud.util.UuidUtil; @@ -115,7 +115,7 @@ public class CoursewareRelationServiceImpl implements CoursewareRelationService } } } - + /**新增字典关联表。通用 * @param pd 课件信息 * @throws Exception diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/CurriculumServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/CurriculumServiceImpl.java index 074bd46..2f30536 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/CurriculumServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/CurriculumServiceImpl.java @@ -9,7 +9,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.curriculum.CurriculumMapper; +import com.zcloud.mapper.dsno2.curriculum.CurriculumMapper; import com.zcloud.service.onlinexxks.CourseStudentRelationService; import com.zcloud.service.onlinexxks.CoursemiddleService; import com.zcloud.service.onlinexxks.CoursepapersService; diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/DataCoursewareServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/DataCoursewareServiceImpl.java index e49167e..8913208 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/DataCoursewareServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/DataCoursewareServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.courseware.DataCoursewareMapper; +import com.zcloud.mapper.dsno2.courseware.DataCoursewareMapper; import com.zcloud.service.onlinexxks.DataCoursewareService; /** diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/KcmiddlekjServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/KcmiddlekjServiceImpl.java index 478a3a0..07ce88d 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/KcmiddlekjServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/KcmiddlekjServiceImpl.java @@ -10,7 +10,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.curriculum.KcmiddlekjMapper; +import com.zcloud.mapper.dsno2.curriculum.KcmiddlekjMapper; import com.zcloud.service.onlinexxks.KcmiddlekjService; import com.zcloud.util.DateUtil; import com.zcloud.util.Jurisdiction; diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/QuestionServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/QuestionServiceImpl.java index d11712b..f6b62ae 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/QuestionServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/QuestionServiceImpl.java @@ -10,7 +10,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.courseware.QuestionMapper; +import com.zcloud.mapper.dsno2.courseware.QuestionMapper; import com.zcloud.service.onlinexxks.QuestionService; /** diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/StageExamPaperCoursewareServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/StageExamPaperCoursewareServiceImpl.java index d5abe5d..3531641 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/StageExamPaperCoursewareServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/StageExamPaperCoursewareServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.paper.StageExamPaperCoursewareMapper; +import com.zcloud.mapper.dsno2.paper.StageExamPaperCoursewareMapper; import com.zcloud.service.onlinexxks.StageExamPaperCoursewareService; import com.zcloud.util.UuidUtil; diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/StageExamPaperInputQuestionServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/StageExamPaperInputQuestionServiceImpl.java index 5d4d1b3..54ab80e 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/StageExamPaperInputQuestionServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/StageExamPaperInputQuestionServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.paper.StageExamPaperInputQuestionMapper; +import com.zcloud.mapper.dsno2.paper.StageExamPaperInputQuestionMapper; import com.zcloud.service.onlinexxks.StageExamPaperInputQuestionService; import com.zcloud.util.UuidUtil; diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/StageExamPaperQuestionServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/StageExamPaperQuestionServiceImpl.java index 3c8202e..714f8a0 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/StageExamPaperQuestionServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/StageExamPaperQuestionServiceImpl.java @@ -8,8 +8,8 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.paper.StageExamPaperInputQuestionMapper; -import com.zcloud.mapper.dsno3.paper.StageExamPaperQuestionMapper; +import com.zcloud.mapper.dsno2.paper.StageExamPaperInputQuestionMapper; +import com.zcloud.mapper.dsno2.paper.StageExamPaperQuestionMapper; import com.zcloud.service.onlinexxks.StageExamPaperQuestionService; import com.zcloud.util.UuidUtil; diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/StageExamRecordServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/StageExamRecordServiceImpl.java index a1684dc..2900441 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/StageExamRecordServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/StageExamRecordServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.task.StageExamRecordMapper; +import com.zcloud.mapper.dsno2.task.StageExamRecordMapper; import com.zcloud.service.onlinexxks.StageExamRecordService; /** diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/StageExamServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/StageExamServiceImpl.java index ac39bc0..39fe77d 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/StageExamServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/StageExamServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.task.StageExamMapper; +import com.zcloud.mapper.dsno2.task.StageExamMapper; import com.zcloud.service.onlinexxks.StageExamRecordService; import com.zcloud.service.onlinexxks.StageExamService; import com.zcloud.service.onlinexxks.StageStudentRelationService; diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/StageStudentRelationServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/StageStudentRelationServiceImpl.java index 07b5751..2217ad5 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/StageStudentRelationServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/StageStudentRelationServiceImpl.java @@ -9,7 +9,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.task.StageStudentRelationMapper; +import com.zcloud.mapper.dsno2.task.StageStudentRelationMapper; import com.zcloud.service.onlinexxks.KcmiddlekjService; import com.zcloud.service.onlinexxks.StageStudentRelationService; import com.zcloud.util.Tools; diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/StageexamctkServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/StageexamctkServiceImpl.java index f783782..0c412d1 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/StageexamctkServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/StageexamctkServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.onlinexxks.StageexamctkMapper; +import com.zcloud.mapper.dsno2.onlinexxks.StageexamctkMapper; import com.zcloud.service.onlinexxks.StageexamctkService; /** diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/StageexammiddleServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/StageexammiddleServiceImpl.java index b113041..870f628 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/StageexammiddleServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/StageexammiddleServiceImpl.java @@ -9,7 +9,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.onlinexxks.StageexammiddleMapper; +import com.zcloud.mapper.dsno2.onlinexxks.StageexammiddleMapper; import com.zcloud.service.onlinexxks.StageexammiddleService; import com.zcloud.util.DateUtil; import com.zcloud.util.Jurisdiction; diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/StageexampaperInputServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/StageexampaperInputServiceImpl.java index e15225f..c9f9952 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/StageexampaperInputServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/StageexampaperInputServiceImpl.java @@ -10,7 +10,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.paper.StageexampaperInputMapper; +import com.zcloud.mapper.dsno2.paper.StageexampaperInputMapper; import com.zcloud.service.onlinexxks.QuestionService; import com.zcloud.service.onlinexxks.StageExamPaperInputQuestionService; import com.zcloud.service.onlinexxks.StageexampaperInputService; diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/StageexampaperServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/StageexampaperServiceImpl.java index 22b1152..7b1aad1 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/StageexampaperServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/StageexampaperServiceImpl.java @@ -10,7 +10,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.paper.StageexampaperMapper; +import com.zcloud.mapper.dsno2.paper.StageexampaperMapper; import com.zcloud.service.onlinexxks.QuestionService; import com.zcloud.service.onlinexxks.StageExamPaperCoursewareService; import com.zcloud.service.onlinexxks.StageExamPaperQuestionService; diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/StudyTaskServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/StudyTaskServiceImpl.java index 8bca847..9415a8b 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/StudyTaskServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/StudyTaskServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.task.StudyTaskMapper; +import com.zcloud.mapper.dsno2.task.StudyTaskMapper; import com.zcloud.service.onlinexxks.StudyTaskService; /** diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/StudytaskCurriculumServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/StudytaskCurriculumServiceImpl.java index 6ab58f8..f833851 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/StudytaskCurriculumServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/StudytaskCurriculumServiceImpl.java @@ -11,8 +11,8 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.curriculum.KcmiddlekjMapper; -import com.zcloud.mapper.dsno3.task.StudytaskCurriculumMapper; +import com.zcloud.mapper.dsno2.curriculum.KcmiddlekjMapper; +import com.zcloud.mapper.dsno2.task.StudytaskCurriculumMapper; import com.zcloud.service.onlinexxks.StudytaskCurriculumService; import com.zcloud.util.UuidUtil; diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/StudytaskSignServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/StudytaskSignServiceImpl.java index 533ada6..757b589 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/StudytaskSignServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/StudytaskSignServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.task.StudytaskSignMapper; +import com.zcloud.mapper.dsno2.task.StudytaskSignMapper; import com.zcloud.service.onlinexxks.StudytaskSignService; import com.zcloud.util.Tools; import com.zcloud.util.UuidUtil; diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/TeacherCertificateServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/TeacherCertificateServiceImpl.java index 58de2f6..3800161 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/TeacherCertificateServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/TeacherCertificateServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.teacher.TeacherCertificateMapper; +import com.zcloud.mapper.dsno2.teacher.TeacherCertificateMapper; import com.zcloud.service.onlinexxks.TeacherCertificateService; /** diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/TeacherServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/TeacherServiceImpl.java index 9aa5b5f..5951763 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/TeacherServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/TeacherServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.teacher.TeacherMapper; +import com.zcloud.mapper.dsno2.teacher.TeacherMapper; import com.zcloud.service.onlinexxks.TeacherCertificateService; import com.zcloud.service.onlinexxks.TeacherService; diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/VideoCoursewareServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/VideoCoursewareServiceImpl.java index 4a2c449..d38ed2e 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/VideoCoursewareServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/VideoCoursewareServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.courseware.VideoCoursewareMapper; +import com.zcloud.mapper.dsno2.courseware.VideoCoursewareMapper; import com.zcloud.service.onlinexxks.VideoCoursewareService; /** diff --git a/src/main/java/com/zcloud/service/onlinexxks/impl/VideocoursewareRecordServiceImpl.java b/src/main/java/com/zcloud/service/onlinexxks/impl/VideocoursewareRecordServiceImpl.java index 3a6629e..1aadc47 100644 --- a/src/main/java/com/zcloud/service/onlinexxks/impl/VideocoursewareRecordServiceImpl.java +++ b/src/main/java/com/zcloud/service/onlinexxks/impl/VideocoursewareRecordServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.onlinexxks.VideocoursewareRecordMapper; +import com.zcloud.mapper.dsno2.onlinexxks.VideocoursewareRecordMapper; import com.zcloud.service.onlinexxks.VideocoursewareRecordService; /** diff --git a/src/main/java/com/zcloud/service/questionnaire/impl/QuestionitemServiceImpl.java b/src/main/java/com/zcloud/service/questionnaire/impl/QuestionitemServiceImpl.java index 31c1ce0..a5111c9 100644 --- a/src/main/java/com/zcloud/service/questionnaire/impl/QuestionitemServiceImpl.java +++ b/src/main/java/com/zcloud/service/questionnaire/impl/QuestionitemServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.questionnaire.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.questionnaire.QuestionitemMapper; +import com.zcloud.mapper.dsno2.questionnaire.QuestionitemMapper; import com.zcloud.service.questionnaire.QuestionitemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zcloud/service/questionnaire/impl/SurveyServiceImpl.java b/src/main/java/com/zcloud/service/questionnaire/impl/SurveyServiceImpl.java index a6e2d15..49d059c 100644 --- a/src/main/java/com/zcloud/service/questionnaire/impl/SurveyServiceImpl.java +++ b/src/main/java/com/zcloud/service/questionnaire/impl/SurveyServiceImpl.java @@ -2,11 +2,10 @@ package com.zcloud.service.questionnaire.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.questionnaire.SurveyMapper; +import com.zcloud.mapper.dsno2.questionnaire.SurveyMapper; import com.zcloud.service.questionnaire.QuestionitemService; import com.zcloud.service.questionnaire.SurveyService; import com.zcloud.service.questionnaire.SurveyquestionService; -import com.zcloud.service.questionnaire.QuestionitemService; //import com.zcloud.service.questionnaire.SurveyanswerService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -14,7 +13,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; -import java.util.Random; /** * 说明：习题管理 diff --git a/src/main/java/com/zcloud/service/questionnaire/impl/SurveyanswerServiceImpl.java b/src/main/java/com/zcloud/service/questionnaire/impl/SurveyanswerServiceImpl.java index 61c16b9..0513435 100644 --- a/src/main/java/com/zcloud/service/questionnaire/impl/SurveyanswerServiceImpl.java +++ b/src/main/java/com/zcloud/service/questionnaire/impl/SurveyanswerServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.questionnaire.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.questionnaire.SurveyanswerMapper; +import com.zcloud.mapper.dsno2.questionnaire.SurveyanswerMapper; import com.zcloud.service.questionnaire.SurveyanswerService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zcloud/service/questionnaire/impl/SurveycorpinfoServiceImpl.java b/src/main/java/com/zcloud/service/questionnaire/impl/SurveycorpinfoServiceImpl.java index 37e1629..44c4fa7 100644 --- a/src/main/java/com/zcloud/service/questionnaire/impl/SurveycorpinfoServiceImpl.java +++ b/src/main/java/com/zcloud/service/questionnaire/impl/SurveycorpinfoServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.questionnaire.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.questionnaire.SurveycorpinfoMapper; +import com.zcloud.mapper.dsno2.questionnaire.SurveycorpinfoMapper; import com.zcloud.service.questionnaire.SurveycorpinfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zcloud/service/questionnaire/impl/SurveyquestionServiceImpl.java b/src/main/java/com/zcloud/service/questionnaire/impl/SurveyquestionServiceImpl.java index 8299ba5..ca0f93c 100644 --- a/src/main/java/com/zcloud/service/questionnaire/impl/SurveyquestionServiceImpl.java +++ b/src/main/java/com/zcloud/service/questionnaire/impl/SurveyquestionServiceImpl.java @@ -2,15 +2,12 @@ package com.zcloud.service.questionnaire.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno3.questionnaire.SurveyquestionMapper; +import com.zcloud.mapper.dsno2.questionnaire.SurveyquestionMapper; import com.zcloud.service.questionnaire.SurveyquestionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.zcloud.mapper.dsno3.courseware.QuestionMapper; -import com.zcloud.service.onlinexxks.QuestionService; - import java.util.ArrayList; import java.util.List; import java.util.Random; diff --git a/src/main/java/com/zcloud/service/system/impl/AdminDepartmentServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/AdminDepartmentServiceImpl.java index d65d252..f4ed064 100644 --- a/src/main/java/com/zcloud/service/system/impl/AdminDepartmentServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/AdminDepartmentServiceImpl.java @@ -10,7 +10,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.entity.system.Department; -import com.zcloud.mapper.dsno2.system.AdminDepartmentMapper; +import com.zcloud.mapper.dsno1.system.AdminDepartmentMapper; import com.zcloud.service.system.AdminDepartmentService; import com.zcloud.util.Tools; diff --git a/src/main/java/com/zcloud/service/system/impl/AppFeedbackServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/AppFeedbackServiceImpl.java index 79628a0..2c028e7 100644 --- a/src/main/java/com/zcloud/service/system/impl/AppFeedbackServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/AppFeedbackServiceImpl.java @@ -8,10 +8,10 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.feedback.AppFeedbackMapper; +import com.zcloud.mapper.dsno1.feedback.AppFeedbackMapper; import com.zcloud.service.system.AppFeedbackService; -/** +/** * 说明：app意见反馈 * 作者：luoxiaobao * 时间：2021-01-13 @@ -23,7 +23,7 @@ public class AppFeedbackServiceImpl implements AppFeedbackService{ @Autowired private AppFeedbackMapper appfeedbackMapper; - + /**新增 * @param pd * @throws Exception @@ -31,7 +31,7 @@ public class AppFeedbackServiceImpl implements AppFeedbackService{ public void save(PageData pd)throws Exception{ appfeedbackMapper.save(pd); } - + /**删除 * @param pd * @throws Exception @@ -39,7 +39,7 @@ public class AppFeedbackServiceImpl implements AppFeedbackService{ public void delete(PageData pd)throws Exception{ appfeedbackMapper.delete(pd); } - + /**修改 * @param pd * @throws Exception @@ -47,7 +47,7 @@ public class AppFeedbackServiceImpl implements AppFeedbackService{ public void edit(PageData pd)throws Exception{ appfeedbackMapper.edit(pd); } - + /**列表 * @param page * @throws Exception @@ -55,7 +55,7 @@ public class AppFeedbackServiceImpl implements AppFeedbackService{ public List list(Page page)throws Exception{ return appfeedbackMapper.datalistPage(page); } - + /**列表(全部) * @param pd * @throws Exception @@ -63,7 +63,7 @@ public class AppFeedbackServiceImpl implements AppFeedbackService{ public List listAll(PageData pd)throws Exception{ return appfeedbackMapper.listAll(pd); } - + /**通过id获取数据 * @param pd * @throws Exception @@ -71,7 +71,7 @@ public class AppFeedbackServiceImpl implements AppFeedbackService{ public PageData findById(PageData pd)throws Exception{ return appfeedbackMapper.findById(pd); } - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception @@ -79,6 +79,6 @@ public class AppFeedbackServiceImpl implements AppFeedbackService{ public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ appfeedbackMapper.deleteAll(ArrayDATA_IDS); } - + } diff --git a/src/main/java/com/zcloud/service/system/impl/ButtonrightsServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/ButtonrightsServiceImpl.java index a1c8041..b90e43b 100644 --- a/src/main/java/com/zcloud/service/system/impl/ButtonrightsServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/ButtonrightsServiceImpl.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.system.ButtonrightsMapper; +import com.zcloud.mapper.dsno1.system.ButtonrightsMapper; import com.zcloud.service.system.ButtonrightsService; /** @@ -18,7 +18,7 @@ import com.zcloud.service.system.ButtonrightsService; @Service @Transactional //开启事物 public class ButtonrightsServiceImpl implements ButtonrightsService { - + @Autowired private ButtonrightsMapper buttonrightsMapper; @@ -37,7 +37,7 @@ public class ButtonrightsServiceImpl implements ButtonrightsService { public List listAllBrAndQxname(PageData pd) throws Exception { return buttonrightsMapper.listAllBrAndQxname(pd); } - + /**列表(全部) * @param pd * @throws Exception @@ -45,7 +45,7 @@ public class ButtonrightsServiceImpl implements ButtonrightsService { public List listAll(PageData pd)throws Exception{ return buttonrightsMapper.listAll(pd); } - + /**通过(角色ID和按钮ID)获取数据 * @param pd * @throws Exception @@ -53,7 +53,7 @@ public class ButtonrightsServiceImpl implements ButtonrightsService { public PageData findById(PageData pd)throws Exception{ return buttonrightsMapper.findById(pd); } - + /**删除 * @param pd * @throws Exception @@ -61,7 +61,7 @@ public class ButtonrightsServiceImpl implements ButtonrightsService { public void delete(PageData pd)throws Exception{ buttonrightsMapper.delete(pd); } - + /**新增 * @param pd * @throws Exception diff --git a/src/main/java/com/zcloud/service/system/impl/ComponentServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/ComponentServiceImpl.java index 2feda42..0c1d441 100644 --- a/src/main/java/com/zcloud/service/system/impl/ComponentServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/ComponentServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.system.impl; import java.util.List; -import com.zcloud.mapper.dsno2.system.ComponentMapper; +import com.zcloud.mapper.dsno1.system.ComponentMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/system/impl/CorpScoreServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/CorpScoreServiceImpl.java index 6811a18..dc2f6f2 100644 --- a/src/main/java/com/zcloud/service/system/impl/CorpScoreServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/CorpScoreServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.system.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.corp.CorpScoreMapper; +import com.zcloud.mapper.dsno1.corp.CorpScoreMapper; import com.zcloud.service.system.CorpScoreService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zcloud/service/system/impl/CorpTypeServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/CorpTypeServiceImpl.java index 6d353c1..e7726ba 100644 --- a/src/main/java/com/zcloud/service/system/impl/CorpTypeServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/CorpTypeServiceImpl.java @@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.corp.CorpTypeMapper; +import com.zcloud.mapper.dsno1.corp.CorpTypeMapper; import com.zcloud.service.system.CorpTypeService; /** diff --git a/src/main/java/com/zcloud/service/system/impl/CorpTypeToDeptServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/CorpTypeToDeptServiceImpl.java index bd25cfe..bb2c0cf 100644 --- a/src/main/java/com/zcloud/service/system/impl/CorpTypeToDeptServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/CorpTypeToDeptServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.corp.CorpTypeToDeptMapper; +import com.zcloud.mapper.dsno1.corp.CorpTypeToDeptMapper; import com.zcloud.service.system.CorpTypeToDeptService; /** diff --git a/src/main/java/com/zcloud/service/system/impl/DatajurServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/DatajurServiceImpl.java index 3fd5eb2..bb58994 100644 --- a/src/main/java/com/zcloud/service/system/impl/DatajurServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/DatajurServiceImpl.java @@ -5,10 +5,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.system.DatajurMapper; +import com.zcloud.mapper.dsno1.system.DatajurMapper; import com.zcloud.service.system.DatajurService; -/** +/** * 说明： 组织数据权限表 * 作者：luoxiaobao * 官网：www.qdkjchina.com @@ -16,10 +16,10 @@ import com.zcloud.service.system.DatajurService; @Service(value="datajurService") @Transactional //开启事物 public class DatajurServiceImpl implements DatajurService{ - + @Autowired private DatajurMapper datajurMapper; - + /**新增 * @param pd * @throws Exception @@ -27,7 +27,7 @@ public class DatajurServiceImpl implements DatajurService{ public void save(PageData pd)throws Exception{ datajurMapper.save( pd); } - + /**修改 * @param pd * @throws Exception @@ -35,8 +35,8 @@ public class DatajurServiceImpl implements DatajurService{ public void edit(PageData pd)throws Exception{ datajurMapper.edit(pd); } - - + + /**通过id获取数据 * @param pd * @throws Exception @@ -44,7 +44,7 @@ public class DatajurServiceImpl implements DatajurService{ public PageData findById(PageData pd)throws Exception{ return (PageData)datajurMapper.findById(pd); } - + /**取出某用户的组织数据权限 * @param pd * @throws Exception @@ -52,6 +52,6 @@ public class DatajurServiceImpl implements DatajurService{ public PageData getDEPARTMENT_IDS(String USERNAME)throws Exception{ return (PageData)datajurMapper.getDEPARTMENT_IDS(USERNAME); } - + } diff --git a/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java index 769aa07..fa9d9bc 100644 --- a/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java @@ -10,7 +10,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.entity.system.Department; -import com.zcloud.mapper.dsno2.system.DepartmentMapper; +import com.zcloud.mapper.dsno1.system.DepartmentMapper; import com.zcloud.service.system.DepartmentService; import com.zcloud.util.Tools; diff --git a/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java index cc6c858..174fa3c 100644 --- a/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java @@ -2,7 +2,6 @@ package com.zcloud.service.system.impl; import java.util.*; -import com.alibaba.fastjson.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -10,7 +9,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.entity.system.Dictionaries; -import com.zcloud.mapper.dsno2.system.DictionariesMapper; +import com.zcloud.mapper.dsno1.system.DictionariesMapper; import com.zcloud.service.system.DictionariesService; import com.zcloud.util.Jurisdiction; diff --git a/src/main/java/com/zcloud/service/system/impl/FHlogServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/FHlogServiceImpl.java index 50ae425..010399f 100644 --- a/src/main/java/com/zcloud/service/system/impl/FHlogServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/FHlogServiceImpl.java @@ -9,7 +9,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.system.FHlogMapper; +import com.zcloud.mapper.dsno1.system.FHlogMapper; import com.zcloud.service.system.FHlogService; import com.zcloud.util.DateUtil; import com.zcloud.util.UuidUtil; @@ -22,10 +22,10 @@ import com.zcloud.util.UuidUtil; @Service @Transactional //开启事物 public class FHlogServiceImpl implements FHlogService { - + @Autowired private FHlogMapper fHlogMapper; - + /**新增 * @param pd * @throws Exception @@ -38,7 +38,7 @@ public class FHlogServiceImpl implements FHlogService { pd.put("CZTIME", DateUtil.date2Str(new Date())); //操作时间 fHlogMapper.save(pd); } - + /**删除 * @param pd * @throws Exception @@ -46,7 +46,7 @@ public class FHlogServiceImpl implements FHlogService { public void delete(PageData pd)throws Exception{ fHlogMapper.delete(pd); } - + /**列表 * @param page * @throws Exception @@ -54,7 +54,7 @@ public class FHlogServiceImpl implements FHlogService { public List list(Page page)throws Exception{ return fHlogMapper.datalistPage(page); } - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception diff --git a/src/main/java/com/zcloud/service/system/impl/FhButtonServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/FhButtonServiceImpl.java index d246359..b97ad9b 100644 --- a/src/main/java/com/zcloud/service/system/impl/FhButtonServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/FhButtonServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.system.FhButtonMapper; +import com.zcloud.mapper.dsno1.system.FhButtonMapper; import com.zcloud.service.system.FhButtonService; /** @@ -19,7 +19,7 @@ import com.zcloud.service.system.FhButtonService; @Service @Transactional //开启事物 public class FhButtonServiceImpl implements FhButtonService { - + @Autowired private FhButtonMapper fhButtonMapper; @@ -30,7 +30,7 @@ public class FhButtonServiceImpl implements FhButtonService { public List listAll(PageData pd) throws Exception { return fhButtonMapper.listAll(pd); } - + /**列表(带分页) * @param page * @throws Exception @@ -38,7 +38,7 @@ public class FhButtonServiceImpl implements FhButtonService { public List list(Page page)throws Exception{ return fhButtonMapper.datalistPage(page); } - + /**删除 * @param pd * @throws Exception @@ -53,7 +53,7 @@ public class FhButtonServiceImpl implements FhButtonService { */ public void save(PageData pd) throws Exception { fhButtonMapper.save(pd); - + } /**修改 @@ -62,7 +62,7 @@ public class FhButtonServiceImpl implements FhButtonService { */ public void edit(PageData pd) throws Exception { fhButtonMapper.edit(pd); - + } /**通过id获取数据 diff --git a/src/main/java/com/zcloud/service/system/impl/FhsmsServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/FhsmsServiceImpl.java index e6c5397..46677be 100644 --- a/src/main/java/com/zcloud/service/system/impl/FhsmsServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/FhsmsServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.system.FhsmsMapper; +import com.zcloud.mapper.dsno1.system.FhsmsMapper; import com.zcloud.service.system.FhsmsService; /** @@ -19,7 +19,7 @@ import com.zcloud.service.system.FhsmsService; @Service @Transactional //开启事物 public class FhsmsServiceImpl implements FhsmsService { - + @Autowired private FhsmsMapper fhsmsMapper; @@ -30,7 +30,7 @@ public class FhsmsServiceImpl implements FhsmsService { public void save(PageData pd)throws Exception{ fhsmsMapper.save(pd); } - + /**删除 * @param pd * @throws Exception @@ -38,7 +38,7 @@ public class FhsmsServiceImpl implements FhsmsService { public void delete(PageData pd)throws Exception{ fhsmsMapper.delete(pd); } - + /**修改 * @param pd * @throws Exception @@ -46,7 +46,7 @@ public class FhsmsServiceImpl implements FhsmsService { public void edit(PageData pd)throws Exception{ fhsmsMapper.edit(pd); } - + /**列表 * @param page * @throws Exception @@ -54,7 +54,7 @@ public class FhsmsServiceImpl implements FhsmsService { public List list(Page page)throws Exception{ return fhsmsMapper.datalistPage(page); } - + /**列表(全部) * @param pd * @throws Exception @@ -62,7 +62,7 @@ public class FhsmsServiceImpl implements FhsmsService { public List listAll(PageData pd)throws Exception{ return fhsmsMapper.listAll(pd); } - + /**通过id获取数据 * @param pd * @throws Exception @@ -70,7 +70,7 @@ public class FhsmsServiceImpl implements FhsmsService { public PageData findById(PageData pd)throws Exception{ return fhsmsMapper.findById(pd); } - + /**获取未读总数 * @param pd * @throws Exception @@ -78,7 +78,7 @@ public class FhsmsServiceImpl implements FhsmsService { public PageData findFhsmsCount(String USERNAME)throws Exception{ return fhsmsMapper.findFhsmsCount(USERNAME); } - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception diff --git a/src/main/java/com/zcloud/service/system/impl/FileUploadLogServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/FileUploadLogServiceImpl.java index 6cef28d..47e35d7 100644 --- a/src/main/java/com/zcloud/service/system/impl/FileUploadLogServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/FileUploadLogServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.system.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.system.FileUploadLogMapper; +import com.zcloud.mapper.dsno1.system.FileUploadLogMapper; import com.zcloud.service.system.FileUploadLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zcloud/service/system/impl/MenuServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/MenuServiceImpl.java index 15586aa..ce5e505 100644 --- a/src/main/java/com/zcloud/service/system/impl/MenuServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/MenuServiceImpl.java @@ -3,8 +3,7 @@ package com.zcloud.service.system.impl; import java.util.ArrayList; import java.util.List; -import com.zcloud.entity.system.Route; -import com.zcloud.mapper.dsno2.system.ComponentMapper; +import com.zcloud.mapper.dsno1.system.ComponentMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; @@ -13,7 +12,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.PageData; import com.zcloud.entity.system.Menu; -import com.zcloud.mapper.dsno2.system.MenuMapper; +import com.zcloud.mapper.dsno1.system.MenuMapper; import com.zcloud.service.system.MenuService; /** diff --git a/src/main/java/com/zcloud/service/system/impl/OfficeServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/OfficeServiceImpl.java index 18be91b..8c99913 100644 --- a/src/main/java/com/zcloud/service/system/impl/OfficeServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/OfficeServiceImpl.java @@ -3,7 +3,7 @@ package com.zcloud.service.system.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.service.system.OfficeService; -import com.zcloud.mapper.dsno2.system.OfficeMapper; +import com.zcloud.mapper.dsno1.system.OfficeMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/system/impl/PhotoServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/PhotoServiceImpl.java index d3d35b3..40dde10 100644 --- a/src/main/java/com/zcloud/service/system/impl/PhotoServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/PhotoServiceImpl.java @@ -5,7 +5,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.system.PhotoMapper; +import com.zcloud.mapper.dsno1.system.PhotoMapper; import com.zcloud.service.system.PhotoService; /** @@ -16,7 +16,7 @@ import com.zcloud.service.system.PhotoService; @Service @Transactional //开启事物 public class PhotoServiceImpl implements PhotoService { - + @Autowired private PhotoMapper photoMapper; diff --git a/src/main/java/com/zcloud/service/system/impl/PostServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/PostServiceImpl.java index 5aa29ce..bc5f7f0 100644 --- a/src/main/java/com/zcloud/service/system/impl/PostServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/PostServiceImpl.java @@ -8,10 +8,10 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.system.PostMapper; +import com.zcloud.mapper.dsno1.system.PostMapper; import com.zcloud.service.system.PostService; -/** +/** * 说明：岗位管理 * 作者：luoxiaobao * 时间：2020-12-28 @@ -23,7 +23,7 @@ public class PostServiceImpl implements PostService{ @Autowired private PostMapper postMapper; - + /**新增 * @param pd * @throws Exception @@ -31,7 +31,7 @@ public class PostServiceImpl implements PostService{ public void save(PageData pd)throws Exception{ postMapper.save(pd); } - + /**删除 * @param pd * @throws Exception @@ -39,7 +39,7 @@ public class PostServiceImpl implements PostService{ public void delete(PageData pd)throws Exception{ postMapper.delete(pd); } - + /**修改 * @param pd * @throws Exception @@ -47,7 +47,7 @@ public class PostServiceImpl implements PostService{ public void edit(PageData pd)throws Exception{ postMapper.edit(pd); } - + /**列表 * @param page * @throws Exception @@ -55,7 +55,7 @@ public class PostServiceImpl implements PostService{ public List list(Page page)throws Exception{ return postMapper.datalistPage(page); } - + /**列表(全部) * @param pd * @throws Exception @@ -63,7 +63,7 @@ public class PostServiceImpl implements PostService{ public List listAll(PageData pd)throws Exception{ return postMapper.listAll(pd); } - + /**通过id获取数据 * @param pd * @throws Exception @@ -71,7 +71,7 @@ public class PostServiceImpl implements PostService{ public PageData findById(PageData pd)throws Exception{ return postMapper.findById(pd); } - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception @@ -79,6 +79,6 @@ public class PostServiceImpl implements PostService{ public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ postMapper.deleteAll(ArrayDATA_IDS); } - + } diff --git a/src/main/java/com/zcloud/service/system/impl/RoleServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/RoleServiceImpl.java index a00d080..7d4efdc 100644 --- a/src/main/java/com/zcloud/service/system/impl/RoleServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/RoleServiceImpl.java @@ -9,7 +9,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.entity.system.Role; -import com.zcloud.mapper.dsno2.system.RoleMapper; +import com.zcloud.mapper.dsno1.system.RoleMapper; import com.zcloud.service.system.RoleService; /** diff --git a/src/main/java/com/zcloud/service/system/impl/RouteServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/RouteServiceImpl.java index bdf1127..4f1bb41 100644 --- a/src/main/java/com/zcloud/service/system/impl/RouteServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/RouteServiceImpl.java @@ -2,9 +2,8 @@ package com.zcloud.service.system.impl; import com.alibaba.fastjson.JSONObject; import com.zcloud.entity.PageData; -import com.zcloud.entity.system.Menu; import com.zcloud.entity.system.Route; -import com.zcloud.mapper.dsno2.system.RouteMapper; +import com.zcloud.mapper.dsno1.system.RouteMapper; import com.zcloud.service.system.RouteService; import com.zcloud.util.Tools; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/zcloud/service/system/impl/UeditorServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UeditorServiceImpl.java index d816d6c..f4329f6 100644 --- a/src/main/java/com/zcloud/service/system/impl/UeditorServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UeditorServiceImpl.java @@ -5,10 +5,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.system.UeditorMapper; +import com.zcloud.mapper.dsno1.system.UeditorMapper; import com.zcloud.service.system.UeditorService; -/** +/** * 说明： 富文本编辑器内容缓存接口实现类 * 作者：luoxiaobao * 官网：www.qdkjchina.com @@ -20,7 +20,7 @@ public class UeditorServiceImpl implements UeditorService{ @Autowired private UeditorMapper ueditorMapper; - + /**通过id获取数据 * @param pd * @throws Exception @@ -28,7 +28,7 @@ public class UeditorServiceImpl implements UeditorService{ public PageData findById(PageData pd)throws Exception{ return ueditorMapper.findById(pd); } - + /**修改 * @param pd * @throws Exception @@ -36,7 +36,7 @@ public class UeditorServiceImpl implements UeditorService{ public void edit(PageData pd)throws Exception{ ueditorMapper.edit(pd); } - + /**删除 * @param pd * @throws Exception @@ -44,7 +44,7 @@ public class UeditorServiceImpl implements UeditorService{ public void delete(PageData pd)throws Exception{ ueditorMapper.delete(pd); } - + /**批量删除 * @param ArrayDATA_IDS * @throws Exception @@ -52,6 +52,6 @@ public class UeditorServiceImpl implements UeditorService{ public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ ueditorMapper.deleteAll(ArrayDATA_IDS); } - + } diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java index 07c90f9..d7f7a53 100644 --- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java @@ -2,8 +2,6 @@ package com.zcloud.service.system.impl; import java.util.List; -import com.zcloud.util.UuidUtil; -import org.apache.shiro.crypto.hash.SimpleHash; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -11,7 +9,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.entity.system.User; -import com.zcloud.mapper.dsno2.system.UsersMapper; +import com.zcloud.mapper.dsno1.system.UsersMapper; import com.zcloud.service.system.UsersService; /** diff --git a/src/main/java/com/zcloud/service/termLibrary/impl/HiddenTermLibraryServiceImpl.java b/src/main/java/com/zcloud/service/termLibrary/impl/HiddenTermLibraryServiceImpl.java index 5843916..6dac35c 100644 --- a/src/main/java/com/zcloud/service/termLibrary/impl/HiddenTermLibraryServiceImpl.java +++ b/src/main/java/com/zcloud/service/termLibrary/impl/HiddenTermLibraryServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.termLibrary.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.termLibrary.HiddenTermLibraryMapper; +import com.zcloud.mapper.dsno1.termLibrary.HiddenTermLibraryMapper; import com.zcloud.service.termLibrary.HiddenTermLibraryService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/termLibrary/impl/RiskTermLibraryServiceImpl.java b/src/main/java/com/zcloud/service/termLibrary/impl/RiskTermLibraryServiceImpl.java index cdd459d..83dbc31 100644 --- a/src/main/java/com/zcloud/service/termLibrary/impl/RiskTermLibraryServiceImpl.java +++ b/src/main/java/com/zcloud/service/termLibrary/impl/RiskTermLibraryServiceImpl.java @@ -2,7 +2,7 @@ package com.zcloud.service.termLibrary.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.termLibrary.RiskTermLibraryMapper; +import com.zcloud.mapper.dsno1.termLibrary.RiskTermLibraryMapper; import com.zcloud.service.termLibrary.RiskTermLibraryService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/zcloud/service/tools/impl/CodeEditorServiceImpl.java b/src/main/java/com/zcloud/service/tools/impl/CodeEditorServiceImpl.java index b4746be..aa6f410 100644 --- a/src/main/java/com/zcloud/service/tools/impl/CodeEditorServiceImpl.java +++ b/src/main/java/com/zcloud/service/tools/impl/CodeEditorServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.tools.CodeEditorMapper; +import com.zcloud.mapper.dsno1.tools.CodeEditorMapper; import com.zcloud.service.tools.CodeEditorService; /** diff --git a/src/main/java/com/zcloud/service/tools/impl/CreateCodeServiceImpl.java b/src/main/java/com/zcloud/service/tools/impl/CreateCodeServiceImpl.java index b1d75ae..c2b73d7 100644 --- a/src/main/java/com/zcloud/service/tools/impl/CreateCodeServiceImpl.java +++ b/src/main/java/com/zcloud/service/tools/impl/CreateCodeServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.dsno2.tools.CreateCodeMapper; +import com.zcloud.mapper.dsno1.tools.CreateCodeMapper; import com.zcloud.service.tools.CreateCodeService; /** diff --git a/src/main/resources/application-gs.properties b/src/main/resources/application-gs.properties new file mode 100644 index 0000000..d602148 --- /dev/null +++ b/src/main/resources/application-gs.properties @@ -0,0 +1,41 @@ +datasource.no1.driver-class-name=com.mysql.cj.jdbc.Driver +datasource.no1.url=jdbc:mysql://192.168.20.230:33080/integrated_mini_bus?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no1.username=root +datasource.no1.password=Mysql@zcloud33080 +datasource.no2.driver-class-name=com.mysql.cj.jdbc.Driver +datasource.no2.url=jdbc:mysql://192.168.20.230:33080/integrated_mini_admin?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no2.username=root +datasource.no2.password=Mysql@zcloud33080 + + +spring.main.banner-mode=off +spring.servlet.multipart.max-file-size=500MB +spring.servlet.multipart.max-request-size=500MB +spring.datasource.type=com.alibaba.druid.pool.DruidDataSource +spring.datasource.maxActive=20 +spring.datasource.initialSize=1 +spring.datasource.maxWait=60000 +spring.datasource.poolPreparedStatements=true +spring.datasource.maxPoolPreparedStatementPerConnectionSize=20 +spring.datasource.minIdle=1 +spring.datasource.timeBetweenEvictionRunsMillis=60000 +spring.datasource.minEvictableIdleTimeMillis=300000 +spring.datasource.validationQuery=select 1 from dual +spring.datasource.testWhileIdle=true +spring.datasource.testOnBorrow=false +spring.datasource.testOnReturn=false +spring.cache.ehcache.cofnig=ehcache.xml +spring.activiti.check-process-definitions=false + +filters=stat, wall, log4j + +logging.level.com.zcloud.mapper=debug + +server.servlet.encoding.charset=UTF-8 +server.servlet.encoding.force=true +server.servlet.encoding.enabled=true + +customer.id=LAZ-20221129-3 +customer.SECRET_KEY=a256e8575c3f4240b08f6350f13ce8e2 +customer.url=https://api.qhdsafety.com/sync/ +customer.domain=yth.qhdsafety.com diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 3c2e502..66f1b1d 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,11 +1,5 @@ spring.application.name=integrated_whb_admin server.port=8098 -#?? -#spring.profiles.active=local -#????31???? -spring.profiles.active=dev -#?? -#spring.profiles.active=master - +spring.profiles.active=gs management.endpoints.web.exposure.include=prometheus -management.metrics.tags.application=\u5371\u5316\u7248\u8fd0\u8425\u7aef \ No newline at end of file +management.metrics.tags.application=\u5371\u5316\u7248\u8fd0\u8425\u7aef diff --git a/src/main/resources/mybatis/dsno2/agency/AgentNumberMapper.xml b/src/main/resources/mybatis/dsno1/agency/AgentNumberMapper.xml similarity index 98% rename from src/main/resources/mybatis/dsno2/agency/AgentNumberMapper.xml rename to src/main/resources/mybatis/dsno1/agency/AgentNumberMapper.xml index 543a2ae..517e5cf 100644 --- a/src/main/resources/mybatis/dsno2/agency/AgentNumberMapper.xml +++ b/src/main/resources/mybatis/dsno1/agency/AgentNumberMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno2/alarm/DBAlarmMapper.xml b/src/main/resources/mybatis/dsno1/alarm/DBAlarmMapper.xml similarity index 98% rename from src/main/resources/mybatis/dsno2/alarm/DBAlarmMapper.xml rename to src/main/resources/mybatis/dsno1/alarm/DBAlarmMapper.xml index c291058..2dbc83e 100644 --- a/src/main/resources/mybatis/dsno2/alarm/DBAlarmMapper.xml +++ b/src/main/resources/mybatis/dsno1/alarm/DBAlarmMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno2/alarm/DeviceCorpMapper.xml b/src/main/resources/mybatis/dsno1/alarm/DeviceCorpMapper.xml similarity index 97% rename from src/main/resources/mybatis/dsno2/alarm/DeviceCorpMapper.xml rename to src/main/resources/mybatis/dsno1/alarm/DeviceCorpMapper.xml index 6cf90e0..40b77c9 100644 --- a/src/main/resources/mybatis/dsno2/alarm/DeviceCorpMapper.xml +++ b/src/main/resources/mybatis/dsno1/alarm/DeviceCorpMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno2/api/EducationApiMapper.xml b/src/main/resources/mybatis/dsno1/api/EducationApiMapper.xml similarity index 100% rename from src/main/resources/mybatis/dsno2/api/EducationApiMapper.xml rename to src/main/resources/mybatis/dsno1/api/EducationApiMapper.xml diff --git a/src/main/resources/mybatis/dsno2/api/OtherApiMapper.xml b/src/main/resources/mybatis/dsno1/api/OtherApiMapper.xml similarity index 97% rename from src/main/resources/mybatis/dsno2/api/OtherApiMapper.xml rename to src/main/resources/mybatis/dsno1/api/OtherApiMapper.xml index 0b67952..bf3c8cc 100644 --- a/src/main/resources/mybatis/dsno2/api/OtherApiMapper.xml +++ b/src/main/resources/mybatis/dsno1/api/OtherApiMapper.xml @@ -1,6 +1,6 @@ - + SELECT diff --git a/src/main/resources/mybatis/dsno2/billing/BillingManageMapper.xml b/src/main/resources/mybatis/dsno1/billing/BillingManageMapper.xml similarity index 98% rename from src/main/resources/mybatis/dsno2/billing/BillingManageMapper.xml rename to src/main/resources/mybatis/dsno1/billing/BillingManageMapper.xml index 2b0508b..d670a7d 100644 --- a/src/main/resources/mybatis/dsno2/billing/BillingManageMapper.xml +++ b/src/main/resources/mybatis/dsno1/billing/BillingManageMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno2/check/CheckRecordMapper.xml b/src/main/resources/mybatis/dsno1/check/CheckRecordMapper.xml similarity index 99% rename from src/main/resources/mybatis/dsno2/check/CheckRecordMapper.xml rename to src/main/resources/mybatis/dsno1/check/CheckRecordMapper.xml index 9d411bd..40fb41e 100644 --- a/src/main/resources/mybatis/dsno2/check/CheckRecordMapper.xml +++ b/src/main/resources/mybatis/dsno1/check/CheckRecordMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno2/check/CheckUserMapper.xml b/src/main/resources/mybatis/dsno1/check/CheckUserMapper.xml similarity index 98% rename from src/main/resources/mybatis/dsno2/check/CheckUserMapper.xml rename to src/main/resources/mybatis/dsno1/check/CheckUserMapper.xml index 8ae72d2..1778811 100644 --- a/src/main/resources/mybatis/dsno2/check/CheckUserMapper.xml +++ b/src/main/resources/mybatis/dsno1/check/CheckUserMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno2/check/ListStatisticsMapper.xml b/src/main/resources/mybatis/dsno1/check/ListStatisticsMapper.xml similarity index 99% rename from src/main/resources/mybatis/dsno2/check/ListStatisticsMapper.xml rename to src/main/resources/mybatis/dsno1/check/ListStatisticsMapper.xml index aca6eb9..ccce5e6 100644 --- a/src/main/resources/mybatis/dsno2/check/ListStatisticsMapper.xml +++ b/src/main/resources/mybatis/dsno1/check/ListStatisticsMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno2/check/RecordItemMapper.xml b/src/main/resources/mybatis/dsno1/check/RecordItemMapper.xml similarity index 98% rename from src/main/resources/mybatis/dsno2/check/RecordItemMapper.xml rename to src/main/resources/mybatis/dsno1/check/RecordItemMapper.xml index 40de8bd..299eb14 100644 --- a/src/main/resources/mybatis/dsno2/check/RecordItemMapper.xml +++ b/src/main/resources/mybatis/dsno1/check/RecordItemMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno2/corp/AllWorkItemMapper.xml b/src/main/resources/mybatis/dsno1/corp/AllWorkItemMapper.xml similarity index 98% rename from src/main/resources/mybatis/dsno2/corp/AllWorkItemMapper.xml rename to src/main/resources/mybatis/dsno1/corp/AllWorkItemMapper.xml index af40df6..4e1383d 100644 --- a/src/main/resources/mybatis/dsno2/corp/AllWorkItemMapper.xml +++ b/src/main/resources/mybatis/dsno1/corp/AllWorkItemMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno2/corp/CorpFuncMapper.xml b/src/main/resources/mybatis/dsno1/corp/CorpFuncMapper.xml similarity index 98% rename from src/main/resources/mybatis/dsno2/corp/CorpFuncMapper.xml rename to src/main/resources/mybatis/dsno1/corp/CorpFuncMapper.xml index bf9c777..15435e2 100644 --- a/src/main/resources/mybatis/dsno2/corp/CorpFuncMapper.xml +++ b/src/main/resources/mybatis/dsno1/corp/CorpFuncMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno2/corp/CorpInfo2Mapper.xml b/src/main/resources/mybatis/dsno1/corp/CorpInfo2Mapper.xml similarity index 98% rename from src/main/resources/mybatis/dsno2/corp/CorpInfo2Mapper.xml rename to src/main/resources/mybatis/dsno1/corp/CorpInfo2Mapper.xml index 9b36d25..56ac7fd 100644 --- a/src/main/resources/mybatis/dsno2/corp/CorpInfo2Mapper.xml +++ b/src/main/resources/mybatis/dsno1/corp/CorpInfo2Mapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno2/corp/CorpInfoMapper.xml b/src/main/resources/mybatis/dsno1/corp/CorpInfoMapper.xml similarity index 99% rename from src/main/resources/mybatis/dsno2/corp/CorpInfoMapper.xml rename to src/main/resources/mybatis/dsno1/corp/CorpInfoMapper.xml index a9c4cd7..582843b 100644 --- a/src/main/resources/mybatis/dsno2/corp/CorpInfoMapper.xml +++ b/src/main/resources/mybatis/dsno1/corp/CorpInfoMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno2/corp/CorpPlsInfoMapper.xml b/src/main/resources/mybatis/dsno1/corp/CorpPlsInfoMapper.xml similarity index 97% rename from src/main/resources/mybatis/dsno2/corp/CorpPlsInfoMapper.xml rename to src/main/resources/mybatis/dsno1/corp/CorpPlsInfoMapper.xml index 5b846ea..8b1302a 100644 --- a/src/main/resources/mybatis/dsno2/corp/CorpPlsInfoMapper.xml +++ b/src/main/resources/mybatis/dsno1/corp/CorpPlsInfoMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno2/corp/CorpScoreMapper.xml b/src/main/resources/mybatis/dsno1/corp/CorpScoreMapper.xml similarity index 98% rename from src/main/resources/mybatis/dsno2/corp/CorpScoreMapper.xml rename to src/main/resources/mybatis/dsno1/corp/CorpScoreMapper.xml index 84a2aae..401d9f4 100644 --- a/src/main/resources/mybatis/dsno2/corp/CorpScoreMapper.xml +++ b/src/main/resources/mybatis/dsno1/corp/CorpScoreMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno2/corp/CorpTimeMapper.xml b/src/main/resources/mybatis/dsno1/corp/CorpTimeMapper.xml similarity index 98% rename from src/main/resources/mybatis/dsno2/corp/CorpTimeMapper.xml rename to src/main/resources/mybatis/dsno1/corp/CorpTimeMapper.xml index 27c0518..da6cfbd 100644 --- a/src/main/resources/mybatis/dsno2/corp/CorpTimeMapper.xml +++ b/src/main/resources/mybatis/dsno1/corp/CorpTimeMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno2/corp/CorpTypeMapper.xml b/src/main/resources/mybatis/dsno1/corp/CorpTypeMapper.xml similarity index 98% rename from src/main/resources/mybatis/dsno2/corp/CorpTypeMapper.xml rename to src/main/resources/mybatis/dsno1/corp/CorpTypeMapper.xml index 8ffb509..49e8b91 100644 --- a/src/main/resources/mybatis/dsno2/corp/CorpTypeMapper.xml +++ b/src/main/resources/mybatis/dsno1/corp/CorpTypeMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno2/corp/CorpTypeToDeptMapper.xml b/src/main/resources/mybatis/dsno1/corp/CorpTypeToDeptMapper.xml similarity index 98% rename from src/main/resources/mybatis/dsno2/corp/CorpTypeToDeptMapper.xml rename to src/main/resources/mybatis/dsno1/corp/CorpTypeToDeptMapper.xml index c0fec19..261697a 100644 --- a/src/main/resources/mybatis/dsno2/corp/CorpTypeToDeptMapper.xml +++ b/src/main/resources/mybatis/dsno1/corp/CorpTypeToDeptMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno2/corp/CorpinfoRelatedMapper.xml b/src/main/resources/mybatis/dsno1/corp/CorpinfoRelatedMapper.xml similarity index 99% rename from src/main/resources/mybatis/dsno2/corp/CorpinfoRelatedMapper.xml rename to src/main/resources/mybatis/dsno1/corp/CorpinfoRelatedMapper.xml index 11bbf89..7cbc936 100644 --- a/src/main/resources/mybatis/dsno2/corp/CorpinfoRelatedMapper.xml +++ b/src/main/resources/mybatis/dsno1/corp/CorpinfoRelatedMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno2/corp/ElectronicFenceMapper.xml b/src/main/resources/mybatis/dsno1/corp/ElectronicFenceMapper.xml similarity index 95% rename from src/main/resources/mybatis/dsno2/corp/ElectronicFenceMapper.xml rename to src/main/resources/mybatis/dsno1/corp/ElectronicFenceMapper.xml index 153b5e3..d1f32e0 100644 --- a/src/main/resources/mybatis/dsno2/corp/ElectronicFenceMapper.xml +++ b/src/main/resources/mybatis/dsno1/corp/ElectronicFenceMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno2/corp/FuncMapper.xml b/src/main/resources/mybatis/dsno1/corp/FuncMapper.xml similarity index 97% rename from src/main/resources/mybatis/dsno2/corp/FuncMapper.xml rename to src/main/resources/mybatis/dsno1/corp/FuncMapper.xml index fa69a65..84fb7e4 100644 --- a/src/main/resources/mybatis/dsno2/corp/FuncMapper.xml +++ b/src/main/resources/mybatis/dsno1/corp/FuncMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno2/corp/ImplementationManagementMapper.xml b/src/main/resources/mybatis/dsno1/corp/ImplementationManagementMapper.xml similarity index 99% rename from src/main/resources/mybatis/dsno2/corp/ImplementationManagementMapper.xml rename to src/main/resources/mybatis/dsno1/corp/ImplementationManagementMapper.xml index c4e807c..e91d9f6 100644 --- a/src/main/resources/mybatis/dsno2/corp/ImplementationManagementMapper.xml +++ b/src/main/resources/mybatis/dsno1/corp/ImplementationManagementMapper.xml @@ -1,6 +1,6 @@ - + select * from qy_register where secretKey = #{secretKey} diff --git a/src/main/resources/mybatis/dsno3/relation/CoursewareRelationMapper.xml b/src/main/resources/mybatis/dsno2/relation/CoursewareRelationMapper.xml similarity index 97% rename from src/main/resources/mybatis/dsno3/relation/CoursewareRelationMapper.xml rename to src/main/resources/mybatis/dsno2/relation/CoursewareRelationMapper.xml index 88e12d6..01976b4 100644 --- a/src/main/resources/mybatis/dsno3/relation/CoursewareRelationMapper.xml +++ b/src/main/resources/mybatis/dsno2/relation/CoursewareRelationMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno1/risk/RiskPointMapper.xml b/src/main/resources/mybatis/dsno2/risk/RiskPointMapper.xml similarity index 84% rename from src/main/resources/mybatis/dsno1/risk/RiskPointMapper.xml rename to src/main/resources/mybatis/dsno2/risk/RiskPointMapper.xml index 8c6135c..55e4d5e 100644 --- a/src/main/resources/mybatis/dsno1/risk/RiskPointMapper.xml +++ b/src/main/resources/mybatis/dsno2/risk/RiskPointMapper.xml @@ -1,95 +1,95 @@ - - + + BUS_RISKPOINT - + SYS_DICTIONARIES - + - f.RISK_UNIT_ID, - f.CORPINFO_ID, - f.IDENTIFICATION_ID, - f.RISK_DESCR, - f.RISK_POSITION_ID, - f.LEVELID, - f.MEASURES, - f.ACCIDENTS, + f.RISK_UNIT_ID, + f.CORPINFO_ID, + f.IDENTIFICATION_ID, + f.RISK_DESCR, + f.RISK_POSITION_ID, + f.LEVELID, + f.MEASURES, + f.ACCIDENTS, f.ACCIDENTS_NAME, - f.EME_MEASURES, - f.DEPARTMENT_ID, - f.USER_ID, - f.ISDELETE, - f.CREATOR, - f.CREATTIME, - f.OPERATOR, - f.OPERATTIME, + f.EME_MEASURES, + f.DEPARTMENT_ID, + f.USER_ID, + f.ISDELETE, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, f.LONGITUDE, f.LATITUDE, f.RISKPOINT_ID, SORT - + - RISK_UNIT_ID, + RISK_UNIT_ID, CORPINFO_ID, - IDENTIFICATION_ID, - RISK_DESCR, - RISK_POSITION_ID, - LEVELID, - MEASURES, - ACCIDENTS, + IDENTIFICATION_ID, + RISK_DESCR, + RISK_POSITION_ID, + LEVELID, + MEASURES, + ACCIDENTS, ACCIDENTS_NAME, - EME_MEASURES, - DEPARTMENT_ID, - USER_ID, - ISDELETE, - CREATOR, - CREATTIME, - OPERATOR, - OPERATTIME, + EME_MEASURES, + DEPARTMENT_ID, + USER_ID, + ISDELETE, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, LONGITUDE, LATITUDE, RISKPOINT_ID, SORT - + - #{RISK_UNIT_ID}, + #{RISK_UNIT_ID}, #{CORPINFO_ID}, - #{IDENTIFICATION_ID}, - #{RISK_DESCR}, - #{RISK_POSITION_ID}, - #{LEVELID}, - #{MEASURES}, - #{ACCIDENTS}, + #{IDENTIFICATION_ID}, + #{RISK_DESCR}, + #{RISK_POSITION_ID}, + #{LEVELID}, + #{MEASURES}, + #{ACCIDENTS}, #{ACCIDENTS_NAME}, - #{EME_MEASURES}, - #{DEPARTMENT_ID}, - #{USER_ID}, - #{ISDELETE}, - #{CREATOR}, - #{CREATTIME}, - #{OPERATOR}, - #{OPERATTIME}, + #{EME_MEASURES}, + #{DEPARTMENT_ID}, + #{USER_ID}, + #{ISDELETE}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, #{LONGITUDE}, #{LATITUDE}, #{RISKPOINT_ID}, #{SORT} - + - insert into + insert into ( @@ -97,22 +97,22 @@ ) - + update set ISDELETE = '1' - where + where RISKPOINT_ID = #{RISKPOINT_ID} - + update - set + set RISK_UNIT_ID = #{RISK_UNIT_ID}, IDENTIFICATION_ID = #{IDENTIFICATION_ID}, RISK_DESCR = #{RISK_DESCR}, @@ -127,17 +127,17 @@ LONGITUDE = #{LONGITUDE}, LATITUDE = #{LATITUDE}, RISKPOINT_ID = RISKPOINT_ID - where + where RISKPOINT_ID = #{RISKPOINT_ID} - + update set RES_ISDELETE = '1' - where + where RISKPOINT_ID = #{RISKPOINT_ID} @@ -152,9 +152,9 @@ id.PARTSNAME, de.NAME as DEPT_NAME, u.NAME as USER_NAME - from + from f - left join + left join d5 on f.LEVELID = d5.BIANMA left join bus_riskunit un on un.RISKUNIT_ID = f.RISK_UNIT_ID and un.ISDELETE = '0' @@ -162,35 +162,35 @@ left join bus_identificationparts id on id.IDENTIFICATIONPARTS_ID = f.IDENTIFICATION_ID and id.ISDELETE = '0' left join OA_DEPARTMENT de on de.DEPARTMENT_ID = f.DEPARTMENT_ID left join SYS_USER u on u.USER_ID = f.USER_ID - where + where f.RISKPOINT_ID = #{RISKPOINT_ID} - - + + - + - + - - + + @@ -301,20 +301,20 @@ set ISDELETE = '1' - where + where RISKPOINT_ID in #{item} - + update set RES_ISDELETE = '1' - where + where RISKPOINT_ID in #{item} @@ -327,7 +327,7 @@ t.LEVELID, count(1) as COUNT FROM - BUS_RISKPOINT t + BUS_RISKPOINT t WHERE t.CORPINFO_ID=#{CORPINFO_ID} and t.ISDELETE='0' @@ -343,7 +343,7 @@ GROUP BY t.LEVELID - + update - set + set LONGITUDE = #{LONGITUDE}, LATITUDE = #{LATITUDE} - where + where RISKPOINT_ID = #{RISKPOINT_ID} diff --git a/src/main/resources/mybatis/dsno1/risk/RiskUnitMapper.xml b/src/main/resources/mybatis/dsno2/risk/RiskUnitMapper.xml similarity index 99% rename from src/main/resources/mybatis/dsno1/risk/RiskUnitMapper.xml rename to src/main/resources/mybatis/dsno2/risk/RiskUnitMapper.xml index a5cc6b4..66a48fa 100644 --- a/src/main/resources/mybatis/dsno1/risk/RiskUnitMapper.xml +++ b/src/main/resources/mybatis/dsno2/risk/RiskUnitMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno3/task/CourseExamMapper.xml b/src/main/resources/mybatis/dsno2/task/CourseExamMapper.xml similarity index 100% rename from src/main/resources/mybatis/dsno3/task/CourseExamMapper.xml rename to src/main/resources/mybatis/dsno2/task/CourseExamMapper.xml diff --git a/src/main/resources/mybatis/dsno3/task/CourseExamRecordMapper.xml b/src/main/resources/mybatis/dsno2/task/CourseExamRecordMapper.xml similarity index 100% rename from src/main/resources/mybatis/dsno3/task/CourseExamRecordMapper.xml rename to src/main/resources/mybatis/dsno2/task/CourseExamRecordMapper.xml diff --git a/src/main/resources/mybatis/dsno3/task/CourseStudyMapper.xml b/src/main/resources/mybatis/dsno2/task/CourseStudyMapper.xml similarity index 100% rename from src/main/resources/mybatis/dsno3/task/CourseStudyMapper.xml rename to src/main/resources/mybatis/dsno2/task/CourseStudyMapper.xml diff --git a/src/main/resources/mybatis/dsno3/task/CourseStudyRecordMapper.xml b/src/main/resources/mybatis/dsno2/task/CourseStudyRecordMapper.xml similarity index 100% rename from src/main/resources/mybatis/dsno3/task/CourseStudyRecordMapper.xml rename to src/main/resources/mybatis/dsno2/task/CourseStudyRecordMapper.xml diff --git a/src/main/resources/mybatis/dsno3/task/CourseStudyVideoRecordMapper.xml b/src/main/resources/mybatis/dsno2/task/CourseStudyVideoRecordMapper.xml similarity index 100% rename from src/main/resources/mybatis/dsno3/task/CourseStudyVideoRecordMapper.xml rename to src/main/resources/mybatis/dsno2/task/CourseStudyVideoRecordMapper.xml diff --git a/src/main/resources/mybatis/dsno3/task/StageExamMapper.xml b/src/main/resources/mybatis/dsno2/task/StageExamMapper.xml similarity index 100% rename from src/main/resources/mybatis/dsno3/task/StageExamMapper.xml rename to src/main/resources/mybatis/dsno2/task/StageExamMapper.xml diff --git a/src/main/resources/mybatis/dsno3/task/StageExamRecordMapper.xml b/src/main/resources/mybatis/dsno2/task/StageExamRecordMapper.xml similarity index 100% rename from src/main/resources/mybatis/dsno3/task/StageExamRecordMapper.xml rename to src/main/resources/mybatis/dsno2/task/StageExamRecordMapper.xml diff --git a/src/main/resources/mybatis/dsno3/task/StageStudentRelationMapper.xml b/src/main/resources/mybatis/dsno2/task/StageStudentRelationMapper.xml similarity index 100% rename from src/main/resources/mybatis/dsno3/task/StageStudentRelationMapper.xml rename to src/main/resources/mybatis/dsno2/task/StageStudentRelationMapper.xml diff --git a/src/main/resources/mybatis/dsno3/task/StudyTaskMapper.xml b/src/main/resources/mybatis/dsno2/task/StudyTaskMapper.xml similarity index 100% rename from src/main/resources/mybatis/dsno3/task/StudyTaskMapper.xml rename to src/main/resources/mybatis/dsno2/task/StudyTaskMapper.xml diff --git a/src/main/resources/mybatis/dsno3/task/StudytaskCurriculumMapper.xml b/src/main/resources/mybatis/dsno2/task/StudytaskCurriculumMapper.xml similarity index 100% rename from src/main/resources/mybatis/dsno3/task/StudytaskCurriculumMapper.xml rename to src/main/resources/mybatis/dsno2/task/StudytaskCurriculumMapper.xml diff --git a/src/main/resources/mybatis/dsno3/task/StudytaskSignMapper.xml b/src/main/resources/mybatis/dsno2/task/StudytaskSignMapper.xml similarity index 100% rename from src/main/resources/mybatis/dsno3/task/StudytaskSignMapper.xml rename to src/main/resources/mybatis/dsno2/task/StudytaskSignMapper.xml diff --git a/src/main/resources/mybatis/dsno3/teacher/TeacherCertificateMapper.xml b/src/main/resources/mybatis/dsno2/teacher/TeacherCertificateMapper.xml similarity index 98% rename from src/main/resources/mybatis/dsno3/teacher/TeacherCertificateMapper.xml rename to src/main/resources/mybatis/dsno2/teacher/TeacherCertificateMapper.xml index 2b950de..a415d8e 100644 --- a/src/main/resources/mybatis/dsno3/teacher/TeacherCertificateMapper.xml +++ b/src/main/resources/mybatis/dsno2/teacher/TeacherCertificateMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno3/teacher/TeacherMapper.xml b/src/main/resources/mybatis/dsno2/teacher/TeacherMapper.xml similarity index 98% rename from src/main/resources/mybatis/dsno3/teacher/TeacherMapper.xml rename to src/main/resources/mybatis/dsno2/teacher/TeacherMapper.xml index 9db6ebb..9619c1d 100644 --- a/src/main/resources/mybatis/dsno3/teacher/TeacherMapper.xml +++ b/src/main/resources/mybatis/dsno2/teacher/TeacherMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mybatis/dsno3/mybatis-config.xml b/src/main/resources/mybatis/dsno3/mybatis-config.xml deleted file mode 100644 index a35bce8..0000000 --- a/src/main/resources/mybatis/dsno3/mybatis-config.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file