健康度分数

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

@@ -18,6 +18,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.List;
 
 /**
@@ -38,9 +40,27 @@ public class HlMetricsController extends BaseController {
     @ApiOperation("根据分类ID查询指标")
     @GetMapping("/list/{hlClassId}")
     public AjaxResult list(@PathVariable("hlClassId") Long hlClassId) {
+        HlClass hlClass = hlClassService.selectHlClassByHlClassId(hlClassId);
         HlMetrics hlMetrics = new HlMetrics();
         hlMetrics.setHlClassId(hlClassId);
         List<HlMetrics> list = hlMetricsService.selectHlMetricsList(hlMetrics);
+        if ("1".equals(hlClass.getScoreType())) {
+            //均分
+            int size = list.size();
+            BigDecimal total = hlClass.getHlScore();
+            int avg = total.divide(BigDecimal.valueOf(size), 0, RoundingMode.HALF_DOWN).intValue();
+            int one = avg * size == total.intValue() ? avg : total.intValue() - avg * size;
+            boolean flag = true;
+            for (HlMetrics hm : list) {
+                if (flag) {
+                    hm.setHlScore(BigDecimal.valueOf(one));
+                    flag = false;
+                } else {
+                    hm.setHlScore(BigDecimal.valueOf(avg));
+                }
+                hlMetricsService.updateHlMetrics(hm);
+            }
+        }
         return AjaxResult.success(list);
     }
 

jjt-biz/src/main/java/com/jjt/hl/controller/HlScoreController.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.HlScore;
 import com.jjt.hl.service.IHlScoreService;
-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/hs")
-public class HlScoreController extends BaseController
-{
+public class HlScoreController extends BaseController {
     @Resource
     private IHlScoreService hlScoreService;
 
@@ -42,11 +34,35 @@ public class HlScoreController extends BaseController
      * 查询健康度分数记录列表
      */
     @ApiOperation("查询健康度分数记录列表")
-    @PreAuthorize("@ss.hasPermi('hl:hs:list')")
     @GetMapping("/list")
-    public TableDataInfo list(HlScore hlScore)
-    {
+    public TableDataInfo list(HlScore hlScore) {
+        startPage();
+        List<HlScore> list = hlScoreService.selectHlScoreList(hlScore);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询健康度分数记录列表
+     */
+    @ApiOperation("历史健康度列表")
+    @GetMapping("/time/list")
+    public TableDataInfo timeList(HlScore hlScore) {
+        startPage();
+        //type=1表示历史健康度
+        hlScore.setHlType("1");
+        List<HlScore> list = hlScoreService.selectHlScoreList(hlScore);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询健康度分数记录列表
+     */
+    @ApiOperation("日健康度列表")
+    @GetMapping("/day/list")
+    public TableDataInfo dayList(HlScore hlScore) {
         startPage();
+        //type=2表示日健康度
+        hlScore.setHlType("1");
         List<HlScore> list = hlScoreService.selectHlScoreList(hlScore);
         return getDataTable(list);
     }
@@ -58,8 +74,7 @@ public class HlScoreController extends BaseController
     @PreAuthorize("@ss.hasPermi('hl:hs:export')")
     @Log(title = "健康度分数记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, HlScore hlScore)
-    {
+    public void export(HttpServletResponse response, HlScore hlScore) {
         List<HlScore> list = hlScoreService.selectHlScoreList(hlScore);
         ExcelUtil<HlScore> util = new ExcelUtil<HlScore>(HlScore.class);
         util.exportExcel(response, list, "健康度分数记录数据");
@@ -71,8 +86,7 @@ public class HlScoreController extends BaseController
     @ApiOperation("获取健康度分数记录详细信息")
     @PreAuthorize("@ss.hasPermi('hl:hs:query')")
     @GetMapping(value = "/{hlScoreId}")
-    public AjaxResult getInfo(@PathVariable("hlScoreId") Long hlScoreId)
-    {
+    public AjaxResult getInfo(@PathVariable("hlScoreId") Long hlScoreId) {
         return success(hlScoreService.selectHlScoreByHlScoreId(hlScoreId));
     }
 
@@ -83,8 +97,7 @@ public class HlScoreController extends BaseController
     @PreAuthorize("@ss.hasPermi('hl:hs:add')")
     @Log(title = "健康度分数记录", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody HlScore hlScore)
-    {
+    public AjaxResult add(@RequestBody HlScore hlScore) {
         return toAjax(hlScoreService.insertHlScore(hlScore));
     }
 
@@ -95,8 +108,7 @@ public class HlScoreController extends BaseController
     @PreAuthorize("@ss.hasPermi('hl:hs:edit')")
     @Log(title = "健康度分数记录", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody HlScore hlScore)
-    {
+    public AjaxResult edit(@RequestBody HlScore hlScore) {
         return toAjax(hlScoreService.updateHlScore(hlScore));
     }
 
@@ -106,9 +118,8 @@ public class HlScoreController extends BaseController
     @ApiOperation("删除健康度分数记录")
     @PreAuthorize("@ss.hasPermi('hl:hs:remove')")
     @Log(title = "健康度分数记录", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{hlScoreIds}")
-    public AjaxResult remove(@PathVariable Long[] hlScoreIds)
-    {
+    @DeleteMapping("/{hlScoreIds}")
+    public AjaxResult remove(@PathVariable Long[] hlScoreIds) {
         return toAjax(hlScoreService.deleteHlScoreByHlScoreIds(hlScoreIds));
     }
 }

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -53,7 +54,7 @@ public class HlClass extends BaseEntity {
      */
     @ApiModelProperty("健康度分值")
     @Excel(name = "健康度分值")
-    private String hlScore;
+    private BigDecimal hlScore;
 
     @ApiModelProperty("对象列表")
     private List<HlObj> hlObjList;

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

@@ -7,6 +7,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * 业务模型健康度指标对象 hl_metrics
  *
@@ -50,7 +52,7 @@ public class HlMetrics extends BaseEntity {
      */
     @ApiModelProperty("健康度分值")
     @Excel(name = "健康度分值")
-    private String hlScore;
+    private BigDecimal hlScore;
 
     /**
      * 评分标准

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

@@ -1,13 +1,13 @@
 package com.jjt.hl.domain;
 
-import java.math.BigDecimal;
 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.math.BigDecimal;
 
 /**
  * 业务模型健康度指标得分对象 hl_metrics_score
@@ -16,124 +16,56 @@ import com.jjt.common.core.domain.BaseEntity;
  * @date 2024-09-05
  */
 @ApiModel(value = "HlMetricsScore", description = "业务模型健康度指标得分")
-public class HlMetricsScore extends BaseEntity
-{
+@Data
+public class HlMetricsScore extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 指标明细ID */
+    /**
+     * 指标明细ID
+     */
     @ApiModelProperty("指标明细ID")
     @TableId
     private Long scoreMetricsId;
 
-    /** 健康度分类ID */
+    /**
+     * 健康度分类ID
+     */
     @ApiModelProperty("健康度分类ID")
     @Excel(name = "健康度分类ID")
     private Long scoreClassId;
 
-    /** 指标ID */
+    /**
+     * 指标ID
+     */
     @ApiModelProperty("指标ID")
     @Excel(name = "指标ID")
     private Long metricsId;
 
-    /** 健康度分值 */
+    /**
+     * 健康度分值
+     */
     @ApiModelProperty("健康度分值")
     @Excel(name = "健康度分值")
-    private String hlScore;
+    private BigDecimal hlScore;
 
-    /** 评分标准 */
+    /**
+     * 评分标准
+     */
     @ApiModelProperty("评分标准")
     @Excel(name = "评分标准")
     private String hlStand;
 
-    /** 扣分 */
+    /**
+     * 扣分
+     */
     @ApiModelProperty("扣分")
     @Excel(name = "扣分")
     private BigDecimal loseScore;
 
-    /** 得分 */
+    /**
+     * 得分
+     */
     @ApiModelProperty("得分")
     @Excel(name = "得分")
     private BigDecimal score;
-
-    public void setScoreMetricsId(Long scoreMetricsId)
-    {
-        this.scoreMetricsId = scoreMetricsId;
-    }
-
-    public Long getScoreMetricsId()
-    {
-        return scoreMetricsId;
-    }
-    public void setScoreClassId(Long scoreClassId)
-    {
-        this.scoreClassId = scoreClassId;
-    }
-
-    public Long getScoreClassId()
-    {
-        return scoreClassId;
-    }
-    public void setMetricsId(Long metricsId)
-    {
-        this.metricsId = metricsId;
-    }
-
-    public Long getMetricsId()
-    {
-        return metricsId;
-    }
-    public void setHlScore(String hlScore)
-    {
-        this.hlScore = hlScore;
-    }
-
-    public String getHlScore()
-    {
-        return hlScore;
-    }
-    public void setHlStand(String hlStand)
-    {
-        this.hlStand = hlStand;
-    }
-
-    public String getHlStand()
-    {
-        return hlStand;
-    }
-    public void setLoseScore(BigDecimal loseScore)
-    {
-        this.loseScore = loseScore;
-    }
-
-    public BigDecimal getLoseScore()
-    {
-        return loseScore;
-    }
-    public void setScore(BigDecimal score)
-    {
-        this.score = score;
-    }
-
-    public BigDecimal getScore()
-    {
-        return score;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("scoreMetricsId", getScoreMetricsId())
-            .append("scoreClassId", getScoreClassId())
-            .append("metricsId", getMetricsId())
-            .append("hlScore", getHlScore())
-            .append("hlStand", getHlStand())
-            .append("loseScore", getLoseScore())
-            .append("score", getScore())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }

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

@@ -67,4 +67,11 @@ public interface IHlObjService {
      * @return 结果
      */
     int insertObj(Long hlClassId, Long[] objIds);
+
+    /**
+     * 通过hlClassId获取列表
+     * @param hlClassId classid
+     * @return 结果
+     */
+    List<HlObj> selectHlObjListByClassId(Long hlClassId);
 }

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

@@ -1,19 +1,19 @@
 package com.jjt.hl.service;
 
-import java.util.List;
 import com.jjt.hl.domain.HlScore;
 
+import java.util.List;
+
 /**
  * 健康度分数记录Service接口
- * 
+ *
  * @author jjt
  * @date 2024-09-05
  */
-public interface IHlScoreService 
-{
+public interface IHlScoreService {
     /**
      * 查询健康度分数记录
-     * 
+     *
      * @param hlScoreId 健康度分数记录主键
      * @return 健康度分数记录
      */
@@ -21,7 +21,7 @@ public interface IHlScoreService
 
     /**
      * 查询健康度分数记录列表
-     * 
+     *
      * @param hlScore 健康度分数记录
      * @return 健康度分数记录集合
      */
@@ -29,7 +29,7 @@ public interface IHlScoreService
 
     /**
      * 新增健康度分数记录
-     * 
+     *
      * @param hlScore 健康度分数记录
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface IHlScoreService
 
     /**
      * 修改健康度分数记录
-     * 
+     *
      * @param hlScore 健康度分数记录
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface IHlScoreService
 
     /**
      * 批量删除健康度分数记录
-     * 
+     *
      * @param hlScoreIds 需要删除的健康度分数记录主键集合
      * @return 结果
      */
@@ -53,9 +53,19 @@ public interface IHlScoreService
 
     /**
      * 删除健康度分数记录信息
-     * 
+     *
      * @param hlScoreId 健康度分数记录主键
      * @return 结果
      */
     public int deleteHlScoreByHlScoreId(Long hlScoreId);
+
+    /**
+     * 健康度评分
+     */
+    void score();
+
+    /**
+     * 日健康度评分
+     */
+    void yesterday();
 }

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

@@ -108,4 +108,17 @@ public class HlObjServiceImpl implements IHlObjService {
         }
         return 0;
     }
+
+    /**
+     * 通过hlClassId获取列表
+     *
+     * @param hlClassId classid
+     * @return 结果
+     */
+    @Override
+    public List<HlObj> selectHlObjListByClassId(Long hlClassId) {
+        HlObj obj = new HlObj();
+        obj.setHlClassId(hlClassId);
+        return selectHlObjList(obj);
+    }
 }

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

@@ -1,12 +1,20 @@
 package com.jjt.hl.service.impl;
 
-import java.util.List;
-        import com.jjt.common.utils.DateUtils;
-import org.springframework.stereotype.Service;
+import com.jjt.biz.domain.BizModel;
+import com.jjt.biz.service.IBizModelDetailService;
+import com.jjt.biz.service.IBizModelService;
+import com.jjt.common.utils.DateUtils;
+import com.jjt.common.utils.bean.BeanUtils;
+import com.jjt.hl.domain.*;
 import com.jjt.hl.mapper.HlScoreMapper;
-import com.jjt.hl.domain.HlScore;
-import com.jjt.hl.service.IHlScoreService;
+import com.jjt.hl.service.*;
+import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Random;
 
 /**
  * 健康度分数记录Service业务层处理
@@ -18,6 +26,23 @@ import javax.annotation.Resource;
 public class HlScoreServiceImpl implements IHlScoreService {
     @Resource
     private HlScoreMapper hlScoreMapper;
+    @Resource
+    private IBizModelService modelService;
+    @Resource
+    private IBizModelDetailService modelDetailService;
+    @Resource
+    private IHlClassService hlClassService;
+    @Resource
+    private IHlClassScoreService hlClassScoreService;
+    @Resource
+    private IHlObjService hlObjService;
+    @Resource
+    private IHlMetricsService hlMetricsService;
+    @Resource
+    private IHlMetricsScoreService hlMetricsScoreService;
+    @Resource
+    private IHlMetricsScoreDetailService hlMetricsScoreDetailService;
+
 
     /**
      * 查询健康度分数记录
@@ -26,6 +51,7 @@ public class HlScoreServiceImpl implements IHlScoreService {
      * @return 健康度分数记录
      */
     @Override
+
     public HlScore selectHlScoreByHlScoreId(Long hlScoreId) {
         return hlScoreMapper.selectHlScoreByHlScoreId(hlScoreId);
     }
@@ -49,8 +75,8 @@ public class HlScoreServiceImpl implements IHlScoreService {
      */
     @Override
     public int insertHlScore(HlScore hlScore) {
-                hlScore.setCreateTime(DateUtils.getNowDate());
-            return hlScoreMapper.insertHlScore(hlScore);
+        hlScore.setCreateTime(DateUtils.getNowDate());
+        return hlScoreMapper.insertHlScore(hlScore);
     }
 
     /**
@@ -61,7 +87,7 @@ public class HlScoreServiceImpl implements IHlScoreService {
      */
     @Override
     public int updateHlScore(HlScore hlScore) {
-                hlScore.setUpdateTime(DateUtils.getNowDate());
+        hlScore.setUpdateTime(DateUtils.getNowDate());
         return hlScoreMapper.updateHlScore(hlScore);
     }
 
@@ -86,4 +112,74 @@ public class HlScoreServiceImpl implements IHlScoreService {
     public int deleteHlScoreByHlScoreId(Long hlScoreId) {
         return hlScoreMapper.deleteHlScoreByHlScoreId(hlScoreId);
     }
+
+    /**
+     * 健康度评分
+     */
+    @Override
+    public void score() {
+        //暂时先模拟分数
+        //1.获取所有模型
+        //2.获取模型健康度指标分类
+        //3.1.获取对象
+        //3.2.获取指标
+        //
+        List<BizModel> modelList = modelService.selectBizModelList(new BizModel());
+        Date curr = new Date();
+        for (BizModel model : modelList) {
+            HlScore score = new HlScore();
+            score.setModelId(model.getModelId());
+            score.setHlDate(curr);
+            score.setHlType("1");
+            insertHlScore(score);
+            List<HlClass> classList = modelService.selectHlClassList4modelId(model.getModelId());
+            for (HlClass hlClass : classList) {
+                HlClassScore hlClassScore = new HlClassScore();
+                BeanUtils.copyBeanProp(hlClassScore, hlClass);
+                hlClassScore.setHlScoreId(score.getHlScoreId());
+                List<HlObj> hlObjList = hlObjService.selectHlObjListByClassId(hlClass.getHlClassId());
+                hlClassScoreService.insertHlClassScore(hlClassScore);
+                List<HlMetrics> hlMetricsList = hlMetricsService.selectHlMetricsList4ModelId(hlClassScore.getModelId(), hlClass.getObjType());
+                BigDecimal loseScore = BigDecimal.ZERO;
+                //1.均分 2.细项分
+                hlClass.getScoreType();
+                for (HlMetrics hlMetrics : hlMetricsList) {
+                    //TODO ..这里需要从对象指标表里面去找。
+//                    BizObjMetrics
+//                    BizObjMetricsData
+                    BigDecimal lose = BigDecimal.ZERO;
+                    HlMetricsScore metricsScore = new HlMetricsScore();
+                    BeanUtils.copyBeanProp(metricsScore, hlMetrics);
+                    if (flag()) {
+                        //TODO 模拟扣分判断
+                        if ("1".equals(hlClassScore.getScoreType())) {
+                            //均分
+//                            Random
+                        } else {
+                            //细项分
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 日健康度评分
+     */
+    @Override
+    public void yesterday() {
+
+    }
+
+    /**
+     * 模拟扣分判断
+     *
+     * @return
+     */
+    private boolean flag() {
+        Random r = new Random();
+        int x = r.nextInt(8889) + 1;
+        return x % 2 == 1;
+    }
 }

jjt-biz/src/main/java/com/jjt/task/HlTask.java

@@ -1,8 +1,11 @@
 package com.jjt.task;
 
 import com.jjt.common.utils.StringUtils;
+import com.jjt.hl.service.IHlScoreService;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
+
 /**
  * 定时任务调度测试
  *
@@ -10,13 +13,15 @@ import org.springframework.stereotype.Component;
  */
 @Component("hlTask")
 public class HlTask {
+    @Resource
+    private IHlScoreService scoreService;
 
     public void score() {
-
+        scoreService.score();
     }
 
     public void yesterday() {
-
+        scoreService.yesterday();
     }
 
     public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) {

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

@@ -5,144 +5,154 @@
 <mapper namespace="com.jjt.hl.mapper.HlScoreMapper">
 
     <resultMap type="HlScore" id="HlScoreResult">
-            <result property="hlScoreId" column="HL_SCORE_ID"/>
-            <result property="modelId" column="MODEL_ID"/>
-            <result property="hlScore" column="HL_SCORE"/>
-            <result property="hlType" column="HL_TYPE"/>
-            <result property="hlDate" column="HL_DATE"/>
-            <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="hlScoreId" column="HL_SCORE_ID"/>
+        <result property="modelId" column="MODEL_ID"/>
+        <result property="hlScore" column="HL_SCORE"/>
+        <result property="hlType" column="HL_TYPE"/>
+        <result property="hlDate" column="HL_DATE"/>
+        <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="selectHlScoreVo">
-        select HL_SCORE_ID, MODEL_ID, HL_SCORE, HL_TYPE, HL_DATE, CREATE_BY, CREATE_TIME, UPDATE_BY, UPDATE_TIME, REMARK
+        select HL_SCORE_ID,
+               MODEL_ID,
+               HL_SCORE,
+               HL_TYPE,
+               HL_DATE,
+               CREATE_BY,
+               CREATE_TIME,
+               UPDATE_BY,
+               UPDATE_TIME,
+               REMARK
         from hl_score
     </sql>
 
     <select id="selectHlScoreList" parameterType="HlScore" resultMap="HlScoreResult">
         <include refid="selectHlScoreVo"/>
         <where>
-                        <if test="modelId != null ">
-                            and MODEL_ID = #{modelId}
-                        </if>
-                        <if test="hlScore != null ">
-                            and HL_SCORE = #{hlScore}
-                        </if>
-                        <if test="hlType != null  and hlType != ''">
-                            and HL_TYPE = #{hlType}
-                        </if>
-                        <if test="hlDate != null ">
-                            and HL_DATE = #{hlDate}
-                        </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="hlScore != null ">
+                and HL_SCORE = #{hlScore}
+            </if>
+            <if test="hlType != null  and hlType != ''">
+                and HL_TYPE = #{hlType}
+            </if>
+            <if test="hlDate != null ">
+                and HL_DATE = #{hlDate}
+            </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="selectHlScoreByHlScoreId" parameterType="Long"
             resultMap="HlScoreResult">
-            <include refid="selectHlScoreVo"/>
-            where HL_SCORE_ID = #{hlScoreId}
+        <include refid="selectHlScoreVo"/>
+        where HL_SCORE_ID = #{hlScoreId}
     </select>
 
     <insert id="insertHlScore" parameterType="HlScore" useGeneratedKeys="true"
             keyProperty="hlScoreId">
         insert into hl_score
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                    <if test="modelId != null">MODEL_ID,
-                    </if>
-                    <if test="hlScore != null">HL_SCORE,
-                    </if>
-                    <if test="hlType != null">HL_TYPE,
-                    </if>
-                    <if test="hlDate != null">HL_DATE,
-                    </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="hlScore != null">HL_SCORE,
+            </if>
+            <if test="hlType != null">HL_TYPE,
+            </if>
+            <if test="hlDate != null">HL_DATE,
+            </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="hlScore != null">#{hlScore},
-                    </if>
-                    <if test="hlType != null">#{hlType},
-                    </if>
-                    <if test="hlDate != null">#{hlDate},
-                    </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="hlScore != null">#{hlScore},
+            </if>
+            <if test="hlType != null">#{hlType},
+            </if>
+            <if test="hlDate != null">#{hlDate},
+            </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="updateHlScore" parameterType="HlScore">
         update hl_score
         <trim prefix="SET" suffixOverrides=",">
-                    <if test="modelId != null">MODEL_ID =
-                        #{modelId},
-                    </if>
-                    <if test="hlScore != null">HL_SCORE =
-                        #{hlScore},
-                    </if>
-                    <if test="hlType != null">HL_TYPE =
-                        #{hlType},
-                    </if>
-                    <if test="hlDate != null">HL_DATE =
-                        #{hlDate},
-                    </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="hlScore != null">HL_SCORE =
+                #{hlScore},
+            </if>
+            <if test="hlType != null">HL_TYPE =
+                #{hlType},
+            </if>
+            <if test="hlDate != null">HL_DATE =
+                #{hlDate},
+            </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_SCORE_ID = #{hlScoreId}
     </update>
 
     <delete id="deleteHlScoreByHlScoreId" parameterType="Long">
         delete
-        from hl_score where HL_SCORE_ID = #{hlScoreId}
+        from hl_score
+        where HL_SCORE_ID = #{hlScoreId}
     </delete>
 
     <delete id="deleteHlScoreByHlScoreIds" parameterType="String">