From 587b438f50abb725f3dee63eaf6b586c09085f54 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 26 九月 2024 09:59:14 +0800
Subject: [PATCH] bug + 模型方法参数排序

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmPredictItemController.java |   43 +++++++++++++++++++++++++++++++++----------
 1 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmPredictItemController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmPredictItemController.java
index bf58c85..267f2c0 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmPredictItemController.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmPredictItemController.java
@@ -5,8 +5,13 @@
 import com.iailab.framework.common.pojo.PageResult;
 import com.iailab.framework.common.util.object.BeanUtils;
 import com.iailab.module.model.mcs.pre.dto.MmPredictItemDTO;
+import com.iailab.module.model.mcs.pre.entity.MmItemOutputEntity;
+import com.iailab.module.model.mcs.pre.entity.MmItemTypeEntity;
 import com.iailab.module.model.mcs.pre.entity.MmPredictItemEntity;
+import com.iailab.module.model.mcs.pre.service.MmItemOutputService;
+import com.iailab.module.model.mcs.pre.service.MmItemTypeService;
 import com.iailab.module.model.mcs.pre.service.MmPredictItemService;
+import com.iailab.module.model.mcs.pre.service.MmResultTableService;
 import com.iailab.module.model.mcs.pre.vo.CountItemtypeVO;
 import com.iailab.module.model.mcs.pre.vo.MmPredictItemPageReqVO;
 import com.iailab.module.model.mcs.pre.vo.MmPredictItemRespVO;
@@ -19,7 +24,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 
 import static com.iailab.framework.common.pojo.CommonResult.success;
 
@@ -34,20 +38,39 @@
     @Autowired
     private MmPredictItemService mmPredictItemService;
 
+    @Autowired
+    private MmItemTypeService mmItemTypeService;
+
+    @Autowired
+    private MmItemOutputService mmItemOutputService;
+
+    @Autowired
+    private MmResultTableService mmResultTableService;
+
     /**
      * 预测项列表
      */
     @GetMapping("/page")
-    @PreAuthorize("@ss.hasPermission('model:pre-predict:query')")
+    @PreAuthorize("@ss.hasPermission('model:pre-item:query')")
     public CommonResult<PageResult<MmPredictItemRespVO>> page(@Validated MmPredictItemPageReqVO reqVO) {
         PageResult<MmPredictItemEntity> page = mmPredictItemService.queryPage(reqVO);
-        return success(BeanUtils.toBean(page, MmPredictItemRespVO.class));
+        PageResult<MmPredictItemRespVO> result = BeanUtils.toBean(page, MmPredictItemRespVO.class);
+        for (MmPredictItemRespVO item : result.getList()){
+
+            MmItemTypeEntity mmItemTypeEntity = mmItemTypeService.info(item.getItemtypeid());
+            item.setItemtypename(mmItemTypeEntity== null ? "" :mmItemTypeEntity.getItemtypename());
+
+            MmItemOutputEntity mmItemOutputEntity = mmItemOutputService.getByItemid(item.getId());
+            item.setTagname(mmItemOutputEntity== null ? "" :mmItemOutputEntity.getTagname());
+            item.setResulttableid(mmItemOutputEntity== null ? "" :mmItemOutputEntity.getResulttableid());
+            item.setTablename(item == null ? "" : mmResultTableService.info(item.getResulttableid()).getTablename());
+        }
+        return success(result);
     }
 
     @GetMapping("/list")
-    @PreAuthorize("@ss.hasPermission('model:pre-predict:query')")
-    public CommonResult<List<MmPredictItemEntity>> list(@RequestParam Map<String, Object> params) {
-        List<MmPredictItemEntity> list = mmPredictItemService.list(params);
+    public CommonResult<List<MmPredictItemEntity>> list() {
+        List<MmPredictItemEntity> list = mmPredictItemService.list();
 
         return success(list);
     }
@@ -56,7 +79,7 @@
      * 预测项信息
      */
     @GetMapping("/get/{id}")
-    @PreAuthorize("@ss.hasPermission('model:pre-predict:query')")
+    @PreAuthorize("@ss.hasPermission('model:pre-item:query')")
     public CommonResult<MmPredictItemDTO> info(@PathVariable("id") String id){
         MmPredictItemDTO predictItem = mmPredictItemService.info(id);
         return success(predictItem);
@@ -66,7 +89,7 @@
      * 保存预测项
      */
     @PostMapping("/create")
-    @PreAuthorize("@ss.hasPermission('model:pre-predict:create')")
+    @PreAuthorize("@ss.hasPermission('model:pre-item:create')")
     @DSTransactional(rollbackFor= Exception.class)
     public CommonResult<Boolean> save(@RequestBody MmPredictItemDTO mmPredictItemDto){
         mmPredictItemService.add(mmPredictItemDto);
@@ -77,7 +100,7 @@
      * 修改预测项
      */
     @PutMapping("/update")
-    @PreAuthorize("@ss.hasPermission('model:pre-predict:update')")
+    @PreAuthorize("@ss.hasPermission('model:pre-item:update')")
     @DSTransactional(rollbackFor= Exception.class)
     public CommonResult<Boolean> update(@RequestBody MmPredictItemDTO mmPredictItemDTO){
         mmPredictItemService.update(mmPredictItemDTO);
@@ -88,7 +111,7 @@
      * 删除预测项
      */
     @DeleteMapping("/delete")
-    @PreAuthorize("@ss.hasPermission('model:pre-predict:delete')")
+    @PreAuthorize("@ss.hasPermission('model:pre-item:delete')")
     @DSTransactional(rollbackFor= Exception.class)
     public CommonResult<Boolean> delete(@RequestParam("id") String id) {
         mmPredictItemService.deleteBatch(new String[]{id});

--
Gitblit v1.9.3