diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/TestingPointController.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/TestingPointController.java new file mode 100644 index 0000000..f04d3a3 --- /dev/null +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/TestingPointController.java @@ -0,0 +1,109 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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.UpdateGroup; +import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.epidemic.TestingPointDTO; +import com.elink.esua.epdc.dto.epidemic.result.TestingPointSelectionResultDTO; +import com.elink.esua.epdc.modules.epidemic.excel.TestingPointExcel; +import com.elink.esua.epdc.modules.epidemic.service.TestingPointService; +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-09-09 + */ +@RestController +@RequestMapping("testingpoint") +public class TestingPointController { + + @Autowired + private TestingPointService testingPointService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = testingPointService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + TestingPointDTO data = testingPointService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody TestingPointDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + testingPointService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody TestingPointDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + testingPointService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + testingPointService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = testingPointService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, TestingPointExcel.class); + } + + + /** + * 下拉选择 监测点 + * + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 09:39 2021-09-10 + **/ + @GetMapping("testingPointSelection") + public Result> testingPointSelection(){ + List data = testingPointService.getTestingPointSelector(); + return new Result>().ok(data); + } +} diff --git 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 index 2956907..aba767b 100644 --- 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 @@ -18,6 +18,7 @@ package com.elink.esua.epdc.modules.epidemic.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.PersonTestingDTO; import com.elink.esua.epdc.dto.PersonTestingPageDTO; import com.elink.esua.epdc.modules.epidemic.entity.PersonTestingEntity; import org.apache.ibatis.annotations.Mapper; @@ -45,4 +46,14 @@ public interface PersonTestingDao extends BaseDao { * @return java.lang.String */ String getMobileByIdCard(@Param("idcard") String idcard); -} \ No newline at end of file + + /** + * 详情查询 + * @param id + * @return com.elink.esua.epdc.dto.PersonTestingDTO + * @Author zhangyong + * @Date 11:04 2021-09-10 + **/ + PersonTestingDTO getDetailPersonTesting(@Param("id") String id); + +} diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/TestingPointDao.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/TestingPointDao.java new file mode 100644 index 0000000..92ed904 --- /dev/null +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/TestingPointDao.java @@ -0,0 +1,68 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.epidemic.dao; + +import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.epidemic.TestingPointDTO; +import com.elink.esua.epdc.dto.epidemic.result.TestingPointSelectionResultDTO; +import com.elink.esua.epdc.modules.epidemic.entity.TestingPointEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + * 核酸检测点 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-09-09 + */ +@Mapper +public interface TestingPointDao extends BaseDao { + + /** + * 下拉选择 监测点 + * + * @param + * @return java.util.List + * @Author zhangyong + * @Date 09:39 2021-09-10 + **/ + List getTestingPointSelector(); + + /** + * 监测点列表查询 + * + * @param params + * @return java.util.List + * @Author zhangyong + * @Date 09:45 2021-09-10 + **/ + List selectListTestingPoint(Map params); + + /** + * 详情查询 + * + * @param id + * @return com.elink.esua.epdc.dto.epidemic.TestingPointDTO + * @Author zhangyong + * @Date 13:30 2021-09-10 + **/ + TestingPointDTO getDetailTestingPoint(@Param("id") String id); +} diff --git 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 index 7052afe..a148ad1 100644 --- 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 @@ -98,4 +98,8 @@ public class PersonTestingEntity extends BaseEpdcEntity { */ private Date testingTime; -} \ No newline at end of file + /** + * 核酸检测点表，主键 + */ + private String testingPointId; +} diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/TestingPointEntity.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/TestingPointEntity.java new file mode 100644 index 0000000..76d5fd5 --- /dev/null +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/TestingPointEntity.java @@ -0,0 +1,76 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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.math.BigDecimal; +import java.util.Date; + +/** + * 核酸检测点 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-09-09 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("epdc_testing_point") +public class TestingPointEntity extends BaseEpdcEntity { + + private static final long serialVersionUID = 1L; + + /** + * 监测点名称 + */ + private String testingPointName; + + /** + * 位置 + */ + private String address; + + /** + * 经度 + */ + private BigDecimal longitude; + + /** + * 纬度 + */ + private BigDecimal latitude; + + /** + * 负责人 + */ + private String contacts; + + /** + * 联系电话 + */ + private String tel; + + /** + * 监测点介绍 + */ + private String introduce; +} diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/TestingPointExcel.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/TestingPointExcel.java new file mode 100644 index 0000000..8bf04f4 --- /dev/null +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/TestingPointExcel.java @@ -0,0 +1,75 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.epidemic.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 核酸检测点 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-09-09 + */ +@Data +public class TestingPointExcel { + + @Excel(name = "ID") + private String id; + + @Excel(name = "监测点名称") + private String testingPointName; + + @Excel(name = "位置") + private String address; + + @Excel(name = "经度") + private BigDecimal longitude; + + @Excel(name = "纬度") + private BigDecimal latitude; + + @Excel(name = "负责人") + private String contacts; + + @Excel(name = "联系电话") + private String tel; + + @Excel(name = "逻辑删除标识") + private String delFlag; + + @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; + + +} diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/redis/TestingPointRedis.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/redis/TestingPointRedis.java new file mode 100644 index 0000000..5458ba7 --- /dev/null +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/redis/TestingPointRedis.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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-09-09 + */ +@Component +public class TestingPointRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/TestingPointService.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/TestingPointService.java new file mode 100644 index 0000000..ae97481 --- /dev/null +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/TestingPointService.java @@ -0,0 +1,106 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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.epidemic.TestingPointDTO; +import com.elink.esua.epdc.dto.epidemic.result.TestingPointSelectionResultDTO; +import com.elink.esua.epdc.modules.epidemic.entity.TestingPointEntity; + +import java.util.List; +import java.util.Map; + +/** + * 核酸检测点 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-09-09 + */ +public interface TestingPointService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2021-09-09 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2021-09-09 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return TestingPointDTO + * @author generator + * @date 2021-09-09 + */ + TestingPointDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2021-09-09 + */ + void save(TestingPointDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2021-09-09 + */ + void update(TestingPointDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2021-09-09 + */ + void delete(String[] ids); + + /** + * 下拉选择 监测点 + * + * @param + * @return java.util.List + * @Author zhangyong + * @Date 09:39 2021-09-10 + **/ + List getTestingPointSelector(); +} diff --git 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 index 8eaa0d6..59dc062 100644 --- 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 @@ -96,8 +96,7 @@ public class PersonTestingServiceImpl extends BaseServiceImpl + * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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.epidemic.TestingPointDTO; +import com.elink.esua.epdc.dto.epidemic.result.TestingPointSelectionResultDTO; +import com.elink.esua.epdc.modules.epidemic.dao.TestingPointDao; +import com.elink.esua.epdc.modules.epidemic.entity.TestingPointEntity; +import com.elink.esua.epdc.modules.epidemic.redis.TestingPointRedis; +import com.elink.esua.epdc.modules.epidemic.service.TestingPointService; +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-09-09 + */ +@Service +public class TestingPointServiceImpl extends BaseServiceImpl implements TestingPointService { + + @Autowired + private TestingPointRedis testingPointRedis; + + @Override + public PageData page(Map params) { + IPage page = getPage(params); + List list = baseDao.selectListTestingPoint(params); + return new PageData<>(list, page.getTotal()); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, TestingPointDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public TestingPointDTO get(String id) { + return baseDao.getDetailTestingPoint(id); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(TestingPointDTO dto) { + TestingPointEntity entity = ConvertUtils.sourceToTarget(dto, TestingPointEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(TestingPointDTO dto) { + TestingPointEntity entity = ConvertUtils.sourceToTarget(dto, TestingPointEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + public List getTestingPointSelector() { + return baseDao.getTestingPointSelector(); + } +} diff --git a/epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml b/epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml index 8f18d62..85b4d49 100644 --- a/epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml +++ b/epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml @@ -22,6 +22,7 @@ + + - \ No newline at end of file + diff --git a/epdc-cloud-custom/src/main/resources/mapper/epidemic/TestingPointDao.xml b/epdc-cloud-custom/src/main/resources/mapper/epidemic/TestingPointDao.xml new file mode 100644 index 0000000..4f66f34 --- /dev/null +++ b/epdc-cloud-custom/src/main/resources/mapper/epidemic/TestingPointDao.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +