dupengyue
2017-03-07 a8b07ffc679a9662f9b6a94a097f8b491ff232e8
框架搭建完成,工作交接

git-svn-id: http://192.168.1.226/svn/proxy@132 454eff88-639b-444f-9e54-f578c98de674
23个文件已修改
303 ■■■■ 已修改文件
VisitFace/face_discern/.classpath 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/face_discern/.settings/org.eclipse.wst.common.component 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/face_discern/.settings/org.eclipse.wst.common.project.facet.core.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/face_discern/pom.xml 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/baseapi/user/PlaceMapper.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/calling/entity/calling.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/checking/entity/Checking.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/checking/entity/CheckingCompany.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Company.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Department.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/EmployeeFace.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Image.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Person.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Place.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Post.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/VisitFace.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/VisitorType.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/Visit.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/VisitMatter.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/VisitStat.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/Visiting.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/face_discern/src/main/resources/log4j.properties 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/face_discern/src/main/webapp/WEB-INF/web.xml 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/face_discern/.classpath
@@ -20,9 +20,10 @@
    <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
        <attributes>
            <attribute name="maven.pomderived" value="true"/>
            <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
        </attributes>
    </classpathentry>
    <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
    <classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.springsource.sts.ide.tomcat.runtimeTarget/Pivotal tc Server Developer Edition (Runtime) v3.2">
        <attributes>
            <attribute name="owner.project.facets" value="jst.web"/>
        </attributes>
VisitFace/face_discern/.settings/org.eclipse.wst.common.component
@@ -5,6 +5,6 @@
        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
        <property name="java-output-path" value="/face_discern/target/classes"/>
        <property name="context-root" value="jf-console"/>
        <property name="context-root" value="face_discern"/>
    </wb-module>
</project-modules>
VisitFace/face_discern/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
  <runtime name="Apache Tomcat v7.0"/>
  <runtime name="Pivotal tc Server Developer Edition (Runtime) v3.2"/>
  <fixed facet="wst.jsdt.web"/>
  <installed facet="java" version="1.7"/>
  <installed facet="jst.web" version="2.5"/>
  <installed facet="wst.jsdt.web" version="1.0"/>
  <installed facet="jst.jaxrs" version="2.0"/>
  <installed facet="java" version="1.7"/>
</faceted-project>
VisitFace/face_discern/pom.xml
@@ -321,6 +321,4 @@
      </plugin>
    </plugins>
  </build>
</project>
</project>
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/baseapi/user/PlaceMapper.java
@@ -14,4 +14,7 @@
    int updateByPrimaryKeySelective(Place record);
    int updateByPrimaryKey(Place record);
    Integer qureyCompanyIDByAuthorizationID(String authorizationid);
}
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/calling/entity/calling.java
@@ -1,9 +1,15 @@
package cn.com.basic.face.discern.calling.entity;
import java.io.Serializable;
import java.util.Date;
public class calling {
    private Integer id;
public class calling implements Serializable{
    /**
     *
     */
    private static final long serialVersionUID = 1L;
    private Integer id;
    private Date calldt;
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/checking/entity/Checking.java
@@ -1,9 +1,15 @@
package cn.com.basic.face.discern.checking.entity;
import java.io.Serializable;
import java.util.Date;
public class Checking {
    private Integer id;
public class Checking implements Serializable{
    /**
     *
     */
    private static final long serialVersionUID = 1L;
    private Integer id;
    private Byte statusid;
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/checking/entity/CheckingCompany.java
@@ -1,7 +1,14 @@
package cn.com.basic.face.discern.checking.entity;
public class CheckingCompany {
    private Integer personid;
import java.io.Serializable;
public class CheckingCompany implements Serializable{
    /**
     *
     */
    private static final long serialVersionUID = 1L;
    private Integer personid;
    private Integer companyid;
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Company.java
@@ -1,7 +1,21 @@
package cn.com.basic.face.discern.user.entity;
public class Company {
    private Integer id;
import java.io.Serializable;
/**
 * @简介:
 * @author dpy
 * @内容说明:
 * @版本:
 *
 */
public class Company implements Serializable{
    /**
     *
     */
    private static final long serialVersionUID = 1L;
    private Integer id;
    private String name;
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Department.java
@@ -1,7 +1,14 @@
package cn.com.basic.face.discern.user.entity;
public class Department {
    private Integer id;
import java.io.Serializable;
public class Department implements Serializable{
    /**
     *
     */
    private static final long serialVersionUID = 1L;
    private Integer id;
    private String label;
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/EmployeeFace.java
@@ -1,7 +1,14 @@
package cn.com.basic.face.discern.user.entity;
public class EmployeeFace {
    private Integer id;
import java.io.Serializable;
public class EmployeeFace implements Serializable{
    /**
     *
     */
    private static final long serialVersionUID = 1L;
    private Integer id;
    private Integer registercompanyid;
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Image.java
@@ -1,7 +1,14 @@
package cn.com.basic.face.discern.user.entity;
public class Image {
    private Integer personid;
import java.io.Serializable;
public class Image implements Serializable{
    /**
     *
     */
    private static final long serialVersionUID = 1L;
    private Integer personid;
    private String imagetye;
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Person.java
@@ -1,9 +1,15 @@
package cn.com.basic.face.discern.user.entity;
import java.io.Serializable;
import java.util.Date;
public class Person {
    private Integer id;
public class Person implements Serializable{
    /**
     *
     */
    private static final long serialVersionUID = 1L;
    private Integer id;
    private String name;
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Place.java
@@ -1,7 +1,14 @@
package cn.com.basic.face.discern.user.entity;
public class Place {
    private Integer id;
import java.io.Serializable;
public class Place implements Serializable{
    /**
     *
     */
    private static final long serialVersionUID = 1L;
    private Integer id;
    private Integer companyid;
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Post.java
@@ -1,7 +1,14 @@
package cn.com.basic.face.discern.user.entity;
public class Post {
    private Integer id;
import java.io.Serializable;
public class Post implements Serializable{
    /**
     *
     */
    private static final long serialVersionUID = 1L;
    private Integer id;
    private String label;
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/VisitFace.java
@@ -1,7 +1,14 @@
package cn.com.basic.face.discern.user.entity;
public class VisitFace {
    private Integer id;
import java.io.Serializable;
public class VisitFace implements Serializable{
    /**
     *
     */
    private static final long serialVersionUID = 1L;
    private Integer id;
    private Integer personid;
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/VisitorType.java
@@ -1,7 +1,14 @@
package cn.com.basic.face.discern.user.entity;
public class VisitorType {
    private Integer id;
import java.io.Serializable;
public class VisitorType implements Serializable{
    /**
     *
     */
    private static final long serialVersionUID = 1L;
    private Integer id;
    private String label;
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/Visit.java
@@ -1,9 +1,15 @@
package cn.com.basic.face.discern.visit.entity;
import java.io.Serializable;
import java.util.Date;
public class Visit {
    private Integer id;
public class Visit implements Serializable{
    /**
     *
     */
    private static final long serialVersionUID = 1L;
    private Integer id;
    private Integer visitorpersonid;
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/VisitMatter.java
@@ -1,7 +1,14 @@
package cn.com.basic.face.discern.visit.entity;
public class VisitMatter {
    private Integer id;
import java.io.Serializable;
public class VisitMatter implements Serializable{
    /**
     *
     */
    private static final long serialVersionUID = 1L;
    private Integer id;
    private Integer companyid;
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/VisitStat.java
@@ -1,7 +1,14 @@
package cn.com.basic.face.discern.visit.entity;
public class VisitStat {
    private Integer personid;
import java.io.Serializable;
public class VisitStat implements Serializable{
    /**
     *
     */
    private static final long serialVersionUID = 1L;
    private Integer personid;
    private Integer registercompanyid;
VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/Visiting.java
@@ -1,9 +1,15 @@
package cn.com.basic.face.discern.visit.entity;
import java.io.Serializable;
import java.util.Date;
public class Visiting {
    private Integer id;
public class Visiting implements Serializable{
    /**
     *
     */
    private static final long serialVersionUID = 1L;
    private Integer id;
    private Integer visitid;
VisitFace/face_discern/src/main/resources/log4j.properties
@@ -1,31 +1,21 @@
log4j.rootLogger=DEBUG,myLogger,logFile
log4j.appender.myLogger=org.apache.log4j.ConsoleAppender
log4j.appender.myLogger.Threshold=DEBUG
log4j.appender.myLogger.ImmediateFlush=true
log4j.appender.myLogger.Target=System.out
log4j.appender.myLogger.layout=org.apache.log4j.PatternLayout
log4j.appender.myLogger.layout.ConversionPattern=[%-5p] %d(%r) --> [%t] %l: %m %x %n
log4j.rootLogger=DEBUG,stdout,R
log4j.logger.org.mybatis=debug
log4j.logger.com.trusdom=DEBUG
log4j.logger.java.sql=DEBUG
log4j.logger.java.sql.PreparedStatement=DEBUG
log4j.logger.java.sql.Statement=DEBUG
log4j.logger.java.sql.Connection=DEBUG
log4j.logger.java.sql.ResultSet=DEBUG
#### First appender writes to console
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.logger.com.mchange.v2=ERROR
log4j.logger.org.springframework=ERROR
log4j.logger.org.mybatis.spring.mapper=ERROR
# Pattern to output the caller's file name and line number.
log4j.appender.stdout.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss}] %-5p [%t] %c (%M:%L) - %m%n
log4j.logger.com.atguigu=debug
log4j.appender.logFile=org.apache.log4j.FileAppender
log4j.appender.logFile.Threshold=DEBUG
log4j.appender.logFile.ImmediateFlush=true
log4j.appender.logFile.Append=true
log4j.appender.logFile.File=D:/myserver/var/log/face_discern_log/face_discern_log.log4j
log4j.appender.logFile.layout=org.apache.log4j.PatternLayout
log4j.appender.logFile.layout.ConversionPattern=[%-5p] %d(%r) --> [%t] %l: %m %x %n
#### Second appender writes to a file
log4j.appender.R=org.apache.log4j.RollingFileAppender
log4j.appender.R.File=/usr/local/tomcat/logs/cbip-company-co.log
# Control the maximum log file size
log4j.appender.R.MaxFileSize=1000KB
# Archive log files (one backup file here)
log4j.appender.R.MaxBackupIndex=20
log4j.appender.R.layout=org.apache.log4j.PatternLayout
log4j.appender.R.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss}] %-5p [%t] %c (%M:%L) - %m%n
VisitFace/face_discern/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,60 @@
<!DOCTYPE web-app PUBLIC
 "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
 "http://java.sun.com/dtd/web-app_2_3.dtd" >
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xmlns="http://java.sun.com/xml/ns/javaee"
    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
    id="WebApp_ID" version="2.5">
    <display-name>face_discern</display-name>
<web-app>
  <display-name>Archetype Created Web Application</display-name>
</web-app>
    <context-param>
        <param-name>contextConfigLocation</param-name>
        <param-value>classpath:/spring/spring-context.xml</param-value>
    </context-param>
    <listener>
        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
    </listener>
    <filter>
        <filter-name>CharacterEncodingFilter</filter-name>
        <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
        <init-param>
            <param-name>encoding</param-name>
            <param-value>UTF-8</param-value>
        </init-param>
        <init-param>
            <param-name>forceEncoding</param-name>
            <param-value>true</param-value>
        </init-param>
    </filter>
    <filter-mapping>
        <filter-name>CharacterEncodingFilter</filter-name>
        <url-pattern>/*</url-pattern>
    </filter-mapping>
    <filter>
        <filter-name>HiddenHttpMethodFilter</filter-name>
        <filter-class>org.springframework.web.filter.HiddenHttpMethodFilter</filter-class>
    </filter>
    <filter-mapping>
        <filter-name>HiddenHttpMethodFilter</filter-name>
        <url-pattern>/*</url-pattern>
    </filter-mapping>
    <servlet>
        <servlet-name>springDispatcherServlet</servlet-name>
        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
        <init-param>
            <param-name>contextConfigLocation</param-name>
            <param-value>classpath:/spring/springmvc-context.xml</param-value>
        </init-param>
        <load-on-startup>1</load-on-startup>
    </servlet>
    <servlet-mapping>
        <servlet-name>springDispatcherServlet</servlet-name>
        <url-pattern>/</url-pattern>
    </servlet-mapping>
    <welcome-file-list>
        <welcome-file>index.jsp</welcome-file>
    </welcome-file-list>
</web-app>