admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

移动巡检目录

Browse Source
This commit is contained in:
guoshengxiong 2024-05-24 23:59:48 +08:00
parent e9672899ec
commit ec00346349
18 changed files with 46 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/zhgd/xmgl/modules/x/controller/XzCheckingRouteController.java → src/main/java/com/zhgd/xmgl/modules/checking/controller/XzCheckingRouteController.java
View File

@ -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;
/**

28
src/main/java/com/zhgd/xmgl/modules/x/controller/XzCheckingRouteTaskController.java → src/main/java/com/zhgd/xmgl/modules/checking/controller/XzCheckingRouteTaskController.java
View File

@ -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;
/**

2
src/main/java/com/zhgd/xmgl/modules/x/entity/XzCheckingRoute.java → src/main/java/com/zhgd/xmgl/modules/checking/entity/XzCheckingRoute.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/x/entity/XzCheckingRouteTask.java → src/main/java/com/zhgd/xmgl/modules/checking/entity/XzCheckingRouteTask.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/x/entity/XzCheckingRouteToPoint.java → src/main/java/com/zhgd/xmgl/modules/checking/entity/XzCheckingRouteToPoint.java
View File

@ -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;

4
src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteMapper.java → src/main/java/com/zhgd/xmgl/modules/checking/mapper/XzCheckingRouteMapper.java
View File

@ -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;
/**

4
src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteTaskMapper.java → src/main/java/com/zhgd/xmgl/modules/checking/mapper/XzCheckingRouteTaskMapper.java
View File

@ -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;

7
src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteToPointMapper.java → src/main/java/com/zhgd/xmgl/modules/checking/mapper/XzCheckingRouteToPointMapper.java
View File

@ -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;
/**

4
src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteMapper.xml → src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/XzCheckingRouteMapper.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.x.mapper.XzCheckingRouteMapper">
<mapper namespace="com.zhgd.xmgl.modules.checking.mapper.XzCheckingRouteMapper">
<sql id="selectTable">
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
</sql>
<select id="queryList" resultType="com.zhgd.xmgl.modules.x.entity.XzCheckingRoute">
<select id="queryList" resultType="com.zhgd.xmgl.modules.checking.entity.XzCheckingRoute">
<include refid="selectTable">
</include>
${ew.customSqlSegment}

8
src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteTaskMapper.xml → src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/XzCheckingRouteTaskMapper.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.x.mapper.XzCheckingRouteTaskMapper">
<resultMap id="queryListMap" type="com.zhgd.xmgl.modules.x.entity.XzCheckingRouteTask" autoMapping="true">
<mapper namespace="com.zhgd.xmgl.modules.checking.mapper.XzCheckingRouteTaskMapper">
<resultMap id="queryListMap" type="com.zhgd.xmgl.modules.checking.entity.XzCheckingRouteTask" autoMapping="true">
<id column="id" property="id"/>
<association property="xzCheckingRoute" javaType="com.zhgd.xmgl.modules.x.entity.XzCheckingRoute"
<association property="xzCheckingRoute" javaType="com.zhgd.xmgl.modules.checking.entity.XzCheckingRoute"
autoMapping="true" columnPrefix="xcr_">
<id column="id" property="id"/>
</association>
@ -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 (<include refid="com.zhgd.xmgl.modules.x.mapper.XzCheckingRouteMapper.selectTable">
join (<include refid="com.zhgd.xmgl.modules.checking.mapper.XzCheckingRouteMapper.selectTable">
</include>) as xcr on t.xz_checking_route_id = xcr.id
</sql>

2
src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteToPointMapper.xml → src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/XzCheckingRouteToPointMapper.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.x.mapper.XzCheckingRouteToPointMapper">
<mapper namespace="com.zhgd.xmgl.modules.checking.mapper.XzCheckingRouteToPointMapper">
</mapper>

4
src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteService.java → src/main/java/com/zhgd/xmgl/modules/checking/service/IXzCheckingRouteService.java
View File

@ -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;

4
src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteTaskService.java → src/main/java/com/zhgd/xmgl/modules/checking/service/IXzCheckingRouteTaskService.java
View File

@ -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;

4
src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteToPointService.java → src/main/java/com/zhgd/xmgl/modules/checking/service/IXzCheckingRouteToPointService.java
View File

@ -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;

6
src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointInfoServiceImpl.java
View File

@ -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;

16
src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteServiceImpl.java → src/main/java/com/zhgd/xmgl/modules/checking/service/impl/XzCheckingRouteServiceImpl.java
View File

@ -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;

8
src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteTaskServiceImpl.java → src/main/java/com/zhgd/xmgl/modules/checking/service/impl/XzCheckingRouteTaskServiceImpl.java
View File

@ -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;

8
src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteToPointServiceImpl.java → src/main/java/com/zhgd/xmgl/modules/checking/service/impl/XzCheckingRouteToPointServiceImpl.java
View File

@ -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;