添加维护未处理标志和待处理数量接口

imcs-bt-be/imcs-authority-server/src/main/java/com/github/zuihou/api/OpsAppApi.java

@@ -514,15 +514,39 @@ public class OpsAppApi {
         return R.success(resultMap);
     }
 
+    /**
+     * 获取维修人员待处理数量
+     * @return
+     */
+    @PostMapping("/getDealCount")
+    public R<Integer> getDealCount() {
+
+        BaseContextHandler.setTenant("0000");
+        LbqWrapper<EquRecord> recordQueryWrap = Wraps.lbQ();
+        //todo 业务类型
+        int count = equRecordService.count();
+        return R.success(count);
+    }
+
     private IPage<ProductionResource> pageListEquByProductResourceUserImpl(IPage<ProductionResource> page,
                                                                            LbqWrapper<ProductionResource> queryWrap) {
         IPage<ProductionResource> list = productionTenantResourceService.pageList(page, queryWrap);
+        LbqWrapper<EquRecord> recordQueryWrap = Wraps.lbQ();
+        //recordQueryWrap.eq(EquRecord::getServiceType,"FAILURE");
+        //recordQueryWrap.eq(EquRecord::getStatus,1);
+        List<EquRecord> records = equRecordService.list(recordQueryWrap);
         if (null != list.getRecords() && list.getRecords().size() > 0) {
             list.getRecords().stream().forEach(item -> {
                 Map map = productionTenantResourceService.getEquRunInfo(item.getId());
                 item.setOnlineStatus(map.containsKey("equStatus") ? map.get("equStatus").toString() : "0");
                 item.setErrMsg(map.containsKey("errMsg") && map.get("errMsg") != null ? map.get("errMsg").toString() : "");
                 Integer lackCount = productionTenantResourceService.getEquLockCount(item.getId());
+                boolean isDealFlag = records.stream().anyMatch(r->r.getEquId().equals(item.getId()));
+                if(isDealFlag){
+                    item.setDealStatus(false);
+                }else{
+                    item.setDealStatus(true);
+                }
                 item.setLackCount(lackCount);
             });
         }

imcs-bt-be/imcs-authority-server/src/main/java/com/github/zuihou/authority/config/AuthorityWebConfiguration.java

@@ -114,7 +114,7 @@ public class AuthorityWebConfiguration extends BaseConfig implements WebMvcConfi
                 "classpath:/resources/**",
                 "classpath:/static/**",
                 "classpath:/public/**",
-
+                "/externalApi/getAdList**",
                 "/cache/**",
                 "/swagger-ui.html**",
                 "/doc.html**"

imcs-bt-be/imcs-business-entity/src/main/java/com/github/zuihou/business/productionresource/entity/ProductionResource.java

@@ -336,6 +336,10 @@ public class ProductionResource extends Entity<Long> {
     @TableField(exist = false)
     private Integer lackCount;
 
+    @ApiModelProperty(value = "故障处理标志")
+    @TableField(exist = false)
+    private boolean dealStatus;
+
     /**
      * 设备人员关系
      */