Skip to content

Q
quant
Commit 9eee0ed4 authored by faker.xin's avatar faker.xin
Browse files
Options

Merge branch 'bianxinxin'

parents bf41744f 472c8026
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 238 deletions
.gitignore
View file @ 9eee0ed4
/out/artifacts/quant_war/com/quant/annotation/*.class
/.idea
/out/artifacts
WebRoot/WEB-INF/classes/applicationContext.xml deleted 100755 → 0
View file @ bf41744f
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
xmlns:jdbc="http://www.springframework.org/schema/jdbc" xmlns:jee="http://www.springframework.org/schema/jee"
xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:jpa="http://www.springframework.org/schema/data/jpa"
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd
http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.2.xsd
http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.2.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd
http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa-1.3.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd">
<!--location属性可以读取配置文件，classpath:db.properties配置文件在classpath中 -->
<util:properties id="db" location="classpath:db.properties"></util:properties>
<!-- 保证连接池一直连接 -->
<!--
<environment id="development">
<transactionManager type="jdbc" />
<dataSource type="POOLED">
<property name="url" value="#{db.url}" />
<property name="driverClassName" value="#{db.driver}" />
<property name="username" value="#{db.user}" />
<property name="password" value="#{db.pwd}" />
<property name="poolPingEnabled" value="true"/>
<property name="poolPingQuery" value="select education from manager where id=1"/>
<property name="poolPingConnectionsNotUsedFor" value="3600000"/>
</dataSource>
</environment>
-->
<!-- 配置数据源 -->
<bean id="ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
<property name="url" value="#{db.url}" />
<property name="driverClassName" value="#{db.driver}" />
<property name="username" value="#{db.user}" />
<property name="password" value="#{db.pwd}" />
<property name="maxWait" value="20000"></property>
<property name="validationQuery" value="SELECT 1"></property>
<property name="testWhileIdle" value="true"></property>
<property name="testOnBorrow" value="true"></property>
<property name="timeBetweenEvictionRunsMillis" value="3600000"></property>
<property name="numTestsPerEvictionRun" value="50"></property>
<property name="minEvictableIdleTimeMillis" value="120000"></property>
<property name="removeAbandoned" value="true"/>
<property name="removeAbandonedTimeout" value="6000000"/>
<property name="initialSize" value="#{db.initialSize}"/>
<property name="maxActive" value="#{db.maxActive}"/>
<property name="maxIdle" value="#{db.maxIdle}"/>
</bean>
<!-- 配置SqlSessionFactory -->
<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
<property name="dataSource" ref="ds" />
<!-- 指定扫描哪些路径下的配置文件 -->
<property name="mapperLocations" value="classpath:com/quant/mapper/*.xml" />
</bean>
<!-- 配置MyBatis注解 -->
<!-- 在Spring容器初始化时，Spring会自动创建 MapperScannerConfigurer，然后自动调用 它扫描指定包下，
带有指定注解的接口，然后 自动实现这个接口，在实现类中它主要封装了 创建连接、关闭练级、开启事务、关闭事务
的代码，这样在开发时就可以简化了。 -->
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
<!-- 指定MapperScannerConfigurer要扫描的包 -->
<property name="basePackage" value="com.quant.dao" />
<!-- 指定MapperScannerConfigurer要扫描的注解， 该注解需要自定义。 -->
<property name="annotationClass" value="com.quant.annotation.MyBatisRepository" />
</bean>
<context:component-scan base-package="com.quant" />
<mvc:annotation-driven/>
<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
<property name="prefix" value="/WEB-INF/"></property>
<property name="suffix" value=".jsp"></property>
</bean>
<!-- 拦截器 -->
<mvc:interceptors>
<!-- 登录检查拦截器 -->
<mvc:interceptor>
<!-- 可以拦截一切请求 -->
<mvc:mapping path="/operation/**"/>
<!-- 排除登录方法，应包括登录成功
之前的调用所有方法 -->
<mvc:exclude-mapping path="/operation/admin/loginCheck.do"/>
<mvc:exclude-mapping path="/operation/admin/toLoginCheck.do"/>
<!-- 声明拦截器组件 -->
<bean class="com.quant.interceptor.CheckLoginInterceptor"/>
</mvc:interceptor>
</mvc:interceptors>
<!-- 日志记录拦截器 -->
<mvc:interceptors>
<!-- 日志检查拦截器 -->
<mvc:interceptor>
<!-- 可以拦截一切请求 -->
<mvc:mapping path="/operation/**"/>
<!-- 声明拦截器组件 -->
<bean class="com.quant.interceptor.LogInterceptor"/>
</mvc:interceptor>
</mvc:interceptors>
</beans>
\ No newline at end of file
WebRoot/WEB-INF/classes/config.properties deleted 100755 → 0
View file @ bf41744f
password=qwersdfqqwerewq\#$^dfgghtt
company_id_min=1231
common_subclass_id_min=1023
manager_id_min=1093
news_id_min=34324
product_id_min=3244
\u65B0\u95FB\u8D44\u8BAF=1
duration=9
investorScope=12
closedPeriod=9
investmentRegion=11
minorStrategy=6
majorStrategy=6
mihf=5
issuePortal=2
currencyType=8
supervisionUnits=7
practitioners=10
uid_min=2133
majorStatus=16
education=17
productType=18
entirePeriod=19
srcBestNews=upload/template/srcBestNews.js
dstBestNews=upload/template/dstBestNews.js
srcMoreNews=upload/template/srcMoreNews.js
dstMoreNews=upload/template/dstMoreNews.js
\ No newline at end of file
WebRoot/WEB-INF/classes/db.properties deleted 100755 → 0
View file @ bf41744f
driver=com.mysql.jdbc.Driver
url=jdbc:mysql://127.0.0.1:3306/work?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&noDatetimeStringSync=true
user=root
pwd=123456
initialSize=1
maxIdle=2
maxActive=2
#minPoolSize=1
#maxPoolSize=2
#username=lhh
#password=123456
#url=jdbc:oracle:thin:@localhost:1521:xe
#driverClassName=oracle.jdbc.OracleDriver
#initialSize=5
#maxActive=30
#maxIdle=10
#minIdle=5
#maxWait=3000
#removeAbandoned=true
#removeAbandonedTimeout=180
WebRoot/WEB-INF/classes/hibernate.cfg.xml deleted 100755 → 0
View file @ bf41744f
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE hibernate-configuration PUBLIC
"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
<!-- Generated by MyEclipse Hibernate Tools. -->
<hibernate-configuration>
<session-factory>
<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
<property name="connection.url">jdbc:mysql://10.202.100.234:3306/work</property>
<property name="connection.username">ggm</property>
<property name="connection.password">123456</property>
<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
<property name="myeclipse.connection.profile">quant</property>
</session-factory>
</hibernate-configuration>
\ No newline at end of file
WebRoot/WEB-INF/classes/logConfig.xml deleted 100755 → 0
View file @ bf41744f
<?xml version='1.0' encoding='UTF-8'?>
<config>
<addManager>添加理财师</addManager>
<modifyManager>修改理财师</modifyManager>
<updateMeeting>修改会议</updateMeeting>
<addMeeting>添加会议</addMeeting>
<deleteMeeting>删除会议</deleteMeeting>
<modifyMeetingRegist>修改会议报名信息</modifyMeetingRegist>
<deleteMeetingRegist>删除会议报名信息</deleteMeetingRegist>
<pubNews>发布新闻</pubNews>
<updateNews>修改新闻</updateNews>
<deleteNews>删除新闻</deleteNews>
<loginCheck>登录</loginCheck>
<addAdmin>添加用户</addAdmin>
<changePassword>修改密码</changePassword>
<deleteAttachment>删除附件</deleteAttachment>
<updateAttachment>更新附件</updateAttachment>
<addCompany>添加公司</addCompany>
<modifyCompany>更新公司信息</modifyCompany>
<insertSql>向数据库插入数据</insertSql>
<UpdateFinancialManager>更新理财师信息</UpdateFinancialManager>
<updateUser>修改用户信息</updateUser>
<modifyUserOrder>修改用户订单</modifyUserOrder>
<UpdateUserOrderInvestor>修改下单投资人信息</UpdateUserOrderInvestor>
<deleteSms>删除短信</deleteSms>
<updateCategory>修改主类别</updateCategory>
<addCategory>添加主类别</addCategory>
<updateSubclass>修改子类别</updateSubclass>
<addSubclass>添加子类别</addSubclass>
<addProductType>添加产品类别</addProductType>
<addProduct>添加产品</addProduct>
<modifyProduct>修改产品信息</modifyProduct>
<uplodeAttachment>上传附件</uplodeAttachment>
<deleteAttachment>删除附件</deleteAttachment>
<addOrModifyProductCommission>新增或修改产品返佣金额</addOrModifyProductCommission>
<addOrModifyProductDescription>新增或修改产品其他描述信息</addOrModifyProductDescription>
<modifySort>修改产品的在页面显示的排序</modifySort>
</config>
\ No newline at end of file
WebRoot/WEB-INF/web.xml
View file @ 9eee0ed4
......@@ -4,10 +4,16 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<display-name></display-name>
<display-name></display-name>
<!--
访问http://localhost:8888的时候会自动跳转到http://localhost:8888/home/toWebsite.do
-->
<welcome-file-list>
<welcome-file>/home/toWebsite.do</welcome-file>
</welcome-file-list>
</welcome-file-list>
<!--
DispatcherServlet
-->
<servlet>
<servlet-name>spring</servlet-name>
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
......
WebRoot/WEB-INF/website/home_page.jsp
View file @ 9eee0ed4
......@@ -91,7 +91,7 @@
<p class="clear">投资起点：${product.leastAmount }万</p>
<div class="jdline clear">
<div class="bars"><span style="width:<c:choose><c:when test="${i.count == 1}">65</c:when><c:when test="${i.count == 2}">70</c:when><c:when test="${i.count == 3}">93</c:when><c:otherwise>66</c:otherwise></c:choose>%;"></span></div>
<p><em>5月15日截止</em><i>募集进度</i></p>
<p><em>12月31日截止</em><i>募集进度</i></p>
</div>
<a href="/product/order.do?productId=${product.productId }">立即预约</a>
</li>
......@@ -152,7 +152,7 @@
<span class="span03">净值(元)</span>
<span class="span04">最新净值日</span>
</p>
<h3>定增基金</h3>
<h3>净值披露</h3>
</dt>
<c:forEach items="${classicProduct }" var="product" varStatus="i">
......
WebRoot/website/css/kkcss.css
View file @ 9eee0ed4
......@@ -30,7 +30,7 @@ body{
.nav li .navli a{ display:block; height:26px; line-height:26px; border-bottom:1px solid #d4c28c; overflow:hidden;}
.nav li .navli a:hover{ background:#b29448;}
/*banner样式*/
/*banner��ʽ*/
.fullSlide{width:100%;position:relative;height:594px; overflow:hidden; z-index:0;}
.fullSlide .bd{margin:0 auto;position:relative;z-index:0;overflow:hidden;}
.fullSlide .bd ul{width:100% !important;}
......@@ -96,7 +96,7 @@ body{
.cpjz{ width:100%; margin-top:80px;}
.jz-con{ margin-top:15px;}
.l-jz{ width:668px; height:290px; color:#221815;}
.l-jz{ width:668px; min-height:335px; color:#221815;}
.l-jz span{ display:inline-block; float:left; height:54px; line-height:54px; text-align:center; padding:0 2%;}
.l-jz span.span01{ width:45%; text-align:left;}
.l-jz span.span02{ width:13%;}
......@@ -147,7 +147,7 @@ body{
.footer em a.icon_qq{ width:30px; background:url(../images/icon_qq.png) center center no-repeat;}
.footer em a.icon_wx{ width:30px; background:url(../images/icon_wx.png) center center no-repeat;}
/*内页样式*/
/*��ҳ��ʽ*/
.subhead{ height:32px; background:#2a2c2f; padding:30px 0 30px 0;}
.subhead .nav{ width:1000px; line-height:32px; margin:5px 0 0 20px;}
.subhead .nav li{ float:left; width:135px; text-align:center; font-size:18px; margin-right:10px;}
......@@ -263,7 +263,7 @@ body{
/*分页样式*/
/*��ҳ��ʽ*/
.page{ height:25px; line-height:25px; text-align:right; margin:30px 0 10px; font-family:"Arial";}
.page a,.page a:visited{ display:inline-block; height:25px; padding:0 8px; background:#fff; border:1px solid #555; color:#555; text-decoration:none; margin:0 2px;}
.page a:hover{ background:#dbb761; border:1px solid #dbb761; color:#fff;}
......@@ -271,7 +271,7 @@ body{
.page span{display:inline-block; background:#fff; border:1px solid #555; color:#555; height:25px; padding:0 8px; margin:0 2px;}
.page span.current{ background:#dbb761; border:1px solid #dbb761; color:#fff;}
/*分篇样式*/
/*��ƪ��ʽ*/
.fenpian{
width:100%;
height:60px;
......@@ -285,7 +285,7 @@ body{
.ddbox ul li {font-size:14px;}
/*3月增加样式*/
/*3��������ʽ*/
.mulist{ width:160px; overflow:hidden; padding-left:25px; margin-right:10px; text-align:left;}
.mulist li{ height:22px; line-height:22px; margin-bottom:20px; overflow:hidden; font-size:16px;}
.abtimg{ width:418px; height:258px; overflow:hidden;}
......
src/com/quant/controller/WebsiteController.java
View file @ 9eee0ed4
......@@ -47,6 +47,7 @@ public class WebsiteController extends BaseController{
p.setProductTypeName(this.getTablefield(p.getProductType()));
}
List<ProductRelationVO> classicProduct = productMapper.findClassicProduct();
//按照newsType=1095 1096取
List<News> newsList1 = websiteMapper.findHotNews(1095);
List<News> newsList2 = websiteMapper.findHotNews(1096);
model.addAttribute("newProduct", newProduct);
......@@ -198,7 +199,7 @@ public class WebsiteController extends BaseController{
map.put("productId", productId);
map.put("currentProduct", pb);
map.put("typeId", typeId);
return "website/product/hotfunds";
}
......@@ -225,7 +226,7 @@ public class WebsiteController extends BaseController{
@RequestMapping("/product/order.do")
public String getStatement(ModelMap map, Integer productId) {
List<ProductBasic> productList = productMapper.findProductByCompanyId(1002);
ProductRelationVO pb;
if (productId == null) {
pb = productMapper.findLastProductByCompanyId(1002);
......@@ -233,7 +234,7 @@ public class WebsiteController extends BaseController{
pb = productMapper.findProductByProductId(productId);
}
//目前只有两个类型有产品，其它的都是空的
List<ProductBasic> productList = productMapper.findProductByCompanyId(1002);
map.put("currentProduct", pb);
map.put("productList", productList);
map.put("productId", productId);
......@@ -354,8 +355,6 @@ public class WebsiteController extends BaseController{
vo.setHs(hs);
vo.setProductId(productId);
List<ProductPerformance> list = productMapper.getProductPerformance(vo);
List<ProductPerformance> _tmp = productMapper.getHSPerformance(list.get(0).getExpiryDate());
List<ProductPerformance> hsList = com.quant.comm.FundsPerformance.getHS300(_tmp, list);
HashMap<String, Object> map= new HashMap<String,Object>();
List pdata = new ArrayList();
List hsdata = new ArrayList();
......@@ -373,6 +372,8 @@ public class WebsiteController extends BaseController{
}else{
map.put("pdata", null);
}
List<ProductPerformance> _tmp = productMapper.getHSPerformance(list.get(0).getExpiryDate());
List<ProductPerformance> hsList = com.quant.comm.FundsPerformance.getHS300(_tmp, list);
if(hsList!=null){
for(ProductPerformance p:hsList){
List l = new ArrayList();
......@@ -387,6 +388,7 @@ public class WebsiteController extends BaseController{
}else{
map.put("hsdata", null);
}
JsonEntity json = this.getJsonInstance();
json.setData(map);
json.flush(response);
......
src/com/quant/entity/AdminstrationUser.java
View file @ 9eee0ed4
......@@ -3,6 +3,7 @@ package com.quant.entity;
import java.util.Date;
/**
* 管理员
* AdminstrationUser entity. @author MyEclipse Persistence Tools
*/
......
src/com/quant/entity/Attachment.java
View file @ 9eee0ed4
......@@ -3,6 +3,7 @@ package com.quant.entity;
import java.sql.Timestamp;
/**
* 附件
* Attachment entity. @author MyEclipse Persistence Tools
*/
......
src/com/quant/entity/City.java
View file @ 9eee0ed4
package com.quant.entity;
/**
* 城市
* City entity. @author MyEclipse Persistence Tools
*/
......
src/com/quant/entity/CommissionRate.java
View file @ 9eee0ed4
package com.quant.entity;
/**
* 比率
* CommissionRate entity. @author MyEclipse Persistence Tools
*/
......
src/com/quant/interceptor/LogInterceptor.java
View file @ 9eee0ed4
......@@ -48,7 +48,9 @@ public class LogInterceptor implements HandlerInterceptor {
}
user=LoginSecret.getCookie(request, response, "name");
}
content = content.substring(0, 255);
if(content.length() > 255) {
content = content.substring(0, 255);
}
String ip=CommTool.getIP(request);
Log log=new Log(null, user, operation, null, ip, content);
logMapper.addLog(log);
......
src/com/quant/mapper/ProductMapper.xml
View file @ 9eee0ed4
......@@ -309,7 +309,7 @@
select pb.product_type, pb.shorter_name,pb.product_name,pb.product_id,pb.bright_point, pb.expected_profit,ps.least_amount,cs.title from product_issue pi
join product_basic pb on pi.product_id=pb.product_id
join product_subscribe ps on pi.product_id=ps.product_id
join common_subclass cs on pi.duration=cs.subclass_id where pb.status = 1 and pb.show_status=1
join common_subclass cs on pi.duration=cs.subclass_id where pb.status = 1
order by pb.sort_id desc limit 0,4
</select>
<!-- 获取典型的产品 -->
......@@ -320,8 +320,8 @@
(select p.product_id, p.expiry_date,p.net_value
from product_performance p order by p.expiry_date desc ) p
group by p.product_id) pp on pp.product_id=pb.product_id
where pb.status != 1
order by pb.sort_id limit 0,5
where pb.status = 2
order by pb.sort_id limit 0,5
</select>
<!-- 20150214修改，企业站 -->
......@@ -372,7 +372,7 @@
</select>
<!-- 获取公司下的产品 -->
<select id="findProductByCompanyId" parameterType="int" resultMap="productBasicResult">
select product_id, product_name, shorter_name, company_id from product_basic where company_id = #{companyId} order by id desc
select product_id, product_name, shorter_name, company_id from product_basic order by id desc
</select>
<resultMap id="productBasicResult" type="com.quant.entity.ProductBasic">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment