diff --git a/securitycontrol-commons/securitycontrol-commons-core/pom.xml b/securitycontrol-commons/securitycontrol-commons-core/pom.xml index 7539e82..8807fa6 100644 --- a/securitycontrol-commons/securitycontrol-commons-core/pom.xml +++ b/securitycontrol-commons/securitycontrol-commons-core/pom.xml @@ -64,6 +64,12 @@ org.springframework.boot spring-boot-starter-validation + + + hibernate-validator + org.hibernate.validator + + @@ -72,6 +78,20 @@ jackson-databind + + + + cn.afterturn + easypoi-base + 4.2.0 + compile + + + guava + com.google.guava + + + com.alibaba.fastjson2 @@ -112,6 +132,16 @@ org.apache.poi poi-ooxml + + + poi-ooxml-schemas + org.apache.poi + + + poi + org.apache.poi + + @@ -137,6 +167,7 @@ 6.0.18.Final + \ No newline at end of file diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/export/util/ExcelStyleUtil.java b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/ExcelStyleUtil.java similarity index 98% rename from securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/export/util/ExcelStyleUtil.java rename to securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/ExcelStyleUtil.java index f93e926..420b884 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/export/util/ExcelStyleUtil.java +++ b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/ExcelStyleUtil.java @@ -1,4 +1,4 @@ -package com.securitycontrol.system.export.util; +package com.securitycontrol.common.core.utils; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.afterturn.easypoi.excel.entity.params.ExcelForEachParams; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/vo/VehicleDto.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/dto/VehicleDto.java similarity index 93% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/vo/VehicleDto.java rename to securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/dto/VehicleDto.java index e5f2488..58b9b6d 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/vo/VehicleDto.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/dto/VehicleDto.java @@ -1,4 +1,4 @@ -package com.securitycontrol.background.vehicleManagement.vo; +package com.securitycontrol.entity.background.dto; import cn.afterturn.easypoi.excel.annotation.Excel; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/export/entity/DutyPlanExportVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/entity/DutyPlanExportVo.java similarity index 94% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/export/entity/DutyPlanExportVo.java rename to securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/entity/DutyPlanExportVo.java index 0498f05..5b5994c 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/export/entity/DutyPlanExportVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/entity/DutyPlanExportVo.java @@ -1,4 +1,4 @@ -package com.securitycontrol.background.export.entity; +package com.securitycontrol.entity.background.entity; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/export/entity/TeamExportVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/entity/TeamExportVo.java similarity index 92% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/export/entity/TeamExportVo.java rename to securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/entity/TeamExportVo.java index af3b49b..96cf023 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/export/entity/TeamExportVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/entity/TeamExportVo.java @@ -1,4 +1,4 @@ -package com.securitycontrol.background.export.entity; +package com.securitycontrol.entity.background.entity; import cn.afterturn.easypoi.excel.annotation.Excel; import io.swagger.annotations.ApiModelProperty; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/export/entity/TeamUserExportVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/entity/TeamUserExportVo.java similarity index 93% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/export/entity/TeamUserExportVo.java rename to securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/entity/TeamUserExportVo.java index caf061b..12227c1 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/export/entity/TeamUserExportVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/entity/TeamUserExportVo.java @@ -1,4 +1,4 @@ -package com.securitycontrol.background.export.entity; +package com.securitycontrol.entity.background.entity; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/export/entity/TodayTaskExportVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/entity/TodayTaskExportVo.java similarity index 97% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/export/entity/TodayTaskExportVo.java rename to securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/entity/TodayTaskExportVo.java index 7875481..4551b57 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/export/entity/TodayTaskExportVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/entity/TodayTaskExportVo.java @@ -1,4 +1,4 @@ -package com.securitycontrol.background.export.entity; +package com.securitycontrol.entity.background.entity; import cn.afterturn.easypoi.excel.annotation.Excel; import io.swagger.annotations.ApiModelProperty; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/export/entity/UserAccessExportVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/entity/UserAccessExportVo.java similarity index 94% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/export/entity/UserAccessExportVo.java rename to securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/entity/UserAccessExportVo.java index 42a7cfb..6176f71 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/export/entity/UserAccessExportVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/entity/UserAccessExportVo.java @@ -1,4 +1,4 @@ -package com.securitycontrol.background.export.entity; +package com.securitycontrol.entity.background.entity; import cn.afterturn.easypoi.excel.annotation.Excel; import io.swagger.annotations.ApiModelProperty; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/vo/EarlyWarningRecordVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/EarlyWarningRecordVo.java similarity index 92% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/vo/EarlyWarningRecordVo.java rename to securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/EarlyWarningRecordVo.java index 5f2cf01..076727b 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/vo/EarlyWarningRecordVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/EarlyWarningRecordVo.java @@ -1,4 +1,4 @@ -package com.securitycontrol.background.towerDetection.vo; +package com.securitycontrol.entity.background.vo; import cn.afterturn.easypoi.excel.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/vo/EarlyWarningsRecordVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/EarlyWarningsRecordVo.java similarity index 93% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/vo/EarlyWarningsRecordVo.java rename to securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/EarlyWarningsRecordVo.java index db51bbc..94cd883 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/vo/EarlyWarningsRecordVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/EarlyWarningsRecordVo.java @@ -1,4 +1,4 @@ -package com.securitycontrol.background.constructionQuality.vo; +package com.securitycontrol.entity.background.vo; import cn.afterturn.easypoi.excel.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/vo/QualityRecordVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/QualityRecordVo.java similarity index 95% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/vo/QualityRecordVo.java rename to securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/QualityRecordVo.java index 174e817..d4b14f1 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/vo/QualityRecordVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/QualityRecordVo.java @@ -1,4 +1,4 @@ -package com.securitycontrol.background.constructionQuality.vo; +package com.securitycontrol.entity.background.vo; import cn.afterturn.easypoi.excel.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/vo/TowerRecordVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/TowerRecordVo.java similarity index 95% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/vo/TowerRecordVo.java rename to securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/TowerRecordVo.java index c6c63f4..aa9f5e4 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/vo/TowerRecordVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/TowerRecordVo.java @@ -1,4 +1,4 @@ -package com.securitycontrol.background.towerDetection.vo; +package com.securitycontrol.entity.background.vo; import cn.afterturn.easypoi.excel.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/vo/VehicleVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/VehicleVo.java similarity index 95% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/vo/VehicleVo.java rename to securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/VehicleVo.java index 03cb514..fd2fc05 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/vo/VehicleVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/VehicleVo.java @@ -1,4 +1,4 @@ -package com.securitycontrol.background.vehicleManagement.vo; +package com.securitycontrol.entity.background.vo; import cn.afterturn.easypoi.excel.annotation.Excel; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/securitycontrol-gateway/pom.xml b/securitycontrol-gateway/pom.xml index c6afae3..531edac 100644 --- a/securitycontrol-gateway/pom.xml +++ b/securitycontrol-gateway/pom.xml @@ -109,6 +109,7 @@ net.logstash.logback logstash-logback-encoder + diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/controller/EarlyWarningRecordController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/EarlyWarningRecordController.java similarity index 91% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/controller/EarlyWarningRecordController.java rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/EarlyWarningRecordController.java index aef3702..c1cbcca 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/controller/EarlyWarningRecordController.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/EarlyWarningRecordController.java @@ -1,18 +1,18 @@ -package com.securitycontrol.background.towerDetection.controller; +package com.securitycontrol.background.controller; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; -import com.securitycontrol.background.towerDetection.service.EarlyWarningRecordService; +import com.securitycontrol.background.service.EarlyWarningRecordService; -import com.securitycontrol.background.towerDetection.vo.EarlyWarningRecordVo; +import com.securitycontrol.entity.background.vo.EarlyWarningRecordVo; import com.securitycontrol.common.core.web.controller.BaseController; import com.securitycontrol.common.core.web.page.TableDataInfo; import com.securitycontrol.common.log.annotation.Log; import com.securitycontrol.common.log.enums.OperationType; import cn.afterturn.easypoi.excel.entity.ExportParams; -import com.securitycontrol.system.export.util.ExcelStyleUtil; +import com.securitycontrol.common.core.utils.ExcelStyleUtil; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Workbook; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/controller/EarlyWarningsRecordController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/EarlyWarningsRecordController.java similarity index 90% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/controller/EarlyWarningsRecordController.java rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/EarlyWarningsRecordController.java index fcd46bf..2d76ddc 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/controller/EarlyWarningsRecordController.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/EarlyWarningsRecordController.java @@ -1,11 +1,10 @@ -package com.securitycontrol.background.constructionQuality.controller; +package com.securitycontrol.background.controller; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; -import com.securitycontrol.background.constructionQuality.service.EarlyWarningsRecordService; -import com.securitycontrol.background.constructionQuality.vo.EarlyWarningsRecordVo; -import com.securitycontrol.background.vehicleManagement.vo.VehicleVo; +import com.securitycontrol.background.service.EarlyWarningsRecordService; +import com.securitycontrol.entity.background.vo.EarlyWarningsRecordVo; import com.securitycontrol.common.core.web.controller.BaseController; import com.securitycontrol.common.core.web.domain.AjaxResult; import com.securitycontrol.common.core.web.page.TableDataInfo; @@ -13,7 +12,7 @@ import com.securitycontrol.common.log.annotation.Log; import com.securitycontrol.common.log.enums.OperationType; import cn.afterturn.easypoi.excel.entity.ExportParams; -import com.securitycontrol.system.export.util.ExcelStyleUtil; +import com.securitycontrol.common.core.utils.ExcelStyleUtil; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Workbook; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/ExportFileController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/ExportFileController.java index 319f311..aa84f32 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/ExportFileController.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/ExportFileController.java @@ -3,7 +3,6 @@ package com.securitycontrol.background.controller; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; -import com.securitycontrol.background.export.entity.*; import com.securitycontrol.background.export.util.ExcelStyleUtil; import com.securitycontrol.background.service.DutyPlanService; import com.securitycontrol.background.service.HumanService; @@ -16,6 +15,7 @@ import com.securitycontrol.common.log.annotation.Log; import com.securitycontrol.common.log.enums.OperationType; import com.securitycontrol.entity.background.dto.ParamDto; import com.securitycontrol.entity.background.dto.TodayTaskDto; +import com.securitycontrol.entity.background.entity.*; import com.securitycontrol.entity.background.vo.*; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Workbook; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/controller/QualityRecordController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/QualityRecordController.java similarity index 91% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/controller/QualityRecordController.java rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/QualityRecordController.java index f18ec13..96fce91 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/controller/QualityRecordController.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/QualityRecordController.java @@ -1,16 +1,16 @@ -package com.securitycontrol.background.constructionQuality.controller; +package com.securitycontrol.background.controller; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; -import com.securitycontrol.background.constructionQuality.service.QualityRecordService; -import com.securitycontrol.background.constructionQuality.vo.QualityRecordVo; +import com.securitycontrol.background.service.QualityRecordService; +import com.securitycontrol.entity.background.vo.QualityRecordVo; import com.securitycontrol.common.core.web.controller.BaseController; import com.securitycontrol.common.core.web.page.TableDataInfo; import com.securitycontrol.common.log.annotation.Log; import com.securitycontrol.common.log.enums.OperationType; import cn.afterturn.easypoi.excel.entity.ExportParams; -import com.securitycontrol.system.export.util.ExcelStyleUtil; +import com.securitycontrol.common.core.utils.ExcelStyleUtil; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Workbook; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/TaskCheckController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/TaskCheckController.java index 26d5013..da7b5b8 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/TaskCheckController.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/TaskCheckController.java @@ -1,16 +1,13 @@ package com.securitycontrol.background.controller; -import com.securitycontrol.background.constructionQuality.vo.QualityRecordVo; import com.securitycontrol.background.service.TaskCheckService; import com.securitycontrol.common.core.domain.Result; import com.securitycontrol.common.core.web.controller.BaseController; -import com.securitycontrol.common.core.web.domain.AjaxResult; import com.securitycontrol.common.core.web.page.TableDataInfo; import com.securitycontrol.common.log.annotation.Log; import com.securitycontrol.common.log.enums.OperationType; import com.securitycontrol.entity.background.dto.ClassCheckDto; import com.securitycontrol.entity.background.vo.ClassCheckVo; -import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/controller/TowerRecordController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/TowerRecordController.java similarity index 91% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/controller/TowerRecordController.java rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/TowerRecordController.java index e61e9ef..8551579 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/controller/TowerRecordController.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/TowerRecordController.java @@ -1,16 +1,16 @@ -package com.securitycontrol.background.towerDetection.controller; +package com.securitycontrol.background.controller; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; -import com.securitycontrol.background.towerDetection.service.TowerRecordService; -import com.securitycontrol.background.towerDetection.vo.TowerRecordVo; +import com.securitycontrol.background.service.TowerRecordService; +import com.securitycontrol.entity.background.vo.TowerRecordVo; import com.securitycontrol.common.core.web.controller.BaseController; import com.securitycontrol.common.core.web.page.TableDataInfo; import com.securitycontrol.common.log.annotation.Log; import com.securitycontrol.common.log.enums.OperationType; import cn.afterturn.easypoi.excel.entity.ExportParams; -import com.securitycontrol.system.export.util.ExcelStyleUtil; +import com.securitycontrol.common.core.utils.ExcelStyleUtil; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Workbook; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/controller/VehicleController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/VehicleController.java similarity index 92% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/controller/VehicleController.java rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/VehicleController.java index f847f3a..26ef061 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/controller/VehicleController.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/VehicleController.java @@ -1,25 +1,22 @@ -package com.securitycontrol.background.vehicleManagement.controller; +package com.securitycontrol.background.controller; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; -import com.securitycontrol.background.vehicleManagement.service.VehicleService; -import com.securitycontrol.background.vehicleManagement.vo.VehicleDto; -import com.securitycontrol.background.vehicleManagement.vo.VehicleVo; +import com.securitycontrol.background.service.VehicleService; +import com.securitycontrol.entity.background.dto.VehicleDto; +import com.securitycontrol.entity.background.vo.VehicleVo; import com.securitycontrol.common.core.web.controller.BaseController; import com.securitycontrol.common.core.web.domain.AjaxResult; import com.securitycontrol.common.core.web.page.TableDataInfo; import com.securitycontrol.common.log.annotation.Log; import com.securitycontrol.common.log.enums.OperationType; -import com.securitycontrol.entity.system.base.dto.GxPlanDto; -import com.securitycontrol.entity.system.base.vo.GxPlanVo; -import com.securitycontrol.system.export.util.ExcelStyleUtil; +import com.securitycontrol.common.core.utils.ExcelStyleUtil; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.ServletOutputStream; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/export/util/ExcelStyleUtil.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/export/util/ExcelStyleUtil.java deleted file mode 100644 index 3212b86..0000000 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/export/util/ExcelStyleUtil.java +++ /dev/null @@ -1,198 +0,0 @@ -package com.securitycontrol.background.export.util; - -import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; -import cn.afterturn.easypoi.excel.entity.params.ExcelForEachParams; -import cn.afterturn.easypoi.excel.export.styler.IExcelExportStyler; -import org.apache.poi.ss.usermodel.*; - -/** - * @author 10488 - * @Auther: ccw - * @Date: 2022/05/12/16:22 - * @description: easypoi 导出表格样式 - */ -public class ExcelStyleUtil implements IExcelExportStyler { - private static final short STRING_FORMAT = (short) BuiltinFormats.getBuiltinFormat("TEXT"); - private static final short FONT_SIZE_TEN = 10; - private static final short FONT_SIZE_ELEVEN = 11; - private static final short FONT_SIZE_TWELVE = 12; - - /** - * 大标题样式 - */ - private CellStyle headerStyle; - - /** - * 每列标题样式 - */ - private CellStyle titleStyle; - - /** - * 数据行样式 - */ - private CellStyle styles; - - public ExcelStyleUtil(Workbook workbook) { - this.init(workbook); - } - - /** - * 初始化样式 - * - * @param workbook - */ - private void init(Workbook workbook) { - this.headerStyle = initHeaderStyle(workbook); - this.titleStyle = initTitleStyle(workbook); - this.styles = initStyles(workbook); - } - - /** - * 大标题样式 - * - * @param color - * @return - */ - - @Override - public CellStyle getHeaderStyle(short color) { - return headerStyle; - } - - /** - * 每列标题样式 - * - * @param color - * @return - */ - - @Override - public CellStyle getTitleStyle(short color) { - return titleStyle; - } - - /** - * 数据行样式 - * - * @param parity 可以用来表示奇偶行 - * @param entity 数据内容 - * @return 样式 - */ - - @Override - - public CellStyle getStyles(boolean parity, ExcelExportEntity entity) { - return styles; - } - - /** - * 获取样式方法 - * - * @param dataRow 数据行 - * @param obj 对象 - * @param data 数据 - */ - - @Override - - public CellStyle getStyles(Cell cell, int dataRow, ExcelExportEntity entity, Object obj, Object data) { - return getStyles(true, entity); - } - - /** - * 模板使用的样式设置 - */ - - @Override - public CellStyle getTemplateStyles(boolean isSingle, ExcelForEachParams excelForEachParams) { - return null; - } - - /** - * 初始化--大标题样式 - * - * @param workbook - * @return - */ - - private CellStyle initHeaderStyle(Workbook workbook) { - CellStyle style = getBaseCellStyle(workbook); - style.setFont(getFont(workbook, FONT_SIZE_TWELVE, true)); - return style; - } - - /** - * 初始化--每列标题样式 - * - * @param workbook - * @return - */ - - private CellStyle initTitleStyle(Workbook workbook) { - CellStyle style = getBaseCellStyle(workbook); - style.setFont(getFont(workbook, FONT_SIZE_ELEVEN, false)); - //背景色 - style.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex()); - style.setFillPattern(FillPatternType.SOLID_FOREGROUND); - return style; - - } - - /** - * 初始化--数据行样式 - * - * @param workbook - * @return - */ - private CellStyle initStyles(Workbook workbook) { - CellStyle style = getBaseCellStyle(workbook); - style.setFont(getFont(workbook, FONT_SIZE_TEN, false)); - style.setDataFormat(STRING_FORMAT); - return style; - } - - /** - * 基础样式 - * - * @return - */ - - private CellStyle getBaseCellStyle(Workbook workbook) { - CellStyle style = workbook.createCellStyle(); - //下边框 - style.setBorderBottom(BorderStyle.THIN); - //左边框 - style.setBorderLeft(BorderStyle.THIN); - //上边框 - style.setBorderTop(BorderStyle.THIN); - //右边框 - style.setBorderRight(BorderStyle.THIN); - //水平居中 - style.setAlignment(HorizontalAlignment.CENTER); - //上下居中 - style.setVerticalAlignment(VerticalAlignment.CENTER); - //设置自动换行 - style.setWrapText(true); - return style; - } - - /** - * 字体样式 - * - * @param size 字体大小 - * @param isBold 是否加粗 - * @return - */ - - private Font getFont(Workbook workbook, short size, boolean isBold) { - Font font = workbook.createFont(); - //字体样式 - font.setFontName("宋体"); - //是否加粗 - font.setBold(isBold); - //字体大小 - font.setFontHeightInPoints(size); - return font; - } -} - diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/mapper/EarlyWarningRecordMapper.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/EarlyWarningRecordMapper.java similarity index 64% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/mapper/EarlyWarningRecordMapper.java rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/EarlyWarningRecordMapper.java index a9f8c4a..4ec4792 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/mapper/EarlyWarningRecordMapper.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/EarlyWarningRecordMapper.java @@ -1,7 +1,6 @@ -package com.securitycontrol.background.towerDetection.mapper; +package com.securitycontrol.background.mapper; -import com.securitycontrol.background.towerDetection.vo.EarlyWarningRecordVo; -import com.securitycontrol.background.towerDetection.vo.TowerRecordVo; +import com.securitycontrol.entity.background.vo.EarlyWarningRecordVo; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/mapper/EarlyWarningsRecordMapper.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/EarlyWarningsRecordMapper.java similarity index 66% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/mapper/EarlyWarningsRecordMapper.java rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/EarlyWarningsRecordMapper.java index 88b20b2..77a1638 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/mapper/EarlyWarningsRecordMapper.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/EarlyWarningsRecordMapper.java @@ -1,7 +1,6 @@ -package com.securitycontrol.background.constructionQuality.mapper; +package com.securitycontrol.background.mapper; -import com.securitycontrol.background.constructionQuality.vo.EarlyWarningsRecordVo; -import com.securitycontrol.background.vehicleManagement.vo.VehicleVo; +import com.securitycontrol.entity.background.vo.EarlyWarningsRecordVo; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/mapper/QualityRecordMapper.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/QualityRecordMapper.java similarity index 71% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/mapper/QualityRecordMapper.java rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/QualityRecordMapper.java index ef23dba..2468ad4 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/mapper/QualityRecordMapper.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/QualityRecordMapper.java @@ -1,6 +1,6 @@ -package com.securitycontrol.background.constructionQuality.mapper; +package com.securitycontrol.background.mapper; -import com.securitycontrol.background.constructionQuality.vo.QualityRecordVo; +import com.securitycontrol.entity.background.vo.QualityRecordVo; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/mapper/TowerRecordMapper.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/TowerRecordMapper.java similarity index 72% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/mapper/TowerRecordMapper.java rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/TowerRecordMapper.java index 3147b9c..49acac8 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/mapper/TowerRecordMapper.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/TowerRecordMapper.java @@ -1,6 +1,6 @@ -package com.securitycontrol.background.towerDetection.mapper; +package com.securitycontrol.background.mapper; -import com.securitycontrol.background.towerDetection.vo.TowerRecordVo; +import com.securitycontrol.entity.background.vo.TowerRecordVo; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/VehicleMapper.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/VehicleMapper.java new file mode 100644 index 0000000..e05af46 --- /dev/null +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/VehicleMapper.java @@ -0,0 +1,32 @@ +package com.securitycontrol.background.mapper; + +import com.securitycontrol.entity.background.dto.VehicleDto; +import com.securitycontrol.entity.background.vo.VehicleVo; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * 车辆管理 + */ +@Repository(value = "VehicleMapper") +public interface VehicleMapper { + /** + * 获取 + */ + List getVehicleLists(VehicleVo dto); + + /** + * 新增/修改 + */ + void addOrUpdateVehicle(VehicleVo vo); + + /** + * 删除 + */ + void delVehicleById(VehicleVo dto); + + List getLists(VehicleVo dto); + + List getListsDto(VehicleDto dto); +} diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/service/EarlyWarningRecordService.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/EarlyWarningRecordService.java similarity index 67% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/service/EarlyWarningRecordService.java rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/EarlyWarningRecordService.java index a4a1a81..3fde063 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/service/EarlyWarningRecordService.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/EarlyWarningRecordService.java @@ -1,6 +1,6 @@ -package com.securitycontrol.background.towerDetection.service; +package com.securitycontrol.background.service; -import com.securitycontrol.background.towerDetection.vo.EarlyWarningRecordVo; +import com.securitycontrol.entity.background.vo.EarlyWarningRecordVo; import java.util.List; /** diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/service/EarlyWarningsRecordService.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/EarlyWarningsRecordService.java similarity index 72% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/service/EarlyWarningsRecordService.java rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/EarlyWarningsRecordService.java index 4bef8f7..413d6bb 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/service/EarlyWarningsRecordService.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/EarlyWarningsRecordService.java @@ -1,7 +1,7 @@ -package com.securitycontrol.background.constructionQuality.service; +package com.securitycontrol.background.service; -import com.securitycontrol.background.constructionQuality.vo.EarlyWarningsRecordVo; +import com.securitycontrol.entity.background.vo.EarlyWarningsRecordVo; import com.securitycontrol.common.core.web.domain.AjaxResult; import java.util.List; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/service/QualityRecordService.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/QualityRecordService.java similarity index 65% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/service/QualityRecordService.java rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/QualityRecordService.java index b9e2e6f..63983d1 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/service/QualityRecordService.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/QualityRecordService.java @@ -1,6 +1,6 @@ -package com.securitycontrol.background.constructionQuality.service; +package com.securitycontrol.background.service; -import com.securitycontrol.background.constructionQuality.vo.QualityRecordVo; +import com.securitycontrol.entity.background.vo.QualityRecordVo; import java.util.List; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/service/TowerRecordService.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/TowerRecordService.java similarity index 65% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/service/TowerRecordService.java rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/TowerRecordService.java index 1dd8c33..4e56b55 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/service/TowerRecordService.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/TowerRecordService.java @@ -1,6 +1,6 @@ -package com.securitycontrol.background.towerDetection.service; +package com.securitycontrol.background.service; -import com.securitycontrol.background.towerDetection.vo.TowerRecordVo; +import com.securitycontrol.entity.background.vo.TowerRecordVo; import java.util.List; /** diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/VehicleService.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/VehicleService.java new file mode 100644 index 0000000..0426cba --- /dev/null +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/VehicleService.java @@ -0,0 +1,35 @@ +package com.securitycontrol.background.service; + +import com.securitycontrol.entity.background.dto.VehicleDto; +import com.securitycontrol.entity.background.vo.VehicleVo; +import com.securitycontrol.common.core.web.domain.AjaxResult; + +import java.util.List; + +/** + * 车辆管理 + */ +public interface VehicleService { + + /** + * 获取车辆列表 + */ + List getVehicleLists(VehicleVo dto); + + + /** + * 新增/修改 + * + */ + AjaxResult addOrUpdateVehicle(VehicleVo vo); + + + /** + * 删除 + */ + AjaxResult delVehicleById(VehicleVo dto); + + List getLists(VehicleVo dto); + + List getListsDto(VehicleDto dto); +} diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/service/impl/EarlyWarningRecordServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/EarlyWarningRecordServiceImpl.java similarity index 67% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/service/impl/EarlyWarningRecordServiceImpl.java rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/EarlyWarningRecordServiceImpl.java index 31d9333..f24aad4 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/service/impl/EarlyWarningRecordServiceImpl.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/EarlyWarningRecordServiceImpl.java @@ -1,9 +1,9 @@ -package com.securitycontrol.background.towerDetection.service.impl; +package com.securitycontrol.background.service.impl; -import com.securitycontrol.background.towerDetection.mapper.EarlyWarningRecordMapper; -import com.securitycontrol.background.towerDetection.service.EarlyWarningRecordService; -import com.securitycontrol.background.towerDetection.vo.EarlyWarningRecordVo; +import com.securitycontrol.background.mapper.EarlyWarningRecordMapper; +import com.securitycontrol.background.service.EarlyWarningRecordService; +import com.securitycontrol.entity.background.vo.EarlyWarningRecordVo; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/service/impl/EarlyWarningsRecordServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/EarlyWarningsRecordServiceImpl.java similarity index 73% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/service/impl/EarlyWarningsRecordServiceImpl.java rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/EarlyWarningsRecordServiceImpl.java index 8f7fb93..13a02ec 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/service/impl/EarlyWarningsRecordServiceImpl.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/EarlyWarningsRecordServiceImpl.java @@ -1,13 +1,10 @@ -package com.securitycontrol.background.constructionQuality.service.impl; +package com.securitycontrol.background.service.impl; -import com.securitycontrol.background.constructionQuality.mapper.EarlyWarningsRecordMapper; -import com.securitycontrol.background.constructionQuality.service.EarlyWarningsRecordService; -import com.securitycontrol.background.constructionQuality.vo.EarlyWarningsRecordVo; -import com.securitycontrol.background.vehicleManagement.vo.VehicleVo; -import com.securitycontrol.common.core.utils.StringUtils; +import com.securitycontrol.background.mapper.EarlyWarningsRecordMapper; +import com.securitycontrol.background.service.EarlyWarningsRecordService; +import com.securitycontrol.entity.background.vo.EarlyWarningsRecordVo; import com.securitycontrol.common.core.web.domain.AjaxResult; import com.securitycontrol.common.security.utils.SecurityUtils; -import com.securitycontrol.system.api.model.LoginUser; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/service/impl/QualityRecordServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/QualityRecordServiceImpl.java similarity index 66% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/service/impl/QualityRecordServiceImpl.java rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/QualityRecordServiceImpl.java index 3ee1bf5..782454e 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/constructionQuality/service/impl/QualityRecordServiceImpl.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/QualityRecordServiceImpl.java @@ -1,9 +1,9 @@ -package com.securitycontrol.background.constructionQuality.service.impl; +package com.securitycontrol.background.service.impl; -import com.securitycontrol.background.constructionQuality.mapper.QualityRecordMapper; -import com.securitycontrol.background.constructionQuality.service.QualityRecordService; -import com.securitycontrol.background.constructionQuality.vo.QualityRecordVo; +import com.securitycontrol.background.mapper.QualityRecordMapper; +import com.securitycontrol.background.service.QualityRecordService; +import com.securitycontrol.entity.background.vo.QualityRecordVo; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TowerRecordServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TowerRecordServiceImpl.java new file mode 100644 index 0000000..af7bebb --- /dev/null +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TowerRecordServiceImpl.java @@ -0,0 +1,30 @@ +package com.securitycontrol.background.service.impl; + +import com.securitycontrol.background.mapper.TowerRecordMapper; +import com.securitycontrol.background.service.TowerRecordService; +import com.securitycontrol.entity.background.vo.TowerRecordVo; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.*; + +/** + * 组塔检测 - 检测记录 + * @author lsun + */ +@Service(value = "TowerRecordService") +@Slf4j +public class TowerRecordServiceImpl implements TowerRecordService { + + @Resource(name = "TowerRecordMapper") + private TowerRecordMapper mapper; + + @Override + public List getTowerRecordLists(TowerRecordVo dto) { + List list = new ArrayList<>(); + list = mapper.getTowerRecordLists(dto); + return list; + } + +} diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/service/impl/VehicleServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/VehicleServiceImpl.java similarity index 62% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/service/impl/VehicleServiceImpl.java rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/VehicleServiceImpl.java index a1721d7..5860f84 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/service/impl/VehicleServiceImpl.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/VehicleServiceImpl.java @@ -1,46 +1,22 @@ -package com.securitycontrol.background.vehicleManagement.service.impl; +package com.securitycontrol.background.service.impl; + + +import com.securitycontrol.background.mapper.VehicleMapper; +import com.securitycontrol.background.service.VehicleService; +import com.securitycontrol.entity.background.dto.VehicleDto; +import com.securitycontrol.entity.background.vo.VehicleVo; -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONArray; -import com.alibaba.fastjson2.JSONObject; -import com.securitycontrol.background.vehicleManagement.mapper.VehicleMapper; -import com.securitycontrol.background.vehicleManagement.service.VehicleService; -import com.securitycontrol.background.vehicleManagement.vo.VehicleDto; -import com.securitycontrol.background.vehicleManagement.vo.VehicleVo; -import com.securitycontrol.common.core.constant.Constant; -import com.securitycontrol.common.core.constant.HttpStatus; -import com.securitycontrol.common.core.constant.SecurityConstants; -import com.securitycontrol.common.core.domain.Result; -import com.securitycontrol.common.core.utils.ImportExcelUtils; import com.securitycontrol.common.core.utils.StringUtils; -import com.securitycontrol.common.core.utils.aes.DateTimeHelper; import com.securitycontrol.common.core.web.domain.AjaxResult; -import com.securitycontrol.common.security.utils.ValidatorsUtils; -import com.securitycontrol.entity.system.base.dto.GxPlanDto; -import com.securitycontrol.entity.system.base.dto.ProDto; -import com.securitycontrol.entity.system.base.dto.ProGxPlanDto; -import com.securitycontrol.entity.system.base.vo.GxPlanVo; -import com.securitycontrol.entity.system.base.vo.ProImportVo; -import com.securitycontrol.entity.system.base.vo.ProVo; -import com.securitycontrol.entity.system.vo.ResourceFileVo; -import com.securitycontrol.system.api.RemoteFileService; -import com.securitycontrol.system.api.domain.SysFile; -import com.securitycontrol.system.base.mapper.IProMapper; -import com.securitycontrol.system.base.service.IProService; + import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; + import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; -import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.math.BigDecimal; + import java.util.*; /** diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/service/impl/TowerRecordServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/service/impl/TowerRecordServiceImpl.java deleted file mode 100644 index e9fbdc8..0000000 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/towerDetection/service/impl/TowerRecordServiceImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.securitycontrol.background.towerDetection.service.impl; - -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONObject; -import com.securitycontrol.background.towerDetection.mapper.TowerRecordMapper; -import com.securitycontrol.background.towerDetection.service.TowerRecordService; -import com.securitycontrol.background.towerDetection.vo.TowerRecordVo; -import com.securitycontrol.common.core.constant.Constant; -import com.securitycontrol.common.core.utils.ImportExcelUtils; -import com.securitycontrol.common.core.utils.StringUtils; -import com.securitycontrol.common.core.utils.aes.DateTimeHelper; -import com.securitycontrol.common.core.web.domain.AjaxResult; -import com.securitycontrol.common.security.utils.ValidatorsUtils; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.transaction.interceptor.TransactionAspectSupport; -import org.springframework.web.multipart.MultipartFile; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.*; - -/** - * 组塔检测 - 检测记录 - * @author lsun - */ -@Service(value = "TowerRecordService") -@Slf4j -public class TowerRecordServiceImpl implements TowerRecordService { - - @Resource(name = "TowerRecordMapper") - private TowerRecordMapper mapper; - - @Override - public List getTowerRecordLists(TowerRecordVo dto) { - List list = new ArrayList<>(); - list = mapper.getTowerRecordLists(dto); - return list; - } - -} diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/mapper/VehicleMapper.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/mapper/VehicleMapper.java deleted file mode 100644 index ff53e61..0000000 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/mapper/VehicleMapper.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.securitycontrol.background.vehicleManagement.mapper; - -import com.securitycontrol.background.vehicleManagement.vo.VehicleDto; -import com.securitycontrol.background.vehicleManagement.vo.VehicleVo; -import com.securitycontrol.entity.system.base.dto.GxPlanDto; -import com.securitycontrol.entity.system.base.dto.ProGxPlanDto; -import com.securitycontrol.entity.system.base.vo.GxPlanVo; -import com.securitycontrol.entity.system.vo.ResourceFileVo; -import org.apache.ibatis.annotations.MapKey; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Map; - -/** - * 车辆管理 - */ -@Repository(value = "VehicleMapper") -public interface VehicleMapper { - /** - * 获取 - */ - List getVehicleLists(VehicleVo dto); - - /** - * 新增/修改 - */ - void addOrUpdateVehicle(VehicleVo vo); - - /** - * 删除 - */ - void delVehicleById(VehicleVo dto); - - List getLists(VehicleVo dto); - - List getListsDto(VehicleDto dto); -} diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/service/VehicleService.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/service/VehicleService.java deleted file mode 100644 index e29098a..0000000 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/vehicleManagement/service/VehicleService.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.securitycontrol.background.vehicleManagement.service; - -import com.securitycontrol.background.vehicleManagement.vo.VehicleDto; -import com.securitycontrol.background.vehicleManagement.vo.VehicleVo; -import com.securitycontrol.common.core.web.domain.AjaxResult; -import com.securitycontrol.entity.system.base.dto.GxPlanDto; -import com.securitycontrol.entity.system.base.dto.ProGxPlanDto; -import com.securitycontrol.entity.system.base.vo.GxPlanVo; -import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - -/** - * 车辆管理 - */ -public interface VehicleService { - - /** - * 获取车辆列表 - */ - List getVehicleLists(VehicleVo dto); - - - /** - * 新增/修改 - * - */ - AjaxResult addOrUpdateVehicle(VehicleVo vo); - - - /** - * 删除 - */ - AjaxResult delVehicleById(VehicleVo dto); - - List getLists(VehicleVo dto); - - List getListsDto(VehicleDto dto); -} diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/towerDetection/EarlyWarningRecordMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/EarlyWarningRecordMapper.xml similarity index 80% rename from securitycontrol-model/securitycontrol-background/src/main/resources/mapper/towerDetection/EarlyWarningRecordMapper.xml rename to securitycontrol-model/securitycontrol-background/src/main/resources/mapper/EarlyWarningRecordMapper.xml index 52c9718..48f6875 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/towerDetection/EarlyWarningRecordMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/EarlyWarningRecordMapper.xml @@ -1,8 +1,8 @@ - + - SELECT tw.warn_content as warnContent, tw.warn_time as warnTime FROM tb_warn tw LEFT JOIN tb_device_detail tdd ON tw.device_id = tdd.device_id diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/constructionQuality/EarlyWarningsRecordMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/EarlyWarningsRecordMapper.xml similarity index 85% rename from securitycontrol-model/securitycontrol-background/src/main/resources/mapper/constructionQuality/EarlyWarningsRecordMapper.xml rename to securitycontrol-model/securitycontrol-background/src/main/resources/mapper/EarlyWarningsRecordMapper.xml index 1975cb9..a120c22 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/constructionQuality/EarlyWarningsRecordMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/EarlyWarningsRecordMapper.xml @@ -1,12 +1,12 @@ - + UPDATE tb_warn SET status = #{status}, update_time = NOW(), user_id = #{userId} WHERE `warn_id` = #{warnId} - SELECT tw.warn_id as warnId, tw.warn_content as warnContent, tw.warn_time as warnTime, case when tw.`status` = '0' then '未处理' when tw.`status` = '1' then '预警正确' diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/constructionQuality/QualityRecordMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/QualityRecordMapper.xml similarity index 88% rename from securitycontrol-model/securitycontrol-background/src/main/resources/mapper/constructionQuality/QualityRecordMapper.xml rename to securitycontrol-model/securitycontrol-background/src/main/resources/mapper/QualityRecordMapper.xml index 17e8b3c..1e98afd 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/constructionQuality/QualityRecordMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/QualityRecordMapper.xml @@ -1,8 +1,8 @@ - + - SELECT tbd.device_name as deviceName, ta.area_name as areaName, tdd.mode_name as modeName, CONCAT(tdd.min_valu,'-',tdd.max_value) as standardValue, a.val, diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/towerDetection/TowerRecordMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TowerRecordMapper.xml similarity index 89% rename from securitycontrol-model/securitycontrol-background/src/main/resources/mapper/towerDetection/TowerRecordMapper.xml rename to securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TowerRecordMapper.xml index 42322fe..d1955ce 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/towerDetection/TowerRecordMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TowerRecordMapper.xml @@ -1,8 +1,8 @@ - + - SELECT tbd.device_name as deviceName, ta.area_name as areaName, tdd.mode_name as modeName,a.val, a.change_val as changeVal, case when a.is_warn = '0' then '否' else '是' end isWarn, diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/vehicleManagement/VehicleMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/VehicleMapper.xml similarity index 89% rename from securitycontrol-model/securitycontrol-background/src/main/resources/mapper/vehicleManagement/VehicleMapper.xml rename to securitycontrol-model/securitycontrol-background/src/main/resources/mapper/VehicleMapper.xml index 86890a0..5fb397f 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/vehicleManagement/VehicleMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/VehicleMapper.xml @@ -1,9 +1,9 @@ - + - SELECT tc.id,tc.car_num as carNum,tc.user_name as userName,tc.phone ,tp.bid_code as bidCode FROM tb_car tc LEFT JOIN tb_project tp ON tp.bid_code = tc.bid_code @@ -19,7 +19,7 @@ - SELECT accesss_time as accesssTime, case WHEN access_type= '0' then '入场' ELSE '出场' end accessType FROM `tb_car_access` @@ -29,7 +29,7 @@ - SELECT accesss_time as accesssTime,car_num as carNum, case WHEN access_type= '0' then '入场' ELSE '出场' end accessType FROM `tb_car_access` diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com.securitycontrol.screen/VscScreenApplication.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/VscScreenApplication.java similarity index 100% rename from securitycontrol-model/securitycontrol-screen/src/main/java/com.securitycontrol.screen/VscScreenApplication.java rename to securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/VscScreenApplication.java diff --git a/securitycontrol-model/securitycontrol-system/pom.xml b/securitycontrol-model/securitycontrol-system/pom.xml index d98e792..12ce27c 100644 --- a/securitycontrol-model/securitycontrol-system/pom.xml +++ b/securitycontrol-model/securitycontrol-system/pom.xml @@ -130,28 +130,8 @@ org.springframework.boot spring-boot-starter-data-mongodb - - - cn.afterturn - easypoi-base - 4.2.0 - - - com.google.guava - guava - - - - - cn.afterturn - easypoi-web - 4.2.0 - - - cn.afterturn - easypoi-annotation - 4.2.0 - + + com.google.guava guava diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/ExportFileController.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/ExportFileController.java index 7bf3f84..248807e 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/ExportFileController.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/ExportFileController.java @@ -9,7 +9,7 @@ import com.securitycontrol.entity.system.base.dto.ProDto; import com.securitycontrol.system.export.entity.ProExportVo; import com.securitycontrol.entity.system.base.vo.ProVo; import com.securitycontrol.system.base.service.IProService; -import com.securitycontrol.system.export.util.ExcelStyleUtil; +import com.securitycontrol.common.core.utils.ExcelStyleUtil; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.BeanUtils; diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/bootstrap.yml b/securitycontrol-model/securitycontrol-system/src/main/resources/bootstrap.yml index 97e11f4..20af2a6 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/resources/bootstrap.yml +++ b/securitycontrol-model/securitycontrol-system/src/main/resources/bootstrap.yml @@ -19,12 +19,12 @@ spring: nacos: discovery: username: nacos - password: nacos + password: Jjsp@nacos2023 server-addr: 127.0.0.1:8848 namespace: jjzhgd config: username: nacos - password: nacos + password: Jjsp@nacos2023 namespace: jjzhgd server-addr: 127.0.0.1:8848 # 配置文件格式