修改重点部位

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgMenuDto.java

@@ -72,4 +72,12 @@ public class OrgMenuDto {
 	public OrgMenuDto() {
 		// TODO Auto-generated constructor stub
 	}
+
+    public OrgMenuDto(Long key, Long value, String title, String name, List<OrgMenuDto> children) {
+        this.key = key;
+        this.value = value;
+        this.title = title;
+        this.name = name;
+        this.children = children;
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.command.biz.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -15,24 +16,7 @@ import com.yeejoin.amos.boot.biz.common.utils.WordConverterUtils;
 import com.yeejoin.amos.boot.module.command.api.dao.SeismometeorologyDtoDao;
 import com.yeejoin.amos.boot.module.command.api.dto.SeismometeorologyDto;
 import com.yeejoin.amos.boot.module.command.biz.service.impl.RemoteSecurityService;
-import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
-import com.yeejoin.amos.boot.module.common.api.dto.CompanyDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FireChemicalDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FireExpertsDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FireStationzhDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FireTeamZhDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto;
-import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
-import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto;
-import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitZhDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrzhDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgusrDataxDto;
-import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceZhDto;
+import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
 import com.yeejoin.amos.boot.module.common.api.feign.IotFeignClient;
@@ -90,6 +74,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -132,7 +117,8 @@ public class CommandController extends BaseController {
     
     @Autowired
     IFirefightersService firefightersService;
-
+    @Autowired
+    private IAlertFormValueService iAlertFormValueService;
     @Autowired
     private IAircraftService aircraftService;
     @Autowired
@@ -150,7 +136,6 @@ public class CommandController extends BaseController {
     IKeySiteService keySiteService;
     @Autowired
     IPowerTransferCompanyService powerTransferCompanyService;
-
     @Autowired
     ISourceFileService sourceFileService;
 
@@ -1003,14 +988,41 @@ public class CommandController extends BaseController {
 
         AlertCalled AlertCalled=iAlertCalledService.getAlertCalledById(id);
         Long buildId=null;
+        String buildIdName="";
+        Long zdid=null;
+        String zdname="";
         OrgusrDataxDto orgusrDataxDto=new OrgusrDataxDto();
         if(AlertCalled.getUnitInvolved()!=null&&!"".equals(AlertCalled.getUnitInvolved())) {
             List<OrgUsrzhDto> orgUsrzhDto= iOrgUsrService.getOrgUsrzhDto( AlertCalled.getUnitInvolved());
             if(orgUsrzhDto!=null&&orgUsrzhDto.size()>0&&orgUsrzhDto.get(0)!=null){
                 buildId=orgUsrzhDto.get(0).getBuildId()==null?null:Long.valueOf(orgUsrzhDto.get(0).getBuildId());
+                buildIdName=orgUsrzhDto.get(0).getBuildId()==null?null:orgUsrzhDto.get(0).getBuildName();
+            }
+        }
+
+
+        // 警情动态表单数据
+        List<KeyValueLabel> listdate = new ArrayList<>();
+        List<AlertFormValue> list = buildId==null?null:iAlertFormValueService.getzqlist(id);
+        if (list != null && list.size() > 0) {
+            for (AlertFormValue alertFormValue : list) {
+               if("keySiteExcle".equals(alertFormValue.getFieldCode())&&alertFormValue.getFieldValue()!=null){
+                   List<OrgMenuDto> list1 = new ArrayList<OrgMenuDto>();
+                   List<OrgMenuDto> children = new ArrayList<OrgMenuDto>();
+                   OrgMenuDto date= new OrgMenuDto( Long.valueOf(alertFormValue.getFieldValueCode()),  Long.valueOf(alertFormValue.getFieldValueCode()),  alertFormValue.getFieldValue(),  alertFormValue.getFieldValue(),null);
+                   children.add(date);
+                   OrgMenuDto orgMenuDto =new OrgMenuDto();
+                   orgMenuDto.setKey(buildId);
+                   orgMenuDto.setValue(buildId);
+                   orgMenuDto.setChildren(children);
+                   orgMenuDto.setName(buildIdName);
+                   orgMenuDto.setTitle(buildIdName);
+                   list1.add(orgMenuDto);
+                   return ResponseHelper.buildResponse(list1);
+               }
             }
         }
-        return ResponseHelper.buildResponse(buildId==null?null:keySiteService.getBuildAndKeyTree(buildId));
+            return ResponseHelper.buildResponse(buildId==null?null:keySiteService.getBuildAndKeyTree(buildId));
     }