修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -75,8 +75,11 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
+import java.net.URL;
+import java.net.URLConnection;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -1129,6 +1132,8 @@ public class CommandController extends BaseController {
             throws Exception {
         String fileName = readUrl + fileUrl; //目标文件
         if (fileName.endsWith(".doc") || fileName.endsWith(".docx")) {
+
+
             String htmlPath = System.getProperty("user.dir") + File.separator + "lookHtml" + File.separator + "file" + File.separator;
             String imagePathStr = System.getProperty("user.dir") + File.separator + "lookHtml" + File.separator + "image" + File.separator;
             String name = fileUrl.substring(fileUrl.lastIndexOf('/') + 1);
@@ -1138,8 +1143,23 @@ public class CommandController extends BaseController {
                 htmlP.mkdirs();
             }
             File htmlFile = new File(htmlFileName);
+
+
             WordConverterUtils.wordToHtml(fileName, htmlFileName, imagePathStr, readUrl, remoteSecurityService, product, appKey, token);
-            FileInputStream fis = new FileInputStream(htmlFile);
+
+
+            String urlString=   remoteSecurityService.uploadFile(WordConverterUtils.fileToMultipartFile(htmlFile), product, appKey, token );
+
+
+
+            URL url = new URL(readUrl+urlString);
+            //链接url
+            URLConnection uc = url.openConnection();
+            //获取输入流
+            InputStream in = uc.getInputStream();
+
+
+            InputStream fis = uc.getInputStream();
 			response.setContentType("multipart/form-data");
 			response.setCharacterEncoding("UTF-8");
 			response.setContentType("text/html");

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java

@@ -405,25 +405,25 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                 AlertCalledRo calledRo = (AlertCalledRo) object;
                 String alertSubmittedId = calledRo.getAlertSubmittedId();
                 //航空器类型警情 web端消息弹窗 发生后面没有数据源  和测试沟通补充航空器子类为数据源
-                if (calledRo.getAlertTypeCode().equals("230")) {
-                    List<AlertFormValueDto> alertFormValueDtos = formValueService.listByCalledId(Long.valueOf(calledRo.getSequenceNbr()));
-                    alertFormValueDtos.forEach(e->{
-                        if (e.getFieldCode().equals("aircraftRescueSub")){
-                            calledRo.setFireSituation(e.getFieldValue());
-                        }
-                    });
-                }
+//                if (calledRo.getAlertTypeCode().equals("230")) {
+//                    List<AlertFormValueDto> alertFormValueDtos = formValueService.listByCalledId(Long.valueOf(calledRo.getSequenceNbr()));
+//                    alertFormValueDtos.forEach(e->{
+//                        if (e.getFieldCode().equals("aircraftRescueSub")){
+//                            calledRo.setFireSituation(e.getFieldValue());
+//                        }
+//                    });
+//                }
                 if (calledRo.getAlertTypeCode().equals("235") || calledRo.getAlertTypeCode().equals("237") || calledRo.getAlertTypeCode().equals("238") ) {
                     calledRo.setFireSituation(calledRo.getAlertType());
                 }
-                if (calledRo.getAlertTypeCode().equals("242") ) {
-                    List<AlertFormValueDto> alertFormValueDtos = formValueService.listByCalledId(Long.valueOf(calledRo.getSequenceNbr()));
-                    alertFormValueDtos.forEach(e->{
-                        if (e.getFieldCode().equals("sub")){
-                            calledRo.setFireSituation(e.getFieldValue());
-                        }
-                    });
-                }
+//                if (calledRo.getAlertTypeCode().equals("242") ) {
+//                    List<AlertFormValueDto> alertFormValueDtos = formValueService.listByCalledId(Long.valueOf(calledRo.getSequenceNbr()));
+//                    alertFormValueDtos.forEach(e->{
+//                        if (e.getFieldCode().equals("sub")){
+//                            calledRo.setFireSituation(e.getFieldValue());
+//                        }
+//                    });
+//                }
 
 
                 alertCalledId = calledRo.getSequenceNbr();
@@ -2220,7 +2220,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
     public void pushPowerTransferToAppAndWeb(String type,Map<String, String> besidesMap, HashMap<String, String> smsParams, List<String> userList, Integer messageType){
 
         log.info("web ---消息/addAlterMessageCheck开始组装数据");
-
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
         PushMessageWebAndAppRo pushMessageWebAndAppRo  = new PushMessageWebAndAppRo();
         pushMessageWebAndAppRo.setRelationId(besidesMap.get("alterId"));
         pushMessageWebAndAppRo.setRecivers(userList);
@@ -2248,7 +2248,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
         }
         if(AlertBusinessTypeEnum.非警情确认.getCode().equals(type)) {
             pushMessageWebAndAppRo.setName("消息");
-            pushMessageWebAndAppRo.setSendTime(smsParams.get("callTimeStr"));
+            pushMessageWebAndAppRo.setSendTime(simpleDateFormat.format(new Date()));
             pushMessageWebAndAppRo.setAddress(smsParams.get("address"));
             pushMessageWebAndAppRo.setRuleType("notAlert");
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/RuleAlertCalledService.java

@@ -187,6 +187,11 @@ public class RuleAlertCalledService {
 					alertCalledRo.setAccidentSituationHkq(alertFormValue.getFieldValue());
 				}
 
+				if (alertFormValue.getFieldCode().equals("aircraftRescueSub")){
+					alertCalledRo.setFireSituation(alertFormValue.getFieldValue());
+				}
+
+
 				//突发事件救援
 				if (alertFormValue.getFieldCode().equals("accidentSituation")) {
 					alertCalledRo.setAccidentSituation(alertFormValue.getFieldValue());
@@ -215,6 +220,9 @@ public class RuleAlertCalledService {
 				if (alertFormValue.getFieldCode().equals("eventOverview")) {
 					alertCalledRo.setAccidentSituation(alertFormValue.getFieldValue());
 				}
+				if (alertFormValue.getFieldCode().equals("sub")){
+					alertCalledRo.setFireSituation(alertFormValue.getFieldValue());
+                 }
 
 				//120 急救
 				if (alertFormValue.getFieldCode().equals("patientStatus")) {