From b4586286c7a7e280d85fb7a6aa0977492c26d877 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 24 Dec 2021 19:13:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=90=8D=E5=92=8C=E7=B1=BB=E5=90=8D?= =?UTF-8?q?=E7=BB=9F=E7=BB=9F=E6=8D=A2=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ler.java => BaseGridDailyworkController.java} | 10 +++++----- .../opendata/controller/InitDataController.java | 6 +++--- .../epmet/opendata/dao/PatrolRoutineWorkDao.java | 4 ++-- ...kEntity.java => BaseGridDailyworkEntity.java} | 4 ++-- .../OpenDataPatrolChangeEventListener.java | 4 ++-- ...ervice.java => BaseGridDailyworkService.java} | 4 ++-- ...pl.java => BaseGridDailyworkServiceImpl.java} | 16 ++++++++-------- .../resources/mapper/PatrolRoutineWorkDao.xml | 2 +- .../dto/result/PatrolRoutineWorkResult.java | 2 +- .../impl/PatrolRoutineWorkServiceImpl.java | 4 ++-- .../resources/mapper/PatrolRoutineWorkDao.xml | 14 +++++++++----- 11 files changed, 37 insertions(+), 33 deletions(-) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/{PatrolRoutineWorkController.java => BaseGridDailyworkController.java} (86%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/{PatrolRoutineWorkEntity.java => BaseGridDailyworkEntity.java} (96%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/{PatrolRoutineWorkService.java => BaseGridDailyworkService.java} (89%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/{PatrolRoutingWorkServiceImpl.java => BaseGridDailyworkServiceImpl.java} (93%) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/PatrolRoutineWorkController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BaseGridDailyworkController.java similarity index 86% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/PatrolRoutineWorkController.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BaseGridDailyworkController.java index e04aa8b10f..1c663a2708 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/PatrolRoutineWorkController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BaseGridDailyworkController.java @@ -21,7 +21,7 @@ package com.epmet.opendata.controller; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.opendata.dto.form.UpsertPatrolRecordForm; -import com.epmet.opendata.service.PatrolRoutineWorkService; +import com.epmet.opendata.service.BaseGridDailyworkService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -36,11 +36,11 @@ import org.springframework.web.bind.annotation.RestController; * @since v1.0.0 2021-12-24 */ @RestController -@RequestMapping("patrolroutinework") -public class PatrolRoutineWorkController { +@RequestMapping("basegriddailywork") +public class BaseGridDailyworkController { @Autowired - private PatrolRoutineWorkService patrolRoutineWorkService; + private BaseGridDailyworkService baseGridDailyworkService; /** @@ -50,7 +50,7 @@ public class PatrolRoutineWorkController { @PostMapping("sync") public Result getStaffBaseInfo(@RequestBody(required = false) UpsertPatrolRecordForm formDTO) { ValidatorUtils.validateEntity(formDTO); - patrolRoutineWorkService.insertPatrolRecord(formDTO); + baseGridDailyworkService.insertPatrolRecord(formDTO); return new Result(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/InitDataController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/InitDataController.java index 3d811a690a..3e52870891 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/InitDataController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/InitDataController.java @@ -18,7 +18,7 @@ package com.epmet.opendata.controller; import com.epmet.commons.tools.utils.Result; -import com.epmet.opendata.service.PatrolRoutineWorkService; +import com.epmet.opendata.service.BaseGridDailyworkService; import com.epmet.opendata.service.UserPatrolRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; @@ -40,7 +40,7 @@ public class InitDataController { @Autowired private UserPatrolRecordService userPatrolRecordService; @Autowired - private PatrolRoutineWorkService patrolRoutineWorkService; + private BaseGridDailyworkService baseGridDailyworkService; /** * @Author sun @@ -57,6 +57,6 @@ public class InitDataController { **/ @PostMapping("routineWork/{customerId}") public Result reloadRoutineWorkData(@PathVariable String customerId) { - return new Result().ok(patrolRoutineWorkService.reloadPatrolData(customerId)); + return new Result().ok(baseGridDailyworkService.reloadPatrolData(customerId)); } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/PatrolRoutineWorkDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/PatrolRoutineWorkDao.java index 25ccd881df..62d7112d92 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/PatrolRoutineWorkDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/PatrolRoutineWorkDao.java @@ -19,7 +19,7 @@ package com.epmet.opendata.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.opendata.entity.PatrolRoutineWorkEntity; +import com.epmet.opendata.entity.BaseGridDailyworkEntity; import org.apache.ibatis.annotations.Mapper; /** @@ -29,6 +29,6 @@ import org.apache.ibatis.annotations.Mapper; * @since v1.0.0 2021-12-24 */ @Mapper -public interface PatrolRoutineWorkDao extends BaseDao { +public interface PatrolRoutineWorkDao extends BaseDao { } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/PatrolRoutineWorkEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseGridDailyworkEntity.java similarity index 96% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/PatrolRoutineWorkEntity.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseGridDailyworkEntity.java index 964a242076..d33e232673 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/PatrolRoutineWorkEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseGridDailyworkEntity.java @@ -32,8 +32,8 @@ import java.util.Date; */ @Data @EqualsAndHashCode(callSuper=false) -@TableName("patrol_routine_work") -public class PatrolRoutineWorkEntity implements Serializable { +@TableName("base_grid_dailywork") +public class BaseGridDailyworkEntity implements Serializable { private static final long serialVersionUID = 1L; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java index 034e4ac54b..8c4db7b3e4 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java @@ -11,7 +11,7 @@ import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.constant.SystemMessageType; import com.epmet.opendata.dto.form.UpsertPatrolRecordForm; -import com.epmet.opendata.service.PatrolRoutineWorkService; +import com.epmet.opendata.service.BaseGridDailyworkService; import com.epmet.opendata.service.UserPatrolRecordService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -95,7 +95,7 @@ public class OpenDataPatrolChangeEventListener implements MessageListenerConcurr aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).updatePatrolRecord(patrolRecordForm); break; case SystemMessageType.PATROL_ROUTINE_WORK_ADD: - aBoolean = SpringContextUtils.getBean(PatrolRoutineWorkService.class).insertPatrolRecord(patrolRecordForm); + aBoolean = SpringContextUtils.getBean(BaseGridDailyworkService.class).insertPatrolRecord(patrolRecordForm); break; default: log.error("错误的消息类型:{}", tags); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/PatrolRoutineWorkService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BaseGridDailyworkService.java similarity index 89% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/PatrolRoutineWorkService.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BaseGridDailyworkService.java index cf9e5367e2..0d40bb6aea 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/PatrolRoutineWorkService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BaseGridDailyworkService.java @@ -19,7 +19,7 @@ package com.epmet.opendata.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.opendata.dto.form.UpsertPatrolRecordForm; -import com.epmet.opendata.entity.PatrolRoutineWorkEntity; +import com.epmet.opendata.entity.BaseGridDailyworkEntity; /** * 用户巡查主记录 @@ -27,7 +27,7 @@ import com.epmet.opendata.entity.PatrolRoutineWorkEntity; * @author generator generator@elink-cn.com * @since v1.0.0 2021-10-14 */ -public interface PatrolRoutineWorkService extends BaseService { +public interface BaseGridDailyworkService extends BaseService { /** * desc：根据条件插入巡查记录 diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/PatrolRoutingWorkServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridDailyworkServiceImpl.java similarity index 93% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/PatrolRoutingWorkServiceImpl.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridDailyworkServiceImpl.java index 317a93f07d..ef1a99346a 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/PatrolRoutingWorkServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridDailyworkServiceImpl.java @@ -32,11 +32,11 @@ import com.epmet.opendata.dao.PatrolRoutineWorkDao; import com.epmet.opendata.dto.ExDeptDTO; import com.epmet.opendata.dto.ExUserDTO; import com.epmet.opendata.dto.form.UpsertPatrolRecordForm; -import com.epmet.opendata.entity.PatrolRoutineWorkEntity; +import com.epmet.opendata.entity.BaseGridDailyworkEntity; import com.epmet.opendata.entity.UserPatrolDetailEntity; import com.epmet.opendata.service.ExDeptService; import com.epmet.opendata.service.ExUserService; -import com.epmet.opendata.service.PatrolRoutineWorkService; +import com.epmet.opendata.service.BaseGridDailyworkService; import com.epmet.opendata.service.UserPatrolDetailService; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; @@ -57,7 +57,7 @@ import java.util.Map; */ @Slf4j @Service -public class PatrolRoutingWorkServiceImpl extends BaseServiceImpl implements PatrolRoutineWorkService { +public class BaseGridDailyworkServiceImpl extends BaseServiceImpl implements BaseGridDailyworkService { @Autowired private EpmetUserOpenFeignClient epmetUserOpenFeignClient; @@ -121,7 +121,7 @@ public class PatrolRoutingWorkServiceImpl extends BaseServiceImpl list, boolean isReload, Map deptMap, Map userMap){ - List insertList = new ArrayList<>(); + List insertList = new ArrayList<>(); list.forEach(o-> insertList.add(buildEntity(o, deptMap, userMap))); //insert if (CollectionUtils.isEmpty(insertList)){ @@ -132,8 +132,8 @@ public class PatrolRoutingWorkServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PatrolRoutineWorkEntity::getCustomerId, list.get(0).getCustomerId()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(BaseGridDailyworkEntity::getCustomerId, list.get(0).getCustomerId()); int delete = baseDao.delete(wrapper); log.info("insertRecordBatch del patrol effectRow:{}",delete); this.saveOrUpdateBatch(insertList, NumConstant.ONE_HUNDRED); @@ -157,8 +157,8 @@ public class PatrolRoutingWorkServiceImpl extends BaseServiceImpl deptMap, Map userMap) { - PatrolRoutineWorkEntity entity = new PatrolRoutineWorkEntity(); + private BaseGridDailyworkEntity buildEntity(PatrolRoutineWorkResult record, Map deptMap, Map userMap) { + BaseGridDailyworkEntity entity = new BaseGridDailyworkEntity(); entity.setCustomerId(record.getCustomerId()); ExDeptDTO exDeptDTO = deptMap.getOrDefault(record.getGridId(),new ExDeptDTO()); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml index 94f86ebb27..6a0af99d7c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml @@ -3,7 +3,7 @@ - + diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRoutineWorkResult.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRoutineWorkResult.java index 55566e4094..5db6d41b24 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRoutineWorkResult.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRoutineWorkResult.java @@ -31,7 +31,7 @@ public class PatrolRoutineWorkResult implements Serializable { private String workTypeFirstCode; /** - * 耳机工作类型 code + * 二级工作类型 code */ private String workTypeSecondCode; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java index f6c6928367..f431272c8e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java @@ -107,8 +107,8 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl> mapResult = adminOpenFeignClient.dictTree(DictTypeEnum.PATROL_WORK_TYPE.getCode()); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml index f55c95154a..11427a3b65 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/PatrolRoutineWorkDao.xml @@ -22,16 +22,20 @@ +