From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java
index fae3037..d53226b 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.SmsUtil;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.TFaultRepairMessageDTO;
import com.ruoyi.system.model.*;
@@ -14,11 +16,8 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
import java.time.LocalDate;
import java.util.List;
@@ -45,9 +44,13 @@
private final TokenService tokenService;
private final TContractService contractService;
private final THouseService houseService;
+ private final SmsUtil smsUtil;
+ private final ISysUserService sysUserService;
+
@Autowired
- public TFaultRepairMessageController(TFaultRepairMessageService tFaultRepairMessageService, TItemService itemService, TItemTypeService itemTypeService, TFaultAreaDicService faultAreaDicService, TFaultDescribeDicService faultDescribeDicService, TokenService tokenService, TContractService contractService, THouseService houseService) {
+ public TFaultRepairMessageController(TFaultRepairMessageService tFaultRepairMessageService, TItemService itemService, TItemTypeService itemTypeService, TFaultAreaDicService faultAreaDicService, TFaultDescribeDicService faultDescribeDicService, TokenService tokenService, TContractService contractService, THouseService houseService,SmsUtil smsUtil
+ ,ISysUserService sysUserService) {
this.tFaultRepairMessageService = tFaultRepairMessageService;
this.itemService = itemService;
this.itemTypeService = itemTypeService;
@@ -56,18 +59,20 @@
this.tokenService = tokenService;
this.contractService = contractService;
this.houseService = houseService;
+ this.smsUtil = smsUtil;
+ this.sysUserService = sysUserService;
}
/**
* 获取维修物品二级结构
*/
@ApiOperation(value = "获取维修物品二级结构")
- @PostMapping(value = "/getItemList")
- public R<List<TItemTypeVO>> getItemList() {
- List<TItemTypeVO> itemTypes = itemTypeService.getItemList();
+ @GetMapping(value = "/getItemList")
+ public R<List<TItemTypeVO>> getItemList(@RequestParam(required = false) String itemName) {
+ List<TItemTypeVO> itemTypes = itemTypeService.getItemList(itemName);
List<TItem> items = itemService.list();
itemTypes.forEach(itemType -> {
- itemType.setItemList(items.stream().filter(item -> itemType.getId().equals(item.getTypeId())).collect(Collectors.toList()));
+ itemType.setItemList(items.stream().filter(item -> itemType.getId().equals(item.getTypeId()) && item.getItemName().contains(itemName)).collect(Collectors.toList()));
});
return R.ok(itemTypes);
}
@@ -124,6 +129,15 @@
.likeRight(TFaultRepairMessage::getCreateTime, LocalDate.now())).size();
dto.setCode(replace.substring(2)+String.format("%03d", size+1));
tFaultRepairMessageService.save(dto);
+ List<SysUser> sysUsers = sysUserService.selectList();
+ if (dto.getRepairType()==2){
+ for (SysUser sysUser : sysUsers) {
+ if (StringUtils.hasLength(sysUser.getPhonenumber())){
+ System.err.println("发送短信");
+ smsUtil.sendSms(sysUser.getPhonenumber(),"2375194",new String[]{});
+ }
+ }
+ }
return R.ok();
}
--
Gitblit v1.7.1