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

service-backend/service-backend-biz/src/main/resources/mapper/backend/DataRealTimeMapper.xml

@@ -65,7 +65,7 @@
     <select id="QueryTotalHistoryAvrgData" resultType="com.usky.backend.domain.vo.DataHistoryAvergerVO">
         SELECT a.data_date as dataDate,'all_in_room' as deviceId,a.attribute_name as attributeName ,avg(a.attribute_data) as avrg
         FROM (SELECT product_code,attribute_name,attribute_data,LEFT(data_time,#{leftLen}) AS data_date FROM ${tableName} WHERE data_time  BETWEEN  #{startTime} AND  #{endTime} AND product_code = #{productCode}
-        AND device_id != 'aliweather0001'
+        AND device_id != 'weather0001'
         <if test="attributeNameList != null and attributeNameList.size() > 0">
             AND attribute_name in
             <foreach item="item" collection="attributeNameList" open="(" separator="," close=")">

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

@@ -0,0 +1,22 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 新消监_责令限期改正通知书、监督检查 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+@RestController
+@RequestMapping("/demNewDeadlineNotice")
+public class DemNewDeadlineNoticeController {
+
+}
+

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

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 新消监_责令立即改正通知书 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+@Controller
+@RequestMapping("/demNewImmediateNotice")
+public class DemNewImmediateNoticeController {
+
+}
+

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

@@ -0,0 +1,44 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.fire.service.DemNewInspectRecordService;
+import com.usky.fire.service.vo.SiAeAllVO;
+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.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 新消监_消防监督检查记录 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+@RestController
+@RequestMapping("/demNewInspectRecord")
+public class DemNewInspectRecordController {
+
+    @Autowired
+    public DemNewInspectRecordService demNewInspectRecordService;
+    /**
+     * 行政执法总记录汇总
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return
+     */
+    @GetMapping("/siAeAllCollect")
+    public ApiResult<List<SiAeAllVO>> aeAllCollect(@RequestParam String startTime,
+                                                   @RequestParam String endTime){
+        return ApiResult.success(demNewInspectRecordService.getAeAllCollect(startTime,endTime));
+    }
+}
+

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

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 新消监_消防监督检查记录（其他形式） 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+@Controller
+@RequestMapping("/demNewOtherRecord")
+public class DemNewOtherRecordController {
+
+}
+

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

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 新消监_行政处罚决定书 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+@Controller
+@RequestMapping("/demNewPenaltyLetter")
+public class DemNewPenaltyLetterController {
+
+}
+

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

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 新消监_行政强制临时查封决定书表 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+@Controller
+@RequestMapping("/demNewSeizureLetter")
+public class DemNewSeizureLetterController {
+
+}
+

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

@@ -0,0 +1,46 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 新消监_责令限期改正通知书、监督检查
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemNewDeadlineNotice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 单位名称
+     */
+    private String companyName;
+
+    /**
+     * 检查时间
+     */
+    private LocalDateTime checkTime;
+
+    /**
+     * 整改隐患
+     */
+    private String content4;
+
+}

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

@@ -0,0 +1,47 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 新消监_责令立即改正通知书
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemNewImmediateNotice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 单位名称
+     */
+    private String companyName;
+
+    /**
+     * 整改隐患
+     */
+    private String content4;
+
+    /**
+     * 检查时间
+     */
+    private LocalDateTime checkTime;
+
+
+}

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

@@ -0,0 +1,106 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 新消监_消防监督检查记录
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemNewInspectRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 文号
+     */
+    private String documentNumber;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标识;（0未删除，1 已删除）
+     */
+    private Integer deleteFlag;
+
+    /**
+     * 录入人姓名
+     */
+    private String enterBy;
+
+    /**
+     * 录入时间
+     */
+    private LocalDateTime enterTime;
+
+    /**
+     * 修改人姓名
+     */
+    private String updateBy;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 项目编号
+     */
+    private String projectNum;
+
+    /**
+     * 主管单位名称
+     */
+    private String sponsorName;
+
+    /**
+     * 单位名称
+     */
+    private String companyName;
+
+    /**
+     * 单位ID
+     */
+    private String companyId;
+
+    /**
+     * 单位地址
+     */
+    private String companyAddress;
+
+    /**
+     * 检查结果
+     */
+    private Integer inspectionResult;
+
+    /**
+     * 消防监督检查员
+     */
+    private String enforceInspectPerson;
+
+    /**
+     * 检查时间
+     */
+    private LocalDateTime checkTime;
+
+
+}

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

@@ -0,0 +1,111 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 新消监_消防监督检查记录（其他形式）
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemNewOtherRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 文号
+     */
+    private String documentNumber;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标识;（0未删除，1 已删除）
+     */
+    private Integer deleteFlag;
+
+    /**
+     * 录入人姓名
+     */
+    private String enterBy;
+
+    /**
+     * 录入时间
+     */
+    private LocalDateTime enterTime;
+
+    /**
+     * 修改人姓名
+     */
+    private String updateBy;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 项目编号
+     */
+    private String projectNum;
+
+    /**
+     * 主管单位名称
+     */
+    private String sponsorName;
+
+    /**
+     * 单位名称
+     */
+    private String companyName;
+
+    /**
+     * 单位ID
+     */
+    private String companyId;
+
+    /**
+     * 单位地址
+     */
+    private String companyAddress;
+
+    /**
+     * 检查结果
+     */
+    private Integer inspectionResult;
+
+    /**
+     * 检查内容和情况
+     */
+    private String inspectionContent;
+
+    /**
+     * 消防监督检查员
+     */
+    private String enforceInspectPerson;
+
+    /**
+     * 检查时间
+     */
+    private LocalDateTime checkTime;
+
+
+}

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

@@ -0,0 +1,54 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 新消监_行政处罚决定书
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemNewPenaltyLetter implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 罚款金额
+     */
+    private Integer penaltyAmount;
+
+    /**
+     * 检查时间
+     */
+    private LocalDateTime checkTime;
+
+    /**
+     * 是否三停
+     */
+    private Integer tripleStop;
+
+    /**
+     * 设施编号
+     */
+    @TableField(exist = false)
+    private Integer totalSum;
+
+
+}

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

@@ -0,0 +1,51 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 新消监_行政强制临时查封决定书表
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemNewSeizureLetter implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 文号
+     */
+    private String documentNumber;
+
+    /**
+     * 被查封单位
+     */
+    private String seizureCompany;
+
+    /**
+     * 被查封地址
+     */
+    private String seizureAddress;
+
+    /**
+     * 检查时间
+     */
+    private LocalDateTime checkTime;
+
+
+}

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

@@ -0,0 +1,18 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemNewDeadlineNotice;
+import com.usky.common.mybatis.core.CrudMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 新消监_责令限期改正通知书、监督检查 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+@Repository
+public interface DemNewDeadlineNoticeMapper extends CrudMapper<DemNewDeadlineNotice> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemNewImmediateNotice;
+import com.usky.common.mybatis.core.CrudMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 新消监_责令立即改正通知书 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+@Repository
+public interface DemNewImmediateNoticeMapper extends CrudMapper<DemNewImmediateNotice> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemNewInspectRecord;
+import com.usky.common.mybatis.core.CrudMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 新消监_消防监督检查记录 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+@Repository
+public interface DemNewInspectRecordMapper extends CrudMapper<DemNewInspectRecord> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemNewOtherRecord;
+import com.usky.common.mybatis.core.CrudMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 新消监_消防监督检查记录（其他形式） Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+@Repository
+public interface DemNewOtherRecordMapper extends CrudMapper<DemNewOtherRecord> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemNewPenaltyLetter;
+import com.usky.common.mybatis.core.CrudMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 新消监_行政处罚决定书 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+@Repository
+public interface DemNewPenaltyLetterMapper extends CrudMapper<DemNewPenaltyLetter> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemNewSeizureLetter;
+import com.usky.common.mybatis.core.CrudMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 新消监_行政强制临时查封决定书表 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+@Repository
+public interface DemNewSeizureLetterMapper extends CrudMapper<DemNewSeizureLetter> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.DemNewDeadlineNotice;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 新消监_责令限期改正通知书、监督检查 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+public interface DemNewDeadlineNoticeService extends CrudService<DemNewDeadlineNotice> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.DemNewImmediateNotice;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 新消监_责令立即改正通知书 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+public interface DemNewImmediateNoticeService extends CrudService<DemNewImmediateNotice> {
+
+}

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

@@ -0,0 +1,25 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.DemNewInspectRecord;
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.fire.service.vo.SiAeAllVO;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 新消监_消防监督检查记录 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+public interface DemNewInspectRecordService extends CrudService<DemNewInspectRecord> {
+    /**
+     * 行政执法总记录汇总
+     * @param
+     * @return
+     */
+    List<SiAeAllVO> getAeAllCollect(String startTime, String endTime);
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.DemNewOtherRecord;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 新消监_消防监督检查记录（其他形式） 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+public interface DemNewOtherRecordService extends CrudService<DemNewOtherRecord> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.DemNewPenaltyLetter;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 新消监_行政处罚决定书 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+public interface DemNewPenaltyLetterService extends CrudService<DemNewPenaltyLetter> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.DemNewSeizureLetter;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 新消监_行政强制临时查封决定书表 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+public interface DemNewSeizureLetterService extends CrudService<DemNewSeizureLetter> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.usky.fire.service.impl;
+
+import com.usky.fire.domain.DemNewDeadlineNotice;
+import com.usky.fire.mapper.DemNewDeadlineNoticeMapper;
+import com.usky.fire.service.DemNewDeadlineNoticeService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 新消监_责令限期改正通知书、监督检查 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+@Service
+public class DemNewDeadlineNoticeServiceImpl extends AbstractCrudService<DemNewDeadlineNoticeMapper, DemNewDeadlineNotice> implements DemNewDeadlineNoticeService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.usky.fire.service.impl;
+
+import com.usky.fire.domain.DemNewImmediateNotice;
+import com.usky.fire.mapper.DemNewImmediateNoticeMapper;
+import com.usky.fire.service.DemNewImmediateNoticeService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 新消监_责令立即改正通知书 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+@Service
+public class DemNewImmediateNoticeServiceImpl extends AbstractCrudService<DemNewImmediateNoticeMapper, DemNewImmediateNotice> implements DemNewImmediateNoticeService {
+
+}

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

@@ -0,0 +1,176 @@
+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.Wrappers;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.common.core.util.Arith;
+import com.usky.common.core.util.DateUtils;
+import com.usky.fire.domain.*;
+import com.usky.fire.mapper.*;
+import com.usky.fire.service.DemNewInspectRecordService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.fire.service.vo.SiAeAllVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * <p>
+ * 新消监_消防监督检查记录 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+@Service
+public class DemNewInspectRecordServiceImpl extends AbstractCrudService<DemNewInspectRecordMapper, DemNewInspectRecord> implements DemNewInspectRecordService {
+    @Autowired
+    private DemNewDeadlineNoticeMapper demNewDeadlineNoticeMapper;
+    @Autowired
+    private DemNewOtherRecordMapper demNewOtherRecordMapper;
+    @Autowired
+    private DemNewImmediateNoticeMapper demNewImmediateNoticeMapper;
+    @Autowired
+    private DemNewPenaltyLetterMapper demNewPenaltyLetterMapper;
+    @Autowired
+    private DemNewSeizureLetterMapper demNewSeizureLetterMapper;
+
+    @Override
+    public List<SiAeAllVO> getAeAllCollect(String startDate, String endDate) {
+        List<SiAeAllVO> allVoS = new ArrayList<>();
+        Optional.ofNullable(startDate).orElseThrow(() -> new BusinessException("开始时间不能为空"));
+        Optional.ofNullable(endDate).orElseThrow(() -> new BusinessException("结束时间不能为空"));
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        try {
+            Date startTime = sdf.parse(startDate);
+            Date endTime = sdf.parse(endDate);
+            //获取同比
+            Date upStartTime = DateUtils.addYears(startTime, -1);
+            Date upEndTime = DateUtils.addYears(endTime, -1);
+            //获取环比
+            //获取两个时间天数之差
+            int distanceOfTwoDate = DateUtils.getDistanceOfTwoDateNew(startTime, endTime);
+            Date linkEndTime = startTime;
+            Date linkStartTime = DateUtils.addDays(linkEndTime, -distanceOfTwoDate);
+            Map<String, Object> dataMap = dataSelect(startTime,endTime);
+            Map<String, Object> upDataMap = dataSelect(upStartTime,upEndTime);
+            Map<String, Object> linkDataMap = dataSelect(linkStartTime,linkEndTime);
+            SiAeAllVO siAeAllVO = countAeAll(dataMap.get("checkType").toString(),Double.parseDouble(dataMap.get(
+                    "checkNum").toString()), Double.parseDouble(upDataMap.get("checkNum").toString()),
+                    Double.parseDouble(linkDataMap.get("checkNum").toString()));
+            allVoS.add(siAeAllVO);
+            SiAeAllVO siAeAllVO1 = countAeAll(dataMap.get("rectifyType").toString(),Double.parseDouble(dataMap.get(
+                    "rectifyNum").toString()), Double.parseDouble(upDataMap.get("rectifyNum").toString()),
+                    Double.parseDouble(linkDataMap.get("rectifyNum").toString()));
+            allVoS.add(siAeAllVO1);
+            SiAeAllVO siAeAllVO2 = countAeAll(dataMap.get("findType").toString(),Double.parseDouble(dataMap.get(
+                    "findNum").toString()), Double.parseDouble(upDataMap.get("findNum").toString()),
+                    Double.parseDouble(linkDataMap.get("findNum").toString()));
+            allVoS.add(siAeAllVO2);
+            SiAeAllVO siAeAllVO3 = countAeAll(dataMap.get("punishType").toString(),Double.parseDouble(dataMap.get(
+                    "punishNum").toString()), Double.parseDouble(upDataMap.get("punishNum").toString()),
+                    Double.parseDouble(linkDataMap.get("punishNum").toString()));
+            allVoS.add(siAeAllVO3);
+            SiAeAllVO siAeAllVO4 = countAeAll(dataMap.get("sealUpType").toString(),Double.parseDouble(dataMap.get(
+                    "sealUpNum").toString()), Double.parseDouble(upDataMap.get("sealUpNum").toString()),
+                    Double.parseDouble(linkDataMap.get("sealUpNum").toString()));
+            allVoS.add(siAeAllVO4);
+            SiAeAllVO siAeAllVO5 = countAeAll(dataMap.get("stopType").toString(),Double.parseDouble(dataMap.get(
+                    "stopNum").toString()), Double.parseDouble(upDataMap.get("stopNum").toString()),
+                    Double.parseDouble(linkDataMap.get("stopNum").toString()));
+            allVoS.add(siAeAllVO5);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return allVoS;
+    }
+    private Map<String, Object> dataSelect(Date startTime, Date endTime) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("checkType", "检查家次(家)");
+        LambdaQueryWrapper<DemNewInspectRecord> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.between(DemNewInspectRecord::getCheckTime,startTime,endTime);
+        Integer checkRadio1 = this.baseMapper.selectCount(queryWrapper);
+        LambdaQueryWrapper<DemNewOtherRecord> queryWrapper1 = Wrappers.lambdaQuery();
+        queryWrapper1.between(DemNewOtherRecord::getCheckTime,startTime,endTime);
+        Integer checkRadio2 = demNewOtherRecordMapper.selectCount(queryWrapper1);
+        map.put("checkNum", checkRadio1+checkRadio2);
+        LambdaQueryWrapper<DemNewImmediateNotice> queryWrapper2 = Wrappers.lambdaQuery();
+        queryWrapper2.between(DemNewImmediateNotice::getCheckTime,startTime,endTime);
+        List<DemNewImmediateNotice> demNewImmediateNoticeList = demNewImmediateNoticeMapper.selectList(queryWrapper2);
+        long count = 0;
+        if (CollectionUtils.isNotEmpty(demNewImmediateNoticeList)) {
+            for (int j = 0; j < demNewImmediateNoticeList.size(); j++) {
+                long count1 = demNewImmediateNoticeList.get(j).getContent4().chars().filter(ch -> ch == ',').count();
+                count+=count1;
+            }
+        }
+        map.put("rectifyType", "整改隐患(起)");
+        map.put("rectifyNum", count+demNewImmediateNoticeList.size());
+        LambdaQueryWrapper<DemNewDeadlineNotice> queryWrapper4 = Wrappers.lambdaQuery();
+        queryWrapper4.between(DemNewDeadlineNotice::getCheckTime,startTime,endTime);
+        List<DemNewDeadlineNotice> demNewDeadlineNoticeList = demNewDeadlineNoticeMapper.selectList(queryWrapper4);
+        long deadlineCount = 0;
+        if (CollectionUtils.isNotEmpty(demNewDeadlineNoticeList)) {
+            for (int j = 0; j < demNewDeadlineNoticeList.size(); j++) {
+                long count1 = demNewDeadlineNoticeList.get(j).getContent4().chars().filter(ch -> ch == ',').count();
+                deadlineCount+=count1;
+            }
+        }
+        map.put("findType", "发现隐患(起)");
+        map.put("findNum", deadlineCount+demNewDeadlineNoticeList.size()+count+demNewImmediateNoticeList.size());
+        QueryWrapper<DemNewPenaltyLetter> queryWrapper5 = Wrappers.query();
+        queryWrapper5.select("sum(penalty_amount) as totalSum")
+        .between("check_time",startTime,endTime);;
+        DemNewPenaltyLetter demNewPenaltyLetter = demNewPenaltyLetterMapper.selectOne(queryWrapper5);
+        map.put("punishType", "处罚金额(万元)");
+        if (demNewPenaltyLetter != null) {
+            map.put("punishNum", demNewPenaltyLetter.getTotalSum()/10000);
+        }else {
+            map.put("punishNum", 0);
+        }
+        LambdaQueryWrapper<DemNewSeizureLetter> queryWrapper6 = Wrappers.lambdaQuery();
+        queryWrapper6.between(DemNewSeizureLetter::getCheckTime,startTime,endTime);
+        Integer sealUp = demNewSeizureLetterMapper.selectCount(queryWrapper6);
+        map.put("sealUpType", "临时查封(份)");
+        map.put("sealUpNum", sealUp);
+        LambdaQueryWrapper<DemNewPenaltyLetter> queryWrapper7 = Wrappers.lambdaQuery();
+        queryWrapper7.between(DemNewPenaltyLetter::getCheckTime,startTime,endTime)
+        .eq(DemNewPenaltyLetter::getTripleStop,1);
+        Integer stopNum = demNewPenaltyLetterMapper.selectCount(queryWrapper7);
+        map.put("stopType", "责令三停(家)");
+        map.put("stopNum", stopNum);
+        return map;
+    }
+    private SiAeAllVO countAeAll(String type,Double radio,Double upRadio,Double linkRadio) {
+        SiAeAllVO siAeAllVO = new SiAeAllVO();
+        siAeAllVO.setCheckType(type);
+        siAeAllVO.setNumber(radio);
+        if (0 != radio){
+            siAeAllVO.setSameRatio(Arith.div(upRadio,radio));
+            siAeAllVO.setLinkRelativeRatio(Arith.div(linkRadio,radio));
+        }else {
+            siAeAllVO.setSameRatio(0.00);
+            siAeAllVO.setLinkRelativeRatio(0.00);
+        }
+        if (radio.equals(upRadio)){
+            siAeAllVO.setSameStatus(0);
+        }else if (radio > upRadio){
+            siAeAllVO.setSameStatus(1);
+        }else {
+            siAeAllVO.setSameStatus(2);
+        }
+        if (radio.equals(linkRadio)){
+            siAeAllVO.setLinkRelativeStatus(0);
+        }else if (radio > linkRadio){
+            siAeAllVO.setLinkRelativeStatus(1);
+        }else {
+            siAeAllVO.setLinkRelativeStatus(2);
+        }
+        return siAeAllVO;
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.usky.fire.service.impl;
+
+import com.usky.fire.domain.DemNewOtherRecord;
+import com.usky.fire.mapper.DemNewOtherRecordMapper;
+import com.usky.fire.service.DemNewOtherRecordService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 新消监_消防监督检查记录（其他形式） 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+@Service
+public class DemNewOtherRecordServiceImpl extends AbstractCrudService<DemNewOtherRecordMapper, DemNewOtherRecord> implements DemNewOtherRecordService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.usky.fire.service.impl;
+
+import com.usky.fire.domain.DemNewPenaltyLetter;
+import com.usky.fire.mapper.DemNewPenaltyLetterMapper;
+import com.usky.fire.service.DemNewPenaltyLetterService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 新消监_行政处罚决定书 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+@Service
+public class DemNewPenaltyLetterServiceImpl extends AbstractCrudService<DemNewPenaltyLetterMapper, DemNewPenaltyLetter> implements DemNewPenaltyLetterService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.usky.fire.service.impl;
+
+import com.usky.fire.domain.DemNewSeizureLetter;
+import com.usky.fire.mapper.DemNewSeizureLetterMapper;
+import com.usky.fire.service.DemNewSeizureLetterService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 新消监_行政强制临时查封决定书表 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-09-01
+ */
+@Service
+public class DemNewSeizureLetterServiceImpl extends AbstractCrudService<DemNewSeizureLetterMapper, DemNewSeizureLetter> implements DemNewSeizureLetterService {
+
+}

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

@@ -0,0 +1,13 @@
+<?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.DemNewDeadlineNoticeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemNewDeadlineNotice">
+        <id column="id" property="id" />
+        <result column="company_name" property="companyName" />
+        <result column="check_time" property="checkTime" />
+        <result column="content4" property="content4" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,13 @@
+<?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.DemNewImmediateNoticeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemNewImmediateNotice">
+        <id column="id" property="id" />
+        <result column="company_name" property="companyName" />
+        <result column="content4" property="content4" />
+        <result column="check_time" property="checkTime" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,25 @@
+<?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.DemNewInspectRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemNewInspectRecord">
+        <id column="id" property="id" />
+        <result column="document_number" property="documentNumber" />
+        <result column="remark" property="remark" />
+        <result column="delete_flag" property="deleteFlag" />
+        <result column="enter_by" property="enterBy" />
+        <result column="enter_time" property="enterTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="project_num" property="projectNum" />
+        <result column="sponsor_name" property="sponsorName" />
+        <result column="company_name" property="companyName" />
+        <result column="company_id" property="companyId" />
+        <result column="company_address" property="companyAddress" />
+        <result column="inspection_result" property="inspectionResult" />
+        <result column="enforce_inspect_person" property="enforceInspectPerson" />
+        <result column="check_time" property="checkTime" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,26 @@
+<?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.DemNewOtherRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemNewOtherRecord">
+        <id column="id" property="id" />
+        <result column="document_number" property="documentNumber" />
+        <result column="remark" property="remark" />
+        <result column="delete_flag" property="deleteFlag" />
+        <result column="enter_by" property="enterBy" />
+        <result column="enter_time" property="enterTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="project_num" property="projectNum" />
+        <result column="sponsor_name" property="sponsorName" />
+        <result column="company_name" property="companyName" />
+        <result column="company_id" property="companyId" />
+        <result column="company_address" property="companyAddress" />
+        <result column="inspection_result" property="inspectionResult" />
+        <result column="inspection_content" property="inspectionContent" />
+        <result column="enforce_inspect_person" property="enforceInspectPerson" />
+        <result column="check_time" property="checkTime" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,13 @@
+<?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.DemNewPenaltyLetterMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemNewPenaltyLetter">
+        <id column="id" property="id" />
+        <result column="penalty_amount" property="penaltyAmount" />
+        <result column="check_time" property="checkTime" />
+        <result column="triple_stop" property="tripleStop" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,14 @@
+<?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.DemNewSeizureLetterMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemNewSeizureLetter">
+        <id column="id" property="id" />
+        <result column="document_number" property="documentNumber" />
+        <result column="seizure_company" property="seizureCompany" />
+        <result column="seizure_address" property="seizureAddress" />
+        <result column="check_time" property="checkTime" />
+    </resultMap>
+
+</mapper>

service-iot/service-iot-api/src/main/java/com/usky/iot/RemoteUserService.java

@@ -1,28 +0,0 @@
-package com.usky.iot;
-
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.iot.domain.SysUserVO;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-
-@FeignClient(contextId = "remoteUserService", value = "usky-demo")
-public interface RemoteUserService {
-
-
-
-    @GetMapping("/byUserName")
-    ApiResult<List<SysUserVO>> getByUserName(@RequestParam("userName") String userName);
-
-
-    @PostMapping("/byUserName")
-    ApiResult<List<SysUserVO>> add(@RequestBody SysUserVO sysUserVO);
-
-
-    @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    ApiResult<String> upload(@RequestPart(value = "file") MultipartFile file);
-}

service-iot/service-iot-api/src/main/java/com/usky/iot/client/DeviceStatusClient.java

@@ -0,0 +1,10 @@
+package com.usky.iot.client;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@FeignClient(contextId = "DeviceStatusClient", value = "service-iot")
+public interface DeviceStatusClient {
+    @RequestMapping(value = "status")
+    void status();
+}

service-iot/service-iot-api/src/main/java/com/usky/iot/factory/RemoteUserFallbackFactory.java

@@ -1,48 +0,0 @@
-package com.usky.iot.factory;
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.exception.BusinessException;
-import com.usky.iot.RemoteUserService;
-import com.usky.iot.domain.SysUserVO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-
-
-/**
- * 用户服务降级处理
- *
- * @author ruoyi
- */
-@Component
-public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService>
-{
-    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
-
-    @Override
-    public RemoteUserService create(Throwable throwable)
-    {
-        log.error("用户服务调用失败:{}", throwable.getMessage());
-        return new RemoteUserService() {
-            @Override
-            public ApiResult<List<SysUserVO>> getByUserName(String userName) {
-                throw new BusinessException(throwable.getMessage());
-            }
-
-            @Override
-            public ApiResult<List<SysUserVO>> add(SysUserVO sysUserVO) {
-                throw new BusinessException(throwable.getMessage());
-            }
-
-            @Override
-            public ApiResult<String> upload(MultipartFile file) {
-                throw new BusinessException(throwable.getMessage());
-            }
-        };
-    }
-}

service-iot/service-iot-biz/pom.xml

@@ -20,6 +20,12 @@
             <version>0.0.1</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>service-iot-api</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+
         <dependency>
             <groupId>cn.afterturn</groupId>
             <artifactId>easypoi-spring-boot-starter</artifactId>

service-iot/service-iot-biz/src/main/java/com/usky/iot/RuoYiSystemApplication.java

@@ -1,7 +1,8 @@
 package com.usky.iot;
 
 
-import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
+
+import io.swagger.annotations.SwaggerDefinition;
 import org.mybatis.spring.annotation.MapperScan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,7 +22,7 @@ import java.net.UnknownHostException;
  * @author ruoyi
  */
 
-@EnableCustomSwagger2
+//@EnableSwagger2
 @EnableFeignClients(basePackages = "com.usky")
 @MapperScan(value = "com.usky.iot.mapper")
 @ComponentScan("com.usky")

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/api/DeviceStatusApi.java

@@ -0,0 +1,20 @@
+package com.usky.iot.controller.api;
+
+import com.usky.iot.client.DeviceStatusClient;
+import com.usky.iot.service.BaseAlarmService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@Api(tags = "数据统一查询RPC")
+public class DeviceStatusApi implements DeviceStatusClient {
+
+    @Autowired
+    private BaseAlarmService baseAlarmService;
+
+    public void status(){
+        baseAlarmService.status();
+    }
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/BaseBuildFacilityMapper.java

@@ -17,6 +17,6 @@ import java.util.List;
  * @since 2023-07-26
  */
 public interface BaseBuildFacilityMapper extends CrudMapper<BaseBuildFacility> {
-    List<BaseBuildFacilityType> baseBuildFacilityTypeList(@Param("facilityTypes") List<String> facilityTypes);
-    BaseBuild getBuildName(Integer buildId);
+    BaseBuildFacilityType baseBuildFacilityTypeList(@Param("facilityType") String facilityType);
+    List<BaseBuild> getBuildName(@Param("buildIdList") List<Integer> buildIdList);
 }

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

@@ -93,44 +93,54 @@ public class BaseBuildFacilityServiceImpl extends AbstractCrudService<BaseBuildF
     @Override
     public CommonPage<BaseBuildFacility> page(BaseBuildFacilityRequestVO requestVO){
         List<BaseBuildFacility> list = new ArrayList<>();
-        BaseBuild one1 = baseMapper.getBuildName(requestVO.getBuildId());
-
-        LambdaQueryWrapper<BaseBuildFacilityRelate> queryWrapper1 = Wrappers.lambdaQuery();
-        queryWrapper1.eq(BaseBuildFacilityRelate::getBuildId,requestVO.getBuildId());
-        List<BaseBuildFacilityRelate> facilityList = baseBuildFacilityRelateService.list(queryWrapper1);
-
-        List<BaseBuildFacility> list1 = new ArrayList<>();
-        if(CollectionUtils.isNotEmpty(facilityList)){
-            List<Integer> facilityIdList = facilityList.stream().map(m ->m.getFacilityId()).collect(Collectors.toList());
-            LambdaQueryWrapper<BaseBuildFacility> queryWrapper = Wrappers.lambdaQuery();
-            queryWrapper.eq(requestVO.getId() != null,BaseBuildFacility::getId,requestVO.getId())
-                    .in(BaseBuildFacility::getId,facilityIdList)
-                    .like(StringUtils.isNotBlank(requestVO.getFacilityNum()),BaseBuildFacility::getFacilityNum,requestVO.getFacilityNum())
-                    .like(StringUtils.isNotBlank(requestVO.getFacilityName()),BaseBuildFacility::getFacilityName,requestVO.getFacilityName())
-                    .eq(StringUtils.isNotBlank(requestVO.getFacilityType()),BaseBuildFacility::getFacilityType,requestVO.getFacilityType())
-                    .eq(BaseBuildFacility::getDeleteFlag,0)
-                    .eq(BaseBuildFacility::getTenantId,SecurityUtils.getTenantId())
-                    .orderByDesc(BaseBuildFacility::getId);
-            list1 = this.list(queryWrapper);
-            if(CollectionUtils.isNotEmpty(list1)){
-                List<String> facilityTypeList = list1.stream().map(m ->m.getFacilityType()).collect(Collectors.toList());
-                List<BaseBuildFacilityType> typeList = baseMapper.baseBuildFacilityTypeList(facilityTypeList);
-                for(int i=0;i<list1.size();i++){
-
-                    if(CollectionUtils.isNotEmpty(typeList)){
-                        for(int j=0;j<typeList.size();j++){
-                            if(list1.get(i).getFacilityType().equals(typeList.get(j).getTypeCode())){
-                                list1.get(i).setTypeName(typeList.get(j).getTypeName());
+        LambdaQueryWrapper<BaseBuildFacility> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(requestVO.getId() != null,BaseBuildFacility::getId,requestVO.getId())
+                .like(StringUtils.isNotBlank(requestVO.getFacilityNum()),BaseBuildFacility::getFacilityNum,requestVO.getFacilityNum())
+                .like(StringUtils.isNotBlank(requestVO.getFacilityName()),BaseBuildFacility::getFacilityName,requestVO.getFacilityName())
+                .eq(StringUtils.isNotBlank(requestVO.getFacilityType()),BaseBuildFacility::getFacilityType,requestVO.getFacilityType())
+                .eq(BaseBuildFacility::getDeleteFlag,0)
+                .eq(BaseBuildFacility::getTenantId,SecurityUtils.getTenantId())
+                .orderByDesc(BaseBuildFacility::getId);
+        List<BaseBuildFacility> list1 = this.list(queryWrapper);
+        if(CollectionUtils.isNotEmpty(list1)){
+            List<BaseBuildFacilityRelate> facilityList = new ArrayList<>();
+            List<BaseBuild> baseBuildList = new ArrayList<>();
+
+            List<Integer> facilityId = list1.stream().map(s ->s.getId()).collect(Collectors.toList());
+            if(CollectionUtils.isNotEmpty(facilityId)){
+                LambdaQueryWrapper<BaseBuildFacilityRelate> queryWrapper1 = Wrappers.lambdaQuery();
+                queryWrapper1.in(BaseBuildFacilityRelate::getFacilityId,facilityId);
+                facilityList = baseBuildFacilityRelateService.list(queryWrapper1);
+                if(CollectionUtils.isNotEmpty(facilityList)){
+                    List<Integer> buildIdList = facilityList.stream().map(s ->s.getBuildId()).collect(Collectors.toList());
+                    baseBuildList = baseMapper.getBuildName(buildIdList);
+                }
+            }
+
+            for(int i=0;i<list1.size();i++){
+                for(int j=0;j<facilityList.size();j++){
+                    if(list1.get(i).getId().equals(facilityList.get(j).getFacilityId())){
+                        for(int k=0;k<baseBuildList.size();k++){
+                            if(facilityList.get(j).getBuildId().equals(baseBuildList.get(k).getId())){
+                                list1.get(i).setBuildId(baseBuildList.get(k).getId());
+                                list1.get(i).setBuildName(baseBuildList.get(k).getBuildName());
                             }
                         }
                     }
-                    list1.get(i).setBuildId(one1.getId());
-                    list1.get(i).setBuildName(one1.getBuildName());
                 }
+
+                BaseBuildFacilityType typeOne = baseMapper.baseBuildFacilityTypeList(list1.get(i).getFacilityType());
+                list1.get(i).setTypeName(typeOne.getTypeName());
             }
+        }
 
 
+        if(StringUtils.isNotBlank(requestVO.getBuildName())){
+            list1 = list1.stream().filter(m-> m.getBuildName().contains(requestVO.getBuildName())).collect(Collectors.toList());
+        }
 
+        if(requestVO.getBuildId() != null){
+            list1 = list1.stream().filter(m-> m.getBuildId().equals(requestVO.getBuildId())).collect(Collectors.toList());
         }
 
         if(list1.size() > 0){

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

@@ -317,6 +317,7 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
                         for (int l = 0; l < typeList.size(); l++) {
                             if (list.get(k).getFacilityType().equals(typeList.get(l).getTypeCode())){
                                 list.get(k).setModelLink(typeList.get(l).getModelLink());
+                                list.get(k).setTypeName(typeList.get(l).getTypeName());
                             }
                         }
                     }

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

@@ -129,64 +129,163 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
     @Override
     public CommonPage<DmpDeviceInfo> page(DmpDeviceInfoRequest diRequest) {
         List<DmpDeviceInfo> list = new ArrayList<>();
-        LambdaQueryWrapper<DmpDeviceInfo> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.like(StringUtils.isNotBlank(diRequest.getDeviceName()),DmpDeviceInfo::getDeviceName,diRequest.getDeviceName())
-                .eq(diRequest.getProductId() != null,DmpDeviceInfo::getProductId,diRequest.getProductId())
-                .eq(diRequest.getServiceStatus() != null,DmpDeviceInfo::getServiceStatus,diRequest.getServiceStatus())
-                .eq(DmpDeviceInfo::getDeleteFlag,0)
-                .eq(DmpDeviceInfo::getTenantId,SecurityUtils.getTenantId())
-                .orderByDesc(DmpDeviceInfo::getId);
-        List<DmpDeviceInfo> list1 = this.list(queryWrapper);
-
-        if(CollectionUtils.isNotEmpty(list1)){
-            List<String> devList = new ArrayList<>();
-            for(int i=0;i<list1.size();i++){
-                devList.add(list1.get(i).getDeviceId());
-            }
-
-            if(devList.size() > 0){
-                LambdaQueryWrapper<DmpDeviceStatus> queryWrapper1 = Wrappers.lambdaQuery();
-                queryWrapper1.in(DmpDeviceStatus::getDeviceId,devList);
-                List<DmpDeviceStatus> statusList = dmpDeviceStatusService.list(queryWrapper1);
-                if(statusList.size() > 0){
+        Integer total = 0;
+        Integer pageCurrent = diRequest.getCurrent();
+        Integer pageSize = diRequest.getSize();
+        IPage<DmpDeviceInfo> page = new Page<>(pageCurrent,pageSize);
+
+        if(diRequest.getDeviceStatus() != null){
+            if(StringUtils.isNotBlank(diRequest.getDeviceName()) || diRequest.getProductId() != null || diRequest.getServiceStatus() != null){
+                LambdaQueryWrapper<DmpDeviceInfo> queryWrapper = Wrappers.lambdaQuery();
+                queryWrapper.like(StringUtils.isNotBlank(diRequest.getDeviceName()),DmpDeviceInfo::getDeviceName,diRequest.getDeviceName())
+                        .eq(diRequest.getProductId() != null,DmpDeviceInfo::getProductId,diRequest.getProductId())
+                        .eq(diRequest.getServiceStatus() != null,DmpDeviceInfo::getServiceStatus,diRequest.getServiceStatus())
+                        .eq(DmpDeviceInfo::getDeleteFlag,0)
+                        .eq(DmpDeviceInfo::getTenantId,SecurityUtils.getTenantId())
+                        .orderByDesc(DmpDeviceInfo::getId);
+                List<DmpDeviceInfo> list1 = this.list(queryWrapper);
+
+                if(CollectionUtils.isNotEmpty(list1)){
+                    List<String> devList = new ArrayList<>();
+                    List<Integer> productIdList = new ArrayList<>();
                     for(int i=0;i<list1.size();i++){
-                        for(int j=0;j<statusList.size();j++){
-                            if(list1.get(i).getProductId().equals(statusList.get(j).getProductId()) && list1.get(i).getDeviceId().equals(statusList.get(j).getDeviceId())){
-                                list1.get(i).setDeviceStatus(statusList.get(j).getDeviceStatus());
-                                list1.get(i).setLastOnlineTime(statusList.get(j).getLastOnlineTime());
-                                list1.get(i).setLastOfflineTime(statusList.get(j).getLastOfflineTime());
-                                continue;
+                        if(!devList.contains(list1.get(i).getDeviceId())){
+                            devList.add(list1.get(i).getDeviceId());
+                        }
+                        if(!productIdList.contains(list1.get(i).getProductId())){
+                            productIdList.add(list1.get(i).getProductId());
+                        }
+                    }
+
+                    if(devList.size() > 0){
+                        LambdaQueryWrapper<DmpDeviceStatus> queryWrapper1 = Wrappers.lambdaQuery();
+                        queryWrapper1.in(DmpDeviceStatus::getDeviceId,devList)
+                                .in(DmpDeviceStatus::getProductId,productIdList)
+                                .eq(DmpDeviceStatus::getDeviceStatus,diRequest.getDeviceStatus());
+                        List<DmpDeviceStatus> statusList = dmpDeviceStatusService.list(queryWrapper1);
+                        if(statusList.size() > 0){
+                            for(int i=0;i<list1.size();i++){
+                                for(int j=0;j<statusList.size();j++){
+                                    if(list1.get(i).getProductId().equals(statusList.get(j).getProductId()) && list1.get(i).getDeviceId().equals(statusList.get(j).getDeviceId())){
+                                        list1.get(i).setDeviceStatus(statusList.get(j).getDeviceStatus());
+                                        list1.get(i).setLastOnlineTime(statusList.get(j).getLastOnlineTime());
+                                        list1.get(i).setLastOfflineTime(statusList.get(j).getLastOfflineTime());
+                                        list.add(list1.get(i));
+                                        break;
+                                    }
+                                }
                             }
                         }
                     }
+
+                }
+
+                if(list.size() > 0){
+                    total = list.size();
+                    page.setTotal(total);
                 }
-            }
 
+                Integer current = 0;
+                if(pageCurrent != null && pageSize > 0){
+                    current = (pageCurrent-1)*pageSize;
+                }
 
-            if(diRequest.getDeviceStatus() != null){
-                list = list1.stream().filter(m-> m.getDeviceStatus().equals(diRequest.getDeviceStatus())).collect(Collectors.toList());
+                page.setRecords(list.stream().skip(current).limit(pageSize).collect(Collectors.toList()));
             }else{
-                for(int j=0;j<list1.size();j++){
-                    list.add(list1.get(j));
+                LambdaQueryWrapper<DmpDeviceStatus> queryWrapper = Wrappers.lambdaQuery();
+                queryWrapper.eq(DmpDeviceStatus::getDeviceStatus,diRequest.getDeviceStatus());
+                List<DmpDeviceStatus> statusList = dmpDeviceStatusService.list(queryWrapper);
+                if(statusList.size() > 0){
+                    List<String> devList = new ArrayList<>();
+                    List<Integer> productIdList = new ArrayList<>();
+                    for(int i=0;i<statusList.size();i++){
+                        if(!devList.contains(statusList.get(i).getDeviceId())){
+                            devList.add(statusList.get(i).getDeviceId());
+                        }
+                        if(!productIdList.contains(statusList.get(i).getProductId())){
+                            productIdList.add(statusList.get(i).getProductId());
+                        }
+                    }
+
+                    if(devList.size() > 0){
+                        LambdaQueryWrapper<DmpDeviceInfo> queryWrapper1 = Wrappers.lambdaQuery();
+                        queryWrapper1.in(DmpDeviceInfo::getDeviceId,devList)
+                                .in(DmpDeviceInfo::getProductId,productIdList)
+                                .eq(DmpDeviceInfo::getDeleteFlag,0)
+                                .eq(DmpDeviceInfo::getTenantId,SecurityUtils.getTenantId())
+                                .orderByDesc(DmpDeviceInfo::getId);
+                        List<DmpDeviceInfo> list1 = this.list(queryWrapper1);
+                        if(list1.size() > 0){
+                            for(int i=0;i<list1.size();i++){
+                                for(int j=0;j<statusList.size();j++){
+                                    if(list1.get(i).getProductId().equals(statusList.get(j).getProductId()) && list1.get(i).getDeviceId().equals(statusList.get(j).getDeviceId())){
+                                        list1.get(i).setDeviceStatus(statusList.get(j).getDeviceStatus());
+                                        list1.get(i).setLastOnlineTime(statusList.get(j).getLastOnlineTime());
+                                        list1.get(i).setLastOfflineTime(statusList.get(j).getLastOfflineTime());
+                                        list.add(list1.get(i));
+                                        break;
+                                    }
+                                }
+                            }
+                            if(list.size() > 0){
+                                total = list.size();
+                                page.setTotal(total);
+                            }
+
+                            Integer current = 0;
+                            if(pageCurrent != null && pageSize > 0){
+                                current = (pageCurrent-1)*pageSize;
+                            }
+
+                            page.setRecords(list.stream().skip(current).limit(pageSize).collect(Collectors.toList()));
+                        }
+                    }
                 }
             }
-        }
-
-        Integer total = 0;
-        if(list.size() > 0){
-            total = list.size();
-        }
+        }else{
+            LambdaQueryWrapper<DmpDeviceInfo> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.like(StringUtils.isNotBlank(diRequest.getDeviceName()),DmpDeviceInfo::getDeviceName,diRequest.getDeviceName())
+                    .eq(diRequest.getProductId() != null,DmpDeviceInfo::getProductId,diRequest.getProductId())
+                    .eq(diRequest.getServiceStatus() != null,DmpDeviceInfo::getServiceStatus,diRequest.getServiceStatus())
+                    .eq(DmpDeviceInfo::getDeleteFlag,0)
+                    .eq(DmpDeviceInfo::getTenantId,SecurityUtils.getTenantId())
+                    .orderByDesc(DmpDeviceInfo::getId);
+            page = this.page(page,queryWrapper);
+            if(page.getTotal() > 0){
+                List<String> devList = new ArrayList<>();
+                List<Integer> productIdList = new ArrayList<>();
+                for(int i=0;i<page.getRecords().size();i++){
+                    if(!devList.contains(page.getRecords().get(i).getDeviceId())){
+                        devList.add(page.getRecords().get(i).getDeviceId());
+                    }
+                    if(!productIdList.contains(page.getRecords().get(i).getProductId())){
+                        productIdList.add(page.getRecords().get(i).getProductId());
+                    }
+                }
 
-        Integer current = 0;
-        Integer pageCurrent = diRequest.getCurrent();
-        Integer pageSize = diRequest.getSize();
-        if(pageCurrent != null && pageSize > 0){
-            current = (pageCurrent-1)*pageSize;
+                if(devList.size() > 0){
+                    LambdaQueryWrapper<DmpDeviceStatus> queryWrapper1 = Wrappers.lambdaQuery();
+                    queryWrapper1.in(DmpDeviceStatus::getDeviceId,devList)
+                                .in(DmpDeviceStatus::getProductId,productIdList);
+                    List<DmpDeviceStatus> statusList = dmpDeviceStatusService.list(queryWrapper1);
+                    if(statusList.size() > 0){
+                        for(int i=0;i<page.getRecords().size();i++){
+                            for(int j=0;j<statusList.size();j++){
+                                if(page.getRecords().get(i).getProductId().equals(statusList.get(j).getProductId()) && page.getRecords().get(i).getDeviceId().equals(statusList.get(j).getDeviceId())){
+                                    page.getRecords().get(i).setDeviceStatus(statusList.get(j).getDeviceStatus());
+                                    page.getRecords().get(i).setLastOnlineTime(statusList.get(j).getLastOnlineTime());
+                                    page.getRecords().get(i).setLastOfflineTime(statusList.get(j).getLastOfflineTime());
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
         }
 
-        List<DmpDeviceInfo> records = list.stream().skip(current).limit(pageSize).collect(Collectors.toList());
 
-        return new CommonPage<>(records,total,pageSize,pageCurrent);
+        return new CommonPage<>(page.getRecords(),page.getTotal(),pageSize,pageCurrent);
     }
 
     @Override

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

@@ -32,11 +32,8 @@
             bbft.*
         from base_build_facility_type bbft
         <where>
-            <if test="facilityTypes != null and facilityTypes.size() > 0">
-                AND bbft.type_code in
-                <foreach item="item" collection="facilityTypes" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
+            <if test="1 == 1">
+                AND bbft.type_code = #{facilityType}
             </if>
         </where>
     </select>
@@ -45,8 +42,11 @@
             bb.*
         from base_build bb
         <where>
-            <if test="1 == 1">
-                bb.id = #{buildId}
+            <if test="buildIdList != null and buildIdList.size() > 0">
+                AND bb.id in
+                <foreach item="item" collection="buildIdList" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
         </where>
     </select>