添加热门事项

sample-form-manager/pom.xml

@@ -141,6 +141,31 @@
             </properties>
         </profile>
 
+        <profile>
+            <id>xuanhan</id>
+            <properties>
+                <profiles.active>xuanhan</profiles.active>
+                <profiles.server.port>17002</profiles.server.port>
+                <profiles.nginx.port>11199</profiles.nginx.port>
+                <profiles.server.gatewayport>11078</profiles.server.gatewayport>
+                <profiles.server.path>/sampleform</profiles.server.path>
+                <profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
+                <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
+                <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
+                <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
+                <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
+                <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
+                <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
+                <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
+                <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
+                <profiles.log.level>INFO</profiles.log.level>
+                <profiles.publish.path>D:/home/publish</profiles.publish.path>
+                <package.environment>build</package.environment>
+                <skipUi>false</skipUi>
+
+            </properties>
+        </profile>
+
     </profiles>
 
     <dependencies>

sample-form-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java

@@ -81,7 +81,8 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
                 log.info("站点名称:{}", site.getSiteName());
                 DevicePdu devicePdu = new DevicePdu();
                 //devicePdu.setProductCode("ybj");
-                devicePdu.setProductId(10L);
+                //devicePdu.setProductId(10L);
+                devicePdu.setProductName("样表机");
                 devicePdu.setSiteId(site.getId());
                 devicePdu.setSize(-1);
                 Rest<RespData<List<DevicePdu>>> deviceRest = deviceFeign.list(devicePdu);

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

@@ -270,6 +270,7 @@ 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);
@@ -279,7 +280,7 @@ public class HomeController extends BaseJsonBodyController {
                 model.put("hotMatterList", matterEntities); //热门事项
 
 
-                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<MatterDatumEntity> matterDatumEntities = matterDatumEntityList.stream().flatMap(item -> matterDatumService.find(new MatterDatumQuery().matterId(item.getId())).stream()).filter(f -> f.getIsRecommend() == YesNoEnum.YES.getValue()).limit(5).collect(Collectors.toList());
                 //热门材料取5个
                // List<DeviceMatterDatumEntity> matterDatumEntities = matterDatumEntityList.stream().limit(5).collect(Collectors.toList());
                 model.put("hotDatumList", matterDatumEntities); //热门热门材料

sample-form-manager/src/test/java/com/mortals/httpclient/system.http

@@ -22,6 +22,13 @@ Content-Type: application/json
 
 {}
 
+###首页
+POST {{baseUrl}}/home/info
+Content-Type: application/json
+
+{"deviceCode": "B8-13-32-86-4E-56","siteId": 1}
+
+
 
 ###站点树
 GET {{baseUrl}}/site/siteTree