From d4438460b528bf61b1dc5f80a3dc8050010b4b9d Mon Sep 17 00:00:00 2001 From: luyan Date: Tue, 20 Jun 2023 15:40:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=8D=95=E4=BD=8D=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/KeyEnterpriseDTO.java | 63 ++++++++++++ .../epmet/dto/form/KeyEnterpriseFormDTO.java | 65 ++++++++++++ .../controller/KeyEnterpriseController.java | 99 +++++++++++++++++++ .../java/com/epmet/dao/KeyEnterpriseDao.java | 20 ++++ .../com/epmet/entity/KeyEnterpriseEntity.java | 61 ++++++++++++ .../com/epmet/excel/KeyEnterpriseExcel.java | 63 ++++++++++++ .../epmet/service/KeyEnterpriseService.java | 79 +++++++++++++++ .../impl/KeyEnterpriseServiceImpl.java | 91 +++++++++++++++++ .../resources/mapper/KeyEnterpriseDao.xml | 51 ++++++++++ 9 files changed, 592 insertions(+) create mode 100755 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/KeyEnterpriseDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/KeyEnterpriseFormDTO.java create mode 100755 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/KeyEnterpriseController.java create mode 100755 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/KeyEnterpriseDao.java create mode 100755 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/KeyEnterpriseEntity.java create mode 100755 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/KeyEnterpriseExcel.java create mode 100755 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/KeyEnterpriseService.java create mode 100755 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/KeyEnterpriseServiceImpl.java create mode 100755 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/KeyEnterpriseDao.xml diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/KeyEnterpriseDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/KeyEnterpriseDTO.java new file mode 100755 index 0000000000..af38dd0a04 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/KeyEnterpriseDTO.java @@ -0,0 +1,63 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-06-19 + */ +@Data +public class KeyEnterpriseDTO implements Serializable { + + + private static final long serialVersionUID = 5507035235435852045L; + + /** + * 主键ID + */ + private String id; + + /** + * 单位名称 + */ + private String unitName; + + /** + * 单位类型 + */ + private String unitType; + + /** + * 主营业务 + */ + private String business; + + /** + * 法人代表 + */ + private String legalPerson; + + /** + * 电话 + */ + private String mobile; + + /** + * 地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/KeyEnterpriseFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/KeyEnterpriseFormDTO.java new file mode 100644 index 0000000000..6030653799 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/KeyEnterpriseFormDTO.java @@ -0,0 +1,65 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author yan Lu + * @description 描述 + * @create 2023/6/19 10:41 + */ +@Data +public class KeyEnterpriseFormDTO extends PageFormDTO implements Serializable { + + + private static final long serialVersionUID = -6171428732538388855L; + + /** + * 主键ID + */ + private String id; + + /** + * 单位名称 + */ + private String unitName; + + /** + * 单位类型 + */ + private String unitType; + + /** + * 主营业务 + */ + private String business; + + /** + * 法人代表 + */ + private String legalPerson; + + /** + * 电话 + */ + private String mobile; + + /** + * 地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/KeyEnterpriseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/KeyEnterpriseController.java new file mode 100755 index 0000000000..450d02786e --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/KeyEnterpriseController.java @@ -0,0 +1,99 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.enums.DictTypeEnum; +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.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.KeyEnterpriseDTO; +import com.epmet.dto.form.KeyEnterpriseFormDTO; +import com.epmet.feign.EpmetAdminOpenFeignClient; +import com.epmet.service.KeyEnterpriseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + + +/** + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-06-19 + */ +@RestController +@RequestMapping("keyEnterprise") +public class KeyEnterpriseController { + + @Autowired + private KeyEnterpriseService keyEnterpriseService; + + @Autowired + private EpmetAdminOpenFeignClient adminOpenFeignClient; + + @RequestMapping("page") + public Result> page(@RequestParam Map params) { + PageData page = keyEnterpriseService.page(params); + if (null != page && page.getList().size() > 0) { + buildData(page.getList()); + } + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id) { + KeyEnterpriseDTO data = keyEnterpriseService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody KeyEnterpriseFormDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + keyEnterpriseService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody KeyEnterpriseFormDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + keyEnterpriseService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids) { + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + keyEnterpriseService.delete(ids); + return new Result(); + } + + @PostMapping("search") + public Result> search(@RequestBody KeyEnterpriseFormDTO formDto) { + PageData page = keyEnterpriseService.search(formDto); + if (null != page && page.getList().size() > 0) { + buildData(page.getList()); + } + return new Result().ok(page); + } + + private void buildData(List dtoList) { + Result> dictMapRes = adminOpenFeignClient.dictMap(DictTypeEnum.UNIT_TYPE.getCode()); + if (null != dictMapRes.getData() && dictMapRes.getData().size() > 0) { + Map dictMap = dictMapRes.getData(); + for (KeyEnterpriseDTO dto : dtoList) { + if (null != dto.getUnitType()) { + dto.setUnitType(dictMap.get(dto.getUnitType())); + } + } + } + } + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/KeyEnterpriseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/KeyEnterpriseDao.java new file mode 100755 index 0000000000..fb943fd7b5 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/KeyEnterpriseDao.java @@ -0,0 +1,20 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.KeyEnterpriseDTO; +import com.epmet.entity.KeyEnterpriseEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-06-19 + */ +@Mapper +public interface KeyEnterpriseDao extends BaseDao { + + List search(@Param("unitName") String unitName, @Param("unitType") String unitType); + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/KeyEnterpriseEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/KeyEnterpriseEntity.java new file mode 100755 index 0000000000..2d7b0bf633 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/KeyEnterpriseEntity.java @@ -0,0 +1,61 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-06-19 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("key_enterprise") +public class KeyEnterpriseEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 单位名称 + */ + private String unitName; + + /** + * 单位类型 + */ + private String unitType; + + /** + * 主营业务 + */ + private String business; + + /** + * 法人代表 + */ + private String legalPerson; + + /** + * 电话 + */ + private String mobile; + + /** + * 地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/KeyEnterpriseExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/KeyEnterpriseExcel.java new file mode 100755 index 0000000000..7d26d9e718 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/KeyEnterpriseExcel.java @@ -0,0 +1,63 @@ +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-06-19 + */ +@Data +public class KeyEnterpriseExcel { + + @Excel(name = "主键ID") + private String id; + + @Excel(name = "单位名称") + private String unitName; + + @Excel(name = "单位类型") + private Integer unitType; + + @Excel(name = "主营业务") + private String business; + + @Excel(name = "法人代表") + private String legalPerson; + + @Excel(name = "电话") + private String mobile; + + @Excel(name = "地址") + private String address; + + @Excel(name = "经度") + private String longitude; + + @Excel(name = "纬度") + private String latitude; + + @Excel(name = "删除标识：0.未删除 1.已删除") + private Integer 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; + + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/KeyEnterpriseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/KeyEnterpriseService.java new file mode 100755 index 0000000000..07e7c73d27 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/KeyEnterpriseService.java @@ -0,0 +1,79 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.KeyEnterpriseDTO; +import com.epmet.dto.form.KeyEnterpriseFormDTO; +import com.epmet.entity.KeyEnterpriseEntity; + +import java.util.List; +import java.util.Map; + +/** + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-06-19 + */ +public interface KeyEnterpriseService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2023-06-19 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2023-06-19 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return KeyEnterpriseDTO + * @author generator + * @date 2023-06-19 + */ + KeyEnterpriseDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2023-06-19 + */ + void save(KeyEnterpriseFormDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2023-06-19 + */ + void update(KeyEnterpriseFormDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2023-06-19 + */ + void delete(String[] ids); + + PageData search(KeyEnterpriseFormDTO formDto); +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/KeyEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/KeyEnterpriseServiceImpl.java new file mode 100755 index 0000000000..9f62b5f50c --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/KeyEnterpriseServiceImpl.java @@ -0,0 +1,91 @@ +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.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.dao.KeyEnterpriseDao; +import com.epmet.dto.KeyEnterpriseDTO; +import com.epmet.dto.form.KeyEnterpriseFormDTO; +import com.epmet.entity.KeyEnterpriseEntity; +import com.epmet.service.KeyEnterpriseService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-06-19 + */ +@Service +public class KeyEnterpriseServiceImpl extends BaseServiceImpl implements KeyEnterpriseService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, KeyEnterpriseDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, KeyEnterpriseDTO.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 KeyEnterpriseDTO get(String id) { + KeyEnterpriseEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, KeyEnterpriseDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(KeyEnterpriseFormDTO dto) { + KeyEnterpriseEntity entity = ConvertUtils.sourceToTarget(dto, KeyEnterpriseEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(KeyEnterpriseFormDTO dto) { + KeyEnterpriseEntity entity = ConvertUtils.sourceToTarget(dto, KeyEnterpriseEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + public PageData search(KeyEnterpriseFormDTO formDto) { + PageInfo pageInfo = PageHelper.startPage(formDto.getPageNo(), formDto.getPageSize(), formDto.getIsPage()) + .doSelectPageInfo(() -> baseDao.search(formDto.getUnitName(), formDto.getUnitType())); + return new PageData<>(pageInfo.getList() == null ? new ArrayList<>() : pageInfo.getList(), pageInfo.getTotal()); + } + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/KeyEnterpriseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/KeyEnterpriseDao.xml new file mode 100755 index 0000000000..3f46ffdfa6 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/KeyEnterpriseDao.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + ke.ID, + ke.UNIT_NAME, + ke.UNIT_TYPE, + ke.BUSINESS, + ke.LEGAL_PERSON, + ke.MOBILE, + ke.ADDRESS, + ke.LONGITUDE, + ke.LATITUDE + + + + +