Merge branch 'xh-dev' into 'dev'

HSCLOUD_CLIENT

See merge request !1

src/main/java/com/hs/admin/job/Select.java

@@ -119,7 +119,9 @@ public class Select implements Job {
             sysTask.setCreateTime(new Date());
             sysTaskDao.insert(sysTask.init());
             //保存完置空，服务器不需要内容
-            vo.setResultVO(new ResultVO("", true, "success"));
+            ResultVO resultVO = vo.getResultVO();
+            resultVO.setResult("");
+            vo.setResultVO(resultVO);
         }
         //更新租户最新活跃时间
         jcbDao.updateModifyTime(sysTask.getJcbId(), System.currentTimeMillis());
@@ -148,7 +150,12 @@ public class Select implements Job {
             BeanPropertyRowMapper<Map> rowMapper = new BeanPropertyRowMapper<>(Map.class);
             mapList = jdbcTemplate.queryForList(sql);
         } else {
-            int i = jdbcTemplate.update(sql);
+            try {
+                int i = jdbcTemplate.update(sql);
+            } catch (DataAccessException e) {
+                vo.setResultVO(new ResultVO(mapList, false, "false"));
+                return vo;
+            }
         }
         vo.setResultVO(new ResultVO(mapList, true, "success"));
         return vo;

src/main/java/com/hs/admin/service/impl/TaskServiceImpl.java

@@ -112,6 +112,10 @@ public class TaskServiceImpl implements TaskService {
         if (!ObjectUtils.isEmpty(tableLog)) {
             Date hsCloudLastTime = tableLog.getHsCloudLastTime();
             map.put("lastExecuteTime", DateUtil.format(hsCloudLastTime, "yyyy-MM-dd HH:mm:ss"));
+        } else {
+            Object createTime = map.get("createTime");
+            Date date = new Date(Long.valueOf(String.valueOf(createTime)));
+            map.put("lastExecuteTime", DateUtil.format(date, "yyyy-MM-dd HH:mm:ss"));
         }
         return map;
     }