From e564c05b04eb3b7d163be20244a6ffa11448354d Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期四, 29 一月 2026 16:28:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-server/src/main/java/com/estate/expert/admin/controller/admin/ClientController.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/admin-server/src/main/java/com/estate/expert/admin/controller/admin/ClientController.java b/admin-server/src/main/java/com/estate/expert/admin/controller/admin/ClientController.java
index 7e7460c..7fd132d 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/controller/admin/ClientController.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/controller/admin/ClientController.java
@@ -1,23 +1,31 @@
package com.estate.expert.admin.controller.admin;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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
@@ -44,7 +52,7 @@
@ApiOperation(value = "委托方添加")
@PostMapping("/add")
- public Result add(@ApiParam(hidden = true) Session session,
+ public Result add(@ApiParam(hidden = true) Session session,
@Validated @RequestBody ClientDto clientDto) {
clientService.add((User) session.getUser(), clientDto);
return Result.success();
@@ -71,4 +79,20 @@
clientParamService.saveOrUpdate(clientParam);
return Result.success();
}
+
+
+ @ApiOperation(value = "委托方获取参数",response = ClientParam.class)
+ @GetMapping("/getParam")
+ public Result getParam(@RequestParam Integer clientId) {
+ ClientParam clientParam = clientParamService.getOne(new LambdaQueryWrapper<ClientParam>().eq(ClientParam::getClientId, clientId).last("limit 1"));
+ return Result.success(clientParam);
+ }
+
+
+ @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);
+ }
}
--
Gitblit v1.7.1