Commit be47a2c6 by Suvalue

数据返回去除CREATEID,CREATEDATE,STATE

parent 8fee76c3
...@@ -3,7 +3,9 @@ package com.bsoft.api.controller; ...@@ -3,7 +3,9 @@ package com.bsoft.api.controller;
import com.bsoft.api.common.Result; import com.bsoft.api.common.Result;
import com.bsoft.api.common.annotations.CurrentUser; import com.bsoft.api.common.annotations.CurrentUser;
import com.bsoft.api.common.annotations.Token; import com.bsoft.api.common.annotations.Token;
import com.bsoft.api.model.SysRole;
import com.bsoft.api.model.SysUser; import com.bsoft.api.model.SysUser;
import com.bsoft.api.model.respmodel.SysMenuList;
import com.bsoft.api.service.SysMenuService; import com.bsoft.api.service.SysMenuService;
import com.bsoft.api.service.SysUserRoleRsService; import com.bsoft.api.service.SysUserRoleRsService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -12,6 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -12,6 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore; import springfox.documentation.annotations.ApiIgnore;
import java.util.List;
@Api(tags = "用户API",produces="produces",consumes="consumes",protocols="protocols") @Api(tags = "用户API",produces="produces",consumes="consumes",protocols="protocols")
@RequestMapping("/user") @RequestMapping("/user")
...@@ -39,7 +43,8 @@ public class UserController { ...@@ -39,7 +43,8 @@ public class UserController {
@Token @Token
@ApiOperation("查询用户角色") @ApiOperation("查询用户角色")
public Object getRoleListByUser(@ApiIgnore@CurrentUser Long userId)throws Exception{ public Object getRoleListByUser(@ApiIgnore@CurrentUser Long userId)throws Exception{
return Result.success(sysUserRoleRsService.getRoleListByUser(userId)); List<SysRole> sysRoleList = sysUserRoleRsService.getRoleListByUser(userId);
return Result.success(sysRoleList);
} }
/** /**
...@@ -51,6 +56,7 @@ public class UserController { ...@@ -51,6 +56,7 @@ public class UserController {
@Token @Token
@ApiOperation("查询用户菜单") @ApiOperation("查询用户菜单")
public Object getMenuByUser(@ApiIgnore@CurrentUser Long userId)throws Exception{ public Object getMenuByUser(@ApiIgnore@CurrentUser Long userId)throws Exception{
return Result.success(sysMenuService.getMenu(userId)); List<SysMenuList> sysMenuList = sysMenuService.getMenu(userId);
return Result.success(sysMenuList);
} }
} }
...@@ -5,12 +5,6 @@ import java.util.Date; ...@@ -5,12 +5,6 @@ import java.util.Date;
public class DicDim { public class DicDim {
private Long id; private Long id;
private Date createDate;
private Long createUserid;
private Short state;
private String dimName; private String dimName;
private String dimField; private String dimField;
...@@ -25,30 +19,6 @@ public class DicDim { ...@@ -25,30 +19,6 @@ public class DicDim {
this.id = id; this.id = id;
} }
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
public Long getCreateUserid() {
return createUserid;
}
public void setCreateUserid(Long createUserid) {
this.createUserid = createUserid;
}
public Short getState() {
return state;
}
public void setState(Short state) {
this.state = state;
}
public String getDimName() { public String getDimName() {
return dimName; return dimName;
} }
......
...@@ -5,12 +5,6 @@ import java.util.Date; ...@@ -5,12 +5,6 @@ import java.util.Date;
public class DicOrg { public class DicOrg {
private Long id; private Long id;
private Date createDate;
private Long createUserid;
private Short state;
private String orgCode; private String orgCode;
private String orgName; private String orgName;
...@@ -35,30 +29,6 @@ public class DicOrg { ...@@ -35,30 +29,6 @@ public class DicOrg {
this.id = id; this.id = id;
} }
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
public Long getCreateUserid() {
return createUserid;
}
public void setCreateUserid(Long createUserid) {
this.createUserid = createUserid;
}
public Short getState() {
return state;
}
public void setState(Short state) {
this.state = state;
}
public String getOrgCode() { public String getOrgCode() {
return orgCode; return orgCode;
} }
......
...@@ -6,12 +6,6 @@ import java.util.Date; ...@@ -6,12 +6,6 @@ import java.util.Date;
public class SerDisease { public class SerDisease {
private BigDecimal id; private BigDecimal id;
private Date createDate;
private BigDecimal createUserid;
private BigDecimal state;
private String mdcCode; private String mdcCode;
private String mdcName; private String mdcName;
...@@ -36,30 +30,6 @@ public class SerDisease { ...@@ -36,30 +30,6 @@ public class SerDisease {
this.id = id; this.id = id;
} }
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
public BigDecimal getCreateUserid() {
return createUserid;
}
public void setCreateUserid(BigDecimal createUserid) {
this.createUserid = createUserid;
}
public BigDecimal getState() {
return state;
}
public void setState(BigDecimal state) {
this.state = state;
}
public String getMdcCode() { public String getMdcCode() {
return mdcCode; return mdcCode;
} }
......
...@@ -5,12 +5,6 @@ import java.util.Date; ...@@ -5,12 +5,6 @@ import java.util.Date;
public class SysMenu { public class SysMenu {
private Long id; private Long id;
private Date createData;
private Long createUserid;
private Short state;
private Long projectId; private Long projectId;
private String menuName; private String menuName;
...@@ -29,30 +23,6 @@ public class SysMenu { ...@@ -29,30 +23,6 @@ public class SysMenu {
this.id = id; this.id = id;
} }
public Date getCreateData() {
return createData;
}
public void setCreateData(Date createData) {
this.createData = createData;
}
public Long getCreateUserid() {
return createUserid;
}
public void setCreateUserid(Long createUserid) {
this.createUserid = createUserid;
}
public Short getState() {
return state;
}
public void setState(Short state) {
this.state = state;
}
public Long getProjectId() { public Long getProjectId() {
return projectId; return projectId;
} }
......
...@@ -17,35 +17,35 @@ public class SysUser { ...@@ -17,35 +17,35 @@ public class SysUser {
@ApiModelProperty("用户ID") @ApiModelProperty("用户ID")
private Long id; private Long id;
/** // /**
* // *
* This field was generated by MyBatis Generator. // * This field was generated by MyBatis Generator.
* This field corresponds to the database column LL.SYS_USER.CREATE_DATE // * This field corresponds to the database column LL.SYS_USER.CREATE_DATE
* // *
* @mbggenerated Tue Oct 22 14:44:12 CST 2019 // * @mbggenerated Tue Oct 22 14:44:12 CST 2019
*/ // */
@ApiModelProperty("创建时间") // @ApiModelProperty("创建时间")
private Date createDate; // private Date createDate;
//
/** // /**
* // *
* This field was generated by MyBatis Generator. // * This field was generated by MyBatis Generator.
* This field corresponds to the database column LL.SYS_USER.CREATE_USERID // * This field corresponds to the database column LL.SYS_USER.CREATE_USERID
* // *
* @mbggenerated Tue Oct 22 14:44:12 CST 2019 // * @mbggenerated Tue Oct 22 14:44:12 CST 2019
*/ // */
@ApiModelProperty("创建人ID") // @ApiModelProperty("创建人ID")
private Long createUserid; // private Long createUserid;
//
/** // /**
* // *
* This field was generated by MyBatis Generator. // * This field was generated by MyBatis Generator.
* This field corresponds to the database column LL.SYS_USER.STATE // * This field corresponds to the database column LL.SYS_USER.STATE
* // *
* @mbggenerated Tue Oct 22 14:44:12 CST 2019 // * @mbggenerated Tue Oct 22 14:44:12 CST 2019
*/ // */
@ApiModelProperty("状态(1=启用/0=禁用)") // @ApiModelProperty("状态(1=启用/0=禁用)")
private Short state; // private Short state;
/** /**
* *
...@@ -187,69 +187,69 @@ public class SysUser { ...@@ -187,69 +187,69 @@ public class SysUser {
* *
* @mbggenerated Tue Oct 22 14:44:12 CST 2019 * @mbggenerated Tue Oct 22 14:44:12 CST 2019
*/ */
public Date getCreateDate() { // public Date getCreateDate() {
return createDate; // return createDate;
} // }
//
/** // /**
* This method was generated by MyBatis Generator. // * This method was generated by MyBatis Generator.
* This method sets the value of the database column LL.SYS_USER.CREATE_DATE // * This method sets the value of the database column LL.SYS_USER.CREATE_DATE
* // *
* @param createDate the value for LL.SYS_USER.CREATE_DATE // * @param createDate the value for LL.SYS_USER.CREATE_DATE
* // *
* @mbggenerated Tue Oct 22 14:44:12 CST 2019 // * @mbggenerated Tue Oct 22 14:44:12 CST 2019
*/ // */
public void setCreateDate(Date createDate) { // public void setCreateDate(Date createDate) {
this.createDate = createDate; // this.createDate = createDate;
} // }
//
/** // /**
* This method was generated by MyBatis Generator. // * This method was generated by MyBatis Generator.
* This method returns the value of the database column LL.SYS_USER.CREATE_USERID // * This method returns the value of the database column LL.SYS_USER.CREATE_USERID
* // *
* @return the value of LL.SYS_USER.CREATE_USERID // * @return the value of LL.SYS_USER.CREATE_USERID
* // *
* @mbggenerated Tue Oct 22 14:44:12 CST 2019 // * @mbggenerated Tue Oct 22 14:44:12 CST 2019
*/ // */
public Long getCreateUserid() { // public Long getCreateUserid() {
return createUserid; // return createUserid;
} // }
//
/** // /**
* This method was generated by MyBatis Generator. // * This method was generated by MyBatis Generator.
* This method sets the value of the database column LL.SYS_USER.CREATE_USERID // * This method sets the value of the database column LL.SYS_USER.CREATE_USERID
* // *
* @param createUserid the value for LL.SYS_USER.CREATE_USERID // * @param createUserid the value for LL.SYS_USER.CREATE_USERID
* // *
* @mbggenerated Tue Oct 22 14:44:12 CST 2019 // * @mbggenerated Tue Oct 22 14:44:12 CST 2019
*/ // */
public void setCreateUserid(Long createUserid) { // public void setCreateUserid(Long createUserid) {
this.createUserid = createUserid; // this.createUserid = createUserid;
} // }
//
/** // /**
* This method was generated by MyBatis Generator. // * This method was generated by MyBatis Generator.
* This method returns the value of the database column LL.SYS_USER.STATE // * This method returns the value of the database column LL.SYS_USER.STATE
* // *
* @return the value of LL.SYS_USER.STATE // * @return the value of LL.SYS_USER.STATE
* // *
* @mbggenerated Tue Oct 22 14:44:12 CST 2019 // * @mbggenerated Tue Oct 22 14:44:12 CST 2019
*/ // */
public Short getState() { // public Short getState() {
return state; // return state;
} // }
//
/** // /**
* This method was generated by MyBatis Generator. // * This method was generated by MyBatis Generator.
* This method sets the value of the database column LL.SYS_USER.STATE // * This method sets the value of the database column LL.SYS_USER.STATE
* // *
* @param state the value for LL.SYS_USER.STATE // * @param state the value for LL.SYS_USER.STATE
* // *
* @mbggenerated Tue Oct 22 14:44:12 CST 2019 // * @mbggenerated Tue Oct 22 14:44:12 CST 2019
*/ // */
public void setState(Short state) { // public void setState(Short state) {
this.state = state; // this.state = state;
} // }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
......
...@@ -5,12 +5,6 @@ import java.util.Date; ...@@ -5,12 +5,6 @@ import java.util.Date;
public class SysUserRoleRs { public class SysUserRoleRs {
private Long id; private Long id;
private Date createDate;
private Long createUserid;
private Short state;
private Long userId; private Long userId;
private Long roleId; private Long roleId;
...@@ -23,30 +17,6 @@ public class SysUserRoleRs { ...@@ -23,30 +17,6 @@ public class SysUserRoleRs {
this.id = id; this.id = id;
} }
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
public Long getCreateUserid() {
return createUserid;
}
public void setCreateUserid(Long createUserid) {
this.createUserid = createUserid;
}
public Short getState() {
return state;
}
public void setState(Short state) {
this.state = state;
}
public Long getUserId() { public Long getUserId() {
return userId; return userId;
} }
......
...@@ -9,6 +9,8 @@ public class DimValue { ...@@ -9,6 +9,8 @@ public class DimValue {
private List<SerDimValue> dimValues; private List<SerDimValue> dimValues;
public DicDim getDicDim() { public DicDim getDicDim() {
return dicDim; return dicDim;
} }
......
...@@ -6,7 +6,6 @@ import java.util.List; ...@@ -6,7 +6,6 @@ import java.util.List;
public class DiseaseLevel { public class DiseaseLevel {
private BigDecimal id; private BigDecimal id;
private BigDecimal state;
private String mdcCode; private String mdcCode;
private String mdcName; private String mdcName;
private BigDecimal date; private BigDecimal date;
...@@ -25,14 +24,6 @@ public class DiseaseLevel { ...@@ -25,14 +24,6 @@ public class DiseaseLevel {
this.id = id; this.id = id;
} }
public BigDecimal getState() {
return state;
}
public void setState(BigDecimal state) {
this.state = state;
}
public String getMdcCode() { public String getMdcCode() {
return mdcCode; return mdcCode;
} }
......
...@@ -3,6 +3,7 @@ package com.bsoft.api.service.Impl; ...@@ -3,6 +3,7 @@ package com.bsoft.api.service.Impl;
import com.bsoft.api.common.utils.TokenUtil; import com.bsoft.api.common.utils.TokenUtil;
import com.bsoft.api.mapper.DicOrgMapper; import com.bsoft.api.mapper.DicOrgMapper;
import com.bsoft.api.mapper.SysUserMapper; import com.bsoft.api.mapper.SysUserMapper;
import com.bsoft.api.model.DicOrg;
import com.bsoft.api.model.SysUser; import com.bsoft.api.model.SysUser;
import com.bsoft.api.service.LoginService; import com.bsoft.api.service.LoginService;
import com.bsoft.api.service.UserService; import com.bsoft.api.service.UserService;
...@@ -12,6 +13,7 @@ import org.springframework.stereotype.Service; ...@@ -12,6 +13,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.util.Date; import java.util.Date;
import java.util.List;
@Service @Service
...@@ -42,7 +44,8 @@ public class LoginServiceImpl implements LoginService { ...@@ -42,7 +44,8 @@ public class LoginServiceImpl implements LoginService {
loginInfo.setToken(token); loginInfo.setToken(token);
loginInfo.setUser(user); loginInfo.setUser(user);
//查询用户机构 //查询用户机构
loginInfo.setOrg(dicOrgMapper.selectByUser(user.getId())); List<DicOrg> orgList =dicOrgMapper.selectByUser(user.getId());
loginInfo.setOrg(orgList);
} }
return loginInfo; return loginInfo;
} }
......
...@@ -44,7 +44,6 @@ public class SerDiseaseServiceImpl implements SerDiseaseService { ...@@ -44,7 +44,6 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
diseaseLevel1.setOrgId(serDiseases.getOrgId()); diseaseLevel1.setOrgId(serDiseases.getOrgId());
diseaseLevel1.setOrgName(serDiseases.getOrgName()); diseaseLevel1.setOrgName(serDiseases.getOrgName());
diseaseLevel1.setParentId(serDiseases.getParentId()); diseaseLevel1.setParentId(serDiseases.getParentId());
diseaseLevel1.setState(serDiseases.getState());
diseaseLevelList.add(diseaseLevel1); diseaseLevelList.add(diseaseLevel1);
} }
if(diseaseLevel!=null){ if(diseaseLevel!=null){
......
...@@ -3,9 +3,6 @@ ...@@ -3,9 +3,6 @@
<mapper namespace="com.bsoft.api.mapper.DicDimMapper"> <mapper namespace="com.bsoft.api.mapper.DicDimMapper">
<resultMap id="BaseResultMap" type="com.bsoft.api.model.DicDim"> <resultMap id="BaseResultMap" type="com.bsoft.api.model.DicDim">
<id column="ID" jdbcType="DECIMAL" property="id" /> <id column="ID" jdbcType="DECIMAL" property="id" />
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
<result column="STATE" jdbcType="DECIMAL" property="state" />
<result column="DIM_NAME" jdbcType="VARCHAR" property="dimName" /> <result column="DIM_NAME" jdbcType="VARCHAR" property="dimName" />
<result column="DIM_FIELD" jdbcType="VARCHAR" property="dimField" /> <result column="DIM_FIELD" jdbcType="VARCHAR" property="dimField" />
<result column="DIM_TYPE" jdbcType="DECIMAL" property="dimType" /> <result column="DIM_TYPE" jdbcType="DECIMAL" property="dimType" />
...@@ -19,16 +16,14 @@ ...@@ -19,16 +16,14 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long"> <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_DIC_DIM_ID.nextval from dual select SEQ_DIC_DIM_ID.nextval from dual
</selectKey> </selectKey>
insert into LL.DIC_DIM (CREATE_DATE, CREATE_USERID, STATE, insert into LL.DIC_DIM (
DIM_NAME, DIM_FIELD,DIM_TYPE) DIM_NAME, DIM_FIELD,DIM_TYPE)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL}, values (
#{dimName,jdbcType=VARCHAR}, #{dimField,jdbcType=VARCHAR},#{dimType,jdbcType=DECIMAL}) #{dimName,jdbcType=VARCHAR}, #{dimField,jdbcType=VARCHAR},#{dimType,jdbcType=DECIMAL})
</insert> </insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.DicDim"> <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.DicDim">
update LL.DIC_DIM update LL.DIC_DIM
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP}, set
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
DIM_NAME = #{dimName,jdbcType=VARCHAR}, DIM_NAME = #{dimName,jdbcType=VARCHAR},
DIM_FIELD = #{dimField,jdbcType=VARCHAR}, DIM_FIELD = #{dimField,jdbcType=VARCHAR},
DIM_TYPE=#{dimType,jdbcType=DECIMAL} DIM_TYPE=#{dimType,jdbcType=DECIMAL}
......
...@@ -3,9 +3,6 @@ ...@@ -3,9 +3,6 @@
<mapper namespace="com.bsoft.api.mapper.DicOrgMapper"> <mapper namespace="com.bsoft.api.mapper.DicOrgMapper">
<resultMap id="BaseResultMap" type="com.bsoft.api.model.DicOrg"> <resultMap id="BaseResultMap" type="com.bsoft.api.model.DicOrg">
<id column="ID" jdbcType="DECIMAL" property="id" /> <id column="ID" jdbcType="DECIMAL" property="id" />
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
<result column="STATE" jdbcType="DECIMAL" property="state" />
<result column="ORG_CODE" jdbcType="VARCHAR" property="orgCode" /> <result column="ORG_CODE" jdbcType="VARCHAR" property="orgCode" />
<result column="ORG_NAME" jdbcType="VARCHAR" property="orgName" /> <result column="ORG_NAME" jdbcType="VARCHAR" property="orgName" />
<result column="ORG_NO" jdbcType="VARCHAR" property="orgNo" /> <result column="ORG_NO" jdbcType="VARCHAR" property="orgNo" />
......
...@@ -3,9 +3,6 @@ ...@@ -3,9 +3,6 @@
<mapper namespace="com.bsoft.api.mapper.SerDiseaseMapper"> <mapper namespace="com.bsoft.api.mapper.SerDiseaseMapper">
<resultMap id="BaseResultMap" type="com.bsoft.api.model.SerDisease"> <resultMap id="BaseResultMap" type="com.bsoft.api.model.SerDisease">
<id column="ID" jdbcType="DECIMAL" property="id" /> <id column="ID" jdbcType="DECIMAL" property="id" />
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
<result column="STATE" jdbcType="DECIMAL" property="state" />
<result column="MDC_CODE" jdbcType="VARCHAR" property="mdcCode" /> <result column="MDC_CODE" jdbcType="VARCHAR" property="mdcCode" />
<result column="MDC_NAME" jdbcType="VARCHAR" property="mdcName" /> <result column="MDC_NAME" jdbcType="VARCHAR" property="mdcName" />
<result column="DATE" jdbcType="DECIMAL" property="date" /> <result column="DATE" jdbcType="DECIMAL" property="date" />
...@@ -36,20 +33,18 @@ ...@@ -36,20 +33,18 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal"> <selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
select SEQ_SER_DISEASE_ID.nextval from dual select SEQ_SER_DISEASE_ID.nextval from dual
</selectKey> </selectKey>
insert into LL.SER_DISEASE (CREATE_DATE, CREATE_USERID, STATE, insert into LL.SER_DISEASE (
MDC_CODE, MDC_NAME, DATE, MDC_CODE, MDC_NAME, DATE,
MDC_NUM, PARENT_ID, LEVEL, MDC_NUM, PARENT_ID, LEVEL,
ORG_ID, ORG_NAME) ORG_ID, ORG_NAME)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL}, values (
#{mdcCode,jdbcType=VARCHAR}, #{mdcName,jdbcType=VARCHAR}, #{date,jdbcType=DECIMAL}, #{mdcCode,jdbcType=VARCHAR}, #{mdcName,jdbcType=VARCHAR}, #{date,jdbcType=DECIMAL},
#{mdcNum,jdbcType=DECIMAL}, #{parentId,jdbcType=DECIMAL}, #{level,jdbcType=DECIMAL}, #{mdcNum,jdbcType=DECIMAL}, #{parentId,jdbcType=DECIMAL}, #{level,jdbcType=DECIMAL},
#{orgId,jdbcType=DECIMAL}, #{orgName,jdbcType=VARCHAR}) #{orgId,jdbcType=DECIMAL}, #{orgName,jdbcType=VARCHAR})
</insert> </insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SerDisease"> <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SerDisease">
update LL.SER_DISEASE update LL.SER_DISEASE
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP}, set
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
MDC_CODE = #{mdcCode,jdbcType=VARCHAR}, MDC_CODE = #{mdcCode,jdbcType=VARCHAR},
MDC_NAME = #{mdcName,jdbcType=VARCHAR}, MDC_NAME = #{mdcName,jdbcType=VARCHAR},
DATE = #{date,jdbcType=DECIMAL}, DATE = #{date,jdbcType=DECIMAL},
......
...@@ -3,9 +3,6 @@ ...@@ -3,9 +3,6 @@
<mapper namespace="com.bsoft.api.mapper.SysMenuMapper"> <mapper namespace="com.bsoft.api.mapper.SysMenuMapper">
<resultMap id="BaseResultMap" type="com.bsoft.api.model.SysMenu"> <resultMap id="BaseResultMap" type="com.bsoft.api.model.SysMenu">
<id column="ID" jdbcType="DECIMAL" property="id" /> <id column="ID" jdbcType="DECIMAL" property="id" />
<result column="CREATE_DATA" jdbcType="TIMESTAMP" property="createData" />
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
<result column="STATE" jdbcType="DECIMAL" property="state" />
<result column="MENU_NAME" jdbcType="VARCHAR" property="menuName" /> <result column="MENU_NAME" jdbcType="VARCHAR" property="menuName" />
<result column="MENU_URL" jdbcType="VARCHAR" property="menuUrl" /> <result column="MENU_URL" jdbcType="VARCHAR" property="menuUrl" />
<result column="MENU_IMAGE" jdbcType="VARCHAR" property="menuImage" /> <result column="MENU_IMAGE" jdbcType="VARCHAR" property="menuImage" />
...@@ -20,10 +17,10 @@ ...@@ -20,10 +17,10 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long"> <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_SYS_MENU_ID.nextval from dual select SEQ_SYS_MENU_ID.nextval from dual
</selectKey> </selectKey>
insert into LL.SYS_MENU (CREATE_DATA, CREATE_USERID, STATE, insert into LL.SYS_MENU (
MENU_NAME, MENU_URL, MENU_IMAGE, MENU_NAME, MENU_URL, MENU_IMAGE,
PARENT_ID) PARENT_ID)
values (#{createData,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL}, values (
#{menuName,jdbcType=VARCHAR}, #{menuUrl,jdbcType=VARCHAR}, #{menuImage,jdbcType=VARCHAR}, #{menuName,jdbcType=VARCHAR}, #{menuUrl,jdbcType=VARCHAR}, #{menuImage,jdbcType=VARCHAR},
values (#{createData,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL}, values (#{createData,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{menuName,jdbcType=VARCHAR}, #{menuUrl,jdbcType=VARCHAR}, #{menuImage,jdbcType=VARCHAR}, #{menuName,jdbcType=VARCHAR}, #{menuUrl,jdbcType=VARCHAR}, #{menuImage,jdbcType=VARCHAR},
...@@ -31,9 +28,7 @@ ...@@ -31,9 +28,7 @@
</insert> </insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysMenu"> <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysMenu">
update LL.SYS_MENU update LL.SYS_MENU
set CREATE_DATA = #{createData,jdbcType=TIMESTAMP}, set
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
MENU_NAME = #{menuName,jdbcType=VARCHAR}, MENU_NAME = #{menuName,jdbcType=VARCHAR},
MENU_URL = #{menuUrl,jdbcType=VARCHAR}, MENU_URL = #{menuUrl,jdbcType=VARCHAR},
MENU_IMAGE = #{menuImage,jdbcType=VARCHAR}, MENU_IMAGE = #{menuImage,jdbcType=VARCHAR},
...@@ -41,16 +36,16 @@ ...@@ -41,16 +36,16 @@
where ID = #{id,jdbcType=DECIMAL} where ID = #{id,jdbcType=DECIMAL}
</update> </update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATA, CREATE_USERID, STATE, MENU_NAME, MENU_URL, MENU_IMAGE, PARENT_ID select ID,MENU_NAME, MENU_URL, MENU_IMAGE, PARENT_ID
from LL.SYS_MENU from LL.SYS_MENU
where ID = #{id,jdbcType=DECIMAL} where ID = #{id,jdbcType=DECIMAL}
</select> </select>
<select id="selectAll" resultMap="BaseResultMap"> <select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATA, CREATE_USERID, STATE, MENU_NAME, MENU_URL, MENU_IMAGE, PARENT_ID select ID,MENU_NAME, MENU_URL, MENU_IMAGE, PARENT_ID
from LL.SYS_MENU from LL.SYS_MENU
</select> </select>
<select id="selectMenuByUser" resultMap="sysMenuResultMap"> <select id="selectMenuByUser" resultMap="sysMenuResultMap">
select DISTINCT m.ID,m.CREATE_DATA,m.CREATE_USERID,m.STATE,m.MENU_NAME,m.MENU_URL,m.MENU_IMAGE,m.PARENT_ID select DISTINCT m.ID,m.MENU_NAME,m.MENU_URL,m.MENU_IMAGE,m.PARENT_ID
from from
SYS_ROLE_MENU_RS rmr SYS_ROLE_MENU_RS rmr
LEFT JOIN LEFT JOIN
...@@ -61,7 +56,7 @@ ...@@ -61,7 +56,7 @@
union union
select DISTINCT m.ID,m.CREATE_DATA,m.CREATE_USERID,m.STATE,m.MENU_NAME,m.MENU_URL,m.MENU_IMAGE,m.PARENT_ID select DISTINCT m.ID,m.MENU_NAME,m.MENU_URL,m.MENU_IMAGE,m.PARENT_ID
from from
SYS_USER_MENU_RS umr SYS_USER_MENU_RS umr
LEFT JOIN LEFT JOIN
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
<mapper namespace="com.bsoft.api.mapper.SysUserMapper"> <mapper namespace="com.bsoft.api.mapper.SysUserMapper">
<resultMap id="BaseResultMap" type="com.bsoft.api.model.SysUser"> <resultMap id="BaseResultMap" type="com.bsoft.api.model.SysUser">
<id column="ID" jdbcType="DECIMAL" property="id"/> <id column="ID" jdbcType="DECIMAL" property="id"/>
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/> <!-- <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>-->
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/> <!-- <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>-->
<result column="STATE" jdbcType="DECIMAL" property="state"/> <!-- <result column="STATE" jdbcType="DECIMAL" property="state"/>-->
<result column="USER_CODE" jdbcType="VARCHAR" property="userCode"/> <result column="USER_CODE" jdbcType="VARCHAR" property="userCode"/>
<result column="USER_NAME" jdbcType="VARCHAR" property="userName"/> <result column="USER_NAME" jdbcType="VARCHAR" property="userName"/>
<result column="PASSWORD" jdbcType="VARCHAR" property="password"/> <result column="PASSWORD" jdbcType="VARCHAR" property="password"/>
...@@ -26,12 +26,12 @@ ...@@ -26,12 +26,12 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long"> <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_SYS_USER_ID.nextval from dual select SEQ_SYS_USER_ID.nextval from dual
</selectKey> </selectKey>
insert into LL.SYS_USER (CREATE_DATE, CREATE_USERID, STATE, insert into LL.SYS_USER (
USER_CODE, USER_NAME, PASSWORD, USER_CODE, USER_NAME, PASSWORD,
IDCARD, SEX, MOBILE, IDCARD, SEX, MOBILE,
PAGE_COUNT, ERROR_COUNT, ERROR_TIME, PAGE_COUNT, ERROR_COUNT, ERROR_TIME,
LAST_TIME, LAST_IP) LAST_TIME, LAST_IP)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL}, values (
#{userCode,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{userCode,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR},
#{idcard,jdbcType=VARCHAR}, #{sex,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{idcard,jdbcType=VARCHAR}, #{sex,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR},
#{pageCount,jdbcType=DECIMAL}, #{errorCount,jdbcType=DECIMAL}, #{errorTime,jdbcType=TIMESTAMP}, #{pageCount,jdbcType=DECIMAL}, #{errorCount,jdbcType=DECIMAL}, #{errorTime,jdbcType=TIMESTAMP},
...@@ -39,9 +39,7 @@ ...@@ -39,9 +39,7 @@
</insert> </insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysUser"> <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysUser">
update LL.SYS_USER update LL.SYS_USER
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP}, set
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
USER_CODE = #{userCode,jdbcType=VARCHAR}, USER_CODE = #{userCode,jdbcType=VARCHAR},
USER_NAME = #{userName,jdbcType=VARCHAR}, USER_NAME = #{userName,jdbcType=VARCHAR},
PASSWORD = #{password,jdbcType=VARCHAR}, PASSWORD = #{password,jdbcType=VARCHAR},
......
...@@ -3,9 +3,6 @@ ...@@ -3,9 +3,6 @@
<mapper namespace="com.bsoft.api.mapper.SysUserRoleRsMapper"> <mapper namespace="com.bsoft.api.mapper.SysUserRoleRsMapper">
<resultMap id="BaseResultMap" type="com.bsoft.api.model.SysUserRoleRs"> <resultMap id="BaseResultMap" type="com.bsoft.api.model.SysUserRoleRs">
<id column="ID" jdbcType="DECIMAL" property="id" /> <id column="ID" jdbcType="DECIMAL" property="id" />
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
<result column="STATE" jdbcType="DECIMAL" property="state" />
<result column="USER_ID" jdbcType="DECIMAL" property="userId" /> <result column="USER_ID" jdbcType="DECIMAL" property="userId" />
<result column="ROLE_ID" jdbcType="DECIMAL" property="roleId" /> <result column="ROLE_ID" jdbcType="DECIMAL" property="roleId" />
</resultMap> </resultMap>
...@@ -17,31 +14,29 @@ ...@@ -17,31 +14,29 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long"> <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_SYS_USER_ROLE_RS_ID.nextval from dual select SEQ_SYS_USER_ROLE_RS_ID.nextval from dual
</selectKey> </selectKey>
insert into LL.SYS_USER_ROLE_RS (CREATE_DATE, CREATE_USERID, STATE, insert into LL.SYS_USER_ROLE_RS (
USER_ID, ROLE_ID) USER_ID, ROLE_ID)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL}, values (
#{userId,jdbcType=DECIMAL}, #{roleId,jdbcType=DECIMAL}) #{userId,jdbcType=DECIMAL}, #{roleId,jdbcType=DECIMAL})
</insert> </insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysUserRoleRs"> <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysUserRoleRs">
update LL.SYS_USER_ROLE_RS update LL.SYS_USER_ROLE_RS
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP}, set
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
USER_ID = #{userId,jdbcType=DECIMAL}, USER_ID = #{userId,jdbcType=DECIMAL},
ROLE_ID = #{roleId,jdbcType=DECIMAL} ROLE_ID = #{roleId,jdbcType=DECIMAL}
where ID = #{id,jdbcType=DECIMAL} where ID = #{id,jdbcType=DECIMAL}
</update> </update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, USER_ID, ROLE_ID select ID,USER_ID, ROLE_ID
from LL.SYS_USER_ROLE_RS from LL.SYS_USER_ROLE_RS
where ID = #{id,jdbcType=DECIMAL} where ID = #{id,jdbcType=DECIMAL}
</select> </select>
<select id="selectAll" resultMap="BaseResultMap"> <select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, USER_ID, ROLE_ID select ID,USER_ID, ROLE_ID
from LL.SYS_USER_ROLE_RS from LL.SYS_USER_ROLE_RS
</select> </select>
<select id="selectRoleByUser" resultMap="BaseResultMap"> <select id="selectRoleByUser" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, USER_ID, ROLE_ID select ID,USER_ID, ROLE_ID
from LL.SYS_USER_ROLE_RS from LL.SYS_USER_ROLE_RS
where USER_ID=#{userId,jdbcType=DECIMAL} where USER_ID=#{userId,jdbcType=DECIMAL}
</select> </select>
......
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