From 34b1d1fc3407b42b9cf94c905238ff97416ff130 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Tue, 18 Apr 2023 09:32:51 +0800 Subject: [PATCH 1/4] =?UTF-8?q?#=20=E8=AE=A1=E5=88=92=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hzims-service/inspect/pom.xml | 1 + .../hnac/hzims/message/controller/MessagePushRecordController.java | 2 +- .../src/main/java/com/hnac/hzims/message/fegin/MessageClient.java | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hzims-service/inspect/pom.xml b/hzims-service/inspect/pom.xml index 9ac3564..3da9278 100644 --- a/hzims-service/inspect/pom.xml +++ b/hzims-service/inspect/pom.xml @@ -13,6 +13,7 @@ com.hnac.hzinfo.inspect hzinfo-inspect + 4.0.0-SNAPSHOT jar diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/controller/MessagePushRecordController.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/controller/MessagePushRecordController.java index 2bff11e..a09551f 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/controller/MessagePushRecordController.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/controller/MessagePushRecordController.java @@ -70,7 +70,7 @@ public class MessagePushRecordController extends BladeController { @ApiOperationSupport(order = 6) public R readMessage(@PathVariable @ApiParam("消息记录ID") String id) { MessagePushRecordEntity record = messagePushRecordService.getById(id); - if(!record.getPusher().equals(AuthUtil.getUserId())) { + if(!(Long.parseLong(record.getPusher()) == AuthUtil.getUserId())) { return R.fail("当前登录人不是消息推送人，修改状态失败"); } LambdaUpdateWrapper eq = Wrappers.lambdaUpdate() diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java index bf43821..57afdb2 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java @@ -25,6 +25,7 @@ import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.core.tool.utils.SpringUtil; import org.springblade.system.user.cache.UserCache; +import org.springblade.system.user.entity.User; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; @@ -32,6 +33,7 @@ import javax.validation.Valid; import java.time.LocalDateTime; import java.time.ZoneId; import java.util.Arrays; +import java.util.Optional; /** * @author hx @@ -98,7 +100,7 @@ public class MessageClient extends BladeController implements IMessageClient{ entity.setPlanTime(request.getPlanTime()); entity.setPushType(MessageConstants.PLAN); entity.setPusher(request.getReceiver().toString()); - entity.setPusherName(UserCache.getUser(request.getReceiver()).getName()); + entity.setPusherName(Optional.ofNullable(UserCache.getUser(request.getReceiver())).map(User::getName).orElse("")); entity.setAccount(request.getReceiver().toString()); entity.setContent(request.getContent()); entity.setSmsParam(request.getSmsParam()); From 9df9761fc8849576e22d1c2b5f8bb1dd105468b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Tue, 18 Apr 2023 09:45:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=97=A5=E5=B8=B8?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E8=AE=A1=E5=88=92=E5=B7=A1=E6=A3=80=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/SafeEquipmentTrialFeignClient.java | 2 +- .../src/main/resources/application.yml | 2 ++ .../web/AreaMonthlyDetailsController.java | 22 ++++++++++++---------- .../scheduled/MaintenanceTaskCreateTask.java | 6 +++++- .../impl/OperMaintenanceTaskServiceImpl.java | 3 ++- .../serviceimpl/MaintenanceTempleServiceImpl.java | 14 ++++++++------ .../controller/StandardTicketInfoController.java | 1 + .../service/impl/TicketProcessServiceImpl.java | 18 +++++++++++------- 8 files changed, 42 insertions(+), 26 deletions(-) diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/areamonthly/feign/SafeEquipmentTrialFeignClient.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/areamonthly/feign/SafeEquipmentTrialFeignClient.java index 1781d1b..7fec8c9 100644 --- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/areamonthly/feign/SafeEquipmentTrialFeignClient.java +++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/areamonthly/feign/SafeEquipmentTrialFeignClient.java @@ -26,7 +26,7 @@ public interface SafeEquipmentTrialFeignClient { /** * 分页 */ - @GetMapping("/list") + @GetMapping("/safeEquimentTrial/list") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页", notes = "查询条件：createDept,fileName,startTime,endTime") public R> list(SafeEquipmentTrialDTO safeEquipmentTrialDTO, Query query) ; diff --git a/hzims-service/hzims-middle/src/main/resources/application.yml b/hzims-service/hzims-middle/src/main/resources/application.yml index 5630ab0..f3bb7f5 100644 --- a/hzims-service/hzims-middle/src/main/resources/application.yml +++ b/hzims-service/hzims-middle/src/main/resources/application.yml @@ -20,6 +20,8 @@ mybatis-plus: mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml #实体扫描，多个package用逗号或者分号分隔 typeAliasesPackage: com.hnac.hzims.**.entity + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #swagger扫描路径配置 swagger: diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/web/AreaMonthlyDetailsController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/web/AreaMonthlyDetailsController.java index 574821d..1904404 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/web/AreaMonthlyDetailsController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/web/AreaMonthlyDetailsController.java @@ -1,8 +1,6 @@ package com.hnac.hzims.operational.main.controller.web; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.hnac.hzims.operational.access.dto.OperAccessStatisticsDTO; @@ -33,9 +31,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.mp.support.BladePage; -import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springframework.cloud.openfeign.SpringQueryMap; @@ -132,10 +128,10 @@ public class AreaMonthlyDetailsController { /** - * 根据区域和月份分页查询日志维护列表 + * 根据区域和月份分页查询日常维护列表 */ @ApiOperationSupport(order = 100) - @ApiOperation(value = "根据区域和月份分页查询日志维护列表") + @ApiOperation(value = "根据区域和月份分页查询日常维护列表") @GetMapping("/queryLogMaintenancePageList/{page}/{size}") public R> queryLogMaintenancePageList( @ApiParam(name = "page", value = "当前页", required = true) @PathVariable("page") Long page, @@ -148,11 +144,11 @@ public class AreaMonthlyDetailsController { /** - * 根据区域和月份分页查询日志维护 根据id获取详情 + * 根据区域和月份分页查询日常维护 根据id获取详情 */ @GetMapping("/queryLogMaintenancePageList/detail/{id}") @ApiOperationSupport(order = 40) - @ApiOperation(value = "根据区域和月份分页查询日志维护 根据id获取详情") + @ApiOperation(value = "根据区域和月份分页查询日常维护 根据id获取详情") public R detail(@PathVariable Long id) { return taskService.detail(id); } @@ -163,8 +159,14 @@ public class AreaMonthlyDetailsController { */ @ApiOperationSupport(order = 50) @ApiOperation(value = "根据区域和月份分页查询巡检任务") - @GetMapping("/queryCheckTaskPageList") - public R> queryCheckTaskPageList(TaskListQuery task, Query query) { + @GetMapping("/queryCheckTaskPageList/{page}/{size}") + public R> queryCheckTaskPageList( + @ApiParam(name = "page", value = "当前页", required = true) @PathVariable("page") Long page, + @ApiParam(name = "size", value = "每页记录数", required = true) @PathVariable("size") Long size, + TaskListQuery task) { + Query query = new Query(); + query.setCurrent(page.intValue()); + query.setSize(size.intValue()); BladePage taskVoIPage = areaMonthlyDetailsService.queryCheckTaskPageList(task, query); return R.data(taskVoIPage); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java index f243cc1..6229c71 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java @@ -162,6 +162,7 @@ public class MaintenanceTaskCreateTask { return; } } + BeanUtil.copyProperties(planEntity, taskEntity); taskService.save(taskEntity); //生成工作流实例 String processInstanceId = this.startProcessInstance(planEntity.getProcDefId(), taskEntity); @@ -169,6 +170,9 @@ public class MaintenanceTaskCreateTask { taskService.updateById(taskEntity); planEntity.setCreateTaskTime(DateUtil.now()); planMapper.updateById(planEntity); + + taskEntity = taskService.getById(taskEntity.getId()); + //taskEntity.setMessageTemplateId(1646694238095732738L); this.pushTaskMessage(taskEntity); } @@ -207,7 +211,7 @@ public class MaintenanceTaskCreateTask { XxlJobLogger.log("开始保存{}的日常维护消息推送记录",taskEntity.getDisposer()); R templateR = messageClient.getMsgTemplateById(taskEntity.getMessageTemplateId()); if(templateR.isSuccess() && ObjectUtil.isNotEmpty(templateR.getData())) { - Func.toLongList("",taskEntity.getDisposer()).forEach(userId -> { + Func.toLongList(",",taskEntity.getDisposer()).forEach(userId -> { // MessagePushRecordDto recordDto = BeanUtil.copy(templateR.getData(),MessagePushRecordDto.class); // recordDto.setTypes(Arrays.asList(Func.split(recordDto.getType(),","))); // recordDto.setDeptId(taskEntity.getCreateDept()); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java index 19c19d7..56ce66b 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java @@ -341,7 +341,8 @@ public class OperMaintenanceTaskServiceImpl extends BaseServiceImpl queryLogMaintenancePageList(Page pageParam, MaintenanceTaskWithAreaVo areaMonthlyVo) { + public IPage + queryLogMaintenancePageList(Page pageParam, MaintenanceTaskWithAreaVo areaMonthlyVo) { //1.根据区域查询 QueryWrapper queryWrapper = new QueryWrapper<>(); //维护内容 diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/template/serviceimpl/MaintenanceTempleServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/template/serviceimpl/MaintenanceTempleServiceImpl.java index 9c1cce3..44420af 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/template/serviceimpl/MaintenanceTempleServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/template/serviceimpl/MaintenanceTempleServiceImpl.java @@ -5,6 +5,8 @@ import com.hnac.hzims.message.dto.PlanMsgRecordDto; import com.hnac.hzims.message.fegin.IMessageClient; import com.hnac.hzims.safeproduct.template.abstracts.TemplateAbstractService; import com.qiniu.util.Json; +import org.apache.commons.lang3.StringUtils; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.system.user.cache.UserCache; import org.springblade.system.user.entity.User; import org.springframework.stereotype.Service; @@ -16,6 +18,7 @@ import java.util.Optional; /** * 日常维护计划 + * * @Author WL * @Version v1.0 * @Serial 1.0 @@ -25,7 +28,6 @@ import java.util.Optional; public class MaintenanceTempleServiceImpl extends TemplateAbstractService { - /** * 执行具体的业务场景,推送消息 * @@ -33,23 +35,23 @@ public class MaintenanceTempleServiceImpl extends TemplateAbstractService { */ @Override public PlanMsgRecordDto executeTemplateMessage(PlanMsgRecordDto planMsgRecord) { - Map map = new HashMap<>(); - map.put("one", - Optional.ofNullable(UserCache.getUser(planMsgRecord.getReceiver())).map(User::getName).orElse("")); + Map map = new HashMap<>(); + map.put("one", Optional.ofNullable(UserCache.getUser(planMsgRecord.getReceiver())).map(User::getName).orElse("")); map.put("two", planMsgRecord.getPlanTime()); planMsgRecord.setContent(JSON.toJSONString(map)); + planMsgRecord.setResourceCode("aliyun-safeTool-push"); return planMsgRecord; } /** * 模板状态 + * * @param status */ @Override public Boolean isTemplateStatus(int status) { - return Objects.equals(status,1); + return Objects.equals(status, 1); } - } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketInfoController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketInfoController.java index 7e44bfa..af1d2bc 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketInfoController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketInfoController.java @@ -123,6 +123,7 @@ public class StandardTicketInfoController extends BladeController { @SpringQueryMap StandardTicketWithAreaVo areaMonthlyVo) { Page searchPage = new Page<>(page, size); + BladePage standardTicketInfoEntity = standardTicketInfoService.areaMonthlyWithOperation(areaMonthlyVo, searchPage); return R.data(standardTicketInfoEntity); diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java index 94c55ef..164a40c 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java @@ -56,7 +56,7 @@ public class TicketProcessServiceImpl implements TicketProcessService { Map params = new HashMap(2) {{ put("taskId", "1644624168666353665"); - put("signUserIds", AuthUtil.getUserId()); + put("signUserIds", "1377143375838359553"); }}; flowClient.startProcessInstanceContainNameByKey( @@ -64,12 +64,16 @@ public class TicketProcessServiceImpl implements TicketProcessService { "开启工作的任务", params); - R> listR = flowClient.todoList(processDefinitionKey); - listR.getData().forEach(taskList -> { - System.out.println("任务名称："+taskList); - System.out.println(taskList.getTaskName()); - System.out.println(taskList.getStatus()); - }); + // R> listR = flowClient.todoList(processDefinitionKey); + // listR.getData().forEach(taskList -> { + // System.out.println("任务名称："+taskList); + // System.out.println(taskList.getTaskName()); + // System.out.println(taskList.getStatus()); + // }); + + + // flowClient.completeTask() + } } From 1cf980f5e4427a2f051a265ca70adeb888d0224f Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Tue, 18 Apr 2023 09:45:46 +0800 Subject: [PATCH 3/4] =?UTF-8?q?#=20=E8=AE=A1=E5=88=92=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hnac/hzims/message/service/impl/MessagePushRecordServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MessagePushRecordServiceImpl.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MessagePushRecordServiceImpl.java index ae77d04..9e4d2aa 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MessagePushRecordServiceImpl.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MessagePushRecordServiceImpl.java @@ -97,6 +97,7 @@ public class MessagePushRecordServiceImpl extends BaseServiceImpl Date: Tue, 18 Apr 2023 10:58:40 +0800 Subject: [PATCH 4/4] =?UTF-8?q?#=20=E8=AE=A1=E5=88=92=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hnac/hzims/message/schedule/MessagePushSchedule.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/schedule/MessagePushSchedule.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/schedule/MessagePushSchedule.java index db349be..97357e2 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/schedule/MessagePushSchedule.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/schedule/MessagePushSchedule.java @@ -114,9 +114,9 @@ public class MessagePushSchedule { } else if(MessageConstants.SMS_PUSH.equals(type)) { Map params = new HashMap<>(); - list.stream().map(MessagePushRecordEntity::getContent).forEachOrdered(record -> { - JSONObject param = JSONObject.parseObject(record); - param.forEach((k,v) -> { + list.stream().map(MessagePushRecordEntity::getSmsParam).forEachOrdered(param -> { + JSONObject paramJson = JSONObject.parseObject(param); + paramJson.forEach((k,v) -> { params.put(k, params.containsKey(k) && Func.isNotEmpty(params.get(k)) ? params.get(k) + "," + v : (String) v); }); });