Merge remote-tracking branch 'origin/master'

src/main/java/com/neotel/smfcore/custom/fuji/bean/dto/FujiConfigDto.java

+package com.neotel.smfcore.custom.fuji.bean.dto;
+
+import com.neotel.smfcore.custom.fuji.bean.FujiConfig;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class FujiConfigDto extends FujiConfig {
+    private String etoUpdateDateStr;
+    private String etnUpdateDateStr;
+}

src/main/java/com/neotel/smfcore/custom/fuji/controller/FujiController.java

@@ -11,6 +11,7 @@ import com.neotel.smfcore.core.order.service.po.LiteOrder;
 import com.neotel.smfcore.core.order.service.po.LiteOrderItem;
 import com.neotel.smfcore.custom.fuji.FujiApi;
 import com.neotel.smfcore.custom.fuji.bean.FujiConfig;
+import com.neotel.smfcore.custom.fuji.bean.dto.FujiConfigDto;
 import com.neotel.smfcore.custom.fuji.config.FujiCacheConfig;
 import com.neotel.smfcore.custom.fuji.order.service.JobService;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
@@ -21,6 +22,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.io.File;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -71,7 +74,19 @@ public class FujiController {
         if (config == null) {
             config = new FujiConfig();
         }
-        return ResultBean.newOkResult(config);
+        FujiConfigDto dto = new FujiConfigDto();
+        dto.setAuthUrl(config.getAuthUrl());
+        dto.setGetDidInfoUrl(config.getGetDidInfoUrl());
+        dto.setRegisterDidInfoUrl(config.getRegisterDidInfoUrl());
+        dto.setResult(config.getResult());
+        dto.setLastUpdateTime(config.getLastUpdateTime());
+        dto.setInputEto(config.getInputEto());
+        dto.setOutputEtn(config.getOutputEtn());
+        dto.setTime(config.getTime());
+        dto.setEtnUpdateDateStr(getUpdateDate(config.getOutputEtn()));
+        dto.setEtoUpdateDateStr(getUpdateDate(config.getInputEto()));
+
+        return ResultBean.newOkResult(dto);
     }
 
     @ApiOperation("did注册")
@@ -97,7 +112,7 @@ public class FujiController {
 
     @ApiOperation("job出库")
     @RequestMapping("/jobCheckOut")
-    @AnonymousAccess
+    //@AnonymousAccess
     public synchronized ResultBean jobCheckOut(String orderNo) {
         LiteOrder liteOrder = liteOrderCache.getLiteOrder(orderNo);
         if (liteOrder == null){
@@ -117,7 +132,7 @@ public class FujiController {
 
     @ApiOperation("获取需要出库/正在执行中的job任务")
     @RequestMapping("/jobInfo")
-    @AnonymousAccess
+    //@AnonymousAccess
     public ResultBean getJobInfo() {
         List<Map<String, Object>> resultList = new ArrayList<>();
         Collection<LiteOrder> allLiteOrder = liteOrderCache.getAllLiteOrder();
@@ -172,4 +187,41 @@ public class FujiController {
         }
         return ResultBean.newOkResult(resultList);
     }
+
+
+    @ApiOperation("获取文件修改时间")
+    @RequestMapping("/getFileUpdateDate")
+    //@AnonymousAccess
+    public ResultBean getFileUpdateDate(String param) {
+        FujiConfig config = dataCache.getCache(FujiCacheConfig.FujiConfig_Cache_Name);
+        if (config == null) {
+            config = new FujiConfig();
+        }
+        String updateStr = "";
+        String fileName = "";
+        if (param.contains("eto")) {
+            fileName = config.getInputEto();
+            updateStr = getUpdateDate(config.getInputEto());
+        } else if (param.contains("etn")) {
+            fileName = config.getOutputEtn();
+            updateStr = getUpdateDate(config.getOutputEtn());
+        }
+        Map<String, String> resultMap = new HashMap<>();
+        resultMap.put("updateDate", updateStr);
+        resultMap.put("fileName", fileName);
+        return ResultBean.newOkResult(resultMap);
+    }
+
+
+    private String getUpdateDate(String fileName) {
+        if (StringUtils.isNotEmpty(fileName)) {
+            File file = new File(fileName);
+            if (file.exists()) {
+                long lastModified = file.lastModified();
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                return sdf.format(new Date(lastModified));
+            }
+        }
+        return "";
+    }
 }