From 9613e34541934b6c4dc772bc1bb8cb6e4cf8f246 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 9 Jul 2020 10:58:58 +0800 Subject: [PATCH] format --- .../controller/AppActivityInfoController.java | 4 ++-- .../police/service/impl/PoliceServiceImpl.java | 15 +++++++-------- .../controller/AppPropertyProjectController.java | 4 ++-- .../project/controller/PropertyController.java | 4 ++-- .../controller/PropertyProjectController.java | 4 ++-- .../PropertyProjectScoreController.java | 2 +- 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/activity/controller/AppActivityInfoController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/activity/controller/AppActivityInfoController.java index 1e5d5d5..76c78cd 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/activity/controller/AppActivityInfoController.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/activity/controller/AppActivityInfoController.java @@ -22,13 +22,13 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.modules.smile.activity.service.ActivityInfoService; +import com.elink.esua.epdc.modules.smile.activity.service.ActivityParticipantService; import com.elink.esua.epdc.smile.dto.activity.form.ActivityDetailFormDTO; import com.elink.esua.epdc.smile.dto.activity.form.ActivityInfoFormDTO; import com.elink.esua.epdc.smile.dto.activity.form.ActivityParticipantFormDTO; import com.elink.esua.epdc.smile.dto.activity.result.ActivityDetailResultDTO; import com.elink.esua.epdc.smile.dto.activity.result.ActivityInfoResultDTO; -import com.elink.esua.epdc.modules.smile.activity.service.ActivityInfoService; -import com.elink.esua.epdc.modules.smile.activity.service.ActivityParticipantService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/police/service/impl/PoliceServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/police/service/impl/PoliceServiceImpl.java index c771d43..ebeabde 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/police/service/impl/PoliceServiceImpl.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/police/service/impl/PoliceServiceImpl.java @@ -30,13 +30,6 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO; import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; -import com.elink.esua.epdc.smile.dto.constant.GroupConstant; -import com.elink.esua.epdc.smile.dto.enums.GroupStateEnum; -import com.elink.esua.epdc.smile.dto.events.form.GroupFormDTO; -import com.elink.esua.epdc.smile.dto.group.GroupDTO; -import com.elink.esua.epdc.smile.dto.police.PoliceDTO; -import com.elink.esua.epdc.smile.dto.police.form.PoliceFormDTO; -import com.elink.esua.epdc.smile.dto.police.result.PoliceResultDTO; import com.elink.esua.epdc.modules.smile.feign.AdminFeignClient; import com.elink.esua.epdc.modules.smile.feign.EventFeignClient; import com.elink.esua.epdc.modules.smile.group.dao.GroupDao; @@ -48,6 +41,13 @@ import com.elink.esua.epdc.modules.smile.police.redis.PoliceRedis; import com.elink.esua.epdc.modules.smile.police.service.PoliceService; import com.elink.esua.epdc.modules.smile.rocketmq.dto.OrganizationModifyDTO; import com.elink.esua.epdc.modules.smile.topic.service.TopicService; +import com.elink.esua.epdc.smile.dto.constant.GroupConstant; +import com.elink.esua.epdc.smile.dto.enums.GroupStateEnum; +import com.elink.esua.epdc.smile.dto.events.form.GroupFormDTO; +import com.elink.esua.epdc.smile.dto.group.GroupDTO; +import com.elink.esua.epdc.smile.dto.police.PoliceDTO; +import com.elink.esua.epdc.smile.dto.police.form.PoliceFormDTO; +import com.elink.esua.epdc.smile.dto.police.result.PoliceResultDTO; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -347,7 +347,6 @@ public class PoliceServiceImpl extends BaseServiceImpl groupEntity.setState(GroupStateEnum.GROUP_STATE_EXAMINATION_PASSED.getValue()); groupEntity.setGroupAvatar(GroupConstant.PROPERTY_GROUP_AVATAR); groupEntity.setGroupName(gridName + "警民群"); -// groupEntity.setGroupCategory(GroupConstant.POLICE_GROUP_CATEGORY); groupEntity.setSectionCode(GroupConstant.POLICE_GROUP_SECTION); groupEntity.setCategoryCode(GroupConstant.POLICE_GROUP_CATEGORY_CODE); groupEntity.setTypeKey(OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY); diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/AppPropertyProjectController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/AppPropertyProjectController.java index 997c3f4..72e0878 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/AppPropertyProjectController.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/AppPropertyProjectController.java @@ -19,13 +19,13 @@ package com.elink.esua.epdc.modules.smile.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.modules.smile.project.service.PropertyProjectScoreService; +import com.elink.esua.epdc.modules.smile.project.service.PropertyProjectService; import com.elink.esua.epdc.smile.dto.project.form.ProjectDetailFormDTO; import com.elink.esua.epdc.smile.dto.project.form.ProjectListFormDTO; import com.elink.esua.epdc.smile.dto.project.form.ProjectScoreFormDTO; import com.elink.esua.epdc.smile.dto.project.result.ProjectDetailResultDTO; import com.elink.esua.epdc.smile.dto.project.result.ProjectListResultDTO; -import com.elink.esua.epdc.modules.smile.project.service.PropertyProjectScoreService; -import com.elink.esua.epdc.modules.smile.project.service.PropertyProjectService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/PropertyController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/PropertyController.java index 6f0a5ea..adac6fc 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/PropertyController.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/PropertyController.java @@ -25,10 +25,10 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.smile.dto.project.PropertyDTO; -import com.elink.esua.epdc.smile.dto.project.result.PropertyDictListResultDTO; import com.elink.esua.epdc.modules.smile.project.excel.PropertyExcel; import com.elink.esua.epdc.modules.smile.project.service.PropertyService; +import com.elink.esua.epdc.smile.dto.project.PropertyDTO; +import com.elink.esua.epdc.smile.dto.project.result.PropertyDictListResultDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/PropertyProjectController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/PropertyProjectController.java index 5a5ab5e..dd63e57 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/PropertyProjectController.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/PropertyProjectController.java @@ -26,9 +26,9 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.smile.dto.project.PropertyProjectDTO; import com.elink.esua.epdc.modules.smile.project.excel.PropertyProjectExcel; import com.elink.esua.epdc.modules.smile.project.service.PropertyProjectService; +import com.elink.esua.epdc.smile.dto.project.PropertyProjectDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -51,7 +51,7 @@ public class PropertyProjectController { private PropertyProjectService propertyProjectService; @GetMapping("page") - @DataFilter(tableAlias = "ep", deptId = "grid_id", prefix = "and",isPendingCreator = false) + @DataFilter(tableAlias = "ep", deptId = "grid_id", prefix = "and", isPendingCreator = false) public Result> page(@RequestParam Map params) { PageData page = propertyProjectService.page(params); return new Result>().ok(page); diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/PropertyProjectScoreController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/PropertyProjectScoreController.java index f5bfb4d..f15be51 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/PropertyProjectScoreController.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/PropertyProjectScoreController.java @@ -25,9 +25,9 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.smile.dto.project.PropertyProjectScoreDTO; import com.elink.esua.epdc.modules.smile.project.excel.PropertyProjectScoreExcel; import com.elink.esua.epdc.modules.smile.project.service.PropertyProjectScoreService; +import com.elink.esua.epdc.smile.dto.project.PropertyProjectScoreDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*;