Merge branch 'master' of http://gitlab.scsmile.cn/zxf/sample-form-platform

sample-form-manager/pom.xml

@@ -116,6 +116,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>D:/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/bin/start.cmd

 echo off
 
+timeout /t 10 /nobreak >nul
+
 if not exist "%JAVA_HOME%\bin\java.exe" echo Please set the JAVA_HOME variable in your environment, We need java(x64)! jdk8 or later is better! & EXIT /B 1
 set "JAVA=%JAVA_HOME%\bin\java.exe"
 
 set BASEDIR=%~dp0
 set BASEDIR="%BASEDIR:~0,-5%"
 
-set PROJECT_NAME=@project.artifactId@
+set PROJECT_NAME=base-manager
 
-set APP_NAME=%PROJECT_NAME%-@project.version@.jar
+set APP_NAME=%PROJECT_NAME%-1.0.0-SNAPSHOT.jar
 
-set LOG_PATH="%BASEDIR%@profiles.log.path@/%PROJECT_NAME%"
+set LOG_PATH="%BASEDIR%/home/mortals/app/logs/%PROJECT_NAME%"
 if not exist "%LOG_PATH%"  md "%LOG_PATH%"
 set GC_PATH=%LOG_PATH%/gc.log
 set HS_ERR_PATH=%LOG_PATH%PORT%-hs_err.log

sample-form-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceMatterDatumEntity.java

@@ -278,14 +278,14 @@ public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
 
     @Override
     public int hashCode() {
-        return this.getId().hashCode();
+        return this.getMatterId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
         if (obj == null) return false;
         if (obj instanceof DeviceMatterDatumEntity) {
             DeviceMatterDatumEntity tmp = (DeviceMatterDatumEntity) obj;
-            if (this.getId() == tmp.getId()) {
+            if (this.getMatterId() == tmp.getMatterId()) {
                 return true;
             }
         }

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

@@ -27,6 +27,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;
@@ -74,6 +75,7 @@ public class HomeController extends BaseJsonBodyController {
     @Autowired
     private ICacheService cacheService;
 
+
     @PostMapping({"site/list"})
     public Rest<Object> list() {
         IUser user = this.getCurUser();
@@ -262,6 +264,25 @@ public class HomeController extends BaseJsonBodyController {
 
             model.put("blankCount", basesetEntity == null ? 20 : basesetEntity.getPrintDisplay()); //空白样表数量
             model.put("newsSource", basesetEntity == null ? 1 : basesetEntity.getNewsSource()); //新闻来源
+
+
+         //添加设备热门事项与热门材料
+            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); //热门热门材料
+            }
+
             model.put("message_info", busiDesc + "成功");
             // this.addDict(model, "newsSource", NewsSourceEnum.getEnumMap());
             this.recordSysLog(this.request, busiDesc + " 【成功】");