[CODE]:陆运基础信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/compayMsg/FleetCarManageController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/basicData/FleetCarManageController.java

@@ -1,12 +1,12 @@
-package com.ruoyi.web.controller.fleet.compayMsg;
+package com.ruoyi.web.controller.fleet.basicData;
 
 import java.util.List;
 import java.util.Map;
 
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.orderManagement.domain.FleetCarManage;
-import com.ruoyi.orderManagement.service.IFleetCarManageService;
+import com.ruoyi.orderManagement.BasicData.domain.FleetCarManage;
+import com.ruoyi.orderManagement.BasicData.service.IFleetCarManageService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/compayMsg/FleetCompanyMsgController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/basicData/FleetCompanyMsgController.java

@@ -1,12 +1,12 @@
-package com.ruoyi.web.controller.fleet.compayMsg;
+package com.ruoyi.web.controller.fleet.basicData;
 
 import java.util.List;
 
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.orderManagement.domain.FleetCompanyMsg;
-import com.ruoyi.orderManagement.service.IFleetCompanyMsgService;
+import com.ruoyi.orderManagement.BasicData.domain.FleetCompanyMsg;
+import com.ruoyi.orderManagement.BasicData.service.IFleetCompanyMsgService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/compayMsg/FleetDriverMsgController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/basicData/FleetDriverMsgController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.fleet.compayMsg;
+package com.ruoyi.web.controller.fleet.basicData;
 
 import java.util.List;
 import java.util.Map;
@@ -6,8 +6,8 @@ import java.util.Map;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.orderManagement.domain.FleetDriverMsg;
-import com.ruoyi.orderManagement.service.IFleetDriverMsgService;
+import com.ruoyi.orderManagement.BasicData.domain.FleetDriverMsg;
+import com.ruoyi.orderManagement.BasicData.service.IFleetDriverMsgService;
 import com.ruoyi.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/domain/FleetCarManage.java → ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/BasicData/domain/FleetCarManage.java

@@ -1,11 +1,12 @@
-package com.ruoyi.orderManagement.domain;
+package com.ruoyi.orderManagement.BasicData.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
 
 /**
  * 【车辆】对象 fleet_car_manage

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/domain/FleetCompanyMsg.java → ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/BasicData/domain/FleetCompanyMsg.java

@@ -1,11 +1,12 @@
-package com.ruoyi.orderManagement.domain;
+package com.ruoyi.orderManagement.BasicData.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
 
 /**
  * 【车队】对象 fleet_company_msg

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/domain/FleetDriverMsg.java → ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/BasicData/domain/FleetDriverMsg.java

@@ -1,11 +1,12 @@
-package com.ruoyi.orderManagement.domain;
+package com.ruoyi.orderManagement.BasicData.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
 
 /**
  * 【司机】对象 fleet_driver_msg

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/mapper/FleetCarManageMapper.java → ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/BasicData/mapper/FleetCarManageMapper.java

@@ -1,8 +1,7 @@
-package com.ruoyi.orderManagement.mapper;
+package com.ruoyi.orderManagement.BasicData.mapper;
 
 
-import com.ruoyi.orderManagement.domain.FleetCarManage;
-import com.ruoyi.orderManagement.domain.FleetCompanyMsg;
+import com.ruoyi.orderManagement.BasicData.domain.FleetCarManage;
 
 import java.util.List;
 import java.util.Map;

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/mapper/FleetCompanyMsgMapper.java → ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/BasicData/mapper/FleetCompanyMsgMapper.java

@@ -1,8 +1,8 @@
-package com.ruoyi.orderManagement.mapper;
+package com.ruoyi.orderManagement.BasicData.mapper;
 
 
-import com.ruoyi.basicData.domain.TGoods;
-import com.ruoyi.orderManagement.domain.FleetCompanyMsg;
+import com.ruoyi.orderManagement.BasicData.domain.FleetCompanyMsg;
+
 import java.util.List;
 import java.util.Map;
 

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/mapper/FleetDriverMsgMapper.java → ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/BasicData/mapper/FleetDriverMsgMapper.java

@@ -1,10 +1,10 @@
-package com.ruoyi.orderManagement.mapper;
+package com.ruoyi.orderManagement.BasicData.mapper;
+
+import com.ruoyi.orderManagement.BasicData.domain.FleetDriverMsg;
 
 import java.util.List;
 import java.util.Map;
 
-import com.ruoyi.orderManagement.domain.FleetDriverMsg;
-
 
 /**
  * 【司机】Mapper接口

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/service/IFleetCarManageService.java → ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/BasicData/service/IFleetCarManageService.java

@@ -1,12 +1,11 @@
-package com.ruoyi.orderManagement.service;
+package com.ruoyi.orderManagement.BasicData.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.orderManagement.BasicData.domain.FleetCarManage;
 
 import java.util.List;
 import java.util.Map;
 
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.orderManagement.domain.FleetCarManage;
-import com.ruoyi.orderManagement.domain.FleetCompanyMsg;
-
 /**
  * 【车辆】Service接口
  * 

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/service/IFleetCompanyMsgService.java → ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/BasicData/service/IFleetCompanyMsgService.java

@@ -1,9 +1,8 @@
-package com.ruoyi.orderManagement.service;
+package com.ruoyi.orderManagement.BasicData.service;
 
 
-import com.ruoyi.basicData.domain.TGoods;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.orderManagement.domain.FleetCompanyMsg;
+import com.ruoyi.orderManagement.BasicData.domain.FleetCompanyMsg;
 
 import java.util.List;
 import java.util.Map;

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/service/IFleetDriverMsgService.java → ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/BasicData/service/IFleetDriverMsgService.java

@@ -1,11 +1,11 @@
-package com.ruoyi.orderManagement.service;
+package com.ruoyi.orderManagement.BasicData.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.orderManagement.BasicData.domain.FleetDriverMsg;
 
 import java.util.List;
 import java.util.Map;
 
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.orderManagement.domain.FleetDriverMsg;
-
 /**
  * 【司机】Service接口
  * 

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/service/impl/FleetCarManageServiceImpl.java → ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/BasicData/service/impl/FleetCarManageServiceImpl.java

@@ -1,4 +1,4 @@
-package com.ruoyi.orderManagement.service.impl;
+package com.ruoyi.orderManagement.BasicData.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -6,13 +6,13 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.orderManagement.domain.FleetCarManage;
-import com.ruoyi.orderManagement.domain.FleetCompanyMsg;
+import com.ruoyi.orderManagement.BasicData.domain.FleetCarManage;
+import com.ruoyi.orderManagement.BasicData.domain.FleetCompanyMsg;
+import com.ruoyi.orderManagement.BasicData.service.IFleetCarManageService;
 import com.ruoyi.orderManagement.domain.Ftmsorderbillsattachs;
-import com.ruoyi.orderManagement.mapper.FleetCarManageMapper;
-import com.ruoyi.orderManagement.mapper.FleetCompanyMsgMapper;
+import com.ruoyi.orderManagement.BasicData.mapper.FleetCarManageMapper;
+import com.ruoyi.orderManagement.BasicData.mapper.FleetCompanyMsgMapper;
 import com.ruoyi.orderManagement.mapper.FtmsorderbillsattachsMapper;
-import com.ruoyi.orderManagement.service.IFleetCarManageService;
 import com.ruoyi.warehouseBusiness.mapper.TEnclosureMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,8 +33,6 @@ public class FleetCarManageServiceImpl implements IFleetCarManageService
     @Autowired
     private FleetCarManageMapper fleetCarManageMapper;
 
-    @Autowired
-    private TEnclosureMapper tEnclosureMapper;
 
     @Autowired
     private FtmsorderbillsattachsMapper ftmsorderbillsattachsMapper;

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/service/impl/FleetCompanyMsgServiceImpl.java → ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/BasicData/service/impl/FleetCompanyMsgServiceImpl.java

@@ -1,14 +1,13 @@
-package com.ruoyi.orderManagement.service.impl;
+package com.ruoyi.orderManagement.BasicData.service.impl;
 
 
-import com.ruoyi.basicData.domain.TGoods;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.orderManagement.domain.FleetCompanyMsg;
-import com.ruoyi.orderManagement.mapper.FleetCompanyMsgMapper;
-import com.ruoyi.orderManagement.service.IFleetCompanyMsgService;
+import com.ruoyi.orderManagement.BasicData.domain.FleetCompanyMsg;
+import com.ruoyi.orderManagement.BasicData.service.IFleetCompanyMsgService;
+import com.ruoyi.orderManagement.BasicData.mapper.FleetCompanyMsgMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/service/impl/FleetDriverMsgServiceImpl.java → ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/BasicData/service/impl/FleetDriverMsgServiceImpl.java

@@ -1,18 +1,13 @@
-package com.ruoyi.orderManagement.service.impl;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+package com.ruoyi.orderManagement.BasicData.service.impl;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.orderManagement.domain.FleetDriverMsg;
-import com.ruoyi.orderManagement.mapper.FleetDriverMsgMapper;
-import com.ruoyi.orderManagement.service.IFleetDriverMsgService;
+import com.ruoyi.orderManagement.BasicData.domain.FleetDriverMsg;
+import com.ruoyi.orderManagement.BasicData.mapper.FleetDriverMsgMapper;
+import com.ruoyi.orderManagement.BasicData.service.IFleetDriverMsgService;
 import com.ruoyi.system.domain.SysUserPost;
 import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.mapper.SysUserMapper;
@@ -23,6 +18,11 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 
 /**
  * 【司机】Service业务层处理
@@ -31,7 +31,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
  * @date 2021-03-04
  */
 @Service
-public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService 
+public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService
 {
     @Autowired
     private FleetDriverMsgMapper fleetDriverMsgMapper;

ruoyi-fleet/src/main/resources/mapper/FleetCarManageMapper.xml → ruoyi-fleet/src/main/resources/mapper/basicData/FleetCarManageMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.orderManagement.mapper.FleetCarManageMapper">
+<mapper namespace="com.ruoyi.orderManagement.BasicData.mapper.FleetCarManageMapper">
     
     <resultMap type="FleetCarManage" id="FleetCarManageResult">
         <result property="id"    column="id"    />

ruoyi-fleet/src/main/resources/mapper/FleetCompanyMsgMapper.xml → ruoyi-fleet/src/main/resources/mapper/basicData/FleetCompanyMsgMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.orderManagement.mapper.FleetCompanyMsgMapper">
+<mapper namespace="com.ruoyi.orderManagement.BasicData.mapper.FleetCompanyMsgMapper">
     
     <resultMap type="FleetCompanyMsg" id="FleetCompanyMsgResult">
         <result property="id"    column="id"    />

ruoyi-fleet/src/main/resources/mapper/FleetDriverMsgMapper.xml → ruoyi-fleet/src/main/resources/mapper/basicData/FleetDriverMsgMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.orderManagement.mapper.FleetDriverMsgMapper">
+<mapper namespace="com.ruoyi.orderManagement.BasicData.mapper.FleetDriverMsgMapper">
     
     <resultMap type="FleetDriverMsg" id="FleetDriverMsgResult">
         <result property="id"    column="id"    />