2020-12-23备份

.gitignore

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

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

@@ -10,6 +10,7 @@ import com.manage.service.*;
 import com.manage.service.cache.Cache;
 import com.manage.service.cache.CacheManager;
 import com.manage.service.ipml.Power_NoticeServiceImpl;
+import com.manage.service.webSocket.WsPool;
 import com.manage.util.DateUtils;
 import com.manage.util.Msg;
 import com.manage.vo.*;
@@ -39,6 +40,8 @@ import java.util.*;
 @Controller
 @RequestMapping("font/")
 public class FontController {
+    @Value("${STR_SPLIT}")
+    private String STR_SPLIT;
     @Autowired
     private PowerService powerService;
     @Autowired
@@ -60,6 +63,7 @@ public class FontController {
 
     /**
      * 2.1
+     *
      * @ProjectName: getUserPowerTreeBySysFlag
      * @Description: 获取菜单通过系统标识
      * @Param 无
@@ -109,6 +113,7 @@ public class FontController {
 
     /**
      * 2.2
+     *
      * @ProjectName: selectAllByUserIdOrRoleIdAndSysIdOrSysFlag
      * @Description: 根据用户id或角色id和系统id或系统标识查询通知记录
      * @Param 无
@@ -136,6 +141,7 @@ public class FontController {
 
     /**
      * 2.4
+     *
      * @ProjectName: getUserPowerTreeBySysFlag
      * @Description: 获取系统用户树通过系统标识
      * @Param 无
@@ -171,6 +177,7 @@ public class FontController {
 
     /**
      * 2.5
+     *
      * @ProjectName: getRolePowerTreeBySysFlag
      * @Description: 获取系统角色树通过系统标识
      * @Param 无
@@ -205,6 +212,7 @@ public class FontController {
 
     /**
      * 2.6
+     *
      * @ProjectName: getUserList
      * @Description: 获取用户id和用户名
      * @Param 无
@@ -245,6 +253,7 @@ public class FontController {
 
     /**
      * 2.7
+     *
      * @ProjectName: checkToken
      * @Description: 验证token是否有效
      * @Param 无
@@ -278,6 +287,7 @@ public class FontController {
 
     /**
      * 2.8
+     *
      * @ProjectName: getUserByToken
      * @Description: 根据token获取用户
      * @Param 无
@@ -345,6 +355,7 @@ public class FontController {
 
     /**
      * 2.9
+     *
      * @ProjectName: getMenuByToken
      * @Description: 根据token获取菜单
      * @Param 无
@@ -390,6 +401,7 @@ public class FontController {
 
     /**
      * 2.10
+     *
      * @ProjectName: getToken
      * @Description: 获取token
      * @Param 无
@@ -447,16 +459,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()).append(",");
                 } 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));
@@ -469,6 +481,7 @@ public class FontController {
 
     /**
      * 2.11
+     *
      * @MethodName getUnReadCount
      * @Description: 根据用户获取未读通知数量
      * @Param 无
@@ -500,4 +513,13 @@ public class FontController {
             return Msg.fail(e.getMessage());
         }
     }
+
+
+    @RequestMapping("sendMessage")
+    @ResponseBody
+    public Msg sendMessage(SendMessage sendMessage) {
+        String message = sendMessage.getTitle() + STR_SPLIT + sendMessage.getContent() + STR_SPLIT  + sendMessage.getType() + STR_SPLIT + sendMessage.getType1() + STR_SPLIT + sendMessage.getFlagId();
+        WsPool.sendMessageToAll(sendMessage.getUserId().toString(), message);
+        return Msg.success();
+    }
 }

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

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

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

@@ -23,12 +23,12 @@ POWER_PORT = ${SERVER_PORT}
 #病案归档系统ip
 EMRMEDICALRECORD_IP = ${SERVER_IP}
 #病案归档系统端口
-EMRMEDICALRECORD_PORT = ${SERVER_PORT}
+EMRMEDICALRECORD_PORT = 8082
 
 #病案管理系统ip
 EMRRECORD_IP = ${SERVER_IP}
 #病案管理系统端口
-EMRRECORD_PORT = ${SERVER_PORT}
+EMRRECORD_PORT = 8083
 
 #病案复印预约ip
 EMRAPPLYCOPY_IP = ${SERVER_IP}

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

@@ -1,5 +1,5 @@
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc\:mysql\://localhost\:3306/power?useUnicode\=true&characterEncoding\=utf-8
+jdbc.url=jdbc\:mysql\://localhost\:3306/ydpower?useUnicode\=true&characterEncoding\=utf-8
 jdbc.username=root
 #jdbc.password=docus@702
 jdbc.password=docus702
@@ -15,13 +15,13 @@ hibernate.current_session_context_class=thread
 hibernate.jdbc.batch_size=50  
 hibernate.enable_lazy_load_no_trans=true  
 
-#执行:右键 Run As ---->Maven build ---->Goals:mybatis-generator:generate
-#输出目录
+#\u05B4\uFFFD\uFFFD:\uFFFD\u04BC\uFFFD Run As ---->Maven build ---->Goals:mybatis-generator:generate
+#\uFFFD\uFFFD\uFFFD\u013F\u00BC
 targetProject=src/main/java
-#modelPackage,sqlMapperPackage,daoMapperPackage 通常一致??
+#modelPackage,sqlMapperPackage,daoMapperPackage \u0368\uFFFD\uFFFD\u04BB\uFFFD\uFFFD??
 modelPackage=com.manage.entity
 daoMapperPackage=com.manage.dao
-#输出目录
+#\uFFFD\uFFFD\uFFFD\u013F\u00BC
 targetProject2=src/main/resources
 sqlMapperPackage=mapper
 

power-admin/src/main/resources/rebel.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_1.xsd">
+
+	<classpath>
+		<dir name="D:/ideaProject/yingde/power_yd/power-admin/target/classes">
+		</dir>
+	</classpath>
+
+	<web>
+		<link target="/">
+			<dir name="D:/ideaProject/yingde/power_yd/power-admin/src/main/webapp">
+			</dir>
+		</link>
+	</web>
+
+</application>

power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp

@@ -109,8 +109,8 @@
                         <input type="text" class="form-control input-sm" id="user_name" maxlength="16"/>
                     </div>
                     <div class="form-group">
-                        <label for="user_email">邮箱地址:</label>
-                        <input type="text" class="form-control input-sm" id="user_email" maxlength="25"/>
+                        <label for="name">姓名:</label>
+                        <input type="text" class="form-control input-sm" id="searchName" maxlength="16"/>
                     </div>
                     <div class="form-group">
                         <label>所属角色:</label>

power-admin/src/main/webapp/static/js/user.js

@@ -29,6 +29,7 @@ var form = '';
                     searchRoleId:$("#roleId").val(),
                     deptId : $("#dept_id option:selected").val(),
                     effective : $("#effective option:selected").val(),
+                    name : $("#searchName").val()
                 };
                 return temp;
             },
@@ -51,11 +52,11 @@ var form = '';
                 },
                 {
                     title:'账号',
-                    field:'userName',
+                    field:'userName'
                 },
                 {
                     title:'姓名',
-                    field:'name',
+                    field:'name'
                 },
                 {
                     title:'性别',
@@ -70,28 +71,28 @@ var form = '';
                 },
                 {
                     title:'年龄',
-                    field:'userAge',
+                    field:'userAge'
                 },
                 {
                     title:'移动电话',
-                    field:'userTel',
+                    field:'userTel'
                 },
                 {
                     title:'邮箱地址',
-                    field:'userEmail',
+                    field:'userEmail'
                 },
                 {
                     title:'用户职位',
-                    field:'userPosition',
+                    field:'userPosition'
                 },
                 {
                     title:'所属角色',
-                    field:'roleName',
+                    field:'roleName'
                 },
                 {
                     title:'所属部门',
                     field:'powerDepts',
-                    formatter:paramsMatter,
+                    formatter:paramsMatter
                 },
                 {
                     title:'是否有效',
@@ -106,19 +107,19 @@ var form = '';
                 },
                 {
                     title:'创建时间',
-                    field:'createDate',
+                    field:'createDate'
                 },
                 {
                     title:'创建人',
-                    field:'creater',
+                    field:'creater'
                 },
                 {
                     title:'修改时间',
-                    field:'updateDate',
+                    field:'updateDate'
                 },
                 {
                     title:'修改人',
-                    field:'updater',
+                    field:'updater'
                 },
                 {
                     title:'操作',

power-dao/src/main/java/com/manage/entity/SendMessage.java

@@ -0,0 +1,63 @@
+package com.manage.entity;
+
+public class SendMessage {
+    private Integer userId;
+
+    private String title;
+
+    private String content;
+
+    private Integer type;
+
+    private Integer type1;
+
+    private Integer flagId;
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Integer getType1() {
+        return type1;
+    }
+
+    public void setType1(Integer type1) {
+        this.type1 = type1;
+    }
+
+    public Integer getFlagId() {
+        return flagId;
+    }
+
+    public void setFlagId(Integer flagId) {
+        this.flagId = flagId;
+    }
+}

power-dao/src/main/resources/mapper/Power_MenuMapper.xml

@@ -279,7 +279,7 @@
     <if test="sysFlag != '' and sysFlag != null">
       and sys_flag=#{sysFlag}
     </if>
-    order by sys_id,menu_id,sort
+    order by sort
   </select>
   <!--<select id="queryMenuViewByUserId" parameterType="java.lang.Integer"
           resultType="com.manage.entity.Power_Detailed_Menu">

power-dao/src/main/resources/mapper/Power_UserMapper.xml

@@ -316,6 +316,9 @@
         </if>
         )
       </if>
+      <if test="name!=null and name!=''">
+        and power_user.name LIKE '%${name}%'
+      </if>
       <if test="userName!=null and userName!=''">
         and power_user.user_name LIKE '%${userName}%'
       </if>
@@ -374,6 +377,9 @@
         </if>
         )
       </if>
+      <if test="name!=null and name!=''">
+        and power_user.name LIKE '%${name}%'
+      </if>
       <if test="userName!=null and userName!=''">
         and power_user.user_name LIKE '%${userName}%'
       </if>

power-dao/target/classes/mapper/Power_MenuMapper.xml

@@ -279,7 +279,7 @@
     <if test="sysFlag != '' and sysFlag != null">
       and sys_flag=#{sysFlag}
     </if>
-    order by sys_id,menu_id,sort
+    order by sort
   </select>
   <!--<select id="queryMenuViewByUserId" parameterType="java.lang.Integer"
           resultType="com.manage.entity.Power_Detailed_Menu">

power-dao/target/classes/mapper/Power_UserMapper.xml

@@ -316,6 +316,9 @@
         </if>
         )
       </if>
+      <if test="name!=null and name!=''">
+        and power_user.name LIKE '%${name}%'
+      </if>
       <if test="userName!=null and userName!=''">
         and power_user.user_name LIKE '%${userName}%'
       </if>
@@ -374,6 +377,9 @@
         </if>
         )
       </if>
+      <if test="name!=null and name!=''">
+        and power_user.name LIKE '%${name}%'
+      </if>
       <if test="userName!=null and userName!=''">
         and power_user.user_name LIKE '%${userName}%'
       </if>

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

@@ -409,6 +409,7 @@ public class PowerServiceImpl implements PowerService  {
             int id = 1;
             int oneLevelId = 0;
             int twoLevelId = 0;
+            int threeLevelId = 0;
             for(Power_UserAndRoleTree hos : hosList){
                 //第一级医院
                 Power_UserAndRoleTree tree1 = new Power_UserAndRoleTree();
@@ -428,13 +429,13 @@ public class PowerServiceImpl implements PowerService  {
                             twoLevelId = id;
                             tree2.setParentId(oneLevelId);
                             tree2.setSysFlag(powerSys.getSysFlag());
-                            Boolean isParent = false;
+                            boolean isParent = false;
                             //第三级用户
                             if(null != userList && !userList.isEmpty()){
                                 //属于该医院的权限系统下有有该用户
                                 for(Power_UserAndRoleTree powerUser : userList){
                                     if(null != powerUser.getParentId() && powerUser.getParentId().equals(hos.getSelfId())){
-                                        /*Power_UserAndRoleTree tree3 = new Power_UserAndRoleTree();
+                                        Power_UserAndRoleTree tree3 = new Power_UserAndRoleTree();
                                         BeanUtils.copyProperties(powerUser,tree3);
                                         tree3.setId(id);
                                         tree3.setParentId(twoLevelId);
@@ -447,7 +448,7 @@ public class PowerServiceImpl implements PowerService  {
                                         }
                                         tree3.setSysFlag("power");
                                         treeList.add(tree3);
-                                        id++;*/
+                                        id++;
                                         isParent = true;
                                     }
                                 }
@@ -478,6 +479,7 @@ public class PowerServiceImpl implements PowerService  {
                                     Power_UserAndRoleTree tree5 = new Power_UserAndRoleTree();
                                     BeanUtils.copyProperties(sys,tree5);
                                     tree5.setId(id);
+                                    threeLevelId = id;
                                     tree5.setParentId(twoLevelId);
                                     tree5.setSysFlag(sys.getSysFlag());
                                     boolean isParent = false;
@@ -490,7 +492,7 @@ public class PowerServiceImpl implements PowerService  {
                                                 if(!deptId.contains(",")){
                                                     if(deptId.equals(dept.getDeptId())){
                                                         isParent = true;
-                                                        /*Power_UserAndRoleTree tree6 = new Power_UserAndRoleTree();
+                                                        Power_UserAndRoleTree tree6 = new Power_UserAndRoleTree();
                                                         BeanUtils.copyProperties(users,tree6);
                                                         tree6.setId(id);
                                                         tree6.setParentId(threeLevelId);
@@ -503,14 +505,14 @@ public class PowerServiceImpl implements PowerService  {
                                                         }
                                                         tree6.setSysFlag(sys.getSysFlag());
                                                         treeList.add(tree6);
-                                                        id++;*/
+                                                        id++;
                                                     }
                                                 }else{
                                                     //逗号隔开多科室
                                                     String[] deptIds = deptId.split(",");
                                                     for (String deptStr : deptIds) {
                                                         if(StringUtils.isNotBlank(deptStr) && deptStr.equals(dept.getDeptId())){
-                                                            /*Power_UserAndRoleTree tree7 = new Power_UserAndRoleTree();
+                                                            Power_UserAndRoleTree tree7 = new Power_UserAndRoleTree();
                                                             BeanUtils.copyProperties(users,tree7);
                                                             tree7.setId(id);
                                                             tree7.setParentId(threeLevelId);
@@ -523,7 +525,7 @@ public class PowerServiceImpl implements PowerService  {
                                                             }
                                                             tree7.setSysFlag(sys.getSysFlag());
                                                             treeList.add(tree7);
-                                                            id++;*/
+                                                            id++;
                                                             isParent = true;
                                                             continue;
                                                         }