From 7596ef709fa4b7f8720286062e0ded46066948bb Mon Sep 17 00:00:00 2001 From: liwen Date: Thu, 18 Jan 2024 15:13:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=8D=AB=E7=94=9F?= =?UTF-8?q?=E8=87=AA=E6=9F=A5=E3=80=81=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E7=89=B9=E7=A7=8D=E8=AE=BE=E5=A4=87=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hnac/hzims/safeproduct/entity/CarEntity.java | 1 - .../hnac/hzims/safeproduct/entity/DeviceEntity.java | 3 +++ .../hzims/safeproduct/vo/HygieneRecordDetailVO.java | 3 +++ .../safeproduct/controller/DeviceController.java | 6 +++--- .../com/hnac/hzims/safeproduct/jobs/CarJob.java | 10 ++++++++++ .../safeproduct/mapper/CarMaintenanceMapper.xml | 2 +- .../safeproduct/mapper/HygieneRecordMapper.xml | 2 +- .../service/impl/CarMaintenanceServiceImpl.java | 2 +- .../safeproduct/service/impl/CarServiceImpl.java | 4 ++-- .../safeproduct/src/main/resources/db/1.0.2.sql | 5 +++-- .../main/resources/template/卫生自查表.docx | Bin 11350 -> 11332 bytes .../resources/template/车辆维保记录单.docx | Bin 11896 -> 11915 bytes 12 files changed, 27 insertions(+), 11 deletions(-) diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/CarEntity.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/CarEntity.java index 4a0beb3..4db2df7 100644 --- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/CarEntity.java +++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/CarEntity.java @@ -88,7 +88,6 @@ public class CarEntity extends BaseEntity { @ApiModelProperty("保养状态") private String maintenanceStatus; - @NotNull @ApiModelProperty("车辆管理人id") private Long managerId; diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/DeviceEntity.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/DeviceEntity.java index 34776c9..486b76f 100644 --- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/DeviceEntity.java +++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/DeviceEntity.java @@ -58,6 +58,9 @@ public class DeviceEntity extends BaseEntity { @ApiModelProperty("上次检验日期") private Date inspectionLastTime; + @ApiModelProperty("设备管理人id") + private Long managerId; + @Size(max = 50, message = "设备管理人长度不能超过50") @ApiModelProperty("设备管理人") private String manager; diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/HygieneRecordDetailVO.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/HygieneRecordDetailVO.java index da9328f..1aeae76 100644 --- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/HygieneRecordDetailVO.java +++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/HygieneRecordDetailVO.java @@ -24,6 +24,9 @@ public class HygieneRecordDetailVO { @ApiModelProperty("检查人") private String checkUser; + @ApiModelProperty("检查时间") + private Date checkTime; + @ApiModelProperty("责任区id") private String hygieneZoneIds; diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/DeviceController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/DeviceController.java index 768b523..c507455 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/DeviceController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/DeviceController.java @@ -43,7 +43,7 @@ public class DeviceController extends BladeController { @PostMapping("/update") @ApiOperation(value = "修改") @ApiOperationSupport(order = 2) - public R update(DeviceEntity deviceEntity) { + public R update(@Valid @RequestBody DeviceEntity deviceEntity) { return R.status(deviceService.updateById(deviceEntity)); } @@ -63,8 +63,8 @@ public class DeviceController extends BladeController { @GetMapping("/page") @ApiImplicitParams({ - @ApiImplicitParam(name = "unit", value = "单位", dataType = "query", paramType = "string"), - @ApiImplicitParam(name = "plateNumber", value = "车牌号", dataType = "query", paramType = "string") + @ApiImplicitParam(name = "name", value = "设备名称", dataType = "query", paramType = "string"), + @ApiImplicitParam(name = "deviceStatus", value = "设备状态", dataType = "query", paramType = "string") }) @ApiOperation(value = "分页") @ApiOperationSupport(order = 5) diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/CarJob.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/CarJob.java index e386ef5..c150dd7 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/CarJob.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/CarJob.java @@ -12,6 +12,7 @@ import com.hnac.hzims.safeproduct.service.ICarMaintenanceService; import com.hnac.hzims.safeproduct.service.ICarService; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.extern.slf4j.Slf4j; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.utils.DateUtil; import org.springblade.system.feign.ISysClient; @@ -29,6 +30,7 @@ import java.util.List; * @author liwen * @date 2024-01-11 */ +@Slf4j @Component public class CarJob { @@ -92,6 +94,10 @@ public class CarJob { * @param carEntity 车辆实体类 */ private void sendUninsuredMessage(CarEntity carEntity) { + if (carEntity.getManagerId() == null) { + log.error("系统无该用户信息，推送车保过期消息失败"); + return; + } BusinessMessageDTO businessMessageDTO = new BusinessMessageDTO(); String deptId = AuthUtil.getDeptId(); if (StringUtils.isNotEmpty(deptId)) { @@ -115,6 +121,10 @@ public class CarJob { * @param carEntity 车辆实体类 */ private void sendUnMaintainedMessage(CarEntity carEntity) { + if (carEntity.getManagerId() == null) { + log.error("系统无该用户信息，推送维保过期消息失败"); + return; + } BusinessMessageDTO businessMessageDTO = new BusinessMessageDTO(); String deptId = AuthUtil.getDeptId(); if (StringUtils.isNotEmpty(deptId)) { diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarMaintenanceMapper.xml b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarMaintenanceMapper.xml index e9f9afc..4f71d3e 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarMaintenanceMapper.xml +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarMaintenanceMapper.xml @@ -5,7 +5,7 @@ SELECT code, actual_end_time, check_user, hygiene_zone_ids, check_result,comprehensive_score, week_num, - img_path, hygiene_plan_id + img_path, hygiene_plan_id, check_time FROM hzims_hygiene_record WHERE diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarMaintenanceServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarMaintenanceServiceImpl.java index 9672634..ad95b50 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarMaintenanceServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarMaintenanceServiceImpl.java @@ -99,7 +99,7 @@ public class CarMaintenanceServiceImpl extends ServiceImpl implements queryWrapper.lambda().eq(CarEntity::getPlateNumber, carEntity.getPlateNumber()); CarEntity car = this.getOne(queryWrapper); if (car == null) { + carEntity.setMaintenanceStatus(CarMaintenanceStatusEnum.UNMAINTAINED.getValue()); return R.status(this.save(carEntity)); } return R.fail("车牌号已存在"); diff --git a/hzims-service/safeproduct/src/main/resources/db/1.0.2.sql b/hzims-service/safeproduct/src/main/resources/db/1.0.2.sql index 054a765..f315d37 100644 --- a/hzims-service/safeproduct/src/main/resources/db/1.0.2.sql +++ b/hzims-service/safeproduct/src/main/resources/db/1.0.2.sql @@ -240,7 +240,7 @@ CREATE TABLE `hzims_car` ( `maintenance_next_time` date DEFAULT NULL COMMENT '下期保养时间', `maintenance_mileage` decimal(10, 2) DEFAULT NULL COMMENT '保养里程', `maintenance_status` varchar(50) DEFAULT NULL COMMENT '保养状态', - `manager_id` bigint(20) NOT NULL COMMENT '车辆管理人id', + `manager_id` bigint(20) DEFAULT NULL COMMENT '车辆管理人id', `manager` varchar(50) NOT NULL COMMENT '车辆管理人', `img_path` varchar(1000) NOT NULL DEFAULT '' COMMENT '车辆图片', `file_path` varchar(1000) NOT NULL DEFAULT '' COMMENT '车辆附件', @@ -345,7 +345,7 @@ CREATE TABLE `hzims_device` ( `name` varchar(50) NOT NULL COMMENT '设备名称', `type` varchar(50) NOT NULL DEFAULT '' COMMENT '规格型号', `code` varchar(50) NOT NULL COMMENT '编码', - `quality_cerfiticate_no` varchar(255) NOT NULL DEFAULT '' COMMENT '产品合格证号', + `quality_certificate_no` varchar(255) NOT NULL DEFAULT '' COMMENT '产品合格证号', `production_time` date DEFAULT NULL COMMENT '生产日期', `used_time` date DEFAULT NULL COMMENT '使用日期', `used_location` varchar(255) NOT NULL DEFAULT '' COMMENT '使用地点', @@ -353,6 +353,7 @@ CREATE TABLE `hzims_device` ( `inspection_current_time` date DEFAULT NULL COMMENT '本次检验日期', `inspection_next_time` date DEFAULT NULL COMMENT '下次检验日期', `inspection_last_time` date DEFAULT NULL COMMENT '上次检验日期', + `manager_id` bigint(20) DEFAULT NULL COMMENT '设备管理人id', `manager` varchar(50) NOT NULL DEFAULT '' COMMENT '设备管理人', `device_status` varchar(20) NOT NULL DEFAULT 'NORMAL' COMMENT '设备状态', `create_user` bigint(20) NOT NULL DEFAULT '-1' COMMENT '创建人', diff --git a/hzims-service/safeproduct/src/main/resources/template/卫生自查表.docx b/hzims-service/safeproduct/src/main/resources/template/卫生自查表.docx index 07d4aa615bc814daac8cbd789ade58824904329e..80ba5d7281dbf818c957b6d18d8f18f174a2e001 100644 GIT binary patch delta 3891 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 delta 3903 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 ME+__)DgXcg0PRPe#{d8T From 3223c2296253e3fa1d69e277f539b8190c0dc59d Mon Sep 17 00:00:00 2001 From: liwen Date: Thu, 18 Jan 2024 15:58:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hnac/hzims/safeproduct/jobs/CarJob.java | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/CarJob.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/CarJob.java index c150dd7..dc9baef 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/CarJob.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/CarJob.java @@ -14,8 +14,11 @@ import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; import org.springblade.core.secure.utils.AuthUtil; +import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.system.feign.ISysClient; +import org.springblade.system.user.entity.User; +import org.springblade.system.user.feign.IUserClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -46,6 +49,9 @@ public class CarJob { @Autowired ISysClient sysClient; + @Autowired + IUserClient userClient; + /** * 车辆台账自动变更 */ @@ -98,10 +104,12 @@ public class CarJob { log.error("系统无该用户信息，推送车保过期消息失败"); return; } + // 查询用户 + R userRes = userClient.userInfoById(carEntity.getManagerId()); + User user = userRes.getData(); BusinessMessageDTO businessMessageDTO = new BusinessMessageDTO(); - String deptId = AuthUtil.getDeptId(); - if (StringUtils.isNotEmpty(deptId)) { - Long id = Long.valueOf(deptId); + if (StringUtils.isNotEmpty(user.getDeptId())) { + Long id = Long.valueOf(user.getDeptId()); businessMessageDTO.setDeptId(id); businessMessageDTO.setDeptName(sysClient.getDeptName(id).getData()); businessMessageDTO.setBusinessKey("车保到期"); @@ -125,10 +133,12 @@ public class CarJob { log.error("系统无该用户信息，推送维保过期消息失败"); return; } + // 查询用户 + R userRes = userClient.userInfoById(carEntity.getManagerId()); + User user = userRes.getData(); BusinessMessageDTO businessMessageDTO = new BusinessMessageDTO(); - String deptId = AuthUtil.getDeptId(); - if (StringUtils.isNotEmpty(deptId)) { - Long id = Long.valueOf(deptId); + if (StringUtils.isNotEmpty(user.getDeptId())) { + Long id = Long.valueOf(user.getDeptId()); businessMessageDTO.setDeptId(id); businessMessageDTO.setDeptName(sysClient.getDeptName(id).getData()); businessMessageDTO.setBusinessKey("维保到期"); From 8ff603a6de3a2e22979072145b86b4a57111459d Mon Sep 17 00:00:00 2001 From: liwen Date: Thu, 18 Jan 2024 16:42:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?update:=20=E7=89=B9=E7=A7=8D=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E6=B7=BB=E5=8A=A0=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hnac/hzims/safeproduct/jobs/DeviceJob.java | 53 +++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/DeviceJob.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/DeviceJob.java index 2e5c414..81b4964 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/DeviceJob.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/DeviceJob.java @@ -1,11 +1,20 @@ package com.hnac.hzims.safeproduct.jobs; +import com.hnac.hzims.common.constant.CommonConstant; +import com.hnac.hzims.common.logs.utils.StringUtils; +import com.hnac.hzims.message.dto.BusinessMessageDTO; +import com.hnac.hzims.message.fegin.IMessageClient; import com.hnac.hzims.safeproduct.entity.DeviceEntity; import com.hnac.hzims.safeproduct.enums.DeviceStatusEnum; import com.hnac.hzims.safeproduct.service.IDeviceService; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; +import org.springblade.system.feign.ISysClient; +import org.springblade.system.user.entity.User; +import org.springblade.system.user.feign.IUserClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; @@ -19,12 +28,22 @@ import java.util.List; * @author liwen * @date 2024-01-16 */ +@Slf4j @Component public class DeviceJob { @Autowired IDeviceService deviceService; + @Autowired + IUserClient userClient; + + @Autowired + ISysClient sysClient; + + @Autowired + IMessageClient messageClient; + @XxlJob("autoChangeDeviceStatus") public ReturnT autoChangeDeviceStatus(String param) { // 获取时间范围 @@ -37,9 +56,41 @@ public class DeviceJob { if (CollectionUtils.isEmpty(list)) { return ReturnT.SUCCESS; } - list.forEach(e -> e.setDeviceStatus(DeviceStatusEnum.EXPIRED.getValue())); + list.forEach(device -> { + device.setDeviceStatus(DeviceStatusEnum.EXPIRED.getValue()); + sendExpiredMessage(device); + }); // 更新状态 boolean update = deviceService.updateBatchById(list); return update ? ReturnT.SUCCESS : ReturnT.FAIL; } + + /** + * 推送设备过期消息 + * @param deviceEntity 特种设备实体类 + */ + private void sendExpiredMessage(DeviceEntity deviceEntity) { + if (deviceEntity.getManagerId() == null) { + log.error("系统无该用户信息，推送设备过期消息失败"); + return; + } + // 查询用户 + R userRes = userClient.userInfoById(deviceEntity.getManagerId()); + User user = userRes.getData(); + BusinessMessageDTO businessMessageDTO = new BusinessMessageDTO(); + if (StringUtils.isNotEmpty(user.getDeptId())) { + Long id = Long.valueOf(user.getDeptId()); + businessMessageDTO.setDeptId(id); + businessMessageDTO.setDeptName(sysClient.getDeptName(id).getData()); + businessMessageDTO.setBusinessKey("设备到期"); + businessMessageDTO.setBusinessClassify("system"); + businessMessageDTO.setTaskId(deviceEntity.getId()); + businessMessageDTO.setSubject("设备到期通知"); + businessMessageDTO.setContent("您所管理的特种设备" + deviceEntity.getName() + "已到期，请尽快进行检验。"); + businessMessageDTO.setUserIds(String.valueOf(deviceEntity.getManagerId())); + businessMessageDTO.setCreateUser(deviceEntity.getCreateUser()); + businessMessageDTO.setTenantId(CommonConstant.TENANT_ID); + } + messageClient.sendAppAndWsMsgByUsers(businessMessageDTO); + } }