no commit message

WebRoot/WEB-INF/classes/com/jsh/model/po/AccountHead.hbm.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+    <class name="com.jsh.model.po.AccountHead" table="jsh_accounthead">
+        <id name="Id" type="java.lang.Long">
+            <column name="Id"/>
+            <generator class="native"/>
+        </id>
+        <property generated="never" lazy="false" name="Type" type="java.lang.String">
+ 			<column length="50" name="Type">
+		    	<comment>类型(支出/收入/收款/付款/转账)</comment>
+		    </column>
+  		</property>
+        <many-to-one name="OrganId" class="com.jsh.model.po.Supplier" lazy="false">
+            <column name="OrganId">
+                <comment>单位Id(收款/付款单位)</comment>
+            </column>
+        </many-to-one>
+        <many-to-one name="HandsPersonId" class="com.jsh.model.po.Person" lazy="false">
+            <column name="HandsPersonId">
+                <comment>经手人Id</comment>
+            </column>
+        </many-to-one>
+        <property generated="never" lazy="false" name="ChangeAmount" type="java.lang.Double">
+            <column name="ChangeAmount" precision="22" scale="3">
+                <comment>变动金额(优惠/收款/付款/实付)</comment>
+            </column>
+        </property>
+        <many-to-one name="AccountId" class="com.jsh.model.po.Account" lazy="false">
+            <column name="AccountId">
+                <comment>账户(收款/付款)</comment>
+            </column>
+        </many-to-one>
+        <property generated="never" lazy="false" name="BillNo" type="java.lang.String">
+            <column length="50" name="BillNo">
+                <comment>单据编号</comment>
+            </column>
+        </property>
+        <property name="BillTime" type="java.sql.Timestamp">
+            <column length="19" name="BillTime">
+                <comment>单据日期</comment>
+            </column>
+        </property>
+        <property generated="never" lazy="false" name="Remark" type="java.lang.String">
+            <column length="100" name="Remark">
+                <comment>备注</comment>
+            </column>
+        </property>
+    </class>
+</hibernate-mapping>

WebRoot/WEB-INF/classes/com/jsh/model/po/AccountItem.hbm.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+    <class name="com.jsh.model.po.AccountItem" table="jsh_accountitem">
+        <id name="Id" type="java.lang.Long">
+            <column name="Id"/>
+            <generator class="native"/>
+        </id>
+        <many-to-one name="HeaderId" class="com.jsh.model.po.AccountHead" lazy="false">
+            <column name="HeaderId" not-null="true">
+                <comment>表头Id</comment>
+            </column>
+        </many-to-one>
+		<many-to-one name="AccountId" class="com.jsh.model.po.Account" lazy="false">
+		  <column name="AccountId">
+		   <comment>账户Id</comment>
+		  </column>
+		</many-to-one>
+		<many-to-one name="InOutItemId" class="com.jsh.model.po.InOutItem" lazy="false">
+		  <column name="InOutItemId">
+		   <comment>收支项目Id</comment>
+		  </column>
+		</many-to-one>
+        <property generated="never" lazy="false" name="EachAmount" type="java.lang.Double">
+            <column name="EachAmount" precision="22" scale="3">
+                <comment>单项金额</comment>
+            </column>
+        </property>
+        <property generated="never" lazy="false" name="Remark" type="java.lang.String">
+            <column length="100" name="Remark">
+                <comment>单据备注</comment>
+            </column>
+        </property>
+    </class>
+</hibernate-mapping>

WebRoot/WEB-INF/classes/hibernate/hibernate.cfg.xml

@@ -41,5 +41,7 @@
     <mapping resource="com/jsh/model/po/DepotItem.hbm.xml" />
     <mapping resource="com/jsh/model/po/Account.hbm.xml" />
     <mapping resource="com/jsh/model/po/InOutItem.hbm.xml" />
+    <mapping resource="com/jsh/model/po/AccountHead.hbm.xml" />
+    <mapping resource="com/jsh/model/po/AccountItem.hbm.xml" />
 </session-factory>
 </hibernate-configuration>

WebRoot/WEB-INF/classes/log4j/log4j.properties

@@ -14,7 +14,7 @@ log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} [%p]-%m%n
 #log4j.logger.org.hibernate = OFF,hibernate
 #log4j.logger.org.hibernate.tool.hbm2ddl=debug
 #log4j.appender.hibernate = org.apache.log4j.RollingFileAppender
-#log4j.appender.hibernate.file = ${webApp.log4j.path}/logs/ams_hibernate.log
+#log4j.appender.hibernate.file = ${webApp.log4j.path}/logs/jsh_hibernate.log
 #log4j.appender.hibernate.layout = org.apache.log4j.PatternLayout
 #log4j.appender.hibernate.layout.conversionPattern = %-d{yyyy-MM-dd HH:mm:ss} [%p]-[%C %M %L]:%m%n
 #log4j.appender.hibernate.layout.conversionPattern = %-d{yyyy-MM-dd HH:mm:ss} [%p]-%m%n

WebRoot/WEB-INF/classes/spring/basic-applicationContext.xml

@@ -333,4 +333,28 @@
         <property name="logService" ref="logService"/>
     </bean>
 	<!--收支项目配置结束 -->
+        
+    <!--账户抬头配置开始 -->
+    <bean id="accountHeadService" class="com.jsh.service.materials.AccountHeadService">
+        <property name="baseDao" ref="baseDao"/>
+        <property name="accountHeadDao" ref="accountHeadDao"/>
+    </bean>
+    <!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
+    <bean id="accountHeadAction" class="com.jsh.action.materials.AccountHeadAction" scope="prototype">
+        <property name="accountHeadService" ref="accountHeadService"/>
+        <property name="logService" ref="logService"/>
+    </bean>
+    <!--账户抬头配置结束 -->
+
+    <!--账户明细配置开始 -->
+    <bean id="accountItemService" class="com.jsh.service.materials.AccountItemService">
+        <property name="baseDao" ref="baseDao"/>
+        <property name="accountItemDao" ref="accountItemDao"/>
+    </bean>
+    <!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
+    <bean id="accountItemAction" class="com.jsh.action.materials.AccountItemAction" scope="prototype">
+        <property name="accountItemService" ref="accountItemService"/>
+        <property name="logService" ref="logService"/>
+    </bean>
+	<!--账户明细配置结束 -->
 </beans>

WebRoot/WEB-INF/classes/spring/dao-applicationContext.xml

@@ -50,4 +50,8 @@
 	<bean id="accountDao" parent="daoTemplate" class="com.jsh.dao.basic.AccountDAO"/>	
 	<!-- 配置inOutItemDao组件 -->
 	<bean id="inOutItemDao" parent="daoTemplate" class="com.jsh.dao.basic.InOutItemDAO"/>
+    <!-- 配置accountHeadDao组件 -->
+    <bean id="accountHeadDao" parent="daoTemplate" class="com.jsh.dao.materials.AccountHeadDAO"/>   
+    <!-- 配置accountItemDao组件 -->
+	<bean id="accountItemDao" parent="daoTemplate" class="com.jsh.dao.materials.AccountItemDAO"/>
 </beans>

WebRoot/WEB-INF/classes/struts2/accountHead-struts.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE struts PUBLIC
+"-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN"
+"http://struts.apache.org/dtds/struts-2.1.7.dtd">
+<struts>
+    <package name="accountHead" namespace="/accountHead" extends="json-default">
+        <action name="*" class="accountHeadAction" method="{1}">
+            <result type="json"/>
+        </action>
+    </package>
+</struts>

WebRoot/WEB-INF/classes/struts2/accountItem-struts.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE struts PUBLIC
+"-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN"
+"http://struts.apache.org/dtds/struts-2.1.7.dtd">
+<struts>
+    <package name="accountItem" namespace="/accountItem" extends="json-default">
+        <action name="*" class="accountItemAction" method="{1}">
+            <result type="json"/>
+        </action>
+    </package>
+</struts>

WebRoot/WEB-INF/web.xml

@@ -25,7 +25,7 @@
   <filter>
     <description>session的过滤器</description>
     <filter-name>SessionValidateFilter</filter-name>
-    <filter-class>com.jsh.filter.user.UserFilter</filter-class>
+    <filter-class>com.jsh.util.SessionFilter</filter-class>
   </filter>
   <filter-mapping>
     <filter-name>SessionValidateFilter</filter-name>
@@ -49,7 +49,7 @@
   </filter-mapping>
   <filter>
     <filter-name>hibernateFilter</filter-name>
-    <filter-class>com.jsh.filter.common.OpenSessionInViewFilterExtend</filter-class>
+    <filter-class>com.jsh.util.OpenSessionInViewFilterExtend</filter-class>
     <init-param>
       <param-name>singleSession</param-name>
       <param-value>true</param-value>