修改认证获取redis方式

fill-manager/src/main/bin/start.cmd

@@ -18,7 +18,7 @@ set HEAP_DUMP_PATH=%LOG_PATH%/heap_dump.hprof
 set TEMP_PATH=%LOG_PATH%/temp/
 if not exist "%TEMP_PATH%"  md "%TEMP_PATH%"
 rem jvm启动参数
-set JAVA_OPTS=-Xms512M -Xmx512M -Xss256K -XX:+UseAdaptiveSizePolicy -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:GCTimeRatio=39 -XX:+PrintGCDetails -XX:+PrintGCDateStamps  -XX:+HeapDumpOnOutOfMemoryError
+set JAVA_OPTS=-Xms512M -Xmx1024M -Xss256K -XX:+UseAdaptiveSizePolicy -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:GCTimeRatio=39 -XX:+PrintGCDetails -XX:+PrintGCDateStamps  -XX:+HeapDumpOnOutOfMemoryError
 set JAVA_OPTS=%JAVA_OPTS% -XX:+PrintGCDateStamps -Xloggc:%GC_PATH%
 set JAVA_OPTS=%JAVA_OPTS% -XX:ErrorFile=%HS_ERR_PATH%
 set JAVA_OPTS=%JAVA_OPTS% -XX:HeapDumpPath=%HEAP_DUMP_PATH%
@@ -28,7 +28,8 @@ set JVM_CONFIG=%JVM_CONFIG% -Dapp.name=%PROJECT_NAME%
 set JVM_CONFIG=%JVM_CONFIG% -Dapp.port=%PORT%
 set JVM_CONFIG=%JVM_CONFIG% -Djava.io.tmpdir=%TEMP_PATH%
 set JVM_CONFIG=%JVM_CONFIG% -Dbasedir=%BASEDIR%
-set JVM_CONFIG=%JVM_CONFIG% -Dloader.path=file://%BASEDIR%/conf,file://%BASEDIR%/lib
+set JVM_CONFIG=%JVM_CONFIG% -Dfile.encoding=utf-8
+
 
 
 set DEBUG_OPTS=

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

@@ -354,16 +354,15 @@ public class HomeController extends BaseJsonBodyController {
             if(!ObjectUtils.isEmpty(homeQueryPdu.getDeviceCode())){
                 DeviceMatterDatumQuery deviceMatterDatumQuery = new DeviceMatterDatumQuery();
                 deviceMatterDatumQuery.setDeviceCode(homeQueryPdu.getDeviceCode());
+                deviceMatterDatumQuery.setIsRecommend(YesNoEnum.YES.getValue());
                 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); //热门事项
-
+                List<MatterDatumEntity> matterDatumEntities = matterDatumEntityList.stream().flatMap(item -> matterDatumService.find(new MatterDatumQuery().matterId(item.getMatterId())).stream()).filter(f -> f.getIsRecommend() == YesNoEnum.YES.getValue()).limit(5).collect(Collectors.toList());
                 //热门材料取5个
-                List<MatterDatumEntity> matterDatumEntities = matterDatumEntityList.stream().flatMap(item -> matterDatumService.find(new MatterDatumQuery().matterId(item.getId())).stream()).filter(f -> f.getIsRecommend() == 1).limit(5).collect(Collectors.toList());
+                // List<DeviceMatterDatumEntity> matterDatumEntities = matterDatumEntityList.stream().limit(5).collect(Collectors.toList());
                 model.put("hotDatumList", matterDatumEntities); //热门热门材料
             }