fix

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/ResourceDetailController.java

@@ -56,6 +56,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -224,6 +225,8 @@ public class ResourceDetailController extends BaseController {
                     }
                     resourceDetail.setResourceId(resourceId);
                     resourceDetail.setResourceType(resourceVo.getResourceType());
+                    resourceDetail.setNum(new BigDecimal(1));
+                    resourceDetail.setUnit("人");
                     // 计算性别、年龄(1 : 男 ， 0 : 女)、出生年月
                     if (StrUtil.isNotBlank(resourceDetail.getIdcard()) && IdcardUtil.isValidCard(resourceDetail.getIdcard())) {
                         int age = IdcardUtil.getAgeByIdCard(resourceDetail.getIdcard());

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/DhServiceImpl.java

@@ -168,13 +168,15 @@ public class DhServiceImpl implements IDhService {
                 .execute().body();
         } catch (Exception e) {
             log.error("大华单兵设备状态请求异常：{}", e.getMessage());
-            return new JSONArray();
+            throw new ServiceException("【jtj01】调用大华单兵在离线接口异常:" + e.getMessage());
+//            return new JSONArray();
         }
         JSONObject getJson = JSONUtil.parseObj(get);
         if (getJson.containsKey("code")) {
             // 说明有错误
             log.error("获取大华单兵设备状态出错：{}", getJson);
-            return new JSONArray();
+            throw new ServiceException("【jtj01】调用大华单兵在离线接口异常:" + getJson);
+//            return new JSONArray();
         }
         return getJson.getJSONArray("results");
     }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/ResourceDetailServiceImpl.java

@@ -27,6 +27,7 @@ import com.ruoyi.zhdd.service.IResourceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -85,6 +86,16 @@ public class ResourceDetailServiceImpl extends ServicePlusImpl<ResourceDetailMap
         ResourceVo voById = resourceService.getVoById(bo.getResourceId());
         if (voById != null) {
             add.setResourceType(voById.getResourceType());
+            if (bo.getResourceType() == 2) {
+                add.setNum(new BigDecimal(1));
+                add.setUnit("人");
+            } else if (bo.getResourceType() == 3 && "车辆".equals(bo.getCarType())) {
+                add.setNum(new BigDecimal(1));
+                add.setUnit("辆");
+            } else if (bo.getResourceType() == 3 && "船舶".equals(bo.getCarType())) {
+                add.setNum(new BigDecimal(1));
+                add.setUnit("艘");
+            }
         }
         /*if (StrUtil.isNotBlank(bo.getIdcard())) {
             boolean validCard = IdcardUtil.isValidCard(bo.getIdcard());

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/ResourceServiceImpl.java

@@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -174,6 +175,16 @@ public class ResourceServiceImpl extends ServicePlusImpl<ResourceMapper, Resourc
                     resourceDetailBo.setResourceId(add.getId());
                     ResourceDetail resourceDetail = BeanUtil.toBean(resourceDetailBo, ResourceDetail.class);
                     resourceDetail.setResourceType(bo.getResourceType());
+                    if (bo.getResourceType() == 2) {
+                        resourceDetail.setNum(new BigDecimal(1));
+                        resourceDetail.setUnit("人");
+                    } else if (bo.getResourceType() == 3 && "车辆".equals(resourceDetailBo.getCarType())) {
+                        resourceDetail.setNum(new BigDecimal(1));
+                        resourceDetail.setUnit("辆");
+                    } else if (bo.getResourceType() == 3 && "船舶".equals(resourceDetailBo.getCarType())) {
+                        resourceDetail.setNum(new BigDecimal(1));
+                        resourceDetail.setUnit("艘");
+                    }
                     list.add(resourceDetail);
                 }
                 resourceDetailService.saveAll(list);
@@ -215,6 +226,16 @@ public class ResourceServiceImpl extends ServicePlusImpl<ResourceMapper, Resourc
                     resourceDetailBo.setId(null);
                     ResourceDetail resourceDetail = BeanUtil.toBean(resourceDetailBo, ResourceDetail.class);
                     resourceDetail.setResourceType(bo.getResourceType());
+                    if (bo.getResourceType() == 2) {
+                        resourceDetail.setNum(new BigDecimal(1));
+                        resourceDetail.setUnit("人");
+                    } else if (bo.getResourceType() == 3 && "车辆".equals(resourceDetailBo.getCarType())) {
+                        resourceDetail.setNum(new BigDecimal(1));
+                        resourceDetail.setUnit("辆");
+                    } else if (bo.getResourceType() == 3 && "船舶".equals(resourceDetailBo.getCarType())) {
+                        resourceDetail.setNum(new BigDecimal(1));
+                        resourceDetail.setUnit("艘");
+                    }
                     list.add(resourceDetail);
                 }
                 resourceDetailService.saveAll(list);