diff --git a/core/src/main/java/core/thrift/ThriftClientDemo.java b/core/src/main/java/core/thrift/ThriftClientDemo.java index 57192c0..1b11340 100644 --- a/core/src/main/java/core/thrift/ThriftClientDemo.java +++ b/core/src/main/java/core/thrift/ThriftClientDemo.java @@ -9,7 +9,6 @@ import org.apache.thrift.transport.TFramedTransport; import org.apache.thrift.transport.TSocket; import org.apache.thrift.transport.TTransport; -import java.util.ArrayList; import java.util.List; public class ThriftClientDemo { @@ -17,12 +16,7 @@ public class ThriftClientDemo { private static final String host="127.0.0.1"; private static final int port=2233; private static Logger log=LogManager.getLogger(); - - public static void main(String[] args) throws Exception { - downloadXml(new ArrayList(){{ - add(12026697); - }},"测试弹幕"); - } + private static final TTransport tTransport = getTTransport(host, port, 5000); public static List commentSumList(List cids) throws Exception { List result= client().commentSumList(cids); @@ -48,9 +42,8 @@ public class ThriftClientDemo { return new QueryComment.Client(protocol); } - private static TTransport getTTransport() throws Exception{ + public static TTransport getTTransport() throws Exception{ try{ - TTransport tTransport = getTTransport(host, port, 5000); if(!tTransport.isOpen()){ tTransport.open(); } diff --git a/db/src/main/java/db/form/PageResult.java b/db/src/main/java/db/form/PageResult.java index 4e4f52f..a5aaf22 100644 --- a/db/src/main/java/db/form/PageResult.java +++ b/db/src/main/java/db/form/PageResult.java @@ -9,49 +9,40 @@ import java.util.List; * @param */ public class PageResult { + /** + * 总记录数 + */ private long count; + /** + * 当前页数 + */ private int currentPage; + /** + * 数据实体集合 + */ private List datas; + /** + * 分页大小 + */ private int pageSize; + /** + * 分页数 + */ private long pages; + /** + * 返回结果 + */ private Type type; - private String errorMsg; - - public PageResult() { - } - /** - * - * @param count 总行数 - * @param currentPage 当前分页数 - * @param datas 数据 - * @param pageSize 分页大小 - * @param type 操作结果 + * 错误信息 */ - public PageResult(long count, int currentPage, List datas, int pageSize, Type type) { - this.count = count; - this.currentPage = currentPage+1; - this.datas = datas; - this.pageSize = pageSize; - this.pages=count%pageSize==0?count/pageSize:count/pageSize+1; - this.type = type; - } - - public PageResult(Type type, String errorMsg) { - this.type = type; - this.errorMsg = errorMsg; - } - - public PageResult(int currentPage, int pageSize) { - this.currentPage = currentPage; - this.pageSize = pageSize; - } + private String errorMsg; public long getCount() { return count; @@ -89,8 +80,8 @@ public class PageResult { return pages; } - public void setPages(long pages) { - this.pages = pages; + public void setPages() { + this.pages = count%pageSize==0?count/pageSize:count/pageSize+1; } public Type getType() { @@ -101,6 +92,8 @@ public class PageResult { this.type = type; } + + public String getErrorMsg() { return errorMsg; } diff --git a/web/src/main/java/web/controller/DataController.java b/web/src/main/java/web/controller/DataController.java index 42858be..8c5623a 100644 --- a/web/src/main/java/web/controller/DataController.java +++ b/web/src/main/java/web/controller/DataController.java @@ -23,10 +23,8 @@ import web.html.data.OtherDataResult; import web.model.DataModelForm; import web.service.DataService; -import javax.servlet.http.HttpSession; import java.io.File; import java.io.IOException; -import java.lang.reflect.InvocationTargetException; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.EnumSet; @@ -38,16 +36,13 @@ public class DataController extends TableController(0, 10)); + public DataController() throws IOException, InstantiationException, IllegalAccessException { + super(); } + @RequestMapping("start/{size}") public void start(@PathVariable Integer size) { stop(); @@ -57,11 +52,11 @@ public class DataController extends TableController> extends BaseController { @@ -20,35 +19,51 @@ public abstract class TableController0) { List list = find(command, pageResult.getCurrentPage()*pageResult.getPageSize(), pageResult.getPageSize()); List otherDatas= otherDatas(command); - result= (B) getResolvableType(typeIndex).getConstructor(long.class,int.class,List.class,int.class,Type.class,List.class).newInstance(rowCount, pageResult.getCurrentPage(),list,pageResult.getPageSize() , Type.success,otherDatas); + result.setCount(rowCount); + result.setCurrentPage(pageResult.getCurrentPage()+1); + result.setDatas(list); + result.setPageSize(pageResult.getPageSize()); + result.setType(Type.success); + result.setOtherData(otherDatas); + result.setPages(); }else{ - result= (B) getResolvableType(typeIndex).getConstructor(Type.class,String.class).newInstance(Type.fail,"没有记录"); + result.setType(Type.fail); + result.setErrorMsg("没有记录"); } } catch (DataAccessException e) { log.error(e); - result= (B) getResolvableType(typeIndex).getConstructor(Type.class,String.class).newInstance(Type.fail,"非法操作"); + result.setType(Type.fail); + result.setErrorMsg("非法操作"); } }else{ - result= (B) getResolvableType(typeIndex).getConstructor(Type.class,String.class).newInstance(Type.fail,tableName + "不允许" + action.getCh() + "操作"); + result.setType(Type.fail); + result.setErrorMsg(tableName + "不允许" + action.getCh() + "操作"); } model.addAttribute("datas", result); + setModel(model); return "table"; } + protected void setModel(Model model){ + + } + @Override protected boolean checkAction(DBAction action) { return false; diff --git a/web/src/main/java/web/html/Table.java b/web/src/main/java/web/html/Table.java index e781a57..4888f13 100644 --- a/web/src/main/java/web/html/Table.java +++ b/web/src/main/java/web/html/Table.java @@ -1,7 +1,6 @@ package web.html; import db.form.PageResult; -import db.form.Type; import db.model.AbstractModel; import java.util.List; @@ -19,21 +18,6 @@ public abstract class Table exten private List otherData; - public Table() { - } - - public Table(int currentPage, int pageSize) { - super(currentPage, pageSize); - } - - public Table(long count, int currentPage, List datas, int pageSize, Type type,List otherData) { - super(count, currentPage, datas, pageSize, type); - this.otherData = otherData; - } - - public Table(Type type, String errorMsg) { - super(type, errorMsg); - } public String getImportJspPath() { if(importJspPath==null){ @@ -66,4 +50,10 @@ public abstract class Table exten public List getOtherData() { return otherData; } + + public void setOtherData(List otherData) { + this.otherData = otherData; + } } + + diff --git a/web/src/main/java/web/html/data/DataTable.java b/web/src/main/java/web/html/data/DataTable.java index 85710c4..c7ac768 100644 --- a/web/src/main/java/web/html/data/DataTable.java +++ b/web/src/main/java/web/html/data/DataTable.java @@ -1,6 +1,5 @@ package web.html.data; -import db.form.Type; import db.model.bilibili.DataModel; import web.html.Table; @@ -9,22 +8,13 @@ import java.util.List; public class DataTable extends Table { - - - public DataTable(int currentPage, int pageSize) { - super(currentPage, pageSize); - } - - public DataTable(long count, int currentPage, List datas, int pageSize, Type type, List otherData) { - super(count, currentPage, datas, pageSize, type, otherData); - } - - public DataTable(Type type, String errorMsg) { - super(type, errorMsg); - } - - public DataTable(){ - + @Override + public int getPageSize() { + if(super.getPageSize()==0){ + return 10; + }else{ + return super.getPageSize(); + } } @Override diff --git a/web/src/main/java/web/service/DataService.java b/web/src/main/java/web/service/DataService.java index e386f35..11d7b5d 100644 --- a/web/src/main/java/web/service/DataService.java +++ b/web/src/main/java/web/service/DataService.java @@ -170,7 +170,7 @@ public class DataService extends BaseService { sql.append(" where title like '%").append(form.getTitle()).append("%'"); } log.info(sql); - return getHibernateTemplate().execute(session -> session.createNativeQuery(sql.toString(),DataModel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList()); + return getHibernateTemplate().execute(session -> session.createNativeQuery(sql.toString(),DataModel.class).setFirstResult(firstResult).setMaxResults(maxResults>getMaxResults()?getMaxResults():maxResults).getResultList()); } } diff --git a/web/src/main/webapp/WEB-INF/jsp/data/otherData.jsp b/web/src/main/webapp/WEB-INF/jsp/data/otherData.jsp index 5810268..c467386 100644 --- a/web/src/main/webapp/WEB-INF/jsp/data/otherData.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/data/otherData.jsp @@ -15,7 +15,7 @@ function get(cid, i) { $("td[cid=" + cid + "]").find("span").text("获取中"); $.get("/data/count/" + cid, function (result) { - if (result>=0) { + if (result!='') { if(result > 0){ $("#cid_" + cid).removeAttr("disabled"); } diff --git a/web/src/test/java/SpringTest.java b/web/src/test/java/SpringTest.java index bf138d5..661d712 100644 --- a/web/src/test/java/SpringTest.java +++ b/web/src/test/java/SpringTest.java @@ -63,7 +63,7 @@ public class SpringTest { @Test public void test() throws Exception { - ResultActions resultActions = this.mockMvc.perform(MockMvcRequestBuilders.get("/data/table").param("firstResult", "0").param("maxResults", "10").param("cids","49052").param("typeIds","33")); + ResultActions resultActions = this.mockMvc.perform(MockMvcRequestBuilders.get("/data/table").param("currentPage", "0").param("pageSize", "10").param("typeIds","33")); resultActions.andDo(MockMvcResultHandlers.print()).andReturn(); } diff --git a/web/src/test/java/Test.java b/web/src/test/java/Test.java index 2b91644..1c3cf45 100644 --- a/web/src/test/java/Test.java +++ b/web/src/test/java/Test.java @@ -1,14 +1,11 @@ +import core.thrift.ThriftClientDemo; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import web.service.BaseService; -import web.service.BiliService; - -import java.io.IOException; public class Test { private static Logger log = LogManager.getLogger(); - public static void main(String[] args) throws IOException { - log.info(org.springframework.util.ClassUtils.isAssignable(BiliService.class,BaseService.class)); + public static void main(String[] args) throws Exception { + ThriftClientDemo.getTTransport(); } }