From 1309a439734ef47d68b5032ef4c741e3c46c17bc Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 17 Jun 2020 11:15:44 +0800
Subject: [PATCH 01/46] =?UTF-8?q?gov-org=E6=96=B0=E5=A2=9E=E5=85=9A?=
=?UTF-8?q?=E6=94=AF=E9=83=A8=E4=BF=A1=E6=81=AF=EF=BC=8C=E4=BB=A3=E7=A0=81?=
=?UTF-8?q?=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/epmet/dto/CustomerPartyBranchDTO.java | 96 ++++++++++++++++
.../CustomerPartyBranchController.java | 94 ++++++++++++++++
.../com/epmet/dao/CustomerPartyBranchDao.java | 33 ++++++
.../entity/CustomerPartyBranchEntity.java | 66 +++++++++++
.../epmet/excel/CustomerPartyBranchExcel.java | 71 ++++++++++++
.../epmet/redis/CustomerPartyBranchRedis.java | 47 ++++++++
.../service/CustomerPartyBranchService.java | 95 ++++++++++++++++
.../impl/CustomerPartyBranchServiceImpl.java | 104 ++++++++++++++++++
.../mapper/CustomerPartyBranchDao.xml | 22 ++++
9 files changed, 628 insertions(+)
create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerPartyBranchDTO.java
create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java
create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerPartyBranchDao.java
create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerPartyBranchEntity.java
create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerPartyBranchExcel.java
create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerPartyBranchRedis.java
create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerPartyBranchService.java
create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerPartyBranchServiceImpl.java
create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerPartyBranchDao.xml
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerPartyBranchDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerPartyBranchDTO.java
new file mode 100644
index 0000000000..88f0afc598
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerPartyBranchDTO.java
@@ -0,0 +1,96 @@
+/**
+ * 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
+ * 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 > page(@RequestParam Map params){
+ PageData page = customerPartyBranchService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ CustomerPartyBranchDTO data = customerPartyBranchService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody CustomerPartyBranchDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ customerPartyBranchService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody CustomerPartyBranchDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ customerPartyBranchService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ customerPartyBranchService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = customerPartyBranchService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, CustomerPartyBranchExcel.class);
+ }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerPartyBranchDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerPartyBranchDao.java
new file mode 100644
index 0000000000..1a29c4df2f
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerPartyBranchDao.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 {
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerPartyBranchEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerPartyBranchEntity.java
new file mode 100644
index 0000000000..98610e75f7
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerPartyBranchEntity.java
@@ -0,0 +1,66 @@
+/**
+ * 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
+ * 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
+ * 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
+ * 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 {
+
+ /**
+ * 默认分页
+ *
+ * @param params
+ * @return PageData
+ * @author generator
+ * @date 2020-06-17
+ */
+ PageData page(Map params);
+
+ /**
+ * 默认查询
+ *
+ * @param params
+ * @return java.util.List
+ * @author generator
+ * @date 2020-06-17
+ */
+ List list(Map params);
+
+ /**
+ * 单条查询
+ *
+ * @param id
+ * @return CustomerPartyBranchDTO
+ * @author generator
+ * @date 2020-06-17
+ */
+ CustomerPartyBranchDTO get(String id);
+
+ /**
+ * 默认保存
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-06-17
+ */
+ void save(CustomerPartyBranchDTO dto);
+
+ /**
+ * 默认更新
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-06-17
+ */
+ void update(CustomerPartyBranchDTO dto);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return void
+ * @author generator
+ * @date 2020-06-17
+ */
+ void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerPartyBranchServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerPartyBranchServiceImpl.java
new file mode 100644
index 0000000000..ae49820a11
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerPartyBranchServiceImpl.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 implements CustomerPartyBranchService {
+
+ @Autowired
+ private CustomerPartyBranchRedis customerPartyBranchRedis;
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, FieldConstant.CREATED_TIME, false),
+ getWrapper(params)
+ );
+ return getPageData(page, CustomerPartyBranchDTO.class);
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, CustomerPartyBranchDTO.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 CustomerPartyBranchDTO get(String id) {
+ CustomerPartyBranchEntity entity = baseDao.selectById(id);
+ return ConvertUtils.sourceToTarget(entity, CustomerPartyBranchDTO.class);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(CustomerPartyBranchDTO dto) {
+ CustomerPartyBranchEntity entity = ConvertUtils.sourceToTarget(dto, CustomerPartyBranchEntity.class);
+ insert(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(CustomerPartyBranchDTO dto) {
+ CustomerPartyBranchEntity entity = ConvertUtils.sourceToTarget(dto, CustomerPartyBranchEntity.class);
+ updateById(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(String[] ids) {
+ // 逻辑删除（@TableLogic 注解）
+ baseDao.deleteBatchIds(Arrays.asList(ids));
+ }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerPartyBranchDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerPartyBranchDao.xml
new file mode 100644
index 0000000000..024a2f2945
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerPartyBranchDao.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From 6d0f3788c769ef694af7c08efb41e3861f99ea9c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 17 Jun 2020 12:24:00 +0800
Subject: [PATCH 02/46] =?UTF-8?q?resi-partymember=EF=BC=9A=E6=96=B0?=
=?UTF-8?q?=E5=A2=9Eparty=5Fbranch=5Fmembers,partymember=5Fauth=5Frecord?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../partymember/PartyBranchMembersDTO.java | 81 ++++++++++++++
.../partymember/PartymemberAuthRecordDTO.java | 101 +++++++++++++++++
.../PartyBranchMembersController.java | 94 ++++++++++++++++
.../PartymemberAuthRecordController.java | 94 ++++++++++++++++
.../dao/PartyBranchMembersDao.java | 33 ++++++
.../dao/PartymemberAuthRecordDao.java | 33 ++++++
.../entity/PartyBranchMembersEntity.java | 51 +++++++++
.../entity/PartymemberAuthRecordEntity.java | 71 ++++++++++++
.../excel/PartyBranchMembersExcel.java | 62 +++++++++++
.../excel/PartymemberAuthRecordExcel.java | 74 +++++++++++++
.../redis/PartyBranchMembersRedis.java | 47 ++++++++
.../redis/PartymemberAuthRecordRedis.java | 47 ++++++++
.../service/PartyBranchMembersService.java | 95 ++++++++++++++++
.../service/PartymemberAuthRecordService.java | 95 ++++++++++++++++
.../impl/PartyBranchMembersServiceImpl.java | 104 ++++++++++++++++++
.../PartymemberAuthRecordServiceImpl.java | 104 ++++++++++++++++++
.../partymember/PartyBranchMembersDao.xml | 19 ++++
.../partymember/PartymemberAuthRecordDao.xml | 23 ++++
18 files changed, 1228 insertions(+)
create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartyBranchMembersDTO.java
create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberAuthRecordDTO.java
create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyBranchMembersController.java
create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberAuthRecordController.java
create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartyBranchMembersDao.java
create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberAuthRecordDao.java
create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartyBranchMembersEntity.java
create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberAuthRecordEntity.java
create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/PartyBranchMembersExcel.java
create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/PartymemberAuthRecordExcel.java
create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/PartyBranchMembersRedis.java
create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/PartymemberAuthRecordRedis.java
create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartyBranchMembersService.java
create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberAuthRecordService.java
create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyBranchMembersServiceImpl.java
create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberAuthRecordServiceImpl.java
create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartyBranchMembersDao.xml
create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberAuthRecordDao.xml
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartyBranchMembersDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartyBranchMembersDTO.java
new file mode 100644
index 0000000000..946e0ea1fa
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartyBranchMembersDTO.java
@@ -0,0 +1,81 @@
+/**
+ * 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
+ * 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
+ * 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 > page(@RequestParam Map params){
+ PageData page = partyBranchMembersService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ PartyBranchMembersDTO data = partyBranchMembersService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody PartyBranchMembersDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ partyBranchMembersService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody PartyBranchMembersDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ partyBranchMembersService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ partyBranchMembersService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = partyBranchMembersService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, PartyBranchMembersExcel.class);
+ }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberAuthRecordController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberAuthRecordController.java
new file mode 100644
index 0000000000..295a615e48
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberAuthRecordController.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 > page(@RequestParam Map params){
+ PageData page = partymemberAuthRecordService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ PartymemberAuthRecordDTO data = partymemberAuthRecordService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody PartymemberAuthRecordDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ partymemberAuthRecordService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody PartymemberAuthRecordDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ partymemberAuthRecordService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ partymemberAuthRecordService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = partymemberAuthRecordService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, PartymemberAuthRecordExcel.class);
+ }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartyBranchMembersDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartyBranchMembersDao.java
new file mode 100644
index 0000000000..f9a567fde2
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartyBranchMembersDao.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 {
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberAuthRecordDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberAuthRecordDao.java
new file mode 100644
index 0000000000..d9213b6fda
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberAuthRecordDao.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 {
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartyBranchMembersEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartyBranchMembersEntity.java
new file mode 100644
index 0000000000..4ab74c40bc
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartyBranchMembersEntity.java
@@ -0,0 +1,51 @@
+/**
+ * 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
+ * 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
+ * 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
+ * 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
+ * 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
+ * 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
+ * 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 {
+
+ /**
+ * 默认分页
+ *
+ * @param params
+ * @return PageData
+ * @author generator
+ * @date 2020-06-17
+ */
+ PageData page(Map params);
+
+ /**
+ * 默认查询
+ *
+ * @param params
+ * @return java.util.List
+ * @author generator
+ * @date 2020-06-17
+ */
+ List list(Map params);
+
+ /**
+ * 单条查询
+ *
+ * @param id
+ * @return PartyBranchMembersDTO
+ * @author generator
+ * @date 2020-06-17
+ */
+ PartyBranchMembersDTO get(String id);
+
+ /**
+ * 默认保存
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-06-17
+ */
+ void save(PartyBranchMembersDTO dto);
+
+ /**
+ * 默认更新
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-06-17
+ */
+ void update(PartyBranchMembersDTO dto);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return void
+ * @author generator
+ * @date 2020-06-17
+ */
+ void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberAuthRecordService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberAuthRecordService.java
new file mode 100644
index 0000000000..e0a3245038
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberAuthRecordService.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 {
+
+ /**
+ * 默认分页
+ *
+ * @param params
+ * @return PageData
+ * @author generator
+ * @date 2020-06-17
+ */
+ PageData page(Map params);
+
+ /**
+ * 默认查询
+ *
+ * @param params
+ * @return java.util.List
+ * @author generator
+ * @date 2020-06-17
+ */
+ List list(Map params);
+
+ /**
+ * 单条查询
+ *
+ * @param id
+ * @return PartymemberAuthRecordDTO
+ * @author generator
+ * @date 2020-06-17
+ */
+ PartymemberAuthRecordDTO get(String id);
+
+ /**
+ * 默认保存
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-06-17
+ */
+ void save(PartymemberAuthRecordDTO dto);
+
+ /**
+ * 默认更新
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-06-17
+ */
+ void update(PartymemberAuthRecordDTO dto);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return void
+ * @author generator
+ * @date 2020-06-17
+ */
+ void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyBranchMembersServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyBranchMembersServiceImpl.java
new file mode 100644
index 0000000000..9297c47fbc
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyBranchMembersServiceImpl.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 implements PartyBranchMembersService {
+
+ @Autowired
+ private PartyBranchMembersRedis partyBranchMembersRedis;
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, FieldConstant.CREATED_TIME, false),
+ getWrapper(params)
+ );
+ return getPageData(page, PartyBranchMembersDTO.class);
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, PartyBranchMembersDTO.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 PartyBranchMembersDTO get(String id) {
+ PartyBranchMembersEntity entity = baseDao.selectById(id);
+ return ConvertUtils.sourceToTarget(entity, PartyBranchMembersDTO.class);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(PartyBranchMembersDTO dto) {
+ PartyBranchMembersEntity entity = ConvertUtils.sourceToTarget(dto, PartyBranchMembersEntity.class);
+ insert(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(PartyBranchMembersDTO dto) {
+ PartyBranchMembersEntity entity = ConvertUtils.sourceToTarget(dto, PartyBranchMembersEntity.class);
+ updateById(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(String[] ids) {
+ // 逻辑删除（@TableLogic 注解）
+ baseDao.deleteBatchIds(Arrays.asList(ids));
+ }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberAuthRecordServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberAuthRecordServiceImpl.java
new file mode 100644
index 0000000000..8c303050d4
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberAuthRecordServiceImpl.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 implements PartymemberAuthRecordService {
+
+ @Autowired
+ private PartymemberAuthRecordRedis partymemberAuthRecordRedis;
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, FieldConstant.CREATED_TIME, false),
+ getWrapper(params)
+ );
+ return getPageData(page, PartymemberAuthRecordDTO.class);
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, PartymemberAuthRecordDTO.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 PartymemberAuthRecordDTO get(String id) {
+ PartymemberAuthRecordEntity entity = baseDao.selectById(id);
+ return ConvertUtils.sourceToTarget(entity, PartymemberAuthRecordDTO.class);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(PartymemberAuthRecordDTO dto) {
+ PartymemberAuthRecordEntity entity = ConvertUtils.sourceToTarget(dto, PartymemberAuthRecordEntity.class);
+ insert(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(PartymemberAuthRecordDTO dto) {
+ PartymemberAuthRecordEntity entity = ConvertUtils.sourceToTarget(dto, PartymemberAuthRecordEntity.class);
+ updateById(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(String[] ids) {
+ // 逻辑删除（@TableLogic 注解）
+ baseDao.deleteBatchIds(Arrays.asList(ids));
+ }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartyBranchMembersDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartyBranchMembersDao.xml
new file mode 100644
index 0000000000..e815a57e2c
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartyBranchMembersDao.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberAuthRecordDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberAuthRecordDao.xml
new file mode 100644
index 0000000000..e02cba68aa
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberAuthRecordDao.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From 1c14c14b84a67e1c4d7fd0e93d94148a77c86c02 Mon Sep 17 00:00:00 2001
From: wxz
Date: Wed, 17 Jun 2020 15:54:13 +0800
Subject: [PATCH 03/46] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E5=AE=A2=E6=88=B7?=
=?UTF-8?q?=EF=BC=8C=E7=BB=99=E5=AE=A2=E6=88=B7=E5=88=9D=E5=A7=8B=E5=8C=96?=
=?UTF-8?q?=E8=A7=92=E8=89=B2=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E5=90=8C?=
=?UTF-8?q?=E6=97=B6=E5=88=9D=E5=A7=8B=E5=8C=96=E8=A7=92=E8=89=B2=E7=9A=84?=
=?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=88=97=E8=A1=A8=E5=92=8C=E8=8C=83=E5=9B=B4?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=202.=E6=9F=A5=E8=AF=A2=E4=B8=80=E4=B8=AA?=
=?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90=E7=9A=84=E6=97=B6=E5=80=99?=
=?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=86=8D=E5=90=8C=E6=97=B6=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=A1=A8=E5=92=8C=E9=85=8D=E7=BD=AE=E8=A1=A8?=
=?UTF-8?q?=EF=BC=8C=E6=94=B9=E4=B8=BA=E5=8F=AA=E6=9F=A5=E8=AF=A2=E9=85=8D?=
=?UTF-8?q?=E7=BD=AE=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/epmet/feign/GovAccessFeignClient.java | 1 +
.../epmet/dao/OperationScopeDefaultDao.java | 35 +++++++++++
.../entity/OperationScopeDefaultEntity.java | 51 ++++++++++++++++
.../impl/RoleOperationServiceImpl.java | 58 +++++++++++++++++--
.../resources/mapper/OperationScopeDao.xml | 12 +++-
.../mapper/OperationScopeDefaultDao.xml | 24 ++++++++
.../com/epmet/feign/EpmetUserFeignClient.java | 2 +-
.../epmet/feign/OperCustomizeFeignClient.java | 10 ----
8 files changed, 177 insertions(+), 16 deletions(-)
create mode 100755 epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperationScopeDefaultDao.java
create mode 100755 epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationScopeDefaultEntity.java
create mode 100755 epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDefaultDao.xml
diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java
index c419c8a257..b4ca57f24b 100644
--- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java
@@ -8,6 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
+//@FeignClient(name = ServiceConstant.GOV_ACCESS_SERVER, fallback = GovAccessFeignClientFallBack.class, url = "http://localhost:8099")
@FeignClient(name = ServiceConstant.GOV_ACCESS_SERVER, fallback = GovAccessFeignClientFallBack.class)
public interface GovAccessFeignClient {
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperationScopeDefaultDao.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperationScopeDefaultDao.java
new file mode 100755
index 0000000000..5e38a89f31
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperationScopeDefaultDao.java
@@ -0,0 +1,35 @@
+/**
+ * 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 {
+ List listAllValid();
+}
\ No newline at end of file
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationScopeDefaultEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationScopeDefaultEntity.java
new file mode 100755
index 0000000000..04d8f7baf9
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationScopeDefaultEntity.java
@@ -0,0 +1,51 @@
+/**
+ * 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 page(Map params) {
IPage page = baseDao.selectPage(
@@ -116,7 +124,9 @@ public class RoleOperationServiceImpl extends BaseServiceImpl roles) {
- //roleOperationDefaultDao.listAllValid();
+ List validScopeDefaults = operationScopeDefaultDao.listAllValid();
+ HashMap> opeScopeMap = convertScopeDefaultEntity2Map(validScopeDefaults);
+
for (InitDefaultOperationsFormDTO.InitDefaultOpesRoleDTO role : roles) {
String roleId = role.getRoleId();
String roleKey = role.getRoleKey();
@@ -124,6 +134,7 @@ public class RoleOperationServiceImpl extends BaseServiceImpl operations, HashMap> opeScopeMap) {
+ for (RoleOperationDefaultResultDTO operation : operations) {
+ Set scopeKeys4ThisOpe = opeScopeMap.get(operation.getOperationKey());
+ if (!CollectionUtils.isEmpty(scopeKeys4ThisOpe)) {
+ for (String scopeKey : scopeKeys4ThisOpe) {
+ RoleScopeEntity roleScopeEntity = new RoleScopeEntity();
+ roleScopeEntity.setOperationKey(operation.getOperationKey());
+ roleScopeEntity.setRoleId(roleId);
+ roleScopeEntity.setScopeKey(scopeKey);
+ roleScopeDao.insert(roleScopeEntity);
+ }
+ }
+ }
+ }
+
+ /**
+ * 将默认范围entity转换为map
+ * @param entities
+ * @return
+ */
+ private HashMap> convertScopeDefaultEntity2Map(List entities) {
+ HashMap> map = new HashMap<>();
+ for (OperationScopeDefaultEntity entity : entities) {
+ Set scopes = map.get(entity.getOperationKey());
+ if (scopes == null) {
+ scopes = new HashSet<>();
+ map.put(entity.getOperationKey(), scopes);
+ }
+ scopes.add(entity.getScopeKey());
+ }
+ return map;
+ }
+
}
\ No newline at end of file
diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDao.xml
index c1772b7c54..0591776c96 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDao.xml
+++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDao.xml
@@ -32,6 +32,16 @@
+ SELECT rs.ROLE_ID, rs.OPERATION_KEY, rs.SCOPE_KEY, os.SCOPE_INDEX, os.SERIES, os.SORT
+ FROM role_scope rs
+ INNER JOIN operation_scope os ON (rs.SCOPE_KEY = os.SCOPE_KEY)
+ WHERE rs.DEL_FLAG = 0
+ AND rs.ROLE_ID = #{roleId}
+ ORDER BY rs.OPERATION_KEY ASC
+
+
+
+
SELECT def.SCOPE_KEY
diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDefaultDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDefaultDao.xml
new file mode 100755
index 0000000000..5e3e76a426
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDefaultDao.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+ SELECT *
+ FROM operation_scope_default WHERE DEL_FLAG=0
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
index 1942525951..d67b500d59 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
import java.util.Map;
-//, url = "localhost:8087"
+//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class, url = "localhost:8087")
@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class)
public interface EpmetUserFeignClient {
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/OperCustomizeFeignClient.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/OperCustomizeFeignClient.java
index b3c13859b7..b59a5c7a20 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/OperCustomizeFeignClient.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/OperCustomizeFeignClient.java
@@ -2,22 +2,12 @@ package com.epmet.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.CustomerAgencyDTO;
import com.epmet.dto.CustomerHomeDTO;
-import com.epmet.dto.form.AddAgencyFormDTO;
-import com.epmet.dto.form.AddRootAgencyFormDTO;
-import com.epmet.dto.form.StaffSubmitFromDTO;
-import com.epmet.dto.result.AddAgencyResultDTO;
-import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
import com.epmet.feign.fallback.OperCustomizeFeignClientFallBack;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
-import java.util.List;
-import java.util.Map;
-
//@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallback = OperCustomizeFeignClientFallBack.class, url = "localhost:8089")
@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallback = OperCustomizeFeignClientFallBack.class)
public interface OperCustomizeFeignClient {
From 363a1911db415e3f6e5ed02ccf837af93613e1e8 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 17 Jun 2020 19:03:51 +0800
Subject: [PATCH 04/46] =?UTF-8?q?=E6=94=AF=E9=83=A8=E7=AE=A1=E7=90=86v1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tools/exception/EpmetErrorCode.java | 2 +-
epmet-module/gov-grid/gov-grid-client/pom.xml | 6 ++
.../epmet/dto/form/DeleteBranchFormDTO.java | 20 +++++
.../epmet/dto/form/PartyBranchAddFormDTO.java | 51 +++++++++++
.../dto/form/PartyBranchEditFormDTO.java | 40 +++++++++
.../dto/form/PartyBranchListFormDTO.java | 29 ++++++
.../dto/result/PartyBranchAddResultDTO.java | 20 +++++
.../dto/result/PartyBranchListResultDTO.java | 24 +++++
.../PartyBranchManageController.java | 88 ++++++++++++++++++
.../service/PartyBranchManageService.java | 54 +++++++++++
.../impl/PartyBranchManageServiceImpl.java | 89 +++++++++++++++++++
.../dto/form/ListPartyBranchFormDTO.java | 29 ++++++
.../dto/result/ListPartyBranchResultDTO.java | 24 +++++
.../epmet/feign/GovOrgOpenFeignClient.java | 72 ++++++++++++---
.../GovOrgOpenFeignClientFallback.java | 30 +++++++
.../CustomerPartyBranchController.java | 39 ++++++--
.../com/epmet/dao/CustomerPartyBranchDao.java | 7 +-
.../service/CustomerPartyBranchService.java | 13 ++-
.../impl/CustomerPartyBranchServiceImpl.java | 12 ++-
.../mapper/CustomerPartyBranchDao.xml | 16 +++-
20 files changed, 642 insertions(+), 23 deletions(-)
create mode 100644 epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/DeleteBranchFormDTO.java
create mode 100644 epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchAddFormDTO.java
create mode 100644 epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchEditFormDTO.java
create mode 100644 epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchListFormDTO.java
create mode 100644 epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchAddResultDTO.java
create mode 100644 epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchListResultDTO.java
create mode 100644 epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java
create mode 100644 epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/PartyBranchManageService.java
create mode 100644 epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/PartyBranchManageServiceImpl.java
create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListPartyBranchFormDTO.java
create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ListPartyBranchResultDTO.java
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
index 04aabbf38f..e9828f104f 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
@@ -38,7 +38,7 @@ public enum EpmetErrorCode {
MESSAGE_SMS_SEND_ERROR(8105, "短信发送失败"),
NOT_DEL_GRID(8106,"该网格存在工作人员，不允许删除"),
ORG_IS_NOT_NULL(8107,"党组织关系不能为空"),
-
+ CANNOT_DELETE_PARTYB_RANCH(8108,"当前支部存在党员，不允许删除"),
CANNOT_AUDIT_WARM(8201, "请完善居民信息"),
NOT_DEL_AGENCY(8202, "该机关存在下级机关，不允许删除"),
NOT_DEL_AGENCY_PER(8205, "该机关存在工作人员，不允许删除"),
diff --git a/epmet-module/gov-grid/gov-grid-client/pom.xml b/epmet-module/gov-grid/gov-grid-client/pom.xml
index 297cb07121..5c477c501f 100644
--- a/epmet-module/gov-grid/gov-grid-client/pom.xml
+++ b/epmet-module/gov-grid/gov-grid-client/pom.xml
@@ -19,6 +19,12 @@
org.projectlombok
lombok
+
+ com.epmet
+ epmet-commons-tools
+ 2.0.0
+ compile
+
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/DeleteBranchFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/DeleteBranchFormDTO.java
new file mode 100644
index 0000000000..0e3e5f5ea2
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/DeleteBranchFormDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 17:02
+ */
+@Data
+public class DeleteBranchFormDTO implements Serializable {
+ private static final long serialVersionUID = 5321430865413383354L;
+
+ @NotBlank(message = "党支部id不能为空")
+ private String partyBranchId;
+}
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchAddFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchAddFormDTO.java
new file mode 100644
index 0000000000..29ac589a4f
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchAddFormDTO.java
@@ -0,0 +1,51 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 添加党支部入参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 12:35
+ */
+@Data
+public class PartyBranchAddFormDTO implements Serializable {
+ private static final long serialVersionUID = -8102877381223078842L;
+
+ public interface AddUserInternalGroup {
+ }
+
+ public interface AddUserShowGroup extends CustomerClientShowGroup {
+ }
+
+ /**
+ * 客户id
+ */
+ @NotBlank(message = "客户id不能为空", groups = {AddUserInternalGroup.class})
+ private String customerId;
+
+ /**
+ * 网格id
+ */
+ @NotBlank(message = "网格id不能为空", groups = {AddUserInternalGroup.class})
+ private String gridId;
+
+ /**
+ * 党支部名称
+ */
+ @NotBlank(message = "请输入支部名称", groups = {AddUserShowGroup.class})
+ @Length(max = 20, message = "支部名称不能超过20个字", groups = AddUserShowGroup.class)
+ private String partyBranchName;
+
+ /**
+ * 党支部概要信息
+ */
+ @NotBlank(message = "请输入支部概要信息", groups = {AddUserShowGroup.class})
+ @Length(max = 500, message = "支部概要信息不能超过500个字", groups = AddUserShowGroup.class)
+ private String profile;
+}
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchEditFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchEditFormDTO.java
new file mode 100644
index 0000000000..d4f03416a6
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchEditFormDTO.java
@@ -0,0 +1,40 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 修改党支部信息入参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 14:00
+ */
+@Data
+public class PartyBranchEditFormDTO implements Serializable {
+ private static final long serialVersionUID = -6739109166420798965L;
+ public interface AddUserInternalGroup {
+ }
+
+ public interface AddUserShowGroup extends CustomerClientShowGroup {
+ }
+
+ @NotBlank(message = "党支部id不能为空", groups = {AddUserInternalGroup.class})
+ private String partyBranchId;
+ /**
+ * 党支部名称
+ */
+ @NotBlank(message = "请输入支部名称", groups = {AddUserShowGroup.class})
+ @Length(max = 20, message = "支部名称不能超过20个字", groups = AddUserShowGroup.class)
+ private String partyBranchName;
+
+ /**
+ * 党支部概要信息
+ */
+ @NotBlank(message = "请输入支部概要信息", groups = {AddUserShowGroup.class})
+ @Length(max = 500, message = "支部概要信息不能超过500个字", groups = AddUserShowGroup.class)
+ private String profile;
+}
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchListFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchListFormDTO.java
new file mode 100644
index 0000000000..5f1c8681e4
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchListFormDTO.java
@@ -0,0 +1,29 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 3、党支部列表查询入参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 16:11
+ */
+@Data
+public class PartyBranchListFormDTO implements Serializable {
+ public interface AddUserInternalGroup {
+ }
+ /**
+ * 客户id
+ */
+ @NotBlank(message = "客户id不能为空", groups = {PartyBranchListFormDTO.AddUserInternalGroup.class})
+ private String customerId;
+
+ /**
+ * 网格id
+ */
+ @NotBlank(message = "网格id不能为空", groups = {PartyBranchListFormDTO.AddUserInternalGroup.class})
+ private String gridId;
+}
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchAddResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchAddResultDTO.java
new file mode 100644
index 0000000000..a959eb8e1a
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchAddResultDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 添加党支部返参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 12:45
+ */
+@Data
+public class PartyBranchAddResultDTO implements Serializable {
+ private static final long serialVersionUID = 5610858988982913682L;
+ /**
+ * 党支部id
+ */
+ private String partyBranchId;
+}
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchListResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchListResultDTO.java
new file mode 100644
index 0000000000..01920b0819
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchListResultDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 3、党支部列表查询返参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 16:13
+ */
+@Data
+public class PartyBranchListResultDTO implements Serializable {
+ private static final long serialVersionUID = 8342529186641647970L;
+ /**
+ * 支部id
+ */
+ private String partyBranchId;
+ /**
+ * 支部名称
+ */
+ private String partyBranchName;
+}
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java
new file mode 100644
index 0000000000..edb06910f7
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java
@@ -0,0 +1,88 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.DeleteBranchFormDTO;
+import com.epmet.dto.form.PartyBranchAddFormDTO;
+import com.epmet.dto.form.PartyBranchEditFormDTO;
+import com.epmet.dto.form.PartyBranchListFormDTO;
+import com.epmet.dto.result.PartyBranchAddResultDTO;
+import com.epmet.dto.result.PartyBranchListResultDTO;
+import com.epmet.service.PartyBranchManageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 基层治理-支部管理
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 12:25
+ */
+@RestController
+@RequestMapping("partybranch")
+public class PartyBranchManageController {
+ @Autowired
+ private PartyBranchManageService partyBranchManageService;
+
+ /**
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @author yinzuomei
+ * @description 添加党支部
+ * @Date 2020/6/17 12:47
+ **/
+ @PostMapping("add")
+ public Result addPartyBranch(@RequestBody PartyBranchAddFormDTO formDTO) {
+ ValidatorUtils.validateEntity(formDTO, PartyBranchAddFormDTO.AddUserShowGroup.class, PartyBranchAddFormDTO.AddUserInternalGroup.class);
+ PartyBranchAddResultDTO partyBranchAddResultDTO = partyBranchManageService.addPartyBranch(formDTO);
+ return new Result().ok(partyBranchAddResultDTO);
+ }
+
+ /**
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @author yinzuomei
+ * @description 修改党支部信息
+ * @Date 2020/6/17 15:31
+ **/
+ @PostMapping("edit")
+ public Result editPartyBranch(@RequestBody PartyBranchEditFormDTO formDTO) {
+ ValidatorUtils.validateEntity(formDTO, PartyBranchEditFormDTO.AddUserShowGroup.class, PartyBranchEditFormDTO.AddUserInternalGroup.class);
+ partyBranchManageService.editPartyBranch(formDTO);
+ PartyBranchAddResultDTO partyBranchAddResultDTO = new PartyBranchAddResultDTO();
+ partyBranchAddResultDTO.setPartyBranchId(formDTO.getPartyBranchId());
+ return new Result().ok(partyBranchAddResultDTO);
+ }
+
+ /**
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result>
+ * @author yinzuomei
+ * @description 党支部列表查询
+ * @Date 2020/6/17 16:15
+ **/
+ @PostMapping("list")
+ public Result> listPartyBranch(@RequestBody PartyBranchListFormDTO formDTO) {
+ ValidatorUtils.validateEntity(formDTO, PartyBranchListFormDTO.AddUserInternalGroup.class);
+ return new Result>().ok(partyBranchManageService.listPartyBranch(formDTO));
+ }
+
+ /**
+ * @return com.epmet.commons.tools.utils.Result
+ * @param formDTO
+ * @author yinzuomei
+ * @description 删除党支部
+ * @Date 2020/6/17 18:23
+ **/
+ @PostMapping("delete")
+ public Result deleteBranch(@RequestBody DeleteBranchFormDTO formDTO) {
+ ValidatorUtils.validateEntity(formDTO);
+ partyBranchManageService.deleteBranch(formDTO);
+ return new Result();
+ }
+}
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/PartyBranchManageService.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/PartyBranchManageService.java
new file mode 100644
index 0000000000..dae0c060d7
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/PartyBranchManageService.java
@@ -0,0 +1,54 @@
+package com.epmet.service;
+
+import com.epmet.dto.form.DeleteBranchFormDTO;
+import com.epmet.dto.form.PartyBranchAddFormDTO;
+import com.epmet.dto.form.PartyBranchEditFormDTO;
+import com.epmet.dto.form.PartyBranchListFormDTO;
+import com.epmet.dto.result.PartyBranchAddResultDTO;
+import com.epmet.dto.result.PartyBranchListResultDTO;
+
+import java.util.List;
+
+/**
+ * 基层治理-支部管理
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 12:47
+ */
+public interface PartyBranchManageService {
+ /**
+ * @param formDTO
+ * @return com.epmet.dto.result.PartyBranchAddResultDTO
+ * @author yinzuomei
+ * @description 添加党支部
+ * @Date 2020/6/17 13:24
+ **/
+ PartyBranchAddResultDTO addPartyBranch(PartyBranchAddFormDTO formDTO);
+
+ /**
+ * @param formDTO
+ * @return com.epmet.dto.result.PartyBranchAddResultDTO
+ * @author yinzuomei
+ * @description 修改党支部信息
+ * @Date 2020/6/17 14:30
+ **/
+ void editPartyBranch(PartyBranchEditFormDTO formDTO);
+
+ /**
+ * @param formDTO
+ * @return java.util.List
+ * @author yinzuomei
+ * @description 党支部列表查询
+ * @Date 2020/6/17 16:15
+ **/
+ List listPartyBranch(PartyBranchListFormDTO formDTO);
+
+ /**
+ * @return void
+ * @param formDTO
+ * @author yinzuomei
+ * @description 删除党支部
+ * @Date 2020/6/17 17:04
+ **/
+ void deleteBranch(DeleteBranchFormDTO formDTO);
+}
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/PartyBranchManageServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/PartyBranchManageServiceImpl.java
new file mode 100644
index 0000000000..fd6c6c4d66
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/PartyBranchManageServiceImpl.java
@@ -0,0 +1,89 @@
+package com.epmet.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerPartyBranchDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.ListPartyBranchResultDTO;
+import com.epmet.dto.result.PartyBranchAddResultDTO;
+import com.epmet.dto.result.PartyBranchListResultDTO;
+import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.service.PartyBranchManageService;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 基层治理-支部管理
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 13:23
+ */
+@Service
+public class PartyBranchManageServiceImpl implements PartyBranchManageService {
+ private Logger logger = LogManager.getLogger(PartyBranchManageServiceImpl.class);
+ @Autowired
+ private GovOrgOpenFeignClient govOrgOpenFeignClient;
+
+ @Override
+ public PartyBranchAddResultDTO addPartyBranch(PartyBranchAddFormDTO formDTO) {
+ CustomerPartyBranchDTO customerPartyBranchDTO = ConvertUtils.sourceToTarget(formDTO, CustomerPartyBranchDTO.class);
+ customerPartyBranchDTO.setTotalPartyMember(0);
+ PartyBranchAddResultDTO partyBranchAddResultDTO = new PartyBranchAddResultDTO();
+ Result result = govOrgOpenFeignClient.savePartyBranch(customerPartyBranchDTO);
+ if (result.success()) {
+ partyBranchAddResultDTO.setPartyBranchId(result.getData());
+ } else {
+ logger.error("添加党支部错误,调用gov-org-server接口返回失败");
+ }
+ return partyBranchAddResultDTO;
+ }
+
+ @Override
+ public void editPartyBranch(PartyBranchEditFormDTO formDTO) {
+ CustomerPartyBranchDTO customerPartyBranchDTO = ConvertUtils.sourceToTarget(formDTO, CustomerPartyBranchDTO.class);
+ customerPartyBranchDTO.setId(formDTO.getPartyBranchId());
+ Result result = govOrgOpenFeignClient.updatePartyBranch(customerPartyBranchDTO);
+ if (result.success()) {
+ logger.info("修改党支部信息成功");
+ }
+ }
+
+ @Override
+ public List listPartyBranch(PartyBranchListFormDTO formDTO) {
+ ListPartyBranchFormDTO listPartyBranchFormDTO = ConvertUtils.sourceToTarget(formDTO, ListPartyBranchFormDTO.class);
+ Result> result = govOrgOpenFeignClient.listPartyBranch(listPartyBranchFormDTO);
+ List resultList=result.getData();
+ if (result.success()) {
+ List list = ConvertUtils.sourceToTarget(resultList, PartyBranchListResultDTO.class);
+ return list;
+ } else {
+ logger.error(String.format("党支部列表查询失败入参:"), JSON.toJSONString(formDTO));
+ }
+ return new ArrayList<>();
+ }
+
+ @Override
+ public void deleteBranch(DeleteBranchFormDTO formDTO) {
+ Result customerPartyBranchDTOResult = govOrgOpenFeignClient.getPartyBranchById(formDTO.getPartyBranchId());
+ if (!customerPartyBranchDTOResult.success()||null==customerPartyBranchDTOResult.getData()) {
+ logger.error(String.format("查询党支部信息失败入参:%s",JSON.toJSONString(formDTO)));
+ return;
+ }else{
+ if (null != customerPartyBranchDTOResult.getData() && customerPartyBranchDTOResult.getData().getTotalPartyMember() > 0) {
+ throw new RenException(EpmetErrorCode.CANNOT_DELETE_PARTYB_RANCH.getCode());
+ }
+ }
+ Result delteResult=govOrgOpenFeignClient.deletePartyBranchById(formDTO.getPartyBranchId());
+ if(!delteResult.success()){
+ logger.error(String.format("删除党支部失败入参:%s",JSON.toJSONString(formDTO)));
+ }
+ }
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListPartyBranchFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListPartyBranchFormDTO.java
new file mode 100644
index 0000000000..ede50112e5
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListPartyBranchFormDTO.java
@@ -0,0 +1,29 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 党支部列表查询
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 16:27
+ */
+@Data
+public class ListPartyBranchFormDTO implements Serializable {
+ private static final long serialVersionUID = -5693132528876149747L;
+
+ /**
+ * 客户id
+ */
+ @NotBlank(message = "客户id不能为空")
+ private String customerId;
+
+ /**
+ * 网格id
+ */
+ @NotBlank(message = "网格id不能为空")
+ private String gridId;
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ListPartyBranchResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ListPartyBranchResultDTO.java
new file mode 100644
index 0000000000..ae84fd8030
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ListPartyBranchResultDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 党支部列表查询返参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 16:30
+ */
+@Data
+public class ListPartyBranchResultDTO implements Serializable {
+ private static final long serialVersionUID = 2306892144298853581L;
+ /**
+ * 支部id
+ */
+ private String partyBranchId;
+ /**
+ * 支部名称
+ */
+ private String partyBranchName;
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
index ff0a23f716..db86b3548b 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
@@ -1,16 +1,19 @@
package com.epmet.feign;
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.CustomerPartyBranchDTO;
+import com.epmet.dto.form.ListPartyBranchFormDTO;
import com.epmet.dto.result.ArticleGridResultDTO;
+import com.epmet.dto.result.ListPartyBranchResultDTO;
import com.epmet.dto.result.PublishAgencyListResultDTO;
+import com.epmet.feign.fallback.GovOrgOpenFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.CustomerAgencyDTO;
-import com.epmet.feign.fallback.GovOrgOpenFeignClientFallback;
+import java.util.List;
/**
* 本服务对外开放的API,其他服务通过引用此client调用该服务
@@ -18,14 +21,13 @@ import com.epmet.feign.fallback.GovOrgOpenFeignClientFallback;
* @author yinzuomei@elink-cn.com
* @date 2020/6/4 13:37
*/
-// @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgOpenFeignClientFallback.class, url =
-// "localhost:8092")
+// @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgOpenFeignClientFallback.class, url = "localhost:8092")
@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgOpenFeignClientFallback.class)
public interface GovOrgOpenFeignClient {
/**
* 根据Id查询agency
- *
+ *
* @param agencyId
* @return
*/
@@ -34,7 +36,7 @@ public interface GovOrgOpenFeignClient {
/**
* 根据staffId查询所属的组织机构
- *
+ *
* @param staffId
* @return
*/
@@ -58,4 +60,54 @@ public interface GovOrgOpenFeignClient {
**/
@PostMapping(value = "gov/org/customeragency/getpublishagencylist/{staffId}", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
Result getPublishAgencyList(@PathVariable("staffId") String staffId);
+
+ /**
+ * @param customerPartyBranchDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @author yinzuomei
+ * @description 添加党支部
+ * @Date 2020/6/17 13:36
+ **/
+ @PostMapping(value = "gov/org/customerpartybranch/save", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+ Result savePartyBranch(@RequestBody CustomerPartyBranchDTO customerPartyBranchDTO);
+
+ /**
+ * @param customerPartyBranchDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @author yinzuomei
+ * @description 修改党支部信息
+ * @Date 2020/6/17 15:31
+ **/
+ @PutMapping(value = "gov/org/customerpartybranch/update", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+ Result updatePartyBranch(@RequestBody CustomerPartyBranchDTO customerPartyBranchDTO);
+
+ /**
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @author yinzuomei
+ * @description 根据客户id、网格id查询党支部列表
+ * @Date 2020/6/17 16:28
+ **/
+ @PostMapping(value = "gov/org/customerpartybranch/listpartybranch", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+ Result> listPartyBranch(@RequestBody ListPartyBranchFormDTO formDTO);
+
+ /**
+ * @param partyBranchId
+ * @return com.epmet.commons.tools.utils.Result
+ * @author yinzuomei
+ * @description 根据党支部id,查询党支部信息
+ * @Date 2020/6/17 18:01
+ **/
+ @GetMapping(value = "gov/org/customerpartybranch/get/{id}")
+ Result getPartyBranchById(@PathVariable("id") String partyBranchId);
+
+ /**
+ * @return com.epmet.commons.tools.utils.Result
+ * @param partyBranchId
+ * @author yinzuomei
+ * @description 根据党支部id,删除党支部（存在党员的不允许删除）
+ * @Date 2020/6/17 18:08
+ **/
+ @GetMapping(value = "gov/org/customerpartybranch/delete/{id}")
+ Result deletePartyBranchById(@PathVariable("id") String partyBranchId);
}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
index 8f6c108a7d..2fffa2b13b 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
@@ -4,11 +4,16 @@ import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.ModuleUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.CustomerPartyBranchDTO;
+import com.epmet.dto.form.ListPartyBranchFormDTO;
import com.epmet.dto.result.ArticleGridResultDTO;
+import com.epmet.dto.result.ListPartyBranchResultDTO;
import com.epmet.dto.result.PublishAgencyListResultDTO;
import com.epmet.feign.GovOrgOpenFeignClient;
import org.springframework.stereotype.Component;
+import java.util.List;
+
/**
* 本服务对外开放的API,其他服务通过引用此client调用该服务
*
@@ -37,4 +42,29 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getPublishAgencyList", staffId);
}
+ @Override
+ public Result savePartyBranch(CustomerPartyBranchDTO customerPartyBranchDTO) {
+ return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "save", customerPartyBranchDTO);
+ }
+
+ @Override
+ public Result updatePartyBranch(CustomerPartyBranchDTO customerPartyBranchDTO) {
+ return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "update", customerPartyBranchDTO);
+ }
+
+ @Override
+ public Result> listPartyBranch(ListPartyBranchFormDTO formDTO) {
+ return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "listpartybranch", formDTO);
+ }
+
+ @Override
+ public Result getPartyBranchById(String partyBranchId) {
+ return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "get", partyBranchId);
+ }
+
+ @Override
+ public Result deletePartyBranchById(String partyBranchId) {
+ return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "deleteById", partyBranchId);
+ }
+
}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java
index 102b6e15b4..5935d18894 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java
@@ -17,15 +17,19 @@
package com.epmet.controller;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.CustomerPartyBranchDTO;
+import com.epmet.dto.form.ListPartyBranchFormDTO;
+import com.epmet.dto.result.ListPartyBranchResultDTO;
import com.epmet.excel.CustomerPartyBranchExcel;
import com.epmet.service.CustomerPartyBranchService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -55,21 +59,20 @@ public class CustomerPartyBranchController {
return new Result>().ok(page);
}
- @GetMapping("{id}")
+ @GetMapping("get/{id}")
public Result get(@PathVariable("id") String id){
CustomerPartyBranchDTO data = customerPartyBranchService.get(id);
return new Result().ok(data);
}
- @PostMapping
- public Result save(@RequestBody CustomerPartyBranchDTO dto){
+ @PostMapping("save")
+ public Result save(@RequestBody CustomerPartyBranchDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
- customerPartyBranchService.save(dto);
- return new Result();
+ return new Result().ok(customerPartyBranchService.save(dto));
}
- @PutMapping
+ @PutMapping("update")
public Result update(@RequestBody CustomerPartyBranchDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -85,10 +88,32 @@ public class CustomerPartyBranchController {
return new Result();
}
+ @GetMapping("delete/{id}")
+ public Result deleteById(@PathVariable("id") String id){
+ CustomerPartyBranchDTO data = customerPartyBranchService.get(id);
+ if(null!=data&&data.getTotalPartyMember()>0){
+ throw new RenException(EpmetErrorCode.CANNOT_DELETE_PARTYB_RANCH.getCode());
+ }
+ customerPartyBranchService.deleteById(id);
+ return new Result();
+ }
+
@GetMapping("export")
public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
List list = customerPartyBranchService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, CustomerPartyBranchExcel.class);
}
+ /**
+ * @return com.epmet.commons.tools.utils.Result>
+ * @param formDTO
+ * @author yinzuomei
+ * @description 党支部列表查询,供gov-grid服务调用
+ * @Date 2020/6/17 16:33
+ **/
+ @PostMapping("listpartybranch")
+ public Result> listpartybranch(@RequestBody ListPartyBranchFormDTO formDTO){
+ ValidatorUtils.validateEntity(formDTO);
+ return new Result>().ok(customerPartyBranchService.listpartybranch(formDTO));
+ }
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerPartyBranchDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerPartyBranchDao.java
index 1a29c4df2f..100ddbc86e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerPartyBranchDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerPartyBranchDao.java
@@ -18,9 +18,13 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.ListPartyBranchFormDTO;
+import com.epmet.dto.result.ListPartyBranchResultDTO;
import com.epmet.entity.CustomerPartyBranchEntity;
import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
+
/**
* 党支部信息
*
@@ -29,5 +33,6 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface CustomerPartyBranchDao extends BaseDao {
-
+ //根据客户id、网格id查询党支部列表
+ List selectListPartyBranchResultDTO(ListPartyBranchFormDTO formDTO);
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerPartyBranchService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerPartyBranchService.java
index 8b497b0f1c..d25e849751 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerPartyBranchService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerPartyBranchService.java
@@ -20,6 +20,8 @@ package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.CustomerPartyBranchDTO;
+import com.epmet.dto.form.ListPartyBranchFormDTO;
+import com.epmet.dto.result.ListPartyBranchResultDTO;
import com.epmet.entity.CustomerPartyBranchEntity;
import java.util.List;
@@ -71,7 +73,7 @@ public interface CustomerPartyBranchService extends BaseService
+ * @param formDTO
+ * @author yinzuomei
+ * @description 党支部列表查询,供gov-grid服务调用
+ * @Date 2020/6/17 16:33
+ **/
+ List listpartybranch(ListPartyBranchFormDTO formDTO);
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerPartyBranchServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerPartyBranchServiceImpl.java
index ae49820a11..07ae09a79a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerPartyBranchServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerPartyBranchServiceImpl.java
@@ -20,11 +20,13 @@ package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.dao.CustomerPartyBranchDao;
import com.epmet.dto.CustomerPartyBranchDTO;
+import com.epmet.dto.form.ListPartyBranchFormDTO;
+import com.epmet.dto.result.ListPartyBranchResultDTO;
import com.epmet.entity.CustomerPartyBranchEntity;
import com.epmet.redis.CustomerPartyBranchRedis;
import com.epmet.service.CustomerPartyBranchService;
@@ -82,9 +84,10 @@ public class CustomerPartyBranchServiceImpl extends BaseServiceImpl listpartybranch(ListPartyBranchFormDTO formDTO) {
+ return baseDao.selectListPartyBranchResultDTO(formDTO);
+ }
+
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerPartyBranchDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerPartyBranchDao.xml
index 024a2f2945..a7d2b9338f 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerPartyBranchDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerPartyBranchDao.xml
@@ -18,5 +18,19 @@
+ SELECT
+ id as partyBranchId,
+ PARTY_BRANCH_NAME as partyBranchName
+ FROM
+ customer_party_branch
+ WHERE
+ DEL_FLAG = '0'
+ AND CUSTOMER_ID =#{customerId}
+ AND GRID_ID = #{gridId}
+ ORDER BY
+ CREATED_TIME DESC
+
\ No newline at end of file
From 1168041aecf85775981c42f24eb58f1202e67724 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 18 Jun 2020 11:29:10 +0800
Subject: [PATCH 05/46] =?UTF-8?q?=E6=94=AF=E9=83=A8=E7=AE=A1=E7=90=86v2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tools/exception/EpmetErrorCode.java | 8 +-
.../validator/IdCardNoValidatorUtils.java | 19 +++
...FormDTO.java => PartyBranchIdFormDTO.java} | 7 +-
.../form/SaveOrUpdateParyMemberFormDTO.java | 42 +++++++
.../dto/result/PartyBranchInfoResultDTO.java | 41 +++++++
.../dto/result/PartyMemberIdResultDTO.java | 17 +++
.../dto/result/PartyMemberInfoResultDTO.java | 30 +++++
.../PartyBranchManageController.java | 74 ++++++++++--
.../service/PartyBranchManageService.java | 44 ++++++-
.../impl/PartyBranchManageServiceImpl.java | 112 ++++++++++++++++--
.../com/epmet/dto/CustomerPartyBranchDTO.java | 12 +-
.../epmet/dto/result/GridInfoResultDTO.java | 10 ++
.../epmet/feign/GovOrgOpenFeignClient.java | 11 ++
.../GovOrgOpenFeignClientFallback.java | 5 +
.../service/impl/CustomerGridServiceImpl.java | 3 +-
.../impl/CustomerPartyBranchServiceImpl.java | 21 +++-
.../form/PartyMemberBaseInfoAddFormDTO.java | 64 ++++++++++
.../result/PartymemberBaseInfoResultDTO.java | 31 +++++
.../feign/ResiPartyMemberOpenFeignClient.java | 41 ++++++-
...esiPartyMemberOpenFeignClientFallback.java | 23 ++++
.../PartymemberBaseInfoController.java | 30 ++++-
.../dao/PartymemberAuthRecordDao.java | 10 +-
.../dao/PartymemberBaseInfoDao.java | 19 +++
.../service/PartymemberBaseInfoService.java | 20 ++++
.../impl/PartymemberBaseInfoServiceImpl.java | 68 +++++++++++
.../partymember/PartymemberAuthRecordDao.xml | 8 +-
.../partymember/PartymemberBaseInfoDao.xml | 25 ++++
27 files changed, 763 insertions(+), 32 deletions(-)
create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java
rename epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/{DeleteBranchFormDTO.java => PartyBranchIdFormDTO.java} (76%)
create mode 100644 epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/SaveOrUpdateParyMemberFormDTO.java
create mode 100644 epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchInfoResultDTO.java
create mode 100644 epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberIdResultDTO.java
create mode 100644 epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberInfoResultDTO.java
create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/PartyMemberBaseInfoAddFormDTO.java
create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartymemberBaseInfoResultDTO.java
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
index e9828f104f..dbd4c2f6d8 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
@@ -37,8 +37,14 @@ public enum EpmetErrorCode {
MOBILE_GET_CODE_ERROR(8104,"获取验证码失败"),
MESSAGE_SMS_SEND_ERROR(8105, "短信发送失败"),
NOT_DEL_GRID(8106,"该网格存在工作人员，不允许删除"),
+
ORG_IS_NOT_NULL(8107,"党组织关系不能为空"),
- CANNOT_DELETE_PARTYB_RANCH(8108,"当前支部存在党员，不允许删除"),
+ CANNOT_DELETE_PARTY_BRANCH(8108,"当前支部存在党员，不允许删除"),
+ IDCARDNO_ALREADY_EXITS(8109,"系统已存在相同身份证号码，请重新输入"),
+ IDCARDNO_ERROR(8110,"身份证号格式错误，请重新输入"),
+ CANNOT_DELETE_PARTY_MEMBER(8111,"该用户已注册党员，不允许删除"),
+
+
CANNOT_AUDIT_WARM(8201, "请完善居民信息"),
NOT_DEL_AGENCY(8202, "该机关存在下级机关，不允许删除"),
NOT_DEL_AGENCY_PER(8205, "该机关存在工作人员，不允许删除"),
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java
new file mode 100644
index 0000000000..cc93d9f3a8
--- /dev/null
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java
@@ -0,0 +1,19 @@
+package com.epmet.commons.tools.validator;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/18 9:59
+ */
+public class IdCardNoValidatorUtils {
+ //判断身份证号是否正确
+ public static boolean checkIsIdCardNo(String idCardNo){
+ return true;
+ }
+
+ //根据身份证号判断性别
+ public static String getGender(String idCard) {
+ return "1";
+ }
+}
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/DeleteBranchFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchIdFormDTO.java
similarity index 76%
rename from epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/DeleteBranchFormDTO.java
rename to epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchIdFormDTO.java
index 0e3e5f5ea2..5009842a2c 100644
--- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/DeleteBranchFormDTO.java
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchIdFormDTO.java
@@ -6,15 +6,18 @@ import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
- * 描述一下
+ * 党支部id
*
* @author yinzuomei@elink-cn.com
* @date 2020/6/17 17:02
*/
@Data
-public class DeleteBranchFormDTO implements Serializable {
+public class PartyBranchIdFormDTO implements Serializable {
private static final long serialVersionUID = 5321430865413383354L;
+ /**
+ * 党支部id
+ */
@NotBlank(message = "党支部id不能为空")
private String partyBranchId;
}
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/SaveOrUpdateParyMemberFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/SaveOrUpdateParyMemberFormDTO.java
new file mode 100644
index 0000000000..999cfd34b1
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/SaveOrUpdateParyMemberFormDTO.java
@@ -0,0 +1,42 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 新增、修改党员入参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 22:15
+ */
+@Data
+public class SaveOrUpdateParyMemberFormDTO implements Serializable {
+ private static final long serialVersionUID = -6896349967046364830L;
+
+ public interface UpdatePatyMemberGroup extends CustomerClientShowGroup {
+ }
+
+ public interface SavePatyMemberGroup extends CustomerClientShowGroup {
+ }
+
+ public interface AddUserShowGroup extends CustomerClientShowGroup {
+ }
+
+ @NotBlank(message = "党支部id不能为空", groups = {SavePatyMemberGroup.class})
+ private String partyBranchId;
+
+ @NotBlank(message = "姓名不能为空", groups = {AddUserShowGroup.class})
+ private String name;
+
+ @NotBlank(message = "手机号不能为空", groups = {AddUserShowGroup.class})
+ private String idCard;
+
+ @NotBlank(message = "身份证不能为空", groups = {AddUserShowGroup.class})
+ private String mobile;
+
+ @NotBlank(message = "党员id不能为空", groups = {UpdatePatyMemberGroup.class})
+ private String partyMemberId;
+}
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchInfoResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchInfoResultDTO.java
new file mode 100644
index 0000000000..dad717fc22
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchInfoResultDTO.java
@@ -0,0 +1,41 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 党支部详情信息返参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 21:45
+ */
+@Data
+public class PartyBranchInfoResultDTO implements Serializable {
+ private static final long serialVersionUID = 1184531127569286576L;
+
+ /**
+ * 党支部id
+ */
+ private String partyBranchId;
+
+ /**
+ * 党支部名称
+ */
+ private String partyBranchName;
+
+ /**
+ * 党支部概要
+ */
+ private String profile;
+
+ /**
+ * 党支部所属网格名称
+ */
+ private String gridName;
+
+ /**
+ * 党支部所属网格id
+ */
+ private String gridId;
+}
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberIdResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberIdResultDTO.java
new file mode 100644
index 0000000000..09f2e6b1a9
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberIdResultDTO.java
@@ -0,0 +1,17 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 党员id:添加党员后返参、修改党员后返参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 22:13
+ */
+@Data
+public class PartyMemberIdResultDTO implements Serializable {
+ private static final long serialVersionUID = 7467454908831748131L;
+ private String partyMemberId;
+}
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberInfoResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberInfoResultDTO.java
new file mode 100644
index 0000000000..7f812531c5
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberInfoResultDTO.java
@@ -0,0 +1,30 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 党员列表返参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/18 10:04
+ */
+@Data
+public class PartyMemberInfoResultDTO implements Serializable {
+ private static final long serialVersionUID = 627412197353847930L;
+ /**
+ * 党员id
+ */
+ private String partyMemberId;
+
+ /**
+ * 姓名
+ */
+ private String name;
+
+ /**
+ * 性别1男2女0未知
+ */
+ private String gender;
+}
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java
index edb06910f7..74fb00d27c 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java
@@ -2,12 +2,8 @@ package com.epmet.controller;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.form.DeleteBranchFormDTO;
-import com.epmet.dto.form.PartyBranchAddFormDTO;
-import com.epmet.dto.form.PartyBranchEditFormDTO;
-import com.epmet.dto.form.PartyBranchListFormDTO;
-import com.epmet.dto.result.PartyBranchAddResultDTO;
-import com.epmet.dto.result.PartyBranchListResultDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.*;
import com.epmet.service.PartyBranchManageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -73,16 +69,76 @@ public class PartyBranchManageController {
}
/**
- * @return com.epmet.commons.tools.utils.Result
* @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
* @author yinzuomei
* @description 删除党支部
* @Date 2020/6/17 18:23
**/
@PostMapping("delete")
- public Result deleteBranch(@RequestBody DeleteBranchFormDTO formDTO) {
+ public Result deleteBranch(@RequestBody PartyBranchIdFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
- partyBranchManageService.deleteBranch(formDTO);
+ partyBranchManageService.deleteBranch(formDTO.getPartyBranchId());
return new Result();
}
+
+ /**
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @author yinzuomei
+ * @description 5、党支部详情信息查询
+ * @Date 2020/6/17 21:49
+ **/
+ @PostMapping("info")
+ public Result queryPartyBranchInfo(@RequestBody PartyBranchIdFormDTO formDTO) {
+ ValidatorUtils.validateEntity(formDTO);
+ PartyBranchInfoResultDTO partyBranchInfoResultDTO = partyBranchManageService.queryPartyBranchInfo(formDTO.getPartyBranchId());
+ return new Result().ok(partyBranchInfoResultDTO);
+ }
+
+ /**
+ * @return com.epmet.commons.tools.utils.Result
+ * @param formDTO
+ * @author yinzuomei
+ * @description 6、党员列表查询
+ * @Date 2020/6/18 0:17
+ **/
+ @PostMapping("/partymember/list")
+ public Result> listPartyMember(@RequestBody PartyBranchIdFormDTO formDTO){
+ ValidatorUtils.validateEntity(formDTO);
+ List list=partyBranchManageService.listPartyMember(formDTO.getPartyBranchId());
+ return new Result>().ok(list);
+ }
+
+ /**
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @author yinzuomei
+ * @description 7、添加党员
+ * @Date 2020/6/17 22:25
+ **/
+ @PostMapping("/partymember/add")
+ public Result addPartyMember(@RequestBody SaveOrUpdateParyMemberFormDTO formDTO) {
+ ValidatorUtils.validateEntity(formDTO, SaveOrUpdateParyMemberFormDTO.AddUserShowGroup.class
+ , SaveOrUpdateParyMemberFormDTO.SavePatyMemberGroup.class);
+ PartyMemberIdResultDTO partyMemberIdResultDTO = new PartyMemberIdResultDTO();
+ partyMemberIdResultDTO.setPartyMemberId(partyBranchManageService.addPartyMember(formDTO));
+ return new Result().ok(partyMemberIdResultDTO);
+ }
+
+ /**
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @author yinzuomei
+ * @description 8、编辑党员
+ * @Date 2020/6/17 23:29
+ **/
+ @PostMapping("/partymember/edit")
+ public Result editPartyMember(@RequestBody SaveOrUpdateParyMemberFormDTO formDTO) {
+ ValidatorUtils.validateEntity(formDTO, SaveOrUpdateParyMemberFormDTO.AddUserShowGroup.class
+ , SaveOrUpdateParyMemberFormDTO.UpdatePatyMemberGroup.class);
+ PartyMemberIdResultDTO partyMemberIdResultDTO = new PartyMemberIdResultDTO();
+ partyMemberIdResultDTO.setPartyMemberId(partyBranchManageService.editPartyMember(formDTO));
+ return new Result().ok(partyMemberIdResultDTO);
+ }
}
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/PartyBranchManageService.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/PartyBranchManageService.java
index dae0c060d7..c9693eddb4 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/PartyBranchManageService.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/PartyBranchManageService.java
@@ -1,11 +1,13 @@
package com.epmet.service;
-import com.epmet.dto.form.DeleteBranchFormDTO;
import com.epmet.dto.form.PartyBranchAddFormDTO;
import com.epmet.dto.form.PartyBranchEditFormDTO;
import com.epmet.dto.form.PartyBranchListFormDTO;
+import com.epmet.dto.form.SaveOrUpdateParyMemberFormDTO;
import com.epmet.dto.result.PartyBranchAddResultDTO;
+import com.epmet.dto.result.PartyBranchInfoResultDTO;
import com.epmet.dto.result.PartyBranchListResultDTO;
+import com.epmet.dto.result.PartyMemberInfoResultDTO;
import java.util.List;
@@ -45,10 +47,46 @@ public interface PartyBranchManageService {
/**
* @return void
- * @param formDTO
+ * @param partyBranchId
* @author yinzuomei
* @description 删除党支部
* @Date 2020/6/17 17:04
**/
- void deleteBranch(DeleteBranchFormDTO formDTO);
+ void deleteBranch(String partyBranchId);
+
+ /**
+ * @return com.epmet.dto.result.PartyBranchInfoResultDTO
+ * @param partyBranchId
+ * @author yinzuomei
+ * @description 5、党支部详情信息查询
+ * @Date 2020/6/17 21:49
+ **/
+ PartyBranchInfoResultDTO queryPartyBranchInfo(String partyBranchId);
+
+ /**
+ * @return java.util.List
+ * @param partyBranchId
+ * @author yinzuomei
+ * @description 党员列表查询
+ * @Date 2020/6/18 10:06
+ **/
+ List listPartyMember(String partyBranchId);
+
+ /**
+ * @return java.lang.String
+ * @param formDTO
+ * @author yinzuomei
+ * @description 7、添加党员
+ * @Date 2020/6/17 22:26
+ **/
+ String addPartyMember(SaveOrUpdateParyMemberFormDTO formDTO);
+
+ /**
+ * @return java.lang.String
+ * @param formDTO
+ * @author yinzuomei
+ * @description 8、编辑党员
+ * @Date 2020/6/17 23:29
+ **/
+ String editPartyMember(SaveOrUpdateParyMemberFormDTO formDTO);
}
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/PartyBranchManageServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/PartyBranchManageServiceImpl.java
index fd6c6c4d66..ae2ea9469c 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/PartyBranchManageServiceImpl.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/PartyBranchManageServiceImpl.java
@@ -7,11 +7,14 @@ import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.CustomerPartyBranchDTO;
import com.epmet.dto.form.*;
-import com.epmet.dto.result.ListPartyBranchResultDTO;
-import com.epmet.dto.result.PartyBranchAddResultDTO;
-import com.epmet.dto.result.PartyBranchListResultDTO;
+import com.epmet.dto.result.*;
import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
+import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
import com.epmet.service.PartyBranchManageService;
+import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +34,8 @@ public class PartyBranchManageServiceImpl implements PartyBranchManageService {
private Logger logger = LogManager.getLogger(PartyBranchManageServiceImpl.class);
@Autowired
private GovOrgOpenFeignClient govOrgOpenFeignClient;
+ @Autowired
+ private ResiPartyMemberOpenFeignClient resiPartyMemberOpenFeignClient;
@Override
public PartyBranchAddResultDTO addPartyBranch(PartyBranchAddFormDTO formDTO) {
@@ -71,19 +76,108 @@ public class PartyBranchManageServiceImpl implements PartyBranchManageService {
}
@Override
- public void deleteBranch(DeleteBranchFormDTO formDTO) {
- Result customerPartyBranchDTOResult = govOrgOpenFeignClient.getPartyBranchById(formDTO.getPartyBranchId());
+ public void deleteBranch(String partyBranchId) {
+ Result customerPartyBranchDTOResult = govOrgOpenFeignClient.getPartyBranchById(partyBranchId);
if (!customerPartyBranchDTOResult.success()||null==customerPartyBranchDTOResult.getData()) {
- logger.error(String.format("查询党支部信息失败入参:%s",JSON.toJSONString(formDTO)));
+ logger.error(String.format("查询党支部信息失败入参:partyBranchId=%s",partyBranchId));
return;
}else{
if (null != customerPartyBranchDTOResult.getData() && customerPartyBranchDTOResult.getData().getTotalPartyMember() > 0) {
- throw new RenException(EpmetErrorCode.CANNOT_DELETE_PARTYB_RANCH.getCode());
+ throw new RenException(EpmetErrorCode.CANNOT_DELETE_PARTY_BRANCH.getCode());
}
}
- Result delteResult=govOrgOpenFeignClient.deletePartyBranchById(formDTO.getPartyBranchId());
+ Result delteResult=govOrgOpenFeignClient.deletePartyBranchById(partyBranchId);
if(!delteResult.success()){
- logger.error(String.format("删除党支部失败入参:%s",JSON.toJSONString(formDTO)));
+ logger.error(String.format("删除党支部失败入参:partyBranchId=%s",partyBranchId));
+ }
+ }
+
+ @Override
+ public PartyBranchInfoResultDTO queryPartyBranchInfo(String partyBranchId) {
+ PartyBranchInfoResultDTO partyBranchInfo = new PartyBranchInfoResultDTO();
+ Result customerPartyBranchDTOResult = govOrgOpenFeignClient.getPartyBranchById(partyBranchId);
+ if (!customerPartyBranchDTOResult.success() || null == customerPartyBranchDTOResult.getData()) {
+ logger.error(String.format("党支部详情信息查询异常,partyBranchId=%s", partyBranchId));
+ return partyBranchInfo;
+ }
+ partyBranchInfo.setPartyBranchId(partyBranchId);
+ partyBranchInfo.setPartyBranchName(customerPartyBranchDTOResult.getData().getPartyBranchName());
+ partyBranchInfo.setProfile(customerPartyBranchDTOResult.getData().getProfile());
+ partyBranchInfo.setGridId(customerPartyBranchDTOResult.getData().getGridId());
+ Result gridInfoResult = govOrgOpenFeignClient.queryGridInfo(customerPartyBranchDTOResult.getData().getGridId());
+ if (gridInfoResult.success() && null != gridInfoResult.getData() && StringUtils.isNotBlank(gridInfoResult.getData().getParentAgencyName())) {
+ partyBranchInfo.setGridName(String.format("%s-%s", gridInfoResult.getData().getParentAgencyName(), gridInfoResult.getData().getGridName()));
+ } else {
+ logger.error(String.format("查询网格基本信息失败,gridId=%s", customerPartyBranchDTOResult.getData().getGridId()));
}
+ return partyBranchInfo;
+ }
+
+ @Override
+ public List listPartyMember(String partyBranchId) {
+ Result> result = resiPartyMemberOpenFeignClient.listPartyMemberBaseInfo(partyBranchId);
+ if (result.success()) {
+ List list = ConvertUtils.sourceToTarget(result.getData(), PartyMemberInfoResultDTO.class);
+ return list;
+ }
+ logger.error("党员列表查询失败");
+ return new ArrayList<>();
+ }
+
+ @Override
+ public String addPartyMember(SaveOrUpdateParyMemberFormDTO formDTO) {
+ //1、查询党支部信息
+ Result customerPartyBranchResult = govOrgOpenFeignClient.getPartyBranchById(formDTO.getPartyBranchId());
+ if (!customerPartyBranchResult.success() || null == customerPartyBranchResult.getData()) {
+ throw new RenException("党支部信息获取失败");
+ }
+ //2、构造党员入参
+ CustomerPartyBranchDTO customerPartyBranch = customerPartyBranchResult.getData();
+ PartyMemberBaseInfoAddFormDTO partyMemberBaseInfoAddFormDTO = this.getPartyMemberBaseInfoAddFormDTO(formDTO, customerPartyBranch);
+ Result result = resiPartyMemberOpenFeignClient.addPartyMemberBaseInfo(partyMemberBaseInfoAddFormDTO);
+ //3、党支部总人数+1
+ if (result.success() && StringUtils.isNotBlank(result.getData())) {
+ //党支部总人数+1
+ customerPartyBranch.setTotalPartyMember(customerPartyBranch.getTotalPartyMember() + 1);
+ Result updatePartyBranchResult = govOrgOpenFeignClient.updatePartyBranch(customerPartyBranch);
+ if (updatePartyBranchResult.success()) {
+ logger.info(String.format("党支部(%s)总人数+1", formDTO.getPartyBranchId()));
+ }
+ } else {
+ logger.error("添加党员异常");
+ throw new RenException(result.getCode());
+ }
+ return result.getData();
+ }
+
+ @Override
+ public String editPartyMember(SaveOrUpdateParyMemberFormDTO formDTO) {
+ PartymemberBaseInfoDTO partymemberBaseInfoDTO = new PartymemberBaseInfoDTO();
+ partymemberBaseInfoDTO.setIdCard(formDTO.getIdCard().trim());
+ partymemberBaseInfoDTO.setName(formDTO.getName().trim());
+ partymemberBaseInfoDTO.setMobile(formDTO.getMobile().trim());
+ partymemberBaseInfoDTO.setId(formDTO.getPartyMemberId());
+ Result updateResult = resiPartyMemberOpenFeignClient.update(partymemberBaseInfoDTO);
+ if (updateResult.success() && StringUtils.isNotBlank(updateResult.getData())) {
+ logger.info("修改党员信息成功");
+ return updateResult.getData();
+ }else{
+ logger.error("修改党员信息失败");
+ throw new RenException(updateResult.getCode());
+ }
+ }
+
+ private PartyMemberBaseInfoAddFormDTO getPartyMemberBaseInfoAddFormDTO(SaveOrUpdateParyMemberFormDTO formDTO,
+ CustomerPartyBranchDTO customerPartyBranchDTO) {
+ PartyMemberBaseInfoAddFormDTO partyMemberBaseInfoAddFormDTO=new PartyMemberBaseInfoAddFormDTO();
+ partyMemberBaseInfoAddFormDTO.setBranchId(formDTO.getPartyBranchId());
+ partyMemberBaseInfoAddFormDTO.setIdCard(formDTO.getIdCard().trim());
+ partyMemberBaseInfoAddFormDTO.setMobile(formDTO.getMobile().trim());
+ partyMemberBaseInfoAddFormDTO.setName(formDTO.getName().trim());
+
+ partyMemberBaseInfoAddFormDTO.setBranch(customerPartyBranchDTO.getPartyBranchName());
+ partyMemberBaseInfoAddFormDTO.setOrganization(customerPartyBranchDTO.getAgencyName());
+ partyMemberBaseInfoAddFormDTO.setCustomerId(customerPartyBranchDTO.getCustomerId());
+ return partyMemberBaseInfoAddFormDTO;
}
}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerPartyBranchDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerPartyBranchDTO.java
index 88f0afc598..960e01450e 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerPartyBranchDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerPartyBranchDTO.java
@@ -17,9 +17,10 @@
package com.epmet.dto;
+import lombok.Data;
+
import java.io.Serializable;
import java.util.Date;
-import lombok.Data;
/**
@@ -93,4 +94,13 @@ public class CustomerPartyBranchDTO implements Serializable {
*/
private Date updatedTime;
+ /**
+ * 网格所属机关id
+ */
+ private String agencyId;
+
+ /**
+ * 网格所属机关名字
+ */
+ private String agencyName;
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInfoResultDTO.java
index fff7b43caf..83bf82bfbf 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInfoResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInfoResultDTO.java
@@ -77,5 +77,15 @@ public class GridInfoResultDTO implements Serializable {
* 省级组织名称
*/
private String proviceName;
+
+ /**
+ * 网格所属机关id
+ */
+ private String parentAgencyId;
+
+ /**
+ * 网格所属机关名称
+ */
+ private String parentAgencyName;
}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
index db86b3548b..4d3c71959b 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
@@ -6,6 +6,7 @@ import com.epmet.dto.CustomerAgencyDTO;
import com.epmet.dto.CustomerPartyBranchDTO;
import com.epmet.dto.form.ListPartyBranchFormDTO;
import com.epmet.dto.result.ArticleGridResultDTO;
+import com.epmet.dto.result.GridInfoResultDTO;
import com.epmet.dto.result.ListPartyBranchResultDTO;
import com.epmet.dto.result.PublishAgencyListResultDTO;
import com.epmet.feign.fallback.GovOrgOpenFeignClientFallback;
@@ -110,4 +111,14 @@ public interface GovOrgOpenFeignClient {
**/
@GetMapping(value = "gov/org/customerpartybranch/delete/{id}")
Result deletePartyBranchById(@PathVariable("id") String partyBranchId);
+
+ /**
+ * @param gridId
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 根据网格id查询所属组织信息
+ * @Date 2020/4/26 23:16
+ **/
+ @GetMapping("/gov/org/customergrid/getGridInfo/{gridId}")
+ Result queryGridInfo(@PathVariable("gridId") String gridId);
}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
index 2fffa2b13b..8de4fa49f9 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
@@ -7,6 +7,7 @@ import com.epmet.dto.CustomerAgencyDTO;
import com.epmet.dto.CustomerPartyBranchDTO;
import com.epmet.dto.form.ListPartyBranchFormDTO;
import com.epmet.dto.result.ArticleGridResultDTO;
+import com.epmet.dto.result.GridInfoResultDTO;
import com.epmet.dto.result.ListPartyBranchResultDTO;
import com.epmet.dto.result.PublishAgencyListResultDTO;
import com.epmet.feign.GovOrgOpenFeignClient;
@@ -67,4 +68,8 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "deleteById", partyBranchId);
}
+ @Override
+ public Result queryGridInfo(String gridId) {
+ return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridInfo",gridId);
+ }
}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index bcc4ecf11c..00436e9b59 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -27,7 +27,6 @@ import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.utils.ModuleUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.constant.CustomerGridConstant;
import com.epmet.dao.CustomerAgencyDao;
@@ -452,6 +451,8 @@ public class CustomerGridServiceImpl extends BaseServiceImpl page(Map params) {
@@ -79,7 +87,18 @@ public class CustomerPartyBranchServiceImpl extends BaseServiceImpl update(@RequestBody PartymemberBaseInfoDTO dto);
+
+ /**
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @author yinzuomei
+ * @description 添加党员
+ * @Date 2020/6/17 23:00
+ **/
+ @PostMapping(value = "/resi/partymember/partymemberbaseinfo/addPartyMemberBaseInfo", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+ Result addPartyMemberBaseInfo(@RequestBody PartyMemberBaseInfoAddFormDTO formDTO);
+
+ /**
+ * @return com.epmet.commons.tools.utils.Result>
+ * @param partyBranchId
+ * @author yinzuomei
+ * @description 根据党支部id,查询党员列表
+ * @Date 2020/6/18 10:12
+ **/
+ @GetMapping(value = "resi/partymember/partymemberbaseinfo/listPartyMemberBaseInfo/{partyBranchId}")
+ Result> listPartyMemberBaseInfo(@PathVariable("partyBranchId") String partyBranchId);
}
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java
index cdcbbcbc92..af3e36dd79 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java
@@ -1,8 +1,16 @@
package com.epmet.resi.partymember.feign.fallback;
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
import org.springframework.stereotype.Component;
+import java.util.List;
+
/**
* 本服务对外开放的API,其他服务通过引用此client调用该服务
*
@@ -11,4 +19,19 @@ import org.springframework.stereotype.Component;
*/
@Component
public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOpenFeignClient {
+
+ @Override
+ public Result update(PartymemberBaseInfoDTO partymemberBaseInfoDTO) {
+ return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "update", partymemberBaseInfoDTO);
+ }
+
+ @Override
+ public Result addPartyMemberBaseInfo(PartyMemberBaseInfoAddFormDTO formDTO) {
+ return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "addPartyMemberBaseInfo", formDTO);
+ }
+
+ @Override
+ public Result> listPartyMemberBaseInfo(String partyBranchId) {
+ return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "listPartyMemberBaseInfo", partyBranchId);
+ }
}
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java
index 438594f0b3..7595e5d6c5 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java
@@ -28,15 +28,16 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.modules.partymember.excel.PartymemberBaseInfoExcel;
import com.epmet.modules.partymember.service.PartymemberBaseInfoService;
import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
import com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO;
import com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
import java.util.List;
import java.util.Map;
@@ -121,4 +122,31 @@ public class PartymemberBaseInfoController {
ValidatorUtils.validateEntity(formDTO);
return partymemberBaseInfoService.audited(formDTO);
}
+
+ /**
+ * @return com.epmet.commons.tools.utils.Result
+ * @param formDTO
+ * @author yinzuomei
+ * @description 添加党员
+ * @Date 2020/6/17 22:47
+ **/
+ @PostMapping("addPartyMemberBaseInfo")
+ public Result addPartyMemberBaseInfo(@RequestBody PartyMemberBaseInfoAddFormDTO formDTO){
+ ValidatorUtils.validateEntity(formDTO);
+ String partyMemberId=partymemberBaseInfoService.addPartyMemberBaseInfo(formDTO);
+ return new Result().ok(partyMemberId);
+ }
+
+ /**
+ * @param partyBranchId
+ * @return com.epmet.commons.tools.utils.Result>
+ * @author yinzuomei
+ * @description 根据党支部id, 查询党员列表
+ * @Date 2020/6/18 10:18
+ **/
+ @GetMapping("listPartyMemberBaseInfo/{partyBranchId}")
+ public Result> listPartyMemberBaseInfo(@PathVariable("partyBranchId") String partyBranchId) {
+ return new Result>().ok(partymemberBaseInfoService.listPartyMemberBaseInfo(partyBranchId));
+ }
+
}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberAuthRecordDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberAuthRecordDao.java
index d9213b6fda..b49ca7552f 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberAuthRecordDao.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberAuthRecordDao.java
@@ -29,5 +29,13 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface PartymemberAuthRecordDao extends BaseDao {
-
+
+ /**
+ * @return com.epmet.modules.partymember.entity.PartymemberAuthRecordEntity
+ * @param partymemberBaseInfoId
+ * @author yinzuomei
+ * @description 根据党员库id,查询党员认证信息
+ * @Date 2020/6/18 0:04
+ **/
+ PartymemberAuthRecordEntity selectByPartyMemberBaseInfoId(String partymemberBaseInfoId);
}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberBaseInfoDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberBaseInfoDao.java
index 6c614045fb..d4a8931124 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberBaseInfoDao.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberBaseInfoDao.java
@@ -25,6 +25,7 @@ import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberForm
import com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO;
import com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -78,4 +79,22 @@ public interface PartymemberBaseInfoDao extends BaseDao selectListReviewedParyMember(ReviewedParyMemberFormDTO formDTO);
+
+ /**
+ * @return com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity
+ * @param idCard
+ * @author yinzuomei
+ * @description 根据身份证号查询党员库
+ * @Date 2020/6/17 23:49
+ **/
+ PartymemberBaseInfoEntity selectByIdCard(@Param("idCard") String idCard,@Param("id")String id);
+
+ /**
+ * @return java.util.List
+ * @param partyBranchId
+ * @author yinzuomei
+ * @description 根据党支部id，查询党员列表
+ * @Date 2020/6/18 11:05
+ **/
+ List selectListPartyMemberBaseInfo(String partyBranchId);
}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberBaseInfoService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberBaseInfoService.java
index e317427c92..056833ac1c 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberBaseInfoService.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberBaseInfoService.java
@@ -24,8 +24,10 @@ import com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity;
import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmAutoDTO;
import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
import com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO;
import com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO;
@@ -125,4 +127,22 @@ public interface PartymemberBaseInfoService extends BaseService> audited(ReviewedParyMemberFormDTO formDTO);
+
+ /**
+ * @return java.lang.String
+ * @param formDTO
+ * @author yinzuomei
+ * @description 添加党员
+ * @Date 2020/6/17 22:50
+ **/
+ String addPartyMemberBaseInfo(PartyMemberBaseInfoAddFormDTO formDTO);
+
+ /**
+ * @return java.util.List
+ * @param partyBranchId
+ * @author yinzuomei
+ * @description 根据党支部id,查询党员列表
+ * @Date 2020/6/18 10:17
+ **/
+ List listPartyMemberBaseInfo(String partyBranchId);
}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java
index f91dc23fe7..67c26fcbf6 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java
@@ -22,24 +22,33 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.IdCardNoValidatorUtils;
+import com.epmet.commons.tools.validator.PhoneValidatorUtils;
import com.epmet.constant.PartyMemberConstant;
import com.epmet.dto.form.UserResiInfoListFormDTO;
import com.epmet.dto.result.GridInfoResultDTO;
import com.epmet.dto.result.UserResiInfoResultDTO;
import com.epmet.modules.feign.EpmetUserFeignClient;
import com.epmet.modules.feign.GovOrgFeignClient;
+import com.epmet.modules.partymember.dao.PartymemberAuthRecordDao;
import com.epmet.modules.partymember.dao.PartymemberBaseInfoDao;
import com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity;
import com.epmet.modules.partymember.redis.PartymemberBaseInfoRedis;
+import com.epmet.modules.partymember.service.PartyBranchMembersService;
import com.epmet.modules.partymember.service.PartymemberBaseInfoService;
+import com.epmet.resi.partymember.dto.partymember.PartyBranchMembersDTO;
import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmAutoDTO;
import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
import com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO;
import com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO;
import info.debatty.java.stringsimilarity.Levenshtein;
@@ -68,6 +77,10 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl>().ok(list);
}
+ @Override
+ public String addPartyMemberBaseInfo(PartyMemberBaseInfoAddFormDTO formDTO) {
+ //校验数据
+ this.checkPartymemberBaseInfoDTO(formDTO.getIdCard(),formDTO.getMobile(),null);
+ //插入党员库记录
+ PartymemberBaseInfoEntity entity = ConvertUtils.sourceToTarget(formDTO, PartymemberBaseInfoEntity.class);
+ insert(entity);
+ //插入党支部-党员关系记录
+ PartyBranchMembersDTO partyBranchMembersDTO=new PartyBranchMembersDTO();
+ partyBranchMembersDTO.setBranchId(formDTO.getBranchId());
+ partyBranchMembersDTO.setPartymemberBaseInfoId(entity.getId());
+ partyBranchMembersService.save(partyBranchMembersDTO);
+ return entity.getId();
+ }
+
+ @Override
+ public List listPartyMemberBaseInfo(String partyBranchId) {
+ List resultDTOList=new ArrayList<>();
+ if(StringUtils.isNotBlank(partyBranchId)){
+ List entityList=baseDao.selectListPartyMemberBaseInfo(partyBranchId);
+ for(PartymemberBaseInfoEntity entity:entityList){
+ PartymemberBaseInfoResultDTO partymemberBaseInfoResultDTO=new PartymemberBaseInfoResultDTO();
+ partymemberBaseInfoResultDTO.setName(entity.getName());
+ partymemberBaseInfoResultDTO.setPartyMemberId(entity.getId());
+ partymemberBaseInfoResultDTO.setGender(IdCardNoValidatorUtils.getGender(entity.getIdCard()));
+ resultDTOList.add(partymemberBaseInfoResultDTO);
+ }
+ }
+ return resultDTOList;
+ }
/**
* 生成返回结果
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberAuthRecordDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberAuthRecordDao.xml
index e02cba68aa..f61badbc80 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberAuthRecordDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberAuthRecordDao.xml
@@ -19,5 +19,11 @@
+ select * from partymember_auth_record
+ where DEL_FLAG='0'
+ and PARTYMEMBER_BASE_INFO_ID=#{partymemberBaseInfoId}
+
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml
index 2cbad32ae0..6e6f16e42d 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml
@@ -120,4 +120,29 @@
applyTime DESC
LIMIT #{pageNo},#{pageSize}
+
+
+
+ select * from partymember_base_info
+ where DEL_FLAG='0'
+ and ID_CARD=#{idCard}
+
+ and id!=#{id}
+
+
+
+
+
+ SELECT
+ pbm.PARTYMEMBER_BASE_INFO_ID AS ID,
+ pbi.`NAME`,
+ pbi.ID_CARD
+ FROM
+ party_branch_members pbm
+ LEFT JOIN partymember_base_info pbi ON ( pbm.PARTYMEMBER_BASE_INFO_ID = pbi.id AND pbi.DEL_FLAG = '0' )
+ WHERE
+ pbm.DEL_FLAG = '0'
+ AND pbm.BRANCH_ID = #{partyBranchId}
+ ORDER BY CONVERT (pbi.`NAME` USING gbk) ASC
+
\ No newline at end of file
From edfff9598914e6019166518ee976b5abba595f70 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 18 Jun 2020 11:34:05 +0800
Subject: [PATCH 06/46] =?UTF-8?q?=E6=94=AF=E9=83=A8=E7=AE=A1=E7=90=86v2?=
=?UTF-8?q?=E6=BC=8F=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/epmet/controller/CustomerPartyBranchController.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java
index 5935d18894..ffa9af68ab 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java
@@ -92,7 +92,7 @@ public class CustomerPartyBranchController {
public Result deleteById(@PathVariable("id") String id){
CustomerPartyBranchDTO data = customerPartyBranchService.get(id);
if(null!=data&&data.getTotalPartyMember()>0){
- throw new RenException(EpmetErrorCode.CANNOT_DELETE_PARTYB_RANCH.getCode());
+ throw new RenException(EpmetErrorCode.CANNOT_DELETE_PARTY_BRANCH.getCode());
}
customerPartyBranchService.deleteById(id);
return new Result();
From a91bbe819d080424dab9a06ec4de258ed1bd66c6 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 18 Jun 2020 11:50:40 +0800
Subject: [PATCH 07/46] =?UTF-8?q?data-report =E9=87=8D?=
=?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
epmet-module/pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/epmet-module/pom.xml b/epmet-module/pom.xml
index 6a43dfe29f..aa37ab3129 100644
--- a/epmet-module/pom.xml
+++ b/epmet-module/pom.xml
@@ -39,7 +39,6 @@
resi-voice
data-statistical
data-report
- data-report
From 6fc1d5fc53f2bf212d6afa76ed749e37ae1ca8da Mon Sep 17 00:00:00 2001
From: yinzuomei
Date: Thu, 18 Jun 2020 13:07:16 +0800
Subject: [PATCH 08/46] user59
---
epmet-user/epmet-user-server/deploy/docker-compose-test.yml | 2 +-
epmet-user/epmet-user-server/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
index 1c7cf953b3..5c9f3966ff 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-user-server:
container_name: epmet-user-server-test
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.58
+ image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.59
ports:
- "8087:8087"
network_mode: host # 不会创建新的网络
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index ee56a0293e..725c2cab56 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@@ -2,7 +2,7 @@
4.0.0
- 0.3.58
+ 0.3.59
com.epmet
epmet-user
From f31d5619565f3047619bd0ae4b3502e77d2d2495 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 18 Jun 2020 13:58:16 +0800
Subject: [PATCH 09/46] =?UTF-8?q?=E6=94=AF=E9=83=A8=E7=AE=A1=E7=90=86v2bug?=
=?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/epmet/commons/tools/exception/EpmetErrorCode.java | 2 +-
.../java/com/epmet/dto/form/PartyBranchIdFormDTO.java | 5 +++--
.../com/epmet/dto/form/SaveOrUpdateParyMemberFormDTO.java | 8 ++++----
.../com/epmet/controller/PartyBranchManageController.java | 4 ++--
.../controller/PartymemberBaseInfoController.java | 4 ++--
.../modules/partymember/dao/PartymemberBaseInfoDao.java | 2 +-
.../service/impl/PartymemberBaseInfoServiceImpl.java | 4 ++--
7 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
index dbd4c2f6d8..e12787cc3b 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
@@ -95,7 +95,7 @@ public enum EpmetErrorCode {
return epmetErrorCodeEnum.getMsg();
}
}
- return null;
+ return EpmetErrorCode.SERVER_ERROR.getMsg();
}
public int getCode(){
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchIdFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchIdFormDTO.java
index 5009842a2c..1849a8481b 100644
--- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchIdFormDTO.java
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchIdFormDTO.java
@@ -14,10 +14,11 @@ import java.io.Serializable;
@Data
public class PartyBranchIdFormDTO implements Serializable {
private static final long serialVersionUID = 5321430865413383354L;
-
+ public interface AddUserInternalGroup {
+ }
/**
* 党支部id
*/
- @NotBlank(message = "党支部id不能为空")
+ @NotBlank(message = "党支部id不能为空",groups = {AddUserInternalGroup.class})
private String partyBranchId;
}
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/SaveOrUpdateParyMemberFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/SaveOrUpdateParyMemberFormDTO.java
index 999cfd34b1..3414805602 100644
--- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/SaveOrUpdateParyMemberFormDTO.java
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/SaveOrUpdateParyMemberFormDTO.java
@@ -16,10 +16,10 @@ import java.io.Serializable;
public class SaveOrUpdateParyMemberFormDTO implements Serializable {
private static final long serialVersionUID = -6896349967046364830L;
- public interface UpdatePatyMemberGroup extends CustomerClientShowGroup {
+ public interface UpdatePatyMemberGroup {
}
- public interface SavePatyMemberGroup extends CustomerClientShowGroup {
+ public interface SavePatyMemberGroup {
}
public interface AddUserShowGroup extends CustomerClientShowGroup {
@@ -31,10 +31,10 @@ public class SaveOrUpdateParyMemberFormDTO implements Serializable {
@NotBlank(message = "姓名不能为空", groups = {AddUserShowGroup.class})
private String name;
- @NotBlank(message = "手机号不能为空", groups = {AddUserShowGroup.class})
+ @NotBlank(message = "身份证不能为空", groups = {AddUserShowGroup.class})
private String idCard;
- @NotBlank(message = "身份证不能为空", groups = {AddUserShowGroup.class})
+ @NotBlank(message = "手机号不能为空", groups = {AddUserShowGroup.class})
private String mobile;
@NotBlank(message = "党员id不能为空", groups = {UpdatePatyMemberGroup.class})
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java
index 74fb00d27c..477aac3df7 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java
@@ -91,7 +91,7 @@ public class PartyBranchManageController {
**/
@PostMapping("info")
public Result queryPartyBranchInfo(@RequestBody PartyBranchIdFormDTO formDTO) {
- ValidatorUtils.validateEntity(formDTO);
+ ValidatorUtils.validateEntity(formDTO,PartyBranchIdFormDTO.AddUserInternalGroup.class);
PartyBranchInfoResultDTO partyBranchInfoResultDTO = partyBranchManageService.queryPartyBranchInfo(formDTO.getPartyBranchId());
return new Result().ok(partyBranchInfoResultDTO);
}
@@ -105,7 +105,7 @@ public class PartyBranchManageController {
**/
@PostMapping("/partymember/list")
public Result> listPartyMember(@RequestBody PartyBranchIdFormDTO formDTO){
- ValidatorUtils.validateEntity(formDTO);
+ ValidatorUtils.validateEntity(formDTO,PartyBranchIdFormDTO.AddUserInternalGroup.class);
List list=partyBranchManageService.listPartyMember(formDTO.getPartyBranchId());
return new Result>().ok(list);
}
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java
index 7595e5d6c5..1c8c521963 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java
@@ -76,11 +76,11 @@ public class PartymemberBaseInfoController {
}
@PutMapping
- public Result update(@RequestBody PartymemberBaseInfoDTO dto){
+ public Result update(@RequestBody PartymemberBaseInfoDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
partymemberBaseInfoService.update(dto);
- return new Result();
+ return new Result().ok(dto.getId());
}
@DeleteMapping
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberBaseInfoDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberBaseInfoDao.java
index d4a8931124..161745918e 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberBaseInfoDao.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberBaseInfoDao.java
@@ -87,7 +87,7 @@ public interface PartymemberBaseInfoDao extends BaseDao selectByIdCard(@Param("idCard") String idCard,@Param("id")String id);
/**
* @return java.util.List
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java
index 67c26fcbf6..e1e498c555 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java
@@ -152,8 +152,8 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl partymemberBaseInfoEntityList = baseDao.selectByIdCard(idCardNo, partymemberBaseInfoId);
+ if (null != partymemberBaseInfoEntityList&&partymemberBaseInfoEntityList.size()>0) {
throw new RenException(EpmetErrorCode.IDCARDNO_ALREADY_EXITS.getCode());
}
}
From db1196ebd0721260ab4143c573bf6c69dabbd106 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 18 Jun 2020 14:05:27 +0800
Subject: [PATCH 10/46] =?UTF-8?q?=E6=94=AF=E9=83=A8=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E8=81=94=E8=B0=831?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../gov-grid/gov-grid-server/deploy/docker-compose-dev.yml | 2 +-
epmet-module/gov-grid/gov-grid-server/pom.xml | 2 +-
.../gov-org/gov-org-server/deploy/docker-compose-dev.yml | 2 +-
epmet-module/gov-org/gov-org-server/pom.xml | 2 +-
.../resi-partymember-server/deploy/docker-compose-dev.yml | 2 +-
epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
index 4189f2d981..eca2c5e296 100644
--- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-grid-server:
container_name: gov-grid-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.30
+ image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.31
ports:
- "8097:8097"
network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml
index d31e134a9a..2bd779f6d6 100644
--- a/epmet-module/gov-grid/gov-grid-server/pom.xml
+++ b/epmet-module/gov-grid/gov-grid-server/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- 0.3.30
+ 0.3.31
com.epmet
gov-grid
diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
index b126058bb6..7c3a7efb4e 100644
--- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-org-server:
container_name: gov-org-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.66
+ image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.67
ports:
- "8092:8092"
network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml
index d7df708edb..95cca7ab03 100644
--- a/epmet-module/gov-org/gov-org-server/pom.xml
+++ b/epmet-module/gov-org/gov-org-server/pom.xml
@@ -2,7 +2,7 @@
4.0.0
- 0.3.66
+ 0.3.67
com.epmet
gov-org
diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
index 7fa0b47f47..489eda12a8 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
resi-partymember-server:
container_name: resi-partymember-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.44
+ image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.45
ports:
- "8096:8096"
network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
index 2bbb496183..9935d6590c 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
@@ -2,7 +2,7 @@
4.0.0
- 0.3.44
+ 0.3.45
com.epmet
resi-partymember
From 2452395e4a4bb4bf5780376636e1341997f5fcd5 Mon Sep 17 00:00:00 2001
From: jianjun
Date: Thu, 18 Jun 2020 18:29:03 +0800
Subject: [PATCH 11/46] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=A3=80=E6=B5=8B?=
=?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=98=AF=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../scan/service/impl/ScanServiceImpl.java | 33 ++++++++++---------
1 file changed, 18 insertions(+), 15 deletions(-)
diff --git a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java
index 6848de234f..3637fa5163 100644
--- a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java
+++ b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java
@@ -12,7 +12,6 @@ import com.aliyuncs.green.model.v20180509.TextScanRequest;
import com.aliyuncs.http.FormatType;
import com.aliyuncs.http.HttpResponse;
import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.openapi.scan.common.constant.SysConstant;
import com.epmet.openapi.scan.common.enu.ImgSceneEnum;
import com.epmet.openapi.scan.common.enu.SuggestionEnum;
@@ -24,9 +23,9 @@ import com.epmet.openapi.scan.support.param.ImgScanParam;
import com.epmet.openapi.scan.support.param.ImgTask;
import com.epmet.openapi.scan.support.param.TextScanParam;
import com.epmet.openapi.scan.support.param.TextTask;
-import com.epmet.openapi.scan.support.result.SceneDetailResult;
import com.epmet.openapi.scan.support.result.ImgAsyncScanResult;
import com.epmet.openapi.scan.support.result.ScanTaskResult;
+import com.epmet.openapi.scan.support.result.SceneDetailResult;
import com.epmet.openapi.scan.support.result.SyncScanResult;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.HttpStatus;
@@ -189,14 +188,19 @@ public class ScanServiceImpl implements ScanService {
//如果是多个场景 则为对个 BaseScanResult
List sceneResults = taskResult.getResults();
//是文本检测 目前就一种场景
+ boolean isSuccess = true;
for (SceneDetailResult sceneResult : sceneResults) {
String suggestion = sceneResult.getSuggestion();
if (SuggestionEnum.BLOCK.getCode().equals(suggestion)) {
- result.getFailDataIds().add(taskResult.getDataId());
- } else {
- result.getSuccessDataIds().add(taskResult.getDataId());
+ isSuccess = false;
+ break;
}
}
+ if (isSuccess){
+ result.getFailDataIds().add(taskResult.getDataId());
+ } else {
+ result.getSuccessDataIds().add(taskResult.getDataId());
+ }
} else {
result.getFailDataIds().add(taskResult.getDataId());
log.warn("executeSyncText task process fail:code:{},msg:{}", taskResult.getCode(), taskResult.getMsg());
@@ -284,21 +288,20 @@ public class ScanServiceImpl implements ScanService {
}
//如果是多个场景 则为对个 BaseScanResult
List sceneResults = taskResult.getResults();
- //是文本检测 目前就一种场景
+
+ boolean isSuccess = true;
for (SceneDetailResult sceneResult : sceneResults) {
String suggestion = sceneResult.getSuggestion();
if (SuggestionEnum.BLOCK.getCode().equals(suggestion)) {
- if (result.getFailDataIds().contains(taskResult.getDataId())) {
- continue;
- }
- result.getFailDataIds().add(taskResult.getDataId());
- } else {
- if (result.getSuccessDataIds().contains(taskResult.getDataId())) {
- continue;
- }
- result.getSuccessDataIds().add(taskResult.getDataId());
+ isSuccess = false;
+ break;
}
}
+ if (isSuccess){
+ result.getSuccessDataIds().add(taskResult.getDataId());
+ }else{
+ result.getFailDataIds().add(taskResult.getDataId());
+ }
}
return result;
} else {
From 0e02f8bac69645dd8929c3cf603642ee15f8a07e Mon Sep 17 00:00:00 2001
From: jianjun
Date: Thu, 18 Jun 2020 18:30:42 +0800
Subject: [PATCH 12/46] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7+1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml | 2 +-
epmet-openapi/epmet-openapi-scan/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
index 5802d6a79c..c3ff2265ed 100644
--- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
+++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-openapi-scan:
container_name: epmet-openapi-scan-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:0.3.8
+ image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:0.3.9
ports:
- "8107:8107"
network_mode: host # 不会创建新的网络
diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml
index 9bb20ac89a..a03207ea82 100644
--- a/epmet-openapi/epmet-openapi-scan/pom.xml
+++ b/epmet-openapi/epmet-openapi-scan/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- 0.3.8
+ 0.3.9
epmet-openapi-scan
jar
From 2b96aee67c00151533c16c953a56e030e807a522 Mon Sep 17 00:00:00 2001
From: jianjun
Date: Thu, 18 Jun 2020 18:31:56 +0800
Subject: [PATCH 13/46] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=A3=B0=E9=9F=B3?=
=?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=83=A8=E7=BD=B2=20=E8=A7=A3=E5=86=B3?=
=?UTF-8?q?=E5=AE=A1=E6=A0=B8=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C=E5=BC=82?=
=?UTF-8?q?=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
index abe98cfc1d..d7aa42ead8 100644
--- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
+++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-openapi-scan:
container_name: epmet-openapi-scan-test
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-openapi-scan:0.3.8
+ image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-openapi-scan:0.3.9
ports:
- "8107:8107"
network_mode: host # 不会创建新的网络
From d679bfda3a6b22a92c6a8344d629a65fa04c9ba8 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 18 Jun 2020 18:35:58 +0800
Subject: [PATCH 14/46] =?UTF-8?q?=E6=94=AF=E9=83=A8=E7=AE=A1=E7=90=86v3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dto/form/DeletePartyMemberFormDTO.java | 31 ++++++++++
.../epmet/dto/form/PartyMemberIdFormDTO.java | 24 ++++++++
.../PartyMemberInfoDetailResultDTO.java | 60 +++++++++++++++++++
.../PartyBranchManageController.java | 27 +++++++++
.../service/PartyBranchManageService.java | 28 ++++++---
.../impl/PartyBranchManageServiceImpl.java | 35 +++++++++++
.../com/epmet/dto/CustomerPartyBranchDTO.java | 5 ++
.../epmet/feign/GovOrgOpenFeignClient.java | 10 ++++
.../GovOrgOpenFeignClientFallback.java | 5 ++
.../CustomerPartyBranchController.java | 13 ++++
.../com/epmet/dao/CustomerPartyBranchDao.java | 3 +
.../service/CustomerPartyBranchService.java | 9 +++
.../impl/CustomerPartyBranchServiceImpl.java | 6 ++
.../mapper/CustomerPartyBranchDao.xml | 8 +++
.../epmet/controller/ArticleController.java | 2 -
.../form/DelPartyMemberBaseInfoFormDTO.java | 31 ++++++++++
.../PartyMemberBaseInfoDetailResultDTO.java | 56 +++++++++++++++++
.../feign/ResiPartyMemberOpenFeignClient.java | 24 +++++++-
...esiPartyMemberOpenFeignClientFallback.java | 12 ++++
.../PartymemberBaseInfoController.java | 26 ++++++++
.../dao/PartyBranchMembersDao.java | 5 +-
.../dao/PartymemberBaseInfoDao.java | 10 ++++
.../service/PartymemberBaseInfoService.java | 20 +++++++
.../impl/PartymemberBaseInfoServiceImpl.java | 41 +++++++++++++
.../partymember/PartyBranchMembersDao.xml | 9 ++-
.../partymember/PartymemberBaseInfoDao.xml | 17 ++++++
26 files changed, 503 insertions(+), 14 deletions(-)
create mode 100644 epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/DeletePartyMemberFormDTO.java
create mode 100644 epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyMemberIdFormDTO.java
create mode 100644 epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberInfoDetailResultDTO.java
create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/DelPartyMemberBaseInfoFormDTO.java
create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartyMemberBaseInfoDetailResultDTO.java
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/DeletePartyMemberFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/DeletePartyMemberFormDTO.java
new file mode 100644
index 0000000000..bcce3cb4bd
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/DeletePartyMemberFormDTO.java
@@ -0,0 +1,31 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 删除党员入参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/18 18:05
+ */
+@Data
+public class DeletePartyMemberFormDTO implements Serializable {
+ private static final long serialVersionUID = 2325963253025239121L;
+
+ public interface AddUserInternalGroup {}
+ /**
+ * 党员id
+ */
+ @NotBlank(message = "党员id不能为空",groups = {PartyMemberIdFormDTO.AddUserInternalGroup.class})
+ private String partyMemberId;
+
+ /**
+ * 党支部id
+ */
+ @NotBlank(message = "党支部id不能为空",groups = {PartyMemberIdFormDTO.AddUserInternalGroup.class})
+ private String partyBranchId;
+
+}
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyMemberIdFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyMemberIdFormDTO.java
new file mode 100644
index 0000000000..1e69866bbf
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyMemberIdFormDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 党员id
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/18 14:48
+ */
+@Data
+public class PartyMemberIdFormDTO implements Serializable {
+ private static final long serialVersionUID = 3088195909670495675L;
+
+ public interface AddUserInternalGroup {}
+ /**
+ * 党员id
+ */
+ @NotBlank(message = "党员id不能为空",groups = {AddUserInternalGroup.class})
+ private String partyMemberId;
+}
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberInfoDetailResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberInfoDetailResultDTO.java
new file mode 100644
index 0000000000..a125784788
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberInfoDetailResultDTO.java
@@ -0,0 +1,60 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 党员信息详情返参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/18 15:19
+ */
+@Data
+public class PartyMemberInfoDetailResultDTO implements Serializable {
+ private static final long serialVersionUID = -4887670791276512339L;
+ /**
+ * 党员id
+ */
+ private String partyMemberId;
+
+ /**
+ * 姓名
+ */
+ private String name;
+
+ /**
+ * 身份证号
+ */
+ private String idCard;
+
+ /**
+ * 手机号
+ */
+ private String mobile;
+
+ /**
+ * 1男2女0未知
+ */
+ private String gender;
+
+ /**
+ * true已激活，false未激活
+ */
+ private Boolean status;
+
+ /**
+ * 返回：账号于2019年10月31日在海泊桥社区-第一网格激活
+ */
+ private String activeDesc;
+
+ /**
+ * 党支部名称（机关-网格-支部名）
+ */
+ private String partyBranchName;
+
+ /**
+ * 党支部id
+ */
+ private String partyBranchId;
+}
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java
index 477aac3df7..02f15fdc7e 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java
@@ -141,4 +141,31 @@ public class PartyBranchManageController {
partyMemberIdResultDTO.setPartyMemberId(partyBranchManageService.editPartyMember(formDTO));
return new Result().ok(partyMemberIdResultDTO);
}
+
+ /**
+ * @return com.epmet.commons.tools.utils.Result
+ * @param formDTO
+ * @author yinzuomei
+ * @description 10、党员详情
+ * @Date 2020/6/18 15:25
+ **/
+ @PostMapping("/partymember/detail")
+ public Result queryPartyMemberDetail(@RequestBody PartyMemberIdFormDTO formDTO){
+ ValidatorUtils.validateEntity(formDTO, PartyMemberIdFormDTO.AddUserInternalGroup.class);
+ return new Result().ok(partyBranchManageService.queryPartyMemberDetail(formDTO.getPartyMemberId()));
+ }
+
+ /**
+ * @return com.epmet.commons.tools.utils.Result
+ * @param deletePartyMemberFormDTO
+ * @author yinzuomei
+ * @description 删除党员
+ * @Date 2020/6/18 17:51
+ **/
+ @PostMapping("partymember/delete")
+ public Result deletePartyMember(@RequestBody DeletePartyMemberFormDTO deletePartyMemberFormDTO){
+ ValidatorUtils.validateEntity(deletePartyMemberFormDTO, DeletePartyMemberFormDTO.AddUserInternalGroup.class);
+ partyBranchManageService.deletePartyMember(deletePartyMemberFormDTO);
+ return new Result();
+ }
}
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/PartyBranchManageService.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/PartyBranchManageService.java
index c9693eddb4..e87a4dad57 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/PartyBranchManageService.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/PartyBranchManageService.java
@@ -1,13 +1,7 @@
package com.epmet.service;
-import com.epmet.dto.form.PartyBranchAddFormDTO;
-import com.epmet.dto.form.PartyBranchEditFormDTO;
-import com.epmet.dto.form.PartyBranchListFormDTO;
-import com.epmet.dto.form.SaveOrUpdateParyMemberFormDTO;
-import com.epmet.dto.result.PartyBranchAddResultDTO;
-import com.epmet.dto.result.PartyBranchInfoResultDTO;
-import com.epmet.dto.result.PartyBranchListResultDTO;
-import com.epmet.dto.result.PartyMemberInfoResultDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.*;
import java.util.List;
@@ -89,4 +83,22 @@ public interface PartyBranchManageService {
* @Date 2020/6/17 23:29
**/
String editPartyMember(SaveOrUpdateParyMemberFormDTO formDTO);
+
+ /**
+ * @param partyMemberId
+ * @return com.epmet.dto.result.PartyMemberInfoDetailResultDTO
+ * @author yinzuomei
+ * @description 10、党员详情：根据党员id查询党员详情
+ * @Date 2020/6/18 15:25
+ **/
+ PartyMemberInfoDetailResultDTO queryPartyMemberDetail(String partyMemberId);
+
+ /**
+ * @return void
+ * @param deletePartyMemberFormDTO
+ * @author yinzuomei
+ * @description 删除党员
+ * @Date 2020/6/18 17:51
+ **/
+ void deletePartyMember(DeletePartyMemberFormDTO deletePartyMemberFormDTO);
}
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/PartyBranchManageServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/PartyBranchManageServiceImpl.java
index ae2ea9469c..d193449aa2 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/PartyBranchManageServiceImpl.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/PartyBranchManageServiceImpl.java
@@ -10,7 +10,9 @@ import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
import com.epmet.feign.GovOrgOpenFeignClient;
import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO;
import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
import com.epmet.service.PartyBranchManageService;
@@ -167,6 +169,39 @@ public class PartyBranchManageServiceImpl implements PartyBranchManageService {
}
}
+ @Override
+ public PartyMemberInfoDetailResultDTO queryPartyMemberDetail(String partyMemberId) {
+ PartyMemberInfoDetailResultDTO partyMemberInfoDetailResultDTO=new PartyMemberInfoDetailResultDTO();
+ Result partyMemberResult=resiPartyMemberOpenFeignClient.queryPartyMemberBaseInfoById(partyMemberId);
+ if(partyMemberResult.success()&&null!=partyMemberResult.getData()){
+ partyMemberInfoDetailResultDTO=ConvertUtils.sourceToTarget(partyMemberResult.getData(),PartyMemberInfoDetailResultDTO.class);
+ Result partyBranchDTOResult=govOrgOpenFeignClient.getPartyBranchById(partyMemberResult.getData().getPartyBranchId());
+ if(partyBranchDTOResult.success()){
+ String agencyName=partyBranchDTOResult.getData().getAgencyName();
+ String gridName=partyBranchDTOResult.getData().getGridName();
+ String branchName=partyBranchDTOResult.getData().getPartyBranchName();
+ partyMemberInfoDetailResultDTO.setPartyBranchName(String.format("%s-%s-%s",agencyName,gridName,branchName));
+ }else{
+ logger.error("党员详情查询异常");
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public void deletePartyMember(DeletePartyMemberFormDTO deletePartyMemberFormDTO) {
+ DelPartyMemberBaseInfoFormDTO formDTO = ConvertUtils.sourceToTarget(deletePartyMemberFormDTO, DelPartyMemberBaseInfoFormDTO.class);
+ Result result = resiPartyMemberOpenFeignClient.deltePartyMemberBaseInfo(formDTO);
+ if (!result.success()) {
+ throw new RenException(result.getCode());
+ }
+ //党支部总人数-1
+ Result decrResult = govOrgOpenFeignClient.decrPartyBranchMember(deletePartyMemberFormDTO.getPartyBranchId());
+ if (decrResult.success()) {
+ logger.info("删除党员成功,党支部总人数已-1");
+ }
+ }
+
private PartyMemberBaseInfoAddFormDTO getPartyMemberBaseInfoAddFormDTO(SaveOrUpdateParyMemberFormDTO formDTO,
CustomerPartyBranchDTO customerPartyBranchDTO) {
PartyMemberBaseInfoAddFormDTO partyMemberBaseInfoAddFormDTO=new PartyMemberBaseInfoAddFormDTO();
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerPartyBranchDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerPartyBranchDTO.java
index 960e01450e..c396f90605 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerPartyBranchDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerPartyBranchDTO.java
@@ -94,6 +94,11 @@ public class CustomerPartyBranchDTO implements Serializable {
*/
private Date updatedTime;
+ /**
+ * 网格名称
+ */
+ private String gridName;
+
/**
* 网格所属机关id
*/
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
index 4d3c71959b..99bccaa484 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
@@ -121,4 +121,14 @@ public interface GovOrgOpenFeignClient {
**/
@GetMapping("/gov/org/customergrid/getGridInfo/{gridId}")
Result queryGridInfo(@PathVariable("gridId") String gridId);
+
+ /**
+ * @return com.epmet.commons.tools.utils.Result
+ * @param partyBranchId
+ * @author yinzuomei
+ * @description 党支部宗人数-1
+ * @Date 2020/6/18 18:28
+ **/
+ @GetMapping(value = "gov/org/customerpartybranch/decrPartyBranchMember/{partyBranchId}")
+ Result decrPartyBranchMember(@PathVariable("partyBranchId") String partyBranchId);
}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
index 8de4fa49f9..bcc224dd86 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
@@ -72,4 +72,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
public Result queryGridInfo(String gridId) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridInfo",gridId);
}
+
+ @Override
+ public Result decrPartyBranchMember(String partyBranchId) {
+ return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "decrPartyBranchMember",partyBranchId);
+ }
}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java
index ffa9af68ab..04ebd8e0a0 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java
@@ -116,4 +116,17 @@ public class CustomerPartyBranchController {
ValidatorUtils.validateEntity(formDTO);
return new Result>().ok(customerPartyBranchService.listpartybranch(formDTO));
}
+
+ /**
+ * @return com.epmet.commons.tools.utils.Result
+ * @param partyBranchId
+ * @author yinzuomei
+ * @description 党支部人数-1
+ * @Date 2020/6/18 18:31
+ **/
+ @GetMapping("decrPartyBranchMember/{partyBranchId}")
+ public Result decrPartyBranchMember(@PathVariable("partyBranchId") String partyBranchId){
+ customerPartyBranchService.decrPartyBranchMember(partyBranchId);
+ return new Result();
+ }
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerPartyBranchDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerPartyBranchDao.java
index 100ddbc86e..007af50fde 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerPartyBranchDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerPartyBranchDao.java
@@ -35,4 +35,7 @@ import java.util.List;
public interface CustomerPartyBranchDao extends BaseDao {
//根据客户id、网格id查询党支部列表
List selectListPartyBranchResultDTO(ListPartyBranchFormDTO formDTO);
+
+ //党支部人数-1
+ int decrPartyBranchMember(String partyBranchId);
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerPartyBranchService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerPartyBranchService.java
index d25e849751..e373bcb0f1 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerPartyBranchService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerPartyBranchService.java
@@ -103,4 +103,13 @@ public interface CustomerPartyBranchService extends BaseService listpartybranch(ListPartyBranchFormDTO formDTO);
+
+ /**
+ * @return void
+ * @param partyBranchId
+ * @author yinzuomei
+ * @description 党支部人数-1
+ * @Date 2020/6/18 18:31
+ **/
+ void decrPartyBranchMember(String partyBranchId);
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerPartyBranchServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerPartyBranchServiceImpl.java
index 88ef3365a9..5ec7c27668 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerPartyBranchServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerPartyBranchServiceImpl.java
@@ -91,6 +91,7 @@ public class CustomerPartyBranchServiceImpl extends BaseServiceImpl
+
+
+ UPDATE customer_party_branch
+ SET TOTAL_PARTY_MEMBER = TOTAL_PARTY_MEMBER - 1
+ WHERE
+ id = #{partyBranchId}
+ AND DEL_FLAG = '0'
+
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java
index 7cc723b070..b22716bc16 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java
@@ -105,7 +105,6 @@ public class ArticleController {
* @date 2020/6/2 16:50
**/
@PostMapping("oprationlist")
- @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_OPERATION_LIST)
public Result> operationList(@RequestBody ArticleOperationFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO, ArticleOperationFormDTO.AddUserInternalGroup.class);
List list =
@@ -121,7 +120,6 @@ public class ArticleController {
* @date 2020/6/3 9:44
**/
@PostMapping("articledetail")
- @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_DETAIL)
public Result articleDetail(@RequestBody GovArticleDetailFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO, GovArticleDetailFormDTO.AddUserInternalGroup.class);
GovArticleDetailResultDTO articleDetail = articleService.queryGovArticleDetail(formDTO.getArticleId());
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/DelPartyMemberBaseInfoFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/DelPartyMemberBaseInfoFormDTO.java
new file mode 100644
index 0000000000..eac10a7bbf
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/DelPartyMemberBaseInfoFormDTO.java
@@ -0,0 +1,31 @@
+package com.epmet.resi.partymember.dto.partymember.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 删除党员入参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/18 18:09
+ */
+@Data
+public class DelPartyMemberBaseInfoFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 2735219691600150687L;
+ public interface AddUserInternalGroup {}
+
+ /**
+ * 党员id
+ */
+ @NotBlank(message = "党员id不能为空",groups = {DelPartyMemberBaseInfoFormDTO.AddUserInternalGroup.class})
+ private String partyMemberId;
+
+ /**
+ * 党支部id
+ */
+ @NotBlank(message = "党支部id不能为空",groups = {DelPartyMemberBaseInfoFormDTO.AddUserInternalGroup.class})
+ private String partyBranchId;
+}
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartyMemberBaseInfoDetailResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartyMemberBaseInfoDetailResultDTO.java
new file mode 100644
index 0000000000..8bf05dbcb8
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartyMemberBaseInfoDetailResultDTO.java
@@ -0,0 +1,56 @@
+package com.epmet.resi.partymember.dto.partymember.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 党员详情返参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/18 15:31
+ */
+@Data
+public class PartyMemberBaseInfoDetailResultDTO implements Serializable {
+ private static final long serialVersionUID = -1416472090639851835L;
+
+ /**
+ * 党员id
+ */
+ private String partyMemberId;
+
+ /**
+ * 姓名
+ */
+ private String name;
+
+ /**
+ * 身份证号
+ */
+ private String idCard;
+
+ /**
+ * 手机号
+ */
+ private String mobile;
+
+ /**
+ * 1男2女0未知
+ */
+ private String gender;
+
+ /**
+ * true已激活，false未激活
+ */
+ private Boolean status;
+
+ /**
+ * 返回：账号于2019年10月31日在海泊桥社区-第一网格激活
+ */
+ private String activeDesc;
+
+ /**
+ * 党支部id
+ */
+ private String partyBranchId;
+}
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java
index cebb86940a..d427d00fc0 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java
@@ -3,7 +3,9 @@ package com.epmet.resi.partymember.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO;
import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
import com.epmet.resi.partymember.feign.fallback.ResiPartyMemberOpenFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient;
@@ -48,6 +50,26 @@ public interface ResiPartyMemberOpenFeignClient {
* @description 根据党支部id,查询党员列表
* @Date 2020/6/18 10:12
**/
- @GetMapping(value = "resi/partymember/partymemberbaseinfo/listPartyMemberBaseInfo/{partyBranchId}")
+ @GetMapping(value = "/resi/partymember/partymemberbaseinfo/listPartyMemberBaseInfo/{partyBranchId}")
Result> listPartyMemberBaseInfo(@PathVariable("partyBranchId") String partyBranchId);
+
+ /**
+ * @return com.epmet.commons.tools.utils.Result
+ * @param partyMemberId 党员库id主键
+ * @author yinzuomei
+ * @description 根据党员id查询党员信息
+ * @Date 2020/6/18 15:30
+ **/
+ @GetMapping(value = "/resi/partymember/partymemberbaseinfo/queryPartyMemberBaseInfoById/{partyMemberId}")
+ Result queryPartyMemberBaseInfoById(@PathVariable("partyMemberId") String partyMemberId);
+
+ /**
+ * @return com.epmet.commons.tools.utils.Result
+ * @param formDTO
+ * @author yinzuomei
+ * @description 删除党员
+ * @Date 2020/6/18 17:57
+ **/
+ @GetMapping(value = "/resi/partymember/partymemberbaseinfo/delete", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+ Result deltePartyMemberBaseInfo(@RequestBody DelPartyMemberBaseInfoFormDTO formDTO);
}
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java
index af3e36dd79..058af67dfa 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java
@@ -4,7 +4,9 @@ import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.ModuleUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO;
import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
import org.springframework.stereotype.Component;
@@ -34,4 +36,14 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp
public Result> listPartyMemberBaseInfo(String partyBranchId) {
return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "listPartyMemberBaseInfo", partyBranchId);
}
+
+ @Override
+ public Result queryPartyMemberBaseInfoById(String partyMemberId) {
+ return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "queryPartyMemberBaseInfoById", partyMemberId);
+ }
+
+ @Override
+ public Result deltePartyMemberBaseInfo(DelPartyMemberBaseInfoFormDTO formDTO) {
+ return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "deltePartyMemberBaseInfo", formDTO);
+ }
}
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java
index 1c8c521963..1149f73def 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java
@@ -28,9 +28,11 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.modules.partymember.excel.PartymemberBaseInfoExcel;
import com.epmet.modules.partymember.service.PartymemberBaseInfoService;
import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO;
import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
import com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO;
import com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO;
@@ -149,4 +151,28 @@ public class PartymemberBaseInfoController {
return new Result>().ok(partymemberBaseInfoService.listPartyMemberBaseInfo(partyBranchId));
}
+ /**
+ * @return com.epmet.commons.tools.utils.Result
+ * @param partyMemberId
+ * @author yinzuomei
+ * @description 根据党员库id，查询党员信息
+ * @Date 2020/6/18 17:15
+ **/
+ @GetMapping("queryPartyMemberBaseInfoById/{partyMemberId}")
+ public Result queryPartyMemberBaseInfoById(String partyMemberId){
+ return new Result().ok(partymemberBaseInfoService.queryPartyMemberBaseInfoById(partyMemberId));
+ }
+
+ /**
+ * @return com.epmet.commons.tools.utils.Result
+ * @param formDTO
+ * @author yinzuomei
+ * @description 删除党员
+ * @Date 2020/6/18 17:45
+ **/
+ @PostMapping("delete")
+ public Result deltePartyMemberBaseInfo(@RequestBody DelPartyMemberBaseInfoFormDTO formDTO){
+ partymemberBaseInfoService.deltePartyMemberBaseInfo(formDTO);
+ return new Result();
+ }
}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartyBranchMembersDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartyBranchMembersDao.java
index f9a567fde2..c70979e411 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartyBranchMembersDao.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartyBranchMembersDao.java
@@ -20,6 +20,7 @@ package com.epmet.modules.partymember.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.modules.partymember.entity.PartyBranchMembersEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
/**
* 党支部党员关系表
@@ -29,5 +30,7 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface PartyBranchMembersDao extends BaseDao {
-
+ int deletePartyBranchMember(@Param("partyBranchId") String partyBranchId,
+ @Param("partyMemberId") String partyMemberId,
+ @Param("userId") String userId);
}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberBaseInfoDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberBaseInfoDao.java
index 161745918e..3b756089a9 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberBaseInfoDao.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberBaseInfoDao.java
@@ -22,6 +22,7 @@ import com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity;
import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO;
import com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO;
import com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO;
import org.apache.ibatis.annotations.Mapper;
@@ -97,4 +98,13 @@ public interface PartymemberBaseInfoDao extends BaseDao selectListPartyMemberBaseInfo(String partyBranchId);
+
+ /**
+ * @return com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO
+ * @param partyMemberId
+ * @author yinzuomei
+ * @description 根据党员库id，查询党员信息
+ * @Date 2020/6/18 17:24
+ **/
+ PartyMemberBaseInfoDetailResultDTO queryPartyMemberBaseInfoById(String partyMemberId);
}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberBaseInfoService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberBaseInfoService.java
index 056833ac1c..b25f8e06b0 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberBaseInfoService.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberBaseInfoService.java
@@ -24,9 +24,11 @@ import com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity;
import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmAutoDTO;
import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO;
import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
import com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO;
import com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO;
@@ -145,4 +147,22 @@ public interface PartymemberBaseInfoService extends BaseService listPartyMemberBaseInfo(String partyBranchId);
+
+ /**
+ * @return com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO
+ * @param partyMemberId
+ * @author yinzuomei
+ * @description 根据党员库id，查询党员信息
+ * @Date 2020/6/18 17:15
+ **/
+ PartyMemberBaseInfoDetailResultDTO queryPartyMemberBaseInfoById(String partyMemberId);
+
+ /**
+ * @param formDTO
+ * @return void
+ * @author yinzuomei
+ * @description 删除党员
+ * @Date 2020/6/18 17:35
+ **/
+ void deltePartyMemberBaseInfo(DelPartyMemberBaseInfoFormDTO formDTO);
}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java
index e1e498c555..890d88a175 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java
@@ -25,6 +25,7 @@ import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.IdCardNoValidatorUtils;
@@ -35,8 +36,10 @@ import com.epmet.dto.result.GridInfoResultDTO;
import com.epmet.dto.result.UserResiInfoResultDTO;
import com.epmet.modules.feign.EpmetUserFeignClient;
import com.epmet.modules.feign.GovOrgFeignClient;
+import com.epmet.modules.partymember.dao.PartyBranchMembersDao;
import com.epmet.modules.partymember.dao.PartymemberAuthRecordDao;
import com.epmet.modules.partymember.dao.PartymemberBaseInfoDao;
+import com.epmet.modules.partymember.entity.PartymemberAuthRecordEntity;
import com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity;
import com.epmet.modules.partymember.redis.PartymemberBaseInfoRedis;
import com.epmet.modules.partymember.service.PartyBranchMembersService;
@@ -45,9 +48,11 @@ import com.epmet.resi.partymember.dto.partymember.PartyBranchMembersDTO;
import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmAutoDTO;
import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO;
import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
import com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO;
import com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO;
@@ -81,6 +86,10 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl
+ update party_branch_members
+ set DEL_FLAG='1',UPDATED_TIME=NOW(),UPDATED_BY=#{userId}
+ WHERE PARTYMEMBER_BASE_INFO_ID=#{partyMemberId}
+ AND BRANCH_ID=#{partyBranchId}
+
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml
index 6e6f16e42d..b7aa868f90 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml
@@ -145,4 +145,21 @@
AND pbm.BRANCH_ID = #{partyBranchId}
ORDER BY CONVERT (pbi.`NAME` USING gbk) ASC
+
+
+
+ SELECT
+ pbi.id AS partyMemberId,
+ pbi.`NAME`,
+ pbi.ID_CARD AS idCard,
+ pbi.MOBILE,
+ pbm.BRANCH_ID AS partyBranchId
+ FROM
+ party_branch_members pbm
+ LEFT JOIN PARTYMEMBER_BASE_INFO pbi ON ( pbm.PARTYMEMBER_BASE_INFO_ID = pbi.ID AND pbi.DEL_FLAG = '0' )
+ WHERE
+ pbm.DEL_FLAG = '0'
+ AND pbm.PARTYMEMBER_BASE_INFO_ID = #{partyMemberId}
+
\ No newline at end of file
From b0befb6132ad60df3cc5d981321e967236869468 Mon Sep 17 00:00:00 2001
From: jianjun
Date: Thu, 18 Jun 2020 18:46:29 +0800
Subject: [PATCH 15/46] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/epmet/openapi/scan/support/param/TextScanParam.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/support/param/TextScanParam.java b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/support/param/TextScanParam.java
index 16ad063428..2b05d34e20 100644
--- a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/support/param/TextScanParam.java
+++ b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/support/param/TextScanParam.java
@@ -26,14 +26,14 @@ public class TextScanParam implements Serializable {
*
* @see com.epmet.openapi.scan.common.enu.ImgSceneEnum;
*/
- @Valid
- @NotEmpty(message = "任务列表不能为空")
private List scenes;
/**
* 要检测的内容列表，必填
* remark：一组任务列表中的taskId不能相同
*/
+ @Valid
+ @NotEmpty(message = "任务列表不能为空")
private List tasks;
/**
From 3c42e33b8b30d7093e902f4214ae1feb9a326063 Mon Sep 17 00:00:00 2001
From: jianjun
Date: Thu, 18 Jun 2020 18:48:06 +0800
Subject: [PATCH 16/46] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7+1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml | 2 +-
epmet-openapi/epmet-openapi-scan/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
index c3ff2265ed..9f4185c482 100644
--- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
+++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-openapi-scan:
container_name: epmet-openapi-scan-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:0.3.9
+ image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:0.3.10
ports:
- "8107:8107"
network_mode: host # 不会创建新的网络
diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml
index a03207ea82..7e4f5951f2 100644
--- a/epmet-openapi/epmet-openapi-scan/pom.xml
+++ b/epmet-openapi/epmet-openapi-scan/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- 0.3.9
+ 0.3.10
epmet-openapi-scan
jar
From 8b399ebf69d8c5c7d29b9eec82b3e3200f162e3b Mon Sep 17 00:00:00 2001
From: jianjun
Date: Thu, 18 Jun 2020 18:48:53 +0800
Subject: [PATCH 17/46] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7+1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
index d7aa42ead8..c7200c6106 100644
--- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
+++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-openapi-scan:
container_name: epmet-openapi-scan-test
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-openapi-scan:0.3.9
+ image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-openapi-scan:0.3.10
ports:
- "8107:8107"
network_mode: host # 不会创建新的网络
From 2a71e82a0f512922c272de005be4546bb875c50c Mon Sep 17 00:00:00 2001
From: jianjun
Date: Thu, 18 Jun 2020 18:51:52 +0800
Subject: [PATCH 18/46] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/epmet/openapi/scan/service/impl/ScanServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java
index 3637fa5163..709fc7aef4 100644
--- a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java
+++ b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java
@@ -191,7 +191,7 @@ public class ScanServiceImpl implements ScanService {
boolean isSuccess = true;
for (SceneDetailResult sceneResult : sceneResults) {
String suggestion = sceneResult.getSuggestion();
- if (SuggestionEnum.BLOCK.getCode().equals(suggestion)) {
+ if (SuggestionEnum.PASS.getCode().equals(suggestion)) {
isSuccess = false;
break;
}
From 3b07a345b37951ce910c668cd5c3a0ebb5da4eeb Mon Sep 17 00:00:00 2001
From: jianjun
Date: Thu, 18 Jun 2020 18:52:54 +0800
Subject: [PATCH 19/46] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7+1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml | 2 +-
epmet-openapi/epmet-openapi-scan/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
index 9f4185c482..10c2835084 100644
--- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
+++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-openapi-scan:
container_name: epmet-openapi-scan-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:0.3.10
+ image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:0.3.11
ports:
- "8107:8107"
network_mode: host # 不会创建新的网络
diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml
index 7e4f5951f2..8a80b425df 100644
--- a/epmet-openapi/epmet-openapi-scan/pom.xml
+++ b/epmet-openapi/epmet-openapi-scan/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- 0.3.10
+ 0.3.11
epmet-openapi-scan
jar
From c80371d18a02a004f58a5158a9ca8f04d16f1eb2 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 18 Jun 2020 18:53:36 +0800
Subject: [PATCH 20/46] =?UTF-8?q?=E6=94=AF=E9=83=A8=E7=AE=A1=E7=90=86v3:?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../commons/tools/enums/RequirePermissionEnum.java | 12 +++++++++++-
.../controller/PartyBranchManageController.java | 8 ++++++++
.../feign/ResiPartyMemberOpenFeignClient.java | 2 +-
.../controller/PartymemberBaseInfoController.java | 1 +
4 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
index 05b505594b..e5e5bb9a2d 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
@@ -106,7 +106,17 @@ public enum RequirePermissionEnum {
WORK_PARTY_VOICE_PUBLISH("work_party_voice_publish", "党建声音:创建文章", ""),
WORK_PARTY_VOICE_EDIT("work_party_voice_edit", "党建声音:重新编辑", ""),
WORK_PARTY_VOICE_OFFLINE("work_party_voice_offline", "党建声音:下线文章", ""),
- WORK_PARTY_VOICE_OPERATION_LIST("work_party_voice_operation_list","党建声音:查看文章操作记录","");
+ WORK_PARTY_VOICE_OPERATION_LIST("work_party_voice_operation_list","党建声音:查看文章操作记录",""),
+
+ /**
+ * 基层治理-支部管理
+ */
+ WORK_GRASSROOTS_PARTY_BRANCH_ADD("work_grassroots_party_branch_add","添加党支部","支部管理-添加党支部"),
+ WORK_GRASSROOTS_PARTY_BRANCH_EDIT("work_grassroots_party_branch_edit","编辑党支部","支部管理-编辑党支部信息"),
+ WORK_GRASSROOTS_PARTY_BRANCH_DELETE("work_grassroots_party_branch_delete","删除党支部","支部管理-删除党支部"),
+ WORK_GRASSROOTS_PARTY_MEMBER_ADD("work_grassroots_party_member_add","添加党员","支部管理-添加党员"),
+ WORK_GRASSROOTS_PARTY_MEMBER_EDIT("work_grassroots_party_member_edit","编辑党员","支部管理-编辑党员"),
+ WORK_GRASSROOTS_PARTY_MEMBER_DELETE("work_grassroots_party_member_delete","删除党员","支部管理-删除党员");
private String key;
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java
index 02f15fdc7e..c74412719a 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java
@@ -1,5 +1,7 @@
package com.epmet.controller;
+import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.enums.RequirePermissionEnum;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.form.*;
@@ -33,6 +35,7 @@ public class PartyBranchManageController {
* @Date 2020/6/17 12:47
**/
@PostMapping("add")
+ @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_BRANCH_ADD)
public Result addPartyBranch(@RequestBody PartyBranchAddFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO, PartyBranchAddFormDTO.AddUserShowGroup.class, PartyBranchAddFormDTO.AddUserInternalGroup.class);
PartyBranchAddResultDTO partyBranchAddResultDTO = partyBranchManageService.addPartyBranch(formDTO);
@@ -47,6 +50,7 @@ public class PartyBranchManageController {
* @Date 2020/6/17 15:31
**/
@PostMapping("edit")
+ @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_BRANCH_EDIT)
public Result editPartyBranch(@RequestBody PartyBranchEditFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO, PartyBranchEditFormDTO.AddUserShowGroup.class, PartyBranchEditFormDTO.AddUserInternalGroup.class);
partyBranchManageService.editPartyBranch(formDTO);
@@ -76,6 +80,7 @@ public class PartyBranchManageController {
* @Date 2020/6/17 18:23
**/
@PostMapping("delete")
+ @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_BRANCH_DELETE)
public Result deleteBranch(@RequestBody PartyBranchIdFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
partyBranchManageService.deleteBranch(formDTO.getPartyBranchId());
@@ -118,6 +123,7 @@ public class PartyBranchManageController {
* @Date 2020/6/17 22:25
**/
@PostMapping("/partymember/add")
+ @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_MEMBER_ADD)
public Result addPartyMember(@RequestBody SaveOrUpdateParyMemberFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO, SaveOrUpdateParyMemberFormDTO.AddUserShowGroup.class
, SaveOrUpdateParyMemberFormDTO.SavePatyMemberGroup.class);
@@ -134,6 +140,7 @@ public class PartyBranchManageController {
* @Date 2020/6/17 23:29
**/
@PostMapping("/partymember/edit")
+ @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_MEMBER_EDIT)
public Result editPartyMember(@RequestBody SaveOrUpdateParyMemberFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO, SaveOrUpdateParyMemberFormDTO.AddUserShowGroup.class
, SaveOrUpdateParyMemberFormDTO.UpdatePatyMemberGroup.class);
@@ -163,6 +170,7 @@ public class PartyBranchManageController {
* @Date 2020/6/18 17:51
**/
@PostMapping("partymember/delete")
+ @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_MEMBER_DELETE)
public Result deletePartyMember(@RequestBody DeletePartyMemberFormDTO deletePartyMemberFormDTO){
ValidatorUtils.validateEntity(deletePartyMemberFormDTO, DeletePartyMemberFormDTO.AddUserInternalGroup.class);
partyBranchManageService.deletePartyMember(deletePartyMemberFormDTO);
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java
index d427d00fc0..dbd66a9ed2 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java
@@ -70,6 +70,6 @@ public interface ResiPartyMemberOpenFeignClient {
* @description 删除党员
* @Date 2020/6/18 17:57
**/
- @GetMapping(value = "/resi/partymember/partymemberbaseinfo/delete", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+ @PostMapping(value = "/resi/partymember/partymemberbaseinfo/delete", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
Result deltePartyMemberBaseInfo(@RequestBody DelPartyMemberBaseInfoFormDTO formDTO);
}
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java
index 1149f73def..37b24fd4e2 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java
@@ -172,6 +172,7 @@ public class PartymemberBaseInfoController {
**/
@PostMapping("delete")
public Result deltePartyMemberBaseInfo(@RequestBody DelPartyMemberBaseInfoFormDTO formDTO){
+ ValidatorUtils.validateEntity(formDTO,DelPartyMemberBaseInfoFormDTO.AddUserInternalGroup.class);
partymemberBaseInfoService.deltePartyMemberBaseInfo(formDTO);
return new Result();
}
From a21b3e371fcb802bb436e329161b34cd083ec4fb Mon Sep 17 00:00:00 2001
From: jianjun
Date: Thu, 18 Jun 2020 18:53:48 +0800
Subject: [PATCH 21/46] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7+1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
index c7200c6106..62b847b4d6 100644
--- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
+++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-openapi-scan:
container_name: epmet-openapi-scan-test
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-openapi-scan:0.3.10
+ image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-openapi-scan:0.3.11
ports:
- "8107:8107"
network_mode: host # 不会创建新的网络
From 798de2a7ef2117ce6a206ff6d8acf98f74dd8974 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 18 Jun 2020 19:15:37 +0800
Subject: [PATCH 22/46] =?UTF-8?q?=E6=94=AF=E9=83=A8=E7=AE=A1=E7=90=86v3:?=
=?UTF-8?q?=E5=85=9A=E6=94=AF=E9=83=A8=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E6=80=BB=E4=BA=BA=E6=95=B0=E8=BF=94=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/epmet/dto/result/PartyBranchListResultDTO.java | 5 +++++
.../java/com/epmet/dto/result/ListPartyBranchResultDTO.java | 5 +++++
.../src/main/resources/mapper/CustomerPartyBranchDao.xml | 3 ++-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchListResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchListResultDTO.java
index 01920b0819..8057699458 100644
--- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchListResultDTO.java
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchListResultDTO.java
@@ -21,4 +21,9 @@ public class PartyBranchListResultDTO implements Serializable {
* 支部名称
*/
private String partyBranchName;
+
+ /**
+ * 党员总数
+ */
+ private Integer totalPartyMember;
}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ListPartyBranchResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ListPartyBranchResultDTO.java
index ae84fd8030..b5d7e6cbce 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ListPartyBranchResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ListPartyBranchResultDTO.java
@@ -21,4 +21,9 @@ public class ListPartyBranchResultDTO implements Serializable {
* 支部名称
*/
private String partyBranchName;
+
+ /**
+ * 党员总数
+ */
+ private Integer totalPartyMember;
}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerPartyBranchDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerPartyBranchDao.xml
index e71f1c5acd..e9e1f1d17b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerPartyBranchDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerPartyBranchDao.xml
@@ -23,7 +23,8 @@
resultType="com.epmet.dto.result.ListPartyBranchResultDTO">
SELECT
id as partyBranchId,
- PARTY_BRANCH_NAME as partyBranchName
+ PARTY_BRANCH_NAME as partyBranchName,
+ TOTAL_PARTY_MEMBER AS totalPartyMember
FROM
customer_party_branch
WHERE
From 943d22626e2fce05fc5904d1faa55521e6bd21e8 Mon Sep 17 00:00:00 2001
From: yinzuomei
Date: Thu, 18 Jun 2020 19:22:00 +0800
Subject: [PATCH 23/46] =?UTF-8?q?=E6=94=AF=E9=83=A8=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E8=81=94=E8=B0=831?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../gov-access/gov-access-server/deploy/docker-compose-dev.yml | 2 +-
epmet-module/gov-access/gov-access-server/pom.xml | 2 +-
.../gov-grid/gov-grid-server/deploy/docker-compose-dev.yml | 2 +-
epmet-module/gov-grid/gov-grid-server/pom.xml | 2 +-
.../gov-mine/gov-mine-server/deploy/docker-compose-dev.yml | 2 +-
epmet-module/gov-mine/gov-mine-server/pom.xml | 2 +-
.../gov-voice/gov-voice-server/deploy/docker-compose-dev.yml | 2 +-
epmet-module/gov-voice/gov-voice-server/pom.xml | 2 +-
.../resi-partymember-server/deploy/docker-compose-dev.yml | 2 +-
epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
index abaec853c1..ab57a9ad78 100644
--- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-access-server:
container_name: gov-access-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.29
+ image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.30
ports:
- "8099:8099"
network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml
index 417d37bd68..59db24d39b 100644
--- a/epmet-module/gov-access/gov-access-server/pom.xml
+++ b/epmet-module/gov-access/gov-access-server/pom.xml
@@ -2,7 +2,7 @@
- 0.3.29
+ 0.3.30
gov-access
com.epmet
diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
index eca2c5e296..c0526f7dc4 100644
--- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-grid-server:
container_name: gov-grid-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.31
+ image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.32
ports:
- "8097:8097"
network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml
index 2bd779f6d6..dbb668ed8f 100644
--- a/epmet-module/gov-grid/gov-grid-server/pom.xml
+++ b/epmet-module/gov-grid/gov-grid-server/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- 0.3.31
+ 0.3.32
com.epmet
gov-grid
diff --git a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
index 16a76313ad..b0be248605 100644
--- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-mine-server:
container_name: gov-mine-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.27
+ image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.28
ports:
- "8098:8098"
network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml
index d57997ab36..3225ee7fc7 100644
--- a/epmet-module/gov-mine/gov-mine-server/pom.xml
+++ b/epmet-module/gov-mine/gov-mine-server/pom.xml
@@ -2,7 +2,7 @@
- 0.3.27
+ 0.3.28
com.epmet
gov-mine
diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
index 80855c22df..d0c6fc3725 100644
--- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-voice-server:
container_name: gov-voice-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.54
+ image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.55
ports:
- "8105:8105"
network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml
index 713902afb2..3a717c945f 100644
--- a/epmet-module/gov-voice/gov-voice-server/pom.xml
+++ b/epmet-module/gov-voice/gov-voice-server/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- 0.3.54
+ 0.3.55
gov-voice
com.epmet
diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
index 489eda12a8..c1d6aca556 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
resi-partymember-server:
container_name: resi-partymember-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.45
+ image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.46
ports:
- "8096:8096"
network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
index 9935d6590c..000ef70163 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
@@ -2,7 +2,7 @@
4.0.0
- 0.3.45
+ 0.3.46
com.epmet
resi-partymember
From 8651575bbc2a84fc51076ff6f39dcdc217ff65c5 Mon Sep 17 00:00:00 2001
From: yinzuomei
Date: Thu, 18 Jun 2020 19:42:44 +0800
Subject: [PATCH 24/46] =?UTF-8?q?govaccess=E6=B3=A8=E5=86=8C=E5=88=B0nacos?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../gov-access-server/deploy/docker-compose-dev.yml | 2 +-
epmet-module/gov-access/gov-access-server/pom.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
index ab57a9ad78..4942ae0478 100644
--- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-access-server:
container_name: gov-access-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.30
+ image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.31
ports:
- "8099:8099"
network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml
index 59db24d39b..4329949cca 100644
--- a/epmet-module/gov-access/gov-access-server/pom.xml
+++ b/epmet-module/gov-access/gov-access-server/pom.xml
@@ -2,7 +2,7 @@
- 0.3.30
+ 0.3.31
gov-access
com.epmet
@@ -120,7 +120,7 @@
6379
123456
- false
+ true
122.152.200.70:8848
fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b
Date: Thu, 18 Jun 2020 20:10:51 +0800
Subject: [PATCH 26/46] =?UTF-8?q?govgrid=E5=8D=87=E7=BA=A70.3.33?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../gov-grid/gov-grid-server/deploy/docker-compose-dev.yml | 2 +-
epmet-module/gov-grid/gov-grid-server/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
index c0526f7dc4..9948b50133 100644
--- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-grid-server:
container_name: gov-grid-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.32
+ image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.33
ports:
- "8097:8097"
network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml
index dbb668ed8f..08a2b680a9 100644
--- a/epmet-module/gov-grid/gov-grid-server/pom.xml
+++ b/epmet-module/gov-grid/gov-grid-server/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- 0.3.32
+ 0.3.33
com.epmet
gov-grid
From ce7b567db89b814926c0483d7d13ac12ee7e6d7b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 18 Jun 2020 20:32:12 +0800
Subject: [PATCH 27/46] =?UTF-8?q?=E6=94=AF=E9=83=A8=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=EF=BC=9A=E6=9F=A5=E7=9C=8B=E5=85=9A=E5=91=98=E8=AF=A6=E6=83=85?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9v2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/epmet/dto/result/PartyMemberInfoDetailResultDTO.java | 2 +-
.../partymember/controller/PartymemberBaseInfoController.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberInfoDetailResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberInfoDetailResultDTO.java
index e86f90e7e4..b64a8b5462 100644
--- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberInfoDetailResultDTO.java
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberInfoDetailResultDTO.java
@@ -59,7 +59,7 @@ public class PartyMemberInfoDetailResultDTO implements Serializable {
private String partyBranchId;
public PartyMemberInfoDetailResultDTO(){
- this.partyBranchId="";
+ this.partyMemberId="";
this.name="";
this.idCard="";
this.mobile="";
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java
index 37b24fd4e2..f5fd7ec421 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java
@@ -159,7 +159,7 @@ public class PartymemberBaseInfoController {
* @Date 2020/6/18 17:15
**/
@GetMapping("queryPartyMemberBaseInfoById/{partyMemberId}")
- public Result queryPartyMemberBaseInfoById(String partyMemberId){
+ public Result queryPartyMemberBaseInfoById(@PathVariable("partyMemberId") String partyMemberId){
return new Result().ok(partymemberBaseInfoService.queryPartyMemberBaseInfoById(partyMemberId));
}
From dfc8411b0484d15d59c059b80149ee8865f35d6e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 18 Jun 2020 20:33:27 +0800
Subject: [PATCH 28/46] =?UTF-8?q?ResiPartyMemberOpenFeignClient=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resi/partymember/feign/ResiPartyMemberOpenFeignClient.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java
index dbd66a9ed2..5785bf4489 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java
@@ -20,6 +20,7 @@ import java.util.List;
* @author yinzuomei@elink-cn.com
* @date 2020/6/4 13:12
*/
+//@FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = ResiPartyMemberOpenFeignClientFallback.class,url = "http://localhost:8096")
@FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = ResiPartyMemberOpenFeignClientFallback.class)
public interface ResiPartyMemberOpenFeignClient {
From a308119dc46e99f61f8b64a755eb2725e52d6326 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 18 Jun 2020 20:36:11 +0800
Subject: [PATCH 29/46] =?UTF-8?q?govgrid=E3=80=81resi-party=E5=8D=87?=
=?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../gov-grid/gov-grid-server/deploy/docker-compose-dev.yml | 2 +-
epmet-module/gov-grid/gov-grid-server/pom.xml | 2 +-
.../resi-partymember-server/deploy/docker-compose-dev.yml | 2 +-
epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
index 9948b50133..cb578b1d6a 100644
--- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-grid-server:
container_name: gov-grid-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.33
+ image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.34
ports:
- "8097:8097"
network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml
index 08a2b680a9..295b9215ea 100644
--- a/epmet-module/gov-grid/gov-grid-server/pom.xml
+++ b/epmet-module/gov-grid/gov-grid-server/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- 0.3.33
+ 0.3.34
com.epmet
gov-grid
diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
index c1d6aca556..fa0745ad87 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
resi-partymember-server:
container_name: resi-partymember-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.46
+ image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.47
ports:
- "8096:8096"
network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
index 000ef70163..0bc26cf2c6 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
@@ -2,7 +2,7 @@
4.0.0
- 0.3.46
+ 0.3.47
com.epmet
resi-partymember
From f45951afbf10fc5d5d2797afeb83c1d4c13fc834 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 19 Jun 2020 09:06:01 +0800
Subject: [PATCH 30/46] =?UTF-8?q?govgrid=E3=80=81resi-party=E5=8D=87?=
=?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../gov-grid/gov-grid-server/deploy/docker-compose-dev.yml | 2 +-
epmet-module/gov-grid/gov-grid-server/pom.xml | 2 +-
.../resi-partymember-server/deploy/docker-compose-dev.yml | 2 +-
epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
index cb578b1d6a..f8249a176d 100644
--- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-grid-server:
container_name: gov-grid-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.34
+ image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.35
ports:
- "8097:8097"
network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml
index 295b9215ea..8c1ff3bd35 100644
--- a/epmet-module/gov-grid/gov-grid-server/pom.xml
+++ b/epmet-module/gov-grid/gov-grid-server/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- 0.3.34
+ 0.3.35
com.epmet
gov-grid
diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
index fa0745ad87..f3df2c490a 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
resi-partymember-server:
container_name: resi-partymember-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.47
+ image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.48
ports:
- "8096:8096"
network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
index 0bc26cf2c6..885a1c4a04 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
@@ -2,7 +2,7 @@
4.0.0
- 0.3.47
+ 0.3.48
com.epmet
resi-partymember
From 24a924b1dd62aa1a52ced7e8ed580b5d799900c9 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 19 Jun 2020 10:19:54 +0800
Subject: [PATCH 31/46] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=BA=AB=E4=BB=BD?=
=?UTF-8?q?=E8=AF=81=E5=8F=B7=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tools/enums/RequirePermissionEnum.java | 12 +-
.../validator/IdCardNoValidatorUtils.java | 205 +++++++++++++++++-
2 files changed, 205 insertions(+), 12 deletions(-)
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
index e5e5bb9a2d..a694f585fb 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
@@ -111,12 +111,12 @@ public enum RequirePermissionEnum {
/**
* 基层治理-支部管理
*/
- WORK_GRASSROOTS_PARTY_BRANCH_ADD("work_grassroots_party_branch_add","添加党支部","支部管理-添加党支部"),
- WORK_GRASSROOTS_PARTY_BRANCH_EDIT("work_grassroots_party_branch_edit","编辑党支部","支部管理-编辑党支部信息"),
- WORK_GRASSROOTS_PARTY_BRANCH_DELETE("work_grassroots_party_branch_delete","删除党支部","支部管理-删除党支部"),
- WORK_GRASSROOTS_PARTY_MEMBER_ADD("work_grassroots_party_member_add","添加党员","支部管理-添加党员"),
- WORK_GRASSROOTS_PARTY_MEMBER_EDIT("work_grassroots_party_member_edit","编辑党员","支部管理-编辑党员"),
- WORK_GRASSROOTS_PARTY_MEMBER_DELETE("work_grassroots_party_member_delete","删除党员","支部管理-删除党员");
+ WORK_GRASSROOTS_PARTY_BRANCH_ADD("work_grassroots_party_branch_add","支部管理-添加党支部","支部管理-添加党支部"),
+ WORK_GRASSROOTS_PARTY_BRANCH_EDIT("work_grassroots_party_branch_edit","支部管理-编辑党支部","支部管理-编辑党支部信息"),
+ WORK_GRASSROOTS_PARTY_BRANCH_DELETE("work_grassroots_party_branch_delete","支部管理-删除党支部","支部管理-删除党支部"),
+ WORK_GRASSROOTS_PARTY_MEMBER_ADD("work_grassroots_party_member_add","支部管理-添加党员","支部管理-添加党员"),
+ WORK_GRASSROOTS_PARTY_MEMBER_EDIT("work_grassroots_party_member_edit","支部管理-编辑党员","支部管理-编辑党员"),
+ WORK_GRASSROOTS_PARTY_MEMBER_DELETE("work_grassroots_party_member_delete","支部管理-删除党员","支部管理-删除党员");
private String key;
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java
index cc93d9f3a8..2aa3e2c964 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java
@@ -1,19 +1,212 @@
package com.epmet.commons.tools.validator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.Hashtable;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static java.util.regex.Pattern.*;
+
/**
- * 描述一下
+ * 身份证号校验
*
* @author yinzuomei@elink-cn.com
* @date 2020/6/18 9:59
*/
public class IdCardNoValidatorUtils {
- //判断身份证号是否正确
- public static boolean checkIsIdCardNo(String idCardNo){
- return true;
+
+ private static Logger logger = LoggerFactory.getLogger(IdCardNoValidatorUtils.class);
+
+ /**
+ * 身份证验证
+ *
+ * @param idCardNo
+ * @return 校验信息，correct为成功，失败会返回对应的失败原因
+ */
+ public static boolean checkIsIdCardNo(String idCardNo) {
+ String[] wf = {"1", "0", "X", "9", "8", "7", "6", "5", "4", "3", "2"};
+ String[] checkCode = {"7", "9", "10", "5", "8", "4", "2", "1", "6", "3", "7", "9", "10", "5", "8", "4", "2"};
+ String iDCardNo = "";
+ try {
+ //判断号码的长度 15位或18位
+ if (idCardNo.length() != 15 && idCardNo.length() != 18) {
+ logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证号码长度应该为15位或18位"));
+ return false;
+ }
+ if (idCardNo.length() == 18) {
+ String lastStr = idCardNo.substring(idCardNo.length() - 1);
+ if (!Character.isDigit(lastStr.charAt(0))) {
+ if (Character.isLowerCase(lastStr.charAt(0))) {
+ logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "18身份证号最后一位字母需要大写"));
+ return false;
+ }
+ } else {
+ logger.info(String.format("身份证号%s最后一位为数字"));
+ }
+ }
+ if (idCardNo.length() == 18) {
+ iDCardNo = idCardNo.substring(0, 17);
+ } else if (idCardNo.length() == 15) {
+ iDCardNo = idCardNo.substring(0, 6) + "19" + idCardNo.substring(6, 15);
+ }
+ if (isStrNum(iDCardNo) == false) {
+ logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证15位号码都应为数字;18位号码除最后一位外,都应为数字"));
+ return false;
+ }
+ //判断出生年月
+ String strYear = iDCardNo.substring(6, 10);// 年份
+ String strMonth = iDCardNo.substring(10, 12);// 月份
+ String strDay = iDCardNo.substring(12, 14);// 月份
+ if (isStrDate(strYear + "-" + strMonth + "-" + strDay) == false) {
+ logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证生日无效"));
+ return false;
+ }
+ GregorianCalendar gc = new GregorianCalendar();
+ SimpleDateFormat s = new SimpleDateFormat("yyyy-MM-dd");
+ if ((gc.get(Calendar.YEAR) - Integer.parseInt(strYear)) > 150 || (gc.getTime().getTime() - s.parse(strYear + "-" + strMonth + "-" + strDay).getTime()) < 0) {
+ logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证生日不在有效范围"));
+ return false;
+ }
+ if (Integer.parseInt(strMonth) > 12 || Integer.parseInt(strMonth) == 0) {
+ logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证月份无效"));
+ return false;
+ }
+ if (Integer.parseInt(strDay) > 31 || Integer.parseInt(strDay) == 0) {
+ logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证日期无效"));
+ return false;
+ }
+ //判断地区码
+ Hashtable h = GetAreaCode();
+ if (h.get(iDCardNo.substring(0, 2)) == null) {
+ logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证地区编码错误"));
+ return false;
+ }
+ //判断最后一位
+ int theLastOne = 0;
+ for (int i = 0; i < 17; i++) {
+ theLastOne = theLastOne + Integer.parseInt(String.valueOf(iDCardNo.charAt(i))) * Integer.parseInt(checkCode[i]);
+ }
+ int modValue = theLastOne % 11;
+ String strVerifyCode = wf[modValue];
+ iDCardNo = iDCardNo + strVerifyCode;
+
+ if (idCardNo.length() == 18 && !iDCardNo.equals(idCardNo)) {
+ logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证无效，不是合法的身份证号码"));
+ return false;
+ }
+
+ } catch (Exception e) {
+ logger.error(String.format("校验身份证号方法异常"));
+ e.printStackTrace();
+ }
+ return true;
+ }
+
+ /**
+ * 地区代码
+ *
+ * @return Hashtable
+ */
+ private static Hashtable GetAreaCode() {
+ Hashtable hashtable = new Hashtable();
+ hashtable.put("11", "北京");
+ hashtable.put("12", "天津");
+ hashtable.put("13", "河北");
+ hashtable.put("14", "山西");
+ hashtable.put("15", "内蒙古");
+ hashtable.put("21", "辽宁");
+ hashtable.put("22", "吉林");
+ hashtable.put("23", "黑龙江");
+ hashtable.put("31", "上海");
+ hashtable.put("32", "江苏");
+ hashtable.put("33", "浙江");
+ hashtable.put("34", "安徽");
+ hashtable.put("35", "福建");
+ hashtable.put("36", "江西");
+ hashtable.put("37", "山东");
+ hashtable.put("41", "河南");
+ hashtable.put("42", "湖北");
+ hashtable.put("43", "湖南");
+ hashtable.put("44", "广东");
+ hashtable.put("45", "广西");
+ hashtable.put("46", "海南");
+ hashtable.put("50", "重庆");
+ hashtable.put("51", "四川");
+ hashtable.put("52", "贵州");
+ hashtable.put("53", "云南");
+ hashtable.put("54", "西藏");
+ hashtable.put("61", "陕西");
+ hashtable.put("62", "甘肃");
+ hashtable.put("63", "青海");
+ hashtable.put("64", "宁夏");
+ hashtable.put("65", "新疆");
+ hashtable.put("71", "台湾");
+ hashtable.put("81", "香港");
+ hashtable.put("82", "澳门");
+ hashtable.put("91", "国外");
+ return hashtable;
+ }
+
+ /**
+ * 判断字符串是否为数字
+ *
+ * @param str
+ * @return
+ */
+ private static boolean isStrNum(String str) {
+ Pattern pattern = compile("[0-9]*");
+ Matcher isNum = pattern.matcher(str);
+ if (isNum.matches()) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * 判断字符串是否为日期格式
+ *
+ * @param strDate
+ * @return
+ */
+ public static boolean isStrDate(String strDate) {
+ Pattern pattern = compile("^((\\d{2}(([02468][048])|([13579][26]))[\\-\\/\\s]?((((0?[13578])|(1[02]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])))))|(\\d{2}(([02468][1235679])|([13579][01345789]))[\\-\\/\\s]?((((0?[13578])|(1[02]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|(1[0-9])|(2[0-8]))))))(\\s(((0?[0-9])|([1-2][0-3]))\\:([0-5]?[0-9])((\\s)|(\\:([0-5]?[0-9])))))?$");
+ Matcher m = pattern.matcher(strDate);
+ if (m.matches()) {
+ return true;
+ } else {
+ return false;
+ }
}
- //根据身份证号判断性别
+
+ //根据身份证号判断性别 1男2女0未知
public static String getGender(String idCard) {
- return "1";
+ String gender = "0";
+ if (!IdCardNoValidatorUtils.checkIsIdCardNo(idCard)) {
+ return gender;
+ }
+ if (idCard.length() == 18) {
+ if (Integer.parseInt(idCard.substring(16).substring(0, 1)) % 2 == 0) {
+ gender = "2";
+ } else {
+ gender = "1";
+ }
+ } else if (idCard.length() == 15) {
+ String usex = idCard.substring(14, 15);
+ if (Integer.parseInt(usex) % 2 == 0) {
+ gender = "2";
+ } else {
+ gender = "1";
+ }
+ }
+ return gender;
}
+
}
+
From 65ea28dd768a4153ce735bb38ff38431f001a620 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 19 Jun 2020 10:25:31 +0800
Subject: [PATCH 32/46] =?UTF-8?q?=E5=8A=9F=E8=83=BDkey=20name=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tools/enums/RequirePermissionEnum.java | 38 +++++++++----------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
index a694f585fb..9de4b0d167 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
@@ -76,23 +76,23 @@ public enum RequirePermissionEnum {
/**
* 基层治理-议题管理
*/
- WORK_GRASSROOTS_ISSUE_VOTINGLIST("work_grassroots_issue_voting_list","表决中","表决中议题列表查询"),
- WORK_GRASSROOTS_ISSUE_SHIFTED_PROJECT_LIST("work_grassroots_issue_shifted_project_list", "已转项目列表查询","已转项目议题列表查询"),
- WORK_GRASSROOTS_ISSUE_CLOSED_LIST("work_grassroots_issue_closed_list","已关闭","已关闭议题列表查询"),
- WORK_GRASSROOTS_ISSUE_DETAIL("work_grassroots_issue_detail", "议题详情","议题详情界面所有的api添加此校验"),
- WORK_GRASSROOTS_ISSUE_SHIFT_PROJECT("work_grassroots_issue_shift_project", "转项目","转项目（选择处理部门api也需要添加此校验）"),
- WORK_GRASSROOTS_ISSUE_CLOSE("work_grassroots_issue_close","关闭议题","关闭议题"),
+ WORK_GRASSROOTS_ISSUE_VOTINGLIST("work_grassroots_issue_voting_list","基层治理:议题管理:表决中","表决中议题列表查询"),
+ WORK_GRASSROOTS_ISSUE_SHIFTED_PROJECT_LIST("work_grassroots_issue_shifted_project_list", "基层治理:议题管理:已转项目列表查询","已转项目议题列表查询"),
+ WORK_GRASSROOTS_ISSUE_CLOSED_LIST("work_grassroots_issue_closed_list","基层治理:议题管理:已关闭","已关闭议题列表查询"),
+ WORK_GRASSROOTS_ISSUE_DETAIL("work_grassroots_issue_detail", "基层治理:议题管理:议题详情","议题详情界面所有的api添加此校验"),
+ WORK_GRASSROOTS_ISSUE_SHIFT_PROJECT("work_grassroots_issue_shift_project", "基层治理:议题管理:转项目","转项目（选择处理部门api也需要添加此校验）"),
+ WORK_GRASSROOTS_ISSUE_CLOSE("work_grassroots_issue_close","基层治理:议题管理:关闭议题","关闭议题"),
/**
* 工作-项目跟踪
*/
- WORK_PROJECT_TRACE_PENDING_LIST("work_project_trace_pending_list","待处理","待处理的项目，列表查询"),
- WORK_PROJECT_TRACE_CREATED_LIST("work_project_trace_created_list","我发起","我发起的项目，列表查询"),
- WORK_PROJECT_TRACE_INVOLVED_LIST("work_project_trace_involved_list","我参与","我参与的项目，列表查询"),
- WORK_PROJECT_TRACE_DETAIL("work_project_trace_detail","项目详情","项目详情界面所有的api添加此校验"),
- WORK_PROJECT_TRACE_CLOSE("work_project_trace_close","结案","结案"),
- WORK_PROJECT_TRACE_TRANSFER("work_project_trace_transfer","转其他部门","转其他部门（选择处理部门api也需要添加此校验）"),
- WORK_PROJECT_TRACE_RETURN("work_project_trace_return","退回","退回"),
+ WORK_PROJECT_TRACE_PENDING_LIST("work_project_trace_pending_list","项目跟踪:待处理","待处理的项目，列表查询"),
+ WORK_PROJECT_TRACE_CREATED_LIST("work_project_trace_created_list","项目跟踪:我发起","我发起的项目，列表查询"),
+ WORK_PROJECT_TRACE_INVOLVED_LIST("work_project_trace_involved_list","项目跟踪:我参与","我参与的项目，列表查询"),
+ WORK_PROJECT_TRACE_DETAIL("work_project_trace_detail","项目跟踪:项目详情","项目详情界面所有的api添加此校验"),
+ WORK_PROJECT_TRACE_CLOSE("work_project_trace_close","项目跟踪:结案","结案"),
+ WORK_PROJECT_TRACE_TRANSFER("work_project_trace_transfer","项目跟踪:转其他部门","转其他部门（选择处理部门api也需要添加此校验）"),
+ WORK_PROJECT_TRACE_RETURN("work_project_trace_return","项目跟踪:退回","退回"),
/**
* 党务工作-党建声音
@@ -111,12 +111,12 @@ public enum RequirePermissionEnum {
/**
* 基层治理-支部管理
*/
- WORK_GRASSROOTS_PARTY_BRANCH_ADD("work_grassroots_party_branch_add","支部管理-添加党支部","支部管理-添加党支部"),
- WORK_GRASSROOTS_PARTY_BRANCH_EDIT("work_grassroots_party_branch_edit","支部管理-编辑党支部","支部管理-编辑党支部信息"),
- WORK_GRASSROOTS_PARTY_BRANCH_DELETE("work_grassroots_party_branch_delete","支部管理-删除党支部","支部管理-删除党支部"),
- WORK_GRASSROOTS_PARTY_MEMBER_ADD("work_grassroots_party_member_add","支部管理-添加党员","支部管理-添加党员"),
- WORK_GRASSROOTS_PARTY_MEMBER_EDIT("work_grassroots_party_member_edit","支部管理-编辑党员","支部管理-编辑党员"),
- WORK_GRASSROOTS_PARTY_MEMBER_DELETE("work_grassroots_party_member_delete","支部管理-删除党员","支部管理-删除党员");
+ WORK_GRASSROOTS_PARTY_BRANCH_ADD("work_grassroots_party_branch_add","基层治理:支部管理:添加党支部","支部管理-添加党支部"),
+ WORK_GRASSROOTS_PARTY_BRANCH_EDIT("work_grassroots_party_branch_edit","基层治理:支部管理:编辑党支部","支部管理-编辑党支部信息"),
+ WORK_GRASSROOTS_PARTY_BRANCH_DELETE("work_grassroots_party_branch_delete","基层治理:支部管理:删除党支部","支部管理-删除党支部"),
+ WORK_GRASSROOTS_PARTY_MEMBER_ADD("work_grassroots_party_member_add","基层治理:支部管理:添加党员","支部管理-添加党员"),
+ WORK_GRASSROOTS_PARTY_MEMBER_EDIT("work_grassroots_party_member_edit","基层治理:支部管理:编辑党员","支部管理-编辑党员"),
+ WORK_GRASSROOTS_PARTY_MEMBER_DELETE("work_grassroots_party_member_delete","基层治理:支部管理:删除党员","支部管理-删除党员");
private String key;
From addfd6405cafef495ab9c40bd3d4da4c9af02e3a Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 19 Jun 2020 10:26:24 +0800
Subject: [PATCH 33/46] =?UTF-8?q?=E6=94=AF=E9=83=A8=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=9A=E5=91=98=EF=BC=8C=E6=A0=A1=E9=AA=8C?=
=?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=EF=BC=8C=E5=88=A4=E6=96=AD?=
=?UTF-8?q?=E6=80=A7=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resi-partymember-server/deploy/docker-compose-dev.yml | 2 +-
epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
index f3df2c490a..9eececd562 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
resi-partymember-server:
container_name: resi-partymember-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.48
+ image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.49
ports:
- "8096:8096"
network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
index 885a1c4a04..3b38da7c3b 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
@@ -2,7 +2,7 @@
4.0.0
- 0.3.48
+ 0.3.49
com.epmet
resi-partymember
From ab6ecaf06de39a917905a17beeaba1894b9e3412 Mon Sep 17 00:00:00 2001
From: wxz
Date: Fri, 19 Jun 2020 12:48:11 +0800
Subject: [PATCH 34/46] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=EF=BC=9A=E5=88=9D?=
=?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=AE=A2=E6=88=B7=E6=93=8D=E4=BD=9C=EF=BC=8C?=
=?UTF-8?q?"=E4=B8=BA=E5=AE=A2=E6=88=B7=E5=88=9D=E5=A7=8B=E5=8C=96?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E8=8C=83=E5=9B=B4"?=
=?UTF-8?q?=E5=8A=A8=E4=BD=9C=E8=B0=83=E6=95=B4=EF=BC=8C=E6=93=8D=E4=BD=9C?=
=?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E8=8C=83=E5=9B=B4?=
=?UTF-8?q?=E4=B8=8D=E5=86=8D=E7=BB=9F=E4=B8=80=EF=BC=8C=E5=90=8C=E4=B8=80?=
=?UTF-8?q?=E4=B8=AA=E6=93=8D=E4=BD=9C=E5=9C=A8=E4=B8=8D=E5=90=8C=E7=9A=84?=
=?UTF-8?q?=E8=A7=92=E8=89=B2=E4=B8=8B=E5=B0=86=E6=9C=89=E4=B8=8D=E5=90=8C?=
=?UTF-8?q?=E7=9A=84=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../OperationScopeDefaultResultDTO.java | 20 +++++++++++
.../epmet/dao/OperationScopeDefaultDao.java | 9 +++++
.../entity/OperationScopeDefaultEntity.java | 2 ++
.../impl/RoleOperationServiceImpl.java | 33 ++++++++++++++++---
.../mapper/OperationScopeDefaultDao.xml | 17 ++++++++++
5 files changed, 76 insertions(+), 5 deletions(-)
create mode 100644 epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/OperationScopeDefaultResultDTO.java
diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/OperationScopeDefaultResultDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/OperationScopeDefaultResultDTO.java
new file mode 100644
index 0000000000..4c1f593712
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/OperationScopeDefaultResultDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+@Data
+public class OperationScopeDefaultResultDTO {
+
+ private String roleKey;
+
+ /**
+ * 操作key
+ */
+ private String operationKey;
+
+ /**
+ * 范围key
+ */
+ private String scopeKey;
+
+}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperationScopeDefaultDao.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperationScopeDefaultDao.java
index 5e38a89f31..2c54dccd0e 100755
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperationScopeDefaultDao.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperationScopeDefaultDao.java
@@ -18,8 +18,10 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.OperationScopeDefaultResultDTO;
import com.epmet.entity.OperationScopeDefaultEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -32,4 +34,11 @@ import java.util.List;
@Mapper
public interface OperationScopeDefaultDao extends BaseDao {
List listAllValid();
+
+ /**
+ * 根据角色key和操作key查询默认操作权限列表
+ * @param roleKey
+ * @return
+ */
+ List listDefaultOpeScopes(@Param("roleKey") String roleKey);
}
\ No newline at end of file
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationScopeDefaultEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationScopeDefaultEntity.java
index 04d8f7baf9..6ec89eb12b 100755
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationScopeDefaultEntity.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationScopeDefaultEntity.java
@@ -38,6 +38,8 @@ public class OperationScopeDefaultEntity extends BaseEpmetEntity {
private static final long serialVersionUID = 1L;
+ private String roleKey;
+
/**
* 操作key
*/
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/RoleOperationServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/RoleOperationServiceImpl.java
index e3c4d16d5d..28943e74b8 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/RoleOperationServiceImpl.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/RoleOperationServiceImpl.java
@@ -29,6 +29,7 @@ import com.epmet.dao.RoleOperationDefaultDao;
import com.epmet.dao.RoleScopeDao;
import com.epmet.dto.RoleOperationDTO;
import com.epmet.dto.form.InitDefaultOperationsFormDTO;
+import com.epmet.dto.result.OperationScopeDefaultResultDTO;
import com.epmet.dto.result.RoleOperationDefaultResultDTO;
import com.epmet.dto.result.RoleOperationResultDTO;
import com.epmet.entity.OperationScopeDefaultEntity;
@@ -124,9 +125,6 @@ public class RoleOperationServiceImpl extends BaseServiceImpl roles) {
- List validScopeDefaults = operationScopeDefaultDao.listAllValid();
- HashMap> opeScopeMap = convertScopeDefaultEntity2Map(validScopeDefaults);
-
for (InitDefaultOperationsFormDTO.InitDefaultOpesRoleDTO role : roles) {
String roleId = role.getRoleId();
String roleKey = role.getRoleKey();
@@ -134,7 +132,7 @@ public class RoleOperationServiceImpl extends BaseServiceImpl operations, HashMap> opeScopeMap) {
+ public void initDefaultOperationScopesForRole(String roleId, String roleKey, List operations) {
+ HashMap> opeScopeMap = listDefaultOpeScopesMap(roleKey);
for (RoleOperationDefaultResultDTO operation : operations) {
+ // 该角色，该操作的操作范围列表
Set scopeKeys4ThisOpe = opeScopeMap.get(operation.getOperationKey());
if (!CollectionUtils.isEmpty(scopeKeys4ThisOpe)) {
for (String scopeKey : scopeKeys4ThisOpe) {
@@ -174,6 +174,11 @@ public class RoleOperationServiceImpl extends BaseServiceImpl> listDefaultOpeScopesMap(String roleKey) {
+ List defaultScopes = operationScopeDefaultDao.listDefaultOpeScopes(roleKey);
+ return convertScopeDefaultDto2Map(defaultScopes);
+ }
+
/**
* 将默认范围entity转换为map
* @param entities
@@ -192,4 +197,22 @@ public class RoleOperationServiceImpl extends BaseServiceImpl> convertScopeDefaultDto2Map(List dtos) {
+ HashMap> map = new HashMap<>();
+ for (OperationScopeDefaultResultDTO dto : dtos) {
+ Set scopes = map.get(dto.getOperationKey());
+ if (scopes == null) {
+ scopes = new HashSet<>();
+ map.put(dto.getOperationKey(), scopes);
+ }
+ scopes.add(dto.getScopeKey());
+ }
+ return map;
+ }
+
}
\ No newline at end of file
diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDefaultDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDefaultDao.xml
index 5e3e76a426..1145048233 100755
--- a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDefaultDao.xml
+++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDefaultDao.xml
@@ -5,6 +5,7 @@
+ SELECT id,
+ role_key,
+ operation_key,
+ scope_key,
+ del_flag,
+ revision,
+ created_by,
+ created_time,
+ updated_by,
+ updated_time
+ FROM operation_scope_default
+ WHERE ROLE_KEY = #{roleKey}
+
+
\ No newline at end of file
From e6ef7d778c77c76bd742b6768b327131e626aca5 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 19 Jun 2020 14:46:40 +0800
Subject: [PATCH 35/46] =?UTF-8?q?=E6=94=AF=E9=83=A8=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=EF=BC=9A=E6=B3=A8=E5=86=8C=E5=85=9A=E5=91=98=E8=87=AA=E5=8A=A8?=
=?UTF-8?q?=E5=8C=B9=E9=85=8D=E6=88=90=E5=8A=9F=E3=80=81=E4=BA=BA=E5=B7=A5?=
=?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=98=AF=E5=85=9A=E5=91=98=EF=BC=8C=E6=96=B0?=
=?UTF-8?q?=E5=A2=9Epartymember=5Fauth=5Frecord?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../epmet/dto/form/PartyBranchAddFormDTO.java | 1 -
.../epmet/constant/PartyMemberConstant.java | 5 +++
.../service/PartymemberAuthRecordService.java | 11 +++++
.../impl/PartyMemberConfirmServiceImpl.java | 24 +++++++----
.../PartymemberAuthRecordServiceImpl.java | 42 ++++++++++++++++++-
.../impl/PartymemberBaseInfoServiceImpl.java | 10 +++--
.../impl/PartymemberInfoServiceImpl.java | 6 +--
7 files changed, 82 insertions(+), 17 deletions(-)
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchAddFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchAddFormDTO.java
index 29ac589a4f..3de9a6f231 100644
--- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchAddFormDTO.java
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchAddFormDTO.java
@@ -45,7 +45,6 @@ public class PartyBranchAddFormDTO implements Serializable {
/**
* 党支部概要信息
*/
- @NotBlank(message = "请输入支部概要信息", groups = {AddUserShowGroup.class})
@Length(max = 500, message = "支部概要信息不能超过500个字", groups = AddUserShowGroup.class)
private String profile;
}
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java
index bb0795b43b..ab366fd058 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java
@@ -135,4 +135,9 @@ public interface PartyMemberConstant {
* 已读
*/
String READ = "read";
+
+ /**
+ * 党员详情界面：账号于2020年10月31日在海泊桥社区-第一网格激活
+ */
+ String AUTH_DESC="账户于%s年%s月%s日在%s激活";
}
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberAuthRecordService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberAuthRecordService.java
index e0a3245038..1087dc909b 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberAuthRecordService.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberAuthRecordService.java
@@ -20,6 +20,7 @@ package com.epmet.modules.partymember.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.modules.partymember.entity.PartymemberAuthRecordEntity;
+import com.epmet.modules.partymember.entity.PartymemberInfoEntity;
import com.epmet.resi.partymember.dto.partymember.PartymemberAuthRecordDTO;
import java.util.List;
@@ -92,4 +93,14 @@ public interface PartymemberAuthRecordService extends BaseService init(PartyMemberInitFromDTO fromDto) {
@@ -182,7 +184,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
return new Result().error(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
}*/
- //获取党员基本信息
+ //获取党员基本信息(匹配)
PartymemberConfirmAutoDTO confirmAutoDTO =
partymemberBaseInfoService.getPartyMemberBaseInfo(partyMemberInfoDTO);
@@ -212,6 +214,9 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
partyMemberInfoEntity.setConfirmResult(PartyMemberConstant.AUTO_CONFIRM_SUCCESS);
if (partyMemberInfoEntity.getId().isEmpty()) {
partymemberInfoService.insert(partyMemberInfoEntity);
+ //记录当前居民与党员库关系，保存认证信息
+ logger.info(String.format("党员认证自动匹配成功,保存partymember_auth_record,userId=%s,党员库id=%s",partyMemberInfoEntity.getUserId(),confirmAutoDTO.getPatryMemberBaseInfoId()));
+ partymemberAuthRecordService.insert(partyMemberInfoEntity,confirmAutoDTO.getPatryMemberBaseInfoId());
} else {
partymemberInfoService.updateById(partyMemberInfoEntity);
}
@@ -256,7 +261,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
PartymemberConfirmAutoEntity.class));
}
}
-
+ //
//判断是否已注册居民，如果没有则注册居民
isResiRegister(partyMemberInfoDTO);
@@ -301,7 +306,6 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
PartymemberInfoEntity partyMemberInfoEntity = partymemberInfoService.selectById(fromDTO.getPartyMemberId());
partyMemberInfoEntity.setId(manualEntity.getPartymemberInfoId());
partyMemberInfoEntity.setConfirmResult(fromDTO.getPartyMemberFlag());
-
partymemberInfoService.updateById(partyMemberInfoEntity);
manualEntity.setAuditStatus(fromDTO.getPartyMemberFlag());
@@ -326,6 +330,12 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
identityParam.setUserId(partyMemberInfoEntity.getUserId());
identityParam.setPartyFlag(NumConstant.ONE_STR);
resiGroupFeignClient.updateWhenAuditedResiRole(identityParam);
+ //如果是自动匹配失败的，人工审核他是党员，需要记录党员库-居民的认证关系
+ PartymemberConfirmAutoDTO partymemberConfirmAutoDTO=partymemberConfirmAutoService.get(fromDTO.getAutoId());
+ if(partymemberConfirmAutoDTO!=null){
+ logger.info(String.format("自动匹配失败,人工审核是党员,保存partymember_auth_record,userId=%s,党员库id=%s",partyMemberInfoEntity.getUserId(),partymemberConfirmAutoDTO.getPatryMemberBaseInfoId()));
+ partymemberAuthRecordService.insert(partyMemberInfoEntity,partymemberConfirmAutoDTO.getPatryMemberBaseInfoId());
+ }
} else {
auditMessageToResi(partyMemberInfoEntity, PartyMemberMessageConstant.AUDIT_REJECT_MSG);
}
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberAuthRecordServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberAuthRecordServiceImpl.java
index 8c303050d4..0252d78942 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberAuthRecordServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberAuthRecordServiceImpl.java
@@ -20,20 +20,28 @@ package com.epmet.modules.partymember.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.PartyMemberConstant;
+import com.epmet.dto.result.GridInfoResultDTO;
+import com.epmet.feign.GovOrgOpenFeignClient;
import com.epmet.modules.partymember.dao.PartymemberAuthRecordDao;
import com.epmet.modules.partymember.entity.PartymemberAuthRecordEntity;
+import com.epmet.modules.partymember.entity.PartymemberInfoEntity;
import com.epmet.modules.partymember.redis.PartymemberAuthRecordRedis;
import com.epmet.modules.partymember.service.PartymemberAuthRecordService;
import com.epmet.resi.partymember.dto.partymember.PartymemberAuthRecordDTO;
import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
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.Calendar;
import java.util.List;
import java.util.Map;
@@ -45,9 +53,11 @@ import java.util.Map;
*/
@Service
public class PartymemberAuthRecordServiceImpl extends BaseServiceImpl implements PartymemberAuthRecordService {
-
+ private static final Logger logger = LoggerFactory.getLogger(PartymemberAuthRecordServiceImpl.class);
@Autowired
private PartymemberAuthRecordRedis partymemberAuthRecordRedis;
+ @Autowired
+ private GovOrgOpenFeignClient govOrgOpenFeignClient;
@Override
public PageData page(Map params) {
@@ -101,4 +111,32 @@ public class PartymemberAuthRecordServiceImpl extends BaseServiceImpl result=govOrgOpenFeignClient.queryGridInfo(partymemberAuthRecordEntity.getGridId());
+ String gridName="";
+ if(result.success()&&null!=result.getData()){
+ gridName=String.format("%s-%s",result.getData().getParentAgencyName(),result.getData().getGridName());
+ }else{
+ logger.error("保存用户认证党员记录失败:查询网格名称失败");
+ }
+ partymemberAuthRecordEntity.setAuthDesc(String.format(PartyMemberConstant.AUTH_DESC,
+ calendar.get(Calendar.YEAR),
+ calendar.get(Calendar.MONTH)+1,
+ calendar.get(Calendar.DATE),
+ gridName));
+ baseDao.insert(partymemberAuthRecordEntity);
+ logger.info(String.format("保存用户认证党员记录成功:认证描述%s",partymemberAuthRecordEntity.getAuthDesc()));
+ }
+
}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java
index 890d88a175..ae51f2cc19 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java
@@ -330,11 +330,12 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl gridInfoResult = govOrgFeignClient.queryGridInfo(formDTO.getGridId());
String gridFullPath = "";
if (gridInfoResult.success() && null != gridInfoResult.getData()) {
- gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName(),
+ /*gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName(),
gridInfoResult.getData().getCommnuityName(),
gridInfoResult.getData().getGridName());
gridFullPath = gridFullPath.replaceAll("null", "").trim();
- gridFullPath = gridFullPath.replaceAll("--", "-").trim();
+ gridFullPath = gridFullPath.replaceAll("--", "-").trim();*/
+ gridFullPath=String.format("%s-%s",gridInfoResult.getData().getParentAgencyName(),gridInfoResult.getData().getGridName());
}
//查询居民认证信息，获取居民头像
List userIdList = new ArrayList<>();
@@ -373,11 +374,12 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl gridInfoResult = govOrgFeignClient.queryGridInfo(formDTO.getGridId());
String gridFullPath = "";
if (gridInfoResult.success() && null != gridInfoResult.getData()) {
- gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName() == null?"":gridInfoResult.getData().getStreetName(),
+ /*gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName() == null?"":gridInfoResult.getData().getStreetName(),
gridInfoResult.getData().getCommnuityName() == null?"":gridInfoResult.getData().getCommnuityName(),
gridInfoResult.getData().getGridName() == null?"":gridInfoResult.getData().getGridName());
gridFullPath = gridFullPath.replaceAll("null", "").trim();
- gridFullPath = gridFullPath.replaceAll("--", "-").trim();
+ gridFullPath = gridFullPath.replaceAll("--", "-").trim();*/
+ gridFullPath=String.format("%s-%s",gridInfoResult.getData().getParentAgencyName(),gridInfoResult.getData().getGridName());
}
//查询居民认证信息，获取居民头像
List userIdList = new ArrayList<>();
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java
index 77a6eaa634..4803ebef14 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java
@@ -29,7 +29,6 @@ import com.epmet.dto.form.CreatedTimeByUserIdFormDTO;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.dto.result.CreatedTimeByUserIdResultDTO;
import com.epmet.dto.result.GridInfoResultDTO;
-import com.epmet.dto.result.SelectGridNameByGridIdResultDTO;
import com.epmet.modules.feign.EpmetUserFeignClient;
import com.epmet.modules.feign.GovOrgFeignClient;
import com.epmet.modules.partymember.dao.PartymemberInfoDao;
@@ -159,10 +158,11 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl gridInfoResult = govOrgFeignClient.queryGridInfo(certifiedFormDTO.getGridId());
String gridFullPath = "";
if (gridInfoResult.success() && null != gridInfoResult.getData()) {
- gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName() == null?"":gridInfoResult.getData().getStreetName(),
+ /*gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName() == null?"":gridInfoResult.getData().getStreetName(),
gridInfoResult.getData().getCommnuityName() == null?"":gridInfoResult.getData().getCommnuityName(),
gridInfoResult.getData().getGridName() == null?"":gridInfoResult.getData().getGridName());
- gridFullPath = gridFullPath.replaceAll("--", "").trim();
+ gridFullPath = gridFullPath.replaceAll("--", "").trim();*/
+ gridFullPath=String.format("%s-%s",gridInfoResult.getData().getParentAgencyName(),gridInfoResult.getData().getGridName());
}
for (CertifiedResultDTO datum : listResult.getData()) {
datum.setGridFullPath(gridFullPath);
From 9ef43c26f2b14caac82e067822f92aac6bc6460a Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 19 Jun 2020 14:55:09 +0800
Subject: [PATCH 36/46] =?UTF-8?q?govgrid=E3=80=81resipartymember=E6=9C=8D?=
=?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../gov-grid/gov-grid-server/deploy/docker-compose-dev.yml | 2 +-
epmet-module/gov-grid/gov-grid-server/pom.xml | 2 +-
.../resi-partymember-server/deploy/docker-compose-dev.yml | 2 +-
epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
index f8249a176d..1cd20945f9 100644
--- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-grid-server:
container_name: gov-grid-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.35
+ image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.36
ports:
- "8097:8097"
network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml
index 8c1ff3bd35..4e0313a293 100644
--- a/epmet-module/gov-grid/gov-grid-server/pom.xml
+++ b/epmet-module/gov-grid/gov-grid-server/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- 0.3.35
+ 0.3.36
com.epmet
gov-grid
diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
index 9eececd562..c700a7b085 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
resi-partymember-server:
container_name: resi-partymember-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.49
+ image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.50
ports:
- "8096:8096"
network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
index 3b38da7c3b..b7715679a3 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
@@ -2,7 +2,7 @@
4.0.0
- 0.3.49
+ 0.3.50
com.epmet
resi-partymember
From 5e310f7595c9661518c3482bb2f551af01ad8e7f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 19 Jun 2020 17:28:46 +0800
Subject: [PATCH 37/46] =?UTF-8?q?=E6=94=AF=E9=83=A8=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E4=BD=93=E9=AA=8C=E7=89=88=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../deploy/docker-compose-test.yml | 4 +--
.../deploy/docker-compose-test.yml | 4 +--
.../gov-issue/gov-issue-server/pom.xml | 2 +-
.../db/migration/V0.0.2__partybranch.sql | 15 +++++++++
.../deploy/docker-compose-test.yml | 4 +--
.../gov-project/gov-project-server/pom.xml | 2 +-
.../deploy/docker-compose-test.yml | 4 +--
.../deploy/docker-compose-test.yml | 2 +-
.../db/migration/V0.0.2__partybranch.sql | 31 +++++++++++++++++++
9 files changed, 57 insertions(+), 11 deletions(-)
create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.2__partybranch.sql
create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.2__partybranch.sql
diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml
index 889491379c..08aedd497f 100644
--- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-grid-server:
container_name: gov-grid-server-test
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-grid-server:0.3.30
+ image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-grid-server:0.3.36
ports:
- "8097:8097"
network_mode: host # 使用现有网络
@@ -14,4 +14,4 @@ services:
resources:
limits:
cpus: '0.1'
- memory: 400M
\ No newline at end of file
+ memory: 350M
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml
index 7825e009a5..56d3dd745b 100644
--- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-issue-server:
container_name: gov-issue-server-test
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-issue-server:0.3.42
+ image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-issue-server:0.3.43
ports:
- "8101:8101"
network_mode: host # 使用现有网络
@@ -14,4 +14,4 @@ services:
resources:
limits:
cpus: '0.1'
- memory: 400M
\ No newline at end of file
+ memory: 350M
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml
index e92c8aa434..2dd11868f2 100644
--- a/epmet-module/gov-issue/gov-issue-server/pom.xml
+++ b/epmet-module/gov-issue/gov-issue-server/pom.xml
@@ -2,7 +2,7 @@
- 0.3.42
+ 0.3.43
gov-issue
com.epmet
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.2__partybranch.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.2__partybranch.sql
new file mode 100644
index 0000000000..673171b04e
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.2__partybranch.sql
@@ -0,0 +1,15 @@
+CREATE TABLE `customer_party_branch` (
+ `ID` varchar(64) NOT NULL COMMENT '主键',
+ `PARTY_BRANCH_NAME` varchar(20) NOT NULL COMMENT '支部名称',
+ `PROFILE` varchar(500) NOT NULL COMMENT '概要',
+ `GRID_ID` varchar(64) NOT NULL COMMENT '党支部所属网格id',
+ `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
+ `TOTAL_PARTY_MEMBER` int(10) NOT NULL COMMENT '党员总数',
+ `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识',
+ `REVISION` int(10) NOT NULL COMMENT '乐观锁',
+ `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+ `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+ `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+ `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+ PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='党支部信息';
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
index d55974b2db..16ec28dfbb 100644
--- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-project-server:
container_name: gov-project-server-test
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:0.3.27
+ image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:0.3.28
ports:
- "8102:8102"
network_mode: host # 使用现有网络
@@ -14,4 +14,4 @@ services:
resources:
limits:
cpus: '0.1'
- memory: 400M
\ No newline at end of file
+ memory: 350M
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml
index 6bec282580..382580cd85 100644
--- a/epmet-module/gov-project/gov-project-server/pom.xml
+++ b/epmet-module/gov-project/gov-project-server/pom.xml
@@ -2,7 +2,7 @@
- 0.3.27
+ 0.3.28
gov-project
com.epmet
diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml
index 36b6cb3e26..75870071a0 100644
--- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-voice-server:
container_name: gov-voice-server-test
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.54
+ image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.55
ports:
- "8105:8105"
network_mode: host # 使用现有网络
@@ -14,4 +14,4 @@ services:
resources:
limits:
cpus: '0.1'
- memory: 400M
\ No newline at end of file
+ memory: 350M
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml
index 01ea60963d..4eaf11b7e0 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
resi-partymember-server:
container_name: resi-partymember-server-test
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.44
+ image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.50
ports:
- "8096:8096"
network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.2__partybranch.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.2__partybranch.sql
new file mode 100644
index 0000000000..a91d0feea2
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.2__partybranch.sql
@@ -0,0 +1,31 @@
+CREATE TABLE `partymember_auth_record` (
+ `ID` varchar(64) NOT NULL COMMENT '主键',
+ `PARTYMEMBER_BASE_INFO_ID` varchar(64) NOT NULL COMMENT 'partymember_base_info.id',
+ `USER_ID` varchar(64) NOT NULL COMMENT '认证居民id',
+ `AUTH_TIME` datetime NOT NULL COMMENT '认证时间(和partymember_info表时间一致)',
+ `GRID_ID` varchar(64) NOT NULL COMMENT '认证网格id',
+ `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '认证客户id',
+ `AUTH_DESC` varchar(255) NOT NULL COMMENT '认证的描述：账户于2020年10月30号在海泊桥社区-第一网格激活',
+ `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识',
+ `REVISION` int(10) NOT NULL COMMENT '乐观锁',
+ `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+ `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+ `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+ `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+ PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='党员认证记录表';
+
+
+
+CREATE TABLE `party_branch_members` (
+ `ID` varchar(64) NOT NULL COMMENT '主键',
+ `BRANCH_ID` varchar(64) NOT NULL COMMENT '党支部id，customer_party_branch.id',
+ `PARTYMEMBER_BASE_INFO_ID` varchar(64) NOT NULL COMMENT '党员库表主键,partymember_base_info.id',
+ `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识',
+ `REVISION` int(10) NOT NULL COMMENT '乐观锁',
+ `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+ `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+ `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+ `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+ PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='党支部党员关系表';
\ No newline at end of file
From be61ba7a578e318bdd6a9073c773d88429686d91 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 19 Jun 2020 18:50:00 +0800
Subject: [PATCH 38/46] =?UTF-8?q?govorg=E6=9C=8D=E5=8A=A1=E5=8D=87?=
=?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../gov-org-server/deploy/docker-compose-test.yml | 2 +-
.../db/migration/V0.0.2__partybranch.sql | 15 ---------------
2 files changed, 1 insertion(+), 16 deletions(-)
delete mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.2__partybranch.sql
diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
index 8df1c9c874..57f13f3fc7 100644
--- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-org-server:
container_name: gov-org-server-test
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.66
+ image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.67
ports:
- "8092:8092"
network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.2__partybranch.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.2__partybranch.sql
deleted file mode 100644
index 673171b04e..0000000000
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.2__partybranch.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-CREATE TABLE `customer_party_branch` (
- `ID` varchar(64) NOT NULL COMMENT '主键',
- `PARTY_BRANCH_NAME` varchar(20) NOT NULL COMMENT '支部名称',
- `PROFILE` varchar(500) NOT NULL COMMENT '概要',
- `GRID_ID` varchar(64) NOT NULL COMMENT '党支部所属网格id',
- `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
- `TOTAL_PARTY_MEMBER` int(10) NOT NULL COMMENT '党员总数',
- `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识',
- `REVISION` int(10) NOT NULL COMMENT '乐观锁',
- `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
- `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
- `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
- `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
- PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='党支部信息';
\ No newline at end of file
From 2cf68821974c02cf993756e9f1bca7083fba57bf Mon Sep 17 00:00:00 2001
From: wxz
Date: Sat, 20 Jun 2020 15:33:42 +0800
Subject: [PATCH 39/46] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E8=A7=92=E8=89=B2?=
=?UTF-8?q?=E5=8F=8A=E5=85=B6=E9=BB=98=E8=AE=A4=E6=9D=83=E9=99=90=E7=9B=B8?=
=?UTF-8?q?=E5=85=B3=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../AccessConfigOpeDefaultScopesFormDTO.java | 26 +++++++
.../AccessConfigRoleDefaultOpesFormDTO.java | 18 +++++
...AccessConfigOpeDefaultScopesResultDTO.java | 16 ++++
.../result/RoleOperationDefaultResultDTO.java | 11 ++-
.../controller/AccessConfigController.java | 56 ++++++++++++-
.../epmet/dao/OperationScopeDefaultDao.java | 20 +++++
.../epmet/dao/RoleOperationDefaultDao.java | 7 ++
.../entity/RoleOperationDefaultEntity.java | 3 +-
.../epmet/service/AccessConfigService.java | 11 +++
.../service/impl/AccessConfigServiceImpl.java | 78 +++++++++++++++++++
.../mapper/OperationScopeDefaultDao.xml | 36 +++++++++
.../mapper/RoleOperationDefaultDao.xml | 18 ++++-
.../dto/result/GovStaffRoleResultDTO.java | 3 +
.../controller/GovStaffRoleController.java | 43 ++++++++++
.../com/epmet/controller/RoleController.java | 13 ----
.../java/com/epmet/dao/GovStaffRoleDao.java | 3 +
.../src/main/java/com/epmet/dao/RoleDao.java | 7 --
.../epmet/service/GovStaffRoleService.java | 5 ++
.../java/com/epmet/service/RoleService.java | 2 -
.../service/impl/GovStaffRoleServiceImpl.java | 11 +++
.../epmet/service/impl/RoleServiceImpl.java | 8 --
.../main/resources/mapper/GovStaffRoleDao.xml | 10 +++
.../src/main/resources/mapper/RoleDao.xml | 7 --
23 files changed, 368 insertions(+), 44 deletions(-)
create mode 100644 epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigOpeDefaultScopesFormDTO.java
create mode 100644 epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigRoleDefaultOpesFormDTO.java
create mode 100644 epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/AccessConfigOpeDefaultScopesResultDTO.java
create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GovStaffRoleController.java
diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigOpeDefaultScopesFormDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigOpeDefaultScopesFormDTO.java
new file mode 100644
index 0000000000..86dad3a7a3
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigOpeDefaultScopesFormDTO.java
@@ -0,0 +1,26 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 权限配置-操作默认范围form dto
+ */
+@Data
+public class AccessConfigOpeDefaultScopesFormDTO {
+
+ public interface ListOpeDefaultScopesGroup {}
+ public interface SaveOpeDefaultScopesGroup {}
+
+ @NotBlank(message = "角色Key不能为空", groups = { ListOpeDefaultScopesGroup.class, SaveOpeDefaultScopesGroup.class })
+ private String roleKey;
+
+ @NotBlank(message = "操作Key不能为空", groups = { ListOpeDefaultScopesGroup.class, SaveOpeDefaultScopesGroup.class })
+ private String operationKey;
+
+ private List scopeKeys;
+}
diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigRoleDefaultOpesFormDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigRoleDefaultOpesFormDTO.java
new file mode 100644
index 0000000000..cb6f196403
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigRoleDefaultOpesFormDTO.java
@@ -0,0 +1,18 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * 角色默认操作权限列表from DTO
+ */
+@Data
+public class AccessConfigRoleDefaultOpesFormDTO {
+
+ @NotBlank(message = "角色Key不能为空")
+ private String roleKey;
+
+ private List operationKeys;
+}
diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/AccessConfigOpeDefaultScopesResultDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/AccessConfigOpeDefaultScopesResultDTO.java
new file mode 100644
index 0000000000..53023bd459
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/AccessConfigOpeDefaultScopesResultDTO.java
@@ -0,0 +1,16 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+/**
+ * 权限配置-操作的默认范围result dto
+ */
+@Data
+public class AccessConfigOpeDefaultScopesResultDTO {
+ private String scopeKey;
+ private String scopeName;
+ private String scopeIndex;
+ private String operationKey;
+ private String roleKey;
+ private Boolean assigned;
+}
diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/RoleOperationDefaultResultDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/RoleOperationDefaultResultDTO.java
index a757844fe3..6961dad6ca 100755
--- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/RoleOperationDefaultResultDTO.java
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/RoleOperationDefaultResultDTO.java
@@ -18,7 +18,6 @@
package com.epmet.dto.result;
import java.io.Serializable;
-import java.util.Date;
import lombok.Data;
@@ -48,4 +47,14 @@ public class RoleOperationDefaultResultDTO implements Serializable {
*/
private String operationKey;
+ /**
+ * 操作名称
+ */
+ private String operationName;
+
+ /**
+ * 是否已经具有该操作权限
+ */
+ private Boolean assigned;
+
}
\ No newline at end of file
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessConfigController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessConfigController.java
index 49374b9084..ec11eaa26f 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessConfigController.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessConfigController.java
@@ -2,12 +2,13 @@ package com.epmet.controller;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.form.AccessConfigOpesFormDTO;
-import com.epmet.dto.form.AccessConfigOptionsFormDTO;
-import com.epmet.dto.form.AccessConfigSaveConfigDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO;
import com.epmet.dto.result.AccessConfigOpesResultDTO;
import com.epmet.dto.result.AccessConfigOptionsResultDTO;
+import com.epmet.dto.result.RoleOperationDefaultResultDTO;
import com.epmet.service.AccessConfigService;
+import oracle.jdbc.proxy.annotation.Post;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -22,7 +23,18 @@ public class AccessConfigController {
private AccessConfigService accessConfigService;
/**
- * 列出角色的操作列表(及该操作的scope范围)
+ * 根据roleKey查询角色默认操作列表(包括assigned字段，标识该角色是否已经具有该操作权限)
+ * @param roleKey
+ * @return
+ */
+ @PostMapping("roledefaultops/{roleKey}")
+ public Result listRoleDefaultOps(@PathVariable("roleKey") String roleKey) {
+ List defaultOps = accessConfigService.listRoleDefaultOpsByRoleKey(roleKey);
+ return new Result().ok(defaultOps);
+ }
+
+ /**
+ * 根据角色ID列出角色的操作列表(及该操作的scope范围)
* @param roleId
* @return
*/
@@ -68,4 +80,40 @@ public class AccessConfigController {
return new Result();
}
+ /**
+ * 保存角色默认操作权限列表
+ * @param form
+ * @return
+ */
+ @PostMapping("roledefaultopes/save")
+ public Result saveRoleDefaultOperations(@RequestBody AccessConfigRoleDefaultOpesFormDTO form) {
+ ValidatorUtils.validateEntity(form);
+ accessConfigService.saveRoleDefaultOperations(form.getRoleKey(), form.getOperationKeys());
+ return new Result();
+ }
+
+ /**
+ * 查询操作的默认范围列表
+ * @param form
+ * @return
+ */
+ @PostMapping("opedefaultscopes/list")
+ public Result listOpeDefaultScopes(@RequestBody AccessConfigOpeDefaultScopesFormDTO form) {
+ ValidatorUtils.validateEntity(form, AccessConfigOpeDefaultScopesFormDTO.ListOpeDefaultScopesGroup.class);
+ List scopes = accessConfigService.listOpeDefaultScopes4Role(form.getRoleKey(), form.getOperationKey());
+ return new Result().ok(scopes);
+ }
+
+ /**
+ * 保存操作的默认范围配置
+ * @param form
+ * @return
+ */
+ @PostMapping("opedefaultscopes/save")
+ public Result saveOpeDefaultScopes(@RequestBody AccessConfigOpeDefaultScopesFormDTO form) {
+ ValidatorUtils.validateEntity(form, AccessConfigOpeDefaultScopesFormDTO.SaveOpeDefaultScopesGroup.class);
+ accessConfigService.saveOpeDefaultScopes(form.getRoleKey(), form.getOperationKey(), form.getScopeKeys());
+ return new Result();
+ }
+
}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperationScopeDefaultDao.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperationScopeDefaultDao.java
index 2c54dccd0e..2c9a049e83 100755
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperationScopeDefaultDao.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperationScopeDefaultDao.java
@@ -18,6 +18,7 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO;
import com.epmet.dto.result.OperationScopeDefaultResultDTO;
import com.epmet.entity.OperationScopeDefaultEntity;
import org.apache.ibatis.annotations.Mapper;
@@ -41,4 +42,23 @@ public interface OperationScopeDefaultDao extends BaseDao listDefaultOpeScopes(@Param("roleKey") String roleKey);
+
+ /**
+ * 查询操作的默认范围
+ * @param roleKey
+ * @param operationKey
+ * @return
+ */
+ List listOpeDefaultScopes4Config(
+ @Param("roleKey") String roleKey,
+ @Param("operationKey") String operationKey);
+
+ List listOpeDefaultScopesByRoleAndOpeKey(
+ @Param("roleKey") String roleKey,
+ @Param("operationKey") String operationKey);
+
+ int delete(
+ @Param("roleKey") String roleKey,
+ @Param("operationKey") String operationKey,
+ @Param("scopeKey") String scopeKey);
}
\ No newline at end of file
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/RoleOperationDefaultDao.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/RoleOperationDefaultDao.java
index 820c23bba6..19ccbf901e 100755
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/RoleOperationDefaultDao.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/RoleOperationDefaultDao.java
@@ -18,6 +18,7 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO;
import com.epmet.dto.result.RoleOperationDefaultResultDTO;
import com.epmet.entity.RoleOperationDefaultEntity;
import org.apache.ibatis.annotations.Mapper;
@@ -47,4 +48,10 @@ public interface RoleOperationDefaultDao extends BaseDao listByRoleKey(@Param("roleKey") String roleKey);
+
+ List listRoleDefaultOpsByRoleKey(@Param("roleKey") String roleKey);
+
+ int deleteByRoleKeyAndOpeKey(
+ @Param("roleKey") String roleKey,
+ @Param("operationKey") String operationKey);
}
\ No newline at end of file
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleOperationDefaultEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleOperationDefaultEntity.java
index b19c7e08e0..8ea82b13b9 100755
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleOperationDefaultEntity.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleOperationDefaultEntity.java
@@ -18,12 +18,13 @@
package com.epmet.entity;
import com.baomidou.mybatisplus.annotation.TableName;
-
import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("role_operation_default")
public class RoleOperationDefaultEntity extends BaseEpmetEntity {
private static final long serialVersionUID = 1L;
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessConfigService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessConfigService.java
index e6dfec5878..3fc28b675f 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessConfigService.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessConfigService.java
@@ -1,7 +1,10 @@
package com.epmet.service;
+import com.epmet.dto.form.AccessConfigRoleDefaultOpesFormDTO;
+import com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO;
import com.epmet.dto.result.AccessConfigOpesResultDTO;
import com.epmet.dto.result.AccessConfigOptionsResultDTO;
+import com.epmet.dto.result.RoleOperationDefaultResultDTO;
import java.util.List;
import java.util.Set;
@@ -14,4 +17,12 @@ public interface AccessConfigService {
AccessConfigOptionsResultDTO listScopeOptionsForAccessConfig(String roleId, String operationKey);
void saveConfig(String roleId, String operationKey, Set scopeKeys);
+
+ List listRoleDefaultOpsByRoleKey(String roleKey);
+
+ void saveRoleDefaultOperations(String roleKey, List operationKeys);
+
+ List listOpeDefaultScopes4Role(String roleKey, String operationKey);
+
+ void saveOpeDefaultScopes(String roleKey, String operationKey, List scopeKeys);
}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java
index 78594a96fd..7b635cedf0 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java
@@ -4,6 +4,8 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.dao.*;
import com.epmet.dto.result.*;
+import com.epmet.entity.OperationScopeDefaultEntity;
+import com.epmet.entity.RoleOperationDefaultEntity;
import com.epmet.entity.RoleOperationEntity;
import com.epmet.entity.RoleScopeEntity;
import com.epmet.redis.RoleOpeScopeRedis;
@@ -30,9 +32,15 @@ public class AccessConfigServiceImpl implements AccessConfigService {
@Autowired
private RoleOperationDao roleOperationDao;
+ @Autowired
+ private RoleOperationDefaultDao roleOperationDefaultDao;
+
@Autowired
private RoleScopeDao roleScopeDao;
+ @Autowired
+ private OperationScopeDefaultDao operationScopeDefaultDao;
+
@Override
public List listOpesByRole(String roleId) {
return roleOperationDao.listOpesForAccessConfig(roleId);
@@ -118,4 +126,74 @@ public class AccessConfigServiceImpl implements AccessConfigService {
// 清空redis缓存
roleOpeScopeRedis.delRoleAllOpeScopes(roleId);
}
+
+ @Override
+ public List listRoleDefaultOpsByRoleKey(String roleKey) {
+ return roleOperationDefaultDao.listRoleDefaultOpsByRoleKey(roleKey);
+ }
+
+ /**
+ *
+ * @param roleKey
+ * @param operationKeys
+ */
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public void saveRoleDefaultOperations(String roleKey, List operationKeys) {
+
+ List opesExists = roleOperationDefaultDao.listByRoleKey(roleKey);
+ Set opeKeysExists = opesExists.stream().map(ope -> ope.getOperationKey()).collect(Collectors.toSet());
+
+ // 过滤出删掉的
+ Set