修改首页风险态势数据推送

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/View3dController.java

@@ -73,7 +73,9 @@ public class View3dController extends BaseController {
 	@PostMapping(value="region/bind")
 	public CommonResponse batchSaveRegionUe4(@ApiParam(name = "区域参数列表",required = true) @RequestBody List<BindRegionBo> regionBoList) {
 		try {		
-			riskSourceService.batchSaveRegionUe4(regionBoList);
+			ReginParams reginParams =getSelectedOrgInfo();
+			String orgCode = this.getOrgCode(reginParams);
+			riskSourceService.batchSaveRegionUe4(regionBoList,orgCode);
 		} catch (Exception e) {
 			return CommonResponseUtil.failure(e.getMessage());
 		}

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java

@@ -1694,7 +1694,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         }
         try {
             String topic = String.format("/%s/%s/%s", serviceName, stationName,"data/refresh/situationMap");
-            webMqttComponent.publish(topic, JSON.toJSONString(queryRiskAreaRpn()));
+            webMqttComponent.publish(topic, JSON.toJSONString(queryRiskSourceSecondLevel(orgCode)));
             topic = String.format("/%s/%s/%s", serviceName, stationName,"data/refresh/riskDegreeHistogram");
             webMqttComponent.publish(topic, JSON.toJSONString(queryRPNReport()));
             topic = String.format("/%s/%s/%s", serviceName, stationName,"data/refresh/riskDegreePie");
@@ -1752,7 +1752,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
 
         try{
             String topic = String.format("/%s/%s/%s", serviceName, stationName,"data/refresh/situationMap");
-            webMqttComponent.publish(topic, JSON.toJSONString(queryRiskAreaRpn()));
+            webMqttComponent.publish(topic, JSON.toJSONString(queryRiskSourceSecondLevel(riskSource.getOrgCode())));
             topic = String.format("/%s/%s/%s", serviceName, stationName,"data/refresh/riskDegreeHistogram");
             webMqttComponent.publish(topic, JSON.toJSONString(queryRPNReport()));
             topic = String.format("/%s/%s/%s", serviceName, stationName,"data/refresh/riskDegreePie");
@@ -1931,11 +1931,11 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     }
 
     @Override
-    public void batchSaveRegionUe4(List<BindRegionBo> regionBoList) {
+    public void batchSaveRegionUe4(List<BindRegionBo> regionBoList,String orgCode) {
         riskSourceMapper.batchSaveRegionUe4(regionBoList);
         try {
             String topic = String.format("/%s/%s/%s", serviceName, stationName,"data/refresh/situationMap");
-            webMqttComponent.publish(topic, JSON.toJSONString(queryRiskAreaRpn()));
+            webMqttComponent.publish(topic, JSON.toJSONString(queryRiskSourceSecondLevel(orgCode)));
             topic = String.format("/%s/%s/%s", serviceName, stationName,"data/refresh/riskDegreeHistogram");
             webMqttComponent.publish(topic, JSON.toJSONString(queryRPNReport()));
             topic = String.format("/%s/%s/%s", serviceName, stationName,"data/refresh/riskDegreePie");

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IRiskSourceService.java

@@ -176,7 +176,7 @@ public interface IRiskSourceService {
      * 批量保存区域信息
      * @param regionBoList 参数数组
      */
-	void batchSaveRegionUe4(List<BindRegionBo> regionBoList);
+	void batchSaveRegionUe4(List<BindRegionBo> regionBoList,String orgCode);
 
     void notifyRiskSource(String orgCode, Long fmeaId, Long riskSourceId, String notifyType, JpushMsgBo jpushMsgBo);
 

YeeAmosFireAutoSysStart/src/main/resources/application-dev.properties

@@ -52,24 +52,8 @@ emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://172.16.10.85:1883
 emqx.user-name=super
 emqx.password=a123456
-# 只用于初始化
-emqx.defaultTopic=mqtt_topic
 
 
-Push.fegin.name=APPMESSAGEPUSHSERVICE-36
-
-dutyMode.fegin.name=AMOSDUTYMODE
-
-##\u89C4\u5219\u5BF9\u8C61\u81EA\u52A8\u626B\u63CF
-rule.definition.load=true
-rule.definition.model-package=com.yeejoin.amos.fas.business.action.model
-rule.definition.default-agency=STATE_GRID
-
-#Fegin service config
-amos.feign.gennerator.use-gateway=true
-
-autoSys.push.type=mqtt
-
 #�ļ�����
 file.downLoad.url=http://39.98.246.31:8888/
 

YeeAmosFireAutoSysStart/src/main/resources/application-docker.properties

@@ -45,7 +45,7 @@ spring.redis.timeout=1000
 file.uploadUrl=D:\\upload\\files\\
 #picture read
 file.readUrl=http://station-fireautosys:8083/file/getFile?in=
-params.isPush=true
+
 
 ## emqx
 emqx.clean-session=true
@@ -54,16 +54,6 @@ emqx.broker=tcp://172.16.10.85:1883
 emqx.user-name=super
 emqx.password=a123456
 
-Push.fegin.name=AMOS-PUSH
-dutyMode.fegin.name=AMOSDUTYMODE
-
-##\u89C4\u5219\u5BF9\u8C61\u81EA\u52A8\u626B\u63CF
-rule.definition.load=true
-rule.definition.model-package=com.yeejoin.amos.fas.business.action.model
-rule.definition.default-agency=STATE_GRID
-
-amos.feign.gennerator.use-gateway=true
-autoSys.push.type=mqtt
 
 #\uFFFD\u013C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 file.downLoad.url=http://172.16.10.175:8888/

YeeAmosFireAutoSysStart/src/main/resources/application-test.properties

@@ -45,7 +45,6 @@ spring.redis.timeout=1000
 file.uploadUrl=D:\\upload\\files\\
 #picture read
 file.readUrl=http://172.16.3.89:8083/file/getFile?in=
-params.isPush=true
 
 ## emqx
 emqx.clean-session=true
@@ -54,16 +53,6 @@ emqx.broker=tcp://172.16.10.85:1883
 emqx.user-name=super
 emqx.password=a123456
 
-Push.fegin.name=PPMESSAGEPUSHSERVICE15
-dutyMode.fegin.name=AMOSDUTYMODE
-
-##\u89C4\u5219\u5BF9\u8C61\u81EA\u52A8\u626B\u63CF
-rule.definition.load=true
-rule.definition.model-package=com.yeejoin.amos.fas.business.action.model
-rule.definition.default-agency=STATE_GRID
-
-amos.feign.gennerator.use-gateway=true
-autoSys.push.type=mqtt
 
 #\uFFFD\u013C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 file.downLoad.url=http://172.16.10.175:8888/

YeeAmosFireAutoSysStart/src/main/resources/application.properties

-spring.application.name = AMOS-AUTOSYS
+spring.application.name = AMOS-AUTOSYS-my
 server.port = 8083
 spring.profiles.active=dev
 
@@ -46,9 +46,16 @@ visual.fegin.name=maas-visual
 dutyMode.fegin.name=AMOSDUTYMODE
 #队站装备管理名称，主要用于风险区域同步至仓库货位和订阅装备信息系统
 equipManage.fegin.name=AMOS-EQUIPMANAGE
+
 #是否开启将风险区域同步至仓库货位true开启，false关闭。默认关闭。
 equipManage.fegin.isSyn=false
 
+#jpush 服务名称
+Push.fegin.name=APPMESSAGEPUSHSERVICE
+
+#值班系统服务名
+dutyMode.fegin.name=AMOSDUTYMODE
+
 spring.http.multipart.maxFileSize = 10480000
 spring.http.multipart.MaxRequestSize = 50480000
 windows.img.path = F:\\
@@ -59,6 +66,16 @@ param.safetyIndexChange.cron = 0 0 2 * * ?
 param.weather.url = http://wthrcdn.etouch.cn/weather_mini?citykey=
 
 
-#站端名称使用全拼
-station.name = yinan
+# 只用于初始化
+emqx.defaultTopic=mqtt_topic
+
+## 规则配置（风险管控及预案）
+rule.definition.load=true
+rule.definition.model-package=com.yeejoin.amos.fas.business.action.model
+rule.definition.default-agency=STATE_GRID
+
+#Fegin service config
+amos.feign.gennerator.use-gateway=true
+# 消息推送类型
+autoSys.push.type=mqtt
 

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_risk_source.xml

@@ -601,30 +601,17 @@
         WHERE rs.parent_id > 0
         order by rs.sort_num,rs.id
 	</select>
-	<select id="queryByFactor"  resultType="com.yeejoin.amos.fas.dao.entity.RiskSource">
-		SELECT
-			*
-		FROM
-			f_risk_source rs
-		WHERE
-			rs.id IN (
-				SELECT
-					ff.risk_source_id
-				FROM
-					f_fmea ff
-				JOIN f_risk_factor rf ON ff.risk_factors_id = rf.id
-				WHERE
-					rf.id = ${factorId}
-			)
-	</select>
 	
 	<select id="queryRiskSourceSecondLevel"  resultType="java.util.HashMap">
 		SELECT
 			rs.id,
-			rs.`code`,
-			rs.`name`,
-			rl.`level`,
-			rs.rpn
+            rs.name, 
+            rs.rpn, 
+            rs.rpni, 
+            rs.risk_level_id as riskLevelId,
+            rl.`name` as riskLevelName, 
+            rl.level,
+            rl.color
 		FROM
 			`f_risk_source` rs
 		LEFT JOIN f_risk_level rl ON rl.id = rs.risk_level_id 
@@ -639,6 +626,24 @@
 			)
 		ORDER BY sort_num,id
 	</select>
+	<select id="queryByFactor"  resultType="com.yeejoin.amos.fas.dao.entity.RiskSource">
+		SELECT
+			*
+		FROM
+			f_risk_source rs
+		WHERE
+			rs.id IN (
+				SELECT
+					ff.risk_source_id
+				FROM
+					f_fmea ff
+				JOIN f_risk_factor rf ON ff.risk_factors_id = rf.id
+				WHERE
+					rf.id = ${factorId}
+			)
+	</select>
+	
+	
 	
 	
 	<select id="queryContingencyWater"  resultType="java.util.HashMap">