From e62c705537acb035932f426a444b2d4f8cac21c7 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.com> Date: Fri, 6 Aug 2021 10:44:56 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=85=9A=E7=BB=84=E7=BB=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86=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 --- .../epdc/controller/PartyOrgController.java | 94 ++++++++++++++++ .../controller/PartyOrgTypeController.java | 94 ++++++++++++++++ .../com/elink/esua/epdc/dao/PartyOrgDao.java | 33 ++++++ .../elink/esua/epdc/dao/PartyOrgTypeDao.java | 33 ++++++ .../esua/epdc/entity/PartyOrgEntity.java | 106 ++++++++++++++++++ .../esua/epdc/entity/PartyOrgTypeEntity.java | 61 ++++++++++ .../elink/esua/epdc/excel/PartyOrgExcel.java | 95 ++++++++++++++++ .../esua/epdc/excel/PartyOrgTypeExcel.java | 68 +++++++++++ .../elink/esua/epdc/redis/PartyOrgRedis.java | 47 ++++++++ .../esua/epdc/redis/PartyOrgTypeRedis.java | 47 ++++++++ .../esua/epdc/service/PartyOrgService.java | 95 ++++++++++++++++ .../epdc/service/PartyOrgTypeService.java | 95 ++++++++++++++++ .../service/impl/PartyOrgServiceImpl.java | 104 +++++++++++++++++ .../service/impl/PartyOrgTypeServiceImpl.java | 104 +++++++++++++++++ 14 files changed, 1076 insertions(+) create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgController.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgTypeController.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgDao.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/PartyOrgEntity.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/PartyOrgTypeEntity.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/excel/PartyOrgExcel.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/excel/PartyOrgTypeExcel.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/redis/PartyOrgRedis.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/redis/PartyOrgTypeRedis.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgService.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgTypeService.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgServiceImpl.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgTypeServiceImpl.java diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgController.java new file mode 100644 index 0000000..ba09196 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgController.java @@ -0,0 +1,94 @@ +/** + * 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.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.PartyOrgDTO; +import com.elink.esua.epdc.excel.PartyOrgExcel; +import com.elink.esua.epdc.service.PartyOrgService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 党组织表 党组织表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-06 + */ +@RestController +@RequestMapping("partyorg") +public class PartyOrgController { + + @Autowired + private PartyOrgService partyOrgService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = partyOrgService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + PartyOrgDTO data = partyOrgService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody PartyOrgDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + partyOrgService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody PartyOrgDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + partyOrgService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + partyOrgService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = partyOrgService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, PartyOrgExcel.class); + } + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgTypeController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgTypeController.java new file mode 100644 index 0000000..63ffd96 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgTypeController.java @@ -0,0 +1,94 @@ +/** + * 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.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.PartyOrgTypeDTO; +import com.elink.esua.epdc.excel.PartyOrgTypeExcel; +import com.elink.esua.epdc.service.PartyOrgTypeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 党组织类型表 党组织类型表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-06 + */ +@RestController +@RequestMapping("partyorgtype") +public class PartyOrgTypeController { + + @Autowired + private PartyOrgTypeService partyOrgTypeService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = partyOrgTypeService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + PartyOrgTypeDTO data = partyOrgTypeService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody PartyOrgTypeDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + partyOrgTypeService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody PartyOrgTypeDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + partyOrgTypeService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + partyOrgTypeService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = partyOrgTypeService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, PartyOrgTypeExcel.class); + } + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgDao.java new file mode 100644 index 0000000..f59f67f --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgDao.java @@ -0,0 +1,33 @@ +/** + * 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.PartyOrgEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 党组织表 党组织表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-06 + */ +@Mapper +public interface PartyOrgDao extends BaseDao { + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java new file mode 100644 index 0000000..7c90e37 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java @@ -0,0 +1,33 @@ +/** + * 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.PartyOrgTypeEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 党组织类型表 党组织类型表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-06 + */ +@Mapper +public interface PartyOrgTypeDao extends BaseDao { + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/PartyOrgEntity.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/PartyOrgEntity.java new file mode 100644 index 0000000..44f81f9 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/PartyOrgEntity.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.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 党组织表 党组织表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-06 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("epdc_party_org") +public class PartyOrgEntity extends BaseEpdcEntity { + + private static final long serialVersionUID = 1L; + + /** + * 党组织名称 + */ + private String partyOrgName; + + /** + * 党组织介绍 + */ + private String introduction; + + /** + * 两委干部 + */ + private String twoCommittees; + + /** + * 党员数量 + */ + private Integer partyMemberNum; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + + /** + * 所属组织名称 + */ + private String deptName; + + /** + * 所属组织ID + */ + private String deptId; + + /** + * 党组织类型编码 + */ + private String typeCode; + + /** + * 父所有部门ID + */ + private String parentDeptIds; + + /** + * 父所有部门名称 + */ + private String parentDeptNames; + + /** + * 所有部门ID + */ + private String allDeptIds; + + /** + * 所有部门名称 + */ + private String allDeptNames; + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/PartyOrgTypeEntity.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/PartyOrgTypeEntity.java new file mode 100644 index 0000000..97a832b --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/PartyOrgTypeEntity.java @@ -0,0 +1,61 @@ +/** + * 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.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 党组织类型表 党组织类型表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-06 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("epdc_party_org_type") +public class PartyOrgTypeEntity extends BaseEpdcEntity { + + private static final long serialVersionUID = 1L; + + /** + * 类型名称 + */ + private String typeName; + + /** + * 类型编码 + */ + private String typeCode; + + /** + * 排序 + */ + private Integer sort; + + /** + * 启用标识 0-否，1-是 + */ + private String enable; + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/excel/PartyOrgExcel.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/excel/PartyOrgExcel.java new file mode 100644 index 0000000..8c3032a --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/excel/PartyOrgExcel.java @@ -0,0 +1,95 @@ +/** + * 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.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 党组织表 党组织表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-06 + */ +@Data +public class PartyOrgExcel { + + @Excel(name = "标识号") + private String id; + + @Excel(name = "党组织名称") + private String partyOrgName; + + @Excel(name = "党组织介绍") + private String introduction; + + @Excel(name = "两委干部") + private String twoCommittees; + + @Excel(name = "党员数量") + private Integer partyMemberNum; + + @Excel(name = "经度") + private String longitude; + + @Excel(name = "纬度") + private String latitude; + + @Excel(name = "所属组织名称") + private String deptName; + + @Excel(name = "所属组织ID") + private String deptId; + + @Excel(name = "党组织类型编码") + private String typeCode; + + @Excel(name = "父所有部门ID") + private String parentDeptIds; + + @Excel(name = "父所有部门名称") + private String parentDeptNames; + + @Excel(name = "所有部门ID") + private String allDeptIds; + + @Excel(name = "所有部门名称") + private String allDeptNames; + + @Excel(name = "删除标识 0-否，1-是") + 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; + + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/excel/PartyOrgTypeExcel.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/excel/PartyOrgTypeExcel.java new file mode 100644 index 0000000..c2d2ec2 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/excel/PartyOrgTypeExcel.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.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 党组织类型表 党组织类型表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-06 + */ +@Data +public class PartyOrgTypeExcel { + + @Excel(name = "标识号") + private String id; + + @Excel(name = "类型名称") + private String typeName; + + @Excel(name = "类型编码") + private String typeCode; + + @Excel(name = "排序") + private Integer sort; + + @Excel(name = "启用标识 0-否，1-是") + private String enable; + + @Excel(name = "删除标识 0-否，1-是") + 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; + + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/redis/PartyOrgRedis.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/redis/PartyOrgRedis.java new file mode 100644 index 0000000..ee6a0f4 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/redis/PartyOrgRedis.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-08-06 + */ +@Component +public class PartyOrgRedis { + @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/redis/PartyOrgTypeRedis.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/redis/PartyOrgTypeRedis.java new file mode 100644 index 0000000..9817a76 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/redis/PartyOrgTypeRedis.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-08-06 + */ +@Component +public class PartyOrgTypeRedis { + @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/PartyOrgService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgService.java new file mode 100644 index 0000000..df5af53 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgService.java @@ -0,0 +1,95 @@ +/** + * 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.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.PartyOrgDTO; +import com.elink.esua.epdc.entity.PartyOrgEntity; + +import java.util.List; +import java.util.Map; + +/** + * 党组织表 党组织表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-06 + */ +public interface PartyOrgService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2021-08-06 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2021-08-06 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return PartyOrgDTO + * @author generator + * @date 2021-08-06 + */ + PartyOrgDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2021-08-06 + */ + void save(PartyOrgDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2021-08-06 + */ + void update(PartyOrgDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2021-08-06 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgTypeService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgTypeService.java new file mode 100644 index 0000000..25f14ae --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgTypeService.java @@ -0,0 +1,95 @@ +/** + * 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.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.PartyOrgTypeDTO; +import com.elink.esua.epdc.entity.PartyOrgTypeEntity; + +import java.util.List; +import java.util.Map; + +/** + * 党组织类型表 党组织类型表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-06 + */ +public interface PartyOrgTypeService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2021-08-06 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2021-08-06 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return PartyOrgTypeDTO + * @author generator + * @date 2021-08-06 + */ + PartyOrgTypeDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2021-08-06 + */ + void save(PartyOrgTypeDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2021-08-06 + */ + void update(PartyOrgTypeDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2021-08-06 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgServiceImpl.java new file mode 100644 index 0000000..ef4f515 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgServiceImpl.java @@ -0,0 +1,104 @@ +/** + * 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.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.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.dao.PartyOrgDao; +import com.elink.esua.epdc.dto.PartyOrgDTO; +import com.elink.esua.epdc.entity.PartyOrgEntity; +import com.elink.esua.epdc.redis.PartyOrgRedis; +import com.elink.esua.epdc.service.PartyOrgService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 党组织表 党组织表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-06 + */ +@Service +public class PartyOrgServiceImpl extends BaseServiceImpl implements PartyOrgService { + + @Autowired + private PartyOrgRedis partyOrgRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, PartyOrgDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, PartyOrgDTO.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 PartyOrgDTO get(String id) { + PartyOrgEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, PartyOrgDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(PartyOrgDTO dto) { + PartyOrgEntity entity = ConvertUtils.sourceToTarget(dto, PartyOrgEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(PartyOrgDTO dto) { + PartyOrgEntity entity = ConvertUtils.sourceToTarget(dto, PartyOrgEntity.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/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgTypeServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgTypeServiceImpl.java new file mode 100644 index 0000000..01a12f9 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgTypeServiceImpl.java @@ -0,0 +1,104 @@ +/** + * 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.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.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.dao.PartyOrgTypeDao; +import com.elink.esua.epdc.dto.PartyOrgTypeDTO; +import com.elink.esua.epdc.entity.PartyOrgTypeEntity; +import com.elink.esua.epdc.redis.PartyOrgTypeRedis; +import com.elink.esua.epdc.service.PartyOrgTypeService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 党组织类型表 党组织类型表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-06 + */ +@Service +public class PartyOrgTypeServiceImpl extends BaseServiceImpl implements PartyOrgTypeService { + + @Autowired + private PartyOrgTypeRedis partyOrgTypeRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, PartyOrgTypeDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, PartyOrgTypeDTO.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 PartyOrgTypeDTO get(String id) { + PartyOrgTypeEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, PartyOrgTypeDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(PartyOrgTypeDTO dto) { + PartyOrgTypeEntity entity = ConvertUtils.sourceToTarget(dto, PartyOrgTypeEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(PartyOrgTypeDTO dto) { + PartyOrgTypeEntity entity = ConvertUtils.sourceToTarget(dto, PartyOrgTypeEntity.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 From d9c736b5f7a31c36d77a2519e9f76bbedb51e847 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.com> Date: Fri, 6 Aug 2021 14:55:31 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=85=9A=E7=BB=84=E7=BB=87=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-cloud-admin/pom.xml | 8 ++-- .../com/elink/esua/epdc/dao/PartyOrgDao.java | 14 ++++++- .../elink/esua/epdc/dao/PartyOrgTypeDao.java | 26 +++++++++++- .../service/impl/PartyOrgTypeServiceImpl.java | 38 ++++++++++++++++- .../src/main/resources/mapper/PartyOrgDao.xml | 36 ++++++++++++++++ .../main/resources/mapper/PartyOrgTypeDao.xml | 41 +++++++++++++++++++ 6 files changed, 153 insertions(+), 10 deletions(-) create mode 100644 epdc-cloud-admin/src/main/resources/mapper/PartyOrgDao.xml create mode 100644 epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml diff --git a/epdc-cloud-admin/pom.xml b/epdc-cloud-admin/pom.xml index a014a21..907fb7b 100644 --- a/epdc-cloud-admin/pom.xml +++ b/epdc-cloud-admin/pom.xml @@ -167,10 +167,10 @@ dev dev - 9 - 114.215.125.123 - 9603 - epdc!redis@master1405 + 8 + r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com + 10001 + elink!888 false diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgDao.java index f59f67f..7a973e2 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgDao.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgDao.java @@ -20,6 +20,7 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.entity.PartyOrgEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 党组织表 党组织表 @@ -29,5 +30,14 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PartyOrgDao extends BaseDao { - -} \ No newline at end of file + + /** + * 是否存在该类型（partyOrgType）的党组织 + * + * @param typeCode + * @return java.lang.Integer + * @Author zhangyong + * @Date 14:34 2021-08-06 + **/ + Integer isPartyOrgExistByPartyOrgType(@Param("typeCode") String typeCode); +} diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java index 7c90e37..c33a632 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java @@ -20,6 +20,7 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.entity.PartyOrgTypeEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 党组织类型表 党组织类型表 @@ -29,5 +30,26 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PartyOrgTypeDao extends BaseDao { - -} \ No newline at end of file + + /** + * 返回值 >0 code 已经存在 + * + * @param typeCode + * @param id 过滤自身(可选项) + * @return java.lang.Integer + * @Author zhangyong + * @Date 10:55 2021-04-28 + **/ + Integer isTypeCodeRepeated(@Param("typeCode") String typeCode, @Param("id") String id); + + /** + * 返回值 >0 name 已经存在 + * + * @param typeName + * @param id 过滤自身(可选项) + * @return java.lang.Integer + * @Author zhangyong + * @Date 10:55 2021-04-28 + **/ + Integer isTypeNameRepeated(@Param("typeName") String typeName, @Param("id") String id); +} diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgTypeServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgTypeServiceImpl.java index 01a12f9..006fb26 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgTypeServiceImpl.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgTypeServiceImpl.java @@ -20,9 +20,12 @@ 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.NumConstant; +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.constant.FieldConstant; +import com.elink.esua.epdc.dao.PartyOrgDao; import com.elink.esua.epdc.dao.PartyOrgTypeDao; import com.elink.esua.epdc.dto.PartyOrgTypeDTO; import com.elink.esua.epdc.entity.PartyOrgTypeEntity; @@ -48,6 +51,8 @@ public class PartyOrgTypeServiceImpl extends BaseServiceImpl page(Map params) { @@ -70,7 +75,7 @@ public class PartyOrgTypeServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - + wrapper.orderByAsc("SORT"); return wrapper; } @@ -83,6 +88,11 @@ public class PartyOrgTypeServiceImpl extends BaseServiceImpl 0 输出异常 + * @param exceptionInfo 异常描述 + * @return void + * @Author zhangyong + * @Date 14:26 2021-08-06 + **/ + private void exceptionHandling(Integer num, String exceptionInfo) { + if (NumConstant.ZERO < num) { + throw new RenException(exceptionInfo); + } + } + @Override @Transactional(rollbackFor = Exception.class) public void delete(String[] ids) { + for (String id : ids) { + PartyOrgTypeEntity partyOrgTypeEntity = baseDao.selectById(id); + Integer num = partyOrgDao.isPartyOrgExistByPartyOrgType(partyOrgTypeEntity.getTypeCode()); + this.exceptionHandling(num, "该类型不能被删除，因当前尚存在该类型的党组织。"); + } // 逻辑删除（@TableLogic 注解） baseDao.deleteBatchIds(Arrays.asList(ids)); } -} \ No newline at end of file +} diff --git a/epdc-cloud-admin/src/main/resources/mapper/PartyOrgDao.xml b/epdc-cloud-admin/src/main/resources/mapper/PartyOrgDao.xml new file mode 100644 index 0000000..44e5f52 --- /dev/null +++ b/epdc-cloud-admin/src/main/resources/mapper/PartyOrgDao.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml b/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml new file mode 100644 index 0000000..4b41a56 --- /dev/null +++ b/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + From cefbca57c3446d4a1e44d8f783f4e7cedd4a21b9 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.com> Date: Fri, 6 Aug 2021 18:09:45 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=85=9A=E7=BB=84=E7=BB=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PartyOrgTypeController.java | 16 +++++++-- .../elink/esua/epdc/dao/PartyOrgTypeDao.java | 12 +++++++ .../epdc/service/PartyOrgTypeService.java | 13 ++++++- .../service/impl/PartyOrgServiceImpl.java | 36 +++++++++++++++++-- .../service/impl/PartyOrgTypeServiceImpl.java | 5 +++ .../main/resources/mapper/PartyOrgTypeDao.xml | 8 +++++ 6 files changed, 85 insertions(+), 5 deletions(-) diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgTypeController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgTypeController.java index 63ffd96..7cf7ab5 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgTypeController.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgTypeController.java @@ -26,6 +26,7 @@ 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.PartyOrgTypeDTO; +import com.elink.esua.epdc.dto.PartyOrgTypeSelectDTO; import com.elink.esua.epdc.excel.PartyOrgTypeExcel; import com.elink.esua.epdc.service.PartyOrgTypeService; import org.springframework.beans.factory.annotation.Autowired; @@ -45,7 +46,7 @@ import java.util.Map; @RestController @RequestMapping("partyorgtype") public class PartyOrgTypeController { - + @Autowired private PartyOrgTypeService partyOrgTypeService; @@ -91,4 +92,15 @@ public class PartyOrgTypeController { ExcelUtils.exportExcelToTarget(response, null, list, PartyOrgTypeExcel.class); } -} \ No newline at end of file + /* + * 获取 党组织类型，用于下拉选项 + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 15:28 2021-08-06 + **/ + @GetMapping("getPartyOrgType") + public Result> getPartyOrgType() { + return new Result>().ok(partyOrgTypeService.getPartyOrgType()); + } +} diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java index c33a632..61ebd3d 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java @@ -18,10 +18,13 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.PartyOrgTypeSelectDTO; import com.elink.esua.epdc.entity.PartyOrgTypeEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 党组织类型表 党组织类型表 * @@ -52,4 +55,13 @@ public interface PartyOrgTypeDao extends BaseDao { * @Date 10:55 2021-04-28 **/ Integer isTypeNameRepeated(@Param("typeName") String typeName, @Param("id") String id); + + /* + * 获取 党组织类型，用于下拉选项 + * @param + * @return java.util.List + * @Author zhangyong + * @Date 15:28 2021-08-06 + **/ + List getPartyOrgType(); } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgTypeService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgTypeService.java index 25f14ae..e9a8056 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgTypeService.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgTypeService.java @@ -19,7 +19,9 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.PartyOrgTypeDTO; +import com.elink.esua.epdc.dto.PartyOrgTypeSelectDTO; import com.elink.esua.epdc.entity.PartyOrgTypeEntity; import java.util.List; @@ -92,4 +94,13 @@ public interface PartyOrgTypeService extends BaseService { * @date 2021-08-06 */ void delete(String[] ids); -} \ No newline at end of file + + /* + * 获取 党组织类型，用于下拉选项 + * @param + * @return java.util.List + * @Author zhangyong + * @Date 15:28 2021-08-06 + **/ + List getPartyOrgType(); +} diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgServiceImpl.java index ef4f515..9a6c45f 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgServiceImpl.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgServiceImpl.java @@ -20,12 +20,15 @@ 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.NumConstant; 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.constant.FieldConstant; import com.elink.esua.epdc.dao.PartyOrgDao; +import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO; import com.elink.esua.epdc.dto.PartyOrgDTO; import com.elink.esua.epdc.entity.PartyOrgEntity; +import com.elink.esua.epdc.optimize.modules.deptlevel.service.OptSysDeptService; import com.elink.esua.epdc.redis.PartyOrgRedis; import com.elink.esua.epdc.service.PartyOrgService; import org.apache.commons.lang3.StringUtils; @@ -48,6 +51,8 @@ public class PartyOrgServiceImpl extends BaseServiceImpl page(Map params) { @@ -77,13 +82,22 @@ public class PartyOrgServiceImpl extends BaseServiceImpl getPartyOrgType() { + return baseDao.getPartyOrgType(); + } } diff --git a/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml b/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml index 4b41a56..b3ec3dc 100644 --- a/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml +++ b/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml @@ -38,4 +38,12 @@ AND ID != #{id} + + From f56d04099ca6292b1c23024a26d4c9c0289e34db Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 11 Aug 2021 09:06:57 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=94=A8=E6=88=B7id?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=A7=92=E8=89=B2=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-cloud-admin/pom.xml | 4 ++-- .../esua/epdc/controller/SysRoleController.java | 12 ++++++++++++ .../java/com/elink/esua/epdc/dao/SysRoleDao.java | 10 +++++++++- .../com/elink/esua/epdc/service/SysRoleService.java | 8 ++++++++ .../esua/epdc/service/impl/SysRoleServiceImpl.java | 5 +++++ .../src/main/resources/mapper/SysRoleDao.xml | 4 ++++ 6 files changed, 40 insertions(+), 3 deletions(-) diff --git a/epdc-cloud-admin/pom.xml b/epdc-cloud-admin/pom.xml index 907fb7b..95bde94 100644 --- a/epdc-cloud-admin/pom.xml +++ b/epdc-cloud-admin/pom.xml @@ -174,9 +174,9 @@ false - mse-7be164015-p.nacos-ans.mse.aliyuncs.com:8848 + 115.29.142.202:8848 - 95aea863-dcc6-4f75-b256-9a6061a30a40 + 8831513c-2f72-42e8-899f-eb6c2c5ae110 http://localhost:9411 diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysRoleController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysRoleController.java index 838ff06..ba85c17 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysRoleController.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysRoleController.java @@ -158,4 +158,16 @@ public class SysRoleController { return new Result(); } + /** + * @describe: 根据用户ID查询角色ID，用逗号隔开 + * @author wangtong + * @date 2021/8/10 16:05 + * @params [userId] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + @GetMapping("getRoleStringIdsByUserId/{userId}") + public Result getRoleStringIdsByUserId(@PathVariable("userId") Long userId) { + String roleStringList = sysRoleService.getRoleStringIdsByUserId(userId); + return new Result().ok(roleStringList); + } } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysRoleDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysRoleDao.java index 1310c61..42759fc 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysRoleDao.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysRoleDao.java @@ -8,7 +8,6 @@ package com.elink.esua.epdc.dao; -import com.elink.esua.epdc.entity.SysRoleEntity; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.entity.SysRoleEntity; import org.apache.ibatis.annotations.Mapper; @@ -36,4 +35,13 @@ public interface SysRoleDao extends BaseDao { * @date 2019/12/18 10:20 */ List> selectAmountByRoleTpye(@Param("roleType") String roleType, @Param("deptIdList") List deptIdList); + + /** + * @describe: 根据用户ID查询角色ID，用逗号隔开 + * @author wangtong + * @date 2021/8/10 16:05 + * @params [userId] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + String getRoleStringIdsByUserId(@Param("userId") Long userId); } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysRoleService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysRoleService.java index 91a6af9..ed16cc1 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysRoleService.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysRoleService.java @@ -42,4 +42,12 @@ public interface SysRoleService extends BaseService { List getWhistleDeptIdList(Long id); + /** + * @describe: 根据用户ID查询角色ID，用逗号隔开 + * @author wangtong + * @date 2021/8/10 16:05 + * @params [userId] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + String getRoleStringIdsByUserId(Long userId); } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java index 0063ca5..6bb93c0 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java @@ -295,6 +295,11 @@ public class SysRoleServiceImpl extends BaseServiceImpl + From 7ebcd564dff20384b9ac6bccdbbe73539ae30218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Wed, 11 Aug 2021 15:22:38 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/AdminImgController.java | 88 ++++++++++++++ .../controller/SysDeptInfoController.java | 88 ++++++++++++++ .../com/elink/esua/epdc/dao/AdminImgDao.java | 33 ++++++ .../elink/esua/epdc/dao/SysDeptInfoDao.java | 33 ++++++ .../esua/epdc/entity/AdminImgEntity.java | 56 +++++++++ .../esua/epdc/entity/SysDeptInfoEntity.java | 86 ++++++++++++++ .../esua/epdc/service/AdminImgService.java | 107 +++++++++++++++++ .../esua/epdc/service/SysDeptInfoService.java | 106 +++++++++++++++++ .../service/impl/AdminImgServiceImpl.java | 110 ++++++++++++++++++ .../service/impl/SysDeptInfoServiceImpl.java | 109 +++++++++++++++++ .../epdc/service/impl/SysDeptServiceImpl.java | 104 ++++++++++++++++- .../src/main/resources/mapper/AdminImgDao.xml | 20 ++++ .../main/resources/mapper/SysDeptInfoDao.xml | 26 +++++ epdc-cloud-client-yushan | 2 +- epdc-cloud-commons-yushan | 2 +- 15 files changed, 965 insertions(+), 5 deletions(-) create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AdminImgController.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptInfoController.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/AdminImgDao.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptInfoDao.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/AdminImgEntity.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysDeptInfoEntity.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/AdminImgService.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptInfoService.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/AdminImgServiceImpl.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptInfoServiceImpl.java create mode 100644 epdc-cloud-admin/src/main/resources/mapper/AdminImgDao.xml create mode 100644 epdc-cloud-admin/src/main/resources/mapper/SysDeptInfoDao.xml diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AdminImgController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AdminImgController.java new file mode 100644 index 0000000..04ca721 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AdminImgController.java @@ -0,0 +1,88 @@ +/** + * 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.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.AdminImgDTO; +import com.elink.esua.epdc.service.AdminImgService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 图片表 图片表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-10 + */ +@RestController +@RequestMapping("adminimg") +public class AdminImgController { + + @Autowired + private AdminImgService adminImgService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = adminImgService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + AdminImgDTO data = adminImgService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody AdminImgDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + adminImgService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody AdminImgDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + adminImgService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + adminImgService.delete(ids); + return new Result(); + } + + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptInfoController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptInfoController.java new file mode 100644 index 0000000..66189f9 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptInfoController.java @@ -0,0 +1,88 @@ +/** + * 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.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.SysDeptInfoDTO; +import com.elink.esua.epdc.service.SysDeptInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 部门信息表 组织信息表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-10 + */ +@RestController +@RequestMapping("sysdeptinfo") +public class SysDeptInfoController { + + @Autowired + private SysDeptInfoService sysDeptInfoService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = sysDeptInfoService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + SysDeptInfoDTO data = sysDeptInfoService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody SysDeptInfoDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + sysDeptInfoService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody SysDeptInfoDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + sysDeptInfoService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + sysDeptInfoService.delete(ids); + return new Result(); + } + + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/AdminImgDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/AdminImgDao.java new file mode 100644 index 0000000..7746cc1 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/AdminImgDao.java @@ -0,0 +1,33 @@ +/** + * 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.AdminImgEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 图片表 图片表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-10 + */ +@Mapper +public interface AdminImgDao extends BaseDao { + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptInfoDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptInfoDao.java new file mode 100644 index 0000000..da3595b --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptInfoDao.java @@ -0,0 +1,33 @@ +/** + * 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.SysDeptInfoEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 部门信息表 组织信息表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-10 + */ +@Mapper +public interface SysDeptInfoDao extends BaseDao { + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/AdminImgEntity.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/AdminImgEntity.java new file mode 100644 index 0000000..774d088 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/AdminImgEntity.java @@ -0,0 +1,56 @@ +/** + * 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.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 图片表 图片表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-10 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("epdc_admin_img") +public class AdminImgEntity extends BaseEpdcEntity { + + private static final long serialVersionUID = 1L; + + /** + * 引用ID + */ + private String referenceId; + + /** + * 图片地址 + */ + private String imgUrl; + + /** + * 图片类型lllll + */ + private String imgType; + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysDeptInfoEntity.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysDeptInfoEntity.java new file mode 100644 index 0000000..dbbd969 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysDeptInfoEntity.java @@ -0,0 +1,86 @@ +/** + * 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.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 部门信息表 组织信息表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-10 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("sys_dept_info") +public class SysDeptInfoEntity extends BaseEpdcEntity { + + private static final long serialVersionUID = 1L; + + /** + * 部门ID + */ + private Long deptId; + + /** + * 概况介绍 + */ + private String introduction; + + /** + * 社区数量 + */ + private Integer communityNum; + + /** + * 网格数量 + */ + private Integer gridNum; + + /** + * 网格员数量 + */ + private Integer gridmanNum; + + /** + * 党员数量 + */ + private Integer partyMemberNum; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + + /** + * 辖区面积 + */ + private String acreage; + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/AdminImgService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/AdminImgService.java new file mode 100644 index 0000000..caac71b --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/AdminImgService.java @@ -0,0 +1,107 @@ +/** + * 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.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.AdminImgDTO; +import com.elink.esua.epdc.entity.AdminImgEntity; + +import java.util.List; +import java.util.Map; + +/** + * 图片表 图片表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-10 + */ +public interface AdminImgService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2021-08-10 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2021-08-10 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return AdminImgDTO + * @author generator + * @date 2021-08-10 + */ + AdminImgDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2021-08-10 + */ + void save(AdminImgDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2021-08-10 + */ + void update(AdminImgDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2021-08-10 + */ + void delete(String[] ids); + + + + /*** + * 根据类型 +引用ID + * @param imgType + * @param referenceId + * @return com.elink.esua.epdc.dto.AdminImgDTO + * @author qushutong + * @date 2021/8/10 17:20 + */ + AdminImgDTO getDtoByReference(String imgType,String referenceId); +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptInfoService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptInfoService.java new file mode 100644 index 0000000..25c4054 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptInfoService.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.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.SysDeptInfoDTO; +import com.elink.esua.epdc.entity.SysDeptInfoEntity; + +import java.util.List; +import java.util.Map; + +/** + * 部门信息表 组织信息表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-10 + */ +public interface SysDeptInfoService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2021-08-10 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2021-08-10 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return SysDeptInfoDTO + * @author generator + * @date 2021-08-10 + */ + SysDeptInfoDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2021-08-10 + */ + void save(SysDeptInfoDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2021-08-10 + */ + void update(SysDeptInfoDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2021-08-10 + */ + void delete(String[] ids); + + /** + * 根据关联deptID 查询 + * + * @param deptId + * @return SysDeptInfoDTO + * @author generator + * @date 2021-08-10 + */ + SysDeptInfoDTO getDeptInfoByDeptID(String deptId); + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/AdminImgServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/AdminImgServiceImpl.java new file mode 100644 index 0000000..503a409 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/AdminImgServiceImpl.java @@ -0,0 +1,110 @@ +/** + * 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.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.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.dao.AdminImgDao; +import com.elink.esua.epdc.dto.AdminImgDTO; +import com.elink.esua.epdc.entity.AdminImgEntity; +import com.elink.esua.epdc.entity.SysDeptInfoEntity; +import com.elink.esua.epdc.service.AdminImgService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 图片表 图片表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-10 + */ +@Service +public class AdminImgServiceImpl extends BaseServiceImpl implements AdminImgService { + + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, AdminImgDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, AdminImgDTO.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 AdminImgDTO get(String id) { + AdminImgEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, AdminImgDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(AdminImgDTO dto) { + AdminImgEntity entity = ConvertUtils.sourceToTarget(dto, AdminImgEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(AdminImgDTO dto) { + AdminImgEntity entity = ConvertUtils.sourceToTarget(dto, AdminImgEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + public AdminImgDTO getDtoByReference(String imgType, String referenceId) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(referenceId), FieldConstant.REFERENCE_ID, referenceId); + wrapper.eq(StringUtils.isNotBlank(imgType), FieldConstant.IMG_TYPE, imgType); + return ConvertUtils.sourceToTarget(baseDao.selectOne(wrapper),AdminImgDTO.class); + } + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptInfoServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptInfoServiceImpl.java new file mode 100644 index 0000000..1034986 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptInfoServiceImpl.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.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.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.dao.SysDeptInfoDao; +import com.elink.esua.epdc.dto.SysDeptInfoDTO; +import com.elink.esua.epdc.entity.SysDeptInfoEntity; +import com.elink.esua.epdc.service.SysDeptInfoService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 部门信息表 组织信息表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-10 + */ +@Service +public class SysDeptInfoServiceImpl extends BaseServiceImpl implements SysDeptInfoService { + + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, SysDeptInfoDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, SysDeptInfoDTO.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 SysDeptInfoDTO get(String id) { + SysDeptInfoEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, SysDeptInfoDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(SysDeptInfoDTO dto) { + SysDeptInfoEntity entity = ConvertUtils.sourceToTarget(dto, SysDeptInfoEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(SysDeptInfoDTO dto) { + SysDeptInfoEntity entity = ConvertUtils.sourceToTarget(dto, SysDeptInfoEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + public SysDeptInfoDTO getDeptInfoByDeptID(String deptId) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(deptId), FieldConstant.DEPT_ID, deptId); + SysDeptInfoEntity sysDeptInfoEntity = baseDao.selectOne(wrapper); + return ConvertUtils.sourceToTarget(sysDeptInfoEntity,SysDeptInfoDTO.class); + } + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index a58f161..a7fcc98 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -28,6 +28,7 @@ import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.utils.TreeUtils; +import com.elink.esua.epdc.constant.ImgConstant; import com.elink.esua.epdc.constant.RoleTypeKeyConstant; import com.elink.esua.epdc.dao.SysDeptDao; import com.elink.esua.epdc.dto.*; @@ -42,11 +43,15 @@ import com.elink.esua.epdc.dto.epdc.result.AreaCodeChildResultDTO; import com.elink.esua.epdc.dto.epdc.result.AreaCodeParentResultDTO; import com.elink.esua.epdc.dto.epdc.result.UserSysDeptAreaCodeResultDTO; import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO; +import com.elink.esua.epdc.entity.AdminImgEntity; import com.elink.esua.epdc.entity.SysDeptEntity; +import com.elink.esua.epdc.entity.SysDeptInfoEntity; import com.elink.esua.epdc.feign.AnalysisFeignClient; import com.elink.esua.epdc.feign.GroupFeignClient; import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO; import com.elink.esua.epdc.rocketmq.producer.OrganizationModifyProducer; +import com.elink.esua.epdc.service.AdminImgService; +import com.elink.esua.epdc.service.SysDeptInfoService; import com.elink.esua.epdc.service.SysDeptService; import com.elink.esua.epdc.service.SysUserService; import com.elink.esua.epdc.utils.EpmetUtils; @@ -93,6 +98,12 @@ public class SysDeptServiceImpl extends BaseServiceImpl list(Map params) { //普通管理员，只能查询所属部门及子部门的数据 @@ -126,10 +137,35 @@ public class SysDeptServiceImpl extends BaseServiceImpl + * @return java.util.Map * @author work@yujt.net.cn * @date 2019/11/29 10:27 */ diff --git a/epdc-cloud-admin/src/main/resources/mapper/AdminImgDao.xml b/epdc-cloud-admin/src/main/resources/mapper/AdminImgDao.xml new file mode 100644 index 0000000..4a0cb37 --- /dev/null +++ b/epdc-cloud-admin/src/main/resources/mapper/AdminImgDao.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/resources/mapper/SysDeptInfoDao.xml b/epdc-cloud-admin/src/main/resources/mapper/SysDeptInfoDao.xml new file mode 100644 index 0000000..a326a86 --- /dev/null +++ b/epdc-cloud-admin/src/main/resources/mapper/SysDeptInfoDao.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 5f37956..57330e4 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 5f3795652ce1dddd3bfced7410ffb36036ed5bbf +Subproject commit 57330e4f0947080d545ed8c2c1003636cd9be806 diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan index ffc7323..b2a4ab3 160000 --- a/epdc-cloud-commons-yushan +++ b/epdc-cloud-commons-yushan @@ -1 +1 @@ -Subproject commit ffc7323ae85c274afed21d90e2cd744c2801a1a8 +Subproject commit b2a4ab3cff9f848c77e7ec6b428321639270f734 From eb1948ec1030c72da7018edabe37d14dd7b66593 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 11 Aug 2021 16:38:29 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90-?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=81=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/v2/SysRoleV2Controller.java | 2 + .../esua/epdc/feign/NewsFeignClient.java | 44 +++++++++++++++++++ .../fallback/NewsFeignClientFallback.java | 30 +++++++++++++ .../esua/epdc/service/SysRoleService.java | 9 ++++ .../epdc/service/impl/SysRoleServiceImpl.java | 16 +++++++ 5 files changed, 101 insertions(+) create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/v2/SysRoleV2Controller.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/v2/SysRoleV2Controller.java index 6aceee1..69e876d 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/v2/SysRoleV2Controller.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/v2/SysRoleV2Controller.java @@ -61,6 +61,8 @@ public class SysRoleV2Controller { data.setCategoryIdList(sysRoleService.getCategoryIdList(id)); //查询角色对应的吹哨部门 data.setWhistleDeptIdList(sysRoleService.getWhistleDeptIdList(id)); + //查询角色对应的栏目权限 + data.setModuleMenuIdList(sysRoleService.getModuleMenuIdList(id)); return new Result().ok(data); } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java new file mode 100644 index 0000000..f12d322 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java @@ -0,0 +1,44 @@ +package com.elink.esua.epdc.feign; + +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.RoleModuleRealationDTO; +import com.elink.esua.epdc.feign.fallback.NewsFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; + +import java.util.List; + +/** + * @Author: wangtong + * @Date: 2021/8/11 09:28 + * @Description: 通知接口 + */ +@FeignClient(name = ServiceConstant.EPDC_NEWS_SERVER, fallback = NewsFeignClientFallback.class +// ,url = "http://127.0.0.1:9064" +) +public interface NewsFeignClient { + + /** + * @param orgTypeFormDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 保存项目处理类型权限 + * @Date 2019/12/24 17:17 + **/ + @PostMapping(value = "news/rolemodule/saveRoleModuleRealation", consumes = MediaType.APPLICATION_JSON_VALUE) + Result saveRoleModuleRealation(RoleModuleRealationDTO moduleDto); + + /** + * @describe: 查询角色对应的栏目权限 + * @author wangtong + * @date 2021/8/11 16:08 + * @params [roleId] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + @GetMapping(value = "news/rolemodule/getModuleMenuIdList/{roleId}") + Result> getModuleMenuIdList(@PathVariable("roleId") Long roleId); +} diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java new file mode 100644 index 0000000..5c82b86 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java @@ -0,0 +1,30 @@ +package com.elink.esua.epdc.feign.fallback; + +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.RoleModuleRealationDTO; +import com.elink.esua.epdc.feign.NewsFeignClient; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @Description + * @Author yinzuomei + * @Date 2019/12/24 9:45 + */ +@Component +public class NewsFeignClientFallback implements NewsFeignClient { + + + @Override + public Result saveRoleModuleRealation(RoleModuleRealationDTO moduleDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "saveRoleModuleRealation", moduleDto); + } + + @Override + public Result> getModuleMenuIdList(Long roleId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "getModuleMenuIdList", roleId); + } +} diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysRoleService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysRoleService.java index ed16cc1..6b27e37 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysRoleService.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysRoleService.java @@ -50,4 +50,13 @@ public interface SysRoleService extends BaseService { * @return com.elink.esua.epdc.commons.tools.utils.Result> */ String getRoleStringIdsByUserId(Long userId); + + /** + * @describe: 查询角色对应的栏目权限 + * @author wangtong + * @date 2021/8/11 16:07 + * @params [id] + * @return java.util.List + */ + List getModuleMenuIdList(Long id); } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java index 6bb93c0..4a82221 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java @@ -28,6 +28,7 @@ import com.elink.esua.epdc.constant.RoleTypeKeyConstant; import com.elink.esua.epdc.dao.SysDeptDao; import com.elink.esua.epdc.dao.SysRoleDao; import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; +import com.elink.esua.epdc.dto.RoleModuleRealationDTO; import com.elink.esua.epdc.dto.SysRoleDTO; import com.elink.esua.epdc.dto.handleroledept.HandleRoleDeptDTO; import com.elink.esua.epdc.dto.handleroledept.form.HandleRoleDeptFormDTO; @@ -35,6 +36,7 @@ import com.elink.esua.epdc.dto.rulecategory.form.HandleRoleCategoryFormDTO; import com.elink.esua.epdc.entity.SysDeptEntity; import com.elink.esua.epdc.entity.SysRoleEntity; import com.elink.esua.epdc.feign.EventFeignClient; +import com.elink.esua.epdc.feign.NewsFeignClient; import com.elink.esua.epdc.service.*; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -71,6 +73,8 @@ public class SysRoleServiceImpl extends BaseServiceImpl page(Map params) { @@ -149,6 +153,12 @@ public class SysRoleServiceImpl extends BaseServiceImpl getModuleMenuIdList(Long id) { + Result> result = newsFeignClient.getModuleMenuIdList(id); + return result.getData(); + } + /** * @param roleId * @param whistleDeptIdList From 5e78e4f25428e09dd1056e5312eff97e3f8c2a1c Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.com> Date: Wed, 11 Aug 2021 17:01:18 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=85=9A=E7=BB=84=E7=BB=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/PartyOrgController.java | 8 +-- .../com/elink/esua/epdc/dao/PartyOrgDao.java | 14 +++++ .../elink/esua/epdc/excel/PartyOrgExcel.java | 61 ++----------------- .../esua/epdc/service/PartyOrgService.java | 12 +++- .../service/impl/PartyOrgServiceImpl.java | 12 ++-- .../src/main/resources/mapper/PartyOrgDao.xml | 18 ++++++ .../main/resources/mapper/PartyOrgTypeDao.xml | 1 + 7 files changed, 60 insertions(+), 66 deletions(-) diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgController.java index ba09196..9f8a7fc 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgController.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgController.java @@ -45,7 +45,7 @@ import java.util.Map; @RestController @RequestMapping("partyorg") public class PartyOrgController { - + @Autowired private PartyOrgService partyOrgService; @@ -87,8 +87,8 @@ public class PartyOrgController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = partyOrgService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, PartyOrgExcel.class); + List list = partyOrgService.selectListPartyOrg(params); + ExcelUtils.exportExcelToTarget(response, "党组织管理", list, PartyOrgExcel.class); } -} \ No newline at end of file +} diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgDao.java index 7a973e2..09ccbb6 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgDao.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgDao.java @@ -18,10 +18,14 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.PartyOrgDTO; import com.elink.esua.epdc.entity.PartyOrgEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; +import java.util.Map; + /** * 党组织表 党组织表 * @@ -40,4 +44,14 @@ public interface PartyOrgDao extends BaseDao { * @Date 14:34 2021-08-06 **/ Integer isPartyOrgExistByPartyOrgType(@Param("typeCode") String typeCode); + + /** + * PC 首页查询 + * + * @param params + * @return java.util.List + * @Author zhangyong + * @Date 15:21 2021-08-11 + **/ + List selectListPartyOrg(Map params); } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/excel/PartyOrgExcel.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/excel/PartyOrgExcel.java index 8c3032a..69462dc 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/excel/PartyOrgExcel.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/excel/PartyOrgExcel.java @@ -31,65 +31,14 @@ import java.util.Date; @Data public class PartyOrgExcel { - @Excel(name = "标识号") - private String id; + @Excel(name = "所属组织") + private String allDeptNames; @Excel(name = "党组织名称") private String partyOrgName; - @Excel(name = "党组织介绍") - private String introduction; - - @Excel(name = "两委干部") - private String twoCommittees; - - @Excel(name = "党员数量") - private Integer partyMemberNum; - - @Excel(name = "经度") - private String longitude; - - @Excel(name = "纬度") - private String latitude; - - @Excel(name = "所属组织名称") - private String deptName; - - @Excel(name = "所属组织ID") - private String deptId; - - @Excel(name = "党组织类型编码") - private String typeCode; - - @Excel(name = "父所有部门ID") - private String parentDeptIds; - - @Excel(name = "父所有部门名称") - private String parentDeptNames; - - @Excel(name = "所有部门ID") - private String allDeptIds; - - @Excel(name = "所有部门名称") - private String allDeptNames; - - @Excel(name = "删除标识 0-否，1-是") - 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; + @Excel(name = "党组织类型") + private String typeName; -} \ No newline at end of file +} diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgService.java index df5af53..3ed40df 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgService.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgService.java @@ -92,4 +92,14 @@ public interface PartyOrgService extends BaseService { * @date 2021-08-06 */ void delete(String[] ids); -} \ No newline at end of file + + /** + * PC 首页查询 + * + * @param params + * @return java.util.List + * @Author zhangyong + * @Date 15:21 2021-08-11 + **/ + List selectListPartyOrg(Map params); +} diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgServiceImpl.java index 9a6c45f..5b80de8 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgServiceImpl.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/PartyOrgServiceImpl.java @@ -56,11 +56,9 @@ public class PartyOrgServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, PartyOrgDTO.class); + IPage page = getPage(params); + List list = baseDao.selectListPartyOrg(params); + return new PageData<>(list, page.getTotal()); } @Override @@ -133,4 +131,8 @@ public class PartyOrgServiceImpl extends BaseServiceImpl selectListPartyOrg(Map params) { + return baseDao.selectListPartyOrg(params); + } } diff --git a/epdc-cloud-admin/src/main/resources/mapper/PartyOrgDao.xml b/epdc-cloud-admin/src/main/resources/mapper/PartyOrgDao.xml index 44e5f52..c658311 100644 --- a/epdc-cloud-admin/src/main/resources/mapper/PartyOrgDao.xml +++ b/epdc-cloud-admin/src/main/resources/mapper/PartyOrgDao.xml @@ -33,4 +33,22 @@ WHERE DEL_FLAG = '0' AND TYPE_CODE = #{typeCode} + + diff --git a/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml b/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml index b3ec3dc..7af2277 100644 --- a/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml +++ b/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml @@ -45,5 +45,6 @@ TYPE_NAME tagName FROM epdc_party_org_type WHERE DEL_FLAG = '0' + AND ENABLE = '1' From 460d8208abb675c714b861a79096faf1a81b4054 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 11 Aug 2021 17:14:22 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90-?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/feign/NewsFeignClient.java | 11 +++++++++++ .../epdc/feign/fallback/NewsFeignClientFallback.java | 5 +++++ .../esua/epdc/service/impl/SysRoleServiceImpl.java | 6 ++++++ 3 files changed, 22 insertions(+) diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java index f12d322..1b95f5c 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java @@ -9,6 +9,7 @@ import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; import java.util.List; @@ -41,4 +42,14 @@ public interface NewsFeignClient { */ @GetMapping(value = "news/rolemodule/getModuleMenuIdList/{roleId}") Result> getModuleMenuIdList(@PathVariable("roleId") Long roleId); + + /** + * @param orgTypeFormDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 保存项目处理类型权限 + * @Date 2019/12/24 17:17 + **/ + @PutMapping(value = "news/rolemodule/updateRoleModuleRealation", consumes = MediaType.APPLICATION_JSON_VALUE) + Result updateRoleModuleRealation(RoleModuleRealationDTO moduleDto); } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java index 5c82b86..c66cfa6 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java @@ -27,4 +27,9 @@ public class NewsFeignClientFallback implements NewsFeignClient { public Result> getModuleMenuIdList(Long roleId) { return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "getModuleMenuIdList", roleId); } + + @Override + public Result updateRoleModuleRealation(RoleModuleRealationDTO moduleDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "updateRoleModuleRealation", moduleDto); + } } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java index 4a82221..7cd8050 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java @@ -264,6 +264,12 @@ public class SysRoleServiceImpl extends BaseServiceImpl Date: Fri, 13 Aug 2021 17:16:36 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A4=BE=E5=8C=BA?= =?UTF-8?q?=E4=BA=BA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/entity/SysDeptInfoEntity.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysDeptInfoEntity.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysDeptInfoEntity.java index dbbd969..606790c 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysDeptInfoEntity.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysDeptInfoEntity.java @@ -83,4 +83,9 @@ public class SysDeptInfoEntity extends BaseEpdcEntity { */ private String acreage; + /** + * 社区人数 + */ + private Integer communityManNum; + } \ No newline at end of file From acea194a1f9e704956c15398f60a1ae9b8c11d2a Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Mon, 16 Aug 2021 10:48:51 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E3=80=81=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83redis=E3=80=81naco?= =?UTF-8?q?s=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-cloud-admin/pom.xml | 12 ++++++------ epdc-cloud-client-yushan | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/epdc-cloud-admin/pom.xml b/epdc-cloud-admin/pom.xml index 95bde94..2690c56 100644 --- a/epdc-cloud-admin/pom.xml +++ b/epdc-cloud-admin/pom.xml @@ -209,15 +209,15 @@ test test - 9 - 114.215.125.123 - 9603 - epdc!redis@master1405 + 8 + r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com + 10001 + elink!888 true - 192.168.0.59:8848 - 192.168.0.59 + 115.29.142.202:8848 + 115.29.142.202 8831513c-2f72-42e8-899f-eb6c2c5ae110 http://localhost:9411 diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 57330e4..688b6ec 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 57330e4f0947080d545ed8c2c1003636cd9be806 +Subproject commit 688b6ec20ea6e5868994c27d8d67cae5238654ed