健康度配置分类和对象功能接口

jjt-biz/src/main/java/com/jjt/biz/controller/BizModelController.java

@@ -11,6 +11,8 @@ import com.jjt.common.core.domain.AjaxResult;
 import com.jjt.common.core.page.TableDataInfo;
 import com.jjt.common.enums.BusinessType;
 import com.jjt.common.utils.poi.ExcelUtil;
+import com.jjt.hl.domain.HlClass;
+import com.jjt.hl.service.IHlClassService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -35,7 +37,8 @@ import java.util.*;
 public class BizModelController extends BaseController {
     @Resource
     private IBizModelService bizModelService;
-
+    @Resource
+    private IHlClassService classService;
 
     @ApiOperation("选择对象")
     @GetMapping("/obj/select/{modelId}")
@@ -51,6 +54,13 @@ public class BizModelController extends BaseController {
         return success(bizModelService.insertObj(modelId, objIds));
     }
 
+    @ApiOperation("健康度配置")
+    @GetMapping("/config/{modelId}")
+    public AjaxResult config(@ApiParam(value = "模型ID", required = true) @PathVariable("modelId") Long modelId) {
+        List<HlClass> list = bizModelService.selectHlClassList4modelId(modelId);
+        return success(list);
+    }
+
     @ApiOperation("历史健康度得分情况")
     @GetMapping("/time/history")
     public List<ScoreVO> timeHistory() {

jjt-biz/src/main/java/com/jjt/biz/service/IBizModelDetailService.java

@@ -5,15 +5,15 @@ import com.jjt.biz.domain.BizModelDetail;
 
 /**
  * 业务模型明细Service接口
- * 
+ *
  * @author jjt
  * @date 2024-08-26
  */
-public interface IBizModelDetailService 
+public interface IBizModelDetailService
 {
     /**
      * 查询业务模型明细
-     * 
+     *
      * @param bizDetailId 业务模型明细主键
      * @return 业务模型明细
      */
@@ -21,7 +21,7 @@ public interface IBizModelDetailService
 
     /**
      * 查询业务模型明细列表
-     * 
+     *
      * @param bizModelDetail 业务模型明细
      * @return 业务模型明细集合
      */
@@ -29,7 +29,7 @@ public interface IBizModelDetailService
 
     /**
      * 新增业务模型明细
-     * 
+     *
      * @param bizModelDetail 业务模型明细
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface IBizModelDetailService
 
     /**
      * 修改业务模型明细
-     * 
+     *
      * @param bizModelDetail 业务模型明细
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface IBizModelDetailService
 
     /**
      * 批量删除业务模型明细
-     * 
+     *
      * @param bizDetailIds 需要删除的业务模型明细主键集合
      * @return 结果
      */
@@ -53,9 +53,16 @@ public interface IBizModelDetailService
 
     /**
      * 删除业务模型明细信息
-     * 
+     *
      * @param bizDetailId 业务模型明细主键
      * @return 结果
      */
     public int deleteBizModelDetailByBizDetailId(Long bizDetailId);
+    /**
+     * 通过模型ID获取明细
+     *
+     * @param modelId 模型ID
+     * @return 结果
+     */
+    List<BizModelDetail> selectBizModelDetailList4ModelId(Long modelId);
 }

jjt-biz/src/main/java/com/jjt/biz/service/IBizModelService.java

@@ -3,6 +3,7 @@ package com.jjt.biz.service;
 import com.jjt.biz.domain.BizModel;
 import com.jjt.biz.domain.BizObj;
 import com.jjt.biz.domain.BizObjMetrics;
+import com.jjt.hl.domain.HlClass;
 
 import java.util.List;
 
@@ -85,4 +86,11 @@ public interface IBizModelService {
      * @return 结果
      */
     List<BizObjMetrics> selectBizModelMetricsList(Long modelId);
+    /**
+     * 通过模型ID获取 分类列表
+     *
+     * @param modelId 模型ID
+     * @return 结果
+     */
+    List<HlClass> selectHlClassList4modelId(Long modelId);
 }

jjt-biz/src/main/java/com/jjt/biz/service/impl/BizModelDetailServiceImpl.java

@@ -1,12 +1,13 @@
 package com.jjt.biz.service.impl;
 
-import java.util.List;
-        import com.jjt.common.utils.DateUtils;
-import org.springframework.stereotype.Service;
-import com.jjt.biz.mapper.BizModelDetailMapper;
 import com.jjt.biz.domain.BizModelDetail;
+import com.jjt.biz.mapper.BizModelDetailMapper;
 import com.jjt.biz.service.IBizModelDetailService;
+import com.jjt.common.utils.DateUtils;
+import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 业务模型明细Service业务层处理
@@ -49,8 +50,8 @@ public class BizModelDetailServiceImpl implements IBizModelDetailService {
      */
     @Override
     public int insertBizModelDetail(BizModelDetail bizModelDetail) {
-                bizModelDetail.setCreateTime(DateUtils.getNowDate());
-            return bizModelDetailMapper.insertBizModelDetail(bizModelDetail);
+        bizModelDetail.setCreateTime(DateUtils.getNowDate());
+        return bizModelDetailMapper.insertBizModelDetail(bizModelDetail);
     }
 
     /**
@@ -61,7 +62,7 @@ public class BizModelDetailServiceImpl implements IBizModelDetailService {
      */
     @Override
     public int updateBizModelDetail(BizModelDetail bizModelDetail) {
-                bizModelDetail.setUpdateTime(DateUtils.getNowDate());
+        bizModelDetail.setUpdateTime(DateUtils.getNowDate());
         return bizModelDetailMapper.updateBizModelDetail(bizModelDetail);
     }
 
@@ -86,4 +87,17 @@ public class BizModelDetailServiceImpl implements IBizModelDetailService {
     public int deleteBizModelDetailByBizDetailId(Long bizDetailId) {
         return bizModelDetailMapper.deleteBizModelDetailByBizDetailId(bizDetailId);
     }
+
+    /**
+     * 通过模型ID获取明细
+     *
+     * @param modelId 模型ID
+     * @return 结果
+     */
+    @Override
+    public List<BizModelDetail> selectBizModelDetailList4ModelId(Long modelId) {
+        BizModelDetail query = new BizModelDetail();
+        query.setModelId(modelId);
+        return selectBizModelDetailList(query);
+    }
 }

jjt-biz/src/main/java/com/jjt/biz/service/impl/BizModelServiceImpl.java

@@ -8,10 +8,21 @@ import com.jjt.biz.mapper.BizModelMapper;
 import com.jjt.biz.service.IBizModelDetailService;
 import com.jjt.biz.service.IBizModelService;
 import com.jjt.common.utils.DateUtils;
+import com.jjt.hl.domain.HlClass;
+import com.jjt.hl.domain.HlObj;
+import com.jjt.hl.mapper.HlObjMapper;
+import com.jjt.hl.service.IHlClassService;
+import com.jjt.hl.service.IHlObjService;
+import org.apache.ibatis.session.ExecutorType;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 业务模型Service业务层处理
@@ -25,6 +36,12 @@ public class BizModelServiceImpl implements IBizModelService {
     private BizModelMapper bizModelMapper;
     @Resource
     private IBizModelDetailService modelDetailService;
+    @Resource
+    private IHlClassService hlClassService;
+    @Resource
+    private IHlObjService hlObjService;
+    @Resource
+    private SqlSessionFactory factory;
 
     /**
      * 查询业务模型
@@ -117,20 +134,11 @@ public class BizModelServiceImpl implements IBizModelService {
         if (objIds.length == 0) {
             return 1;
         }
-//        int total = 100;
-//        int avg = total / objIds.length;
-//        int use = 0;
-        for (int i = 0; i < objIds.length; i++) {
+        for (Long objId : objIds) {
             BizModelDetail detail = new BizModelDetail();
             detail.setModelId(modelId);
-            detail.setObjId(objIds[i]);
-//            if (i == objIds.length - 1 && total - use != avg) {
-//                avg = total - use;
-//            }
-//
-//            detail.setHlScore(avg);
+            detail.setObjId(objId);
             modelDetailService.insertBizModelDetail(detail);
-//            use += avg;
         }
         return 0;
     }
@@ -145,4 +153,44 @@ public class BizModelServiceImpl implements IBizModelService {
     public List<BizObjMetrics> selectBizModelMetricsList(Long modelId) {
         return bizModelMapper.selectBizModelMetricsList(modelId);
     }
+
+    /**
+     * 通过模型ID获取 分类列表
+     *
+     * @param modelId 模型ID
+     * @return 结果
+     */
+    @Override
+    public List<HlClass> selectHlClassList4modelId(Long modelId) {
+        List<HlClass> list = hlClassService.selectHlClassList4modelId(modelId);
+        //如果还未配置，则初始化
+        if (list.size() == 0) {
+            List<BizModelDetail> details = modelDetailService.selectBizModelDetailList4ModelId(modelId);
+            Map<String, List<BizModelDetail>> map = details.stream().collect(Collectors.groupingBy(d -> d.getBizObj().getObjType()));
+            List<HlObj> hlObjList = new ArrayList<>();
+            for (String s : map.keySet()) {
+                HlClass hlClass = new HlClass();
+                hlClass.setObjType(s);
+                hlClass.setModelId(modelId);
+                hlClassService.insertHlClass(hlClass);
+
+                List<BizModelDetail> detailList = map.get(s);
+                detailList.forEach(d -> {
+                    HlObj hlObj = new HlObj();
+                    hlObj.setHlClassId(hlClass.getHlClassId());
+                    hlObj.setObjId(d.getObjId());
+                    hlObjList.add(hlObj);
+                });
+            }
+
+            try (SqlSession sqlSession = factory.openSession(ExecutorType.BATCH, false)) {
+                HlObjMapper mapper = sqlSession.getMapper(HlObjMapper.class);
+                hlObjList.forEach(mapper::insertHlObj);
+                sqlSession.commit();
+            }
+            list = hlClassService.selectHlClassList4modelId(modelId);
+        }
+
+        return list;
+    }
 }

jjt-biz/src/main/java/com/jjt/hl/controller/HlClassController.java

@@ -1,28 +1,21 @@
 package com.jjt.hl.controller;
 
-import java.util.List;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.jjt.common.annotation.Log;
 import com.jjt.common.core.controller.BaseController;
 import com.jjt.common.core.domain.AjaxResult;
+import com.jjt.common.core.page.TableDataInfo;
 import com.jjt.common.enums.BusinessType;
+import com.jjt.common.utils.poi.ExcelUtil;
 import com.jjt.hl.domain.HlClass;
 import com.jjt.hl.service.IHlClassService;
-import com.jjt.common.utils.poi.ExcelUtil;
-import com.jjt.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 模型健康度分类Controller
@@ -30,11 +23,10 @@ import com.jjt.common.core.page.TableDataInfo;
  * @author jjt
  * @date 2024-09-05
  */
-@Api(tags="模型健康度分类")
+@Api(tags = "模型健康度分类")
 @RestController
 @RequestMapping("/hl/hc")
-public class HlClassController extends BaseController
-{
+public class HlClassController extends BaseController {
     @Resource
     private IHlClassService hlClassService;
 
@@ -44,8 +36,7 @@ public class HlClassController extends BaseController
     @ApiOperation("查询模型健康度分类列表")
     @PreAuthorize("@ss.hasPermi('hl:hc:list')")
     @GetMapping("/list")
-    public TableDataInfo list(HlClass hlClass)
-    {
+    public TableDataInfo list(HlClass hlClass) {
         startPage();
         List<HlClass> list = hlClassService.selectHlClassList(hlClass);
         return getDataTable(list);
@@ -58,8 +49,7 @@ public class HlClassController extends BaseController
     @PreAuthorize("@ss.hasPermi('hl:hc:export')")
     @Log(title = "模型健康度分类", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, HlClass hlClass)
-    {
+    public void export(HttpServletResponse response, HlClass hlClass) {
         List<HlClass> list = hlClassService.selectHlClassList(hlClass);
         ExcelUtil<HlClass> util = new ExcelUtil<HlClass>(HlClass.class);
         util.exportExcel(response, list, "模型健康度分类数据");
@@ -71,8 +61,7 @@ public class HlClassController extends BaseController
     @ApiOperation("获取模型健康度分类详细信息")
     @PreAuthorize("@ss.hasPermi('hl:hc:query')")
     @GetMapping(value = "/{hlClassId}")
-    public AjaxResult getInfo(@PathVariable("hlClassId") Long hlClassId)
-    {
+    public AjaxResult getInfo(@PathVariable("hlClassId") Long hlClassId) {
         return success(hlClassService.selectHlClassByHlClassId(hlClassId));
     }
 
@@ -83,8 +72,7 @@ public class HlClassController extends BaseController
     @PreAuthorize("@ss.hasPermi('hl:hc:add')")
     @Log(title = "模型健康度分类", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody HlClass hlClass)
-    {
+    public AjaxResult add(@RequestBody HlClass hlClass) {
         return toAjax(hlClassService.insertHlClass(hlClass));
     }
 
@@ -95,8 +83,7 @@ public class HlClassController extends BaseController
     @PreAuthorize("@ss.hasPermi('hl:hc:edit')")
     @Log(title = "模型健康度分类", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody HlClass hlClass)
-    {
+    public AjaxResult edit(@RequestBody HlClass hlClass) {
         return toAjax(hlClassService.updateHlClass(hlClass));
     }
 
@@ -106,9 +93,8 @@ public class HlClassController extends BaseController
     @ApiOperation("删除模型健康度分类")
     @PreAuthorize("@ss.hasPermi('hl:hc:remove')")
     @Log(title = "模型健康度分类", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{hlClassIds}")
-    public AjaxResult remove(@PathVariable Long[] hlClassIds)
-    {
+    @DeleteMapping("/{hlClassIds}")
+    public AjaxResult remove(@PathVariable Long[] hlClassIds) {
         return toAjax(hlClassService.deleteHlClassByHlClassIds(hlClassIds));
     }
 }

jjt-biz/src/main/java/com/jjt/hl/controller/HlObjController.java

@@ -1,28 +1,28 @@
 package com.jjt.hl.controller;
 
-import java.util.List;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.jjt.biz.domain.BizModelDetail;
+import com.jjt.biz.service.IBizModelDetailService;
 import com.jjt.common.annotation.Log;
 import com.jjt.common.core.controller.BaseController;
 import com.jjt.common.core.domain.AjaxResult;
+import com.jjt.common.core.page.TableDataInfo;
 import com.jjt.common.enums.BusinessType;
+import com.jjt.common.utils.poi.ExcelUtil;
+import com.jjt.hl.domain.HlClass;
 import com.jjt.hl.domain.HlObj;
+import com.jjt.hl.service.IHlClassService;
 import com.jjt.hl.service.IHlObjService;
-import com.jjt.common.utils.poi.ExcelUtil;
-import com.jjt.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 模型健康度对象Controller
@@ -30,13 +30,49 @@ import com.jjt.common.core.page.TableDataInfo;
  * @author jjt
  * @date 2024-09-05
  */
-@Api(tags="模型健康度对象")
+@Api(tags = "模型健康度对象")
 @RestController
 @RequestMapping("/hl/ho")
-public class HlObjController extends BaseController
-{
+public class HlObjController extends BaseController {
     @Resource
     private IHlObjService hlObjService;
+    @Resource
+    private IHlClassService hlClassService;
+    @Resource
+    private IBizModelDetailService modelDetailService;
+
+    @ApiOperation("根据分类ID查询对象")
+    @GetMapping("/list/{hlClassId}")
+    public AjaxResult list(@PathVariable("hlClassId") Long hlClassId) {
+        HlObj hlObj = new HlObj();
+        hlObj.setHlClassId(hlClassId);
+        List<HlObj> list = hlObjService.selectHlObjList(hlObj);
+        return AjaxResult.success(list);
+    }
+
+    @ApiOperation("根据分类ID查询选择对象列表")
+    @GetMapping("/select/{hlClassId}")
+    public AjaxResult select(@PathVariable("hlClassId") Long hlClassId) {
+        HlClass hlClass = hlClassService.selectHlClassByHlClassId(hlClassId);
+
+        BizModelDetail detail = new BizModelDetail();
+        detail.setModelId(hlClass.getModelId());
+        Map<String, Object> params = new HashMap<>();
+        params.put("objType", hlClass.getObjType());
+        params.put("cid", hlClassId);
+        detail.setParams(params);
+
+        List<BizModelDetail> list = modelDetailService.selectBizModelDetailList(detail);
+
+        return AjaxResult.success(list);
+    }
+
+    @ApiOperation("添加对象")
+    @GetMapping("/add/{hlClassId}")
+    public AjaxResult objAdd(@ApiParam(value = "模型ID", required = true) @PathVariable("hlClassId") Long hlClassId, @ApiParam(value = "对象ID数组", required = true) Long[] objIds) {
+        return success(hlObjService.insertObj(hlClassId, objIds));
+    }
+
 
     /**
      * 查询模型健康度对象列表
@@ -44,8 +80,7 @@ public class HlObjController extends BaseController
     @ApiOperation("查询模型健康度对象列表")
     @PreAuthorize("@ss.hasPermi('hl:ho:list')")
     @GetMapping("/list")
-    public TableDataInfo list(HlObj hlObj)
-    {
+    public TableDataInfo list(HlObj hlObj) {
         startPage();
         List<HlObj> list = hlObjService.selectHlObjList(hlObj);
         return getDataTable(list);
@@ -58,8 +93,7 @@ public class HlObjController extends BaseController
     @PreAuthorize("@ss.hasPermi('hl:ho:export')")
     @Log(title = "模型健康度对象", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, HlObj hlObj)
-    {
+    public void export(HttpServletResponse response, HlObj hlObj) {
         List<HlObj> list = hlObjService.selectHlObjList(hlObj);
         ExcelUtil<HlObj> util = new ExcelUtil<HlObj>(HlObj.class);
         util.exportExcel(response, list, "模型健康度对象数据");
@@ -71,8 +105,7 @@ public class HlObjController extends BaseController
     @ApiOperation("获取模型健康度对象详细信息")
     @PreAuthorize("@ss.hasPermi('hl:ho:query')")
     @GetMapping(value = "/{hlObjId}")
-    public AjaxResult getInfo(@PathVariable("hlObjId") Long hlObjId)
-    {
+    public AjaxResult getInfo(@PathVariable("hlObjId") Long hlObjId) {
         return success(hlObjService.selectHlObjByHlObjId(hlObjId));
     }
 
@@ -83,8 +116,7 @@ public class HlObjController extends BaseController
     @PreAuthorize("@ss.hasPermi('hl:ho:add')")
     @Log(title = "模型健康度对象", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody HlObj hlObj)
-    {
+    public AjaxResult add(@RequestBody HlObj hlObj) {
         return toAjax(hlObjService.insertHlObj(hlObj));
     }
 
@@ -95,8 +127,7 @@ public class HlObjController extends BaseController
     @PreAuthorize("@ss.hasPermi('hl:ho:edit')")
     @Log(title = "模型健康度对象", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody HlObj hlObj)
-    {
+    public AjaxResult edit(@RequestBody HlObj hlObj) {
         return toAjax(hlObjService.updateHlObj(hlObj));
     }
 
@@ -106,9 +137,8 @@ public class HlObjController extends BaseController
     @ApiOperation("删除模型健康度对象")
     @PreAuthorize("@ss.hasPermi('hl:ho:remove')")
     @Log(title = "模型健康度对象", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{hlObjIds}")
-    public AjaxResult remove(@PathVariable Long[] hlObjIds)
-    {
+    @DeleteMapping("/{hlObjIds}")
+    public AjaxResult remove(@PathVariable Long[] hlObjIds) {
         return toAjax(hlObjService.deleteHlObjByHlObjIds(hlObjIds));
     }
 }

jjt-biz/src/main/java/com/jjt/hl/domain/HlClass.java

@@ -1,12 +1,13 @@
 package com.jjt.hl.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.jjt.common.annotation.Excel;
 import com.jjt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
 
 /**
  * 模型健康度分类对象 hl_class
@@ -15,94 +16,45 @@ import com.jjt.common.core.domain.BaseEntity;
  * @date 2024-09-05
  */
 @ApiModel(value = "HlClass", description = "模型健康度分类")
-public class HlClass extends BaseEntity
-{
+@Data
+public class HlClass extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 健康度分类ID */
+    /**
+     * 健康度分类ID
+     */
     @ApiModelProperty("健康度分类ID")
     @TableId
     private Long hlClassId;
 
-    /** 模型ID */
+    /**
+     * 模型ID
+     */
     @ApiModelProperty("模型ID")
     @Excel(name = "模型ID")
     private Long modelId;
 
-    /** 业务类型 */
+    /**
+     * 业务类型
+     */
     @ApiModelProperty("业务类型")
     @Excel(name = "业务类型")
     private String objType;
 
-    /** 细项分 */
+    /**
+     * 细项分
+     */
     @ApiModelProperty("细项分")
     @Excel(name = "细项分")
     private String scoreType;
 
-    /** 健康度分值 */
+    /**
+     * 健康度分值
+     */
     @ApiModelProperty("健康度分值")
     @Excel(name = "健康度分值")
     private String hlScore;
 
-    public void setHlClassId(Long hlClassId)
-    {
-        this.hlClassId = hlClassId;
-    }
-
-    public Long getHlClassId()
-    {
-        return hlClassId;
-    }
-    public void setModelId(Long modelId)
-    {
-        this.modelId = modelId;
-    }
-
-    public Long getModelId()
-    {
-        return modelId;
-    }
-    public void setObjType(String objType)
-    {
-        this.objType = objType;
-    }
-
-    public String getObjType()
-    {
-        return objType;
-    }
-    public void setScoreType(String scoreType)
-    {
-        this.scoreType = scoreType;
-    }
-
-    public String getScoreType()
-    {
-        return scoreType;
-    }
-    public void setHlScore(String hlScore)
-    {
-        this.hlScore = hlScore;
-    }
-
-    public String getHlScore()
-    {
-        return hlScore;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("hlClassId", getHlClassId())
-            .append("modelId", getModelId())
-            .append("objType", getObjType())
-            .append("scoreType", getScoreType())
-            .append("hlScore", getHlScore())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
+    @ApiModelProperty("对象列表")
+    private List<HlObj> hlObjList;
 }

jjt-biz/src/main/java/com/jjt/hl/domain/HlObj.java

@@ -1,12 +1,11 @@
 package com.jjt.hl.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.jjt.common.annotation.Excel;
 import com.jjt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * 模型健康度对象对象 hl_obj
@@ -15,64 +14,20 @@ import com.jjt.common.core.domain.BaseEntity;
  * @date 2024-09-05
  */
 @ApiModel(value = "HlObj", description = "模型健康度对象")
-public class HlObj extends BaseEntity
-{
+@Data
+public class HlObj extends BaseEntity {
     private static final long serialVersionUID = 1L;
-
-    /** 健康度对象ID */
     @ApiModelProperty("健康度对象ID")
     @TableId
     private Long hlObjId;
-
-    /** 健康度分类ID */
     @ApiModelProperty("健康度分类ID")
     @Excel(name = "健康度分类ID")
     private Long hlClassId;
-
-    /** 对象ID */
     @ApiModelProperty("对象ID")
     @Excel(name = "对象ID")
     private Long objId;
-
-    public void setHlObjId(Long hlObjId)
-    {
-        this.hlObjId = hlObjId;
-    }
-
-    public Long getHlObjId()
-    {
-        return hlObjId;
-    }
-    public void setHlClassId(Long hlClassId)
-    {
-        this.hlClassId = hlClassId;
-    }
-
-    public Long getHlClassId()
-    {
-        return hlClassId;
-    }
-    public void setObjId(Long objId)
-    {
-        this.objId = objId;
-    }
-
-    public Long getObjId()
-    {
-        return objId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("hlObjId", getHlObjId())
-            .append("hlClassId", getHlClassId())
-            .append("objId", getObjId())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
+    @ApiModelProperty("对象名称")
+    private String objName;
+    @ApiModelProperty("对象类型")
+    private String objType;
 }

jjt-biz/src/main/java/com/jjt/hl/service/IHlClassService.java

@@ -1,19 +1,19 @@
 package com.jjt.hl.service;
 
-import java.util.List;
 import com.jjt.hl.domain.HlClass;
 
+import java.util.List;
+
 /**
  * 模型健康度分类Service接口
- * 
+ *
  * @author jjt
  * @date 2024-09-05
  */
-public interface IHlClassService 
-{
+public interface IHlClassService {
     /**
      * 查询模型健康度分类
-     * 
+     *
      * @param hlClassId 模型健康度分类主键
      * @return 模型健康度分类
      */
@@ -21,7 +21,7 @@ public interface IHlClassService
 
     /**
      * 查询模型健康度分类列表
-     * 
+     *
      * @param hlClass 模型健康度分类
      * @return 模型健康度分类集合
      */
@@ -29,7 +29,7 @@ public interface IHlClassService
 
     /**
      * 新增模型健康度分类
-     * 
+     *
      * @param hlClass 模型健康度分类
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface IHlClassService
 
     /**
      * 修改模型健康度分类
-     * 
+     *
      * @param hlClass 模型健康度分类
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface IHlClassService
 
     /**
      * 批量删除模型健康度分类
-     * 
+     *
      * @param hlClassIds 需要删除的模型健康度分类主键集合
      * @return 结果
      */
@@ -53,9 +53,17 @@ public interface IHlClassService
 
     /**
      * 删除模型健康度分类信息
-     * 
+     *
      * @param hlClassId 模型健康度分类主键
      * @return 结果
      */
     public int deleteHlClassByHlClassId(Long hlClassId);
+
+    /**
+     * 通过模型ID获取 分类列表
+     *
+     * @param modelId 模型ID
+     * @return 结果
+     */
+    List<HlClass> selectHlClassList4modelId(Long modelId);
 }

jjt-biz/src/main/java/com/jjt/hl/service/IHlObjService.java

@@ -1,19 +1,19 @@
 package com.jjt.hl.service;
 
-import java.util.List;
 import com.jjt.hl.domain.HlObj;
 
+import java.util.List;
+
 /**
  * 模型健康度对象Service接口
- * 
+ *
  * @author jjt
  * @date 2024-09-05
  */
-public interface IHlObjService 
-{
+public interface IHlObjService {
     /**
      * 查询模型健康度对象
-     * 
+     *
      * @param hlObjId 模型健康度对象主键
      * @return 模型健康度对象
      */
@@ -21,7 +21,7 @@ public interface IHlObjService
 
     /**
      * 查询模型健康度对象列表
-     * 
+     *
      * @param hlObj 模型健康度对象
      * @return 模型健康度对象集合
      */
@@ -29,7 +29,7 @@ public interface IHlObjService
 
     /**
      * 新增模型健康度对象
-     * 
+     *
      * @param hlObj 模型健康度对象
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface IHlObjService
 
     /**
      * 修改模型健康度对象
-     * 
+     *
      * @param hlObj 模型健康度对象
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface IHlObjService
 
     /**
      * 批量删除模型健康度对象
-     * 
+     *
      * @param hlObjIds 需要删除的模型健康度对象主键集合
      * @return 结果
      */
@@ -53,9 +53,18 @@ public interface IHlObjService
 
     /**
      * 删除模型健康度对象信息
-     * 
+     *
      * @param hlObjId 模型健康度对象主键
      * @return 结果
      */
     public int deleteHlObjByHlObjId(Long hlObjId);
+
+    /**
+     * 添加对象
+     *
+     * @param hlClassId 分类ID
+     * @param objIds    对象ID
+     * @return 结果
+     */
+    int insertObj(Long hlClassId, Long[] objIds);
 }

jjt-biz/src/main/java/com/jjt/hl/service/impl/HlClassServiceImpl.java

@@ -1,12 +1,13 @@
 package com.jjt.hl.service.impl;
 
-import java.util.List;
-        import com.jjt.common.utils.DateUtils;
-import org.springframework.stereotype.Service;
-import com.jjt.hl.mapper.HlClassMapper;
+import com.jjt.common.utils.DateUtils;
 import com.jjt.hl.domain.HlClass;
+import com.jjt.hl.mapper.HlClassMapper;
 import com.jjt.hl.service.IHlClassService;
+import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 模型健康度分类Service业务层处理
@@ -49,8 +50,8 @@ public class HlClassServiceImpl implements IHlClassService {
      */
     @Override
     public int insertHlClass(HlClass hlClass) {
-                hlClass.setCreateTime(DateUtils.getNowDate());
-            return hlClassMapper.insertHlClass(hlClass);
+        hlClass.setCreateTime(DateUtils.getNowDate());
+        return hlClassMapper.insertHlClass(hlClass);
     }
 
     /**
@@ -61,7 +62,7 @@ public class HlClassServiceImpl implements IHlClassService {
      */
     @Override
     public int updateHlClass(HlClass hlClass) {
-                hlClass.setUpdateTime(DateUtils.getNowDate());
+        hlClass.setUpdateTime(DateUtils.getNowDate());
         return hlClassMapper.updateHlClass(hlClass);
     }
 
@@ -86,4 +87,17 @@ public class HlClassServiceImpl implements IHlClassService {
     public int deleteHlClassByHlClassId(Long hlClassId) {
         return hlClassMapper.deleteHlClassByHlClassId(hlClassId);
     }
+
+    /**
+     * 通过模型ID获取 分类列表
+     *
+     * @param modelId 模型ID
+     * @return 结果
+     */
+    @Override
+    public List<HlClass> selectHlClassList4modelId(Long modelId) {
+        HlClass query = new HlClass();
+        query.setModelId(modelId);
+        return selectHlClassList(query);
+    }
 }

jjt-biz/src/main/java/com/jjt/hl/service/impl/HlObjServiceImpl.java

@@ -1,12 +1,13 @@
 package com.jjt.hl.service.impl;
 
-import java.util.List;
-        import com.jjt.common.utils.DateUtils;
-import org.springframework.stereotype.Service;
-import com.jjt.hl.mapper.HlObjMapper;
+import com.jjt.common.utils.DateUtils;
 import com.jjt.hl.domain.HlObj;
+import com.jjt.hl.mapper.HlObjMapper;
 import com.jjt.hl.service.IHlObjService;
+import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 模型健康度对象Service业务层处理
@@ -49,8 +50,8 @@ public class HlObjServiceImpl implements IHlObjService {
      */
     @Override
     public int insertHlObj(HlObj hlObj) {
-                hlObj.setCreateTime(DateUtils.getNowDate());
-            return hlObjMapper.insertHlObj(hlObj);
+        hlObj.setCreateTime(DateUtils.getNowDate());
+        return hlObjMapper.insertHlObj(hlObj);
     }
 
     /**
@@ -61,7 +62,7 @@ public class HlObjServiceImpl implements IHlObjService {
      */
     @Override
     public int updateHlObj(HlObj hlObj) {
-                hlObj.setUpdateTime(DateUtils.getNowDate());
+        hlObj.setUpdateTime(DateUtils.getNowDate());
         return hlObjMapper.updateHlObj(hlObj);
     }
 
@@ -86,4 +87,25 @@ public class HlObjServiceImpl implements IHlObjService {
     public int deleteHlObjByHlObjId(Long hlObjId) {
         return hlObjMapper.deleteHlObjByHlObjId(hlObjId);
     }
+
+    /**
+     * 添加对象
+     *
+     * @param hlClassId 分类ID
+     * @param objIds    对象ID
+     * @return 结果
+     */
+    @Override
+    public int insertObj(Long hlClassId, Long[] objIds) {
+        if (objIds.length == 0) {
+            return 1;
+        }
+        for (Long objId : objIds) {
+            HlObj hlObj = new HlObj();
+            hlObj.setHlClassId(hlClassId);
+            hlObj.setObjId(objId);
+            insertHlObj(hlObj);
+        }
+        return 0;
+    }
 }

jjt-biz/src/main/resources/mapper/hl/BizModelDetailMapper.xml

@@ -55,9 +55,18 @@
             <if test="objId != null ">
                 and OBJ_ID = #{objId}
             </if>
+            <if test="modelId != null ">
+                and MODEL_ID = #{modelId}
+            </if>
             <if test="hlScore != null ">
                 and HL_SCORE = #{hlScore}
             </if>
+            <if test="params.objType != null ">
+                and OBJ_TYPE = #{params.objType}
+            </if>
+             <if test="params.cid != null ">
+                and OBJ_ID NOT IN (SELECT obj_id FROM hl_obj WHERE hl_class_id = #{params.cid})
+            </if>
             <if test="createBy != null  and createBy != ''">
                 and CREATE_BY = #{createBy}
             </if>

jjt-biz/src/main/resources/mapper/hl/HlClassMapper.xml

@@ -5,144 +5,169 @@
 <mapper namespace="com.jjt.hl.mapper.HlClassMapper">
 
     <resultMap type="HlClass" id="HlClassResult">
-            <result property="hlClassId" column="HL_CLASS_ID"/>
-            <result property="modelId" column="MODEL_ID"/>
-            <result property="objType" column="OBJ_TYPE"/>
-            <result property="scoreType" column="SCORE_TYPE"/>
-            <result property="hlScore" column="HL_SCORE"/>
-            <result property="createBy" column="CREATE_BY"/>
-            <result property="createTime" column="CREATE_TIME"/>
-            <result property="updateBy" column="UPDATE_BY"/>
-            <result property="updateTime" column="UPDATE_TIME"/>
-            <result property="remark" column="REMARK"/>
+        <result property="hlClassId" column="HL_CLASS_ID"/>
+        <result property="modelId" column="MODEL_ID"/>
+        <result property="objType" column="OBJ_TYPE"/>
+        <result property="scoreType" column="SCORE_TYPE"/>
+        <result property="hlScore" column="HL_SCORE"/>
+        <result property="createBy" column="CREATE_BY"/>
+        <result property="createTime" column="CREATE_TIME"/>
+        <result property="updateBy" column="UPDATE_BY"/>
+        <result property="updateTime" column="UPDATE_TIME"/>
+        <result property="remark" column="REMARK"/>
+        <collection property="hlObjList" javaType="java.util.List" resultMap="hlObjResult"/>
+    </resultMap>
+    <resultMap id="hlObjResult" type="HlObj">
+        <result property="hlObjId" column="HL_OBJ_ID"/>
+        <result property="hlClassId" column="HL_CLASS_ID"/>
+        <result property="objId" column="OBJ_ID"/>
+        <result property="objName" column="OBJ_NAME"/>
+        <result property="objType" column="OBJ_TYPE"/>
     </resultMap>
-
     <sql id="selectHlClassVo">
-        select HL_CLASS_ID, MODEL_ID, OBJ_TYPE, SCORE_TYPE, HL_SCORE, CREATE_BY, CREATE_TIME, UPDATE_BY, UPDATE_TIME, REMARK
-        from hl_class
+        select *
+        from (SELECT a.HL_CLASS_ID,
+                     a.MODEL_ID,
+                     a.OBJ_TYPE,
+                     a.SCORE_TYPE,
+                     a.HL_SCORE,
+                     a.CREATE_BY,
+                     a.CREATE_TIME,
+                     a.UPDATE_BY,
+                     a.UPDATE_TIME,
+                     a.REMARK,
+                     b.hl_obj_id,
+                     b.OBJ_ID,
+                     b.OBJ_NAME
+              from hl_class a
+                       left JOIN (SELECT a.*, b.OBJ_NAME, b.OBJ_TYPE
+                                  FROM hl_obj a,
+                                       biz_obj b
+                                  WHERE a.obj_id = b.obj_id) b ON a.hl_class_id = b.hl_class_id and a.obj_type=b.obj_type) t
     </sql>
 
     <select id="selectHlClassList" parameterType="HlClass" resultMap="HlClassResult">
         <include refid="selectHlClassVo"/>
         <where>
-                        <if test="modelId != null ">
-                            and MODEL_ID = #{modelId}
-                        </if>
-                        <if test="objType != null  and objType != ''">
-                            and OBJ_TYPE = #{objType}
-                        </if>
-                        <if test="scoreType != null  and scoreType != ''">
-                            and SCORE_TYPE = #{scoreType}
-                        </if>
-                        <if test="hlScore != null  and hlScore != ''">
-                            and HL_SCORE = #{hlScore}
-                        </if>
-                        <if test="createBy != null  and createBy != ''">
-                            and CREATE_BY = #{createBy}
-                        </if>
-                        <if test="createTime != null ">
-                            and CREATE_TIME = #{createTime}
-                        </if>
-                        <if test="updateBy != null  and updateBy != ''">
-                            and UPDATE_BY = #{updateBy}
-                        </if>
-                        <if test="updateTime != null ">
-                            and UPDATE_TIME = #{updateTime}
-                        </if>
-                        <if test="remark != null  and remark != ''">
-                            and REMARK = #{remark}
-                        </if>
+            <if test="modelId != null ">
+                and MODEL_ID = #{modelId}
+            </if>
+            <if test="objType != null  and objType != ''">
+                and OBJ_TYPE = #{objType}
+            </if>
+            <if test="scoreType != null  and scoreType != ''">
+                and SCORE_TYPE = #{scoreType}
+            </if>
+            <if test="hlScore != null  and hlScore != ''">
+                and HL_SCORE = #{hlScore}
+            </if>
+            <if test="createBy != null  and createBy != ''">
+                and CREATE_BY = #{createBy}
+            </if>
+            <if test="createTime != null ">
+                and CREATE_TIME = #{createTime}
+            </if>
+            <if test="updateBy != null  and updateBy != ''">
+                and UPDATE_BY = #{updateBy}
+            </if>
+            <if test="updateTime != null ">
+                and UPDATE_TIME = #{updateTime}
+            </if>
+            <if test="remark != null  and remark != ''">
+                and REMARK = #{remark}
+            </if>
         </where>
     </select>
 
     <select id="selectHlClassByHlClassId" parameterType="Long"
             resultMap="HlClassResult">
-            <include refid="selectHlClassVo"/>
-            where HL_CLASS_ID = #{hlClassId}
+        <include refid="selectHlClassVo"/>
+        where HL_CLASS_ID = #{hlClassId}
     </select>
 
     <insert id="insertHlClass" parameterType="HlClass" useGeneratedKeys="true"
             keyProperty="hlClassId">
         insert into hl_class
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                    <if test="modelId != null">MODEL_ID,
-                    </if>
-                    <if test="objType != null">OBJ_TYPE,
-                    </if>
-                    <if test="scoreType != null">SCORE_TYPE,
-                    </if>
-                    <if test="hlScore != null">HL_SCORE,
-                    </if>
-                    <if test="createBy != null">CREATE_BY,
-                    </if>
-                    <if test="createTime != null">CREATE_TIME,
-                    </if>
-                    <if test="updateBy != null">UPDATE_BY,
-                    </if>
-                    <if test="updateTime != null">UPDATE_TIME,
-                    </if>
-                    <if test="remark != null">REMARK,
-                    </if>
+            <if test="modelId != null">MODEL_ID,
+            </if>
+            <if test="objType != null">OBJ_TYPE,
+            </if>
+            <if test="scoreType != null">SCORE_TYPE,
+            </if>
+            <if test="hlScore != null">HL_SCORE,
+            </if>
+            <if test="createBy != null">CREATE_BY,
+            </if>
+            <if test="createTime != null">CREATE_TIME,
+            </if>
+            <if test="updateBy != null">UPDATE_BY,
+            </if>
+            <if test="updateTime != null">UPDATE_TIME,
+            </if>
+            <if test="remark != null">REMARK,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                    <if test="modelId != null">#{modelId},
-                    </if>
-                    <if test="objType != null">#{objType},
-                    </if>
-                    <if test="scoreType != null">#{scoreType},
-                    </if>
-                    <if test="hlScore != null">#{hlScore},
-                    </if>
-                    <if test="createBy != null">#{createBy},
-                    </if>
-                    <if test="createTime != null">#{createTime},
-                    </if>
-                    <if test="updateBy != null">#{updateBy},
-                    </if>
-                    <if test="updateTime != null">#{updateTime},
-                    </if>
-                    <if test="remark != null">#{remark},
-                    </if>
+            <if test="modelId != null">#{modelId},
+            </if>
+            <if test="objType != null">#{objType},
+            </if>
+            <if test="scoreType != null">#{scoreType},
+            </if>
+            <if test="hlScore != null">#{hlScore},
+            </if>
+            <if test="createBy != null">#{createBy},
+            </if>
+            <if test="createTime != null">#{createTime},
+            </if>
+            <if test="updateBy != null">#{updateBy},
+            </if>
+            <if test="updateTime != null">#{updateTime},
+            </if>
+            <if test="remark != null">#{remark},
+            </if>
         </trim>
     </insert>
 
     <update id="updateHlClass" parameterType="HlClass">
         update hl_class
         <trim prefix="SET" suffixOverrides=",">
-                    <if test="modelId != null">MODEL_ID =
-                        #{modelId},
-                    </if>
-                    <if test="objType != null">OBJ_TYPE =
-                        #{objType},
-                    </if>
-                    <if test="scoreType != null">SCORE_TYPE =
-                        #{scoreType},
-                    </if>
-                    <if test="hlScore != null">HL_SCORE =
-                        #{hlScore},
-                    </if>
-                    <if test="createBy != null">CREATE_BY =
-                        #{createBy},
-                    </if>
-                    <if test="createTime != null">CREATE_TIME =
-                        #{createTime},
-                    </if>
-                    <if test="updateBy != null">UPDATE_BY =
-                        #{updateBy},
-                    </if>
-                    <if test="updateTime != null">UPDATE_TIME =
-                        #{updateTime},
-                    </if>
-                    <if test="remark != null">REMARK =
-                        #{remark},
-                    </if>
+            <if test="modelId != null">MODEL_ID =
+                #{modelId},
+            </if>
+            <if test="objType != null">OBJ_TYPE =
+                #{objType},
+            </if>
+            <if test="scoreType != null">SCORE_TYPE =
+                #{scoreType},
+            </if>
+            <if test="hlScore != null">HL_SCORE =
+                #{hlScore},
+            </if>
+            <if test="createBy != null">CREATE_BY =
+                #{createBy},
+            </if>
+            <if test="createTime != null">CREATE_TIME =
+                #{createTime},
+            </if>
+            <if test="updateBy != null">UPDATE_BY =
+                #{updateBy},
+            </if>
+            <if test="updateTime != null">UPDATE_TIME =
+                #{updateTime},
+            </if>
+            <if test="remark != null">REMARK =
+                #{remark},
+            </if>
         </trim>
         where HL_CLASS_ID = #{hlClassId}
     </update>
 
     <delete id="deleteHlClassByHlClassId" parameterType="Long">
         delete
-        from hl_class where HL_CLASS_ID = #{hlClassId}
+        from hl_class
+        where HL_CLASS_ID = #{hlClassId}
     </delete>
 
     <delete id="deleteHlClassByHlClassIds" parameterType="String">

jjt-biz/src/main/resources/mapper/hl/HlObjMapper.xml

@@ -5,122 +5,128 @@
 <mapper namespace="com.jjt.hl.mapper.HlObjMapper">
 
     <resultMap type="HlObj" id="HlObjResult">
-            <result property="hlObjId" column="HL_OBJ_ID"/>
-            <result property="hlClassId" column="HL_CLASS_ID"/>
-            <result property="objId" column="OBJ_ID"/>
-            <result property="createBy" column="CREATE_BY"/>
-            <result property="createTime" column="CREATE_TIME"/>
-            <result property="updateBy" column="UPDATE_BY"/>
-            <result property="updateTime" column="UPDATE_TIME"/>
-            <result property="remark" column="REMARK"/>
+        <result property="hlObjId" column="HL_OBJ_ID"/>
+        <result property="hlClassId" column="HL_CLASS_ID"/>
+        <result property="objId" column="OBJ_ID"/>
+        <result property="objName" column="OBJ_NAME"/>
+        <result property="objType" column="OBJ_TYPE"/>
+        <result property="createBy" column="CREATE_BY"/>
+        <result property="createTime" column="CREATE_TIME"/>
+        <result property="updateBy" column="UPDATE_BY"/>
+        <result property="updateTime" column="UPDATE_TIME"/>
+        <result property="remark" column="REMARK"/>
     </resultMap>
 
     <sql id="selectHlObjVo">
-        select HL_OBJ_ID, HL_CLASS_ID, OBJ_ID, CREATE_BY, CREATE_TIME, UPDATE_BY, UPDATE_TIME, REMARK
-        from hl_obj
+        select *
+        from (SELECT a.*, b.OBJ_NAME, b.OBJ_TYPE
+              FROM hl_obj a,
+                   biz_obj b
+              WHERE a.obj_id = b.obj_id) t
     </sql>
 
     <select id="selectHlObjList" parameterType="HlObj" resultMap="HlObjResult">
         <include refid="selectHlObjVo"/>
         <where>
-                        <if test="hlClassId != null ">
-                            and HL_CLASS_ID = #{hlClassId}
-                        </if>
-                        <if test="objId != null ">
-                            and OBJ_ID = #{objId}
-                        </if>
-                        <if test="createBy != null  and createBy != ''">
-                            and CREATE_BY = #{createBy}
-                        </if>
-                        <if test="createTime != null ">
-                            and CREATE_TIME = #{createTime}
-                        </if>
-                        <if test="updateBy != null  and updateBy != ''">
-                            and UPDATE_BY = #{updateBy}
-                        </if>
-                        <if test="updateTime != null ">
-                            and UPDATE_TIME = #{updateTime}
-                        </if>
-                        <if test="remark != null  and remark != ''">
-                            and REMARK = #{remark}
-                        </if>
+            <if test="hlClassId != null ">
+                and HL_CLASS_ID = #{hlClassId}
+            </if>
+            <if test="objId != null ">
+                and OBJ_ID = #{objId}
+            </if>
+            <if test="createBy != null  and createBy != ''">
+                and CREATE_BY = #{createBy}
+            </if>
+            <if test="createTime != null ">
+                and CREATE_TIME = #{createTime}
+            </if>
+            <if test="updateBy != null  and updateBy != ''">
+                and UPDATE_BY = #{updateBy}
+            </if>
+            <if test="updateTime != null ">
+                and UPDATE_TIME = #{updateTime}
+            </if>
+            <if test="remark != null  and remark != ''">
+                and REMARK = #{remark}
+            </if>
         </where>
     </select>
 
     <select id="selectHlObjByHlObjId" parameterType="Long"
             resultMap="HlObjResult">
-            <include refid="selectHlObjVo"/>
-            where HL_OBJ_ID = #{hlObjId}
+        <include refid="selectHlObjVo"/>
+        where HL_OBJ_ID = #{hlObjId}
     </select>
 
     <insert id="insertHlObj" parameterType="HlObj" useGeneratedKeys="true"
             keyProperty="hlObjId">
         insert into hl_obj
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                    <if test="hlClassId != null">HL_CLASS_ID,
-                    </if>
-                    <if test="objId != null">OBJ_ID,
-                    </if>
-                    <if test="createBy != null">CREATE_BY,
-                    </if>
-                    <if test="createTime != null">CREATE_TIME,
-                    </if>
-                    <if test="updateBy != null">UPDATE_BY,
-                    </if>
-                    <if test="updateTime != null">UPDATE_TIME,
-                    </if>
-                    <if test="remark != null">REMARK,
-                    </if>
+            <if test="hlClassId != null">HL_CLASS_ID,
+            </if>
+            <if test="objId != null">OBJ_ID,
+            </if>
+            <if test="createBy != null">CREATE_BY,
+            </if>
+            <if test="createTime != null">CREATE_TIME,
+            </if>
+            <if test="updateBy != null">UPDATE_BY,
+            </if>
+            <if test="updateTime != null">UPDATE_TIME,
+            </if>
+            <if test="remark != null">REMARK,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                    <if test="hlClassId != null">#{hlClassId},
-                    </if>
-                    <if test="objId != null">#{objId},
-                    </if>
-                    <if test="createBy != null">#{createBy},
-                    </if>
-                    <if test="createTime != null">#{createTime},
-                    </if>
-                    <if test="updateBy != null">#{updateBy},
-                    </if>
-                    <if test="updateTime != null">#{updateTime},
-                    </if>
-                    <if test="remark != null">#{remark},
-                    </if>
+            <if test="hlClassId != null">#{hlClassId},
+            </if>
+            <if test="objId != null">#{objId},
+            </if>
+            <if test="createBy != null">#{createBy},
+            </if>
+            <if test="createTime != null">#{createTime},
+            </if>
+            <if test="updateBy != null">#{updateBy},
+            </if>
+            <if test="updateTime != null">#{updateTime},
+            </if>
+            <if test="remark != null">#{remark},
+            </if>
         </trim>
     </insert>
 
     <update id="updateHlObj" parameterType="HlObj">
         update hl_obj
         <trim prefix="SET" suffixOverrides=",">
-                    <if test="hlClassId != null">HL_CLASS_ID =
-                        #{hlClassId},
-                    </if>
-                    <if test="objId != null">OBJ_ID =
-                        #{objId},
-                    </if>
-                    <if test="createBy != null">CREATE_BY =
-                        #{createBy},
-                    </if>
-                    <if test="createTime != null">CREATE_TIME =
-                        #{createTime},
-                    </if>
-                    <if test="updateBy != null">UPDATE_BY =
-                        #{updateBy},
-                    </if>
-                    <if test="updateTime != null">UPDATE_TIME =
-                        #{updateTime},
-                    </if>
-                    <if test="remark != null">REMARK =
-                        #{remark},
-                    </if>
+            <if test="hlClassId != null">HL_CLASS_ID =
+                #{hlClassId},
+            </if>
+            <if test="objId != null">OBJ_ID =
+                #{objId},
+            </if>
+            <if test="createBy != null">CREATE_BY =
+                #{createBy},
+            </if>
+            <if test="createTime != null">CREATE_TIME =
+                #{createTime},
+            </if>
+            <if test="updateBy != null">UPDATE_BY =
+                #{updateBy},
+            </if>
+            <if test="updateTime != null">UPDATE_TIME =
+                #{updateTime},
+            </if>
+            <if test="remark != null">REMARK =
+                #{remark},
+            </if>
         </trim>
         where HL_OBJ_ID = #{hlObjId}
     </update>
 
     <delete id="deleteHlObjByHlObjId" parameterType="Long">
         delete
-        from hl_obj where HL_OBJ_ID = #{hlObjId}
+        from hl_obj
+        where HL_OBJ_ID = #{hlObjId}
     </delete>
 
     <delete id="deleteHlObjByHlObjIds" parameterType="String">