重点部位接口

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/ISourceFileService.java

 package com.yeejoin.amos.boot.module.common.api.service;
 
 
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+
+import java.util.List;
+import java.util.Map;
+
 /**
 * 公共附件接口类
 *
@@ -8,5 +13,5 @@ package com.yeejoin.amos.boot.module.common.api.service;
 * @date 2021-07-16
 */
 public interface ISourceFileService {
-
+    public Map<String, List<AttachmentDto>> getAttachments(Long sourceId);
 }

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

 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.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -108,15 +109,18 @@ public class CommandController extends BaseController {
  	private String readUrl;
  	 @Autowired
      EquipFeignClient equipFeignClient;
-
+    @Autowired
+    IKeySiteService keySiteService;
     @Autowired
     IPowerTransferCompanyService powerTransferCompanyService;
 
-    
+    @Autowired
+    ISourceFileService sourceFileService;
+
     @Value("${video.url}")
  	private String videoUrl;
-    
-    
+
+
     @Autowired
     IDutyPersonService iDutyPersonService;
     /**
@@ -691,7 +695,10 @@ public class CommandController extends BaseController {
     	if(AlertCalled.getUnitInvolved()!=null&&!"".equals(AlertCalled.getUnitInvolved())) {   		
             List<OrgUsrzhDto> orgUsrzhDto= iOrgUsrService.getOrgUsrzhDto( AlertCalled.getUnitInvolved());
             orgusrDataxDto.setOrgUsrzhDto(orgUsrzhDto!=null&&orgUsrzhDto.size()>0?orgUsrzhDto.get(0):null);
-            buildId=orgUsrzhDto!=null&&orgUsrzhDto.size()>0?orgUsrzhDto.get(0).getBuildId():null;
+//            buildId=orgUsrzhDto!=null&&orgUsrzhDto.size()>0?orgUsrzhDto.get(0).getBuildId():null;
+            if(orgUsrzhDto!=null&&orgUsrzhDto.size()>0&&orgUsrzhDto.get(0)!=null){
+                buildId=orgUsrzhDto.get(0).getBuildId();
+            }
     	}
         
         //现场照片 待完成，
@@ -720,7 +727,6 @@ public class CommandController extends BaseController {
     @GetMapping(value = "/AlertCalledcountTime")
     @ApiOperation(httpMethod = "GET", value = "执勤动态警情信息统计", notes = "执勤动态警情信息统计")
     public ResponseModel<Object> AlertCalledcountTime() {
-
         List<KeyValueLabel> listdate =new ArrayList<>();
         listdate.add(new KeyValueLabel("今年警情数量","",iAlertCalledService.AlertCalledcountTime(1)));
         listdate.add(new KeyValueLabel("当月警情数量","",iAlertCalledService.AlertCalledcountTime(2)));
@@ -734,7 +740,6 @@ public class CommandController extends BaseController {
     @GetMapping(value = "/getTodayPowerTransferCompany")
     @ApiOperation(httpMethod = "GET", value = "当天力量调派", notes = "当天力量调派")
     public ResponseModel<Object> getTodayPowerTransferCompany() {
-
         return ResponseHelper.buildResponse(powerTransferCompanyService.getTodayPowerTransferCompany());
     }
 
@@ -742,7 +747,6 @@ public class CommandController extends BaseController {
     @GetMapping(value = "/getTodayAlertCalled")
     @ApiOperation(httpMethod = "GET", value = "当天接警记录", notes = "当天接警记录")
     public ResponseModel<Object> getTodayAlertCalled() {
-
         return ResponseHelper.buildResponse(iAlertCalledService.getTodayAlertCalled());
     }
 
@@ -750,7 +754,6 @@ public class CommandController extends BaseController {
     @GetMapping(value = "/getFireTeamCountList")
     @ApiOperation(httpMethod = "GET", value = "执勤力量", notes = "执勤力量")
     public ResponseModel<Object> getFireTeamCountList() {
-
         return ResponseHelper.buildResponse(iFireTeamService.getFireTeamCountList());
     }
 
@@ -771,9 +774,7 @@ public class CommandController extends BaseController {
     @RequestMapping(value = "/findDutyCarStateBy", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "当日气象预警", notes = "当日气象预警")
     public ResponseModel<Object> findDutyCarStateBy()throws Exception {
-
         List<SeismometeorologyDto> li= seismometeorologyDtoDao.findDutyCarStateBy();
-       
         return ResponseHelper.buildResponse(li);
     }
 
@@ -785,9 +786,7 @@ public class CommandController extends BaseController {
     @GetMapping(value = "fireCar/list")
     @ApiOperation(httpMethod = "GET", value = "车辆资源", notes = "车辆资源")
     public ResponseModel<List<Map<String,Object>>> getTeamCarList(RequestData par) {
-
     	ResponseModel<List<Map<String, Object>>> date= equipFeignClient.getTeamCarList(par.getLongitude(),par.getLatitude());
-      
         return ResponseHelper.buildResponse(date!=null?date.getResult():null);
     }
 
@@ -823,6 +822,46 @@ public class CommandController extends BaseController {
 
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET",value = "根据灾情id建筑部位树",   notes = "根据灾情id建筑部位树")
+    @GetMapping(value = "/getBuildTree/{id}")
+    public  ResponseModel<List<OrgMenuDto>> getBuildTree(@PathVariable Long id) throws Exception{
+
+        AlertCalled AlertCalled=iAlertCalledService.getAlertCalledById(id);
+        Long buildId=null;
+        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=Long.valueOf(orgUsrzhDto.get(0).getBuildId());
+            }
+        }
+        return ResponseHelper.buildResponse(keySiteService.getBuildAndKeyTree(buildId));
+    }
+
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET",value = "根据重点部位id查询详情",   notes = "根据重点部位id查询详情")
+    @GetMapping(value = "/getkeySite/{sequenceNbr}")
+    public ResponseModel<KeySiteDto> getkeySite(@PathVariable Long sequenceNbr) {
+        Map<String, List<AttachmentDto>> files = sourceFileService.getAttachments(sequenceNbr);
+        KeySiteDto dto=  keySiteService.getSequenceNbr(sequenceNbr);
+        List<String> list = new ArrayList<String>();
+        if(files!=null && dto!=null) {
+            if(files!=null && dto!=null) {
+                dto.setAttachments(files);
+                JSONArray array=	JSONArray.parseArray(JSONArray.toJSONString(files.get("keySitePhoto")));
+                if(array!=null &&array.size()>0) {
+                    for(Object i :array) {
+                        JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(i));
+                        list.add(object.getString("url"));
+                    }
+                }
+            }
+            dto.setAttachmentsList(list);
+        }
+        return ResponseHelper.buildResponse(dto);
+    }
     
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -949,7 +949,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	@Override
 	public List<OrgUsrzhDto> getOrgUsrzhDto(String  name) {
 		// TODO Auto-generated method stub
-		return orgUsrMapper.getOrgUsrzhDto(name);
+		List<OrgUsrzhDto> list=orgUsrMapper.getOrgUsrzhDto(name);
+		return list;
 	}
 
 	@Override

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/SourceFileServiceImpl.java

@@ -117,6 +117,7 @@ public class SourceFileServiceImpl extends BaseService<SourceFileDto, SourceFile
      * @param sourceId
      * @return
      */
+    @Override
     public Map<String, List<AttachmentDto>> getAttachments(Long sourceId) {
         Map<String, List<AttachmentDto>> attachmentMap = Maps.newHashMap();
         List<SourceFile> sourceFileList = findBySourceId(sourceId);