修改Command 插件扫描问题

amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/java/com/yeejoin/amos/boot/module/command/api/dao/SeismometeorologyDtoDao.java

-//package com.yeejoin.amos.boot.module.command.api.dao;
-//
-//import java.util.ArrayList;
-//import java.util.Calendar;
-//import java.util.Date;
-//import java.util.List;
-//
-//import ch.qos.logback.core.net.SyslogOutputStream;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.data.domain.Sort;
-//import org.springframework.data.mongodb.core.MongoTemplate;
-//import org.springframework.data.mongodb.core.query.Query;
-//import org.springframework.stereotype.Component;
-//import com.yeejoin.amos.boot.module.command.api.dto.SeismometeorologyDto;
-//import org.springframework.data.mongodb.core.query.Criteria;
-//import org.springframework.stereotype.Service;
-//
-///**
-// * @description:
-// * @author: tw
-// * @createDate: 2021/7/19
-// */
-//@Component
-//public class SeismometeorologyDtoDao {
-//
-//
-//    @Autowired
-//    private MongoTemplate mongoTemplate;
-//
-//    /**
-//     * 保存对象SeismometeorologyDto
-//     *
-//     * @param
-//     */
-//    public void saveObj(SeismometeorologyDto book) {
-//        mongoTemplate.save(book);
-//    }
-//
-//
-//    /**
-//     * 24小時预警
-//     **/
-//    public List<SeismometeorologyDto> findCarStateByWatchSn() {
-//        System.out.println(new Date().getTime());
-//        Query query = new Query(Criteria.where("releaseTime").gte(getStartTime())
-//                .lte(getEndTime()));
-//        Sort sort = Sort.by(Sort.Direction.DESC, "releaseTime");
-//        query.with(sort);
-//        List<SeismometeorologyDto> gpsList = mongoTemplate.find(query, SeismometeorologyDto.class);
-//        return gpsList;
-//    }
-//
-//
-//    /**
-//     * 当天气象预警
-//     **/
-//    public List<SeismometeorologyDto> findDutyCarStateBy() {
-//
-//        System.out.println(new Date().getTime());
-//        Query query = new Query(Criteria.where("releaseTime").gte(getStartTime())
-//                .lte(getEndTime()));
-//        Sort sort = Sort.by(Sort.Direction.DESC, "releaseTime");
-//        query.with(sort);
-//        List<SeismometeorologyDto> gpsList = mongoTemplate.find(query, SeismometeorologyDto.class);
-//        return gpsList;
-//    }
-//
-//
-//    private static Date getStartTime() {
-//        Calendar todayStart = Calendar.getInstance();
-//        todayStart.set(Calendar.HOUR_OF_DAY, 0);
-//        todayStart.set(Calendar.MINUTE, 0);
-//        todayStart.set(Calendar.SECOND, 0);
-//        todayStart.set(Calendar.MILLISECOND, 0);
-//        return todayStart.getTime();
-//    }
-//
-//    private static Date getEndTime() {
-//        Calendar todayEnd = Calendar.getInstance();
-//        todayEnd.set(Calendar.HOUR_OF_DAY, 23);
-//        todayEnd.set(Calendar.MINUTE, 59);
-//        todayEnd.set(Calendar.SECOND, 59);
-//        todayEnd.set(Calendar.MILLISECOND, 999);
-//        return todayEnd.getTime();
-//    }
-//
-//
-//}
-//

amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/java/com/yeejoin/amos/boot/module/command/api/dto/AlertSummaryDto.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.util.Date;
+
 
 /**
  * 

amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/java/com/yeejoin/amos/boot/module/command/api/dto/CarTaskDto.java

 package com.yeejoin.amos.boot.module.command.api.dto;
 
-import org.springframework.web.bind.annotation.PathVariable;
+
 
 import java.util.List;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/java/com/yeejoin/amos/boot/module/command/api/dto/FrontlineLiaisonDto.java

@@ -3,8 +3,6 @@ package com.yeejoin.amos.boot.module.command.api.dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.util.Date;
 
 import com.yeejoin.amos.boot.module.command.api.entity.BasEntity;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/java/com/yeejoin/amos/boot/module/command/api/dto/videoDataDto.java

-package com.yeejoin.amos.boot.module.command.api.dto;
-
-public class videoDataDto {
-	
-	private String code;
-	private String msg;
-	private String data;
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/java/com/yeejoin/amos/boot/module/command/api/entity/AlertSummary.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import java.util.Date;
 
 /**
  * 

amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/java/com/yeejoin/amos/boot/module/command/api/entity/FrontlineLiaison.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import java.util.Date;
+
 
 /**
  * 前线联络员

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/ESCarDto.java

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.elasticsearch.annotations.Document;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2022/8/24
+ */
+@Data
+public class ESCarDto {
+
+    private String id;
+
+
+    private Long sequenceNbr;
+
+
+    private String longitude;
+
+
+    private String latitude;
+
+
+    private Long Time;
+
+
+    private String carNum;
+}

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

@@ -96,7 +96,7 @@ public class AlertSummaryController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
 	public ResponseModel<Page<AlertSummaryDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
                     (value = "size") int size) {
-	    Page<AlertSummaryDto> page = new Page<AlertSummaryDto>();
+	    Page<AlertSummaryDto> page = new Page<>();
 	    page.setCurrent(current);
 	    page.setSize(size);
 	    return ResponseHelper.buildResponse(alertSummaryServiceImpl.queryForAlertSummaryPage(page));

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

@@ -97,8 +97,6 @@ public class CommandController extends BaseController {
     IFireTeamService iFireTeamService;
     @Autowired
     IWaterResourceService iWaterResourceService;
-//    @Autowired
-//    SeismometeorologyDtoDao seismometeorologyDtoDao;
     @Autowired
     IOrgUsrService iOrgUsrService;
     @Autowired
@@ -179,6 +177,12 @@ public class CommandController extends BaseController {
     AirportStandMapper airportStandMapper;
     private static final String JW = "mechinePosition";
     private static final String KEYSITE = "keySiteExcle";
+    private static final String VIDEO = "video";
+    private static final String OPENURL = "openUrl";
+    private static final String BUILDDATE = "buildDate";
+    private static final String FILEPATH = "filePath";
+    private static final String CARSTATE = "carState";
+    private static final String USERNAME = "userName";
     public static final Logger log = LoggerFactory.getLogger(CommandController.class);
 
 
@@ -445,8 +449,9 @@ public class CommandController extends BaseController {
                     par.setLatitude(alertCalled.getCoordinateX());
                     par.setLongitude(alertCalled.getCoordinateY());
                     break;
+                default:
+                    break;
             }
-
         }
         ResponseModel<Page<Map<String, Object>>> data = null;
         if (ValidationUtil.isEmpty(par.getLatitudeTwo()) ){
@@ -456,22 +461,21 @@ public class CommandController extends BaseController {
         }
 
 
-        if (!ObjectUtils.isEmpty(result)&&!ObjectUtils.isEmpty(result.getResult().get("video"))){
-            List<Map<String, Object>> records = result != null ? (List<Map<String, Object>>) result.getResult().get("video") : null;
+        if (!ObjectUtils.isEmpty(result)&&!ObjectUtils.isEmpty(result.getResult().get(VIDEO))){
+            List<Map<String, Object>> records = result != null ? (List<Map<String, Object>>) result.getResult().get(VIDEO) : null;
             Page<Map<String, Object>> page = data.getResult();
             records.addAll(data.getResult().getRecords());
             page.setRecords(records);
             data.setResult(page);
         }
 
-     //   ResponseModel<Page<Map<String, Object>>> data = equipFeignClient.pageVideo(pageNum == 0 ? 1 : pageNum, pageSize, par.getLongitude(), par.getLatitude(), par.getDistance());
         Page<Map<String, Object>> pag = data != null ? data.getResult() : null;
         List<Map<String, Object>> records = pag != null ? pag.getRecords() : null;
         if (records != null && records.size() > 0) {
-            for (Map<String, Object> record : records) {
-                ResponseModel<String> da = videoFeignClient.videoUrlByIndexCode(record.get("code") + "");
-                String url = da != null ? da.getResult().substring(da.getResult().indexOf("openUrl")) : null;
-                record.put("url", url);
+            for (Map<String, Object> rec : records) {
+                ResponseModel<String> da = videoFeignClient.videoUrlByIndexCode(rec.get("code") + "");
+                String url = da != null ? da.getResult().substring(da.getResult().indexOf(OPENURL)) : null;
+                rec.put("url", url);
             }
             pag.setRecords(records);
         }
@@ -493,10 +497,10 @@ public class CommandController extends BaseController {
         Page<Map<String, Object>> pag = data != null ? data.getResult() : null;
         List<Map<String, Object>> records = pag != null ? pag.getRecords() : null;
         if (records != null && records.size() > 0) {
-            for (Map<String, Object> record : records) {
-                ResponseModel<String> da = videoFeignClient.videoUrlByIndexCode(record.get("code") + "");
-                String url = da != null ? da.getResult().substring(da.getResult().indexOf("openUrl")) : null;
-                record.put("url", url);
+            for (Map<String, Object> rec: records) {
+                ResponseModel<String> da = videoFeignClient.videoUrlByIndexCode(rec.get("code") + "");
+                String url = da != null ? da.getResult().substring(da.getResult().indexOf(OPENURL)) : null;
+                rec.put("url", url);
             }
             pag.setRecords(records);
         }
@@ -518,10 +522,10 @@ public class CommandController extends BaseController {
         Page<Map<String, Object>> pag = data != null ? data.getResult() : null;
         List<Map<String, Object>> records = pag != null ? pag.getRecords() : null;
         if (records != null && records.size() > 0) {
-            for (Map<String, Object> record : records) {
-                ResponseModel<String> da = videoFeignClient.videoUrlByIndexCode(record.get("code") + "");
-                String url = da != null ? da.getResult().substring(da.getResult().indexOf("openUrl")) : null;
-                record.put("url", url);
+            for (Map<String, Object> rec : records) {
+                ResponseModel<String> da = videoFeignClient.videoUrlByIndexCode(rec.get("code") + "");
+                String url = da != null ? da.getResult().substring(da.getResult().indexOf(OPENURL)) : null;
+                rec.put("url", url);
             }
             pag.setRecords(records);
         }
@@ -537,15 +541,15 @@ public class CommandController extends BaseController {
             @RequestParam(value = "nodeType", required = false) String nodeType,
             @RequestParam(value = "current") int current,
             @RequestParam(value = "size") int size
-    ) throws Exception {
+    ) throws BaseException {
         ResponseModel<Page<Map<String, Object>>> data = equipFeignClient.queryVideoPage(nodeId, nodeType, current, size);
         Page<Map<String, Object>> pag = data != null ? data.getResult() : null;
         List<Map<String, Object>> records = pag != null ? pag.getRecords() : null;
         if (records != null && records.size() > 0) {
-            for (Map<String, Object> record : records) {
-                ResponseModel<String> da = videoFeignClient.videoUrlByIndexCode(record.get("code") + "");
-                String url = da != null ? da.getResult().substring(da.getResult().indexOf("openUrl")) : null;
-                record.put("url", url);
+            for (Map<String, Object> rec : records) {
+                ResponseModel<String> da = videoFeignClient.videoUrlByIndexCode(rec.get("code") + "");
+                String url = da != null ? da.getResult().substring(da.getResult().indexOf(OPENURL)) : null;
+                rec.put("url", url);
             }
             pag.setRecords(records);
         }
@@ -558,14 +562,14 @@ public class CommandController extends BaseController {
     public ResponseModel<Map<String, Object>> getDetailsById(@RequestParam Long alamId, @RequestParam Long equipId, @RequestParam String type, @RequestParam String area) {
         ResponseModel<Map<String, Object>> response = equipFeignClient.getDetailsById(alamId, equipId, type, area);
         Map<String, Object> data = response.getResult();
-        List<Map<String, Object>> records = data != null ? (List<Map<String, Object>>) data.get("video") : null;
+        List<Map<String, Object>> records = data != null ? (List<Map<String, Object>>) data.get(VIDEO) : null;
         if (records != null && records.size() > 0) {
-            for (Map<String, Object> record : records) {
-                ResponseModel<String> da = videoFeignClient.videoUrlByIndexCode(record.get("code") + "");
-                String url = da != null ? da.getResult().substring(da.getResult().indexOf("openUrl")) : null;
-                record.put("url", url);
+            for (Map<String, Object> rec : records) {
+                ResponseModel<String> da = videoFeignClient.videoUrlByIndexCode(rec.get("code") + "");
+                String url = da != null ? da.getResult().substring(da.getResult().indexOf(OPENURL)) : null;
+                rec.put("url", url);
             }
-            data.put("video", records);
+            data.put(VIDEO, records);
         }
         return ResponseHelper.buildResponse(data);
     }
@@ -588,10 +592,10 @@ public class CommandController extends BaseController {
         Page<VideoDto> pag = data != null ? data.getResult() : null;
         List<VideoDto> records = pag != null ? pag.getRecords() : null;
         if (records != null && records.size() > 0) {
-            for (VideoDto record : records) {
-                ResponseModel<String> da = videoFeignClient.videoUrlByIndexCode(record.getCode());
+            for (VideoDto rec : records) {
+                ResponseModel<String> da = videoFeignClient.videoUrlByIndexCode(rec.getCode());
                 String url = da != null ? da.getResult() : null;
-                record.setUrl(url);
+                rec.setUrl(url);
             }
             pag.setRecords(records);
         }
@@ -612,7 +616,7 @@ public class CommandController extends BaseController {
         Map<String, Object> records = data != null ? data.getResult() : null;
         if (records != null && records.size() > 0) {
             ResponseModel<String> da = videoFeignClient.videoUrlByIndexCode(records.get("code") + "");
-            String url = da != null ? da.getResult().substring(da.getResult().indexOf("openUrl")) : null;
+            String url = da != null ? da.getResult().substring(da.getResult().indexOf(OPENURL)) : null;
             records.put("url", url);
             data.setResult(records);
         }
@@ -647,12 +651,12 @@ public class CommandController extends BaseController {
         RequestData requestData = new RequestData();
         requestData.setWhether24(true);
         List<AlertCalledZhDto> list = iAlertCalledService.alertCalledListByAlertStatus120(null, null, requestData);
-//        List<SeismometeorologyDto> li = seismometeorologyDtoDao.findCarStateByWatchSn();
+
         List<SeismometeorologyDto> li =new ArrayList<>();
         //数据组装
         for (AlertCalledZhDto alertCalledZhDto : list) {
 
-            StringBuffer st = new StringBuffer();
+            StringBuilder st = new StringBuilder();
 
             String time = DateUtil.formatDate(alertCalledZhDto.getCallTime(), "yyyy-MM-dd HH:mm:ss");
 
@@ -665,25 +669,6 @@ public class CommandController extends BaseController {
     }
 
 
-
-//    /**
-//     * 水源列表分页查询
-//     *
-//     * @return
-//     */
-//    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
-//    @GetMapping(value = "SYTY/list")
-//    @ApiOperation(httpMethod = "GET", value = "水源列表分页查询", notes = "水源列表分页查询")
-//    public ResponseModel<IPage<WaterResourceZhDto>> listPageSYTY(Integer pageNum, Integer pageSize, RequestData par) {
-//        Page<WaterResourceZhDto> pageBean = new Page<>(pageNum, pageSize);
-//        List<WaterResourceZhDto>  list= iWaterResourceService.getWaterResourceList(pageNum,pageSize,par);
-//        Integer num=  iWaterResourceService.getWaterResourceListCount(par);
-//        pageBean.setRecords(list);
-//        pageBean.setTotal(num);
-//        return ResponseHelper.buildResponse(pageBean);
-//    }
-
-
     /**
      * 消防队伍列表分页查询
      *
@@ -745,9 +730,6 @@ public class CommandController extends BaseController {
     @GetMapping(value = "ZQ/list")
     @ApiOperation(httpMethod = "GET", value = "执勤实力列表分页查询", notes = "执勤实力列表分页查询")
     public ResponseModel<IPage<FireTeamZhDto>> ZQlistPage(Integer pageNum, Integer pageSize, RequestData par) {
-//        if(par.getTypeCode()==null){
-//            par.setTypeCode( AlertStageEnums.ZZZD.getCode()+","+AlertStageEnums.YLJY.getCode());
-//        }
         Page<FireTeamZhDto> pageBean = new Page<>(pageNum, pageSize);
         List<FireTeamZhDto> list = iFireTeamService.getFireTeamList(pageNum, pageSize, par);
         Integer num = iFireTeamService.getFireTeamListCount(par);
@@ -792,14 +774,14 @@ public class CommandController extends BaseController {
     @GetMapping(value = "/SY")
     @ApiOperation(httpMethod = "GET", value = "根据id查询水源", notes = "根据id查询水源")
     public ResponseModel<JSONObject> selectOne(Long id) {
-        JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(iWaterResourceService.selectBySequenceNbr(id)));
+        JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(iWaterResourceService.selectBySequenceNbr(id)));
 
-        if (!ValidationUtil.isEmpty(jsonObject.get("buildDate"))) {
-            String str = jsonObject.get("buildDate").toString();
+        if (!ValidationUtil.isEmpty(jsonObject.get(BUILDDATE))) {
+            String str = jsonObject.get(BUILDDATE).toString();
             Date date = new Date(Long.parseLong(str));
-            jsonObject.put("buildDate", DateUtils.convertDateToString(date, DateUtils.DATE_TIME_PATTERN));
+            jsonObject.put(BUILDDATE, DateUtils.convertDateToString(date, DateUtils.DATE_TIME_PATTERN));
         } else {
-            jsonObject.put("buildDate", "");
+            jsonObject.put(BUILDDATE, "");
         }
 
         if (ValidationUtil.isEmpty(jsonObject.get("intakeHeight"))) {
@@ -837,12 +819,11 @@ public class CommandController extends BaseController {
         RequestData requestData = new RequestData();
         requestData.setWhether24(true);
         List<AlertCalledZhDto> list = iAlertCalledService.alertCalledListByAlertStatus(null, null, requestData);
-//        List<SeismometeorologyDto> li = seismometeorologyDtoDao.findCarStateByWatchSn();
         List<SeismometeorologyDto> li =new ArrayList<>();
         //数据组装
         for (AlertCalledZhDto alertCalledZhDto : list) {
 
-            StringBuffer st = new StringBuffer();
+            StringBuilder st = new StringBuilder();
 
             String time = DateUtil.formatDate(alertCalledZhDto.getCallTime(), "yyyy-MM-dd HH:mm:ss");
 
@@ -1076,7 +1057,7 @@ public class CommandController extends BaseController {
             }
 
         }
-        return null;
+        return Collections.emptyList();
     }
 
 
@@ -1120,7 +1101,7 @@ public class CommandController extends BaseController {
     @GetMapping(value = "/lookHtmlText")
     @ApiOperation(value = "查看文件内容", notes = "查看文件内容")
     public ResponseModel<Object> lookHtmlText(HttpServletResponse response, @RequestParam(value = "fileUrl") String fileUrl, @RequestParam(value = "product") String product, @RequestParam(value = "appKey") String appKey, @RequestParam(value = "token") String token /* @PathVariable String fileName */)
-            throws Exception {
+            throws BaseException {
         String fileName = readUrl + fileUrl; //目标文件
         if (fileName.endsWith(".doc") || fileName.endsWith(".docx")) {
             String htmlPath = System.getProperty("user.dir") + File.separator + "lookHtml" + File.separator + "file" + File.separator;
@@ -1201,7 +1182,7 @@ public class CommandController extends BaseController {
                List<String> url = new ArrayList<>();
                if (list != null && list.size() > 0) {
                    list.stream().forEach(map -> {
-                       url.add(map.get("filePath").toString());
+                       url.add(map.get(FILEPATH).toString());
                    });
                }
 
@@ -1210,7 +1191,7 @@ public class CommandController extends BaseController {
                List<String> url1 = new ArrayList<>();
                if (list1 != null && list1.size() > 0) {
                    list1.stream().forEach(map -> {
-                       url1.add(map.get("filePath").toString());
+                       url1.add(map.get(FILEPATH).toString());
                    });
                }
                //立面
@@ -1218,7 +1199,7 @@ public class CommandController extends BaseController {
                List<String> url2 = new ArrayList<>();
                if (list2 != null && list2.size() > 0) {
                    list2.stream().forEach(map -> {
-                       url2.add(map.get("filePath").toString());
+                       url2.add(map.get(FILEPATH).toString());
                    });
                }
                orgusrDataxDto.setPlanePicture(url);
@@ -1267,7 +1248,7 @@ public class CommandController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @ApiOperation("当天值班人信息列表")
     @GetMapping("/getonDuty/list")
-    public ResponseModel listOnDutyPerson() {
+    public ResponseModel<Object> listOnDutyPerson() {
         return ResponseHelper.buildResponse(iDutyPersonService.listOnDutyPerson());
     }
 
@@ -1280,8 +1261,7 @@ public class CommandController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/findDutyCarStateBy", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "当日气象预警", notes = "当日气象预警")
-    public ResponseModel<Object> findDutyCarStateBy() throws Exception {
-//        List<SeismometeorologyDto> li = seismometeorologyDtoDao.findDutyCarStateBy();
+    public ResponseModel<Object> findDutyCarStateBy() throws BaseException {
         return ResponseHelper.buildResponse(null);
     }
 
@@ -1294,18 +1274,15 @@ public class CommandController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getVideo", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "分页获取视频", notes = "分页获取视频")
-    public ResponseModel<Object> getVideo(long current, long size) throws Exception {
-        Page page = new Page(current, size);
-        List<OrderItem> list = OrderItem.ascs("id");
-        page.setOrders(list);
+    public ResponseModel<Object> getVideo(long current, long size) throws BaseException {
         ResponseModel<Page<Map<String, Object>>> data = equipFeignClient.getVideo(current, size, 0L);
         Page<Map<String, Object>> pag = data != null ? data.getResult() : null;
         List<Map<String, Object>> records = pag != null ? pag.getRecords() : null;
         if (records != null && records.size() > 0) {
-            for (Map<String, Object> record : records) {
-                ResponseModel<String> da = videoFeignClient.videoUrlByIndexCode(record.get("code") + "");
-                String url = da != null ? da.getResult().substring(da.getResult().indexOf("openUrl")) : null;
-                record.put("url", url);
+            for (Map<String, Object> rec: records) {
+                ResponseModel<String> da = videoFeignClient.videoUrlByIndexCode(rec.get("code") + "");
+                String url = da != null ? da.getResult().substring(da.getResult().indexOf(OPENURL)) : null;
+                rec.put("url", url);
             }
             pag.setRecords(records);
         }
@@ -1324,8 +1301,8 @@ public class CommandController extends BaseController {
         queryWrapper.eq("status", FireCarStatusEnum.执行中.getCode());
         List<PowerTransferCompanyResources> alertFormValue = powerTransferCompanyResourcesMapper.selectList(queryWrapper);
         result.stream().forEach(e -> {
-            if (e.get("carState").equals("在位")) {
-                e.put("carState", FireCarStatusEnum.执勤.getName());
+            if (e.get(CARSTATE).equals("在位")) {
+                e.put(CARSTATE, FireCarStatusEnum.执勤.getName());
             }
 
             String sequenceNbr = e.get("sequenceNbr").toString();
@@ -1341,11 +1318,11 @@ public class CommandController extends BaseController {
             alertFormValue.stream().forEach(v -> {
                 if (v.getResourcesId().equals(sequenceNbr)) {
                     String carStatus = v.getCarStatus();
-                    e.put("carState", carStatus != null ? FireCarStatusEnum.getEnum(carStatus).getName() : null);
+                    e.put(CARSTATE, carStatus != null ? FireCarStatusEnum.getEnum(carStatus).getName() : null);
                 }
             });
         });
-        return ResponseHelper.buildResponse(date != null ? date.getResult() : null);
+        return ResponseHelper.buildResponse( date.getResult());
         /*bug 2583 地图屏，消防车辆类型时，左侧车辆状态显示错误 2021-10-26 陈召 结束 */
     }
 
@@ -1365,38 +1342,17 @@ public class CommandController extends BaseController {
     }
 
 
-//    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
-//    @GetMapping(value = "/testPostApi")
-//    @ApiOperation(httpMethod = "GET", value = "视频地址", notes = "视频地址")
-//    public Object testPost(Integer pageNum, Integer pageSize) throws URISyntaxException {
-//        RestTemplate restTemplate = new RestTemplate();
-//        URI uri = new URI(videoUrl+"artemis/api/resource/v1/camera/advance/cameraList");
-//        HttpHeaders headers = new HttpHeaders();
-////        headers.add("Authorization", "APPCODE " + appCode);
-//        //添加参数,因为HttpEntity里面的参数是MultiValueMap类型的，所以使用这个map集合
-//        MultiValueMap<String, Object> map = new LinkedMultiValueMap<>();
-//        map.add("pageSize", 100);
-//        map.add("pageNo", 1);
-//        //添加请求的实体类，这里第一个参数是要发送的参数，第二个参数是请求头里的数据
-//        HttpEntity<Object> requestEntity = new HttpEntity<Object>(map, headers);
-//        ResponseEntity<String> exchange = restTemplate.exchange(uri, HttpMethod.POST, requestEntity, String.class);
-//        JSONObject jsonObject = JSON.parseObject(exchange.getBody());
-//        System.out.println(jsonObject);
-//        return jsonObject;
-//
-//    }
 
     @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 {
+    public ResponseModel<List<OrgMenuDto>> getBuildTree(@PathVariable Long id) throws BaseException {
 
         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) {
@@ -1407,11 +1363,10 @@ public class CommandController extends BaseController {
 
 
         // 警情动态表单数据
-        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) {
+                if (KEYSITE.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);
@@ -1433,7 +1388,7 @@ public class CommandController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "根据bizOrgCode建筑部位树", notes = "根据bizOrgCode建筑部位树")
     @GetMapping(value = "/getBuildTreeCcs/{buildId}")
-    public ResponseModel<List<OrgMenuDto>> getBuildTreeCcs(@PathVariable Long buildId) throws Exception {
+    public ResponseModel<List<OrgMenuDto>> getBuildTreeCcs(@PathVariable Long buildId) throws BaseException {
 
         return ResponseHelper.buildResponse(keySiteService.getBuildAndKeyTree(buildId));
     }
@@ -1447,16 +1402,14 @@ public class CommandController extends BaseController {
         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")));
+                JSONArray array = JSON.parseArray(JSON.toJSONString(files.get("keySitePhoto")));
                 if (array != null && array.size() > 0) {
                     for (Object i : array) {
-                        JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(i));
+                        JSONObject object = JSON.parseObject(JSON.toJSONString(i));
                         list.add(object.getString("url"));
                     }
                 }
-            }
             dto.setAttachmentsList(list);
         }
         return ResponseHelper.buildResponse(dto);
@@ -1465,8 +1418,8 @@ public class CommandController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "app-根据警情id查询力量调派列表", notes = "app-根据警情id查询力量调派列表")
     @GetMapping(value = "/app/transferList")
-    public ResponseModel getPowerTransferList(@RequestParam String alertId, @RequestParam(defaultValue = "team") String type, @RequestParam(value = "current") int current, @RequestParam(value = "size") int size) {
-        Page page = new Page();
+    public ResponseModel<Object> getPowerTransferList(@RequestParam String alertId, @RequestParam(defaultValue = "team") String type, @RequestParam(value = "current") int current, @RequestParam(value = "size") int size) {
+        Page<PowerTransferResourceDto> page = new Page<>();
         page.setSize(size);
         page.setCurrent(current);
         return ResponseHelper.buildResponse(powerTransferService.getPowerTransferPageByParam(Long.valueOf(alertId), type, page));
@@ -1475,7 +1428,7 @@ public class CommandController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "app-根据警情id查询力量调派资源统计", notes = "app-根据警情id查询力量调派资源统计")
     @GetMapping(value = "/app/transfer/statistics")
-    public ResponseModel getPowerTransferStatistics(@RequestParam String alertId, @RequestParam(defaultValue = "team") String type) {
+    public ResponseModel<List<ResourceStatisticsDto>> getPowerTransferStatistics(@RequestParam String alertId, @RequestParam(defaultValue = "team") String type) {
         return ResponseHelper.buildResponse(powerTransferService.getPowerTransferStatistics(Long.valueOf(alertId), type));
     }
 
@@ -1607,7 +1560,7 @@ public class CommandController extends BaseController {
 
         id = userCar != null ? userCar.getCarId() : null;
         if (id == null && isNo != null && isNo) {
-            Map map = new HashMap();
+            Map<String,Object> map = new HashMap<>();
             map.put("select", null);
             map.put("data", null);
             return ResponseHelper.buildResponse(null);
@@ -1629,9 +1582,9 @@ public class CommandController extends BaseController {
                     }
                 }
             }
+            data.getResult().setRecords(array);
         }
-        data.getResult().setRecords(array);
-        Map map = new HashMap();
+        Map<String,Object> map = new HashMap<>();
         map.put("select", userCar != null ? userCar.getCarId() : null);
         map.put("data", data != null ? data.getResult() : null);
         return ResponseHelper.buildResponse(map);
@@ -1682,8 +1635,6 @@ public class CommandController extends BaseController {
         //获取用户已绑定车辆id、
         UserCar userCar = userCarService.selectByAmosUserId(Long.valueOf(agencyUserModel.getUserId()));
         return ResponseHelper.buildResponse(userCar);
-
-
     }
 
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@@ -1754,9 +1705,9 @@ public class CommandController extends BaseController {
                 String newStr = "";
                 for (int i = 0; i < equipmentList.size(); i++) {
                     if (i == equipmentList.size() - 1) {
-                        newStr =newStr+ str.concat(equipmentList.get(i).get("userName") + "");
+                        newStr =newStr+ str.concat(equipmentList.get(i).get(USERNAME) + "");
                     } else {
-                        newStr = newStr+str.concat(equipmentList.get(i).get("userName") + ",");
+                        newStr = newStr+str.concat(equipmentList.get(i).get(USERNAME) + ",");
                     }
                 }
                 powerTransferCompanyResources.setPw(newStr);
@@ -1786,9 +1737,9 @@ public class CommandController extends BaseController {
                     String newStr = "";
                     for (int i = 0; i < equipmentList.size(); i++) {
                         if (i == equipmentList.size() - 1) {
-                            newStr = newStr+str.concat(equipmentList.get(i).get("userName") + "");
+                            newStr = newStr+str.concat(equipmentList.get(i).get(USERNAME) + "");
                         } else {
-                            newStr =newStr+ str.concat(equipmentList.get(i).get("userName") + ",");
+                            newStr =newStr+ str.concat(equipmentList.get(i).get(USERNAME) + ",");
                         }
                     }
                     powerTransferCompanyResources.setPw(newStr);
@@ -1849,34 +1800,27 @@ public class CommandController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getuserBJ", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取当前登录人员是否绑定车辆", notes = "获取当前登录人员是否绑定车辆")
-    public ResponseModel<Object> getuserBJ() {
-        AgencyUserModel agencyUserModel = getUserInfo();
-        Long id = null;
-        //获取用户已绑定车辆id、
-        UserCar userCar = userCarService.selectByAmosUserId(Long.valueOf(agencyUserModel.getUserId()));
-        return ResponseHelper.buildResponse(userCar);
+    public ResponseModel<UserCar> getuserBJ() {
+                return  this.getAlertCalledId() ;
     }
 
     //存储啊手机上报的车辆信息
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/addESCar", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "手机上报", notes = "手机上报")
-    public ResponseModel<Object> addESCar( @RequestBody ESCar esCar) {
+    public ResponseModel<Object> addESCar( @RequestBody ESCarDto esCarDto) {
 
         try {
             Date date1=  new Date();
-            esCar.setId(UUID.randomUUID().toString().trim().replaceAll("-",""));
+            ESCar esCar = new ESCar();
+            BeanUtils.copyProperties(esCarDto,esCar);
+            esCar.setId(UUID.randomUUID().toString().trim().replace("-",""));
             esCar.setTime(date1.getTime());
             Gps gps = PositionUtil.gcj02_To_Gps84(Double.valueOf(esCar.getLatitude()), Double.valueOf(esCar.getLongitude()));
             esCar.setLongitude(String.valueOf(gps.getWgLon()));
             esCar.setLatitude(String.valueOf(gps.getWgLat()));
             esCarService.saveESCar(esCar);
             //给App端发送
-            // TODO
-
-//            esCar.setLatitude(String.valueOf(gps.getWgLat()));
-//            esCar.setLongitude(String.valueOf(gps.getWgLon()));
-
             ResponseModel<List<Map<String, Object>>> date = equipFeignClient.getTeamCarList(esCar.getSequenceNbr().toString(),null,null);
             List<Map<String, Object>> result = date.getResult();
             QueryWrapper<PowerTransferCompanyResources> queryWrapper = new QueryWrapper<>();
@@ -1884,8 +1828,8 @@ public class CommandController extends BaseController {
             List<PowerTransferCompanyResources> alertFormValue = powerTransferCompanyResourcesMapper.selectList(queryWrapper);
             if(result!=null&&result.size()>0){
                 result.stream().forEach(e -> {
-                    if (e.get("carState").equals("在位")) {
-                        e.put("carState", FireCarStatusEnum.执勤.getName());
+                    if (e.get(CARSTATE).equals("在位")) {
+                        e.put(CARSTATE, FireCarStatusEnum.执勤.getName());
                     }
 
                     String sequenceNbr = e.get("sequenceNbr").toString();
@@ -1893,7 +1837,7 @@ public class CommandController extends BaseController {
                     alertFormValue.stream().forEach(v -> {
                         if (v.getResourcesId().equals(sequenceNbr)) {
                             String carStatus = v.getCarStatus();
-                            e.put("carState", carStatus != null ? FireCarStatusEnum.getEnum(carStatus).getName() : null);
+                            e.put(CARSTATE, carStatus != null ? FireCarStatusEnum.getEnum(carStatus).getName() : null);
                         }
                     });
 
@@ -1901,8 +1845,10 @@ public class CommandController extends BaseController {
                     e.put("longitude", String.valueOf(gps.getWgLon()));
                 });
 
-                emqKeeper.getMqttClient().publish(topic,JSONObject.toJSONString(result.get(0)).getBytes(), RuleConfig.DEFAULT_QOS, false);
-                log.info(String.format("消息推送成功,数据: %s", JSON.toJSONString(result.get(0))));
+                emqKeeper.getMqttClient().publish(topic,JSON.toJSONString(result.get(0)).getBytes(), RuleConfig.DEFAULT_QOS, false);
+
+                String msg = "消息推送成功,数据: %s"+ JSON.toJSONString(result.get(0));
+                log.info(msg);
             }
 
 
@@ -1916,7 +1862,7 @@ public class CommandController extends BaseController {
     @RequestMapping(value = "/getEsCar", produces = "application/json;charset=UTF-8", method = RequestMethod.GET
     )
     @ApiOperation(httpMethod = "get", value = "手机上报", notes = "手机上报")
-    public ResponseModel<Object> getEsCar(Long sequenceNbr) throws Exception {
+    public ResponseModel<Object> getEsCar(Long sequenceNbr) throws BaseException {
         Iterable<ESCar> allById = esCarService.findAllById(Arrays.asList(sequenceNbr));
         List<ESCar> esCars = new ArrayList<>();
         allById.forEach(e -> {

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

@@ -96,7 +96,7 @@ public class FrontlineLiaisonController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = "前线联络员分页查询",  notes = "前线联络员分页查询")
 	public ResponseModel<Page<FrontlineLiaisonDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
                     (value = "size") int size,@RequestParam(value = "alertCalledId")Long alertCalledId) {
-	    Page<FrontlineLiaisonDto> page = new Page<FrontlineLiaisonDto>();
+	    Page<FrontlineLiaisonDto> page = new Page<>();
 	    page.setCurrent(current);
 	    page.setSize(size);
 	    return ResponseHelper.buildResponse(frontlineLiaisonServiceImpl.queryForFrontlineLiaisonPage(page,alertCalledId));

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/service/impl/FrontlineLiaisonServiceImpl.java

@@ -4,7 +4,6 @@ import com.yeejoin.amos.boot.module.command.api.entity.FrontlineLiaison;
 import com.yeejoin.amos.boot.module.command.api.mapper.FrontlineLiaisonMapper;
 import com.yeejoin.amos.boot.module.command.api.service.IFrontlineLiaisonService;
 import com.yeejoin.amos.boot.module.command.api.dto.FrontlineLiaisonDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FireExpertsDto;
 import org.typroject.tyboot.core.rdbms.annotation.Condition;
 import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/service/impl/RemoteSecurityService.java

@@ -7,11 +7,13 @@ import com.yeejoin.amos.boot.biz.common.utils.FileService;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.PermissionModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.util.Iterator;
 import java.util.List;
@@ -45,17 +47,17 @@ public class RemoteSecurityService  implements FileService{
 	             return urlString;
 	        } catch (Exception e) {  
 	        	e.printStackTrace();
-	            throw new RuntimeException();
+	            throw new BadRequest(e.getMessage());
 	        }
 	}
 
 	@Override
 	public List<PermissionModelDto> currentPermissionTree() {
 		List<Object> dictionarieModel = null;
-		FeignClientResult feignClientResult;
+		FeignClientResult<java.util.Collection<PermissionModel>>  feignClientResult;
 		try {
 			feignClientResult = Privilege.permissionClient.currentPermissionTree( "APP",null,null,null );
-			dictionarieModel = (List<Object>) feignClientResult.getResult();
+			dictionarieModel = (List) feignClientResult.getResult();
 
 		} catch (InnerInvokException e) {
 			e.printStackTrace();

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/utils/PositionUtil.java

@@ -7,6 +7,8 @@ public class PositionUtil {
 	private static double a = 6378245.0;
 	private static double ee = 0.00669342162296594323;
 
+	private PositionUtil() {
+	}
 	/**
 	 * 84 to 火星坐标系 (GCJ-02)
 	 *