From a7186fb17067a32273711cf29693f88bd1a22795 Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Thu, 30 Jul 2020 16:29:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/manage/controller/FontController.java | 8 ++++---- .../manage/controller/LoginController.java | 8 ++++---- .../controller/Power_LogController.java | 8 ++++---- .../resources/mapper/Power_Sys_DictMapper.xml | 19 ++++++++----------- .../ImportExcel/ImportExcelJudgeMethod.java | 6 +++--- .../service/ImportExcel/ImportExcelUtil.java | 16 ++++++++-------- .../manage/service/ipml/PowerServiceImpl.java | 10 +++++----- .../service/ipml/Power_UserServiceImpl.java | 8 ++++---- 8 files changed, 40 insertions(+), 43 deletions(-) diff --git a/power-admin/src/main/java/com/manage/controller/FontController.java b/power-admin/src/main/java/com/manage/controller/FontController.java index 79c98fd..abd0f04 100644 --- a/power-admin/src/main/java/com/manage/controller/FontController.java +++ b/power-admin/src/main/java/com/manage/controller/FontController.java @@ -449,16 +449,16 @@ public class FontController { userVo.setMenus(menus); //设置科室 - String power_depts = ""; + StringBuilder power_depts = new StringBuilder(); List power_depts1 = power_deptService.selectByPrimaryKeys(userVo.getDeptId()); for(int j=0;j power_depts1 = power_deptService.selectByPrimaryKeys(user.getDeptId()); for(int j=0;j - - - 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 diff --git a/power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelJudgeMethod.java b/power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelJudgeMethod.java index 38f4aa0..4eba7f4 100644 --- a/power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelJudgeMethod.java +++ b/power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelJudgeMethod.java @@ -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 = 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 = 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+"\"不存在,"; } diff --git a/power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelUtil.java b/power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelUtil.java index 0d462ad..a3f66a1 100644 --- a/power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelUtil.java +++ b/power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelUtil.java @@ -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; } diff --git a/power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java index 9cb4c0c..fde881e 100644 --- a/power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java +++ b/power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java @@ -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); } } diff --git a/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java index 8064666..fda9cbe 100644 --- a/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java +++ b/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java @@ -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_depts1 = power_deptService.selectByPrimaryKeys(power_user.getDeptId()); for(int j=0;j