diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml index 6e04f3e3..ec72e80c 100644 --- a/blade-service-api/blade-desk-api/pom.xml +++ b/blade-service-api/blade-desk-api/pom.xml @@ -24,6 +24,10 @@ org.springblade blade-starter-excel + + org.springblade + blade-resource-api + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/BasicClazzDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/BasicClazzDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/BasicClazzDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/BasicClazzDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/BatConfigDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/BatConfigDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/BatConfigDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/BatConfigDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/CoatingThicknessDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/CoatingThicknessDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/CoatingThicknessDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/CoatingThicknessDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/FormulaDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/FormulaDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/FormulaDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/FormulaDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/LocallyPlatedPartDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/LocallyPlatedPartDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/LocallyPlatedPartDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/LocallyPlatedPartDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/MaterialQuotaDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/MaterialQuotaDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/MaterialQuotaDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/MaterialQuotaDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlanAssignSteerDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/PlanAssignSteerDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlanAssignSteerDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/PlanAssignSteerDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingSmallDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingSmallDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingSmallDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingSmallDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/ProcessAbilityDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/ProcessAbilityDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/ProcessAbilityDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/ProcessAbilityDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/ProdMarkDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/ProdMarkDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/ProdMarkDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/ProdMarkDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/ShiftsDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/ShiftsDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/ShiftsDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/ShiftsDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/TeamSetDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/TeamSetDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/TeamSetDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/TeamSetDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/WorkCenterDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/WorkCenterDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/WorkCenterDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/WorkCenterDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/WorkTankDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/WorkTankDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/WorkTankDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/WorkTankDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Formula.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Formula.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Formula.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Formula.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/WorkCenter.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkCenter.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/WorkCenter.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkCenter.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/WorkTank.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkTank.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/WorkTank.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkTank.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BasicClazzVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/BasicClazzVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BasicClazzVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/BasicClazzVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BatConfigVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/BatConfigVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BatConfigVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/BatConfigVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/CoatingThicknessVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/CoatingThicknessVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/CoatingThicknessVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/CoatingThicknessVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/FormulaVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/FormulaVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/FormulaVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/FormulaVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/LocallyPlatedPartVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/LocallyPlatedPartVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/LocallyPlatedPartVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/LocallyPlatedPartVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/MaterialQuotaVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/MaterialQuotaVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/MaterialQuotaVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/MaterialQuotaVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/ProcessAbilityVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/ProcessAbilityVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/ProcessAbilityVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/ProcessAbilityVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/ProdMarkVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/ProdMarkVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/ProdMarkVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/ProdMarkVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/ShiftsVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/ShiftsVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/ShiftsVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/ShiftsVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/TeamSetVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/TeamSetVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/TeamSetVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/TeamSetVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/WorkCenterVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/WorkCenterVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/WorkCenterVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/WorkCenterVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/WorkTankVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/WorkTankVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/WorkTankVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/WorkTankVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/AuditFileDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/AuditFileDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/AuditFileDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/AuditFileDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestItemDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestItemDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestItemDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestItemDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestStandardDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestStandardDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestStandardDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestStandardDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestTaskDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestTaskDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestTaskDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestTaskDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorMonthDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorMonthDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorMonthDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorMonthDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDetailDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDetailDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDetailDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDetailDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionItemDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionItemDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionItemDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionItemDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionResultDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionResultDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionResultDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionResultDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTaskDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTaskDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTaskDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTaskDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTemplateDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTemplateDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTemplateDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTemplateDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IotHardnessDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IotHardnessDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IotHardnessDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IotHardnessDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IotThicknessDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IotThicknessDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IotThicknessDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IotThicknessDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportConfigDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportConfigDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportConfigDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportConfigDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskCopyDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskCopyDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskCopyDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskCopyDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskHiDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskHiDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskHiDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskHiDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankWaveDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankWaveDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankWaveDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankWaveDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/PlanTestDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/PlanTestDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/PlanTestDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/PlanTestDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDetailDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDetailDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDetailDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDetailDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateTankDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateTankDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateTankDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateTankDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/RelInsTemplateItemDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/RelInsTemplateItemDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/RelInsTemplateItemDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/RelInsTemplateItemDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankReportItemDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankReportItemDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankReportItemDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankReportItemDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankWaveItemDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankWaveItemDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankWaveItemDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankWaveItemDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/RemindMsgDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/RemindMsgDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/RemindMsgDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/RemindMsgDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewDutyDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewDutyDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewDutyDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewDutyDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewFaultDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewFaultDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewFaultDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewFaultDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewSheetDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewSheetDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewSheetDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewSheetDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/StandardDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/StandardDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/StandardDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/StandardDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/StandardParamDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/StandardParamDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/StandardParamDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/StandardParamDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/SupplyInspectionDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/SupplyInspectionDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/SupplyInspectionDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/SupplyInspectionDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDetailDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDetailDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDetailDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDetailDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/package-info.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/package-info.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/package-info.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/package-info.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestStandard.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestStandard.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestStandard.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestStandard.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorMonth.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorMonth.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorMonth.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorMonth.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYear.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYear.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYear.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYear.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYearDetail.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYearDetail.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYearDetail.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYearDetail.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionResult.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionResult.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionResult.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionResult.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTemplate.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTemplate.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTemplate.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTemplate.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IotHardness.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IotHardness.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IotHardness.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IotHardness.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTank.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTank.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTank.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTank.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReport.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReport.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReport.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReport.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReportConfig.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReportConfig.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReportConfig.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReportConfig.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskCopy.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskCopy.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskCopy.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskCopy.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskHi.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskHi.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskHi.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskHi.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankWave.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankWave.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankWave.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankWave.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/PlanTest.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/PlanTest.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/PlanTest.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/PlanTest.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplate.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplate.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplate.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplate.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateDetail.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateDetail.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateDetail.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateDetail.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateTank.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateTank.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateTank.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateTank.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RelInsTemplateItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RelInsTemplateItem.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RelInsTemplateItem.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RelInsTemplateItem.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankReportItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankReportItem.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankReportItem.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankReportItem.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankWaveItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankWaveItem.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankWaveItem.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankWaveItem.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RemindMsg.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RemindMsg.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RemindMsg.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RemindMsg.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewDuty.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewDuty.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewDuty.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewDuty.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Standard.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/Standard.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Standard.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/Standard.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/StandardParam.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/StandardParam.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/StandardParam.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/StandardParam.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/SupplyInspection.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/SupplyInspection.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/SupplyInspection.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/SupplyInspection.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceChain.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/TraceChain.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceChain.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/TraceChain.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceEvent.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/TraceEvent.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceEvent.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/TraceEvent.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/TraceItem.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceItem.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/TraceItem.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/package-info.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/package-info.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/package-info.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/package-info.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestBatUpdateCycle.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestBatUpdateCycle.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestBatUpdateCycle.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestBatUpdateCycle.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestItemSubmit.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestItemSubmit.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestItemSubmit.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestItemSubmit.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestSubmit.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestSubmit.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestSubmit.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestSubmit.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskAccept.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskAccept.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskAccept.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskAccept.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFillData.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFillData.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFillData.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFillData.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFilter.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFilter.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFilter.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFilter.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssue.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssue.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssue.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssue.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssueBat.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssueBat.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssueBat.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssueBat.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestUpdateUserBat.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestUpdateUserBat.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestUpdateUserBat.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestUpdateUserBat.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskEditResult.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskEditResult.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskEditResult.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskEditResult.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java similarity index 97% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java index ee801651..f1851ffe 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java @@ -6,7 +6,6 @@ import lombok.EqualsAndHashCode; import org.springblade.desk.quality.pojo.entity.InspectionTask; import java.time.LocalDate; -import java.time.LocalDateTime; @Data @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskStartNew.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskStartNew.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskStartNew.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskStartNew.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java similarity index 58% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java index 8d84bfd0..773ea271 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java @@ -1,9 +1,5 @@ package org.springblade.desk.quality.pojo.request; -import org.springblade.desk.quality.pojo.entity.InspectionResult; - -import java.util.List; - public class InspectionTaskSubmit { /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateAdd.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateAdd.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateAdd.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateAdd.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateSearch.java similarity index 94% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateSearch.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateSearch.java index 81a587fd..62aca6d0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateSearch.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateSearch.java @@ -5,7 +5,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.desk.quality.pojo.entity.InspectionTemplate; -import java.time.LocalDateTime; import java.util.Date; @Data diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateUpdate.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateUpdate.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateUpdate.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateUpdate.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/JobExt.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/JobExt.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/JobExt.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/JobExt.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankSubmit.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankSubmit.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankSubmit.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankSubmit.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskAccept.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskAccept.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskAccept.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskAccept.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskApproval.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskApproval.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskApproval.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskApproval.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskClose.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskClose.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskClose.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskClose.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskCloseBat.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskCloseBat.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskCloseBat.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskCloseBat.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskEditDrug.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskEditDrug.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskEditDrug.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskEditDrug.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskException.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskException.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskException.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskException.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillData.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillData.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillData.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillData.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillDataBat.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillDataBat.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillDataBat.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillDataBat.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskGenManual.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskGenManual.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskGenManual.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskGenManual.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssue.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssue.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssue.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssue.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssueBat.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssueBat.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssueBat.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssueBat.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskReceiveDrug.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskReceiveDrug.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskReceiveDrug.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskReceiveDrug.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSendDrug.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSendDrug.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSendDrug.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSendDrug.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSubmit.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSubmit.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSubmit.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSubmit.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankUpdateBat.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankUpdateBat.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankUpdateBat.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankUpdateBat.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/NgSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/NgSearch.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/NgSearch.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/NgSearch.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/AuditFileVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/AuditFileVO.java similarity index 92% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/AuditFileVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/AuditFileVO.java index 178c8ec1..69b44287 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/AuditFileVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/AuditFileVO.java @@ -6,7 +6,6 @@ package org.springblade.desk.quality.pojo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springblade.core.mp.base.BaseEntity; import org.springblade.desk.basic.pojo.vo.BaseEntityVO; import org.springblade.desk.quality.pojo.entity.AuditFile; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestItemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestItemVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestItemVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestItemVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestStandardVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestStandardVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestStandardVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestStandardVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestTaskVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestTaskVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestTaskVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestTaskVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorMonthVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorMonthVO.java similarity index 95% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorMonthVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorMonthVO.java index 4af2161c..e9647fc7 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorMonthVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorMonthVO.java @@ -8,7 +8,6 @@ import lombok.EqualsAndHashCode; import org.springblade.desk.quality.pojo.entity.IndicatorMonth; import java.io.Serial; -import java.util.List; /** * [月度指标] 视图实体类 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearDetailVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearDetailVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearDetailVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionItemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionItemVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionItemVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionItemVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionResultVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionResultVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionResultVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionResultVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java similarity index 92% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java index 853db304..74c68865 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java @@ -3,7 +3,6 @@ */ package org.springblade.desk.quality.pojo.vo; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.desk.quality.pojo.entity.InspectionTask; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTemplateVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTemplateVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTemplateVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTemplateVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IotHardnessVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IotHardnessVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IotHardnessVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IotHardnessVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IotThicknessVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IotThicknessVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IotThicknessVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IotThicknessVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportConfigVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportConfigVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportConfigVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportConfigVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskCopyVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskCopyVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskCopyVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskCopyVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskHiVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskHiVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskHiVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskHiVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java similarity index 98% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java index e3506146..f5a92141 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java @@ -11,7 +11,6 @@ import org.springblade.desk.quality.pojo.entity.LiquidTankTask; import java.io.Serial; import java.time.LocalDate; -import java.time.LocalDateTime; /** * 视图实体类 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawItemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawItemVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawItemVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawItemVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/PlanTestVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/PlanTestVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/PlanTestVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/PlanTestVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateDetailVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateDetailVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateDetailVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateTankVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateTankVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateTankVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateTankVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/RelInsTemplateItemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RelInsTemplateItemVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/RelInsTemplateItemVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RelInsTemplateItemVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankReportItemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankReportItemVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankReportItemVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankReportItemVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankWaveItemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankWaveItemVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankWaveItemVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankWaveItemVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/RemindMsgVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RemindMsgVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/RemindMsgVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RemindMsgVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/StandardParamVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/StandardParamVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/StandardParamVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/StandardParamVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/StandardVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/StandardVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/StandardVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/StandardVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/SupplyInspectionVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/SupplyInspectionVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/SupplyInspectionVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/SupplyInspectionVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/package-info.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/package-info.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/package-info.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/package-info.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java index 93f13d1b..1f718d0e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java @@ -26,9 +26,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; -import org.springblade.desk.basic.constant.BasicClazzConst; import org.springblade.desk.basic.excel.FormulaExcel; -import org.springblade.desk.basic.pojo.entity.BasicClazz; import org.springblade.desk.basic.pojo.entity.Formula; import org.springblade.desk.basic.pojo.vo.FormulaVO; import org.springblade.desk.basic.service.IFormulaService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java index 2a33e127..ced140a1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java @@ -28,7 +28,6 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.MaterialQuotaExcel; -import org.springblade.desk.basic.pojo.entity.Formula; import org.springblade.desk.basic.pojo.entity.MaterialQuota; import org.springblade.desk.basic.pojo.vo.MaterialQuotaVO; import org.springblade.desk.basic.service.IMaterialQuotaService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java index be4e8032..4b7adeaf 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java @@ -27,7 +27,6 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.basic.excel.OemExcel; -import org.springblade.desk.basic.pojo.entity.MaterialQuota; import org.springblade.desk.basic.pojo.entity.Oem; import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.OemVO; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java index 2cbca935..4e9c9883 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java @@ -26,9 +26,7 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.ShiftsExcel; -import org.springblade.desk.basic.pojo.entity.Oem; import org.springblade.desk.basic.pojo.entity.Shifts; -import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.ShiftsVO; import org.springblade.desk.basic.service.IShiftsService; import org.springblade.desk.basic.util.ExcelExtUtil; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java index e342e074..f9cef1c9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java @@ -25,7 +25,6 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.TeamSetExcel; -import org.springblade.desk.basic.pojo.entity.Shifts; import org.springblade.desk.basic.pojo.entity.TeamSet; import org.springblade.desk.basic.pojo.vo.TeamSetVO; import org.springblade.desk.basic.service.ITeamSetService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java index 692c3739..72ae9820 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java @@ -9,10 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.pojo.entity.Oem; -import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.OemVO; -import org.springblade.desk.quality.pojo.entity.AuditFile; -import org.springblade.desk.quality.pojo.request.AuditFileSearch; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.java index d60e0d17..ab84e8f8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.desk.basic.excel.TeamSetExcel; -import org.springblade.desk.basic.mapper.en.EnBaseMapper; import org.springblade.desk.basic.pojo.entity.TeamSet; import org.springblade.desk.basic.pojo.vo.TeamSetVO; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/WorkCenterMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/WorkCenterMapper.java index d9424e25..583ab8b0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/WorkCenterMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/WorkCenterMapper.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.desk.basic.excel.WorkCenterExcel; -import org.springblade.desk.basic.mapper.en.EnBaseMapper; import org.springblade.desk.basic.pojo.entity.WorkCenter; import org.springblade.desk.basic.pojo.vo.WorkCenterVO; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java index 71b1c508..ceaf5592 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java @@ -11,8 +11,6 @@ import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.pojo.entity.Oem; import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.OemVO; -import org.springblade.desk.quality.pojo.entity.AuditFile; -import org.springblade.desk.quality.pojo.request.AuditFileSearch; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java index 5fa344e8..a856665e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java @@ -5,14 +5,12 @@ package org.springblade.desk.basic.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.Resource; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.core.mp.support.Condition; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.mapper.OemMapper; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsSimilarPartsController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsSimilarPartsController.java index c76da256..c27bd77f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsSimilarPartsController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsSimilarPartsController.java @@ -34,7 +34,6 @@ import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springblade.core.log.exception.ServiceException; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; @@ -42,11 +41,9 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; -import org.springblade.desk.quality.pojo.entity.CycleTestItem; import org.springframework.core.io.Resource; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -58,10 +55,9 @@ import org.springblade.desk.dashboard.service.IDsSimilarPartsService; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; + import java.util.Map; import java.util.List; -import java.util.stream.Collectors; import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java index 58ec68d1..02b7a969 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java @@ -3,7 +3,6 @@ */ package org.springblade.desk.quality.controller; -import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; @@ -28,9 +27,7 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.CycleTestExcel; -import org.springblade.desk.quality.excel.CycleTestExcelImport; import org.springblade.desk.quality.pojo.entity.CycleTest; -import org.springblade.desk.quality.pojo.entity.CycleTestItem; import org.springblade.desk.quality.pojo.request.CycleTestBatUpdateCycle; import org.springblade.desk.quality.pojo.request.CycleTestSubmit; import org.springblade.desk.quality.pojo.vo.CycleTestVO; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java index 1c6b2578..e8e39a5b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java @@ -28,11 +28,8 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.IndicatorYearExcel; -import org.springblade.desk.quality.pojo.entity.IndicatorMonth; import org.springblade.desk.quality.pojo.entity.IndicatorYear; import org.springblade.desk.quality.pojo.entity.IndicatorYearDetail; -import org.springblade.desk.quality.pojo.vo.IndicatorMonthVO; -import org.springblade.desk.quality.pojo.vo.IndicatorYearDetailVO; import org.springblade.desk.quality.pojo.vo.IndicatorYearVO; import org.springblade.desk.quality.service.IIndicatorYearDetailService; import org.springblade.desk.quality.service.IIndicatorYearService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java index e4e5e6b2..f4d8d143 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java @@ -28,7 +28,6 @@ import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.LiquidTankReportExcel; import org.springblade.desk.quality.pojo.entity.LiquidTankReport; -import org.springblade.desk.quality.pojo.entity.LiquidTankTaskCopy; import org.springblade.desk.quality.pojo.vo.LiquidTankReportVO; import org.springblade.desk.quality.service.ILiquidTankReportService; import org.springblade.desk.quality.wrapper.LiquidTankReportWrapper; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java index 0676f181..459dbe85 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java @@ -28,8 +28,6 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; -import org.springblade.desk.device.pojo.entity.MeasuringUpkeepEntity; -import org.springblade.desk.order.pojo.entity.YieldOrderCraft; import org.springblade.desk.quality.constant.NgConst; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.NgExcel; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateDetailController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateDetailController.java index 11b437f6..73501122 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateDetailController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateDetailController.java @@ -15,7 +15,6 @@ import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -33,9 +32,8 @@ import org.springblade.desk.quality.excel.ProReTemplateDetailExcel; import org.springblade.desk.quality.wrapper.ProReTemplateDetailWrapper; import org.springblade.desk.quality.service.IProReTemplateDetailService; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; + import java.util.Map; import java.util.List; import java.util.stream.Collectors; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateTankController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateTankController.java index c231dbbb..b43c3987 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateTankController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateTankController.java @@ -15,7 +15,6 @@ import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -33,9 +32,8 @@ import org.springblade.desk.quality.excel.ProReTemplateTankExcel; import org.springblade.desk.quality.wrapper.ProReTemplateTankWrapper; import org.springblade.desk.quality.service.IProReTemplateTankService; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; + import java.util.Map; import java.util.List; import java.util.stream.Collectors; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTemplateMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTemplateMapper.java index efee2bf0..8746aafe 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTemplateMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTemplateMapper.java @@ -13,7 +13,6 @@ import org.springblade.desk.quality.pojo.request.InspectionTemplateSearch; import org.springblade.desk.quality.pojo.vo.InspectionTemplateVO; import java.util.List; -import java.util.Map; /** * [检验模板] Mapper 接口 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService2.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService2.java index e81c6322..1cc4076b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService2.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService2.java @@ -10,10 +10,8 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import org.springblade.desk.dashboard.service.IBsPlatingService; import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.quality.constant.CycleTestTaskConst; -import org.springblade.desk.quality.constant.JobTypeConst; import org.springblade.desk.quality.mapper.CycleTestMapper; import org.springblade.desk.quality.pojo.entity.CycleTest; import org.springblade.desk.quality.pojo.entity.CycleTestItem; @@ -25,7 +23,6 @@ import org.springblade.desk.quality.pojo.vo.CycleTestStandardVO; import org.springblade.desk.quality.wrapper.CycleTestStandardWrapper; import org.springblade.desk.quality.wrapper.CycleTestWrapper; import org.springblade.resource.feign.IAttachClient; -import org.springblade.resource.pojo.entity.Attach; import org.springblade.system.feign.IDictClient; import org.springblade.system.feign.IUserClient; import org.springblade.system.pojo.entity.UserInfo; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java index 7ec3536f..bfeaad70 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java @@ -5,14 +5,11 @@ package org.springblade.desk.quality.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.service.en.EnBaseService; import org.springblade.desk.quality.excel.AuditFileExcel; import org.springblade.desk.quality.pojo.entity.AuditFile; -import org.springblade.desk.quality.pojo.entity.InspectionTemplate; import org.springblade.desk.quality.pojo.request.AuditFileSearch; -import org.springblade.desk.quality.pojo.request.InspectionTemplateSearch; import org.springblade.desk.quality.pojo.vo.AuditFileVO; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTemplateService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTemplateService.java index 0782dd12..6c3c5e9c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTemplateService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTemplateService.java @@ -10,10 +10,8 @@ import org.springblade.desk.quality.excel.InspectionTemplateExcel; import org.springblade.desk.quality.pojo.entity.InspectionTemplate; import org.springblade.desk.quality.pojo.request.InspectionTemplateSearch; import org.springblade.desk.quality.pojo.vo.InspectionTemplateVO; -import org.springblade.desk.quality.pojo.vo.LiquidTankVO; import java.util.List; -import java.util.Map; /** * [检验模板] 服务类 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankReportService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankReportService.java index 80d3b62c..c6a0ea1a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankReportService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankReportService.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import org.springblade.desk.quality.excel.LiquidTankReportExcel; import org.springblade.desk.quality.pojo.entity.LiquidTankReport; -import org.springblade.desk.quality.pojo.vo.LiquidTankReportConfigVO; import org.springblade.desk.quality.pojo.vo.LiquidTankReportVO; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskCopyService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskCopyService.java index 4af52fa1..e3dafa3f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskCopyService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskCopyService.java @@ -11,7 +11,6 @@ import org.springblade.core.tool.api.R; import org.springblade.desk.quality.excel.LiquidTankTaskCopyExcel; import org.springblade.desk.quality.pojo.entity.LiquidTankTaskCopy; import org.springblade.desk.quality.pojo.vo.LiquidTankTaskCopyVO; -import org.springblade.desk.quality.pojo.vo.LiquidTankTaskVO; import org.springframework.web.bind.annotation.RequestBody; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskService.java index 7851c154..c5b58bd4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskService.java @@ -10,7 +10,6 @@ import org.springblade.core.tool.api.R; import org.springblade.desk.quality.excel.LiquidTankTaskExcel; import org.springblade.desk.quality.pojo.entity.LiquidTankTask; import org.springblade.desk.quality.pojo.vo.LiquidTankTaskVO; -import org.springblade.desk.quality.pojo.vo.LiquidTankVO; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IProReTemplateService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IProReTemplateService.java index 89dc56ac..c3be1c49 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IProReTemplateService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IProReTemplateService.java @@ -5,15 +5,11 @@ package org.springblade.desk.quality.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import io.swagger.v3.oas.annotations.Parameter; -import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.service.en.EnBaseService; import org.springblade.desk.quality.excel.ProReTemplateExcel; import org.springblade.desk.quality.pojo.entity.ProReTemplate; -import org.springblade.desk.quality.pojo.vo.InspectionTemplateVO; import org.springblade.desk.quality.pojo.vo.ProReTemplateVO; -import org.springframework.web.bind.annotation.RequestParam; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IStandardService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IStandardService.java index a3c072da..c643c947 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IStandardService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IStandardService.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import org.springblade.desk.quality.excel.StandardExcel; import org.springblade.desk.quality.pojo.entity.Standard; -import org.springblade.desk.quality.pojo.vo.LiquidTankVO; import org.springblade.desk.quality.pojo.vo.StandardVO; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService222.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService222.java index f35d8a9f..cbe23b25 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService222.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService222.java @@ -12,8 +12,8 @@ import org.springblade.desk.quality.mapper.LiquidTankMapper; import org.springblade.desk.quality.mapper.LiquidTankTaskMapper; import org.springblade.desk.quality.pojo.entity.LiquidTank; import org.springblade.desk.quality.pojo.entity.LiquidTankTask; -import org.springblade.desk.quality.pojo.request.*; import org.springblade.desk.basic.util.IdUtil; +import org.springblade.desk.quality.pojo.request.*; import org.springblade.system.feign.IUserClient; import org.springblade.system.pojo.entity.UserInfo; import org.springframework.stereotype.Service; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java index 1c0154f5..069ea2e9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java @@ -11,16 +11,13 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.service.en.impl.EnBaseServiceImpl; import org.springblade.desk.quality.constant.AuditFileConst; import org.springblade.desk.quality.excel.AuditFileExcel; import org.springblade.desk.quality.mapper.AuditFileMapper; import org.springblade.desk.quality.pojo.entity.AuditFile; -import org.springblade.desk.quality.pojo.entity.InspectionTemplate; import org.springblade.desk.quality.pojo.request.AuditFileSearch; -import org.springblade.desk.quality.pojo.request.InspectionTemplateSearch; import org.springblade.desk.quality.pojo.vo.AuditFileVO; import org.springblade.desk.quality.service.IAuditFileService; import org.springblade.system.feign.IDictClient; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestServiceImpl.java index a81fe509..32d1a3bf 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestServiceImpl.java @@ -33,7 +33,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestStandardServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestStandardServiceImpl.java index 4b147556..891c52e5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestStandardServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestStandardServiceImpl.java @@ -15,7 +15,6 @@ import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.quality.excel.CycleTestStandardExcel; import org.springblade.desk.quality.mapper.CycleTestStandardMapper; -import org.springblade.desk.quality.pojo.entity.CycleTestItem; import org.springblade.desk.quality.pojo.entity.CycleTestStandard; import org.springblade.desk.quality.pojo.vo.CycleTestStandardVO; import org.springblade.desk.quality.service.ICycleTestStandardService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTemplateServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTemplateServiceImpl.java index d34b779a..56d32152 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTemplateServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTemplateServiceImpl.java @@ -26,7 +26,6 @@ import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; import java.util.List; -import java.util.Map; /** * [检验模板] 服务实现类 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateDetailServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateDetailServiceImpl.java index 7bf92438..e16f4a16 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateDetailServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateDetailServiceImpl.java @@ -16,11 +16,9 @@ import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.desk.quality.excel.ProReTemplateDetailExcel; import org.springblade.desk.quality.mapper.ProReTemplateDetailMapper; import org.springblade.desk.quality.pojo.entity.ProReTemplateDetail; -import org.springblade.desk.quality.pojo.entity.ProReTemplateTank; import org.springblade.desk.quality.pojo.vo.ProReTemplateDetailVO; import org.springblade.desk.quality.service.IProReTemplateDetailService; import org.springblade.desk.quality.wrapper.ProReTemplateDetailWrapper; -import org.springblade.desk.quality.wrapper.ProReTemplateTankWrapper; import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java index 0cfc94d0..90d8ed63 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java @@ -11,11 +11,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springblade.core.mp.base.BaseEntity; -import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.api.R; -import org.springblade.desk.basic.pojo.vo.BaseEntityVO; import org.springblade.desk.basic.service.en.impl.EnBaseServiceImpl; import org.springblade.desk.quality.constant.ProReTemplateConst; import org.springblade.desk.quality.excel.ProReTemplateExcel; @@ -31,13 +27,9 @@ import org.springblade.desk.basic.util.IdUtil; import org.springblade.system.feign.IDictClient; import org.springblade.system.feign.ISysClient; import org.springblade.system.feign.IUserClient; -import org.springblade.system.pojo.entity.Dept; -import org.springblade.system.pojo.entity.User; -import org.springblade.system.pojo.entity.UserInfo; import org.springframework.stereotype.Service; import java.util.*; -import java.util.stream.Collectors; /** * [过程记录模板] 服务实现类 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateTankServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateTankServiceImpl.java index ab22ddac..c26f38f8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateTankServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateTankServiceImpl.java @@ -5,7 +5,6 @@ package org.springblade.desk.quality.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.Resource; @@ -24,7 +23,6 @@ import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** * [过程记录模板-槽-明细] 服务实现类 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/PowerJobUtil.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/PowerJobUtil.java index aa26567d..bf333add 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/PowerJobUtil.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/PowerJobUtil.java @@ -3,7 +3,6 @@ package org.springblade.desk.quality.util; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springblade.core.tool.api.R; -import org.springblade.desk.quality.constant.JobTypeConst; import org.springblade.desk.quality.pojo.request.JobExt; import java.util.Objects;