消防站点管理相关接口开发

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_police_record");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("dem_micro_station");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

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

@@ -0,0 +1,73 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.DemMicroStation;
+import com.usky.fire.service.DemMicroStationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 微型消防站 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-24
+ */
+@RestController
+@RequestMapping("/demMicroStation")
+public class DemMicroStationController {
+
+    @Autowired
+    private DemMicroStationService demMicroStationService;
+
+    /**
+     * 消防站点管理-列表
+     *
+     * @param squadron    所属中队
+     * @param stationName 消防站名称
+     * @param id          主键ID
+     * @param pageNum     当前页
+     * @param pageSize    每页条数
+     * @return
+     */
+    @GetMapping("microStationList")
+    public ApiResult<CommonPage<Map<String, Object>>> microStationList(@RequestParam(value = "squadron", required = false) String squadron,
+                                                                       @RequestParam(value = "stationName", required = false) String stationName,
+                                                                       @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
+                                                                       @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                       @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demMicroStationService.microStationList(squadron, stationName, id, pageNum, pageSize));
+    }
+
+    /**
+     * 消防站点管理-修改
+     *
+     * @param demMicroStation
+     */
+    @Log(title = "消防站点管理-修改", businessType = BusinessType.UPDATE)
+    @PutMapping("updateMicroStation")
+    public ApiResult<Void> updateMicroStation(@RequestBody DemMicroStation demMicroStation) {
+        demMicroStationService.updateMicroStation(demMicroStation);
+        return ApiResult.success();
+    }
+
+    /**
+     * 消防站点管理-删除
+     *
+     * @param id 主键ID
+     */
+    @Log(title = "消防站点管理-删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("delMicroStation")
+    public ApiResult<Void> delMicroStation(@RequestParam(value = "id") Integer id) {
+        demMicroStationService.delMicroStation(id);
+        return ApiResult.success();
+    }
+}
+

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

@@ -0,0 +1,146 @@
+package com.usky.fire.domain;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 微型消防站
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemMicroStation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id;
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 支队名称
+     */
+    private String branchName;
+
+    /**
+     * 所属辖区中队
+     */
+    private String squadron;
+
+    /**
+     * 消防站名称
+     */
+    private String stationName;
+
+    /**
+     * 单位性质
+     */
+    private String companyNature;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 所在位置
+     */
+    private String location;
+
+    /**
+     * 联动固定电话
+     */
+    private String fixedPhone;
+
+    /**
+     * 负责人姓名
+     */
+    private String chargeName;
+
+    /**
+     * 负责人手机号码
+     */
+    private String chargePhone;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 消防站类型（1：微消站;2：专职站，3：重点微消站）
+     */
+    private String stationType;
+
+    /**
+     * 经度
+     */
+    private BigDecimal longitude;
+
+    /**
+     * 维度
+     */
+    private BigDecimal dimension;
+
+    /**
+     * 创建时间
+     */
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    private String updateTime;
+
+    /**
+     * 支队id
+     */
+    private Integer branchId;
+
+    /**
+     * 中队id
+     */
+    private Integer squadronId;
+
+    /**
+     * 编号
+     */
+    private String number;
+
+    /**
+     * 0:当天未拨;1：已拨未接 ,2 已拨接统 3已拨挂断
+     */
+    private Integer callStatus;
+
+    /**
+     * 1浦东;2 闵行
+     */
+    private Integer belongFlag;
+
+    /**
+     * 点名时间段
+     */
+    private String callPeriod;
+
+    /**
+     * 原单位性质
+     */
+    private String primaryCompanyNature;
+
+    /**
+     * 删除标识
+     */
+    private String deleteFlag;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemMicroStation;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 微型消防站 Mapper 接口
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-24
+ */
+public interface DemMicroStationMapper extends CrudMapper<DemMicroStation> {
+
+}

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

@@ -0,0 +1,44 @@
+package com.usky.fire.service;
+
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.fire.domain.DemMicroStation;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 微型消防站 服务类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-24
+ */
+public interface DemMicroStationService extends CrudService<DemMicroStation> {
+
+    /**
+     * 消防站点管理-列表
+     *
+     * @param squadron    所属中队
+     * @param stationName 消防站名称
+     * @param id          主键ID
+     * @param pageNum     当前页
+     * @param pageSize    每页条数
+     * @return
+     */
+    CommonPage<Map<String, Object>> microStationList(String squadron, String stationName, Integer id, Integer pageNum, Integer pageSize);
+
+    /**
+     * 消防站点管理-修改
+     *
+     * @param demMicroStation
+     */
+    void updateMicroStation(DemMicroStation demMicroStation);
+
+    /**
+     * 消防站点管理-删除
+     *
+     * @param id 主键ID
+     */
+    void delMicroStation(Integer id);
+}

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

@@ -0,0 +1,79 @@
+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.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.fire.domain.DemMicroStation;
+import com.usky.fire.mapper.DemMicroStationMapper;
+import com.usky.fire.service.DemMicroStationService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * <p>
+ * 微型消防站 服务实现类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-10-24
+ */
+@Service
+public class DemMicroStationServiceImpl extends AbstractCrudService<DemMicroStationMapper, DemMicroStation> implements DemMicroStationService {
+
+    @Override
+    public CommonPage<Map<String, Object>> microStationList(String squadron, String stationName, Integer id, Integer pageNum, Integer pageSize){
+        List<Map<String,Object>> list = new ArrayList<>();
+        IPage<DemMicroStation> page = new Page<>(pageNum, pageSize);
+        LambdaQueryWrapper<DemMicroStation> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemMicroStation::getId,DemMicroStation::getBranchName,DemMicroStation::getSquadron,
+                DemMicroStation::getStationName,DemMicroStation::getCompanyNature,DemMicroStation::getAddress,
+                DemMicroStation::getLocation,DemMicroStation::getFixedPhone,DemMicroStation::getChargeName,
+                DemMicroStation::getChargePhone,DemMicroStation::getStationType)
+                .eq(DemMicroStation::getDeleteFlag,0)
+                .like(StringUtils.isNotBlank(squadron),DemMicroStation::getSquadron,squadron)
+                .like(StringUtils.isNotBlank(stationName),DemMicroStation::getStationName,stationName)
+                .orderByDesc(DemMicroStation::getId);
+        page = this.page(page, queryWrapper);
+        if (CollectionUtils.isNotEmpty(page.getRecords())){
+            for (int i = 0; i < page.getRecords().size(); i++) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("id",page.getRecords().get(i).getId());
+                map.put("branchName",page.getRecords().get(i).getBranchName());
+                map.put("squadron",page.getRecords().get(i).getSquadron());
+                map.put("stationName",page.getRecords().get(i).getStationName());
+                map.put("companyNature",page.getRecords().get(i).getCompanyNature());
+                map.put("address",page.getRecords().get(i).getAddress());
+                map.put("location",page.getRecords().get(i).getLocation());
+                map.put("fixedPhone",page.getRecords().get(i).getFixedPhone());
+                map.put("chargeName",page.getRecords().get(i).getChargeName());
+                map.put("chargePhone",page.getRecords().get(i).getChargePhone());
+                map.put("stationType",page.getRecords().get(i).getStationType());
+                list.add(map);
+            }
+        }
+        return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
+    }
+
+    @Override
+    public void updateMicroStation(DemMicroStation demMicroStation){
+        SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");
+        demMicroStation.setUpdateTime(dateFormat.format(new Date()));
+        this.updateById(demMicroStation);
+    }
+
+    @Override
+    public void delMicroStation(Integer id){
+        DemMicroStation demMicroStation = new DemMicroStation();
+        demMicroStation.setId(id);
+        demMicroStation.setDeleteFlag("1");
+        this.updateById(demMicroStation);
+    }
+
+}

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

@@ -51,7 +51,10 @@ public class DemPoliceRecordServiceImpl extends AbstractCrudService<DemPoliceRec
             }
             if (CollectionUtils.isNotEmpty(policeIdList)) {
                 LambdaQueryWrapper<DemPoliceInfo> queryWrapper1 = Wrappers.lambdaQuery();
-                queryWrapper1.select()
+                queryWrapper1.select(DemPoliceInfo::getId, DemPoliceInfo::getCaseCode, DemPoliceInfo::getBranch,
+                        DemPoliceInfo::getTimeSlot, DemPoliceInfo::getArea, DemPoliceInfo::getCaseType,
+                        DemPoliceInfo::getFilingDate, DemPoliceInfo::getFilingTime, DemPoliceInfo::getHandleObject,
+                        DemPoliceInfo::getCaseStatus, DemPoliceInfo::getCaseNature, DemPoliceInfo::getDispatchVehicle)
                         .in(DemPoliceInfo::getPoliceId, policeIdList)
                         .like(StringUtils.isNotBlank(branch), DemPoliceInfo::getBranch, branch)
                         .like(StringUtils.isNotBlank(caseCode), DemPoliceInfo::getCaseCode, caseCode);
@@ -86,7 +89,7 @@ public class DemPoliceRecordServiceImpl extends AbstractCrudService<DemPoliceRec
 
     @Transactional
     @Override
-    public void updatePoliceRecord(DemPoliceRecord demPoliceRecord){
+    public void updatePoliceRecord(DemPoliceRecord demPoliceRecord) {
         this.updateById(demPoliceRecord);
         DemPoliceInfo demPoliceInfo = new DemPoliceInfo();
         demPoliceInfo.setId(demPoliceRecord.getId1());
@@ -105,7 +108,7 @@ public class DemPoliceRecordServiceImpl extends AbstractCrudService<DemPoliceRec
     }
 
     @Override
-    public void delPoliceRecord(Integer id){
+    public void delPoliceRecord(Integer id) {
         DemPoliceRecord demPoliceRecord = new DemPoliceRecord();
         demPoliceRecord.setId(id);
         demPoliceRecord.setDeleteFlag("1");

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

@@ -0,0 +1,33 @@
+<?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.DemMicroStationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemMicroStation">
+        <id column="id" property="id" />
+        <result column="branch_name" property="branchName" />
+        <result column="squadron" property="squadron" />
+        <result column="station_name" property="stationName" />
+        <result column="company_nature" property="companyNature" />
+        <result column="address" property="address" />
+        <result column="location" property="location" />
+        <result column="fixed_phone" property="fixedPhone" />
+        <result column="charge_name" property="chargeName" />
+        <result column="charge_phone" property="chargePhone" />
+        <result column="remark" property="remark" />
+        <result column="station_type" property="stationType" />
+        <result column="longitude" property="longitude" />
+        <result column="dimension" property="dimension" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="branch_id" property="branchId" />
+        <result column="squadron_id" property="squadronId" />
+        <result column="number" property="number" />
+        <result column="call_status" property="callStatus" />
+        <result column="belong_flag" property="belongFlag" />
+        <result column="call_period" property="callPeriod" />
+        <result column="primary_company_nature" property="primaryCompanyNature" />
+        <result column="delete_flag" property="deleteFlag" />
+    </resultMap>
+
+</mapper>