diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index 4d865b8..d79ae26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -13,6 +13,7 @@ import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.dto.DictDTO; import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; @@ -28,6 +29,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.validation.Valid; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Objects; @@ -155,28 +157,7 @@ @RequestMapping(value = "/detail") @ResponseBody public Object detail(Long id) { - Summary summary = summaryService.getById(id); - if (ObjectUtil.isNotEmpty(summary.getPlateResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setCommonRequestList(list); - } - if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setSpreadResultList(list); - } - if (ObjectUtil.isNotEmpty(summary.getForeignResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setForeignResultList(list); - } - if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setDiscoveryResultList(list); - } - return ResponseData.success(summary); + return ResponseData.success(summaryService.detailDp(id)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index 4d865b8..d79ae26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -13,6 +13,7 @@ import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.dto.DictDTO; import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; @@ -28,6 +29,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.validation.Valid; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Objects; @@ -155,28 +157,7 @@ @RequestMapping(value = "/detail") @ResponseBody public Object detail(Long id) { - Summary summary = summaryService.getById(id); - if (ObjectUtil.isNotEmpty(summary.getPlateResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setCommonRequestList(list); - } - if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setSpreadResultList(list); - } - if (ObjectUtil.isNotEmpty(summary.getForeignResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setForeignResultList(list); - } - if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setDiscoveryResultList(list); - } - return ResponseData.success(summary); + return ResponseData.success(summaryService.detailDp(id)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java index 486b07d..8a5c7db 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java @@ -17,6 +17,8 @@ private String value1; + private String value2; + public CommonResponse() { } @@ -25,4 +27,14 @@ this.value = value; this.value1 = value1; } + + public CommonResponse(String name, String value, String value1, String value2) { + this.name = name; + this.value = value; + this.value1 = value1; + this.value2 = value2; + } + + + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index 4d865b8..d79ae26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -13,6 +13,7 @@ import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.dto.DictDTO; import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; @@ -28,6 +29,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.validation.Valid; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Objects; @@ -155,28 +157,7 @@ @RequestMapping(value = "/detail") @ResponseBody public Object detail(Long id) { - Summary summary = summaryService.getById(id); - if (ObjectUtil.isNotEmpty(summary.getPlateResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setCommonRequestList(list); - } - if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setSpreadResultList(list); - } - if (ObjectUtil.isNotEmpty(summary.getForeignResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setForeignResultList(list); - } - if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setDiscoveryResultList(list); - } - return ResponseData.success(summary); + return ResponseData.success(summaryService.detailDp(id)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java index 486b07d..8a5c7db 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java @@ -17,6 +17,8 @@ private String value1; + private String value2; + public CommonResponse() { } @@ -25,4 +27,14 @@ this.value = value; this.value1 = value1; } + + public CommonResponse(String name, String value, String value1, String value2) { + this.name = name; + this.value = value; + this.value1 = value1; + this.value2 = value2; + } + + + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java index 378f967..5f8e15b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.CommonResponse; import lombok.Data; import java.util.Date; @@ -138,6 +139,9 @@ @TableField(exist = false) private List spreadResultList; + //供大屏显示用 + @TableField(exist = false) + private List dpList; @Override public String toString() { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index 4d865b8..d79ae26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -13,6 +13,7 @@ import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.dto.DictDTO; import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; @@ -28,6 +29,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.validation.Valid; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Objects; @@ -155,28 +157,7 @@ @RequestMapping(value = "/detail") @ResponseBody public Object detail(Long id) { - Summary summary = summaryService.getById(id); - if (ObjectUtil.isNotEmpty(summary.getPlateResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setCommonRequestList(list); - } - if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setSpreadResultList(list); - } - if (ObjectUtil.isNotEmpty(summary.getForeignResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setForeignResultList(list); - } - if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setDiscoveryResultList(list); - } - return ResponseData.success(summary); + return ResponseData.success(summaryService.detailDp(id)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java index 486b07d..8a5c7db 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java @@ -17,6 +17,8 @@ private String value1; + private String value2; + public CommonResponse() { } @@ -25,4 +27,14 @@ this.value = value; this.value1 = value1; } + + public CommonResponse(String name, String value, String value1, String value2) { + this.name = name; + this.value = value; + this.value1 = value1; + this.value2 = value2; + } + + + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java index 378f967..5f8e15b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.CommonResponse; import lombok.Data; import java.util.Date; @@ -138,6 +139,9 @@ @TableField(exist = false) private List spreadResultList; + //供大屏显示用 + @TableField(exist = false) + private List dpList; @Override public String toString() { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java index d71a38e..3b614b4 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java @@ -31,4 +31,6 @@ Object update(Summary summary); Object detail(Long summaryId); + + Object detailDp(Long id); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index 4d865b8..d79ae26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -13,6 +13,7 @@ import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.dto.DictDTO; import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; @@ -28,6 +29,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.validation.Valid; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Objects; @@ -155,28 +157,7 @@ @RequestMapping(value = "/detail") @ResponseBody public Object detail(Long id) { - Summary summary = summaryService.getById(id); - if (ObjectUtil.isNotEmpty(summary.getPlateResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setCommonRequestList(list); - } - if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setSpreadResultList(list); - } - if (ObjectUtil.isNotEmpty(summary.getForeignResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setForeignResultList(list); - } - if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setDiscoveryResultList(list); - } - return ResponseData.success(summary); + return ResponseData.success(summaryService.detailDp(id)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java index 486b07d..8a5c7db 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java @@ -17,6 +17,8 @@ private String value1; + private String value2; + public CommonResponse() { } @@ -25,4 +27,14 @@ this.value = value; this.value1 = value1; } + + public CommonResponse(String name, String value, String value1, String value2) { + this.name = name; + this.value = value; + this.value1 = value1; + this.value2 = value2; + } + + + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java index 378f967..5f8e15b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.CommonResponse; import lombok.Data; import java.util.Date; @@ -138,6 +139,9 @@ @TableField(exist = false) private List spreadResultList; + //供大屏显示用 + @TableField(exist = false) + private List dpList; @Override public String toString() { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java index d71a38e..3b614b4 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java @@ -31,4 +31,6 @@ Object update(Summary summary); Object detail(Long summaryId); + + Object detailDp(Long id); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java index 17d8de5..00e5254 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java @@ -84,6 +84,7 @@ List> firstMapList = new ArrayList<>(); List> secondMapList = new ArrayList<>(); List> thirdMapList = new ArrayList<>(); + List> dpMapList = new ArrayList<>(); List tagResponseList = iCmdBodyRoamService.getTagResponses(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()); List dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(new Date(), -6), new Date(), DateField.DAY_OF_YEAR); @@ -91,6 +92,8 @@ Map firstMap = new HashMap<>(); Map secondMap = new HashMap<>(); Map thirdMap = new HashMap<>(); + Map dpMap = new HashMap<>(); + dpMap.put("name", DateUtil.formatDate(dateTime)); firstMap.put("name", DateUtil.formatDate(dateTime)); firstMap.put("value", 0); secondMap.put("name", DateUtil.formatDate(dateTime)); @@ -108,14 +111,19 @@ } } }); + dpMap.put("value", firstMap.get("value")); + dpMap.put("value1", secondMap.get("value")); + dpMap.put("value2", thirdMap.get("value")); firstMapList.add(firstMap); secondMapList.add(secondMap); thirdMapList.add(thirdMap); + dpMapList.add(dpMap); }); //修改封装数据结构 hashMap.put("zdzj", firstMapList); hashMap.put("sjmg", secondMapList); hashMap.put("cgxx", thirdMapList); + hashMap.put("dp", dpMapList); return hashMap; } @@ -124,6 +132,7 @@ List> firstMapList = new ArrayList<>(); List> secondMapList = new ArrayList<>(); List> thirdMapList = new ArrayList<>(); + List> dpMapList = new ArrayList<>(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.ge("END_TIME", DateUtil.offsetDay(new Date(), -6)); List judgmentList = this.list(queryWrapper); @@ -184,17 +193,26 @@ dayMap.put("name", DateUtil.formatDate(dateTime)); dayMap.put("value", tag3Map.get("third")); thirdMapList.add(dayMap); + dayMap = new HashMap<>(); + dayMap.put("name", DateUtil.formatDate(dateTime)); + dayMap.put("value", tag1Map.get("first")); + dayMap.put("value1", tag2Map.get("second")); + dayMap.put("value2", tag3Map.get("third")); + dpMapList.add(dayMap); }); //修改封装数据结构 hashMap.put("zdzj", firstMapList); hashMap.put("sjmg", secondMapList); hashMap.put("cgxx", thirdMapList); + hashMap.put("dp", dpMapList); return hashMap; } @Override public Map statisticsByDateTime(JudgmentRequest judgmentRequest) { - return iBusinessAccessService.getAccessStatus("2-sj") ? getDataByOther(judgmentRequest) : getDataByLocal(judgmentRequest); + return iBusinessAccessService.getAccessStatus("2-sj") ? + getDataByOther(judgmentRequest) : + getDataByLocal(judgmentRequest); } public List processUtil(List list1, List list2) { @@ -215,8 +233,8 @@ public Judgment getListByLocal(JudgmentRequest judgmentRequest) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.ge(ObjectUtil.isNotEmpty(judgmentRequest.getBeginTime()), "endTime", judgmentRequest.getBeginTime()); - queryWrapper.le(ObjectUtil.isNotEmpty(judgmentRequest.getEndTime()), "endTime", judgmentRequest.getEndTime()); + queryWrapper.ge(ObjectUtil.isNotEmpty(judgmentRequest.getBeginTime()), "END_TIME", judgmentRequest.getBeginTime()); + queryWrapper.le(ObjectUtil.isNotEmpty(judgmentRequest.getEndTime()), "END_TIME", judgmentRequest.getEndTime()); List judgmentList = this.list(queryWrapper); Judgment judgmentResult = new Judgment(); judgmentList.forEach(judgment -> { @@ -240,7 +258,8 @@ } }); //用于大屏回显 - judgmentResult.setStartTime(judgmentRequest.getBeginTime()+","+judgmentRequest.getEndTime()); + judgmentResult.setStartTime(judgmentRequest.getBeginTime()); + judgmentResult.setEndTime(judgmentRequest.getEndTime()); return judgmentResult; } @@ -259,7 +278,7 @@ subDicts.add(second); List codes = subDicts.stream().map(Dict::getCode).collect(Collectors.toList()); tagResponseList.forEach(tagResponse -> { - if (codes.contains(tagResponse.getTagId())) { + if (codes.contains(tagResponse.getClassify())) { commonRequest.setValue((Long.valueOf(commonRequest.getValue()) + 1) + ""); } }); @@ -274,7 +293,7 @@ subDicts.add(second); List codes = subDicts.stream().map(Dict::getCode).collect(Collectors.toList()); tagResponseList.forEach(tagResponse -> { - if (codes.contains(tagResponse.getTagId())) { + if (codes.contains(tagResponse.getClassify())) { commonRequest.setValue((Long.valueOf(commonRequest.getValue()) + 1) + ""); } }); @@ -289,7 +308,7 @@ subDicts.add(second); List codes = subDicts.stream().map(Dict::getCode).collect(Collectors.toList()); tagResponseList.forEach(tagResponse -> { - if (codes.contains(tagResponse.getTagId())) { + if (codes.contains(tagResponse.getClassify())) { commonRequest.setValue((Long.valueOf(commonRequest.getValue()) + 1) + ""); } }); @@ -303,7 +322,8 @@ Integer sum2 = judgmentResult.getTitle2List().stream().mapToInt(commonRequest -> Integer.valueOf(commonRequest.getValue())).sum(); Integer sum3 = judgmentResult.getTitle3List().stream().mapToInt(commonRequest -> Integer.valueOf(commonRequest.getValue())).sum(); judgmentResult.setJudgmentTotal(sum1 + sum2 + sum3); - judgmentResult.setStartTime(judgmentRequest.getBeginTime()+","+judgmentRequest.getEndTime()); + judgmentResult.setStartTime(judgmentRequest.getBeginTime()); + judgmentResult.setEndTime(judgmentRequest.getEndTime()); return judgmentResult; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index 4d865b8..d79ae26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -13,6 +13,7 @@ import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.dto.DictDTO; import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; @@ -28,6 +29,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.validation.Valid; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Objects; @@ -155,28 +157,7 @@ @RequestMapping(value = "/detail") @ResponseBody public Object detail(Long id) { - Summary summary = summaryService.getById(id); - if (ObjectUtil.isNotEmpty(summary.getPlateResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setCommonRequestList(list); - } - if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setSpreadResultList(list); - } - if (ObjectUtil.isNotEmpty(summary.getForeignResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setForeignResultList(list); - } - if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setDiscoveryResultList(list); - } - return ResponseData.success(summary); + return ResponseData.success(summaryService.detailDp(id)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java index 486b07d..8a5c7db 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java @@ -17,6 +17,8 @@ private String value1; + private String value2; + public CommonResponse() { } @@ -25,4 +27,14 @@ this.value = value; this.value1 = value1; } + + public CommonResponse(String name, String value, String value1, String value2) { + this.name = name; + this.value = value; + this.value1 = value1; + this.value2 = value2; + } + + + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java index 378f967..5f8e15b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.CommonResponse; import lombok.Data; import java.util.Date; @@ -138,6 +139,9 @@ @TableField(exist = false) private List spreadResultList; + //供大屏显示用 + @TableField(exist = false) + private List dpList; @Override public String toString() { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java index d71a38e..3b614b4 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java @@ -31,4 +31,6 @@ Object update(Summary summary); Object detail(Long summaryId); + + Object detailDp(Long id); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java index 17d8de5..00e5254 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java @@ -84,6 +84,7 @@ List> firstMapList = new ArrayList<>(); List> secondMapList = new ArrayList<>(); List> thirdMapList = new ArrayList<>(); + List> dpMapList = new ArrayList<>(); List tagResponseList = iCmdBodyRoamService.getTagResponses(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()); List dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(new Date(), -6), new Date(), DateField.DAY_OF_YEAR); @@ -91,6 +92,8 @@ Map firstMap = new HashMap<>(); Map secondMap = new HashMap<>(); Map thirdMap = new HashMap<>(); + Map dpMap = new HashMap<>(); + dpMap.put("name", DateUtil.formatDate(dateTime)); firstMap.put("name", DateUtil.formatDate(dateTime)); firstMap.put("value", 0); secondMap.put("name", DateUtil.formatDate(dateTime)); @@ -108,14 +111,19 @@ } } }); + dpMap.put("value", firstMap.get("value")); + dpMap.put("value1", secondMap.get("value")); + dpMap.put("value2", thirdMap.get("value")); firstMapList.add(firstMap); secondMapList.add(secondMap); thirdMapList.add(thirdMap); + dpMapList.add(dpMap); }); //修改封装数据结构 hashMap.put("zdzj", firstMapList); hashMap.put("sjmg", secondMapList); hashMap.put("cgxx", thirdMapList); + hashMap.put("dp", dpMapList); return hashMap; } @@ -124,6 +132,7 @@ List> firstMapList = new ArrayList<>(); List> secondMapList = new ArrayList<>(); List> thirdMapList = new ArrayList<>(); + List> dpMapList = new ArrayList<>(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.ge("END_TIME", DateUtil.offsetDay(new Date(), -6)); List judgmentList = this.list(queryWrapper); @@ -184,17 +193,26 @@ dayMap.put("name", DateUtil.formatDate(dateTime)); dayMap.put("value", tag3Map.get("third")); thirdMapList.add(dayMap); + dayMap = new HashMap<>(); + dayMap.put("name", DateUtil.formatDate(dateTime)); + dayMap.put("value", tag1Map.get("first")); + dayMap.put("value1", tag2Map.get("second")); + dayMap.put("value2", tag3Map.get("third")); + dpMapList.add(dayMap); }); //修改封装数据结构 hashMap.put("zdzj", firstMapList); hashMap.put("sjmg", secondMapList); hashMap.put("cgxx", thirdMapList); + hashMap.put("dp", dpMapList); return hashMap; } @Override public Map statisticsByDateTime(JudgmentRequest judgmentRequest) { - return iBusinessAccessService.getAccessStatus("2-sj") ? getDataByOther(judgmentRequest) : getDataByLocal(judgmentRequest); + return iBusinessAccessService.getAccessStatus("2-sj") ? + getDataByOther(judgmentRequest) : + getDataByLocal(judgmentRequest); } public List processUtil(List list1, List list2) { @@ -215,8 +233,8 @@ public Judgment getListByLocal(JudgmentRequest judgmentRequest) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.ge(ObjectUtil.isNotEmpty(judgmentRequest.getBeginTime()), "endTime", judgmentRequest.getBeginTime()); - queryWrapper.le(ObjectUtil.isNotEmpty(judgmentRequest.getEndTime()), "endTime", judgmentRequest.getEndTime()); + queryWrapper.ge(ObjectUtil.isNotEmpty(judgmentRequest.getBeginTime()), "END_TIME", judgmentRequest.getBeginTime()); + queryWrapper.le(ObjectUtil.isNotEmpty(judgmentRequest.getEndTime()), "END_TIME", judgmentRequest.getEndTime()); List judgmentList = this.list(queryWrapper); Judgment judgmentResult = new Judgment(); judgmentList.forEach(judgment -> { @@ -240,7 +258,8 @@ } }); //用于大屏回显 - judgmentResult.setStartTime(judgmentRequest.getBeginTime()+","+judgmentRequest.getEndTime()); + judgmentResult.setStartTime(judgmentRequest.getBeginTime()); + judgmentResult.setEndTime(judgmentRequest.getEndTime()); return judgmentResult; } @@ -259,7 +278,7 @@ subDicts.add(second); List codes = subDicts.stream().map(Dict::getCode).collect(Collectors.toList()); tagResponseList.forEach(tagResponse -> { - if (codes.contains(tagResponse.getTagId())) { + if (codes.contains(tagResponse.getClassify())) { commonRequest.setValue((Long.valueOf(commonRequest.getValue()) + 1) + ""); } }); @@ -274,7 +293,7 @@ subDicts.add(second); List codes = subDicts.stream().map(Dict::getCode).collect(Collectors.toList()); tagResponseList.forEach(tagResponse -> { - if (codes.contains(tagResponse.getTagId())) { + if (codes.contains(tagResponse.getClassify())) { commonRequest.setValue((Long.valueOf(commonRequest.getValue()) + 1) + ""); } }); @@ -289,7 +308,7 @@ subDicts.add(second); List codes = subDicts.stream().map(Dict::getCode).collect(Collectors.toList()); tagResponseList.forEach(tagResponse -> { - if (codes.contains(tagResponse.getTagId())) { + if (codes.contains(tagResponse.getClassify())) { commonRequest.setValue((Long.valueOf(commonRequest.getValue()) + 1) + ""); } }); @@ -303,7 +322,8 @@ Integer sum2 = judgmentResult.getTitle2List().stream().mapToInt(commonRequest -> Integer.valueOf(commonRequest.getValue())).sum(); Integer sum3 = judgmentResult.getTitle3List().stream().mapToInt(commonRequest -> Integer.valueOf(commonRequest.getValue())).sum(); judgmentResult.setJudgmentTotal(sum1 + sum2 + sum3); - judgmentResult.setStartTime(judgmentRequest.getBeginTime()+","+judgmentRequest.getEndTime()); + judgmentResult.setStartTime(judgmentRequest.getBeginTime()); + judgmentResult.setEndTime(judgmentRequest.getEndTime()); return judgmentResult; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java index e918948..36ce485 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java @@ -276,10 +276,13 @@ List xfList = iCmdBodyInstructService.getCountByTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime()); + List> dpMapList = new ArrayList<>(); List> sbMapList = new ArrayList<>(); List dateTimeList = DateUtil.rangeToList(DateUtil.offsetHour(new Date(), -7), new Date(), DateField.HOUR_OF_DAY); dateTimeList.forEach(dateTime -> { Map sbMap = new HashMap<>(); + Map dpMap = new HashMap<>(); + dpMap.put("name", DateUtil.hour(dateTime, true)); sbMap.put("name", DateUtil.hour(dateTime, true)); sbMap.put("value", 0); sbList.forEach(sb -> { @@ -288,7 +291,9 @@ sbMap.put("value", Long.valueOf(sbMap.get("value") + "") + 1); } }); + dpMap.put("value", sbMap.get("value")); sbMapList.add(sbMap); + dpMapList.add(dpMap); }); List> xfMapList = new ArrayList<>(); @@ -303,9 +308,15 @@ } }); xfMapList.add(xfMap); + dpMapList.forEach(dp -> { + if (dp.get("name").equals(xfMap.get("name"))) { + dp.put("value1", xfMap.get("value")); + } + }); }); resultMap.put("sb", sbMapList); resultMap.put("xf", xfMapList); + resultMap.put("dp", dpMapList); return resultMap; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index 4d865b8..d79ae26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -13,6 +13,7 @@ import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.dto.DictDTO; import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; @@ -28,6 +29,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.validation.Valid; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Objects; @@ -155,28 +157,7 @@ @RequestMapping(value = "/detail") @ResponseBody public Object detail(Long id) { - Summary summary = summaryService.getById(id); - if (ObjectUtil.isNotEmpty(summary.getPlateResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setCommonRequestList(list); - } - if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setSpreadResultList(list); - } - if (ObjectUtil.isNotEmpty(summary.getForeignResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setForeignResultList(list); - } - if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - summary.setDiscoveryResultList(list); - } - return ResponseData.success(summary); + return ResponseData.success(summaryService.detailDp(id)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java index 486b07d..8a5c7db 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java @@ -17,6 +17,8 @@ private String value1; + private String value2; + public CommonResponse() { } @@ -25,4 +27,14 @@ this.value = value; this.value1 = value1; } + + public CommonResponse(String name, String value, String value1, String value2) { + this.name = name; + this.value = value; + this.value1 = value1; + this.value2 = value2; + } + + + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java index 378f967..5f8e15b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.CommonResponse; import lombok.Data; import java.util.Date; @@ -138,6 +139,9 @@ @TableField(exist = false) private List spreadResultList; + //供大屏显示用 + @TableField(exist = false) + private List dpList; @Override public String toString() { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java index d71a38e..3b614b4 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java @@ -31,4 +31,6 @@ Object update(Summary summary); Object detail(Long summaryId); + + Object detailDp(Long id); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java index 17d8de5..00e5254 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java @@ -84,6 +84,7 @@ List> firstMapList = new ArrayList<>(); List> secondMapList = new ArrayList<>(); List> thirdMapList = new ArrayList<>(); + List> dpMapList = new ArrayList<>(); List tagResponseList = iCmdBodyRoamService.getTagResponses(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()); List dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(new Date(), -6), new Date(), DateField.DAY_OF_YEAR); @@ -91,6 +92,8 @@ Map firstMap = new HashMap<>(); Map secondMap = new HashMap<>(); Map thirdMap = new HashMap<>(); + Map dpMap = new HashMap<>(); + dpMap.put("name", DateUtil.formatDate(dateTime)); firstMap.put("name", DateUtil.formatDate(dateTime)); firstMap.put("value", 0); secondMap.put("name", DateUtil.formatDate(dateTime)); @@ -108,14 +111,19 @@ } } }); + dpMap.put("value", firstMap.get("value")); + dpMap.put("value1", secondMap.get("value")); + dpMap.put("value2", thirdMap.get("value")); firstMapList.add(firstMap); secondMapList.add(secondMap); thirdMapList.add(thirdMap); + dpMapList.add(dpMap); }); //修改封装数据结构 hashMap.put("zdzj", firstMapList); hashMap.put("sjmg", secondMapList); hashMap.put("cgxx", thirdMapList); + hashMap.put("dp", dpMapList); return hashMap; } @@ -124,6 +132,7 @@ List> firstMapList = new ArrayList<>(); List> secondMapList = new ArrayList<>(); List> thirdMapList = new ArrayList<>(); + List> dpMapList = new ArrayList<>(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.ge("END_TIME", DateUtil.offsetDay(new Date(), -6)); List judgmentList = this.list(queryWrapper); @@ -184,17 +193,26 @@ dayMap.put("name", DateUtil.formatDate(dateTime)); dayMap.put("value", tag3Map.get("third")); thirdMapList.add(dayMap); + dayMap = new HashMap<>(); + dayMap.put("name", DateUtil.formatDate(dateTime)); + dayMap.put("value", tag1Map.get("first")); + dayMap.put("value1", tag2Map.get("second")); + dayMap.put("value2", tag3Map.get("third")); + dpMapList.add(dayMap); }); //修改封装数据结构 hashMap.put("zdzj", firstMapList); hashMap.put("sjmg", secondMapList); hashMap.put("cgxx", thirdMapList); + hashMap.put("dp", dpMapList); return hashMap; } @Override public Map statisticsByDateTime(JudgmentRequest judgmentRequest) { - return iBusinessAccessService.getAccessStatus("2-sj") ? getDataByOther(judgmentRequest) : getDataByLocal(judgmentRequest); + return iBusinessAccessService.getAccessStatus("2-sj") ? + getDataByOther(judgmentRequest) : + getDataByLocal(judgmentRequest); } public List processUtil(List list1, List list2) { @@ -215,8 +233,8 @@ public Judgment getListByLocal(JudgmentRequest judgmentRequest) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.ge(ObjectUtil.isNotEmpty(judgmentRequest.getBeginTime()), "endTime", judgmentRequest.getBeginTime()); - queryWrapper.le(ObjectUtil.isNotEmpty(judgmentRequest.getEndTime()), "endTime", judgmentRequest.getEndTime()); + queryWrapper.ge(ObjectUtil.isNotEmpty(judgmentRequest.getBeginTime()), "END_TIME", judgmentRequest.getBeginTime()); + queryWrapper.le(ObjectUtil.isNotEmpty(judgmentRequest.getEndTime()), "END_TIME", judgmentRequest.getEndTime()); List judgmentList = this.list(queryWrapper); Judgment judgmentResult = new Judgment(); judgmentList.forEach(judgment -> { @@ -240,7 +258,8 @@ } }); //用于大屏回显 - judgmentResult.setStartTime(judgmentRequest.getBeginTime()+","+judgmentRequest.getEndTime()); + judgmentResult.setStartTime(judgmentRequest.getBeginTime()); + judgmentResult.setEndTime(judgmentRequest.getEndTime()); return judgmentResult; } @@ -259,7 +278,7 @@ subDicts.add(second); List codes = subDicts.stream().map(Dict::getCode).collect(Collectors.toList()); tagResponseList.forEach(tagResponse -> { - if (codes.contains(tagResponse.getTagId())) { + if (codes.contains(tagResponse.getClassify())) { commonRequest.setValue((Long.valueOf(commonRequest.getValue()) + 1) + ""); } }); @@ -274,7 +293,7 @@ subDicts.add(second); List codes = subDicts.stream().map(Dict::getCode).collect(Collectors.toList()); tagResponseList.forEach(tagResponse -> { - if (codes.contains(tagResponse.getTagId())) { + if (codes.contains(tagResponse.getClassify())) { commonRequest.setValue((Long.valueOf(commonRequest.getValue()) + 1) + ""); } }); @@ -289,7 +308,7 @@ subDicts.add(second); List codes = subDicts.stream().map(Dict::getCode).collect(Collectors.toList()); tagResponseList.forEach(tagResponse -> { - if (codes.contains(tagResponse.getTagId())) { + if (codes.contains(tagResponse.getClassify())) { commonRequest.setValue((Long.valueOf(commonRequest.getValue()) + 1) + ""); } }); @@ -303,7 +322,8 @@ Integer sum2 = judgmentResult.getTitle2List().stream().mapToInt(commonRequest -> Integer.valueOf(commonRequest.getValue())).sum(); Integer sum3 = judgmentResult.getTitle3List().stream().mapToInt(commonRequest -> Integer.valueOf(commonRequest.getValue())).sum(); judgmentResult.setJudgmentTotal(sum1 + sum2 + sum3); - judgmentResult.setStartTime(judgmentRequest.getBeginTime()+","+judgmentRequest.getEndTime()); + judgmentResult.setStartTime(judgmentRequest.getBeginTime()); + judgmentResult.setEndTime(judgmentRequest.getEndTime()); return judgmentResult; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java index e918948..36ce485 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java @@ -276,10 +276,13 @@ List xfList = iCmdBodyInstructService.getCountByTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime()); + List> dpMapList = new ArrayList<>(); List> sbMapList = new ArrayList<>(); List dateTimeList = DateUtil.rangeToList(DateUtil.offsetHour(new Date(), -7), new Date(), DateField.HOUR_OF_DAY); dateTimeList.forEach(dateTime -> { Map sbMap = new HashMap<>(); + Map dpMap = new HashMap<>(); + dpMap.put("name", DateUtil.hour(dateTime, true)); sbMap.put("name", DateUtil.hour(dateTime, true)); sbMap.put("value", 0); sbList.forEach(sb -> { @@ -288,7 +291,9 @@ sbMap.put("value", Long.valueOf(sbMap.get("value") + "") + 1); } }); + dpMap.put("value", sbMap.get("value")); sbMapList.add(sbMap); + dpMapList.add(dpMap); }); List> xfMapList = new ArrayList<>(); @@ -303,9 +308,15 @@ } }); xfMapList.add(xfMap); + dpMapList.forEach(dp -> { + if (dp.get("name").equals(xfMap.get("name"))) { + dp.put("value1", xfMap.get("value")); + } + }); }); resultMap.put("sb", sbMapList); resultMap.put("xf", xfMapList); + resultMap.put("dp", dpMapList); return resultMap; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java index 0c029dd..8cca861 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java @@ -1,15 +1,21 @@ package com.casic.missiles.modular.system.service.impl; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.SummaryMapper; +import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.Summary; import com.casic.missiles.modular.system.service.ISummaryService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -35,12 +41,12 @@ @Override public Page listPage(Page page, HashMap map) { - return summaryMapper.getSummaryList(page,map); + return summaryMapper.getSummaryList(page, map); } @Override public Object add(Summary summary) { - if(summaryMapper.insert(summary) > 0){ + if (summaryMapper.insert(summary) > 0) { return ResponseData.success(); } return ResponseData.error("操作失败"); @@ -48,7 +54,7 @@ @Override public Object batchDelete(List summaryIds) { - if(summaryMapper.deleteBatchIds(summaryIds) > 0){ + if (summaryMapper.deleteBatchIds(summaryIds) > 0) { return ResponseData.success(); } return ResponseData.error("操作失败"); @@ -56,7 +62,7 @@ @Override public Object delete(Long summaryId) { - if(summaryMapper.deleteById(summaryId) > 0){ + if (summaryMapper.deleteById(summaryId) > 0) { return ResponseData.success(); } return ResponseData.error("操作失败"); @@ -64,7 +70,7 @@ @Override public Object update(Summary summary) { - if(summaryMapper.updateById(summary) > 0){ + if (summaryMapper.updateById(summary) > 0) { return ResponseData.success(); } return ResponseData.error("操作失败"); @@ -74,4 +80,73 @@ public Object detail(Long summaryId) { return summaryMapper.selectById(summaryId); } + + @Override + public Object detailDp(Long id) { + + Summary summary = this.getById(id); + List commonResponseList = new ArrayList<>(); + if (ObjectUtil.isNotEmpty(summary.getPlateResult())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + summary.setCommonRequestList(list); + } + if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + summary.setSpreadResultList(list); + } + if (ObjectUtil.isNotEmpty(summary.getForeignResult())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + summary.setForeignResultList(list); + } + if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + summary.setDiscoveryResultList(list); + } + if (ObjectUtil.isNotEmpty(summary.getDiscoveryResultList())) { + summary.getDiscoveryResultList().forEach(commonRequest -> { + CommonResponse commonResponse = new CommonResponse(); + commonResponse.setName(commonRequest.getTime()); + commonResponse.setValue(commonRequest.getValue()); + commonResponseList.add(commonResponse); + }); + } + if (ObjectUtil.isNotEmpty(summary.getForeignResultList())) { + summary.getForeignResultList().forEach(commonRequest -> { + if (ObjectUtil.isNotEmpty(commonResponseList)) { + commonResponseList.forEach(commonResponse -> { + if (commonResponse.getName().equals(commonRequest.getTime())) { + commonResponse.setValue1(commonRequest.getValue()); + } + }); + } else { + CommonResponse commonResponse = new CommonResponse(); + commonResponse.setName(commonRequest.getTime()); + commonResponse.setValue1(commonRequest.getValue()); + commonResponseList.add(commonResponse); + } + }); + } + if (ObjectUtil.isNotEmpty(summary.getSpreadResultList())) { + summary.getSpreadResultList().forEach(commonRequest -> { + if (ObjectUtil.isNotEmpty(commonResponseList)) { + commonResponseList.forEach(commonResponse -> { + if (commonResponse.getName().equals(commonRequest.getTime())) { + commonResponse.setValue2(commonRequest.getValue()); + } + }); + } else { + CommonResponse commonResponse = new CommonResponse(); + commonResponse.setName(commonRequest.getTime()); + commonResponse.setValue2(commonRequest.getValue()); + commonResponseList.add(commonResponse); + } + }); + } + summary.setDpList(commonResponseList); + return summary; + } }