1.更改mapper位置，为了解决小诺扫mapper时候的问题

2.将mapeer中的字段全都改为大写加下划线，为了适配小诺架子

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/resources/mapper/CommonFileMapper.xml → snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/CommonFileMapper.xml

@@ -7,17 +7,17 @@
 <mapper namespace="vip.xiaonuo.disk.mapper.CommonFileMapper">
 
     <select id="selectCommonFileUser" parameterType="java.lang.Long" resultType="vip.xiaonuo.disk.vo.commonfile.CommonFileUser">
-        SELECT c.userId, (SELECT username FROM user WHERE user.userId = c.userId) username FROM commonfile a
-        LEFT JOIN filepermission b ON a.commonFileId = b.commonFileId
-        LEFT JOIN userfile c ON c.userFileId = a.userFileId
-        WHERE b.userId = #{userId}
+        SELECT c.USER_ID, (SELECT ACCOUNT FROM SYS_USER WHERE user.ID = c.USER_ID) username FROM commonfile a
+        LEFT JOIN filepermission b ON a.COMMON_FILE_ID = b.COMMON_FILE_ID
+        LEFT JOIN userfile c ON c.USER_FILE_ID = a.USER_FILE_ID
+        WHERE b.USER_ID = #{userId}
     </select>
 
     <select id="selectCommonFileByUser" resultType="vip.xiaonuo.disk.vo.commonfile.CommonFileListVo">
         SELECT * FROM commonfile a
-        LEFT JOIN userfile b ON b.userFileId = a.userFileId
-        left join filepermission c on c.commonFileId = a.commonFileId
-        WHERE b.userId = #{userId} and c.userId = #{sessionUserId}
+        LEFT JOIN userfile b ON b.USER_FILE_ID = a.USER_FILE_ID
+        left join filepermission c on c.COMMON_FILE_ID = a.COMMON_FILE_ID
+        WHERE b.USER_ID = #{userId} and c.USER_ID = #{sessionUserId}
     </select>
 
 

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/resources/mapper/FileMapper.xml → snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/FileMapper.xml

@@ -7,8 +7,8 @@
 <mapper namespace="vip.xiaonuo.disk.mapper.FileMapper">
 
     <insert id="batchInsertFile" parameterType="java.util.List">
-        INSERT ignore INTO file (userId, fileName,timeStampName, fileUrl,
-        filePath, extendName, uploadTime, fileSize, isDir)
+        INSERT ignore INTO file (USER_ID, FILE_NAME,TIME_STAMP_NAME, FILE_URL,
+        FILE_PATH, EXTEND_NAME, UPLOAD_TIME, FILE_SIZE, IS_DIR)
         VALUES
         <foreach collection="list" item="file" index="index" separator=",">
         (#{file.userId}, #{file.fileName},#{file.timeStampName},

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/resources/mapper/FileTypeMapper.xml → snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/FileTypeMapper.xml

@@ -11,10 +11,10 @@
         <where>
             <choose>
                 <when test="fileTypeId != 5">
-                    fileTypeId = #{fileTypeId}
+                    FILE_TYPE_ID = #{fileTypeId}
                 </when>
                 <otherwise>
-                    fileTypeId not in (1,2,3,4)
+                    FILE_TYPE_ID not in (1,2,3,4)
                 </otherwise>
 
             </choose>

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/resources/mapper/NoticeMapper.xml → snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/NoticeMapper.xml

@@ -12,22 +12,22 @@
         select * from notice
         <where>
             <if test="noticeListDTO.platform != null and noticeListDTO.platform != ''">
-                and platform = #{noticeListDTO.platform}
+                and PLATFORM = #{noticeListDTO.platform}
             </if>
             <if test="noticeListDTO.publisher != null and noticeListDTO.publisher != ''">
-                and publisher = #{noticeListDTO.publisher}
+                and PUBLISHER = #{noticeListDTO.publisher}
             </if>
             <if test="noticeListDTO.beginTime != null and noticeListDTO.beginTime != ''">
-                and createTime &gt;= #{noticeListDTO.beginTime}
+                and CREATE_TIME &gt;= #{noticeListDTO.beginTime}
             </if>
             <if test="noticeListDTO.endTime != null and noticeListDTO.endTime != ''">
-                and createTime &lt;= #{noticeListDTO.endTime}
+                and CREATE_TIME &lt;= #{noticeListDTO.endTime}
             </if>
             <if test="noticeListDTO.title != null and noticeListDTO.title != ''">
-                and title like '%${noticeListDTO.title}%'
+                and TITLE like '%${noticeListDTO.title}%'
             </if>
         </where>
-        order by createTime desc
+        order by CREATE_TIME desc
     </select>
 
 </mapper>

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/resources/mapper/RecoveryFileMapper.xml → snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/RecoveryFileMapper.xml

@@ -8,8 +8,8 @@
 
     <select id="selectRecoveryFileList" resultType="vip.xiaonuo.disk.vo.file.RecoveryFileListVo">
         SELECT * FROM recoveryfile a
-        LEFT JOIN userfile b ON a.userFileId = b.userFileId
-        left join file c on c.fileId = b.fileId
-        WHERE userId = #{userId}
+        LEFT JOIN userfile b ON a.USER_FILE_ID = b.USER_FILE_ID
+        left join file c on c.FILE_ID = b.FILE_ID
+        WHERE USER_ID = #{userId}
     </select>
 </mapper>

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/resources/mapper/ShareFileMapper.xml → snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/ShareFileMapper.xml

@@ -8,11 +8,11 @@
 
     <select id="selectShareFileList" resultType="vip.xiaonuo.disk.vo.share.ShareFileListVO">
         select * from sharefile a
-        LEFT JOIN share ON share.shareBatchNum = a.shareBatchNum
-        left join userfile b on b.userFileId = a.userFileId
-        left join file c on c.fileId = b.fileId
-        where a.shareBatchNum = #{shareBatchNum}
-        and a.shareFilePath = #{shareFilePath}
+        LEFT JOIN share ON share.SHARE_BATCH_NUM = a.SHARE_BATCH_NUM
+        left join userfile b on b.USER_FILE_ID = a.USER_FILE_ID
+        left join file c on c.FILE_ID = b.FILE_ID
+        where a.SHARE_BATCH_NUM = #{shareBatchNum}
+        and a.SHARE_FILE_PATH = #{shareFilePath}
     </select>
 
 

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/resources/mapper/ShareMapper.xml → snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/ShareMapper.xml

@@ -8,28 +8,28 @@
 
     <select id="selectShareList" resultType="vip.xiaonuo.disk.vo.share.ShareListVO">
         SELECT * FROM share a
-        LEFT JOIN sharefile b ON b.shareBatchNum = a.shareBatchNum
-        LEFT JOIN userfile c ON c.userFileId = b.userFileId
-        LEFT JOIN file d ON d.fileId = c.fileId
-        WHERE shareFilePath = #{shareFilePath}
+        LEFT JOIN sharefile b ON b.SHARE_BATCH_NUM = a.SHARE_BATCH_NUM
+        LEFT JOIN userfile c ON c.USER_FILE_ID = b.USER_FILE_ID
+        LEFT JOIN file d ON d.FILE_ID = c.FILE_ID
+        WHERE SHARE_FILE_PATH = #{shareFilePath}
         <if test="shareBatchNum != null">
-            AND a.shareBatchNum = #{shareBatchNum}
+            AND a.SHARE_BATCH_NUM = #{shareBatchNum}
         </if>
-        AND c.userId = #{userId}
-        order BY shareTime desc
+        AND c.USER_ID = #{userId}
+        order BY SHARE_TIME desc
         limit #{beginCount}, #{pageCount}
     </select>
 
     <select id="selectShareListTotalCount" resultType="java.lang.Integer">
         SELECT count(*) FROM share a
-        LEFT JOIN sharefile b ON b.shareBatchNum = a.shareBatchNum
-        LEFT JOIN userfile c ON c.userFileId = b.userFileId
-        LEFT JOIN file d ON d.fileId = c.fileId
+        LEFT JOIN sharefile b ON b.SHARE_BATCH_NUM = a.SHARE_BATCH_NUM
+        LEFT JOIN userfile c ON c.USER_FILE_ID = b.USER_FILE_ID
+        LEFT JOIN file d ON d.FILE_ID = c.FILE_ID
         WHERE shareFilePath = #{shareFilePath}
         <if test="shareBatchNum != null">
-            AND a.shareBatchNum = #{shareBatchNum}
+            AND a.SHARE_BATCH_NUM = #{shareBatchNum}
         </if>
-        AND c.userId = #{userId}
+        AND c.USER_ID = #{userId}
     </select>
 
 

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/resources/mapper/UploadTaskDetailMapper.xml → snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/UploadTaskDetailMapper.xml

@@ -6,9 +6,9 @@
 
 <mapper namespace="vip.xiaonuo.disk.mapper.UploadTaskDetailMapper">
     <select id="selectUploadedChunkNumList" parameterType="java.lang.String" resultType="java.lang.Integer">
-        select chunkNumber from uploadtaskdetail
-        where identifier = #{identifier}
-        order by chunkNumber asc
+        select CHUNK_NUMBER from uploadtaskdetail
+        where IDENTIFIER = #{identifier}
+        order by CHUNK_NUMBER asc
     </select>
 
 </mapper>

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/resources/mapper/UserFileMapper.xml → snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/UserFileMapper.xml

@@ -8,49 +8,49 @@
 
     <select id="selectPageVo" parameterType="vip.xiaonuo.disk.domain.UserFile" resultType="vip.xiaonuo.disk.vo.file.FileListVO">
         select * from userfile a
-        left join image on a.fileId = image.fileId
-        left join file on file.fileId = a.fileId
+        left join image on a.FILE_ID = image.FILE_ID
+        left join file on file.FILE_ID = a.FILE_ID
         <where>
             <if test="fileTypeId != null">
                 <choose>
                     <when test="fileTypeId != 5">
-                        extendName in (select fileExtendName from fileclassification where fileTypeId = #{fileTypeId})
+                        EXTEND_NAME in (select FILE_EXTEND_NAME from fileclassification where FILE_TYPE_ID = #{fileTypeId})
                     </when>
                     <otherwise>
-                        extendName not in (select fileExtendName from fileclassification where fileTypeId in (1, 2, 3, 4))
+                        EXTEND_NAME not in (select FILE_EXTEND_NAME from fileclassification where FILE_TYPE_ID in (1, 2, 3, 4))
                     </otherwise>
                 </choose>
-                and a.isDir = 0
+                and a.IS_DIR = 0
             </if>
             <if test="userFile.userId != null">
-                and a.userId = #{userFile.userId}
+                and a.USER_ID = #{userFile.userId}
             </if>
             <if test="userFile.filePath != null">
-                and a.filePath = #{userFile.filePath}
+                and a.FILE_PATH = #{userFile.filePath}
             </if>
             <if test="userFile.extendName != null">
-                and a.extendName = #{userFile.extendName}
+                and a.EXTEND_NAME = #{userFile.extendName}
             </if>
             <if test="userFile.userFileId != null">
-                and a.userFileId = #{userFile.userFileId}
+                and a.USER_FILE_ID = #{userFile.userFileId}
             </if>
             <if test="userFile.fileName != null">
-                and a.fileName = #{userFile.fileName}
+                and a.FILE_NAME = #{userFile.fileName}
             </if>
-            and a.deleteFlag = 0
+            and a.DELETE_FLAG = 0
         </where>
-        ORDER BY isDir desc
+        ORDER BY IS_DIR desc
     </select>
 
     <select id="selectUserFileByLikeRightFilePath" resultType="vip.xiaonuo.disk.domain.UserFile">
         select * from userfile
-        where (filePath = #{filePath} or filePath like concat(#{filePath},'/%')) and userId = #{userId} and deleteFlag = 0
+        where (FILE_PATH = #{filePath} or FILE_PATH like concat(#{filePath},'/%')) and USER_ID = #{userId} and DELETE_FLAG = 0
     </select>
 
     <select id="selectStorageSizeByUserId" resultType="java.lang.Long" parameterType="java.lang.String">
-        SELECT SUM(fileSize) FROM userfile
-        LEFT JOIN file ON file.fileId = userfile.fileId
-        WHERE userfile.userId = #{userId}
+        SELECT SUM(FILE_SIZE) FROM userfile
+        LEFT JOIN file ON file.FILE_ID = userfile.FILE_ID
+        WHERE userfile.USER_ID = #{userId}
     </select>
 
 </mapper>

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/resources/mapper/UserMapper.xml → snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/UserMapper.xml

@@ -7,34 +7,34 @@
 <mapper namespace="vip.xiaonuo.disk.mapper.UserMapper">
 
     <insert id="insertUser" parameterType="vip.xiaonuo.disk.domain.user.UserBean" useGeneratedKeys="true" keyProperty="userId">
-        INSERT INTO user (userId, username, salt, PASSWORD,  telephone, sex, imageUrl, registerTime, available)
+        INSERT INTO user (USER_ID, USERNAME, SALT, PASSWORD,  TELEPHONE, SEX, IMAGE_URL, REGISTER_TIME, AVAILABLE)
         VALUES (#{userId}, #{username},#{salt}, #{password}, #{telephone}, #{sex}, #{imageUrl}, #{registerTime}, 1);
     </insert>
 
     <insert id="insertUserRole">
-        INSERT INTO user_role (userId, roleId)
+        INSERT INTO user_role (USER_ID, ROLE_ID)
         VALUES (#{userId}, #{roleId});
     </insert>
 
     <select id="selectRoleListByUserId" resultType="vip.xiaonuo.disk.domain.user.Role">
         select b.*
         from user_role a
-        left join role b on b.roleId = a.roleId
-        where userId = #{userId}
+        left join role b on b.ROLE_ID = a.ROLE_ID
+        where USER_ID = #{userId}
     </select>
 
     <select id="selectSaltByTelephone" parameterType="java.lang.String" resultType="java.lang.String">
-        SELECT salt
+        SELECT SALT
         FROM user
-        where telephone = #{telephone}
+        where TELEPHONE = #{telephone}
     </select>
 
     <select id="selectUserByTelephoneAndPassword" parameterType="java.lang.String"
             resultType="vip.xiaonuo.disk.domain.user.UserBean">
-        select userId
+        select USER_ID
         from user
-        where telephone = #{telephone}
-        AND password = #{password}
+        where TELEPHONE = #{telephone}
+        AND PASSWORD = #{password}
     </select>
 
 </mapper>