Merge remote-tracking branch 'origin/developer' into developer

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/rule/action/MessageAction.java

@@ -23,6 +23,7 @@ public class MessageAction {
         MessageModel messageModel = JSON.parseObject(JSON.toJSONString(msgObj), MessageModel.class);
         messageModel.setTitle(title);
         messageModel.setBody(RuleUtils.instedParams(content, msgObj));
+        log.info(String.format("接收规则返回数据: %s", JSON.toJSONString(msgObj)));
         if (!ValidationUtil.isEmpty(messageModel)) {
             try {
                 Systemctl.messageClient.create(messageModel);

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/excel/ExcelUtil.java

@@ -167,14 +167,18 @@ public class ExcelUtil {
 					String[] postTypeNamestrings = new String[postTypeNameDetailList.size()];
 					List<String> userNameDetailList = (List<String>) detail.get(detail.size()-3);
 					String[] userNamestrings = new String[userNameDetailList.size()];
+					List<String> companyNameList = (List<String>) detail.get(detail.size()-4);
+					String[] companyNameLists = new String[companyNameList.size()];
 					map.put(4, fireStationDetailList.toArray(strings));
 					map.put(3, postTypeNameDetailList.toArray(postTypeNamestrings));
 					map.put(2, userNameDetailList.toArray(userNamestrings));
+					map.put(1, companyNameList.toArray(companyNameLists));
 					map.putAll(explicitListConstraintMap);
 					fireStationExplicitListConstraintMap.add(map);
 					detail.remove(detail.size()-1);
 					detail.remove(detail.size()-1);
 					detail.remove(detail.size()-1);
+					detail.remove(detail.size()-1);
 					resultList.add(detail);
 				});
 				excelWriterSheetBuilder

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/AppDownloadVO.java

@@ -4,6 +4,7 @@ import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.vo.BuildingTreeVo;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -18,47 +19,47 @@ public class AppDownloadVO {
     /**
      * 装备
      */
-    private List<DownloadEquipmentDataVO> downloadEquipmentDatas;
+    private List<DownloadEquipmentDataVO> downloadEquipmentDatas = new ArrayList<>();
 
     /**
      * 车辆
      */
-    private List<Car> downloadCarDatas;
+    private List<Car> downloadCarDatas = new ArrayList<>();
 
     /**
      * 建筑
      */
-    private List<BuildingTreeVo> buildTree;
+    private List<BuildingTreeVo> buildTree = new ArrayList<>();
 
     /**
      *设备对应性能指标
      */
-    private List<EquipmentSpecificIndex> equipmentSpecificIndexs;
+    private List<EquipmentSpecificIndex> equipmentSpecificIndexs = new ArrayList<>();
 
     /**
      *性能指标模板
      */
-    private List<EquipmentIndex> equipmentIndex;
+    private List<EquipmentIndex> equipmentIndex = new ArrayList<>();
 
     /**
      *货位
      */
-    private List<WarehouseStructure> warehouseStructure;
+    private List<WarehouseStructure> warehouseStructure = new ArrayList<>();
 
     /**
      * 车载装备
      */
-    private List<EquipmentOnCar> equipmentOnCar;
+    private List<EquipmentOnCar> equipmentOnCar = new ArrayList<>();
 
     /**
      * 车载灭火药剂
      */
-    private List<ExtinguishantOnCar> extinguishantOnCar;
+    private List<ExtinguishantOnCar> extinguishantOnCar = new ArrayList<>();
 
 
     /**
      *报废原因
      */
-    private List<SystemDic> reason;
+    private List<SystemDic> reason = new ArrayList<>();
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderInfoDto.java

@@ -82,6 +82,6 @@ public class CylinderInfoDto  extends BaseDto {
     private Boolean syncState;
 
     @ApiModelProperty(value = "对接公司编码")
-    private String apiCompanyCode;
+    private String appId;
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderUnitDto.java

@@ -90,8 +90,8 @@ public class CylinderUnitDto  extends BaseDto {
     @ApiModelProperty(value = "1初次同步数据   2上层系统已同步数据   0已删除数据")
     private Boolean syncState;
 
-    @ApiModelProperty(value = "对接公司编码")
-    private String apiCompanyCode;
+ @ApiModelProperty(value = "对接公司编码")
+ private String appId;
 
    @ApiModelProperty(value = "气瓶数量")
    private Long cylinderNumber;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderInfo.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -150,7 +151,6 @@ public class CylinderInfo  {
     /**
      * 对接公司编码
      */
-	@TableField("api_company_code")
-    private String apiCompanyCode;
-
+    @TableField("app_id")
+    private String appId;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderUnit.java

@@ -168,8 +168,8 @@ public class CylinderUnit  {
     /**
      * 对接公司编码
      */
-	@TableField("api_company_code")
-    private String apiCompanyCode;
+    @TableField("app_id")
+    private String appId;
 
     /**
      * 经度

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/IEquipmentInformService.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.flc.api.service;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentInformDto;
 
 import java.util.List;
@@ -19,4 +20,12 @@ public interface IEquipmentInformService {
     Page<EquipmentInformDto> queryDtoList(Page<EquipmentInformDto> page, EquipmentInformDto equipmentInformDto, String sortParam, String sortRule);
 
     Boolean batchDelete(List<Long> sequenceNbrList);
+
+    Boolean acceptInform(Long sequenceNbr);
+
+    EquipmentInformDto updateEquipmentInform(EquipmentInformDto model);
+
+    EquipmentInformDto queryDtoBySeq(Long sequenceNbr);
+
+    Boolean startWorkflow(Long sequenceNbr, ReginParams userInfo) throws Exception;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderInfoMapper.xml

@@ -11,9 +11,9 @@
         tz_cylinder_info t
         WHERE
         t.sequence_nbr IN ( SELECT max( tt.sequence_nbr ) FROM tz_cylinder_info tt GROUP BY tt.sequence_code )
-        AND t.api_company_code = (
+        AND t.app_id = (
         SELECT
-        u.api_company_code
+        u.app_id
         FROM
         tz_cylinder_unit u
         WHERE

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyFirstAidServiceImpl.java

@@ -122,11 +122,16 @@ public class DutyFirstAidServiceImpl extends DutyCommonServiceImpl implements ID
 
 	public List< Map<String, Object>> getFirstAidExportData(List<String> ids) {
 		List< Map<String, Object>> resultList = new ArrayList<Map<String, Object>>();
+		List< Map<String, Object>> result = new ArrayList<Map<String, Object>>();
+		List<String> userNameList= new ArrayList<String>();
+
+		List<String> firstAidSimpleList = new ArrayList<String>();
+		List<String> companyNameList = new ArrayList<String>();
 		String typeString = "JJZ";
 		ids.stream().forEach(i->{
 			Map<String, Object> detailMap = new HashMap<String, Object>();
 			List<OrgUsr> personList = orgUsrServiceImpl.getPersonListByParentId(Long.parseLong(i));
-			List<String> userNameList= new ArrayList<String>();
+
 			personList.stream().forEach(m -> {
 				String userNameString =m.getBizOrgName()+ "@" +m.getSequenceNbr();
 				userNameList.add(userNameString);
@@ -134,28 +139,29 @@ public class DutyFirstAidServiceImpl extends DutyCommonServiceImpl implements ID
 			detailMap.put("userName", userNameList);
 			OrgUsr companyDetail =	orgUsrServiceImpl.getDetailById(Long.parseLong(i));
 			String companyNameString = companyDetail.getBizOrgName()+ "@" +companyDetail.getSequenceNbr();
-			detailMap.put("companyName", companyNameString);
+			companyNameList.add(companyNameString);
+			detailMap.put("companyName", companyNameList);
 			List<DataDictionary>  dataDicList=	dataDictionaryService.getByType(typeString);
 			List<String> dataDicSimpleList = new ArrayList<String>();
-			dataDicList.stream().forEach(l->{
-				String dataDic = l.getName() + "@" +l.getCode();
-				dataDicSimpleList.add(dataDic);
-			});
+				dataDicList.stream().forEach(l->{
+					String dataDic = l.getName() + "@" +l.getCode();
+					dataDicSimpleList.add(dataDic);
+				});
+
 			detailMap.put("postTypeName",dataDicSimpleList);
 			List<Map<String, Object>> list = dutyPersonShiftMapper.getFirstAidForTypeCodeAndCompanyId(
 					Long.parseLong(i));
-			
-			List<String> firstAidSimpleList = new ArrayList<String>();
 			list.stream().forEach(m -> {
 				String firstAidNameString = m.get("name").toString() + "@" + m.get("sequence_nbr").toString();
 				firstAidSimpleList.add(firstAidNameString);
 			});
-			if( firstAidSimpleList != null && firstAidSimpleList.size() > 1 ) {
+			if( firstAidSimpleList != null && firstAidSimpleList.size() >= 1 ) {
 				detailMap.put("firstAidName", firstAidSimpleList);
 				resultList.add(detailMap);
 			}
 		});
-		return resultList;
+		result.add(resultList.get(0));
+		return result;
 	}
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/MaintenanceCompanyServiceImpl.java

@@ -643,7 +643,7 @@ public class MaintenanceCompanyServiceImpl
         MaintenanceCompany maintenanceCompany = new MaintenanceCompany();
         if (ValidationUtil.isEmpty(seq)) {
             maintenanceCompany = getMaintenanceCompany(amosUserId);
-            seq = maintenanceCompany.getSequenceNbr();
+            seq = maintenanceCompany.getParentId();
         }
         // 机场单位列表基本信息
         if (pageNum == -1 || pageSize == -1) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -1174,10 +1174,14 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
     public String getParentId(String amosOrgId) {
-        List<OrgUsrDto> orgUsrDtos = queryForList("", false, amosOrgId);
+		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(BaseEntity::getIsDelete,false);
+		wrapper.eq(OrgUsr::getAmosOrgId,amosOrgId);
+		List<OrgUsr> orgUsrs = orgUsrMapper.selectList(wrapper);
+
         String parentId = null;
-        if (orgUsrDtos.size() >= 1) {
-            parentId = orgUsrDtos.get(0).getParentId();
+        if (orgUsrs.size() >= 1) {
+            parentId = orgUsrs.get(0).getParentId();
         } else {
             return null;
         }
@@ -1239,7 +1243,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         // 业主单位人员
         List<UserUnitDto> list = orgUsrMapper.getUserUnit(userId, typeArr[0], null);
         // 维保单位人员
-        List<MaintenanceCompany> maintenancePersons = maintenanceCompanyService.findPersonByAmosOrgId(CODE, userId);
+     //   maintenanceCompanyService.findPerssonByAmosOrgId(typeArr[0], userId);
+        List<MaintenanceCompany> maintenancePersons = null;
         if (!CollectionUtils.isEmpty(list) && !CollectionUtils.isEmpty(maintenancePersons)) {
             throw new RuntimeException("人员绑定单位重复！");
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ConfirmAlarmServiceImpl.java

@@ -261,14 +261,14 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
         } catch (Exception e) {
             log.error("查询机场人员为空，检查机场人员是否绑定单位！");
         }
-
+        confirmAlamVo.setFireLocation(ent.getLocation());
         List<UserDto> infoList = equipmentSpecificSerivce.getEquipSpecificLocationInfo(ent.getEquipmentSpecificId(), FIELD_NAME.split(","));
         if (CollectionUtils.isNotEmpty(infoList)) {
             infoList.stream().forEach(dto -> {
-                String name = dto.getPersonName();
+//                String name = dto.getPersonName();
+//                confirmAlamVo.setFireLocation(name);
                 String code = dto.getFieldCode();
                 String value = dto.getFieldValue();
-                confirmAlamVo.setFireLocation(name);
                 switch (code) {
                     case "longitude":
                         confirmAlamVo.setFloorLongitude(getVal(value));

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/DownloadFileService.java

 package com.yeejoin.equipmanage.service.impl;
 
-import javax.annotation.Resource;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.equipmanage.common.entity.FormGroup;
 import com.yeejoin.equipmanage.common.entity.SystemDic;
 import com.yeejoin.equipmanage.common.entity.vo.AppDownloadVO;
 import com.yeejoin.equipmanage.common.enums.GroupCodeEnum;
+import com.yeejoin.equipmanage.common.utils.FileUploadFactory;
+import com.yeejoin.equipmanage.common.utils.FileUploadTypeEnum;
+import com.yeejoin.equipmanage.common.utils.ImportFile;
 import com.yeejoin.equipmanage.common.vo.BuildingTreeVo;
 import com.yeejoin.equipmanage.mapper.EquipmentMapper;
-import com.yeejoin.equipmanage.mapper.ExtinguishantOnCarMapper;
 import com.yeejoin.equipmanage.service.*;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
-
-import com.yeejoin.equipmanage.common.utils.FileUploadFactory;
-import com.yeejoin.equipmanage.common.utils.FileUploadTypeEnum;
-import com.yeejoin.equipmanage.common.utils.ImportFile;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
 @Service
 public class DownloadFileService implements IDownloadFileService {
 
-	@Autowired
-	@Lazy
+    @Autowired
+    @Lazy
     private FileUploadFactory factory;
     @Autowired
-	private IFormInstanceService iFormInstanceService;
+    private IFormInstanceService iFormInstanceService;
     @Autowired
-	private IFormGroupService iFormGroupService;
+    private IFormGroupService iFormGroupService;
     @Autowired
-	private ICarService carService;
+    private ICarService carService;
     @Autowired
-	private EquipmentMapper equipmentMapper;
+    private EquipmentMapper equipmentMapper;
     @Autowired
-	private IExtinguishantOnCarService extinguishantOnCarService;
+    private IExtinguishantOnCarService extinguishantOnCarService;
     @Autowired
-	private IEquipmentIndexService equipmentIndexService;
+    private IEquipmentIndexService equipmentIndexService;
     @Autowired
-	private IEquipmentSpecificIndexSerivce equipmentSpecificIndexSerivce;
+    private IEquipmentSpecificIndexSerivce equipmentSpecificIndexSerivce;
     @Autowired
-	private IWarehouseStructureService warehouseStructureService;
+    private IWarehouseStructureService warehouseStructureService;
     @Autowired
-	private ISystemDicService systemDicService;
+    private ISystemDicService systemDicService;
     @Autowired
-	private IEquipmentOnCarService equipmentOnCarService;
-	
-	@Resource(name = "fileUploadFactory")
-	public void setFactory(FileUploadFactory factory) {
-		this.factory = factory;
-	}
-	@Override
-	public HSSFWorkbook DownloadFile(String type) {
-		ImportFile up = factory.create(FileUploadTypeEnum.getEnum(type));
-		HSSFWorkbook workbook =(HSSFWorkbook) up.downloadImportFile();
-		return workbook;
-	}
-
-	@Override
-	public AppDownloadVO appDownloadDatas() {
-		AppDownloadVO appDownload = new AppDownloadVO();
-
-		//建筑信息
-		FormGroup formGroup = iFormGroupService.getByUniqueKey(GroupCodeEnum.ALL_BUILDING.getGroupCode());
-		List<Map<String, Object>> allList = iFormInstanceService.getSpecialChildrenList(null);
-		List<BuildingTreeVo> allListVo = buildBuildingData(formGroup, allList);
-		appDownload.setBuildTree(allListVo);
-
-		//车辆信息
-		appDownload.setDownloadCarDatas(carService.list());
-
-		//装备信息
-		appDownload.setDownloadEquipmentDatas(equipmentMapper.getDownloadEquipmentData());
-
-		//性能指标模板
-		appDownload.setEquipmentIndex(equipmentIndexService.list());
-
-		//性能指标
-		appDownload.setEquipmentSpecificIndexs(equipmentSpecificIndexSerivce.list());
-
-		//仓库
-		appDownload.setWarehouseStructure(warehouseStructureService.list());
-
-		//车载装备
-		appDownload.setEquipmentOnCar(equipmentOnCarService.list());
-
-		//车载灭火药剂
-		appDownload.setExtinguishantOnCar(extinguishantOnCarService.list());
-
-		//报废原因
-		appDownload.setReason(systemDicService.list(new QueryWrapper<SystemDic>().eq("type", "ScrapReason")));
-
-		return appDownload;
-	}
-
-	/**
-	 * 建筑树数据处理
-	 * @param formGroup
-	 * @param allList
-	 * @return
-	 */
-	private List<BuildingTreeVo> buildBuildingData(FormGroup formGroup, List<Map<String, Object>> allList) {
-		List<BuildingTreeVo> allListVo = Bean.listMap2ListBean(allList, BuildingTreeVo.class);
-		BuildingTreeVo treeNode = new BuildingTreeVo();
-		treeNode.setInstanceId(formGroup.getId());
-		treeNode.setInstanceName(formGroup.getGroupName());
-		treeNode.setParentId("-1");
-		treeNode.setGroupType(formGroup.getGroupType());
-		treeNode.setGroupCode(formGroup.getGroupCode());
-		allListVo.add(treeNode);
-		return allListVo;
-	}
+    private IEquipmentOnCarService equipmentOnCarService;
+
+    @Resource(name = "fileUploadFactory")
+    public void setFactory(FileUploadFactory factory) {
+        this.factory = factory;
+    }
+
+    @Override
+    public HSSFWorkbook DownloadFile(String type) {
+        ImportFile up = factory.create(FileUploadTypeEnum.getEnum(type));
+        HSSFWorkbook workbook = (HSSFWorkbook) up.downloadImportFile();
+        return workbook;
+    }
+
+    @Override
+    public AppDownloadVO appDownloadDatas() {
+        AppDownloadVO appDownload = new AppDownloadVO();
+
+        //建筑信息
+        FormGroup formGroup = iFormGroupService.getByUniqueKey(GroupCodeEnum.ALL_BUILDING.getGroupCode());
+        List<Map<String, Object>> allList = iFormInstanceService.getSpecialChildrenList(null);
+        List<BuildingTreeVo> allListVo = buildBuildingData(formGroup, allList);
+        appDownload.setBuildTree(allListVo);
+
+        //车辆信息
+        appDownload.setDownloadCarDatas(carService.list());
+
+        //装备信息
+
+//		appDownload.setDownloadEquipmentDatas(equipmentMapper.getDownloadEquipmentData());
+//
+//		//性能指标模板
+//		appDownload.setEquipmentIndex(equipmentIndexService.list(queryWrapper1));
+//
+//		//性能指标
+//		appDownload.setEquipmentSpecificIndexs(equipmentSpecificIndexSerivce.list(queryWrapper));
+
+        //仓库
+        appDownload.setWarehouseStructure(warehouseStructureService.list());
+
+        //车载装备
+        appDownload.setEquipmentOnCar(equipmentOnCarService.list());
+
+        //车载灭火药剂
+        appDownload.setExtinguishantOnCar(extinguishantOnCarService.list());
+
+        //报废原因
+        appDownload.setReason(systemDicService.list(new QueryWrapper<SystemDic>().eq("type", "ScrapReason")));
+
+        return appDownload;
+    }
+
+    /**
+     * 建筑树数据处理
+     *
+     * @param formGroup
+     * @param allList
+     * @return
+     */
+    private List<BuildingTreeVo> buildBuildingData(FormGroup formGroup, List<Map<String, Object>> allList) {
+        List<BuildingTreeVo> allListVo = Bean.listMap2ListBean(allList, BuildingTreeVo.class);
+        BuildingTreeVo treeNode = new BuildingTreeVo();
+        treeNode.setInstanceId(formGroup.getId());
+        treeNode.setInstanceName(formGroup.getGroupName());
+        treeNode.setParentId("-1");
+        treeNode.setGroupType(formGroup.getGroupType());
+        treeNode.setGroupCode(formGroup.getGroupCode());
+        allListVo.add(treeNode);
+        return allListVo;
+    }
 
 }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java

@@ -440,6 +440,9 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                         equipmentSpecificAlarmService.saveOrUpdate(action);
                         if (AlarmStatusEnum.BJ.getCode() == action.getStatus()) {
                             equipmentAlarmLogs.add(addEquipAlarmLogRecord(action));
+                            if (ValidationUtil.isEmpty(action.getAlamContent())){
+                                action.setAlamContent(action.getEquipmentSpecificName() + action.getEquipmentSpecificIndexName());
+                            }
                             mqttSendGateway.sendToMqtt(TopicEnum.EQDQR.getTopic(), JSONArray.toJSON(action).toString());
                         }
                         specificAlarmIds.add(action.getId());

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertFormController.java

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.alibaba.fastjson.JSONArray;
 import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -109,7 +113,7 @@ public class AlertFormController extends BaseController {
     
     /**
      * 根据表态类型code查询表单数据项
-     * @param id
+     * @param
      * @return
      */
 
@@ -120,7 +124,18 @@ public class AlertFormController extends BaseController {
          List<AlertFormInitDto> list=new ArrayList<AlertFormInitDto>();
          if(redisUtils.hasKey(RedisKey.FORM_CODE+code)){
              Object obj= redisUtils.get(RedisKey.FORM_CODE+code);
-             return ResponseHelper.buildResponse(obj);
+             JSONArray arr = (JSONArray) obj;
+             List<AlertFormInitDto> list1 =  arr.toJavaList(AlertFormInitDto.class);
+             for (AlertFormInitDto alertFormInitDto: list1) {
+                    if(alertFormInitDto.getKey().equals("fireTime")) {
+                        Date date = new Date();
+                        alertFormInitDto.setDefaultValue(date);
+                        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                        String dateString = formatter.format(date);
+                        alertFormInitDto.getFormItemDescr().setFieldValue(dateString);
+                    }
+             }
+             return ResponseHelper.buildResponse(JSON.toJSON(list1));
          }else{
              list=  iAlertFormService.getFormlist(code);
              redisUtils.set(RedisKey.FORM_CODE+code,JSON.toJSON(list),time);

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

@@ -267,13 +267,13 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 				for (AlertFormValue alertFormValue : list) {
 					if("flightNumber".equals(alertFormValue.getFieldCode())) {
 						FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
-								"text", alertFormValue.getFieldValueCode(), alertFormValue.getBlock());
+								"text", ValidationUtil.isEmpty(alertFormValue.getFieldValueCode()) ?  alertFormValue.getFieldValue() : alertFormValue.getFieldValueCode()  , alertFormValue.getBlock());
 						formValue.add(value);
 						continue;
 					}
 					if("aircraftModel".equals(alertFormValue.getFieldCode())) {
 						FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
-								"text", alertFormValue.getFieldValueCode(), alertFormValue.getBlock());
+								"text", ValidationUtil.isEmpty(alertFormValue.getFieldValueCode()) ?  alertFormValue.getFieldValue() : alertFormValue.getFieldValueCode() , alertFormValue.getBlock());
 						formValue.add(value);
 						continue;
 					}
@@ -615,11 +615,11 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 			/*
 			 * if(null == valueCode) { valueCode = alertFormValue.getFieldValue(); }
 			 */
-			if("flightNumber".equals(alertFormValue.getFieldCode()) || "aircraftModel".equals(alertFormValue.getFieldCode())) {
-				listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(), alertFormValue.getFieldValueCode()));
-			} else  {
+//			if("flightNumber".equals(alertFormValue.getFieldCode()) || "aircraftModel".equals(alertFormValue.getFieldCode())) {
+//				listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(), alertFormValue.getFieldValueCode()));
+//			} else  {
 				listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(), valueCode));
-			}
+//			}
 		});
 		map.put("data", listdate);
 

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

@@ -531,7 +531,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
             smsParams.put("feedback", calledRo.getFeedback());
         }
         // 短信报送对象
-     //   alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
+        alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
         // 发送任务消息
         // 组织短信内容
         // 调用短信发送接口

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

@@ -126,10 +126,10 @@ public class RuleAlertCalledService {
 				}
 				//航空器救援
 				if (alertFormValue.getFieldCode().equals("flightNumber")) {
-					alertCalledRo.setFlightNumber(alertFormValue.getFieldValueCode());
+					alertCalledRo.setFlightNumber(ValidationUtil.isEmpty(alertFormValue.getFieldValueCode()) ?  alertFormValue.getFieldValue() : alertFormValue.getFieldValueCode());
 				}
 				if (alertFormValue.getFieldCode().equals("aircraftModel")) {
-					alertCalledRo.setAircraftModel(alertFormValue.getFieldValueCode());
+					alertCalledRo.setAircraftModel(ValidationUtil.isEmpty(alertFormValue.getFieldValueCode()) ?  alertFormValue.getFieldValue() : alertFormValue.getFieldValueCode());
 				}
 				if (alertFormValue.getFieldCode().equals("landingTime")) {
 					alertCalledRo.setLandingTime(alertFormValue.getFieldValue());
@@ -160,7 +160,7 @@ public class RuleAlertCalledService {
 
 				//漏油现场安全保障
 				if (alertFormValue.getFieldCode().equals("flightNumber")) {
-					alertCalledRo.setFlightNumberLy(alertFormValue.getFieldValue());
+					alertCalledRo.setFlightNumberLy(ValidationUtil.isEmpty(alertFormValue.getFieldValueCode()) ?  alertFormValue.getFieldValue() : alertFormValue.getFieldValueCode());
 				}
 				if (alertFormValue.getFieldCode().equals("seat")) {
 					alertCalledRo.setSeat(alertFormValue.getFieldValue());

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/core/async/AsyncTask.java

@@ -81,6 +81,7 @@ public class AsyncTask {
         if (pointName != null) {
             body += "关联检查点：" + pointName + TAB;
         }
+        body = body.replaceAll(null, "").replaceAll("null", "");
         saveAndSendMsg(orgCode, informerList, msgTypeEnum.getTitle(), body, msgTypeEnum.getMsgType(), latentDangerId, state, "");
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/core/async/AsyncTask.java

@@ -184,6 +184,7 @@ public class AsyncTask {
 		if (pointName != null) {
 			body += "关联检查点：" + pointName + TAB;
 		}
+		body = body.replaceAll(null, "").replaceAll("null", "");
 		saveAndSendMsg(orgCode, informerList, msgTypeEnum.getTitle(), body, msgTypeEnum.getMsgType(), latentDangerId, state,"");
 	}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/core/async/AsyncTask.java

@@ -155,6 +155,7 @@ public class AsyncTask {
 		if (pointName != null) {
 			body += "关联检查点：" + pointName + TAB;
 		}
+		body = body.replaceAll(null, "").replaceAll("null", "");
 		saveAndSendMsg(orgCode, informerList, msgTypeEnum.getTitle(), body, msgTypeEnum.getMsgType(), latentDangerId, taskId, state,"");
 	}
 

amos-boot-system-equip/src/main/java/com/yeejoin/AmostEquipApplication.java

@@ -10,13 +10,16 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.FilterType;
 import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.web.client.RestTemplate;
 import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler;
 
 import com.yeejoin.amos.boot.biz.common.utils.oConvertUtils;
@@ -48,4 +51,10 @@ public class AmostEquipApplication {
 				+ "Application Amos-Biz-Boot is running! Access URLs:\n\t" + "Swagger文档: \thttp://" + ip + ":" + port
 				+ path + "/doc.html\n" + "----------------------------------------------------------");
     }
+
+	@Bean
+	@LoadBalanced
+	RestTemplate restTemplate(){
+		return new RestTemplate();
+	}
 }

amos-boot-system-equip/src/main/resources/application.properties

@@ -18,6 +18,8 @@ pagehelper.params=count=countSql
 pagehelper.reasonable=false
 pagehelper.support-methods-arguments=true
 
+spring.main.allow-bean-definition-overriding=true
+
 #liquibase
 spring.liquibase.change-log = classpath:/changelog/changelog-master.xml
 spring.liquibase.enabled= true

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml

@@ -734,18 +734,18 @@
     </select>
     <select id="getEquipSpecificDetail"
             resultType="com.yeejoin.equipmanage.common.datasync.entity.FireEquipment">
-        SELECT
+         SELECT
             es.id,
             es.`code` AS mrid,
-            ed.`name`,
-            ed.`name` AS aliasname,
+            es.`name`,
+            es.`name` AS aliasname,
             es.`code`,
-            e.`name` AS categoryname,
-            e.`code` AS categorycode,
+			ed.equipment_name AS categoryname,
+			ed.`code` AS categorycode,
             ( SELECT GROUP_CONCAT( url ) FROM wl_upload_file WHERE file_type = 'image' AND object_type = 'equipment' AND object_id = ed.id ) AS img,
             es.iot_code AS iotcode,
-            f.`name` AS stationname,
-            f.`code` AS stationcode,
+            '' AS stationname,
+            '' AS stationcode,
             ws.source_id AS buildid,
             es.system_id AS fightingsystemids,
             TRIM(CONCAT_WS(' ',ws.full_name,sd.description)) AS position,
@@ -760,11 +760,9 @@
         FROM
             wl_equipment_specific es
             LEFT JOIN wl_equipment_detail ed ON es.equipment_detail_id = ed.id
-            LEFT JOIN wl_equipment e ON e.id = ed.equipment_id
             LEFT JOIN wl_stock_detail sd ON sd.equipment_specific_id = es.id
             LEFT JOIN wl_warehouse_structure ws ON ws.id = sd.warehouse_structure_id
-            LEFT JOIN wl_area a ON es.area_id = a.id,
-            f_station_info f
+            LEFT JOIN wl_area a ON es.area_id = a.id
         WHERE
             es.id = #{id}
     </select>

amos-boot-system-patrol/src/main/resources/db/mapper/pointMapper.xml

@@ -71,10 +71,11 @@
 			p_point_inputitem pi
 		LEFT JOIN p_input_item ii ON ii.id = pi.input_item_id
 		LEFT JOIN p_point_classify pc ON FIND_IN_SET(pc.id, pi.classify_ids) > 0
+		
 		LEFT JOIN p_route_point prp ON prp.point_id = pi.point_id
 		WHERE
 		pi.point_id = #{pointId}
-		AND NOT FIND_IN_SET(pi.id,prp.exclude_items)
+		AND IF(prp.id, NOT FIND_IN_SET(pi.id,prp.exclude_items),' 1=1 ')
 		ORDER BY
 		    pi.order_no
     </select>