2020-10-20更新版本备份

.gitignore

@@ -1,4 +1,4 @@
-/target/
+target
 /.idea/
 /out/
 power.iml

power-admin/src/main/java/com/manage/controller/DeptController.java

@@ -398,6 +398,7 @@ public class DeptController {
         }finally {
             if(os != null){
                 try {
+                    os.flush();
                     os.close();
                 }catch (Exception e){
                     e.printStackTrace();

power-admin/src/main/java/com/manage/controller/ExportExcelController.java

@@ -47,6 +47,7 @@ public class ExportExcelController {
             }finally {
                 if(os != null){
                     try {
+                        os.flush();
                         os.close();
                     }catch (Exception e){
                         e.printStackTrace();

power-admin/src/main/java/com/manage/controller/LogAopAction.java

@@ -104,14 +104,14 @@ public class LogAopAction {
         }
 
         char[] chars = property.toCharArray();
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         for (int i = 0; i < chars.length; i++) {
             char c = chars[i];
             if (i == 0) {
                 sb.append(StringUtils.lowerCase(CharUtils.toString(c)));
             } else {
                 if (CharUtils.isAsciiAlphaUpper(c)) {
-                    sb.append("_" + StringUtils.lowerCase(CharUtils.toString(c)));
+                    sb.append("_").append(StringUtils.lowerCase(CharUtils.toString(c)));
                 } else {
                     sb.append(c);
                 }

power-admin/src/main/java/com/manage/controller/PageController.java

@@ -245,7 +245,7 @@ public class PageController {
         return "main";
     }
 
-    @RequestMapping("getEcharts1")
+    /*@RequestMapping("getEcharts1")
     @ResponseBody
     public Msg getEcharts1(){
         List<Echarts> list = new ArrayList<>();
@@ -303,7 +303,7 @@ public class PageController {
             e.printStackTrace();
             return Msg.fail(e.getMessage());
         }
-    }
+    }*/
 
     @RequestMapping("getEcharts4")
     @ResponseBody

power-admin/src/main/java/com/manage/controller/PermissionsController.java

@@ -85,7 +85,7 @@ public class PermissionsController {
             if (user.getRoleId() == 0 && user.getRoleId() != -100) {
                 object = pjp.proceed();
             }else{
-                Boolean flag = false;
+                boolean flag = false;
                 Set<String> menus = user.getMenus();
                 if (null != menus && !menus.isEmpty()) {
                     for (String menuUrl : menus) {

power-admin/src/main/java/com/manage/controller/Power_LogController.java

@@ -91,7 +91,7 @@ public class Power_LogController {
             if(null != logs && !logs.isEmpty()){
                 Set<String> menus = user.getMenus();
                 if(null != menus && !menus.isEmpty()){
-                    Integer deleteOper = 0;
+                    int deleteOper = 0;
                     for(String menu : menus){
                         if(StringUtils.isNotBlank(menu)){
                             if("/otherManage/deleteLogById".equals(menu)){
@@ -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]).append(",");
                     }else{
-                        str += idList[i];
+                        str.append(idList[i]);
                     }
                 }
             }
-            logService.deleteLogByIds(str);
+            logService.deleteLogByIds(str.toString());
             CacheManager.addExcCount("noExc");
             return Msg.success();
         }catch (Exception e){

power-admin/src/main/java/com/manage/controller/Power_Sys_DictController.java

@@ -173,7 +173,7 @@ public class Power_Sys_DictController {
                 if(StringUtils.isNoneBlank(powerSysDict.getHospitalName())){
                     //修改医院信息
                     Power_Sys_DictVo dictVo = powerSysDictService.checkHospitalName(powerSysDict.getHospitalName());
-                    if(dictVo != null && dictVo.getDictId() != powerSysDict.getDictId()){
+                    if(dictVo != null && !dictVo.getDictId().equals(powerSysDict.getDictId())){
                         return Msg.fail("医院名称已存在!");
                     }else{
                         powerSysDictService.updateByPrimaryKeySelective(powerSysDict,request);
@@ -189,7 +189,7 @@ public class Power_Sys_DictController {
                     List<Power_Sys_Dict> flagExists = powerSysDictService.checkSysFlagOrSysNameByDeptId(powerSysDict.getSysFlag(), null, deptId.toString());
                     if(null != flagExists && !flagExists.isEmpty()) {
                         //判断是否包含在这个集合里
-                        Boolean flagExist = false;
+                        boolean flagExist = false;
                         for (int i = 0; i < flagExists.size(); i++) {
                             if(!flagExists.get(i).getDictId().equals(powerSysDict.getDictId())){
                                 flagExist = true;
@@ -203,7 +203,7 @@ public class Power_Sys_DictController {
                     List<Power_Sys_Dict> sysNameExists = powerSysDictService.checkSysFlagOrSysNameByDeptId(null, powerSysDict.getSysName(), deptId.toString());
                     if(null != sysNameExists && !sysNameExists.isEmpty()) {
                         //判断是否包含在这个集合里
-                        Boolean sysNameExist = false;
+                        boolean sysNameExist = false;
                         for (int i = 0; i < sysNameExists.size(); i++) {
                             if(!sysNameExists.get(i).getDictId().equals(powerSysDict.getDictId())){
                                 sysNameExist = true;

power-admin/src/main/java/com/manage/controller/UserController.java

@@ -321,6 +321,7 @@ public class UserController {
         }finally {
             if(os != null){
                 try {
+                    os.flush();
                     os.close();
                 }catch (Exception e){
                     e.printStackTrace();

power-admin/src/main/java/com/manage/interfaces/webservice/impl/PowerWebServiceImpl.java

@@ -80,9 +80,9 @@ public class PowerWebServiceImpl implements PowerWebService {
         // 当前用户的所有菜单集合
         List<Power_Menu> tempPowerMenus = new ArrayList<>(powerRoleMenus);
         for (Power_Menu powerMenu:powerUserMenus) {
-            if(powerMenu.getFlag() == Constant.EFFECTIVE_YES){
+            if(powerMenu.getFlag().equals(Constant.EFFECTIVE_YES)){
                 tempPowerMenus.add(powerMenu);
-            }else if(powerMenu.getFlag() == Constant.EFFECTIVE_NO){
+            }else if(powerMenu.getFlag().equals(Constant.EFFECTIVE_NO)){
                 tempPowerMenus.remove(powerMenu);
             }
         }

power-admin/src/main/resources/config/config.properties

@@ -9,8 +9,11 @@ TOKEN_EXPIRE_TIME = 1200000
 
 ##################################################服务器ip##########################################################
 #通用服务器IP与通用服务器端口
+#SERVER_IP = 10.36.116.108
+#SERVER_PORT = 8080
+
 SERVER_IP = localhost
-SERVER_PORT = 8081
+SERVER_PORT = 8080
 
 #power权限系统ip
 POWER_IP = ${SERVER_IP}
@@ -20,12 +23,12 @@ POWER_PORT = ${SERVER_PORT}
 #病案归档系统ip
 EMRMEDICALRECORD_IP = ${SERVER_IP}
 #病案归档系统端口
-EMRMEDICALRECORD_PORT = 8082
+EMRMEDICALRECORD_PORT = ${SERVER_PORT}
 
 #病案管理系统ip
 EMRRECORD_IP = ${SERVER_IP}
 #病案管理系统端口
-EMRRECORD_PORT = 8083
+EMRRECORD_PORT = ${SERVER_PORT}
 
 #病案复印预约ip
 EMRAPPLYCOPY_IP = ${SERVER_IP}

power-admin/src/main/resources/config/jdbc.properties

@@ -1,6 +1,7 @@
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc\:mysql\://localhost\:3306/ydpower?useUnicode\=true&characterEncoding\=utf-8
+jdbc.url=jdbc\:mysql\://localhost\:3306/power?useUnicode\=true&characterEncoding\=utf-8
 jdbc.username=root
+#jdbc.password=docus@702
 jdbc.password=docus702
 
 #hibernate config

power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp

@@ -278,7 +278,7 @@
     <!-- 底部版权-->
     <footer class="main-footer">
         <div class="pull-right hidden-xs">
-            <b>Version</b> 20200211
+            <b>Version</b> 20201020
         </div>
         <strong>Copyright &copy; 2019-2090 厦门嘉时软件.</strong> All rights
         reserved.

power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelJudgeMethod.java

@@ -311,20 +311,20 @@ public class ImportExcelJudgeMethod {
                 String deptIds = "";
                 if(value.contains("@")){
                     String[] values = value.split("@");
-                    for (int i = 0; i < values.length; i++) {
+                    for (String value1 : values) {
-                        if(StringUtils.isNotBlank(values[i])){
+                        if (StringUtils.isNotBlank(value1)) {
-                            List<Power_Dept> power_dept = deptMapper.checkDeptName(values[i], userDict.getDictId());
+                            List<Power_Dept> powerDept = deptMapper.checkDeptName(value1, userDict.getDictId());
-                            if(power_dept != null && !power_dept.isEmpty()){
+                            if (powerDept != null && !powerDept.isEmpty()) {
-                                deptIds += power_dept.get(0).getDeptId()+",";
+                                deptIds += powerDept.get(0).getDeptId() + ",";
-                            }else{
+                            } else {
-                                return "\""+head+"\"其中有不存在,";
+                                return "\"" + head + "\"其中有不存在,";
                             }
                         }
                     }
                 }else{
-                    List<Power_Dept> power_dept = deptMapper.checkDeptName(value, userDict.getDictId());
+                    List<Power_Dept> powerDept = deptMapper.checkDeptName(value, userDict.getDictId());
-                    if(power_dept != null && !power_dept.isEmpty()){
+                    if(powerDept != null && !powerDept.isEmpty()){
-                        deptIds += power_dept.get(0).getDeptId()+",";
+                        deptIds += powerDept.get(0).getDeptId()+",";
                     }else{
                         return "\""+head+"\"不存在,";
                     }

power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelUtil.java

@@ -77,13 +77,13 @@ 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)){
+                            if(StringUtils.isNotBlank(wrongStr.toString())){
                                 //设置错误信息字体为红色加粗
                                 Font font = workbook.createFont();
                                 font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
@@ -93,8 +93,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);
+                                wrongStr = new StringBuilder(wrongStr.substring(0, wrongStr.length() - 1));
-                                cell.setCellValue(wrongStr);
+                                cell.setCellValue(wrongStr.toString());
                                 wrongCount++;
                             }else{
                                 successCount++;
@@ -182,7 +182,7 @@ 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 = "";
+        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,9 +219,9 @@ public class ImportExcelUtil {
             }
         }catch (Exception e){
             e.printStackTrace();
-            wrongStr+="\""+head+"\"格式不正确,";
+            wrongStr.append("\"").append(head).append("\"格式不正确,");
         }
-        return wrongStr;
+        return wrongStr.toString();
     }
 
     /**

power-service/src/main/java/com/manage/service/cache/CacheManager.java

@@ -9,8 +9,8 @@ import java.util.Map;
 
 public class CacheManager {
     private static HashMap cacheMap = new HashMap();
-    private static HashMap cacheExceptionMap = new HashMap();
+    //private static HashMap cacheExceptionMap = new HashMap();
-    private static HashMap<String,HashMap<String,Integer>> loginUserCacheMap = new HashMap();
+    //private static HashMap<String,HashMap<String,Integer>> loginUserCacheMap = new HashMap();
     //无异常数量
     private static Integer noExcCount = 0;
     //异常数量
@@ -19,7 +19,7 @@ public class CacheManager {
     //添加用户登录缓存
     public synchronized static void addloginUserCount(String date,String userName){
         //取出当天数据
-        HashMap<String,Integer> map = loginUserCacheMap.get(date);
+        /*HashMap<String,Integer> map = loginUserCacheMap.get(date);
         if(null == map){
             map = new HashMap<>();
             //首次登录
@@ -36,32 +36,32 @@ public class CacheManager {
             map.put(userName,count);
         }
         //重置
-        loginUserCacheMap.put(date,map);
+        loginUserCacheMap.put(date,map);*/
     }
 
     //获取当天用户集合
-    public  static HashMap getCurrentDayCount(String date){
+   /* public  static HashMap getCurrentDayCount(String date){
         //取出当天数据
         HashMap map = loginUserCacheMap.get(date);
         return map;
-    }
+    }*/
 
     //添加异常数量
     public synchronized static void addExcCount(String type){
-        if("noExc".equals(type)){
+        /*if("noExc".equals(type)){
             noExcCount++;
             cacheExceptionMap.put(type,noExcCount);
         }
         if("exc".equals(type)){
             excCount++;
             cacheExceptionMap.put(type,excCount);
-        }
+        }*/
     }
 
     //取异常数量
-    public synchronized static Integer getExcCount(String type){
+    /*public synchronized static Integer getExcCount(String type){
         return (Integer)cacheExceptionMap.get(type);
-    }
+    }*/
 
     private CacheManager() {
         super();
@@ -146,9 +146,10 @@ public class CacheManager {
                 cache.setExpired(true);
             }
             return cache;
-        }else
+        }else {
             return null;
         }
+    }
 
     public static void putCacheInfo(String key, Cache obj, long dt, boolean expired) {
         Cache cache = new Cache();

power-service/src/main/java/com/manage/service/ipml/PageServiceImpl.java

@@ -42,7 +42,7 @@ public class PageServiceImpl {
         return userMapper.selectEffectiveCount();
     }
 
-    public Map<String,List> getEcharts2(){
+    /*public Map<String,List> getEcharts2(){
         Map<String,List> returnMap = new HashMap();
         List<String> dateList = getDayListOfMonth();
         //日期集合
@@ -169,11 +169,11 @@ public class PageServiceImpl {
         //日期对应登录数
         returnMap.put("dataList",dataList);
         return returnMap;
-    }
+    }*/
 
     public int getEcharts4() throws Exception{
         SigarUtils s = new SigarUtils();
-        s.initSigar();
+        SigarUtils.initSigar();
         int cpuCount = cpu();
         return cpuCount;
     }
@@ -213,7 +213,7 @@ public class PageServiceImpl {
             int i = buffer.toString().lastIndexOf("</TD>");
             String substring = buffer.substring(0, i);
             String substring1 = substring.substring(substring.length() - 4, substring.length());
-            Float f = Float.valueOf(substring1);
+            float f = Float.parseFloat(substring1);
             temperature = Math.round(f);
         }catch (Exception e){
             e.printStackTrace();

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).append(",");
                                                     }
                                                 }
-                                                if(StringUtils.isNotBlank(sysFlagStr)){
+                                                if(StringUtils.isNotBlank(sysFlagStr.toString())){
                                                     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).append(",");
                                                         }
                                                     }
-                                                    if(StringUtils.isNotBlank(sysFlagStr)){
+                                                    if(StringUtils.isNotBlank(sysFlagStr.toString())){
                                                         Power_UserAndRoleTree tempRole = new Power_UserAndRoleTree();
                                                         BeanUtils.copyProperties(role,tempRole);
-                                                        tempRole.setSysFlag(sysFlagStr);
+                                                        tempRole.setSysFlag(sysFlagStr.toString());
                                                         tempRoleList.add(tempRole);
                                                     }
                                                 }
@@ -480,7 +480,7 @@ public class PowerServiceImpl implements PowerService  {
                                     tree5.setId(id);
                                     tree5.setParentId(twoLevelId);
                                     tree5.setSysFlag(sys.getSysFlag());
-                                    Boolean isParent = false;
+                                    boolean isParent = false;
                                     //第四级用户
                                     if(null != userList && !userList.isEmpty()) {
                                         for (Power_UserAndRoleTree users : userList) {

power-service/src/main/java/com/manage/service/ipml/Power_DeptServiceImpl.java

@@ -95,8 +95,8 @@ public class Power_DeptServiceImpl implements Power_DeptService {
         Set<String> perms = powerUser1.getMenus();
         if(null != power_depts && !power_depts.isEmpty()){
             for (int i = 0; i < power_depts.size(); i++) {
-                Integer isUpdate = 0;
+                int isUpdate = 0;
-                Integer isDelete = 0;
+                int isDelete = 0;
                 for(String menu : perms){
                     if("/dept/update".equals(menu)){
                         isUpdate = 1;

power-service/src/main/java/com/manage/service/ipml/Power_RoleServiceImpl.java

@@ -86,8 +86,8 @@ public class Power_RoleServiceImpl implements Power_RoleService {
         Set<String> perms = powerUser1.getMenus();
         if(null != power_roles && !power_roles.isEmpty()){
             for (int i = 0; i < power_roles.size(); i++) {
-                Integer isUpdate = 0;
+                int isUpdate = 0;
-                Integer isDelete = 0;
+                int isDelete = 0;
                 for(String menu : perms){
                     if("/role/update".equals(menu)){
                         isUpdate = 1;

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_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()).append(",");
             }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;
     }
 
@@ -152,8 +152,8 @@ public class Power_UserServiceImpl implements Power_UserService {
         for(int i=0;i<someByMore.size();i++){
             Power_UserVo power_user = someByMore.get(i);
             //设置编辑和删除权限
-            Integer isUpdate = 0;
+            int isUpdate = 0;
-            Integer isDelete = 0;
+            int isDelete = 0;
             if(null != perms && !perms.isEmpty()){
                 for(String menu : perms){
                     if("/user/update".equals(menu)){