死亡数据查询

sys-server/pom.xml

@@ -84,6 +84,16 @@
             <artifactId>druid-spring-boot-starter</artifactId>
             <version>${alibaba.druid.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.oracle</groupId>
+            <artifactId>ojdbc8</artifactId>
+            <version>12.1.0.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.oracle.database.nls</groupId>
+            <artifactId>orai18n</artifactId>
+            <version>21.1.0.0</version>
+        </dependency>
 
         <!-- quartz -->
         <dependency>

sys-server/src/main/java/com/zq/system/modules/system/dao/CremationInfoSumDao.java

+package com.zq.system.modules.system.dao;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zq.common.constant.DBName;
+import com.zq.system.modules.system.domain.vo.ReportDeathVo;
+import com.zq.system.modules.system.entity.CremationInfoSum;
+import com.zq.system.modules.system.entity.ReportDeath;
+import org.springframework.stereotype.Repository;
+
+
+@Repository
+@DS(DBName.OZT)
+public interface CremationInfoSumDao extends BaseMapper<CremationInfoSum> {
+
+    CremationInfoSum selectByNameOrIdcard(ReportDeathVo vo);
+}

sys-server/src/main/java/com/zq/system/modules/system/dao/EnbuzMemberStopDao.java

+package com.zq.system.modules.system.dao;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zq.common.constant.DBName;
+import com.zq.system.modules.system.domain.vo.ReportDeathVo;
+import com.zq.system.modules.system.entity.CremationInfoSum;
+import com.zq.system.modules.system.entity.EnbuzMemberStop;
+import org.springframework.stereotype.Repository;
+
+
+@Repository
+@DS(DBName.OZT)
+public interface EnbuzMemberStopDao extends BaseMapper<EnbuzMemberStop> {
+
+    EnbuzMemberStop selectByNameOrIdcard(ReportDeathVo vo);
+}

sys-server/src/main/java/com/zq/system/modules/system/dao/HdptRstSwmdDao.java

+package com.zq.system.modules.system.dao;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zq.common.constant.DBName;
+import com.zq.system.modules.system.domain.vo.ReportDeathVo;
+import com.zq.system.modules.system.entity.CremationInfoSum;
+import com.zq.system.modules.system.entity.HdptRstSwmd;
+import org.springframework.stereotype.Repository;
+
+
+@Repository
+@DS(DBName.OZT)
+public interface HdptRstSwmdDao extends BaseMapper<HdptRstSwmd> {
+
+    HdptRstSwmd selectByNameOrIdcard(ReportDeathVo vo);
+}

sys-server/src/main/java/com/zq/system/modules/system/dao/ReportDeathDao.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository;
 
 
 @Repository
-@DS(DBName.GXBZ)
+@DS(DBName.OZT)
 public interface ReportDeathDao extends BaseMapper<ReportDeath> {
 
     ReportDeath selectByIdCard(String idCard);

sys-server/src/main/java/com/zq/system/modules/system/entity/CremationInfoSum.java

+package com.zq.system.modules.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ * @author wilmiam
+ * @since 2020-10-20 12:05:16
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@KeySequence(value = "FIS_CREMATION_INFO_SUM_SEQ")
+@TableName(value = "FIS_CREMATION_INFO_SUM")
+public class CremationInfoSum {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private String useId;
+
+    @ApiModelProperty("姓名")
+    private String name;
+
+    @ApiModelProperty("身份证")
+    private String idCard;
+
+    @ApiModelProperty("死亡原因")
+    private String deathCause;
+
+    @ApiModelProperty("死亡地点")
+    private String deathPlace;
+
+    @ApiModelProperty("死亡时间")
+    private String deathDate;
+
+
+}

sys-server/src/main/java/com/zq/system/modules/system/entity/EnbuzMemberStop.java

+package com.zq.system.modules.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *
+ *
+ * @author wilmiam
+ * @since 2020-10-20 12:05:16
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@KeySequence(value = "ENBUZ_MEMBER_STOP_SEQ")
+@TableName(value = "ENBUZ_MEMBER_STOP")
+public class EnbuzMemberStop {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private String stopMid;//STOP_MID
+
+    @ApiModelProperty("姓名")
+    private String memberName;//MEMBER_NAME
+
+    @ApiModelProperty("身份证")
+    private String identifcardId;//IDENTIFCARD_ID
+
+    @ApiModelProperty("死亡原因")
+    private String deadReason;//DEAD_REASON
+
+    @ApiModelProperty("死亡地点")
+    private String deathPlace;//DEATH_PLACE
+
+    @ApiModelProperty("死亡时间")
+    private String deadDate;//DEAD_DATE
+
+
+}

sys-server/src/main/java/com/zq/system/modules/system/entity/HdptRstSwmd.java

+package com.zq.system.modules.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *
+ *
+ * @author wilmiam
+ * @since 2020-10-20 12:05:16
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@KeySequence(value = "HDPT_RST_SWMD_SEQ")
+@TableName(value = "HDPT_RST_SWMD")
+public class HdptRstSwmd {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty("姓名")
+    private String name;//AAC003
+
+    @ApiModelProperty("身份证")
+    private String idCard;//
+
+    @ApiModelProperty("死亡时间")
+    private String aae138;//AAE138
+
+
+
+}

sys-server/src/main/java/com/zq/system/modules/system/entity/ReportDeath.java

 package com.zq.system.modules.system.entity;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.zq.common.constant.DBName;
+
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -23,7 +24,7 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@TableName(value = "report_death")
+@TableName(value = "GX_BZ.REPORT_DEATHS")
 public class ReportDeath {
 
     /**

sys-server/src/main/java/com/zq/system/modules/system/rest/DeathRegisterController.java

@@ -26,7 +26,6 @@ import org.springframework.web.multipart.MultipartFile;
 @RequestMapping("/sys/death")
 public class DeathRegisterController {
     private final ReportDeathService reportDeathService;
-
     @ApiOperation("死亡上报")
     @AnonymousPostMapping(value = "/report")
     public ResultVo register(@RequestBody ReportDeathVo vo) {
@@ -51,7 +50,7 @@ public class DeathRegisterController {
     }
 
     @ApiOperation("获取死亡人详情")
-    @PostMapping(value = "/getDeathDetail")
+    @AnonymousPostMapping(value = "/getDeathDetail")
     public ResultVo getDeathDetail(@RequestBody ReportDeathVo vo) {
         return ResultVo.success(reportDeathService.getDeathDetail(vo));
     }

sys-server/src/main/java/com/zq/system/modules/system/service/impl/ReportDeathImpl.java

@@ -8,31 +8,29 @@ import cn.hutool.poi.excel.ExcelUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.zq.common.constant.DBName;
-import com.zq.common.context.ContextUtils;
 import com.zq.common.exception.BusinessException;
 import com.zq.common.utils.AssertUtils;
 import com.zq.common.utils.PagingUtils;
 import com.zq.common.vo.PageVo;
 import com.zq.common.vo.ResultVo;
+import com.zq.system.modules.system.dao.CremationInfoSumDao;
+import com.zq.system.modules.system.dao.EnbuzMemberStopDao;
+import com.zq.system.modules.system.dao.HdptRstSwmdDao;
 import com.zq.system.modules.system.dao.ReportDeathDao;
 import com.zq.system.modules.system.domain.User;
 import com.zq.system.modules.system.domain.vo.ReportDeathVo;
-import com.zq.system.modules.system.entity.BindUserInfo;
-import com.zq.system.modules.system.entity.ReportDeath;
+import com.zq.system.modules.system.entity.*;
 import com.zq.system.modules.system.repository.UserRepository;
 import com.zq.system.modules.system.service.ReportDeathService;
 import com.zq.system.modules.system.service.SsoService;
-import com.zq.system.modules.system.service.UserService;
-import com.zq.system.modules.system.service.dto.UserDto;
 import com.zq.system.utils.SecurityUtils;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.List;
 
 @Service
@@ -42,6 +40,9 @@ public class ReportDeathImpl implements ReportDeathService {
     private final ReportDeathDao reportDeathDao;
     private final UserRepository userRepository;
     private final SsoService ssoService;
+    private final CremationInfoSumDao cremationInfoSumDao;
+    private final EnbuzMemberStopDao enbuzMemberStopDao;
+    private final HdptRstSwmdDao hdptRstSwmdDao;
 
 
 
@@ -49,7 +50,7 @@ public class ReportDeathImpl implements ReportDeathService {
     public ResultVo save(ReportDeathVo vo) {
         ReportDeath Death=reportDeathDao.selectByIdCard(vo.getIdCard());
         if (Death!=null){
-            return ResultVo.fail("改死者已重复上报");
+            return ResultVo.fail("该死者已重复上报");
         }else {
             ReportDeath reportDeath = new ReportDeath();
             reportDeath.setName(vo.getName());
@@ -118,7 +119,19 @@ public class ReportDeathImpl implements ReportDeathService {
 
     @Override
     public Object getDeathDetail(ReportDeathVo vo) {
-        return reportDeathDao.selectById(vo.getId());
+        HashMap<String, Object> map = new HashMap<>();
+        CremationInfoSum cremationInfoSum = cremationInfoSumDao.selectByNameOrIdcard(vo);
+        EnbuzMemberStop enbuzMemberStop = enbuzMemberStopDao.selectByNameOrIdcard(vo);
+        HdptRstSwmd hdptRstSwmd = hdptRstSwmdDao.selectByNameOrIdcard(vo);
+        if (cremationInfoSum==null && enbuzMemberStop==null && hdptRstSwmd==null){
+            return "未查到该死者信息";
+        }else{
+           map.put("此数据来源殡葬火化库",cremationInfoSum);
+           map.put("此数据来源死亡上报小程序（低保）",enbuzMemberStop);
+           map.put("此数据来源共享平台死亡记录数",hdptRstSwmd);
+        }
+        return map;
+
     }
 
     @Override

sys-server/src/main/resources/application.yml

@@ -39,6 +39,12 @@ spring:
           url: ${jdbc.gxshzz.url}
           username: ${jdbc.username}
           password: ${jdbc.password}
+        ozt:
+          type: com.alibaba.druid.pool.DruidDataSource
+          driver-class-name: ${ojdbc.driver-class-name}
+          url: ${ojdbc.mzzt.url}
+          username: ${ojdbc.zt.username}
+          password: ${ojdbc.zt.password}
       druid:
         # 初始连接数
         initial-size: 5
@@ -176,3 +182,14 @@ file:
   # 文件大小 /M
   maxSize: 100
   avatarMaxSize: 5
+
+
+# mybatis plus 配置
+mybatis-plus:
+  configuration:
+    jdbc-type-for-null: null
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  global-config:
+    db-config:
+      select-strategy: not_empty
+      update-strategy: not_empty
\ No newline at end of file

sys-server/src/main/resources/mapper/CremationInfoSumMapper.xml

+<?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.zq.system.modules.system.dao.CremationInfoSumDao">
+    <resultMap id="BaseResultMap" type="com.zq.system.modules.system.entity.CremationInfoSum">
+        <!--@Table DATA_TABLE-->
+        <result property="useId" column="USE_ID" jdbcType="OTHER"/>
+        <result property="name" column="NAME" jdbcType="OTHER"/>
+        <result property="idCard" column="ID_CARD" jdbcType="OTHER"/>
+        <result property="deathCause" column="DEATH_CAUSE" jdbcType="OTHER"/>
+        <result property="deathPlace" column="DEATH_PLACE" jdbcType="OTHER"/>
+        <result property="deathDate" column="DEATH_DATE" jdbcType="OTHER"/>
+    </resultMap>
+    <select id="selectByNameOrIdcard" resultMap="BaseResultMap">
+        select * from GX_BZ.FIS_CREMATION_INFO_SUM t
+        where t.ID_CARD=#{idCard} and t.NAME=#{name}
+    </select>
+</mapper>
\ No newline at end of file

sys-server/src/main/resources/mapper/EnbuzMemberStopMapper.xml

+<?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.zq.system.modules.system.dao.EnbuzMemberStopDao">
+    <resultMap id="BaseResultMap" type="com.zq.system.modules.system.entity.EnbuzMemberStop">
+        <!--@Table DATA_TABLE-->
+        <result property="stopMid" column="STOP_MID" jdbcType="OTHER"/>
+        <result property="memberName" column="MEMBER_NAME" jdbcType="OTHER"/>
+        <result property="identifcardId" column="IDENTIFCARD_ID" jdbcType="OTHER"/>
+        <result property="deadReason" column="DEAD_REASON" jdbcType="OTHER"/>
+        <result property="deathPlace" column="DEATH_PLACE" jdbcType="OTHER"/>
+        <result property="deadDate" column="DEAD_DATE" jdbcType="OTHER"/>
+    </resultMap>
+    <select id="selectByNameOrIdcard" resultMap="BaseResultMap">
+        select t.MEMBER_NAME as name,t.IDENTIFCARD_ID as idCard,t.* from GX_BZ.ENBUZ_MEMBER_STOP t
+        where t.IDENTIFCARD_ID=#{idCard} and t.MEMBER_NAME=#{name}
+    </select>
+</mapper>
\ No newline at end of file

sys-server/src/main/resources/mapper/HdptRstSwmdMapper.xml

+<?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.zq.system.modules.system.dao.HdptRstSwmdDao">
+
+    <resultMap id="BaseResultMap" type="com.zq.system.modules.system.entity.HdptRstSwmd">
+        <!--@Table DATA_TABLE-->
+        <result property="id" column="ID" jdbcType="OTHER"/>
+        <result property="name" column="NAME" jdbcType="OTHER"/>
+        <result property="idCard" column="ID_CARD" jdbcType="OTHER"/>
+        <result property="aae138" column="AAE138" jdbcType="OTHER"/>
+    </resultMap>
+    <select id="selectByNameOrIdcard" resultMap="BaseResultMap">
+        SELECT
+            *
+        FROM
+            GX_BZ.HDPT_RST_SWMD
+        WHERE
+            ID = ( SELECT MAX( ID ) FROM GX_BZ.HDPT_RST_SWMD t WHERE t.ID_CARD = #{idCard} AND t.NAME = #{name} )
+    </select>
+</mapper>
\ No newline at end of file

sys-server/src/main/resources/mapper/ReportDeathMapper.xml

@@ -18,7 +18,7 @@
         <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
     </resultMap>
     <select id="selectByIdCard" resultMap="BaseResultMap">
-        select * from report_death t where t.ID_CARD=#{idCard}
+        select * from GX_BZ.REPORT_DEATHS t where t.ID_CARD=#{idCard}
     </select>
 <!--    <update id="updateByappId">-->
 <!--        UPDATE report_death-->