Skip to content

S
sv-springboot
Commit e8b8cfbb by Suvalue
Options

登录添加病案信息

parent 3824c251
Showing with 152 additions and 100 deletions
bsoft-api/src/main/java/com/bsoft/api/controller/LoginController.java
......@@ -30,11 +30,11 @@ public class LoginController {
*/
@PostMapping("login")
@ApiOperation(value = "Result«LoginService.LoginInfo»登录")
public Result<LoginService.LoginInfo> login(@RequestBody CodeAndPwd codeAndPwd,HttpServletRequest request) {
public Result<LoginService.LoginInfo> login(@RequestBody CodeAndPwd codeAndPwd, HttpServletRequest request) {
String ip = HttpUtil.getIP(request);
LoginService.LoginInfo loginInfo = loginServiceImpl.login(
codeAndPwd.getLoginName(),codeAndPwd.getPassword(),ip);
if(loginInfo == null){
codeAndPwd.getLoginName(), codeAndPwd.getPassword(), ip);
if (loginInfo == null) {
return Result.error(Result.ErrorCode.USERERROR);
}
return Result.success(loginInfo);
......
bsoft-api/src/main/java/com/bsoft/api/mapper/SysVersionMapper.java 0 → 100644
package com.bsoft.api.mapper;
import com.bsoft.api.model.SysVersion;
import java.util.List;
public interface SysVersionMapper {
int deleteByPrimaryKey(Integer id);
int insert(SysVersion record);
SysVersion selectByPrimaryKey(Integer id);
List<SysVersion> selectAll();
int updateByPrimaryKey(SysVersion record);
SysVersion selectLastDate();
}
\ No newline at end of file
bsoft-api/src/main/java/com/bsoft/api/model/SysVersion.java 0 → 100644
package com.bsoft.api.model;
import java.util.Date;
public class SysVersion {
private Integer id;
private Date updateTime;
private Integer bahDate;
private String version;
private String remarks;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Integer getBahDate() {
return bahDate;
}
public void setBahDate(Integer bahDate) {
this.bahDate = bahDate;
}
public String getVersion() {
return version;
}
public void setVersion(String version) {
this.version = version;
}
public String getRemarks() {
return remarks;
}
public void setRemarks(String remarks) {
this.remarks = remarks;
}
}
\ No newline at end of file
bsoft-api/src/main/java/com/bsoft/api/service/Impl/LoginServiceImpl.java
......@@ -4,10 +4,8 @@ import com.bsoft.api.common.utils.TokenUtil;
import com.bsoft.api.mapper.DicOrgMapper;
import com.bsoft.api.mapper.SysRoleMapper;
import com.bsoft.api.mapper.SysUserMapper;
import com.bsoft.api.model.DicOrg;
import com.bsoft.api.model.SerDepartment;
import com.bsoft.api.model.SysRole;
import com.bsoft.api.model.SysUser;
import com.bsoft.api.mapper.SysVersionMapper;
import com.bsoft.api.model.*;
import com.bsoft.api.service.LoginService;
import com.bsoft.api.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -30,6 +28,8 @@ public class LoginServiceImpl implements LoginService {
private DicOrgMapper dicOrgMapper;
@Resource
private SysRoleMapper sysRoleMapper;
@Resource
private SysVersionMapper sysVersionMapper;
@Override
public LoginInfo login(String logName, String password, String ip) {
......@@ -58,6 +58,9 @@ public class LoginServiceImpl implements LoginService {
loginInfo.setDept(deptList != null && deptList.size() > 0 ? deptList.get(0) : null);
}
loginInfo.setOrg(orgList);
//查询病案信息
SysVersion version = sysVersionMapper.selectLastDate();
loginInfo.setVersion(version);
}
return loginInfo;
}
......
bsoft-api/src/main/java/com/bsoft/api/service/LoginService.java
package com.bsoft.api.service;
import com.bsoft.api.model.DicOrg;
import com.bsoft.api.model.SerDepartment;
import com.bsoft.api.model.SysRole;
import com.bsoft.api.model.SysUser;
import com.bsoft.api.model.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -28,6 +25,8 @@ public interface LoginService {
private List<DicOrg> org;
@ApiModelProperty("用户科室信息")
private SerDepartment dept;
@ApiModelProperty("病案信息")
private SysVersion version;
public LoginInfo() {
}
......@@ -78,6 +77,14 @@ public interface LoginService {
this.role = role;
}
public SysVersion getVersion() {
return version;
}
public void setVersion(SysVersion version) {
this.version = version;
}
@Override
public String toString() {
return "LoginInfo{" +
......@@ -86,6 +93,7 @@ public interface LoginService {
", role=" + role +
", org=" + org +
", dept=" + dept +
", version=" + version +
'}';
}
}
......
bsoft-api/src/main/resources/application-test.properties
#### \u6D4B\u8BD5\u73AF\u5883 ###################################################
spring.datasource.url=jdbc:mysql://192.168.18.178:3306/scml_zp_test2.0?useUnicode=true&characterEncoding=utf8&useSSL=false&autoReconnect=true&rewriteBatchedStatements=TRUE&serverTimezone=UTC
spring.datasource.url=jdbc:mysql://192.168.18.176:3306/scml_sy_test2.0?useUnicode=true&characterEncoding=utf8&useSSL=false&autoReconnect=true&rewriteBatchedStatements=TRUE&serverTimezone=UTC
spring.datasource.username=root
spring.datasource.password=Suvalue2016
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
......
bsoft-api/src/main/resources/mapper/SysVersionMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bsoft.api.mapper.SysVersionMapper">
<resultMap id="BaseResultMap" type="com.bsoft.api.model.SysVersion">
<id column="ID" jdbcType="INTEGER" property="id"/>
<result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="BAH_DATE" jdbcType="INTEGER" property="bahDate"/>
<result column="VERSION" jdbcType="VARCHAR" property="version"/>
<result column="REMARKS" jdbcType="LONGVARCHAR" property="remarks"/>
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete
from sys_version
where ID = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.bsoft.api.model.SysVersion">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
</selectKey>
insert into sys_version (UPDATE_TIME, BAH_DATE, VERSION,
REMARKS)
values (#{updateTime,jdbcType=TIMESTAMP}, #{bahDate,jdbcType=INTEGER}, #{version,jdbcType=VARCHAR},
#{remarks,jdbcType=LONGVARCHAR})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysVersion">
update sys_version
set UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
BAH_DATE = #{bahDate,jdbcType=INTEGER},
VERSION = #{version,jdbcType=VARCHAR},
REMARKS = #{remarks,jdbcType=LONGVARCHAR}
where ID = #{id,jdbcType=INTEGER}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select ID, UPDATE_TIME, BAH_DATE, VERSION, REMARKS
from sys_version
where ID = #{id,jdbcType=INTEGER}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, UPDATE_TIME, BAH_DATE, VERSION, REMARKS
from sys_version
</select>
<select id="selectLastDate" resultMap="BaseResultMap">
select *
from sys_version
order by UPDATE_TIME, BAH_DATE desc
limit 0,1
</select>
</mapper>
\ No newline at end of file
bsoft-api/src/test/resources/generatorConfig.xml
......@@ -4,7 +4,7 @@
<generatorConfiguration>
<!-- 引入配置文件 -->
<properties resource="./application-dev.properties"/>
<properties resource="./application-test.properties"/>
<context id="MySql" targetRuntime="MyBatis3Simple" defaultModelType="flat">
<property name="beginningDelimiter" value="`"/>
......@@ -12,8 +12,8 @@
<!-- 生成的文件编码 -->
<property name="javaFileEncoding" value="utf-8"/>
<property name="autoDelimitKeywords" value="true"/>
<property name="beginningDelimiter" value="&quot;"/>
<property name="endingDelimiter" value="&quot;"/>
<property name="beginningDelimiter" value="`"/>
<property name="endingDelimiter" value="`"/>
<!-- 通过自定义插件类生成自定义注解和接口 -->
<!--<plugin type="com.suvalue.common.GenPlugin">-->
......@@ -42,91 +42,7 @@
<!-- 生成映射接口配置 -->
<javaClientGenerator targetPackage="com.bsoft.api.mapper" targetProject="src/main/java" type="XMLMAPPER"/>
<table schema="scml_zp_cs" tableName="dic_dim">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="dic_ind">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="dic_org">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="ser_block">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="ser_department">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="ser_dept_doc_rs">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="ser_dim_value">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="ser_disease">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="ser_disease_doc_rs">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="ser_doctor">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="ser_page">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="ser_page_block_rs">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="ser_page_field">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="ser_page_proj">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="ser_page_proj_field_rs">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="ser_page_proj_value">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="ser_page_value_config">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="ser_proj">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="ser_proj_value">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="ser_proj_value_sz">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="sys_menu">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="sys_org">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="sys_project">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="sys_role">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="sys_role_menu_rs">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="sys_user">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="sys_user_menu_rs">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="sys_user_org_rs">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
<table schema="scml_zp_cs" tableName="sys_user_role_rs">
<table tableName="sys_version">
<generatedKey column="ID" sqlStatement="Mysql" identity="true"/>
</table>
......
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