Merge branch 'V0.0.1' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.1

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -340,8 +340,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
     @Override
     public void updateTaskStart() {
         LocalDate dateTime =  LocalDate.now();
-        Date dateTimeNew = Date.from(dateTime.atStartOfDay(ZoneId.systemDefault()).toInstant());
-        DateUtil.endOfDay(dateTimeNew).setField(DateField.MILLISECOND, 0);
+        Date dateTimeNew = DateUtil.endOfDay(Date.from(dateTime.atStartOfDay(ZoneId.systemDefault()).toInstant())).setField(DateField.MILLISECOND, 0);
         coreMonitoringRetrievalTaskMapper.updateTaskStart(dateTimeNew);
     }
 

soc-modules/soc-modules-job/src/main/java/com/xunmei/job/task/RetrievalTask.java

@@ -26,6 +26,7 @@ public class RetrievalTask {
 
     /**
      * 每天生成日任务 如果当天是周一还需生成周任务
+     * 指定日子在前端调用
      */
     public void retrieveDayTaskByDate(String taskTime)
     {   String id = UUID.fastUUID().toString();
@@ -39,7 +40,7 @@ public class RetrievalTask {
      * 4.1||10.1日生成周期为每月，每季
      * 7.1日获取执行周期为每月，每季,每半年的
      * 其他日期生成月任务
-     *
+     * 指定日子在前端调用
      */
     public void retrieveMonthTaskByDate(String taskTime)
     {   String id = UUID.fastUUID().toString();
@@ -49,6 +50,9 @@ public class RetrievalTask {
         log.info("监控调阅每月季度半年年任务生成定时任务执行结束，当前任务 id:{},当前时间:{},结果:{}", id, new Date(), JSON.toJSONString(result));
     }
 
+    /**
+     * 每天凌晨3点执行定时任务
+     */
     public void retrieveDayTask()
     {   String id = UUID.fastUUID().toString();
         log.info("开始执行监控调阅每日每周任务生成定时任务，当前任务 id:{},当前时间:{},无参数", id, new Date());
@@ -60,7 +64,7 @@ public class RetrievalTask {
      * 4.1||10.1日生成周期为每月，每季
      * 7.1日获取执行周期为每月，每季,每半年的
      * 其他日期生成月任务
-     *
+     * 每月凌晨3.20执行定时任务
      */
     public void retrieveMonthTask()
     {   String id = UUID.fastUUID().toString();
@@ -68,6 +72,10 @@ public class RetrievalTask {
         AjaxResult result =  remoteRetrievalTaskService.monthTask(SecurityConstants.INNER);
         log.info("监控调阅每月季度半年年任务生成定时任务执行结束，当前任务 id:{},当前时间:{},结果:{}", id, new Date(), JSON.toJSONString(result));
     }
+
+    /**
+     * 每天晚上23:59:00执行任务
+     */
     public void updateTaskStart()
     {   String id = UUID.fastUUID().toString();
         log.info("开始执行监控调阅任务超期定时任务，当前任务 id:{},当前时间:{},无参数", id, new Date());

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -19,6 +19,7 @@ import com.xunmei.system.api.domain.SysUserInformation;
 import com.xunmei.system.api.model.LoginUser;
 import com.xunmei.system.domain.SysUserRole;
 import com.xunmei.system.domain.vo.SysUserListVo;
+import com.xunmei.system.domain.vo.UserRoleVo;
 import com.xunmei.system.service.*;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.ArrayUtils;
@@ -26,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
@@ -138,9 +140,12 @@ public class SysUserController extends BaseController {
         Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(user);
+        List<UserRoleVo> userRoleVos = sysUserRoleService.selectUserRoleVoList(user.getId());
         AjaxResult ajax = AjaxResult.success();
         ajax.put("user", user);
         ajax.put("roles", roles);
+        //用户角色信息
+        ajax.put("roleList", userRoleVos);
         ajax.put("permissions", permissions);
         return ajax;
     }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/vo/UserRoleVo.java

@@ -0,0 +1,11 @@
+package com.xunmei.system.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class UserRoleVo {
+
+    private Long userId;
+    private Long roleId;
+    private String roleName;
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysUserRoleMapper.java

@@ -1,8 +1,8 @@
 package com.xunmei.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xunmei.system.domain.SysUserPost;
 import com.xunmei.system.domain.SysUserRole;
+import com.xunmei.system.domain.vo.UserRoleVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -53,14 +53,16 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole>
      * @param userRole 用户和角色关联信息
      * @return 结果
      */
-     int deleteUserRoleInfo(SysUserRole userRole);
+    int deleteUserRoleInfo(SysUserRole userRole);
 
     /**
      * 批量取消授权用户角色
-     * 
-     * @param roleId 角色ID
+     *
+     * @param roleId  角色ID
      * @param userIds 需要删除的用户数据ID
      * @return 结果
      */
-     int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds);
+    int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds);
+
+    List<UserRoleVo> selectUserRoleVoList(@Param("userId") Long userId);
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysUserRoleService.java

@@ -1,11 +1,11 @@
 package com.xunmei.system.service;
 
-import java.util.List;
-
-import com.xunmei.system.domain.SysUserRole;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.system.domain.SysUserRole;
+import com.xunmei.system.domain.vo.UserRoleVo;
+
+import java.util.List;
 
 /**
  * 用户和角色关联Service接口
@@ -75,4 +75,6 @@ public interface ISysUserRoleService extends IService<SysUserRole> {
      * @return Page
      */
     TableDataInfo<SysUserRole> selectPage(SysUserRole sysUserRole);
+
+    List<UserRoleVo> selectUserRoleVoList(Long userId);
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysUserRoleServiceImpl.java

@@ -1,15 +1,17 @@
 package com.xunmei.system.service.impl;
 
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.web.page.TableDataInfo;
-import com.xunmei.system.mapper.SysUserRoleMapper;
 import com.xunmei.system.domain.SysUserRole;
+import com.xunmei.system.domain.vo.UserRoleVo;
+import com.xunmei.system.mapper.SysUserRoleMapper;
 import com.xunmei.system.service.ISysUserRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 用户和角色关联Service业务层处理
@@ -25,9 +27,9 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
     @Override
     public TableDataInfo<SysUserRole> selectPage(SysUserRole sysUserRole) {
         Page<SysUserRole> page;
-        if (sysUserRole.getPageNum() != null &&sysUserRole.getPageSize() != null){
+        if (sysUserRole.getPageNum() != null && sysUserRole.getPageSize() != null) {
             page = new Page<>(sysUserRole.getPageNum(), sysUserRole.getPageSize());
-        }else{
+        } else {
             page = new Page<>();
         }
         QueryWrapper<SysUserRole> where = new QueryWrapper<>(sysUserRole);
@@ -36,6 +38,11 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
 
     }
 
+    @Override
+    public List<UserRoleVo> selectUserRoleVoList(Long userId) {
+
+        return sysUserRoleMapper.selectUserRoleVoList(userId);
+    }
 
     /**
      * 查询用户和角色关联
@@ -73,7 +80,7 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
      */
     @Override
     public int insertSysUserRole(SysUserRole sysUserRole) {
-            return sysUserRoleMapper.insert(sysUserRole);
+        return sysUserRoleMapper.insert(sysUserRole);
     }
 
     /**

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysUserRoleMapper.xml

@@ -31,15 +31,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			(#{item.userId},#{item.roleId},#{item.createBy},#{item.createTime})
 		</foreach>
 	</insert>
-	
+
 	<delete id="deleteUserRoleInfo" parameterType="com.xunmei.system.domain.SysUserRole">
-		delete from sys_user_role where user_id=#{userId} and role_id=#{roleId}
+		delete
+		from sys_user_role
+		where user_id = #{userId}
+		  and role_id = #{roleId}
 	</delete>
-	
+
 	<delete id="deleteUserRoleInfos">
-	    delete from sys_user_role where role_id=#{roleId} and user_id in
- 	    <foreach collection="userIds" item="userId" open="(" separator="," close=")">
- 	        #{userId}
-            </foreach> 
+		delete from sys_user_role where role_id=#{roleId} and user_id in
+		<foreach collection="userIds" item="userId" open="(" separator="," close=")">
+			#{userId}
+		</foreach>
 	</delete>
+
+	<select id="selectUserRoleVoList" resultType="com.xunmei.system.domain.vo.UserRoleVo">
+		select ur.user_id as userId, r.id as roleId, r.role_name as roleName
+		from sys_user_role ur
+				 inner join sys_role r on ur.role_id = r.id
+		where ur.user_id = #{userId}
+		  and r.del_flag = 0
+	</select>
 </mapper>