yeyinlaoying/neutrino-proxy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

分页接口改造

Browse Source
This commit is contained in:
aoshiguchen
2023-03-11 17:13:58 +08:00
parent 0fcc4c96ac
commit 28625f193c
85 changed files with 995 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_solon_plugin/orika-solon-plugin/pom.xml
+30
View File
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.noear</groupId>
<artifactId>solon-parent</artifactId>
<version>2.2.1</version>
</parent>
<groupId>fun.asgc</groupId>
<artifactId>orika-solon-plugin</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.noear</groupId>
<artifactId>solon</artifactId>
</dependency>
<!--orika-->
<dependency>
<groupId>ma.glasnost.orika</groupId>
<artifactId>orika-core</artifactId>
<version>1.5.4</version>
</dependency>
</dependencies>
</project>
_solon_plugin/orika-solon-plugin/src/main/java/fun/asgc/solon/extend/orika/OrikaConfiguration.java
+19
View File
@@ -0,0 +1,19 @@
package fun.asgc.solon.extend.orika;
import ma.glasnost.orika.MapperFacade;
import ma.glasnost.orika.MapperFactory;
import org.noear.solon.annotation.Bean;
import org.noear.solon.annotation.Configuration;
import org.noear.solon.annotation.Inject;
/**
* @author: aoshiguchen
* @date: 2023/3/11
*/
@Configuration
public class OrikaConfiguration {
@Bean
public MapperFacade mapperFacade(@Inject MapperFactory factory) {
return factory.getMapperFacade();
}
}
_solon_plugin/orika-solon-plugin/src/main/java/fun/asgc/solon/extend/orika/XPluginImp.java
+33
View File
@@ -0,0 +1,33 @@
package fun.asgc.solon.extend.orika;
import ma.glasnost.orika.CustomConverter;
import ma.glasnost.orika.Mapper;
import ma.glasnost.orika.MapperFactory;
import ma.glasnost.orika.impl.DefaultMapperFactory;
import ma.glasnost.orika.metadata.ClassMapBuilder;
import org.noear.solon.core.AopContext;
import org.noear.solon.core.Plugin;
/**
* @author: aoshiguchen
* @date: 2023/3/11
*/
public class XPluginImp implements Plugin {
@Override
public void start(AopContext context) throws Throwable {
DefaultMapperFactory factory = new DefaultMapperFactory.Builder().build();
context.subWrapsOfType(CustomConverter.class, bw -> {
factory.getConverterFactory().registerConverter(bw.raw());
});
context.subWrapsOfType(Mapper.class, bw -> {
factory.registerMapper(bw.raw());
});
context.subWrapsOfType(ClassMapBuilder.class, bw -> {
factory.registerClassMap((ClassMapBuilder<? extends Object, ? extends Object>) bw.raw());
});
context.wrapAndPut(MapperFactory.class, factory);
context.beanScan("fun.asgc.solon.extend.orika");
}
}
_solon_plugin/orika-solon-plugin/src/main/java/fun/asgc/solon/extend/orika/package-info.java
View File
_solon_plugin/orika-solon-plugin/src/main/resources/META-INF/solon/fun.asgc.solon.extend.orika.properties
+2
View File
@@ -0,0 +1,2 @@
solon.plugin=fun.asgc.solon.extend.orika.XPluginImp
solon.plugin.priority=1
neutrino-core/src/main/java/fun/asgc/neutrino/core/db/mapper/SqlMapperInterceptor.java
+7 -7
View File
@@ -26,7 +26,7 @@ import fun.asgc.neutrino.core.annotation.NonIntercept;
import fun.asgc.neutrino.core.annotation.Param;
import fun.asgc.neutrino.core.aop.Invocation;
import fun.asgc.neutrino.core.aop.interceptor.Interceptor;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageInfo;
import fun.asgc.neutrino.core.db.template.JdbcTemplate;
import fun.asgc.neutrino.core.util.*;
@@ -66,14 +66,14 @@ public class SqlMapperInterceptor implements Interceptor {
res = jdbcTemplate.queryForListByMap(resultComponentType, sql, (Map)params);
}
} else {
if (Page.class.isAssignableFrom(inv.getTargetMethod().getParameters()[0].getType())) {
if (PageInfo.class.isAssignableFrom(inv.getTargetMethod().getParameters()[0].getType())) {
// 分页查询 TODO 此处暂时临时处理，假设后面的参数是一个DO对象
Page page = (Page) inv.getArgs()[0];
int offset = (page.getCurrentPage() - 1) * page.getPageSize();
PageInfo pageInfo = (PageInfo) inv.getArgs()[0];
int offset = (pageInfo.getCurrent() - 1) * pageInfo.getSize();
long total = jdbcTemplate.queryForLongByModel(String.format("select count(1) from (%s) T", sql), inv.getArgs()[1]);
List resultList = jdbcTemplate.queryForListByModel(resultComponentType, String.format("%s limit %s,%s", sql, offset, page.getPageSize()), inv.getArgs()[1]);
page.setTotal(total);
page.setRecords(resultList);
List resultList = jdbcTemplate.queryForListByModel(resultComponentType, String.format("%s limit %s,%s", sql, offset, pageInfo.getSize()), inv.getArgs()[1]);
pageInfo.setTotal(total);
pageInfo.setRecords(resultList);
} else {
Object params = getParams(inv);
if (null == params || params.getClass().isArray()) {
neutrino-core/src/main/java/fun/asgc/neutrino/core/db/page/PageInfo.java
+123
View File
@@ -0,0 +1,123 @@
/**
* Copyright (c) 2022 aoshiguchen
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package fun.asgc.neutrino.core.db.page;
import lombok.Data;
import java.io.Serializable;
import java.util.Collections;
import java.util.List;
/**
*
* @author: aoshiguchen
* @date: 2022/8/6
*/
@Data
public class PageInfo<T> implements Serializable {
private static final long serialVersionUID = 8545996863226528797L;
private List<T> records;
private Long total;
private Integer size;
private Integer current;
public PageInfo() {
this.records = Collections.emptyList();
this.total = 0L;
this.size = 10;
this.current = 1;
}
public PageInfo(Integer current, Integer size) {
this(current, size, 0L);
}
public PageInfo(Integer current, Integer size, Long total) {
this.records = Collections.emptyList();
this.total = 0L;
this.size = 10;
this.current = 1;
if ((long)current > 1L) {
this.current = current;
}
this.size = size;
this.total = total;
}
public Long getPages() {
if ((long)this.getSize() == 0L) {
return 0L;
} else {
Long pages = this.getTotal() / (long)this.getSize();
if (this.getTotal() % (long)this.getSize() != 0L) {
pages = pages + 1L;
}
return pages;
}
}
public Long getTotal() {
return this.total;
}
public Integer getSize() {
return this.size;
}
public boolean hasPrevious() {
return (long)this.current > 1L;
}
public boolean hasNext() {
return (long)this.current < this.getPages();
}
public List<T> getRecords() {
return this.records;
}
public PageInfo<T> setRecords(List<T> records) {
this.records = records;
return this;
}
public PageInfo<T> setTotal(Long total) {
this.total = total;
return this;
}
public PageInfo<T> setSize(Integer size) {
this.size = size;
return this;
}
public Integer getCurrent() {
return this.current;
}
public PageInfo<T> setCurrent(Integer current) {
this.current = current;
return this;
}
}
neutrino-core/src/main/java/fun/asgc/neutrino/core/db/page/PageQuery.java
+8 -19
View File
@@ -21,34 +21,23 @@
*/
package fun.asgc.neutrino.core.db.page;
import lombok.Data;
import java.io.Serializable;
/**
*
* @author: aoshiguchen
* @date: 2022/8/6
*/
public class PageQuery {
@Data
public class PageQuery implements Serializable {
/**
* 当前页
*/
private int currentPage = 1;
private int current = 1;
/**
* 分页大小
*/
private int pageSize = 10;
public int getCurrentPage() {
return currentPage;
}
public void setCurrentPage(int currentPage) {
this.currentPage = currentPage;
}
public int getPageSize() {
return pageSize;
}
public void setPageSize(int pageSize) {
this.pageSize = pageSize;
}
private int size = 10;
}
neutrino-proxy-admin/README.md
+2 -2
View File
@@ -62,7 +62,7 @@ You need to install [node](http://nodejs.org/) and [git](https://git-scm.com/) l
- Dynamic breadcrumb
- I18n
- Customizable theme
- Tags-view(Tab page Support right-click operation)
- Tags-view(Tab pageInfo Support right-click operation)
- Rich text editor
- Markdown editor
- JSON editor
@@ -73,7 +73,7 @@ You need to install [node](http://nodejs.org/) and [git](https://git-scm.com/) l
- Mock data
- Echarts
- Clipboard
- 401/404 error page
- 401/404 error pageInfo
- Error log
- Export excel
- Export zip
neutrino-proxy-admin/src/components/FBATable/index.vue
+4 -4
View File
@@ -47,12 +47,12 @@
</el-table>
<div class="pagination-end" v-if="isPagination">
<el-pagination
:hide-on-single-page="false"
:hide-on-single-pageInfo="false"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="PaginationData.currentPage"
:page-sizes="[10, 20, 50, 100]"
:page-size="PaginationData.pageSize"
:current-pageInfo="PaginationData.currentPage"
:pageInfo-sizes="[10, 20, 50, 100]"
:pageInfo-size="PaginationData.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="PaginationData.total"
>
neutrino-proxy-admin/src/views/log/clientConnectLog.vue
+6 -6
View File
@@ -48,8 +48,8 @@
</el-table-column>
</el-table>
<div class="pagination-container">
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.currentPage"
:page-sizes="[10,20,30, 50]" :page-size="listQuery.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total">
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.currentPage"
:pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total">
</el-pagination>
</div>
@@ -124,16 +124,16 @@ export default {
})
},
handleFilter() {
this.listQuery.currentPage = 1
this.listQuery.current = 1
this.getList()
},
handleSizeChange(val) {
this.listQuery.pageSize = val
this.listQuery.currentPage = 1
this.listQuery.size = val
this.listQuery.current = 1
this.getList()
},
handleCurrentChange(val) {
this.listQuery.currentPage = val
this.listQuery.current = val
this.getList()
},
handleLookOver(row) {
neutrino-proxy-admin/src/views/log/jobLog.vue
+6 -6
View File
@@ -46,8 +46,8 @@
</el-table-column>-->
</el-table>
<div class="pagination-container">
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.currentPage"
:page-sizes="[10,20,30, 50]" :page-size="listQuery.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total">
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.currentPage"
:pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total">
</el-pagination>
</div>
@@ -148,16 +148,16 @@ export default {
})
},
handleFilter() {
this.listQuery.currentPage = 1
this.listQuery.current = 1
this.getList()
},
handleSizeChange(val) {
this.listQuery.pageSize = val
this.listQuery.currentPage = 1
this.listQuery.size = val
this.listQuery.current = 1
this.getList()
},
handleCurrentChange(val) {
this.listQuery.currentPage = val
this.listQuery.current = val
this.getList()
},
handleShowClick(row) {
neutrino-proxy-admin/src/views/log/loginLog.vue
+6 -6
View File
@@ -28,8 +28,8 @@
</el-table-column>
</el-table>
<div class="pagination-container">
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.currentPage"
:page-sizes="[10,20,30, 50]" :page-size="listQuery.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total">
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.currentPage"
:pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total">
</el-pagination>
</div>
</div>
@@ -116,16 +116,16 @@ export default {
})
},
handleFilter() {
this.listQuery.currentPage = 1
this.listQuery.current = 1
this.getList()
},
handleSizeChange(val) {
this.listQuery.pageSize = val
this.listQuery.currentPage = 1
this.listQuery.size = val
this.listQuery.current = 1
this.getList()
},
handleCurrentChange(val) {
this.listQuery.currentPage = val
this.listQuery.current = val
this.getList()
},
handleShowClick(row) {
neutrino-proxy-admin/src/views/proxy/license.vue
+5 -5
View File
@@ -60,8 +60,8 @@
</el-table>
<div class="pagination-container">
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.currentPage"
:page-sizes="[10,20,30, 50]" :page-size="listQuery.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total">
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.currentPage"
:pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total">
</el-pagination>
</div>
@@ -213,15 +213,15 @@
})
},
handleFilter() {
this.listQuery.currentPage = 1
this.listQuery.current = 1
this.getList()
},
handleSizeChange(val) {
this.listQuery.pageSize = val
this.listQuery.size = val
this.getList()
},
handleCurrentChange(val) {
this.listQuery.currentPage = val
this.listQuery.current = val
this.getList()
},
handleModifyStatus(row, enable) {
neutrino-proxy-admin/src/views/proxy/portMapping.vue
+5 -5
View File
@@ -65,8 +65,8 @@
</el-table>
<div class="pagination-container">
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.currentPage"
:page-sizes="[10,20,30, 50]" :page-size="listQuery.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total">
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.currentPage"
:pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total">
</el-pagination>
</div>
@@ -264,15 +264,15 @@
})
},
handleFilter() {
this.listQuery.currentPage = 1
this.listQuery.current = 1
this.getList()
},
handleSizeChange(val) {
this.listQuery.pageSize = val
this.listQuery.size = val
this.getList()
},
handleCurrentChange(val) {
this.listQuery.currentPage = val
this.listQuery.current = val
this.getList()
},
handleModifyStatus(row, enable) {
neutrino-proxy-admin/src/views/system/jobManager.vue
+5 -5
View File
@@ -51,8 +51,8 @@
</el-table-column>
</el-table>
<div class="pagination-container">
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.currentPage"
:page-sizes="[10,20,30, 50]" :page-size="listQuery.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total">
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.currentPage"
:pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total">
</el-pagination>
</div>
@@ -171,15 +171,15 @@
})
},
handleFilter() {
this.listQuery.currentPage = 1
this.listQuery.current = 1
this.getList()
},
handleSizeChange(val) {
this.listQuery.pageSize = val
this.listQuery.size = val
this.getList()
},
handleCurrentChange(val) {
this.listQuery.currentPage = val
this.listQuery.current = val
this.getList()
},
handleModifyStatus(row, enable) {
neutrino-proxy-admin/src/views/system/portPool.vue
+5 -5
View File
@@ -43,8 +43,8 @@
</el-table>
<div class="pagination-container">
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.currentPage"
:page-sizes="[10,20,30, 50]" :page-size="listQuery.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total">
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.currentPage"
:pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total">
</el-pagination>
</div>
@@ -173,15 +173,15 @@
})
},
handleFilter() {
this.listQuery.currentPage = 1
this.listQuery.current = 1
this.getList()
},
handleSizeChange(val) {
this.listQuery.pageSize = val
this.listQuery.size = val
this.getList()
},
handleCurrentChange(val) {
this.listQuery.currentPage = val
this.listQuery.current = val
this.getList()
},
handleModifyStatus(row, enable) {
neutrino-proxy-admin/src/views/system/user.vue
+5 -5
View File
@@ -50,8 +50,8 @@
</el-table>
<div class="pagination-container">
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.currentPage"
:page-sizes="[10,20,30, 50]" :page-size="listQuery.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total">
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.currentPage"
:pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total">
</el-pagination>
</div>
@@ -197,15 +197,15 @@
})
},
handleFilter() {
this.listQuery.currentPage = 1
this.listQuery.current = 1
this.getList()
},
handleSizeChange(val) {
this.listQuery.pageSize = val
this.listQuery.size = val
this.getList()
},
handleCurrentChange(val) {
this.listQuery.currentPage = val
this.listQuery.current = val
this.getList()
},
handleModifyStatus(row, enable) {
neutrino-proxy-server/pom.xml
+19
View File
@@ -24,6 +24,25 @@
<artifactId>mybatis-plus-solon-plugin</artifactId>
<version>2.2.1</version>
</dependency>
<dependency>
<groupId>org.noear</groupId>
<artifactId>mybatis-pagehelper-solon-plugin</artifactId>
<version>2.2.1</version>
</dependency>
<!--orika-->
<dependency>
<groupId>ma.glasnost.orika</groupId>
<artifactId>orika-core</artifactId>
<version>1.5.4</version>
</dependency>
<dependency>
<groupId>fun.asgc</groupId>
<artifactId>orika-solon-plugin</artifactId>
<version>2.2.1</version>
<scope>system</scope>
<systemPath>${project.basedir}/../_solon_plugin/orika-solon-plugin/pom.xml</systemPath>
</dependency>
<dependency>
<groupId>fun.asgc.neutrino</groupId>
<artifactId>neutrino-proxy-core</artifactId>
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/DbConfiguration.java
+25 -2
View File
@@ -1,9 +1,14 @@
package fun.asgc.neutrino.proxy.server.base.db;
import com.alibaba.druid.pool.DruidDataSource;
import com.baomidou.mybatisplus.core.MybatisConfiguration;
import com.baomidou.mybatisplus.core.MybatisSqlSessionFactoryBuilder;
import com.baomidou.mybatisplus.core.config.GlobalConfig;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import fun.asgc.neutrino.core.db.template.JdbcTemplate;
import fun.asgc.neutrino.proxy.server.base.rest.config.DbConfig;
import fun.asgc.neutrino.proxy.server.constant.DbTypeEnum;
import org.apache.ibatis.solon.annotation.Db;
import org.noear.solon.annotation.Bean;
import org.noear.solon.annotation.Configuration;
import org.noear.solon.annotation.Inject;
@@ -19,7 +24,7 @@ import javax.sql.DataSource;
@Configuration
public class DbConfiguration {
@Bean(value = "dataSource", typed = true)
@Bean(value = "db", typed = true)
public DataSource dataSource(@Inject DbConfig dbConfig) {
DbTypeEnum dbTypeEnum = DbTypeEnum.of(dbConfig.getType());
if (DbTypeEnum.SQLITE == dbTypeEnum) {
@@ -45,7 +50,25 @@ public class DbConfiguration {
}
@Bean
public JdbcTemplate jdbcTemplate(@Inject("dataSource") DataSource dataSource) {
public JdbcTemplate jdbcTemplate(@Inject("db") DataSource dataSource) {
return new JdbcTemplate(dataSource);
}
@Bean
public void db1_ext(@Db("db") GlobalConfig globalConfig) {
MetaObjectHandler metaObjectHandler = new MetaObjectHandlerImpl();
globalConfig.setMetaObjectHandler(metaObjectHandler);
}
@Bean
public void db1_ext2(@Db("db") MybatisConfiguration config){
config.getTypeHandlerRegistry().register("fun.asgc.neutrino.proxy.server.dal");
config.setDefaultEnumTypeHandler(null);
}
@Bean
public MybatisSqlSessionFactoryBuilder factoryBuilderNew(){
return new MybatisSqlSessionFactoryBuilderImpl();
}
}
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/MapperPlugin.java
+33 -35
View File
@@ -1,7 +1,5 @@
package fun.asgc.neutrino.proxy.server.base.db;
import fun.asgc.neutrino.core.aop.Aop;
import fun.asgc.neutrino.proxy.server.dal.*;
import org.noear.solon.core.AopContext;
import org.noear.solon.core.Plugin;
@@ -12,39 +10,39 @@ import org.noear.solon.core.Plugin;
public class MapperPlugin implements Plugin {
@Override
public void start(AopContext context) throws Throwable {
Aop.intercept(ClientConnectRecordMapper.class, SqlMapperInterceptor.class);
Aop.intercept(DataCleanMapper.class, SqlMapperInterceptor.class);
Aop.intercept(FlowReportDayMapper.class, SqlMapperInterceptor.class);
Aop.intercept(FlowReportHourMapper.class, SqlMapperInterceptor.class);
Aop.intercept(FlowReportMinuteMapper.class, SqlMapperInterceptor.class);
Aop.intercept(FlowReportMonthMapper.class, SqlMapperInterceptor.class);
Aop.intercept(JobInfoMapper.class, SqlMapperInterceptor.class);
Aop.intercept(JobLogMapper.class, SqlMapperInterceptor.class);
Aop.intercept(LicenseMapper.class, SqlMapperInterceptor.class);
Aop.intercept(PortMappingMapper.class, SqlMapperInterceptor.class);
Aop.intercept(PortPoolMapper.class, SqlMapperInterceptor.class);
Aop.intercept(UserConnectRecordMapper.class, SqlMapperInterceptor.class);
Aop.intercept(UserLoginRecordMapper.class, SqlMapperInterceptor.class);
Aop.intercept(UserMapper.class, SqlMapperInterceptor.class);
Aop.intercept(UserReportMapper.class, SqlMapperInterceptor.class);
Aop.intercept(UserTokenMapper.class, SqlMapperInterceptor.class);
context.wrapAndPut(ClientConnectRecordMapper.class, Aop.get(ClientConnectRecordMapper.class));
context.wrapAndPut(DataCleanMapper.class, Aop.get(DataCleanMapper.class));
context.wrapAndPut(FlowReportDayMapper.class, Aop.get(FlowReportDayMapper.class));
context.wrapAndPut(FlowReportHourMapper.class, Aop.get(FlowReportHourMapper.class));
context.wrapAndPut(FlowReportMinuteMapper.class, Aop.get(FlowReportMinuteMapper.class));
context.wrapAndPut(FlowReportMonthMapper.class, Aop.get(FlowReportMonthMapper.class));
context.wrapAndPut(JobInfoMapper.class, Aop.get(JobInfoMapper.class));
context.wrapAndPut(JobLogMapper.class, Aop.get(JobLogMapper.class));
context.wrapAndPut(LicenseMapper.class, Aop.get(LicenseMapper.class));
context.wrapAndPut(PortMappingMapper.class, Aop.get(PortMappingMapper.class));
context.wrapAndPut(PortPoolMapper.class, Aop.get(PortPoolMapper.class));
context.wrapAndPut(UserConnectRecordMapper.class, Aop.get(UserConnectRecordMapper.class));
context.wrapAndPut(UserLoginRecordMapper.class, Aop.get(UserLoginRecordMapper.class));
context.wrapAndPut(UserMapper.class, Aop.get(UserMapper.class));
context.wrapAndPut(UserReportMapper.class, Aop.get(UserReportMapper.class));
context.wrapAndPut(UserTokenMapper.class, Aop.get(UserTokenMapper.class));
// Aop.intercept(ClientConnectRecordMapper.class, SqlMapperInterceptor.class);
// Aop.intercept(DataCleanMapper.class, SqlMapperInterceptor.class);
// Aop.intercept(FlowReportDayMapper.class, SqlMapperInterceptor.class);
// Aop.intercept(FlowReportHourMapper.class, SqlMapperInterceptor.class);
// Aop.intercept(FlowReportMinuteMapper.class, SqlMapperInterceptor.class);
// Aop.intercept(FlowReportMonthMapper.class, SqlMapperInterceptor.class);
// Aop.intercept(JobInfoMapper.class, SqlMapperInterceptor.class);
// Aop.intercept(JobLogMapper.class, SqlMapperInterceptor.class);
// Aop.intercept(LicenseMapper.class, SqlMapperInterceptor.class);
// Aop.intercept(PortMappingMapper.class, SqlMapperInterceptor.class);
// Aop.intercept(PortPoolMapper.class, SqlMapperInterceptor.class);
// Aop.intercept(UserConnectRecordMapper.class, SqlMapperInterceptor.class);
// Aop.intercept(UserLoginRecordMapper.class, SqlMapperInterceptor.class);
// Aop.intercept(UserMapper.class, SqlMapperInterceptor.class);
// Aop.intercept(UserReportMapper.class, SqlMapperInterceptor.class);
// Aop.intercept(UserTokenMapper.class, SqlMapperInterceptor.class);
//
// context.wrapAndPut(ClientConnectRecordMapper.class, Aop.get(ClientConnectRecordMapper.class));
// context.wrapAndPut(DataCleanMapper.class, Aop.get(DataCleanMapper.class));
// context.wrapAndPut(FlowReportDayMapper.class, Aop.get(FlowReportDayMapper.class));
// context.wrapAndPut(FlowReportHourMapper.class, Aop.get(FlowReportHourMapper.class));
// context.wrapAndPut(FlowReportMinuteMapper.class, Aop.get(FlowReportMinuteMapper.class));
// context.wrapAndPut(FlowReportMonthMapper.class, Aop.get(FlowReportMonthMapper.class));
// context.wrapAndPut(JobInfoMapper.class, Aop.get(JobInfoMapper.class));
// context.wrapAndPut(JobLogMapper.class, Aop.get(JobLogMapper.class));
// context.wrapAndPut(LicenseMapper.class, Aop.get(LicenseMapper.class));
// context.wrapAndPut(PortMappingMapper.class, Aop.get(PortMappingMapper.class));
// context.wrapAndPut(PortPoolMapper.class, Aop.get(PortPoolMapper.class));
// context.wrapAndPut(UserConnectRecordMapper.class, Aop.get(UserConnectRecordMapper.class));
// context.wrapAndPut(UserLoginRecordMapper.class, Aop.get(UserLoginRecordMapper.class));
// context.wrapAndPut(UserMapper.class, Aop.get(UserMapper.class));
// context.wrapAndPut(UserReportMapper.class, Aop.get(UserReportMapper.class));
// context.wrapAndPut(UserTokenMapper.class, Aop.get(UserTokenMapper.class));
}
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/MetaObjectHandlerImpl.java
+20
View File
@@ -0,0 +1,20 @@
package fun.asgc.neutrino.proxy.server.base.db;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import org.apache.ibatis.reflection.MetaObject;
/**
* @author: aoshiguchen
* @date: 2023/3/10
*/
public class MetaObjectHandlerImpl implements MetaObjectHandler {
@Override
public void insertFill(MetaObject metaObject) {
}
@Override
public void updateFill(MetaObject metaObject) {
}
}
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/MybatisSqlSessionFactoryBuilderImpl.java
+11
View File
@@ -0,0 +1,11 @@
package fun.asgc.neutrino.proxy.server.base.db;
import com.baomidou.mybatisplus.core.MybatisSqlSessionFactoryBuilder;
/**
* @author: aoshiguchen
* @date: 2023/3/10
*/
public class MybatisSqlSessionFactoryBuilderImpl extends MybatisSqlSessionFactoryBuilder {
}
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/SqlMapperInterceptor.java
+7 -7
View File
@@ -27,7 +27,7 @@ import fun.asgc.neutrino.core.annotation.Param;
import fun.asgc.neutrino.core.aop.Invocation;
import fun.asgc.neutrino.core.aop.interceptor.Interceptor;
import fun.asgc.neutrino.core.db.mapper.SqlParser;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageInfo;
import fun.asgc.neutrino.core.db.template.JdbcTemplate;
import fun.asgc.neutrino.core.util.ArrayUtil;
import fun.asgc.neutrino.core.util.Assert;
@@ -71,14 +71,14 @@ public class SqlMapperInterceptor implements Interceptor {
res = jdbcTemplate.queryForListByMap(resultComponentType, sql, (Map)params);
}
} else {
if (Page.class.isAssignableFrom(inv.getTargetMethod().getParameters()[0].getType())) {
if (PageInfo.class.isAssignableFrom(inv.getTargetMethod().getParameters()[0].getType())) {
// 分页查询 TODO 此处暂时临时处理，假设后面的参数是一个DO对象
Page page = (Page) inv.getArgs()[0];
int offset = (page.getCurrentPage() - 1) * page.getPageSize();
PageInfo pageInfo = (PageInfo) inv.getArgs()[0];
int offset = (pageInfo.getCurrent() - 1) * pageInfo.getSize();
long total = jdbcTemplate.queryForLongByModel(String.format("select count(1) from (%s) T", sql), inv.getArgs()[1]);
List resultList = jdbcTemplate.queryForListByModel(resultComponentType, String.format("%s limit %s,%s", sql, offset, page.getPageSize()), inv.getArgs()[1]);
page.setTotal(total);
page.setRecords(resultList);
List resultList = jdbcTemplate.queryForListByModel(resultComponentType, String.format("%s limit %s,%s", sql, offset, pageInfo.getSize()), inv.getArgs()[1]);
pageInfo.setTotal(total);
pageInfo.setRecords(resultList);
} else {
Object params = getParams(inv);
if (null == params || params.getClass().isArray()) {
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/page/PageInfo.java
+132
View File
@@ -0,0 +1,132 @@
/**
* Copyright (c) 2022 aoshiguchen
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package fun.asgc.neutrino.proxy.server.base.page;
import lombok.Data;
import java.io.Serializable;
import java.util.Collections;
import java.util.List;
/**
*
* @author: aoshiguchen
* @date: 2022/8/6
*/
@Data
public class PageInfo<T> implements Serializable {
private static final long serialVersionUID = 8545996863226528797L;
private List<T> records;
private Long total;
private Integer size;
private Integer current;
public PageInfo() {
this.records = Collections.emptyList();
this.total = 0L;
this.size = 10;
this.current = 1;
}
public PageInfo(Integer current, Integer size) {
this(current, size, 0L);
}
public PageInfo(Integer current, Integer size, Long total) {
this.records = Collections.emptyList();
this.total = 0L;
this.size = 10;
this.current = 1;
if ((long)current > 1L) {
this.current = current;
}
this.size = size;
this.total = total;
}
public Long getPages() {
if ((long)this.getSize() == 0L) {
return 0L;
} else {
Long pages = this.getTotal() / (long)this.getSize();
if (this.getTotal() % (long)this.getSize() != 0L) {
pages = pages + 1L;
}
return pages;
}
}
public Long getTotal() {
return this.total;
}
public Integer getSize() {
return this.size;
}
public boolean hasPrevious() {
return (long)this.current > 1L;
}
public boolean hasNext() {
return (long)this.current < this.getPages();
}
public List<T> getRecords() {
return this.records;
}
public PageInfo<T> setRecords(List<T> records) {
this.records = records;
return this;
}
public PageInfo<T> setTotal(Long total) {
this.total = total;
return this;
}
public PageInfo<T> setSize(Integer size) {
this.size = size;
return this;
}
public Integer getCurrent() {
return this.current;
}
public PageInfo<T> setCurrent(Integer current) {
this.current = current;
return this;
}
public static <T> PageInfo<T> of(List<T> records, Long total, Integer current, Integer size) {
PageInfo<T> pageInfo = new PageInfo();
pageInfo.setRecords(records);
pageInfo.setTotal(total);
pageInfo.setCurrent(current);
pageInfo.setSize(size);
return pageInfo;
}
}
neutrino-core/src/main/java/fun/asgc/neutrino/core/db/page/Page.java → neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/page/PageQuery.java
+7 -14
View File
@@ -19,11 +19,11 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package fun.asgc.neutrino.core.db.page;
package fun.asgc.neutrino.proxy.server.base.page;
import lombok.Data;
import java.util.List;
import java.io.Serializable;
/**
*
@@ -31,20 +31,13 @@ import java.util.List;
* @date: 2022/8/6
*/
@Data
public class Page<T> extends PageQuery {
public class PageQuery implements Serializable {
/**
* 数据总数
* 当前页
*/
private Long total;
private int current = 1;
/**
* 结果数据
* 分页大小
*/
private List<T> records;
public static <T> Page<T> create(PageQuery pageQuery) {
Page page = new Page();
page.setPageSize(pageQuery.getPageSize());
page.setCurrentPage(pageQuery.getCurrentPage());
return page;
}
private int size = 10;
}
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/config/RestConfiguration.java
-75
View File
@@ -1,75 +0,0 @@
/**
* Copyright (c) 2022 aoshiguchen
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package fun.asgc.neutrino.proxy.server.base.rest.config;
import com.alibaba.druid.pool.DruidDataSource;
import fun.asgc.neutrino.core.db.template.JdbcTemplate;
import fun.asgc.neutrino.proxy.server.constant.DbTypeEnum;
import org.noear.solon.annotation.Bean;
import org.noear.solon.annotation.Configuration;
import org.noear.solon.annotation.Inject;
import org.sqlite.SQLiteConfig;
import org.sqlite.SQLiteDataSource;
import javax.sql.DataSource;
/**
* 系统配置
*author: aoshiguchen
* @date: 2022/8/1
*/
@Configuration
public class RestConfiguration {
@Inject
private DbConfig dbConfig;
@Bean("dataSource")
public DataSource dataSource() {
DbTypeEnum dbTypeEnum = DbTypeEnum.of(dbConfig.getType());
if (DbTypeEnum.SQLITE == dbTypeEnum) {
SQLiteDataSource dataSource = new SQLiteDataSource();
dataSource.setUrl(dbConfig.getUrl());
dataSource.setJournalMode(SQLiteConfig.JournalMode.WAL.getValue());
return dataSource;
} else if (DbTypeEnum.MYSQL == dbTypeEnum) {
DruidDataSource dataSource = new DruidDataSource();
dataSource.setDriverClassName(dbConfig.getDriverClass());
dataSource.setUrl(dbConfig.getUrl());
dataSource.setInitialSize(5);
dataSource.setMinIdle(5);
dataSource.setMaxActive(20);
dataSource.setMaxWait(60000);
dataSource.setPoolPreparedStatements(true);
dataSource.setUsername(dbConfig.getUsername());
dataSource.setPassword(dbConfig.getPassword());
return dataSource;
}
return null;
}
@Bean
public JdbcTemplate jdbcTemplate(@Inject("dataSource") DataSource dataSource) {
return new JdbcTemplate(dataSource);
}
}
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/ClientConnectRecordController.java
+3 -3
View File
@@ -21,8 +21,8 @@
*/
package fun.asgc.neutrino.proxy.server.controller;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageQuery;
import fun.asgc.neutrino.proxy.server.base.page.PageInfo;
import fun.asgc.neutrino.proxy.server.base.page.PageQuery;
import fun.asgc.neutrino.proxy.server.controller.req.ClientConnectRecordListReq;
import fun.asgc.neutrino.proxy.server.controller.res.ClientConnectRecordListRes;
import fun.asgc.neutrino.proxy.server.service.ClientConnectRecordService;
@@ -46,7 +46,7 @@ public class ClientConnectRecordController {
@Get
@Mapping("/page")
public Page<ClientConnectRecordListRes> page(PageQuery pageQuery, ClientConnectRecordListReq req) {
public PageInfo<ClientConnectRecordListRes> page(PageQuery pageQuery, ClientConnectRecordListReq req) {
ParamCheckUtil.checkNotNull(pageQuery, "pageQuery");
return clientConnectRecordService.page(pageQuery, req);
}
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobInfoController.java
+3 -3
View File
@@ -21,9 +21,9 @@
*/
package fun.asgc.neutrino.proxy.server.controller;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageQuery;
import fun.asgc.neutrino.core.web.annotation.RequestBody;
import fun.asgc.neutrino.proxy.server.base.page.PageInfo;
import fun.asgc.neutrino.proxy.server.base.page.PageQuery;
import fun.asgc.neutrino.proxy.server.base.rest.annotation.OnlyAdmin;
import fun.asgc.neutrino.proxy.server.controller.req.JobInfoExecuteReq;
import fun.asgc.neutrino.proxy.server.controller.req.JobInfoListReq;
@@ -55,7 +55,7 @@ public class JobInfoController {
@Get
@Mapping("/page")
public Page<JobInfoListRes> page(PageQuery pageQuery, JobInfoListReq req) {
public PageInfo<JobInfoListRes> page(PageQuery pageQuery, JobInfoListReq req) {
ParamCheckUtil.checkNotNull(pageQuery, "pageQuery");
return jobInfoService.page(pageQuery, req);
}
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobLogController.java
+3 -3
View File
@@ -21,8 +21,8 @@
*/
package fun.asgc.neutrino.proxy.server.controller;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageQuery;
import fun.asgc.neutrino.proxy.server.base.page.PageInfo;
import fun.asgc.neutrino.proxy.server.base.page.PageQuery;
import fun.asgc.neutrino.proxy.server.controller.req.JobLogListReq;
import fun.asgc.neutrino.proxy.server.controller.res.JobLogListRes;
import fun.asgc.neutrino.proxy.server.service.JobLogService;
@@ -47,7 +47,7 @@ public class JobLogController {
@Get
@Mapping("/page")
public Page<JobLogListRes> page(PageQuery pageQuery, JobLogListReq req) {
public PageInfo<JobLogListRes> page(PageQuery pageQuery, JobLogListReq req) {
ParamCheckUtil.checkNotNull(pageQuery, "pageQuery");
return jobLogService.page(pageQuery, req);
}
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/LicenseController.java
+3 -3
View File
@@ -21,10 +21,10 @@
*/
package fun.asgc.neutrino.proxy.server.controller;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageQuery;
import fun.asgc.neutrino.core.web.annotation.RequestBody;
import fun.asgc.neutrino.core.web.annotation.RequestParam;
import fun.asgc.neutrino.proxy.server.base.page.PageInfo;
import fun.asgc.neutrino.proxy.server.base.page.PageQuery;
import fun.asgc.neutrino.proxy.server.base.rest.annotation.OnlyAdmin;
import fun.asgc.neutrino.proxy.server.controller.req.LicenseCreateReq;
import fun.asgc.neutrino.proxy.server.controller.req.LicenseListReq;
@@ -50,7 +50,7 @@ public class LicenseController {
@Get
@Mapping("/page")
public Page<LicenseListRes> page(PageQuery pageQuery, LicenseListReq req) {
public PageInfo<LicenseListRes> page(PageQuery pageQuery, LicenseListReq req) {
ParamCheckUtil.checkNotNull(pageQuery, "pageQuery");
return licenseService.page(pageQuery, req);
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortMappingController.java
+3 -3
View File
@@ -22,10 +22,10 @@
package fun.asgc.neutrino.proxy.server.controller;
import fun.asgc.neutrino.core.annotation.NonIntercept;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageQuery;
import fun.asgc.neutrino.core.web.annotation.RequestBody;
import fun.asgc.neutrino.core.web.annotation.RequestParam;
import fun.asgc.neutrino.proxy.server.base.page.PageInfo;
import fun.asgc.neutrino.proxy.server.base.page.PageQuery;
import fun.asgc.neutrino.proxy.server.controller.req.PortMappingCreateReq;
import fun.asgc.neutrino.proxy.server.controller.req.PortMappingListReq;
import fun.asgc.neutrino.proxy.server.controller.req.PortMappingUpdateEnableStatusReq;
@@ -49,7 +49,7 @@ public class PortMappingController {
@Get
@Mapping("/page")
public Page<PortMappingListRes> page(PageQuery pageQuery, PortMappingListReq req) {
public PageInfo<PortMappingListRes> page(PageQuery pageQuery, PortMappingListReq req) {
ParamCheckUtil.checkNotNull(pageQuery, "pageQuery");
return portMappingService.page(pageQuery, req);
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortPoolController.java
+3 -3
View File
@@ -21,10 +21,10 @@
*/
package fun.asgc.neutrino.proxy.server.controller;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageQuery;
import fun.asgc.neutrino.core.web.annotation.RequestBody;
import fun.asgc.neutrino.core.web.annotation.RequestParam;
import fun.asgc.neutrino.proxy.server.base.page.PageInfo;
import fun.asgc.neutrino.proxy.server.base.page.PageQuery;
import fun.asgc.neutrino.proxy.server.base.rest.annotation.OnlyAdmin;
import fun.asgc.neutrino.proxy.server.controller.req.PortPoolCreateReq;
import fun.asgc.neutrino.proxy.server.controller.req.PortPoolListReq;
@@ -51,7 +51,7 @@ public class PortPoolController {
@Get
@Mapping("/page")
public Page<PortPoolListRes> page(PageQuery pageQuery, PortPoolListReq req) {
public PageInfo<PortPoolListRes> page(PageQuery pageQuery, PortPoolListReq req) {
ParamCheckUtil.checkNotNull(pageQuery, "pageQuery");
return portPoolService.page(pageQuery, req);
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/ReportController.java
+3 -3
View File
@@ -21,7 +21,7 @@
*/
package fun.asgc.neutrino.proxy.server.controller;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageInfo;
import fun.asgc.neutrino.core.db.page.PageQuery;
import fun.asgc.neutrino.proxy.server.controller.req.LicenseFlowReportReq;
import fun.asgc.neutrino.proxy.server.controller.req.UserFlowReportReq;
@@ -79,7 +79,7 @@ public class ReportController {
*/
@Get
@Mapping("/user/flow-report/page")
public Page<UserFlowReportRes> userFlowReportPage(PageQuery pageQuery, UserFlowReportReq req) {
public PageInfo<UserFlowReportRes> userFlowReportPage(PageQuery pageQuery, UserFlowReportReq req) {
ParamCheckUtil.checkNotNull(pageQuery, "pageQuery");
return reportService.userFlowReportPage(pageQuery, req);
@@ -93,7 +93,7 @@ public class ReportController {
*/
@Get
@Mapping("/license/flow-report/page")
public Page<LicenseFlowReportRes> licenseFlowReportPage(PageQuery pageQuery, LicenseFlowReportReq req) {
public PageInfo<LicenseFlowReportRes> licenseFlowReportPage(PageQuery pageQuery, LicenseFlowReportReq req) {
ParamCheckUtil.checkNotNull(pageQuery, "pageQuery");
return reportService.licenseFlowReportPage(pageQuery, req);
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/UserController.java
+3 -3
View File
@@ -21,10 +21,10 @@
*/
package fun.asgc.neutrino.proxy.server.controller;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageQuery;
import fun.asgc.neutrino.core.web.annotation.RequestBody;
import fun.asgc.neutrino.core.web.annotation.RequestParam;
import fun.asgc.neutrino.proxy.server.base.page.PageInfo;
import fun.asgc.neutrino.proxy.server.base.page.PageQuery;
import fun.asgc.neutrino.proxy.server.base.rest.SystemContextHolder;
import fun.asgc.neutrino.proxy.server.base.rest.annotation.OnlyAdmin;
import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant;
@@ -54,7 +54,7 @@ public class UserController {
@Get
@Mapping("/page")
public Page<UserListRes> page(PageQuery pageQuery, UserListReq req) {
public PageInfo<UserListRes> page(PageQuery pageQuery, UserListReq req) {
ParamCheckUtil.checkNotNull(pageQuery, "pageQuery");
return userService.page(pageQuery, req);
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/UserLoginRecordController.java
+3 -3
View File
@@ -21,8 +21,8 @@
*/
package fun.asgc.neutrino.proxy.server.controller;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageQuery;
import fun.asgc.neutrino.proxy.server.base.page.PageInfo;
import fun.asgc.neutrino.proxy.server.base.page.PageQuery;
import fun.asgc.neutrino.proxy.server.controller.req.UserLoginRecordListReq;
import fun.asgc.neutrino.proxy.server.controller.res.UserLoginRecordListRes;
import fun.asgc.neutrino.proxy.server.service.UserLoginRecordService;
@@ -44,7 +44,7 @@ public class UserLoginRecordController {
@Get
@Mapping("/page")
public Page<UserLoginRecordListRes> page(PageQuery pageQuery, UserLoginRecordListReq req) {
public PageInfo<UserLoginRecordListRes> page(PageQuery pageQuery, UserLoginRecordListReq req) {
ParamCheckUtil.checkNotNull(pageQuery, "pageQuery");
return userLoginRecordService.page(pageQuery, req);
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/ClientConnectRecordMapper.java
+6 -3
View File
@@ -1,21 +1,24 @@
package fun.asgc.neutrino.proxy.server.dal;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import fun.asgc.neutrino.core.db.annotation.ResultType;
import fun.asgc.neutrino.core.db.annotation.Select;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageInfo;
import fun.asgc.neutrino.proxy.server.controller.req.ClientConnectRecordListReq;
import fun.asgc.neutrino.proxy.server.controller.res.ClientConnectRecordListRes;
import fun.asgc.neutrino.proxy.server.dal.entity.ClientConnectRecordDO;
import org.apache.ibatis.annotations.Mapper;
/**
* @author: aoshiguchen
* @date: 2022/11/23
*/
public interface ClientConnectRecordMapper {
@Mapper
public interface ClientConnectRecordMapper extends BaseMapper<ClientConnectRecordDO> {
void add(ClientConnectRecordDO clientConnectRecordDO);
@ResultType(ClientConnectRecordListRes.class)
@Select("select * from client_connect_record order by id desc")
void page(Page page, ClientConnectRecordListReq req);
void page(PageInfo pageInfo, ClientConnectRecordListReq req);
}
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportDayMapper.java
+4 -3
View File
@@ -21,19 +21,20 @@
*/
package fun.asgc.neutrino.proxy.server.dal;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import fun.asgc.neutrino.core.annotation.Param;
import fun.asgc.neutrino.core.db.annotation.Delete;
import fun.asgc.neutrino.core.db.annotation.Insert;
import fun.asgc.neutrino.core.db.annotation.ResultType;
import fun.asgc.neutrino.core.db.annotation.Select;
import fun.asgc.neutrino.core.db.mapper.SqlMapper;
import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportDayDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.Date;
import java.util.List;
public interface FlowReportDayMapper {
@Mapper
public interface FlowReportDayMapper extends BaseMapper<FlowReportDayDO> {
@Select("select * from flow_report_day where license_id = :licenseId and date_str = :dateStr")
FlowReportDayDO findOne(@Param("licenseId") Integer licenseId, @Param("dateStr") String dateStr);
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportHourMapper.java
+4 -2
View File
@@ -21,18 +21,20 @@
*/
package fun.asgc.neutrino.proxy.server.dal;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import fun.asgc.neutrino.core.annotation.Param;
import fun.asgc.neutrino.core.db.annotation.Delete;
import fun.asgc.neutrino.core.db.annotation.Insert;
import fun.asgc.neutrino.core.db.annotation.ResultType;
import fun.asgc.neutrino.core.db.annotation.Select;
import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportHourDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.Date;
import java.util.List;
public interface FlowReportHourMapper {
@Mapper
public interface FlowReportHourMapper extends BaseMapper<FlowReportHourDO> {
@Select("select * from flow_report_hour where license_id = :licenseId and date_str = :dateStr")
FlowReportHourDO findOne(@Param("licenseId") Integer licenseId, @Param("dateStr") String dateStr);
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMinuteMapper.java
+4 -2
View File
@@ -21,18 +21,20 @@
*/
package fun.asgc.neutrino.proxy.server.dal;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import fun.asgc.neutrino.core.annotation.Param;
import fun.asgc.neutrino.core.db.annotation.Insert;
import fun.asgc.neutrino.core.db.annotation.ResultType;
import fun.asgc.neutrino.core.db.annotation.Select;
import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportMinuteDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.Date;
import java.util.List;
import java.util.Set;
public interface FlowReportMinuteMapper {
@Mapper
public interface FlowReportMinuteMapper extends BaseMapper<FlowReportMinuteDO> {
@Select("select * from flow_report_minute where license_id = :licenseId and date = :date")
FlowReportMinuteDO findOne(@Param("licenseId") Integer licenseId, @Param("date") String date);
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMonthMapper.java
+4 -2
View File
@@ -21,14 +21,16 @@
*/
package fun.asgc.neutrino.proxy.server.dal;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import fun.asgc.neutrino.core.annotation.Param;
import fun.asgc.neutrino.core.db.annotation.Delete;
import fun.asgc.neutrino.core.db.annotation.Insert;
import fun.asgc.neutrino.core.db.annotation.Select;
import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportMonthDO;
import org.apache.ibatis.annotations.Mapper;
public interface FlowReportMonthMapper {
@Mapper
public interface FlowReportMonthMapper extends BaseMapper<FlowReportMonthDO> {
@Select("select * from flow_report_month where license_id = :licenseId and date_str = :dateStr")
FlowReportMonthDO findOne(@Param("licenseId") Integer licenseId, @Param("dateStr") String dateStr);
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobInfoMapper.java
+6 -4
View File
@@ -21,24 +21,26 @@
*/
package fun.asgc.neutrino.proxy.server.dal;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import fun.asgc.neutrino.core.annotation.Param;
import fun.asgc.neutrino.core.db.annotation.ResultType;
import fun.asgc.neutrino.core.db.annotation.Select;
import fun.asgc.neutrino.core.db.annotation.Update;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageInfo;
import fun.asgc.neutrino.proxy.server.controller.req.JobInfoListReq;
import fun.asgc.neutrino.proxy.server.controller.res.JobInfoListRes;
import fun.asgc.neutrino.proxy.server.dal.entity.JobInfoDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.Date;
import java.util.List;
public interface JobInfoMapper {
@Mapper
public interface JobInfoMapper extends BaseMapper<JobInfoDO> {
@ResultType(JobInfoListRes.class)
@Select("select * from job_info")
void page(Page page, JobInfoListReq req);
void page(PageInfo pageInfo, JobInfoListReq req);
@Select("select * from job_info where id = ?")
JobInfoDO findById(Integer id);
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobLogMapper.java
+7 -4
View File
@@ -21,15 +21,17 @@
*/
package fun.asgc.neutrino.proxy.server.dal;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import fun.asgc.neutrino.core.annotation.Component;
import fun.asgc.neutrino.core.aop.Intercept;
import fun.asgc.neutrino.core.db.annotation.Insert;
import fun.asgc.neutrino.core.db.annotation.ResultType;
import fun.asgc.neutrino.core.db.annotation.Select;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageInfo;
import fun.asgc.neutrino.proxy.server.controller.req.JobLogListReq;
import fun.asgc.neutrino.proxy.server.controller.res.JobLogListRes;
import fun.asgc.neutrino.proxy.server.dal.entity.JobLogDO;
import org.apache.ibatis.annotations.Mapper;
/**
*
@@ -38,17 +40,18 @@ import fun.asgc.neutrino.proxy.server.dal.entity.JobLogDO;
*/
@Intercept(ignoreGlobal = true)
@Component
public interface JobLogMapper {
@Mapper
public interface JobLogMapper extends BaseMapper<JobLogDO> {
@Insert("insert into job_log(`job_id`,`handler`,`param`,`code`,`msg`,`alarm_status`,`create_time`) values(:jobId,:handler,:param,:code,:msg,:alarmStatus,:createTime)")
void add(JobLogDO jobLog);
@ResultType(JobLogListRes.class)
@Select("select * from job_log order by create_time desc")
void page(Page page, JobLogListReq req);
void page(PageInfo pageInfo, JobLogListReq req);
@ResultType(JobLogListRes.class)
@Select("select * from job_log where job_id = :jobId order by create_time desc")
void pageByJobId(Page page, JobLogListReq req);
void pageByJobId(PageInfo pageInfo, JobLogListReq req);
}
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/LicenseMapper.java
+24 -7
View File
@@ -21,6 +21,9 @@
*/
package fun.asgc.neutrino.proxy.server.dal;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import fun.asgc.neutrino.core.annotation.Component;
import fun.asgc.neutrino.core.annotation.Param;
import fun.asgc.neutrino.core.aop.Intercept;
@@ -28,10 +31,11 @@ import fun.asgc.neutrino.core.db.annotation.Delete;
import fun.asgc.neutrino.core.db.annotation.ResultType;
import fun.asgc.neutrino.core.db.annotation.Select;
import fun.asgc.neutrino.core.db.annotation.Update;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageInfo;
import fun.asgc.neutrino.proxy.server.controller.req.LicenseListReq;
import fun.asgc.neutrino.proxy.server.controller.res.LicenseListRes;
import fun.asgc.neutrino.proxy.server.dal.entity.LicenseDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.Date;
import java.util.List;
@@ -44,14 +48,15 @@ import java.util.Set;
*/
@Intercept(ignoreGlobal = true)
@Component
public interface LicenseMapper {
@Mapper
public interface LicenseMapper extends BaseMapper<LicenseDO> {
/**
* 查询license分页
* @param page
* @param pageInfo
* @param req
*/
void page(Page page, LicenseListReq req);
void page(PageInfo pageInfo, LicenseListReq req);
@ResultType(LicenseListRes.class)
@Select("select * from license where enable = 1")
@@ -75,7 +80,13 @@ public interface LicenseMapper {
void updateEnableStatus(@Param("id") Integer id, @Param("enable") Integer enable, @Param("updateTime") Date updateTime);
@Update("update `license` set is_online = :isOnline, update_time = :updateTime where id = :id")
void updateOnlineStatus(@Param("id") Integer id, @Param("isOnline") Integer isOnline, @Param("updateTime") Date updateTime);
default void updateOnlineStatus(@Param("id") Integer id, @Param("isOnline") Integer isOnline, @Param("updateTime") Date updateTime) {
this.update(null, new LambdaUpdateWrapper<LicenseDO>()
.eq(LicenseDO::getId, id)
.set(LicenseDO::getIsOnline, isOnline)
.set(LicenseDO::getUpdateTime, updateTime)
);
}
@Update("update `license` set is_online = :isOnline, update_time = :updateTime")
void updateOnlineStatus(@Param("isOnline") Integer isOnline, @Param("updateTime") Date updateTime);
@@ -94,7 +105,9 @@ public interface LicenseMapper {
@ResultType(LicenseDO.class)
@Select("select * from `license` where id in (:ids)")
List<LicenseDO> findByIds(@Param("ids")Set<Integer> ids);
default List<LicenseDO> findByIds(@Param("ids")Set<Integer> ids) {
return selectBatchIds(ids);
}
@ResultType(LicenseDO.class)
@Select("select * from `license` where user_id = :userId and name =:name limit 0,1")
@@ -105,5 +118,9 @@ public interface LicenseMapper {
LicenseDO checkRepeat(@Param("userId") Integer userId, @Param("name") String name, @Param("excludeIds") Set<Integer> excludeIds);
@Select("select * from `license` where `key` = ?")
LicenseDO findByKey(String licenseKey);
default LicenseDO findByKey(String licenseKey) {
return selectOne(new LambdaQueryWrapper<LicenseDO>()
.eq(LicenseDO::getKey, licenseKey)
);
}
}
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortMappingMapper.java
+23 -5
View File
@@ -21,6 +21,9 @@
*/
package fun.asgc.neutrino.proxy.server.dal;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import fun.asgc.neutrino.core.annotation.Component;
import fun.asgc.neutrino.core.annotation.Param;
import fun.asgc.neutrino.core.aop.Intercept;
@@ -28,10 +31,12 @@ import fun.asgc.neutrino.core.db.annotation.Delete;
import fun.asgc.neutrino.core.db.annotation.ResultType;
import fun.asgc.neutrino.core.db.annotation.Select;
import fun.asgc.neutrino.core.db.annotation.Update;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageInfo;
import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum;
import fun.asgc.neutrino.proxy.server.controller.req.PortMappingListReq;
import fun.asgc.neutrino.proxy.server.controller.res.PortMappingListRes;
import fun.asgc.neutrino.proxy.server.dal.entity.PortMappingDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.Date;
import java.util.List;
@@ -44,11 +49,12 @@ import java.util.Set;
*/
@Intercept(ignoreGlobal = true)
@Component
public interface PortMappingMapper {
@Mapper
public interface PortMappingMapper extends BaseMapper<PortMappingDO> {
@ResultType(PortMappingListRes.class)
@Select("select * from port_mapping")
void page(Page page, PortMappingListReq req);
void page(PageInfo pageInfo, PortMappingListReq req);
void add(PortMappingDO portMappingDO);
@@ -71,7 +77,12 @@ public interface PortMappingMapper {
@ResultType(PortMappingDO.class)
@Select("select * from port_mapping where license_id = ? and enable = 1")
List<PortMappingDO> findEnableListByLicenseId(Integer licenseId);
default List<PortMappingDO> findEnableListByLicenseId(Integer licenseId) {
return this.selectList(new LambdaQueryWrapper<PortMappingDO>()
.eq(PortMappingDO::getLicenseId, licenseId)
.eq(PortMappingDO::getEnable, EnableStatusEnum.ENABLE.getStatus())
);
}
@ResultType(PortMappingDO.class)
@Select("select * from port_mapping where server_port = :serverPort")
@@ -82,7 +93,14 @@ public interface PortMappingMapper {
List<PortMappingDO> findListByLicenseId(Integer licenseId);
@Update("update `port_mapping` set is_online = :isOnline,update_time = :updateTime where license_id = :licenseId and server_port = :serverPort")
void updateOnlineStatus(@Param("licenseId") Integer licenseId, @Param("serverPort") Integer serverPort, @Param("isOnline") Integer isOnline, @Param("updateTime") Date updateTime);
default void updateOnlineStatus(@Param("licenseId") Integer licenseId, @Param("serverPort") Integer serverPort, @Param("isOnline") Integer isOnline, @Param("updateTime") Date updateTime) {
this.update(null, new LambdaUpdateWrapper<PortMappingDO>()
.eq(PortMappingDO::getLicenseId, licenseId)
.eq(PortMappingDO::getServerPort, serverPort)
.set(PortMappingDO::getIsOnline, isOnline)
.set(PortMappingDO::getUpdateTime, updateTime)
);
}
@Update("update `port_mapping` set is_online = :isOnline,update_time = :updateTime where license_id = :licenseId")
void updateOnlineStatus(@Param("licenseId") Integer licenseId, @Param("isOnline") Integer isOnline, @Param("updateTime") Date updateTime);
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortPoolMapper.java
+6 -3
View File
@@ -21,14 +21,16 @@
*/
package fun.asgc.neutrino.proxy.server.dal;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import fun.asgc.neutrino.core.annotation.Component;
import fun.asgc.neutrino.core.annotation.Param;
import fun.asgc.neutrino.core.aop.Intercept;
import fun.asgc.neutrino.core.db.annotation.*;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageInfo;
import fun.asgc.neutrino.proxy.server.controller.req.PortPoolListReq;
import fun.asgc.neutrino.proxy.server.controller.res.PortPoolListRes;
import fun.asgc.neutrino.proxy.server.dal.entity.PortPoolDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.Date;
import java.util.List;
@@ -40,11 +42,12 @@ import java.util.List;
*/
@Intercept(ignoreGlobal = true)
@Component
public interface PortPoolMapper {
@Mapper
public interface PortPoolMapper extends BaseMapper<PortPoolDO> {
@ResultType(PortPoolListRes.class)
@Select("select * from port_pool")
void page(Page<PortPoolListRes> page, PortPoolListReq req);
void page(PageInfo<PortPoolListRes> pageInfo, PortPoolListReq req);
@ResultType(PortPoolListRes.class)
@Select("select * from port_pool where enable = 1")
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserLoginRecordMapper.java
+6 -3
View File
@@ -21,15 +21,17 @@
*/
package fun.asgc.neutrino.proxy.server.dal;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import fun.asgc.neutrino.core.annotation.Component;
import fun.asgc.neutrino.core.aop.Intercept;
import fun.asgc.neutrino.core.db.annotation.Insert;
import fun.asgc.neutrino.core.db.annotation.ResultType;
import fun.asgc.neutrino.core.db.annotation.Select;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageInfo;
import fun.asgc.neutrino.proxy.server.controller.req.UserLoginRecordListReq;
import fun.asgc.neutrino.proxy.server.controller.res.UserLoginRecordListRes;
import fun.asgc.neutrino.proxy.server.dal.entity.UserLoginRecordDO;
import org.apache.ibatis.annotations.Mapper;
/**
*
@@ -38,7 +40,8 @@ import fun.asgc.neutrino.proxy.server.dal.entity.UserLoginRecordDO;
*/
@Intercept(ignoreGlobal = true)
@Component
public interface UserLoginRecordMapper {
@Mapper
public interface UserLoginRecordMapper extends BaseMapper<UserLoginRecordDO> {
/**
* 新增用户登录日志
* @param userLoginRecord
@@ -49,5 +52,5 @@ public interface UserLoginRecordMapper {
@ResultType(UserLoginRecordListRes.class)
@Select("select * from user_login_record order by create_time desc")
void page(Page page, UserLoginRecordListReq req);
void page(PageInfo pageInfo, UserLoginRecordListReq req);
}
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserMapper.java
+19 -6
View File
@@ -21,14 +21,17 @@
*/
package fun.asgc.neutrino.proxy.server.dal;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import fun.asgc.neutrino.core.annotation.Component;
import fun.asgc.neutrino.core.annotation.Param;
import fun.asgc.neutrino.core.aop.Intercept;
import fun.asgc.neutrino.core.db.annotation.*;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageInfo;
import fun.asgc.neutrino.proxy.server.controller.req.UserListReq;
import fun.asgc.neutrino.proxy.server.controller.res.UserListRes;
import fun.asgc.neutrino.proxy.server.dal.entity.UserDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.Date;
import java.util.List;
@@ -41,7 +44,8 @@ import java.util.Set;
*/
@Intercept(ignoreGlobal = true)
@Component
public interface UserMapper {
@Mapper
public interface UserMapper extends BaseMapper<UserDO> {
/**
* 根据登录名查询用户记录
@@ -49,7 +53,12 @@ public interface UserMapper {
* @return
*/
@Select("select * from user where login_name = ?")
UserDO findByLoginName(String loginName);
default UserDO findByLoginName(String loginName) {
return selectOne(new LambdaQueryWrapper<UserDO>()
.eq(UserDO::getLoginName, loginName)
.last("limit 1")
);
}
/**
* 根据id查询单条记录
@@ -57,15 +66,19 @@ public interface UserMapper {
* @return
*/
@Select("select * from user where id = ?")
UserDO findById(Integer id);
default UserDO findById(Integer id) {
return selectById(id);
}
@ResultType(UserDO.class)
@Select("select * from user where id in (:ids)")
List<UserDO> findByIds(@Param("ids") Set<Integer> ids);
default List<UserDO> findByIds(@Param("ids") Set<Integer> ids) {
return selectBatchIds(ids);
}
@ResultType(UserListRes.class)
@Select("select * from user")
void page(Page page, UserListReq req);
void page(PageInfo pageInfo, UserListReq req);
@ResultType(UserListRes.class)
@Select("select * from user where enable = 1")
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserReportMapper.java
+4 -2
View File
@@ -3,8 +3,9 @@ package fun.asgc.neutrino.proxy.server.dal;
import fun.asgc.neutrino.core.annotation.Component;
import fun.asgc.neutrino.core.annotation.Param;
import fun.asgc.neutrino.core.aop.Intercept;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageInfo;
import fun.asgc.neutrino.proxy.server.controller.res.UserFlowReportRes;
import org.apache.ibatis.annotations.Mapper;
import java.util.Date;
@@ -14,8 +15,9 @@ import java.util.Date;
*/
@Intercept(ignoreGlobal = true)
@Component
@Mapper
public interface UserReportMapper {
void userFlowReportPage(Page<UserFlowReportRes> page, @Param("todayBegin") Date todayBegin, @Param("todayEnd") Date todayEnd);
void userFlowReportPage(PageInfo<UserFlowReportRes> pageInfo, @Param("todayBegin") Date todayBegin, @Param("todayEnd") Date todayEnd);
}
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserTokenMapper.java
+18 -3
View File
@@ -21,12 +21,16 @@
*/
package fun.asgc.neutrino.proxy.server.dal;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import fun.asgc.neutrino.core.annotation.Component;
import fun.asgc.neutrino.core.annotation.Param;
import fun.asgc.neutrino.core.aop.Intercept;
import fun.asgc.neutrino.core.db.annotation.Delete;
import fun.asgc.neutrino.core.db.annotation.Update;
import fun.asgc.neutrino.proxy.server.dal.entity.UserTokenDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.Date;
@@ -37,7 +41,8 @@ import java.util.Date;
*/
@Intercept(ignoreGlobal = true)
@Component
public interface UserTokenMapper {
@Mapper
public interface UserTokenMapper extends BaseMapper<UserTokenDO> {
/**
* 新增用户token
* 支持注解 + xml配置2种方式
@@ -55,7 +60,12 @@ public interface UserTokenMapper {
* @return
*/
// @Select("select * from user_token where token = ? and expiration_time > ?")
UserTokenDO findByAvailableToken(String token, Date date);
default UserTokenDO findByAvailableToken(String token, Date date) {
return selectOne(new LambdaQueryWrapper<UserTokenDO>()
.eq(UserTokenDO::getToken, token)
.gt(UserTokenDO::getExpirationTime, date)
);
}
/**
* 根据token删除记录
@@ -65,7 +75,12 @@ public interface UserTokenMapper {
void deleteByToken(String token);
@Update("update user_token set expiration_time = :expirationTime where token = :token")
void updateTokenExpirationTime(@Param("token") String token, @Param("expirationTime") Date expirationTime);
default void updateTokenExpirationTime(@Param("token") String token, @Param("expirationTime") Date expirationTime) {
update(null, new LambdaUpdateWrapper<UserTokenDO>()
.eq(UserTokenDO::getToken, token)
.set(UserTokenDO::getExpirationTime, expirationTime)
);
}
/**
* 根据userId删除token
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/ClientConnectRecordDO.java
+4
View File
@@ -1,5 +1,7 @@
package fun.asgc.neutrino.proxy.server.dal.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import fun.asgc.neutrino.core.db.annotation.Id;
import fun.asgc.neutrino.core.db.annotation.Table;
import lombok.Data;
@@ -16,8 +18,10 @@ import java.util.Date;
@Accessors(chain = true)
@Data
@Table("client_connect_record")
@TableName("client_connect_record")
public class ClientConnectRecordDO {
@Id
@TableId
private Integer id;
private String ip;
private Integer licenseId;
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportDayDO.java
+4
View File
@@ -21,6 +21,8 @@
*/
package fun.asgc.neutrino.proxy.server.dal.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import fun.asgc.neutrino.core.db.annotation.Id;
import fun.asgc.neutrino.core.db.annotation.Table;
import lombok.Data;
@@ -37,8 +39,10 @@ import java.util.Date;
@Accessors(chain = true)
@Data
@Table("flow_report_day")
@TableName("flow_report_day")
public class FlowReportDayDO {
@Id
@TableId
private Integer id;
/**
* 用户ID
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportHourDO.java
+2
View File
@@ -21,6 +21,7 @@
*/
package fun.asgc.neutrino.proxy.server.dal.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import fun.asgc.neutrino.core.db.annotation.Id;
import fun.asgc.neutrino.core.db.annotation.Table;
import lombok.Data;
@@ -39,6 +40,7 @@ import java.util.Date;
@Table("flow_report_hour")
public class FlowReportHourDO {
@Id
@TableId
private Integer id;
/**
* 用户ID
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportMinuteDO.java
+4
View File
@@ -21,6 +21,8 @@
*/
package fun.asgc.neutrino.proxy.server.dal.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import fun.asgc.neutrino.core.db.annotation.Id;
import fun.asgc.neutrino.core.db.annotation.Table;
import lombok.Data;
@@ -37,8 +39,10 @@ import java.util.Date;
@Accessors(chain = true)
@Data
@Table("flow_report_minute")
@TableName("flow_report_minute")
public class FlowReportMinuteDO {
@Id
@TableId
private Integer id;
/**
* 用户ID
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportMonthDO.java
+4
View File
@@ -21,6 +21,8 @@
*/
package fun.asgc.neutrino.proxy.server.dal.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import fun.asgc.neutrino.core.db.annotation.Id;
import fun.asgc.neutrino.core.db.annotation.Table;
import lombok.Data;
@@ -37,8 +39,10 @@ import java.util.Date;
@Accessors(chain = true)
@Data
@Table("flow_report_month")
@TableName("flow_report_month")
public class FlowReportMonthDO {
@Id
@TableId
private Integer id;
/**
* 用户ID
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobInfoDO.java
+4
View File
@@ -21,6 +21,8 @@
*/
package fun.asgc.neutrino.proxy.server.dal.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import fun.asgc.neutrino.core.db.annotation.Id;
import fun.asgc.neutrino.core.db.annotation.Table;
import lombok.Data;
@@ -38,8 +40,10 @@ import java.util.Date;
@Accessors(chain = true)
@Data
@Table("job_info")
@TableName("job_info")
public class JobInfoDO {
@Id
@TableId
private Integer id;
private String cron;
private String desc;
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobLogDO.java
+4 -2
View File
@@ -21,7 +21,8 @@
*/
package fun.asgc.neutrino.proxy.server.dal.entity;
import fun.asgc.neutrino.core.annotation.Autowired;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import fun.asgc.neutrino.core.db.annotation.Table;
import lombok.Data;
import lombok.ToString;
@@ -38,8 +39,9 @@ import java.util.Date;
@Accessors(chain = true)
@Data
@Table("job_log")
@TableName("job_log")
public class JobLogDO {
@Autowired
@TableId
private Integer id;
private Integer jobId;
private String handler;
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/LicenseDO.java
+4
View File
@@ -21,6 +21,8 @@
*/
package fun.asgc.neutrino.proxy.server.dal.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import fun.asgc.neutrino.core.db.annotation.Id;
import fun.asgc.neutrino.core.db.annotation.Table;
import fun.asgc.neutrino.proxy.server.constant.OnlineStatusEnum;
@@ -39,8 +41,10 @@ import java.util.Date;
@Accessors(chain = true)
@Data
@Table("license")
@TableName("license")
public class LicenseDO {
@Id
@TableId
private Integer id;
/**
* 名称
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/PortMappingDO.java
+4
View File
@@ -21,6 +21,8 @@
*/
package fun.asgc.neutrino.proxy.server.dal.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import fun.asgc.neutrino.core.db.annotation.Id;
import fun.asgc.neutrino.core.db.annotation.Table;
import fun.asgc.neutrino.proxy.server.constant.OnlineStatusEnum;
@@ -39,8 +41,10 @@ import java.util.Date;
@Accessors(chain = true)
@Data
@Table("port_mapping")
@TableName("port_mapping")
public class PortMappingDO {
@Id
@TableId
private Integer id;
/**
* licenseId
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/PortPoolDO.java
+4
View File
@@ -21,6 +21,8 @@
*/
package fun.asgc.neutrino.proxy.server.dal.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import fun.asgc.neutrino.core.db.annotation.Id;
import fun.asgc.neutrino.core.db.annotation.Table;
import lombok.Data;
@@ -38,8 +40,10 @@ import java.util.Date;
@Accessors(chain = true)
@Data
@Table("port_pool")
@TableName("port_pool")
public class PortPoolDO {
@Id
@TableId
private Integer id;
/**
* 端口
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/UserDO.java
+4
View File
@@ -21,6 +21,8 @@
*/
package fun.asgc.neutrino.proxy.server.dal.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import fun.asgc.neutrino.core.db.annotation.Id;
import fun.asgc.neutrino.core.db.annotation.Table;
import lombok.Data;
@@ -36,8 +38,10 @@ import java.util.Date;
@ToString
@Data
@Table("user")
@TableName("user")
public class UserDO {
@Id
@TableId
private Integer id;
/**
* 用户名
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/UserLoginRecordDO.java
+4
View File
@@ -12,6 +12,8 @@
*/
package fun.asgc.neutrino.proxy.server.dal.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import fun.asgc.neutrino.core.db.annotation.Id;
import fun.asgc.neutrino.core.db.annotation.Table;
import lombok.Data;
@@ -29,6 +31,7 @@ import java.util.Date;
@Data
@Accessors(chain = true)
@Table("user_login_record")
@TableName("user_login_record")
public class UserLoginRecordDO {
/**
* 类型 - 登录
@@ -40,6 +43,7 @@ public class UserLoginRecordDO {
public static final Integer TYPE_LOGOUT = 2;
@Id
@TableId
private Integer id;
/**
* 用户ID
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/UserTokenDO.java
+4
View File
@@ -21,6 +21,8 @@
*/
package fun.asgc.neutrino.proxy.server.dal.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import fun.asgc.neutrino.core.db.annotation.Id;
import fun.asgc.neutrino.core.db.annotation.Table;
import lombok.Data;
@@ -38,9 +40,11 @@ import java.util.Date;
@Accessors(chain = true)
@Data
@Table("user_token")
@TableName("user_token")
public class UserTokenDO {
@Id
@TableId
private Integer id;
/**
* token
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ClientConnectRecordService.java
+22 -15
View File
@@ -21,9 +21,13 @@
*/
package fun.asgc.neutrino.proxy.server.service;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageQuery;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import fun.asgc.neutrino.core.util.CollectionUtil;
import fun.asgc.neutrino.proxy.server.base.page.PageInfo;
import fun.asgc.neutrino.proxy.server.base.page.PageQuery;
import fun.asgc.neutrino.proxy.server.base.rest.SystemContextHolder;
import fun.asgc.neutrino.proxy.server.controller.req.ClientConnectRecordListReq;
import fun.asgc.neutrino.proxy.server.controller.res.ClientConnectRecordListRes;
@@ -34,6 +38,7 @@ import fun.asgc.neutrino.proxy.server.dal.entity.ClientConnectRecordDO;
import fun.asgc.neutrino.proxy.server.dal.entity.LicenseDO;
import fun.asgc.neutrino.proxy.server.dal.entity.UserDO;
import lombok.extern.slf4j.Slf4j;
import ma.glasnost.orika.MapperFactory;
import org.noear.solon.annotation.Component;
import org.noear.solon.annotation.Inject;
@@ -50,6 +55,8 @@ import java.util.stream.Collectors;
@Slf4j
@Component
public class ClientConnectRecordService {
@Inject
private MapperFactory mapperFactory;
@Inject
private ClientConnectRecordMapper clientConnectRecordMapper;
@Inject
@@ -58,29 +65,29 @@ public class ClientConnectRecordService {
private UserMapper userMapper;
public void add(ClientConnectRecordDO clientConnectRecordDO) {
clientConnectRecordMapper.add(clientConnectRecordDO);
clientConnectRecordMapper.insert(clientConnectRecordDO);
}
public Page<ClientConnectRecordListRes> page(PageQuery pageQuery, ClientConnectRecordListReq req) {
Page<ClientConnectRecordListRes> page = Page.create(pageQuery);
clientConnectRecordMapper.page(page, req);
if (CollectionUtil.isEmpty(page.getRecords())) {
return page;
}
Set<Integer> licenseIds = page.getRecords().stream().map(ClientConnectRecordListRes::getLicenseId).collect(Collectors.toSet());
if (CollectionUtil.isEmpty(licenseIds)) {
return page;
public PageInfo<ClientConnectRecordListRes> page(PageQuery pageQuery, ClientConnectRecordListReq req) {
Page<ClientConnectRecordListRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
List<ClientConnectRecordDO> list = clientConnectRecordMapper.selectList(new LambdaQueryWrapper<ClientConnectRecordDO>()
.orderByDesc(ClientConnectRecordDO::getId)
);
List<ClientConnectRecordListRes> respList = mapperFactory.getMapperFacade().mapAsList(list, ClientConnectRecordListRes.class);
if (CollectionUtils.isEmpty(list)) {
return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
}
Set<Integer> licenseIds = respList.stream().map(ClientConnectRecordListRes::getLicenseId).collect(Collectors.toSet());
List<LicenseDO> licenseList = licenseMapper.findByIds(licenseIds);
if (CollectionUtil.isEmpty(licenseList)) {
return page;
return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
}
Set<Integer> userIds = licenseList.stream().map(LicenseDO::getUserId).collect(Collectors.toSet());
List<UserDO> userList = userMapper.findByIds(userIds);
Map<Integer, LicenseDO> licenseMap = licenseList.stream().collect(Collectors.toMap(LicenseDO::getId, Function.identity()));
Map<Integer, UserDO> userMap = userList.stream().collect(Collectors.toMap(UserDO::getId, Function.identity()));
boolean isAdmin = SystemContextHolder.isAdmin();
page.getRecords().forEach(item -> {
respList.forEach(item -> {
LicenseDO license = licenseMap.get(item.getLicenseId());
if (null == license) {
return;
@@ -97,6 +104,6 @@ public class ClientConnectRecordService {
item.setMsg("******");
}
});
return page;
return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
}
}
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java
+15 -6
View File
@@ -21,10 +21,13 @@
*/
package fun.asgc.neutrino.proxy.server.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.google.common.collect.Lists;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageQuery;
import fun.asgc.neutrino.core.util.CollectionUtil;
import fun.asgc.neutrino.proxy.server.base.page.PageInfo;
import fun.asgc.neutrino.proxy.server.base.page.PageQuery;
import fun.asgc.neutrino.proxy.server.base.quartz.IJobSource;
import fun.asgc.neutrino.proxy.server.base.quartz.JobExecutor;
import fun.asgc.neutrino.proxy.server.base.quartz.JobInfo;
@@ -42,6 +45,7 @@ import fun.asgc.neutrino.proxy.server.dal.JobInfoMapper;
import fun.asgc.neutrino.proxy.server.dal.entity.JobInfoDO;
import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil;
import lombok.extern.slf4j.Slf4j;
import ma.glasnost.orika.MapperFactory;
import org.noear.solon.Solon;
import org.noear.solon.annotation.Component;
import org.noear.solon.annotation.Inject;
@@ -57,13 +61,18 @@ import java.util.List;
@Slf4j
@Component
public class JobInfoService implements IJobSource {
@Inject
private MapperFactory mapperFactory;
@Inject
private JobInfoMapper jobInfoMapper;
public Page<JobInfoListRes> page(PageQuery pageQuery, JobInfoListReq req) {
Page<JobInfoListRes> page = Page.create(pageQuery);
jobInfoMapper.page(page, req);
return page;
public PageInfo<JobInfoListRes> page(PageQuery pageQuery, JobInfoListReq req) {
Page<JobInfoListRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
List<JobInfoDO> list = jobInfoMapper.selectList(new LambdaQueryWrapper<JobInfoDO>()
.orderByAsc(JobInfoDO::getId)
);
List<JobInfoListRes> respList = mapperFactory.getMapperFacade().mapAsList(list, JobInfoListRes.class);
return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
}
public List<JobInfoDO> findList() {
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobLogService.java
+17 -11
View File
@@ -21,8 +21,11 @@
*/
package fun.asgc.neutrino.proxy.server.service;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageQuery;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import fun.asgc.neutrino.proxy.server.base.page.PageInfo;
import fun.asgc.neutrino.proxy.server.base.page.PageQuery;
import fun.asgc.neutrino.proxy.server.base.quartz.IJobCallback;
import fun.asgc.neutrino.proxy.server.base.quartz.JobInfo;
import fun.asgc.neutrino.proxy.server.controller.req.JobLogListReq;
@@ -30,11 +33,13 @@ import fun.asgc.neutrino.proxy.server.controller.res.JobLogListRes;
import fun.asgc.neutrino.proxy.server.dal.JobLogMapper;
import fun.asgc.neutrino.proxy.server.dal.entity.JobLogDO;
import lombok.extern.slf4j.Slf4j;
import ma.glasnost.orika.MapperFactory;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.noear.solon.annotation.Component;
import org.noear.solon.annotation.Inject;
import java.util.Date;
import java.util.List;
/**
*
@@ -44,6 +49,8 @@ import java.util.Date;
@Slf4j
@Component
public class JobLogService implements IJobCallback {
@Inject
private MapperFactory mapperFactory;
@Inject
private JobLogMapper jobLogMapper;
@@ -70,15 +77,14 @@ public class JobLogService implements IJobCallback {
);
}
public Page<JobLogListRes> page(PageQuery pageQuery, JobLogListReq req) {
Page<JobLogListRes> page = Page.create(pageQuery);
if(req.getJobId() != null && req.getJobId() > 0){
jobLogMapper.pageByJobId(page, req);
} else {
jobLogMapper.page(page, req);
}
return page;
public PageInfo<JobLogListRes> page(PageQuery pageQuery, JobLogListReq req) {
Page<JobLogListRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
List<JobLogDO> list = jobLogMapper.selectList(new LambdaQueryWrapper<JobLogDO>()
.eq(null != req.getJobId(), JobLogDO::getJobId, req.getJobId())
.orderByDesc(JobLogDO::getId)
);
List<JobLogListRes> respList = mapperFactory.getMapperFacade().mapAsList(list, JobLogListRes.class);
return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
}
}
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java
+22 -10
View File
@@ -21,10 +21,14 @@
*/
package fun.asgc.neutrino.proxy.server.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.google.common.collect.Sets;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageQuery;
import fun.asgc.neutrino.core.util.CollectionUtil;
import fun.asgc.neutrino.proxy.server.base.page.PageInfo;
import fun.asgc.neutrino.proxy.server.base.page.PageQuery;
import fun.asgc.neutrino.proxy.server.base.rest.SystemContextHolder;
import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum;
import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant;
@@ -39,6 +43,7 @@ import fun.asgc.neutrino.proxy.server.dal.UserMapper;
import fun.asgc.neutrino.proxy.server.dal.entity.LicenseDO;
import fun.asgc.neutrino.proxy.server.dal.entity.UserDO;
import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil;
import ma.glasnost.orika.MapperFactory;
import org.noear.solon.annotation.Component;
import org.noear.solon.annotation.Inject;
import org.noear.solon.core.Lifecycle;
@@ -54,7 +59,8 @@ import java.util.stream.Collectors;
*/
@Component
public class LicenseService implements Lifecycle {
@Inject
private MapperFactory mapperFactory;
@Inject
private LicenseMapper licenseMapper;
@Inject
@@ -62,14 +68,20 @@ public class LicenseService implements Lifecycle {
@Inject
private VisitorChannelService visitorChannelService;
public Page<LicenseListRes> page(PageQuery pageQuery, LicenseListReq req) {
Page<LicenseListRes> page = Page.create(pageQuery);
licenseMapper.page(page, req);
if (!CollectionUtil.isEmpty(page.getRecords())) {
Set<Integer> userIds = page.getRecords().stream().map(LicenseListRes::getUserId).collect(Collectors.toSet());
public PageInfo<LicenseListRes> page(PageQuery pageQuery, LicenseListReq req) {
Page<LicenseListRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
List<LicenseDO> list = licenseMapper.selectList(new LambdaQueryWrapper<LicenseDO>()
.orderByAsc(LicenseDO::getId)
);
List<LicenseListRes> respList = mapperFactory.getMapperFacade().mapAsList(list, LicenseListRes.class);
if (CollectionUtils.isEmpty(list)) {
return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
}
if (!CollectionUtil.isEmpty(respList)) {
Set<Integer> userIds = respList.stream().map(LicenseListRes::getUserId).collect(Collectors.toSet());
List<UserDO> userList = userMapper.findByIds(userIds);
Map<Integer, UserDO> userMap = userList.stream().collect(Collectors.toMap(UserDO::getId, Function.identity()));
for (LicenseListRes item : page.getRecords()) {
for (LicenseListRes item : respList) {
UserDO userDO = userMap.get(item.getUserId());
if (null != userDO) {
item.setUserName(userDO.getName());
@@ -77,7 +89,7 @@ public class LicenseService implements Lifecycle {
item.setKey(desensitization(item.getUserId(), item.getKey()));
}
}
return page;
return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
}
public List<LicenseListRes> list(LicenseListReq req) {
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java
+21 -14
View File
@@ -21,10 +21,14 @@
*/
package fun.asgc.neutrino.proxy.server.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.google.common.collect.Sets;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageQuery;
import fun.asgc.neutrino.core.util.CollectionUtil;
import fun.asgc.neutrino.proxy.server.base.page.PageInfo;
import fun.asgc.neutrino.proxy.server.base.page.PageQuery;
import fun.asgc.neutrino.proxy.server.base.rest.SystemContextHolder;
import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum;
import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant;
@@ -43,6 +47,7 @@ import fun.asgc.neutrino.proxy.server.dal.entity.PortMappingDO;
import fun.asgc.neutrino.proxy.server.dal.entity.PortPoolDO;
import fun.asgc.neutrino.proxy.server.dal.entity.UserDO;
import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil;
import ma.glasnost.orika.MapperFactory;
import org.noear.solon.annotation.Component;
import org.noear.solon.annotation.Inject;
import org.noear.solon.core.Lifecycle;
@@ -61,6 +66,8 @@ import java.util.stream.Collectors;
*/
@Component
public class PortMappingService implements Lifecycle {
@Inject
private MapperFactory mapperFactory;
@Inject
private PortMappingMapper portMappingMapper;
@Inject
@@ -72,25 +79,25 @@ public class PortMappingService implements Lifecycle {
@Inject
private VisitorChannelService visitorChannelService;
public Page<PortMappingListRes> page(PageQuery pageQuery, PortMappingListReq req) {
Page<PortMappingListRes> page = Page.create(pageQuery);
portMappingMapper.page(page, req);
if (CollectionUtil.isEmpty(page.getRecords())) {
return page;
}
Set<Integer> licenseIds = page.getRecords().stream().map(PortMappingListRes::getLicenseId).collect(Collectors.toSet());
if (CollectionUtil.isEmpty(licenseIds)) {
return page;
public PageInfo<PortMappingListRes> page(PageQuery pageQuery, PortMappingListReq req) {
Page<PortMappingListRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
List<PortMappingDO> list = portMappingMapper.selectList(new LambdaQueryWrapper<PortMappingDO>()
.orderByAsc(PortMappingDO::getId)
);
List<PortMappingListRes> respList = mapperFactory.getMapperFacade().mapAsList(list, PortMappingListRes.class);
if (CollectionUtils.isEmpty(list)) {
return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
}
Set<Integer> licenseIds = respList.stream().map(PortMappingListRes::getLicenseId).collect(Collectors.toSet());
List<LicenseDO> licenseList = licenseMapper.findByIds(licenseIds);
if (CollectionUtil.isEmpty(licenseList)) {
return page;
return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
}
Set<Integer> userIds = licenseList.stream().map(LicenseDO::getUserId).collect(Collectors.toSet());
List<UserDO> userList = userMapper.findByIds(userIds);
Map<Integer, LicenseDO> licenseMap = licenseList.stream().collect(Collectors.toMap(LicenseDO::getId, Function.identity()));
Map<Integer, UserDO> userMap = userList.stream().collect(Collectors.toMap(UserDO::getId, Function.identity()));
page.getRecords().forEach(item -> {
respList.forEach(item -> {
LicenseDO license = licenseMap.get(item.getLicenseId());
if (null == license) {
return;
@@ -103,7 +110,7 @@ public class PortMappingService implements Lifecycle {
}
item.setUserName(user.getName());
});
return page;
return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
}
public PortMappingCreateRes create(PortMappingCreateReq req) {
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortPoolService.java
+15 -7
View File
@@ -21,8 +21,11 @@
*/
package fun.asgc.neutrino.proxy.server.service;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageQuery;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import fun.asgc.neutrino.proxy.server.base.page.PageInfo;
import fun.asgc.neutrino.proxy.server.base.page.PageQuery;
import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum;
import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant;
import fun.asgc.neutrino.proxy.server.controller.req.PortPoolCreateReq;
@@ -34,6 +37,7 @@ import fun.asgc.neutrino.proxy.server.controller.res.PortPoolUpdateEnableStatusR
import fun.asgc.neutrino.proxy.server.dal.PortPoolMapper;
import fun.asgc.neutrino.proxy.server.dal.entity.PortPoolDO;
import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil;
import ma.glasnost.orika.MapperFactory;
import org.noear.solon.annotation.Component;
import org.noear.solon.annotation.Inject;
@@ -47,16 +51,20 @@ import java.util.List;
*/
@Component
public class PortPoolService {
@Inject
private MapperFactory mapperFactory;
@Inject
private PortPoolMapper portPoolMapper;
@Inject
private VisitorChannelService visitorChannelService;
public Page<PortPoolListRes> page(PageQuery pageQuery, PortPoolListReq req) {
Page<PortPoolListRes> page = Page.create(pageQuery);
portPoolMapper.page(page, req);
return page;
public PageInfo<PortPoolListRes> page(PageQuery pageQuery, PortPoolListReq req) {
Page<PortPoolListRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
List<PortPoolDO> list = portPoolMapper.selectList(new LambdaQueryWrapper<PortPoolDO>()
.orderByAsc(PortPoolDO::getId)
);
List<PortPoolListRes> respList = mapperFactory.getMapperFacade().mapAsList(list, PortPoolListRes.class);
return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
}
public List<PortPoolListRes> list(PortPoolListReq req) {
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ReportService.java
+3 -3
View File
@@ -21,7 +21,7 @@
*/
package fun.asgc.neutrino.proxy.server.service;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageInfo;
import fun.asgc.neutrino.core.db.page.PageQuery;
import fun.asgc.neutrino.proxy.server.controller.req.LicenseFlowReportReq;
import fun.asgc.neutrino.proxy.server.controller.req.UserFlowReportReq;
@@ -48,7 +48,7 @@ public class ReportService {
* @param req
* @return
*/
public Page<UserFlowReportRes> userFlowReportPage(PageQuery pageQuery, UserFlowReportReq req) {
public PageInfo<UserFlowReportRes> userFlowReportPage(PageQuery pageQuery, UserFlowReportReq req) {
// TODO
return null;
}
@@ -59,7 +59,7 @@ public class ReportService {
* @param req
* @return
*/
public Page<LicenseFlowReportRes> licenseFlowReportPage(PageQuery pageQuery, LicenseFlowReportReq req) {
public PageInfo<LicenseFlowReportRes> licenseFlowReportPage(PageQuery pageQuery, LicenseFlowReportReq req) {
// TODO
return null;
}
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserLoginRecordService.java
+24 -9
View File
@@ -21,14 +21,20 @@
*/
package fun.asgc.neutrino.proxy.server.service;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageQuery;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import fun.asgc.neutrino.core.util.CollectionUtil;
import fun.asgc.neutrino.proxy.server.base.page.PageInfo;
import fun.asgc.neutrino.proxy.server.base.page.PageQuery;
import fun.asgc.neutrino.proxy.server.controller.req.UserLoginRecordListReq;
import fun.asgc.neutrino.proxy.server.controller.res.UserLoginRecordListRes;
import fun.asgc.neutrino.proxy.server.dal.UserLoginRecordMapper;
import fun.asgc.neutrino.proxy.server.dal.UserMapper;
import fun.asgc.neutrino.proxy.server.dal.entity.UserDO;
import fun.asgc.neutrino.proxy.server.dal.entity.UserLoginRecordDO;
import ma.glasnost.orika.MapperFactory;
import org.noear.solon.annotation.Component;
import org.noear.solon.annotation.Inject;
@@ -45,25 +51,34 @@ import java.util.stream.Collectors;
*/
@Component
public class UserLoginRecordService {
@Inject
private MapperFactory mapperFactory;
@Inject
private UserLoginRecordMapper userLoginRecordMapper;
@Inject
private UserMapper userMapper;
public Page<UserLoginRecordListRes> page(PageQuery pageQuery, UserLoginRecordListReq req) {
Page<UserLoginRecordListRes> page = Page.create(pageQuery);
userLoginRecordMapper.page(page, req);
if (!CollectionUtil.isEmpty(page.getRecords())) {
Set<Integer> userIds = page.getRecords().stream().map(UserLoginRecordListRes::getUserId).collect(Collectors.toSet());
public PageInfo<UserLoginRecordListRes> page(PageQuery pageQuery, UserLoginRecordListReq req) {
Page<UserLoginRecordListRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
List<UserLoginRecordDO> list = userLoginRecordMapper.selectList(new LambdaQueryWrapper<UserLoginRecordDO>()
.orderByDesc(UserLoginRecordDO::getCreateTime)
);
List<UserLoginRecordListRes> respList = mapperFactory.getMapperFacade().mapAsList(list, UserLoginRecordListRes.class);
if (CollectionUtils.isEmpty(list)) {
return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
}
if (!CollectionUtil.isEmpty(respList)) {
Set<Integer> userIds = respList.stream().map(UserLoginRecordListRes::getUserId).collect(Collectors.toSet());
List<UserDO> userList = userMapper.findByIds(userIds);
Map<Integer, UserDO> userMap = userList.stream().collect(Collectors.toMap(UserDO::getId, Function.identity()));
for (UserLoginRecordListRes item : page.getRecords()) {
for (UserLoginRecordListRes item : respList) {
UserDO userDO = userMap.get(item.getUserId());
if (null != userDO) {
item.setUserName(userDO.getName());
}
}
}
return page;
return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
}
}
neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java
+21 -11
View File
@@ -21,9 +21,12 @@
*/
package fun.asgc.neutrino.proxy.server.service;
import fun.asgc.neutrino.core.db.page.Page;
import fun.asgc.neutrino.core.db.page.PageQuery;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import fun.asgc.neutrino.core.util.DateUtil;
import fun.asgc.neutrino.proxy.server.base.page.PageInfo;
import fun.asgc.neutrino.proxy.server.base.page.PageQuery;
import fun.asgc.neutrino.proxy.server.base.rest.ServiceException;
import fun.asgc.neutrino.proxy.server.base.rest.SystemContextHolder;
import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum;
@@ -38,6 +41,8 @@ import fun.asgc.neutrino.proxy.server.dal.entity.UserLoginRecordDO;
import fun.asgc.neutrino.proxy.server.dal.entity.UserTokenDO;
import fun.asgc.neutrino.proxy.server.util.Md5Util;
import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil;
import ma.glasnost.orika.MapperFactory;
import org.apache.ibatis.solon.annotation.Db;
import org.noear.solon.annotation.Component;
import org.noear.solon.annotation.Inject;
@@ -55,12 +60,14 @@ import java.util.UUID;
public class UserService {
private static final String DEFAULT_PASSWORD = "123456";
@Inject
private MapperFactory mapperFactory;
@Db
private UserMapper userMapper;
@Inject
@Db
private UserTokenMapper userTokenMapper;
@Inject
@Db
private UserLoginRecordMapper userLoginRecordMapper;
@Inject
@Db
private VisitorChannelService visitorChannelService;
public LoginRes login(LoginReq req) {
@@ -77,7 +84,7 @@ public class UserService {
Date expirationTime = DateUtil.addDate(now, Calendar.HOUR, 1);
// 缓存token
userTokenMapper.add(new UserTokenDO()
userTokenMapper.insert(new UserTokenDO()
.setToken(token)
.setUserId(userDO.getId())
.setExpirationTime(expirationTime)
@@ -86,7 +93,7 @@ public class UserService {
);
// 新增用户登录日志
userLoginRecordMapper.add(new UserLoginRecordDO()
userLoginRecordMapper.insert(new UserLoginRecordDO()
.setUserId(userDO.getId())
.setIp(SystemContextHolder.getIp())
.setToken(token)
@@ -132,10 +139,13 @@ public class UserService {
userTokenMapper.updateTokenExpirationTime(token, expirationTime);
}
public Page<UserListRes> page(PageQuery pageQuery, UserListReq req) {
Page<UserListRes> page = Page.create(pageQuery);
userMapper.page(page, req);
return page;
public PageInfo<UserListRes> page(PageQuery pageQuery, UserListReq req) {
Page<UserListRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
List<UserDO> list = userMapper.selectList(new LambdaQueryWrapper<UserDO>()
.orderByAsc(UserDO::getId)
);
List<UserListRes> respList = mapperFactory.getMapperFacade().mapAsList(list, UserListRes.class);
return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
}
public List<UserListRes> list(UserListReq req) {
neutrino-proxy-server/src/main/resources/app.yml
+13 -1
View File
@@ -36,4 +36,16 @@ solon.staticfiles.maxAge: 600
#添加静态目录映射。（按需选择）#v1.11.0 后支持
solon.staticfiles.mappings:
- path: "/"
repository: "./neutrino-proxy-admin/dist/" #2.添加资源路径（仓库只能是目录）
repository: "./neutrino-proxy-admin/dist/" #2.添加资源路径（仓库只能是目录）
mybatis.db:
typeAliases: #支持包名 或 类名（大写开头 或 *）//支持 ** 或 * 占位符
- "fun.asgc.neutrino.proxy.server.dal.entity"
mappers: #支持包名 或 类名（大写开头 或 *）或 xml（.xml结尾）//支持 ** 或 * 占位符
- "classpath:mapper/*.xml"
- "fun.asgc.neutrino.proxy.server.dal"
configuration: #扩展配置（要与 MybatisConfiguration 类的属性一一对应）
cacheEnabled: false
mapUnderscoreToCamelCase: true
globalConfig: #全局配置（要与 GlobalConfig 类的属性一一对应）
banner: true
neutrino-proxy-server/src/main/resources/mapper/ClientConnectRecordMapper.xml
+3
View File
@@ -1,3 +1,6 @@
<?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 = "fun.asgc.neutrino.proxy.server.dal.ClientConnectRecordMapper">
<update id="add">
neutrino-proxy-server/src/main/resources/mapper/JobInfoMapper.xml
+3
View File
@@ -1,3 +1,6 @@
<?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 = "fun.asgc.neutrino.proxy.server.dal.JobInfoMapper">
<update id="update">
neutrino-proxy-server/src/main/resources/mapper/LicenseMapper.xml
+4 -1
View File
@@ -1,6 +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 = "fun.asgc.neutrino.proxy.server.dal.LicenseMapper">
<select id="page" resultType="fun.asgc.neutrino.proxy.server.controller.res.LicenseListRes">
<select id="pageInfo" resultType="fun.asgc.neutrino.proxy.server.controller.res.LicenseListRes">
select * from `license`
</select>
neutrino-proxy-server/src/main/resources/mapper/PortMappingMapper.xml
+3
View File
@@ -1,3 +1,6 @@
<?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 = "fun.asgc.neutrino.proxy.server.dal.PortMappingMapper">
<insert id="add">
neutrino-proxy-server/src/main/resources/mapper/UserReportMapper.xml
+3
View File
@@ -1,3 +1,6 @@
<?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 = "fun.asgc.neutrino.proxy.server.dal.UserReportMapper">
<select id="userFlowReportPage" resultType="fun.asgc.neutrino.proxy.server.controller.res.UserFlowReportRes">
neutrino-proxy-server/src/main/resources/mapper/UserTokenMapper.xml
+3
View File
@@ -1,3 +1,6 @@
<?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 = "fun.asgc.neutrino.proxy.server.dal.UserTokenMapper">
<insert id = "add">
neutrino-proxy-server/src/main/resources/mapper/bak/ClientConnectRecordMapper.xml
+7
View File
@@ -0,0 +1,7 @@
<!--<mapper namespace = "fun.asgc.neutrino.proxy.server.dal.ClientConnectRecordMapper">-->
<!-- <update id="add">-->
<!-- insert into client_connect_record(`ip`,`license_id`,`type`, `msg`, `code`, `err`, `create_time`)-->
<!-- values(:ip,:licenseId,:type,:msg,:code,:err,:createTime)-->
<!-- </update>-->
<!--</mapper>-->
neutrino-proxy-server/src/main/resources/mapper/bak/JobInfoMapper.xml
+8
View File
@@ -0,0 +1,8 @@
<!--<mapper namespace = "fun.asgc.neutrino.proxy.server.dal.JobInfoMapper">-->
<!-- <update id="update">-->
<!-- update `job_info`-->
<!-- set cron = :cron,desc = :desc,alarm_email=:alarmEmail,alarm_ding=:alarmDing,param=:param,update_time=:updateTime-->
<!-- where id =:id-->
<!-- </update>-->
<!--</mapper>-->
neutrino-proxy-server/src/main/resources/mapper/bak/LicenseMapper.xml
+12
View File
@@ -0,0 +1,12 @@
<!--<mapper namespace = "fun.asgc.neutrino.proxy.server.dal.LicenseMapper">-->
<!-- <select id="pageInfo" resultType="fun.asgc.neutrino.proxy.server.controller.res.LicenseListRes">-->
<!-- select * from `license`-->
<!-- </select>-->
<!-- <insert id="add">-->
<!-- insert into `license`(`name`,`key`,`user_id`,`is_online`,`enable`,`create_time`,`update_time`)-->
<!-- values (:name, :key, :userId, :isOnline, :enable, :createTime, :updateTime)-->
<!-- </insert>-->
<!--</mapper>-->
neutrino-proxy-server/src/main/resources/mapper/bak/PortMappingMapper.xml
+13
View File
@@ -0,0 +1,13 @@
<!--<mapper namespace = "fun.asgc.neutrino.proxy.server.dal.PortMappingMapper">-->
<!-- <insert id="add">-->
<!-- insert into `port_mapping`(`license_id`,`server_port`,`client_ip`,`client_port`,`is_online`,`enable`,`create_time`,`update_time`)-->
<!-- values (:licenseId, :serverPort, :clientIp, :clientPort, :isOnline, :enable, :createTime, :updateTime)-->
<!-- </insert>-->
<!-- <update id="update">-->
<!-- update `port_mapping`-->
<!-- set license_id = :licenseId,server_port = :serverPort,client_ip=:clientIp,client_port=:clientPort,update_time=:updateTime-->
<!-- where id =:id-->
<!-- </update>-->
<!--</mapper>-->
neutrino-proxy-server/src/main/resources/mapper/bak/UserReportMapper.xml
+14
View File
@@ -0,0 +1,14 @@
<!--<mapper namespace = "fun.asgc.neutrino.proxy.server.dal.UserReportMapper">-->
<!-- <select id="userFlowReportPage" resultType="fun.asgc.neutrino.proxy.server.controller.res.UserFlowReportRes">-->
<!-- SELECT-->
<!-- u.id AS userId,-->
<!-- u.NAME AS userName,-->
<!-- IFNULL( SUM( frm.write_bytes ), 0 ) AS historyWriteBytes,-->
<!-- IFNULL( SUM( frm.read_bytes ), 0 ) AS historyReadBytes-->
<!-- FROM `user` u-->
<!-- LEFT JOIN flow_report_month frm ON u.id = frm.user_id-->
<!-- GROUP BY u.id-->
<!-- </select>-->
<!--</mapper>-->
neutrino-proxy-server/src/main/resources/mapper/bak/UserTokenMapper.xml
+12
View File
@@ -0,0 +1,12 @@
<!--<mapper namespace = "fun.asgc.neutrino.proxy.server.dal.UserTokenMapper">-->
<!-- <insert id = "add">-->
<!-- insert into `user_token`(`token`,`user_id`,`expiration_time`,`create_time`,`update_time`)-->
<!-- values (:token, :userId, :expirationTime, :createTime, :updateTime)-->
<!-- </insert>-->
<!-- <select id = "findByAvailableToken">-->
<!-- select * from user_token where token = ? and expiration_time > ?-->
<!-- </select>-->
<!--</mapper>-->