From 7fc6a36e9e336554a15e3d6c13d04dad0300cbc1 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期五, 30 九月 2022 11:25:25 +0800
Subject: [PATCH] 细节调整

---
 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java |   82 +++++++++++++++++++----------------------
 1 files changed, 38 insertions(+), 44 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
index e5220d4..936760c 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -1,5 +1,6 @@
 package com.ycl.service.caseHandler.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -14,8 +15,8 @@
 import com.ycl.mapper.caseHandler.*;
 import com.ycl.mapper.common.ImageResourcesMapper;
 import com.ycl.mapper.dict.DataDictionaryMapper;
-import com.ycl.remote.dto.EventAddParamDto;
-import com.ycl.remote.dto.EventProcessParamDto;
+import com.ycl.remote.dto.*;
+import com.ycl.remote.service.CityPlatformService;
 import com.ycl.service.caseHandler.IBaseCaseService;
 import com.ycl.service.caseHandler.IViolationsService;
 import com.ycl.service.video.IVideoAlarmReportService;
@@ -26,9 +27,8 @@
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.time.Instant;
+import java.time.Duration;
 import java.time.LocalDateTime;
-import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -44,17 +44,17 @@
 @Service
 public class BaseCaseServiceImpl extends ServiceImpl<BaseCaseMapper, BaseCase> implements IBaseCaseService {
 
-    //    private CityPlatformService cityPlatformService;
+    private CityPlatformService cityPlatformService;
     private IViolationsService violationsService;
     private IVideoAlarmReportService videoAlarmReportService;
 
     @Value("${fdfs.fileUrl}")
     private String fileUrl;
 
-//    @Autowired
-//    public void setCityPlatformService(CityPlatformService cityPlatformService) {
-//        this.cityPlatformService = cityPlatformService;
-//    }
+    @Autowired
+    public void setCityPlatformService(CityPlatformService cityPlatformService) {
+        this.cityPlatformService = cityPlatformService;
+    }
 
     @Autowired
     public void setViolationsService(IViolationsService violationsService) {
@@ -90,8 +90,6 @@
     ImageResourcesMapper imageResourcesMapper;
 
 
-
-
     @Override
     public String uploadEvent(Integer caseId) {
         BaseCase baseCase = this.getById(caseId);
@@ -106,53 +104,53 @@
                 medias = stringBuilder.toString();
             }
         }
-        EventAddParamDto dto = EventAddParamDto.builder().y84(baseCase.getLatitude().toString()).x84(baseCase.getLongitude().toString())
+        EventAddParamDto dto = EventAddParamDto.builder().y84(baseCase.getLatitude() != null ? baseCase.getLatitude().toString() : "")
+                .x84(baseCase.getLongitude() != null ? baseCase.getLongitude().toString() : "")
                 .source(11).address(baseCase.getSite()).eventDesc(eventDesc).eventSign(baseCase.getCode()).medias(medias).build();
-//        ResultResponseDto<EventAddResponseDto> result = cityPlatformService.addEvent(dto);
-//        if (result.getCode() == 0) {
-//            EventAddResponseDto responseDto = result.getResult();
-//            baseCase.setTaskCode(responseDto.getTaskcode());
-//            this.updateById(baseCase);
-//            return null;
-//        } else {
-//            return result.getMsg();
-//        }
-        return null;
+        String msg = cityPlatformService.addEvent(dto);
+        ResultResponseDto result = JSONObject.parseObject(msg, ResultResponseDto.class);
+        if (result.getCode() == 0) {
+            EventAddResponseDto responseDto = JSONObject.parseObject(result.getResult(), EventAddResponseDto.class);
+            baseCase.setTaskCode(responseDto.getTaskcode());
+            this.updateById(baseCase);
+            return null;
+        } else {
+            return result.getMsg();
+        }
     }
 
     @Override
     public String processEvent(Integer caseId) {
         BaseCase baseCase = this.getById(caseId);
         EventProcessParamDto paramDto = EventProcessParamDto.builder().eventSign(baseCase.getCode()).taskcode(baseCase.getTaskCode()).build();
-//        ResultResponseDto<EventProcessResponseDto> responseDto = cityPlatformService.getEventProcess(paramDto);
-//        if (responseDto.getCode() == 0) {
-//            EventProcessResponseDto eventProcessResponseDto = responseDto.getResult();
-//            /*********** 鏈鐞嗗競骞冲彴杩斿洖鏁版嵁 ***************/
-//            return null;
-//        } else {
-//            return responseDto.getMsg();
-//        }
-        return null;
+        String msg = cityPlatformService.getEventProcess(paramDto);
+        ResultResponseDto responseDto = JSONObject.parseObject(msg, ResultResponseDto.class);
+        if (responseDto.getCode() == 0) {
+            EventProcessResponseDto eventProcessResponseDto = JSONObject.parseObject(responseDto.getResult(), EventProcessResponseDto.class);
+            /*********** 鏈鐞嗗競骞冲彴杩斿洖鏁版嵁 ***************/
+            return null;
+        } else {
+            return responseDto.getMsg();
+        }
     }
 
     @Override
     public Page listViolationsPage(Page page, Integer state, Integer resource) {
         Integer type = 01;
+        Integer hours = 60;
         Page<CasePoolViolationDO> violationsPage = baseCaseMapper.listViolationsPage(page, state, type, resource);
         List<CasePoolViolationVO> violationVOList = violationsPage.getRecords().stream().map(item -> {
             CasePoolViolationVO casePoolViolationVO = new CasePoolViolationVO();
             BeanUtils.copyProperties(item, casePoolViolationVO);
             if (item.getCloseTime() == null) {
-                long nowTime = System.currentTimeMillis();
-                long alarmTime = item.getAlarmTime().toEpochSecond(ZoneOffset.ofHours(8));
-                LocalDateTime continueTimes = Instant.ofEpochMilli(nowTime - alarmTime).atZone(ZoneOffset.ofHours(8)).toLocalDateTime();
-                String continueTime = continueTimes.getHour() + "鏃�" + continueTimes.getSecond() + "鍒嗛挓";
+                Duration duration = Duration.between(item.getAlarmTime(), LocalDateTime.now());
+                long minutes = duration.toMinutes() - (duration.toHours() * hours);
+                String continueTime = duration.toHours() + "鏃�" + minutes + "鍒嗛挓";
                 casePoolViolationVO.setContinueTime(continueTime);
             } else {
-                long closeTime = item.getCloseTime().toEpochSecond(ZoneOffset.ofHours(8));
-                long alarmTime = item.getAlarmTime().toEpochSecond(ZoneOffset.ofHours(8));
-                LocalDateTime continueTimes = Instant.ofEpochMilli(closeTime - alarmTime).atZone(ZoneOffset.ofHours(8)).toLocalDateTime();
-                String continueTime = continueTimes.getHour() + "鏃�" + continueTimes.getSecond() + "鍒嗛挓";
+                Duration duration = Duration.between(item.getAlarmTime(), item.getCloseTime());
+                long minutes = duration.toMinutes() - (duration.toHours() * hours);
+                String continueTime = duration.toHours() + "鏃�" + minutes + "鍒嗛挓";
                 casePoolViolationVO.setContinueTime(continueTime);
             }
             casePoolViolationVO.setCategory(dataDictionaryMapper.selectById(item.getCategoryId()).getName());
@@ -188,9 +186,7 @@
 
     @Override
     public Boolean saveViolationCase(ViolationParam violationParam, Integer id) {
-        BaseCase baseCase = new BaseCase();
         Violations violations = new Violations();
-        BeanUtils.copyProperties(violationParam, baseCase);
         BeanUtils.copyProperties(violationParam, violations);
         violations.setId(id);
         Integer value = 1;
@@ -199,9 +195,7 @@
 
     @Override
     public Boolean saveIllegalBuildingCase(IllegalBuildingParam illegalBuildingParam, Integer id) {
-        BaseCase baseCase = new BaseCase();
         IllegalBuilding illegalBuilding = new IllegalBuilding();
-        BeanUtils.copyProperties(illegalBuilding, baseCase);
         BeanUtils.copyProperties(illegalBuilding, illegalBuildingParam);
         illegalBuilding.setBaseCaseId(id);
         Integer value = 1;
@@ -222,7 +216,7 @@
         QueryWrapper<WorkflowConfig> wrapperWc = new QueryWrapper<>();
         wrapperWc.lambda().eq(WorkflowConfig::getCode, "ddlc").or().eq(WorkflowConfig::getCode, "wtcllc");
         List<WorkflowConfig> wcs = workflowConfigMapper.selectList(wrapperWc);
-        Integer ddlcId=0,wtcllcId=0;
+        Integer ddlcId = 0, wtcllcId = 0;
         for (WorkflowConfig wc : wcs) {
             if ("ddlc".equals(wc.getCode())) {
                 ddlcId = wc.getId();

--
Gitblit v1.8.0