删除无用的代码

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

@@ -1,109 +0,0 @@
-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.Alert;
-import com.bizmatics.mhfire.service.AlertService;
-import com.bizmatics.mhfire.service.vo.AlertMapVO;
-import com.bizmatics.mhfire.service.vo.AlertStatisticsVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 警情模块
- * @author yq
- * @date 2021/5/31 10:05
- */
-@RestController
-@RequestMapping("/alert")
-public class AlertControllerWeb {
-
-    @Autowired
-    private AlertService alertService;
-
-
-    /**
-     * 查询当天24小时警情
-     *
-     * @return
-     */
-    @GetMapping("/alertStatisticsByHouse")
-    public ApiResult<Map<String, List<AlertStatisticsVO>>> getAlertStatisticsByHouse(@RequestParam Date startTime,
-                                                                                     @RequestParam Date endTime) {
-        return ApiResult.success(alertService.getAlertStatisticsByHouse(startTime,endTime));
-    }
-
-
-    /**
-     * 查询每年12个月警情
-     *
-     * @return
-     */
-    @GetMapping("/alertStatisticsByMonth")
-    public ApiResult<Map<String, List<AlertStatisticsVO>>> getAlertStatisticsByMonth(@RequestParam Date startTime,
-                                                                                     @RequestParam Date endTime) {
-        return ApiResult.success(alertService.getAlertStatisticsByMonth(startTime,endTime));
-    }
-
-
-    /**
-     * 警情详细信息
-     *
-     * @param current   页数
-     * @param size      条数
-     * @param startTime 开始时间
-     * @param endTime   结束时间
-     * @return
-     */
-    @GetMapping("/page")
-    public ApiResult<CommonPage<Alert>> page(@RequestParam Integer current,
-                                             @RequestParam Integer size,
-                                             @RequestParam(required = false) Date startTime,
-                                             @RequestParam(required = false) Date endTime) {
-        return ApiResult.success(alertService.page(current, size, startTime, endTime));
-    }
-
-    /**
-     * 地图撒点
-     *
-     * @param current   页数
-     * @param size      条数
-     * @param startTime 开始时间
-     * @param endTime   结束时间
-     * @return
-     */
-    @GetMapping("/pageMap")
-    public ApiResult<CommonPage<AlertMapVO>> pageMap(@RequestParam(required = false) Integer current,
-                                                     @RequestParam(required = false) Integer size,
-                                                     @RequestParam(required = false) Date startTime,
-                                                     @RequestParam(required = false) Date endTime) {
-        return ApiResult.success(alertService.pageMap(current, size, startTime, endTime));
-    }
-
-    /**
-     * 查询不同警情(社会救助，警情，火灾)的占比
-     *
-     * @param startTime 开始时间
-     * @param endTime   结束时间
-     * @return
-     */
-    @GetMapping("/alertStatistics")
-    public ApiResult<List<AlertStatisticsVO>> getAlertStatistics(@RequestParam(required = false) Date startTime,
-                                                                 @RequestParam(required = false) Date endTime) {
-        return ApiResult.success(alertService.getAlertStatistics(startTime, endTime));
-    }
-
-    @GetMapping("/one")
-    public ApiResult<Alert> getOne(@RequestParam String id) {
-        return ApiResult.success(alertService.getOne(id));
-    }
-
-    @PostMapping("/add")
-    public void add(@RequestBody List<Alert> alert){
-        alertService.saveBatch(alert);
-    }
-}

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

@@ -1,21 +0,0 @@
-package com.bizmatics.mhfire.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 车辆人员信息 前端控制器
- * </p>
- *
- * @author ya
- * @since 2021-11-19
- */
-@Controller
-@RequestMapping("/carPerson")
-public class CarPersonController {
-
-}
-

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

@@ -1,53 +0,0 @@
-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.model.FireSiteDetail;
-import com.bizmatics.mhfire.service.FireSiteService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 消防站点
- * @author yq
- * @date 2021/5/31 10:13
- */
-@RestController
-@RequestMapping("/fireSite")
-public class FireSiteControllerWeb {
-
-    @Autowired
-    private FireSiteService fireSiteService;
-
-
-    /**
-     * 分页
-     * @param current 页数
-     * @param size 条数
-     * @return
-     */
-    @GetMapping("/page")
-    public ApiResult<CommonPage<FireSite>> page(@RequestParam Integer current,
-                                                @RequestParam Integer size){
-        return ApiResult.success(fireSiteService.page(current, size));
-    }
-
-
-    /**
-     * get one
-     * @param id id
-     * @return
-     */
-    @GetMapping("/one")
-    public ApiResult<List<FireSiteDetail>> getOne(@RequestParam String id){
-        return ApiResult.success(fireSiteService.getOne(id));
-    }
-
-    @GetMapping("/addList")
-    public void addList(@RequestBody List<FireSite> fireSite){
-        fireSiteService.saveBatch(fireSite);
-    }
-}

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

@@ -1,21 +0,0 @@
-package com.bizmatics.mhfire.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 消防站点详情 前端控制器
- * </p>
- *
- * @author ya
- * @since 2021-11-19
- */
-@Controller
-@RequestMapping("/fireSiteDetail")
-public class FireSiteDetailController {
-
-}
-

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

@@ -1,88 +0,0 @@
-package com.bizmatics.mhfire.controller.web;
-
-import com.bizmatics.mhfire.model.Alert;
-import com.bizmatics.mhfire.model.FireSite;
-import com.bizmatics.mhfire.model.WaterAj;
-import com.bizmatics.mhfire.service.WaterAjService;
-import com.bizmatics.mhfire.service.api.AlertAndSiteApi;
-import com.bizmatics.mhfire.service.job.AlertJob;
-import com.bizmatics.mhfire.service.job.FireSiteJob;
-import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author yq
- * @date 2021/8/12 11:05
- */
-@Log4j2
-@RestController
-public class TestController {
-
-    @Autowired
-    private AlertJob alertJob;
-
-    @Autowired
-    private FireSiteJob fireSiteJob;
-    @Autowired
-    private WaterAjService waterAjService;
-
-    @GetMapping("login")
-    public String login(){
-        return AlertAndSiteApi.login(AlertAndSiteApi.USER_NAME,AlertAndSiteApi.USER_PASSWORD);
-    }
-
-    @GetMapping("alert")
-    public List<Alert> alert(@RequestParam(required = false) String ajlx,
-                             @RequestParam(required = false) String searchValue,
-                             @RequestParam Integer page,
-                             @RequestParam Integer size,
-                             @RequestParam String token){
-        return AlertAndSiteApi.alertPage(ajlx,searchValue,page,size,token);
-    }
-
-    @GetMapping("fireSite")
-    public List<FireSite> fireSite(@RequestParam(required = false) String dwxz,
-                                   @RequestParam(required = false) String xfzlx,
-                                   @RequestParam(required = false) String rang,
-                                   @RequestParam(required = false) String addr,
-                                   @RequestParam String token){
-        return AlertAndSiteApi.fireSiteList(dwxz, xfzlx, rang, addr, token);
-    }
-
-    @GetMapping("alertJob")
-    public void alertJob(){
-        alertJob.execute();
-    }
-
-
-    @GetMapping("fireSiteJob")
-    public void fireSiteJob(){
-        fireSiteJob.execute();
-    }
-
-    @GetMapping("waterAjTest")
-    public void waterAjTest(@RequestParam Long id){
-        WaterAj waterAj = new WaterAj();
-        waterAj.setId(id);
-        waterAj.setCreateTime(new Date());
-        waterAj.setAjType("消防案件");
-        waterAj.setStreet("闵行街道");
-        waterAj.setAddress("所属街道");
-        waterAj.setGrid("网格通道");
-        waterAj.setAjDescribe("这个就是描述了");
-        waterAj.setDutyGroup("上海永天");
-        waterAj.setAjFlag(0);
-        waterAj.setEndTime(new Date());
-        waterAj.setEnclosure("meid");
-        waterAj.setImage("图片");
-        waterAj.setDeviceCode("1111");
-        waterAjService.saveOrUpdate(waterAj);
-    }
-
-}

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

@@ -1,35 +0,0 @@
-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/CarPersonMapper.java

@@ -1,22 +0,0 @@
-package com.bizmatics.mhfire.persistence.mapper;
-
-import com.bizmatics.mhfire.model.CarPerson;
-import com.bizmatics.common.mvc.base.CrudMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 车辆人员信息 Mapper 接口
- * </p>
- *
- * @author ya
- * @since 2021-11-19
- */
-public interface CarPersonMapper extends CrudMapper<CarPerson> {
-
-
-
-    List<CarPerson> selectByAjId(@Param("ajId") String ajId);
-}

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

@@ -1,16 +0,0 @@
-package com.bizmatics.mhfire.persistence.mapper;
-
-import com.bizmatics.mhfire.model.FireSiteDetail;
-import com.bizmatics.common.mvc.base.CrudMapper;
-
-/**
- * <p>
- * 消防站点详情 Mapper 接口
- * </p>
- *
- * @author ya
- * @since 2021-11-19
- */
-public interface FireSiteDetailMapper extends CrudMapper<FireSiteDetail> {
-
-}

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

@@ -1,17 +0,0 @@
-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

@@ -1,59 +0,0 @@
-<?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(lasj) monthTime,
-    COUNT(id) as aCount,
-    ajlx as aType
-    FROM
-    `alert`
-    WHERE
-    lasj BETWEEN #{startTime} AND #{endTime}
-    GROUP BY monthTime,ajlx
-    </select>
-    <select id="getCountByMonth" resultType="java.util.Map">
-        SELECT
-    month(lasj) monthTime,
-    COUNT(id) as aCount,
-    ajlx as aType
-    FROM
-    `alert`
-    WHERE
-    lasj BETWEEN #{startTime} AND #{endTime}
-    GROUP BY monthTime,ajlx
-    </select>
-
-</mapper>

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

@@ -1,24 +0,0 @@
-<?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.CarPersonMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.bizmatics.mhfire.model.CarPerson">
-        <result column="position_name" property="positionName" />
-        <result column="photo_url" property="photoUrl" />
-        <result column="phone" property="phone" />
-        <result column="squad" property="squad" />
-        <result column="name" property="name" />
-        <result column="clId" property="clId" />
-    </resultMap>
-    <select id="selectByAjId" resultType="com.bizmatics.mhfire.model.CarPerson">
-        select cp.*
-        from car_person as cp
-        inner join jcj_cjjl as jc
-        on cp.clId = jc.CJBH
-        inner join alert as a
-        on jc.JCJ_AJXX_ID = a.id
-        where a.id = #{ajId}
-    </select>
-
-</mapper>

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

@@ -1,18 +0,0 @@
-<?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.FireSiteDetailMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.bizmatics.mhfire.model.FireSiteDetail">
-        <result column="orga_desc" property="orgaDesc" />
-        <result column="DTHH" property="dthh" />
-        <result column="LXDH" property="lxdh" />
-        <result column="car_status" property="carStatus" />
-        <result column="YS" property="ys" />
-        <result column="ID" property="id" />
-        <result column="CLJC" property="cljc" />
-        <result column="CPHM" property="cphm" />
-        <result column="ssxfjgid" property="ssxfjgid" />
-    </resultMap>
-
-</mapper>

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

@@ -1,21 +0,0 @@
-<?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

@@ -1,130 +0,0 @@
-package com.bizmatics.mhfire.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonAlias;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <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;
-
-    @JsonAlias("gIS_X")
-    @TableField("gIS_X")
-    private String gisX;
-
-    @JsonAlias("gIS_Y")
-    @TableField("gIS_Y")
-    private String gisY;
-
-    @TableId(value = "id",type = IdType.INPUT)
-    private String id;
-
-    private String larq;
-
-    private Date lasj;
-
-    private String qrqk;
-
-    private String qx;
-
-    private String qy;
-
-    @JsonAlias("sJC")
-    @TableField("sJC")
-    private Date sjc;
-
-    private String tzdcsj;
-
-    private String tzfdsj;
-
-    private String tzsj;
-
-    private String zgzd;
-
-    private String zhongdui;
-
-
-    //火灾信息
-
-    /**
-     * 报警人
-     */
-    @TableField(exist = false)
-    private String callPolice;
-
-    /**
-     * 电话
-     */
-    @TableField(exist = false)
-    private String policePhone;
-    /**
-     * 财产损失
-     */
-    @TableField(exist = false)
-    private String propertyLoss;
-
-
-    /**
-     * 死亡人数
-     */
-    @TableField(exist = false)
-    private String deathToll;
-
-    /**
-     * 受伤人数
-     */
-    @TableField(exist = false)
-    private String nonFatal;
-    /**
-     * 关联案件的车辆信息
-     */
-    @TableField(exist = false)
-    private List<CarPerson> carList;
-}

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

@@ -1,56 +0,0 @@
-package com.bizmatics.mhfire.model;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 车辆人员信息
- * </p>
- *
- * @author ya
- * @since 2021-11-19
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class CarPerson implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 职位名称
-     */
-    private String positionName;
-
-    /**
-     * 头像信息
-     */
-    private String photoUrl;
-
-    /**
-     * 手机号
-     */
-    private String phone;
-
-    /**
-     * 岗位
-     */
-    private String squad;
-
-    /**
-     * 人员信息
-     */
-    private String name;
-
-    /**
-     * 车辆id
-     */
-    @TableField("clId")
-    private String clId;
-
-
-}

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

@@ -1,64 +0,0 @@
-package com.bizmatics.mhfire.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonAlias;
-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;
-
-
-    @JsonAlias("DWXZ")
-    @TableField("DWXZ")
-    private String dwxz;
-
-    @JsonAlias("LDGDDH")
-    @TableField("LDGDDH")
-    private String ldgddh;
-
-    private String name;
-
-    private String reng;
-
-    private String jgid;
-
-    private String jd;
-
-    @JsonAlias("ID")
-    @TableId(value = "id",type = IdType.INPUT)
-    private Integer id;
-
-    private String addr;
-
-    @JsonAlias("SSZD")
-    @TableField("SSZD")
-    private String sszd;
-
-    @JsonAlias("SZWZ")
-    @TableField("SZWZ")
-    private String szwz;
-
-    @JsonAlias("WD")
-    @TableField("WD")
-    private String wd;
-
-    private Integer xfzlx;
-}

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

@@ -1,77 +0,0 @@
-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.List;
-
-/**
- * <p>
- * 消防站点详情
- * </p>
- *
- * @author ya
- * @since 2021-11-19
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class FireSiteDetail implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 消防站
-     */
-    private String orgaDesc;
-
-    /**
-     * 电台呼号
-     */
-    @TableField("DTHH")
-    private String dthh;
-
-    /**
-     * 类型编号
-     */
-    @TableField("LXDH")
-    private String lxdh;
-
-    /**
-     * 车辆状态
-     */
-    private String carStatus;
-
-    /**
-     * 颜色
-     */
-    @TableField("YS")
-    private String ys;
-
-    @TableField("ID")
-    private String id;
-
-    /**
-     * 车辆简称
-     */
-    @TableField("CLJC")
-    private String cljc;
-
-    /**
-     * 车牌号码
-     */
-    @TableField("CPHM")
-    private String cphm;
-
-    /**
-     * 消防机构ID
-     */
-    private String ssxfjgid;
-
-
-    @TableField(exist = false)
-    private List<CarPerson> carList;
-}

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

@@ -1,58 +0,0 @@
-package com.bizmatics.mhfire.service;
-
-import com.bizmatics.common.core.bean.CommonPage;
-import com.bizmatics.common.mvc.base.CrudService;
-import com.bizmatics.mhfire.model.Alert;
-import com.bizmatics.mhfire.service.vo.AlertMapVO;
-import com.bizmatics.mhfire.service.vo.AlertStatisticsVO;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author yq
- * @date 2021/5/28 14:52
- * 警情
- */
-public interface AlertService  extends CrudService<Alert> {
-
-
-    /**
-     * 按小时统计警情
-     * @return
-     */
-    Map<String, List<AlertStatisticsVO>> getAlertStatisticsByHouse(Date startTime,Date endTime);
-
-
-
-    /**
-     * 按月份统计警情
-     * @return
-     */
-    Map<String, List<AlertStatisticsVO>> getAlertStatisticsByMonth(Date startTime,Date endTime);
-
-
-    /**
-     * 警情详细信息
-     * @param current
-     * @param size
-     * @param startTime
-     * @param endTime
-     * @return
-     */
-    CommonPage<Alert> page(Integer current, Integer size, Date startTime, Date endTime);
-
-    CommonPage<AlertMapVO> pageMap(Integer current, Integer size, Date startTime, Date endTime);
-    /**
-     * 查询不同警情(社会救助，警情，火灾)的占比
-     * @param startTime
-     * @param endTime
-     * @return
-     */
-    List<AlertStatisticsVO> getAlertStatistics(Date startTime, Date endTime);
-
-    Alert getOne(String id);
-
-
-}

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

@@ -1,25 +0,0 @@
-package com.bizmatics.mhfire.service;
-
-import com.bizmatics.mhfire.model.CarPerson;
-import com.bizmatics.common.mvc.base.CrudService;
-
-import java.util.List;
-
-/**
- * <p>
- * 车辆人员信息 服务类
- * </p>
- *
- * @author ya
- * @since 2021-11-19
- */
-public interface CarPersonService extends CrudService<CarPerson> {
-
-
-    /**
-     * 根据案件id查询车辆信息
-     * @param ajId
-     * @return
-     */
-    List<CarPerson> getByAjId(String ajId);
-}

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

@@ -1,16 +0,0 @@
-package com.bizmatics.mhfire.service;
-
-import com.bizmatics.mhfire.model.FireSiteDetail;
-import com.bizmatics.common.mvc.base.CrudService;
-
-/**
- * <p>
- * 消防站点详情 服务类
- * </p>
- *
- * @author ya
- * @since 2021-11-19
- */
-public interface FireSiteDetailService extends CrudService<FireSiteDetail> {
-
-}

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

@@ -1,33 +0,0 @@
-package com.bizmatics.mhfire.service;
-
-import com.bizmatics.common.core.bean.CommonPage;
-import com.bizmatics.common.mvc.base.CrudService;
-import com.bizmatics.mhfire.model.FireSite;
-import com.bizmatics.mhfire.model.FireSiteDetail;
-
-import java.util.List;
-
-/**
- * @author yq
- * @date 2021/5/28 15:30
- * 消防站信息
- */
-public interface FireSiteService extends CrudService<FireSite> {
-
-
-    /**
-     * 分页
-     * @return
-     */
-    CommonPage<FireSite> page(Integer current,Integer size);
-
-
-    /**
-     * get one
-     * @param id
-     * @return
-     */
-    List<FireSiteDetail> getOne(String id);
-
-
-}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/api/AlertAndSiteApi.java

@@ -1,191 +0,0 @@
-package com.bizmatics.mhfire.service.api;
-
-import com.bizmatics.common.core.exception.BusinessException;
-import com.bizmatics.common.core.util.HttpUtils;
-import com.bizmatics.common.spring.util.JsonUtils;
-import com.bizmatics.mhfire.model.Alert;
-import com.bizmatics.mhfire.model.FireSite;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.extern.log4j.Log4j2;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * @author yq
- * @date 2021/8/12 9:38
- */
-@Log4j2
-public class AlertAndSiteApi {
-
-    private static final String URL = "http://32.1.7.42";
-    /**
-     * 账号
-     */
-    public static final String USER_NAME = "zhgl";
-    /**
-     * 密码
-     */
-    public static final String USER_PASSWORD = "NOXBwA24Ojt+kp/wUxkLz0h2viJ7lQkyyBexlLkfKvU7/BW1RZjfUNUkW9Ot0pS/Bv17I1JKCjSSvZVAqp/Xug==";
-    /**
-     * 登录url
-     */
-    private static final String LOGIN_URL = String.format("%s%s",URL,"/mhxfzd/mhapi/bsUser/user/login");
-    /**
-     * 警情url
-     */
-    private static final String ALERT_URL = String.format("%s%s",URL,"/mhxfzd/mhapi/xf/case/queryCase");
-    /**
-     * 消防站点url
-     */
-    private static final String FIRE_SITE_URL = String.format("%s%s",URL,"/mhxfzd/mhapi/xf/fire/queryNature");
-    /**
-     * 执勤实力url
-     */
-    private static final String Z_Q_URL = String.format("%s%s",URL,"/mhxfzd/mhapi/xf/fire/queryNature");
-    /**
-     * 车辆信息url
-     */
-    private static final String CAR_URL = String.format("%s%s",URL,"/mhxfzd/mhapi/xf/fire/queryNature");
-
-    private static final ObjectMapper MAPPER = new ObjectMapper();
-
-    /**
-     * 登录
-     * @return
-     */
-    public static String login(String userName,String userPassword){
-        Map<String,String> params = new HashMap<>();
-        params.put("userName",userName);
-        params.put("userPassword",userPassword);
-        String token = "";
-        try {
-            String result = HttpUtils.postJson(LOGIN_URL, params, null);
-            JsonNode arrNode = new ObjectMapper().readTree(result);
-            if ("200".equals(arrNode.get("code").asText())){
-                token = arrNode.get("data").asText();
-            }else {
-                throw new BusinessException("登录api失败"+ arrNode.get("msg"));
-            }
-        } catch (IOException e) {
-            throw new BusinessException("调用登录api异常"+ e.getMessage());
-        }
-        return token;
-    }
-
-    /**
-     *
-     * @param ajlx 案件类型
-     * @param searchValue 地址或补充信息
-     * @return
-     */
-    public static List<Alert> alertPage(String ajlx,String searchValue,Integer page,Integer size,String token){
-        List<Alert> alerts = new ArrayList<>();
-        //添加参数信息
-        Map<String,Object> params = new HashMap<>();
-        params.put("ajlx",ajlx);
-        params.put("searchValue",searchValue);
-        params.put("page",page);
-        params.put("size",size);
-        //添加token信息
-        Map<String,String> header = new HashMap<>();
-        header.put("Authorization",token);
-        try {
-            String result = HttpUtils.postJson(ALERT_URL, params, header);
-            log.info("alertjob---------获取到的数据"+result);
-            JsonNode arrNode = MAPPER.readTree(result);
-            if ("200".equals(arrNode.get("code").asText())){
-                JsonNode data = arrNode.get("data");
-                JsonNode iterms = data.get("items");
-                if (iterms.isArray() && iterms.size() > 0){
-                    alerts = JsonUtils.fromJson(MAPPER.writeValueAsString(iterms), new TypeReference<List<Alert>>() {
-                    });
-                }
-            }else {
-                throw new BusinessException("警情api失败"+ arrNode.get("msg"));
-            }
-        } catch (IOException e) {
-            throw new BusinessException("调用警情api异常:"+e.getMessage());
-        }
-        return alerts;
-    }
-
-
-    /**
-     * 站点集合
-     * @param dwxz 单位
-     * @param xfzlx 消防站类型
-     * @param rang 半径范围
-     * @param addr 地址
-     * @return
-     */
-    public static List<FireSite> fireSiteList(String dwxz, String xfzlx, String rang, String addr,String token){
-        List<FireSite> list = new ArrayList<>();
-        //添加参数信息
-        Map<String,String> params = new HashMap<>();
-        params.put("dwxz",dwxz);
-        params.put("xfzlx",xfzlx);
-        params.put("rang",rang);
-        params.put("addr",addr);
-        //添加token信息
-        Map<String,String> header = new HashMap<>();
-        header.put("Authorization",token);
-        try {
-            String result = HttpUtils.postJson(FIRE_SITE_URL, params, header);
-            JsonNode arrNode = MAPPER.readTree(result);
-            if ("200".equals(arrNode.get("code").asText())){
-                JsonNode data = arrNode.get("data");
-                JsonNode iterms = data.get("items");
-                if (iterms.isArray() && iterms.size() > 0){
-                    list = MAPPER.readValue(MAPPER.writeValueAsString(iterms), new TypeReference<List<FireSite>>() {});
-                }
-            }else {
-                throw new BusinessException("站点api失败"+arrNode.get("msg"));
-            }
-        } catch (IOException e) {
-            throw new BusinessException("调用站点api异常:"+e.getMessage());
-        }
-        return list;
-    }
-
-
-
-    /**
-     * 站点集合
-     * @return
-     */
-    public static List<FireSite> dutyApi(){
-        List<FireSite> list = new ArrayList<>();
-        //添加参数信息
-        Map<String,String> params = new HashMap<>();
-
-        //添加token信息
-//        Map<String,String> header = new HashMap<>();
-//        header.put("Authorization",token);
-        try {
-            String result = HttpUtils.postJson(Z_Q_URL, null, null);
-            JsonNode arrNode = MAPPER.readTree(result);
-            if ("200".equals(arrNode.get("code").asText())){
-                JsonNode data = arrNode.get("data");
-                Iterator<String> sites = data.fieldNames();
-
-                while (sites.hasNext()){
-                    String site = sites.next();
-                    JsonNode jsonNode = data.get(site);
-
-                }
-
-            }else {
-                throw new BusinessException("执勤实力api失败"+arrNode.get("msg"));
-            }
-        } catch (IOException e) {
-            throw new BusinessException("调用执勤实力api异常:"+e.getMessage());
-        }
-        return list;
-    }
-
-
-}
-

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

@@ -1,211 +0,0 @@
-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.CollectionUtils;
-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.core.util.BeanMapperUtils;
-import com.bizmatics.common.core.util.DateUtils;
-import com.bizmatics.common.core.util.StringUtils;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
-import com.bizmatics.mhfire.model.Alert;
-import com.bizmatics.mhfire.model.CarPerson;
-import com.bizmatics.mhfire.persistence.mapper.AlertMapper;
-import com.bizmatics.mhfire.persistence.mapper.po.FireStatisticsPO;
-import com.bizmatics.mhfire.persistence.mapper.vo.LocateInfo;
-import com.bizmatics.mhfire.service.AlertService;
-import com.bizmatics.mhfire.service.CarPersonService;
-import com.bizmatics.mhfire.service.FireStatisticsService;
-import com.bizmatics.mhfire.service.util.Arith;
-import com.bizmatics.mhfire.service.util.GouldUtil;
-import com.bizmatics.mhfire.service.vo.AlertMapVO;
-import com.bizmatics.mhfire.service.vo.AlertStatisticsVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * @author yq
- * @date 2021/5/28 14:53
- */
-@Service
-public class AlertServiceImpl extends AbstractCrudService<AlertMapper, Alert> implements AlertService {
-
-    @Autowired
-    private FireStatisticsService fireStatisticsService;
-
-    @Autowired
-    private CarPersonService carPersonService;
-
-
-    private static final String[] ALERT_TYPE = {"火灾","社会救助","抢险救援"};
-
-    @Override
-    public Map<String, List<AlertStatisticsVO>> getAlertStatisticsByHouse(Date startTime,Date endTime) {
-        Map<String, List<AlertStatisticsVO>> typeMap = enhanceList(baseMapper.getCountByHorse(startTime, endTime));
-        int distanceOfTwoDate = DateUtils.getDistanceOfTwoDateNew(startTime, endTime);
-        perfect(typeMap,24,distanceOfTwoDate,0);
-        return typeMap;
-    }
-
-    public void perfect(Map<String, List<AlertStatisticsVO>> typeMap,Integer times,Integer subTime,Integer defaultTime){
-        for (String type:ALERT_TYPE) {
-            if (!typeMap.containsKey(type)){
-                typeMap.put(type,new ArrayList<>());
-            }
-            perfectDate(typeMap.get(type), times,subTime,defaultTime);
-        }
-    }
-
-    public void perfectDate(List<AlertStatisticsVO> list,Integer times,Integer subTime,Integer defaultTime){
-        for (int i = defaultTime; i < times; i++) {
-            int finalI = i;
-            list.stream()
-                    .filter(asv -> Integer.parseInt(asv.getMonth()) == finalI)
-                    .findFirst()
-                    .map(asv -> {
-                        asv.setAvg(Arith.div(asv.getNumber(), subTime));
-                        return asv;
-                    })
-                    .orElseGet(() -> {
-                        AlertStatisticsVO asv = new AlertStatisticsVO();
-                        asv.setMonth(Integer.toString(finalI));
-                        asv.setNumber(0);
-                        asv.setAvg(0.00);
-                        list.add(asv);
-                        return asv;
-                    });
-        }
-        list.sort(Comparator.comparingInt(x -> Integer.parseInt(x.getMonth())));
-    }
-
-
-
-    public Map<String, List<AlertStatisticsVO>> enhanceList(List<Map<String,Object>> mapList){
-        List<AlertStatisticsVO> list = new ArrayList<>();
-        for (Map<String, Object> map:mapList) {
-            AlertStatisticsVO alertStatisticsVo = new AlertStatisticsVO();
-            alertStatisticsVo.setType(map.get("aType").toString());
-            alertStatisticsVo.setMonth(map.get("monthTime").toString());
-            alertStatisticsVo.setNumber(Integer.parseInt(map.get("aCount").toString()));
-            alertStatisticsVo.setType(map.get("aType").toString());
-            list.add(alertStatisticsVo);
-        }
-        return list.stream().collect(Collectors.groupingBy(AlertStatisticsVO::getType));
-    }
-
-
-    @Override
-    public Map<String, List<AlertStatisticsVO>> getAlertStatisticsByMonth(Date startTime,Date endTime) {
-        Map<String, List<AlertStatisticsVO>> typeMap = enhanceList(baseMapper.getCountByMonth(startTime, endTime));
-        int distanceOfTwoDate =Integer.parseInt(DateUtils.getYear(endTime)) - Integer.parseInt(DateUtils.getYear(startTime)) + 1;
-        perfect(typeMap,13,distanceOfTwoDate,1);
-        return typeMap;
-    }
-
-    @Override
-    public CommonPage<Alert> page(Integer current, Integer size, Date startTime, Date endTime) {
-        IPage<Alert> page = new Page<>(current, size);
-        LambdaQueryWrapper<Alert> queryWrapper = Wrappers.lambdaQuery();
-        if (null != startTime && null != endTime){
-            queryWrapper.between(Alert::getDcsj,startTime,endTime);
-        }
-        page = this.page(page, queryWrapper);
-        return  this.ToCommonPage(page);
-    }
-
-    @Override
-    public CommonPage<AlertMapVO> pageMap(Integer current, Integer size, Date startTime, Date endTime) {
-
-        LambdaQueryWrapper<Alert> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.select(Alert::getId,Alert::getGisX,Alert::getGisY);
-        if (null != startTime && null != endTime){
-            queryWrapper.between(Alert::getDcsj,startTime,endTime);
-        }
-        CommonPage<AlertMapVO> commonPage;
-        if (null != current && size != null){
-            IPage<Alert> page = new Page<>(current,size);
-            page = this.page(page,queryWrapper);
-            commonPage = new CommonPage<>(BeanMapperUtils.mapList(page.getRecords(),Alert.class,AlertMapVO.class),page.getTotal(),page.getSize(),page.getCurrent());
-        }else {
-            List<Alert> list = this.list(queryWrapper);
-            commonPage = new CommonPage<>(BeanMapperUtils.mapList(list,Alert.class,AlertMapVO.class),list.size(),list.size(),1);
-        }
-        return commonPage;
-    }
-
-
-    @Override
-    public Alert getOne(String id) {
-        Alert alert = this.getById(id);
-        if (alert.getAjlx().equals(ALERT_TYPE[0])){
-            Date startTime = DateUtils.addMonths(alert.getLasj(), -30);
-            Date endTime = DateUtils.addMonths(alert.getLasj(), 30);
-            List<LocateInfo> lonLat = GouldUtil.getLonLat(alert.getAfdz());
-            LocateInfo locateInfo = lonLat.get(0);
-            //计算精度维度在一定范围内的数据和火灾关联
-            List<FireStatisticsPO> list = fireStatisticsService.distanceList(locateInfo.getLongitude(), locateInfo.getLatitude(), startTime, endTime);
-            if (CollectionUtils.isNotEmpty(list)){
-                FireStatisticsPO fireStatisticsPo = list.get(0);
-                alert.setPropertyLoss(fireStatisticsPo.getPropertyLoss());
-                alert.setDeathToll(fireStatisticsPo.getDeathToll());
-                alert.setNonFatal(fireStatisticsPo.getNonFatal());
-            }
-        }
-        //查询车辆和人员信息
-        List<CarPerson> carLit = carPersonService.getByAjId(alert.getId());
-        alert.setCarList(carLit);
-        return alert;
-    }
-
-    @Override
-    public List<AlertStatisticsVO> getAlertStatistics(Date startTime, Date endTime) {
-
-        //获取同比
-        Date upStartTime = DateUtils.addYears(startTime, -1);
-        Date upEndTime = DateUtils.addYears(endTime, -1);
-        List<AlertStatisticsVO> list = new ArrayList<>();
-        list.add(getAsV(startTime, endTime, ALERT_TYPE[0]));
-        list.add(getAsV(startTime, endTime, ALERT_TYPE[1]));
-        list.add(getAsV(startTime, endTime, ALERT_TYPE[2]));
-        list.forEach(alertStatisticsVO -> {
-            AlertStatisticsVO upAsv = getAsV(upStartTime, upEndTime, alertStatisticsVO.getType());
-            Integer number = alertStatisticsVO.getNumber();
-            Integer upNumber = upAsv.getNumber();
-            if (number.equals(upNumber)) {
-                alertStatisticsVO.setSameStatus(0);
-            } else if (number > upNumber) {
-                alertStatisticsVO.setSameStatus(1);
-            } else {
-                alertStatisticsVO.setSameStatus(2);
-            }
-            if (0 != upNumber) {
-                double radio = Arith.div(Arith.sub(number, upNumber), upNumber);
-                alertStatisticsVO.setRadio(Math.abs(radio));
-            } else {
-                if (number != 0){
-                    alertStatisticsVO.setRadio(1.00);
-                }else {
-                    alertStatisticsVO.setRadio(0.00);
-                }
-            }
-        });
-        return list;
-    }
-    public AlertStatisticsVO getAsV(Date startTime,Date endTime,String type){
-        AlertStatisticsVO alertStatisticsVo = new AlertStatisticsVO();
-        LambdaQueryWrapper<Alert> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(StringUtils.isNotBlank(type),Alert::getAjlx,type);
-        if (null != startTime && null != endTime){
-            queryWrapper.between(Alert::getDcsj,startTime,endTime);
-        }
-        alertStatisticsVo.setType(type);
-        alertStatisticsVo.setNumber(this.count(queryWrapper));
-        return alertStatisticsVo;
-    }
-
-}

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

@@ -1,26 +0,0 @@
-package com.bizmatics.mhfire.service.impl;
-
-import com.bizmatics.mhfire.model.CarPerson;
-import com.bizmatics.mhfire.persistence.mapper.CarPersonMapper;
-import com.bizmatics.mhfire.service.CarPersonService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 车辆人员信息 服务实现类
- * </p>
- *
- * @author ya
- * @since 2021-11-19
- */
-@Service
-public class CarPersonServiceImpl extends AbstractCrudService<CarPersonMapper, CarPerson> implements CarPersonService {
-
-    @Override
-    public List<CarPerson> getByAjId(String ajId) {
-        return baseMapper.selectByAjId(ajId);
-    }
-}

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

@@ -1,20 +0,0 @@
-package com.bizmatics.mhfire.service.impl;
-
-import com.bizmatics.mhfire.model.FireSiteDetail;
-import com.bizmatics.mhfire.persistence.mapper.FireSiteDetailMapper;
-import com.bizmatics.mhfire.service.FireSiteDetailService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 消防站点详情 服务实现类
- * </p>
- *
- * @author ya
- * @since 2021-11-19
- */
-@Service
-public class FireSiteDetailServiceImpl extends AbstractCrudService<FireSiteDetailMapper, FireSiteDetail> implements FireSiteDetailService {
-
-}

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

@@ -1,64 +0,0 @@
-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.CollectionUtils;
-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;
-import com.bizmatics.mhfire.model.CarPerson;
-import com.bizmatics.mhfire.model.FireSite;
-import com.bizmatics.mhfire.model.FireSiteDetail;
-import com.bizmatics.mhfire.persistence.mapper.FireSiteMapper;
-import com.bizmatics.mhfire.service.CarPersonService;
-import com.bizmatics.mhfire.service.FireSiteDetailService;
-import com.bizmatics.mhfire.service.FireSiteService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @author yq
- * @date 2021/5/28 15:30
- */
-@Service
-public class FireSiteServiceImpl extends AbstractCrudService<FireSiteMapper, FireSite> implements FireSiteService {
-
-    @Autowired
-    private FireSiteDetailService fireSiteDetailService;
-
-    @Autowired
-    private CarPersonService carPersonService;
-    @Override
-    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
-    public List<FireSiteDetail> getOne(String id) {
-        LambdaQueryWrapper<FireSiteDetail> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(FireSiteDetail::getSsxfjgid,id);
-        List<FireSiteDetail> fireSiteDetails = fireSiteDetailService.list(queryWrapper);
-        List<String> cIdList = fireSiteDetails.stream().map(FireSiteDetail::getId).collect(Collectors.toList());
-        List<CarPerson> list = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(cIdList)){
-            LambdaQueryWrapper<CarPerson> carPersonLambdaQueryWrapper = Wrappers.lambdaQuery();
-            carPersonLambdaQueryWrapper.in(CollectionUtils.isNotEmpty(cIdList),CarPerson::getClId,cIdList);
-            list = carPersonService.list(carPersonLambdaQueryWrapper);
-        }
-        List<CarPerson> finalList = list;
-        fireSiteDetails = fireSiteDetails.stream().peek(fd ->
-                fd.setCarList(finalList.stream().filter(carPerson -> carPerson.getClId().equals(fd.getId())).collect(Collectors.toList()))
-        ).collect(Collectors.toList());
-        return fireSiteDetails;
-
-    }
-
-}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/job/AlertJob.java

@@ -1,81 +0,0 @@
-package com.bizmatics.mhfire.service.job;
-
-import com.bizmatics.common.core.util.DateUtils;
-import com.bizmatics.common.core.util.StringUtils;
-import com.bizmatics.mhfire.model.Alert;
-import com.bizmatics.mhfire.service.AlertService;
-import com.bizmatics.mhfire.service.api.AlertAndSiteApi;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @author yq
- * @date 2021/8/12 16:04
- */
-@Slf4j
-@Component
-public class AlertJob{
-
-    @Autowired
-    private AlertService alertService;
-
-
-    //    @Scheduled(cron = "0 0 23 * * ?")
-    public void execute(){
-        try {
-            String token = AlertAndSiteApi.login(AlertAndSiteApi.USER_NAME, AlertAndSiteApi.USER_PASSWORD);
-            int page = 1;
-            int size = 100;
-            executeCore(page,size,null,null,token);
-        }catch (Exception e){
-            log.info("alertJob--all--异常"+e.getMessage());
-        }
-    }
-
-    //    @Scheduled(cron = "*/30 * * * * ?")
-    public void executeToday(){
-        try {
-            String token = AlertAndSiteApi.login(AlertAndSiteApi.USER_NAME, AlertAndSiteApi.USER_PASSWORD);
-            int page = 1;
-            int size = 100;
-            Date date = new Date();
-            Date dayStartTime = DateUtils.getDayStartTime(date);
-            Date dayEndTime = DateUtils.getDayEndTime(date);
-            executeCore(page,size,dayStartTime,dayEndTime,token);
-        }catch (Exception e){
-            log.info("alertJob--today--异常"+e.getMessage());
-        }
-    }
-
-    public void executeCore(Integer page,Integer size,Date startTime,Date endTime,String token){
-        boolean nextFlag = true;
-        while (StringUtils.isNotBlank(token) && nextFlag){
-            try {
-                long l = System.currentTimeMillis();
-                List<Alert> alerts = AlertAndSiteApi.alertPage(null, null, page, size, token);
-                long ea = System.currentTimeMillis();
-                log.info("alertJob----调用api需要时间"+(ea-l)+"毫秒");
-                if (null != startTime && null != endTime){
-                    alerts = alerts.stream().filter(alert -> DateUtils.isEffectiveDate(alert.getDcsj(), startTime, endTime)).collect(Collectors.toList());
-                }
-                if (CollectionUtils.isNotEmpty(alerts)){
-                    alertService.saveOrUpdateBatch(alerts);
-                    page++;
-                }else {
-                    nextFlag = false;
-                }
-                long e = System.currentTimeMillis();
-                log.info("alertJob----处理100条数需要的时间"+(e-l)+"毫秒");
-            }catch (Exception e){
-                log.info("alertJob----异常"+e.getMessage());
-            }
-        }
-        log.info("获取警情定时任务完成----完成");
-    }
-}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/job/FireSiteJob.java

@@ -1,42 +0,0 @@
-package com.bizmatics.mhfire.service.job;
-
-import com.bizmatics.common.core.util.StringUtils;
-import com.bizmatics.mhfire.model.FireSite;
-import com.bizmatics.mhfire.service.FireSiteService;
-import com.bizmatics.mhfire.service.api.AlertAndSiteApi;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author yq
- * @date 2021/8/12 16:04
- */
-@Slf4j
-@Component
-public class FireSiteJob {
-
-
-    @Autowired
-    private FireSiteService fireSiteService;
-    //    @Scheduled(cron = "0 0 23 * * ?")
-    public void execute(){
-        try {
-            String token = AlertAndSiteApi.login(AlertAndSiteApi.USER_NAME, AlertAndSiteApi.USER_PASSWORD);
-            List<FireSite> list = new ArrayList<>();
-            if (StringUtils.isNotBlank(token)){
-                list = AlertAndSiteApi.fireSiteList(null, null, null, null, token);
-                if (CollectionUtils.isNotEmpty(list)){
-                    fireSiteService.saveOrUpdateBatch(list);
-                }
-            }
-            log.info("fireSiteJob----完成,获取警情记录:"+ list.size());
-        }catch (Exception e){
-            log.info("fireSiteJob----异常"+e.getMessage());
-        }
-    }
-}