1、新增查询停车库剩余车位数；

2、优化单个设备数据写入接口，新增判断注册过的设备是不是属于本产品的代码逻辑；
3、新增产品列表和设备列表缓存更新触发机制；

data-gateway/data-gateway-vd-hik/src/main/java/com/usky/hik/controller/api/HkVideoApi.java

@@ -188,4 +188,35 @@ public class HkVideoApi {
 
         return ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, contentType , null);
     }
+
+    /**
+     * 查询停车库剩余车位数
+     * @param parkSyscode
+     * @return
+     */
+    public static String parkRemainSpace(String parkSyscode){
+
+        /**
+         * STEP2：设置OpenAPI接口的上下文
+         */
+        final String ARTEMIS_PATH = "/artemis";
+        final String url = ARTEMIS_PATH+"/api/pms/v1/park/remainSpaceNum";
+        Map<String, String> path = new HashMap<String, String>(2) {
+            {
+                put("https://", url);//根据现场环境部署确认是http还是https
+            }
+        };
+        /**
+         * 添加请求参数
+         */
+        JSONObject jsonBody = new JSONObject();
+        jsonBody.put("parkSyscode", parkSyscode);
+        String body = jsonBody.toJSONString();
+        /**
+         * STEP4：设置参数提交方式
+         */
+        String contentType = "application/json";
+
+        return ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, contentType , null);
+    }
 }

data-gateway/data-gateway-vd-hik/src/main/java/com/usky/hik/controller/web/DeviceAlarmController.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.hikvision.artemis.sdk.ArtemisHttpUtil;
 import com.usky.hik.service.utils.HttpClientUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +21,7 @@ import java.util.HashMap;
 
 @RestController
 @RequestMapping("/deviceAlarm")
+@Slf4j
 public class DeviceAlarmController {
     private static final Logger logger = LoggerFactory.getLogger(DeviceAlarmController.class);
     @Value("${alarm.url}")
@@ -57,7 +59,7 @@ public class DeviceAlarmController {
 
         Object obj_target_attrs = JSON.toJSONString(json_data.get("targetAttrs"));
         JSONObject json_target_attrs = JSONObject.parseObject(obj_target_attrs.toString());
-        String deviceIndexCode = json_target_attrs.get("deviceIndexCode").toString();
+        String deviceIndexCode = json_target_attrs.get("cameraIndexCode").toString();
         JSONArray array_throw = JSONArray.parseArray(json_data.get("ObjectsThrownDetection").toString());
         JSONObject json_throw = JSONObject.parseObject(array_throw.getJSONObject(0).toJSONString());
 

data-gateway/data-gateway-vd-hik/src/main/java/com/usky/hik/service/listener/MqttListener.java

@@ -50,6 +50,9 @@ public class MqttListener {
                 }else if(method.equals("driverRecordControl")){
                     mqttBaseVO.setDescribe("driverRecordControl");
                     mqttBaseVO.setData(payload);
+                }else if(method.equals("parkRemainSpaceControl")){
+                    mqttBaseVO.setDescribe("parkRemainSpaceControl");
+                    mqttBaseVO.setData(payload);
                 }
                 //统一处理数据
                 simpleContext.getResource(mqttBaseVO);

data-gateway/data-gateway-vd-hik/src/main/java/com/usky/hik/service/mqtt/parkRemainSpaceControl/parkRemainSpaceControl.java

@@ -0,0 +1,67 @@
+package com.usky.hik.service.mqtt.parkRemainSpaceControl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.usky.hik.controller.api.HkVideoApi;
+import com.usky.hik.service.config.mqtt.MqttOutConfig;
+import com.usky.hik.service.mqtt.MqttStrategy;
+import com.usky.hik.service.vo.MqttBaseVO;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Objects;
+
+/**
+ * @author zyj
+ * @date 2022/12/6 15:07
+ */
+@Service("parkRemainSpaceControl")
+public class parkRemainSpaceControl implements MqttStrategy {
+    @Resource
+    private MqttOutConfig.MqttGateway mqttGateway;
+
+    /**
+     * 查询停车库剩余车位数
+     * @return
+     */
+    public String disposeMessage(MqttBaseVO mqttBaseVO){
+
+        /**
+         * 添加请求参数
+         */
+        JSONObject obj_data = JSONObject.parseObject(mqttBaseVO.getData().toString());
+        Integer commandId = Integer.parseInt(obj_data.get("id").toString());
+        Object params = JSONObject.toJSONString(obj_data.get("params"));
+        JSONObject params_data = JSON.parseObject(params.toString());
+        String parkSyscode = params_data.get("parkSyscode").toString();
+
+        String rec_body = HkVideoApi.parkRemainSpace(parkSyscode);
+
+        JSONObject rec_data = JSONObject.parseObject(rec_body);
+        String rec_code = rec_data.get("code").toString();
+
+        //推送下发命令响应mqtt
+        JSONObject jsonObject = new JSONObject();
+
+        if(rec_code.equals("0")){
+            jsonObject.put("result","success");
+            jsonObject.put("message",rec_body);
+
+        }else{
+            JSONObject obj1 = new JSONObject();
+            obj1.put("code",-1);
+            obj1.put("message","open failed");
+            jsonObject.put("error",obj1);
+
+        }
+
+        jsonObject.put("timeStamp",System.currentTimeMillis());
+        jsonObject.put("id",commandId);
+
+        String res_topic = mqttBaseVO.getTopic().replace("control","controlResponse");
+        mqttGateway.sendToMqtt(res_topic,jsonObject.toJSONString());
+
+        return null;
+    }
+
+}

data-transfer/data-transfer-biz/src/main/java/com/usky/transfer/ApplicationRun.java

@@ -7,6 +7,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
@@ -22,6 +23,7 @@ import java.net.UnknownHostException;
  */
 
 
+@EnableCaching
 @EnableCustomSwagger2
 //@EnableSwagger2
 @EnableFeignClients(basePackages = "com.usky")

data-transfer/data-transfer-biz/src/main/java/com/usky/transfer/service/DmpProductService.java

@@ -2,6 +2,10 @@ package com.usky.transfer.service;
 
 import com.usky.transfer.domain.DmpProduct;
 import com.usky.common.mybatis.core.CrudService;
+import com.usky.transfer.service.vo.DeviceMapVO;
+import com.usky.transfer.service.vo.ProductMapVO;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -12,5 +16,9 @@ import com.usky.common.mybatis.core.CrudService;
  * @since 2024-09-19
  */
 public interface DmpProductService extends CrudService<DmpProduct> {
+    void deleteProductCache();
+    void deleteDeviceCache();
 
+    Map<String, ProductMapVO> getProductMap();
+    Map<String, DeviceMapVO> getDeviceMap();
 }

data-transfer/data-transfer-biz/src/main/java/com/usky/transfer/service/impl/DmpProductServiceImpl.java

@@ -1,11 +1,26 @@
 package com.usky.transfer.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.transfer.domain.DmpDevice;
 import com.usky.transfer.domain.DmpProduct;
 import com.usky.transfer.mapper.DmpProductMapper;
+import com.usky.transfer.service.DmpDeviceService;
 import com.usky.transfer.service.DmpProductService;
+import com.usky.transfer.service.vo.DeviceMapVO;
+import com.usky.transfer.service.vo.ProductMapVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.CachePut;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 产品信息表 服务实现类
@@ -17,4 +32,66 @@ import org.springframework.stereotype.Service;
 @Service
 public class DmpProductServiceImpl extends AbstractCrudService<DmpProductMapper, DmpProduct> implements DmpProductService {
 
+    @Autowired
+    private DmpDeviceService dmpDeviceService;
+
+    //清除产品缓存
+    @CacheEvict(cacheNames = "productList")
+    public void deleteProductCache(){
+        System.out.println("deleteProductCache");
+    }
+
+    //清除设备缓存
+    @CacheEvict(cacheNames = "deviceList")
+    public void deleteDeviceCache(){
+        System.out.println("deleteDeviceCache");
+    }
+
+    @Cacheable(cacheNames = "productList",sync = true)
+    public Map<String, ProductMapVO> getProductMap(){
+        Map<String,ProductMapVO> productMap = new HashMap<>();
+        LambdaQueryWrapper<DmpProduct> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(DmpProduct::getDeleteFlag,0)
+                .orderByDesc(DmpProduct::getId);
+        List<DmpProduct> list = this.list(queryWrapper);
+        if(CollectionUtils.isNotEmpty(list)){
+            for (int i = 0; i < list.size(); i++) {
+                String productCode = list.get(i).getProductCode();
+                ProductMapVO mapVO = new ProductMapVO();
+                mapVO.setProductId(list.get(i).getId());
+                mapVO.setProductCode(list.get(i).getProductCode());
+                mapVO.setCreatedBy(list.get(i).getCreatedBy());
+                mapVO.setTenantId(list.get(i).getTenantId());
+                mapVO.setDeviceType(list.get(i).getDeviceType());
+
+                productMap.put(productCode,mapVO);
+            }
+        }
+
+
+        return productMap;
+    }
+
+    @Cacheable(cacheNames = "deviceList",sync = true)
+    public Map<String, DeviceMapVO> getDeviceMap(){
+        Map<String,DeviceMapVO> deviceMap = new HashMap<>();
+        LambdaQueryWrapper<DmpDevice> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(DmpDevice::getDeleteFlag,0)
+                .orderByDesc(DmpDevice::getId);
+        List<DmpDevice> list = dmpDeviceService.list(queryWrapper);
+        if(CollectionUtils.isNotEmpty(list)){
+            for (int i = 0; i < list.size(); i++) {
+                String deviceId = list.get(i).getDeviceId();
+                DeviceMapVO mapVO = new DeviceMapVO();
+                mapVO.setProductCode(list.get(i).getProductCode());
+                mapVO.setDeviceId(list.get(i).getDeviceId());
+                mapVO.setDeviceUuid(list.get(i).getDeviceUuid());
+                mapVO.setDeviceStatus(list.get(i).getServiceStatus());
+
+                deviceMap.put(deviceId,mapVO);
+            }
+        }
+
+        return deviceMap;
+    }
 }

data-transfer/data-transfer-biz/src/main/java/com/usky/transfer/service/impl/QueryInfluxdbDataServiceImpl.java

@@ -2,6 +2,7 @@ package com.usky.transfer.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.nacos.shaded.com.google.protobuf.Internal;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -137,7 +138,7 @@ public class QueryInfluxdbDataServiceImpl extends AbstractCrudService<QueryInflu
             String deviceId = tags.get("deviceId");
 
             //判断上报数据对应产品是否注册，如未注册则为非法
-            Map<String,ProductMapVO> productMapList = getProductMap();
+            Map<String,ProductMapVO> productMapList = dmpProductService.getProductMap();
             if(!productMapList.containsKey(productCode)){
                 //通过查询数据库再确认下产品是否注册
                 LambdaQueryWrapper<DmpProduct> queryWrapper = Wrappers.lambdaQuery();
@@ -145,15 +146,17 @@ public class QueryInfluxdbDataServiceImpl extends AbstractCrudService<QueryInflu
                         .eq(DmpProduct::getProductCode,productCode);
                 DmpProduct one = dmpProductService.getOne(queryWrapper);
                 if(one == null){
-                    rec_map.put("code",201);
+                    rec_map.put("code",201) ;
                     rec_map.put("message","产品未注册!");
                     log.info("产品未注册");
                     return rec_map;
+                }else{
+                    dmpProductService.deleteProductCache();
                 }
             }
 
-            //判断上报数据设备是否已注册，未注册自动注册
-            Map<String,DeviceMapVO> deviceMapList = getDeviceMap();
+            //判断上报数据设备是否已注册(要判断注册过的设备是不是属于本产品的)，未注册自动注册
+            Map<String,DeviceMapVO> deviceMapList = dmpProductService.getDeviceMap();
             if(!deviceMapList.containsKey(deviceId)){
                 DmpDevice dmpDeviceInfo = new DmpDevice();
                 ProductMapVO productMapVO = productMapList.get(productCode);
@@ -178,6 +181,41 @@ public class QueryInfluxdbDataServiceImpl extends AbstractCrudService<QueryInflu
                 dmpDeviceStatus.setLastOfflineTime(LocalDateTime.now());
                 dmpDeviceStatus.setProductCode(dmpDeviceInfo.getProductCode());
                 dmpDeviceStatusService.save(dmpDeviceStatus);
+
+                dmpProductService.deleteDeviceCache();
+            }else if(deviceMapList.containsKey(deviceId)){
+                LambdaQueryWrapper<DmpDevice> queryWrapper = Wrappers.lambdaQuery();
+                queryWrapper.eq(DmpDevice::getDeleteFlag,0)
+                        .eq(DmpDevice::getProductCode,productCode)
+                        .eq(DmpDevice::getDeviceId,deviceId);
+                DmpDevice one = dmpDeviceService.getOne(queryWrapper);
+                if(one == null){
+                    DmpDevice dmpDeviceInfo = new DmpDevice();
+                    ProductMapVO productMapVO = productMapList.get(productCode);
+                    dmpDeviceInfo.setDeviceId(deviceId);
+                    dmpDeviceInfo.setDeviceName("");
+                    dmpDeviceInfo.setDeviceType(productMapVO.getDeviceType());
+                    dmpDeviceInfo.setProductId(productMapVO.getProductId());
+                    dmpDeviceInfo.setProductCode(productCode);
+                    dmpDeviceInfo.setCreatedBy(productMapVO.getCreatedBy());
+                    dmpDeviceInfo.setCreatedTime(LocalDateTime.now());
+                    dmpDeviceInfo.setTenantId(productMapVO.getTenantId());
+                    dmpDeviceInfo.setServiceStatus(1);
+                    dmpDeviceInfo.setDeviceUuid(UUIDUtils.uuid());
+                    dmpDeviceService.save(dmpDeviceInfo);
+
+                    deviceUUId = dmpDeviceInfo.getDeviceUuid();
+
+                    DmpDeviceStatus dmpDeviceStatus = new DmpDeviceStatus();
+                    dmpDeviceStatus.setDeviceId(dmpDeviceInfo.getDeviceId());
+                    dmpDeviceStatus.setProductId(dmpDeviceInfo.getProductId());
+                    dmpDeviceStatus.setDeviceStatus(2);
+                    dmpDeviceStatus.setLastOfflineTime(LocalDateTime.now());
+                    dmpDeviceStatus.setProductCode(dmpDeviceInfo.getProductCode());
+                    dmpDeviceStatusService.save(dmpDeviceStatus);
+
+                    dmpProductService.deleteDeviceCache();
+                }
             }
 
             if(StringUtils.isBlank(deviceUUId)){
@@ -202,52 +240,4 @@ public class QueryInfluxdbDataServiceImpl extends AbstractCrudService<QueryInflu
         return rec_map;
     }
 
-    @Cacheable(cacheNames = "productList",sync = true)
-    public Map<String, ProductMapVO> getProductMap(){
-        Map<String,ProductMapVO> productMap = new HashMap<>();
-        LambdaQueryWrapper<DmpProduct> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(DmpProduct::getDeleteFlag,0)
-                .orderByDesc(DmpProduct::getId);
-        List<DmpProduct> list = dmpProductService.list(queryWrapper);
-        if(CollectionUtils.isNotEmpty(list)){
-            for (int i = 0; i < list.size(); i++) {
-                String productCode = list.get(i).getProductCode();
-                ProductMapVO mapVO = new ProductMapVO();
-                mapVO.setProductId(list.get(i).getId());
-                mapVO.setProductCode(list.get(i).getProductCode());
-                mapVO.setCreatedBy(list.get(i).getCreatedBy());
-                mapVO.setTenantId(list.get(i).getTenantId());
-                mapVO.setDeviceType(list.get(i).getDeviceType());
-
-                productMap.put(productCode,mapVO);
-            }
-        }
-
-
-        return productMap;
-    }
-
-    @Cacheable(cacheNames = "deviceList",sync = true)
-    public Map<String, DeviceMapVO> getDeviceMap(){
-        Map<String,DeviceMapVO> deviceMap = new HashMap<>();
-        LambdaQueryWrapper<DmpDevice> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(DmpDevice::getDeleteFlag,0)
-                .orderByDesc(DmpDevice::getId);
-        List<DmpDevice> list = dmpDeviceService.list(queryWrapper);
-        if(CollectionUtils.isNotEmpty(list)){
-            for (int i = 0; i < list.size(); i++) {
-                String deviceId = list.get(i).getDeviceId();
-                DeviceMapVO mapVO = new DeviceMapVO();
-                mapVO.setProductCode(list.get(i).getProductCode());
-                mapVO.setDeviceId(list.get(i).getDeviceId());
-                mapVO.setDeviceUuid(list.get(i).getDeviceUuid());
-                mapVO.setDeviceStatus(list.get(i).getServiceStatus());
-
-                deviceMap.put(deviceId,mapVO);
-            }
-        }
-
-        return deviceMap;
-    }
-
 }