From 9568c67928944559ad10cffb6b2518b57bc1af7a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 26 Oct 2022 14:42:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/template/Controller.java.vm | 10 --- .../resources/template/ServiceImpl.java.vm | 4 - .../com/epmet/dto/IcEmployeeRegisterDTO.java | 79 ++++++++++++++++++ .../dto/IcEmployeeRegisterDetailDTO.java | 74 +++++++++++++++++ .../epmet/dto/IcGroupPeopleRegisterDTO.java | 79 ++++++++++++++++++ .../IcEmployeeRegisterController.java | 71 ++++++++++++++++ .../IcEmployeeRegisterDetailController.java | 72 ++++++++++++++++ .../IcGroupPeopleRegisterController.java | 72 ++++++++++++++++ .../com/epmet/dao/IcEmployeeRegisterDao.java | 16 ++++ .../dao/IcEmployeeRegisterDetailDao.java | 16 ++++ .../epmet/dao/IcGroupPeopleRegisterDao.java | 16 ++++ .../IcEmployeeRegisterDetailEntity.java | 44 ++++++++++ .../entity/IcEmployeeRegisterEntity.java | 49 +++++++++++ .../entity/IcGroupPeopleRegisterEntity.java | 49 +++++++++++ .../IcEmployeeRegisterDetailService.java | 78 +++++++++++++++++ .../service/IcEmployeeRegisterService.java | 78 +++++++++++++++++ .../service/IcGroupPeopleRegisterService.java | 78 +++++++++++++++++ .../IcEmployeeRegisterDetailServiceImpl.java | 83 +++++++++++++++++++ .../impl/IcEmployeeRegisterServiceImpl.java | 83 +++++++++++++++++++ .../IcGroupPeopleRegisterServiceImpl.java | 83 +++++++++++++++++++ .../mapper/IcEmployeeRegisterDao.xml | 6 ++ .../mapper/IcEmployeeRegisterDetailDao.xml | 6 ++ .../mapper/IcGroupPeopleRegisterDao.xml | 6 ++ 23 files changed, 1138 insertions(+), 14 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDetailDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterDetailController.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDetailDao.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcGroupPeopleRegisterDao.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEmployeeRegisterDetailEntity.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEmployeeRegisterEntity.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcGroupPeopleRegisterEntity.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterDetailService.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterDetailServiceImpl.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDetailDao.xml create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml diff --git a/epmet-cloud-generator/src/main/resources/template/Controller.java.vm b/epmet-cloud-generator/src/main/resources/template/Controller.java.vm index 1e489dca52..c26eeb8447 100644 --- a/epmet-cloud-generator/src/main/resources/template/Controller.java.vm +++ b/epmet-cloud-generator/src/main/resources/template/Controller.java.vm @@ -2,7 +2,6 @@ package ${package}.controller; import ${main}.commons.tools.aop.NoRepeatSubmit; import ${main}.commons.tools.page.PageData; -import ${main}.commons.tools.utils.ExcelUtils; import ${main}.commons.tools.utils.Result; import ${main}.commons.tools.validator.AssertUtils; import ${main}.commons.tools.validator.ValidatorUtils; @@ -10,7 +9,6 @@ import ${main}.commons.tools.validator.group.AddGroup; import ${main}.commons.tools.validator.group.UpdateGroup; import ${main}.commons.tools.validator.group.DefaultGroup; import ${package}.dto.${className}DTO; -import ${package}.excel.${className}Excel; import ${package}.service.${className}Service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -71,12 +69,4 @@ public class ${className}Controller { return new Result(); } - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List<${className}DTO> list = ${classname}Service.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, ${className}Excel.class); - } - - - } diff --git a/epmet-cloud-generator/src/main/resources/template/ServiceImpl.java.vm b/epmet-cloud-generator/src/main/resources/template/ServiceImpl.java.vm index f0bcfe2a7e..de6efd193d 100644 --- a/epmet-cloud-generator/src/main/resources/template/ServiceImpl.java.vm +++ b/epmet-cloud-generator/src/main/resources/template/ServiceImpl.java.vm @@ -9,7 +9,6 @@ import ${package}.commons.tools.constant.FieldConstant; import ${package}.dao.${className}Dao; import ${package}.dto.${className}DTO; import ${package}.entity.${className}Entity; -import ${package}.redis.${className}Redis; import ${package}.service.${className}Service; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -29,9 +28,6 @@ import java.util.Map; @Service public class ${className}ServiceImpl extends BaseServiceImpl<${className}Dao, ${className}Entity> implements ${className}Service { - @Autowired - private ${className}Redis ${classname}Redis; - @Override public PageData<${className}DTO> page(Map params) { IPage<${className}Entity> page = baseDao.selectPage( diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java new file mode 100644 index 0000000000..16ec39997f --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java @@ -0,0 +1,79 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 员工登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Data +public class IcEmployeeRegisterDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户id + */ + private String customerId; + + /** + * 场所id + */ + private String enterpriseId; + + /** + * 姓名 + */ + private String name; + + /** + * 手机号 + */ + private String mobile; + + /** + * 身份证号或护照号 + */ + private String idCard; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDetailDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDetailDTO.java new file mode 100644 index 0000000000..40d12c1fd4 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDetailDTO.java @@ -0,0 +1,74 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 员工登记明细表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Data +public class IcEmployeeRegisterDetailDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户id + */ + private String customerId; + + /** + * ic_employee_register.ID + */ + private String registerId; + + /** + * 疫苗接种次数：0,1,2,3 + */ + private Integer ymjzCount; + + /** + * 最近一次核酸检测时间：yyyy-MM-dd 日期 + */ + private Date latestNatTime; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java new file mode 100644 index 0000000000..bc4e876b7c --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java @@ -0,0 +1,79 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 受众群体登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Data +public class IcGroupPeopleRegisterDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户id + */ + private String customerId; + + /** + * 场所id + */ + private String enterpriseId; + + /** + * 核酸检测时间：yyyy-MM-dd 日期 + */ + private Date natTime; + + /** + * 受众人数 + */ + private Integer szTotal; + + /** + * 核酸检测人数 + */ + private Integer hsjcTotal; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java new file mode 100644 index 0000000000..270d3c7f9b --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java @@ -0,0 +1,71 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.IcEmployeeRegisterDTO; +import com.epmet.service.IcEmployeeRegisterService; +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 generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@RestController +@RequestMapping("icEmployeeRegister") +public class IcEmployeeRegisterController { + + @Autowired + private IcEmployeeRegisterService icEmployeeRegisterService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icEmployeeRegisterService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcEmployeeRegisterDTO data = icEmployeeRegisterService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcEmployeeRegisterDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icEmployeeRegisterService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcEmployeeRegisterDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icEmployeeRegisterService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icEmployeeRegisterService.delete(ids); + return new Result(); + } +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterDetailController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterDetailController.java new file mode 100644 index 0000000000..6b23562985 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterDetailController.java @@ -0,0 +1,72 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.IcEmployeeRegisterDetailDTO; +import com.epmet.service.IcEmployeeRegisterDetailService; +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 generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@RestController +@RequestMapping("icEmployeeRegisterDetail") +public class IcEmployeeRegisterDetailController { + + @Autowired + private IcEmployeeRegisterDetailService icEmployeeRegisterDetailService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icEmployeeRegisterDetailService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcEmployeeRegisterDetailDTO data = icEmployeeRegisterDetailService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcEmployeeRegisterDetailDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icEmployeeRegisterDetailService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcEmployeeRegisterDetailDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icEmployeeRegisterDetailService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icEmployeeRegisterDetailService.delete(ids); + return new Result(); + } + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java new file mode 100644 index 0000000000..ffc54df114 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java @@ -0,0 +1,72 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.IcGroupPeopleRegisterDTO; +import com.epmet.service.IcGroupPeopleRegisterService; +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 generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@RestController +@RequestMapping("icGroupPeopleRegister") +public class IcGroupPeopleRegisterController { + + @Autowired + private IcGroupPeopleRegisterService icGroupPeopleRegisterService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icGroupPeopleRegisterService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcGroupPeopleRegisterDTO data = icGroupPeopleRegisterService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcGroupPeopleRegisterDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icGroupPeopleRegisterService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcGroupPeopleRegisterDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icGroupPeopleRegisterService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icGroupPeopleRegisterService.delete(ids); + return new Result(); + } + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java new file mode 100644 index 0000000000..87bcce87fa --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcEmployeeRegisterEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 员工登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Mapper +public interface IcEmployeeRegisterDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDetailDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDetailDao.java new file mode 100644 index 0000000000..a9d0408825 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcEmployeeRegisterDetailDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcEmployeeRegisterDetailEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 员工登记明细表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Mapper +public interface IcEmployeeRegisterDetailDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcGroupPeopleRegisterDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcGroupPeopleRegisterDao.java new file mode 100644 index 0000000000..b60b0155c0 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcGroupPeopleRegisterDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcGroupPeopleRegisterEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 受众群体登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Mapper +public interface IcGroupPeopleRegisterDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEmployeeRegisterDetailEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEmployeeRegisterDetailEntity.java new file mode 100644 index 0000000000..14f90935c5 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEmployeeRegisterDetailEntity.java @@ -0,0 +1,44 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 员工登记明细表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_employee_register_detail") +public class IcEmployeeRegisterDetailEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * ic_employee_register.ID + */ + private String registerId; + + /** + * 疫苗接种次数：0,1,2,3 + */ + private Integer ymjzCount; + + /** + * 最近一次核酸检测时间：yyyy-MM-dd 日期 + */ + private Date latestNatTime; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEmployeeRegisterEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEmployeeRegisterEntity.java new file mode 100644 index 0000000000..dcae1e3c2d --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcEmployeeRegisterEntity.java @@ -0,0 +1,49 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 员工登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_employee_register") +public class IcEmployeeRegisterEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * 场所id + */ + private String enterpriseId; + + /** + * 姓名 + */ + private String name; + + /** + * 手机号 + */ + private String mobile; + + /** + * 身份证号或护照号 + */ + private String idCard; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcGroupPeopleRegisterEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcGroupPeopleRegisterEntity.java new file mode 100644 index 0000000000..3f4dffc18e --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcGroupPeopleRegisterEntity.java @@ -0,0 +1,49 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 受众群体登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_group_people_register") +public class IcGroupPeopleRegisterEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * 场所id + */ + private String enterpriseId; + + /** + * 核酸检测时间：yyyy-MM-dd 日期 + */ + private Date natTime; + + /** + * 受众人数 + */ + private Integer szTotal; + + /** + * 核酸检测人数 + */ + private Integer hsjcTotal; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterDetailService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterDetailService.java new file mode 100644 index 0000000000..658dc475bf --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterDetailService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcEmployeeRegisterDetailDTO; +import com.epmet.entity.IcEmployeeRegisterDetailEntity; + +import java.util.List; +import java.util.Map; + +/** + * 员工登记明细表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +public interface IcEmployeeRegisterDetailService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-10-26 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-10-26 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcEmployeeRegisterDetailDTO + * @author generator + * @date 2022-10-26 + */ + IcEmployeeRegisterDetailDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-26 + */ + void save(IcEmployeeRegisterDetailDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-26 + */ + void update(IcEmployeeRegisterDetailDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-10-26 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java new file mode 100644 index 0000000000..1ccb4a8b5c --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcEmployeeRegisterDTO; +import com.epmet.entity.IcEmployeeRegisterEntity; + +import java.util.List; +import java.util.Map; + +/** + * 员工登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +public interface IcEmployeeRegisterService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-10-26 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-10-26 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcEmployeeRegisterDTO + * @author generator + * @date 2022-10-26 + */ + IcEmployeeRegisterDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-26 + */ + void save(IcEmployeeRegisterDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-26 + */ + void update(IcEmployeeRegisterDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-10-26 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java new file mode 100644 index 0000000000..d38ba6d9e9 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcGroupPeopleRegisterDTO; +import com.epmet.entity.IcGroupPeopleRegisterEntity; + +import java.util.List; +import java.util.Map; + +/** + * 受众群体登记表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +public interface IcGroupPeopleRegisterService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-10-26 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-10-26 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcGroupPeopleRegisterDTO + * @author generator + * @date 2022-10-26 + */ + IcGroupPeopleRegisterDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-26 + */ + void save(IcGroupPeopleRegisterDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-10-26 + */ + void update(IcGroupPeopleRegisterDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-10-26 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterDetailServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterDetailServiceImpl.java new file mode 100644 index 0000000000..76c2e52a1f --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterDetailServiceImpl.java @@ -0,0 +1,83 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.IcEmployeeRegisterDetailDao; +import com.epmet.dto.IcEmployeeRegisterDetailDTO; +import com.epmet.entity.IcEmployeeRegisterDetailEntity; +import com.epmet.service.IcEmployeeRegisterDetailService; +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 generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Service +public class IcEmployeeRegisterDetailServiceImpl extends BaseServiceImpl implements IcEmployeeRegisterDetailService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcEmployeeRegisterDetailDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcEmployeeRegisterDetailDTO.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 IcEmployeeRegisterDetailDTO get(String id) { + IcEmployeeRegisterDetailEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcEmployeeRegisterDetailDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcEmployeeRegisterDetailDTO dto) { + IcEmployeeRegisterDetailEntity entity = ConvertUtils.sourceToTarget(dto, IcEmployeeRegisterDetailEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcEmployeeRegisterDetailDTO dto) { + IcEmployeeRegisterDetailEntity entity = ConvertUtils.sourceToTarget(dto, IcEmployeeRegisterDetailEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java new file mode 100644 index 0000000000..57cd680a61 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -0,0 +1,83 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.IcEmployeeRegisterDao; +import com.epmet.dto.IcEmployeeRegisterDTO; +import com.epmet.entity.IcEmployeeRegisterEntity; +import com.epmet.service.IcEmployeeRegisterService; +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 generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Service +public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl implements IcEmployeeRegisterService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcEmployeeRegisterDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcEmployeeRegisterDTO.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 IcEmployeeRegisterDTO get(String id) { + IcEmployeeRegisterEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcEmployeeRegisterDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcEmployeeRegisterDTO dto) { + IcEmployeeRegisterEntity entity = ConvertUtils.sourceToTarget(dto, IcEmployeeRegisterEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcEmployeeRegisterDTO dto) { + IcEmployeeRegisterEntity entity = ConvertUtils.sourceToTarget(dto, IcEmployeeRegisterEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java new file mode 100644 index 0000000000..8f3cd6e4b6 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java @@ -0,0 +1,83 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.IcGroupPeopleRegisterDao; +import com.epmet.dto.IcGroupPeopleRegisterDTO; +import com.epmet.entity.IcGroupPeopleRegisterEntity; +import com.epmet.service.IcGroupPeopleRegisterService; +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 generator generator@elink-cn.com + * @since v1.0.0 2022-10-26 + */ +@Service +public class IcGroupPeopleRegisterServiceImpl extends BaseServiceImpl implements IcGroupPeopleRegisterService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcGroupPeopleRegisterDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcGroupPeopleRegisterDTO.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 IcGroupPeopleRegisterDTO get(String id) { + IcGroupPeopleRegisterEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcGroupPeopleRegisterDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcGroupPeopleRegisterDTO dto) { + IcGroupPeopleRegisterEntity entity = ConvertUtils.sourceToTarget(dto, IcGroupPeopleRegisterEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcGroupPeopleRegisterDTO dto) { + IcGroupPeopleRegisterEntity entity = ConvertUtils.sourceToTarget(dto, IcGroupPeopleRegisterEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml new file mode 100644 index 0000000000..d71375c8b1 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDetailDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDetailDao.xml new file mode 100644 index 0000000000..2ca17eecfd --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDetailDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml new file mode 100644 index 0000000000..5b4d514d4c --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcGroupPeopleRegisterDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file