消防站点分页接口

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/FireSiteControllerWeb.java

@@ -2,6 +2,7 @@ package com.bizmatics.mhfire.controller.web;
 
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.mhfire.model.FireSite;
 import com.bizmatics.mhfire.service.FireSiteService;
 import com.bizmatics.mhfire.service.vo.FireSiteDutyVO;
 import com.bizmatics.mhfire.service.vo.FireSiteVO;
@@ -30,16 +31,12 @@ public class FireSiteControllerWeb {
      * 分页
      * @param current 页数
      * @param size 条数
-     * @param startTime 开始时间
-     * @param endTime 结束时间
      * @return
      */
     @GetMapping("/page")
-    public ApiResult<CommonPage<FireSiteVO>> page(@RequestParam Integer current,
-                                                  @RequestParam Integer size,
-                                                  @RequestParam(required = false)String startTime,
-                                                  @RequestParam(required = false)String endTime){
-        return ApiResult.success(fireSiteService.page(current, size, startTime, endTime));
+    public ApiResult<CommonPage<FireSite>> page(@RequestParam Integer current,
+                                                @RequestParam Integer size){
+        return ApiResult.success(fireSiteService.page(current, size));
     }
 
 

mhfire-mapping/src/main/java/com/bizmatics/mhfire/persistence/mapper/AlertMapper.java

@@ -0,0 +1,35 @@
+package com.bizmatics.mhfire.persistence.mapper;
+
+
+import com.bizmatics.common.mvc.base.CrudMapper;
+import com.bizmatics.mhfire.model.Alert;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2021-08-10
+ */
+
+@Repository
+public interface AlertMapper extends CrudMapper<Alert> {
+
+
+
+    List<Map<String,Object>> getCountByHorse(@Param("startTime") Date startTime,
+                                             @Param("endTime") Date endTime);
+
+    List<Map<String,Object>> getCountByMonth(@Param("startTime") Date startTime,
+                                             @Param("endTime") Date endTime);
+
+
+
+}

mhfire-mapping/src/main/java/com/bizmatics/mhfire/persistence/mapper/FireSiteMapper.java

@@ -0,0 +1,17 @@
+package com.bizmatics.mhfire.persistence.mapper;
+
+
+import com.bizmatics.common.mvc.base.CrudMapper;
+import com.bizmatics.mhfire.model.FireSite;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2021-08-10
+ */
+public interface FireSiteMapper extends CrudMapper<FireSite> {
+
+}

mhfire-mapping/src/main/resources/mapper/mysql/AlertMapper.xml

@@ -0,0 +1,59 @@
+<?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.bizmatics.mhfire.persistence.mapper.AlertMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.bizmatics.mhfire.model.Alert">
+        <id column="id" property="id" />
+        <result column="afdz" property="afdz" />
+        <result column="ajbh" property="ajbh" />
+        <result column="ajdj" property="ajdj" />
+        <result column="ajlx" property="ajlx" />
+        <result column="ajlxdm" property="ajlxdm" />
+        <result column="ajqy" property="ajqy" />
+        <result column="ajsjd" property="ajsjd" />
+        <result column="ajxz" property="ajxz" />
+        <result column="ajzt" property="ajzt" />
+        <result column="bcxx" property="bcxx" />
+        <result column="cdcl" property="cdcl" />
+        <result column="czdx" property="czdx" />
+        <result column="dcsj" property="dcsj" />
+        <result column="fdsj" property="fdsj" />
+        <result column="gIS_X" property="gisX" />
+        <result column="gIS_Y" property="gisY" />
+        <result column="larq" property="larq" />
+        <result column="lasj" property="lasj" />
+        <result column="qrqk" property="qrqk" />
+        <result column="qx" property="qx" />
+        <result column="qy" property="qy" />
+        <result column="sJC" property="sJC" />
+        <result column="tzdcsj" property="tzdcsj" />
+        <result column="tzfdsj" property="tzfdsj" />
+        <result column="tzsj" property="tzsj" />
+        <result column="zgzd" property="zgzd" />
+        <result column="zhongdui" property="zhongdui" />
+    </resultMap>
+    <select id="getCountByHorse" resultType="java.util.Map">
+        SELECT
+    HOUR(dcsj) monthTime,
+    COUNT(id) as aCount,
+    ajlx as aType
+    FROM
+    `alert`
+    WHERE
+    dcsj BETWEEN #{startTime} AND #{endTime}
+    GROUP BY monthTime,ajlx
+    </select>
+    <select id="getCountByMonth" resultType="java.util.Map">
+        SELECT
+    DATE_FORMAT(dcsj, '%Y-%m-%d') monthTime,
+    COUNT(id) as aCount,
+    ajlx as aType
+    FROM
+    `alert`
+    WHERE
+    dcsj BETWEEN #{startTime} AND #{endTime}
+    GROUP BY monthTime,ajlx
+    </select>
+
+</mapper>

mhfire-mapping/src/main/resources/mapper/mysql/FireSiteMapper.xml

@@ -0,0 +1,21 @@
+<?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.bizmatics.mhfire.persistence.mapper.FireSiteMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.bizmatics.mhfire.model.FireSite">
+        <id column="id" property="id" />
+        <result column="DWXZ" property="dwxz" />
+        <result column="LDGDDH" property="ldgddh" />
+        <result column="name" property="name" />
+        <result column="reng" property="reng" />
+        <result column="jgid" property="jgid" />
+        <result column="jd" property="jd" />
+        <result column="addr" property="addr" />
+        <result column="SSZD" property="sszd" />
+        <result column="SZWZ" property="szwz" />
+        <result column="WD" property="wd" />
+        <result column="xfzlx" property="xfzlx" />
+    </resultMap>
+
+</mapper>

mhfire-model/src/main/java/com/bizmatics/mhfire/model/Alert.java

@@ -0,0 +1,86 @@
+package com.bizmatics.mhfire.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2021-08-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class Alert implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    private String afdz;
+
+    private String ajbh;
+
+    private String ajdj;
+
+    private String ajlx;
+
+    private String ajlxdm;
+
+    private String ajqy;
+
+    private String ajsjd;
+
+    private String ajxz;
+
+    private String ajzt;
+
+    private String bcxx;
+
+    private String cdcl;
+
+    private String czdx;
+
+    private Date dcsj;
+
+    private Date fdsj;
+
+    @TableField("gIS_X")
+    private String gisX;
+
+    @TableField("gIS_Y")
+    private String gisY;
+
+    private String id;
+
+    private String larq;
+
+    private Date lasj;
+
+    private String qrqk;
+
+    private String qx;
+
+    private String qy;
+
+    @TableField("sJC")
+    private Date sJC;
+
+    private String tzdcsj;
+
+    private String tzfdsj;
+
+    private String tzsj;
+
+    private String zgzd;
+
+    private String zhongdui;
+
+
+}

mhfire-model/src/main/java/com/bizmatics/mhfire/model/FireSite.java

@@ -0,0 +1,55 @@
+package com.bizmatics.mhfire.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2021-08-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class FireSite implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @TableField("DWXZ")
+    private String dwxz;
+
+    @TableField("LDGDDH")
+    private String ldgddh;
+
+    private String name;
+
+    private String reng;
+
+    private String jgid;
+
+    private String jd;
+
+    private Integer id;
+
+    private String addr;
+
+    @TableField("SSZD")
+    private String sszd;
+
+    @TableField("SZWZ")
+    private String szwz;
+
+    @TableField("WD")
+    private String wd;
+
+    private Integer xfzlx;
+
+
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/FireSiteService.java

@@ -20,7 +20,7 @@ public interface FireSiteService extends CrudService<FireSite> {
      * 分页
      * @return
      */
-    CommonPage<FireSiteVO> page(Integer current,Integer size,String startTime,String endTime);
+    CommonPage<FireSite> page(Integer current,Integer size);
 
 
     /**

mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/FireSiteServiceImpl.java

@@ -1,5 +1,8 @@
 package com.bizmatics.mhfire.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
@@ -12,7 +15,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author yq
@@ -21,12 +23,11 @@ import java.util.Map;
 @Service
 public class FireSiteServiceImpl extends AbstractCrudService<FireSiteMapper, FireSite> implements FireSiteService {
     @Override
-    public CommonPage<FireSiteVO> page(Integer current, Integer size, String startTime, String endTime) {
-        Page<Map<String, Object>> page = new Page<>(current, size);
-
-        List<FireSiteVO> list = new ArrayList<>();
-        //TODO 站点信息调用其他平台接口
-        return new CommonPage<>(list, page.getTotal(), page.getSize(), page.getCurrent());
+    public CommonPage<FireSite> page(Integer current, Integer size) {
+        IPage<FireSite> page = new Page<>(current, size);
+        LambdaQueryWrapper<FireSite> queryWrapper = Wrappers.lambdaQuery();
+        page = this.page(page, queryWrapper);
+        return this.ToCommonPage(page);
     }
 
     @Override

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/FireSiteVO.java

@@ -10,89 +10,36 @@ import lombok.Data;
 @Data
 public class FireSiteVO {
 
-    /**
-     * id
-     */
-    private String id;
+    private String dwxz;
 
-    /**
-     * 类别
-     */
-    private String type;
+    private String ldgddh;
 
+    private String name;
 
-    /**
-     * 位置
-     */
-    private String address;
+    private String reng;
 
-    /**
-     * 消防站登记
-     */
-    private String level;
+    private String jgid;
 
+    private String jd;
 
-    /**
-     * 电话
-     */
-    private String phone;
+    private Integer id;
 
-    /**
-     * 支队人数
-     */
-    private Integer detachment;
+    private String addr;
 
-    /**
-     * 中队人数
-     */
-    private Integer lochus;
+    private String sszd;
 
-    /**
-     * 平均警情处理时间
-     */
-    private Integer alertCheckAvgTime;
+    private String szwz;
 
+    private String wd;
 
-    //TODO 以后新建siteCar类里面有车辆类型和车辆数量两个字段
-    /**
-     * 加油车辆
-     */
-    private Integer playCar;
+    private Integer xfzlx;
 
     /**
-     * 备勤车辆
+     * 站点人员
      */
-    private Integer prepareCar;
-
+    private Integer sitePersonnel;
     /**
-     * 待命车辆
+     * 站点车辆
      */
-    private Integer awaitOrdersCar;
-
-    /**
-     * 故障车辆
-     */
-    private Integer faultCar;
-
-    //TODO 以后新建waterGun类，里面有物资名称，物资数量两个字段
-    /**
-     * 直流水枪
-     */
-    private Integer directWaterGun;
-
-    /**
-     * 带架水枪
-     */
-    private Integer shelfWaterGun;
-
-    /**
-     * 喷雾水枪
-     */
-    private Integer mistSprayWaterGun;
-
-    /**
-     * 喷雾泡泡
-     */
-    private Integer mistSprayBubble;
-
+    private Integer siteCar;
 }