完成国际化组织管理功能和代码生成模板

web/src/main/java/com/jeesite/modules/test/dao/TestDataChildDao.java

@@ -10,7 +10,7 @@ import com.jeesite.modules.test.entity.TestDataChild;
 /**
  * 测试数据DAO接口
  * @author ThinkGem
- * @version 2018-02-07
+ * @version 2018-04-22
  */
 @MyBatisDao
 public interface TestDataChildDao extends CrudDao<TestDataChild> {

web/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java

@@ -10,7 +10,7 @@ import com.jeesite.modules.test.entity.TestData;
 /**
  * 测试数据DAO接口
  * @author ThinkGem
- * @version 2018-02-07
+ * @version 2018-04-22
  */
 @MyBatisDao
 public interface TestDataDao extends CrudDao<TestData> {

web/src/main/java/com/jeesite/modules/test/dao/TestTreeDao.java

@@ -10,7 +10,7 @@ import com.jeesite.modules.test.entity.TestTree;
 /**
  * 测试树表DAO接口
  * @author ThinkGem
- * @version 2018-02-07
+ * @version 2018-04-22
  */
 @MyBatisDao
 public interface TestTreeDao extends TreeDao<TestTree> {

web/src/main/java/com/jeesite/modules/test/entity/TestData.java

@@ -8,7 +8,6 @@ import java.util.Date;
 import com.jeesite.common.mybatis.annotation.JoinTable;
 import com.jeesite.common.mybatis.annotation.JoinTable.Type;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import javax.validation.constraints.NotNull;
 import com.jeesite.modules.sys.entity.User;
 import com.jeesite.modules.sys.entity.Office;
 import java.util.List;
@@ -22,7 +21,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
 /**
  * 测试数据Entity
  * @author ThinkGem
- * @version 2018-02-07
+ * @version 2018-04-22
  */
 @Table(name="test_data", alias="a", columns={
 		@Column(name="id", attrName="id", label="编号", isPK=true),
@@ -132,7 +131,6 @@ public class TestData extends DataEntity<TestData> {
 	}
 	
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@NotNull(message="日期选择不能为空")
 	public Date getTestDate() {
 		return testDate;
 	}
@@ -142,7 +140,6 @@ public class TestData extends DataEntity<TestData> {
 	}
 	
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@NotNull(message="日期时间不能为空")
 	public Date getTestDatetime() {
 		return testDatetime;
 	}

web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java

@@ -8,7 +8,6 @@ import java.util.Date;
 import com.jeesite.common.mybatis.annotation.JoinTable;
 import com.jeesite.common.mybatis.annotation.JoinTable.Type;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import javax.validation.constraints.NotNull;
 import com.jeesite.modules.sys.entity.User;
 import com.jeesite.modules.sys.entity.Office;
 
@@ -20,7 +19,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
 /**
  * 测试数据Entity
  * @author ThinkGem
- * @version 2018-02-07
+ * @version 2018-04-22
  */
 @Table(name="test_data_child", alias="a", columns={
 		@Column(name="id", attrName="id", label="编号", isPK=true),
@@ -150,7 +149,6 @@ public class TestDataChild extends DataEntity<TestDataChild> {
 	}
 	
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@NotNull(message="日期选择不能为空")
 	public Date getTestDate() {
 		return testDate;
 	}
@@ -160,7 +158,6 @@ public class TestDataChild extends DataEntity<TestDataChild> {
 	}
 	
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@NotNull(message="日期时间不能为空")
 	public Date getTestDatetime() {
 		return testDatetime;
 	}

web/src/main/java/com/jeesite/modules/test/entity/TestTree.java

@@ -15,7 +15,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
 /**
  * 测试树表Entity
  * @author ThinkGem
- * @version 2018-02-07
+ * @version 2018-04-22
  */
 @Table(name="test_tree", alias="a", columns={
 		@Column(name="tree_code", attrName="treeCode", label="节点编码", isPK=true),

web/src/main/java/com/jeesite/modules/test/service/TestDataService.java

@@ -3,24 +3,22 @@
  */
 package com.jeesite.modules.test.service;
 
-import java.util.List;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.jeesite.common.entity.Page;
 import com.jeesite.common.service.CrudService;
-import com.jeesite.modules.test.entity.TestData;
-import com.jeesite.modules.test.dao.TestDataDao;
 import com.jeesite.modules.file.utils.FileUploadUtils;
-import com.jeesite.modules.test.entity.TestDataChild;
 import com.jeesite.modules.test.dao.TestDataChildDao;
+import com.jeesite.modules.test.dao.TestDataDao;
+import com.jeesite.modules.test.entity.TestData;
+import com.jeesite.modules.test.entity.TestDataChild;
 
 /**
  * 测试数据Service
  * @author ThinkGem
- * @version 2018-02-07
+ * @version 2018-04-22
  */
 @Service
 @Transactional(readOnly=true)

web/src/main/java/com/jeesite/modules/test/service/TestTreeService.java

@@ -8,16 +8,15 @@ import java.util.List;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.jeesite.common.entity.Page;
 import com.jeesite.common.service.TreeService;
-import com.jeesite.modules.test.entity.TestTree;
-import com.jeesite.modules.test.dao.TestTreeDao;
 import com.jeesite.modules.file.utils.FileUploadUtils;
+import com.jeesite.modules.test.dao.TestTreeDao;
+import com.jeesite.modules.test.entity.TestTree;
 
 /**
  * 测试树表Service
  * @author ThinkGem
- * @version 2018-02-07
+ * @version 2018-04-22
  */
 @Service
 @Transactional(readOnly=true)

web/src/main/java/com/jeesite/modules/test/web/TestDataController.java

@@ -25,7 +25,7 @@ import com.jeesite.modules.test.service.TestDataService;
 /**
  * 测试数据Controller
  * @author ThinkGem
- * @version 2018-02-07
+ * @version 2018-04-22
  */
 @Controller
 @RequestMapping(value = "${adminPath}/test/testData")
@@ -81,7 +81,7 @@ public class TestDataController extends BaseController {
 	@ResponseBody
 	public String save(@Validated TestData testData) {
 		testDataService.save(testData);
-		return renderResult(Global.TRUE, "保存数据成功！");
+		return renderResult(Global.TRUE, text("保存数据成功！"));
 	}
 	
 	/**
@@ -93,7 +93,7 @@ public class TestDataController extends BaseController {
 	public String disable(TestData testData) {
 		testData.setStatus(TestData.STATUS_DISABLE);
 		testDataService.updateStatus(testData);
-		return renderResult(Global.TRUE, "停用数据成功");
+		return renderResult(Global.TRUE, text("停用数据成功"));
 	}
 	
 	/**
@@ -105,7 +105,7 @@ public class TestDataController extends BaseController {
 	public String enable(TestData testData) {
 		testData.setStatus(TestData.STATUS_NORMAL);
 		testDataService.updateStatus(testData);
-		return renderResult(Global.TRUE, "启用数据成功");
+		return renderResult(Global.TRUE, text("启用数据成功"));
 	}
 	
 	/**
@@ -116,7 +116,7 @@ public class TestDataController extends BaseController {
 	@ResponseBody
 	public String delete(TestData testData) {
 		testDataService.delete(testData);
-		return renderResult(Global.TRUE, "删除数据成功！");
+		return renderResult(Global.TRUE, text("删除数据成功！"));
 	}
 	
 }

web/src/main/java/com/jeesite/modules/test/web/TestTreeController.java

@@ -29,7 +29,7 @@ import com.jeesite.modules.test.service.TestTreeService;
 /**
  * 测试树表Controller
  * @author ThinkGem
- * @version 2018-02-07
+ * @version 2018-04-22
  */
 @Controller
 @RequestMapping(value = "${adminPath}/test/testTree")
@@ -128,7 +128,7 @@ public class TestTreeController extends BaseController {
 	@ResponseBody
 	public String save(@Validated TestTree testTree) {
 		testTreeService.save(testTree);
-		return renderResult(Global.TRUE, "保存数据成功！");
+		return renderResult(Global.TRUE, text("保存数据成功！"));
 	}
 	
 	/**
@@ -143,11 +143,11 @@ public class TestTreeController extends BaseController {
 		where.setParentCodes("," + testTree.getId() + ",");
 		long count = testTreeService.findCount(where);
 		if (count > 0) {
-			return renderResult(Global.FALSE, "该数据包含未停用的子数据！");
+			return renderResult(Global.FALSE, text("该数据包含未停用的子数据！"));
 		}
 		testTree.setStatus(TestTree.STATUS_DISABLE);
 		testTreeService.updateStatus(testTree);
-		return renderResult(Global.TRUE, "停用数据成功");
+		return renderResult(Global.TRUE, text("停用数据成功"));
 	}
 	
 	/**
@@ -159,7 +159,7 @@ public class TestTreeController extends BaseController {
 	public String enable(TestTree testTree) {
 		testTree.setStatus(TestTree.STATUS_NORMAL);
 		testTreeService.updateStatus(testTree);
-		return renderResult(Global.TRUE, "启用数据成功");
+		return renderResult(Global.TRUE, text("启用数据成功"));
 	}
 	
 	/**
@@ -170,7 +170,7 @@ public class TestTreeController extends BaseController {
 	@ResponseBody
 	public String delete(TestTree testTree) {
 		testTreeService.delete(testTree);
-		return renderResult(Global.TRUE, "删除数据成功！");
+		return renderResult(Global.TRUE, text("删除数据成功！"));
 	}
 	
 	/**