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

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

@@ -0,0 +1,39 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.fire.domain.DemFireSafetyInspection;
+import com.usky.fire.service.DemFireSafetyInspectionService;
+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.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 消防安全检查记录表 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-25
+ */
+@RestController
+@RequestMapping("/demFireSafetyInspection")
+public class DemFireSafetyInspectionController {
+    @Autowired
+    private DemFireSafetyInspectionService demFireSafetyInspectionService;
+
+    /**
+     * 撒点
+     * @return
+     */
+    @GetMapping("fireSafetyInspectionScatter")
+    public ApiResult<List<DemFireSafetyInspection>> fireSafetyInspectionScatter(){
+        return ApiResult.success(demFireSafetyInspectionService.fireSafetyInspectionScatter());
+    }
+}
+

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

@@ -0,0 +1,116 @@
+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-10-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemFireSafetyInspection implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 检查人员姓名
+     */
+    private String checkName;
+
+    /**
+     * 检查人员所属单位
+     */
+    private String subordinateCompany;
+
+    /**
+     * 检查时间
+     */
+    private LocalDateTime checkTime;
+
+    /**
+     * 单位类型（1：重点单位、2：一般单位、3：九小场所、9：其他单位）
+     */
+    private String companyType;
+
+    /**
+     * 单位使用性质
+     */
+    private String companyUseNature;
+
+    /**
+     * 单位（法人）名称
+     */
+    private String companyName;
+
+    /**
+     * 单位（场所）实际名称
+     */
+    private String companyActualName;
+
+    /**
+     * 网格号
+     */
+    private String gridNum;
+
+    /**
+     * 所辖派出所
+     */
+    private String subordinatePoliceStation;
+
+    /**
+     * 街镇
+     */
+    private String street;
+
+    /**
+     * 单位地址
+     */
+    private String companyAddress;
+
+    /**
+     * 消防安全责任人姓名
+     */
+    private String fireDutyName;
+
+    /**
+     * 消防安全管理人姓名
+     */
+    private String fireManageName;
+
+    /**
+     * 联系电话（手机）
+     */
+    private String phone;
+
+    /**
+     * 隐患图片
+     */
+    private String hiddImage;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemFireSafetyInspection;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 消防安全检查记录表 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-25
+ */
+public interface DemFireSafetyInspectionMapper extends CrudMapper<DemFireSafetyInspection> {
+
+}

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

@@ -0,0 +1,19 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.DemFireSafetyInspection;
+import com.usky.common.mybatis.core.CrudService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 消防安全检查记录表 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-25
+ */
+public interface DemFireSafetyInspectionService extends CrudService<DemFireSafetyInspection> {
+
+    List<DemFireSafetyInspection> fireSafetyInspectionScatter();
+}

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

@@ -0,0 +1,34 @@
+package com.usky.fire.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.fire.domain.DemFireSafetyInspection;
+import com.usky.fire.mapper.DemFireSafetyInspectionMapper;
+import com.usky.fire.service.DemFireSafetyInspectionService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 消防安全检查记录表 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-25
+ */
+@Service
+public class DemFireSafetyInspectionServiceImpl extends AbstractCrudService<DemFireSafetyInspectionMapper, DemFireSafetyInspection> implements DemFireSafetyInspectionService {
+
+    @Override
+    public List<DemFireSafetyInspection> fireSafetyInspectionScatter(){
+        LambdaQueryWrapper<DemFireSafetyInspection> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.orderByDesc(DemFireSafetyInspection::getCheckTime)
+                .last("limit 500");
+        List<DemFireSafetyInspection> list = this.list(queryWrapper);
+
+        return list;
+    }
+}

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

@@ -0,0 +1,27 @@
+<?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.DemFireSafetyInspectionMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemFireSafetyInspection">
+        <id column="id" property="id" />
+        <result column="check_name" property="checkName" />
+        <result column="subordinate_company" property="subordinateCompany" />
+        <result column="check_time" property="checkTime" />
+        <result column="company_type" property="companyType" />
+        <result column="company_use_nature" property="companyUseNature" />
+        <result column="company_name" property="companyName" />
+        <result column="company_actual_name" property="companyActualName" />
+        <result column="grid_num" property="gridNum" />
+        <result column="subordinate_police_station" property="subordinatePoliceStation" />
+        <result column="street" property="street" />
+        <result column="company_address" property="companyAddress" />
+        <result column="fire_duty_name" property="fireDutyName" />
+        <result column="fire_manage_name" property="fireManageName" />
+        <result column="phone" property="phone" />
+        <result column="hidd_image" property="hiddImage" />
+        <result column="longitude" property="longitude" />
+        <result column="latitude" property="latitude" />
+    </resultMap>
+
+</mapper>