jiapeng 7 vuotta sitten
vanhempi
commit
c4bfc0cc77

+ 16 - 0
src/main/java/com/ekexiu/portal/dao/FeedbackDao.java

@ -0,0 +1,16 @@
1
package com.ekexiu.portal.dao;
2

3
import java.sql.Connection;
4
import java.sql.SQLException;
5

6
import org.jfw.apt.orm.annotation.dao.DAO;
7
import org.jfw.apt.orm.annotation.dao.method.operator.InsertAndGenKey;
8

9
import com.ekexiu.portal.po.Feedback;
10

11
@DAO
12
public interface FeedbackDao {
13

14
	@InsertAndGenKey(value = "id")
15
	long insert(Connection con, Feedback fb) throws SQLException;
16
}

+ 2 - 2
src/main/java/com/ekexiu/portal/dao/PpaperDao.java

@ -41,13 +41,13 @@ public interface PpaperDao {
41 41
	int update(Connection con, String id, @Set @Nullable String keywords) throws SQLException;
42 42

43 43
	@PageQuery
44
	@OrderBy(" ORDER BY ASS_TIMIE DESC,ID ASC")
44
	@OrderBy(" ORDER BY ASS_TIME DESC,ID ASC")
45 45
	PageQueryResult<AssedPaper> pageQueryWithProfessor(Connection con,
46 46
			@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "A.PROFESSOR_ID=?" })  String professorId,
47 47
			@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "P.NAME LIKE ?" }) String name, int pageSize, int pageNo) throws SQLException;
48 48

49 49
	@PageQuery
50
	@OrderBy(" ORDER BY ASS_TIMIE DESC,ID ASC")
50
	@OrderBy(" ORDER BY ASS_TIME DESC,ID ASC")
51 51
	PageQueryResult<AssedPaper> pageQueryWithAuthor(Connection con,
52 52
			@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "A.NAME=?" }) String author,
53 53
			@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "((A.PROFESSOR_ID=?)  OR  (A.PROFESSOR_ID='################################'))" }) String id,

+ 82 - 0
src/main/java/com/ekexiu/portal/po/Feedback.java

@ -0,0 +1,82 @@
1
package com.ekexiu.portal.po;
2

3
import org.jfw.apt.orm.annotation.entry.Column;
4
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
5
import org.jfw.apt.orm.annotation.entry.Table;
6
import org.jfw.apt.orm.core.enums.DE;
7

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

10
@PrimaryKey("id")
11
@Table
12
public class Feedback implements CreateTimeSupported{
13
	private long id;
14
	private String title;
15
	private int category;// int4 NOT NULL,
16
	private int schema;// int4 NOT NULL,
17
	private String param;// text NOT NULL,
18
	private String content;// text NOT NULL,
19
	private String createTime;// char(14) NOT NULL,
20
	private String  state;// char(1) NOT NULL,
21
	@Override
22
	public String getCreateTime() {
23
		return this.createTime;
24
	}
25
	@Override
26
	public void setCreateTime(String createTime) {
27
		this.createTime = createTime;
28
	}
29
	
30
	@Column(DE.bigSerial)
31
	public long getId() {
32
		return id;
33
	}
34
	public void setId(long id) {
35
		this.id = id;
36
	}
37
	@Column(DE.Text_de)
38
	public String getTitle() {
39
		return title;
40
	}
41
	public void setTitle(String title) {
42
		this.title = title;
43
	}
44
	@Column(DE.int_de)
45
	public int getCategory() {
46
		return category;
47
	}
48
	public void setCategory(int category) {
49
		this.category = category;
50
	}
51
	@Column(DE.int_de)
52
	public int getSchema() {
53
		return schema;
54
	}
55
	public void setSchema(int schema) {
56
		this.schema = schema;
57
	}
58
	@Column(DE.text_de)
59
	public String getParam() {
60
		return param;
61
	}
62
	public void setParam(String param) {
63
		this.param = param;
64
	}
65
	@Column(DE.text_de)
66
	public String getContent() {
67
		return content;
68
	}
69
	
70
	public void setContent(String content) {
71
		this.content = content;
72
	}
73
	@Column(DE.singleChar)
74
	public String getState() {
75
		return state;
76
	}
77
	public void setState(String state) {
78
		this.state = state;
79
	}
80
	
81
	
82
}

+ 26 - 0
src/main/java/com/ekexiu/push/service/FeedbackService.java

@ -0,0 +1,26 @@
1
package com.ekexiu.push.service;
2

3
import org.jfw.apt.annotation.Autowrie;
4
import org.jfw.apt.web.annotation.Path;
5
import org.jfw.apt.web.annotation.operate.Post;
6

7
import com.ekexiu.portal.dao.FeedbackDao;
8

9
@Path("/feedback")
10
public class FeedbackService {
11

12
	@Autowrie
13
	private FeedbackDao feedbackDao;
14

15
	public FeedbackDao getFeedbackDao() {
16
		return feedbackDao;
17
	}
18

19
	public void setFeedbackDao(FeedbackDao feedbackDao) {
20
		this.feedbackDao = feedbackDao;
21
	}
22
	
23
//	@Post
24
//	@Path("/")
25
	
26
}

+ 49 - 0
src/main/resources/database.sql

@ -1443,6 +1443,55 @@ COMMENT ON COLUMN paper_author.name IS '作者姓名';
1443 1443
COMMENT ON COLUMN paper_author.ass_time IS '关联专家时间';
1444 1444
CREATE UNIQUE INDEX paper_author_pkey ON paper_author USING btree (paper_id,name COLLATE "zh_CN.utf8");
1445 1445
ALTER TABLE paper_author ADD PRIMARY KEY (paper_id,name);
1446
CREATE TABLE ORG_REG_INFO (
1447
NAME TEXT  COLLATE "zh_CN.utf8" NOT NULL,
1448
NUM TEXT NOT NULL,
1449
CODE TEXT NOT NULL,
1450
CREDIT_CODE TEXT,
1451
"TYPE" TEXT NOT NULL,
1452
INDUSTRY TEXT NOT NULL,
1453
OPERATING_PERIOD TEXT NOT NULL,
1454
DAY_OF_APPROVAL TEXT NOT NULL,
1455
MANAGER TEXT NOT NULL,
1456
ADDR TEXT NOT NULL,
1457
SCOPE_OF_BUSINESS TEXT NOT NULL);
1458
ALTER TABLE ORG_REG_INFO ADD PRIMARY KEY (CODE);
1459
COMMENT ON COLUMN ORG_REG_INFO.NAME IS '注册名称';
1460
COMMENT ON COLUMN ORG_REG_INFO.NUM IS '工商注册号';
1461
COMMENT ON COLUMN ORG_REG_INFO.CODE IS '组织机构代码';
1462
COMMENT ON COLUMN ORG_REG_INFO.CREDIT_CODE IS '统一信用代码';
1463
COMMENT ON COLUMN ORG_REG_INFO."TYPE" IS '企业类型';
1464
COMMENT ON COLUMN ORG_REG_INFO.INDUSTRY IS '行业';
1465
COMMENT ON COLUMN ORG_REG_INFO.OPERATING_PERIOD IS '营业期限';
1466
COMMENT ON COLUMN ORG_REG_INFO.DAY_OF_APPROVAL IS '核准日期';
1467
COMMENT ON COLUMN ORG_REG_INFO.MANAGER IS '登记机关';
1468
COMMENT ON COLUMN ORG_REG_INFO.ADDR IS '注册地址';
1469
COMMENT ON COLUMN ORG_REG_INFO.SCOPE_OF_BUSINESS IS '经营范围';
1470

1471

1472
CREATE TABLE feedback (
1473
id bigserial NOT NULL,
1474
title text,
1475
category int4 NOT NULL,
1476
"schema" int4 NOT NULL,
1477
param text NOT NULL,
1478
content text NOT NULL,
1479
create_time char(14) NOT NULL,
1480
state char(1) NOT NULL,
1481
PRIMARY KEY (id)
1482
);
1483
COMMENT ON TABLE feedback IS '反馈信息';
1484
COMMENT ON COLUMN feedback.id IS '反馈信息ID';
1485
COMMENT ON COLUMN feedback.title IS '标题';
1486
COMMENT ON COLUMN feedback.category IS '大类  1:纠错';
1487
COMMENT ON COLUMN feedback."schema" IS '小类类  1.1:论文纠错,1.2:专利纠错';
1488
COMMENT ON COLUMN feedback.content IS '内容';
1489
COMMENT ON COLUMN feedback.param IS '参数:如 论文ID....';
1490
COMMENT ON COLUMN feedback.state IS '状态,0:初始状态   ,其他由不同大类业务确定';
1491

1492

1493

1494

1446 1495

1447 1496

1448 1497