Merge branch 'master' of http://116.63.33.55/git/read_opc

chuanyi-admin/src/utils/request.js

@@ -116,7 +116,7 @@ service.interceptors.response.use(
             isRelogin.show = false
             logout().then((res) => {
               removeAll()
-              location.href = '/index'
+              location.href = '/'
             })
           })
           .catch(() => {

chuanyi-admin/src/views/login/index.vue

@@ -209,6 +209,7 @@ export default {
             })
             .catch(() => {
               this.loading = false
+              this.loginForm.code = ''
               if (this.captchaEnabled) {
                 this.getCode()
               }

chuanyi_server/src/main/java/com/judong/chuanyiserver/controller/UserGroupController.java

@@ -107,6 +107,21 @@ public class UserGroupController {
     }
 
     /**
+     * 通过用户组id获取所有的用户信息
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/getUserByGroupId/{id}")
+    @WebLog(ServerEnum = ServerEnum.CLIENT, ModelEnum = ModelEnum.USERGROUP, OperationEnum = OperationEnum.SELECT)
+    public Result getUserByGroupId(@PathVariable Integer id) {
+        if (Blank.isEmpty(id)) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
+        }
+        return userGroupService.getUserByGroupId(id);
+    }
+
+    /**
      * 通过id删除用户组
      *
      * @param id

chuanyi_server/src/main/java/com/judong/chuanyiserver/dao/UserGroupDao.java

@@ -1,5 +1,6 @@
 package com.judong.chuanyiserver.dao;
 
+import com.judong.chuanyiserver.entity.User;
 import com.judong.chuanyiserver.entity.UserGroup;
 import com.judong.chuanyiserver.entity.UserGroupUser;
 import org.springframework.stereotype.Repository;
@@ -13,7 +14,7 @@ public interface UserGroupDao {
 
     UserGroup getUserGroupById(Integer id);
 
-    List<UserGroupUser> getUserGroupUserById(Integer userGroupId);
+    List<String> getUserGroupUserById(Integer userGroupId);
 
     Integer delUserGroupUserListById(Integer userGroupId);
 
@@ -21,11 +22,13 @@ public interface UserGroupDao {
 
     Integer addUserGroup(UserGroup userGroup);
 
-    Integer addUserGroupUserList(Integer userGroupId, List<UserGroupUser> userGroupUserList);
+    Integer addUserGroupUserList(Integer userGroupId, List<String> userIdList);
 
     UserGroup getUserGroupByNameNoId(Integer id, String userId, String userGroupName);
 
     Integer updateUserGroup(UserGroup userGroup);
 
     List<UserGroupUser> getUserGroupUserList(String userId);
+
+    List<User> getUserByGroupId(Integer userGroupId,Integer normalUse);
 }

chuanyi_server/src/main/java/com/judong/chuanyiserver/entity/UserGroup.java

@@ -39,6 +39,6 @@ public class UserGroup implements Serializable {
      */
     private Date createTime;
 
-    private List<UserGroupUser> userGroupUserList;
+    private List<String> userIdList;
 
 }

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/UserGroupService.java

@@ -18,4 +18,6 @@ public interface UserGroupService {
     Result getClientUserByDepartmentId(Integer departmentId);
 
     Result getDepartmentTree();
+
+    Result getUserByGroupId(Integer id);
 }

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/impl/UserGroupServiceImpl.java

@@ -40,8 +40,8 @@ public class UserGroupServiceImpl implements UserGroupService {
         if (userGroupDao.addUserGroup(userGroup) <= 0) {
             return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "新增用户组失败");
         }
-        if (Blank.isNotEmpty(userGroup.getUserGroupUserList())) {
-            userGroupDao.addUserGroupUserList(userGroup.getId(), userGroup.getUserGroupUserList());
+        if (Blank.isNotEmpty(userGroup.getUserIdList())) {
+            userGroupDao.addUserGroupUserList(userGroup.getId(), userGroup.getUserIdList());
         }
         return Result.ok("新增用户组成功");
     }
@@ -58,8 +58,8 @@ public class UserGroupServiceImpl implements UserGroupService {
             return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "修改用户组失败");
         }
         userGroupDao.delUserGroupUserListById(userGroup.getId());
-        if (Blank.isNotEmpty(userGroup.getUserGroupUserList())) {
-            userGroupDao.addUserGroupUserList(userGroup.getId(), userGroup.getUserGroupUserList());
+        if (Blank.isNotEmpty(userGroup.getUserIdList())) {
+            userGroupDao.addUserGroupUserList(userGroup.getId(), userGroup.getUserIdList());
         }
         return Result.ok("修改用户组成功");
     }
@@ -67,8 +67,8 @@ public class UserGroupServiceImpl implements UserGroupService {
     @Override
     public Result getUserGroupById(Integer id) {
         UserGroup userGroup = userGroupDao.getUserGroupById(id);
-        List<UserGroupUser> userGroupUserList = userGroupDao.getUserGroupUserById(id);
-        userGroup.setUserGroupUserList(userGroupUserList);
+        List<String> userIdList = userGroupDao.getUserGroupUserById(id);
+        userGroup.setUserIdList(userIdList);
         return Result.ok(userGroup);
     }
 
@@ -96,6 +96,11 @@ public class UserGroupServiceImpl implements UserGroupService {
     }
 
     @Override
+    public Result getUserByGroupId(Integer id) {
+        return Result.ok(userGroupDao.getUserByGroupId(id, ConstantStr.NORMAL_USE));
+    }
+
+    @Override
     public Result getAllUserGroup() {
         String userId = userUtil.getCurrentUserId();
         return Result.ok(userGroupDao.getAllUserGroup(userId));

chuanyi_server/src/main/java/com/judong/chuanyiserver/util/ConstantStr.java

@@ -90,4 +90,8 @@ public class ConstantStr {
     public static final Integer MANUAL_REPORT = 0;
     public static final Integer AUTOMATIC_REPORT = 1;
 
+    //消息通知状态，0未读，1已读
+    public static final Integer NO_READ = 0;
+    public static final Integer ALREADY_READ = 1;
+
 }

chuanyi_server/src/main/resources/mapper/UserGroupDao.xml

@@ -12,15 +12,16 @@
         , user_group_id, user_id
     </sql>
 
-    <insert id="addUserGroup">
+    <insert id="addUserGroup" parameterType="com.judong.chuanyiserver.entity.UserGroup" useGeneratedKeys="true"
+            keyProperty="id">
         insert into t_user_group(user_group_name, user_id, sort_num, user_group_describe, create_time)
             value (#{userGroupName}, #{userId}, #{sortNum}, #{userGroupDescribe}, now())
     </insert>
 
     <insert id="addUserGroupUserList">
         insert into t_user_group_user (user_group_id, user_id) VALUES
-        <foreach collection="userGroupUserList" item="userGroupUser" index="index" separator=",">
-            (#{userGroupId},#{userGroupUser.userId})
+        <foreach collection="userIdList" item="userId" index="index" separator=",">
+            (#{userGroupId},#{userId})
         </foreach>
     </insert>
 
@@ -46,19 +47,12 @@
         where id=#{id}
     </select>
 
-    <select id="getUserGroupUserById" resultType="com.judong.chuanyiserver.entity.UserGroupUser">
-        select
-        <include refid="userGroupUser"/>
-        from t_user_group_user
-        where user_group_id = #{userGroupId}
-    </select>
-
     <select id="getUserGroupByNameNoId" resultType="com.judong.chuanyiserver.entity.UserGroup">
         select
         <include refid="userGroup"/>
         from t_user_group
         where user_id=#{userId}
-        and user_group_name=#{user_group_name}
+        and user_group_name=#{userGroupName}
         and user_id!=#{userId}
     </select>
 
@@ -68,6 +62,26 @@
         from t_user_group_user
         where user_id=#{userId}
     </select>
+    <select id="getUserGroupUserById" resultType="java.lang.String">
+        select user_id
+        from t_user_group_user
+        where user_group_id = #{userGroupId}
+    </select>
+
+    <select id="getUserByGroupId" resultType="com.judong.chuanyiserver.entity.User">
+        select user_id,
+               user_name,
+               PASSWORD,
+               user_type,
+               create_time,
+               last_login_time,
+               state
+        from sys_user
+        where state = #{normalUse}
+          and user_id in (select user_id
+                          from t_user_group_user
+                          where user_group_id = #{userGroupId})
+    </select>
 
     <delete id="delUserGroupUserListById">
         delete