bug调整

Author: 245655812@qq.com

src/main/java/com/cppba/core/Main.java

@@ -22,7 +22,7 @@
 
 public class Main {
 
-    static String domainName = "Card"; //类名
+    static String domainName = "Articles"; //类名
     static String packageName = "com.cppba";//类包
 
     static String templateDir = "\\src\\main\\webapp\\template\\";
@@ -35,7 +35,7 @@ public class Main {
     public static void main(String []args) throws Exception{
 
         Map<String,Object> map = new HashMap();
-        map.put("DaoTemplate.java","dao/" + domainName + "DAO.java");
+        map.put("DaoTemplate.java","dao/" + domainName + "Dao.java");
         map.put("ServiceTemplate.java","service/" + domainName + "Service.java");
         map.put("ServiceImplTemplate.java","service/impl/" + domainName + "ServiceImpl.java");
         map.put("DtoTemplate.java","dto/" + domainName + "Dto.java");

src/main/webapp/template/DtoTemplate.java

@@ -1,6 +1,5 @@
-#set ($domain = $!domainName.substring(0,1).toLowerCase()+$!domainName.substring(1))package $!{packageName}.dao;
-
-package $!{packageName}.dto;
+#set ($domain = $!domainName.substring(0,1).toLowerCase()+$!domainName.substring(1))
+package $!{packageName}.dao;
 
 import $!{packageName}.entity.$!{domainName};
 

src/main/webapp/template/ServiceImplTemplate.java

@@ -1,11 +1,12 @@
 #set ($domain = $!domainName.substring(0,1).toLowerCase()+$!domainName.substring(1))
 package $!{packageName}.service.impl;
 
+import $!{packageName}.core.bean.PageEntity;
 import $!{packageName}.dao.$!{domainName}Dao;
 import $!{packageName}.dto.$!{domainName}Dto;
+import $!{packageName}.dto.BaseDto;
 import $!{packageName}.entity.$!{domainName};
 import $!{packageName}.service.$!{domainName}Service;
-import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -35,7 +36,7 @@ public void save($!{domainName} $!{domain}) {
 
 	@Override
 	public void delete($!{domainName} $!{domain}) {
-		$!{domainName}Dao.delete($!{domain});
+		$!{domain}Dao.delete($!{domain});
 	}
 
 	@Override
@@ -49,16 +50,21 @@ public void update($!{domainName} $!{domain}) {
 	}
 
 	@Override
-	public List<$!{domainName}> query(BaseDto baseDto) {
+	public PageEntity<$!{domainName}> query(BaseDto baseDto) {
 		String hql = " select distinct $!{domain} from $!{domainName} $!{domain} where 1=1 ";
 		Map params = new HashMap<String,Object>();
 
 		$!{domainName}Dto $!{domain}Dto = ($!{domainName}Dto)baseDto;
 		$!{domainName} $!{domain} = $!{domain}Dto.get$!{domainName}();
-		Integer page = $!{domain}Dto.getPage();
-		Integer pageSize = $!{domain}Dto.getPageSize();
+		int page = $!{domain}Dto.getPage();
+		int pageSize = $!{domain}Dto.getPageSize();
 
-		return $!{domain}Dao.query(hql,params,0,0);
+		List list = $!{domain}Dao.query(hql,params,page,pageSize);
+		long count = $!{domain}Dao.count(hql,params);
+		PageEntity<$!{domainName}> pe = new PageEntity<$!{domainName}>();
+		pe.setCount(count);
+		pe.setList(list);
+		return pe;
 	}
 }
 

src/main/webapp/template/ServiceTemplate.java

@@ -1,6 +1,6 @@
 #set ($domain = $!domainName.substring(0,1).toLowerCase()+$!domainName.substring(1))package $!{packageName}.service;
 
-import $!{packageName}.bean.pagination.PageEntity;
+import $!{packageName}.core.bean.PageEntity;
 import $!{packageName}.dto.BaseDto;
 import $!{packageName}.entity.${domainName};