Merge remote-tracking branch 'origin/master'

“mitao”

2026-01-29 e564c05b04eb3b7d163be20244a6ffa11448354d

 admin-server/src/main/java/com/estate/expert/admin/controller/admin/AccidentBriefController.java

@@ -3,12 +3,14 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.estate.expert.admin.domain.business.accidentbrief.AccidentBrief;
import com.estate.expert.admin.domain.business.accidentclassification.AccidentClassification;
import com.estate.expert.admin.domain.business.screenaccount.ScreenAccount;
import com.estate.expert.admin.domain.business.screenaccount.ScreenAccountAddDto;
import com.estate.expert.admin.domain.business.screenaccount.ScreenAccountEditDto;
import com.estate.expert.admin.domain.business.screenaccount.ScreenAccountEditPasswordDto;
import com.estate.expert.admin.domain.common.request.PageReq;
import com.estate.expert.admin.service.AccidentBriefService;
import com.estate.expert.admin.service.AccidentClassificationService;
import com.estate.expert.admin.service.ScreenAccountService;
import com.estate.expert.admin.utils.MD5Utils;
import com.estate.expert.common.rpc.Result;
@@ -22,6 +24,7 @@

import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.List;

@Slf4j
@CrossOrigin
@@ -33,6 +36,9 @@

    @Resource
    private AccidentBriefService accidentBriefService;

    @Resource
    private AccidentClassificationService accidentClassificationService;

    @ApiOperation(value = "列表")
    @PostMapping("/list")
@@ -51,6 +57,12 @@
        wrapper.eq(AccidentBrief::getDeleted,false);
        wrapper.orderByDesc(AccidentBrief::getCreateTime);
        Page<AccidentBrief> res = accidentBriefService.page(page, wrapper);
        if(!res.getRecords().isEmpty()){
            List<AccidentClassification> list = accidentClassificationService.list(new LambdaQueryWrapper<AccidentClassification>());
            res.getRecords().forEach(item -> {
                item.setClassifyName(list.stream().filter(classify -> classify.getId().equals(item.getClassifyId())).findFirst().get().getName());
            });
        }
        return Result.success(res);
    }

@@ -101,5 +113,16 @@



    @ApiOperation(value = "开启/禁用故事简讯")
    @PostMapping("/enable/{id}")
    public Result enable(@PathVariable Integer id) {
        AccidentBrief accidentBrief = accidentBriefService.getById(id);
        if (accidentBrief == null) {
            return Result.error("故事简讯不存在");
        }
        accidentBrief.setState(accidentBrief.getState()==1?2:1);
        return Result.success(accidentBriefService.updateById(accidentBrief));
    }


}