2022年8月29日18时05分

ruoyi-admin/src/main/java/com/ruoyi/web/controller/liveBroadcast/controller/LiveBroadcastController.java

@@ -343,6 +343,7 @@ public class LiveBroadcastController {
                            @RequestParam(value = "deviceName", required = false) String deviceName,
                            @RequestParam(value = "modelType", required = false) String modelType,
                            @RequestParam(value = "projectId") String projectId,
+                           @RequestParam(value = "fWarehouseName") String fWarehouseName,
                            @RequestParam(value = "Authorization") String Authorization,
                            @RequestParam(value = "token") String token
     ) {
@@ -375,14 +376,14 @@ public class LiveBroadcastController {
         }
         System.out.println(s);
         JSONObject result = JSON.parseObject(s);
-        if ("200".equals(result.get("data"))) {
+        if ("200".equals(result.get("code"))) {
             TWarehouseWebcam tWarehouseWebcam = new TWarehouseWebcam();
             tWarehouseWebcam.setProjectId(projectId);
-            tWarehouseWebcam.setfWarehouseName("");
+            tWarehouseWebcam.setfWarehouseName(fWarehouseName);
             tWarehouseWebcam.setfWarehouseId(null);
             tWarehouseWebcam.setDeviceSerial(deviceSerial);
             tWarehouseWebcam.setDeviceName(deviceName);
-            tWarehouseWebcam.setCode("");
+            tWarehouseWebcam.setCode(validateCode);
             tWarehouseWebcam.setCreateBy("设备添加");
             tWarehouseWebcam.setCreateTime(new Date());
             itWarehouseWebcamService.insertTWarehouseWebcam(tWarehouseWebcam);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitoringAlarms/controller/MonitoringAlarmsController.java

@@ -10,7 +10,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.JsonUtil;
 import com.ruoyi.warehouse.warehouse.domain.TMonitoringAlarms;
 import com.ruoyi.warehouse.warehouse.service.ITMonitoringAlarmsService;
-import com.ruoyi.web.controller.monitoringAlarms.main.OpenApi;
+import com.ruoyi.common.monitoringAlarms.main.OpenApi;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import okhttp3.OkHttpClient;
@@ -76,18 +76,18 @@ public class MonitoringAlarmsController {
      */
     @ApiOperation("告警列表查询")
     @PostMapping(value = "/queryAlarmList")
-    public AjaxResult queryAlarmList(@RequestParam(value = "pageNum") int pageNum,
-                                     @RequestParam(value = "pageSize") int pageSize,
+    public AjaxResult queryAlarmList(@RequestParam(value = "pageNum", defaultValue = "1", required = false) int pageNum,
+                                     @RequestParam(value = "pageSize", defaultValue = "10", required = false) int pageSize,
                                      @RequestParam(value = "token") String token) {
-        String retStr = OpenApi.queryAlarmList(MonitoringAlarms.API_PREFIX_DEV, token);
+        String retStr = OpenApi.queryAlarmList(MonitoringAlarms.API_PREFIX_DEV, token, pageNum, pageSize);
         JSONObject result = JSON.parseObject(retStr);
         if ("OK".equals(result.get("rmsg"))) {
             List<TMonitoringAlarms> list = JSONArray.parseArray(result.get("data").toString(), TMonitoringAlarms.class);
             for (TMonitoringAlarms tMonitoringAlarms : list) {
-                TMonitoringAlarms alarms =  tMonitoringAlarmsService.selectTMonitoringAlarmsById(tMonitoringAlarms.getId());
-                if (ObjectUtils.isNotNull(alarms)){
+                TMonitoringAlarms alarms = tMonitoringAlarmsService.selectTMonitoringAlarmsById(tMonitoringAlarms.getId());
+                if (ObjectUtils.isNotNull(alarms)) {
                     tMonitoringAlarmsService.updateTMonitoringAlarms(tMonitoringAlarms);
-                }else{
+                } else {
                     tMonitoringAlarmsService.insertTMonitoringAlarms(tMonitoringAlarms);
                 }
             }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/basicData/TWarehouseWebcamController.java

@@ -106,13 +106,12 @@ public class TWarehouseWebcamController extends BaseController {
      * 新增仓库摄像头
      */
     @Log(title = "仓库摄像头", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping("/add")
     @RepeatSubmit
     public AjaxResult add(@RequestBody TWarehouseWebcam tWarehouseWebcam) {
-        if (StringUtils.isNotNull(tWarehouseWebcamService.selectTWarehouseWebcamByDeviceSerial(tWarehouseWebcam.getDeviceSerial()))) {
+       /* if (StringUtils.isNotNull(tWarehouseWebcamService.selectTWarehouseWebcamByDeviceSerial(tWarehouseWebcam.getDeviceSerial()))) {
             return AjaxResult.error("设备序列号已存在");
-        }
-        tWarehouseWebcam.setProjectId("951186895306992");
+        }*/
         return toAjax(tWarehouseWebcamService.insertTWarehouseWebcam(tWarehouseWebcam));
     }
 
@@ -120,7 +119,7 @@ public class TWarehouseWebcamController extends BaseController {
      * 修改仓库摄像头
      */
     @Log(title = "仓库摄像头", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/edit")
     @RepeatSubmit
     public AjaxResult edit(@RequestBody TWarehouseWebcam tWarehouseWebcam) {
         return toAjax(tWarehouseWebcamService.updateTWarehouseWebcam(tWarehouseWebcam));

ruoyi-common/pom.xml

@@ -17,6 +17,23 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.5</version>
+        </dependency>
+
         <!-- Spring框架基本的核心工具 -->
         <dependency>
             <groupId>org.springframework</groupId>

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitoringAlarms/main/OpenApi.java → ruoyi-common/src/main/java/com/ruoyi/common/monitoringAlarms/main/OpenApi.java

@@ -1,14 +1,16 @@
-package com.ruoyi.web.controller.monitoringAlarms.main;
+package com.ruoyi.common.monitoringAlarms.main;
 
 import com.google.gson.Gson;
+import com.ruoyi.common.monitoringAlarms.req.QueryAlarmInfoListBean;
+import com.ruoyi.common.monitoringAlarms.req.QueryTokenBean;
+import com.ruoyi.common.monitoringAlarms.resp.QueryTimerResp;
+import com.ruoyi.common.monitoringAlarms.resp.QueryTokenResp;
+import com.ruoyi.common.monitoringAlarms.utils.HttpUtil;
+import com.ruoyi.common.monitoringAlarms.utils.RequestUtils;
+import com.ruoyi.common.monitoringAlarms.utils.VerifyCodeUtils;
 import com.ruoyi.common.utils.JsonUtil;
-import com.ruoyi.web.controller.monitoringAlarms.utils.RequestUtils;
-import com.ruoyi.web.controller.monitoringAlarms.req.QueryAlarmInfoListBean;
-import com.ruoyi.web.controller.monitoringAlarms.req.QueryTokenBean;
-import com.ruoyi.web.controller.monitoringAlarms.resp.QueryTimerResp;
-import com.ruoyi.web.controller.monitoringAlarms.resp.QueryTokenResp;
-import com.ruoyi.web.controller.monitoringAlarms.utils.HttpUtil;
-import com.ruoyi.web.controller.monitoringAlarms.utils.VerifyCodeUtils;
+
+import java.util.Date;
 
 public class OpenApi {
 
@@ -21,7 +23,7 @@ public class OpenApi {
             String url = "https://aim.360os.com/";
             String token =  getToken(url,appId,appSecret);
 
-            queryAlarmList(url,token);
+            queryAlarmList(url,token,1,20);
 
             System.out.println(token);
         }catch (Exception ex){
@@ -76,7 +78,7 @@ public class OpenApi {
      * @param token
      * @return
      */
-    public static  String queryAlarmList(String url,String token){
+    public static  String queryAlarmList(String url,String token,int pageNum,int pageSize){
 
         String interfaceUrl = url+"/openapi/alarm/queryAlarmList";
 
@@ -86,10 +88,10 @@ public class OpenApi {
         queryAlarmInfoListBean.setR(r);
         queryAlarmInfoListBean.setNonce(VerifyCodeUtils.generateVerifyCode(6));
         queryAlarmInfoListBean.setToken(token);
-        // queryAlarmInfoListBean.setAlarmType(2);
-//        queryAlarmInfoListBean.setEndTime(0);
+//         queryAlarmInfoListBean.setAlarmType(2);
+//        queryAlarmInfoListBean.setStartTime(System.currentTimeMillis());
 //        queryAlarmInfoListBean.setEndTime(0);
-        queryAlarmInfoListBean.setPageSize(20);
+        queryAlarmInfoListBean.setPageSize(1000);
         queryAlarmInfoListBean.setPageNum(1);
 //        queryAlarmInfoListBean.setProjectId(234);
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitoringAlarms/req/BaseBean.java → ruoyi-common/src/main/java/com/ruoyi/common/monitoringAlarms/req/BaseBean.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.monitoringAlarms.req;
+package com.ruoyi.common.monitoringAlarms.req;
 
 public class BaseBean {
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitoringAlarms/req/QueryAlarmInfoListBean.java → ruoyi-common/src/main/java/com/ruoyi/common/monitoringAlarms/req/QueryAlarmInfoListBean.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.monitoringAlarms.req;
+package com.ruoyi.common.monitoringAlarms.req;
 
 import java.util.List;
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitoringAlarms/req/QueryTokenBean.java → ruoyi-common/src/main/java/com/ruoyi/common/monitoringAlarms/req/QueryTokenBean.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.monitoringAlarms.req;
+package com.ruoyi.common.monitoringAlarms.req;
 
 /**
  *  获取token bean

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitoringAlarms/resp/QueryTimerResp.java → ruoyi-common/src/main/java/com/ruoyi/common/monitoringAlarms/resp/QueryTimerResp.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.monitoringAlarms.resp;
+package com.ruoyi.common.monitoringAlarms.resp;
 
 public class QueryTimerResp {
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitoringAlarms/resp/QueryTokenResp.java → ruoyi-common/src/main/java/com/ruoyi/common/monitoringAlarms/resp/QueryTokenResp.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.monitoringAlarms.resp;
+package com.ruoyi.common.monitoringAlarms.resp;
 
 public class QueryTokenResp {
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitoringAlarms/resp/TimerData.java → ruoyi-common/src/main/java/com/ruoyi/common/monitoringAlarms/resp/TimerData.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.monitoringAlarms.resp;
+package com.ruoyi.common.monitoringAlarms.resp;
 
 public class TimerData {
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitoringAlarms/resp/TokenData.java → ruoyi-common/src/main/java/com/ruoyi/common/monitoringAlarms/resp/TokenData.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.monitoringAlarms.resp;
+package com.ruoyi.common.monitoringAlarms.resp;
 
 public class TokenData {
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitoringAlarms/utils/Cipher.java → ruoyi-common/src/main/java/com/ruoyi/common/monitoringAlarms/utils/Cipher.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.monitoringAlarms.utils;
+package com.ruoyi.common.monitoringAlarms.utils;
 
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitoringAlarms/utils/HttpUtil.java → ruoyi-common/src/main/java/com/ruoyi/common/monitoringAlarms/utils/HttpUtil.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.monitoringAlarms.utils;
+package com.ruoyi.common.monitoringAlarms.utils;
 
 
 import org.apache.commons.codec.binary.Base64;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitoringAlarms/utils/RequestUtils.java → ruoyi-common/src/main/java/com/ruoyi/common/monitoringAlarms/utils/RequestUtils.java

@@ -1,14 +1,16 @@
-package com.ruoyi.web.controller.monitoringAlarms.utils;
+package com.ruoyi.common.monitoringAlarms.utils;
 
 
-
-import com.google.common.reflect.TypeToken;
 import com.google.gson.*;
-import com.ruoyi.web.controller.monitoringAlarms.req.BaseBean;
-import com.ruoyi.web.controller.monitoringAlarms.req.QueryAlarmInfoListBean;
+import com.google.gson.reflect.TypeToken;
+import com.ruoyi.common.monitoringAlarms.req.BaseBean;
 import org.apache.commons.codec.digest.DigestUtils;
+
 import java.lang.reflect.Type;
-import java.util.*;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
 
 /**
  * 网络请求工具类，因为sping boot 依赖，所以放这里。

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitoringAlarms/utils/TextUtils.java → ruoyi-common/src/main/java/com/ruoyi/common/monitoringAlarms/utils/TextUtils.java

@@ -12,7 +12,7 @@
 * 相应的书面授权,承担保密责任和接受相应的法律约束.                                 
 *                                                                         
 **************************************************************************/
-package com.ruoyi.web.controller.monitoringAlarms.utils;
+package com.ruoyi.common.monitoringAlarms.utils;
 
 
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitoringAlarms/utils/VerifyCodeUtils.java → ruoyi-common/src/main/java/com/ruoyi/common/monitoringAlarms/utils/VerifyCodeUtils.java

@@ -3,7 +3,7 @@
  * copyright (c) 2015-2016 All Rights Reserved.
  */
 
-package com.ruoyi.web.controller.monitoringAlarms.utils;
+package com.ruoyi.common.monitoringAlarms.utils;
 
 import java.util.Random;
 

ruoyi-quartz/pom.xml

@@ -34,6 +34,10 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-warehouse</artifactId>
+        </dependency>
 
     </dependencies>
 

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -1,7 +1,27 @@
 package com.ruoyi.quartz.task;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.ruoyi.common.constant.MonitoringAlarms;
+import com.ruoyi.common.monitoringAlarms.main.OpenApi;
+import com.ruoyi.common.utils.JsonUtil;
+import com.ruoyi.warehouse.warehouse.domain.TMonitoringAlarms;
+import com.ruoyi.warehouse.warehouse.service.ITMonitoringAlarmsService;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import com.ruoyi.common.utils.StringUtils;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * 定时任务调度测试
@@ -11,6 +31,10 @@ import com.ruoyi.common.utils.StringUtils;
 @Component("ryTask")
 public class RyTask
 {
+
+    @Autowired
+    private ITMonitoringAlarmsService tMonitoringAlarmsService;
+
     public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
     {
         System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
@@ -25,4 +49,47 @@ public class RyTask
     {
         System.out.println("执行无参方法");
     }
+
+    public void queryAlarmList()
+    {
+        Map<String, Object> rsp = new HashMap<>();
+
+        rsp.put("appId", "26GgM5hQYPPOa6GW");
+        rsp.put("appSecret", "fa6370788e207c06a9dcbfb01b46ddff9c396124");
+
+        OkHttpClient okHttpClient = new OkHttpClient();
+        Request request = new Request.Builder()
+                .url(MonitoringAlarms.API_PREFIX_DEV + MonitoringAlarms.GET_ACCESS_TOKEN)
+                .method("post", RequestBody.create(okhttp3.MediaType.parse("application/json; charset=utf-8"), JsonUtil.toJson(rsp)))
+                .post(RequestBody.create(okhttp3.MediaType.parse("application/json; charset=utf-8"), JsonUtil.toJson(rsp)))
+                .build();
+        try {
+            String rest = Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
+            JSONObject result = JSON.parseObject(rest);
+            if ("OK".equals(result.get("rmsg"))){
+                String data = result.getString("data");
+                JSONObject resultData = JSON.parseObject(data);
+                String token = resultData.get("access_token").toString();
+                String retStr = OpenApi.queryAlarmList(MonitoringAlarms.API_PREFIX_DEV, token, 1, 1000);
+                JSONObject restList = JSON.parseObject(retStr);
+                System.out.println(restList.get("rmsg"));
+                if ("OK".equals(restList.get("rmsg"))) {
+//                    String resatList =  restList.get("data").toString();
+//                    JSONObject tMonitoringAlarmsList = JSON.parseObject(resatList);
+                    List<TMonitoringAlarms> list = JSONArray.parseArray(restList.get("data").toString(), TMonitoringAlarms.class);
+                    for (TMonitoringAlarms tMonitoringAlarms : list) {
+                        TMonitoringAlarms alarms = tMonitoringAlarmsService.selectTMonitoringAlarmsById(tMonitoringAlarms.getId());
+                        if (ObjectUtils.isNotNull(alarms)) {
+                            tMonitoringAlarmsService.updateTMonitoringAlarms(tMonitoringAlarms);
+                        } else {
+                            tMonitoringAlarmsService.insertTMonitoringAlarms(tMonitoringAlarms);
+                        }
+                    }
+                }
+            }
+        } catch (IOException e) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            System.out.println("请求反馈异常，" + e.getMessage());
+        }
+    }
 }

ruoyi-warehouse/src/main/resources/mapper/warehouse/TMonitoringAlarmsMapper.xml

@@ -68,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyId != null "> and company_id = #{companyId}</if>
             <if test="companyName != null  and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
         </where>
+        ORDER BY alarm_date DESC
     </select>
     
     <select id="selectTMonitoringAlarmsById" parameterType="Long" resultMap="TMonitoringAlarmsResult">