Skip to content

update again 09.08 #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
greenHandProgramer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update again 09.08 #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/main/java/com/lungcare/dicomfile/dao/impl/UserDAOImp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ public List<User> getAllUsers(){

public void addUser(String user_account,String user_name,String user_password,int user_age,int user_gender,int user_role,String user_tel,String user_address){



User user = new User();
user.setAccount(user_account);
user.setPassword(user_password);
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/com/lungcare/dicomfile/entity/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ public class User {
private Date lastLoginTime;//最后一次登陆时间
private int gender;//性别 0表示男 1表示女

private String email;//用户邮箱

@ManyToOne(cascade = { CascadeType.PERSIST }, fetch = FetchType.EAGER)
private Role ro;

Expand All @@ -40,6 +42,12 @@ public class User {



public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public int getId() {
return id;
}
Expand Down
Binary file modified src/main/webapp/WEB-INF/classes/com/lungcare/dicomfile/dao/impl/UserDAOImp.class
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/webapp/WEB-INF/classes/com/lungcare/dicomfile/entity/User.class
View file
Open in desktop
Binary file not shown.
29 changes: 29 additions & 0 deletions src/main/webapp/WEB-INF/logs/ssh.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33940,3 +33940,32 @@ Caused by: org.hibernate.MappingException: Could not determine type for: com.lun
2015-09-08 15:06:32,832 INFO [org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBean] - Building new Hibernate SessionFactory
2015-09-08 15:06:33,677 INFO [org.springframework.orm.hibernate3.HibernateTransactionManager] - Using DataSource [org.springframework.jdbc.datasource.DriverManagerDataSource@1800b96] of Hibernate SessionFactory for HibernateTransactionManager
2015-09-08 15:06:33,683 INFO [org.springframework.web.context.ContextLoader] - Root WebApplicationContext: initialization completed in 1642 ms
2015-09-08 15:21:44,690 INFO [org.springframework.web.context.ContextLoader] - Root WebApplicationContext: initialization started
2015-09-08 15:21:44,921 INFO [org.springframework.web.context.support.XmlWebApplicationContext] - Refreshing Root WebApplicationContext: startup date [Tue Sep 08 15:21:44 CST 2015]; root of context hierarchy
2015-09-08 15:21:45,070 INFO [org.springframework.beans.factory.xml.XmlBeanDefinitionReader] - Loading XML bean definitions from URL [file:/G:/wjlProgramFiles/local-git-repository/LungCareRestFulAPI/src/main/webapp/WEB-INF/classes/applicationContext.xml]
2015-09-08 15:21:45,551 INFO [org.springframework.context.annotation.ClassPathBeanDefinitionScanner] - JSR-250 'javax.annotation.ManagedBean' found and supported for component scanning
2015-09-08 15:21:45,555 INFO [org.springframework.context.annotation.ClassPathBeanDefinitionScanner] - JSR-330 'javax.inject.Named' annotation found and supported for component scanning
2015-09-08 15:21:45,949 INFO [org.springframework.beans.factory.xml.XmlBeanDefinitionReader] - Loading XML bean definitions from URL [file:/G:/wjlProgramFiles/local-git-repository/LungCareRestFulAPI/src/main/webapp/WEB-INF/classes/com/lungcare/dicomfile/config/spring-hibernate.xml]
2015-09-08 15:21:46,109 INFO [org.springframework.beans.factory.config.PropertyPlaceholderConfigurer] - Loading properties file from URL [file:/G:/wjlProgramFiles/local-git-repository/LungCareRestFulAPI/src/main/webapp/WEB-INF/classes/com/lungcare/dicomfile/config/jdbc.properties]
2015-09-08 15:21:46,117 INFO [org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor] - JSR-330 'javax.inject.Inject' annotation found and supported for autowiring
2015-09-08 15:21:46,132 INFO [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Pre-instantiating singletons in org.springframework.beans.factory.support.DefaultListableBeanFactory@2cd9fa: defining beans [org.springframework.context.annotation.internalConfigurationAnnotationProcessor,org.springframework.context.annotation.internalAutowiredAnnotationProcessor,org.springframework.context.annotation.internalRequiredAnnotationProcessor,org.springframework.context.annotation.internalCommonAnnotationProcessor,org.springframework.context.annotation.internalPersistenceAnnotationProcessor,customersResource,remoteFileTransferResource,usersResource,org.springframework.beans.factory.config.PropertyPlaceholderConfigurer#0,dataSource,sessionFactory,transactionManager,transactionBase,localFileService,localFileTransferDAO,remoteFileService,remoteFileTransferDAO,algorithmService,algorithmDAO,receiveEntityService,receiveEntityDAO,sendEntityService,sendEntityDAO,userEntityService,userEntityDAO,dicomFileDAO,fileDAO]; root of factory hierarchy
2015-09-08 15:21:46,275 INFO [org.springframework.jdbc.datasource.DriverManagerDataSource] - Loaded JDBC driver: com.mysql.jdbc.Driver
2015-09-08 15:21:46,779 INFO [org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBean] - Building new Hibernate SessionFactory
2015-09-08 15:21:47,643 INFO [org.springframework.orm.hibernate3.HibernateTransactionManager] - Using DataSource [org.springframework.jdbc.datasource.DriverManagerDataSource@1b812ba] of Hibernate SessionFactory for HibernateTransactionManager
2015-09-08 15:21:47,650 INFO [org.springframework.web.context.ContextLoader] - Root WebApplicationContext: initialization completed in 2960 ms
2015-09-08 15:37:58,903 INFO [org.springframework.web.context.support.XmlWebApplicationContext] - Closing Root WebApplicationContext: startup date [Tue Sep 08 15:21:44 CST 2015]; root of context hierarchy
2015-09-08 15:37:58,904 INFO [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Destroying singletons in org.springframework.beans.factory.support.DefaultListableBeanFactory@2cd9fa: defining beans [org.springframework.context.annotation.internalConfigurationAnnotationProcessor,org.springframework.context.annotation.internalAutowiredAnnotationProcessor,org.springframework.context.annotation.internalRequiredAnnotationProcessor,org.springframework.context.annotation.internalCommonAnnotationProcessor,org.springframework.context.annotation.internalPersistenceAnnotationProcessor,customersResource,remoteFileTransferResource,usersResource,org.springframework.beans.factory.config.PropertyPlaceholderConfigurer#0,dataSource,sessionFactory,transactionManager,transactionBase,localFileService,localFileTransferDAO,remoteFileService,remoteFileTransferDAO,algorithmService,algorithmDAO,receiveEntityService,receiveEntityDAO,sendEntityService,sendEntityDAO,userEntityService,userEntityDAO,dicomFileDAO,fileDAO]; root of factory hierarchy
2015-09-08 15:37:58,908 INFO [org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBean] - Closing Hibernate SessionFactory
2015-09-08 15:38:06,831 INFO [org.springframework.web.context.ContextLoader] - Root WebApplicationContext: initialization started
2015-09-08 15:38:06,854 INFO [org.springframework.web.context.support.XmlWebApplicationContext] - Refreshing Root WebApplicationContext: startup date [Tue Sep 08 15:38:06 CST 2015]; root of context hierarchy
2015-09-08 15:38:06,900 INFO [org.springframework.beans.factory.xml.XmlBeanDefinitionReader] - Loading XML bean definitions from URL [file:/G:/wjlProgramFiles/local-git-repository/LungCareRestFulAPI/src/main/webapp/WEB-INF/classes/applicationContext.xml]
2015-09-08 15:38:06,979 INFO [org.springframework.context.annotation.ClassPathBeanDefinitionScanner] - JSR-250 'javax.annotation.ManagedBean' found and supported for component scanning
2015-09-08 15:38:06,980 INFO [org.springframework.context.annotation.ClassPathBeanDefinitionScanner] - JSR-330 'javax.inject.Named' annotation found and supported for component scanning
2015-09-08 15:38:07,068 INFO [org.springframework.beans.factory.xml.XmlBeanDefinitionReader] - Loading XML bean definitions from URL [file:/G:/wjlProgramFiles/local-git-repository/LungCareRestFulAPI/src/main/webapp/WEB-INF/classes/com/lungcare/dicomfile/config/spring-hibernate.xml]
2015-09-08 15:38:07,249 INFO [org.springframework.beans.factory.config.PropertyPlaceholderConfigurer] - Loading properties file from URL [file:/G:/wjlProgramFiles/local-git-repository/LungCareRestFulAPI/src/main/webapp/WEB-INF/classes/com/lungcare/dicomfile/config/jdbc.properties]
2015-09-08 15:38:07,280 INFO [org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor] - JSR-330 'javax.inject.Inject' annotation found and supported for autowiring
2015-09-08 15:38:07,290 INFO [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Pre-instantiating singletons in org.springframework.beans.factory.support.DefaultListableBeanFactory@142636b: defining beans [org.springframework.context.annotation.internalConfigurationAnnotationProcessor,org.springframework.context.annotation.internalAutowiredAnnotationProcessor,org.springframework.context.annotation.internalRequiredAnnotationProcessor,org.springframework.context.annotation.internalCommonAnnotationProcessor,org.springframework.context.annotation.internalPersistenceAnnotationProcessor,customersResource,remoteFileTransferResource,usersResource,org.springframework.beans.factory.config.PropertyPlaceholderConfigurer#0,dataSource,sessionFactory,transactionManager,transactionBase,localFileService,localFileTransferDAO,remoteFileService,remoteFileTransferDAO,algorithmService,algorithmDAO,receiveEntityService,receiveEntityDAO,sendEntityService,sendEntityDAO,userEntityService,userEntityDAO,dicomFileDAO,fileDAO]; root of factory hierarchy
2015-09-08 15:38:07,473 INFO [org.springframework.jdbc.datasource.DriverManagerDataSource] - Loaded JDBC driver: com.mysql.jdbc.Driver
2015-09-08 15:38:07,869 INFO [org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBean] - Building new Hibernate SessionFactory
2015-09-08 15:38:08,808 INFO [org.springframework.orm.hibernate3.HibernateTransactionManager] - Using DataSource [org.springframework.jdbc.datasource.DriverManagerDataSource@159fd87] of Hibernate SessionFactory for HibernateTransactionManager
2015-09-08 15:38:08,815 INFO [org.springframework.web.context.ContextLoader] - Root WebApplicationContext: initialization completed in 1982 ms
5 changes: 3 additions & 2 deletions src/main/webapp/htmls/User.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,9 @@

$(function() {


alert("111");
findUsersByCurrentPage();
alert("222");
$('a[data-toggle="tab"]').on('shown.bs.tab', function(e) {
// 获取已激活的标签页的名称
var activeTab = $(e.target).text();
Expand Down Expand Up @@ -167,7 +169,6 @@
url : '/transfer/rest/user/getAllUsers',
data : {},
dataType : 'JSON',
async:false,
success : function(result) {
if (result == "" || result == null) {
alert("there is no data in the table receiveEntity!");
Expand Down