Skip to content

J
jfV5portal
Commit 69d0fe7e by 周王清
Options

修改imp 一个bug，表名修改

parent e981d246
Showing with 23 additions and 193 deletions
WebContent/WEB-INF/web.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<display-name>jfV5portal</display-name>
<context-param>
<param-name>webAppRootKey</param-name>
<param-value>jfV5portal.root</param-value>
</context-param>
<context-param>
<!-- log4j配置文件位置 -->
<param-name>log4jConfigLocation</param-name>
<param-value>/WEB-INF/conf/gaowj/bl/log4j.properties</param-value>
</context-param>
<context-param>
<param-name>log4jRefreshInterval</param-name>
<param-value>6000</param-value>
</context-param>
<!-- log4j监听器 -->
<listener>
<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
</listener>
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>/WEB-INF/conf/gaowj/bl/applicationContext-business.xml</param-value>
</context-param>
<!-- 启用Web监控统计功能 -->
<filter>
<filter-name>DruidWebStatFilter</filter-name>
<filter-class>com.alibaba.druid.support.http.WebStatFilter</filter-class>
<init-param>
<param-name>exclusions</param-name>
<param-value>*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*</param-value>
</init-param>
</filter>
<filter-mapping>
<filter-name>DruidWebStatFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<servlet>
<servlet-name>DruidStatView</servlet-name>
<servlet-class>com.alibaba.druid.support.http.StatViewServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>DruidStatView</servlet-name>
<url-pattern>/druid/*</url-pattern>
</servlet-mapping>
<!-- spring监听器-->
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
<!-- spring监听器,使用scrope=request 时必须加上-->
<listener>
<listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
</listener>
<listener>
<listener-class>
com.gaowj.business.listener.myHttpSessionAttributeListener
</listener-class>
</listener>
<!-- 该过滤器负责用户的认证工作，必须启用它 -->
<filter>
<filter-name>CASFilter</filter-name>
<filter-class>org.jasig.cas.client.authentication.AuthenticationFilter</filter-class>
<init-param>
<param-name>casServerLoginUrl</param-name>
<param-value>http://localhost:8080/cas-jfsso/login</param-value><!-- cas 服务器登录 地址 http://IP:PORT/CasWebProName/login -->
</init-param>
<init-param>
<!-- 这里的server是服务端的IP -->
<param-name>serverName</param-name>
<param-value>http://localhost:8081</param-value><!-- 客户端服务器地址 http://IP:PORT -->
</init-param>
</filter>
<filter-mapping>
<filter-name>CASFilter</filter-name>
<url-pattern>/jfcas</url-pattern>
<!-- <url-pattern>/*</url-pattern> -->
</filter-mapping>
<!-- 该过滤器负责对Ticket的校验工作，必须启用它 -->
<filter>
<filter-name>CAS Validation Filter</filter-name>
<filter-class>org.jasig.cas.client.validation.Cas20ProxyReceivingTicketValidationFilter</filter-class>
<init-param>
<param-name>casServerUrlPrefix</param-name>
<param-value>http://localhost:8080/cas-jfsso</param-value><!-- cas 服务器地址 http://IP:PORT/CasWebProName -->
</init-param>
<init-param>
<param-name>serverName</param-name>
<param-value>http://localhost:8081</param-value><!-- 客户端服务器地址 http://IP:PORT -->
</init-param>
</filter>
<filter-mapping>
<filter-name>CAS Validation Filter</filter-name>
<url-pattern>/jfcas</url-pattern>
</filter-mapping>
<!-- 该过滤器负责实现HttpServletRequest请求的包裹，
比如允许开发者通过HttpServletRequest的getRemoteUser()方法获得SSO登录用户的登录名，可选配置。 -->
<filter>
<filter-name>CAS HttpServletRequest Wrapper Filter</filter-name>
<filter-class>org.jasig.cas.client.util.HttpServletRequestWrapperFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>CAS HttpServletRequest Wrapper Filter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<!-- 单点注销监听器 -->
<listener>
<listener-class>org.jasig.cas.client.session.SingleSignOutHttpSessionListener</listener-class>
</listener>
<!-- 单点注销过滤器 -->
<filter>
<filter-name>caslogoutFilter</filter-name>
<filter-class>org.jasig.cas.client.session.SingleSignOutFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>caslogoutFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter>
<filter-name>struts2</filter-name>
<filter-class>com.gaowj.business.filter.myStrutsPrepareAndExecuteFilter</filter-class>
<!-- org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter//com.gaowj.business.filter.myStrutsPrepareAndExecuteFilter -->
</filter>
<filter-mapping>
<filter-name>struts2</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<servlet>
<servlet-name>initServlet</servlet-name>
<servlet-class>com.gaowj.business.util.InitServlet</servlet-class>
<load-on-startup>2</load-on-startup>
</servlet>
<!-- 是否允许同一帐号多地登陆,为1则允许,为0则不允许-->
<context-param>
<param-name>MultiUserLogin</param-name>
<param-value>1</param-value>
</context-param>
<!-- 是否启用验证码,为1则启用,其它数字默认为不启用-->
<context-param>
<param-name>yzm</param-name>
<param-value>1</param-value>
</context-param>
<session-config>
<session-timeout>60</session-timeout>
</session-config>
<welcome-file-list>
<welcome-file>cas.jsp</welcome-file>
</welcome-file-list>
<error-page>
<error-code>404</error-code>
<location>/system/pages/error/error404.jsp</location>
</error-page>
<error-page>
<error-code>500</error-code>
<location>/system/pages/error/error50x.jsp</location>
</error-page>
</web-app>
src_jwapp/com/jw/app/business/attendance/AttendanceBusinessImpl.java
......@@ -39,7 +39,7 @@ public class AttendanceBusinessImpl implements AttendanceBusiness {
entity.put("USER_ID", SessionUtil.getEmid());
}
if(entity.get("USER_NAME")==null){
entity.put("USER_NAME", SessionUtil.getEmname());
entity.put("USER_NAME", SessionUtil.getCode());
}
if(entity.get("DEPT_ID")==null){
entity.put("DEPT_ID", SessionUtil.getEmdepart());
......
src_jwapp/com/jw/app/business/bgmk/BgmkBusinessImpl.java
......@@ -38,7 +38,7 @@ public class BgmkBusinessImpl implements BgmkBusiness {
entity.put("CREATE_TIME", new Date());
}
if(entity.get("USER_NAME")==null){
entity.put("USER_NAME", SessionUtil.getEmname());
entity.put("USER_NAME", SessionUtil.getCode());
}
if(entity.get("CREATOR_ID")==null){
entity.put("CREATOR_ID", SessionUtil.getCode());
......
src_jwapp/com/jw/app/business/bgmk/bgmkDAO.xml
......@@ -3,7 +3,7 @@
<mapper namespace="com.jw.app.business.bgmk.bgmkDAO">
<insert id="insert_bgmk" parameterType="map">
insert into C_T_WORK_BG(
insert into WORK_BG(
<trim prefix="" suffixOverrides=",">
<foreach collection="infoListKey" item="key">
${key},
......@@ -20,7 +20,7 @@
<update id="update_bgmk" parameterType="map">
<![CDATA[
update C_T_WORK_BG set
update WORK_BG set
]]>
<trim prefix="" suffixOverrides=",">
<foreach collection="info" item="info">
......@@ -36,7 +36,7 @@
<delete id="delete_bgmk" parameterType="list">
<![CDATA[
delete from C_T_WORK_BG where UUID IN
delete from WORK_BG where UUID IN
]]>
<foreach collection="list" item="UUID" open="(" separator=","
close=")">
......@@ -47,7 +47,7 @@
<select id="list_bgmk" parameterType="map" resultType="upperCaseKeyMap">
<![CDATA[
select f.*
from C_T_WORK_BG f where 1=1
from WORK_BG f where 1=1
]]>
<if test="UUID != null and UUID != ''">
and f.UUID = #{UUID}
......@@ -92,7 +92,7 @@
<select id="listCount_bgmk" parameterType="map" resultType="int">
<![CDATA[
select count(*) c from C_T_WORK_BG f where 1=1
select count(*) c from WORK_BG f where 1=1
]]>
<if test="UUID != null and UUID != ''">
and f.UUID = #{UUID}
......@@ -137,7 +137,7 @@
<select id="list_bgmk_employee" parameterType="map" resultType="upperCaseKeyMap">
<![CDATA[
select f.*
from C_T_WORK_BG f where 1=1
from WORK_BG f where 1=1
]]>
<if test="UUID != null and UUID != ''">
and f.UUID = #{UUID}
......@@ -182,7 +182,7 @@
<select id="listCount_bgmk_employee" parameterType="map" resultType="int">
<![CDATA[
select count(*) c from C_T_WORK_BG f where 1=1
select count(*) c from WORK_BG f where 1=1
]]>
<if test="UUID != null and UUID != ''">
and f.UUID = #{UUID}
......
src_jwapp/com/jw/app/business/friendlink/FriendLinkBusinessImpl.java
package com.jw.app.business.friendlink;
import java.text.BreakIterator;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Date;
......@@ -61,6 +62,7 @@ public class FriendLinkBusinessImpl implements FriendLinkBusiness {
int count = friendlinkDAO.list_count_friendlink(query);
if(count>=8){
info.put("ERROR", "-1");
throw new BusinessException("");
}
// 表示新增
info.put("UUID", UUID.randomUUID().toString());
......
src_jwapp/com/jw/app/business/friendlink/friendlinkDAO.xml
......@@ -22,7 +22,7 @@
<select id="list_friendlink" parameterType="map" resultType="upperCaseKeyMap">
<![CDATA[
select * from b_t_ufp_friendlink t
select * from friendlink t
]]>
<include refid="where" />
ORDER BY t.sort
......@@ -30,14 +30,14 @@
<select id="list_count_friendlink" parameterType="map" resultType="int">
<![CDATA[
select count(*) from b_t_ufp_friendlink t
select count(*) from friendlink t
]]>
<include refid="where" />
ORDER BY t.sort
</select>
<insert id="insert_friendlink" parameterType="java.util.List">
insert into b_t_ufp_friendlink(
insert into friendlink(
<trim prefix="" suffixOverrides=",">
<foreach collection="list" item="field">
${field.key},
......@@ -53,7 +53,7 @@
</insert>
<update id="update_friendlink" parameterType="java.util.List">
update b_t_ufp_friendlink set
update friendlink set
<trim prefix="" suffixOverrides=",">
<foreach collection="list" item="field">
${field.key}=#{field.value},
......@@ -63,6 +63,6 @@
</update>
<delete id="delete_friendlink" parameterType="String">
delete from b_t_ufp_friendlink where UUID=#{uuid}
delete from friendlink where UUID=#{uuid}
</delete>
</mapper>
\ No newline at end of file
src_jwapp/com/jw/app/business/notice/noticeDAO.xml
......@@ -22,7 +22,7 @@
<select id="list_notice" parameterType="map" resultType="upperCaseKeyMap">
<![CDATA[
select * from b_t_ufp_notice t
select * from notice t
]]>
<include refid="where" />
ORDER BY t.CREATE_TIME
......@@ -30,14 +30,14 @@
<select id="list_count_notice" parameterType="map" resultType="int">
<![CDATA[
select count(*) from b_t_ufp_notice t
select count(*) from notice t
]]>
<include refid="where" />
ORDER BY t.CREATE_TIME
</select>
<insert id="insert_notice" parameterType="java.util.List">
insert into b_t_ufp_notice(
insert into notice(
<trim prefix="" suffixOverrides=",">
<foreach collection="list" item="field">
${field.key},
......@@ -53,7 +53,7 @@
</insert>
<update id="update_notice" parameterType="java.util.List">
update b_t_ufp_notice set
update notice set
<trim prefix="" suffixOverrides=",">
<foreach collection="list" item="field">
${field.key}=#{field.value},
......@@ -63,6 +63,6 @@
</update>
<delete id="delete_notice" parameterType="String">
delete from b_t_ufp_notice where UUID=#{uuid}
delete from notice where UUID=#{uuid}
</delete>
</mapper>
\ No newline at end of file
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