Tenlion/btxtgxq-system-city
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

大数据页面接口

Browse Source
This commit is contained in:
wans 2021-08-07 10:26:15 +08:00
parent 885900fc09
commit 1089110ad3
3 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/cm/systemcity/controller/datarelease/DataReleaseController.java
View File

@ -166,7 +166,7 @@ public class DataReleaseController extends AbstractController {
} }
BigDataResult bdr = new BigDataResult(); BigDataResult bdr = new BigDataResult();
Map<String, Object> resData = new HashMap<>(4); Map<String, Object> resData = new HashMap<>(4);
resData.put("caseTypeCount","案件数量"); resData.put("nameColumns","案件数量");
bdr.setData(resData); bdr.setData(resData);
bdr.setList(resList); bdr.setList(resList);
return bdr; return bdr;

22
src/main/java/com/cm/systemcity/service/usersignin/impl/UserSigninServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.cm.systemcity.service.usersignin.impl;
import com.alibaba.excel.EasyExcel; import com.alibaba.excel.EasyExcel;
import com.cm.common.component.SecurityComponent; import com.cm.common.component.SecurityComponent;
import com.cm.common.constants.ISystemConstant;
import com.cm.common.exception.RemoveException; import com.cm.common.exception.RemoveException;
import com.cm.common.exception.SaveException; import com.cm.common.exception.SaveException;
import com.cm.common.exception.SearchException; import com.cm.common.exception.SearchException;
@ -26,6 +27,7 @@ import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormat;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -165,14 +167,20 @@ public class UserSigninServiceImpl extends BaseService implements IUserSigninSer
@Override @Override
public SuccessResultData<UserSigninStatusDTO> getCheckUserSignin(String token, Map<String, Object> params) throws SearchException { public SuccessResultData<UserSigninStatusDTO> getCheckUserSignin(String token, Map<String, Object> params) throws SearchException {
AppTokenUser appTokenUser = AppTokenManager.getInstance().getToken(token).getAppTokenUser();
UserSigninDTO userSigninDTO = checkUserSignIn(appTokenUser.getId(), hasNRole(appTokenUser.getRoles()) ? null : DateUtil.getAmPm());
UserSigninStatusDTO userSigninStatusDTO = new UserSigninStatusDTO(); UserSigninStatusDTO userSigninStatusDTO = new UserSigninStatusDTO();
if (userSigninDTO == null) { try{
userSigninStatusDTO.setSignIn(Boolean.FALSE); AppTokenUser appTokenUser = AppTokenManager.getInstance().getToken(token).getAppTokenUser();
} else { UserSigninDTO userSigninDTO = checkUserSignIn(appTokenUser.getId(), hasNRole(appTokenUser.getRoles()) ? null : DateUtil.getAmPm());
userSigninStatusDTO.setSignIn(Boolean.TRUE); userSigninStatusDTO = new UserSigninStatusDTO();
userSigninStatusDTO.setLate(StringUtils.equals("0", userSigninDTO.getIsLate()) ? Boolean.FALSE : Boolean.TRUE); if (userSigninDTO == null) {
userSigninStatusDTO.setSignIn(Boolean.FALSE);
} else {
userSigninStatusDTO.setSignIn(Boolean.TRUE);
userSigninStatusDTO.setLate(StringUtils.equals("0", userSigninDTO.getIsLate()) ? Boolean.FALSE : Boolean.TRUE);
}
} catch (NullPointerException e){
LOG.error(token);
return new SuccessResultData<>(userSigninStatusDTO);
} }
return new SuccessResultData<>(userSigninStatusDTO); return new SuccessResultData<>(userSigninStatusDTO);
} }

12
src/main/java/com/cm/systemcity/service/usersignout/impl/UserSignoutServiceImpl.java
View File

@ -157,9 +157,15 @@ public class UserSignoutServiceImpl extends BaseService implements IUserSignoutS
@Override @Override
public SuccessResultData<String> getCheckUserSignout(String token, Map<String, Object> params) throws SearchException { public SuccessResultData<String> getCheckUserSignout(String token, Map<String, Object> params) throws SearchException {
AppTokenUser appTokenUser = AppTokenManager.getInstance().getToken(token).getAppTokenUser(); try{
UserSignoutDTO userSignoutDTO = checkUserSignOut(appTokenUser.getId(), hasNRole(appTokenUser.getRoles()) ? null : DateUtil.getAmPm()); AppTokenUser appTokenUser = AppTokenManager.getInstance().getToken(token).getAppTokenUser();
if (userSignoutDTO == null) { UserSignoutDTO userSignoutDTO = checkUserSignOut(appTokenUser.getId(), hasNRole(appTokenUser.getRoles()) ? null : DateUtil.getAmPm());
if (userSignoutDTO == null) {
return new SuccessResultData<>(ISystemConstant.IS_FALSE);
}
} catch (NullPointerException e){
LOG.error(token);
return new SuccessResultData<>(ISystemConstant.IS_FALSE); return new SuccessResultData<>(ISystemConstant.IS_FALSE);
} }
return new SuccessResultData<>(ISystemConstant.IS_TRUE); return new SuccessResultData<>(ISystemConstant.IS_TRUE);