修改认证获取redis方式

fill-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java

@@ -30,6 +30,7 @@ import com.mortals.xhx.feign.site.ISiteFeign;
 import com.mortals.xhx.module.baseset.model.BasesetEntity;
 import com.mortals.xhx.module.baseset.model.BasesetQuery;
 import com.mortals.xhx.module.baseset.service.BasesetService;
+import com.mortals.xhx.module.device.model.DeviceMatterDatumEntity;
 import com.mortals.xhx.module.device.model.DeviceMatterDatumQuery;
 import com.mortals.xhx.module.device.service.DeviceMatterDatumService;
 import com.mortals.xhx.module.home.pdu.HomeQueryPdu;
@@ -348,6 +349,24 @@ public class HomeController extends BaseJsonBodyController {
             model.put("blankCount", basesetEntity == null ? 20 : basesetEntity.getPrintDisplay()); //空白样表数量
             model.put("newsSource", basesetEntity == null ? 1 : basesetEntity.getNewsSource()); //新闻来源
             model.put("message_info", busiDesc + "成功");
+
+            //添加设备热门事项与热门材料
+            if(!ObjectUtils.isEmpty(homeQueryPdu.getDeviceCode())){
+                DeviceMatterDatumQuery deviceMatterDatumQuery = new DeviceMatterDatumQuery();
+                deviceMatterDatumQuery.setDeviceCode(homeQueryPdu.getDeviceCode());
+                deviceMatterDatumQuery.setOrderColList(Arrays.asList(new OrderCol("isRecommend",OrderCol.DESCENDING)));
+
+                List<DeviceMatterDatumEntity> matterDatumEntityList = deviceMatterDatumService.find(deviceMatterDatumQuery, null);
+
+                //热门事项取5个
+                List<DeviceMatterDatumEntity> matterEntities = matterDatumEntityList.stream().distinct().limit(5).collect(Collectors.toList());
+                model.put("hotMatterList", matterEntities); //热门事项
+
+                //热门材料取5个
+                List<DeviceMatterDatumEntity> matterDatumEntities = matterDatumEntityList.stream().limit(5).collect(Collectors.toList());
+                model.put("hotDatumList", matterDatumEntities); //热门热门材料
+            }
+
             this.addDict(model, "newsSource", NewsSourceEnum.getEnumMap());
             this.recordSysLog(this.request, busiDesc + " 【成功】");
         } catch (Exception var9) {