Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-09-24 7dd6f64910238eca447d2bbc797f2817275963e6

Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java

@@ -35,11 +35,10 @@
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/30 15:33
 */
@Api(tags = "海康数据同步接口")
@Api(tags = "海康接口测试工具接口")
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/hktest")
public class HkInterfaceTestCloudController extends BaseController {


    @Autowired
    private SystemDictDataBiz systemDictDataBiz;
@@ -67,32 +66,32 @@
        return ApiResponse.success(  HKService.wxAccessToken(configId,tageId));
    }
    @ApiOperation("【海康】测试分页获取告警事件")
    @GetMapping("/nhEventPageList")
    @PostMapping("/nhEventPageList")
    @LoginNoRequired
    public ApiResponse<BaseResponse> nhEventPageList(@RequestBody NhEventPageListRequest param, HttpServletResponse response) {
        return ApiResponse.success(  HKService.nhEventPageList(param));
    }

    @ApiOperation("【海康】分页查询消防传感器部件状态")
    @GetMapping("/sensorStatusSearch")
    @PostMapping("/sensorStatusSearch")
    @LoginNoRequired
    public ApiResponse<BaseResponse> sensorStatusSearch(@RequestBody SensorStatusListRequest param, HttpServletResponse response) {
        return ApiResponse.success(  HKService.sensorStatusSearch(param));
    }
    @ApiOperation("【海康】查询消防传感器列表")
    @GetMapping("/fireChannelSearch")
    @PostMapping("/fireChannelSearch")
    @LoginNoRequired
    public ApiResponse<BaseResponse> fireChannelSearch(@RequestBody FireChannelListRequest param, HttpServletResponse response) {
        return ApiResponse.success(  HKService.fireChannelSearch(param));
    }
    @ApiOperation("【海康】海康询消防设备列表")
    @GetMapping("/fireDeviceSearch")
    @PostMapping("/fireDeviceSearch")
    @LoginNoRequired
    public ApiResponse<BaseResponse> fireDeviceSearch(@RequestBody FireDeviceListRequest param, HttpServletResponse response) {
        return ApiResponse.success(  HKService.fireDeviceSearch(param));
    }
    @ApiOperation("【海康】分页查询消防设备部件状态")
    @GetMapping("/fireDeviceStatusSearch")
    @PostMapping("/fireDeviceStatusSearch")
    @LoginNoRequired
    public ApiResponse<BaseResponse> fireDeviceStatusSearch(@RequestBody FireDeviceStatuslListRequest param, HttpServletResponse response) {
        return ApiResponse.success(  HKService.fireDeviceStatusSearch(param));

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java

@@ -195,4 +195,12 @@
    public ApiResponse<List<PlatformWarnEventListResponse>> warningEventList(@RequestBody PlatformWarnEventListRequest param) {
        return ApiResponse.success(new ArrayList<>());
    }

    @LoginNoRequired
    @PreventRepeat
    @ApiOperation("【月台】月台状态")
    @PostMapping("/platform/getStatusList")
    public ApiResponse<List<PlatformStatusListResponse>> getStatusList() {
        return ApiResponse.success(platformService.getPlatformStatusList());
    }
}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java

@@ -593,24 +593,24 @@
     * @param body
     * @return
     */
    public static String fireDeviceStatusSearch(Map<String,String> body) {
        return startDoGetStringArtemis(HKConstants.InterfacePath.fireDeviceStatusSearch,body);
    public static String fireDeviceStatusSearch(String body) {
        return startDoPostStringArtemis(HKConstants.InterfacePath.fireDeviceStatusSearch,body);
    }
    /**
     *    åˆ†é¡µæŸ¥è¯¢æ¶ˆé˜²ä¼ æ„Ÿå™¨éƒ¨ä»¶çŠ¶æ€
     * @param body
     * @return
     */
    public static String sensorStatusSearch(Map<String,String> body) {
        return startDoGetStringArtemis(HKConstants.InterfacePath.sensorStatusSearch,body);
    public static String sensorStatusSearch(String body) {
        return startDoPostStringArtemis(HKConstants.InterfacePath.sensorStatusSearch,body);
    }
    /**
     *    è¯¢æ¶ˆé˜²è®¾å¤‡åˆ—表
     * @param body
     * @return
     */
    public static String fireChannelSearch(Map<String,String> body) {
        return startDoGetStringArtemis(HKConstants.InterfacePath.fireChannelSearch,body);
    public static String fireChannelSearch(String body) {
        return startDoPostStringArtemis(HKConstants.InterfacePath.fireChannelSearch,body);
    }

    /**
@@ -618,8 +618,8 @@
     * @param body
     * @return
     */
    public static String fireDeviceSearch(Map<String,String> body) {
        return startDoGetStringArtemis(HKConstants.InterfacePath.fireDeviceSearch,body);
    public static String fireDeviceSearch(String body) {
        return startDoPostStringArtemis(HKConstants.InterfacePath.fireDeviceSearch,body);
    }
    /**
     *    èŽ·å–全量用户列表

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageResponse.java

@@ -13,6 +13,6 @@
  private int pageNo    ;// number    False    å½“前页码
  private int totalPage;//    number    False    æ€»é¡µæ•°

  @JSONField(name="list",alternateNames = {"rows","records"})
  @JSONField(name="list",alternateNames = {"rows","list"})
  private List<T> list    ;// object[]    False    æƒé™ç»„对象列表
}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireDeviceStatusListResponse.java

@@ -4,21 +4,16 @@

@Data
public class FireDeviceStatusListResponse {
      private String id    ;//String    false    é¢„告警事件唯一标识
      private String warningName    ;//String    false    é¢„告警名称
      private String nodeType    ;//Number    false    èŠ‚点类型
      private String nodeId    ;//String    false    èŠ‚点ID
      private String nodeName;//    String    false    èŠ‚点名称
      private String nodePath;//    String    false    èŠ‚点路径
      private String ruleType    ;//String    false    é¢„告警类型
      private String warningLevel    ;//Number    false    é¢„告警等级，1：一般，2：严重，3：故障
      private String warningValue    ;//String    false    æ•°æ®é¡¹å½“前值
      private String warningEventTip;//    String    false    å¼‚常原因
      private String createTime;//    String    false    å‘生时间
      private String benchmark;//    String    false    åŸºå‡†æ•°æ®
      private String handleStatus;//    Number    false    å¤„理状态：1：未处理，2：已处理
      private String note;//    String    false    å¤„理意见
      private String handleTime;//    String    false    å¤„理时间
      private String normal;//    Boolean    false    é¢„告警是否正常
      private String deviceId;//    String    false    è®¾å¤‡id
        private String cn    ;//String    false
        private String regionIndexCode    ;//String    false
        private String indexCode;//    String    false
        private String regionName;//    String    false
        private String deviceIndexCode;//    String    false
        private String deviceType;//    Number    false
        private String unitStatus    ;//Number    false
        private String online;//    Number    false
        private String collectTime;//    String    false
        private String faultType;//    String    false
        private String faultName;//    String    false
        private String faultNum;//    String    false
}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java

@@ -926,7 +926,7 @@
    public  static  BaseResponse<BaseListPageResponse<FireDeviceStatusListResponse>>   fireDeviceStatusSearch(FireDeviceStatuslListRequest param){
        log.info("【海康查询消防设备部件状态】================开始===="+JSONObject.toJSONString(param));
        try {
            String res = HKTools.fireDeviceStatusSearch(toMap(param));
            String res = HKTools.fireDeviceStatusSearch(JSONObject.toJSONString(param));
            TypeReference typeReference =
                    new TypeReference<BaseResponse<BaseListPageResponse<FireDeviceStatusListResponse>>>(){};
            BaseResponse<BaseListPageResponse<FireDeviceStatusListResponse>>   result = JSONObject.parseObject(res, typeReference.getType());
@@ -944,7 +944,7 @@
    public  static  BaseResponse<BaseListPageResponse<SensorStatusListResponse>>   sensorStatusSearch(SensorStatusListRequest param){
        log.info("【海康分页查询消防传感器部件状态】================开始===="+JSONObject.toJSONString(param));
        try {
            String res = HKTools.sensorStatusSearch(toMap(param));
            String res = HKTools.sensorStatusSearch(JSONObject.toJSONString(param));
            TypeReference typeReference =
                    new TypeReference<BaseResponse<BaseListPageResponse<SensorStatusListResponse>>>(){};
            BaseResponse<BaseListPageResponse<SensorStatusListResponse>>   result = JSONObject.parseObject(res, typeReference.getType());
@@ -963,7 +963,7 @@
    public  static  BaseResponse<BaseListPageResponse<FireChannelListResponse>>   fireChannelSearch(FireChannelListRequest param){
        log.info("【海康查询消防传感器列表】================开始===="+JSONObject.toJSONString(param));
        try {
            String res = HKTools.fireChannelSearch(toMap(param));
            String res = HKTools.fireChannelSearch(JSONObject.toJSONString(param));
            TypeReference typeReference =
                    new TypeReference<BaseResponse<BaseListPageResponse<FireChannelListResponse>>>(){};
            BaseResponse<BaseListPageResponse<FireChannelListResponse>>   result = JSONObject.parseObject(res, typeReference.getType());
@@ -981,7 +981,7 @@
    public  static  BaseResponse<BaseListPageResponse<FireDeviceListResponse>>   fireDeviceSearch(FireDeviceListRequest param){
        log.info("【海康询消防设备列表】================开始===="+JSONObject.toJSONString(param));
        try {
            String res = HKTools.fireDeviceSearch(toMap(param));
            String res = HKTools.fireDeviceSearch(JSONObject.toJSONString(param));
            TypeReference typeReference =
                    new TypeReference<BaseResponse<BaseListPageResponse<FireDeviceListResponse>>>(){};
            BaseResponse<BaseListPageResponse<FireDeviceListResponse>>   result = JSONObject.parseObject(res, typeReference.getType());
@@ -1338,7 +1338,6 @@
            log.error("【海康获取全部月台信息】================失败====：\n" + e.getMessage());
        }
        return null;

    }
    /**
     *发送消息给LED

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java

@@ -46,7 +46,6 @@

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
  
    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
@@ -184,6 +183,10 @@
    @TableField(exist = false)
    private Integer workStatus;

    @ApiModelProperty(value = "作业车辆车牌照")
    @TableField(exist = false)
    private String workCarCode;



    @ApiModelProperty(value = "月台作业数据")

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/openapi/response/PlatformStatusListResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.doumee.dao.openapi.response;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2023/12/7 11:19
 */
@Data
@ApiModel("【月台】月台状态")
public class PlatformStatusListResponse {

    @ApiModelProperty(value = "月台ID" )
    private String platformHkId;
    @ApiModelProperty(value = "月台名称" )
    private String platformName;
    @ApiModelProperty(value = "车牌号" )
    private String carCode;
    @ApiModelProperty(value = "月台状态 0-无车 1-有车 2-超时停靠 3-错误停靠" )
    private Integer status;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformService.java

@@ -4,6 +4,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Platform;
import com.doumee.dao.openapi.response.PlatformNumByStatusResponse;
import com.doumee.dao.openapi.response.PlatformStatusListResponse;

import java.util.List;

@@ -101,4 +102,6 @@

    PlatformNumByStatusResponse getPlatformNumByStatusResponse();

    List<PlatformStatusListResponse>  getPlatformStatusList();

}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java

@@ -14,6 +14,7 @@
import com.doumee.dao.business.join.PlatformJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.openapi.response.PlatformNumByStatusResponse;
import com.doumee.dao.openapi.response.PlatformStatusListResponse;
import com.doumee.service.business.PlatformDeviceService;
import com.doumee.service.business.PlatformService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -333,6 +334,35 @@



    @Override
    public List<PlatformStatusListResponse>  getPlatformStatusList(){
        List<Platform> platformList =  platformJoinMapper.selectJoinList(Platform.class,new MPJLambdaWrapper<Platform>()
                .selectAll(Platform.class)
                .select(" ( select count(1) from platform_job pj where t.id = pj.PLATFORM_ID and pj.STATUS = "+Constants.PlatformJobStatus.WORKING.getKey()+" ) as workStatus ")
                .select(" ( select pj.CAR_CODE_FRONT from platform_job pj where t.id = pj.PLATFORM_ID and pj.STATUS = "+Constants.PlatformJobStatus.WORKING.getKey()+" limit 1  ) as workCarCode ")
                .eq(Platform::getIsdeleted,Constants.ZERO)
        );
        List<PlatformStatusListResponse> platformStatusListResponses = new ArrayList<>();
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformList)){
            for (Platform platform:platformList) {
                PlatformStatusListResponse response = new PlatformStatusListResponse();
                response.setPlatformHkId(platform.getHkId());
                response.setPlatformName(platform.getName());
                response.setStatus(platform.getPlatformStatus());
                if(Constants.equalsInteger(platform.getPlatformStatus(),Constants.ONE)){
                    response.setCarCode(platform.getWorkCarCode());
                }



            }
        }


        return platformStatusListResponses;

    }



}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java

@@ -1027,7 +1027,6 @@
     */
    private void dealCarsInErrorPlatformBiz( PlatformJob model,EventPlatformCarsStatusInfoRequest status) {
        //TODO-----------------处理车辆进入错误月台业务逻辑

        List<PlatformDevice> deviceList = platformDeviceMapper.selectList(new QueryWrapper<PlatformDevice>().lambda()
                .eq(PlatformDevice::getPlatformId,model.getPlatformId())
                .eq(PlatformDevice::getIsdeleted,Constants.ZERO));
@@ -1041,7 +1040,6 @@
                continue;
            }
            if(Constants.equalsInteger(device.getType(),Constants.ZERO)){

                //如果是LED
                TransparentChannelBodyRequest body = new TransparentChannelBodyRequest();
                TransparentChannelHeadRequest head = new TransparentChannelHeadRequest();
@@ -1053,16 +1051,21 @@
                body.setMethod("ControlLedGereral");//固定值
                request.setIndexCode(device.getHkId());
                request.setOperationType(219);//固定值
                regions.setActionType(0);
                regions.setActionType(32);
                regions.setContent(content);
                regions.setRegionNo(1);
                regions.setRegionType(14);
                regions.setFontColor(2);
                regions.setFontColor(1);
                regions.setCircleTimes(1);//循环次数
                regions.setFontSize(31);//
                regions.setFontSize(32);//
                regions.setStayTime(1);//单位？？
                regions.setRegionLeftTopXPos(0);
                regions.setRegionLeftTopYPos(0);
                regions.setRegionRightBottomXPos(255);
                regions.setRegionRightBottomYPos(31);
                request.setRegions(new ArrayList<>());
                request.getRegions().add(regions);
                regions.setSpeed(13);
                body.setParams(request);
                HKService.transparentchannel(head,body);
            }else  if(Constants.equalsInteger(device.getType(),Constants.ZERO)){
@@ -1073,9 +1076,9 @@
        if(broadcastList.size()>0){
            CustomBroadcastRequest request = new CustomBroadcastRequest();
            request.setAudioPointIndexCode(broadcastList);
            request.setPlayDuration(60);//单位秒
            request.setPlayDuration(15);//单位秒
            request.setBroadCastMode("tts");
            request.setPriority(15);
            request.setPriority(1);
            request.setState(1);//播放/停止标识 1-播放，0-停止
            request.setPlayTtsContent(content);
            HKService.customBroadcast(request);