解决冲突

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/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)
 	 *