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

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemGridMemberController.java

@@ -52,6 +52,19 @@ public class DemGridMemberController {
         return ApiResult.success(demGridMemberService.gridMemberList(gridArea, streetTown, gridPersonnel, id, pageNum, pageSize));
     }
 
+    /**
+     * 网格员信息管理-撒点
+     *
+     * @param gridArea     网格区域
+     * @param gridGrade    网格等级(1、大网格 2、中网格 3、小网格)
+     * @return
+     */
+    @GetMapping("gridMemberScatter")
+    public ApiResult<List<DemGridMember>> gridMemberScatter(@RequestParam(value = "gridArea",required = false) String gridArea,
+                                                         @RequestParam(value = "gridGrade",required = false) Integer gridGrade) {
+        return ApiResult.success(demGridMemberService.gridMemberScatter(gridArea, gridGrade));
+    }
+
     /**
      * 网格员信息管理-列表查询-导出
      *

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/DemGridMember.java

@@ -40,6 +40,21 @@ public class DemGridMember implements Serializable {
      */
     private String streetTown;
 
+    /**
+     * 网格等级(1、大网格 2、中网格 3、小网格)
+     */
+    private Integer gridGrade;
+
+    /**
+     * 上级网格
+     */
+    private Integer seniorGrid;
+
+    /**
+     * 测绘院地图网格名称
+     */
+    private String mapGridName;
+
     private String gridPersonnel;
 
     private String gridPhone;
@@ -75,5 +90,10 @@ public class DemGridMember implements Serializable {
     @TableField(exist = false)
     private List<DemGridMemderVice> gridMemderViceList;
 
+    /**
+     * 子级网格数
+     */
+    @TableField(exist = false)
+    private Integer num;
 
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemGridMemberService.java

@@ -4,6 +4,7 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.fire.domain.DemGridMember;
 import com.usky.fire.service.vo.DemGridMemberVO;
 import com.usky.common.mybatis.core.CrudService;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -19,6 +20,8 @@ public interface DemGridMemberService extends CrudService<DemGridMember> {
 
     CommonPage<DemGridMember> gridMemberList(String gridArea, String streetTown, String gridPersonnel, Integer id, Integer pageNum, Integer pageSize);
 
+    List<DemGridMember> gridMemberScatter(String gridArea, Integer gridGrade);
+
     List<DemGridMemberVO> gridMemberListExport(String gridArea, String streetTown, String gridPersonnel, Integer id);
 
     void addGridMember(DemGridMember demGridMember);

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

@@ -41,7 +41,7 @@ public class DemFireHazardsNoticeServiceImpl extends AbstractCrudService<DemFire
         LambdaQueryWrapper<DemFireHazardsNotice> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(DemFireHazardsNotice::getUserDesignId,DemFireHazardsNotice::getCompanyName,
                 DemFireHazardsNotice::getCheckTime,DemFireHazardsNotice::getOrderCorrectTime,
-                DemFireHazardsNotice::getContent,DemFireHazardsNotice::getBookNum)
+                DemFireHazardsNotice::getContent,DemFireHazardsNotice::getBookNum,DemFireHazardsNotice::getListingLevel)
                 .eq(listingLevel != null, DemFireHazardsNotice::getListingLevel,listingLevel)
                 .eq(DemFireHazardsNotice::getDeleteFlag,0);
         page = this.page(page, queryWrapper);

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

@@ -1,6 +1,8 @@
 package com.usky.fire.service.impl;
 
+import ch.qos.logback.core.pattern.FormatInfo;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -24,6 +26,7 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -75,6 +78,53 @@ public class DemGridMemberServiceImpl extends AbstractCrudService<DemGridMemberM
         return new CommonPage<>(page.getRecords(), page.getTotal(), pageSize, pageNum);
     }
 
+    @Override
+    public List<DemGridMember> gridMemberScatter(String gridArea, Integer gridGrade){
+        List<DemGridMember> list = new ArrayList<>();
+        LambdaQueryWrapper<DemGridMember> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(DemGridMember::getDeleteFlag, 0)
+                .eq(StringUtils.isNotBlank(gridArea),DemGridMember::getGridArea, gridArea)
+                .eq(gridGrade != null,DemGridMember::getGridGrade, gridGrade);
+        list = this.list(queryWrapper);
+        if (CollectionUtils.isNotEmpty(list)) {
+            List<Integer> gridMemberId = new ArrayList<>();
+            for (int i = 0; i < list.size(); i++) {
+                gridMemberId.add(list.get(i).getId());
+            }
+            List<DemGridMemderVice> demGridMemderVicesList = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(gridMemberId)) {
+                demGridMemderVicesList = demGridMemderViceService.gridMemderViceList(gridMemberId);
+            }
+            if (CollectionUtils.isNotEmpty(demGridMemderVicesList)) {
+                QueryWrapper<DemGridMember> queryWrapper1 = Wrappers.query();
+                queryWrapper1.select("senior_grid as seniorGrid","count(*) as count")
+                        .groupBy("senior_grid");
+                List<Map<String,Object>> map = this.listMaps(queryWrapper1);
+
+                for (int i = 0; i < list.size(); i++) {
+                    List<DemGridMemderVice> gridMemderViceList = new ArrayList<>();
+                    for (int j = 0; j < demGridMemderVicesList.size(); j++) {
+                        Integer id = list.get(i).getId();
+                        Integer id1 = demGridMemderVicesList.get(j).getGridMemberId();
+                        if (list.get(i).getId().equals(demGridMemderVicesList.get(j).getGridMemberId())) {
+                            gridMemderViceList.add(demGridMemderVicesList.get(j));
+                        }
+
+                    }
+                    list.get(i).setGridMemderViceList(gridMemderViceList);
+                    if(map.size() > 0){
+                        for (int j = 0; j < map.size(); j++) {
+                            if(list.get(i).getId().equals(Integer.parseInt(map.get(j).get("seniorGrid").toString()))){
+                                list.get(i).setNum(Integer.parseInt(map.get(j).get("count").toString()));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return list;
+    }
+
     @Override
     public List<DemGridMemberVO> gridMemberListExport(String gridArea, String streetTown, String gridPersonnel, Integer id) {
         LambdaQueryWrapper<DemGridMember> queryWrapper = Wrappers.lambdaQuery();

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemGridMemberMapper.xml

@@ -7,6 +7,9 @@
         <id column="id" property="id" />
         <result column="grid_area" property="gridArea" />
         <result column="street_town" property="streetTown" />
+        <result column="grid_grade" property="gridGrade" />
+        <result column="senior_grid" property="seniorGrid" />
+        <result column="map_grid_name" property="mapGridName" />
         <result column="grid_personnel" property="gridPersonnel" />
         <result column="grid_phone" property="gridPhone" />
         <result column="creator" property="creator" />