jiapeng 6 years ago
parent
commit
27889cec37

+ 0 - 2
src/main/java/com/ekexiu/portal/platform/PlatformDao.java

@ -15,8 +15,6 @@ import org.jfw.apt.orm.annotation.dao.method.operator.Delete;
15 15
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
16 16
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
17 17
import org.jfw.apt.orm.annotation.dao.method.operator.LimitQuery;
18
import org.jfw.apt.orm.annotation.dao.method.operator.LimitSelect;
19
import org.jfw.apt.orm.annotation.dao.method.operator.QueryList;
20 18
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
21 19
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
22 20
import org.jfw.apt.orm.annotation.dao.method.operator.Update;

+ 4 - 1
src/main/java/com/ekexiu/portal/platform/PlatformService.java

@ -117,6 +117,9 @@ public class PlatformService {
117 117
		LoginUserInfo ret = null;
118 118
		PlatformUser pu = this.platformDao.queryUser(con, email);
119 119
		if (pu != null) {
120
			if(!"1".equals(pu.getState())){
121
				throw new JfwBaseException(-600004, "user disabled");
122
			}
120 123
			if (pw.equals(pu.getPasswd())) {
121 124
				PlatformInfo pi = this.platformDao.queryInfo(con, pu.getId());
122 125
				if (pi != null) {
@ -170,7 +173,7 @@ public class PlatformService {
170 173
	}
171 174

172 175
	@Post
173
	@Path("/restpw")
176
	@Path("/resetpw")
174 177
	public void restpw(@JdbcConn(true) Connection con, String code, String pw) throws SQLException, JfwBaseException {
175 178
		@SuppressWarnings("unchecked")
176 179
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext.getCachedObject(code);

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

@ -2260,6 +2260,124 @@ COMMENT ON TABLE WARE is '文章关联服务表';
2260 2260
ALTER TABLE PPATENT ADD COLUMN COOPERATION text;
2261 2261
COMMENT ON COLUMN PPATENT.COOPERATION is '合作备注';
2262 2262

2263
--modify begin at version2.40
2264
CREATE TABLE PLATFORM_USER (
2265
	ID CHAR(32) NOT NULL,
2266
	EMAIL TEXT NOT NULL,
2267
	PHONE TEXT,
2268
	PASSWD TEXT NOT NULL,
2269
	STATE CHAR(1) NOT NULL,
2270
	CREATE_TIME CHAR(14) NOT NULL,
2271
	MODIFY_TIME CHAR(14) NOT NULL);
2272
ALTER TABLE PLATFORM_USER ADD PRIMARY KEY (ID);
2273
ALTER TABLE PLATFORM_USER ADD UNIQUE (EMAIL);
2274
ALTER TABLE PLATFORM_USER ADD UNIQUE (PHONE);
2275

2276
COMMENT ON TABLE PLATFORM_USER is '平台用户表';
2277
COMMENT ON COLUMN PLATFORM.EMAIL is '登录邮箱';
2278
COMMENT ON COLUMN PLATFORM.PHONE is '登录手机号(未户用)';
2279
COMMENT ON COLUMN PLATFORM.PASSWD is '登录密码';
2280
COMMENT ON COLUMN PLATFORM.PHONE is '状态 1:启用  0:未启用';
2281

2282
CREATE TABLE PLATFORM_INFO (
2283
	ID CHAR(10) NOT NULL,
2284
	NAME TEXT NOT NULL,
2285
	LOGO TEXT,
2286
	LINKMAN TEXT NOT NULL,
2287
	LINKPHONE TEXT NOT NULL,
2288
	LINKEAMIL TEXT NOT NULL,
2289
	PROVINCE TEXT,
2290
	CITY TEXT,
2291
	ADDR TEXT,
2292
	URL TEXT,
2293
	INDUSTRY TEXT,
2294
	DESCP TEXT NOT NULL,
2295
	CREATE_TIME CHAR(14) NOT NULL,
2296
	MODIFY_TIME CHAR(14) NOT NULL);
2297
ALTER TABLE PLATFORM_INFO ADD PRIMARY KEY (ID);
2298

2299
COMMENT ON TABLE PLATFORM_INFO is '平台信息表';
2300
COMMENT ON COLUMN PLATFORM_INFO.NAME is '平台名称';
2301
COMMENT ON COLUMN PLATFORM_INFO.LOGO is '平台LOGO';
2302
COMMENT ON COLUMN PLATFORM_INFO.LINKMAN is '联系人';
2303
COMMENT ON COLUMN PLATFORM_INFO.LINKPHONE is '联系电话';
2304
COMMENT ON COLUMN PLATFORM_INFO.LINKEMAIL is '联系邮箱';
2305
COMMENT ON COLUMN PLATFORM_INFO.PROVINCE is '省';
2306
COMMENT ON COLUMN PLATFORM_INFO.CITY is '市';
2307
COMMENT ON COLUMN PLATFORM_INFO.ADDR is '地址';
2308
COMMENT ON COLUMN PLATFORM_INFO.URL is '官网';
2309
COMMENT ON COLUMN PLATFORM_INFO.INDUSTRY is '面向行业';
2310
COMMENT ON COLUMN PLATFORM_INFO.DESCP is '平台介绍';
2311

2312

2313
 CREATE TABLE REFERENCED_ARTICLE (
2314
 	PID TEXT NOT NULL,
2315
 	AID TEXT NOT NULL,
2316
 	CREATE_TIME CHAR(14) NOT NULL);
2317
ALTER TABLE REFERENCED_ARTICLE ADD PRIMARY KEY (PID,OID);
2318
COMMENT ON TABLE REFERENCED_ARTICLE is '企业动态表';
2319
COMMENT ON COLUMN REFERENCED_ARTICLE.PID is '平台ID';
2320
COMMENT ON COLUMN REFERENCED_ARTICLE.AID is '文章ID';
2321
COMMENT ON COLUMN REFERENCED_ARTICLE.CREATE_TIME is '关联时间';
2322

2323
 CREATE TABLE RESIDENT_ORG (
2324
 	PID TEXT NOT NULL,
2325
 	OID TEXT NOT NULL,
2326
 	CREATE_TIME CHAR(14) NOT NULL);
2327
ALTER TABLE RESIDENT_ORG ADD PRIMARY KEY (PID,OID);
2328
COMMENT ON TABLE RESIDENT_ORG is '平台入驻企业表';
2329
COMMENT ON COLUMN RESIDENT_ORG.PID is '平台ID';
2330
COMMENT ON COLUMN RESIDENT_ORG.OID is '企业ID';
2331
COMMENT ON COLUMN RESIDENT_ORG.CREATE_TIME is '入驻时间';
2332

2333

2334
 CREATE TABLE BUTTED_ORG (
2335
 	PID TEXT NOT NULL,
2336
 	OID TEXT NOT NULL,
2337
 	CREATE_TIME CHAR(14) NOT NULL);
2338
ALTER TABLE BUTTED_ORG ADD PRIMARY KEY (PID,OID);
2339
COMMENT ON TABLE BUTTED_ORG is '对接的平台机构表';
2340
COMMENT ON COLUMN BUTTED_ORG.PID is '平台ID';
2341
COMMENT ON COLUMN BUTTED_ORG.OID is '对接的机构ID';
2342
COMMENT ON COLUMN BUTTED_ORG.CREATE_TIME is '对接时间';
2343

2344

2345
 CREATE TABLE BUTTED_PROFESSOR (
2346
 	PID TEXT NOT NULL,
2347
 	UID TEXT NOT NULL,
2348
 	CREATE_TIME CHAR(14) NOT NULL);
2349
ALTER TABLE BUTTED_PROFESSOR ADD PRIMARY KEY (PID,OID);
2350
COMMENT ON TABLE BUTTED_PROFESSOR is '对接的平台专家表';
2351
COMMENT ON COLUMN BUTTED_PROFESSOR.PID is '平台ID';
2352
COMMENT ON COLUMN BUTTED_PROFESSOR.UID is '对接的专家ID';
2353
COMMENT ON COLUMN BUTTED_PROFESSOR.CREATE_TIME is '对接时间';
2354

2355
CREATE TABLE PLATFORM_ORG (
2356
	ID TEXT NOT NULL,
2357
	PID TEXT NOT NULL,
2358
	NAME TEXT NOT NULL,
2359
	EMAIL TEXT NOT NULL,
2360
	ADDR TEXT,
2361
	LINKMAN TEXT,
2362
	LINKPHONE TEXT,
2363
	INDUSTRY TEXT,
2364
	DESCP TEXT,
2365
	CREATE_TIME CHAR(14) NOT NULL);
2366
ALTER TABLE PLATFORM_ORG ADD PRIMARY KEY (ID);
2367

2368
COMMENT ON TABLE PLATFORM_ORG is '平台待入驻企业表';
2369
COMMENT ON COLUMN PLATFORM_ORG.PID is '平台ID';
2370
COMMENT ON COLUMN PLATFORM_ORG.NAME is '企业全称';
2371
COMMENT ON COLUMN PLATFORM_ORG.EMAIL is '企业邮箱';
2372
COMMENT ON COLUMN PLATFORM_ORG.ADDR is '企业地址';
2373
COMMENT ON COLUMN PLATFORM_ORG.LINKMAN is '联系人';
2374
COMMENT ON COLUMN PLATFORM_ORG.LINKPHONE is '联系电话';
2375
COMMENT ON COLUMN PLATFORM_ORG.INDUSTRY is '所属行业';
2376
COMMENT ON COLUMN PLATFORM_ORG.DESCP is '企业介绍';
2377

2378

2379

2380

2263 2381

2264 2382

2265 2383