Merge branch 'han' of uskycloud/usky-modules into server-165

service-agbox/service-agbox-api/src/main/java/com/usky/agbox/RemoteUserService.java

@@ -1,28 +0,0 @@
-package com.usky.agbox;
-
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.agbox.domain.SysUserVO;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-
-@FeignClient(contextId = "remoteUserService", value = "usky-demo")
-public interface RemoteUserService {
-
-
-
-    @GetMapping("/byUserName")
-    ApiResult<List<SysUserVO>> getByUserName(@RequestParam("userName") String userName);
-
-
-    @PostMapping("/byUserName")
-    ApiResult<List<SysUserVO>> add(@RequestBody SysUserVO sysUserVO);
-
-
-    @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    ApiResult<String> upload(@RequestPart(value = "file") MultipartFile file);
-}

service-agbox/service-agbox-api/src/main/java/com/usky/agbox/RemotepatrolAgboxService.java

@@ -0,0 +1,56 @@
+package com.usky.agbox;
+
+import com.alibaba.fastjson.JSONObject;
+import com.usky.agbox.factory.RemotePatrolAgboxFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author han
+ * @date 2024/04/02 15:07
+ */
+@FeignClient(contextId = "remotePatrolAgboxService", value = "service-agbox", fallbackFactory =
+        RemotePatrolAgboxFallbackFactory.class)
+public interface RemotePatrolAgboxService {
+    /**
+     * 获得事件编码
+     *
+     * @return 事件编码数组
+     */
+    @GetMapping("/getEventCode")
+    JSONObject getEventCode();
+
+    /**
+     * 获取设备列表信息
+     *
+     * @return 设备列表数组
+     */
+    @GetMapping("/getDeviceList")
+    JSONObject getDeviceList();
+
+    /**
+     * 更新心跳信息
+     *
+     * @return 更新结果
+     */
+    @PostMapping("/updateHeart")
+    JSONObject updateHeart(@RequestBody String requestBody);
+
+    /**
+     * 添加事件信息
+     *
+     * @return 添加结果
+     */
+    @PostMapping("/addEvent")
+    JSONObject addEvent(@RequestBody String requestBody);
+
+    /**
+     * 获取事件信息
+     *
+     * @return 事件信息数组
+     */
+    @PostMapping("/getEvent")
+    JSONObject getEvent(@RequestBody String requestBody);
+}

service-agbox/service-agbox-api/src/main/java/com/usky/agbox/domain/EventVO.java

@@ -0,0 +1,34 @@
+package com.usky.agbox.domain;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class EventVO {
+    /**
+     * 设备ID
+     */
+    private String deviceId;
+
+    /**
+     * 事件时间
+     */
+    private String triggerTime;
+
+    /**
+     * 事件编码
+     */
+    private Integer eventCode;
+
+    /**
+     * 人员姓名
+     */
+    private String name;
+
+    /**
+     * 证件编号
+     */
+    private String certifiedNo;
+
+}

service-agbox/service-agbox-api/src/main/java/com/usky/agbox/factory/RemoteUserFallbackFactory.java

@@ -1,48 +0,0 @@
-package com.usky.agbox.factory;
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.exception.BusinessException;
-import com.usky.agbox.RemoteUserService;
-import com.usky.agbox.domain.SysUserVO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-
-
-/**
- * 用户服务降级处理
- *
- * @author ruoyi
- */
-@Component
-public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService>
-{
-    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
-
-    @Override
-    public RemoteUserService create(Throwable throwable)
-    {
-        log.error("用户服务调用失败:{}", throwable.getMessage());
-        return new RemoteUserService() {
-            @Override
-            public ApiResult<List<SysUserVO>> getByUserName(String userName) {
-                throw new BusinessException(throwable.getMessage());
-            }
-
-            @Override
-            public ApiResult<List<SysUserVO>> add(SysUserVO sysUserVO) {
-                throw new BusinessException(throwable.getMessage());
-            }
-
-            @Override
-            public ApiResult<String> upload(MultipartFile file) {
-                throw new BusinessException(throwable.getMessage());
-            }
-        };
-    }
-}

service-agbox/service-agbox-api/src/main/java/com/usky/agbox/factory/RemotepatrolAgboxFallbackFactory.java

@@ -0,0 +1,47 @@
+package com.usky.agbox.factory;
+
+import com.alibaba.fastjson.JSONObject;
+import com.usky.agbox.RemotePatrolAgboxService;
+import com.usky.common.core.exception.FeignBadRequestException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author han
+ * @date 2024/04/02 15:07
+ */
+@Component
+public class RemotePatrolAgboxFallbackFactory implements FallbackFactory<RemotePatrolAgboxService> {
+    private static final Logger log = LoggerFactory.getLogger(RemotePatrolAgboxFallbackFactory.class);
+
+    @Override
+    public RemotePatrolAgboxService create(Throwable throwable)
+    {
+        log.error("agbox服务调用失败:{}", throwable.getMessage());
+        return new RemotePatrolAgboxService()
+        {
+            @Override
+            public JSONObject getEventCode() {
+                throw new FeignBadRequestException(500,"获取事件编码异常"+throwable.getMessage());
+            }
+            @Override
+            public JSONObject getDeviceList() {
+                throw new FeignBadRequestException(500,"获取设备列表异常"+throwable.getMessage());
+            }
+            @Override
+            public JSONObject updateHeart(String requestBody) {
+                throw new FeignBadRequestException(500,"更新心跳异常"+throwable.getMessage());
+            }
+            @Override
+            public JSONObject addEvent(String requestBody) {
+                throw new FeignBadRequestException(500,"添加事件异常"+throwable.getMessage());
+            }
+            @Override
+            public JSONObject getEvent(String requestBody) {
+                throw new FeignBadRequestException(500,"获取事件异常"+throwable.getMessage());
+            }
+        };
+    }
+}

service-agbox/service-agbox-biz/pom.xml

@@ -56,6 +56,12 @@
             <artifactId>spring-websocket</artifactId>
             <version>5.2.8.RELEASE</version>
         </dependency>
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>service-agbox-api</artifactId>
+            <version>0.0.1</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

service-agbox/service-agbox-biz/src/main/java/com/usky/agbox/controller/api/patrolAgboxControllerApi.java

@@ -0,0 +1,39 @@
+package com.usky.agbox.controller.api;
+
+import com.alibaba.fastjson.JSONObject;
+import com.usky.agbox.RemotePatrolAgboxService;
+import com.usky.agbox.service.job.patrolAgbox;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author han
+ * @date 2024/04/02 11:21
+ */
+@RestController
+public class patrolAgboxControllerApi implements RemotePatrolAgboxService {
+    @Override
+    public JSONObject getEventCode() {
+        return patrolAgbox.getEventCode();
+    }
+
+    @Override
+    public JSONObject getDeviceList() {
+        return patrolAgbox.getDeviceList();
+    }
+
+    @Override
+    public JSONObject updateHeart(@RequestBody String requestBody){
+        return patrolAgbox.updateHeart(requestBody);
+    }
+
+    @Override
+    public JSONObject addEvent(@RequestBody String requestBody){
+        return patrolAgbox.addEvent(requestBody);
+    }
+
+    @Override
+    public JSONObject getEvent(@RequestBody String requestBody){
+        return patrolAgbox.getEvent(requestBody);
+    }
+}

service-agbox/service-agbox-biz/src/main/java/com/usky/agbox/controller/web/patrolAgboxController.java

@@ -2,9 +2,7 @@ package com.usky.agbox.controller.web;
 
 
 import com.alibaba.fastjson.JSONObject;
-import com.google.gson.JsonObject;
 import com.usky.agbox.service.job.patrolAgbox;
-import com.usky.agbox.service.vo.EventVO;
 import com.usky.common.core.bean.ApiResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -41,8 +39,8 @@ public class patrolAgboxController {
      * @return
      */
     @PostMapping("/addEvent")
-    public ApiResult<JSONObject> addEvent(@RequestBody EventVO eventVO){
-        return ApiResult.success(patrolAgbox.addEvent(eventVO));
+    public ApiResult<JSONObject> addEvent(@RequestBody String requestBody){
+        return ApiResult.success(patrolAgbox.addEvent(requestBody));
     }
 
     /**
@@ -50,8 +48,8 @@ public class patrolAgboxController {
      * @return
      */
     @PostMapping("/updateHeart")
-    public ApiResult<JSONObject> updateHeart(@RequestBody EventVO eventVO){
-        return ApiResult.success(patrolAgbox.updateHeart(eventVO));
+    public ApiResult<JSONObject> updateHeart(@RequestBody String requestBody){
+        return ApiResult.success(patrolAgbox.updateHeart(requestBody));
     }
 
     /**
@@ -59,7 +57,7 @@ public class patrolAgboxController {
      * @return
      */
     @PostMapping("/getEvent")
-    public ApiResult<JSONObject> getEvent(){
-        return ApiResult.success(patrolAgbox.getEvent());
+    public ApiResult<JSONObject> getEvent(@RequestBody String requestBody){
+        return ApiResult.success(patrolAgbox.getEvent(requestBody));
     }
 }

service-agbox/service-agbox-biz/src/main/java/com/usky/agbox/service/job/patrolAgbox.java

@@ -1,9 +1,7 @@
 package com.usky.agbox.service.job;
 
 import com.alibaba.fastjson.JSONObject;
-import com.google.gson.JsonObject;
 import com.usky.agbox.service.util.HttpClientUtils;
-import com.usky.agbox.service.vo.EventVO;
 
 import java.util.HashMap;
 
@@ -42,12 +40,13 @@ public class patrolAgbox {
      * 添加事件信息
      * @return
      */
-    public static JSONObject addEvent(EventVO eventVO) {
+    public static JSONObject addEvent(String requestBody) {
+        JSONObject eventVO = JSONObject.parseObject(requestBody);
         HashMap map = new HashMap();
         map.put("key", KEY);
-        map.put("json", "{\"jsonrpc\":\"2.0\",\"method\":\"addEvent\",\"params\":{\"deviceId\":\""+eventVO.getDeviceId()+"\"," +
-                "\"triggerTime\":\""+eventVO.getTriggerTime()+"\",\"eventCode\":"+eventVO.getEventCode()+",\"name" +
-                "\":\""+eventVO.getName()+"\",\"certifiedNo\":\""+eventVO.getCertifiedNo()+"\"}}");
+        map.put("json", "{\"jsonrpc\":\"2.0\",\"method\":\"addEvent\",\"params\":{\"deviceId\":\""+eventVO.get("deviceId").toString()+"\"," +
+                "\"triggerTime\":\""+eventVO.get("triggerTime").toString()+"\",\"eventCode\":"+eventVO.get("eventCode")+",\"name" +
+                "\":\""+eventVO.get("name").toString()+"\",\"certifiedNo\":\""+eventVO.get("certifiedNo").toString()+"\"}}");
         String resultString = HttpClientUtils.doPost(URL,map);
         JSONObject resultVO = JSONObject.parseObject(resultString);
         return resultVO;
@@ -57,10 +56,12 @@ public class patrolAgbox {
      * 更新心跳信息
      * @return
      */
-    public static JSONObject updateHeart(EventVO eventVO) {
+    public static JSONObject updateHeart(String requestBody) {
+        JSONObject eventVO = JSONObject.parseObject(requestBody);
         HashMap map = new HashMap();
         map.put("key", KEY);
-        map.put("json", "{\"jsonrpc\":\"2.0\",\"method\":\"updateHeart\",\"params\":{\"deviceId\":\""+eventVO.getDeviceId()+"\"}}");
+        map.put("json",
+                "{\"jsonrpc\":\"2.0\",\"method\":\"updateHeart\",\"params\":{\"deviceId\":\""+eventVO.get("deviceId").toString()+"\"}}");
         String resultString = HttpClientUtils.doPost(URL,map);
         JSONObject resultVO = JSONObject.parseObject(resultString);
         return resultVO;
@@ -70,10 +71,11 @@ public class patrolAgbox {
      * 获取事件信息
      * @return
      */
-    public static JSONObject getEvent() {
+    public static JSONObject getEvent(String requestBody) {
+        JSONObject eventVO = JSONObject.parseObject(requestBody);
         HashMap map = new HashMap();
         map.put("key", KEY);
-        map.put("json", "{\"jsonrpc\":\"2.0\",\"method\":\"getEvent\",\"params\":{\"eventId\":\"3af67e73-c393-42da-ab4c-96ad5dfb946d\"}}");
+        map.put("json", "{\"jsonrpc\":\"2.0\",\"method\":\"getEvent\",\"params\":{\"eventId\":\""+eventVO.get("eventId").toString()+"\"}}");
         String resultString = HttpClientUtils.doPost(URL,map);
         JSONObject resultVO = JSONObject.parseObject(resultString);
         return resultVO;

service-fire/service-fire-biz/pom.xml

@@ -88,6 +88,12 @@
             <artifactId>itextpdf</artifactId>
             <version>5.4.3</version>
         </dependency>
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>service-agbox-api</artifactId>
+            <version>0.0.1</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionAttendanceServiceImpl.java

@@ -1,11 +1,13 @@
 package com.usky.fire.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 
+import com.usky.agbox.RemotePatrolAgboxService;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.common.core.util.StringUtils;
 import com.usky.common.security.utils.SecurityUtils;
@@ -50,6 +52,9 @@ public class PatrolInspectionAttendanceServiceImpl extends AbstractCrudService<P
 
     @Autowired
     private PatrolInspectionPersonnelMapper patrolInspectionPersonnelMapper;
+
+    @Autowired
+    private RemotePatrolAgboxService remotePatrolAgboxService;
     @Override
     public IPage<Map<String, Object>> pageList(Integer pageNum, Integer pageSize, String operateCode, String operator, LocalDateTime startTime, LocalDateTime endTime) {
         IPage<PatrolInspectionAttendance> page = new Page<>(pageNum, pageSize);
@@ -127,6 +132,19 @@ public class PatrolInspectionAttendanceServiceImpl extends AbstractCrudService<P
         patrolInspectionAttendance.setDeviceCode(patrolInspectionAttendance.getDeviceCode());
         baseMapper.insert(patrolInspectionAttendance);
         patrolInspectionPersonnelService.updateSignStatus(patrolInspectionAttendance.getSignInType());
+        JSONObject jsonObj = new JSONObject();
+        jsonObj.put("deviceId", patrolInspectionAttendance.getDeviceCode());
+        jsonObj.put("triggerTime", LocalDateTime.now());
+        Integer eventCode = 17;
+        if(patrolInspectionAttendance.getSignInType().equals(0)){
+            eventCode=1;
+        }else {
+            eventCode=2;
+        }
+        jsonObj.put("eventCode", eventCode);
+        jsonObj.put("name", SecurityUtils.getUsername());
+        jsonObj.put("certifiedNo", patrolInspectionAttendance.getIdentificationNumber());
+        JSONObject a = remotePatrolAgboxService.addEvent(jsonObj.toJSONString());
     }
 
     /**

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/ReportConfigServiceImpl.java

@@ -95,6 +95,14 @@ public class ReportConfigServiceImpl extends AbstractCrudService<ReportConfigMap
                 queryWrapper2
                         .in(ReportIndexConfig::getSeniorIndex,indexIdList1);
                 List<ReportIndexConfig> list4 = reportIndexConfigService.list(queryWrapper2);
+                for (int k = 0; k < list3.size(); k++) {
+                    ReportIndex1Vo reportIndex1Vo = new ReportIndex1Vo();
+                    reportIndex1Vo.setId(list3.get(k).getId());
+                    reportIndex1Vo.setIndexCode(list3.get(k).getIndexCode());
+                    reportIndex1Vo.setIndexGrade(list3.get(k).getIndexGrade());
+                    reportIndex1Vo.setIndexName(list3.get(k).getIndexName());
+                    reportIndex1Vo.setIndexWeight(list3.get(k).getIndexWeight());
+                    reportIndex1Vo.setIndexDesc(list3.get(k).getIndexDesc());
                 if (CollectionUtils.isNotEmpty(list4)) {
                     List<Integer> indexIdList2 = new ArrayList<>();
                     for (int j = 0; j < list4.size(); j++) {
@@ -104,14 +112,7 @@ public class ReportConfigServiceImpl extends AbstractCrudService<ReportConfigMap
                     queryWrapper3
                             .in(ReportIndexConfig::getSeniorIndex,indexIdList2);
                     List<ReportIndexConfig> list5 = reportIndexConfigService.list(queryWrapper3);
-                    for (int k = 0; k < list3.size(); k++) {
-                        ReportIndex1Vo reportIndex1Vo = new ReportIndex1Vo();
-                        reportIndex1Vo.setId(list3.get(k).getId());
-                        reportIndex1Vo.setIndexCode(list3.get(k).getIndexCode());
-                        reportIndex1Vo.setIndexGrade(list3.get(k).getIndexGrade());
-                        reportIndex1Vo.setIndexName(list3.get(k).getIndexName());
-                        reportIndex1Vo.setIndexWeight(list3.get(k).getIndexWeight());
-                        reportIndex1Vo.setIndexDesc(list3.get(k).getIndexDesc());
+
                         List<ReportIndex2Vo> list6 = new ArrayList<>();
                         for (int l = 0; l < list4.size(); l++) {
                             List<ReportIndex3Vo> list7 = new ArrayList<>();

service-iot/service-iot-biz/pom.xml

@@ -60,6 +60,12 @@
             <artifactId>spring-websocket</artifactId>
             <version>5.2.8.RELEASE</version>
         </dependency>
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>service-agbox-api</artifactId>
+            <version>0.0.1</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseAppInfoServiceImpl.java

@@ -1,12 +1,13 @@
 package com.usky.iot.service.impl;
 
-import com.usky.common.core.exception.BusinessException;
+import com.alibaba.fastjson.JSONObject;
+import com.usky.agbox.RemotePatrolAgboxService;
 import com.usky.common.security.utils.SecurityUtils;
-import com.usky.iot.domain.BaseAlarmType;
 import com.usky.iot.domain.BaseAppInfo;
 import com.usky.iot.mapper.BaseAppInfoMapper;
 import com.usky.iot.service.BaseAppInfoService;
 import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -26,6 +27,9 @@ import java.time.LocalDateTime;
 @Service
 public class BaseAppInfoServiceImpl extends AbstractCrudService<BaseAppInfoMapper, BaseAppInfo> implements BaseAppInfoService {
 
+    @Autowired
+    private RemotePatrolAgboxService remotePatrolAgboxService;
+
     public String getIpAddress(HttpServletRequest request) {
         String ip = request.getHeader("X-Forwarded-For");
         if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
@@ -51,6 +55,10 @@ public class BaseAppInfoServiceImpl extends AbstractCrudService<BaseAppInfoMappe
 
     @Override
     public void add(BaseAppInfo baseAppInfo){
+        JSONObject jsonObj = new JSONObject();
+        jsonObj.put("deviceId", baseAppInfo.getDeviceId());
+        JSONObject a = remotePatrolAgboxService.updateHeart(jsonObj.toJSONString());
+//        baseAppInfo.setNetworkService(a.toJSONString());
         HttpServletRequest request = getHttpServletRequest();
         String accessIp = getIpAddress(request);
         baseAppInfo.setAccessIp(accessIp);