代码生成

4 years ago · 31bae19e28
9 changed files with 595 additions and 9 deletions
--- a/epdc-cloud-custom/pom.xml
+++ b/epdc-cloud-custom/pom.xml
@ -158,10 +158,10 @@

                <server.port>9076</server.port>

-                <spring.redis.index>9</spring.redis.index>
-                <spring.redis.host>114.215.125.123</spring.redis.host>
-                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
+                <spring.redis.index>8</spring.redis.index>
+                <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.port>10001</spring.redis.port>
+                <spring.redis.password>elink!888</spring.redis.password>

                <!--小程序配置-->
                <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
@ -174,15 +174,15 @@
                <analysis.wx.ma.secret>394f47d4e08fc0fd629231d3f68a34dc</analysis.wx.ma.secret>

                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_custom?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/yushan_esua_epdc_custom?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
-                <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>yushan_epdc_test</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink-epdc@yushan</spring.datasource.druid.password>

                <nacos.register-enabled>false</nacos.register-enabled>
-                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
                <nacos.ip></nacos.ip>
-                <nacos.namespace>de000340-5fc4-45aa-bdbc-dd96852012ad</nacos.namespace>
+                <nacos.namespace>8831513c-2f72-42e8-899f-eb6c2c5ae110</nacos.namespace>
                <!--RocketMQ-->
                <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
                <rocketmq.consumer.group>organizationGroup</rocketmq.consumer.group>
--- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/PersonTestingController.java
+++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/PersonTestingController.java
@ -0,0 +1,94 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.epidemic.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.PersonTestingDTO;
+import com.elink.esua.epdc.modules.epidemic.excel.PersonTestingExcel;
+import com.elink.esua.epdc.modules.epidemic.service.PersonTestingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 核酸检测记录
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-08-20
+ */
+@RestController
+@RequestMapping("persontesting")
+public class PersonTestingController {
+    
+    @Autowired
+    private PersonTestingService personTestingService;
+
+    @GetMapping("page")
+    public Result<PageData<PersonTestingDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<PersonTestingDTO> page = personTestingService.page(params);
+        return new Result<PageData<PersonTestingDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<PersonTestingDTO> get(@PathVariable("id") String id){
+        PersonTestingDTO data = personTestingService.get(id);
+        return new Result<PersonTestingDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody PersonTestingDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        personTestingService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody PersonTestingDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        personTestingService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        personTestingService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<PersonTestingDTO> list = personTestingService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, PersonTestingExcel.class);
+    }
+
+}
--- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/PersonTestingDao.java
+++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/PersonTestingDao.java
@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.epidemic.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.modules.epidemic.entity.PersonTestingEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 核酸检测记录
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-08-20
+ */
+@Mapper
+public interface PersonTestingDao extends BaseDao<PersonTestingEntity> {
+	
+}
--- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/PersonTestingEntity.java
+++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/PersonTestingEntity.java
@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.epidemic.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 核酸检测记录
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-08-20
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("epdc_person_testing")
+public class PersonTestingEntity extends BaseEpdcEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 姓名
+     */
+	private String name;
+
+    /**
+     * 性别
+     */
+	private String sex;
+
+    /**
+     * 民族
+     */
+	private String nation;
+
+    /**
+     * 出生日期
+     */
+	private Date birthday;
+
+    /**
+     * 住址
+     */
+	private String address;
+
+    /**
+     * 身份证号码
+     */
+	private String idcard;
+
+    /**
+     * 签发机关
+     */
+	private String organ;
+
+    /**
+     * 照片base64编码
+     */
+	private String imgCode;
+
+    /**
+     * 照片地址
+     */
+	private String imgUrl;
+
+    /**
+     * 核酸接测结果
+     */
+	private String testingResult;
+
+    /**
+     * 核酸检测时间
+     */
+	private Date testingTime;
+
+}
--- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/PersonTestingExcel.java
+++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/PersonTestingExcel.java
@ -0,0 +1,89 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.epidemic.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 核酸检测记录
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-08-20
+ */
+@Data
+public class PersonTestingExcel {
+
+    @Excel(name = "ID")
+    private String id;
+
+    @Excel(name = "姓名")
+    private String name;
+
+    @Excel(name = "性别")
+    private String sex;
+
+    @Excel(name = "民族")
+    private String nation;
+
+    @Excel(name = "出生日期")
+    private Date birthday;
+
+    @Excel(name = "住址")
+    private String address;
+
+    @Excel(name = "身份证号码")
+    private String idcard;
+
+    @Excel(name = "签发机关")
+    private String organ;
+
+    @Excel(name = "照片base64编码")
+    private String imgCode;
+
+    @Excel(name = "照片地址")
+    private String imgUrl;
+
+    @Excel(name = "核酸接测结果")
+    private String testingResult;
+
+    @Excel(name = "核酸检测时间")
+    private Date testingTime;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+    @Excel(name = "逻辑删除标识")
+    private String delFlag;
+
+
+}
--- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/redis/PersonTestingRedis.java
+++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/redis/PersonTestingRedis.java
@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.epidemic.redis;
+
+import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 核酸检测记录
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-08-20
+ */
+@Component
+public class PersonTestingRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
--- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/PersonTestingService.java
+++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/PersonTestingService.java
@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.epidemic.service;
+
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.dto.PersonTestingDTO;
+import com.elink.esua.epdc.modules.epidemic.entity.PersonTestingEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 核酸检测记录
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-08-20
+ */
+public interface PersonTestingService extends BaseService<PersonTestingEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<PersonTestingDTO>
+     * @author generator
+     * @date 2021-08-20
+     */
+    PageData<PersonTestingDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<PersonTestingDTO>
+     * @author generator
+     * @date 2021-08-20
+     */
+    List<PersonTestingDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return PersonTestingDTO
+     * @author generator
+     * @date 2021-08-20
+     */
+    PersonTestingDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-08-20
+     */
+    void save(PersonTestingDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-08-20
+     */
+    void update(PersonTestingDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-08-20
+     */
+    void delete(String[] ids);
+}
--- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java
+++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java
@ -0,0 +1,104 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.epidemic.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.dto.PersonTestingDTO;
+import com.elink.esua.epdc.modules.epidemic.dao.PersonTestingDao;
+import com.elink.esua.epdc.modules.epidemic.entity.PersonTestingEntity;
+import com.elink.esua.epdc.modules.epidemic.redis.PersonTestingRedis;
+import com.elink.esua.epdc.modules.epidemic.service.PersonTestingService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 核酸检测记录
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-08-20
+ */
+@Service
+public class PersonTestingServiceImpl extends BaseServiceImpl<PersonTestingDao, PersonTestingEntity> implements PersonTestingService {
+
+    @Autowired
+    private PersonTestingRedis personTestingRedis;
+
+    @Override
+    public PageData<PersonTestingDTO> page(Map<String, Object> params) {
+        IPage<PersonTestingEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, PersonTestingDTO.class);
+    }
+
+    @Override
+    public List<PersonTestingDTO> list(Map<String, Object> params) {
+        List<PersonTestingEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, PersonTestingDTO.class);
+    }
+
+    private QueryWrapper<PersonTestingEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<PersonTestingEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PersonTestingDTO get(String id) {
+        PersonTestingEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, PersonTestingDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(PersonTestingDTO dto) {
+        PersonTestingEntity entity = ConvertUtils.sourceToTarget(dto, PersonTestingEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(PersonTestingDTO dto) {
+        PersonTestingEntity entity = ConvertUtils.sourceToTarget(dto, PersonTestingEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
--- a/epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml
+++ b/epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml
@ -0,0 +1,28 @@
+<?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.elink.esua.epdc.modules.epidemic.dao.PersonTestingDao">
+
+    <resultMap type="com.elink.esua.epdc.modules.epidemic.entity.PersonTestingEntity" id="personTestingMap">
+        <result property="id" column="ID"/>
+        <result property="name" column="NAME"/>
+        <result property="sex" column="SEX"/>
+        <result property="nation" column="NATION"/>
+        <result property="birthday" column="BIRTHDAY"/>
+        <result property="address" column="ADDRESS"/>
+        <result property="idcard" column="IDCARD"/>
+        <result property="organ" column="ORGAN"/>
+        <result property="imgCode" column="IMG_CODE"/>
+        <result property="imgUrl" column="IMG_URL"/>
+        <result property="testingResult" column="TESTING_RESULT"/>
+        <result property="testingTime" column="TESTING_TIME"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+    </resultMap>
+
+
+</mapper>