添加h5

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/DingTalkLoginController.java

@@ -20,6 +20,7 @@ import com.mortals.xhx.base.system.menu.model.MenuEntity;
 import com.mortals.xhx.base.system.menu.service.MenuService;
 import com.mortals.xhx.base.system.resource.service.ResourceService;
 import com.mortals.xhx.base.system.user.model.UserEntity;
+import com.mortals.xhx.base.system.user.model.UserQuery;
 import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.base.system.valid.service.ValidCodeService;
 import com.mortals.xhx.busiz.h5.req.DingTalkReq;
@@ -97,40 +98,38 @@ public class DingTalkLoginController extends BaseCRUDJsonBodyMappingController<U
             if (personRest.getCode() == YesNoEnum.NO.getValue()) {
                 throw new AppException(String.format("获取钉钉用户异常,{}", personRest.getMsg()));
             }
-            //根据钉钉的用户查询系统绑定的用户
+            //根据钉钉的用户查询系统绑定的用户,获取
+            UserQuery userQuery = new UserQuery();
+            userQuery.setDingUserId(personRest.getData());
+            userEntity = userService.selectOne(userQuery);
+            if (ObjectUtils.isEmpty(userEntity)) throw new AppException("不存在当前匹配的钉钉关联用户！");
 
 
-            recordSysLog(request, userEntity, "用户登录系统成功!");
-            // 返回拥有的菜单数据
-            Set<String> urls = resourceService.findUrlSetByUserId(userEntity.getId());
-            List<MenuEntity> outlookBarList = menuService.findTreeMenu(userEntity, urls);
             String currUserName = userEntity.getRealName();
             if (currUserName == null || currUserName.trim().length() == 0) {
                 currUserName = "管理员";
             }
             JSONObject data = new JSONObject();
             data.put("currUserName", currUserName);
-            data.put("barList", outlookBarList);
             data.put("id", userEntity.getId());
             data.put("userType", userEntity.getUserType());
             userEntity.setLoginTime(System.currentTimeMillis());
             userEntity.setToken(IdUtil.fastSimpleUUID());
             userEntity.setExpireTime(DateUtils.addCurrDate(7).getTime());
-           // userEntity.setMenuUrl(generateMenuUrlCode(urls));
-
             String token = authTokenService.createToken(userEntity);
             data.put("token", token);
-            //设置token 和过期时间
-            //data.put("expiresTime", DateUtils.addCurrDate(7).getTime());
-
-            //this.generateBlackCookie(request, response, loginName, urls);
             ret.put(KEY_RESULT_DATA, data);
             ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
             ret.put(KEY_RESULT_MSG, "用户登录系统成功!");
-            ret.put("resources", urls);
+            recordSysLog(request, userEntity, "钉钉用户登录系统成功!");
             return ret.toJSONString();
-        } catch (Exception e) {
+        } catch (AppException e) {
             log.error("dinding login error ", e);
+            ret.put(KEY_RESULT_CODE, e.getCode());
+            ret.put(KEY_RESULT_MSG, super.convertException(e));
+            return ret.toJSONString();
+        } catch (Exception e) {
+            log.error("系统异常 error ", e);
             ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
             ret.put(KEY_RESULT_MSG, super.convertException(e));
             return ret.toJSONString();

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/FeedbackApiController.java

@@ -86,7 +86,6 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
                 feedbackQuery.setIdList(feedbackIdList);
 
                 Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null);
-
                 model.put(PAGEINFO_KEY, result.getPageInfo());
                 model.put(KEY_RESULT_DATA, result.getList());
                 parsePageInfo(model, result.getPageInfo());

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/PerformApiController.java

@@ -133,19 +133,15 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                 query.setCheckTimeEnd(performReq.getPerformEndDate());
                 query.setStaffId(context.getUser().getCustomerId());
 
-                List<CheckAllRecordVo> allCheckRecord = checkAllRecordService.getAllCheckRecord(query);
-                List<PerformInfo> collect = allCheckRecord.stream().map(item -> {
+                Result<CheckAllRecordVo> result = checkAllRecordService.getAllCheckRecord(query, pageInfo);
+                List<CheckAllRecordVo> allCheckRecord = result.getList();List<PerformInfo> collect = allCheckRecord.stream().map(item -> {
                     PerformInfo performInfo = new PerformInfo();
                     BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
                     return performInfo;
                 }).collect(Collectors.toList());
                 model.put(KEY_RESULT_DATA, collect);
-                PageInfo pageAllInfo = new PageInfo();
-                pageAllInfo.setTotalResult(collect.size());
-                pageAllInfo.setCurrPage(1);
-                pageAllInfo.setPrePageResult(-1);
-                model.put(PAGEINFO_KEY, pageAllInfo);
-                parsePageInfo(model, pageAllInfo);
+                model.put(PAGEINFO_KEY, result.getPageInfo());
+                parsePageInfo(model, result.getPageInfo());
 
             } else if (PerformTypeEnum.考勤绩效.getValue().equals(performReq.getPerformType())) {
                 CheckAttendRecordQuery query = new CheckAttendRecordQuery();