From 2c72fce83175c05c9bdcb43814bc5e08d7fed047 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 21 一月 2026 11:09:13 +0800
Subject: [PATCH] update
---
admin-server/src/main/java/com/estate/expert/admin/service/impl/ClientParamServiceImpl.java | 7 +++++++
admin-server/src/main/java/com/estate/expert/admin/domain/repository/ClientParamMapper.java | 6 ++++++
admin-server/src/main/java/com/estate/expert/admin/service/impl/ReportTemplateServiceImpl.java | 6 ++++++
admin-server/src/main/java/com/estate/expert/admin/service/ClientParamService.java | 6 ++++++
admin-server/src/main/resources/mapper/ClientParamMapper.xml | 7 +++++++
admin-server/src/main/java/com/estate/expert/admin/controller/admin/ClientController.java | 16 +++++++++++++++-
admin-server/src/main/java/com/estate/expert/admin/service/ReportTemplateService.java | 4 ++++
7 files changed, 51 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..f9345b2 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
@@ -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
@@ -44,7 +51,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 +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);
+ }
}
diff --git a/admin-server/src/main/java/com/estate/expert/admin/domain/repository/ClientParamMapper.java b/admin-server/src/main/java/com/estate/expert/admin/domain/repository/ClientParamMapper.java
index 258aa21..fdc9e2f 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/domain/repository/ClientParamMapper.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/domain/repository/ClientParamMapper.java
@@ -3,6 +3,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.estate.expert.admin.domain.business.client.clientparam.ClientParam;
+import com.estate.expert.admin.domain.report.ReportTemplate;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -14,4 +18,6 @@
*/
public interface ClientParamMapper extends BaseMapper<ClientParam> {
+ List<ReportTemplate> getTemplate(@Param("type") Integer type);
+
}
diff --git a/admin-server/src/main/java/com/estate/expert/admin/service/ClientParamService.java b/admin-server/src/main/java/com/estate/expert/admin/service/ClientParamService.java
index 57f6513..e8662a0 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/service/ClientParamService.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/service/ClientParamService.java
@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.estate.expert.admin.domain.business.client.clientparam.ClientParam;
+import com.estate.expert.admin.domain.report.ReportTemplate;
+
+import java.util.List;
/**
* <p>
@@ -14,4 +17,7 @@
*/
public interface ClientParamService extends IService<ClientParam> {
+ List<ReportTemplate> getTemplate(Integer type);
+
+
}
diff --git a/admin-server/src/main/java/com/estate/expert/admin/service/ReportTemplateService.java b/admin-server/src/main/java/com/estate/expert/admin/service/ReportTemplateService.java
index ab6495d..b6f4fd2 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/service/ReportTemplateService.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/service/ReportTemplateService.java
@@ -6,6 +6,8 @@
import com.estate.expert.admin.domain.report.ReportTemplateDto;
import com.estate.expert.admin.service.common.CrudServiceBase;
+import java.util.List;
+
/**
* 报告模板服务
*/
@@ -23,4 +25,6 @@
* 创建默认报告模板
*/
void createDefaultTemplates();
+
+ List<ReportTemplate> getTemplate(Integer type);
}
diff --git a/admin-server/src/main/java/com/estate/expert/admin/service/impl/ClientParamServiceImpl.java b/admin-server/src/main/java/com/estate/expert/admin/service/impl/ClientParamServiceImpl.java
index ae0d3ad..9ecacf3 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/service/impl/ClientParamServiceImpl.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/service/impl/ClientParamServiceImpl.java
@@ -3,9 +3,12 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.estate.expert.admin.domain.business.client.clientparam.ClientParam;
+import com.estate.expert.admin.domain.report.ReportTemplate;
import com.estate.expert.admin.domain.repository.ClientParamMapper;
import com.estate.expert.admin.service.ClientParamService;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -18,4 +21,8 @@
@Service
public class ClientParamServiceImpl extends ServiceImpl<ClientParamMapper, ClientParam> implements ClientParamService {
+ @Override
+ public List<ReportTemplate> getTemplate(Integer type) {
+ return this.baseMapper.getTemplate(type);
+ }
}
diff --git a/admin-server/src/main/java/com/estate/expert/admin/service/impl/ReportTemplateServiceImpl.java b/admin-server/src/main/java/com/estate/expert/admin/service/impl/ReportTemplateServiceImpl.java
index b2ce999..5b92fb4 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/service/impl/ReportTemplateServiceImpl.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/service/impl/ReportTemplateServiceImpl.java
@@ -13,6 +13,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.List;
/**
* 报告模板服务实现
@@ -58,6 +59,11 @@
.build();
add(userService.getSystemUser(), template);
}
+
+ @Override
+ public List<ReportTemplate> getTemplate(Integer type) {
+ return List.of();
+ }
}
diff --git a/admin-server/src/main/resources/mapper/ClientParamMapper.xml b/admin-server/src/main/resources/mapper/ClientParamMapper.xml
index eac019d..7c6dd27 100644
--- a/admin-server/src/main/resources/mapper/ClientParamMapper.xml
+++ b/admin-server/src/main/resources/mapper/ClientParamMapper.xml
@@ -3,4 +3,11 @@
<mapper namespace="com.estate.expert.admin.domain.repository.ClientParamMapper">
+ <select id="getTemplate" resultType="com.estate.expert.admin.domain.report.ReportTemplate"
+ parameterType="java.lang.Integer">
+
+select id,name from report_template where type = #{type} and deleted =0
+
+
+ </select>
</mapper>
--
Gitblit v1.7.1