+ * 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.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.GridMemberCategoryDTO;
+import com.elink.esua.epdc.excel.GridMemberCategoryExcel;
+import com.elink.esua.epdc.service.GridMemberCategoryService;
+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-11-04
+ */
+@RestController
+@RequestMapping("gridmembercategory")
+public class GridMemberCategoryController {
+
+ @Autowired
+ private GridMemberCategoryService gridMemberCategoryService;
+
+ @GetMapping("page")
+ public Result> page(@RequestParam Map params){
+ PageData page = gridMemberCategoryService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ GridMemberCategoryDTO data = gridMemberCategoryService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody GridMemberCategoryDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ gridMemberCategoryService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody GridMemberCategoryDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ gridMemberCategoryService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ gridMemberCategoryService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = gridMemberCategoryService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, GridMemberCategoryExcel.class);
+ }
+
+ /**
+ * @describe: 获取网格队伍分类
+ * @author wangtong
+ * @date 2021/11/4 15:38
+ * @params []
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ */
+ @GetMapping("getGridCategoryList")
+ public Result getGridCategoryList() {
+ return gridMemberCategoryService.getGridCategoryList();
+ }
+
+ /**
+ * @describe: 获取社区列表
+ * @author wangtong
+ * @date 2021/11/5 10:24
+ * @params []
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ */
+ @GetMapping("getCommunityDeptList")
+ public Result getCommunityDeptList() {
+ return gridMemberCategoryService.getCommunityDeptList();
+ }
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/GridMemberCategoryDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/GridMemberCategoryDao.java
new file mode 100644
index 0000000..f35200c
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/GridMemberCategoryDao.java
@@ -0,0 +1,53 @@
+/**
+ * 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.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.entity.GridMemberCategoryEntity;
+import com.elink.esua.epdc.entity.SysDeptEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 网格队伍分类
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-11-04
+ */
+@Mapper
+public interface GridMemberCategoryDao extends BaseDao {
+
+ /**
+ * @describe: 获取网格队伍分类
+ * @author wangtong
+ * @date 2021/11/4 15:38
+ * @params []
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ */
+ List getGridCategoryList();
+
+ /**
+ * @describe: 获取社区列表
+ * @author wangtong
+ * @date 2021/11/5 10:24
+ * @params []
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ */
+ List getCommunityDeptList();
+}
\ No newline at end of file
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/GridMemberCategoryEntity.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/GridMemberCategoryEntity.java
new file mode 100644
index 0000000..591ef4b
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/GridMemberCategoryEntity.java
@@ -0,0 +1,87 @@
+/**
+ * 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.
+ *
+ * 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.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-11-04
+ */
+@Data
+public class GridMemberCategoryExcel {
+
+ @Excel(name = "标识号")
+ private Long id;
+
+ @Excel(name = "类别名称")
+ private String typeName;
+
+ @Excel(name = "类别编码")
+ private String typeCode;
+
+ @Excel(name = "排序")
+ private Integer sort;
+
+ @Excel(name = "图片地址")
+ private String imgUrl;
+
+ @Excel(name = "启用标识 0-启用，1-未启用")
+ private String bannerFlag;
+
+ @Excel(name = "删除标识 0：未删除 1：删除")
+ private Integer delFlag;
+
+ @Excel(name = "创建者")
+ private Long creator;
+
+ @Excel(name = "创建时间")
+ private Date createDate;
+
+ @Excel(name = "更新者")
+ private Long updater;
+
+ @Excel(name = "更新时间")
+ private Date updateDate;
+
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/redis/GridMemberCategoryRedis.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/redis/GridMemberCategoryRedis.java
new file mode 100644
index 0000000..46ee4c9
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/redis/GridMemberCategoryRedis.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.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-11-04
+ */
+@Component
+public class GridMemberCategoryRedis {
+ @Autowired
+ private RedisUtils redisUtils;
+
+ public void delete(Object[] ids) {
+
+ }
+
+ public void set(){
+
+ }
+
+ public String get(String id){
+ return null;
+ }
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/GridMemberCategoryService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/GridMemberCategoryService.java
new file mode 100644
index 0000000..584a5a4
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/GridMemberCategoryService.java
@@ -0,0 +1,114 @@
+/**
+ * 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.
+ *
+ * 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.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.exception.RenException;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dao.GridMemberCategoryDao;
+import com.elink.esua.epdc.dto.GridMemberCategoryDTO;
+import com.elink.esua.epdc.entity.GridMemberCategoryEntity;
+import com.elink.esua.epdc.entity.SysDeptEntity;
+import com.elink.esua.epdc.redis.GridMemberCategoryRedis;
+import com.elink.esua.epdc.service.GridMemberCategoryService;
+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-11-04
+ */
+@Service
+public class GridMemberCategoryServiceImpl extends BaseServiceImpl implements GridMemberCategoryService {
+
+ @Autowired
+ private GridMemberCategoryRedis gridMemberCategoryRedis;
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, "sort", true),
+ getWrapper(params)
+ );
+ return getPageData(page, GridMemberCategoryDTO.class);
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, GridMemberCategoryDTO.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 GridMemberCategoryDTO get(String id) {
+ GridMemberCategoryEntity entity = baseDao.selectById(id);
+ return ConvertUtils.sourceToTarget(entity, GridMemberCategoryDTO.class);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(GridMemberCategoryDTO dto) {
+ String categoryCode = dto.getTypeCode();
+ if (StringUtils.isNotBlank(categoryCode)) {
+ if (getCodeCount(dto) > 0) {
+ throw new RenException("您输入的编码已存在");
+ }
+ }
+ GridMemberCategoryEntity entity = ConvertUtils.sourceToTarget(dto, GridMemberCategoryEntity.class);
+ insert(entity);
+ }
+
+ public Integer getCodeCount(GridMemberCategoryDTO dto) {
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq("type_code", dto.getTypeCode());
+ wrapper.eq("del_flag", "0");
+ return baseDao.selectCount(wrapper);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(GridMemberCategoryDTO dto) {
+
+ String categoryCode = dto.getTypeCode();
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq("type_code", dto.getTypeCode());
+ wrapper.eq("del_flag", "0");
+ wrapper.ne("id", dto.getId());
+ if (StringUtils.isNotBlank(categoryCode)) {
+ if (baseDao.selectCount(wrapper) > 0) {
+ throw new RenException("您输入的编码已存在");
+ }
+ }
+ GridMemberCategoryEntity entity = ConvertUtils.sourceToTarget(dto, GridMemberCategoryEntity.class);
+ updateById(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(String[] ids) {
+ // 逻辑删除（@TableLogic 注解）
+ baseDao.deleteBatchIds(Arrays.asList(ids));
+ }
+
+ @Override
+ public Result getGridCategoryList() {
+ List result = baseDao.getGridCategoryList();
+ return new Result().ok(result);
+ }
+
+ @Override
+ public Result getCommunityDeptList() {
+ List result = baseDao.getCommunityDeptList();
+ return new Result().ok(result);
+ }
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/GridMemberServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/GridMemberServiceImpl.java
index 567e7b6..c3dcf3c 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/GridMemberServiceImpl.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/GridMemberServiceImpl.java
@@ -34,6 +34,7 @@ import com.elink.esua.epdc.entity.SysDeptEntity;
import com.elink.esua.epdc.optimize.modules.deptlevel.service.OptSysDeptService;
import com.elink.esua.epdc.redis.GridMemberRedis;
import com.elink.esua.epdc.service.GridMemberService;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -50,6 +51,7 @@ import java.util.Map;
* @since v1.0.0 2021-09-14
*/
@Service
+@Slf4j
public class GridMemberServiceImpl extends BaseServiceImpl implements GridMemberService {
@Autowired
@@ -140,8 +142,9 @@ public class GridMemberServiceImpl extends BaseServiceImpl result = baseDao.getMemberList(dto);
diff --git a/epdc-cloud-admin/src/main/resources/mapper/GridMemberCategoryDao.xml b/epdc-cloud-admin/src/main/resources/mapper/GridMemberCategoryDao.xml
new file mode 100644
index 0000000..99e2633
--- /dev/null
+++ b/epdc-cloud-admin/src/main/resources/mapper/GridMemberCategoryDao.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epdc-cloud-admin/src/main/resources/mapper/GridMemberDao.xml b/epdc-cloud-admin/src/main/resources/mapper/GridMemberDao.xml
index 852179b..76f830c 100644
--- a/epdc-cloud-admin/src/main/resources/mapper/GridMemberDao.xml
+++ b/epdc-cloud-admin/src/main/resources/mapper/GridMemberDao.xml
@@ -52,6 +52,7 @@
from epdc_grid_member
where del_flag='0'
and FIND_IN_SET(#{deptId},ALL_DEPT_IDS)
+ and CATEGORY_CODE=#{categoryCode}
order by CREATED_TIME desc
LIMIT #{pageIndex},#{pageSize}