Merge branch 'han'

hebingfenzhi

pom.xml

@@ -58,6 +58,10 @@
     
     
     <module>service-iot</module>
+
+
+
+    <module>service-alarm</module>
                 
     
     

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/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/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();

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-iot/service-iot-biz/src/main/java/com/usky/iot/domain/BaseBuildFacility.java

@@ -162,6 +162,16 @@ public class BaseBuildFacility implements Serializable {
      */
     private String facilityDesc;
 
+    /**
+     * 三维角度
+     */
+    private Integer angle;
+
+    /**
+     * 建筑设施备注
+     */
+    private String scale;
+
     /**
      * 模型链接
      */

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/resources/mapper/iot/BaseBuildFacilityMapper.xml

@@ -26,6 +26,9 @@
         <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="angle" property="angle" />
+        <result column="scale" property="scale" />
     </resultMap>
     <select id="baseBuildFacilityTypeList" resultType="com.usky.iot.domain.BaseBuildFacilityType">
         select