Merge remote-tracking branch 'origin/master'

“mitao”

2026-01-21 e7180a965206be1d4ca141dd68b41f50233478e2

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

@@ -2,22 +2,29 @@

import com.estate.expert.admin.domain.business.client.ClientDto;
import com.estate.expert.admin.domain.business.client.clientparam.ClientParam;
import com.estate.expert.admin.domain.report.ReportTemplate;
import com.estate.expert.admin.domain.user.User;
import com.estate.expert.admin.domain.common.request.BatchReq;
import com.estate.expert.admin.domain.common.request.PageReq;
import com.estate.expert.admin.domain.business.client.ClientType;
import com.estate.expert.admin.service.ClientParamService;
import com.estate.expert.admin.service.ClientService;
import com.estate.expert.admin.service.ReportTemplateService;
import com.estate.expert.common.domain.Session;
import com.estate.expert.common.rpc.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

import java.util.List;

import static org.springframework.data.jpa.domain.AbstractPersistable_.id;

@Slf4j
@CrossOrigin
@@ -71,4 +78,11 @@
        clientParamService.saveOrUpdate(clientParam);
        return Result.success();
    }

    @ApiOperation(value = "委托方获取模板",response = ReportTemplate.class)
    @PostMapping("/getTemplate")
    public Result getTemplate(@ApiParam(value = "模板类型0安全 1设备") @RequestParam(value = "type") Integer type) {
        List<ReportTemplate> list = clientParamService.getTemplate(type);
        return Result.success(list);
    }
}