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

pom.xml

@@ -58,6 +58,10 @@
     
     
     <module>service-iot</module>
+
+
+
+    <module>service-alarm</module>
                 
     
     
@@ -66,7 +70,7 @@
 
     
     <module>service-park</module>
-      
+
   </modules>
           
   

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/domain/BaseAlarmNoticeResult.java

@@ -76,4 +76,4 @@ public class BaseAlarmNoticeResult implements Serializable {
     private Integer tenantId;
 
 
-}
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/mapper/BaseAlarmNoticeResultMapper.java

@@ -2,6 +2,7 @@ package com.usky.alarm.mapper;
 
 import com.usky.alarm.domain.BaseAlarmNoticeResult;
 import com.usky.common.mybatis.core.CrudMapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * <p>
@@ -9,8 +10,9 @@ import com.usky.common.mybatis.core.CrudMapper;
  * </p>
  *
  * @author han
- * @since 2023-09-25
+ * @since 2023-11-09
  */
+@Repository
 public interface BaseAlarmNoticeResultMapper extends CrudMapper<BaseAlarmNoticeResult> {
 
 }

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/config/smsmessage/SmsMessage.java

@@ -0,0 +1,2 @@
+package com.usky.alarm.service.config.smsmessage;public class SmsMessage {
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/impl/BaseAlarmNoticeResultServiceImpl.java

@@ -33,4 +33,4 @@ public class BaseAlarmNoticeResultServiceImpl extends AbstractCrudService<BaseAl
         page = this.page(page,queryWrapper1);
         return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
     }
-}
+}

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/impl/BaseAlarmServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.alarm.domain.*;
 import com.usky.alarm.mapper.BaseAlarmMapper;
+import com.usky.alarm.mapper.BaseAlarmNoticeResultMapper;
 import com.usky.alarm.mapper.SysUserMapper;
 import com.usky.alarm.service.*;
 import com.usky.alarm.service.config.voice.VoiceNotice;
@@ -16,6 +17,7 @@ import com.usky.common.mybatis.core.AbstractCrudService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 
@@ -51,6 +53,9 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
     @Autowired
     private VoiceNotice voiceNotice;
 
+    @Autowired
+    private BaseAlarmNoticeResultMapper baseAlarmNoticeResultMapper;
+
     @Override
     public boolean add(BaseAlarm baseAlarm) throws ClientException {
         baseAlarm.setHandleStatus(0);
@@ -81,6 +86,7 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
                     return this.update(baseAlarm, queryWrapper);
                 } else {
                     boolean saveResult = this.save(baseAlarm);
+                    Integer alarmId = baseAlarm.getId();
                     if (records1.size() > 0) {
                         baseAlarm.setFacilityId(records1.get(0).getFacilityId());
                     }
@@ -108,6 +114,21 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
                                         records.get(0).getProductName(),baseAlarmType.getTypeName(),
                                         baseAlarm.getAlarmTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd " +
                                         "HH:mm:ss")));
+                                BaseAlarmNoticeResult baseAlarmNoticeResult = new BaseAlarmNoticeResult();
+                                baseAlarmNoticeResult.setReceiver(sysUser.getPhonenumber());
+                                baseAlarmNoticeResult.setAlarmId(alarmId);
+                                baseAlarmNoticeResult.setNoticeTime(LocalDateTime.now());
+                                baseAlarmNoticeResult.setNoticeType(3);
+                                baseAlarmNoticeResult.setNoticeContent(records.get(0).getProductName()+","+baseAlarmType.getTypeName()+","+baseAlarm.getAlarmTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd " +
+                                        "HH:mm:ss")));
+                                baseAlarmNoticeResult.setTenantId(records.get(0).getTenantId());
+                                if(code.getCode() != null && code.getCode().equals("OK")) {
+                                    //请求成功
+                                    baseAlarmNoticeResult.setNoticeResult(1);
+                                }else {
+                                    baseAlarmNoticeResult.setNoticeResult(2);
+                                }
+                                Integer saveAlarmResult = baseAlarmNoticeResultMapper.insert(baseAlarmNoticeResult);
                             }
                         }
                     }

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

@@ -38,12 +38,12 @@ public class BaseGgpFacilityController {
 
     /**
      * 统计
-     * @param facilityType
+     * @param baseGgpFacilityVO
      * @return
      */
-    @GetMapping("statistic")
-    public ApiResult<List<BaseGgpFacilityStatisticVO>> statistic(@RequestParam(value = "facilityType") Integer facilityType){
-        return ApiResult.success(baseGgpFacilityService.statistic(facilityType));
+    @PostMapping("statistic")
+    public ApiResult<List<BaseGgpFacilityStatisticVO>> statistic(@RequestBody BaseGgpFacilityVO baseGgpFacilityVO){
+        return ApiResult.success(baseGgpFacilityService.statistic(baseGgpFacilityVO));
     }
 }
 

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

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -69,6 +70,16 @@ public class DemGridMemberController {
         return ApiResult.success(demGridMemberService.gridMemberScatter(gridArea, mapGridName, gridGrade, seniorGrid));
     }
 
+    /**
+     * 网格人员统计接口
+     *
+     * @return
+     */
+    @GetMapping("gridMemderViceStatistic")
+    public ApiResult<List<Map<String ,Object>>> gridMemderViceStatistic(){
+        return ApiResult.success(demGridMemberService.gridMemderViceStatistic());
+    }
+
     /**
      * 网格员信息管理-列表查询-导出
      *

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

@@ -0,0 +1,47 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.fire.domain.DemGridMemderStatistic;
+import com.usky.fire.service.DemGridMemderStatisticService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 网格基础信息统计表 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-30
+ */
+@RestController
+@RequestMapping("/demGridMemderStatistic")
+public class DemGridMemderStatisticController {
+
+    @Autowired
+    private DemGridMemderStatisticService demGridMemderStatisticService;
+
+    /**
+     * 网格基础信息统计
+     * @param gridArea      网格区域
+     * @param mapGridName    测绘院地图网格名称
+     * @param gridGrade  网格等级(2、中网格 3、小网格)
+     * @return
+     */
+    @GetMapping("gridMemderStatistic")
+    public ApiResult<DemGridMemderStatistic> gridMemderStatistic(@RequestParam(value = "gridArea", required = false) String gridArea,
+                                                                 @RequestParam(value = "mapGridName",required = false) String mapGridName,
+                                                                       @RequestParam(value = "gridGrade",required = false) Integer gridGrade){
+        return ApiResult.success(demGridMemderStatisticService.gridMemderStatistic(gridArea,mapGridName,gridGrade));
+    }
+
+}
+

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

@@ -0,0 +1,140 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 网格基础信息统计表
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemGridMemderStatistic implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 网格员管理表主键ID
+     */
+    private Integer gridMemberId;
+
+    /**
+     * 网格员人数
+     */
+    private Integer personnelNum;
+
+    /**
+     * 居民小区数量
+     */
+    private Integer villageNum;
+
+    /**
+     * 高层建筑数量
+     */
+    private Integer highRiseNum;
+
+    /**
+     * 办公楼宇数量
+     */
+    private Integer officeBuildingsNum;
+
+    /**
+     * 沿街门面店数量
+     */
+    private Integer streetFrontNum;
+
+    /**
+     * 重点单位数量
+     */
+    private Integer keyCompanyNum;
+
+    /**
+     * 厂房仓库数量
+     */
+    private Integer factoryStoreNum;
+
+    /**
+     * 医疗机构数量
+     */
+    private Integer medicalInstitutionNum;
+
+    /**
+     * 学校数量
+     */
+    private Integer schoolNum;
+
+    /**
+     * 养老机构数量
+     */
+    private Integer elderCareNum;
+
+    /**
+     * 综合体数量
+     */
+    private Integer largeBuildNum;
+
+    /**
+     * 商市场数量
+     */
+    private Integer dealerMarketNum;
+
+    /**
+     * 公共娱乐场所数量
+     */
+    private Integer pulicEntertainmentNum;
+
+    /**
+     * 宗教场所数量
+     */
+    private Integer religiousPlacesNum;
+
+    /**
+     * 宾馆数量
+     */
+    private Integer hotelNum;
+
+    /**
+     * 规模租赁数量
+     */
+    private Integer scaleRentNum;
+
+    /**
+     * 加油站数量
+     */
+    private Integer gasStationNum;
+
+    /**
+     * 地铁车站数量
+     */
+    private Integer subwayStationNum;
+
+    /**
+     * 在建工地数量
+     */
+    private Integer constructionSiteNum;
+
+    /**
+     * 社会消防组织数量
+     */
+    private Integer communityNum;
+
+    /**
+     * 其他数量
+     */
+    private Integer otherNum;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/DemGridMemderStatisticMapper.java

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemGridMemderStatistic;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 网格基础信息统计表 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-30
+ */
+public interface DemGridMemderStatisticMapper extends CrudMapper<DemGridMemderStatistic> {
+
+}

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

@@ -28,5 +28,5 @@ public interface BaseGgpFacilityService extends CrudService<BaseGgpFacility> {
      */
     List<BaseGgpFacility> baseGgpFacilityList(BaseGgpFacilityVO baseGgpFacilityVO);
 
-    List<BaseGgpFacilityStatisticVO> statistic(Integer facilityType);
+    List<BaseGgpFacilityStatisticVO> statistic(BaseGgpFacilityVO baseGgpFacilityVO);
 }

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

@@ -7,6 +7,7 @@ import com.usky.common.mybatis.core.CrudService;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -22,6 +23,8 @@ public interface DemGridMemberService extends CrudService<DemGridMember> {
 
     List<DemGridMember> gridMemberScatter(String gridArea, String mapGridName, Integer gridGrade, Integer seniorGrid);
 
+    List<Map<String ,Object>> gridMemderViceStatistic();
+
     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/DemGridMemderStatisticService.java

@@ -0,0 +1,19 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.DemGridMemderStatistic;
+import com.usky.common.mybatis.core.CrudService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 网格基础信息统计表 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-30
+ */
+public interface DemGridMemderStatisticService extends CrudService<DemGridMemderStatistic> {
+
+    DemGridMemderStatistic gridMemderStatistic(String gridArea, String mapGridName, Integer gridGrade);
+}

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

@@ -32,13 +32,46 @@ import java.util.Map;
 public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacilityMapper, BaseGgpFacility> implements BaseGgpFacilityService {
     @Override
     public List<BaseGgpFacility> baseGgpFacilityList(BaseGgpFacilityVO baseGgpFacilityVO) {
-        List<BaseGgpFacilityListVO> list1 = new ArrayList<>();
-        LambdaQueryWrapper<BaseGgpFacility> query = Wrappers.lambdaQuery();
-        query.eq(StringUtils.isNotBlank(baseGgpFacilityVO.getStreetTown()),BaseGgpFacility::getStreetTown, baseGgpFacilityVO.getStreetTown());
-        query.in(CollectionUtils.isNotEmpty(baseGgpFacilityVO.getFacilityType()),BaseGgpFacility::getFacilityType,
-                baseGgpFacilityVO.getFacilityType());
+        List<BaseGgpFacility> list = new ArrayList<>();
+        if (baseGgpFacilityVO.getId()==null){
+            if (baseGgpFacilityVO.getFacilityType().size()==2 && baseGgpFacilityVO.getFacilityType().get(0)==39 && baseGgpFacilityVO.getFacilityType().get(1)==42){
+                LambdaQueryWrapper<BaseGgpFacility> query1 = Wrappers.lambdaQuery();
+                query1.select(BaseGgpFacility::getId,BaseGgpFacility::getFacilityName,BaseGgpFacility::getAddress,
+                        BaseGgpFacility::getFacilityType,BaseGgpFacility::getLongitude,BaseGgpFacility::getLatitude,
+                        BaseGgpFacility::getStreetTown,BaseGgpFacility::getContact,BaseGgpFacility::getContactPhone,
+                        BaseGgpFacility::getCheckComment);
+                query1.eq(StringUtils.isNotBlank(baseGgpFacilityVO.getStreetTown()),BaseGgpFacility::getStreetTown,
+                        baseGgpFacilityVO.getStreetTown());
+                query1.eq(BaseGgpFacility::getFacilityType,39);
+                List<BaseGgpFacility> list1 = this.list(query1);
+                LambdaQueryWrapper<BaseGgpFacility> query2 = Wrappers.lambdaQuery();
+                query2.eq(StringUtils.isNotBlank(baseGgpFacilityVO.getStreetTown()),BaseGgpFacility::getStreetTown,
+                        baseGgpFacilityVO.getStreetTown());
+                query2.eq(BaseGgpFacility::getFacilityType,42);
+                List<BaseGgpFacility> list2 = this.list(query2);
+                list.addAll(list1);
+                list.addAll(list2);
+            }else {
+                LambdaQueryWrapper<BaseGgpFacility> query = Wrappers.lambdaQuery();
+                if (baseGgpFacilityVO.getFacilityType().size()==1){
+                    if(baseGgpFacilityVO.getFacilityType().get(0)==39){
+                        query.select(BaseGgpFacility::getId,BaseGgpFacility::getFacilityName,BaseGgpFacility::getAddress,
+                                BaseGgpFacility::getFacilityType,BaseGgpFacility::getLongitude,BaseGgpFacility::getLatitude,
+                                BaseGgpFacility::getStreetTown,BaseGgpFacility::getContact,BaseGgpFacility::getContactPhone,
+                                BaseGgpFacility::getCheckComment);
+                    }
+                }
+                query.eq(StringUtils.isNotBlank(baseGgpFacilityVO.getStreetTown()),BaseGgpFacility::getStreetTown, baseGgpFacilityVO.getStreetTown());
+                query.in(CollectionUtils.isNotEmpty(baseGgpFacilityVO.getFacilityType()),BaseGgpFacility::getFacilityType,
+                        baseGgpFacilityVO.getFacilityType());
+                list = this.list(query);
+            }
+        }else {
+            LambdaQueryWrapper<BaseGgpFacility> query = Wrappers.lambdaQuery();
+            query.eq(BaseGgpFacility::getId, baseGgpFacilityVO.getId());
+            list = this.list(query);
+        }
 
-        List<BaseGgpFacility> list = this.list(query);
 //        if (CollectionUtils.isNotEmpty(list)) {
 //            for (int j = 0; j < list.size(); j++) {
 //                BaseGgpFacilityListVO baseGgpFacilityListVO = new BaseGgpFacilityListVO();
@@ -54,22 +87,38 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
     }
 
     @Override
-    public List<BaseGgpFacilityStatisticVO> statistic(Integer facilityType){
+    public List<BaseGgpFacilityStatisticVO> statistic(BaseGgpFacilityVO baseGgpFacilityVO){
         List<BaseGgpFacilityStatisticVO> list = new ArrayList<>();
         QueryWrapper<BaseGgpFacility> queryWrapper = Wrappers.query();
-        queryWrapper.select("street_town as streetTown","count(*) as count")
-                .eq("facility_type",facilityType)
-                .groupBy("street_town");
-        List<Map<String,Object>> maps = this.listMaps(queryWrapper);
-        if(maps.size() > 0){
-            for (int i = 0; i < maps.size(); i++) {
-                BaseGgpFacilityStatisticVO statisticVO = new BaseGgpFacilityStatisticVO();
-                statisticVO.setStreetTown(maps.get(i).get("streetTown").toString());
-                statisticVO.setCount(Integer.parseInt(maps.get(i).get("count").toString()));
-                list.add(statisticVO);
+        if(baseGgpFacilityVO.getStatisticType().equals("street")){
+            queryWrapper.select("street_town as streetTown","count(*) as count")
+                    .in("facility_type",baseGgpFacilityVO.getFacilityType())
+                    .groupBy("street_town");
+            List<Map<String,Object>> maps = this.listMaps(queryWrapper);
+            if(maps.size() > 0){
+                for (int i = 0; i < maps.size(); i++) {
+                    BaseGgpFacilityStatisticVO statisticVO = new BaseGgpFacilityStatisticVO();
+                    statisticVO.setStreetTown(maps.get(i).get("streetTown").toString());
+                    statisticVO.setCount(Integer.parseInt(maps.get(i).get("count").toString()));
+                    list.add(statisticVO);
+                }
+            }
+        }else if(baseGgpFacilityVO.getStatisticType().equals("facilityType")){
+            queryWrapper.select("facility_type as facilityType","count(*) as count")
+                    .in("facility_type",baseGgpFacilityVO.getFacilityType())
+                    .groupBy("facility_type");
+            List<Map<String,Object>> maps = this.listMaps(queryWrapper);
+            if(maps.size() > 0){
+                for (int i = 0; i < maps.size(); i++) {
+                    BaseGgpFacilityStatisticVO statisticVO = new BaseGgpFacilityStatisticVO();
+                    statisticVO.setFacilityType(Integer.parseInt(maps.get(i).get("facilityType").toString()));
+                    statisticVO.setCount(Integer.parseInt(maps.get(i).get("count").toString()));
+                    list.add(statisticVO);
+                }
             }
         }
 
+
         return list;
     }
 }

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

@@ -127,6 +127,16 @@ public class DemGridMemberServiceImpl extends AbstractCrudService<DemGridMemberM
         return list;
     }
 
+    @Override
+    public List<Map<String ,Object>> gridMemderViceStatistic(){
+        QueryWrapper<DemGridMemderVice> queryWrapper = Wrappers.query();
+        queryWrapper.select("personnel_type as personnelType","count(*) as count")
+                .groupBy("personnel_type");
+        List<Map<String,Object>> list = demGridMemderViceService.listMaps(queryWrapper);
+
+        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/java/com/usky/fire/service/impl/DemGridMemderStatisticServiceImpl.java

@@ -0,0 +1,219 @@
+package com.usky.fire.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.fire.domain.DemGridMember;
+import com.usky.fire.domain.DemGridMemderStatistic;
+import com.usky.fire.mapper.DemGridMemderStatisticMapper;
+import com.usky.fire.service.DemGridMemberService;
+import com.usky.fire.service.DemGridMemderStatisticService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * <p>
+ * 网格基础信息统计表 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-30
+ */
+@Service
+public class DemGridMemderStatisticServiceImpl extends AbstractCrudService<DemGridMemderStatisticMapper, DemGridMemderStatistic> implements DemGridMemderStatisticService {
+
+    @Autowired
+    private DemGridMemberService demGridMemberService;
+
+    @Override
+    public DemGridMemderStatistic gridMemderStatistic(String gridArea, String mapGridName, Integer gridGrade){
+        DemGridMemderStatistic gridMemderStatistic = new DemGridMemderStatistic();
+
+        QueryWrapper<DemGridMemderStatistic> queryWrapper = Wrappers.query();
+        if(gridGrade == null){
+            queryWrapper.select("SUM(personnel_num) as personnelNum","SUM(village_num) as villageNum","SUM(high_rise_num) as highRiseNum","SUM(office_buildings_num) as officeBuildingsNum","SUM(street_front_num) as streetFrontNum","SUM(key_company_num) as keyCompanyNum","SUM(factory_store_num) as factoryStoreNum","SUM(medical_institution_num) as medicalInstitutionNum","SUM(school_num) as schoolNum","SUM(elder_care_num) as elderCareNum","SUM(large_build_num) as largeBuildNum","SUM(dealer_market_num) as dealerMarketNum","SUM(pulic_entertainment_num) as pulicEntertainmentNum","SUM(religious_places_num) as religiousPlacesNum","SUM(hotel_num) as hotelNum","SUM(scale_rent_num) as scaleRentNum","SUM(gas_station_num) as gasStationNum","SUM(subway_station_num) as subwayStationNum","SUM(construction_site_num) as constructionSiteNum","SUM(community_num) as communityNum","SUM(other_num) as otherNum");
+
+        }else{
+            List<DemGridMember> list = new ArrayList<>();
+            LambdaQueryWrapper<DemGridMember> queryWrapperList = Wrappers.lambdaQuery();
+            queryWrapperList.eq(DemGridMember::getDeleteFlag, 0)
+                    .eq(StringUtils.isNotBlank(gridArea),DemGridMember::getGridArea, gridArea)
+                    .eq(StringUtils.isNotBlank(mapGridName),DemGridMember::getMapGridName, mapGridName)
+                    .eq(gridGrade != null,DemGridMember::getGridGrade, gridGrade);
+            list = demGridMemberService.list(queryWrapperList);
+            if (CollectionUtils.isNotEmpty(list)) {
+                List<Integer> id = new ArrayList<>();
+                for (int i = 0; i < list.size(); i++) {
+                    id.add(list.get(i).getId());
+                }
+                if(gridGrade == 2){
+                    LambdaQueryWrapper<DemGridMember> queryWrapper1 = Wrappers.lambdaQuery();
+                    queryWrapper1.in(DemGridMember::getSeniorGrid,id);
+                    List<Integer> idList = new ArrayList<>();
+                    List<DemGridMember> queryList = demGridMemberService.list(queryWrapper1);
+                    if(queryList.size() > 0){
+                        for (int i = 0; i < queryList.size(); i++) {
+                            idList.add(queryList.get(i).getId());
+                        }
+                    }
+
+                    if(idList.size() > 0){
+                        queryWrapper.select("SUM(personnel_num) as personnelNum","SUM(village_num) as villageNum","SUM(high_rise_num) as highRiseNum","SUM(office_buildings_num) as officeBuildingsNum","SUM(street_front_num) as streetFrontNum","SUM(key_company_num) as keyCompanyNum","SUM(factory_store_num) as factoryStoreNum","SUM(medical_institution_num) as medicalInstitutionNum","SUM(school_num) as schoolNum","SUM(elder_care_num) as elderCareNum","SUM(large_build_num) as largeBuildNum","SUM(dealer_market_num) as dealerMarketNum","SUM(pulic_entertainment_num) as pulicEntertainmentNum","SUM(religious_places_num) as religiousPlacesNum","SUM(hotel_num) as hotelNum","SUM(scale_rent_num) as scaleRentNum","SUM(gas_station_num) as gasStationNum","SUM(subway_station_num) as subwayStationNum","SUM(construction_site_num) as constructionSiteNum","SUM(community_num) as communityNum","SUM(other_num) as otherNum")
+                                .in("grid_member_id",idList);
+                    }
+
+
+                }else if(gridGrade == 3){
+                    queryWrapper.select("SUM(personnel_num) as personnelNum","SUM(village_num) as villageNum","SUM(high_rise_num) as highRiseNum","SUM(office_buildings_num) as officeBuildingsNum"
+                            ,"SUM(street_front_num) as streetFrontNum","SUM(key_company_num) as keyCompanyNum","SUM(factory_store_num) as factoryStoreNum"
+                            ,"SUM(medical_institution_num) as medicalInstitutionNum","SUM(school_num) as schoolNum","SUM(elder_care_num) as elderCareNum"
+                            ,"SUM(large_build_num) as largeBuildNum","SUM(dealer_market_num) as dealerMarketNum","SUM(pulic_entertainment_num) as pulicEntertainmentNum"
+                            ,"SUM(religious_places_num) as religiousPlacesNum","SUM(hotel_num) as hotelNum","SUM(scale_rent_num) as scaleRentNum"
+                            ,"SUM(gas_station_num) as gasStationNum","SUM(subway_station_num) as subwayStationNum","SUM(construction_site_num) as constructionSiteNum"
+                            ,"SUM(community_num) as communityNum","SUM(other_num) as otherNum")
+                            .in("grid_member_id",id);
+                }
+            }
+
+        }
+        List<Map<String,Object>> maps = this.listMaps(queryWrapper);
+        if(maps.size() > 0){
+            if(Objects.isNull(maps.get(0).get("personnelNum"))){
+                gridMemderStatistic.setPersonnelNum(0);
+            }else{
+                gridMemderStatistic.setPersonnelNum(Integer.parseInt(maps.get(0).get("personnelNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("villageNum"))){
+                gridMemderStatistic.setVillageNum(0);
+            }else{
+                gridMemderStatistic.setVillageNum(Integer.parseInt(maps.get(0).get("villageNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("highRiseNum"))){
+                gridMemderStatistic.setHighRiseNum(0);
+            }else{
+                gridMemderStatistic.setHighRiseNum(Integer.parseInt(maps.get(0).get("highRiseNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("officeBuildingsNum"))){
+                gridMemderStatistic.setOfficeBuildingsNum(0);
+            }else{
+                gridMemderStatistic.setOfficeBuildingsNum(Integer.parseInt(maps.get(0).get("officeBuildingsNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("streetFrontNum"))){
+                gridMemderStatistic.setStreetFrontNum(0);
+            }else{
+                gridMemderStatistic.setStreetFrontNum(Integer.parseInt(maps.get(0).get("streetFrontNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("keyCompanyNum"))){
+                gridMemderStatistic.setKeyCompanyNum(0);
+            }else{
+                gridMemderStatistic.setKeyCompanyNum(Integer.parseInt(maps.get(0).get("keyCompanyNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("factoryStoreNum"))){
+                gridMemderStatistic.setFactoryStoreNum(0);
+            }else{
+                gridMemderStatistic.setFactoryStoreNum(Integer.parseInt(maps.get(0).get("factoryStoreNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("medicalInstitutionNum"))){
+                gridMemderStatistic.setMedicalInstitutionNum(0);
+            }else{
+                gridMemderStatistic.setMedicalInstitutionNum(Integer.parseInt(maps.get(0).get("medicalInstitutionNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("schoolNum"))){
+                gridMemderStatistic.setSchoolNum(0);
+            }else{
+                gridMemderStatistic.setSchoolNum(Integer.parseInt(maps.get(0).get("schoolNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("elderCareNum"))){
+                gridMemderStatistic.setElderCareNum(0);
+            }else{
+                gridMemderStatistic.setElderCareNum(Integer.parseInt(maps.get(0).get("elderCareNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("largeBuildNum"))){
+                gridMemderStatistic.setLargeBuildNum(0);
+            }else{
+                gridMemderStatistic.setLargeBuildNum(Integer.parseInt(maps.get(0).get("largeBuildNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("dealerMarketNum"))){
+                gridMemderStatistic.setDealerMarketNum(0);
+            }else{
+                gridMemderStatistic.setDealerMarketNum(Integer.parseInt(maps.get(0).get("dealerMarketNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("pulicEntertainmentNum"))){
+                gridMemderStatistic.setPulicEntertainmentNum(0);
+            }else{
+                gridMemderStatistic.setPulicEntertainmentNum(Integer.parseInt(maps.get(0).get("pulicEntertainmentNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("religiousPlacesNum"))){
+                gridMemderStatistic.setReligiousPlacesNum(0);
+            }else{
+                gridMemderStatistic.setReligiousPlacesNum(Integer.parseInt(maps.get(0).get("religiousPlacesNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("hotelNum"))){
+                gridMemderStatistic.setHotelNum(0);
+            }else{
+                gridMemderStatistic.setHotelNum(Integer.parseInt(maps.get(0).get("hotelNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("scaleRentNum"))){
+                gridMemderStatistic.setScaleRentNum(0);
+            }else{
+                gridMemderStatistic.setScaleRentNum(Integer.parseInt(maps.get(0).get("scaleRentNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("gasStationNum"))){
+                gridMemderStatistic.setGasStationNum(0);
+            }else{
+                gridMemderStatistic.setGasStationNum(Integer.parseInt(maps.get(0).get("gasStationNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("subwayStationNum"))){
+                gridMemderStatistic.setSubwayStationNum(0);
+            }else{
+                gridMemderStatistic.setSubwayStationNum(Integer.parseInt(maps.get(0).get("subwayStationNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("constructionSiteNum"))){
+                gridMemderStatistic.setConstructionSiteNum(0);
+            }else{
+                gridMemderStatistic.setConstructionSiteNum(Integer.parseInt(maps.get(0).get("constructionSiteNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("communityNum"))){
+                gridMemderStatistic.setCommunityNum(0);
+            }else{
+                gridMemderStatistic.setCommunityNum(Integer.parseInt(maps.get(0).get("communityNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("otherNum"))){
+                gridMemderStatistic.setOtherNum(0);
+            }else{
+                gridMemderStatistic.setOtherNum(Integer.parseInt(maps.get(0).get("otherNum").toString()));
+            }
+
+        }
+
+        return gridMemderStatistic;
+    }
+}

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

@@ -84,21 +84,21 @@ public class ReportIndexResultServiceImpl extends AbstractCrudService<ReportInde
                 LocalDate date=LocalDate.now();
                 LocalDateTime dateTime=LocalDateTime.now();
                 for (int i = 0; i < baseCompanies.size(); i++) {
-                    // 1.新建document对象
-//                    Document document = new Document(PageSize.A4);// 建立一个Document对象
-//
-//// 2.建立一个书写器(Writer)与document对象关联
-////                    File file =
-////                            new File("/var/www/usky-file/"+now.get(Calendar.YEAR)+"0"+now.get(Calendar.MONTH+1)+"/"+now.get(Calendar.YEAR)+now.get(Calendar.MONTH)+baseCompanies.get(i).getCompanyId()+".pdf");
+                     //1.新建document对象
+                    Document document = new Document(PageSize.A4);// 建立一个Document对象
+
+// 2.建立一个书写器(Writer)与document对象关联
+                    File file =
+                            new File("/var/www/usky-file/"+now.get(Calendar.YEAR)+"0"+now.get(Calendar.MONTH+1)+"/"+now.get(Calendar.YEAR)+now.get(Calendar.MONTH)+baseCompanies.get(i).getCompanyId()+".pdf");
 //                    File file = new File("D:\\"+now.get(Calendar.YEAR)+now.get(Calendar.MONTH)+baseCompanies.get(i).getCompanyId()+".pdf");
-//                    file.createNewFile();
-//                    PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream(file));
-////                    writer.setPageEvent(new Watermark("hello word"));// 水印
-//                    writer.setPageEvent(new MyHeaderFooter());// 页眉/页脚
-//                    // 3.打开文档
-//                    document.open();
-//                    document.addTitle("fire report");// 标题
-//                    document.addAuthor("mhzd");// 作者
+                    file.createNewFile();
+                    PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream(file));
+//                    writer.setPageEvent(new Watermark("hello word"));// 水印
+                    writer.setPageEvent(new MyHeaderFooter());// 页眉/页脚
+                    // 3.打开文档
+                    document.open();
+                    document.addTitle("fire report");// 标题
+                    document.addAuthor("mhzd");// 作者
                     DemReportDataVo demReportDataVo = new DemReportDataVo();
                     demReportDataVo.setCompanyName(baseCompanies.get(i).getCompanyName());
                     demReportDataVo.setLastMonthEndTime(date.toString());
@@ -1010,8 +1010,8 @@ public class ReportIndexResultServiceImpl extends AbstractCrudService<ReportInde
                             demReportDataVo.setOverallRating("高风险");
                         }
                     }
-//                    this.generatePDF(document,demReportDataVo);
-//                    document.close();
+                    this.generatePDF(document,demReportDataVo);
+                    document.close();
                     reportResultService.save(reportResult);
                 }
             }
@@ -1715,9 +1715,9 @@ public class ReportIndexResultServiceImpl extends AbstractCrudService<ReportInde
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
         String formattedDate = currentDate.format(formatter);
         resultStatisticsVO.setHighRisk(getReportCountByScoreRange(0, 60, formattedDate).size());
-        resultStatisticsVO.setMildHighRisk(getReportCountByScoreRange(60, 70, formattedDate).size());
-        resultStatisticsVO.setNormalRisk(getReportCountByScoreRange(70, 80, formattedDate).size());
-        resultStatisticsVO.setLowRisk(getReportCountByScoreRange(80, 100, formattedDate).size());
+        resultStatisticsVO.setMildHighRisk(getReportCountByScoreRange(60, 69, formattedDate).size());
+        resultStatisticsVO.setNormalRisk(getReportCountByScoreRange(69, 70, formattedDate).size());
+        resultStatisticsVO.setLowRisk(getReportCountByScoreRange(70, 100, formattedDate).size());
         list.add(resultStatisticsVO);
         return list;
     }
@@ -1740,11 +1740,11 @@ public class ReportIndexResultServiceImpl extends AbstractCrudService<ReportInde
         if (riskGrade.equals(1)) {
             highRiskList = getReportCountByScoreRange(0, 60, formattedDate);
         }else if (riskGrade.equals(2)){
-            highRiskList = getReportCountByScoreRange(60, 70, formattedDate);
+            highRiskList = getReportCountByScoreRange(60, 69, formattedDate);
         }else if (riskGrade.equals(3)){
-            highRiskList = getReportCountByScoreRange(70, 80, formattedDate);
+            highRiskList = getReportCountByScoreRange(69, 70, formattedDate);
         }else if (riskGrade.equals(4)){
-            highRiskList = getReportCountByScoreRange(80, 100, formattedDate);
+            highRiskList = getReportCountByScoreRange(70, 100, formattedDate);
         }
         if (CollectionUtils.isNotEmpty(highRiskList)) {
             List<Integer> idList = new ArrayList<>();
@@ -1782,7 +1782,9 @@ public class ReportIndexResultServiceImpl extends AbstractCrudService<ReportInde
                 }
                 LambdaQueryWrapper<BaseCompanyAttach1> queryWrapper1 = Wrappers.lambdaQuery();
                 queryWrapper1.select(BaseCompanyAttach1::getId, BaseCompanyAttach1::getCompanyId, BaseCompanyAttach1::getLongitude,
-                        BaseCompanyAttach1::getLatitude)
+                        BaseCompanyAttach1::getLatitude,BaseCompanyAttach1::getRefugeFloorPosition,
+                        BaseCompanyAttach1::getRemarks,BaseCompanyAttach1::getPlanName,BaseCompanyAttach1::getPlanUrl
+                        ,BaseCompanyAttach1::getBuildNum,BaseCompanyAttach1::getSuperiorFireJurisdiction)
                         .in(BaseCompanyAttach1::getCompanyId, companyIdList);
                 List<BaseCompanyAttach1> list2 = baseCompanyAttach1Service.list(queryWrapper1);
                 for (int i = 0; i < list1.size(); i++) {
@@ -1840,6 +1842,12 @@ public class ReportIndexResultServiceImpl extends AbstractCrudService<ReportInde
                             map.put("streetTown", streetTown);
                             map.put("longitude", longitude);
                             map.put("latitude", latitude);
+                            map.put("person1", list2.get(j).getRefugeFloorPosition());
+                            map.put("phone1", list2.get(j).getRemarks());
+                            map.put("person2", list2.get(j).getPlanName());
+                            map.put("phone2", list2.get(j).getPlanUrl());
+                            map.put("person3", list2.get(j).getBuildNum());
+                            map.put("phone3", list2.get(j).getSuperiorFireJurisdiction());
                         }
                     }
                     if (map.get("longitude") != null && map.get("latitude") != null && map.get("streetTown") != null) {

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/BaseGgpFacilityStatisticVO.java

@@ -4,6 +4,10 @@ import lombok.Data;
 
 @Data
 public class BaseGgpFacilityStatisticVO {
+    /**
+     * 设施类型
+     */
+    private Integer facilityType;
 
     /**
      * 所属街镇

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/BaseGgpFacilityVO.java

@@ -19,6 +19,8 @@ public class BaseGgpFacilityVO {
 
         private String streetTown;
 
+        private String statisticType; //统计类型("facilityType","street")
+
         private List<Integer> facilityType;
 
 }

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

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.fire.mapper.DemGridMemderStatisticMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemGridMemderStatistic">
+        <id column="id" property="id" />
+        <result column="grid_member_id" property="gridMemberId" />
+        <result column="personnel_num" property="personnelNum" />
+        <result column="village_num" property="villageNum" />
+        <result column="high_rise_num" property="highRiseNum" />
+        <result column="office_buildings_num" property="officeBuildingsNum" />
+        <result column="street_front_num" property="streetFrontNum" />
+        <result column="key_company_num" property="keyCompanyNum" />
+        <result column="factory_store_num" property="factoryStoreNum" />
+        <result column="medical_institution_num" property="medicalInstitutionNum" />
+        <result column="school_num" property="schoolNum" />
+        <result column="elder_care_num" property="elderCareNum" />
+        <result column="large_build_num" property="largeBuildNum" />
+        <result column="dealer_market_num" property="dealerMarketNum" />
+        <result column="pulic_entertainment_num" property="pulicEntertainmentNum" />
+        <result column="religious_places_num" property="religiousPlacesNum" />
+        <result column="hotel_num" property="hotelNum" />
+        <result column="scale_rent_num" property="scaleRentNum" />
+        <result column="gas_station_num" property="gasStationNum" />
+        <result column="subway_station_num" property="subwayStationNum" />
+        <result column="construction_site_num" property="constructionSiteNum" />
+        <result column="community_num" property="communityNum" />
+        <result column="other_num" property="otherNum" />
+    </resultMap>
+
+</mapper>

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/BaseBuildFacility.java

@@ -162,6 +162,36 @@ public class BaseBuildFacility implements Serializable {
      */
     private String facilityDesc;
 
+    /**
+     * 三维角度X
+     */
+    private Double anglesX;
+
+    /**
+     * 三维角度Y
+     */
+    private Double anglesY;
+
+    /**
+     * 三维角度Z
+     */
+    private Double anglesZ;
+
+    /**
+     * 三维图标大小
+     */
+    private Double scaleL;
+
+    /**
+     * 三维图标大小
+     */
+    private Double scaleW;
+
+    /**
+     * 三维图标大小
+     */
+    private Double scaleH;
+
     /**
      * 模型链接
      */

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/BaseBuildFacilityType.java

@@ -92,5 +92,35 @@ public class BaseBuildFacilityType implements Serializable {
      */
     private Integer tenantId;
 
+    /**
+     * 三维角度X
+     */
+    private Double anglesX;
+
+    /**
+     * 三维角度Y
+     */
+    private Double anglesY;
+
+    /**
+     * 三维角度Z
+     */
+    private Double anglesZ;
+
+    /**
+     * 三维图标大小
+     */
+    private Double scaleL;
+
+    /**
+     * 三维图标大小
+     */
+    private Double scaleW;
+
+    /**
+     * 三维图标大小
+     */
+    private Double scaleH;
+
 
 }

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

@@ -78,7 +78,7 @@ public class BaseAlarmNoticeServiceImpl extends AbstractCrudService<BaseAlarmNot
                 .eq(StringUtils.isNotBlank(baseAlarmListVO.getProductCode()),BaseAlarmNotice::getProductCode,
                         baseAlarmListVO.getProductCode())
                 .eq(BaseAlarmNotice::getDeleteFlag,0)
-//                .eq(BaseAlarmNotice::getTenantId,SecurityUtils.getTenantId())
+                .eq(BaseAlarmNotice::getTenantId,SecurityUtils.getTenantId())
                 .orderByDesc(BaseAlarmNotice::getId);
         page  = this.page(page,queryWrapper);
         return new CommonPage<>(page.getRecords(),page.getTotal(),page.getSize(),page.getCurrent());

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

@@ -111,7 +111,8 @@ public class CrmDeviceRepairServiceImpl extends AbstractCrudService<CrmDeviceRep
     public CommonPage<CrmDeviceRepair> page(CrmDeviceRepairVO crmDeviceRepairVO){
         IPage<CrmDeviceRepair> page = new Page<>(crmDeviceRepairVO.getCurrent(),crmDeviceRepairVO.getSize());
         LambdaQueryWrapper<CrmDeviceRepair> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.like(StringUtils.isNotBlank(crmDeviceRepairVO.getProjectName()),CrmDeviceRepair::getProjectName,crmDeviceRepairVO.getProjectName())
+        queryWrapper.eq(StringUtils.isNotBlank(crmDeviceRepairVO.getRepairCode()),CrmDeviceRepair::getRepairCode,crmDeviceRepairVO.getRepairCode())
+                .like(StringUtils.isNotBlank(crmDeviceRepairVO.getProjectName()),CrmDeviceRepair::getProjectName,crmDeviceRepairVO.getProjectName())
                 .like(StringUtils.isNotBlank(crmDeviceRepairVO.getReflectName()),CrmDeviceRepair::getReflectName,crmDeviceRepairVO.getReflectName())
                 .eq(crmDeviceRepairVO.getRepairStatus() != null,CrmDeviceRepair::getRepairStatus,crmDeviceRepairVO.getRepairStatus())
                 .between(StringUtils.isNotBlank(crmDeviceRepairVO.getStartTime()) && StringUtils.isNotBlank(crmDeviceRepairVO.getEndTime()),CrmDeviceRepair::getCreateTime,crmDeviceRepairVO.getStartTime(),crmDeviceRepairVO.getEndTime())

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/CrmDeviceRepairVO.java

@@ -14,6 +14,11 @@ public class CrmDeviceRepairVO {
      */
     private Integer size;
 
+    /**
+     * 报修单编码
+     */
+    private String repairCode;
+
     /**
      * 项目名称
      */

service-iot/service-iot-biz/src/main/resources/mapper/iot/BaseBuildFacilityMapper.xml

@@ -26,6 +26,13 @@
         <result column="create_by" property="createBy" />
         <result column="dept_id" property="deptId" />
         <result column="tenant_id" property="tenantId" />
+        <result column="facility_desc" property="facilityDesc" />
+        <result column="angles_x" property="anglesX" />
+        <result column="angles_y" property="anglesY" />
+        <result column="angles_z" property="anglesZ" />
+        <result column="scale_l" property="scaleL" />
+        <result column="scale_w" property="scaleW" />
+        <result column="scale_h" property="scaleH" />
     </resultMap>
     <select id="baseBuildFacilityTypeList" resultType="com.usky.iot.domain.BaseBuildFacilityType">
         select

service-iot/service-iot-biz/src/main/resources/mapper/iot/BaseBuildFacilityTypeMapper.xml

@@ -18,6 +18,12 @@
         <result column="update_time" property="updateTime" />
         <result column="dept_id" property="deptId" />
         <result column="tenant_id" property="tenantId" />
+        <result column="angles_x" property="anglesX" />
+        <result column="angles_y" property="anglesY" />
+        <result column="angles_z" property="anglesZ" />
+        <result column="scale_l" property="scaleL" />
+        <result column="scale_w" property="scaleW" />
+        <result column="scale_h" property="scaleH" />
     </resultMap>
 
 </mapper>