举报投诉信息

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

@@ -1,9 +1,26 @@
 package com.bizmatics.mhfire.persistence.mapper;
 
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import javax.xml.crypto.Data;
+import java.util.Map;
+
 /**
  * @author yq
  * @date 2021/6/2 10:00
  * 基本总表-监督管理项目全表
  */
+@Repository
 public interface BsSupervisionAllMapper {
+
+
+    Integer selectCount(@Param("typeOneLetter") String typeOneLetter,
+                        @Param("typeTwoLetter") String typeTwoLetter,
+                        @Param("startTime") Data startTime,
+                        @Param("endTime") Data endTime);
+
+
+    Map<String,String> selectByRecentlyOne(@Param("typeOneLetter") String typeOneLetter,
+                                           @Param("typeTwoLetter") String typeTwoLetter);
 }

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

@@ -19,15 +19,19 @@ public interface FireStatisticsMapper {
 
 
     /**
-     * 根据时间，地址统计火灾数量
+     * 统计火灾数量
      * @param startTime
      * @param endTime
+     * @param fireAddress
+     * @param level
+     * @param unitId
      * @return
      */
     Integer selectCount(@Param("startTime") Date startTime,
                         @Param("endTime") Date endTime,
                         @Param("fireAddress") String fireAddress,
-                        @Param("level") String level);
+                        @Param("level") String level,
+                        @Param("unitId") String unitId);
 
 
 

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

@@ -0,0 +1,27 @@
+package com.bizmatics.mhfire.persistence.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import javax.xml.crypto.Data;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author yq
+ * @date 2021/6/2 14:57
+ */
+@Repository
+public interface ReportComplaintMapper {
+
+
+
+    Integer selectCount(@Param("startTime") Date startTime,
+                        @Param("endTime") Data endTime,
+                        @Param("type") String type,
+                        @Param("workFlag") String workFlag,
+                        @Param("satisfaction") String satisfaction);
+
+
+    List<String> selectType();
+}

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

@@ -0,0 +1,112 @@
+package com.bizmatics.mhfire.persistence.mapper.po;
+
+import lombok.Data;
+
+import java.io.StringReader;
+
+/**
+ * @author yq
+ * @date 2021/6/2 13:19
+ */
+@Data
+public class BsSupervisionAllPO {
+
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * 项目编号
+     */
+    private String productId;
+    /**
+     * 项目名称
+     */
+    private String productName;
+
+    /**
+     * 项目单位id
+     */
+    private String productUnitId;
+
+    /**
+     * 项目单位名称
+     */
+    private String productUnitName;
+    /**
+     * 项目单位地址
+     */
+    private String productUnitAddress;
+
+    /**
+     * 单位类型（一般单位，重点单位）
+     */
+    private String unitType;
+
+    /**
+     * 项目分类1
+     */
+    private String productTypeOne;
+
+    /**
+     * 项目分类1 字母标志
+     */
+    private String productTypeOneLetter;
+
+    /**
+     * 项目分类2
+     */
+    private String productTypeTwo;
+
+    /**
+     * 项目分类2字母类型
+     */
+    private String productTypeTwoLetter;
+
+    /**
+     * 项目结果（合格，不合格，复查合格）
+     */
+    private String productResult;
+
+    /**
+     * 主管单位id
+     */
+    private String competentId;
+    /**
+     * 主管单位名称
+      */
+    private String competentName;
+
+
+    /**
+     * 项目创建时间
+     */
+    private String productCreatTime;
+
+    /**
+     * 项目完成时间
+     */
+    private String productEndTime;
+
+    /**
+     * 项目截止时间
+     */
+    private String productCutTime;
+
+    /**
+     * 项目处理时间
+     */
+    private String productDisposeTime;
+
+    /**
+     * 主承办人
+     */
+    private String mastUndertake;
+
+    /**
+     * 协助人
+     */
+    private String assistPerson;
+
+}

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

@@ -2,4 +2,35 @@
 <!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.BsSupervisionAllMapper">
 
+    <select id="selectCount" resultType="java.lang.Integer">
+        select count(1)
+        from `jbzb-jdglxm-all`
+        <where>
+            <if test="typeOneLetter != null and typeOneLetter != ''">
+                and `项目分类型一` = #{typeOneLetter}
+            </if>
+            <if test="typeTwoLetter != null and typeTwoLetter != ''">
+                and `项目分类型二` = #{typeTwoLetter}
+            </if>
+            <if test="startTime != null">
+                and `项目创建时间` >= #{startTime}
+            </if>
+            <if test="endTime != null">
+                and `项目创建时间` &lt;= #{endTime}
+            </if>
+        </where>
+    </select>
+    <select id="selectByRecentlyOne" resultType="java.util.Map">
+        select *
+        from `jbzb-jdglxm-all`
+        <where>
+            <if test="typeOneLetter != null and typeOneLetter != ''">
+                and `项目分类型一` = #{typeOneLetter}
+            </if>
+            <if test="typeTwoLetter != null and typeTwoLetter != ''">
+                and `项目分类型二` = #{typeTwoLetter}
+            </if>
+        </where>
+        limit 0,1
+    </select>
 </mapper>

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

@@ -18,6 +18,9 @@
             <if test="level != null and level != ''">
                 and `火灾原因分类（一级）` = #{level}
             </if>
+            <if test="unitId != null and unitId != ''">
+                and `单位代码` = #{unitId}
+            </if>
         </where>
     </select>
     <select id="page" resultType="java.util.Map">

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

@@ -0,0 +1,32 @@
+<?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.ReportComplaintMapper">
+
+
+    <select id="selectCount" resultType="java.lang.Integer">
+        select count(1)
+        from `jdjc-hzyhtsjbxx`
+        <where>
+            <if test="startTime != null">
+                and `举报时间` >= #{startTime}
+            </if>
+            <if test="endTime !=null">
+                and `举报时间` &lt;= #{endTime}
+            </if>
+            <if test="type !=null and type != ''">
+                and `工单类型名称` = #{type}
+            </if>
+            <if test="workFlag !=null and workFlag != ''">
+                and `工单状态名称` = #{workFlag}
+            </if>
+            <if test="satisfaction !=null and satisfaction != ''">
+                and `是否满意` = #{satisfaction}
+            </if>
+        </where>
+    </select>
+    <select id="selectType" resultType="java.lang.String">
+        SELECT `工单类型名称`
+        FROM `jdjc-hzyhtsjbxx`
+         GROUP BY `工单类型名称`
+    </select>
+</mapper>

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

@@ -1,5 +1,7 @@
 package com.bizmatics.mhfire.service;
 
+import com.bizmatics.mhfire.persistence.mapper.po.BsSupervisionAllPO;
+
 /**
  * @author yq
  * @date 2021/6/2 9:59
@@ -8,4 +10,7 @@ package com.bizmatics.mhfire.service;
 public interface BsSupervisionAllService {
 
 
+
+
+    BsSupervisionAllPO getByRecentlyOne(String typeOneLetter, String typeTwoLetter);
 }

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

@@ -4,6 +4,7 @@ import com.bizmatics.mhfire.service.vo.ReportComplaintVO;
 import com.bizmatics.mhfire.service.vo.ReportStatisticsVO;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author yq
@@ -23,6 +24,6 @@ public interface ReportComplaintService {
      * 举报情况信息
      * @return
      */
-    ReportComplaintVO getReportComplaint(Date startTime, Date endTime);
+    List<ReportComplaintVO> getReportComplaint(Date startTime, Date endTime);
 
 }

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

@@ -1,10 +1,59 @@
 package com.bizmatics.mhfire.service.impl;
 
+import com.bizmatics.mhfire.persistence.mapper.BsSupervisionAllMapper;
+import com.bizmatics.mhfire.persistence.mapper.po.BsSupervisionAllPO;
 import com.bizmatics.mhfire.service.BsSupervisionAllService;
+import net.sf.ehcache.search.parser.MAggregate;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
 
 /**
  * @author yq
  * @date 2021/6/2 10:00
  */
+@Service
 public class BsSupervisionAllServiceImpl implements BsSupervisionAllService {
+
+
+    @Autowired
+    private BsSupervisionAllMapper bsSupervisionAllMapper;
+
+
+
+    @Override
+    public BsSupervisionAllPO getByRecentlyOne(String typeOneLetter, String typeTwoLetter) {
+        Map<String, String> stringStringMap = bsSupervisionAllMapper.selectByRecentlyOne(typeOneLetter, typeTwoLetter);
+        return enhanceBsSupervisionAll(stringStringMap);
+    }
+
+
+
+
+    public BsSupervisionAllPO enhanceBsSupervisionAll(Map<String,String> map){
+        BsSupervisionAllPO bsSupervisionAllPo = new BsSupervisionAllPO();
+        bsSupervisionAllPo.setId(map.get("ID"));
+        bsSupervisionAllPo.setProductId(map.get("项目编号"));
+        bsSupervisionAllPo.setProductName(map.get("项目名称"));
+        bsSupervisionAllPo.setProductUnitId(map.get("项目单位ID"));
+        bsSupervisionAllPo.setProductUnitName(map.get("项目单位名称"));
+        bsSupervisionAllPo.setProductUnitAddress(map.get("项目单位地址"));
+        bsSupervisionAllPo.setUnitType(map.get("监管单位类别（重点单位等）"));
+        bsSupervisionAllPo.setProductTypeOne(map.get("项目分类一"));
+        bsSupervisionAllPo.setProductTypeOneLetter(map.get("项目分类型一"));
+        bsSupervisionAllPo.setProductTypeTwo(map.get("项目分类二"));
+        bsSupervisionAllPo.setProductTypeTwoLetter(map.get("项目分类型二"));
+        bsSupervisionAllPo.setProductResult(map.get("项目结果名称"));
+        bsSupervisionAllPo.setCompetentId(map.get("主管单位"));
+        bsSupervisionAllPo.setCompetentName(map.get("主管单位简称（含大队）"));
+        bsSupervisionAllPo.setProductCreatTime(map.get("项目创建日期"));
+        bsSupervisionAllPo.setProductCutTime(map.get("截止日期"));
+        bsSupervisionAllPo.setProductDisposeTime(map.get("处理时间"));
+        bsSupervisionAllPo.setProductEndTime(map.get("项目完成日期"));
+        bsSupervisionAllPo.setMastUndertake(map.get("主承办人姓名"));
+        bsSupervisionAllPo.setAssistPerson(map.get("协办人姓名"));
+        return bsSupervisionAllPo;
+    }
 }

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

@@ -38,7 +38,7 @@ public class FireStatisticsServiceImpl implements FireStatisticsService {
             System.out.println(DateUtils.format(setMonths,"yyyy-MM-dd HH:mm:ss"));
             Date firstDayOfMonth = DateUtils.getFirstDayOfMonth(setMonths);
             Date lastDayOfMonth = DateUtils.getLastDayOfMonth(setMonths);
-            list.add(fireStatisticsMapper.selectCount(firstDayOfMonth, lastDayOfMonth, address,fireType));
+            list.add(fireStatisticsMapper.selectCount(firstDayOfMonth, lastDayOfMonth, address,fireType,null));
         }
         return list;
     }
@@ -82,7 +82,7 @@ public class FireStatisticsServiceImpl implements FireStatisticsService {
         for (String cause:fireCauses) {
             FireLevelRatioVO fireLevelRatioVo = new FireLevelRatioVO();
             fireLevelRatioVo.setFireType(cause);
-            Integer radio = fireStatisticsMapper.selectCount(startTime, endTime, address, cause);
+            Integer radio = fireStatisticsMapper.selectCount(startTime, endTime, address, cause,null);
             fireLevelRatioVo.setRadio(radio.doubleValue());
             list.add(fireLevelRatioVo);
             fireCount+=radio;

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

@@ -1,12 +1,16 @@
 package com.bizmatics.mhfire.service.impl;
 
 import com.baomidou.mybatisplus.extension.api.R;
+import com.bizmatics.mhfire.persistence.mapper.ReportComplaintMapper;
 import com.bizmatics.mhfire.service.ReportComplaintService;
 import com.bizmatics.mhfire.service.vo.ReportComplaintVO;
 import com.bizmatics.mhfire.service.vo.ReportStatisticsVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author yq
@@ -14,17 +18,34 @@ import java.util.Date;
  */
 @Service
 public class ReportComplaintServiceImpl implements ReportComplaintService {
+
+    @Autowired
+    private ReportComplaintMapper reportComplaintMapper;
+
     @Override
     public ReportStatisticsVO getReportStatistics(Date startTime, Date endTime) {
         ReportStatisticsVO reportStatisticsVo = new ReportStatisticsVO();
-        //TODO 从其他平台获取
+        Integer count = reportComplaintMapper.selectCount(null, null, null, null, null);
+        reportStatisticsVo.setComplaintNumber(count);
+        reportStatisticsVo.setConcludeNumber(
+                reportComplaintMapper.selectCount(null,null,null,"已归档",null));
+        reportStatisticsVo.setCheckNumber(
+                reportComplaintMapper.selectCount(null,null,null,"已办结",null));
+        Integer satisfactionRateNumber = reportComplaintMapper.selectCount(null, null, null, null, "3");
+        reportStatisticsVo.setSatisfactionRate(satisfactionRateNumber/count.doubleValue());
         return reportStatisticsVo;
     }
 
     @Override
-    public ReportComplaintVO getReportComplaint(Date startTime, Date endTime) {
-        ReportComplaintVO reportComplaintVo = new ReportComplaintVO();
-        //TODO 从其他平台获取
-        return reportComplaintVo;
+    public List<ReportComplaintVO> getReportComplaint(Date startTime, Date endTime) {
+        List<ReportComplaintVO> list = new ArrayList<>();
+        List<String> strings = reportComplaintMapper.selectType();
+        strings.forEach(type -> {
+            ReportComplaintVO reportComplaintVo = new ReportComplaintVO();
+            reportComplaintVo.setType(type);
+            reportComplaintVo.setNumber(reportComplaintMapper.selectCount(null,null,type,null,null));
+            list.add(reportComplaintVo);
+        });
+        return list;
     }
 }