更新名称

src/main/java/com/taauav/api/controller/AdController.java → src/main/java/com/taauav/app/controller/AdController.java

@@ -1,10 +1,9 @@
-package com.taauav.api.controller;
+package com.taauav.app.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
-import com.taauav.api.controller.ApiBaseController;
 
 /**
  * <p>
@@ -15,7 +14,7 @@ import com.taauav.api.controller.ApiBaseController;
  * @since 2020-08-13
  */
 @RestController
-@RequestMapping("/user/ad")
+@RequestMapping("/app/ad")
 public class AdController extends ApiBaseController {
 
 }

src/main/java/com/taauav/api/controller/ApiBaseController.java → src/main/java/com/taauav/app/controller/ApiBaseController.java

@@ -1,4 +1,4 @@
-package com.taauav.api.controller;
+package com.taauav.app.controller;
 
 public class ApiBaseController {
 }

src/main/java/com/taauav/api/controller/AppAdminController.java → src/main/java/com/taauav/app/controller/AppAdminController.java

@@ -1,10 +1,9 @@
-package com.taauav.api.controller;
+package com.taauav.app.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
-import com.taauav.api.controller.ApiBaseController;
 
 /**
  * <p>
@@ -15,7 +14,7 @@ import com.taauav.api.controller.ApiBaseController;
  * @since 2020-08-18
  */
 @RestController
-@RequestMapping("/app-admin")
+@RequestMapping("/app/appadmin")
 public class AppAdminController extends ApiBaseController {
 
 }

src/main/java/com/taauav/api/controller/DriverController.java → src/main/java/com/taauav/app/controller/DriverController.java

@@ -1,14 +1,12 @@
-package com.taauav.api.controller;
+package com.taauav.app.controller;
 
 
-import com.taauav.api.query.DriverQuery;
-import com.taauav.api.service.IDriverService;
+import com.taauav.app.query.DriverQuery;
+import com.taauav.app.service.IDriverService;
 import com.taauav.common.bean.Response;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import com.taauav.api.controller.ApiBaseController;
-
 /**
  * <p>
  * 河道管理表 前端控制器
@@ -18,7 +16,7 @@ import com.taauav.api.controller.ApiBaseController;
  * @since 2020-08-14
  */
 @RestController
-@RequestMapping("/user/driver")
+@RequestMapping("/app/driver")
 public class DriverController extends ApiBaseController {
 
     @Autowired

src/main/java/com/taauav/api/controller/HomeController.java → src/main/java/com/taauav/app/controller/HomeController.java

@@ -1,8 +1,8 @@
-package com.taauav.api.controller;
+package com.taauav.app.controller;
 
 import com.taauav.admin.entity.CtAd;
-import com.taauav.api.service.IAdService;
-import com.taauav.api.service.INoticeService;
+import com.taauav.app.service.IAdService;
+import com.taauav.app.service.INoticeService;
 import com.taauav.common.bean.Response;
 import com.taauav.front.entity.UserNotice;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +15,7 @@ import java.util.List;
 import java.util.Map;
 
 @RestController
-@RequestMapping("/user/home")
+@RequestMapping("/app/home")
 public class HomeController {
 
     @Autowired

src/main/java/com/taauav/api/controller/InspectAppController.java → src/main/java/com/taauav/app/controller/InspectAppController.java

@@ -1,11 +1,11 @@
-package com.taauav.api.controller;
+package com.taauav.app.controller;
 
 
-import com.taauav.api.dto.InspectEndDto;
-import com.taauav.api.dto.InspectPauseDto;
-import com.taauav.api.dto.InspectStartDto;
-import com.taauav.api.query.InspectListQuery;
-import com.taauav.api.service.IInspectAppService;
+import com.taauav.app.dto.InspectEndDto;
+import com.taauav.app.dto.InspectPauseDto;
+import com.taauav.app.dto.InspectStartDto;
+import com.taauav.app.query.InspectListQuery;
+import com.taauav.app.service.IInspectAppService;
 import com.taauav.common.bean.Response;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2020-08-19
  */
 @RestController
-@RequestMapping("/user/inspectapp")
+@RequestMapping("/app/inspectapp")
 public class InspectAppController extends ApiBaseController {
 
     @Autowired

src/main/java/com/taauav/api/controller/InspectAppPointController.java → src/main/java/com/taauav/app/controller/InspectAppPointController.java

@@ -1,14 +1,12 @@
-package com.taauav.api.controller;
+package com.taauav.app.controller;
 
 
-import com.taauav.api.dto.InspectAppPointDto;
-import com.taauav.api.service.IInspectAppPointService;
+import com.taauav.app.dto.InspectAppPointDto;
+import com.taauav.app.service.IInspectAppPointService;
 import com.taauav.common.bean.Response;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import com.taauav.api.controller.ApiBaseController;
-
 /**
  * <p>
  * 巡河坐标 前端控制器
@@ -18,7 +16,7 @@ import com.taauav.api.controller.ApiBaseController;
  * @since 2020-08-20
  */
 @RestController
-@RequestMapping("/user/inspectapppoint")
+@RequestMapping("/app/inspectapppoint")
 public class InspectAppPointController extends ApiBaseController {
 
     @Autowired

src/main/java/com/taauav/api/controller/InspectLogsController.java → src/main/java/com/taauav/app/controller/InspectLogsController.java

@@ -1,8 +1,8 @@
-package com.taauav.api.controller;
+package com.taauav.app.controller;
 
 
-import com.taauav.api.dto.InspectLogsDto;
-import com.taauav.api.service.IInspectLogsService;
+import com.taauav.app.dto.InspectLogsDto;
+import com.taauav.app.service.IInspectLogsService;
 import com.taauav.common.bean.Response;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
-import com.taauav.api.controller.ApiBaseController;
 
 /**
  * <p>
@@ -21,7 +20,7 @@ import com.taauav.api.controller.ApiBaseController;
  * @since 2020-08-18
  */
 @RestController
-@RequestMapping("/user/inspectlogs")
+@RequestMapping("/app/inspectlogs")
 public class InspectLogsController extends ApiBaseController {
 
     @Autowired

src/main/java/com/taauav/api/controller/InspectQuestionController.java → src/main/java/com/taauav/app/controller/InspectQuestionController.java

@@ -1,9 +1,9 @@
-package com.taauav.api.controller;
+package com.taauav.app.controller;
 
 
-import com.taauav.api.dto.InspectQuestionReportDto;
-import com.taauav.api.query.InspectQuestionQuery;
-import com.taauav.api.service.IInspectQuestionService;
+import com.taauav.app.dto.InspectQuestionReportDto;
+import com.taauav.app.query.InspectQuestionQuery;
+import com.taauav.app.service.IInspectQuestionService;
 import com.taauav.common.bean.Response;
 import com.taauav.front.dto.inspectquestion.InspectQuestionDto;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +21,7 @@ import java.text.ParseException;
  * @since 2020-08-13
  */
 @RestController
-@RequestMapping("/user/inspectquestion")
+@RequestMapping("/app/inspectquestion")
 public class InspectQuestionController extends ApiBaseController {
 
     @Autowired

src/main/java/com/taauav/api/controller/LoginController.java → src/main/java/com/taauav/app/controller/LoginController.java

@@ -1,7 +1,7 @@
-package com.taauav.api.controller;
+package com.taauav.app.controller;
 
-import com.taauav.api.dto.LoginDto;
-import com.taauav.api.service.ILoginService;
+import com.taauav.app.dto.LoginDto;
+import com.taauav.app.service.ILoginService;
 import com.taauav.common.bean.Response;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
  * APP登录控制器
  */
 @RestController
-@RequestMapping("/user/login")
+@RequestMapping("/app/login")
 public class LoginController {
 
     @Autowired

src/main/java/com/taauav/api/controller/NoticeController.java → src/main/java/com/taauav/app/controller/NoticeController.java

@@ -1,14 +1,12 @@
-package com.taauav.api.controller;
+package com.taauav.app.controller;
 
 
-import com.taauav.api.dto.NoticeQuery;
-import com.taauav.api.service.INoticeService;
+import com.taauav.app.dto.NoticeQuery;
+import com.taauav.app.service.INoticeService;
 import com.taauav.common.bean.Response;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import com.taauav.api.controller.ApiBaseController;
-
 /**
  * <p>
  * 通知公告表 前端控制器
@@ -18,7 +16,7 @@ import com.taauav.api.controller.ApiBaseController;
  * @since 2020-08-13
  */
 @RestController
-@RequestMapping("/user/notice")
+@RequestMapping("/app/notice")
 public class NoticeController extends ApiBaseController {
 
     @Autowired

src/main/java/com/taauav/api/dto/InspectAppPointDto.java → src/main/java/com/taauav/app/dto/InspectAppPointDto.java

@@ -1,4 +1,4 @@
-package com.taauav.api.dto;
+package com.taauav.app.dto;
 
 import lombok.Data;
 

src/main/java/com/taauav/api/dto/InspectEndDto.java → src/main/java/com/taauav/app/dto/InspectEndDto.java

@@ -1,4 +1,4 @@
-package com.taauav.api.dto;
+package com.taauav.app.dto;
 
 import lombok.Data;
 

src/main/java/com/taauav/api/dto/InspectLogsDto.java → src/main/java/com/taauav/app/dto/InspectLogsDto.java

@@ -1,4 +1,4 @@
-package com.taauav.api.dto;
+package com.taauav.app.dto;
 
 import lombok.Data;
 

src/main/java/com/taauav/api/dto/InspectPauseDto.java → src/main/java/com/taauav/app/dto/InspectPauseDto.java

@@ -1,4 +1,4 @@
-package com.taauav.api.dto;
+package com.taauav.app.dto;
 
 import lombok.Data;
 

src/main/java/com/taauav/api/dto/InspectQuestionReportDto.java → src/main/java/com/taauav/app/dto/InspectQuestionReportDto.java

@@ -1,4 +1,4 @@
-package com.taauav.api.dto;
+package com.taauav.app.dto;
 
 import lombok.Data;
 

src/main/java/com/taauav/api/dto/InspectStartDto.java → src/main/java/com/taauav/app/dto/InspectStartDto.java

@@ -1,4 +1,4 @@
-package com.taauav.api.dto;
+package com.taauav.app.dto;
 
 import lombok.Data;
 

src/main/java/com/taauav/api/dto/LoginDto.java → src/main/java/com/taauav/app/dto/LoginDto.java

@@ -1,4 +1,4 @@
-package com.taauav.api.dto;
+package com.taauav.app.dto;
 
 import lombok.Data;
 

src/main/java/com/taauav/api/dto/NoticeQuery.java → src/main/java/com/taauav/app/dto/NoticeQuery.java

@@ -1,4 +1,4 @@
-package com.taauav.api.dto;
+package com.taauav.app.dto;
 
 import com.taauav.common.core.mps.BaseQuery;
 import lombok.Data;

src/main/java/com/taauav/api/entity/AppAdmin.java → src/main/java/com/taauav/app/entity/AppAdmin.java

@@ -1,4 +1,4 @@
-package com.taauav.api.entity;
+package com.taauav.app.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

src/main/java/com/taauav/api/entity/TauvInspectLogs.java → src/main/java/com/taauav/app/entity/TauvInspectLogs.java

@@ -1,6 +1,5 @@
-package com.taauav.api.entity;
+package com.taauav.app.entity;
 
-import java.time.LocalDateTime;
 import com.taauav.common.domain.Entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/taauav/api/mapper/AdMapper.java → src/main/java/com/taauav/app/mapper/AdMapper.java

@@ -1,4 +1,4 @@
-package com.taauav.api.mapper;
+package com.taauav.app.mapper;
 
 import com.taauav.admin.entity.CtAd;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

src/main/java/com/taauav/api/mapper/AdMapper.xml → src/main/java/com/taauav/app/mapper/AdMapper.xml

@@ -1,5 +1,5 @@
 <?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.taauav.api.mapper.AdMapper">
+<mapper namespace="com.taauav.app.mapper.AdMapper">
 
 </mapper>

src/main/java/com/taauav/api/mapper/AppAdminMapper.java → src/main/java/com/taauav/app/mapper/AppAdminMapper.java

@@ -1,6 +1,6 @@
-package com.taauav.api.mapper;
+package com.taauav.app.mapper;
 
-import com.taauav.api.entity.AppAdmin;
+import com.taauav.app.entity.AppAdmin;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/com/taauav/api/mapper/AppAdminMapper.xml → src/main/java/com/taauav/app/mapper/AppAdminMapper.xml

@@ -1,5 +1,5 @@
 <?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.taauav.api.mapper.AppAdminMapper">
+<mapper namespace="com.taauav.app.mapper.AppAdminMapper">
 
 </mapper>

src/main/java/com/taauav/api/mapper/DriverMapper.java → src/main/java/com/taauav/app/mapper/DriverMapper.java

@@ -1,4 +1,4 @@
-package com.taauav.api.mapper;
+package com.taauav.app.mapper;
 
 import com.taauav.admin.entity.TauvDriver;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

src/main/java/com/taauav/api/mapper/DriverMapper.xml → src/main/java/com/taauav/app/mapper/DriverMapper.xml

@@ -1,5 +1,5 @@
 <?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.taauav.api.mapper.DriverMapper">
+<mapper namespace="com.taauav.app.mapper.DriverMapper">
 
 </mapper>

src/main/java/com/taauav/api/mapper/InspectAppMapper.java → src/main/java/com/taauav/app/mapper/InspectAppMapper.java

@@ -1,14 +1,12 @@
-package com.taauav.api.mapper;
+package com.taauav.app.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.taauav.admin.entity.TauvInspectApp;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.taauav.api.query.InspectListQuery;
-import com.taauav.api.vo.InspectListVo;
+import com.taauav.app.query.InspectListQuery;
+import com.taauav.app.vo.InspectListVo;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import java.util.List;
-
 /**
  * <p>
  * 巡河表 Mapper 接口

src/main/java/com/taauav/api/mapper/InspectAppMapper.xml → src/main/java/com/taauav/app/mapper/InspectAppMapper.xml

@@ -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.taauav.api.mapper.InspectAppMapper">
+<mapper namespace="com.taauav.app.mapper.InspectAppMapper">
 
     <!-- 获取巡检任务记录列表 -->
-    <select id="getInspectList" resultType="com.taauav.api.vo.InspectListVo">
+    <select id="getInspectList" resultType="com.taauav.app.vo.InspectListVo">
         SELECT a.id as 'inspectId',i.id as 'inspectDriverId',a.inspect_no as 'inspectNo',a.driver_id AS 'driverId',d.`name` AS 'driverName',d.driver_area AS 'driverArea',a.begin_time AS 'beginTime',a.end_time AS 'endTime',u.realname,(SELECT TIMESTAMPDIFF( MINUTE,a.begin_time,NOW())) AS 'timeUse' FROM tauv_inspect_app AS a
         INNER JOIN tauv_inspect_driver AS i ON i.inspect_id=a.id
         INNER JOIN tauv_driver AS d ON a.driver_id=d.id
@@ -12,7 +12,7 @@
     </select>
 
     <!-- 获取巡检记录详情 -->
-    <select id="getInspectInfo" parameterType="java.lang.Integer" resultType="com.taauav.api.vo.InspectListVo">
+    <select id="getInspectInfo" parameterType="java.lang.Integer" resultType="com.taauav.app.vo.InspectListVo">
         SELECT a.id as 'inspectId',i.id as 'inspectDriverId',a.inspect_no as 'inspectNo',a.driver_id AS 'driverId',d.`name` AS 'driverName',d.driver_area AS 'driverArea',a.begin_time AS 'beginTime',a.end_time AS 'endTime',u.realname,(SELECT TIMESTAMPDIFF( MINUTE,a.begin_time,NOW())) AS 'timeUse' FROM tauv_inspect_app AS a
         INNER JOIN tauv_inspect_driver AS i ON i.inspect_id=a.id
         INNER JOIN tauv_driver AS d ON a.driver_id=d.id

src/main/java/com/taauav/api/mapper/InspectAppPointMapper.java → src/main/java/com/taauav/app/mapper/InspectAppPointMapper.java

@@ -1,4 +1,4 @@
-package com.taauav.api.mapper;
+package com.taauav.app.mapper;
 
 import com.taauav.admin.entity.TauvInspectAppPoint;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

src/main/java/com/taauav/api/mapper/InspectAppPointMapper.xml → src/main/java/com/taauav/app/mapper/InspectAppPointMapper.xml

@@ -1,5 +1,5 @@
 <?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.taauav.api.mapper.InspectAppPointMapper">
+<mapper namespace="com.taauav.app.mapper.InspectAppPointMapper">
 
 </mapper>

src/main/java/com/taauav/api/mapper/InspectLogsMapper.java → src/main/java/com/taauav/app/mapper/InspectLogsMapper.java

@@ -1,8 +1,8 @@
-package com.taauav.api.mapper;
+package com.taauav.app.mapper;
 
-import com.taauav.api.entity.TauvInspectLogs;
+import com.taauav.app.entity.TauvInspectLogs;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.taauav.api.vo.InspectLogsListVo;
+import com.taauav.app.vo.InspectLogsListVo;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;

src/main/java/com/taauav/api/mapper/InspectLogsMapper.xml → src/main/java/com/taauav/app/mapper/InspectLogsMapper.xml

@@ -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.taauav.api.mapper.InspectLogsMapper">
+<mapper namespace="com.taauav.app.mapper.InspectLogsMapper">
 
     <!-- 获取巡检日志列表 -->
-    <select id="getInspectLogsList" parameterType="java.lang.Integer" resultType="com.taauav.api.vo.InspectLogsListVo">
+    <select id="getInspectLogsList" parameterType="java.lang.Integer" resultType="com.taauav.app.vo.InspectLogsListVo">
         SELECT l.id,l.inspect_driver_id,l.question_id, o.content AS 'question_content',l.inspect_result,l.inspect_image FROM tauv_inspect_logs AS l
         INNER JOIN tauv_question_options AS o ON o.id=l.question_id
         WHERE l.inspect_driver_id=#{inspectDriverId} AND l.mark=1 AND o.mark=1;

src/main/java/com/taauav/api/mapper/InspectQuestionMapper.java → src/main/java/com/taauav/app/mapper/InspectQuestionMapper.java

@@ -1,11 +1,11 @@
-package com.taauav.api.mapper;
+package com.taauav.app.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.taauav.admin.entity.TauvInspectQuestion;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.taauav.api.query.InspectQuestionQuery;
-import com.taauav.api.vo.InspectQuestionListVo;
-import com.taauav.api.vo.InspectQuestionStatisticsListVo;
+import com.taauav.app.query.InspectQuestionQuery;
+import com.taauav.app.vo.InspectQuestionListVo;
+import com.taauav.app.vo.InspectQuestionStatisticsListVo;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.math.BigInteger;

src/main/java/com/taauav/api/mapper/InspectQuestionMapper.xml → src/main/java/com/taauav/app/mapper/InspectQuestionMapper.xml

@@ -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.taauav.api.mapper.InspectQuestionMapper">
+<mapper namespace="com.taauav.app.mapper.InspectQuestionMapper">
 
     <!-- 获取问题列表 -->
-    <select id="getQuestionList" resultType="com.taauav.api.vo.InspectQuestionListVo">
+    <select id="getQuestionList" resultType="com.taauav.app.vo.InspectQuestionListVo">
         SELECT q.id,q.question_no, q.`status`,q.question_id,o.content as 'question_content',i.driver_name,i.driver_area,c.`name` as 'city_name',i.execution_time FROM tauv_inspect_question AS q
         INNER JOIN tauv_inspect_driver AS i ON q.inspect_driver_id=i.id
         INNER JOIN tauv_question_options AS o ON q.question_id=o.id
@@ -12,7 +12,7 @@
     </select>
 
     <!-- 获取问题详情 -->
-    <select id="getQuestionInfo" resultType="com.taauav.api.vo.InspectQuestionListVo">
+    <select id="getQuestionInfo" resultType="com.taauav.app.vo.InspectQuestionListVo">
         SELECT q.id,q.question_no, q.`status`,q.handler_image,q.create_time,q.assign_time,q.handler_time,f.src as 'question_src',f.gaode_address as 'question_address',q.question_id,o.content as 'question_content',i.driver_name,i.driver_area,c.`name` as 'city_name',i.execution_time,i.driver_id,i.driver_video FROM tauv_inspect_question AS q
         INNER JOIN tauv_inspect_driver AS i ON q.inspect_driver_id=i.id
         INNER JOIN tauv_question_options AS o ON q.question_id=o.id
@@ -29,7 +29,7 @@
         WHERE q.mark=1 AND i.mark=1 AND c.mark=1;
     </select>
     <!-- 获取各街道数据统计 -->
-    <select id="getQuestionStatisticsList" resultType="com.taauav.api.vo.InspectQuestionStatisticsListVo">
+    <select id="getQuestionStatisticsList" resultType="com.taauav.app.vo.InspectQuestionStatisticsListVo">
         SELECT i.driver_area,c.`name` AS driver_area_name,q.* FROM tauv_inspect_question AS q
         INNER JOIN tauv_inspect_driver AS i ON i.id=q.inspect_driver_id
         LEFT JOIN sys_city AS c ON i.driver_area=c.id
@@ -37,7 +37,7 @@
     </select>
 
     <!-- 问题处理效率统计 -->
-    <select id="getQuestionFinishedList" resultType="com.taauav.api.vo.InspectQuestionStatisticsListVo">
+    <select id="getQuestionFinishedList" resultType="com.taauav.app.vo.InspectQuestionStatisticsListVo">
         SELECT i.driver_area,c.`name` AS driver_area_name,q.* FROM tauv_inspect_question AS q
         INNER JOIN tauv_inspect_driver AS i ON i.id=q.inspect_driver_id
         LEFT JOIN sys_city AS c ON i.driver_area=c.id

src/main/java/com/taauav/api/mapper/NoticeMapper.java → src/main/java/com/taauav/app/mapper/NoticeMapper.java

@@ -1,4 +1,4 @@
-package com.taauav.api.mapper;
+package com.taauav.app.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.taauav.front.entity.UserNotice;

src/main/java/com/taauav/api/mapper/NoticeMapper.xml → src/main/java/com/taauav/app/mapper/NoticeMapper.xml

@@ -1,5 +1,5 @@
 <?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.taauav.api.mapper.NoticeMapper">
+<mapper namespace="com.taauav.app.mapper.NoticeMapper">
 
 </mapper>

src/main/java/com/taauav/api/query/DriverQuery.java → src/main/java/com/taauav/app/query/DriverQuery.java

@@ -1,4 +1,4 @@
-package com.taauav.api.query;
+package com.taauav.app.query;
 
 import com.taauav.common.core.mps.BaseQuery;
 import lombok.Data;

src/main/java/com/taauav/api/query/InspectListQuery.java → src/main/java/com/taauav/app/query/InspectListQuery.java

@@ -1,4 +1,4 @@
-package com.taauav.api.query;
+package com.taauav.app.query;
 
 import com.taauav.common.core.mps.BaseQuery;
 import lombok.Data;

src/main/java/com/taauav/api/query/InspectQuestionQuery.java → src/main/java/com/taauav/app/query/InspectQuestionQuery.java

@@ -1,4 +1,4 @@
-package com.taauav.api.query;
+package com.taauav.app.query;
 
 import com.taauav.common.core.mps.BaseQuery;
 import lombok.Data;

src/main/java/com/taauav/api/service/IAdService.java → src/main/java/com/taauav/app/service/IAdService.java

@@ -1,4 +1,4 @@
-package com.taauav.api.service;
+package com.taauav.app.service;
 
 import com.taauav.admin.entity.CtAd;
 import com.baomidou.mybatisplus.extension.service.IService;

src/main/java/com/taauav/api/service/IAppAdminService.java → src/main/java/com/taauav/app/service/IAppAdminService.java

@@ -1,6 +1,6 @@
-package com.taauav.api.service;
+package com.taauav.app.service;
 
-import com.taauav.api.entity.AppAdmin;
+import com.taauav.app.entity.AppAdmin;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

src/main/java/com/taauav/api/service/IDriverService.java → src/main/java/com/taauav/app/service/IDriverService.java

@@ -1,12 +1,10 @@
-package com.taauav.api.service;
+package com.taauav.app.service;
 
 import com.taauav.admin.entity.TauvDriver;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.taauav.api.query.DriverQuery;
+import com.taauav.app.query.DriverQuery;
 import com.taauav.common.bean.Response;
 
-import java.util.List;
-
 /**
  * <p>
  * 河道管理表 服务类

src/main/java/com/taauav/api/service/IInspectAppPointService.java → src/main/java/com/taauav/app/service/IInspectAppPointService.java

@@ -1,8 +1,8 @@
-package com.taauav.api.service;
+package com.taauav.app.service;
 
 import com.taauav.admin.entity.TauvInspectAppPoint;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.taauav.api.dto.InspectAppPointDto;
+import com.taauav.app.dto.InspectAppPointDto;
 import com.taauav.common.bean.Response;
 
 import java.util.List;

src/main/java/com/taauav/api/service/IInspectAppService.java → src/main/java/com/taauav/app/service/IInspectAppService.java

@@ -1,11 +1,11 @@
-package com.taauav.api.service;
+package com.taauav.app.service;
 
 import com.taauav.admin.entity.TauvInspectApp;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.taauav.api.dto.InspectEndDto;
-import com.taauav.api.dto.InspectPauseDto;
-import com.taauav.api.dto.InspectStartDto;
-import com.taauav.api.query.InspectListQuery;
+import com.taauav.app.dto.InspectEndDto;
+import com.taauav.app.dto.InspectPauseDto;
+import com.taauav.app.dto.InspectStartDto;
+import com.taauav.app.query.InspectListQuery;
 import com.taauav.common.bean.Response;
 
 /**

src/main/java/com/taauav/api/service/IInspectLogsService.java → src/main/java/com/taauav/app/service/IInspectLogsService.java

@@ -1,7 +1,7 @@
-package com.taauav.api.service;
+package com.taauav.app.service;
 
-import com.taauav.api.dto.InspectLogsDto;
-import com.taauav.api.entity.TauvInspectLogs;
+import com.taauav.app.dto.InspectLogsDto;
+import com.taauav.app.entity.TauvInspectLogs;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.taauav.common.bean.Response;
 

src/main/java/com/taauav/api/service/IInspectQuestionService.java → src/main/java/com/taauav/app/service/IInspectQuestionService.java

@@ -1,10 +1,10 @@
-package com.taauav.api.service;
+package com.taauav.app.service;
 
 import com.taauav.admin.entity.TauvInspectQuestion;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.taauav.api.dto.InspectQuestionReportDto;
-import com.taauav.api.query.InspectQuestionQuery;
-import com.taauav.api.vo.InspectQuestionListVo;
+import com.taauav.app.dto.InspectQuestionReportDto;
+import com.taauav.app.query.InspectQuestionQuery;
+import com.taauav.app.vo.InspectQuestionListVo;
 import com.taauav.common.bean.Response;
 import com.taauav.front.dto.inspectquestion.InspectQuestionDto;
 

src/main/java/com/taauav/api/service/ILoginService.java → src/main/java/com/taauav/app/service/ILoginService.java

@@ -1,7 +1,7 @@
-package com.taauav.api.service;
+package com.taauav.app.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.taauav.api.dto.LoginDto;
+import com.taauav.app.dto.LoginDto;
 import com.taauav.common.bean.Response;
 import com.taauav.front.entity.UserAdmin;
 

src/main/java/com/taauav/api/service/INoticeService.java → src/main/java/com/taauav/app/service/INoticeService.java

@@ -1,7 +1,7 @@
-package com.taauav.api.service;
+package com.taauav.app.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.taauav.api.dto.NoticeQuery;
+import com.taauav.app.dto.NoticeQuery;
 import com.taauav.common.bean.Response;
 import com.taauav.front.entity.UserNotice;
 

src/main/java/com/taauav/api/service/impl/AdServiceImpl.java → src/main/java/com/taauav/app/service/impl/AdServiceImpl.java

@@ -1,11 +1,10 @@
-package com.taauav.api.service.impl;
+package com.taauav.app.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.taauav.admin.entity.CtAd;
-import com.taauav.api.mapper.AdMapper;
-import com.taauav.api.service.IAdService;
+import com.taauav.app.mapper.AdMapper;
+import com.taauav.app.service.IAdService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.taauav.common.bean.Response;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/taauav/api/service/impl/AppAdminServiceImpl.java → src/main/java/com/taauav/app/service/impl/AppAdminServiceImpl.java

@@ -1,11 +1,10 @@
-package com.taauav.api.service.impl;
+package com.taauav.app.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.taauav.api.entity.AppAdmin;
-import com.taauav.api.mapper.AppAdminMapper;
-import com.taauav.api.service.IAppAdminService;
+import com.taauav.app.entity.AppAdmin;
+import com.taauav.app.mapper.AppAdminMapper;
+import com.taauav.app.service.IAppAdminService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.taauav.front.entity.UserAdmin;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;

src/main/java/com/taauav/api/service/impl/DriverServiceImpl.java → src/main/java/com/taauav/app/service/impl/DriverServiceImpl.java

@@ -1,19 +1,16 @@
-package com.taauav.api.service.impl;
+package com.taauav.app.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.taauav.admin.entity.SysCity;
 import com.taauav.admin.entity.TauvDriver;
-import com.taauav.admin.mapper.SysCityMapper;
 import com.taauav.admin.service.ISysCityService;
-import com.taauav.api.mapper.DriverMapper;
-import com.taauav.api.query.DriverQuery;
-import com.taauav.api.service.IDriverService;
+import com.taauav.app.mapper.DriverMapper;
+import com.taauav.app.query.DriverQuery;
+import com.taauav.app.service.IDriverService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.taauav.api.vo.DriverListVo;
+import com.taauav.app.vo.DriverListVo;
 import com.taauav.common.bean.Response;
-import com.taauav.common.util.ShiroUtils;
 import com.taauav.front.service.IUserAuthGroupService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/taauav/api/service/impl/InspectAppPointServiceImpl.java → src/main/java/com/taauav/app/service/impl/InspectAppPointServiceImpl.java

@@ -1,16 +1,15 @@
-package com.taauav.api.service.impl;
+package com.taauav.app.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.taauav.admin.entity.TauvInspectAppPoint;
-import com.taauav.api.dto.InspectAppPointDto;
-import com.taauav.api.mapper.InspectAppPointMapper;
-import com.taauav.api.service.IInspectAppPointService;
+import com.taauav.app.dto.InspectAppPointDto;
+import com.taauav.app.mapper.InspectAppPointMapper;
+import com.taauav.app.service.IInspectAppPointService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.taauav.common.bean.Response;
 import com.taauav.common.util.DateUtil;
 import com.taauav.common.util.ShiroUtils;
 import com.taauav.common.util.StringUtils;
-import io.netty.util.internal.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/taauav/api/service/impl/InspectAppServiceImpl.java → src/main/java/com/taauav/app/service/impl/InspectAppServiceImpl.java

@@ -1,4 +1,4 @@
-package com.taauav.api.service.impl;
+package com.taauav.app.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,18 +7,18 @@ import com.taauav.admin.entity.*;
 import com.taauav.admin.mapper.TauvDriverMapper;
 import com.taauav.admin.mapper.TauvInspectDriverMapper;
 import com.taauav.admin.service.ISysCityService;
-import com.taauav.api.dto.InspectEndDto;
-import com.taauav.api.dto.InspectPauseDto;
-import com.taauav.api.dto.InspectStartDto;
-import com.taauav.api.mapper.InspectAppMapper;
-import com.taauav.api.mapper.InspectLogsMapper;
-import com.taauav.api.mapper.InspectQuestionMapper;
-import com.taauav.api.query.InspectListQuery;
-import com.taauav.api.service.IInspectAppPointService;
-import com.taauav.api.service.IInspectAppService;
+import com.taauav.app.dto.InspectEndDto;
+import com.taauav.app.dto.InspectPauseDto;
+import com.taauav.app.dto.InspectStartDto;
+import com.taauav.app.mapper.InspectAppMapper;
+import com.taauav.app.mapper.InspectLogsMapper;
+import com.taauav.app.mapper.InspectQuestionMapper;
+import com.taauav.app.query.InspectListQuery;
+import com.taauav.app.service.IInspectAppPointService;
+import com.taauav.app.service.IInspectAppService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.taauav.api.vo.InspectListVo;
-import com.taauav.api.vo.InspectLogsListVo;
+import com.taauav.app.vo.InspectListVo;
+import com.taauav.app.vo.InspectLogsListVo;
 import com.taauav.common.bean.Response;
 import com.taauav.common.util.DateUtil;
 import com.taauav.common.util.FunctionUtils;

src/main/java/com/taauav/api/service/impl/InspectLogsServiceImpl.java → src/main/java/com/taauav/app/service/impl/InspectLogsServiceImpl.java

@@ -1,24 +1,18 @@
-package com.taauav.api.service.impl;
+package com.taauav.app.service.impl;
 
-import com.taauav.admin.entity.TauvInspectFile;
-import com.taauav.admin.entity.TauvInspectQuestion;
-import com.taauav.api.dto.InspectLogsDto;
-import com.taauav.api.entity.TauvInspectLogs;
-import com.taauav.api.mapper.InspectLogsMapper;
-import com.taauav.api.service.IInspectLogsService;
+import com.taauav.app.dto.InspectLogsDto;
+import com.taauav.app.entity.TauvInspectLogs;
+import com.taauav.app.mapper.InspectLogsMapper;
+import com.taauav.app.service.IInspectLogsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.taauav.common.bean.Response;
 import com.taauav.common.util.*;
-import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.util.Calendar;
-import java.util.List;
-import java.util.Map;
 import java.util.UUID;
 
 /**

src/main/java/com/taauav/api/service/impl/InspectQuestionServiceImpl.java → src/main/java/com/taauav/app/service/impl/InspectQuestionServiceImpl.java

@@ -1,17 +1,17 @@
-package com.taauav.api.service.impl;
+package com.taauav.app.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.taauav.admin.entity.*;
 import com.taauav.admin.mapper.*;
-import com.taauav.api.dto.InspectQuestionReportDto;
-import com.taauav.api.query.InspectQuestionQuery;
-import com.taauav.api.mapper.InspectQuestionMapper;
-import com.taauav.api.service.IInspectQuestionService;
+import com.taauav.app.dto.InspectQuestionReportDto;
+import com.taauav.app.query.InspectQuestionQuery;
+import com.taauav.app.mapper.InspectQuestionMapper;
+import com.taauav.app.service.IInspectQuestionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.taauav.api.vo.InspectQuestionListVo;
-import com.taauav.api.vo.InspectQuestionStatisticsListVo;
+import com.taauav.app.vo.InspectQuestionListVo;
+import com.taauav.app.vo.InspectQuestionStatisticsListVo;
 import com.taauav.common.bean.Response;
 import com.taauav.common.util.DateUtil;
 import com.taauav.common.util.FileUtil;

src/main/java/com/taauav/api/service/impl/LoginServiceImpl.java → src/main/java/com/taauav/app/service/impl/LoginServiceImpl.java

@@ -1,13 +1,12 @@
-package com.taauav.api.service.impl;
+package com.taauav.app.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.taauav.api.dto.LoginDto;
-import com.taauav.api.entity.AppAdmin;
-import com.taauav.api.service.ILoginService;
+import com.taauav.app.dto.LoginDto;
+import com.taauav.app.entity.AppAdmin;
+import com.taauav.app.service.ILoginService;
 import com.taauav.common.bean.CacheUser;
 import com.taauav.common.bean.Response;
 import com.taauav.common.config.AppUserToken;
-import com.taauav.common.config.FrontUserToken;
 import com.taauav.common.util.StringUtils;
 import com.taauav.front.entity.UserAdmin;
 import com.taauav.front.mapper.UserAdminMapper;

src/main/java/com/taauav/api/service/impl/NoticeServiceImpl.java → src/main/java/com/taauav/app/service/impl/NoticeServiceImpl.java

@@ -1,17 +1,15 @@
-package com.taauav.api.service.impl;
+package com.taauav.app.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.taauav.api.dto.NoticeQuery;
-import com.taauav.api.mapper.NoticeMapper;
-import com.taauav.api.service.INoticeService;
+import com.taauav.app.dto.NoticeQuery;
+import com.taauav.app.mapper.NoticeMapper;
+import com.taauav.app.service.INoticeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.taauav.common.bean.Response;
 import com.taauav.common.util.FunctionUtils;
-import com.taauav.common.util.StringUtils;
 import com.taauav.front.constant.UserNoticeConstant;
-import com.taauav.front.entity.UserAdmin;
 import com.taauav.front.entity.UserNotice;
 import com.taauav.front.vo.usernotice.UserNoticeListVo;
 import org.springframework.beans.BeanUtils;

src/main/java/com/taauav/api/utils/CodeGenerator.java → src/main/java/com/taauav/app/utils/CodeGenerator.java

@@ -1,4 +1,4 @@
-package com.taauav.api.utils;
+package com.taauav.app.utils;
 
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;

src/main/java/com/taauav/api/utils/LoginUtils.java → src/main/java/com/taauav/app/utils/LoginUtils.java

@@ -1,4 +1,4 @@
-package com.taauav.api.utils;
+package com.taauav.app.utils;
 
 import com.taauav.common.util.JwtUtil;
 import com.taauav.common.util.StringUtils;

src/main/java/com/taauav/api/vo/DriverListVo.java → src/main/java/com/taauav/app/vo/DriverListVo.java

@@ -1,4 +1,4 @@
-package com.taauav.api.vo;
+package com.taauav.app.vo;
 
 import com.taauav.admin.entity.TauvDriver;
 import lombok.Data;

src/main/java/com/taauav/api/vo/InspectListVo.java → src/main/java/com/taauav/app/vo/InspectListVo.java

@@ -1,4 +1,4 @@
-package com.taauav.api.vo;
+package com.taauav.app.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.taauav.admin.entity.TauvInspectAppPoint;

src/main/java/com/taauav/api/vo/InspectLogsListVo.java → src/main/java/com/taauav/app/vo/InspectLogsListVo.java

@@ -1,4 +1,4 @@
-package com.taauav.api.vo;
+package com.taauav.app.vo;
 
 import lombok.Data;
 

src/main/java/com/taauav/api/vo/InspectQuestionListVo.java → src/main/java/com/taauav/app/vo/InspectQuestionListVo.java

@@ -1,4 +1,4 @@
-package com.taauav.api.vo;
+package com.taauav.app.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

src/main/java/com/taauav/api/vo/InspectQuestionStatisticsListVo.java → src/main/java/com/taauav/app/vo/InspectQuestionStatisticsListVo.java

@@ -1,4 +1,4 @@
-package com.taauav.api.vo;
+package com.taauav.app.vo;
 
 import com.taauav.admin.entity.TauvInspectQuestion;
 import lombok.Data;

src/main/java/com/taauav/common/config/MyShiroRealm.java

@@ -4,16 +4,14 @@ import com.taauav.admin.entity.SysAdmin;
 import com.taauav.admin.entity.SysAuthRule;
 import com.taauav.admin.service.ISysAdminService;
 import com.taauav.admin.service.ISysAuthRuleService;
-import com.taauav.api.entity.AppAdmin;
-import com.taauav.api.service.IAppAdminService;
-import com.taauav.common.domain.Entity;
+import com.taauav.app.entity.AppAdmin;
+import com.taauav.app.service.IAppAdminService;
 import com.taauav.common.util.ShiroUtils;
 import com.taauav.front.entity.UserAdmin;
 import com.taauav.front.entity.UserAuthRule;
 import com.taauav.front.service.IUserAdminService;
 import com.taauav.front.service.IUserAuthRuleService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.*;
 import org.apache.shiro.authz.AuthorizationInfo;
 import org.apache.shiro.authz.SimpleAuthorizationInfo;

src/main/java/com/taauav/common/config/ShiroConfig.java

@@ -74,6 +74,8 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/doc.html", "anon");
         //前台接口权限 开放
         filterChainDefinitionMap.put("/front/**", "anon");
+        //APP接口权限 开放
+        filterChainDefinitionMap.put("/app/**", "anon");
         // 所有url都必须认证通过才可以访问
         filterChainDefinitionMap.put("/**", "authc");
 

src/main/java/com/taauav/common/util/ShiroUtils.java

@@ -1,7 +1,7 @@
 package com.taauav.common.util;
 
 import com.taauav.admin.entity.SysAdmin;
-import com.taauav.api.entity.AppAdmin;
+import com.taauav.app.entity.AppAdmin;
 import com.taauav.common.domain.Entity;
 import com.taauav.front.entity.UserAdmin;
 import lombok.extern.slf4j.Slf4j;