From 60722ba5e77769314a087a19830660d23e274cd5 Mon Sep 17 00:00:00 2001 From: lujiang Date: Wed, 18 Sep 2024 15:24:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=84=E4=BB=B6=20=E6=89=A9=E5=B1=95?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/RepairAttachController.java | 5 +++-- .../ics/admin/controller/RepairController.java | 2 +- .../com/ics/admin/domain/RepairAttach.java | 6 ++++++ .../com/ics/admin/domain/RepairRemind.java | 2 +- .../ics/admin/mapper/RepairAttachMapper.java | 8 ++++---- .../admin/service/IRepairAttachService.java | 8 ++++---- .../service/impl/RepairAttachServiceImpl.java | 18 +++++++++--------- .../admin/service/impl/RepairServiceImpl.java | 8 ++++---- .../mapper/admin/RepairAttachMapper.xml | 18 +++++++++++------- .../mapper/admin/RepairRemindMapper.xml | 2 +- .../com/ics/task/RepairRemindPushTask.java | 2 +- 11 files changed, 45 insertions(+), 34 deletions(-) diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairAttachController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairAttachController.java index b34bf94..2f02d04 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairAttachController.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairAttachController.java @@ -36,7 +36,7 @@ public class RepairAttachController extends BaseController { private DfsConfig dfsConfig; /** - * 保修上传语音 + * 报修上传语音 */ @RequiresPermissions(value = {"repair:attach:operator", "member:center:view"}, logical = Logical.OR) @PostMapping("upload/voice") @@ -45,7 +45,7 @@ public class RepairAttachController extends BaseController { } /** - * 保修上传图片视频 + * 报修上传图片视频 * * @param file * @param repairId 工单id @@ -81,6 +81,7 @@ public class RepairAttachController extends BaseController { // 上传并返回新文件名称 String url = FileUploadUtils.upload(filePath, file); RepairAttach repairAttach = new RepairAttach(); + repairAttach.setTypeId(0); repairAttach.setRepairId(repairId); repairAttach.setNodeId(nodeId); repairAttach.setOriginalFilename(originalFilename); diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java index 62f47ad..1ea4692 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java @@ -201,7 +201,7 @@ public class RepairController extends BaseController { public R get(@RequestBody Map map) { Long id = map.get("id"); Repair repair = repairService.selectRepairById(id); - Map files=repairAttachService.getAttachMapbyRepairId(id); + Map files=repairAttachService.getAttachMapbyRepairId(id,0); List logList = repairLogService.selectRepairLogListByRepairId(id); return R.ok().put("repair", repair) .put("files", files) diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairAttach.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairAttach.java index 455d491..e295031 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairAttach.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairAttach.java @@ -14,6 +14,12 @@ import lombok.Data; @TableName("ics_repair_attach") public class RepairAttach extends BaseEntity { private static final long serialVersionUID = -202408082136L; + + /** + * 附件类型 0,工单附件，1，会议预约附件 + */ + private Integer typeId = 0; + /** * 工单id */ diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairRemind.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairRemind.java index bf3b493..248d025 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairRemind.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairRemind.java @@ -18,7 +18,7 @@ public class RepairRemind extends BaseEntity { private static final long serialVersionUID = -202408172114L; /** - * 提醒类型 + * 提醒类型 0,工单提醒，1，会议预约提醒 */ private Integer typeId; diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairAttachMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairAttachMapper.java index 9a8a808..b863078 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairAttachMapper.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairAttachMapper.java @@ -30,14 +30,14 @@ public interface RepairAttachMapper { * @param repairId 工单id * @return 附件集合 */ - List selectRepairAttachList(@Param("repairId") Long repairId); + List selectRepairAttachList(@Param("repairId") Long repairId, @Param("typeId") Integer typeId); /** * 获取工单报修的第一张图片url * @param repairId 工单id * @return */ - String getRepairFirstImg(@Param("repairId") Long repairId); + String getRepairFirstImg(@Param("repairId") Long repairId, @Param("typeId") Integer typeId); /** * 新增附件 @@ -54,7 +54,7 @@ public interface RepairAttachMapper { * @param ids 附件id数组 * @return 结果 */ - int updateRepairAttachs(@Param("repairId") Long repairId, @Param("ids") String[] ids); + int updateRepairAttachs(@Param("repairId") Long repairId, @Param("typeId") Integer typeId, @Param("ids") String[] ids); /** * 删除工单附件 @@ -62,7 +62,7 @@ public interface RepairAttachMapper { * @param repairId 工单ID * @return 结果 */ - int deleteByRepairId(Long repairId); + int deleteByRepairId(@Param("repairId") Long repairId, @Param("typeId") Integer typeId); /** * 删除附件 diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairAttachService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairAttachService.java index 8f3bb9d..725f192 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairAttachService.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairAttachService.java @@ -34,7 +34,7 @@ public interface IRepairAttachService { * @param repairId 工单id * @return */ - int updateRepairAttach(long repairId, String[] ids); + int updateRepairAttach(long repairId, Integer typeId, String[] ids); /** * 查询工单所有附件 @@ -42,7 +42,7 @@ public interface IRepairAttachService { * @param repairId 工单id * @return */ - List getListByRepair(Long repairId); + List getListByRepair(Long repairId, Integer typeId); /** * 查询工单所有附件,并分类组合成map @@ -50,7 +50,7 @@ public interface IRepairAttachService { * @param repairId 工单id * @return */ - Map getAttachMapbyRepairId(Long repairId); + Map getAttachMapbyRepairId(Long repairId, Integer typeId); /** * 删除工单附件 @@ -58,7 +58,7 @@ public interface IRepairAttachService { * @param repairId * @return */ - int deleteByRepairId(long repairId); + int deleteByRepairId(long repairId, Integer typeId); /** * 删除附件信息 diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairAttachServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairAttachServiceImpl.java index 06d1dc5..0cb7f28 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairAttachServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairAttachServiceImpl.java @@ -38,19 +38,19 @@ public class RepairAttachServiceImpl implements IRepairAttachService { } @Override - public int updateRepairAttach(long repairId, String[] ids) { - return repairAttachMapper.updateRepairAttachs(repairId, ids); + public int updateRepairAttach(long repairId, Integer typeId, String[] ids) { + return repairAttachMapper.updateRepairAttachs(repairId, typeId, ids); } @Override - public List getListByRepair(Long repairId) { - return repairAttachMapper.selectRepairAttachList(repairId); + public List getListByRepair(Long repairId, Integer typeId) { + return repairAttachMapper.selectRepairAttachList(repairId, typeId); } @Override - public Map getAttachMapbyRepairId(Long repairId) { - List list =repairAttachMapper.selectRepairAttachList(repairId); + public Map getAttachMapbyRepairId(Long repairId, Integer typeId) { + List list = repairAttachMapper.selectRepairAttachList(repairId, typeId); List voices = new ArrayList<>(); List repairs = new ArrayList<>(); List feedbacks = new ArrayList<>(); @@ -73,12 +73,12 @@ public class RepairAttachServiceImpl implements IRepairAttachService { } @Override - public int deleteByRepairId(long repairId) { - List list = repairAttachMapper.selectRepairAttachList(repairId); + public int deleteByRepairId(long repairId, Integer typeId) { + List list = repairAttachMapper.selectRepairAttachList(repairId, typeId); for (RepairAttach repairAttach : list) { deleteFile(repairAttach.getUrl()); } - return repairAttachMapper.deleteByRepairId(repairId); + return repairAttachMapper.deleteByRepairId(repairId, typeId); } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java index b29e8ec..58382fe 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java @@ -295,7 +295,7 @@ public class RepairServiceImpl implements IRepairService { RepairLog oldLog = null; if (from == 0) { repairMapper.insertRepair(repair); - if (files != null && files.length > 0) repairAttachMapper.updateRepairAttachs(repair.getId(), files);//处理附件 + if (files != null && files.length > 0) repairAttachMapper.updateRepairAttachs(repair.getId(),0,files);//处理附件 //处理工单提醒--start for (RepairRemind repairRemind : rList) { repairRemind.setRepairId(repair.getId()); @@ -391,7 +391,7 @@ public class RepairServiceImpl implements IRepairService { IcsCustomerStaff evalUser = customerStaffMapper.selectIcsCustomerStaffById(repair.getEvalUserId()); repair.setEvalUserName(evalUser.getUsername()); } - String url = repairAttachMapper.getRepairFirstImg(repair.getId()); + String url = repairAttachMapper.getRepairFirstImg(repair.getId(),0); repair.setExt1(url); IcsCustomerStaff createUser = customerStaffMapper.selectIcsCustomerStaffById(Long.valueOf(repair.getCreateBy())); repair.setExt2(createUser.getUsername()); @@ -444,7 +444,7 @@ public class RepairServiceImpl implements IRepairService { @Override public int deleteRepairById(Long id) { //删除附件 - repairAttachService.deleteByRepairId(id); + repairAttachService.deleteByRepairId(id,0); //删除日志 repairLogMapper.deleteRepairLogByRId(id); return repairMapper.deleteRepairById(id); @@ -456,7 +456,7 @@ public class RepairServiceImpl implements IRepairService { String[] idsArray = StrUtil.split(ids, ","); for (int i = 0; i < idsArray.length; i++) { Long id = Long.valueOf(idsArray[0]); - repairAttachService.deleteByRepairId(id); + repairAttachService.deleteByRepairId(id,0); //删除日志 repairLogMapper.deleteRepairLogByRId(id); repairMapper.deleteRepairById(id); diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairAttachMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairAttachMapper.xml index dc9d56b..22caea9 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairAttachMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairAttachMapper.xml @@ -6,6 +6,7 @@ + @@ -26,6 +27,7 @@ SELECT id, + type_id, repair_id, node_id, original_filename, @@ -50,18 +52,19 @@ WHERE id = #{id} and delete_flag = 0 - - where repair_id= #{repairId} and delete_flag = 0 + where repair_id= #{repairId} and type_id = #{typeId} and delete_flag = 0 - + select url from ics_repair_attach where repair_id=#{repairId} and node_id=1 and type_id = #{typeId} and delete_flag=0 and ext1='img' order by id limit 1 INSERT INTO ics_repair_attach + type_id, repair_id, node_id, original_filename, @@ -79,6 +82,7 @@ + #{typeId}, #{repairId}, #{nodeId}, #{originalFilename}, @@ -97,16 +101,16 @@ - UPDATE ics_repair_attach set repair_id= #{repairId} where id in + UPDATE ics_repair_attach set repair_id= #{repairId} where type_id = #{typeId} and id in #{id} - + DELETE FROM ics_repair_attach - WHERE repair_id = #{repairId} + WHERE repair_id = #{repairId} and type_id = #{typeId} diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairRemindMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairRemindMapper.xml index c085ca1..9b03d91 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairRemindMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairRemindMapper.xml @@ -6,7 +6,7 @@ - + diff --git a/shoot-hand/ics-web/src/main/java/com/ics/task/RepairRemindPushTask.java b/shoot-hand/ics-web/src/main/java/com/ics/task/RepairRemindPushTask.java index 0953772..a089a36 100644 --- a/shoot-hand/ics-web/src/main/java/com/ics/task/RepairRemindPushTask.java +++ b/shoot-hand/ics-web/src/main/java/com/ics/task/RepairRemindPushTask.java @@ -22,6 +22,6 @@ public class RepairRemindPushTask { public void remindPush() { RepairRemindPushService repairRemindPushService = SpringUtils.getBean(RepairRemindPushService.class); int num = repairRemindPushService.pushWxTemplateMsg(); - log.info("推送公众号" + num + "个工单提醒"); + log.info("推送公众号" + num + "个提醒"); } }