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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/MetaHandler.java

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
+import java.lang.reflect.Field;
 import java.util.Date;
 
 /**
@@ -74,10 +75,14 @@ public class MetaHandler implements MetaObjectHandler {
             Date currentDate = new Date();
             this.setFieldValByName("recDate", currentDate, metaObject);
         }
+
+
+
         //以下为装备中转移过来的
-//        if (isExistField("userId", entity)) {
-//            this.setFieldValByName("userId", String.valueOf(agencyUserModel.getUserId()), metaObject);
-//        }
+        if (isExistField("userId", entity)&&isStringField(metaObject,"userId")) {
+            this.setFieldValByName("userId", String.valueOf(agencyUserModel.getUserId()), metaObject);
+        }
+
         if (isExistField("creatorId", entity)) {
             this.setFieldValByName("creatorId", Long.valueOf(agencyUserModel.getUserId()), metaObject);
         }
@@ -117,6 +122,23 @@ public class MetaHandler implements MetaObjectHandler {
         }
         return jsonObj.containsKey(field);
     }
+    private Boolean isStringField(MetaObject metaObject,String fieldName) {
+
+        Class clazz = metaObject.getOriginalObject().getClass();
+        Field[] fields = clazz.getDeclaredFields();
+
+        for (Field field : fields) {
+            if (fieldName.equals(field.getName()) &&("class java.lang.String").equals(field.getGenericType().toString())) {
+                return true;
+            }
+
+
+        }
+        return false;
+    }
+
+
+
 
     /**
      * 更新拦截

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/CheckObjectDto.java

@@ -30,6 +30,9 @@ public class CheckObjectDto extends BaseDto implements Serializable {
 
     @ApiModelProperty(value = "单位性质")
     private String companyNature;
+    
+    @ApiModelProperty(value = "管理类别")
+    private String managementType;
 
     @ApiModelProperty(value = "机构类型（部门：DEPARTMENT，单位：COMPANY，人员：PERSON）")
     private String bizOrgType;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/OrgUsr.java

@@ -83,4 +83,8 @@ public class OrgUsr extends BaseEntity {
     @ApiModelProperty(value = "数量")
     @TableField(exist = false)
     private Long total;
+    
+    @ApiModelProperty(value = "管理类别")
+    @TableField(exist = false)
+    private String managementType;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml

@@ -47,6 +47,34 @@
     <!--消防队员列表按时间倒叙排列add desc 2021-09-08 by kongfm -->
     <select id="getFirefightersCount" resultType="Map">
         select COUNT(a.sequence_nbr) num from cb_firefighters a LEFT JOIN
+        cb_firefighters_post b on
+        a.sequence_nbr=b.firefighters_id where
+        a.is_delete=0
+        <if test='par.bizOrgCode!=null'>and a.biz_org_code like concat ('%',#{par.bizOrgCode},'%')</if>
+        <if test='par.postQualification!=null'>and b.post_qualification_code = #{par.postQualification}</if>
+        <if test='par.areasExpertise!=null'>and b.areas_expertise_code= #{par.areasExpertise}</if>
+        <if test='par.name!=null'>and a.name like concat ('%',#{par.name},'%')</if>
+        <if test='par.address!=null'>and a.residence_detail_val like concat ('%',#{par.address},'%')</if>
+        <if test='par.state!=null'>and a.state_code= #{par.state}</if>
+        <if test='par.company!=null and par.company!= -1'>and a.company= #{par.company}</if>
+        <if test='par.fireTeamId!=null'>and a.fire_team_id= #{par.fireTeamId}</if>
+        <if test='par.jobTitles!=null'>and a.job_title_code in
+            <foreach collection="par.jobTitles" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
+        <if
+                test='par.areasExpertiseCode!=null and par.areasExpertiseCode!="0"'>and b.areas_expertise_code
+            =#{par.areasExpertiseCode}
+        </if>
+        <if test='par.company!=null and par.company!= -1'>and a.company= #{par.company}</if>
+
+
+        <if test='par.areasExpertiseCode=="0"'>and b.areas_expertise_code is not null</if>
+<!--
+
+
+        select COUNT(a.sequence_nbr) num from cb_firefighters a LEFT JOIN
         cb_firefighters_post b on a.sequence_nbr=b.firefighters_id where
         a.is_delete=0
         <if test='par.bizOrgCode!=null'>and a.biz_org_code like concat ('%',#{par.bizOrgCode},'%')</if>
@@ -64,7 +92,7 @@
         </if>
         <if test='par.areasExpertiseCode=="0"'>and b.areas_expertise_code is not null</if>
 
-        ORDER BY a.rec_date desc
+        ORDER BY a.rec_date desc-->
     </select>
 
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -594,6 +594,7 @@ GROUP BY
         company_sur.biz_org_type as bizOrgType,
 --         cb.field_value_label,
         (SELECT field_value_label FROM cb_dynamic_form_instance as cb WHERE company_sur.sequence_nbr = cb.instance_id AND field_code = 'companyNature' ) as companyNature,
+         (SELECT field_value_label FROM cb_dynamic_form_instance as cb WHERE company_sur.sequence_nbr = cb.instance_id AND field_code = 'managementType' ) as managementType,
         CASE
         WHEN keysite_sur.num IS NULL THEN
             0

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/EquipmentStateUtil.java

@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.common.utils;
 
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
 import com.yeejoin.equipmanage.common.entity.vo.StateVo;
+import com.yeejoin.equipmanage.common.enums.AlarmStatusEnum;
 import com.yeejoin.equipmanage.common.enums.EquipmentRiskTypeEnum;
 import com.yeejoin.equipmanage.common.enums.EquipmentStateEnum;
 import com.yeejoin.equipmanage.common.enums.TrueOrFalseEnum;
@@ -268,7 +269,7 @@ public class EquipmentStateUtil {
     
     public static String judgeEquipState(EquipmentSpecificIndex index) {
         if (TrueOrFalseEnum.real.value.toUpperCase().equals(String.valueOf(index.getValue()).toUpperCase())) {
-            return index.getEmergencyLevelColor();
+            return AlarmStatusEnum.BJ.getCode() == index.getIsAlarm() ? index.getEmergencyLevelColor() : "";
         }
         return "";
     }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/TreeNodeUtil.java

 package com.yeejoin.equipmanage.common.utils;
 
+import com.itextpdf.text.pdf.PdfStructTreeController.returnType;
 import com.yeejoin.equipmanage.common.entity.publics.BaseTreeNode;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -197,9 +198,19 @@ public class TreeNodeUtil {
             //递归
             assembleTree(t, listNodes);
         }
+       
+        return newTreeNodes;
+    }
+    public static <T extends BaseTreeNode> List<T> assembleTreeNotFilter_1(List<T> listNodes) {
+        List<T> newTreeNodes = new ArrayList<>();
+        newTreeNodes.addAll(listNodes);
+        for (T t : listNodes) {
+            //递归
+        	assembleTree_1(t, newTreeNodes);
+        }
+       
         return newTreeNodes;
     }
-
     /**
      * 封装整个树状图数据
      *
@@ -279,13 +290,26 @@ public class TreeNodeUtil {
             if (!CollectionUtils.isEmpty(node.getChildren())) {
                 for (Object t : node.getChildren()) {
                     //递归
-                	listNodes.remove(t);
+                	//listNodes.remove(t);
                     assembleTree((T) t, listNodes);
                 }
             }
         }
     }
-
+    static <T extends BaseTreeNode> void assembleTree_1(T node, List<T> listNodes) {
+        if (node != null && !CollectionUtils.isEmpty(listNodes)) {
+            // 循环节点数据，如果是子节点则添加起来
+            listNodes.stream().filter(t -> Objects.equals(t.getParentId(), node.getId())).forEachOrdered(node::addChild);
+            // 循环处理子节点数据,递归
+            if (!CollectionUtils.isEmpty(node.getChildren())) {
+                for (Object t : node.getChildren()) {
+                    //递归
+                	listNodes.remove(t);
+                	assembleTree_1((T) t, listNodes);
+                }
+            }
+        }
+    }
     /**
      * 根据节点封装树状图集合数据
      *

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
-import ch.qos.logback.core.net.SyslogOutputStream;
+import java.io.Serializable;
+import java.lang.reflect.Method;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.component.emq.EmqKeeper;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -15,7 +46,25 @@ import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
-import com.yeejoin.amos.boot.module.common.api.dto.*;
+import com.yeejoin.amos.boot.module.common.api.dto.CheckObjectDto;
+import com.yeejoin.amos.boot.module.common.api.dto.CompanyDto;
+import com.yeejoin.amos.boot.module.common.api.dto.CompanyPerson;
+import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormInstanceDto;
+import com.yeejoin.amos.boot.module.common.api.dto.ESOrgUsrDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentFormDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonExcelDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonFormDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrExcelDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrzhDto;
+import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
+import com.yeejoin.amos.boot.module.common.api.dto.UserDto;
+import com.yeejoin.amos.boot.module.common.api.dto.UserUnitDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
 import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
@@ -33,43 +82,6 @@ import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
 
-import freemarker.core.ReturnInstruction.Return;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-import org.typroject.tyboot.component.emq.EmqKeeper;
-import org.springframework.transaction.annotation.Transactional;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
-
-import javax.annotation.Resource;
-
-import static org.hamcrest.CoreMatchers.nullValue;
-
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 /**
  * 机构/部门/人员表 服务实现类
  *
@@ -2230,6 +2242,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		if (!orgUsr1.getBizOrgType().equals(CommonConstant.BIZ_ORG_TYPE_COMPANY)) {
 			return getCompanyByParentId(orgUsr1.getParentId());
 		}
+		List<DynamicFormInstanceDto>  tagerList=	dynamicFormInstanceMapper.selectListByCalledId(orgUsr1.getSequenceNbr());
+		tagerList.stream().forEach(i->{
+			if("managementType".equals(i.getFieldCode().toString())) {
+				orgUsr1.setManagementType(i.getFieldValueLabel());
+			}
+		});
 		return orgUsr1;
 	}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java

@@ -277,7 +277,9 @@ public class EquipmentDetailController extends AbstractBaseController {
                 equipmentSpecific.setPosition(warehouseStructure.getFullName());
             }
         }
-        equipmentSpecific.getStockDetail().setDescription(equipmentDetail.getArea());
+        if (!ObjectUtils.isEmpty(equipmentSpecific.getStockDetail())) {
+            equipmentSpecific.getStockDetail().setDescription(equipmentDetail.getArea());
+        }
         equipmentSpecificSerivce.updateEquipmentSpecific(equipmentSpecific, getSelectedOrgInfo(), getUserInfo());
         // TODO 后续判断成功，执行同步
         // 编辑同步redis装备iotcode数据

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/TopographyController.java

@@ -866,7 +866,12 @@ public class TopographyController extends AbstractBaseController {
             List<Date> dates = new ArrayList<>();
             for (IotDataVO vo : timeList) {
                 SimpleDateFormat sdf = new SimpleDateFormat(DateUtils.DATE_TIME_T_PATTERN);
-                dates.add(sdf.parse(String.valueOf(vo.getValue())));
+                logger.info("返回时间===================================(" + vo.getValue() + ") =======================================");
+                Date  date=sdf.parse(String.valueOf(vo.getValue()));
+                sdf.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
+                String time= sdf.format(date);
+                dates.add(sdf.parse(time));
+                logger.info("返回时间===================================(" + sdf.parse(String.valueOf(vo.getValue())) + ") =======================================");
             }
             List<EquipmentSpecificIndex> indexes = equipmentSpecificIndexMapper.getEquipmentSpeIndexByIotCodeAndTrend(iotCode);
             if (0 <indexes.size()) {
@@ -922,4 +927,5 @@ public class TopographyController extends AbstractBaseController {
         return CommonResponseUtil.success();
     }
 
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FormInstanceMapper.java

@@ -3,6 +3,7 @@ package com.yeejoin.equipmanage.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.equipmanage.common.entity.FormInstance;
+import com.yeejoin.equipmanage.common.entity.Video;
 import com.yeejoin.equipmanage.common.entity.dto.BuildIsRiskDTO;
 import com.yeejoin.equipmanage.common.entity.dto.BuildSearchDTO;
 import com.yeejoin.equipmanage.common.entity.vo.BuildingVideoListVO;
@@ -120,6 +121,13 @@ public interface FormInstanceMapper extends BaseMapper<FormInstance> {
      */
     int saveStucture(Map<String, Object> formKeyMap);
 
+    Map<String, String> getChildListdate(@Param("id")Long id);
+
+    void updateListChild(@Param("value")String value,
+                          @Param("ids") List<String> ids,
+                          @Param("fieldName") String fieldName);
+
+
     /**
      * 获取仓库父类详细位置
      * @param id

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

 package com.yeejoin.equipmanage.service;
 
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.equipmanage.common.entity.SignalClassify;
 
-import java.util.List;
-
 /**
  * 信号分类量测枚举表接口类
  *
@@ -15,4 +12,5 @@ import java.util.List;
  */
 public interface ISignalClassifyService extends IService<SignalClassify> {
 
+    SignalClassify getTypeNameByCode(String code);
 }

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

@@ -105,9 +105,13 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
 
     @Autowired
     private EquipmentSpecificAlarmMapper equipmentSpecificAlarmMapper;
+    
     @Autowired
     private EquipmentSpecificAlarmLogMapper equipmentSpecificAlarmLogMapper;
 
+    @Autowired
+    private ISignalClassifyService signalClassifyService;
+
 
 
     @Override
@@ -124,6 +128,11 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
             return res;
         }
         EquipmentSpecificAlarmLog specificAlarm = confirmAlarmMapper.getDetailsById(alarmId, equipId);
+        if (!ObjectUtils.isEmpty(specificAlarm.getConfirmType())) {
+            String handleTypeName = ConfirmAlamEnum.getTypeByCode(String.valueOf(specificAlarm.getConfirmType()));
+            specificAlarm.setConfirmTypeName(StringUtil.isNotEmpty(handleTypeName)
+                    ? handleTypeName : signalClassifyService.getTypeNameByCode(String.valueOf(specificAlarm.getConfirmType())).getTypeName());
+        }
         List<AlamVideoVO> videoBySpeId;
         if (specificAlarm == null) {
             videoBySpeId = videoMapper.getVideoBySpeId(equipId);
@@ -153,6 +162,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
             if (!ObjectUtils.isEmpty(alarmLog)) {
                 Long equipmentSpecificAlarmId = alarmLog.getEquipmentSpecificAlarmId();
                 ent.setEquipmentSpecificAlarmId(equipmentSpecificAlarmId);
+                ent.setEquipmentSpecificId(alarmLog.getEquipmentSpecificId());
                 ent.setEquipmentSpecificIndexKey(alarmLog.getEquipmentSpecificIndexKey());
                 String cleanType = equipmentSpecificMapper.getEquipmentBySpecificId(alarmLog.getEquipmentSpecificId());
                 if (StringUtil.isNotEmpty(cleanType) && AlarmCleanTypeEnum.QRXC.getCode().equals(cleanType)) {

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

@@ -17,14 +17,13 @@ import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 import javax.servlet.http.HttpServletResponse;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.equipmanage.common.dto.OrgUsrDto;
 import com.yeejoin.equipmanage.common.vo.*;
 import com.yeejoin.equipmanage.fegin.JcsFeign;
+import com.yeejoin.equipmanage.service.*;
+import liquibase.pro.packaged.x;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.PageImpl;
@@ -58,11 +57,6 @@ import com.yeejoin.equipmanage.mapper.EquipmentSpecificAlarmLogMapper;
 import com.yeejoin.equipmanage.mapper.EquipmentSpecificAlarmMapper;
 import com.yeejoin.equipmanage.mapper.EquipmentSpecificMapper;
 import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
-import com.yeejoin.equipmanage.service.IEquipmentDetailService;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificAlarmService;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificIndexSerivce;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
-import com.yeejoin.equipmanage.service.IVideoService;
 
 /**
  * @author DELL
@@ -96,6 +90,9 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
     
     @Autowired
     private IVideoService videoService;
+
+    @Autowired
+    private ISignalClassifyService signalClassifyService;
     
     @Value("${window.vedioFormat}")
     String vedioFormat;
@@ -106,7 +103,9 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
     @Override
     public void handleExport(HttpServletResponse response, List<Long> ids, String alarmType) {
         CommonPageInfoParam param = new CommonPageInfoParam();
-        param.setAlarmType(alarmType);
+        if (AlarmTypeEnum.GZGJ.getCode().equals(alarmType)) {
+            param.setIsFireAlarm("false");
+        }
         List<HashMap<String, Object>> list = this.baseMapper.getAlarmList(param);
         List<EquipmentAlarmDownloadVO> equipmentDownloads = handleExportData(ids, list);
         if (0 == list.size()) {
@@ -126,8 +125,7 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
                         EquipmentAlarmDownloadVO alarmDownloadVO = new EquipmentAlarmDownloadVO();
                         if ((alarm.get("id").toString()).equals(id.toString())) {
 //                            alarmDownloadVO.setId((Long) alarm.get("id"));
-                            alarmDownloadVO.setAlarmType(AlarmTypeEnum.GZGJ.getCode().equals(alarm.get("type").toString())
-                                    ? AlarmTypeEnum.GZGJ.getType() : AlarmTypeEnum.HZGJ.getType());
+                            alarmDownloadVO.setAlarmType(signalClassifyService.getTypeNameByCode(alarm.get("type").toString()).getTypeName());
                             alarmDownloadVO.setEquipName(alarm.get("fireEquipmentName").toString());
                             alarmDownloadVO.setAlarmContent(alarm.get("alarmContent").toString());
                             alarmDownloadVO.setEquipCode(StringUtil.isNotEmpty(alarm.get("fireEquipmentCode")) ? alarm.get("fireEquipmentCode").toString() : "");
@@ -137,7 +135,13 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
                             alarmDownloadVO.setCleanStatus(alarm.get("cleanStatus").toString());
                             // 处理状态、处理类型无业务字段，后期业务功能实现之后需在此处返回相应字段
                             alarmDownloadVO.setHandleStatus(String.valueOf(alarm.get("handleStatus")));
-                            alarmDownloadVO.setHandleType(ConfirmAlamEnum.getTypeByCode(String.valueOf(alarm.get("handleType"))));
+                            if (ObjectUtils.isEmpty(alarm.get("handleType"))) {
+                                alarmDownloadVO.setHandleType("");
+                            } else {
+                                String handleType = ConfirmAlamEnum.getTypeByCode(String.valueOf(alarm.get("handleType")));
+                                alarmDownloadVO.setHandleType(StringUtil.isNotEmpty(handleType)
+                                        ? handleType : signalClassifyService.getTypeNameByCode(String.valueOf(alarm.get("handleType"))).getTypeName());
+                            }
                             alarmDownloadVO.setResolveResult(StringUtil.isNotEmpty(alarm.get("resolveResult")) ? alarm.get("resolveResult").toString() : "");
                             alarmDownloadVO.setConfirmDate(StringUtil.isNotEmpty(alarm.get("confirmDate")) ?alarm.get("confirmDate").toString().replace("T", " ") : "");
                             alarmDownloadVO.setAlarmReason(StringUtil.isNotEmpty(alarm.get("alarmReason")) ? alarm.get("alarmReason").toString() : "");
@@ -153,8 +157,7 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
                 list.forEach(alarm -> {
                     EquipmentAlarmDownloadVO alarmDownloadVO = new EquipmentAlarmDownloadVO();
 //                    alarmDownloadVO.setId((Long) alarm.get("id"));
-                    alarmDownloadVO.setAlarmType(AlarmTypeEnum.GZGJ.getCode().equals(alarm.get("type").toString())
-                            ? AlarmTypeEnum.GZGJ.getType() : AlarmTypeEnum.HZGJ.getType());
+                    alarmDownloadVO.setAlarmType(signalClassifyService.getTypeNameByCode(alarm.get("type").toString()).getTypeName());
                     alarmDownloadVO.setEquipName(alarm.get("fireEquipmentName").toString());
                     alarmDownloadVO.setAlarmContent(alarm.get("alarmContent").toString());
                     alarmDownloadVO.setEquipCode(StringUtil.isNotEmpty(alarm.get("fireEquipmentCode")) ? alarm.get("fireEquipmentCode").toString() : "");
@@ -164,7 +167,13 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
                     alarmDownloadVO.setCleanStatus(alarm.get("cleanStatus").toString());
                     // 处理状态、处理类型无业务字段，后期业务功能实现之后需在此处返回相应字段
                     alarmDownloadVO.setHandleStatus(String.valueOf(alarm.get("handleStatus")));
-                    alarmDownloadVO.setHandleType(ConfirmAlamEnum.getTypeByCode(String.valueOf(alarm.get("handleType"))));
+                    if (ObjectUtils.isEmpty(alarm.get("handleType"))) {
+                        alarmDownloadVO.setHandleType("");
+                    } else {
+                        String handleType = ConfirmAlamEnum.getTypeByCode(String.valueOf(alarm.get("handleType")));
+                        alarmDownloadVO.setHandleType(StringUtil.isNotEmpty(handleType)
+                                ? handleType : signalClassifyService.getTypeNameByCode(String.valueOf(alarm.get("handleType"))).getTypeName());
+                    }
                     alarmDownloadVO.setResolveResult(StringUtil.isNotEmpty(alarm.get("resolveResult")) ? alarm.get("resolveResult").toString() : "");
                     alarmDownloadVO.setConfirmDate(StringUtil.isNotEmpty(alarm.get("confirmDate")) ?alarm.get("confirmDate").toString().replace("T", " ") : "");
                     alarmDownloadVO.setAlarmReason(StringUtil.isNotEmpty(alarm.get("alarmReason")) ? alarm.get("alarmReason").toString() : "");
@@ -189,7 +198,13 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
             for (Map<String, Object> x : resultPage.getRecords()) {
                 LocalDateTime createDate = (LocalDateTime) x.get("createDate");
                 x.put("createDate", Date.from(createDate.atZone(ZoneId.systemDefault()).toInstant()));
-                x.put("handleType", ConfirmAlamEnum.getTypeByCode(String.valueOf(x.get("handleType"))));
+                if (ObjectUtils.isEmpty(x.get("handleType"))) {
+                    x.put("handleType", null);
+                } else {
+                    String handleType = ConfirmAlamEnum.getTypeByCode(String.valueOf(x.get("handleType")));
+                    x.put("handleType", StringUtil.isNotEmpty(handleType)
+                            ? handleType : signalClassifyService.getTypeNameByCode(String.valueOf(x.get("handleType"))).getTypeName());
+                }
                 // 冗余统一跑马灯显示字段取值
                 x.put("equipmentSpecificIndexName", x.get("fireEquipmentSpecificIndexName"));
             }
@@ -200,8 +215,8 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
     @Override
     public org.springframework.data.domain.Page<AlarmListDataVO> listAlarmsPage(CommonPageInfoParam param) {
         Page page = new Page(param.getPageNumber(), param.getPageSize());
-        page.setCurrent(param.getPageNumber() == 1 ? 0 : param.getPageNumber());
-        page.setSize(param.getPageNumber() * param.getPageSize());
+//        page.setCurrent(param.getPageNumber() == 1 ? 0 : param.getPageNumber());
+//        page.setSize(param.getPageNumber() * param.getPageSize());
 
         Page<Map<String, Object>> mybatisResult = this.baseMapper.pageAlarmsInfo(page, param);
         List<AlarmListDataVO> res = new ArrayList<>();

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

@@ -477,9 +477,11 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                 queryWrapper.eq(EquipmentSpecificAlarm::getEquipmentSpecificId, equipmentSpecific.getId());
                 queryWrapper.ne(EquipmentSpecificAlarm::getStatus, AlarmStatusEnum.HF.getCode());
                 List<EquipmentSpecificAlarm> alarms = equipmentSpecificAlarmService.getBaseMapper().selectList(queryWrapper);
-                alarms.stream().map(x -> x.setLocation(equipmentSpecific.getPosition() + " "
-                        + equipmentSpecific.getStockDetail().getDescription())).collect(Collectors.toList());
-                equipmentSpecificAlarmService.updateBatchById(alarms);
+                if (0 < alarms.size()) {
+                    alarms.stream().map(x -> x.setLocation(equipmentSpecific.getPosition() + " "
+                            + equipmentSpecific.getStockDetail().getDescription())).collect(Collectors.toList());
+                    equipmentSpecificAlarmService.updateBatchById(alarms);
+                }
 
                 //生成入库单
                 StockBill stockBill = buildStockBills(equipmentSpecific, reginParams, agencyUserModel);

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

@@ -278,7 +278,10 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
 
             FeignClientResult<AgencyUserModel> result = Privilege.agencyUserClient.queryByUserId(vo.getChargePerson());
             AgencyUserModel userModel = result == null ? new AgencyUserModel() : result.getResult();
-            vo.setChargePersonName(userModel.getRealName());
+            if(userModel!=null&&userModel.getRealName()!=null){
+                vo.setChargePersonName(userModel.getRealName());
+            }
+
         }
     }
 
@@ -565,29 +568,30 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
         if (list == null || list.size() == 0) {
             return new ArrayList<>();
         }
-        List<SpeIndexVo> newList = new ArrayList<>();
+//        List<SpeIndexVo> newList = new ArrayList<>();
         List<SpeIndexVo> statusList = new ArrayList<>();
-        for (SpeIndexVo vo : list) {
-            int status = vo.getIsAlarm();
-            if (AlarmStatusEnum.BJ.getCode() == status) {
-                statusList.add(vo);
-            }
-            newList.add(vo);
-        }
-        if (statusList.size() == 0) {
-            return newList;
-        }
+        // 按照http://36.46.149.14:5080/zentao/task-view-5911.html的问题改动如下
+//        for (SpeIndexVo vo : list) {
+//            int status = vo.getIsAlarm();
+//            if (AlarmStatusEnum.BJ.getCode() == status) {
+//                statusList.add(vo);
+//            }
+//            newList.add(vo);
+//        }
+//        if (statusList.size() == 0) {
+//            return newList;
+//        }
         SpeIndexVo spe = new SpeIndexVo();
         spe.setKey(EquipmentSpeIndexEnum.YXZT.getCode());
-        SpeIndexVo latestVo = statusList.get(0);
+        SpeIndexVo latestVo = list.get(0);
         org.springframework.beans.BeanUtils.copyProperties(latestVo, spe);
         spe.setName("当前状态");
-        Map<String, String> map = getStatus(statusList);
+        Map<String, String> map = getStatus(list);
         spe.setValue(map.get("runStatus"));
         spe.setColor(map.get("color"));
         statusList.clear();
         statusList.add(spe);
-        statusList.addAll(newList);
+        statusList.addAll(list);
         return statusList;
     }
 
@@ -611,11 +615,17 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
             map.put("color", "");
             return map;
         }
+        if (StringUtil.isNotEmpty(indexVo.getIndexValue()) && AlarmStatusEnum.HF.getCode() == indexVo.getIsAlarm()) {
+            map.put("runStatus", indexVo.getIndexName());
+            map.put("color", "");
+            return map;
+        }
         if (StringUtil.isNotEmpty(indexVo.getIndexValue()) && TrueOrFalseEnum.real.value.toUpperCase().equals(indexVo.getIndexValue().toUpperCase())) {
             map.put("runStatus", indexVo.getIndexName());
             map.put("color", indexVo.getColor());
             return map;
         }
+
         map.put("runStatus", "运行");
         map.put("color", "");
         return map;

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

@@ -154,6 +154,28 @@ public class FormInstanceServiceImpl extends ServiceImpl<FormInstanceMapper, For
         }
         //4.保存
         boolean saveOrUpdateBatch = this.saveOrUpdateBatch(entities);
+        //字节点单位修改
+
+        Map<String, String> mapid= formInstanceMapper.getChildListdate(instanceId);
+        if(mapid!=null){
+            String[] listid=  mapid.get("ids").split(",");
+            if(listid!=null){
+                  List<String> listiods= new ArrayList<>();
+                for (String s : listid) {
+                    if(!"".equals(s)){
+                        listiods.add(s);
+                    }
+                }
+
+                   String bizOrgCode = map.get("bizOrgCode").toString();
+                String bizOrgName = map.get("bizOrgName").toString();
+                formInstanceMapper.updateListChild(bizOrgCode,listiods,"bizOrgCode");
+                formInstanceMapper.updateListChild(bizOrgName,listiods,"bizOrgName");
+            }
+
+
+        }
+
 //        syncDataService.syncCreatedFormInstance(entities);
         if (saveOrUpdateBatch && StringUtils.isNotBlank(groupType) && syncSwitch) {
             //数据同步

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

 package com.yeejoin.equipmanage.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -195,7 +196,7 @@ public class MaintenanceResourceServiceImpl extends ServiceImpl<MaintenanceResou
     public List<MaintenanceResourceDto> findTreeById(Long id) {
         List<MaintenanceResourceDto> list = maintenanceResourceMapper.findTreeById(id);
         if (!CollectionUtils.isEmpty(list)) {
-            List<MaintenanceResourceDto> dtoList = TreeNodeUtil.assembleTreeNotFilter(list);//&& x.getId().equals(Long.toString(id)) 这一段用于生成树之后并没有把树子节点数据从list列表删除造成的脏数据的问题 by chenhao 2022-01-12
+            List<MaintenanceResourceDto> dtoList = TreeNodeUtil.assembleTreeNotFilter_1(list);//&& x.getId().equals(Long.toString(id)) 这一段用于生成树之后并没有把树子节点数据从list列表删除造成的脏数据的问题 by chenhao 2022-01-12
             List<MaintenanceResourceDto> collect = dtoList.stream().filter(x -> !MaintenanceResourceEnum.CLASSIFY.getValue().equals(x.getType()) && x.getId().equals(Long.toString(id))).collect(Collectors.toList());
             return collect;
         }

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

 package com.yeejoin.equipmanage.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.equipmanage.common.entity.SignalClassify;
 import com.yeejoin.equipmanage.mapper.SignalClassifyMapper;
 import com.yeejoin.equipmanage.service.ISignalClassifyService;
 import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
-import java.util.List;
 
 /**
  * 信号分类量测枚举表服务实现类
@@ -19,4 +16,8 @@ import java.util.List;
 @Service
 public class SignalClassifyServiceImpl extends ServiceImpl<SignalClassifyMapper, SignalClassify> implements ISignalClassifyService {
 
+    @Override
+    public SignalClassify getTypeNameByCode(String code) {
+        return this.baseMapper.selectOne(new LambdaQueryWrapper<SignalClassify>().eq(SignalClassify::getTypeCode, code));
+    }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanAuditServiceImpl.java

@@ -141,8 +141,7 @@ public class PlanAuditServiceImpl implements IPlanAuditService {
                     workflowExcuteService.setTaskAssign(instanceId, checkLeaderId);
                 }
                 int status = statusEnum != null ? statusEnum.getNextStatus() : PlanStatusEnum.DRAFT.getValue();
-                // bug 5139  
-                if (nextCondition.equals(conditionValue) && PlanStatusEnum.EXAMINE_DEVELOPED.getNextStatus() == status) {
+                if (nextCondition.equals(conditionValue) && PlanStatusEnum.EXAMINE_THREE.getNextStatus() == status) {
                     status = PlanStatusEnum.IN_EXECUTION.getValue();
                 }
                 planDao.updatePlanStatus(status, plan.getId());

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

@@ -73,7 +73,7 @@
 				AND id = #{id}
 			</if>
 			<if test="isBatch == 1">
-				AND equipment_specific_alarm_id = #{equipmentSpecificAlarmId}
+				AND equipment_specific_id = #{equipmentSpecificId} AND equipment_specific_index_key = #{equipmentSpecificIndexKey}
 			</if>
 		</where>
     </update>

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

@@ -234,7 +234,8 @@
                 AND find_in_set(#{param.system},wles.system_id)
             </if>
             <if test="param.buildIds!=null">
-                AND wlesal.build_id IN
+--                 AND wlesal.build_id IN
+                AND wles.warehouse_structure_id IN
                 <foreach item="item" collection="param.buildIds" separator=","
                          open="(" close=")" index="">#{item}
                 </foreach>
@@ -458,6 +459,7 @@
             <if test="endDate!=null">AND d.createDate <![CDATA[<=]]> #{endDate}</if>
             <if test="alarmType != null and alarmType != ''">AND d.type = #{alarmType}</if>
             <if test="id != null and id != ''">AND d.id = #{id}</if>
+            <if test="isFireAlarm == 'false'">AND d.type != 'FIREALARM'</if>
         </where>
         ORDER BY d.createDate DESC
     </select>

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

@@ -391,7 +391,6 @@ WHERE wles.id=#{id}
         si.id,
         si.equipment_specific_id AS equipmentId,
         (case when si.value_label is null or trim(si.value_label) ='' then si.`value` else si.value_label end )AS 'value',
-      <!--  IFNULL(si.value_label, si.`value`) AS 'value', -->
         si.create_date,
         si.update_date
         FROM

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

@@ -276,14 +276,16 @@
 			equipindex.`value`,
 			ei.type_code AS 'typeCode',
 			es.qr_code AS 'qrCode',
-			equipindex.color AS emergencyLevelColor
+			equipindex.color AS emergencyLevelColor,
+			equipindex.isAlarm AS isAlarm
 		FROM
 			(
 				SELECT
 					esi.equipment_index_id,
 					esi.equipment_specific_id,
 					esi.`value`,
-					esi.emergency_level_color as color
+					esi.emergency_level_color as color,
+					esi.is_alarm as isAlarm
 				FROM
 					wl_equipment_specific_index esi,
 					(
@@ -318,6 +320,7 @@
 			es.qr_code AS 'qrCode',
 			es.iot_code AS 'iotCode',
 			es.realtime_iot_index_value AS 'value',
+			sc.is_alarm AS isAlarm,
             sc.emergency_level_color AS 'emergencyLevelColor'
 		FROM
 			wl_equipment_specific es,

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

@@ -38,6 +38,26 @@
         </if>
         order by instanceId desc
     </select>
+
+    <select id="getChildListdate" resultType="map">
+	SELECT getChildListdate ( #{id} ) ids
+    </select>
+
+    <update id="updateListChild" >
+
+        UPDATE wl_form_instance  set field_value =#{value}
+        where wl_form_instance.group_type in('building','room','floor')
+        and wl_form_instance.instance_id  in
+        <foreach collection="ids" index="index" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+
+
+       and wl_form_instance.field_name=#{fieldName}
+    </update>
+
+
+
     <select id="queryForMapList" resultType="map">
         select
         d.*

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

@@ -133,9 +133,10 @@
         ]]>
         <where>
             <if test="id != null">
-                FIND_IN_SET(m.id, getMaintenanceResourceTreeById(#{id}))
+                FIND_IN_SET(m.parent_id, getMaintenanceResourceTreeById(#{id}))
             </if>
         </where>
+        UNION (SELECT f.* from mt_maintenance_resource f where f.id =#{id})
     </select>
     <select id="findByIds" resultType="com.yeejoin.equipmanage.common.vo.MaintenanceResourceDataVo">
         <![CDATA[