Merge remote-tracking branch 'origin/dev' into dev

epmet-auth/src/main/resources/bootstrap.yml

@@ -32,6 +32,8 @@ spring:
         namespace: @nacos.discovery.namespace@
         #不把自己注册到注册中心的地址
         register-enabled: @nacos.register-enabled@
+        serviceListChangedListening:
+          enable: @nacos.service-list-changed-listening.enable@
       config:
         enabled: @nacos.config-enabled@
         server-addr: @nacos.server-addr@

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffPatrolDetailDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -94,7 +95,7 @@ public class StaffPatrolDetailDTO implements Serializable {
 	private String horizontalaccuracy;
 
     /**
-     * 地址；暂时不用
+     * 地址
      */
 	private String address;
 

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolRecordDetailDTO.java

@@ -34,4 +34,9 @@ public class PatrolRecordDetailDTO implements Serializable {
 	 * 后端返回：开始巡查；结束巡查；此列只有集合第一条，和最后一条有值
 	 */
 	private String flag;
+
+	/**
+	 * 位置信息
+	 */
+	private String address;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -226,8 +226,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
             String totalTimeDesc = minutes / 60 + "小时"+ minutes % 60 + "分";
             dto.setTotalTimeDesc(totalTimeDesc);
             List<StaffPatrolDetailDTO> detailList = details.get(record.getId());
-            detailList =
-                    detailList.stream().sorted(Comparator.comparing(StaffPatrolDetailDTO::getSerialNum).reversed()).collect(Collectors.toList()).stream()
+            detailList = detailList.stream().sorted(Comparator.comparing(StaffPatrolDetailDTO::getSerialNum).reversed()).collect(Collectors.toList()).stream()
                     .filter(item -> null == record.getPatrolEndTime() || record.getPatrolEndTime().compareTo(item.getUploadTime()) > -1).collect(Collectors.toList());
             List<PatrolRecordDetailDTO> recordDetails = detailList.stream().map( detail -> {
                         PatrolRecordDetailDTO detailDTO = new PatrolRecordDetailDTO();
@@ -235,6 +234,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
                         detailDTO.setLongitude(detail.getLongitude());
                         detailDTO.setSpeed(detail.getSpeed());
                         detailDTO.setUploadTime(DateUtils.format(detail.getUploadTime(), DateUtils.DATE_TIME_PATTERN));
+                        detailDTO.setAddress(detail.getAddress());
                         return detailDTO;
                     }).collect(Collectors.toList());
             if (("end").equals(record.getStatus())) {

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml

@@ -46,7 +46,7 @@
             IFNULL(avg(data.publish_issue_ratio),0) AS publishIssueRatioA,
             CEILING(sum(data.PLAT_ISSUE_TOTAL)) AS platIssueTotal,
             IFNULL(avg(data.PLAT_JOIN_PARTY_RATIO),0) AS platJoinPartyRatio,
-            DATA_END_TIME as dataEndTime
+            data.DATA_END_TIME as dataEndTime
         FROM
             screen_pioneer_data data
         LEFT JOIN

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BlockChainProjectController.java

@@ -28,8 +28,8 @@ public class BlockChainProjectController {
      */
     @PostMapping("create")
     public Result blockChainCreateProject(@RequestBody BlockChainCreateProjectFormDTO input) {
-        ValidatorUtils.validateEntity(input);
-        blockChainProjectService.blockChainCreateProject(input);
+        //ValidatorUtils.validateEntity(input);
+        //blockChainProjectService.blockChainCreateProject(input);
         return new Result();
     }
 
@@ -40,8 +40,8 @@ public class BlockChainProjectController {
      */
     @PostMapping("process")
     public Result blockChainProcessProject(@RequestBody BlockChainProcessProjectFormDTO input) {
-        ValidatorUtils.validateEntity(input);
-        blockChainProjectService.blockChainProcessProject(input);
+        //ValidatorUtils.validateEntity(input);
+        //blockChainProjectService.blockChainProcessProject(input);
         return new Result();
     }
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java

@@ -36,6 +36,10 @@ public class BlockChainUploadServiceImpl implements BlockChainUploadService {
      */
     public void send2BlockChain(ProjectEntity projectEntity, ProjectProcessEntity processEntity, List<ProjectStaffEntity> assignedStaffEntities, String projectStaffId) {
 
+        if (true) {
+            return;
+        }
+        
         // 1.项目主信息
         BlockChainProjectFormDTO project = null;
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolUploadDetailFormDTO.java

@@ -1,21 +0,0 @@
-package com.epmet.dto.form;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @author zhaoqifeng
- * @dscription
- * @date 2021/6/9 16:31
- */
-@Data
-public class PatrolUploadDetailFormDTO implements Serializable {
-	private static final long serialVersionUID = 1527344810917196996L;
-	/**
-	 * 巡查主记录id, 开始巡查反参
-	 */
-	private String staffPatrolRecId;
-	private List<PatrolUploadFormDTO> details;
-}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolUploadFormDTO.java

@@ -54,4 +54,8 @@ public class PatrolUploadFormDTO implements Serializable {
 	 * 序号,前端生成，后端记录
 	 */
 	private Integer serialNum;
+	/**
+	 * 位置信息
+	 */
+	private String address;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java

@@ -120,13 +120,6 @@ public class StaffPatrolController {
 
 	}
 
-	@PostMapping("uploaddetails")
-	public Result<PatrolUploadResultDTO> uploadDetails(@LoginUser TokenDto tokenDto, @RequestBody PatrolUploadDetailFormDTO formDTO) {
-		PatrolUploadResultDTO result = staffPatrolRecordService.uploadDetails(tokenDto, formDTO);
-		return new Result<PatrolUploadResultDTO>().ok(result);
-
-	}
-
     /**
      * @Description  查询经纬度
      * @Param userIds

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolDetailEntity.java

@@ -94,7 +94,7 @@ public class StaffPatrolDetailEntity extends BaseEpmetEntity {
 	private String horizontalaccuracy;
 
     /**
-     * 地址；暂时不用
+     * 地址
      */
 	private String address;
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffPatrolRecordService.java

@@ -91,16 +91,6 @@ public interface StaffPatrolRecordService extends BaseService<StaffPatrolRecordE
 	 */
 	PatrolUploadResultDTO uploadDetail(TokenDto tokenDto, PatrolUploadFormDTO formDTO);
 
-	/**
-	 * 上传巡查记录
-	 * @author zhaoqifeng
-	 * @date 2021/6/9 16:32
-	 * @param tokenDto
-	 * @param formDTO
-	 * @return com.epmet.dto.result.PatrolUploadResultDTO
-	 */
-	PatrolUploadResultDTO uploadDetails(TokenDto tokenDto, PatrolUploadDetailFormDTO formDTO);
-
     /**
      * @Description  查询经纬度
      * @Param userIds

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java

@@ -377,6 +377,7 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		detailEntity.setAltitude(formDTO.getAltitude());
 		detailEntity.setVerticalaccuracy(formDTO.getVerticalAccuracy());
 		detailEntity.setHorizontalaccuracy(formDTO.getHorizontalAccuracy());
+		detailEntity.setAddress(formDTO.getAddress());
 		staffPatrolDetailService.insert(detailEntity);
 
 		PatrolUploadResultDTO dto = new PatrolUploadResultDTO();
@@ -384,42 +385,6 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		return dto;
 	}
 
-	/**
-	 * 上传巡查记录
-	 *
-	 * @param tokenDto
-	 * @param formDTO
-	 * @return com.epmet.dto.result.PatrolUploadResultDTO
-	 * @author zhaoqifeng
-	 * @date 2021/6/9 16:32
-	 */
-	@Override
-	public PatrolUploadResultDTO uploadDetails(TokenDto tokenDto, PatrolUploadDetailFormDTO formDTO) {
-		if (CollectionUtils.isNotEmpty(formDTO.getDetails())) {
-			List<StaffPatrolDetailEntity> list = formDTO.getDetails().stream().map(detail -> {
-				StaffPatrolDetailEntity detailEntity = new StaffPatrolDetailEntity();
-				detailEntity.setStaffPatrolRecId(formDTO.getStaffPatrolRecId());
-				detailEntity.setCustomerId(tokenDto.getCustomerId());
-				detailEntity.setSerialNum(detail.getSerialNum());
-				detailEntity.setUploadTime(new Date());
-				detailEntity.setLatitude(detail.getLatitude());
-				detailEntity.setLongitude(detail.getLongitude());
-				detailEntity.setSpeed(detail.getSpeed());
-				detailEntity.setAccuracy(detail.getAccuracy());
-				detailEntity.setAltitude(detail.getAltitude());
-				detailEntity.setVerticalaccuracy(detail.getVerticalAccuracy());
-				detailEntity.setHorizontalaccuracy(detail.getHorizontalAccuracy());
-				return detailEntity;
-			}).collect(Collectors.toList());
-
-			staffPatrolDetailService.insertBatch(list);
-		}
-
-		PatrolUploadResultDTO dto = new PatrolUploadResultDTO();
-		dto.setStaffPatrolRecId(formDTO.getStaffPatrolRecId());
-		return dto;
-	}
-
 	/**
 	 * @Description  查询经纬度
 	 * @Param userIds