|
@@ -138,10 +138,14 @@ public class BiInfoController {
|
|
*/
|
|
*/
|
|
@GetMapping("/selectBiInfoNew")
|
|
@GetMapping("/selectBiInfoNew")
|
|
public List<BiViewInfo> selectBiInfoNew(String compId, String seachMoth) {
|
|
public List<BiViewInfo> selectBiInfoNew(String compId, String seachMoth) {
|
|
- List<BiViewInfo> listRedis = cacheComponent.getObjList(Const.ADMIN_BI_INFO, BiViewInfo.class);
|
|
|
|
|
|
+ if(AuthSecurityUtils.getCurrentUserInfo() != null && AuthSecurityUtils.getCurrentUserInfo().getUserId() != null){
|
|
|
|
+ String userId = AuthSecurityUtils.getCurrentUserInfo().getUserId();
|
|
|
|
+ List<BiViewInfo> listRedis = cacheComponent.getObjList(Const.ADMIN_BI_INFO+userId, BiViewInfo.class);
|
|
if (listRedis != null && listRedis.size() > 0) {
|
|
if (listRedis != null && listRedis.size() > 0) {
|
|
return listRedis;
|
|
return listRedis;
|
|
- }
|
|
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
companyId = compId;
|
|
companyId = compId;
|
|
List<BiViewInfo> biViewInfos = new ArrayList<>();
|
|
List<BiViewInfo> biViewInfos = new ArrayList<>();
|
|
// 车辆
|
|
// 车辆
|
|
@@ -187,8 +191,10 @@ public class BiInfoController {
|
|
getBuyInfo(contractManagementInfos, biViewInfos);
|
|
getBuyInfo(contractManagementInfos, biViewInfos);
|
|
// 收入支出毛利润
|
|
// 收入支出毛利润
|
|
getMoney(biViewInfos, seachMoth);
|
|
getMoney(biViewInfos, seachMoth);
|
|
-
|
|
|
|
- cacheComponent.putRaw(Const.ADMIN_BI_INFO, JSONObject.toJSONString(biViewInfos), 60 * 20);
|
|
|
|
|
|
+ if(AuthSecurityUtils.getCurrentUserInfo() != null && AuthSecurityUtils.getCurrentUserInfo().getUserId() != null){
|
|
|
|
+ String userId = AuthSecurityUtils.getCurrentUserInfo().getUserId();
|
|
|
|
+ cacheComponent.putRaw(Const.ADMIN_BI_INFO+userId, JSONObject.toJSONString(biViewInfos), 60 * 20);
|
|
|
|
+ }
|
|
return biViewInfos;
|
|
return biViewInfos;
|
|
}
|
|
}
|
|
|
|
|