lin 3 سال پیش
والد
کامیت
10e88d51ad

+ 1 - 1
zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/FileController.java

@@ -34,7 +34,7 @@ public class FileController {
     public AjaxMessage<Map<String,String>> uploadFile(MultipartFile file) {
         String url = fileLogService.uploadFile(file);
         Map<String,String> map = new HashMap<>();
-        map.put("url",rmcpUrl+"/file"+url);
+        map.put("url",rmcpUrl+"/zoniot-rmcp-web/file"+url);
         return AjaxMessage.success(map);
     }
 

+ 4 - 0
zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/excel/resolver/service/WaterDeviceHandleExcelService.java

@@ -22,6 +22,7 @@ import com.zcxk.rmcp.web.service.impl.ImportFileServiceImpl;
 import com.zcxk.rmcp.web.util.MessageSendUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -45,6 +46,8 @@ public class WaterDeviceHandleExcelService implements HandleExcelService {
     private ImportFileServiceImpl importFileService;
     @Autowired
     private MessageSendUtil messageSendUtil;
+    @Value("${rmcp.url}")
+    private String rmcpUrl;
 
     @Override
     public void handle(ExcelData data) {
@@ -119,6 +122,7 @@ public class WaterDeviceHandleExcelService implements HandleExcelService {
         message.setMessageTemplateId(9);
         message.setChannel(0);
         message.setUserId(data.getImportFile().getUserId());
+        message.setPath(rmcpUrl);
         messageSendUtil.send(message);
     }
 

+ 1 - 1
zoniot-rmcp/zoniot-rmcp-web/src/main/resources/application-sit.properties

@@ -4,7 +4,7 @@ logging.level.root=info
 logging.path=./logs
 
 files.path=/app/sit/uims/zoniot-rmcp-web/data
-rmcp.url=http://10.0.0.62:8325
+rmcp.url=http://114.135.61.186:21020
 
 
 # mysql