upd: 编码规范
This commit is contained in:
@@ -7,5 +7,4 @@ import org.apache.ibatis.annotations.Mapper;
|
|||||||
|
|
||||||
@Mapper
|
@Mapper
|
||||||
public interface EmailConfigMapper extends BaseMapper<EmailConfig> {
|
public interface EmailConfigMapper extends BaseMapper<EmailConfig> {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,6 +12,6 @@ import java.util.List;
|
|||||||
|
|
||||||
@Mapper
|
@Mapper
|
||||||
public interface LocalStorageMapper extends BaseMapper<LocalStorage> {
|
public interface LocalStorageMapper extends BaseMapper<LocalStorage> {
|
||||||
IPage<LocalStorage> selectByPage(@Param("criteria") LocalStorageQueryCriteria criteria, Page<Object> page);
|
IPage<LocalStorage> findLocalStorage(@Param("criteria") LocalStorageQueryCriteria criteria, Page<Object> page);
|
||||||
List<LocalStorage> selectByPage(@Param("criteria") LocalStorageQueryCriteria criteria);
|
List<LocalStorage> findLocalStorage(@Param("criteria") LocalStorageQueryCriteria criteria);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,5 +7,4 @@ import org.apache.ibatis.annotations.Mapper;
|
|||||||
|
|
||||||
@Mapper
|
@Mapper
|
||||||
public interface QiniuConfigMapper extends BaseMapper<QiniuConfig> {
|
public interface QiniuConfigMapper extends BaseMapper<QiniuConfig> {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,10 +13,7 @@ import java.util.List;
|
|||||||
|
|
||||||
@Mapper
|
@Mapper
|
||||||
public interface QiniuContentMapper extends BaseMapper<QiniuContent> {
|
public interface QiniuContentMapper extends BaseMapper<QiniuContent> {
|
||||||
|
QiniuContent findQiniuContentByName(@Param("name") String name);
|
||||||
QiniuContent selectByName(@Param("name") String name);
|
IPage<QiniuContent> findQiniuContent(@Param("criteria") QiniuQueryCriteria criteria, Page<Object> page);
|
||||||
|
List<QiniuContent> findQiniuContent(@Param("criteria") QiniuQueryCriteria criteria);
|
||||||
IPage<QiniuContent> selectByPage(@Param("criteria") QiniuQueryCriteria criteria, Page<Object> page);
|
|
||||||
|
|
||||||
List<QiniuContent> selectByPage(QiniuQueryCriteria criteria);
|
|
||||||
}
|
}
|
||||||
+2
-2
@@ -36,12 +36,12 @@ public class LocalStorageServiceImpl extends ServiceImpl<LocalStorageMapper, Loc
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PageResult<LocalStorage> queryAll(LocalStorageQueryCriteria criteria, Page<Object> page) {
|
public PageResult<LocalStorage> queryAll(LocalStorageQueryCriteria criteria, Page<Object> page) {
|
||||||
return PageUtil.toPage(localStorageMapper.selectByPage(criteria, page));
|
return PageUtil.toPage(localStorageMapper.findLocalStorage(criteria, page));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<LocalStorage> queryAll(LocalStorageQueryCriteria criteria) {
|
public List<LocalStorage> queryAll(LocalStorageQueryCriteria criteria) {
|
||||||
return localStorageMapper.selectByPage(criteria);
|
return localStorageMapper.findLocalStorage(criteria);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+5
-5
@@ -47,12 +47,12 @@ public class QiniuContentServiceImpl extends ServiceImpl<QiniuContentMapper, Qin
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PageResult<QiniuContent> queryAll(QiniuQueryCriteria criteria, Page<Object> page) {
|
public PageResult<QiniuContent> queryAll(QiniuQueryCriteria criteria, Page<Object> page) {
|
||||||
return PageUtil.toPage(qiniuContentMapper.selectByPage(criteria, page));
|
return PageUtil.toPage(qiniuContentMapper.findQiniuContent(criteria, page));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<QiniuContent> queryAll(QiniuQueryCriteria criteria) {
|
public List<QiniuContent> queryAll(QiniuQueryCriteria criteria) {
|
||||||
return qiniuContentMapper.selectByPage(criteria);
|
return qiniuContentMapper.findQiniuContent(criteria);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -69,13 +69,13 @@ public class QiniuContentServiceImpl extends ServiceImpl<QiniuContentMapper, Qin
|
|||||||
String upToken = auth.uploadToken(qiniuConfig.getBucket());
|
String upToken = auth.uploadToken(qiniuConfig.getBucket());
|
||||||
try {
|
try {
|
||||||
String key = file.getOriginalFilename();
|
String key = file.getOriginalFilename();
|
||||||
if (qiniuContentMapper.selectByName(key) != null) {
|
if (qiniuContentMapper.findQiniuContentByName(key) != null) {
|
||||||
key = QiNiuUtil.getKey(key);
|
key = QiNiuUtil.getKey(key);
|
||||||
}
|
}
|
||||||
Response response = uploadManager.put(file.getBytes(), key, upToken);
|
Response response = uploadManager.put(file.getBytes(), key, upToken);
|
||||||
// 解析上传成功的结果
|
// 解析上传成功的结果
|
||||||
DefaultPutRet putRet = JSON.parseObject(response.bodyString(), DefaultPutRet.class);
|
DefaultPutRet putRet = JSON.parseObject(response.bodyString(), DefaultPutRet.class);
|
||||||
QiniuContent content = qiniuContentMapper.selectByName(FileUtil.getFileNameNoEx(putRet.key));
|
QiniuContent content = qiniuContentMapper.findQiniuContentByName(FileUtil.getFileNameNoEx(putRet.key));
|
||||||
if (content == null) {
|
if (content == null) {
|
||||||
// 存入数据库
|
// 存入数据库
|
||||||
QiniuContent qiniuContent = new QiniuContent();
|
QiniuContent qiniuContent = new QiniuContent();
|
||||||
@@ -147,7 +147,7 @@ public class QiniuContentServiceImpl extends ServiceImpl<QiniuContentMapper, Qin
|
|||||||
QiniuContent qiniuContent;
|
QiniuContent qiniuContent;
|
||||||
FileInfo[] items = fileListIterator.next();
|
FileInfo[] items = fileListIterator.next();
|
||||||
for (FileInfo item : items) {
|
for (FileInfo item : items) {
|
||||||
if (qiniuContentMapper.selectByName(FileUtil.getFileNameNoEx(item.key)) == null) {
|
if (qiniuContentMapper.findQiniuContentByName(FileUtil.getFileNameNoEx(item.key)) == null) {
|
||||||
qiniuContent = new QiniuContent();
|
qiniuContent = new QiniuContent();
|
||||||
qiniuContent.setSize(FileUtil.getSize(Integer.parseInt(String.valueOf(item.fsize))));
|
qiniuContent.setSize(FileUtil.getSize(Integer.parseInt(String.valueOf(item.fsize))));
|
||||||
qiniuContent.setSuffix(FileUtil.getExtensionName(item.key));
|
qiniuContent.setSuffix(FileUtil.getExtensionName(item.key));
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
<?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" >
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||||
<mapper namespace="cn.odboy.mapper.LocalStorageMapper">
|
<mapper namespace="cn.odboy.mapper.LocalStorageMapper">
|
||||||
<select id="selectByPage" resultType="cn.odboy.model.tools.domain.LocalStorage">
|
<select id="findLocalStorage" resultType="cn.odboy.model.tools.domain.LocalStorage">
|
||||||
select
|
select
|
||||||
*
|
*
|
||||||
from tool_local_storage
|
from tool_local_storage
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
<?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" >
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||||
<mapper namespace="cn.odboy.mapper.QiniuContentMapper">
|
<mapper namespace="cn.odboy.mapper.QiniuContentMapper">
|
||||||
<select id="selectByName" resultType="cn.odboy.model.tools.domain.QiniuContent">
|
<select id="findQiniuContentByName" resultType="cn.odboy.model.tools.domain.QiniuContent">
|
||||||
SELECT *
|
SELECT *
|
||||||
FROM tool_qiniu_content
|
FROM tool_qiniu_content
|
||||||
WHERE name = #{name}
|
WHERE name = #{name}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectByPage" resultType="cn.odboy.model.tools.domain.QiniuContent">
|
<select id="findQiniuContent" resultType="cn.odboy.model.tools.domain.QiniuContent">
|
||||||
SELECT
|
SELECT
|
||||||
*
|
*
|
||||||
FROM tool_qiniu_content
|
FROM tool_qiniu_content
|
||||||
|
|||||||
Reference in New Issue
Block a user