Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/CheckTypeSuEnum.java

@@ -13,7 +13,10 @@ public enum CheckTypeSuEnum {
      */
     DAILY("日常检查", "1", "daily"),
     SPECIAL_RQ("燃气专项", "2", "special"),
-    SPECIAL_GW("高温专项", "3", "special");
+    SPECIAL_GW("高温专项", "3", "special"),
+    SPECIAL_DQ("电气专项", "4", "special"),
+    SPECIAL_HD("重大活动专项", "5", "special"),
+    SPECIAL_BZ("重大保障专项", "6", "special");
 
     /**
      * 名字

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/ExcelController.java

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import java.util.Map;
-
-import javax.servlet.http.HttpServletResponse;
-
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.ExcelDto;
+import com.yeejoin.amos.boot.module.jcs.api.enums.ExcelEnums;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.DataSourcesImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.ExcelServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -19,14 +22,8 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.common.api.dto.ExcelDto;
-import com.yeejoin.amos.boot.module.jcs.api.enums.ExcelEnums;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.DataSourcesImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.ExcelServiceImpl;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
 
 /**
  * 导出导入
@@ -188,9 +185,9 @@ public class ExcelController extends BaseController {
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "导出给提供设备接口")
-    @PostMapping("/exportForEquipment")
-    public  ResponseModel<String[]> getFireStationFileByParams(@RequestParam(value = "type") String type,
-                                           @RequestParam(value = "method") String method) {
+    @GetMapping(value = "/exportForEquipment")
+    public  ResponseModel<String[]> getFireStationFileByParams( String type,
+                                          String method) {
         try {
             return ResponseHelper.buildResponse(dataSources.selectList(type,method));
         } catch (Exception e) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/ESElevatorServiceImpl.java

@@ -6,9 +6,7 @@ import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.tzs.api.dto.EsElevatorDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
-import com.yeejoin.amos.boot.module.tzs.api.entity.ElevatorAlarm;
 import com.yeejoin.amos.boot.module.tzs.api.entity.EsElevator;
-import com.yeejoin.amos.boot.module.tzs.api.enums.LiftAlarmDealStatusEnum;
 import com.yeejoin.amos.boot.module.tzs.biz.dao.ESElavtorRepository;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
@@ -119,20 +117,22 @@ public class ESElevatorServiceImpl {
             qb4.must(QueryBuilders.termQuery("sequenceNbr",  alertCalled.getEquipmentId()));
             boolMust.must(qb4);
         } else {
-            if(elevatorDto.getIsToday() != null && elevatorDto.getIsToday()) {
-                queryWrapper.ge(AlertCalled::getCallTime, DateUtils.stampToDate(System.currentTimeMillis(),DateUtils.DATE_PATTERN));
-                queryWrapper.le(AlertCalled::getCallTime, DateUtils.stampToDate(DateUtils.dateAddDays(new Date(),1).getTime(),DateUtils.DATE_PATTERN));
-            }
+            if(!ValidationUtil.isEmpty(elevatorDto.getAlarmTypeCode())) {
+                if(elevatorDto.getIsToday() != null && elevatorDto.getIsToday()) {
+                    queryWrapper.ge(AlertCalled::getCallTime, DateUtils.stampToDate(System.currentTimeMillis(),DateUtils.DATE_PATTERN));
+                    queryWrapper.le(AlertCalled::getCallTime, DateUtils.stampToDate(DateUtils.dateAddDays(new Date(),1).getTime(),DateUtils.DATE_PATTERN));
+                }
 
-            alertCalleds  = iAlertCalledService.list(queryWrapper);
-            List<Long> stringList = new ArrayList<>();
-            for (AlertCalled al: alertCalleds
-            ) {
-                stringList.add(al.getEquipmentId());
+                alertCalleds  = iAlertCalledService.list(queryWrapper);
+                List<Long> stringList = new ArrayList<>();
+                for (AlertCalled al: alertCalleds
+                ) {
+                    stringList.add(al.getEquipmentId());
+                }
+                List<Long> listL = stringList.stream().distinct().collect(Collectors.toList());
+                qb0.should(QueryBuilders.termsQuery("sequenceNbr",  listL.toArray()));
+                boolMust.must(qb0);
             }
-            List<Long> listL = stringList.stream().distinct().collect(Collectors.toList());
-            qb0.should(QueryBuilders.termsQuery("sequenceNbr",  listL.toArray()));
-            boolMust.must(qb0);
         }
 
 
@@ -169,33 +169,20 @@ public class ESElevatorServiceImpl {
                 JSONObject jsonObject = (JSONObject) JSONObject.toJSON(searchHit.getContent());
                 EsElevatorDto esElevatorDto =JSONObject.toJavaObject(jsonObject, EsElevatorDto.class);
 
-                if(null != alertCalled) {
-                   // Elevator elevator = elevatorService.getById(esElevatorDto.getSequenceNbr());
-                    LambdaQueryWrapper<ElevatorAlarm> queryWrapper1 = new LambdaQueryWrapper<>();
-                    queryWrapper1.eq(ElevatorAlarm::getRegisterCode,esElevatorDto.getRegisterCode());
-                    queryWrapper1.orderByDesc(ElevatorAlarm::getStartDate);
-                    List<ElevatorAlarm>  elevatorAlarms = elevatorAlarmServiceImpl.list(queryWrapper1);
-                    if(null != elevatorAlarms && elevatorAlarms.size() > 0) {
-                        esElevatorDto.setType(elevatorAlarms.get(0).getType());
-                        esElevatorDto.setStatus(LiftAlarmDealStatusEnum.getEnum(elevatorAlarms.get(0).getDealStatus()).getName());
-
-                    }
-                    esElevatorDto.setHappenTime(alertCalled.getCallTime());
-                    esElevatorDto.setAlertId(String.valueOf(alertCalled.getSequenceNbr()));
-                    esElevatorDto.setAlarmTypeCode(alertCalled.getAlarmTypeCode());
-
-                } else {
+                if(null != alertCalleds) {
                     for (AlertCalled al: alertCalleds
                     ) {
                         if(al.getEquipmentId().equals(esElevatorDto.getSequenceNbr())) {
                             esElevatorDto.setHappenTime(al.getCallTime());
                             esElevatorDto.setAlertId(String.valueOf(al.getSequenceNbr()));
                             esElevatorDto.setAlarmTypeCode(al.getAlarmTypeCode());
+                            list.add(esElevatorDto);
                             break;
                         }
                     }
+                } else {
+                    list.add(esElevatorDto);
                 }
-                list.add(esElevatorDto);
             }
         }
         catch (Exception e)