From c29b5c7a877b66a31766f37ee1d9bae7dc1f91d8 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Thu, 16 Jan 2020 13:37:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=20=E8=B0=83=E7=94=A8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/api/iservice/base/IReportService.java       |  8 --------
 .../controller/report/ReportPojoCloudController.java | 20 +-------------------
 .../core/apiservice/daoimpl/ReportDaoImpl.java       |  2 +-
 .../apiservice/serviceimpl/base/ReportService.java   |  8 +-------
 4 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/IReportService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/IReportService.java
index 22b2803..11621f3 100644
--- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/IReportService.java
+++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/IReportService.java
@@ -30,12 +30,4 @@ public interface IReportService {
     @ApiOperation(value = "HQL 执行",notes = "执行 HQL")
     List selectTemplateModel(TemplateModel model) throws Exception;
 
-    /**
-     * 执行 HQL
-     * @param model HQL Model
-     * @return 查询结果集
-     * @throws Exception 运行异常
-     */
-    @ApiOperation(value = "HQL 执行",notes = "执行 HQL")
-    Long countTemplateModel(TemplateModel model) throws Exception;
 }
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/ReportPojoCloudController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/ReportPojoCloudController.java
index 18f6b38..f5e0e81 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/ReportPojoCloudController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/ReportPojoCloudController.java
@@ -76,7 +76,7 @@ public class ReportPojoCloudController {
      * @param model 模板模型
      * @return 处理结果
      */
-    @PostMapping(value = "/hql/run")
+    @PostMapping(value = "/query")
     @ApiOperation(value = "查询管理后台所有类", notes = "根据核心包路径列出所有类")
     public BaseResultBean runHql(@RequestBody TemplateModel model) {
         LOGGER.info("【执行 HQL】TemplateModel：{}", model);
@@ -90,22 +90,4 @@ public class ReportPojoCloudController {
         }
     }
 
-
-    /**
-     * 根据核心包路径列出所有类
-     *
-     * @param model 模板模型
-     * @return 处理结果
-     */
-    @PostMapping(value = "/hql/run-count")
-    @ApiOperation(value = "查询管理后台所有类", notes = "根据核心包路径列出所有类")
-    public BaseResultBean runHqlCount(@RequestBody TemplateModel model) {
-        LOGGER.info("【执行 HQL】TemplateModel：{}", model);
-        try {
-            Long count = reportService.countTemplateModel(model);
-            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(count);
-        } catch (Exception e) {
-            return ResultBean.fail("操作失败").setMsg(e.getMessage()).setErrorMsg(e.getLocalizedMessage());
-        }
-    }
 }
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/ReportDaoImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/ReportDaoImpl.java
index c279709..506604b 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/ReportDaoImpl.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/ReportDaoImpl.java
@@ -30,7 +30,7 @@ public class ReportDaoImpl implements IReportDao {
     @Override
     public List<Object[]> findByHqlObjects(String hql, Map<String,Object> findParam) throws Exception {
         LOGGER.info(" find HQL:{} \n find params :{}", hql, findParam);
-        Query queryObject = entityManager.createQuery(hql);
+        Query queryObject = entityManager.createNativeQuery(hql);
 
         if(!CollectionUtils.isEmpty(findParam)){
             findParam.forEach((K, V) -> queryObject.setParameter(K, V));
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/ReportService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/ReportService.java
index 6176c7b..9910ad1 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/ReportService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/ReportService.java
@@ -35,14 +35,8 @@ public class ReportService implements IReportService {
     }
 
     @Override
-    public Long countTemplateModel(TemplateModel model) throws Exception {
-        LOGGER.info("报表执行 model :{}",model);
-        return reportDao.findByHqlCount(model.getCountHql(), model.getFindParam());
-    }
-
-    @Override
     public List selectTemplateModel(TemplateModel model) throws Exception{
         LOGGER.info("报表执行 model :{}",model);
-        return reportDao.findByHqlObjects(model.getSelectHql(), model.getFindParam());
+        return reportDao.findByHqlObjects(model.getQuerySql(), model.getFindParam());
     }
 }