Browse Source

修改所有时间问题,时间一致用char类型。

zzy.zhiyuan.foxmail 8 years ago
parent
commit
d6c838cc13

+ 8 - 4
src/main/java/com/ekexiu/portal/dao/AssessDao.java

@ -23,7 +23,7 @@ public abstract class AssessDao {
23 23
	
24 24
	public com.ekexiu.portal.po.Assess query(java.sql.Connection con,java.lang.String assessId) throws java.sql.SQLException{
25 25
        int _m_1 = 1;
26
        String sql = "SELECT ASSESS_ID,STAR_LEVEL,ASSESS.DESCP,ASSESS.OPERATION_ID,ASSESS.RESOURCE_ID,ASSESS.PROFESSOR_ID,RESOURCE_NAME,PROFESSOR.NAME FROM ASSESS INNER JOIN RESOURCE ON ASSESS.RESOURCE_ID = RESOURCE.RESOURCE_ID INNER JOIN PROFESSOR ON ASSESS.PROFESSOR_ID = PROFESSOR.ID WHERE ASSESS_ID = ?";
26
        String sql = "SELECT ASSESS_ID,STAR_LEVEL,ASSESS.DESCP,ASSESS.OPERATION_ID,ASSESS.RESOURCE_ID,ASSESS.PROFESSOR_ID,RESOURCE_NAME,PROFESSOR.NAME,ASSESS.CREATE_TIME FROM ASSESS INNER JOIN RESOURCE ON ASSESS.RESOURCE_ID = RESOURCE.RESOURCE_ID INNER JOIN PROFESSOR ON ASSESS.PROFESSOR_ID = PROFESSOR.ID WHERE ASSESS_ID = ?";
27 27
        java.sql.PreparedStatement ps = con.prepareStatement(sql);
28 28
        try{
29 29
            ps.setString(_m_1++,assessId);
@ -47,6 +47,7 @@ public abstract class AssessDao {
47 47
                    _result.setResource(resource);
48 48
                    professor.setName(rs.getString(8));
49 49
                    _result.setProfessor(professor);
50
                    _result.setCreateTime(rs.getString(9));
50 51
                    return _result;
51 52
                }else{
52 53
                    return null;
@ -61,7 +62,7 @@ public abstract class AssessDao {
61 62
	
62 63
	public java.util.List<com.ekexiu.portal.po.Assess> queryOper(java.sql.Connection con,java.lang.String operationId) throws java.sql.SQLException{
63 64
        int _m_1 = 1;
64
        String sql = "SELECT ASSESS_ID,STAR_LEVEL,ASSESS.DESCP,ASSESS.OPERATION_ID,ASSESS.RESOURCE_ID,ASSESS.PROFESSOR_ID,RESOURCE_NAME,PROFESSOR.NAME FROM ASSESS INNER JOIN RESOURCE ON ASSESS.RESOURCE_ID = RESOURCE.RESOURCE_ID INNER JOIN PROFESSOR ON ASSESS.PROFESSOR_ID = PROFESSOR.ID WHERE ASSESS.OPERATION_ID = ?";
65
        String sql = "SELECT ASSESS_ID,STAR_LEVEL,ASSESS.DESCP,ASSESS.OPERATION_ID,ASSESS.RESOURCE_ID,ASSESS.PROFESSOR_ID,RESOURCE_NAME,PROFESSOR.NAME,ASSESS.CREATE_TIME FROM ASSESS INNER JOIN RESOURCE ON ASSESS.RESOURCE_ID = RESOURCE.RESOURCE_ID INNER JOIN PROFESSOR ON ASSESS.PROFESSOR_ID = PROFESSOR.ID WHERE ASSESS.OPERATION_ID = ?";
65 66
        java.sql.PreparedStatement ps = con.prepareStatement(sql);
66 67
        try{
67 68
            ps.setString(_m_1++,operationId);
@ -86,6 +87,7 @@ public abstract class AssessDao {
86 87
                    _obj.setResource(resource);
87 88
                    professor.setName(rs.getString(8));
88 89
                    _obj.setProfessor(professor);
90
                    _obj.setCreateTime(rs.getString(9));
89 91
                    _result.add(_obj);
90 92
                }
91 93
                return _result;
@ -99,7 +101,7 @@ public abstract class AssessDao {
99 101
	
100 102
	public java.util.List<com.ekexiu.portal.po.Assess> queryRes(java.sql.Connection con,java.lang.String resourceId) throws java.sql.SQLException{
101 103
        int _m_1 = 1;
102
        String sql = "SELECT ASSESS_ID,STAR_LEVEL,ASSESS.DESCP,ASSESS.OPERATION_ID,ASSESS.RESOURCE_ID,ASSESS.PROFESSOR_ID,RESOURCE_NAME,PROFESSOR.NAME FROM ASSESS INNER JOIN RESOURCE ON ASSESS.RESOURCE_ID = RESOURCE.RESOURCE_ID INNER JOIN PROFESSOR ON ASSESS.PROFESSOR_ID = PROFESSOR.ID WHERE ASSESS.RESOURCE_ID = ?";
104
        String sql = "SELECT ASSESS_ID,STAR_LEVEL,ASSESS.DESCP,ASSESS.OPERATION_ID,ASSESS.RESOURCE_ID,ASSESS.PROFESSOR_ID,RESOURCE_NAME,PROFESSOR.NAME,ASSESS.CREATE_TIME FROM ASSESS INNER JOIN RESOURCE ON ASSESS.RESOURCE_ID = RESOURCE.RESOURCE_ID INNER JOIN PROFESSOR ON ASSESS.PROFESSOR_ID = PROFESSOR.ID WHERE ASSESS.RESOURCE_ID = ?";
103 105
        java.sql.PreparedStatement ps = con.prepareStatement(sql);
104 106
        try{
105 107
            ps.setString(_m_1++,resourceId);
@ -124,6 +126,7 @@ public abstract class AssessDao {
124 126
                    _obj.setResource(resource);
125 127
                    professor.setName(rs.getString(8));
126 128
                    _obj.setProfessor(professor);
129
                    _obj.setCreateTime(rs.getString(9));
127 130
                    _result.add(_obj);
128 131
                }
129 132
                return _result;
@ -137,7 +140,7 @@ public abstract class AssessDao {
137 140
	
138 141
	public java.util.List<com.ekexiu.portal.po.Assess> queryPro(java.sql.Connection con,java.lang.String professorId) throws java.sql.SQLException{
139 142
        int _m_1 = 1;
140
        String sql = "SELECT ASSESS_ID,STAR_LEVEL,ASSESS.DESCP,ASSESS.OPERATION_ID,ASSESS.RESOURCE_ID,ASSESS.PROFESSOR_ID,RESOURCE_NAME,PROFESSOR.NAME FROM ASSESS INNER JOIN RESOURCE ON ASSESS.RESOURCE_ID = RESOURCE.RESOURCE_ID INNER JOIN PROFESSOR ON ASSESS.PROFESSOR_ID = PROFESSOR.ID WHERE ASSESS.PROFESSOR_ID = ?";
143
        String sql = "SELECT ASSESS_ID,STAR_LEVEL,ASSESS.DESCP,ASSESS.OPERATION_ID,ASSESS.RESOURCE_ID,ASSESS.PROFESSOR_ID,RESOURCE_NAME,PROFESSOR.NAME,ASSESS.CREATE_TIME FROM ASSESS INNER JOIN RESOURCE ON ASSESS.RESOURCE_ID = RESOURCE.RESOURCE_ID INNER JOIN PROFESSOR ON ASSESS.PROFESSOR_ID = PROFESSOR.ID WHERE ASSESS.PROFESSOR_ID = ?";
141 144
        java.sql.PreparedStatement ps = con.prepareStatement(sql);
142 145
        try{
143 146
            ps.setString(_m_1++,professorId);
@ -162,6 +165,7 @@ public abstract class AssessDao {
162 165
                    _obj.setResource(resource);
163 166
                    professor.setName(rs.getString(8));
164 167
                    _obj.setProfessor(professor);
168
                    _obj.setCreateTime(rs.getString(9));
165 169
                    _result.add(_obj);
166 170
                }
167 171
                return _result;

+ 12 - 3
src/main/java/com/ekexiu/portal/dao/ConsultDao.java

@ -1,6 +1,7 @@
1 1
package com.ekexiu.portal.dao;
2 2

3 3
import java.sql.Connection;
4
import java.sql.PreparedStatement;
4 5
import java.sql.SQLException;
5 6
import java.util.List;
6 7

@ -29,9 +30,17 @@ public abstract class ConsultDao {
29 30
	@From(Consult.class)
30 31
	public abstract int updateFinishTime(Connection con, String consultId, @Set String finishTime) throws SQLException;
31 32
	
32
	@UpdateWith
33
	@From(Consult.class)
34
	public abstract int updateRevoveryTime(Connection con, String consultId, @Set String revoveryTime) throws SQLException;
33
	public int updateRevoveryTime(Connection con,String consultId) throws SQLException{
34
        int _m_1 = 1;
35
        String sql ="UPDATE CONSULT SET REVOVERY_TIME= TO_CHAR(NOW(),'YYYYMMDDHH24MISS') WHERE CONSULT_ID = ?";
36
        PreparedStatement ps = con.prepareStatement(sql);
37
        try{
38
            ps.setString(_m_1++,consultId);
39
            return ps.executeUpdate();
40
        }finally{
41
            try{ps.close();}catch(Exception _m_2){}
42
        }
43
    }
35 44
	
36 45
	@SelectOne
37 46
	@Nullable

+ 4 - 0
src/main/java/com/ekexiu/portal/dao/OperationDao.java

@ -42,6 +42,10 @@ public abstract class OperationDao {
42 42
	@From(Operation.class)
43 43
	public abstract int updateDeliverTime(Connection con, String operationId, @Set String deliverTime) throws SQLException;
44 44
	
45
	@UpdateWith
46
	@From(Operation.class)
47
	public abstract int updateDealTime(Connection con, String operationId, @Set String dealTime) throws SQLException;
48
	
45 49
	@UpdateWith
46 50
	@From(Operation.class)
47 51
	public abstract int updatePayMethod(Connection con, String operationId, @Set String payMethod) throws SQLException;

+ 11 - 1
src/main/java/com/ekexiu/portal/po/Assess.java

@ -6,15 +6,18 @@ import org.jfw.apt.orm.annotation.entry.Table;
6 6
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
7 7
import org.jfw.apt.orm.core.enums.DE;
8 8

9
import com.ekexiu.portal.basepo.CreateTimeSupported;
10

9 11
@PrimaryKey("assessId")
10 12
@Table
11
public class Assess {
13
public class Assess implements CreateTimeSupported {
12 14
	private String assessId;
13 15
	private int starLevel;
14 16
	private String descp;
15 17
	private String operationId;
16 18
	private String resourceId;
17 19
	private String professorId;
20
	private String createTime;
18 21
	private Operation operation;
19 22
	private Resource resource;
20 23
	private Professor professor;
@ -88,4 +91,11 @@ public class Assess {
88 91
		this.professorId = professorId;
89 92
	}
90 93
	
94
	public String getCreateTime() {
95
		return createTime;
96
	}
97
	public void setCreateTime(String createTime) {
98
		this.createTime = createTime;
99
	}
100
	
91 101
}

+ 8 - 6
src/main/java/com/ekexiu/portal/po/Consult.java

@ -5,13 +5,16 @@ import java.math.BigDecimal;
5 5
import org.jfw.apt.orm.annotation.entry.Column;
6 6
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
7 7
import org.jfw.apt.orm.annotation.entry.Table;
8
import org.jfw.apt.orm.core.defaultImpl.FixLenStringHandler;
8 9
import org.jfw.apt.orm.core.defaultImpl.IntHandler;
9 10
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
10 11
import org.jfw.apt.orm.core.enums.DE;
11 12

13
import com.ekexiu.portal.basepo.CreateTimeSupported;
14

12 15
@PrimaryKey("consultId")
13 16
@Table
14
public class Consult {
17
public class Consult implements CreateTimeSupported {
15 18
	private String consultId;
16 19
	private String consultType;
17 20
	private String consultTitle;
@ -70,7 +73,6 @@ public class Consult {
70 73
		this.consultContant = consultContant;
71 74
	}
72 75
	
73
	@Column(handlerClass=StringHandler.class,dbType="VARCHAR",nullable=false,insertable=false,renewable=false,queryable=true)
74 76
	public String getCreateTime() {
75 77
		return createTime;
76 78
	}
@ -102,7 +104,7 @@ public class Consult {
102 104
		this.consultStatus = consultStatus;
103 105
	}
104 106
	
105
	@Column(handlerClass=StringHandler.class,dbType="VARCHAR",nullable=true,insertable=false,renewable=true,queryable=true)
107
	@Column(handlerClass = FixLenStringHandler.class, dbType = "CHAR(14)", insertable = false, nullable = true, queryable = true, renewable = true)
106 108
	public String getFinishTime() {
107 109
		return finishTime;
108 110
	}
@ -134,7 +136,7 @@ public class Consult {
134 136
		this.assessContant = assessContant;
135 137
	}
136 138
	
137
	@Column(handlerClass=StringHandler.class,dbType="VARCHAR", nullable=true,insertable=false,renewable=false,queryable=true)
139
	@Column(handlerClass = FixLenStringHandler.class, dbType = "CHAR(14)", insertable = false, nullable = true, queryable = true, renewable = true)
138 140
	public String getAssessTime() {
139 141
		return assessTime;
140 142
	}
@ -158,7 +160,7 @@ public class Consult {
158 160
		this.thanksMoney = thanksMoney;
159 161
	}
160 162
	
161
	@Column(handlerClass=StringHandler.class,dbType="VARCHAR", nullable=true,insertable=false,renewable=true,queryable=true)
163
	@Column(handlerClass = FixLenStringHandler.class, dbType = "CHAR(14)", insertable = false, nullable = true, queryable = true, renewable = true)
162 164
	public String getThanksTime() {
163 165
		return thanksTime;
164 166
	}
@ -166,7 +168,7 @@ public class Consult {
166 168
		this.thanksTime = thanksTime;
167 169
	}
168 170
	
169
	@Column(handlerClass=StringHandler.class,dbType="VARCHAR", nullable=false,insertable=true,renewable=true,queryable=true)
171
	@Column(handlerClass = FixLenStringHandler.class, dbType = "CHAR(14)", fixSqlValueWithInsert = "TO_CHAR(NOW(),'YYYYMMDDHH24MISS')", fixSqlValueWithUpdate = "TO_CHAR(NOW(),'YYYYMMDDHH24MISS')", insertable = true, nullable = false, queryable = true, renewable = true)
170 172
	public String getRevoveryTime() {
171 173
		return revoveryTime;
172 174
	}

+ 4 - 3
src/main/java/com/ekexiu/portal/po/Operation.java

@ -9,9 +9,11 @@ import org.jfw.apt.orm.core.defaultImpl.FixLenStringHandler;
9 9
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
10 10
import org.jfw.apt.orm.core.enums.DE;
11 11

12
import com.ekexiu.portal.basepo.CreateTimeSupported;
13

12 14
@Table
13 15
@PrimaryKey("operationId")
14
public class Operation {
16
public class Operation implements CreateTimeSupported {
15 17
	private String operationId;//业务ID
16 18
	private int operationStatus;//业务状态
17 19
	private String demandId;//需求方ID,即当前登录用户ID
@ -58,7 +60,6 @@ public class Operation {
58 60
		this.replyNotes = replyNotes;
59 61
	}
60 62
	
61
	@Column(handlerClass = FixLenStringHandler.class, dbType = "CHAR(14)", fixSqlValueWithInsert = "TO_CHAR(NOW(),'YYYYMMDDHH24MISS')", insertable = true, nullable = false, queryable = true, renewable = false)
62 63
	public String getCreateTime() {
63 64
		return createTime;
64 65
	}
@ -130,7 +131,7 @@ public class Operation {
130 131
		this.dealPrice = dealPrice;
131 132
	}
132 133
	
133
	@Column(handlerClass = FixLenStringHandler.class, dbType = "CHAR(14)", fixSqlValueWithUpdate = "TO_CHAR(NOW(),'YYYYMMDDHH24MISS')", insertable = false, nullable = true, queryable = true, renewable = true)
134
	@Column(handlerClass = FixLenStringHandler.class, dbType = "CHAR(14)", insertable = false, nullable = true, queryable = true, renewable = true)
134 135
	public String getDealTime() {
135 136
		return dealTime;
136 137
	}

+ 3 - 2
src/main/java/com/ekexiu/portal/po/Tidings.java

@ -6,9 +6,11 @@ import org.jfw.apt.orm.annotation.entry.Table;
6 6
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
7 7
import org.jfw.apt.orm.core.enums.DE;
8 8

9
import com.ekexiu.portal.basepo.CreateTimeSupported;
10

9 11
@PrimaryKey("tidingsId")
10 12
@Table
11
public class Tidings {
13
public class Tidings implements CreateTimeSupported {
12 14
	private String tidingsId;
13 15
	private String tidingsContant;
14 16
	private String senderId;
@ -63,7 +65,6 @@ public class Tidings {
63 65
		this.consultId = consultId;
64 66
	}
65 67
	
66
	@Column(handlerClass=StringHandler.class,dbType="VARCHAR",nullable=false,insertable=false,renewable=false,queryable=true)
67 68
	public String getCreateTime() {
68 69
		return createTime;
69 70
	}

+ 1 - 4
src/main/java/com/ekexiu/portal/service/AssessService.java

@ -32,12 +32,9 @@ public class AssessService {
32 32
	
33 33
	@Post
34 34
	@Path
35
	public String insert(@JdbcConn(true) Connection con, Assess assess, String operationId, String resourceId, String professorId) throws SQLException {
35
	public String insert(@JdbcConn(true) Connection con, Assess assess) throws SQLException {
36 36
		String assessId = StringUtil.buildUUID();
37 37
		assess.setAssessId(assessId);
38
		assess.setOperationId(operationId);
39
		assess.setResourceId(resourceId);
40
		assess.setProfessorId(professorId);
41 38
		this.assessDao.insert(con, assess);
42 39
		return assessId;
43 40
	}

+ 3 - 7
src/main/java/com/ekexiu/portal/service/ConsultService.java

@ -2,8 +2,6 @@ package com.ekexiu.portal.service;
2 2

3 3
import java.sql.Connection;
4 4
import java.sql.SQLException;
5
import java.text.SimpleDateFormat;
6
import java.util.Date;
7 5
import java.util.List;
8 6

9 7
import org.jfw.apt.annotation.Autowrie;
@ -34,8 +32,6 @@ public class ConsultService {
34 32
	public String insert(@JdbcConn(true) Connection con, Consult consult) throws SQLException {
35 33
		String consultId = StringUtil.buildUUID();
36 34
		consult.setConsultId(consultId);
37
		String revoveryTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
38
		consult.setRevoveryTime(revoveryTime);
39 35
		this.consultDao.insert(con, consult);
40 36
		return consultId;
41 37
	}
@ -48,9 +44,9 @@ public class ConsultService {
48 44
	
49 45
	@Post
50 46
	@Path("/finishTime")
51
	public void updateFinishTime(@JdbcConn(true) Connection con, String consultId, int consultStatus) throws SQLException {
52
		if(5 == consultStatus) {
53
			String finishTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
47
	public void updateFinishTime(@JdbcConn(true) Connection con, String consultId, String finishTime) throws SQLException {
48
		Consult consult = this.consultDao.query(con, consultId);
49
		if(null == consult.getFinishTime()){
54 50
			this.consultDao.updateFinishTime(con, consultId, finishTime);
55 51
		}
56 52
	}

+ 11 - 7
src/main/java/com/ekexiu/portal/service/OperationService.java

@ -15,7 +15,6 @@ import org.jfw.apt.web.annotation.operate.Post;
15 15
import org.jfw.apt.web.annotation.operate.Put;
16 16
import org.jfw.apt.web.annotation.param.JdbcConn;
17 17
import org.jfw.apt.web.annotation.param.PathVar;
18
import org.jfw.apt.web.annotation.param.RequestBody;
19 18
import org.jfw.util.PageQueryResult;
20 19
import org.jfw.util.StringUtil;
21 20

@ -36,20 +35,16 @@ public class OperationService {
36 35
	
37 36
	@Post
38 37
	@Path
39
	public String insert(@JdbcConn(true) Connection con, Operation operation, String demandId, @Nullable String resourceId) throws SQLException{
38
	public String insert(@JdbcConn(true) Connection con, Operation operation) throws SQLException{
40 39
		String operationId = StringUtil.buildUUID();
41 40
		operation.setOperationId(operationId);
42
		operation.setDemandId(demandId);
43
		if(operation.getResourceId() == null){
44
			operation.setResourceId(resourceId);
45
		}
46 41
		this.operationDao.insert(con, operation);
47 42
		return operationId;
48 43
	}
49 44
	
50 45
	@Put
51 46
	@Path
52
	public void update(@JdbcConn(true) Connection con, @RequestBody Operation operation) throws SQLException{
47
	public void update(@JdbcConn(true) Connection con, Operation operation) throws SQLException{
53 48
		this.operationDao.update(con, operation);
54 49
	}
55 50
	
@ -109,6 +104,15 @@ public class OperationService {
109 104
		this.operationDao.updateDeliverTime(con, operationId, deliverTime);
110 105
	}
111 106
	
107
	@Post
108
	@Path("/dealTime")
109
	public void updateDealTime(@JdbcConn(true) Connection con, String operationId, String dealTime) throws SQLException{
110
		Operation operation = this.operationDao.query(con, operationId);
111
		if (null == operation.getDealTime()){
112
			this.operationDao.updateDealTime(con, operationId, dealTime);
113
		}
114
	}
115
	
112 116
	@Post
113 117
	@Path("/payMethod")
114 118
	public void updatePayMethod(@JdbcConn(true) Connection con, String operationId, String payMethod) throws SQLException{

+ 1 - 4
src/main/java/com/ekexiu/portal/service/ResourceService.java

@ -58,12 +58,9 @@ public class ResourceService {
58 58

59 59
	@Post
60 60
	@Path
61
	public String insert(@JdbcConn(true) Connection con, Resource resource,	@Nullable String professorId) throws SQLException, IOException {
61
	public String insert(@JdbcConn(true) Connection con, Resource resource) throws SQLException, IOException {
62 62
		String resourceId = StringUtil.buildUUID();
63 63
		resource.setResourceId(resourceId);
64
		if (resource.getProfessorId() == null) {
65
			resource.setProfessorId(professorId);
66
		}
67 64
		this.resourceDao.insert(con, resource);
68 65
		this.imageService.saveDefaultResourcePhoto(resourceId);
69 66
		return resourceId;

+ 1 - 4
src/main/java/com/ekexiu/portal/service/TidingsService.java

@ -2,8 +2,6 @@ package com.ekexiu.portal.service;
2 2

3 3
import java.sql.Connection;
4 4
import java.sql.SQLException;
5
import java.text.SimpleDateFormat;
6
import java.util.Date;
7 5
import java.util.List;
8 6

9 7
import org.jfw.apt.annotation.Autowrie;
@ -45,8 +43,7 @@ public class TidingsService {
45 43
		tidings.setTidingsId(tidingsId);
46 44
		this.tidingsDao.insert(con, tidings);
47 45
		String consultId = tidings.getConsultId();
48
		String revoveryTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
49
		this.consultDao.updateRevoveryTime(con, consultId, revoveryTime);
46
		this.consultDao.updateRevoveryTime(con, consultId);
50 47
		return tidingsId;
51 48
	}
52 49