From c734368723d915973c61ffb23a9cdd245d53f37a Mon Sep 17 00:00:00 2001 From: GUO <1923636941@qq.com> Date: Sat, 1 Jun 2024 18:41:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java | 4 ++-- src/main/java/com/zhgd/xmgl/call/HikvisionCall.java | 4 ++-- .../controller/XzHikvisionCompareDataController.java | 6 +++--- .../modules/{x => xz}/entity/XzHikvisionCompareData.java | 2 +- .../{x => xz}/mapper/XzHikvisionCompareDataMapper.java | 7 ++----- .../{x => xz}/mapper/xml/XzHikvisionCompareDataMapper.xml | 2 +- .../{x => xz}/service/IXzHikvisionCompareDataService.java | 5 ++--- .../service/impl/XzHikvisionCompareDataServiceImpl.java | 8 ++++---- src/main/java/com/zhgd/xmgl/task/HikvisionTask.java | 6 +++--- 9 files changed, 20 insertions(+), 24 deletions(-) rename src/main/java/com/zhgd/xmgl/modules/{x => xz}/controller/XzHikvisionCompareDataController.java (97%) rename src/main/java/com/zhgd/xmgl/modules/{x => xz}/entity/XzHikvisionCompareData.java (98%) rename src/main/java/com/zhgd/xmgl/modules/{x => xz}/mapper/XzHikvisionCompareDataMapper.java (65%) rename src/main/java/com/zhgd/xmgl/modules/{x => xz}/mapper/xml/XzHikvisionCompareDataMapper.xml (65%) rename src/main/java/com/zhgd/xmgl/modules/{x => xz}/service/IXzHikvisionCompareDataService.java (93%) rename src/main/java/com/zhgd/xmgl/modules/{x => xz}/service/impl/XzHikvisionCompareDataServiceImpl.java (98%) diff --git a/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java b/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java index 821cbbee3..6c661767b 100644 --- a/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java +++ b/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java @@ -17,8 +17,8 @@ import com.zhgd.xmgl.modules.worker.entity.TeamInfo; import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.worker.mapper.EnterpriseInfoMapper; import com.zhgd.xmgl.modules.worker.service.impl.WorkerInfoServiceImpl; -import com.zhgd.xmgl.modules.x.mapper.XzHikvisionCompareDataMapper; -import com.zhgd.xmgl.modules.x.service.impl.XzHikvisionCompareDataServiceImpl; +import com.zhgd.xmgl.modules.xz.mapper.XzHikvisionCompareDataMapper; +import com.zhgd.xmgl.modules.xz.service.impl.XzHikvisionCompareDataServiceImpl; import com.zhgd.xmgl.modules.xz.entity.XzHikvisionSync; import com.zhgd.xmgl.modules.xz.mapper.XzHikvisionSyncMapper; import com.zhgd.xmgl.security.util.SecurityUtils; diff --git a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java index 3e388fa5e..9bebbbbbc 100644 --- a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java +++ b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java @@ -52,8 +52,8 @@ import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper; import com.zhgd.xmgl.modules.worker.service.IWorkerAttendancePresenceService; import com.zhgd.xmgl.modules.worker.service.IWorkerAttendanceService; import com.zhgd.xmgl.modules.worker.service.impl.WorkerAttendanceServiceImpl; -import com.zhgd.xmgl.modules.x.mapper.XzHikvisionCompareDataMapper; -import com.zhgd.xmgl.modules.x.service.IXzHikvisionCompareDataService; +import com.zhgd.xmgl.modules.xz.mapper.XzHikvisionCompareDataMapper; +import com.zhgd.xmgl.modules.xz.service.IXzHikvisionCompareDataService; import com.zhgd.xmgl.modules.xz.entity.XzHikvisionSync; import com.zhgd.xmgl.modules.xz.mapper.XzHikvisionSyncMapper; import com.zhgd.xmgl.modules.xz.service.impl.XzHikvisionSyncServiceImpl; diff --git a/src/main/java/com/zhgd/xmgl/modules/x/controller/XzHikvisionCompareDataController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzHikvisionCompareDataController.java similarity index 97% rename from src/main/java/com/zhgd/xmgl/modules/x/controller/XzHikvisionCompareDataController.java rename to src/main/java/com/zhgd/xmgl/modules/xz/controller/XzHikvisionCompareDataController.java index 5bdf87bac..226a82e21 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/controller/XzHikvisionCompareDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzHikvisionCompareDataController.java @@ -1,10 +1,10 @@ -package com.zhgd.xmgl.modules.x.controller; +package com.zhgd.xmgl.modules.xz.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.xmgl.modules.x.entity.XzHikvisionCompareData; -import com.zhgd.xmgl.modules.x.service.IXzHikvisionCompareDataService; +import com.zhgd.xmgl.modules.xz.entity.XzHikvisionCompareData; +import com.zhgd.xmgl.modules.xz.service.IXzHikvisionCompareDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/x/entity/XzHikvisionCompareData.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzHikvisionCompareData.java similarity index 98% rename from src/main/java/com/zhgd/xmgl/modules/x/entity/XzHikvisionCompareData.java rename to src/main/java/com/zhgd/xmgl/modules/xz/entity/XzHikvisionCompareData.java index ae7d7ce51..240bd855c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/entity/XzHikvisionCompareData.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzHikvisionCompareData.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.x.entity; +package com.zhgd.xmgl.modules.xz.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/zhgd/xmgl/modules/x/mapper/XzHikvisionCompareDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzHikvisionCompareDataMapper.java similarity index 65% rename from src/main/java/com/zhgd/xmgl/modules/x/mapper/XzHikvisionCompareDataMapper.java rename to src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzHikvisionCompareDataMapper.java index 4b332f76a..ec7806390 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/mapper/XzHikvisionCompareDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzHikvisionCompareDataMapper.java @@ -1,10 +1,7 @@ -package com.zhgd.xmgl.modules.x.mapper; - -import java.util.List; +package com.zhgd.xmgl.modules.xz.mapper; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import com.zhgd.xmgl.modules.x.entity.XzHikvisionCompareData; +import com.zhgd.xmgl.modules.xz.entity.XzHikvisionCompareData; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzHikvisionCompareDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzHikvisionCompareDataMapper.xml similarity index 65% rename from src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzHikvisionCompareDataMapper.xml rename to src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzHikvisionCompareDataMapper.xml index 6f48bf205..a4157197b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzHikvisionCompareDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzHikvisionCompareDataMapper.xml @@ -1,4 +1,4 @@ - + diff --git a/src/main/java/com/zhgd/xmgl/modules/x/service/IXzHikvisionCompareDataService.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionCompareDataService.java similarity index 93% rename from src/main/java/com/zhgd/xmgl/modules/x/service/IXzHikvisionCompareDataService.java rename to src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionCompareDataService.java index b5b06236a..4b434d300 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/service/IXzHikvisionCompareDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionCompareDataService.java @@ -1,11 +1,10 @@ -package com.zhgd.xmgl.modules.x.service; +package com.zhgd.xmgl.modules.xz.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.project.entity.Project; -import com.zhgd.xmgl.modules.x.entity.XzHikvisionCompareData; -import com.zhgd.xmgl.task.HikvisionTask; +import com.zhgd.xmgl.modules.xz.entity.XzHikvisionCompareData; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzHikvisionCompareDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionCompareDataServiceImpl.java similarity index 98% rename from src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzHikvisionCompareDataServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionCompareDataServiceImpl.java index 9f10404da..75fd62d2b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzHikvisionCompareDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionCompareDataServiceImpl.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.x.service.impl; +package com.zhgd.xmgl.modules.xz.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -29,9 +29,9 @@ import com.zhgd.xmgl.modules.worker.service.ITeamInfoService; import com.zhgd.xmgl.modules.worker.service.impl.DepartmentInfoServiceImpl; import com.zhgd.xmgl.modules.worker.service.impl.EnterpriseInfoServiceImpl; import com.zhgd.xmgl.modules.worker.service.impl.WorkerInfoServiceImpl; -import com.zhgd.xmgl.modules.x.entity.XzHikvisionCompareData; -import com.zhgd.xmgl.modules.x.mapper.XzHikvisionCompareDataMapper; -import com.zhgd.xmgl.modules.x.service.IXzHikvisionCompareDataService; +import com.zhgd.xmgl.modules.xz.entity.XzHikvisionCompareData; +import com.zhgd.xmgl.modules.xz.mapper.XzHikvisionCompareDataMapper; +import com.zhgd.xmgl.modules.xz.service.IXzHikvisionCompareDataService; import com.zhgd.xmgl.util.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; diff --git a/src/main/java/com/zhgd/xmgl/task/HikvisionTask.java b/src/main/java/com/zhgd/xmgl/task/HikvisionTask.java index d6df5abe5..a2de954b7 100644 --- a/src/main/java/com/zhgd/xmgl/task/HikvisionTask.java +++ b/src/main/java/com/zhgd/xmgl/task/HikvisionTask.java @@ -23,9 +23,9 @@ import com.zhgd.xmgl.modules.worker.service.ITeamInfoService; import com.zhgd.xmgl.modules.worker.service.impl.DepartmentInfoServiceImpl; import com.zhgd.xmgl.modules.worker.service.impl.EnterpriseInfoServiceImpl; import com.zhgd.xmgl.modules.worker.service.impl.WorkerInfoServiceImpl; -import com.zhgd.xmgl.modules.x.entity.XzHikvisionCompareData; -import com.zhgd.xmgl.modules.x.mapper.XzHikvisionCompareDataMapper; -import com.zhgd.xmgl.modules.x.service.IXzHikvisionCompareDataService; +import com.zhgd.xmgl.modules.xz.entity.XzHikvisionCompareData; +import com.zhgd.xmgl.modules.xz.mapper.XzHikvisionCompareDataMapper; +import com.zhgd.xmgl.modules.xz.service.IXzHikvisionCompareDataService; import com.zhgd.xmgl.util.HikvisionUtil; import com.zhgd.xmgl.util.MapBuilder; import lombok.extern.slf4j.Slf4j;