Merge branch 'master' of https://gitee.com/xiaochen991015/xizang

无关风月

2025-03-07 4cfbc641e4c94aaedd65eb6eba78105b766348e7

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java

@@ -1,8 +1,11 @@
package com.ruoyi.web.controller.api;


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.*;
@@ -13,12 +16,10 @@
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.util.StringUtils;
import org.springframework.web.bind.annotation.*;

import org.springframework.web.bind.annotation.RestController;

import java.time.LocalDate;
import java.util.List;
import java.util.stream.Collectors;

@@ -43,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;
@@ -54,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);
    }
@@ -116,7 +123,21 @@
    @PostMapping(value = "/addFault")
    public R<String> addFault(@RequestBody TFaultRepairMessageDTO dto) {
        dto.setTenantId(tokenService.getLoginUserApplet().getUserId());
        LocalDate now = LocalDate.now();
        String replace = (now + "").replace("-", "");
        int size = tFaultRepairMessageService.list(new LambdaQueryWrapper<TFaultRepairMessage>()
                .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();
    }