Skip to content

B
bigdatainterservice
Commit a810ea05 by liuys
Options

修改用户查询接口，并修改表TB_ST_USER为TB_VM_USER_INFO

parent 3b3ba7d0
Showing with 145 additions and 105 deletions
src/main/java/com/founder/interservice/user/controller/UserContoller.java
......@@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
/**
......@@ -31,21 +30,16 @@ public class UserContoller {
*/
@RequestMapping(value = "/queryUserByid")
@ResponseBody
public User queryUserByid(String userid, String policemanid,
@RequestParam(value = "page",defaultValue = "0") int page,
@RequestParam(value = "rows",defaultValue = "0") int rows){
User users = new User();
public User queryUserByid(String id, String username){
User user = new User();
try{
User user = new User();
user.setUserid(userid);
user.setPolicemanid(policemanid);
users = userService.queryUserByid(user);
String truename = users.getTrue_name();
System.out.print("truename="+truename);
user.setId(id);
user.setUsername(username);
user = userService.queryUserByid(user);
}catch (InterServiceException e){
e.printStackTrace();
}
return users;
return user;
}
......
src/main/java/com/founder/interservice/user/model/User.java
......@@ -3,8 +3,9 @@ package com.founder.interservice.user.model;
import lombok.Data;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.util.Date;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/**
* @ClassName： UserContoller
......@@ -15,34 +16,30 @@ import java.util.Date;
*/
@Data
@Entity
@Table(name = "TB_ST_USER")
@Table(name = "TB_VW_USER_INFO")
@DynamicUpdate
public class User {
@Id
private String userid;
private String tech_id;
private String username;
private String user_level;
private String password;
private String true_name;
private String open_flag;
private String default_module;
private String remark;
private Date create_date;
private String create_pname;
private Date modify_date;
private String modify_pname;
private String policemanid;
private String card_id;
private String phone_no;
private String jz_dwdm;
private String jz_dwmc;
private String scbz;
private String sex;
private String birthday;
//单独给实体添加私有属性
@Transient
private int begin;
@Transient
private int end;
private String id;//主键id
private String tech_id;//
private String username;//用户名
private String user_level;//用户级别
private String password;//密码
private String true_name;//真实姓名
private String open_flag;//
private String default_module;//
private String remark;//
private String create_date;//创建时间
private String create_pname;//创建用户名称
private String modify_date;//修改时间
private String modify_pname;//修改用户名称
private String card_id;//身份证号
private String phone_no;//手机号
private String jz_dwdm;//用户单位
private String jz_dwmc;//用户单位名称
private String organ_name;//
private String organ_id;//
private String createdtime;//登记时间
private String rksj;//入库时间
private String del;//删除判断标志
}
src/main/java/com/founder/interservice/user/vo/UserVOS.java
......@@ -2,32 +2,31 @@ package com.founder.interservice.user.vo;
import lombok.Data;
import java.util.Date;
/**
* 用户实体的VO类
*/
@Data
public class UserVOS {
private String userid;
private String tech_id;
private String username;
private String user_level;
private String password;
private String true_name;
private String open_flag;
private String default_module;
private String remark;
private Date create_date;
private String create_pname;
private Date modify_date;
private String modify_pname;
private String policemanid;
private String card_id;
private String phone_no;
private String jz_dwdm;
private String jz_dwmc;
private String scbz;
private String sex;
private String birthday;
private String id;//主键id
private String tech_id;//
private String username;//用户名
private String user_level;//用户级别
private String password;//密码
private String true_name;//真实姓名
private String open_flag;//
private String default_module;//
private String remark;//
private String create_date;//创建时间
private String create_pname;//创建用户名称
private String modify_date;//修改时间
private String modify_pname;//修改用户名称
private String card_id;//身份证号
private String phone_no;//手机号
private String jz_dwdm;//用户单位
private String jz_dwmc;//用户单位名称
private String organ_name;//
private String organ_id;//
private String createdtime;//登记时间
private String rksj;//入库时间
private String del;//删除判断标志
}
src/main/resources/mybatis/mapper/xzxt/UserMapper.xml
......@@ -4,7 +4,7 @@
<select id="queryUserByid" parameterType="com.founder.interservice.user.model.User" resultType="com.founder.interservice.user.model.User">
select
t.USERID as userid,
t.ID as id,
t.TECH_ID as tech_id,
t.USERNAME as username,
t.USER_LEVEL as user_level,
......@@ -12,27 +12,28 @@
t.TRUE_NAME as true_name,
t.OPEN_FLAG as open_flag,
t.DEFAULT_MODULE as default_module,
t.remark as remark,
t.REMARK as remark,
t.CREATE_DATE as create_date,
t.CREATE_PNAME as create_pname,
t.MODIFY_DATE as modify_date,
t.MODIFY_PNAME as modify_pname,
t.POLICEMANID as policemanid,
t.CARD_ID as card_id,
t.PHONE_NO as phone_no,
t.JZ_DWDM as jz_dwdm,
t.JZ_DWMC as jz_dwmc,
t.SEX as sex,
t.BIRTHDAY as birthday,
t.SCBZ as scbz
from TB_ST_USER t
t.ORGAN_NAME as organ_name,
t.ORGAN_ID as organ_id,
t.CREATEDTIME as createdtime,
t.RKSJ as rksj,
t.DEL as del
from TB_VW_USER_INFO t
where
t.SCBZ='0'
<if test="userid != null and userid != ''">
and t.USERID = #{userid}
t.DEL='0'
<if test="id != null and id != ''">
and t.ID = #{id}
</if>
<if test="policemanid != null and policemanid != ''">
and t.POLICEMANID = #{policemanid}
<if test="username != null and username != ''">
and t.USERNAME = #{username}
</if>
</select>
</mapper>
\ No newline at end of file
src/main/resources/static/sql/S034.20190320_zhulinying_新增TB_ST_USER表.txt → src/main/resources/static/sql/S034.20190320_zhulinying_新增TB_VW_USER_INFO表.txt
INSERT INTO XZXT.SYS_DBLOG(SID,STATUS)VALUES('S034',0);
INSERT INTO XZXT.SYS_DBLOG(SID,STATUS)VALUES('S034',0);
INSERT INTO XZXT.SYS_DBLOG(SID,STATUS)VALUES('S034',0);
COMMIT;
-------------------------------------------------------------------------------------------
CREATE TABLE XZXT.TB_ST_USER
ALTER TABLE XZXT.TB_VW_USER_INFO
DROP PRIMARY KEY CASCADE;
DROP TABLE XZXT.TB_VW_USER_INFO CASCADE CONSTRAINTS;
CREATE TABLE XZXT.TB_VW_USER_INFO
(
USERID VARCHAR2(32 BYTE) NOT NULL,
ID VARCHAR2(32 BYTE) NOT NULL,
TECH_ID VARCHAR2(32 BYTE),
USERNAME VARCHAR2(50 BYTE),
USER_LEVEL VARCHAR2(4 BYTE),
......@@ -16,14 +20,15 @@ CREATE TABLE XZXT.TB_ST_USER
CREATE_PNAME VARCHAR2(50 BYTE),
MODIFY_DATE DATE,
MODIFY_PNAME VARCHAR2(50 BYTE),
POLICEMANID VARCHAR2(32 BYTE),
CARD_ID VARCHAR2(28 BYTE),
PHONE_NO VARCHAR2(20 BYTE),
JZ_DWDM VARCHAR2(32 BYTE),
JZ_DWMC VARCHAR2(200 BYTE),
SCBZ VARCHAR2(1 BYTE),
SEX VARCHAR2(4 BYTE),
BIRTHDAY VARCHAR2(50 BYTE)
ORGAN_NAME VARCHAR2(200 BYTE),
ORGAN_ID VARCHAR2(32 BYTE),
CREATEDTIME VARCHAR2(2000 BYTE),
RKSJ VARCHAR2(2000 BYTE),
DEL VARCHAR2(2 BYTE)
)
TABLESPACE TBS_BIGDATA
PCTUSED 0
......@@ -31,68 +36,111 @@ PCTFREE 10
INITRANS 1
MAXTRANS 255
STORAGE (
INITIAL 64K
NEXT 1M
MINEXTENTS 1
MAXEXTENTS UNLIMITED
PCTINCREASE 0
BUFFER_POOL DEFAULT
)
LOGGING
NOCOMPRESS
LOB (REMARK) STORE AS
( TABLESPACE TBS_BIGDATA
ENABLE STORAGE IN ROW
CHUNK 8192
RETENTION
NOCACHE
INDEX (
TABLESPACE TBS_BIGDATA
STORAGE (
INITIAL 64K
NEXT 1
MINEXTENTS 1
MAXEXTENTS UNLIMITED
PCTINCREASE 0
BUFFER_POOL DEFAULT
))
STORAGE (
INITIAL 64K
NEXT 1M
MINEXTENTS 1
MAXEXTENTS UNLIMITED
PCTINCREASE 0
BUFFER_POOL DEFAULT
)
)
NOCACHE
NOPARALLEL
MONITORING;
COMMENT ON COLUMN XZXT.TB_ST_USER.USERID IS '主键id';
COMMENT ON COLUMN XZXT.TB_ST_USER.TECH_ID IS '角色id';
COMMENT ON COLUMN XZXT.TB_VW_USER_INFO.ID IS '主键id';
COMMENT ON COLUMN XZXT.TB_ST_USER.USERNAME IS '用户名';
COMMENT ON COLUMN XZXT.TB_VW_USER_INFO.USERNAME IS '用户名';
COMMENT ON COLUMN XZXT.TB_ST_USER.USER_LEVEL IS '用户级别';
COMMENT ON COLUMN XZXT.TB_VW_USER_INFO.USER_LEVEL IS '用户级别';
COMMENT ON COLUMN XZXT.TB_ST_USER.PASSWORD IS '密码';
COMMENT ON COLUMN XZXT.TB_VW_USER_INFO.PASSWORD IS '密码';
COMMENT ON COLUMN XZXT.TB_ST_USER.TRUE_NAME IS '真实姓名';
COMMENT ON COLUMN XZXT.TB_VW_USER_INFO.TRUE_NAME IS '真实姓名';
COMMENT ON COLUMN XZXT.TB_ST_USER.CREATE_DATE IS '创建时间';
COMMENT ON COLUMN XZXT.TB_VW_USER_INFO.CREATE_DATE IS '创建时间';
COMMENT ON COLUMN XZXT.TB_ST_USER.CREATE_PNAME IS '创建用户名称';
COMMENT ON COLUMN XZXT.TB_VW_USER_INFO.CREATE_PNAME IS '创建用户名称';
COMMENT ON COLUMN XZXT.TB_ST_USER.MODIFY_DATE IS '修改时间';
COMMENT ON COLUMN XZXT.TB_VW_USER_INFO.MODIFY_DATE IS '修改时间';
COMMENT ON COLUMN XZXT.TB_ST_USER.MODIFY_PNAME IS '修改用户名称';
COMMENT ON COLUMN XZXT.TB_VW_USER_INFO.MODIFY_PNAME IS '修改用户名称';
COMMENT ON COLUMN XZXT.TB_ST_USER.POLICEMANID IS '警号';
COMMENT ON COLUMN XZXT.TB_VW_USER_INFO.CARD_ID IS '身份证号';
COMMENT ON COLUMN XZXT.TB_ST_USER.PHONE_NO IS '手机号';
COMMENT ON COLUMN XZXT.TB_VW_USER_INFO.PHONE_NO IS '手机号';
COMMENT ON COLUMN XZXT.TB_ST_USER.JZ_DWDM IS '用户单位';
COMMENT ON COLUMN XZXT.TB_VW_USER_INFO.JZ_DWDM IS '用户单位';
COMMENT ON COLUMN XZXT.TB_ST_USER.JZ_DWMC IS '用户单位名称';
COMMENT ON COLUMN XZXT.TB_VW_USER_INFO.JZ_DWMC IS '用户单位名称';
COMMENT ON COLUMN XZXT.TB_ST_USER.SCBZ IS '删除标志';
COMMENT ON COLUMN XZXT.TB_VW_USER_INFO.CREATEDTIME IS '登记时间';
COMMENT ON COLUMN XZXT.TB_ST_USER.SEX IS '性别';
COMMENT ON COLUMN XZXT.TB_VW_USER_INFO.RKSJ IS '入库时间';
COMMENT ON COLUMN XZXT.TB_ST_USER.BIRTHDAY IS '出生日期';
COMMENT ON COLUMN XZXT.TB_VW_USER_INFO.DEL IS '删除判断标志';
CREATE UNIQUE INDEX XZXT.TB_ST_USER_PK ON XZXT.TB_ST_USER
(USERID)
CREATE UNIQUE INDEX XZXT.TB_ST_USER_PK ON XZXT.TB_VW_USER_INFO
(ID)
LOGGING
TABLESPACE TBS_BIGDATA
PCTFREE 10
INITRANS 2
MAXTRANS 255
STORAGE (
INITIAL 64K
NEXT 1M
MINEXTENTS 1
MAXEXTENTS UNLIMITED
PCTINCREASE 0
BUFFER_POOL DEFAULT
)
NOPARALLEL;
ALTER TABLE XZXT.TB_ST_USER ADD (
ALTER TABLE XZXT.TB_VW_USER_INFO ADD (
CONSTRAINT TB_ST_USER_PK
PRIMARY KEY
(USERID));
(ID)
USING INDEX
TABLESPACE TBS_BIGDATA
PCTFREE 10
INITRANS 2
MAXTRANS 255
STORAGE (
INITIAL 64K
NEXT 1M
MINEXTENTS 1
MAXEXTENTS UNLIMITED
PCTINCREASE 0
));
-------------------------------------------------------------------------------------------
UPDATE XZXT.SYS_DBLOG SET STATUS=1 WHERE SID='S034';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment