调整配置

nafmii-app-business/src/main/java/org/nafmii/appbusiness/NafmiiAppBusinessApplication.java

@@ -6,11 +6,20 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 
+import javax.annotation.PostConstruct;
+import java.util.Date;
+import java.util.TimeZone;
+
 @SpringBootApplication(scanBasePackages = {"org.nafmii.appbusiness"})
 @MapperScan("org.nafmii.appbusiness/**/dao")
 @EnableFtpServer
 @EnableEurekaClient
 public class NafmiiAppBusinessApplication {
+    @PostConstruct
+    void setDefaultTimezone() {
+        TimeZone.setDefault(TimeZone.getTimeZone("GMT+8"));
+        System.out.println("当前时间：" + new Date());
+    }
 
     public static void main(String[] args) {
         SpringApplication.run(NafmiiAppBusinessApplication.class, args);

nafmii-web-center/src/main/java/org/nafmii/admin/NafmiiWebCenterApplication.java → nafmii-web-center/src/main/java/org/nafmii/webcenter/NafmiiWebCenterApplication.java

-package org.nafmii.admin;
+package org.nafmii.webcenter;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.nafmii.common.ftp.EnableFtpServer;
@@ -12,7 +12,7 @@ import java.util.TimeZone;
 
 @SpringBootApplication
 @EnableEurekaClient
-@MapperScan(basePackages ={"org.nafmii.admin/**/dao"})
+@MapperScan(basePackages ={"org.nafmii.webcenter/**/dao"})
 @EnableFtpServer
 public class NafmiiWebCenterApplication {
     @PostConstruct

nafmii-web-center/src/main/java/org/nafmii/admin/att/controller/AttController.java → nafmii-web-center/src/main/java/org/nafmii/webcenter/att/controller/AttController.java

-package org.nafmii.admin.att.controller;
+package org.nafmii.webcenter.att.controller;
 
 import cn.hutool.core.io.FileUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.nafmii.admin.att.service.AttService;
+import org.nafmii.webcenter.att.service.AttService;
 import org.nafmii.common.response.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

nafmii-web-center/src/main/java/org/nafmii/admin/att/controller/ImportExcelController.java → nafmii-web-center/src/main/java/org/nafmii/webcenter/att/controller/ImportExcelController.java

-package org.nafmii.admin.att.controller;
+package org.nafmii.webcenter.att.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.nafmii.admin.att.service.ImportExcelService;
+import org.nafmii.webcenter.att.service.ImportExcelService;
 import org.nafmii.common.response.ApiResponse;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

nafmii-web-center/src/main/java/org/nafmii/admin/att/dao/AttachmentInfoMapper.java → nafmii-web-center/src/main/java/org/nafmii/webcenter/att/dao/AttachmentInfoMapper.java

-package org.nafmii.admin.att.dao;
+package org.nafmii.webcenter.att.dao;
 
-import org.nafmii.admin.att.entity.AttachmentInfoPO;
+import org.nafmii.webcenter.att.entity.AttachmentInfoPO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

nafmii-web-center/src/main/java/org/nafmii/admin/att/dao/BusinessAttachmentInfoMapper.java → nafmii-web-center/src/main/java/org/nafmii/webcenter/att/dao/BusinessAttachmentInfoMapper.java

-package org.nafmii.admin.att.dao;
+package org.nafmii.webcenter.att.dao;
 
-import org.nafmii.admin.att.entity.BusinessAttachmentInfoPO;
+import org.nafmii.webcenter.att.entity.BusinessAttachmentInfoPO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

nafmii-web-center/src/main/java/org/nafmii/admin/att/dao/ImportExcelMapper.java → nafmii-web-center/src/main/java/org/nafmii/webcenter/att/dao/ImportExcelMapper.java

-package org.nafmii.admin.att.dao;
+package org.nafmii.webcenter.att.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.nafmii.admin.att.dto.ImportExcelDto;
+import org.nafmii.webcenter.att.dto.ImportExcelDto;
 
 /**
  * <p>

nafmii-web-center/src/main/java/org/nafmii/admin/att/dto/AttachmentInfoDto.java → nafmii-web-center/src/main/java/org/nafmii/webcenter/att/dto/AttachmentInfoDto.java

-package org.nafmii.admin.att.dto;
+package org.nafmii.webcenter.att.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

nafmii-web-center/src/main/java/org/nafmii/admin/att/dto/AttachmentInfoListDto.java → nafmii-web-center/src/main/java/org/nafmii/webcenter/att/dto/AttachmentInfoListDto.java

-package org.nafmii.admin.att.dto;
+package org.nafmii.webcenter.att.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

nafmii-web-center/src/main/java/org/nafmii/admin/att/dto/ImportExcelDto.java → nafmii-web-center/src/main/java/org/nafmii/webcenter/att/dto/ImportExcelDto.java

-package org.nafmii.admin.att.dto;
+package org.nafmii.webcenter.att.dto;
 
 import io.swagger.annotations.ApiModel;
 import lombok.Data;

nafmii-web-center/src/main/java/org/nafmii/admin/att/entity/AttachmentInfoPO.java → nafmii-web-center/src/main/java/org/nafmii/webcenter/att/entity/AttachmentInfoPO.java

-package org.nafmii.admin.att.entity;
+package org.nafmii.webcenter.att.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

nafmii-web-center/src/main/java/org/nafmii/admin/att/entity/BusinessAttachmentInfoPO.java → nafmii-web-center/src/main/java/org/nafmii/webcenter/att/entity/BusinessAttachmentInfoPO.java

-package org.nafmii.admin.att.entity;
+package org.nafmii.webcenter.att.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

nafmii-web-center/src/main/java/org/nafmii/admin/att/service/AttService.java → nafmii-web-center/src/main/java/org/nafmii/webcenter/att/service/AttService.java

-package org.nafmii.admin.att.service;
+package org.nafmii.webcenter.att.service;
 
-import org.nafmii.admin.att.dto.AttachmentInfoListDto;
+import org.nafmii.webcenter.att.dto.AttachmentInfoListDto;
 import org.nafmii.common.response.ApiResponse;
 import org.springframework.web.multipart.MultipartFile;
 

nafmii-web-center/src/main/java/org/nafmii/admin/att/service/ImportExcelService.java → nafmii-web-center/src/main/java/org/nafmii/webcenter/att/service/ImportExcelService.java

-package org.nafmii.admin.att.service;
+package org.nafmii.webcenter.att.service;
 
 import org.nafmii.common.response.ApiResponse;
 import org.springframework.web.multipart.MultipartFile;

nafmii-web-center/src/main/java/org/nafmii/admin/att/service/impl/AttServiceImpl.java → nafmii-web-center/src/main/java/org/nafmii/webcenter/att/service/impl/AttServiceImpl.java

-package org.nafmii.admin.att.service.impl;
+package org.nafmii.webcenter.att.service.impl;
 
 import cn.hutool.core.bean.copier.BeanCopier;
 import cn.hutool.core.io.FileUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
-import org.nafmii.admin.att.dao.AttachmentInfoMapper;
-import org.nafmii.admin.att.dto.AttachmentInfoDto;
-import org.nafmii.admin.att.dto.AttachmentInfoListDto;
-import org.nafmii.admin.att.entity.AttachmentInfoPO;
-import org.nafmii.admin.att.service.AttService;
-import org.nafmii.admin.att.vo.EshopAttachmentInfoVo;
+import org.nafmii.webcenter.att.dao.AttachmentInfoMapper;
+import org.nafmii.webcenter.att.dto.AttachmentInfoDto;
+import org.nafmii.webcenter.att.dto.AttachmentInfoListDto;
+import org.nafmii.webcenter.att.entity.AttachmentInfoPO;
+import org.nafmii.webcenter.att.service.AttService;
+import org.nafmii.webcenter.att.vo.EshopAttachmentInfoVo;
 import org.nafmii.common.constant.CommonEnum;
 import org.nafmii.common.constant.MessageEnum;
 import org.nafmii.common.param.BeanTransferUtils;

nafmii-web-center/src/main/java/org/nafmii/admin/att/service/impl/ImportExcelServiceImpl.java → nafmii-web-center/src/main/java/org/nafmii/webcenter/att/service/impl/ImportExcelServiceImpl.java

-package org.nafmii.admin.att.service.impl;
+package org.nafmii.webcenter.att.service.impl;
 
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.enums.CellExtraTypeEnum;
 import lombok.extern.slf4j.Slf4j;
-import org.nafmii.admin.att.dto.ImportExcelDto;
-import org.nafmii.admin.att.service.ImportExcelService;
-import org.nafmii.admin.att.dao.ImportExcelMapper;
-import org.nafmii.admin.att.utils.NoModelDataListener;
-import org.nafmii.admin.att.vo.ExcelVo;
+import org.nafmii.webcenter.att.dto.ImportExcelDto;
+import org.nafmii.webcenter.att.service.ImportExcelService;
+import org.nafmii.webcenter.att.dao.ImportExcelMapper;
+import org.nafmii.webcenter.att.utils.NoModelDataListener;
+import org.nafmii.webcenter.att.vo.ExcelVo;
 import org.nafmii.common.constant.MessageEnum;
 import org.nafmii.common.response.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;

nafmii-web-center/src/main/java/org/nafmii/admin/att/utils/NoModelDataListener.java → nafmii-web-center/src/main/java/org/nafmii/webcenter/att/utils/NoModelDataListener.java

-package org.nafmii.admin.att.utils;
+package org.nafmii.webcenter.att.utils;
 
 import com.alibaba.excel.context.AnalysisContext;
 

nafmii-web-center/src/main/java/org/nafmii/admin/att/vo/EshopAttachmentInfoVo.java → nafmii-web-center/src/main/java/org/nafmii/webcenter/att/vo/EshopAttachmentInfoVo.java

-package org.nafmii.admin.att.vo;
+package org.nafmii.webcenter.att.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

nafmii-web-center/src/main/java/org/nafmii/admin/att/vo/ExcelVo.java → nafmii-web-center/src/main/java/org/nafmii/webcenter/att/vo/ExcelVo.java

-package org.nafmii.admin.att.vo;
+package org.nafmii.webcenter.att.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;

nafmii-web-center/src/main/resources/mapper/AttachmentInfoMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.nafmii.admin.dao.AttachmentInfoMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="org.nafmii.admin.att.entity.AttachmentInfoPO">
+    <resultMap id="BaseResultMap" type="org.nafmii.webcenter.att.entity.AttachmentInfoPO">
         <id column="ID" property="id" />
         <result column="FILE_NAME" property="fileName" />
         <result column="FILE_URL" property="fileUrl" />

nafmii-web-center/src/main/resources/mapper/BusinessAttachmentInfoMapper.xml

 <?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="org.nafmii.admin.att.dao.BusinessAttachmentInfoMapper">
+<mapper namespace="org.nafmii.webcenter.att.dao.BusinessAttachmentInfoMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="org.nafmii.admin.att.entity.BusinessAttachmentInfoPO">
+    <resultMap id="BaseResultMap" type="org.nafmii.webcenter.att.entity.BusinessAttachmentInfoPO">
         <id column="ID" property="id" />
         <result column="BUSINESS" property="business" />
         <result column="BUSINESS_ID" property="businessId" />

nafmii-web-center/src/main/resources/mapper/CenterMenuMapper.xml

 <?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="org.nafmii.admin.user.dao.CenterMenuMapper">
+<mapper namespace="org.nafmii.webcenter.user.dao.CenterMenuMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="org.nafmii.admin.user.entity.CenterMenuPO">
+    <resultMap id="BaseResultMap" type="org.nafmii.webcenter.user.entity.CenterMenuPO">
         <id column="ID" property="id" />
         <result column="MENU_NAME" property="menuName" />
         <result column="MENU_LEVLE" property="menuLevle" />
@@ -21,7 +21,7 @@
         ID, MENU_NAME, MENU_LEVLE, PARENT_ID, ORDER_SEQ, CREATE_TIME, UPDATE_TIME, IS_ENABLE, CREATE_USER_ID, UPDATE_USER_ID
     </sql>
 
-    <select id="selectAll" resultType="org.nafmii.admin.user.vo.MenuListVo">
+    <select id="selectAll" resultType="org.nafmii.webcenter.user.vo.MenuListVo">
         select
         ID as id,
         MENU_NAME as menuName, MENU_LEVLE as menuLevle, PARENT_ID as parentId,

nafmii-web-center/src/main/resources/mapper/CenterRoleMapper.xml

 <?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="org.nafmii.admin.user.dao.CenterRoleMapper">
+<mapper namespace="org.nafmii.webcenter.user.dao.CenterRoleMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="org.nafmii.admin.user.entity.CenterRolePO">
+    <resultMap id="BaseResultMap" type="org.nafmii.webcenter.user.entity.CenterRolePO">
         <id column="ID" property="id" />
         <result column="R_NAME" property="rName" />
         <result column="CREAT_TIME" property="creatTime" />
@@ -24,7 +24,7 @@
         from CENTER_ROLE
         where IS_ENABLE = 0 and DEL_FLAG = 0
     </select>
-    <select id="selectByName" parameterType="org.nafmii.admin.user.dto.QueryRoleListDto" resultType="org.nafmii.admin.user.vo.RoleListVo">
+    <select id="selectByName" parameterType="org.nafmii.webcenter.user.dto.QueryRoleListDto" resultType="org.nafmii.webcenter.user.vo.RoleListVo">
         select
         ID as roleID,
         R_NAME as roleName,

nafmii-web-center/src/main/resources/mapper/CenterUserMapper.xml

 <?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="org.nafmii.admin.user.dao.CenterUserMapper">
+<mapper namespace="org.nafmii.webcenter.user.dao.CenterUserMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="org.nafmii.admin.user.entity.CenterUserPO">
+    <resultMap id="BaseResultMap" type="org.nafmii.webcenter.user.entity.CenterUserPO">
         <id column="ID" property="id" />
         <result column="LOGIN_NAME" property="loginName" />
         <result column="LOGIN_PWD" property="loginPwd" />
@@ -26,7 +26,7 @@
         ID, LOGIN_NAME, LOGIN_PWD, CN_NAME, EN_NAME, PHONE, TELPHONE, SEX, EMAIL, CREATE_USER_ID, UPDATE_USER_ID, CREATE_TIME, UPDATE_TIME, IS_ENABLE, DEL_FLAG
     </sql>
 
-    <select id="selectUserByPhone" parameterType="org.nafmii.admin.user.dto.LoginDto" resultType="org.nafmii.admin.user.vo.CenterUserVO">
+    <select id="selectUserByPhone" parameterType="org.nafmii.webcenter.user.dto.LoginDto" resultType="org.nafmii.webcenter.user.vo.CenterUserVO">
         select
             ID as id, LOGIN_NAME as loginName, LOGIN_PWD as loginPwd, CN_NAME as cnName, EN_NAME as enName, PHONE as phone,
             TELPHONE as telphone, SEX as sex, EMAIL as email, CREATE_USER_ID as createUserId, UPDATE_USER_ID as updateUserId,
@@ -40,7 +40,7 @@
             and LOGIN_PWD =#{loginPwd}
         </if>
     </select>
-    <select id="selectUserAndRole" parameterType="org.nafmii.admin.user.dto.QueryUsersDto" resultType="org.nafmii.admin.user.vo.CenterUserAndRoleVo">
+    <select id="selectUserAndRole" parameterType="org.nafmii.webcenter.user.dto.QueryUsersDto" resultType="org.nafmii.webcenter.user.vo.CenterUserAndRoleVo">
         select
         cur.ID as id,
         cu.LOGIN_NAME as loginName,
@@ -62,8 +62,8 @@
         </if>
     </select>
 
-    <select id="queryUserList" parameterType="org.nafmii.admin.user.dto.QueryUsersDto"
-            resultType="org.nafmii.admin.user.vo.CenterUserVO">
+    <select id="queryUserList" parameterType="org.nafmii.webcenter.user.dto.QueryUsersDto"
+            resultType="org.nafmii.webcenter.user.vo.CenterUserVO">
         SELECT
         <include refid="Base_Column_List" />
         FROM CENTER_USER CU

nafmii-web-center/src/main/resources/mapper/CenterUserRoleMapper.xml

 <?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="org.nafmii.admin.user.dao.CenterUserRoleMapper">
+<mapper namespace="org.nafmii.webcenter.user.dao.CenterUserRoleMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="org.nafmii.admin.user.entity.CenterUserRolePO">
+    <resultMap id="BaseResultMap" type="org.nafmii.webcenter.user.entity.CenterUserRolePO">
         <id column="ID" property="id" />
         <result column="USER_ID" property="userId" />
         <result column="ROLE_ID" property="roleId" />

nafmii-web-center/src/main/resources/mapper/CneterRoleMenuMapper.xml

 <?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="org.nafmii.admin.user.dao.CneterRoleMenuMapper">
+<mapper namespace="org.nafmii.webcenter.user.dao.CneterRoleMenuMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="org.nafmii.admin.user.entity.CneterRoleMenuPO">
+    <resultMap id="BaseResultMap" type="org.nafmii.webcenter.user.entity.CneterRoleMenuPO">
         <id column="ID" property="id" />
         <result column="ROLE_ID" property="roleId" />
         <result column="MENU_ID" property="menuId" />

nafmii-web-center/src/main/resources/mapper/ImportExcelMapper.xml

 <?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="org.nafmii.admin.att.dao.ImportExcelMapper">
+<mapper namespace="org.nafmii.webcenter.att.dao.ImportExcelMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="org.nafmii.admin.att.dto.ImportExcelDto">
+    <resultMap id="BaseResultMap" type="org.nafmii.webcenter.att.dto.ImportExcelDto">
         <result column="COLUMN1" property="column1" />
         <result column="COLUMN2" property="column2" />
         <result column="COLUMN3" property="column3" />
     </resultMap>
 
-    <insert id ="insertExcelData" parameterType="org.nafmii.admin.att.dto.ImportExcelDto" >
+    <insert id ="insertExcelData" parameterType="org.nafmii.webcenter.att.dto.ImportExcelDto" >
         insert into IMPORT_EXCEL_TEST
         (COLUMN1,COLUMN2,COLUMN3)
         values(#{data.column1},