power2.0
/
power
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

后台优化

Browse Source
nanfang_branch
zengwh 5 years ago
parent 1ba714c0fe
commit a7186fb170
8 changed files with 40 additions and 43 deletions
Show Stats Download Patch File Download Diff File

8
power-admin/src/main/java/com/manage/controller/FontController.java
Unescape Escape View File

@ -449,16 +449,16 @@ public class FontController {
userVo.setMenus(menus);
//设置科室
String power_depts = "";
StringBuilder power_depts = new StringBuilder();
List<Power_Dept> power_depts1 = power_deptService.selectByPrimaryKeys(userVo.getDeptId());
for(int j=0;j<power_depts1.size();j++){
if(j<power_depts1.size()-1){
power_depts += power_depts1.get(j).getDeptName()+",";
power_depts.append(power_depts1.get(j).getDeptName()+",");
}else{
power_depts += power_depts1.get(j).getDeptName();
power_depts.append(power_depts1.get(j).getDeptName());
}
}
userVo.setRemark(power_depts);
userVo.setRemark(power_depts.toString());
//移除缓存
CacheManager.removeCacheByObject(userVo);
CacheManager.putCache(date,new Cache(date,userVo,TOKEN_EXPIRE_TIME));

8
power-admin/src/main/java/com/manage/controller/LoginController.java
Unescape Escape View File

@ -109,16 +109,16 @@ public class LoginController {
user.setMenus(menus);
//设置科室
String power_depts = "";
StringBuilder power_depts = new StringBuilder();
List<Power_Dept> power_depts1 = power_deptService.selectByPrimaryKeys(user.getDeptId());
for(int j=0;j<power_depts1.size();j++){
if(j<power_depts1.size()-1){
power_depts += power_depts1.get(j).getDeptName()+",";
power_depts.append(power_depts1.get(j).getDeptName()+",");
}else{
power_depts += power_depts1.get(j).getDeptName();
power_depts.append(power_depts1.get(j).getDeptName());
}
}
user.setRemark(power_depts);
user.setRemark(power_depts.toString());
//设置进缓存
CacheManager.putCache(date,new Cache(date,user,TOKEN_EXPIRE_TIME));

8
power-admin/src/main/java/com/manage/controller/Power_LogController.java
Unescape Escape View File

@ -161,17 +161,17 @@ public class Power_LogController {
public Msg deleteLogByIds(@PathVariable("ids")String ids){
try{
String[] idList = ids.split(",");
String str = "";
StringBuilder str = new StringBuilder();
for (int i = 0; i < idList.length; i++) {
if(StringUtils.isNoneBlank(idList[i])){
if(i != idList.length - 1){
str += idList[i] + ",";
str.append(idList[i] + ",");
}else{
str += idList[i];
str.append(idList[i]);
}
}
}
logService.deleteLogByIds(str);
logService.deleteLogByIds(str.toString());
CacheManager.addExcCount("noExc");
return Msg.success();
}catch (Exception e){

19
power-dao/src/main/resources/mapper/Power_Sys_DictMapper.xml
Unescape Escape View File

@ -21,9 +21,6 @@
<result column="remark" jdbcType="VARCHAR" property="remark"/>
</resultMap>
<resultMap id="BaseResultMapVo" type="com.manage.vo.Power_Sys_DictVo">
<result column="sys_name" jdbcType="VARCHAR" property="sysName"/>
<result column="dict_status" jdbcType="INTEGER" property="dictStatus"/>
<result column="dept_name" jdbcType="VARCHAR" property="deptName"/>
</resultMap>
<sql id="Base_Column_List">
dict_id, dept_id, hospital_name, sys_flag, sys_name, dict_area, hospital_tel, parent_id,
@ -400,10 +397,10 @@ LEFT JOIN (SELECT
dict.dept_id dictDeptId,
dept.dept_id deptIds,
dict.hospital_name hospitalName,
dict.sys_name sysName,
dict.sys_name,
dict.sys_flag sysFlag,
dict.sys_type sysType,
dept.dept_name deptName,
dept.dept_name,
dict.hospital_tel,
dict.dict_area,
dept.creater username
@ -437,10 +434,10 @@ on FIND_IN_SET(dict.deptIds,power_user.dept_id)
dict.dept_id dictDeptId,
dept.dept_id deptId,
dict.hospital_name hospitalName,
dict.sys_name sysName,
dict.sys_name,
dict.sys_flag sysFlag,
dict.sys_type sysType,
dept.dept_name deptName,
dept.dept_name,
dict.hospital_tel,
dict.dict_area
FROM
@ -553,10 +550,10 @@ on FIND_IN_SET(dict.deptIds,power_user.dept_id)
dict.dept_id dictDeptId,
dept.dept_id deptIds,
dict.hospital_name hospitalName,
dict.sys_name sysName,
dict.sys_name,
dict.sys_flag sysFlag,
dict.sys_type sysType,
dept.dept_name deptName,
dept.dept_name,
dict.hospital_tel,
dict.dict_area,
dept.creater username
@ -637,10 +634,10 @@ on FIND_IN_SET(dict.deptIds,power_user.dept_id)
dict.dept_id dictDeptId,
dept.dept_id deptIds,
dict.hospital_name hospitalName,
dict.sys_name sysName,
dict.sys_name,
dict.sys_flag sysFlag,
dict.sys_type sysType,
dept.dept_name deptName,
dept.dept_name,
dict.hospital_tel,
dict.dict_area
FROM

6
power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelJudgeMethod.java
Unescape Escape View File

@ -308,14 +308,14 @@ public class ImportExcelJudgeMethod {
Power_User powerUser1 =(Power_User) session.getAttribute("CURRENT_USER");
//获取医院ID
Power_User_Dict userDict = userDictMapper.selectDictIdByUserId(powerUser1.getUserId());
String deptIds = "";
StringBuilder deptIds = new StringBuilder();
if(value.contains("@")){
String[] values = value.split("@");
for (int i = 0; i < values.length; i++) {
if(StringUtils.isNotBlank(values[i])){
List<Power_Dept> power_dept = deptMapper.checkDeptName(values[i], userDict.getDictId());
if(power_dept != null && !power_dept.isEmpty()){
deptIds += power_dept.get(0).getDeptId()+",";
deptIds.append(power_dept.get(0).getDeptId()+",");
}else{
return "\""+head+"\"其中有不存在,";
}
@ -324,7 +324,7 @@ public class ImportExcelJudgeMethod {
}else{
List<Power_Dept> power_dept = deptMapper.checkDeptName(value, userDict.getDictId());
if(power_dept != null && !power_dept.isEmpty()){
deptIds += power_dept.get(0).getDeptId()+",";
deptIds.append( power_dept.get(0).getDeptId()+",");
}else{
return "\""+head+"\"不存在,";
}

16
power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelUtil.java
Unescape Escape View File

@ -76,10 +76,10 @@ public class ImportExcelUtil {
boolean flag = isRowEmpty(row);
if(!flag){
if(row.getPhysicalNumberOfCells() !=0){
String wrongStr = "";
StringBuilder wrongStr = new StringBuilder();
for (int k = 0; k < fieldNames.length; k++) {
//对象赋值后返回错误对象
wrongStr += getValueByField(object, fieldNames[k], getCellValue(row.getCell(k)), getCellValue(head.getCell(k)),judgeMethods[k]);
wrongStr.append(getValueByField(object, fieldNames[k], getCellValue(row.getCell(k)), getCellValue(head.getCell(k)),judgeMethods[k]));
}
//有错误信息在行尾创建cell，并标红提示文字
if(StringUtils.isNotBlank(wrongStr)){
@ -92,8 +92,8 @@ public class ImportExcelUtil {
Cell cell = row.createCell( fieldNames.length);
cell.setCellStyle(cellStyle);
cell.setCellType(HSSFCell.CELL_TYPE_STRING);
wrongStr = wrongStr.substring(0,wrongStr.length()-1);
cell.setCellValue(wrongStr);
wrongStr = new StringBuilder(wrongStr.substring(0,wrongStr.length()-1));
cell.setCellValue(wrongStr.toString());
wrongCount++;
}else{
successCount++;
@ -181,8 +181,8 @@ public class ImportExcelUtil {
* 通过反射获取属性值
* object:赋值对象，fieldName:属性名，value:excel表格值,head:表格头名称(中文名)，judgeMethod:判断方法
* */
private static String getValueByField(Object object,String fieldName,String value,String head,String judgeMethod){
String wrongStr = "";
private static StringBuilder getValueByField(Object object,String fieldName,String value,String head,String judgeMethod){
StringBuilder wrongStr = new StringBuilder();
try {
Class<?> clazz = object.getClass();
for (; clazz != Object.class; clazz = clazz.getSuperclass()) {
@ -200,7 +200,7 @@ public class ImportExcelUtil {
//执行方法
String returnWrongStr = (String)method.invoke(importExcelJudgeMethod, fieldName, value, f, object, head);
if(StringUtils.isNotBlank(returnWrongStr)){
wrongStr+=returnWrongStr;
wrongStr.append(returnWrongStr);
}
}else{
if(StringUtils.isNotBlank(value)){
@ -219,7 +219,7 @@ public class ImportExcelUtil {
}
}catch (Exception e){
e.printStackTrace();
wrongStr+="\""+head+"\"格式不正确,";
wrongStr.append("\""+head+"\"格式不正确,");
}
return wrongStr;
}

10
power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java
Unescape Escape View File

@ -183,7 +183,7 @@ public class PowerServiceImpl implements PowerService {
//给角色设置系统权限
if (null != roleList && !roleList.isEmpty()) {
for (Power_UserAndRoleTree role : roleList) {
String sysFlagStr = "";
StringBuilder sysFlagStr = new StringBuilder();
String deptId = role.getDeptId();
if(StringUtils.isNotBlank(deptId)){
//单一科室
@ -191,13 +191,13 @@ public class PowerServiceImpl implements PowerService {
if (deptId.equals(dept.getDeptId())) {
if(null != sysFlagSet && !sysFlagSet.isEmpty()){
for(String sysFlag:sysFlagSet){
sysFlagStr += sysFlag + ",";
sysFlagStr.append(sysFlag + ",");
}
}
if(StringUtils.isNotBlank(sysFlagStr)){
Power_UserAndRoleTree tempRole = new Power_UserAndRoleTree();
BeanUtils.copyProperties(role,tempRole);
tempRole.setSysFlag(sysFlagStr);
tempRole.setSysFlag(sysFlagStr.toString());
tempRoleList.add(tempRole);
}
}
@ -208,13 +208,13 @@ public class PowerServiceImpl implements PowerService {
if (StringUtils.isNotBlank(deptStr) && deptStr.equals(dept.getDeptId())) {
if(null != sysFlagSet && !sysFlagSet.isEmpty()){
for(String sysFlag:sysFlagSet){
sysFlagStr += sysFlag + ",";
sysFlagStr.append(sysFlag + ",");
}
}
if(StringUtils.isNotBlank(sysFlagStr)){
Power_UserAndRoleTree tempRole = new Power_UserAndRoleTree();
BeanUtils.copyProperties(role,tempRole);
tempRole.setSysFlag(sysFlagStr);
tempRole.setSysFlag(sysFlagStr.toString());
tempRoleList.add(tempRole);
}
}

8
power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java
Unescape Escape View File

@ -84,18 +84,18 @@ public class Power_UserServiceImpl implements Power_UserService {
@Override
public Power_UserVo selectByPrimaryKey(Integer userId) {
String power_depts = "";
StringBuilder power_depts = new StringBuilder();
Power_UserVo power_user = powerUserMapper.selectByPrimaryKey(userId);
power_user.setUserPwd(MD5.JM(Base64.decode(power_user.getUserPwd())));
List<Power_Dept> power_depts1 = power_deptService.selectByPrimaryKeys(power_user.getDeptId());
for(int j=0;j<power_depts1.size();j++){
if(j<power_depts1.size()-1){
power_depts += power_depts1.get(j).getDeptName()+",";
power_depts.append(power_depts1.get(j).getDeptName()+",");
}else{
power_depts += power_depts1.get(j).getDeptName();
power_depts.append(power_depts1.get(j).getDeptName());
}
}
power_user.setPowerDepts(power_depts);
power_user.setPowerDepts(power_depts.toString());
return power_user;
}

Write Preview
Loading…
Cancel
Save