'新增仓库撒点接口'

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

@@ -71,7 +71,7 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude("dem_inspect_list");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("dem_store");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

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

@@ -0,0 +1,42 @@
+package com.usky.fire.controller.web;
+
+
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.fire.service.DemStoreService;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 仓库信息表 前端控制器
+ * </p>
+ *
+ * @author ZYJ
+ * @since 2023-01-16
+ */
+@Controller
+@RequestMapping("/demStore")
+public class DemStoreController {
+    @Autowired
+    private DemStoreService demStoreService;
+
+    /**
+     * 城市消防特征-地图撒点-仓库撒点
+     *
+     * @param streetTown 街镇
+     * @return
+     */
+    @GetMapping("storeScatterer")
+    public ApiResult<List<Object>> storeScatterer(@RequestParam(value = "streetTown", required = false) String streetTown){
+        return ApiResult.success(demStoreService.storeScatterer(streetTown));
+    }
+}
+

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

@@ -0,0 +1,131 @@
+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 ZYJ
+ * @since 2023-01-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemStore implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 单位类别
+     */
+    private String companyType;
+
+    /**
+     * 单位使用性质
+     */
+    private String companyNature;
+
+    /**
+     * 单位（法人）名称
+     */
+    private String delegateName;
+
+    /**
+     * 统一社会信用代码
+     */
+    private String socialCode;
+
+    /**
+     * 单位（场所）实际名称
+     */
+    private String companyName;
+
+    /**
+     * 所辖派出所
+     */
+    private String policeStation;
+
+    /**
+     * 单位地址
+     */
+    private String address;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 消防安全责任人
+     */
+    private String fireDutyName;
+
+    /**
+     * 消防安全管理人
+     */
+    private String fireManageName;
+
+    /**
+     * 联系电话（手机）
+     */
+    private String linkPhone;
+
+    /**
+     * 是否自主消防安全管理
+     */
+    private String fireSafetyManage;
+
+    /**
+     * 单位（场所）面积（㎡）
+     */
+    private String companyArea;
+
+    /**
+     * 行业类别
+     */
+    private String industryType;
+
+    /**
+     * 是否为洁净厂房
+     */
+    private String cleanRoom;
+
+    /**
+     * 生产经营组织形式
+     */
+    private String organizationForm;
+
+    /**
+     * 网格号
+     */
+    private String gridNo;
+
+    /**
+     * 年份
+     */
+    private String particularYear;
+
+    /**
+     * 提交时间
+     */
+    private LocalDateTime submitTime;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemStore;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 仓库信息表 Mapper 接口
+ * </p>
+ *
+ * @author ZYJ
+ * @since 2023-01-16
+ */
+public interface DemStoreMapper extends CrudMapper<DemStore> {
+
+}

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

@@ -0,0 +1,25 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.DemStore;
+import com.usky.common.mybatis.core.CrudService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 仓库信息表 服务类
+ * </p>
+ *
+ * @author ZYJ
+ * @since 2023-01-16
+ */
+public interface DemStoreService extends CrudService<DemStore> {
+    /**
+     * 城市消防体征-地图撒点-仓库撒点
+     *
+     * @param streetTown 街镇
+     * @return
+     */
+    List<Object> storeScatterer(String streetTown);
+}

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

@@ -0,0 +1,67 @@
+package com.usky.fire.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.DemStore;
+import com.usky.fire.mapper.DemStoreMapper;
+import com.usky.fire.service.DemStoreService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 仓库信息表 服务实现类
+ * </p>
+ *
+ * @author ZYJ
+ * @since 2023-01-16
+ */
+@Service
+public class DemStoreServiceImpl extends AbstractCrudService<DemStoreMapper, DemStore> implements DemStoreService {
+    @Override
+    public List<Object> storeScatterer(String streetTown){
+        List<Object> list = new ArrayList<>();
+        LambdaQueryWrapper<DemStore> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.like(StringUtils.isNotBlank(streetTown), DemStore::getPoliceStation, streetTown);
+        List<DemStore> list1 = this.list(queryWrapper);
+
+        if(CollectionUtils.isNotEmpty(list1)){
+            for(int i=0;i<list1.size();i++){
+                Map<String, Object> map = new HashMap<>();
+                map.put("companyType", list1.get(i).getCompanyType());
+                map.put("companyNature", list1.get(i).getCompanyNature());
+                map.put("delegateName", list1.get(i).getDelegateName());
+                map.put("socialCode", list1.get(i).getSocialCode());
+                map.put("companyName", list1.get(i).getCompanyName());
+                map.put("policeStation", list1.get(i).getPoliceStation());
+                map.put("address", list1.get(i).getAddress());
+                map.put("longitude", list1.get(1).getLongitude());
+                map.put("latitude", list1.get(i).getLatitude());
+                map.put("fireDutyName", list1.get(i).getFireDutyName());
+                map.put("fireManageName", list1.get(i).getFireManageName());
+                map.put("linkPhone", list1.get(i).getLinkPhone());
+                map.put("fireSafetyManage", list1.get(i).getFireSafetyManage());
+                map.put("companyArea", list1.get(i).getCompanyArea());
+                map.put("industryType", list1.get(i).getIndustryType());
+                map.put("cleanRoom", list1.get(i).getCleanRoom());
+                map.put("organizationForm", list1.get(i).getOrganizationForm());
+                map.put("gridNo", list1.get(i).getGridNo());
+                map.put("particularYear", list1.get(i).getParticularYear());
+                map.put("submitTime", (list1.get(i).getSubmitTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+
+                list.add(map);
+            }
+        }
+
+        return list;
+    }
+}

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

@@ -0,0 +1,30 @@
+<?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.DemStoreMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemStore">
+        <id column="id" property="id" />
+        <result column="company_type" property="companyType" />
+        <result column="company_nature" property="companyNature" />
+        <result column="delegate_name" property="delegateName" />
+        <result column="social_code" property="socialCode" />
+        <result column="company_name" property="companyName" />
+        <result column="police_station" property="policeStation" />
+        <result column="address" property="address" />
+        <result column="longitude" property="longitude" />
+        <result column="latitude" property="latitude" />
+        <result column="fire_duty_name" property="fireDutyName" />
+        <result column="fire_manage_name" property="fireManageName" />
+        <result column="link_phone" property="linkPhone" />
+        <result column="fire_safety_manage" property="fireSafetyManage" />
+        <result column="company_area" property="companyArea" />
+        <result column="industry_type" property="industryType" />
+        <result column="clean_room" property="cleanRoom" />
+        <result column="organization_form" property="organizationForm" />
+        <result column="grid_no" property="gridNo" />
+        <result column="particular_year" property="particularYear" />
+        <result column="submit_time" property="submitTime" />
+    </resultMap>
+
+</mapper>