diff --git a/src/main/java/com/zhgd/xmgl/modules/x/controller/XzCheckingRouteController.java b/src/main/java/com/zhgd/xmgl/modules/checking/controller/XzCheckingRouteController.java similarity index 77% rename from src/main/java/com/zhgd/xmgl/modules/x/controller/XzCheckingRouteController.java rename to src/main/java/com/zhgd/xmgl/modules/checking/controller/XzCheckingRouteController.java index 640354d6b..2eff9ed16 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/controller/XzCheckingRouteController.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/controller/XzCheckingRouteController.java @@ -1,6 +1,5 @@ -package com.zhgd.xmgl.modules.x.controller; +package com.zhgd.xmgl.modules.checking.controller; -import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -10,40 +9,19 @@ import java.util.HashMap; import springfox.documentation.annotations.ApiIgnore; -import java.util.Arrays; import java.util.List; -import java.util.Map; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.jeecg.common.util.oConvertUtils; import org.apache.commons.collections.MapUtils; -import com.zhgd.xmgl.modules.x.entity.XzCheckingRoute; -import com.zhgd.xmgl.modules.x.service.IXzCheckingRouteService; +import com.zhgd.xmgl.modules.checking.entity.XzCheckingRoute; +import com.zhgd.xmgl.modules.checking.service.IXzCheckingRouteService; import org.simpleframework.xml.core.Validate; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/x/controller/XzCheckingRouteTaskController.java b/src/main/java/com/zhgd/xmgl/modules/checking/controller/XzCheckingRouteTaskController.java similarity index 79% rename from src/main/java/com/zhgd/xmgl/modules/x/controller/XzCheckingRouteTaskController.java rename to src/main/java/com/zhgd/xmgl/modules/checking/controller/XzCheckingRouteTaskController.java index 070a94a70..5246da636 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/controller/XzCheckingRouteTaskController.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/controller/XzCheckingRouteTaskController.java @@ -1,6 +1,5 @@ -package com.zhgd.xmgl.modules.x.controller; +package com.zhgd.xmgl.modules.checking.controller; -import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -10,40 +9,19 @@ import java.util.HashMap; import springfox.documentation.annotations.ApiIgnore; -import java.util.Arrays; import java.util.List; -import java.util.Map; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.jeecg.common.util.oConvertUtils; import org.apache.commons.collections.MapUtils; -import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteTask; -import com.zhgd.xmgl.modules.x.service.IXzCheckingRouteTaskService; +import com.zhgd.xmgl.modules.checking.entity.XzCheckingRouteTask; +import com.zhgd.xmgl.modules.checking.service.IXzCheckingRouteTaskService; import org.simpleframework.xml.core.Validate; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/x/entity/XzCheckingRoute.java b/src/main/java/com/zhgd/xmgl/modules/checking/entity/XzCheckingRoute.java similarity index 98% rename from src/main/java/com/zhgd/xmgl/modules/x/entity/XzCheckingRoute.java rename to src/main/java/com/zhgd/xmgl/modules/checking/entity/XzCheckingRoute.java index 6383bfd6f..28975f70a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/entity/XzCheckingRoute.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/entity/XzCheckingRoute.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.x.entity; +package com.zhgd.xmgl.modules.checking.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/zhgd/xmgl/modules/x/entity/XzCheckingRouteTask.java b/src/main/java/com/zhgd/xmgl/modules/checking/entity/XzCheckingRouteTask.java similarity index 98% rename from src/main/java/com/zhgd/xmgl/modules/x/entity/XzCheckingRouteTask.java rename to src/main/java/com/zhgd/xmgl/modules/checking/entity/XzCheckingRouteTask.java index f901a3815..cd7a10348 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/entity/XzCheckingRouteTask.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/entity/XzCheckingRouteTask.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.x.entity; +package com.zhgd.xmgl.modules.checking.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/zhgd/xmgl/modules/x/entity/XzCheckingRouteToPoint.java b/src/main/java/com/zhgd/xmgl/modules/checking/entity/XzCheckingRouteToPoint.java similarity index 96% rename from src/main/java/com/zhgd/xmgl/modules/x/entity/XzCheckingRouteToPoint.java rename to src/main/java/com/zhgd/xmgl/modules/checking/entity/XzCheckingRouteToPoint.java index 8a74c59c6..16dbc2fa3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/entity/XzCheckingRouteToPoint.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/entity/XzCheckingRouteToPoint.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.x.entity; +package com.zhgd.xmgl.modules.checking.entity; import java.io.Serializable; import java.util.Date; diff --git a/src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteMapper.java b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/XzCheckingRouteMapper.java similarity index 89% rename from src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteMapper.java rename to src/main/java/com/zhgd/xmgl/modules/checking/mapper/XzCheckingRouteMapper.java index 23abd2bfa..4a24c2074 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/XzCheckingRouteMapper.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.x.mapper; +package com.zhgd.xmgl.modules.checking.mapper; import java.util.List; @@ -7,9 +7,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.DataScope; +import com.zhgd.xmgl.modules.checking.entity.XzCheckingRoute; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import com.zhgd.xmgl.modules.x.entity.XzCheckingRoute; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteTaskMapper.java b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/XzCheckingRouteTaskMapper.java similarity index 90% rename from src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteTaskMapper.java rename to src/main/java/com/zhgd/xmgl/modules/checking/mapper/XzCheckingRouteTaskMapper.java index ce45d1d24..ae87bfe8a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteTaskMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/XzCheckingRouteTaskMapper.java @@ -1,11 +1,11 @@ -package com.zhgd.xmgl.modules.x.mapper; +package com.zhgd.xmgl.modules.checking.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteTask; +import com.zhgd.xmgl.modules.checking.entity.XzCheckingRouteTask; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteToPointMapper.java b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/XzCheckingRouteToPointMapper.java similarity index 66% rename from src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteToPointMapper.java rename to src/main/java/com/zhgd/xmgl/modules/checking/mapper/XzCheckingRouteToPointMapper.java index 56fd60140..7f1daf545 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteToPointMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/XzCheckingRouteToPointMapper.java @@ -1,10 +1,7 @@ -package com.zhgd.xmgl.modules.x.mapper; - -import java.util.List; +package com.zhgd.xmgl.modules.checking.mapper; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteToPoint; +import com.zhgd.xmgl.modules.checking.entity.XzCheckingRouteToPoint; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteMapper.xml b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/XzCheckingRouteMapper.xml similarity index 85% rename from src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteMapper.xml rename to src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/XzCheckingRouteMapper.xml index f7f12aa5a..523b26b4e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/XzCheckingRouteMapper.xml @@ -1,6 +1,6 @@ - + select t.* from (select t.*, @@ -17,7 +17,7 @@ join enterprise_info ei on find_in_set(ei.id, t.enterprise_id) group by t.id) as t - ${ew.customSqlSegment} diff --git a/src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteTaskMapper.xml b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/XzCheckingRouteTaskMapper.xml similarity index 84% rename from src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteTaskMapper.xml rename to src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/XzCheckingRouteTaskMapper.xml index 65e3d6067..c7025b6ed 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteTaskMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/XzCheckingRouteTaskMapper.xml @@ -1,9 +1,9 @@ - - + + - @@ -32,7 +32,7 @@ (select count(*) from xz_checking_route_to_point as xcrtp where t.xz_checking_route_id=xcrtp.xz_checking_route_id) as checkingPointNum from xz_checking_route_task as t - join ( + join ( ) as xcr on t.xz_checking_route_id = xcr.id diff --git a/src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteToPointMapper.xml b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/XzCheckingRouteToPointMapper.xml similarity index 64% rename from src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteToPointMapper.xml rename to src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/XzCheckingRouteToPointMapper.xml index f16388dcd..37415a1c3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteToPointMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/XzCheckingRouteToPointMapper.xml @@ -1,4 +1,4 @@ - + diff --git a/src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteService.java b/src/main/java/com/zhgd/xmgl/modules/checking/service/IXzCheckingRouteService.java similarity index 85% rename from src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteService.java rename to src/main/java/com/zhgd/xmgl/modules/checking/service/IXzCheckingRouteService.java index 107b9a04f..89dbcb0ab 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteService.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/service/IXzCheckingRouteService.java @@ -1,6 +1,6 @@ -package com.zhgd.xmgl.modules.x.service; +package com.zhgd.xmgl.modules.checking.service; -import com.zhgd.xmgl.modules.x.entity.XzCheckingRoute; +import com.zhgd.xmgl.modules.checking.entity.XzCheckingRoute; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteTaskService.java b/src/main/java/com/zhgd/xmgl/modules/checking/service/IXzCheckingRouteTaskService.java similarity index 86% rename from src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteTaskService.java rename to src/main/java/com/zhgd/xmgl/modules/checking/service/IXzCheckingRouteTaskService.java index d828d4ec0..55cd8cf8c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteTaskService.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/service/IXzCheckingRouteTaskService.java @@ -1,6 +1,6 @@ -package com.zhgd.xmgl.modules.x.service; +package com.zhgd.xmgl.modules.checking.service; -import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteTask; +import com.zhgd.xmgl.modules.checking.entity.XzCheckingRouteTask; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteToPointService.java b/src/main/java/com/zhgd/xmgl/modules/checking/service/IXzCheckingRouteToPointService.java similarity index 86% rename from src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteToPointService.java rename to src/main/java/com/zhgd/xmgl/modules/checking/service/IXzCheckingRouteToPointService.java index 19fe886fa..8987ec0c3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteToPointService.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/service/IXzCheckingRouteToPointService.java @@ -1,6 +1,6 @@ -package com.zhgd.xmgl.modules.x.service; +package com.zhgd.xmgl.modules.checking.service; -import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteToPoint; +import com.zhgd.xmgl.modules.checking.entity.XzCheckingRouteToPoint; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointInfoServiceImpl.java index 5f42854a6..85364f366 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointInfoServiceImpl.java @@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; -import com.zhgd.jeecg.common.execption.OpenPromptException; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper; import com.zhgd.xmgl.modules.basicdata.service.INoticeService; @@ -27,9 +26,8 @@ import com.zhgd.xmgl.modules.checking.service.CheckingPointAlarmService; import com.zhgd.xmgl.modules.checking.service.CheckingPointInfoService; import com.zhgd.xmgl.modules.checking.service.CheckingPointService; import com.zhgd.xmgl.modules.project.service.IProjectService; -import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteTask; -import com.zhgd.xmgl.modules.x.mapper.XzCheckingRouteTaskMapper; -import com.zhgd.xmgl.modules.x.service.impl.XzCheckingRouteTaskServiceImpl; +import com.zhgd.xmgl.modules.checking.entity.XzCheckingRouteTask; +import com.zhgd.xmgl.modules.checking.mapper.XzCheckingRouteTaskMapper; import com.zhgd.xmgl.security.entity.UserInfo; import com.zhgd.xmgl.security.util.SecurityUtils; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/XzCheckingRouteServiceImpl.java similarity index 94% rename from src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/checking/service/impl/XzCheckingRouteServiceImpl.java index 524f364e5..ec79fdbea 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/XzCheckingRouteServiceImpl.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.x.service.impl; +package com.zhgd.xmgl.modules.checking.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; @@ -10,13 +10,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.modules.x.entity.XzCheckingRoute; -import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteTask; -import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteToPoint; -import com.zhgd.xmgl.modules.x.mapper.XzCheckingRouteMapper; -import com.zhgd.xmgl.modules.x.mapper.XzCheckingRouteTaskMapper; -import com.zhgd.xmgl.modules.x.mapper.XzCheckingRouteToPointMapper; -import com.zhgd.xmgl.modules.x.service.IXzCheckingRouteService; +import com.zhgd.xmgl.modules.checking.entity.XzCheckingRouteToPoint; +import com.zhgd.xmgl.modules.checking.mapper.XzCheckingRouteTaskMapper; +import com.zhgd.xmgl.modules.checking.mapper.XzCheckingRouteToPointMapper; +import com.zhgd.xmgl.modules.checking.entity.XzCheckingRoute; +import com.zhgd.xmgl.modules.checking.entity.XzCheckingRouteTask; +import com.zhgd.xmgl.modules.checking.mapper.XzCheckingRouteMapper; +import com.zhgd.xmgl.modules.checking.service.IXzCheckingRouteService; import com.zhgd.xmgl.util.DateUtils; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; diff --git a/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteTaskServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/XzCheckingRouteTaskServiceImpl.java similarity index 93% rename from src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteTaskServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/checking/service/impl/XzCheckingRouteTaskServiceImpl.java index 2f5f7a6e1..8904392f8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteTaskServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/XzCheckingRouteTaskServiceImpl.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.x.service.impl; +package com.zhgd.xmgl.modules.checking.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -7,9 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteTask; -import com.zhgd.xmgl.modules.x.mapper.XzCheckingRouteTaskMapper; -import com.zhgd.xmgl.modules.x.service.IXzCheckingRouteTaskService; +import com.zhgd.xmgl.modules.checking.mapper.XzCheckingRouteTaskMapper; +import com.zhgd.xmgl.modules.checking.service.IXzCheckingRouteTaskService; +import com.zhgd.xmgl.modules.checking.entity.XzCheckingRouteTask; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; import org.apache.commons.collections.MapUtils; diff --git a/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteToPointServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/XzCheckingRouteToPointServiceImpl.java similarity index 92% rename from src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteToPointServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/checking/service/impl/XzCheckingRouteToPointServiceImpl.java index e93efc920..dee042ee7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteToPointServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/XzCheckingRouteToPointServiceImpl.java @@ -1,9 +1,9 @@ -package com.zhgd.xmgl.modules.x.service.impl; +package com.zhgd.xmgl.modules.checking.service.impl; import com.zhgd.jeecg.common.execption.OpenAlertException; -import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteToPoint; -import com.zhgd.xmgl.modules.x.mapper.XzCheckingRouteToPointMapper; -import com.zhgd.xmgl.modules.x.service.IXzCheckingRouteToPointService; +import com.zhgd.xmgl.modules.checking.entity.XzCheckingRouteToPoint; +import com.zhgd.xmgl.modules.checking.mapper.XzCheckingRouteToPointMapper; +import com.zhgd.xmgl.modules.checking.service.IXzCheckingRouteToPointService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage;