临时提交代码

docs/027.20191220病历质控维护/init_mrqc.sql

@@ -1,15 +1,21 @@
 use `sys-mrqc`;
 
-DROP TABLE IF EXISTS `mrqc_item`;
-CREATE TABLE `mrqc_item` (
+DROP TABLE IF EXISTS `mrqc_token`;
+CREATE TABLE `mrqc_token` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
   `is_deleted` char(1)  NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
   `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
   `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
   `creator` varchar(20)  NOT NULL DEFAULT '' COMMENT '创建人姓名',
   `modifier` varchar(20)  NOT NULL DEFAULT '' COMMENT '修改人姓名',
-  `name` varchar(255)  NOT NULL COMMENT '质控条目',
-    `remark` varchar(255)  NOT NULL DEFAULT '' COMMENT '备注',
+  `server` varchar(255)  NOT NULL DEFAULT '' COMMENT '服务商',
+  `hospital` varchar(255)  NOT NULL DEFAULT '' COMMENT '医院',
+  `cpu` varchar(255)  NOT NULL DEFAULT '' COMMENT 'cpu',
+  `mainboard` varchar(255)  NOT NULL DEFAULT '' COMMENT '主板信息',
+  `disk` varchar(255)  NOT NULL DEFAULT '' COMMENT '硬盘信息',
+  `ip` varchar(255)  NOT NULL DEFAULT '' COMMENT 'ip',
+  `remain_day` TINYINT  NOT NULL DEFAULT 0 COMMENT '剩余使用天数',
+  `login_token` varchar(255)  NOT NULL DEFAULT '' COMMENT '登录token',
+  `remark` varchar(255)  NOT NULL DEFAULT '' COMMENT '备注',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8  COMMENT='病历质控条目';
-
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8  COMMENT='病历质控token信息';

mrqcman-service/src/main/java/com/diagbot/entity/MrqcToken.java

@@ -0,0 +1,101 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 病历质控token信息
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-12-23
+ */
+@Getter
+@Setter
+public class MrqcToken implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人姓名
+     */
+    private String creator;
+
+    /**
+     * 修改人姓名
+     */
+    private String modifier;
+
+    /**
+     * 服务商
+     */
+    private String server;
+
+    /**
+     * 医院
+     */
+    private String hospital;
+
+    /**
+     * cpu
+     */
+    private String cpu;
+
+    /**
+     * 主板信息
+     */
+    private String mainboard;
+
+    /**
+     * 硬盘信息
+     */
+    private String disk;
+
+    /**
+     * ip
+     */
+    private String ip;
+
+    /**
+     * 剩余使用天数
+     */
+    private Integer remainDay;
+
+    /**
+     * 登录token
+     */
+    private String loginToken;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

mrqcman-service/src/main/java/com/diagbot/facade/MrqcTokenFacade.java

@@ -0,0 +1,33 @@
+package com.diagbot.facade;
+
+import com.diagbot.entity.MrqcToken;
+import com.diagbot.service.impl.MrqcTokenServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.vo.MrqcTokenVO;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+@Component
+public class MrqcTokenFacade extends MrqcTokenServiceImpl {
+
+    /**
+     * token保存
+     *
+     * @param mrqcTokenVO
+     */
+    public void saveOrUpdate(MrqcTokenVO mrqcTokenVO) {
+        Date date = DateUtil.now();
+        MrqcToken mrqcToken = new MrqcToken();
+        BeanUtil.copyProperties(mrqcTokenVO, mrqcToken);
+        // id为空表示新增
+        if (mrqcTokenVO.getId() == null) {
+            mrqcToken.setGmtCreate(date);
+        }
+        mrqcToken.setGmtModified(date);
+        mrqcToken.setModifier(mrqcTokenVO.getCreator());
+        this.saveOrUpdate(mrqcToken);
+    }
+
+}

mrqcman-service/src/main/java/com/diagbot/mapper/MrqcTokenMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.MrqcToken;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 病历质控token信息 Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-12-23
+ */
+public interface MrqcTokenMapper extends BaseMapper<MrqcToken> {
+
+}

mrqcman-service/src/main/java/com/diagbot/service/MrqcTokenService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.MrqcToken;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 病历质控token信息 服务类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-12-23
+ */
+public interface MrqcTokenService extends IService<MrqcToken> {
+
+}

mrqcman-service/src/main/java/com/diagbot/service/impl/MrqcTokenServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.MrqcToken;
+import com.diagbot.mapper.MrqcTokenMapper;
+import com.diagbot.service.MrqcTokenService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 病历质控token信息 服务实现类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-12-23
+ */
+@Service
+public class MrqcTokenServiceImpl extends ServiceImpl<MrqcTokenMapper, MrqcToken> implements MrqcTokenService {
+
+}

mrqcman-service/src/main/java/com/diagbot/web/SerialNumberUtil.java

@@ -1,4 +1,4 @@
-package com.diagbot.web;
+package com.diagbot.util;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

mrqcman-service/src/main/java/com/diagbot/vo/MrqcTokenVO.java

@@ -0,0 +1,77 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 病历质控token信息
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-12-23
+ */
+@Getter
+@Setter
+public class MrqcTokenVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+
+    /**
+     * 创建人(修改人)姓名
+     */
+    private String creator;
+
+    /**
+     * 服务商
+     */
+    private String server;
+
+    /**
+     * 医院
+     */
+    private String hospital;
+
+    /**
+     * cpu
+     */
+    private String cpu;
+
+    /**
+     * 主板信息
+     */
+    private String mainboard;
+
+    /**
+     * 硬盘信息
+     */
+    private String disk;
+
+    /**
+     * ip
+     */
+    private String ip;
+
+    /**
+     * 剩余使用天数
+     */
+    private Integer remainDay;
+
+    /**
+     * 登录token
+     */
+    private String loginToken;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

mrqcman-service/src/main/java/com/diagbot/web/IpUtil.java

@@ -1,188 +0,0 @@
-package com.diagbot.web;
-
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.UUID;
-
-/**
- * @description:
- * @author: zhoutg
- * @time: 2019/12/23 9:33
- */
-public class IpUtil {
-    private IpUtil(){}
-    /**
-     * 此方法描述的是：获得服务器的IP地址
-     * @author:  zhangyang33@sinopharm.com
-     * @version: 2014年9月5日 下午4:57:15
-     */
-    public static String getLocalIP() {
-        String sIP = "";
-        InetAddress ip = null;
-        try {
-            boolean bFindIP = false;
-            Enumeration<NetworkInterface> netInterfaces = (Enumeration<NetworkInterface>) NetworkInterface
-                    .getNetworkInterfaces();
-            while (netInterfaces.hasMoreElements()) {
-                if (bFindIP) {
-                    break;
-                }
-                NetworkInterface ni = (NetworkInterface) netInterfaces
-                        .nextElement();
-
-                Enumeration<InetAddress> ips = ni.getInetAddresses();
-                while (ips.hasMoreElements()) {
-                    ip = (InetAddress) ips.nextElement();
-                    if (!ip.isLoopbackAddress()
-                            && ip.getHostAddress().matches(
-                            "(\\d{1,3}\\.){3}\\d{1,3}")) {
-                        bFindIP = true;
-                        break;
-                    }
-                }
-            }
-        } catch (Exception e) {
-            System.out.println(e.getMessage());
-        }
-        if (null != ip) {
-            sIP = ip.getHostAddress();
-        }
-        return sIP;
-    }
-
-    /**
-     * 此方法描述的是：获得服务器的IP地址(多网卡)
-     * @author:  zhangyang33@sinopharm.com
-     * @version: 2014年9月5日 下午4:57:15
-     */
-    public static List<String> getLocalIPS() {
-        InetAddress ip = null;
-        List<String> ipList = new ArrayList<String>();
-        try {
-            Enumeration<NetworkInterface> netInterfaces = (Enumeration<NetworkInterface>) NetworkInterface
-                    .getNetworkInterfaces();
-            while (netInterfaces.hasMoreElements()) {
-                NetworkInterface ni = (NetworkInterface) netInterfaces
-                        .nextElement();
-                Enumeration<InetAddress> ips = ni.getInetAddresses();
-                while (ips.hasMoreElements()) {
-                    ip = (InetAddress) ips.nextElement();
-                    if (!ip.isLoopbackAddress()
-                            && ip.getHostAddress().matches(
-                            "(\\d{1,3}\\.){3}\\d{1,3}")) {
-                        ipList.add(ip.getHostAddress());
-                    }
-                }
-            }
-        } catch (Exception e) {
-            System.out.println(e.getMessage());
-        }
-        return ipList;
-    }
-
-    /**
-     * 此方法描述的是：获得服务器的MAC地址
-     * @author:  zhangyang33@sinopharm.com
-     * @version: 2014年9月5日 下午1:27:25
-     */
-    public static String getMacId() {
-        String macId = "";
-        InetAddress ip = null;
-        NetworkInterface ni = null;
-        try {
-            boolean bFindIP = false;
-            Enumeration<NetworkInterface> netInterfaces = (Enumeration<NetworkInterface>) NetworkInterface
-                    .getNetworkInterfaces();
-            while (netInterfaces.hasMoreElements()) {
-                if (bFindIP) {
-                    break;
-                }
-                ni = (NetworkInterface) netInterfaces
-                        .nextElement();
-                // ----------特定情况，可以考虑用ni.getName判断
-                // 遍历所有ip
-                Enumeration<InetAddress> ips = ni.getInetAddresses();
-                while (ips.hasMoreElements()) {
-                    ip = (InetAddress) ips.nextElement();
-                    if (!ip.isLoopbackAddress() // 非127.0.0.1
-                            && ip.getHostAddress().matches(
-                            "(\\d{1,3}\\.){3}\\d{1,3}")) {
-                        bFindIP = true;
-                        break;
-                    }
-                }
-            }
-        } catch (Exception e) {
-            System.out.println(e.getMessage());
-        }
-        if (null != ip) {
-            try {
-                macId = getMacFromBytes(ni.getHardwareAddress());
-            } catch (SocketException e) {
-                System.out.println(e.getMessage());
-            }
-        }
-        return macId;
-    }
-
-    /**
-     * 此方法描述的是：获得服务器的MAC地址(多网卡)
-     * @author:  zhangyang33@sinopharm.com
-     * @version: 2014年9月5日 下午1:27:25
-     */
-    public static List<String> getMacIds() {
-        InetAddress ip = null;
-        NetworkInterface ni = null;
-        List<String> macList = new ArrayList<String>();
-        try {
-            Enumeration<NetworkInterface> netInterfaces = (Enumeration<NetworkInterface>) NetworkInterface
-                    .getNetworkInterfaces();
-            while (netInterfaces.hasMoreElements()) {
-                ni = (NetworkInterface) netInterfaces
-                        .nextElement();
-                // ----------特定情况，可以考虑用ni.getName判断
-                // 遍历所有ip
-                Enumeration<InetAddress> ips = ni.getInetAddresses();
-                while (ips.hasMoreElements()) {
-                    ip = (InetAddress) ips.nextElement();
-                    if (!ip.isLoopbackAddress() // 非127.0.0.1
-                            && ip.getHostAddress().matches(
-                            "(\\d{1,3}\\.){3}\\d{1,3}")) {
-                        macList.add(getMacFromBytes(ni.getHardwareAddress()));
-                    }
-                }
-            }
-        } catch (Exception e) {
-            System.out.println(e.getMessage());
-        }
-        return macList;
-    }
-
-    private static String getMacFromBytes(byte[] bytes) {
-        StringBuffer mac = new StringBuffer();
-        byte currentByte;
-        boolean first = false;
-        for (byte b : bytes) {
-            if (first) {
-                mac.append("-");
-            }
-            currentByte = (byte) ((b & 240) >> 4);
-            mac.append(Integer.toHexString(currentByte));
-            currentByte = (byte) (b & 15);
-            mac.append(Integer.toHexString(currentByte));
-            first = true;
-        }
-        return mac.toString().toUpperCase();
-    }
-
-    public static void main(String[] args) {
-        String uuid = UUID.randomUUID().toString();
-        System.out.println(uuid);
-        uuid = uuid.replace("-", "");
-        System.out.println(uuid);
-    }
-}

mrqcman-service/src/main/java/com/diagbot/web/MrqcTokenController.java

@@ -0,0 +1,36 @@
+package com.diagbot.web;
+
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.MrqcTokenFacade;
+import com.diagbot.util.DateUtil;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 病历质控token信息 前端控制器
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-12-23
+ */
+@RestController("/mrqcToken")
+public class MrqcTokenController {
+
+    @Autowired
+    private MrqcTokenFacade mrqcTokenFacade;
+
+    @ApiOperation(value = "token新增或更新[by:zhoutg]",
+            notes = "")
+    @PostMapping("/saveOrUpdate")
+    @SysLogger("saveOrUpdate")
+    @Transactional
+    RespDTO<Boolean> saveOrUpdate() {
+        return RespDTO.onSuc(true);
+    }
+}

mrqcman-service/src/main/resources/mapper/MrqcTokenMapper.xml

@@ -0,0 +1,24 @@
+<?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.MrqcTokenMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.MrqcToken">
+        <id column="id" property="id" />
+        <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" />
+        <result column="server" property="server" />
+        <result column="hospital" property="hospital" />
+        <result column="cpu" property="cpu" />
+        <result column="mainboard" property="mainboard" />
+        <result column="disk" property="disk" />
+        <result column="ip" property="ip" />
+        <result column="remain_day" property="remainDay" />
+        <result column="login_token" property="loginToken" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

mrqcman-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -33,7 +33,7 @@ public class CodeGeneration {
         gc.setEnableCache(false);// XML 二级缓存
         gc.setBaseResultMap(true);// XML ResultMap
         gc.setBaseColumnList(false);// XML columList
-        gc.setAuthor("gaodm");// 作者
+        gc.setAuthor("zhoutg");// 作者
 
         // 自定义文件命名，注意 %s 会自动填充表实体属性！
         gc.setControllerName("%sController");
@@ -56,7 +56,7 @@ public class CodeGeneration {
         StrategyConfig strategy = new StrategyConfig();
 //        strategy.setTablePrefix(new String[] { "sys_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "prec_question_info" }); // 需要生成的表
+        strategy.setInclude(new String[] { "mrqc_token" }); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);