Skip to content

S
sv-springboot
Commit f9bc1053 by Suvalue
Options

后台包名调整

parent 7b216d74
Showing with 444 additions and 365 deletions
bsoft-admin/src/main/resources/mapper/SysUserMapper.xml deleted 100644 → 0
<?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.admin.mapper.SysUserMapper">
<resultMap id="BaseResultMap" type="com.bsoft.admin.model.SysUser">
<id column="ID" jdbcType="INTEGER" 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_CODE" jdbcType="VARCHAR" property="userCode" />
<result column="USER_NAME" jdbcType="VARCHAR" property="userName" />
<result column="PASSWORD" jdbcType="VARCHAR" property="password" />
<result column="IDCARD" jdbcType="VARCHAR" property="idcard" />
<result column="SEX" jdbcType="VARCHAR" property="sex" />
<result column="MOBILE" jdbcType="VARCHAR" property="mobile" />
<result column="PAGE_COUNT" jdbcType="DECIMAL" property="pageCount" />
<result column="ERROR_COUNT" jdbcType="DECIMAL" property="errorCount" />
<result column="ERROR_TIME" jdbcType="TIMESTAMP" property="errorTime" />
<result column="LAST_TIME" jdbcType="TIMESTAMP" property="lastTime" />
<result column="LAST_IP" jdbcType="VARCHAR" property="lastIp" />
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from sys_user
where ID = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.bsoft.admin.model.SysUser">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
</selectKey>
insert into sys_user (CREATE_DATE, CREATE_USERID, `STATE`,
USER_CODE, USER_NAME, `PASSWORD`,
IDCARD, SEX, MOBILE,
PAGE_COUNT, ERROR_COUNT, ERROR_TIME,
LAST_TIME, LAST_IP)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{userCode,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR},
#{idcard,jdbcType=VARCHAR}, #{sex,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR},
#{pageCount,jdbcType=DECIMAL}, #{errorCount,jdbcType=DECIMAL}, #{errorTime,jdbcType=TIMESTAMP},
#{lastTime,jdbcType=TIMESTAMP}, #{lastIp,jdbcType=VARCHAR})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.admin.model.SysUser">
update sys_user
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
`STATE` = #{state,jdbcType=DECIMAL},
USER_CODE = #{userCode,jdbcType=VARCHAR},
USER_NAME = #{userName,jdbcType=VARCHAR},
`PASSWORD` = #{password,jdbcType=VARCHAR},
IDCARD = #{idcard,jdbcType=VARCHAR},
SEX = #{sex,jdbcType=VARCHAR},
MOBILE = #{mobile,jdbcType=VARCHAR},
PAGE_COUNT = #{pageCount,jdbcType=DECIMAL},
ERROR_COUNT = #{errorCount,jdbcType=DECIMAL},
ERROR_TIME = #{errorTime,jdbcType=TIMESTAMP},
LAST_TIME = #{lastTime,jdbcType=TIMESTAMP},
LAST_IP = #{lastIp,jdbcType=VARCHAR}
where ID = #{id,jdbcType=INTEGER}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, USER_CODE, USER_NAME, `PASSWORD`,
IDCARD, SEX, MOBILE, PAGE_COUNT, ERROR_COUNT, ERROR_TIME, LAST_TIME, LAST_IP
from sys_user
where ID = #{id,jdbcType=INTEGER}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, USER_CODE, USER_NAME, `PASSWORD`,
IDCARD, SEX, MOBILE, PAGE_COUNT, ERROR_COUNT, ERROR_TIME, LAST_TIME, LAST_IP
from sys_user
</select>
<select id="selectByCode" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, USER_CODE, USER_NAME, PASSWORD, IDCARD,
SEX, MOBILE, PAGE_COUNT, ERROR_COUNT, ERROR_TIME, LAST_TIME, LAST_IP
from SYS_USER
where USER_CODE=#{userCode,jdbcType=VARCHAR}
and `STATE` != 0
</select>
</mapper>
\ No newline at end of file
bsoft-admin/pom.xml → hs-admin/pom.xml
......@@ -8,10 +8,10 @@
<version>2.2.2.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.bsoft</groupId>
<artifactId>bsoft-admin</artifactId>
<groupId>com.hs</groupId>
<artifactId>hs-admin</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>bsoft-admin</name>
<name>hs-admin</name>
<packaging>war</packaging>
<description>Demo project for Spring Boot</description>
......@@ -36,8 +36,8 @@
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>com.bsoft</groupId>
<artifactId>bsoft-common</artifactId>
<groupId>com.hs</groupId>
<artifactId>hs-common</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
......
bsoft-admin/src/main/java/com/bsoft/admin/BsoftAdminApplication.java → hs-admin/src/main/java/com/hs/admin/HsAdminApplication.java
package com.bsoft.admin;
package com.hs.admin;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
......@@ -6,12 +6,12 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;
@SpringBootApplication
@MapperScan("com.bsoft.admin.mapper")
@ComponentScan(basePackages = {"com.bsoft.common.config","com.bsoft.admin"})
public class BsoftAdminApplication {
@MapperScan("com.hs.admin.mapper")
@ComponentScan(basePackages = {"com.hs.common.config", "com.hs.admin"})
public class HsAdminApplication {
public static void main(String[] args) {
SpringApplication.run(BsoftAdminApplication.class,args);
SpringApplication.run(HsAdminApplication.class, args);
}
}
bsoft-admin/src/main/java/com/bsoft/admin/ServletInitializer.java → hs-admin/src/main/java/com/hs/admin/ServletInitializer.java
package com.bsoft.admin;
package com.hs.admin;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
......@@ -7,6 +7,6 @@ public class ServletInitializer extends SpringBootServletInitializer {
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
//Application的类名
return application.sources(BsoftAdminApplication.class);
return application.sources(HsAdminApplication.class);
}
}
bsoft-admin/src/main/java/com/bsoft/admin/common/Constants.java → hs-admin/src/main/java/com/hs/admin/common/Constants.java
package com.bsoft.admin.common;
package com.hs.admin.common;
public interface Constants {
String TOKEN_KEY = "Authorization";
......
bsoft-admin/src/main/java/com/bsoft/admin/common/Result.java → hs-admin/src/main/java/com/hs/admin/common/Result.java
package com.bsoft.admin.common;
package com.hs.admin.common;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......
bsoft-admin/src/main/java/com/bsoft/admin/common/annotations/CurrentUser.java → hs-admin/src/main/java/com/hs/admin/common/annotations/CurrentUser.java
package com.bsoft.admin.common.annotations;
package com.hs.admin.common.annotations;
import java.lang.annotation.*;
......
bsoft-admin/src/main/java/com/bsoft/admin/common/annotations/Token.java → hs-admin/src/main/java/com/hs/admin/common/annotations/Token.java
package com.bsoft.admin.common.annotations;
package com.hs.admin.common.annotations;
import org.springframework.core.annotation.AliasFor;
......
bsoft-admin/src/main/java/com/bsoft/admin/common/aspect/RequestMappingAspect.java → hs-admin/src/main/java/com/hs/admin/common/aspect/RequestMappingAspect.java
package com.bsoft.admin.common.aspect;
package com.hs.admin.common.aspect;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
......
bsoft-admin/src/main/java/com/bsoft/admin/common/aspect/TokenAspect.java → hs-admin/src/main/java/com/hs/admin/common/aspect/TokenAspect.java
package com.bsoft.admin.common.aspect;
package com.hs.admin.common.aspect;
import com.bsoft.admin.common.Constants;
import com.bsoft.admin.common.exceptions.InvalidTokenException;
import com.bsoft.admin.common.utils.TokenUtil;
import com.hs.admin.common.Constants;
import com.hs.admin.common.exceptions.InvalidTokenException;
import com.hs.admin.common.utils.TokenUtil;
import com.hs.common.utils.StringUtil;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
......@@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletRequest;
@Order(1)
@Profile({"dev","test","prod"})
public class TokenAspect {
@Pointcut("@annotation(com.bsoft.admin.common.annotations.Token)")
@Pointcut("@annotation(com.hs.admin.common.annotations.Token)")
public void tokenAspect() {
}
......
bsoft-admin/src/main/java/com/bsoft/admin/common/base/RequestResult.java → hs-admin/src/main/java/com/hs/admin/common/base/RequestResult.java
package com.bsoft.admin.common.base;
package com.hs.admin.common.base;
public class RequestResult {
Integer code;
......
bsoft-admin/src/main/java/com/bsoft/admin/common/configurations/CurrentUserConfigure.java → hs-admin/src/main/java/com/hs/admin/common/configurations/CurrentUserConfigure.java
package com.bsoft.admin.common.configurations;
package com.hs.admin.common.configurations;
import com.bsoft.admin.common.resolvers.CurrentUserMethodArgumentResolver;
import com.hs.admin.common.resolvers.CurrentUserMethodArgumentResolver;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
......
bsoft-admin/src/main/java/com/bsoft/admin/common/configurations/LoginConfigure.java → hs-admin/src/main/java/com/hs/admin/common/configurations/LoginConfigure.java
package com.bsoft.admin.common.configurations;
package com.hs.admin.common.configurations;
import com.bsoft.admin.common.intercepters.LoginInterceptor;
import com.hs.admin.common.intercepters.LoginInterceptor;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
......
bsoft-admin/src/main/java/com/bsoft/admin/common/enums/RequestResultType.java → hs-admin/src/main/java/com/hs/admin/common/enums/RequestResultType.java
package com.bsoft.admin.common.enums;
package com.hs.admin.common.enums;
public enum RequestResultType {
SUCCESS(1,"成功"),
......
bsoft-admin/src/main/java/com/bsoft/admin/common/enums/StateType.java → hs-admin/src/main/java/com/hs/admin/common/enums/StateType.java
package com.bsoft.admin.common.enums;
package com.hs.admin.common.enums;
public enum StateType {
ON(1,"启用"),
......
bsoft-admin/src/main/java/com/bsoft/admin/common/exceptions/DBConfigurationError.java → hs-admin/src/main/java/com/hs/admin/common/exceptions/DBConfigurationError.java
package com.bsoft.admin.common.exceptions;
package com.hs.admin.common.exceptions;
public class DBConfigurationError extends ExceptionBase {
public DBConfigurationError(String message) {
......
bsoft-admin/src/main/java/com/bsoft/admin/common/exceptions/ExceptionBase.java → hs-admin/src/main/java/com/hs/admin/common/exceptions/ExceptionBase.java
package com.bsoft.admin.common.exceptions;
package com.hs.admin.common.exceptions;
public class ExceptionBase extends RuntimeException {
public ExceptionBase() {
......
bsoft-admin/src/main/java/com/bsoft/admin/common/exceptions/InvalidTokenException.java → hs-admin/src/main/java/com/hs/admin/common/exceptions/InvalidTokenException.java
package com.bsoft.admin.common.exceptions;
package com.hs.admin.common.exceptions;
public class InvalidTokenException extends ExceptionBase {
public InvalidTokenException() {
......
bsoft-admin/src/main/java/com/bsoft/admin/common/handlers/GlobalExceptionHandler.java → hs-admin/src/main/java/com/hs/admin/common/handlers/GlobalExceptionHandler.java
package com.bsoft.admin.common.handlers;
package com.hs.admin.common.handlers;
import com.bsoft.admin.common.Result;
import com.bsoft.admin.common.exceptions.DBConfigurationError;
import com.bsoft.admin.common.exceptions.ExceptionBase;
import com.bsoft.admin.common.exceptions.InvalidTokenException;
import com.hs.admin.common.Result;
import com.hs.admin.common.exceptions.DBConfigurationError;
import com.hs.admin.common.exceptions.ExceptionBase;
import com.hs.admin.common.exceptions.InvalidTokenException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.validation.BindingResult;
......
bsoft-admin/src/main/java/com/bsoft/admin/common/intercepters/LoginInterceptor.java → hs-admin/src/main/java/com/hs/admin/common/intercepters/LoginInterceptor.java
package com.bsoft.admin.common.intercepters;
package com.hs.admin.common.intercepters;
import com.bsoft.admin.common.Constants;
import com.bsoft.admin.common.Result;
import com.bsoft.admin.common.utils.TokenUtil;
import com.hs.admin.common.Constants;
import com.hs.admin.common.Result;
import com.hs.admin.common.utils.TokenUtil;
import org.slf4j.Logger;
import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView;
......
bsoft-admin/src/main/java/com/bsoft/admin/common/resolvers/CurrentUserMethodArgumentResolver.java → hs-admin/src/main/java/com/hs/admin/common/resolvers/CurrentUserMethodArgumentResolver.java
package com.bsoft.admin.common.resolvers;
package com.hs.admin.common.resolvers;
import com.bsoft.admin.common.Constants;
import com.bsoft.admin.common.annotations.CurrentUser;
import com.bsoft.admin.common.utils.TokenUtil;
import com.bsoft.admin.model.SysUser;
import com.hs.admin.common.Constants;
import com.hs.admin.common.annotations.CurrentUser;
import com.hs.admin.common.utils.TokenUtil;
import com.hs.admin.model.SysUser;
import com.hs.common.utils.RedisUtil;
import org.springframework.core.MethodParameter;
import org.springframework.web.bind.support.WebDataBinderFactory;
......
bsoft-admin/src/main/java/com/bsoft/admin/common/utils/SqlUtil.java → hs-admin/src/main/java/com/hs/admin/common/utils/SqlUtil.java
package com.bsoft.admin.common.utils;
package com.hs.admin.common.utils;
public class SqlUtil {
public static String TransactSQLInjection(String str) {
......
bsoft-admin/src/main/java/com/bsoft/admin/common/utils/TokenUtil.java → hs-admin/src/main/java/com/hs/admin/common/utils/TokenUtil.java
package com.bsoft.admin.common.utils;
package com.hs.admin.common.utils;
import com.bsoft.admin.model.SysUser;
import com.hs.admin.model.SysUser;
import com.hs.common.utils.JWTUtil;
import com.hs.common.utils.RedisUtil;
......
bsoft-admin/src/main/java/com/bsoft/admin/controller/LoginController.java → hs-admin/src/main/java/com/hs/admin/controller/LoginController.java
package com.bsoft.admin.controller;
package com.hs.admin.controller;
import com.bsoft.admin.common.Result;
import com.bsoft.admin.model.reqmodel.CodeAndPwd;
import com.bsoft.admin.service.LoginService;
import com.hs.admin.common.Result;
import com.hs.admin.model.reqmodel.CodeAndPwd;
import com.hs.admin.service.LoginService;
import com.hs.common.utils.HttpUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......
bsoft-admin/src/main/java/com/bsoft/admin/controller/MenuController.java → hs-admin/src/main/java/com/hs/admin/controller/MenuController.java
package com.bsoft.admin.controller;
package com.hs.admin.controller;
import com.bsoft.admin.common.Result;
import com.bsoft.admin.common.annotations.CurrentUser;
import com.bsoft.admin.common.annotations.Token;
import com.bsoft.admin.model.SysMenu;
import com.bsoft.admin.model.reqmodel.MenuReq;
import com.bsoft.admin.model.respmodel.SysMenuList;
import com.bsoft.admin.model.respmodel.SysRoleMenuRsList;
import com.bsoft.admin.model.respmodel.SysUserMenuRsList;
import com.bsoft.admin.service.SysMenuService;
import com.hs.admin.common.Result;
import com.hs.admin.common.annotations.CurrentUser;
import com.hs.admin.common.annotations.Token;
import com.hs.admin.model.SysMenu;
import com.hs.admin.model.reqmodel.MenuReq;
import com.hs.admin.model.respmodel.SysMenuList;
import com.hs.admin.model.respmodel.SysRoleMenuRsList;
import com.hs.admin.model.respmodel.SysUserMenuRsList;
import com.hs.admin.service.SysMenuService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
......
bsoft-admin/src/main/java/com/bsoft/admin/controller/OrgController.java → hs-admin/src/main/java/com/hs/admin/controller/OrgController.java
package com.bsoft.admin.controller;
package com.hs.admin.controller;
import com.bsoft.admin.common.Result;
import com.bsoft.admin.common.annotations.CurrentUser;
import com.bsoft.admin.common.annotations.Token;
import com.bsoft.admin.model.DicOrg;
import com.bsoft.admin.model.reqmodel.OrgReq;
import com.bsoft.admin.model.respmodel.DicOrgList;
import com.bsoft.admin.model.respmodel.SysUserOrgRsList;
import com.bsoft.admin.service.DicOrgService;
import com.hs.admin.common.Result;
import com.hs.admin.common.annotations.CurrentUser;
import com.hs.admin.common.annotations.Token;
import com.hs.admin.model.DicOrg;
import com.hs.admin.model.reqmodel.OrgReq;
import com.hs.admin.model.respmodel.DicOrgList;
import com.hs.admin.model.respmodel.SysUserOrgRsList;
import com.hs.admin.service.DicOrgService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
......
bsoft-admin/src/main/java/com/bsoft/admin/controller/RoleController.java → hs-admin/src/main/java/com/hs/admin/controller/RoleController.java
package com.bsoft.admin.controller;
package com.hs.admin.controller;
import com.bsoft.admin.common.Result;
import com.bsoft.admin.common.annotations.CurrentUser;
import com.bsoft.admin.common.annotations.Token;
import com.bsoft.admin.model.SysRole;
import com.bsoft.admin.model.reqmodel.RoleReq;
import com.bsoft.admin.service.SysRoleService;
import com.hs.admin.common.Result;
import com.hs.admin.common.annotations.CurrentUser;
import com.hs.admin.common.annotations.Token;
import com.hs.admin.model.SysRole;
import com.hs.admin.model.reqmodel.RoleReq;
import com.hs.admin.service.SysRoleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
......
bsoft-admin/src/main/java/com/bsoft/admin/controller/UserController.java → hs-admin/src/main/java/com/hs/admin/controller/UserController.java
package com.bsoft.admin.controller;
package com.hs.admin.controller;
import com.bsoft.admin.common.Result;
import com.bsoft.admin.common.annotations.CurrentUser;
import com.bsoft.admin.common.annotations.Token;
import com.bsoft.admin.model.SysRole;
import com.bsoft.admin.model.SysUser;
import com.bsoft.admin.model.reqmodel.UserReq;
import com.bsoft.admin.model.respmodel.SysMenuList;
import com.bsoft.admin.service.SysMenuService;
import com.bsoft.admin.service.SysUserRoleRsService;
import com.bsoft.admin.service.UserService;
import com.hs.admin.common.Result;
import com.hs.admin.common.annotations.CurrentUser;
import com.hs.admin.common.annotations.Token;
import com.hs.admin.model.SysRole;
import com.hs.admin.model.SysUser;
import com.hs.admin.model.reqmodel.UserReq;
import com.hs.admin.model.respmodel.SysMenuList;
import com.hs.admin.service.SysMenuService;
import com.hs.admin.service.SysUserRoleRsService;
import com.hs.admin.service.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
......
bsoft-admin/src/main/java/com/bsoft/admin/mapper/DicOrgMapper.java → hs-admin/src/main/java/com/hs/admin/mapper/DicOrgMapper.java
package com.bsoft.admin.mapper;
package com.hs.admin.mapper;
import com.bsoft.admin.model.DicOrg;
import com.bsoft.admin.model.respmodel.DicOrgList;
import com.hs.admin.model.DicOrg;
import com.hs.admin.model.respmodel.DicOrgList;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......
bsoft-admin/src/main/java/com/bsoft/admin/mapper/SysMenuMapper.java → hs-admin/src/main/java/com/hs/admin/mapper/SysMenuMapper.java
package com.bsoft.admin.mapper;
package com.hs.admin.mapper;
import com.bsoft.admin.model.SysMenu;
import com.bsoft.admin.model.respmodel.SysMenuList;
import com.hs.admin.model.SysMenu;
import com.hs.admin.model.respmodel.SysMenuList;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......
bsoft-admin/src/main/java/com/bsoft/admin/mapper/SysRoleMapper.java → hs-admin/src/main/java/com/hs/admin/mapper/SysRoleMapper.java
package com.bsoft.admin.mapper;
package com.hs.admin.mapper;
import com.bsoft.admin.model.SysRole;
import com.hs.admin.model.SysRole;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......
bsoft-admin/src/main/java/com/bsoft/admin/mapper/SysRoleMenuRsMapper.java → hs-admin/src/main/java/com/hs/admin/mapper/SysRoleMenuRsMapper.java
package com.bsoft.admin.mapper;
package com.hs.admin.mapper;
import com.bsoft.admin.model.SysRoleMenuRs;
import com.bsoft.admin.model.respmodel.SysRoleMenuRsList;
import com.hs.admin.model.SysRoleMenuRs;
import com.hs.admin.model.respmodel.SysRoleMenuRsList;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......
bsoft-admin/src/main/java/com/bsoft/admin/mapper/SysUserMapper.java → hs-admin/src/main/java/com/hs/admin/mapper/SysUserMapper.java
package com.bsoft.admin.mapper;
package com.hs.admin.mapper;
import com.bsoft.admin.model.SysUser;
import com.hs.admin.model.SysUser;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......
bsoft-admin/src/main/java/com/bsoft/admin/mapper/SysUserMenuRsMapper.java → hs-admin/src/main/java/com/hs/admin/mapper/SysUserMenuRsMapper.java
package com.bsoft.admin.mapper;
package com.hs.admin.mapper;
import com.bsoft.admin.model.SysUserMenuRs;
import com.bsoft.admin.model.respmodel.SysUserMenuRsList;
import com.hs.admin.model.SysUserMenuRs;
import com.hs.admin.model.respmodel.SysUserMenuRsList;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......
bsoft-admin/src/main/java/com/bsoft/admin/mapper/SysUserOrgRsMapper.java → hs-admin/src/main/java/com/hs/admin/mapper/SysUserOrgRsMapper.java
package com.bsoft.admin.mapper;
package com.hs.admin.mapper;
import com.bsoft.admin.model.SysUserOrgRs;
import com.bsoft.admin.model.respmodel.SysUserOrgRsList;
import com.hs.admin.model.SysUserOrgRs;
import com.hs.admin.model.respmodel.SysUserOrgRsList;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......
bsoft-admin/src/main/java/com/bsoft/admin/mapper/SysUserRoleRsMapper.java → hs-admin/src/main/java/com/hs/admin/mapper/SysUserRoleRsMapper.java
package com.bsoft.admin.mapper;
package com.hs.admin.mapper;
import com.bsoft.admin.model.SysUserRoleRs;
import com.hs.admin.model.SysUserRoleRs;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......
bsoft-admin/src/main/java/com/bsoft/admin/model/reqmodel/CodeAndPwd.java → hs-admin/src/main/java/com/hs/admin/model/reqmodel/CodeAndPwd.java
package com.bsoft.admin.model.reqmodel;
package com.hs.admin.model.reqmodel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......
bsoft-admin/src/main/java/com/bsoft/admin/model/reqmodel/MenuReq.java → hs-admin/src/main/java/com/hs/admin/model/reqmodel/MenuReq.java
package com.bsoft.admin.model.reqmodel;
package com.hs.admin.model.reqmodel;
import com.bsoft.admin.model.SysMenu;
import com.hs.admin.model.SysMenu;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotBlank;
......
bsoft-admin/src/main/java/com/bsoft/admin/model/reqmodel/OrgReq.java → hs-admin/src/main/java/com/hs/admin/model/reqmodel/OrgReq.java
package com.bsoft.admin.model.reqmodel;
package com.hs.admin.model.reqmodel;
import io.swagger.annotations.ApiModelProperty;
......
bsoft-admin/src/main/java/com/bsoft/admin/model/reqmodel/RoleReq.java → hs-admin/src/main/java/com/hs/admin/model/reqmodel/RoleReq.java
package com.bsoft.admin.model.reqmodel;
package com.hs.admin.model.reqmodel;
import io.swagger.annotations.ApiModelProperty;
......
bsoft-admin/src/main/java/com/bsoft/admin/model/reqmodel/UserReq.java → hs-admin/src/main/java/com/hs/admin/model/reqmodel/UserReq.java
package com.bsoft.admin.model.reqmodel;
package com.hs.admin.model.reqmodel;
import io.swagger.annotations.ApiModelProperty;
......
bsoft-admin/src/main/java/com/bsoft/admin/model/respmodel/DicOrgList.java → hs-admin/src/main/java/com/hs/admin/model/respmodel/DicOrgList.java
package com.bsoft.admin.model.respmodel;
package com.hs.admin.model.respmodel;
import com.bsoft.admin.model.DicOrg;
import com.hs.admin.model.DicOrg;
import lombok.Data;
import java.util.List;
......
bsoft-admin/src/main/java/com/bsoft/admin/model/respmodel/SysMenuList.java → hs-admin/src/main/java/com/hs/admin/model/respmodel/SysMenuList.java
package com.bsoft.admin.model.respmodel;
package com.hs.admin.model.respmodel;
import com.bsoft.admin.model.SysMenu;
import com.hs.admin.model.SysMenu;
import lombok.Data;
import java.util.List;
......
bsoft-admin/src/main/java/com/bsoft/admin/model/respmodel/SysRoleMenuRsList.java → hs-admin/src/main/java/com/hs/admin/model/respmodel/SysRoleMenuRsList.java
package com.bsoft.admin.model.respmodel;
package com.hs.admin.model.respmodel;
import com.bsoft.admin.model.SysRoleMenuRs;
import com.hs.admin.model.SysRoleMenuRs;
import lombok.Data;
@Data
......
bsoft-admin/src/main/java/com/bsoft/admin/model/respmodel/SysUserMenuRsList.java → hs-admin/src/main/java/com/hs/admin/model/respmodel/SysUserMenuRsList.java
package com.bsoft.admin.model.respmodel;
package com.hs.admin.model.respmodel;
import com.bsoft.admin.model.SysUserMenuRs;
import com.hs.admin.model.SysUserMenuRs;
import lombok.Data;
@Data
......
bsoft-admin/src/main/java/com/bsoft/admin/model/respmodel/SysUserOrgRsList.java → hs-admin/src/main/java/com/hs/admin/model/respmodel/SysUserOrgRsList.java
package com.bsoft.admin.model.respmodel;
package com.hs.admin.model.respmodel;
import com.bsoft.admin.model.SysUserOrgRs;
import com.hs.admin.model.SysUserOrgRs;
import lombok.Data;
@Data
......
bsoft-admin/src/main/java/com/bsoft/admin/service/DicOrgService.java → hs-admin/src/main/java/com/hs/admin/service/DicOrgService.java
package com.bsoft.admin.service;
package com.hs.admin.service;
import com.bsoft.admin.model.DicOrg;
import com.bsoft.admin.model.reqmodel.OrgReq;
import com.bsoft.admin.model.respmodel.DicOrgList;
import com.bsoft.admin.model.respmodel.SysUserOrgRsList;
import com.hs.admin.model.DicOrg;
import com.hs.admin.model.reqmodel.OrgReq;
import com.hs.admin.model.respmodel.DicOrgList;
import com.hs.admin.model.respmodel.SysUserOrgRsList;
import java.util.List;
......
bsoft-admin/src/main/java/com/bsoft/admin/service/LoginService.java → hs-admin/src/main/java/com/hs/admin/service/LoginService.java
package com.bsoft.admin.service;
package com.hs.admin.service;
import com.bsoft.admin.model.DicOrg;
import com.bsoft.admin.model.SysUser;
import com.hs.admin.model.DicOrg;
import com.hs.admin.model.SysUser;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......
bsoft-admin/src/main/java/com/bsoft/admin/service/SysMenuService.java → hs-admin/src/main/java/com/hs/admin/service/SysMenuService.java
package com.bsoft.admin.service;
package com.hs.admin.service;
import com.bsoft.admin.model.SysMenu;
import com.bsoft.admin.model.reqmodel.MenuReq;
import com.bsoft.admin.model.respmodel.SysMenuList;
import com.bsoft.admin.model.respmodel.SysRoleMenuRsList;
import com.bsoft.admin.model.respmodel.SysUserMenuRsList;
import com.hs.admin.model.SysMenu;
import com.hs.admin.model.reqmodel.MenuReq;
import com.hs.admin.model.respmodel.SysMenuList;
import com.hs.admin.model.respmodel.SysRoleMenuRsList;
import com.hs.admin.model.respmodel.SysUserMenuRsList;
import java.util.List;
......
bsoft-admin/src/main/java/com/bsoft/admin/service/SysRoleService.java → hs-admin/src/main/java/com/hs/admin/service/SysRoleService.java
package com.bsoft.admin.service;
package com.hs.admin.service;
import com.bsoft.admin.model.SysRole;
import com.bsoft.admin.model.reqmodel.RoleReq;
import com.hs.admin.model.SysRole;
import com.hs.admin.model.reqmodel.RoleReq;
import java.util.List;
......
bsoft-admin/src/main/java/com/bsoft/admin/service/SysUserRoleRsService.java → hs-admin/src/main/java/com/hs/admin/service/SysUserRoleRsService.java
package com.bsoft.admin.service;
package com.hs.admin.service;
import com.bsoft.admin.model.SysRole;
import com.bsoft.admin.model.SysUserRoleRs;
import com.hs.admin.model.SysRole;
import com.hs.admin.model.SysUserRoleRs;
import java.util.List;
......
bsoft-admin/src/main/java/com/bsoft/admin/service/UserService.java → hs-admin/src/main/java/com/hs/admin/service/UserService.java
package com.bsoft.admin.service;
package com.hs.admin.service;
import com.bsoft.admin.model.SysUser;
import com.bsoft.admin.model.reqmodel.UserReq;
import com.hs.admin.model.SysUser;
import com.hs.admin.model.reqmodel.UserReq;
import java.util.List;
......
bsoft-admin/src/main/java/com/bsoft/admin/service/impl/DicOrgServiceImpl.java → hs-admin/src/main/java/com/hs/admin/service/impl/DicOrgServiceImpl.java
package com.bsoft.admin.service.impl;
import com.bsoft.admin.common.enums.StateType;
import com.bsoft.admin.mapper.DicOrgMapper;
import com.bsoft.admin.mapper.SysUserOrgRsMapper;
import com.bsoft.admin.model.DicOrg;
import com.bsoft.admin.model.SysUserOrgRs;
import com.bsoft.admin.model.reqmodel.OrgReq;
import com.bsoft.admin.model.respmodel.DicOrgList;
import com.bsoft.admin.model.respmodel.SysUserOrgRsList;
import com.bsoft.admin.service.DicOrgService;
package com.hs.admin.service.impl;
import com.hs.admin.common.enums.StateType;
import com.hs.admin.mapper.DicOrgMapper;
import com.hs.admin.mapper.SysUserOrgRsMapper;
import com.hs.admin.model.DicOrg;
import com.hs.admin.model.SysUserOrgRs;
import com.hs.admin.model.reqmodel.OrgReq;
import com.hs.admin.model.respmodel.DicOrgList;
import com.hs.admin.model.respmodel.SysUserOrgRsList;
import com.hs.admin.service.DicOrgService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......
bsoft-admin/src/main/java/com/bsoft/admin/service/impl/LoginServiceImpl.java → hs-admin/src/main/java/com/hs/admin/service/impl/LoginServiceImpl.java
package com.bsoft.admin.service.impl;
import com.bsoft.admin.common.utils.TokenUtil;
import com.bsoft.admin.mapper.DicOrgMapper;
import com.bsoft.admin.mapper.SysUserMapper;
import com.bsoft.admin.model.DicOrg;
import com.bsoft.admin.model.SysUser;
import com.bsoft.admin.service.LoginService;
import com.bsoft.admin.service.UserService;
package com.hs.admin.service.impl;
import com.hs.admin.common.utils.TokenUtil;
import com.hs.admin.mapper.DicOrgMapper;
import com.hs.admin.mapper.SysUserMapper;
import com.hs.admin.model.DicOrg;
import com.hs.admin.model.SysUser;
import com.hs.admin.service.LoginService;
import com.hs.admin.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......
bsoft-admin/src/main/java/com/bsoft/admin/service/impl/SysMenuServiceImpl.java → hs-admin/src/main/java/com/hs/admin/service/impl/SysMenuServiceImpl.java
package com.bsoft.admin.service.impl;
import com.bsoft.admin.common.enums.StateType;
import com.bsoft.admin.mapper.SysMenuMapper;
import com.bsoft.admin.mapper.SysRoleMenuRsMapper;
import com.bsoft.admin.mapper.SysUserMenuRsMapper;
import com.bsoft.admin.model.SysMenu;
import com.bsoft.admin.model.SysRoleMenuRs;
import com.bsoft.admin.model.SysUserMenuRs;
import com.bsoft.admin.model.reqmodel.MenuReq;
import com.bsoft.admin.model.respmodel.SysMenuList;
import com.bsoft.admin.model.respmodel.SysRoleMenuRsList;
import com.bsoft.admin.model.respmodel.SysUserMenuRsList;
import com.bsoft.admin.service.SysMenuService;
package com.hs.admin.service.impl;
import com.hs.admin.common.enums.StateType;
import com.hs.admin.mapper.SysMenuMapper;
import com.hs.admin.mapper.SysRoleMenuRsMapper;
import com.hs.admin.mapper.SysUserMenuRsMapper;
import com.hs.admin.model.SysMenu;
import com.hs.admin.model.SysRoleMenuRs;
import com.hs.admin.model.SysUserMenuRs;
import com.hs.admin.model.reqmodel.MenuReq;
import com.hs.admin.model.respmodel.SysMenuList;
import com.hs.admin.model.respmodel.SysRoleMenuRsList;
import com.hs.admin.model.respmodel.SysUserMenuRsList;
import com.hs.admin.service.SysMenuService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......
bsoft-admin/src/main/java/com/bsoft/admin/service/impl/SysRoleServiceImpl.java → hs-admin/src/main/java/com/hs/admin/service/impl/SysRoleServiceImpl.java
package com.bsoft.admin.service.impl;
package com.hs.admin.service.impl;
import com.bsoft.admin.common.enums.StateType;
import com.bsoft.admin.mapper.SysRoleMapper;
import com.bsoft.admin.mapper.SysUserRoleRsMapper;
import com.bsoft.admin.model.SysRole;
import com.bsoft.admin.model.SysUserRoleRs;
import com.bsoft.admin.model.reqmodel.RoleReq;
import com.bsoft.admin.service.SysRoleService;
import com.hs.admin.common.enums.StateType;
import com.hs.admin.mapper.SysRoleMapper;
import com.hs.admin.mapper.SysUserRoleRsMapper;
import com.hs.admin.model.SysRole;
import com.hs.admin.model.SysUserRoleRs;
import com.hs.admin.model.reqmodel.RoleReq;
import com.hs.admin.service.SysRoleService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......
bsoft-admin/src/main/java/com/bsoft/admin/service/impl/SysUserRoleServiceImpl.java → hs-admin/src/main/java/com/hs/admin/service/impl/SysUserRoleServiceImpl.java
package com.bsoft.admin.service.impl;
package com.hs.admin.service.impl;
import com.bsoft.admin.mapper.SysRoleMapper;
import com.bsoft.admin.mapper.SysUserRoleRsMapper;
import com.bsoft.admin.model.SysRole;
import com.bsoft.admin.model.SysUserRoleRs;
import com.bsoft.admin.service.SysUserRoleRsService;
import com.hs.admin.mapper.SysRoleMapper;
import com.hs.admin.mapper.SysUserRoleRsMapper;
import com.hs.admin.model.SysRole;
import com.hs.admin.model.SysUserRoleRs;
import com.hs.admin.service.SysUserRoleRsService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
......
bsoft-admin/src/main/java/com/bsoft/admin/service/impl/UserServiceImpl.java → hs-admin/src/main/java/com/hs/admin/service/impl/UserServiceImpl.java
package com.bsoft.admin.service.impl;
package com.hs.admin.service.impl;
import com.bsoft.admin.common.enums.StateType;
import com.bsoft.admin.mapper.SysUserMapper;
import com.bsoft.admin.model.SysUser;
import com.bsoft.admin.model.reqmodel.UserReq;
import com.bsoft.admin.service.UserService;
import com.hs.admin.common.enums.StateType;
import com.hs.admin.mapper.SysUserMapper;
import com.hs.admin.model.SysUser;
import com.hs.admin.model.reqmodel.UserReq;
import com.hs.admin.service.UserService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
......
bsoft-admin/src/main/resources/application-test.properties → hs-admin/src/main/resources/application-test.properties
#### \u6D4B\u8BD5\u73AF\u5883 ###################################################
spring.datasource.url=jdbc:mysql://192.168.18.176:3306/scml_zp_cs?useUnicode=true&characterEncoding=utf8&useSSL=false&autoReconnect=true&rewriteBatchedStatements=TRUE&serverTimezone=UTC
spring.datasource.url=jdbc:mysql://192.168.18.179:3306/scml_mzx_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
......@@ -20,7 +20,7 @@ spring.redis.jedis.pool.min-idle=0
spring.redis.timeout=100000
swagger.enabled=true
swagger.basePackage=com.bsoft.admin.controller
swagger.basePackage=com.hs.admin.controller
spring.mvc.view.prefix=/WEB-INF/views/
spring.mvc.view.suffix=.jsp
......
bsoft-admin/src/main/resources/application.properties → hs-admin/src/main/resources/application.properties
......@@ -3,7 +3,7 @@ spring.profiles.active=test
#server.port=8080
#server.servlet.context-path=/api
mybatis.mapper-locations=classpath:mapper/*.xml
mybatis.type-aliases-package=com.bsoft.admin.model
mybatis.type-aliases-package=com.hs.admin.model
config.path.include[0]=/user/**
......@@ -14,5 +14,5 @@ spring.aop.auto=true
# Whether subclass-based (CGLIB) proxies are to be created (true)
spring.aop.proxy-target-class=false
spring.jmx.enabled=false
#控制字段为null不返回的问题 True表示返回 False表示不返回
#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05B6\uFFFD\u03AAnull\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0635\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD True\uFFFD\uFFFD\u02BE\uFFFD\uFFFD\uFFFD\uFFFD False\uFFFD\uFFFD\u02BE\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
mybatis.configuration.call-setters-on-nulls=true
bsoft-admin/src/main/resources/mapper/DicOrgMapper.xml → hs-admin/src/main/resources/mapper/DicOrgMapper.xml
<?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.admin.mapper.DicOrgMapper">
<resultMap id="BaseResultMap" type="com.bsoft.admin.model.DicOrg">
<mapper namespace="com.hs.admin.mapper.DicOrgMapper">
<resultMap id="BaseResultMap" type="com.hs.admin.model.DicOrg">
<id column="ID" jdbcType="INTEGER" property="id" />
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
......@@ -16,16 +16,16 @@
<result column="PARENT_ID" jdbcType="DECIMAL" property="parentId" />
<result column="IS_NEW" jdbcType="DECIMAL" property="isNew" />
</resultMap>
<resultMap id="DicOrgResultMap" extends="BaseResultMap" type="com.bsoft.admin.model.respmodel.DicOrgList" />
<resultMap id="DicOrgResultMap" extends="BaseResultMap" type="com.hs.admin.model.respmodel.DicOrgList" />
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from dic_org
delete from sys_subject
where ID = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.bsoft.admin.model.DicOrg">
<insert id="insert" parameterType="com.hs.admin.model.DicOrg">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
</selectKey>
insert into dic_org (CREATE_DATE, CREATE_USERID, `STATE`,
insert into sys_subject (CREATE_DATE, CREATE_USERID, `STATE`,
ORG_CODE, ORG_NAME, ORG_NO,
ORG_SHORT_NAME, ORG_GROUP, ORG_TYPE,
ORG_ADDRESS, PARENT_ID,IS_NEW)
......@@ -34,8 +34,8 @@
#{orgShortName,jdbcType=VARCHAR}, #{orgGroup,jdbcType=VARCHAR}, #{orgType,jdbcType=VARCHAR},
#{orgAddress,jdbcType=VARCHAR}, #{parentId,jdbcType=DECIMAL}, #{isNew,jdbcType=DECIMAL})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.admin.model.DicOrg">
update dic_org
<update id="updateByPrimaryKey" parameterType="com.hs.admin.model.DicOrg">
update sys_subject
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
`STATE` = #{state,jdbcType=DECIMAL},
......@@ -53,27 +53,27 @@
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, ORG_CODE, ORG_NAME, ORG_NO, ORG_SHORT_NAME,
ORG_GROUP, ORG_TYPE, ORG_ADDRESS, PARENT_ID,IS_NEW
from dic_org
from sys_subject
where ID = #{id,jdbcType=INTEGER}
</select>
<select id="selectParentAll" resultMap="DicOrgResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, ORG_CODE, ORG_NAME, ORG_NO, ORG_SHORT_NAME,
ORG_GROUP, ORG_TYPE, ORG_ADDRESS, PARENT_ID,IS_NEW
from DIC_ORG
from sys_subject
where `STATE`=1
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, ORG_CODE, ORG_NAME, ORG_NO, ORG_SHORT_NAME,
ORG_GROUP, ORG_TYPE, ORG_ADDRESS, PARENT_ID,IS_NEW
from dic_org
from sys_subject
</select>
<select id="selectByUser" resultMap="BaseResultMap">
SELECT o.*
FROM SYS_USER_ORG_RS uor,DIC_ORG o
FROM sys_user_sbj_rs uor,sys_subject o
where uor.ORG_ID=o.ID and uor.USER_ID= #{userId,jdbcType=DECIMAL}
and o.`STATE`=1 and uor.`STATE`=1
</select>
<select id="selectByName" resultMap="BaseResultMap">
select * from DIC_ORG where ORG_NAME=#{orgName,jdbcType=VARCHAR} and `STATE`=1
select * from sys_subject where ORG_NAME=#{orgName,jdbcType=VARCHAR} and `STATE`=1
</select>
</mapper>
\ No newline at end of file
bsoft-admin/src/main/resources/mapper/SysMenuMapper.xml → hs-admin/src/main/resources/mapper/SysMenuMapper.xml
<?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.admin.mapper.SysMenuMapper">
<resultMap id="BaseResultMap" type="com.bsoft.admin.model.SysMenu">
<mapper namespace="com.hs.admin.mapper.SysMenuMapper">
<resultMap id="BaseResultMap" type="com.hs.admin.model.SysMenu">
<id column="ID" jdbcType="INTEGER" property="id" />
<result column="CREATE_DATA" jdbcType="TIMESTAMP" property="createData" />
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
......@@ -13,12 +13,12 @@
<result column="PAGE_CODE" jdbcType="VARCHAR" property="pageCode" />
<result column="SORT" jdbcType="DECIMAL" property="sort" />
</resultMap>
<resultMap id="sysMenuResultMap" type="com.bsoft.admin.model.respmodel.SysMenuList" extends="BaseResultMap"/>
<resultMap id="sysMenuResultMap" type="com.hs.admin.model.respmodel.SysMenuList" extends="BaseResultMap"/>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from sys_menu
where ID = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.bsoft.admin.model.SysMenu">
<insert id="insert" parameterType="com.hs.admin.model.SysMenu">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
</selectKey>
......@@ -31,7 +31,7 @@
#{parentId,jdbcType=DECIMAL}, #{pageCode,jdbcType=VARCHAR}, #{sort,jdbcType=DECIMAL}
)
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.admin.model.SysMenu">
<update id="updateByPrimaryKey" parameterType="com.hs.admin.model.SysMenu">
update sys_menu
set CREATE_DATA = #{createData,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
......
bsoft-admin/src/main/resources/mapper/SysRoleMapper.xml → hs-admin/src/main/resources/mapper/SysRoleMapper.xml
<?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.admin.mapper.SysRoleMapper">
<resultMap id="BaseResultMap" type="com.bsoft.admin.model.SysRole">
<mapper namespace="com.hs.admin.mapper.SysRoleMapper">
<resultMap id="BaseResultMap" type="com.hs.admin.model.SysRole">
<id column="ID" jdbcType="INTEGER" property="id" />
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
......@@ -13,7 +13,7 @@
delete from sys_role
where ID = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.bsoft.admin.model.SysRole">
<insert id="insert" parameterType="com.hs.admin.model.SysRole">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
</selectKey>
......@@ -22,7 +22,7 @@
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{roleName,jdbcType=VARCHAR}, #{roleCode,jdbcType=DECIMAL})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.admin.model.SysRole">
<update id="updateByPrimaryKey" parameterType="com.hs.admin.model.SysRole">
update sys_role
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
......
bsoft-admin/src/main/resources/mapper/SysRoleMenuRsMapper.xml → hs-admin/src/main/resources/mapper/SysRoleMenuRsMapper.xml
<?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.admin.mapper.SysRoleMenuRsMapper">
<resultMap id="BaseResultMap" type="com.bsoft.admin.model.SysRoleMenuRs">
<mapper namespace="com.hs.admin.mapper.SysRoleMenuRsMapper">
<resultMap id="BaseResultMap" type="com.hs.admin.model.SysRoleMenuRs">
<id column="ID" jdbcType="INTEGER" property="id" />
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
......@@ -9,14 +9,14 @@
<result column="MENU_ID" jdbcType="DECIMAL" property="menuId" />
<result column="ROLE_ID" jdbcType="DECIMAL" property="roleId" />
</resultMap>
<resultMap id="SysRoleMenuRsList" extends="BaseResultMap" type="com.bsoft.admin.model.respmodel.SysRoleMenuRsList">
<resultMap id="SysRoleMenuRsList" extends="BaseResultMap" type="com.hs.admin.model.respmodel.SysRoleMenuRsList">
<result column="PARENT_ID" jdbcType="DECIMAL" property="parentId" />
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from sys_role_menu_rs
where ID = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.bsoft.admin.model.SysRoleMenuRs">
<insert id="insert" parameterType="com.hs.admin.model.SysRoleMenuRs">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
</selectKey>
......@@ -25,7 +25,7 @@
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{menuId,jdbcType=DECIMAL}, #{roleId,jdbcType=DECIMAL})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.admin.model.SysRoleMenuRs">
<update id="updateByPrimaryKey" parameterType="com.hs.admin.model.SysRoleMenuRs">
update sys_role_menu_rs
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
......
hs-admin/src/main/resources/mapper/SysUserMapper.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.hs.admin.mapper.SysUserMapper">
<resultMap id="BaseResultMap" type="com.hs.admin.model.SysUser">
<id column="ID" jdbcType="INTEGER" 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_CODE" jdbcType="VARCHAR" property="userCode"/>
<result column="USER_NAME" jdbcType="VARCHAR" property="userName"/>
<result column="PASSWORD" jdbcType="VARCHAR" property="password"/>
<result column="IDCARD" jdbcType="VARCHAR" property="idcard"/>
<result column="SEX" jdbcType="VARCHAR" property="sex"/>
<result column="MOBILE" jdbcType="VARCHAR" property="mobile"/>
<result column="PAGE_COUNT" jdbcType="DECIMAL" property="pageCount"/>
<result column="ERROR_COUNT" jdbcType="DECIMAL" property="errorCount"/>
<result column="ERROR_TIME" jdbcType="TIMESTAMP" property="errorTime"/>
<result column="LAST_TIME" jdbcType="TIMESTAMP" property="lastTime"/>
<result column="LAST_IP" jdbcType="VARCHAR" property="lastIp"/>
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete
from sys_user
where ID = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.hs.admin.model.SysUser">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
</selectKey>
insert into sys_user (CREATE_DATE, CREATE_USERID, `STATE`,
USER_CODE, USER_NAME, `PASSWORD`,
IDCARD, SEX, MOBILE,
PAGE_COUNT, ERROR_COUNT, ERROR_TIME,
LAST_TIME, LAST_IP,MAC_ADDRESS)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{userCode,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR},
#{idcard,jdbcType=VARCHAR}, #{sex,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR},
#{pageCount,jdbcType=DECIMAL}, #{errorCount,jdbcType=DECIMAL}, #{errorTime,jdbcType=TIMESTAMP},
#{lastTime,jdbcType=TIMESTAMP}, #{lastIp,jdbcType=VARCHAR},'EO-D5-5E-6C-4D-7B')
</insert>
<update id="updateByPrimaryKey" parameterType="com.hs.admin.model.SysUser">
update sys_user
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
`STATE` = #{state,jdbcType=DECIMAL},
USER_CODE = #{userCode,jdbcType=VARCHAR},
USER_NAME = #{userName,jdbcType=VARCHAR},
`PASSWORD` = #{password,jdbcType=VARCHAR},
IDCARD = #{idcard,jdbcType=VARCHAR},
SEX = #{sex,jdbcType=VARCHAR},
MOBILE = #{mobile,jdbcType=VARCHAR},
PAGE_COUNT = #{pageCount,jdbcType=DECIMAL},
ERROR_COUNT = #{errorCount,jdbcType=DECIMAL},
ERROR_TIME = #{errorTime,jdbcType=TIMESTAMP},
LAST_TIME = #{lastTime,jdbcType=TIMESTAMP},
LAST_IP = #{lastIp,jdbcType=VARCHAR}
where ID = #{id,jdbcType=INTEGER}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select ID,
CREATE_DATE,
CREATE_USERID,
`STATE`,
USER_CODE,
USER_NAME,
`PASSWORD`,
IDCARD,
SEX,
MOBILE,
PAGE_COUNT,
ERROR_COUNT,
ERROR_TIME,
LAST_TIME,
LAST_IP
from sys_user
where ID = #{id,jdbcType=INTEGER}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID,
CREATE_DATE,
CREATE_USERID,
`STATE`,
USER_CODE,
USER_NAME,
`PASSWORD`,
IDCARD,
SEX,
MOBILE,
PAGE_COUNT,
ERROR_COUNT,
ERROR_TIME,
LAST_TIME,
LAST_IP
from sys_user
</select>
<select id="selectByCode" resultMap="BaseResultMap">
select ID,
CREATE_DATE,
CREATE_USERID,
STATE,
USER_CODE,
USER_NAME,
PASSWORD,
IDCARD,
SEX,
MOBILE,
PAGE_COUNT,
ERROR_COUNT,
ERROR_TIME,
LAST_TIME,
LAST_IP
from SYS_USER
where USER_CODE = #{userCode,jdbcType=VARCHAR}
and `STATE` != 0
</select>
</mapper>
\ No newline at end of file
bsoft-admin/src/main/resources/mapper/SysUserMenuRsMapper.xml → hs-admin/src/main/resources/mapper/SysUserMenuRsMapper.xml
<?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.admin.mapper.SysUserMenuRsMapper">
<resultMap id="BaseResultMap" type="com.bsoft.admin.model.SysUserMenuRs">
<mapper namespace="com.hs.admin.mapper.SysUserMenuRsMapper">
<resultMap id="BaseResultMap" type="com.hs.admin.model.SysUserMenuRs">
<id column="ID" jdbcType="INTEGER" property="id" />
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
......@@ -9,14 +9,14 @@
<result column="USER_ID" jdbcType="DECIMAL" property="userId" />
<result column="MENU_ID" jdbcType="DECIMAL" property="menuId" />
</resultMap>
<resultMap id="SysUserMenuRsList" extends="BaseResultMap" type="com.bsoft.admin.model.respmodel.SysUserMenuRsList">
<resultMap id="SysUserMenuRsList" extends="BaseResultMap" type="com.hs.admin.model.respmodel.SysUserMenuRsList">
<result column="PARENT_ID" jdbcType="DECIMAL" property="parentId" />
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from sys_user_menu_rs
where ID = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.bsoft.admin.model.SysUserMenuRs">
<insert id="insert" parameterType="com.hs.admin.model.SysUserMenuRs">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
</selectKey>
......@@ -25,7 +25,7 @@
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{userId,jdbcType=DECIMAL}, #{menuId,jdbcType=DECIMAL})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.admin.model.SysUserMenuRs">
<update id="updateByPrimaryKey" parameterType="com.hs.admin.model.SysUserMenuRs">
update sys_user_menu_rs
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
......
bsoft-admin/src/main/resources/mapper/SysUserOrgRsMapper.xml → hs-admin/src/main/resources/mapper/SysUserOrgRsMapper.xml
<?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.admin.mapper.SysUserOrgRsMapper">
<resultMap id="BaseResultMap" type="com.bsoft.admin.model.SysUserOrgRs">
<id column="ID" jdbcType="INTEGER" 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="ORG_ID" jdbcType="DECIMAL" property="orgId" />
<mapper namespace="com.hs.admin.mapper.SysUserOrgRsMapper">
<resultMap id="BaseResultMap" type="com.hs.admin.model.SysUserOrgRs">
<id column="ID" jdbcType="INTEGER" 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="ORG_ID" jdbcType="DECIMAL" property="orgId"/>
</resultMap>
<resultMap id="SysUserOrgRsList" extends="BaseResultMap" type="com.bsoft.admin.model.respmodel.SysUserOrgRsList">
<result column="PARENT_ID" jdbcType="DECIMAL" property="parentId" />
<resultMap id="SysUserOrgRsList" extends="BaseResultMap" type="com.hs.admin.model.respmodel.SysUserOrgRsList">
<result column="PARENT_ID" jdbcType="DECIMAL" property="parentId"/>
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from sys_user_org_rs
delete
from sys_user_sbj_rs
where ID = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.bsoft.admin.model.SysUserOrgRs">
<insert id="insert" parameterType="com.hs.admin.model.SysUserOrgRs">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
</selectKey>
insert into sys_user_org_rs (CREATE_DATE, CREATE_USERID, `STATE`,
insert into sys_user_sbj_rs (CREATE_DATE, CREATE_USERID, `STATE`,
USER_ID, ORG_ID)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{userId,jdbcType=DECIMAL}, #{orgId,jdbcType=DECIMAL})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.admin.model.SysUserOrgRs">
update sys_user_org_rs
<update id="updateByPrimaryKey" parameterType="com.hs.admin.model.SysUserOrgRs">
update sys_user_sbj_rs
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
`STATE` = #{state,jdbcType=DECIMAL},
......@@ -36,26 +37,28 @@
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, USER_ID, ORG_ID
from sys_user_org_rs
from sys_user_sbj_rs
where ID = #{id,jdbcType=INTEGER}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, USER_ID, ORG_ID
from sys_user_org_rs
from sys_user_sbj_rs
</select>
<select id="selectByUser" resultMap="SysUserOrgRsList">
select map.*,o.PARENT_ID
from SYS_USER_ORG_RS MAP
join DIC_ORG o on o.ID=map.ORG_ID
where MAP.`STATE` = 1 and MAP.USER_ID = #{userId,jdbcType=DECIMAL}
select map.*, o.PARENT_ID
from sys_user_sbj_rs MAP
join sys_subject o on o.ID = map.ORG_ID
where MAP.`STATE` = 1
and MAP.USER_ID = #{userId,jdbcType=DECIMAL}
</select>
<select id="selectByUserWithOrg" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, USER_ID, ORG_ID
from SYS_USER_ORG_RS
where USER_ID = #{userId,jdbcType=DECIMAL} and ORG_ID=#{orgId,jdbcType=DECIMAL}
from sys_user_sbj_rs
where USER_ID = #{userId,jdbcType=DECIMAL}
and ORG_ID = #{orgId,jdbcType=DECIMAL}
</select>
<update id="deleteByUser">
update SYS_USER_ORG_RS
update sys_user_sbj_rs
set `STATE` = 0
where USER_ID = #{userId,jdbcType=DECIMAL}
</update>
......
bsoft-admin/src/main/resources/mapper/SysUserRoleRsMapper.xml → hs-admin/src/main/resources/mapper/SysUserRoleRsMapper.xml
<?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.admin.mapper.SysUserRoleRsMapper">
<resultMap id="BaseResultMap" type="com.bsoft.admin.model.SysUserRoleRs">
<mapper namespace="com.hs.admin.mapper.SysUserRoleRsMapper">
<resultMap id="BaseResultMap" type="com.hs.admin.model.SysUserRoleRs">
<id column="ID" jdbcType="INTEGER" property="id" />
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
......@@ -13,7 +13,7 @@
delete from sys_user_role_rs
where ID = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.bsoft.admin.model.SysUserRoleRs">
<insert id="insert" parameterType="com.hs.admin.model.SysUserRoleRs">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
</selectKey>
......@@ -22,7 +22,7 @@
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{userId,jdbcType=DECIMAL}, #{roleId,jdbcType=DECIMAL})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.admin.model.SysUserRoleRs">
<update id="updateByPrimaryKey" parameterType="com.hs.admin.model.SysUserRoleRs">
update sys_user_role_rs
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
......
bsoft-admin/src/test/java/com/bsoft/admin/BsoftAdminApplicationTests.java → hs-admin/src/test/java/com/hs/admin/HsAdminApplicationTests.java
package com.bsoft.admin;
package com.hs.admin;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@SpringBootTest
class BsoftAdminApplicationTests {
class HsAdminApplicationTests {
@Test
void contextLoads() {
......
hs-api/src/main/resources/更新日志.txt
时间：2020.08.07 版本号：2.02.0807001
时间：2020.08.011 版本号：2.02.0811001
时间：2020.08.011 版本号：2.02.0811001
前端更新说明
606 科室账号登录，在住院预算编制得界面，住院---》门诊----》汇总，，点上一页，门诊界面显示全院数据
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间：2020.08.010 版本号：2.02.0810001
前端更新说明
能效三级病组转图标点击返回的图标
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间：2020.08.07 版本号：2.02.0807002
前端更新说明
589 绩效左上角的病组点击病组名出现浮框，再次单击浮框消失
590 所有的病组列表，第一列病组长按出现浮框病组名，再次长按浮框消失
绩效考核一级二级病组层 正向得分、负向得分 50% 100% 两条线
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间：2020.08.07 版本号：2.02.0807001
前端更新说明
......@@ -6,6 +26,14 @@
后端更新说明
预算编制-总览 查询速度优化
数据更新说明：
一、CMI修改为下发CMI，影响所有模块全院层。
二、病组重新分组,中高例数，手术等相关的发生改变，影响模块 预算编制，能效，医保，费用，绩效。
三、耗材成本中不可计费部分，按照其他费用占比切割。影响预算的科室成本，成本模块下的科室与疾病的耗材成本及总成本。
四、添加全院子父级病组的group_type。影响能效，医保，费用，成本的病组的列表部分的展示
五、修改总，药，耗，人的优质成本区间 。影响成本模块
六、修改全院和科室子父级病组的趋势图的展示问题（二三级病组和左侧列表一样） 。影响 能效和医保的趋势图部分
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间：2020.08.06 版本号：2.02.0806001
......
hs-common/src/main/java/com/hs/common/utils/RedisUtil.java
......@@ -15,11 +15,12 @@ import java.util.concurrent.TimeUnit;
public class RedisUtil {
private static RedisTemplate redisTemplate;
public static void setRedisTemplate(RedisTemplate redisTemplate){
public static void setRedisTemplate(RedisTemplate redisTemplate) {
RedisUtil.redisTemplate = redisTemplate;
}
//region Common
/**
* 指定缓存失效时间
*
......@@ -86,6 +87,7 @@ public class RedisUtil {
//endregion
//region String
/**
* 普通缓存获取
*
......@@ -131,8 +133,9 @@ public class RedisUtil {
}
return true;
} catch (Exception e) {
e.printStackTrace();
return false;
throw e;
// e.printStackTrace();
// return false;
}
}
......@@ -168,6 +171,7 @@ public class RedisUtil {
//endregion
//region Map
/**
* 判断hash表中是否有该项的值
*
......@@ -321,6 +325,7 @@ public class RedisUtil {
//endregion
//region Set
/**
* 根据key获取Set中的所有值
*
......@@ -426,6 +431,7 @@ public class RedisUtil {
//endregion
//region List
/**
* 获取集合指定位置的值
*
......
pom.xml
......@@ -4,8 +4,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.bsoft</groupId>
<artifactId>bsoft</artifactId>
<groupId>com.hs</groupId>
<artifactId>hs</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<properties>
......@@ -13,13 +13,14 @@
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
<modules>
<module>bsoft-common</module>
<module>bsoft-api</module>
<module>hs-common</module>
<module>hs-api</module>
<module>hs-admin</module>
<module>suvalue-boot-upms</module>
<module>suvalue-boot-ucenter</module>
<module>suvalue-boot-dynamic-datasource</module>
<module>suvalue-boot-demo</module>
<module>bsoft-plugins</module>
<module>hs-plugins</module>
</modules>
......
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