优化代码

src/main/java/com/hisense/dataservice/es/utils/ElasticsearchUtils.java

@@ -2,6 +2,8 @@ package com.hisense.dataservice.es.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.hisense.dataservice.es.data.EsBaseData;
 import com.hisense.dataservice.es.data.EsField;
 import com.hisense.dataservice.es.data.EsPage;
@@ -49,7 +51,9 @@ import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import springfox.documentation.spring.web.json.Json;
 
+import javax.annotation.PostConstruct;
 import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -65,6 +69,14 @@ public class ElasticsearchUtils {
     @Autowired
     private RestHighLevelClient restHighLevelClient;
 
+    private ObjectMapper mapper = new ObjectMapper();
+
+    @PostConstruct
+    public void init() {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        mapper.setDateFormat(dateFormat);
+        mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
+    }
     /**
      * 添加索引
      *
@@ -452,7 +464,8 @@ public class ElasticsearchUtils {
             for (SearchHit hit : hits
             ) {
                 String data = hit.getSourceAsString();
-                T t = JSONObject.parseObject(data, c);
+
+                T t = mapper.readValue(data,c);
                 log.info("data={}", data);
                 res.add(t);
             }

src/main/java/com/hisense/dataservice/repository/DataApiModelRepository.java

@@ -31,6 +31,9 @@ public interface DataApiModelRepository extends JpaRepository<DataApiModel,Long>
 
     boolean existsByNameAndSystemEnv(String name, SystemEnv env);
 
+    @Query(value = "SELECT id FROM data_api_model e WHERE e.name = :name AND e.systenEnv = :env AND e.id != :idToExclude", nativeQuery = true)
+    List<Long> isNameAlreadyInUse(@Param("name")String name,@Param("env")SystemEnv env, @Param("idToExclude")Long idToExclude);
+
     @Query(value = "select name from system_info where id = :systemId", nativeQuery = true)
     String findSystemNameBySystemId(@Param("systemId") Long systemId);
 

src/main/java/com/hisense/dataservice/service/impl/DataApiServiceManagementServiceImpl.java

@@ -200,9 +200,16 @@ public class DataApiServiceManagementServiceImpl implements DataApiServiceManage
         }
 
         if (!StringUtils.isEmpty(dataApiModelDto.getModelName())) {
+            if(dataApiModel.getId() != null){
+                List<Long> nameAlreadyInUses = dataApiModelRepository.isNameAlreadyInUse(dataApiModelDto.getModelName(), SystemEnv.valueOf(environment), dataApiModel.getId());
+                if(!nameAlreadyInUses.isEmpty()){
+                    return failure("数据api服务名称已经存在", null);
+                }
+            }else{
                 if(dataApiModelRepository.existsByNameAndSystemEnv(dataApiModelDto.getModelName(), SystemEnv.valueOf(environment))){
                     return failure("数据api服务名称已经存在", null);
                 }
+            }
             dataApiModel.setName(dataApiModelDto.getModelName());
         }
 

src/main/java/com/hisense/dataservice/service/impl/DataServiceLogManagementServiceImpl.java

 package com.hisense.dataservice.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.hisense.dataservice.entity.DataApiApplication;
 import com.hisense.dataservice.entity.DataApiSubscribeConfig;
 import com.hisense.dataservice.enums.SystemEnv;
@@ -93,13 +94,13 @@ public class DataServiceLogManagementServiceImpl implements DataServiceLogManage
     public Result<Boolean> retryQuery(String environment, Integer systemId, Long subscribeConfigId){
         Optional<DataApiSubscribeConfig> dataApiSubscribeConfigOptional = dataApiSubscribeRepository.findByIdAndSystemEnvAndSubscribeSystemId(subscribeConfigId, SystemEnv.valueOf(environment), systemId);
         if (!dataApiSubscribeConfigOptional.isPresent()) {
-            failure("重试的订阅配置不存在");
+            return failure("重试的订阅配置不存在");
         }
         DataApiSubscribeConfig subscribeConfig = dataApiSubscribeConfigOptional.get();
         String hashStr = subscribeConfig.getHashStr();
         DataApiApplication dataApiApplication = dataApiApplicationRepository.findDataApiApplicationByDataModelSubConfigId(subscribeConfigId);
         if(dataApiApplication == null){
-            failure("订阅应用信息不存在");
+            return failure("订阅应用信息不存在");
         }
         String appKey = dataApiApplication.getAppKey();
         String appId = dataApiApplication.getAppId();
@@ -108,9 +109,13 @@ public class DataServiceLogManagementServiceImpl implements DataServiceLogManage
         String queryUrlForAppIdAndKey = String.format("%s/%s?appId=%s&appKey=%s", DATA_SERVER_BASE_URL, hashStr, appId, appKey);
         String result = HttpUtil.get(queryUrlForUserKey);
         if(StringUtils.isEmpty(result)){
-            failure("重试失败");
-        }else{
-            success(Boolean.TRUE);
+            return failure("重试失败");
+        }
+        JSONObject resultJson = JSONObject.parseObject(result);
+        Boolean isFailure = resultJson.getBoolean("failure");
+        String errorMsg = resultJson.getString("msg");
+        if(isFailure){
+            return failure("重试失败："+ errorMsg);
         }
         return success(Boolean.TRUE);
     }

src/main/java/com/hisense/dataservice/vo/CallLogVo.java

@@ -29,7 +29,7 @@ public class CallLogVo {
 
     @ApiModelProperty(name = "调用时间")
     @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private String timestamp;
+    private String callTime;
 
     @ApiModelProperty(name = "调用状态")
     private String status;