值班信息模块

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

@@ -0,0 +1,20 @@
+package com.bizmatics.mhfire.persistence.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.Map;
+
+/**
+ * @author yq
+ * @date 2021/5/27 15:14
+ * 值班信息表
+ */
+@Repository
+public interface UnitBeOnDutyMapper {
+
+
+    Map<String,Object> getOne(@Param("id") String id);
+
+
+}

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

@@ -0,0 +1,8 @@
+<?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.UnitBeOnDutyMapper">
+
+    <select id="getOne" resultType="java.util.Map">
+        select * from jbzb-zbb;
+    </select>
+</mapper>

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

@@ -0,0 +1,22 @@
+package com.bizmatics.mhfire.service;
+
+import com.bizmatics.mhfire.service.po.UnitBeOnDutyPO;
+
+/**
+ * @author yq
+ * @date 2021/5/27 15:17
+ * 值班信息
+ */
+public interface UnitBeOnDutyService {
+
+
+    /**
+     * getOne
+     * @return
+     */
+    UnitBeOnDutyPO getOne(String id);
+
+
+
+
+}

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

@@ -2,6 +2,7 @@ package com.bizmatics.mhfire.service;
 
 import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.mhfire.service.po.UnitPO;
+import com.bizmatics.mhfire.service.vo.UnitAlCheckVO;
 
 import java.util.List;
 
@@ -26,4 +27,14 @@ public interface UnitService {
      * @return
      */
     CommonPage<UnitPO> page(Integer current, Integer size);
+
+
+    /**
+     * 单位信息及执法情况和历史检查记录
+     * @param unitId
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    UnitAlCheckVO getUnitAlCheck(String unitId,String startTime,String endTime);
 }

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

@@ -0,0 +1,32 @@
+package com.bizmatics.mhfire.service.impl;
+
+import com.bizmatics.mhfire.persistence.mapper.UnitBeOnDutyMapper;
+import com.bizmatics.mhfire.service.UnitBeOnDutyService;
+import com.bizmatics.mhfire.service.po.UnitBeOnDutyPO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * @author yq
+ * @date 2021/5/27 15:18
+ */
+@Service
+public class UnitBeOnDutyServiceImpl implements UnitBeOnDutyService {
+
+    @Autowired
+    private UnitBeOnDutyMapper unitBeOnDutyMapper;
+    @Override
+    public UnitBeOnDutyPO getOne(String id) {
+        return enhanceUnitBeOnDutyPo(unitBeOnDutyMapper.getOne(id));
+    }
+
+
+    public UnitBeOnDutyPO enhanceUnitBeOnDutyPo(Map<String,Object> unitBeOnDutyMap){
+        UnitBeOnDutyPO unitBeOnDutyPO = new UnitBeOnDutyPO();
+        unitBeOnDutyPO.setLead(unitBeOnDutyMap.get("值班人员姓名").toString());
+        //TODO 值班信息全部没有
+        return unitBeOnDutyPO;
+    }
+}

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

@@ -3,9 +3,11 @@ package com.bizmatics.mhfire.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.mhfire.persistence.mapper.UnitMapper;
 import com.bizmatics.mhfire.service.UnitService;
 import com.bizmatics.mhfire.service.po.UnitPO;
+import com.bizmatics.mhfire.service.vo.UnitAlCheckVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,10 +36,18 @@ public class UnitServiceImpl implements UnitService {
         page = unitMapper.page(page);
         List<UnitPO> unitPOList = new ArrayList<>();
         page.getRecords().forEach(stringObjectMap -> unitPOList.add(enhanceUnitPo(stringObjectMap)));
-        return new CommonPage<UnitPO>(unitPOList, page.getTotal(), page.getSize(), page.getCurrent());
+        return new CommonPage<>(unitPOList, page.getTotal(), page.getSize(), page.getCurrent());
 
     }
 
+    @Override
+    public UnitAlCheckVO getUnitAlCheck(String unitId, String startTime, String endTime) {
+        UnitAlCheckVO unitAlCheckVO = BeanMapperUtils.map(getOne(unitId), UnitAlCheckVO.class);
+        //TODO 行政检查记录,历史处罚情况没有找见对应的记录
+
+        return unitAlCheckVO;
+    }
+
     /**
      * map转换为unitpo
      * @param unitPoMap

mhfire-service/src/main/java/com/bizmatics/mhfire/service/po/UnitBeOnDutyPO.java

@@ -0,0 +1,46 @@
+package com.bizmatics.mhfire.service.po;
+
+import lombok.Data;
+
+import javax.print.DocFlavor;
+
+/**
+ * @author yq
+ * @date 2021/5/27 15:19
+ * 值班表
+ */
+@Data
+public class UnitBeOnDutyPO {
+
+    /**
+     * 值班领导
+     */
+    private String lead;
+
+    /**
+     * 作战指挥长
+     */
+    private String chiefOfOperations;
+
+    /**
+     * 作战助理
+     */
+    private String combatAssistant;
+
+    /**
+     * 调度助理
+     */
+    private String schedulingAssistant;
+
+
+    /**
+     * 防火宣传助理
+     */
+    private String fireSelectAssistant;
+
+    /**
+     * 行政值班
+     */
+    private String administrativeDuty;
+
+}

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

@@ -0,0 +1,100 @@
+package com.bizmatics.mhfire.service.vo;
+
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/25 17:33
+ * 单位及执法情况
+ */
+@Data
+public class UnitAlCheckVO {
+
+
+    /**
+     * 单位ID
+     */
+    private String id;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 负责人
+     */
+    private String principal;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 行政许可审核时间
+     */
+    private String auditTime;
+
+    /**
+     * 行政许可验收时间
+     */
+    private String acceptTime;
+
+
+    /**
+     * 行政许可安检时间
+     */
+    private String securityTime;
+
+
+    /**
+     * 历史检查次数
+     */
+    private Integer checkNumber;
+
+
+    /**
+     * 隐患次数
+     */
+    private Integer dangerNumber;
+
+
+    /**
+     * 督改次数
+     */
+    private Integer directoireNumber;
+
+    /**
+     * 处罚次数
+     */
+    private Integer punishNumber;
+
+    /**
+     * 三停
+     */
+    private Integer threeStop;
+
+
+    /**
+     * 责改次数
+     */
+    private Integer beganToChangeNumber;
+
+    /**
+     * 临封次数
+     */
+    private Integer sealNumber;
+
+
+    /**
+     * 罚款金额
+     */
+    private Double fine;
+
+}

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

@@ -1,12 +0,0 @@
-package com.bizmatics.mhfire.service.vo;
-
-import lombok.Data;
-
-/**
- * @author yq
- * @date 2021/5/25 17:33
- * 单位信息
- */
-@Data
-public class UnitVO {
-}