From af5ac9438d4c5fe173d7fe1aab4915fecc979079 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 22 May 2020 15:04:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=91=E8=AD=A6=E7=BE=A4=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8CPC=E6=96=B0=E5=A2=9E=E6=B0=91=E8=AD=A6=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/modules/group/dao/GroupDao.java | 10 ------ .../police/controller/PoliceController.java | 3 +- .../service/impl/PoliceServiceImpl.java | 11 +++--- .../AppPropertyProjectController.java | 34 +++++++++++++++---- .../main/resources/mapper/group/GroupDao.xml | 19 +++-------- 5 files changed, 39 insertions(+), 38 deletions(-) diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/dao/GroupDao.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/dao/GroupDao.java index 5e4e390..5131ac1 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/dao/GroupDao.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/dao/GroupDao.java @@ -129,16 +129,6 @@ public interface GroupDao extends BaseDao { * @author zhangyuan * @since 2019/11/12 9:35 */ - List selectListOfGroupByDeptIds(List list); - - /** - * 获取社区下所有社群 - * - * @return java.util.List - * @params [deptId] - * @author zhangyuan - * @since 2019/11/12 9:35 - */ List selectListOfGroupByDeptId(@Param("deptId") String deptId); /** diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/controller/PoliceController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/controller/PoliceController.java index de9bfd8..549ff50 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/controller/PoliceController.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/controller/PoliceController.java @@ -65,8 +65,7 @@ public class PoliceController { public Result save(@RequestBody PoliceDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - policeService.save(dto); - return new Result(); + return policeService.save(dto); } @PutMapping diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/service/impl/PoliceServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/service/impl/PoliceServiceImpl.java index a3f1be6..f82ea58 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/service/impl/PoliceServiceImpl.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/service/impl/PoliceServiceImpl.java @@ -31,7 +31,6 @@ import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO; import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; import com.elink.esua.epdc.dto.constant.GroupConstant; import com.elink.esua.epdc.dto.enums.GroupStateEnum; -import com.elink.esua.epdc.dto.group.GroupListDTO; import com.elink.esua.epdc.modules.feign.AdminFeignClient; import com.elink.esua.epdc.modules.group.dao.GroupDao; import com.elink.esua.epdc.modules.group.entity.GroupEntity; @@ -106,7 +105,11 @@ public class PoliceServiceImpl extends BaseServiceImpl PoliceEntity entity = ConvertUtils.sourceToTarget(dto, PoliceEntity.class); // 先查询该社区下有没有网格群，没有就同时创建民警和群，有就表示已经创建过。 List deptList = adminFeignClient.listChildDeptLevelById(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY, entity.getDeptId()).getData(); - List groupList = groupDao.selectListOfGroupByDeptIds(deptList); + // 社区下没有网格 + if (deptList.size() == 0 || dto.getDeptId() == null) { + return new Result().error("新增失败"); + } + List groupList = groupDao.selectListOfGroupByDeptId(entity.getDeptId() + ""); if (groupList.size() == 0) { ParentAndAllDeptDTO parentAndAllDeptDTO = getParentAndAllDeptDTO(dto.getDeptId() + ""); @@ -129,7 +132,7 @@ public class PoliceServiceImpl extends BaseServiceImpl groupEntity.setReferenceBusinessId(entity.getId()); groupEntity.setState(GroupStateEnum.GROUP_STATE_EXAMINATION_PASSED.getValue()); groupEntity.setGroupAvatar(GroupConstant.PROPERTY_GROUP_AVATAR); - groupEntity.setGroupName(entity.getDeptName() + "警民群"); + groupEntity.setGroupName(dept.getDeptName() + "警民群"); groupEntity.setGroupCategory(GroupConstant.POLICE_GROUP_CATEGORY); groupEntity.setGrid(dept.getDeptName()); groupEntity.setGridId(dept.getDeptId()); @@ -137,7 +140,7 @@ public class PoliceServiceImpl extends BaseServiceImpl }); return new Result(); } else { - return new Result().error(); + return new Result().error("新增失败,社区内已有民警"); } } diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/controller/AppPropertyProjectController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/controller/AppPropertyProjectController.java index 62fc42e..1c92f06 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/controller/AppPropertyProjectController.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/controller/AppPropertyProjectController.java @@ -19,11 +19,14 @@ package com.elink.esua.epdc.modules.project.controller; import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.police.form.PoliceFormDTO; +import com.elink.esua.epdc.dto.police.result.PoliceResultDTO; import com.elink.esua.epdc.dto.project.form.ProjectDetailFormDTO; import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO; import com.elink.esua.epdc.dto.project.form.ProjectScoreFormDTO; import com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO; import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO; +import com.elink.esua.epdc.modules.police.service.PoliceService; import com.elink.esua.epdc.modules.project.service.PropertyProjectScoreService; import com.elink.esua.epdc.modules.project.service.PropertyProjectService; import org.springframework.beans.factory.annotation.Autowired; @@ -48,11 +51,14 @@ public class AppPropertyProjectController { @Autowired private PropertyProjectScoreService propertyProjectScoreService; + @Autowired + private PoliceService policeService; + /** * 项目列表 * * @return - * @params [id] + * @params [formDto] * @author zhangyuan * @since 2020/5/13 15:37 */ @@ -65,8 +71,8 @@ public class AppPropertyProjectController { /** * 项目详情 * - * @return - * @params [id] + * @return com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO + * @params [formDto] * @author zhangyuan * @since 2020/5/13 15:37 */ @@ -79,8 +85,8 @@ public class AppPropertyProjectController { /** * 项目详情V2 * - * @return - * @params [id] + * @return com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO + * @params [formDto] * @author zhangyuan * @since 2020/5/13 15:37 */ @@ -93,8 +99,8 @@ public class AppPropertyProjectController { /** * 打分详情 * - * @return - * @params [id] + * @return Result + * @params [formDto] * @author zhangyuan * @since 2020/5/13 15:37 */ @@ -103,4 +109,18 @@ public class AppPropertyProjectController { propertyProjectScoreService.score(formDto); return new Result(); } + + /** + * 获取社区内民警及警民群数据 + * + * @return com.elink.esua.epdc.dto.police.result.PoliceResultDTO + * @params [formDto] + * @author zhangyuan + * @since 2020/5/13 15:37 + */ + @GetMapping("getDeptPolice") + public Result getDeptPolice(@RequestBody PoliceFormDTO formDto) { +// propertyProjectScoreService.score(formDto); + return new Result(); + } } \ No newline at end of file diff --git a/epdc-cloud-property/src/main/resources/mapper/group/GroupDao.xml b/epdc-cloud-property/src/main/resources/mapper/group/GroupDao.xml index a780d15..73d4ad3 100644 --- a/epdc-cloud-property/src/main/resources/mapper/group/GroupDao.xml +++ b/epdc-cloud-property/src/main/resources/mapper/group/GroupDao.xml @@ -311,31 +311,20 @@ ORDER BY epdc_group WHERE DEL_FLAG = '0' + AND GROUP_CATEGORY = '3' AND STATE IN ( 10, 15, 20 ) AND GRID_ID = #{deptId} - -