git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@297 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/model/Enterprise.java

@@ -30,7 +30,7 @@ import com.uas.platform.core.model.Constant;
 @Entity
 @Table(name = "sec$enterprises")
 @Cacheable
-@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
+@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class Enterprise implements Serializable {
 
 	/**

src/main/java/com/uas/platform/b2b/model/PurchaseOrderAll.java

@@ -145,7 +145,7 @@ public class PurchaseOrderAll {
 	@OneToMany(mappedBy = "order", cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE,
 			CascadeType.MERGE }, fetch = FetchType.EAGER)
 	@Where(clause = "pd_status = 200")
-	@OrderBy("pd_number")
+	@OrderBy("number")
 	private Set<PurchaseOrderAllItem> orderItems;
 
 	public Long getId() {

src/main/java/com/uas/platform/b2b/model/PurchaseOrderChange.java

@@ -141,7 +141,7 @@ public class PurchaseOrderChange implements Serializable {
 	 * 采购变更单明细
 	 */
 	@OneToMany(mappedBy = "orderChange", cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE, CascadeType.MERGE }, fetch = FetchType.EAGER)
-	@OrderBy("pcd_number")
+	@OrderBy("number")
 	private Set<PurchaseOrderChangeItem> orderChangeItems;
 
 	public Long getId() {

src/main/java/com/uas/platform/b2b/model/SaleOrder.java

@@ -116,7 +116,7 @@ public class SaleOrder implements Serializable {
 	 * 订单明细
 	 */
 	@OneToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }, mappedBy = "order", fetch = FetchType.EAGER)
-	@OrderBy("sd_number")
+	@OrderBy("number")
 	@NotFound(action = NotFoundAction.IGNORE)
 	private List<SaleOrderItem> orderItems;
 

src/main/java/com/uas/platform/b2b/model/User.java

@@ -77,7 +77,7 @@ public class User implements Serializable {
 	 */
 	@ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }, fetch = FetchType.EAGER)
 	@JoinTable(name = "sec$userenterprise", joinColumns = @JoinColumn(name = "user_uu", referencedColumnName = "user_uu"), inverseJoinColumns = @JoinColumn(name = "en_uu", referencedColumnName = "en_uu"))
-	@OrderBy("en_uu")
+	@OrderBy("uu")
 	@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 	private Set<Enterprise> enterprises;
 
@@ -93,7 +93,7 @@ public class User implements Serializable {
 	 */
 	@ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }, fetch = FetchType.EAGER)
 	@JoinTable(name = "sec$userrole", joinColumns = @JoinColumn(name = "user_uu", referencedColumnName = "user_uu"), inverseJoinColumns = @JoinColumn(name = "role_id", referencedColumnName = "role_id"))
-	@OrderBy("role_id")
+	@OrderBy("id")
 	@Cache(usage = CacheConcurrencyStrategy.READ_ONLY)
 	private Set<Role> roles;
 

src/main/resources/META-INF/persistence.xml

@@ -6,6 +6,11 @@
 		transaction-type="RESOURCE_LOCAL">
 		<provider>org.hibernate.ejb.HibernatePersistence</provider>
 		<properties>
+			<property name="hibernate.cache.provider_class" value="org.hibernate.cache.EhCacheProvider" />
+			<property name="hibernate.cache.use_second_level_cache"
+				value="true" />
+			<property name="hibernate.cache.region.factory_class"
+				value="org.hibernate.cache.ehcache.EhCacheRegionFactory" />
 			<property name="hibernate.dialect" value="org.hibernate.dialect.Oracle10gDialect" />
 			<!-- value="create" to build a new database on each run; value="update" 
 				to modify an existing database; value="create-drop" means the same as "create"