新增收支项目和结算账户功能

WebRoot/WEB-INF/classes/com/jsh/model/po/Account.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.Account" table="jsh_account">
+        <id name="Id" type="java.lang.Long">
+            <column name="Id"/>
+            <generator class="native"/>
+        </id>
+        <property generated="never" lazy="false" name="Name" type="java.lang.String">
+            <column length="50" name="Name">
+                <comment>名称</comment>
+            </column>
+        </property>
+        <property generated="never" lazy="false" name="SerialNo" type="java.lang.String">
+            <column length="50" name="SerialNo">
+                <comment>编号</comment>
+            </column>
+        </property>
+        <property generated="never" lazy="false" name="InitialAmount" type="java.lang.Double">
+            <column name="InitialAmount" precision="22" scale="3">
+                <comment>期初金额</comment>
+            </column>
+        </property>
+        <property generated="never" lazy="false" name="CurrentAmount" type="java.lang.Double">
+            <column name="CurrentAmount" 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/com/jsh/model/po/InOutItem.hbm.xml

@@ -0,0 +1,26 @@
+<?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.InOutItem" table="jsh_inoutitem">
+        <id name="Id" type="java.lang.Long">
+            <column name="Id"/>
+            <generator class="native"/>
+        </id>
+        <property generated="never" lazy="false" name="Name" type="java.lang.String">
+            <column length="50" name="Name">
+                <comment>名称</comment>
+            </column>
+        </property>
+        <property generated="never" lazy="false" name="Type" type="java.lang.String">
+            <column length="20" name="Type">
+                <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

@@ -18,6 +18,7 @@
 		org.hibernate.dialect.MySQL5Dialect
 	</property>
 	<property name="show_sql">true</property>
+	<!-- 一般重新建库用create(慎用)，只更新字段用update -->
 	<property name="hbm2ddl.auto">update</property>
 
 	<!-- 对应的实体映射 -->
@@ -39,5 +40,7 @@
     <mapping resource="com/jsh/model/po/Building.hbm.xml" />
     <mapping resource="com/jsh/model/po/DepotHead.hbm.xml" />
     <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" />
 </session-factory>
-</hibernate-configuration>
+</hibernate-configuration>

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

@@ -321,4 +321,28 @@
 		<property name="logService" ref="logService"/>
 	</bean>
 	<!--仓管通明细配置结束 -->
-</beans>
+        
+    <!--结算账户配置开始 -->
+    <bean id="accountService" class="com.jsh.service.basic.AccountService">
+        <property name="baseDao" ref="baseDao"/>
+        <property name="accountDao" ref="accountDao"/>
+    </bean>
+    <!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
+    <bean id="accountAction" class="com.jsh.action.basic.AccountAction" scope="prototype">
+        <property name="accountService" ref="accountService"/>
+        <property name="logService" ref="logService"/>
+    </bean>
+	<!--结算账户配置结束 -->
+        
+    <!--收支项目配置开始 -->
+    <bean id="inOutItemService" class="com.jsh.service.basic.InOutItemService">
+        <property name="baseDao" ref="baseDao"/>
+        <property name="inOutItemDao" ref="inOutItemDao"/>
+    </bean>
+    <!-- spring整合struts2需要默认为request或者 prototype，不能是单例 -->
+    <bean id="inOutItemAction" class="com.jsh.action.basic.InOutItemAction" scope="prototype">
+        <property name="inOutItemService" ref="inOutItemService"/>
+        <property name="logService" ref="logService"/>
+    </bean>
+	<!--收支项目配置结束 -->
+</beans>

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

@@ -47,5 +47,9 @@
 	<!-- 配置depotHeadDao组件 -->
 	<bean id="depotHeadDao" parent="daoTemplate" class="com.jsh.dao.materials.DepotHeadDAO"/>	
 	<!-- 配置depotItemDao组件 -->
-	<bean id="depotItemDao" parent="daoTemplate" class="com.jsh.dao.materials.DepotItemDAO"/>	
+	<bean id="depotItemDao" parent="daoTemplate" class="com.jsh.dao.materials.DepotItemDAO"/>
+	<!-- 配置accountDao组件 -->
+	<bean id="accountDao" parent="daoTemplate" class="com.jsh.dao.basic.AccountDAO"/>	
+	<!-- 配置inOutItemDao组件 -->
+	<bean id="inOutItemDao" parent="daoTemplate" class="com.jsh.dao.basic.InOutItemDAO"/>	
 </beans>

WebRoot/WEB-INF/classes/struts2/account-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="account" namespace="/account" extends="json-default">
+        <action name="*" class="accountAction" method="{1}">
+            <result type="json"/>
+        </action>
+    </package>
+</struts>

WebRoot/WEB-INF/classes/struts2/inOutItem-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="inOutItem" namespace="/inOutItem" extends="json-default">
+        <action name="*" class="inOutItemAction" method="{1}">
+            <result type="json"/>
+        </action>
+    </package>
+</struts>