巡检功能修改

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

@@ -5,6 +5,8 @@ import com.jjt.biz.service.*;
 import com.jjt.biz.util.DataUtil;
 import com.jjt.biz.vo.BizTypeVO;
 import com.jjt.biz.vo.HlScoreVO;
+import com.jjt.check.domain.CheckRecord;
+import com.jjt.check.service.ICheckRecordService;
 import com.jjt.common.core.controller.BaseController;
 import com.jjt.common.core.domain.AjaxResult;
 import com.jjt.common.core.page.TableDataInfo;
@@ -57,17 +59,22 @@ public class IndexController extends BaseController {
     private IAlarmRecordService alarmRecordService;
     @Resource
     private JdbcTemplate jdbcTemplate;
+    @Resource
+    private ICheckRecordService crService;
 
     String[] MODEL_NAMES = {"市场服务", "市场出清", "信息发布", "市场合规", "市场结算"};
 
     @ApiOperation("巡检提示")
     @GetMapping("/hl/check")
     public AjaxResult hlCheck() {
+        CheckRecord cr = crService.selectCheckRecordByCrId(0L);
+
         Map<String, Object> result = new HashMap<>(16);
-        result.put("time", DateUtils.getTime());
-        result.put("model", 5);
-        result.put("metrics", new Random().nextInt(200));
-        result.put("problem", new Random().nextInt(80));
+        result.put("time", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,cr.getCheckTime()));
+        result.put("result", cr.getCheckResult());
+//        result.put("model", 5);
+//        result.put("metrics", new Random().nextInt(200));
+//        result.put("problem", new Random().nextInt(80));
         return AjaxResult.success(result);
     }
 

jjt-biz/src/main/java/com/jjt/check/domain/CheckRecord.java

@@ -33,7 +33,7 @@ public class CheckRecord extends BaseEntity {
      * 巡检时间
      */
     @ApiModelProperty("巡检时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "巡检时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date checkTime;
 

jjt-biz/src/main/resources/mapper/check/CheckRecordMapper.xml

@@ -29,6 +29,7 @@
                 and REMARK = #{remark}
             </if>
         </where>
+        order by check_time desc
     </select>
 
     <select id="selectCheckRecordByCrId" parameterType="Long"