Browse Source

版本更新

lantone 5 years ago
parent
commit
b02c3be80e

+ 146 - 0
src/main/java/com/diagbot/entity/MedAbnormalInfo.java

@@ -0,0 +1,146 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-06-24
+ */
+public class MedAbnormalInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "abnormal_id", type = IdType.AUTO)
+    private Long abnormalId;
+
+    /**
+     * 入参
+     */
+    private String paramIn;
+
+    /**
+     * 出参
+     */
+    private String paramOut;
+
+    /**
+     * 异常描述
+     */
+    private String ramark;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    public Long getAbnormalId() {
+        return abnormalId;
+    }
+
+    public void setAbnormalId(Long abnormalId) {
+        this.abnormalId = abnormalId;
+    }
+    public String getParamIn() {
+        return paramIn;
+    }
+
+    public void setParamIn(String paramIn) {
+        this.paramIn = paramIn;
+    }
+    public String getParamOut() {
+        return paramOut;
+    }
+
+    public void setParamOut(String paramOut) {
+        this.paramOut = paramOut;
+    }
+    public String getRamark() {
+        return ramark;
+    }
+
+    public void setRamark(String ramark) {
+        this.ramark = ramark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "MedAbnormalInfo{" +
+            "abnormalId=" + abnormalId +
+            ", paramIn=" + paramIn +
+            ", paramOut=" + paramOut +
+            ", ramark=" + ramark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

+ 68 - 40
src/main/java/com/diagbot/facade/data/ABasDeptInfoFacade.java

@@ -1,13 +1,16 @@
 package com.diagbot.facade.data;
 
+import com.alibaba.druid.support.json.JSONUtils;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ABasDeptInfoDTO;
 import com.diagbot.entity.BasDeptInfo;
+import com.diagbot.entity.MedAbnormalInfo;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.BasDeptInfoServiceImpl;
-import com.diagbot.util.TZDBConn;
+import com.diagbot.util.*;
 import com.diagbot.vo.data.ABasDeptInfoVO;
-import com.diagbot.util.BeanUtil;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -23,6 +26,9 @@ public class ABasDeptInfoFacade extends BasDeptInfoServiceImpl{
     @Qualifier("basDeptInfoServiceImpl")
     private BasDeptInfoServiceImpl basDeptInfoService;
 
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
     private TZDBConn tzDBConn = new TZDBConn();
 
     /**
@@ -49,53 +55,75 @@ public class ABasDeptInfoFacade extends BasDeptInfoServiceImpl{
      * @return
      */
     public RespDTO<List<ABasDeptInfoDTO>> executeDept(List<ABasDeptInfoVO> list) {
-        if(list!=null && list.size()>0){
-            List<BasDeptInfo> basDeptInfoList=Lists.newArrayList();
-            List<ABasDeptInfoDTO> basDeptInfoDtoList=Lists.newArrayList();
-            basDeptInfoList=BeanUtil.listCopyTo(list,BasDeptInfo.class);
-            basDeptInfoDtoList=BeanUtil.listCopyTo(list,ABasDeptInfoDTO.class);
+        try {
+            if(list!=null && list.size()>0){
+                List<BasDeptInfo> basDeptInfoList=Lists.newArrayList();
+                List<ABasDeptInfoDTO> basDeptInfoDtoList=Lists.newArrayList();
+                basDeptInfoList=BeanUtil.listCopyTo(list,BasDeptInfo.class);
+                basDeptInfoDtoList=BeanUtil.listCopyTo(list,ABasDeptInfoDTO.class);
 
-            //循环验证数据有效性
-            for (BasDeptInfo basDeptInfo:basDeptInfoList) {
-                if("".equals(basDeptInfo.getDeptId())) {
-                    return RespDTO.onError("请输入科室编码!");
-                }else if(basDeptInfo.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(basDeptInfo.getDeptName())){
-                    return RespDTO.onError("请输入科室名称!");
+                //循环验证数据有效性
+                for (BasDeptInfo basDeptInfo:basDeptInfoList) {
+                    if("".equals(basDeptInfo.getDeptId())) {
+                        return RespDTO.onError("请输入科室编码!");
+                    }else if(basDeptInfo.getHospitalId()==null){
+                        return RespDTO.onError("请输入医院编码!");
+                    }else if("".equals(basDeptInfo.getDeptName())){
+                        return RespDTO.onError("请输入科室名称!");
+                    }
                 }
+                execute(basDeptInfoList);
+                return RespDTO.onSuc(basDeptInfoDtoList);
+            }else {
+                saveAbnormalInfo(JSON.toJSONString(list),"","未接收到数据!");
+                return RespDTO.onError("未接收到数据!");
             }
-            execute(basDeptInfoList);
-            return RespDTO.onSuc(basDeptInfoDtoList);
-        }else {
-            return RespDTO.onError("未接收到数据!");
+        }catch (Exception e){
+            saveAbnormalInfo(JSON.toJSONString(list),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 
     public void execute(List<BasDeptInfo> basDeptInfoList){
-        long startTime=System.currentTimeMillis();
-        List<BasDeptInfo> addE=Lists.newArrayList();
-        List<BasDeptInfo> updateE=Lists.newArrayList();
-        basDeptInfoList.stream().forEach(s -> {
-            BasDeptInfo basDeptInfo =this.getOne(new QueryWrapper<BasDeptInfo>()
-            .eq("dept_id", s.getDeptId())
-            .eq("hospital_id", s.getHospitalId()));
-            if (basDeptInfo != null) {
-                s.setGmtModified(new Date());
-                updateE.add(s);
-            } else {
-                s.setGmtCreate(new Date());
-                addE.add(s);
+        try {
+            List<BasDeptInfo> addE=Lists.newArrayList();
+            List<BasDeptInfo> updateE=Lists.newArrayList();
+            basDeptInfoList.stream().forEach(s -> {
+                BasDeptInfo basDeptInfo =this.getOne(new QueryWrapper<BasDeptInfo>()
+                        .eq("dept_id", s.getDeptId())
+                        .eq("hospital_id", s.getHospitalId())
+                        .eq("is_deleted",IsDeleteEnum.N));
+                if (basDeptInfo != null) {
+                    s.setGmtModified(new Date());
+                    updateE.add(s);
+                } else {
+                    s.setGmtCreate(new Date());
+                    addE.add(s);
+                }
+            });
+            if(updateE.size()>0){
+                basDeptInfoService.updateBatchByKey(updateE);
             }
-        });
-        if(updateE.size()>0){
-            basDeptInfoService.updateBatchByKey(updateE);
-        }
-        if(addE.size()>0){
-            basDeptInfoService.saveBatch(addE);
+            if(addE.size()>0){
+                basDeptInfoService.saveBatch(addE);
+            }
+        }catch (Exception e){
+            saveAbnormalInfo(JSON.toJSONString(basDeptInfoList),"",e.getMessage());
         }
+    }
 
-        long endTime=System.currentTimeMillis();
-        System.out.println("程序运行时间: "+(endTime - startTime)+"ms");
+    /**
+     * 接口日志记录
+     * @param paramIn
+     * @param paramOut
+     * @param remark
+     */
+    private void saveAbnormalInfo(String paramIn,String paramOut,String remark){
+        MedAbnormalInfo medAbnormalInfo=new MedAbnormalInfo();
+        medAbnormalInfo.setParamIn(paramIn);
+        medAbnormalInfo.setParamOut(paramOut);
+        medAbnormalInfo.setRamark(remark);
+        medAbnormalInfo.setGmtCreate(new Date());
+        aMedAbnormalInfoFacade.save(medAbnormalInfo);
     }
 }

+ 9 - 0
src/main/java/com/diagbot/facade/data/AMedAbnormalInfoFacade.java

@@ -0,0 +1,9 @@
+package com.diagbot.facade.data;
+
+import com.diagbot.service.impl.MedAbnormalInfoServiceImpl;
+import org.springframework.stereotype.Component;
+
+@Component
+public class AMedAbnormalInfoFacade extends MedAbnormalInfoServiceImpl {
+
+}

+ 16 - 0
src/main/java/com/diagbot/mapper/MedAbnormalInfoMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.MedAbnormalInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-06-24
+ */
+public interface MedAbnormalInfoMapper extends BaseMapper<MedAbnormalInfo> {
+
+}

+ 16 - 0
src/main/java/com/diagbot/service/MedAbnormalInfoService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.MedAbnormalInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-06-24
+ */
+public interface MedAbnormalInfoService extends IService<MedAbnormalInfo> {
+
+}

+ 20 - 0
src/main/java/com/diagbot/service/impl/MedAbnormalInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.MedAbnormalInfo;
+import com.diagbot.mapper.MedAbnormalInfoMapper;
+import com.diagbot.service.MedAbnormalInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-06-24
+ */
+@Service
+public class MedAbnormalInfoServiceImpl extends ServiceImpl<MedAbnormalInfoMapper, MedAbnormalInfo> implements MedAbnormalInfoService {
+
+}

+ 18 - 0
src/main/resources/mapper/MedAbnormalInfoMapper.xml

@@ -0,0 +1,18 @@
+<?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.diagbot.mapper.MedAbnormalInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.MedAbnormalInfo">
+        <id column="abnormal_id" property="abnormalId" />
+        <result column="param_in" property="paramIn" />
+        <result column="param_out" property="paramOut" />
+        <result column="ramark" property="ramark" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+    </resultMap>
+
+</mapper>

+ 2 - 2
src/test/java/com/diagbot/CodeGeneration.java

@@ -49,14 +49,14 @@ public class CodeGeneration {
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("lantone");
-        dsc.setUrl("jdbc:mysql://192.168.2.236:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8");
+        dsc.setUrl("jdbc:mysql://192.168.3.5:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8");
         mpg.setDataSource(dsc);
 
         // 策略配置
         StrategyConfig strategy = new StrategyConfig();
 //        strategy.setTablePrefix(new String[] { "med_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "med_doctor_advice"}); // 需要生成的表
+        strategy.setInclude(new String[] { "med_abnormal_info"}); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);