1、全域、片区、风电场站、光伏场站健康状态指数与趋势,改成10分钟汇总

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IPersonnelBusinessService.java

@@ -17,4 +17,6 @@ public interface IPersonnelBusinessService {
     UserDataDto getPersonnelBusinessById(String id);
 
     Object deleteAllBySequenceNbr(Long sequenceNbr);
+
+    Boolean deleteBySequenceNbrs(String sequenceNbrs);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PersonnelBusinessController.java

@@ -108,6 +108,19 @@ public class PersonnelBusinessController extends BaseController {
     }
 
     /**
+     * 根据sequenceNbrs批量删除
+     *
+     * @param sequenceNbrs 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/deleteDealerPerson")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbrs批量删除经销商人员信息", notes = "根据sequenceNbrs批量删除经销商人员信息")
+    public ResponseModel<Boolean> deleteBySequenceNbrs(@RequestParam(value = "sequenceNbrs") String sequenceNbrs){
+        return ResponseHelper.buildResponse(personnelBusinessServiceImpl.deleteBySequenceNbrs(sequenceNbrs));
+    }
+
+    /**
      * 根据sequenceNbr查询
      *
 	 * @param sequenceNbr  主键

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TDBigScreenAnalyseController.java

@@ -176,7 +176,7 @@ public class TDBigScreenAnalyseController extends BaseController {
         String finalStationCode = stationCode;
        // List<String> dateList = dateInfoBy15.stream().map(i -> i.get("date")).collect(Collectors.toList());
         String finalAreaCode = areaCode;
-        if ((WarningPeriodEnum.DAY.getName().equals(analysisType) || analysisType == null)) {
+        if ((WarningPeriodEnum.DAY.getName().equals(analysisType))) {
             List<String> fullDateList = dateList.stream().map(s -> {
                 return s + " 00:00:00";
             }).collect(Collectors.toList());
@@ -198,7 +198,7 @@ public class TDBigScreenAnalyseController extends BaseController {
                 String value = map.get(date) != null ? String.valueOf(map.get(date)) : "100";
                 valueList.add(String.valueOf(Math.round(Double.valueOf(value) * 10.0) / 10.0));
             }
-        } else if (WarningPeriodEnum.MINUTES.getName().equals(analysisType)) {
+        } else if (WarningPeriodEnum.MINUTES.getName().equals(analysisType) || analysisType == null) {
             List<Map<String, Object>> healthListInfo = fanHealthIndexMapper.getInfoByMoment(finalAreaCode,
                     finalStationCode, dateList);
             Map<String, Object> map = healthListInfo.stream().collect(Collectors