优化autosys配置项，删除不用的逻辑代码

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/ContingencyAction.java

@@ -80,9 +80,6 @@ public class ContingencyAction implements CustomerAction {
     @Autowired
     private WebMqttComponent webMqttComponent;
 
-    @Autowired
-    private JcsFeign jcsFeign;
-
     @Value("${auto-sys.push.type}")
     private String pushType;
     @Value("${spring.application.name}")
@@ -142,8 +139,8 @@ public class ContingencyAction implements CustomerAction {
     @Value("${maparea.action.is-area}")
     private String isArea;
 
-    @Value("${plan.default.roleCode}")
-    private String defaultRoleCode;
+//    @Value("${plan.default.roleCode}")
+//    private String defaultRoleCode;
 
     @Value("${plan.web.isUpdatePlanStep}")
     private Boolean isUpdatePlanStep;

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

@@ -51,13 +51,6 @@ public class PlanVisual3dController extends BaseController {
     HttpServletRequest request;
 
     @Permission
-    @ApiOperation(value = "预案应用树", notes = "预案应用树")
-    @GetMapping(value = "/plan/tree")
-    public CommonResponse getPlanTree() {
-        return CommonResponseUtil.success(planVisual3dService.getPlanTree());
-    }
-
-    @Permission
     @ApiOperation(value = "根据ID获取文字预案", notes = "根据ID获取文字预案")
     @GetMapping(value = "/plan/text/{id}")
     public CommonResponse getTextPlanById(@PathVariable(value = "id") Long id) {

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

@@ -321,11 +321,10 @@ public class View3dController extends BaseController {
 	 
 	@ApiOperation(value = "rocketMQ消息推送测试", notes = "rocketMQ消息推送测试")
 	@PostMapping(value="rocketMQ/send")
-	public CommonResponse rocketMQTemplate(@RequestParam(required = true, defaultValue = "all") String topic,
+	public CommonResponse rocketMQTemplate(@RequestParam(defaultValue = "all") String topic,
 			@RequestBody Object msg) {
-		try {		
+		try {
 	        rocketMQService.sendMsg(topic,"test_msg",msg);
-			rocketMQService.sendMsg1(topic,"test_msg",msg);
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
 			return CommonResponseUtil.failure(e.getMessage());

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/IEquipManageFeign.java

@@ -10,7 +10,7 @@ import java.util.Map;
 /**
  * @author DELL
  */
-@FeignClient(name="${equipManage.fegin.name}", fallback=MassVisualFallback.class, configuration=FeignConfiguration.class)
+@FeignClient(name="${equipManage.fegin.name}", configuration=FeignConfiguration.class)
 public interface IEquipManageFeign {
     /**
      * 解除区域与建筑绑定

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/IMaasVisualServer.java

-package com.yeejoin.amos.fas.business.feign;
-
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.yeejoin.amos.fas.core.util.CommonResponse;
-
-@FeignClient(name="${visual.fegin.name}", fallback=MassVisualFallback.class, configuration=FeignConfiguration.class)
-public interface IMaasVisualServer {
-	@RequestMapping(value = "/tree/subject/findAll", method = RequestMethod.GET)
-	public CommonResponse getTree();
-
-	@RequestMapping(value = "/subject/list/{subjectId}", method = RequestMethod.GET)
-	public CommonResponse getSubjectById(@PathVariable("subjectId")  String subjectId);
-}

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/MassVisualFallback.java

-package com.yeejoin.amos.fas.business.feign;
-
-import com.yeejoin.amos.fas.core.util.CommonResponse;
-
-public class MassVisualFallback implements IMaasVisualServer{
-
-	@Override
-	public CommonResponse getTree() {
-		CommonResponse res = new CommonResponse();
-		res.setResult("FAILED");
-		return res;
-	}
-
-	@Override
-	public CommonResponse getSubjectById(String subjectId) {
-		CommonResponse res = new CommonResponse();
-		res.setResult("FAILED");
-		return res;
-	}
-}

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

@@ -3,17 +3,13 @@ package com.yeejoin.amos.fas.business.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.collect.Lists;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.fas.business.action.mq.WebMqttComponent;
 import com.yeejoin.amos.fas.business.constants.FasConstant;
 import com.yeejoin.amos.fas.business.dao.mapper.*;
 import com.yeejoin.amos.fas.business.dao.repository.*;
-import com.yeejoin.amos.fas.business.feign.IMaasVisualServer;
 import com.yeejoin.amos.fas.business.feign.PrivilegeFeign;
 import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
 import com.yeejoin.amos.fas.business.service.intfc.IDictService;
@@ -49,9 +45,6 @@ import java.util.stream.Collectors;
 public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
 
     @Autowired
-    IMaasVisualServer maasVisualServer;
-
-    @Autowired
     ITextPlanDao iTextPlanDao;
 
     @Autowired
@@ -120,21 +113,6 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
     @Value("${aurora.push.switch}")
     private Boolean auroraPushSwitch;
 
-
-    @Override
-    public List<TreeSubjectVo> getPlanTree() {
-
-        CommonResponse response = maasVisualServer.getTree();
-        List<TreeSubjectVo> treeSubjectVos = Lists.newArrayList();
-        if (null != response.getDataList()) {
-            List<Object> res = (List<Object>) response.getDataList();
-            if (!CollectionUtils.isEmpty(res)) {
-                treeSubjectVos = listToTree(res);
-            }
-        }
-        return treeSubjectVos;
-    }
-
     @Override
     public void uploadTextPlan(String appId, Map<String, String> pathNameMap) {
         if (null != pathNameMap && !pathNameMap.isEmpty()) {
@@ -157,69 +135,6 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
         return null;
     }
 
-    private List<TreeSubjectVo> listToTree(List<Object> list) {
-        List<TreeSubjectVo> treeSubjectVos = Lists.newArrayList();
-        for (Object obj : list) {
-            TreeSubjectVo treeItem = new TreeSubjectVo();
-            LinkedHashMap<String, Object> map = (LinkedHashMap<String, Object>) obj;
-            treeItem.setId((String) map.get("id"));
-            treeItem.setTreeName((String) map.get("treeName"));
-            treeItem.setParentId((String) map.get("parentId"));
-            treeItem.setMaxSubjectNumber((Integer) map.get("maxSubjectNumber"));
-            treeItem.setType("treeNode");
-
-            List<Object> children = (List<Object>) map.get("children");
-            if (null != children) {
-                List<TreeSubjectVo> subjectVos = listToTree(children);
-                treeItem.setChildren(subjectVos);
-            }
-
-            CommonResponse response = maasVisualServer.getSubjectById(String.valueOf(map.get("id")));
-            if (null != response) {
-                List<TreeSubjectVo> childrenVos = Lists.newArrayList();
-                List<Object> res = (List<Object>) response.getDataList();
-                res.forEach(r -> {
-                    LinkedHashMap<String, Object> map1 = (LinkedHashMap<String, Object>) r;
-                    Integer state = (Integer) map1.get("publishState");
-                    if (state == 0) {//过滤 未发布状态
-                        return;
-                    }
-                    TreeSubjectVo subjectVo = new TreeSubjectVo();
-                    subjectVo.setType("listNode");
-                    subjectVo.setParentId((String) map.get("id"));
-                    subjectVo.setId((String) map1.get("id"));
-                    subjectVo.setDelete(map1.get("isDelete") == null || (Integer) map1.get("isDelete") == 0 ? false : true);
-                    subjectVo.setCreateTime((String) map1.get("createTime"));
-                    subjectVo.setCreator(map1.get("creator") == null ? 0 : (Integer) map1.get("creator"));
-                    subjectVo.setSubjectName((String) map1.get("subjectName"));
-                    subjectVo.setTreeName((String) map1.get("subjectName"));
-                    subjectVo.setSubjectDetail((String) map1.get("subjectDetail"));
-                    subjectVo.setSubjectType((String) map1.get("subjectType"));
-                    subjectVo.setSubjectTypeName((String) map1.get("subjectTypeName"));
-                    subjectVo.setPublishState(state);
-                    subjectVo.setBelongTreeId((String) map1.get("belongTreeId"));
-                    subjectVo.setScenes(map1.get("scenes") == null ? "" : (String) map1.get("scenes"));
-
-                    //关联文字预案
-                    List<TextPlan> textPlans = iTextPlanDao.findByAppId(String.valueOf(subjectVo.getId()));
-                    textPlans.forEach(t -> {
-                        TreeSubjectVo textTreeSubjectVo = new TreeSubjectVo();
-                        textTreeSubjectVo.setParentId(String.valueOf(t.getAppId()));
-                        textTreeSubjectVo.setTreeName(t.getTextName());
-                        textTreeSubjectVo.setId(String.valueOf(t.getId()));
-                        textTreeSubjectVo.setType("textNode");
-                        subjectVo.getChildren().add(textTreeSubjectVo);
-                    });
-
-                    childrenVos.add(subjectVo);
-                });
-                treeItem.getChildren().addAll(childrenVos);
-            }
-            treeSubjectVos.add(treeItem);
-        }
-        return treeSubjectVos;
-    }
-
     @Override
     public CommonResponse getResourceListByType(String type) {
         //1.校验是否是约定的字典，不存在则提示失败

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

@@ -1316,8 +1316,6 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
 //        }
 //    }
 
-    @Value("${autoSys.push.type}")
-    private String pushType;
     @Value("${spring.application.name}")
     private String serviceName;
 

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

@@ -28,9 +28,6 @@ public class RocketMQService implements IRocketMQService {
 
 	@Value("${rocketmq.producer.sysIsUsed}")
 	private String sysIsUsed;
-
-	@Value("${rocketmq.producer.sysIsUsed2}")
-	private String sysIsUsed2;
 	 
 	 public void sendMsg(String topic, String tag, Object msg){
 	     try {
@@ -51,25 +48,4 @@ public class RocketMQService implements IRocketMQService {
 			e.printStackTrace();
 		} 
 	 }
-
-	@Override
-	public void sendMsg1(String topic, String tag, Object msg) {
-		try {
-			if ("on".equalsIgnoreCase(sysIsUsed2)) {
-				log.info("rocketMQtopic====" + topic);
-				log.info("rocketMQmsg====" + JSON.toJSONString(msg).toString());
-
-				Message sendMsg = new Message(topic, tag, JSON.toJSONString(msg).getBytes());
-				SendResult sendResult = defaultMQProducer1.send(sendMsg);
-
-				log.info("rocketMQsendResult====" + JSON.toJSONString(sendResult).toString());
-			} else {
-				log.info("rocketMQsendResult====rocketmq.producer.sysIsUsed is not on");
-			}
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			log.error(e.getMessage(), e);
-			e.printStackTrace();
-		}
-	}
 }

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

@@ -18,13 +18,6 @@ import java.util.Map;
 public interface IPlanVisual3dService {
 
     /**
-     * 获取预案树
-     *
-     * @return
-     */
-    List<TreeSubjectVo> getPlanTree();
-
-    /**
      * 上传文字预案
      *
      * @param appId       预案ID

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

@@ -3,6 +3,4 @@ package com.yeejoin.amos.fas.business.service.intfc;
 public interface IRocketMQService {
 	
 	void sendMsg(String topic, String tag, Object msg);
-
-	void sendMsg1(String topic, String tag, Object msg);
 }

YeeAmosFireAutoSysStart/src/main/java/com/yeejoin/amos/YeeAmosFireAutoSysStart.java

 package com.yeejoin.amos;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.URISyntaxException;
 
 import org.mybatis.spring.annotation.MapperScan;
@@ -72,7 +73,7 @@ public class YeeAmosFireAutoSysStart implements ApplicationContextAware {
 		try {
 			SpringApplication application = new SpringApplication(YeeAmosFireAutoSysStart.class);
 			Environment environment = application.run(args).getEnvironment();
-			log.info("SwaggerUI: 	http://localhost:" + environment.getProperty("server.port") + "/swagger-ui.html");
+			log.info("SwaggerUI: 	http://" + InetAddress.getLocalHost().getHostAddress() + ":" + environment.getProperty("server.port") + environment.getProperty("server.servlet.context-path") + "/swagger-ui.html");
 		} catch (Exception e) {
 			System.out.println("error occur when run server! " + e);
 		}

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

 #DB properties:
-spring.datasource.url = jdbc:mysql://172.16.11.201:3307/dl_business_v3.0.1.3?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.datasource.url = jdbc:mysql://172.16.11.201:3306/dl_business_v3.0.1.3?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.datasource.username=root
 spring.datasource.password=Yeejoin@2020
 spring.datasource.driver-class-name = com.mysql.cj.jdbc.Driver
@@ -9,14 +9,10 @@ spring.datasource.testWhileIdle = true
 spring.datasource.validationQuery = SELECT 1
 
 #\u7CFB\u7EDF\u670D\u52A1\u8D26\u53F7\uFF0C\u7528\u6237\u540E\u7AEF\u670D\u52A1\u8C03\u7528
-#security.password=a1234560
-#security.loginId=fas_autosys
 amos.system.user.user-name=fas_autosys
 amos.system.user.password=a1234560
 
 #\u5E94\u7528product appkey
-#security.productWeb=STUDIO_APP_WEB
-#security.appKey =studio_normalapp_3056965
 amos.system.user.app-key=studio_normalapp_3056965
 amos.system.user.product=STUDIO_APP_WEB
 
@@ -27,12 +23,11 @@ eureka.client.healthcheck.enabled = true
 eureka.client.fetchRegistry = true
 eureka.instance.prefer-ip-address=true
 
-
 #redis
 spring.redis.database=1
 spring.redis.host=172.16.11.201
 spring.redis.port=6379
-spring.redis.password=1234560
+spring.redis.password=yeejoin@2020
 spring.redis.jedis.pool.max-active=200
 spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.max-idle=10
@@ -45,8 +40,6 @@ file.uploadUrl=C:\\upload\\files\\
 #picture read
 file.readUrl=http://172.16.11.201:8085/file/getFile?in=
 
-#jpush \u63A8\u9001\u5F00\u5173
-params.isPush=false
 ## emqx
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
@@ -61,9 +54,6 @@ file.downLoad.url=http://172.16.11.201:9000/
 plan.instance.personImg=upload/3dview_icon/plan_via.png
 plan.instance.playImg=upload/3dview_icon/plan_play.png
 
-#\u5E94\u6025\u9884\u6848\u52A8\u4F5C\u6267\u884C\u9ED8\u8BA4\u89D2\u8272\u7F16\u7801
-plan.default.roleCode=Digital_Responsing_Plan_A
-
 # \u662F\u5426\u4F7F\u7528rocketmq on/off
 rocketmq.producer.sysIsUsed=off
 #rocketmq\u751F\u4EA7\u8005\u914D\u7F6E
@@ -80,21 +70,16 @@ rocketmq.producer.sendMsgTimeOut=30000
 # \u53D1\u9001\u6D88\u606F\u5931\u8D25\u91CD\u8BD5\u6B21\u6570\uFF0C\u9ED8\u8BA42
 rocketmq.producer.retryTimesWhenSendFailed=2
 
-# \u662F\u5426\u4F7F\u7528rocketmq on/off
-rocketmq.producer.sysIsUsed2=off
-#\u81EA\u5B9A\u4E49groupName2 \u4E0E  \u7B2C\u4E00\u4E2Aname\u533A\u5206\u5F00
+#\u81EA\u5B9A\u4E49groupName2 \u4E0E \u7B2C\u4E00\u4E2Aname\u533A\u5206\u5F00
 rocketmq.producer.groupName2=groupName2
 # mq\u7684nameserver\u5730\u5740
 rocketmq.producer.namesrvAddr2=172.16.3.135:9876
 
-rocket-plan-topic =topic_fire_emergency_plan
-rocket-equip-alarm-topic =topic_fire_equip_alarm
-
-#\u89C4\u5219ip\u914D\u7F6E\uFF0C\u7528\u4E8E\u591A\u7F51\u5361\u53CAdocker\u955C\u50CF\u542F\u52A8\u65F6\u6DFB\u52A0
-#rule.definition.local-ip=172.16.11.201
+rocket-plan-topic=topic_fire_emergency_plan
+rocket-equip-alarm-topic=topic_fire_equip_alarm
 
 #3Dtype \u5206\u4E3Aweb\u548Cue
-integrated3Dtype =web
+integrated3Dtype=web
 
 #\u6570\u636E\u540C\u6B65\u5F00\u5173
 systemctl.sync.switch=false
@@ -105,7 +90,6 @@ plan.web.isUpdatePlanStep=false
 #\u5730\u56FE\u52A8\u4F5C\u533A\u57DF\u5C55\u793A
 maparea.action.is-area=action1-2,action1-6
 
-
 plan.dynamic.execut.topic=\u6362\u6D41\u7AD9\u6D88\u9632\u4E13\u9879\u9884\u6848/autoExec
 
 #\u670D\u52A1\u7AEF\u83B7\u53D6isdp\u7684token\u7528

YeeAmosFireAutoSysStart/src/main/resources/application.properties

@@ -43,73 +43,50 @@ param.system.online.date = 2021-10-12
 spring.servlet.multipart.max-file-size=20MB
 spring.servlet.multipart.max-request-size=20MB
 
-#feginName
-visual.fegin.name=maas-visual
-#值班系统
+#\u503C\u73ED\u7CFB\u7EDF
 dutyMode.fegin.name=AMOS-DUTYMODE
-#队站装备管理名称，主要用于风险区域同步至仓库货位和订阅装备信息系统
+#\u961F\u7AD9\u88C5\u5907\u7BA1\u7406\u540D\u79F0\uFF0C\u4E3B\u8981\u7528\u4E8E\u98CE\u9669\u533A\u57DF\u540C\u6B65\u81F3\u4ED3\u5E93\u8D27\u4F4D\u548C\u8BA2\u9605\u88C5\u5907\u4FE1\u606F\u7CFB\u7EDF
 equipManage.fegin.name=AMOS-EQUIPMANAGE
 
-#jpush 服务名称
+#jpush \u670D\u52A1\u540D\u79F0
 Push.fegin.name=AMOS-JPUSH
 
-#JCS 服务名称
+#JCS \u670D\u52A1\u540D\u79F0
 Jcs.fegin.name=JCS
 
 #feginName
-number.plan.projectName=换流站消防专项预案
+number.plan.projectName=\u6362\u6D41\u7AD9\u6D88\u9632\u4E13\u9879\u9884\u6848
 
+# \u6D88\u606F\u63A8\u9001\u7C7B\u578B
+autoSys.push.type=mqtt
 
-#站端名称使用全拼  与三维iotree 消息用到了，暂时统一设置为yinan
+#\u7AD9\u7AEF\u540D\u79F0\u4F7F\u7528\u5168\u62FC  \u4E0E\u4E09\u7EF4iotree \u6D88\u606F\u7528\u5230\u4E86\uFF0C\u6682\u65F6\u7EDF\u4E00\u8BBE\u7F6E\u4E3Ayinan
 station.name = yinan
-#极光推送开关
+#\u6781\u5149\u63A8\u9001\u5F00\u5173
 aurora.push.switch=false
 
-
 param.safetyIndexChange.cron = 0 0 2 * * ?
 param.weather.url = http://wthrcdn.etouch.cn/weather_mini?citykey=
 
-# 只用于初始化
+# \u53EA\u7528\u4E8E\u521D\u59CB\u5316
 emqx.defaultTopic=mqtt_topic
 
-## 规则配置（风险管控及预案）
+## \u89C4\u5219\u914D\u7F6E\uFF08\u98CE\u9669\u7BA1\u63A7\u53CA\u9884\u6848\uFF09
 rule.definition.load=false
 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
-
-# 3D告警初始化
+# 3D\u544A\u8B66\u521D\u59CB\u5316
 autoSys.alarm.nameKeys=BREAKDOWN,FIREALARM,SHIELD
 autoSys.alarm.status=2,3
 autoSys.alarm.value=true
 
-#消防水池指标编码
+#\u6D88\u9632\u6C34\u6C60\u6307\u6807\u7F16\u7801
 autoSys.fire.pool.index_key=FHS_FirePoolDevice_WaterLevel
 
-#查询装备分类
-
-#消防视频：xfsp
-#消防车：2101
-data.type.fireCar=2101
-#消防小室：9301
-data.type.fireChamber=9301
-#消防水池：9302
-data.type.pool=9302
-#消防泡沫间：9305
-data.type.fireFoamRoom=9305
-#探测器：8501
-data.type.monitorEquipment=8501
-#消防炮：3103
+#\u67E5\u8BE2\u88C5\u5907\u5206\u7C7B
+#\u6D88\u9632\u70AE\uFF1A3103
 data.type.fireMonitor=3103
-#灭火器：3104
-data.type.extinguisher=3104
-#消火栓：3105
-data.type.hydrant=3105
 
 amos.system.privilege.user.product=AMOS-WEB-ADMIN
 amos.system.privilege.user.app-key=AMOS_ADMIN
@@ -118,5 +95,5 @@ outSystem.fegin.name=unKnow
 outSystem.user.password=a1234560
 privilege.fegin.name=AMOS-API-PRIVILEGE
 
-#预案指标配置
+#\u9884\u6848\u6307\u6807\u914D\u7F6E
 plan.index =ONL_OilDischargeDeviceOilPillowDischargeOpen,CAFS_CAFSFireGunEquipmentValveStatus,DCCP_DCCPStreamTransformerCharged,WSS_DelugeValve_Start,ONL_OilDischargeDeviceOilyPillowDischargeOpen
\ No newline at end of file