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

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

+package com.yeejoin.equipmanage.common.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author DELL
+ */
+@Data
+@TableName("wl_form_group_column_equip")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "wl_form_group_column_equip对象", description = "分组表")
+public class FormGroupColumnEquip extends BaseEntity {
+
+    @ApiModelProperty(value = "字段名")
+    @TableField("field_name")
+    private String fieldName;
+
+    @ApiModelProperty(value = "中文名")
+    @TableField("field_label")
+    private String fieldLabel;
+
+    @ApiModelProperty(value = "数据类型：文本，数字，枚举,日期")
+    @TableField("data_type")
+    private String dataType;
+
+
+    @ApiModelProperty(value = "字段分组主键")
+    @TableField("group_id")
+    private Long groupId;
+
+    @ApiModelProperty(value = "查询策略;全等,模糊,区间")
+    @TableField("query_strategy")
+    private String queryStrategy;
+
+    @ApiModelProperty(value = "不能为空")
+    @TableField("not_null")
+    private Boolean notNull;
+
+    @ApiModelProperty(value = "分组编号")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "创建者")
+    @TableField("creator_id")
+    private Long creatorId;
+
+}

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

+package com.yeejoin.equipmanage.common.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+/**
+ * @author DELL
+ */
+@Data
+@TableName("wl_form_group_equip")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "wl_form_group_equip对象", description = "分组表")
+public class FormGroupEquip extends BaseEntity {
+    @ApiModelProperty(value = "分组名称")
+    @TableField("group_name")
+    private String groupName;
+
+    @ApiModelProperty(value = "分组编号")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "分组类型（点位图过滤用）")
+    @TableField("group_type")
+    private String groupType;
+
+    @ApiModelProperty(value = "允许的操作（逗号分隔ids）")
+    @TableField("allow_operation")
+    private String allowOperation;
+
+    @ApiModelProperty(value = "创建者")
+    @TableField("creator_id")
+    private Long creatorId;
+}

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

+package com.yeejoin.equipmanage.common.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author DELL
+ */
+@Data
+@TableName("wl_form_instance_equip")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "wl_form_instance_equip", description = "实例表")
+public class FormInstanceEquip extends BaseEntity {
+
+    @ApiModelProperty(value = "字段名")
+    @TableField("field_name")
+    private String fieldName;
+
+    @ApiModelProperty(value = "中文名")
+    @TableField("field_label")
+    private String fieldLabel;
+
+    @ApiModelProperty(value = "数据类型：文本，数字，枚举,日期")
+    @TableField("data_type")
+    private String dataType;
+
+    @ApiModelProperty(value = "字段分组主键")
+    @TableField("group_id")
+    private Long groupId;
+
+    @ApiModelProperty(value = "动态配置字段的值")
+    @TableField("field_value")
+    private String fieldValue;
+
+    @ApiModelProperty(value = "分组类型(冗余字段便于查询）")
+    @TableField("group_type")
+    private String groupType;
+
+    @ApiModelProperty(value = "设备实例id")
+    @TableField("instance_id")
+    private Long instanceId;
+
+    @ApiModelProperty(value = "字段定义信息的主键")
+    @TableField("group_column_id")
+    private Long groupColumnId;
+
+    @ApiModelProperty(value = "查询策略;全等,模糊,区间")
+    @TableField("query_strategy")
+    private String queryStrategy;
+
+    @ApiModelProperty(value = "分组编号")
+    @TableField("group_code")
+    private String groupCode;
+
+    @ApiModelProperty(value = "创建者")
+    @TableField(value = "creator_id",fill = FieldFill.INSERT_UPDATE)
+    private Long creatorId;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/dto/FormGroupColumnDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/dto/FormGroupColumnEquipDto.java

@@ -9,7 +9,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel(value = "FormGroupColumnDto对象", description = "分组Dto对象")
-public class FormGroupColumnDto {
+public class FormGroupColumnEquipDto {
 
     @ApiModelProperty(value = "字段名")
     private String fieldName;

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

@@ -183,6 +183,7 @@ public class ConfigureController extends AbstractBaseController {
         if (StringUtils.isEmpty(bizOrgCode)) {
             return CommonResponseUtil.success(null);
         }
+
         Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize());
         Page<Map<String, Object>> fireCarInfoByWL = fireFightingSystemMapper.getFireCarInfoByWL(page, bizOrgCode);
         if (!CollectionUtils.isEmpty(fireCarInfoByWL.getRecords())) {
@@ -215,7 +216,7 @@ public class ConfigureController extends AbstractBaseController {
                 }
                 if (item.containsKey("carStateDate") && !ObjectUtils.isEmpty(item.get("carStateDate"))) {
                     try {
-                        Date carStateDate = DateUtils.dateParse(item.get("carStateDate").toString(), "yyyy-MM-dd'T'HH:mm:ss");
+                        Date carStateDate = DateUtils.dateParse(item.get("carStateDate").toString(), "yyyy-MM-dd HH:mm:ss");
                         String s = DateUtils.dateFormat(carStateDate, DateUtils.DATE_TIME_PATTERN);
                         item.put("carStateDate", s);
                     } catch (ParseException e) {

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

 package com.yeejoin.equipmanage.controller;
 
-import com.yeejoin.equipmanage.common.entity.FormGroupColumn;
-import com.yeejoin.equipmanage.common.entity.dto.FormGroupColumnDto;
-import com.yeejoin.equipmanage.service.IFormGroupColumnService;
-import com.yeejoin.equipmanage.service.IFormInstanceService;
+import com.yeejoin.equipmanage.common.entity.dto.FormGroupColumnEquipDto;
+import com.yeejoin.equipmanage.config.PersonIdentify;
+import com.yeejoin.equipmanage.service.IFormInstanceEquipService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -31,15 +28,39 @@ public class FormInstanceController extends AbstractBaseController {
 
 
     @Autowired
-    private IFormInstanceService formInstanceService;
+    private IFormInstanceEquipService formInstanceEquipService;
+
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "通过分组code查询列及值信息", notes = "通过分组code查询列及值信息")
     @RequestMapping(value = "/queryColumnAndValueByGroup", method = RequestMethod.GET)
-    public List<FormGroupColumnDto> queryColumnAndValueByGroup(@RequestParam String groupCode, @RequestParam(required = false) Long instanceId) {
-        return formInstanceService.queryColumnAndValueByGroup(groupCode, instanceId);
+    public List<FormGroupColumnEquipDto> queryColumnAndValueByGroup(@RequestParam String groupCode, @RequestParam(required = false) Long instanceId) {
+        return formInstanceEquipService.queryColumnAndValueByGroup(groupCode, instanceId);
     }
 
+
+    @PostMapping(value = "/commonSave")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "通用保存")
+    @PersonIdentify
+    public Object save(
+            @RequestParam(value = "groupCode") String groupCode,
+            @RequestParam(value = "instanceId", required = false) String instanceId,
+            @RequestBody Map<String, Object> map) {
+        String orgCode = getOrgCode();
+        return formInstanceEquipService.saveForm(groupCode, orgCode, map, instanceId);
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "通用更新")
+    @PutMapping(value = "/commonUpdate")
+    public Object update(
+            @RequestParam Long instanceId,
+            @RequestParam(value = "groupCode", required = false) String groupCode,
+            @RequestBody Map<String, Object> map) {
+        String orgCode = getOrgCode();
+        return formInstanceEquipService.updateForm(instanceId, orgCode, map, groupCode);
+    }
 }
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/dto/EquipmentDetailDownloadTemplateDto.java

@@ -59,19 +59,19 @@ public class EquipmentDetailDownloadTemplateDto implements Serializable {
     //@Excel(name = "品牌", width = 30, orderNum = "4")
     private Date productionDate;
 
-    @Excel(name = "报废年限",width = 30, orderNum = "14")
-    //@Excel(name = "品牌", width = 30, orderNum = "4")
-    private String expiryDate;
-
-    @Excel(name = "维保周期",width = 30, orderNum = "15")
-    //@Excel(name = "品牌", width = 30, orderNum = "4")
-    private BigDecimal maintenanceCycle ;
-
-    @Excel(name = "投运时间",width = 30, orderNum = "16")
+//    @Excel(name = "报废年限",width = 30, orderNum = "14")
+//    //@Excel(name = "品牌", width = 30, orderNum = "4")
+//    private String expiryDate;
+//
+//    @Excel(name = "维保周期",width = 30, orderNum = "15")
+//    //@Excel(name = "品牌", width = 30, orderNum = "4")
+//    private BigDecimal maintenanceCycle ;
+
+    @Excel(name = "投运时间",width = 30, orderNum = "14")
     //@Excel(name = "品牌", width = 30, orderNum = "4")
     private Date deliveryDate;
     
-    @Excel(name = "所属系统",width = 30, orderNum = "17")
-    //@Excel(name = "所属单位",width = 30,orderNum = "12")
-    private String systemName;
+//    @Excel(name = "所属系统",width = 30, orderNum = "17")
+//    //@Excel(name = "所属单位",width = 30,orderNum = "12")
+//    private String systemName;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/dto/EquipmentDetailExcelSingleTemplateDto.java

@@ -68,21 +68,21 @@ public class EquipmentDetailExcelSingleTemplateDto {
     //@Excel(name = "品牌", width = 30, orderNum = "4")
     private Date productionDate;
 
-    @ExcelProperty(value = "报废年限", index = 13)
-    //@Excel(name = "品牌", width = 30, orderNum = "4")
-    private String expiryDate;
-
-    @ExcelProperty(value = "维保周期", index = 14)
-    //@Excel(name = "品牌", width = 30, orderNum = "4")
-    private BigDecimal maintenanceCycle ;
-
-    @ExcelProperty(value = "投运时间", index = 15)
+//    @ExcelProperty(value = "报废年限", index = 13)
+//    //@Excel(name = "品牌", width = 30, orderNum = "4")
+//    private String expiryDate;
+//
+//    @ExcelProperty(value = "维保周期", index = 14)
+//    //@Excel(name = "品牌", width = 30, orderNum = "4")
+//    private BigDecimal maintenanceCycle ;
+
+    @ExcelProperty(value = "投运时间", index = 13)
     //@Excel(name = "品牌", width = 30, orderNum = "4")
     private Date deliveryDate;
 
     //动态下拉内容
-    @ExplicitConstraint(indexNum = 16, sourceClass = RoleNameExplicitConstraint.class,method="getFireSystemList") //动态下拉内容
-    @ExcelProperty(value = "所属系统", index = 16)
-    //@Excel(name = "所属单位",width = 30,orderNum = "12")
-    private String systemName;
+//    @ExplicitConstraint(indexNum = 16, sourceClass = RoleNameExplicitConstraint.class,method="getFireSystemList") //动态下拉内容
+//    @ExcelProperty(value = "所属系统", index = 16)
+//    //@Excel(name = "所属单位",width = 30,orderNum = "12")
+//    private String systemName;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/dto/EquipmentDetailExcelTemplateDto.java

@@ -69,21 +69,21 @@ public class EquipmentDetailExcelTemplateDto implements Serializable {
     //@Excel(name = "品牌", width = 30, orderNum = "4")
     private Date productionDate;
 
-    @ExcelProperty(value = "报废年限", index = 13)
-    //@Excel(name = "品牌", width = 30, orderNum = "4")
-    private String expiryDate;
-
-    @ExcelProperty(value = "维保周期", index = 14)
-    //@Excel(name = "品牌", width = 30, orderNum = "4")
-    private BigDecimal maintenanceCycle ;
-
-    @ExcelProperty(value = "投运时间", index = 15)
+//    @ExcelProperty(value = "报废年限", index = 13)
+//    //@Excel(name = "品牌", width = 30, orderNum = "4")
+//    private String expiryDate;
+//
+//    @ExcelProperty(value = "维保周期", index = 14)
+//    //@Excel(name = "品牌", width = 30, orderNum = "4")
+//    private BigDecimal maintenanceCycle ;
+
+    @ExcelProperty(value = "投运时间", index = 13)
     //@Excel(name = "品牌", width = 30, orderNum = "4")
     private Date deliveryDate;
 
     //动态下拉内容
-    @ExplicitConstraint(indexNum = 16, sourceClass = RoleNameExplicitConstraint.class,method="getFireSystemList") //动态下拉内容
-    @ExcelProperty(value = "所属系统", index = 16)
-    //@Excel(name = "所属单位",width = 30,orderNum = "12")
-    private String systemName;
+//    @ExplicitConstraint(indexNum = 16, sourceClass = RoleNameExplicitConstraint.class,method="getFireSystemList") //动态下拉内容
+//    @ExcelProperty(value = "所属系统", index = 16)
+//    //@Excel(name = "所属单位",width = 30,orderNum = "12")
+//    private String systemName;
 }

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

+package com.yeejoin.equipmanage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.equipmanage.common.entity.FormGroupColumnEquip;
+
+
+/**
+ * 分组字段表
+ * @author DELL
+ */
+public interface FormGroupColumnEquipMapper extends BaseMapper<FormGroupColumnEquip> {
+
+
+}

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

+package com.yeejoin.equipmanage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.equipmanage.common.entity.FormGroupEquip;
+
+
+/**
+ * 分组表
+ * @author DELL
+ */
+public interface FormGroupEquipMapper extends BaseMapper<FormGroupEquip> {
+
+
+}

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

+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.FormInstanceEquip;
+import com.yeejoin.equipmanage.common.entity.dto.BuildIsRiskDTO;
+import com.yeejoin.equipmanage.common.entity.dto.BuildSearchDTO;
+import com.yeejoin.equipmanage.common.entity.vo.BuildingVideoListVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 分组字段表
+ * @author DELL
+ */
+public interface FormInstanceEquipMapper extends BaseMapper<FormInstanceEquip> {
+    /**
+     * 实例基本信息分页查询
+     * @param page 分页信息
+     * @param params 查询条件
+     * @param fieldNames 字段
+     * @return List<Map<String,Object>>
+     */
+    Page<Map<String,Object>> queryInstancePage(Page page,
+                                               @Param("groupCode") String groupCode,
+                                               @Param("fieldNames") Map<String,Object> fieldNames,
+                                               @Param("params") Map<String,String> params
+    );
+    /**
+     * 不分页查询
+     * @param groupCode 分组编号
+     * @param fieldNames 字段
+     * @param params 查询参数
+     * @return List<Map<String, Object>>
+     */
+    List<Map<String, Object>> queryForMapList(@Param("groupCode") String groupCode,
+                                              @Param("fieldNames") Map<String, Object> fieldNames,
+                                              @Param("params") Map<String, String> params);
+
+    /**
+     * 查询指定节点的子
+     * @param parentId
+     * @return
+     */
+    List<Map<String,Object>> querySpecialChildrenList(String parentId, String bizOrgCode);
+
+    /**
+     * 查询指定节点的子
+     * @param parentId
+     * @return
+     */
+    List<Map<String,Object>> querySpecialChildrenListByName(String parentId, String bizOrgCode, String name);
+
+    /**
+     * 查询指定节点的子
+     * @param parentId
+     * @return
+     */
+    List<Map<String,Object>> querySpecialChildrenListByBizOrgCode(@Param("parentId") String parentId, @Param("bizOrgCode") String bizOrgCode);
+
+    /**
+     * @Description 分页查询
+     * @param dto 查询参数
+     * @Return List<Map<String,Object>>
+     * @Date 2020/12/19 11:47
+     */
+    Page queryPage(Page page, @Param("query") BuildSearchDTO dto);
+    /**
+     * @Description 不分页
+     * @param dto 查询参数
+     * @Return List<Map<String,Object>>
+     * @Date 2020/12/19 11:47
+     */
+    List<Map<String,Object>> queryPage(@Param("query") BuildSearchDTO dto);
+    /**
+     * @Description 分页查询
+     * @param dto 查询参数
+     * @Return List<Map<String,Object>>
+     * @Date 2020/12/19 11:47
+     */
+    Page roomPage(Page page, @Param("query") BuildSearchDTO dto);
+    /**
+     * @Description 查询列表
+     * @param dto 查询参数
+     * @Return List<Map<String,Object>>
+     * @Date 2020/12/19 11:47
+     */
+    List<Map<String,Object>> roomPage(@Param("query") BuildSearchDTO dto);
+    /**
+     * @Description 根据parentId查询其下资源（楼层、房间）
+     * @param instanceId
+     * @Return List<Map<String,Object>>
+     * @Date 2020/12/19 15:06
+     */
+    List<Map<String,Object>> queryFloorRoom(List<Long> instanceId);
+
+    /**
+     * 根据instanceId、groupType，获取建筑楼层list
+     * @param dto
+     * @return
+     */
+    List<BuildSearchDTO> getBuildFloorList(@Param("query") BuildSearchDTO dto);
+
+    /**
+     * 根据instanceId，获取建筑楼层信息
+     * @param instanceId
+     * @param fileCategory
+     * @return
+     */
+    LinkedHashMap<String, Object> findByInstanceId(@Param("instanceId") Long instanceId, @Param("fileCategory") String fileCategory);
+
+    List<LinkedHashMap<String, Object>> findDetailByInstanceId(@Param("instanceId") Long instanceId, @Param("fileCategory") String fileCategory);
+
+    /**
+     * 消防建筑视屏监控统计树
+     * @return
+     * @param bizOrgCodeList
+     */
+    List<Map<String, Object>> getBuildVideoListCount(@Param("list") List<String> bizOrgCodeList);
+
+    /**
+     * 可乐建筑视屏监控统计树
+     * @return
+     */
+    List<Map<String, Object>> getColaBuildVideoListCount(@Param("dto") BuildingVideoListVO dto);
+
+    /**
+     * 同步仓库
+     * @param formKeyMap
+     * @return
+     */
+    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
+     * @return
+     */
+    String getStuctureName(String id);
+    String getStuName(String id);
+    Long getStructureParentId(String id);
+    /**
+     * 删除仓库
+     * @param id
+     * @return
+     */
+    int deleteStuById(Long  id);
+
+    /**
+     * 修改仓库
+     */
+    int updateStr(@Param("id") Long  id,@Param("name") String name,@Param("fullName") String fullName,@Param("parentId")String parentId, @Param("code")String code, @Param("bizOrgCode")String bizOrgCode,@Param("bizOrgName")String bizOrgName);
+
+
+    /**
+     * 修改仓库
+     */
+    int updateStrFullName(@Param("id") Long  id,@Param("name") String name,@Param("fullName") String fullName);
+
+    /**
+     * 查询未设置风险区域的子风险区域列表
+     * @param instanceId
+     * @return
+     */
+    List<BuildIsRiskDTO> getChildrenNotIsRiskList(@Param("instanceId") String instanceId);
+
+
+    int clearSystemId(@Param("id")  Long id );
+
+    /**
+     * 清除绑定关系
+     * @param instanceId 建筑实例id
+     */
+    void clearRegionBind(Long instanceId);
+
+    /*
+     * 查询id下是否还有子类货位信息
+     * */
+    List<Map<String,Object>> getParentId(Long parentId);
+
+    Map<String, String> getIdAndType(String  id);
+
+    Map<String, Object>  getFormInstanceById(Long instanceId);
+
+    /**
+     * 获取所有建筑 用于数据字典 // 需求958 导出模板需要列表获取建筑 by kongfm 2021-09-15
+     * @return
+     */
+    List<LinkedHashMap<String, Object>> getAllBuilding();
+
+    Map<String, String> getBuildingToLongitudeAndLatitude(String instanceId);
+
+    List<Map<String, Long>> getBuildVideoCount();
+
+    int  updateFormInstanceByInstanceAndFieldName(String name,String value ,Long instanceId);
+
+    /**
+     * 查询子节点
+     * @param id
+     * @return
+     */
+    List<String> selectChildListdate(@Param("id")Long id);
+
+    int updateFormFieldValue(@Param("id") Long id, @Param("name") String name, @Param("value") String value);
+}

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

+package com.yeejoin.equipmanage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.equipmanage.common.entity.FormGroupColumnEquip;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author DELL
+ */
+public interface IFormGroupColumnEquipService extends IService<FormGroupColumnEquip> {
+    /**
+     * 查询指定分组的字段
+     * @param groupCode 分组
+     * @return List<FormGroupColumn>
+     */
+    List<FormGroupColumnEquip> queryByGroup(String groupCode);
+
+    /**
+     * 枚举处理
+     * @param fieldName 需要处理的字段名
+     * @param value 需要处理的字段值
+     * @return Map<String, Map<String, Object>>
+     */
+    Map<String, Map<String, Object>> processEnumData(String fieldName, String value);
+}

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

+package com.yeejoin.equipmanage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.equipmanage.common.entity.FormGroup;
+import com.yeejoin.equipmanage.common.entity.FormGroupEquip;
+
+import java.util.Map;
+
+/**
+ * @author DELL
+ */
+public interface IFormGroupEquipService extends IService<FormGroupEquip> {
+    /**
+     * @Description 根据groupCode查询
+     * @param groupCode
+     * @Return FormGroup
+     * @Date 2020/12/18 10:01
+     */
+    FormGroupEquip allowOperationByGroupCode(String groupCode);
+
+    /**
+     * 按照唯一主键查询
+     * @param groupCode 编号
+     * @return FormGroup
+     */
+    FormGroupEquip getByUniqueKey(String groupCode);
+}

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

+package com.yeejoin.equipmanage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.equipmanage.common.entity.FormInstanceEquip;
+import com.yeejoin.equipmanage.common.entity.dto.FormGroupColumnEquipDto;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author DELL
+ */
+public interface IFormInstanceEquipService extends IService<FormInstanceEquip> {
+
+    List<FormGroupColumnEquipDto> queryColumnAndValueByGroup(String groupCode, Long instanceId);
+
+    /**
+     * 通用表单保存
+     *
+     * @param groupCode   表单类型
+     * @param orgCode 公司编号
+     * @param map         form
+     * @param caseId 实例ID
+     * @return Object
+     */
+    Object saveForm(String groupCode, String orgCode, Map<String, Object> map, String instanceId);
+
+    /**
+     * 创建
+     *
+     * @param groupCode   分类
+     * @param companyCode 公司编码
+     * @param map         字段值对象
+     * @return Map<String, Object>
+     */
+    Map<String, Object> createByMap(String groupCode, String companyCode, Map<String, Object> map, String caseId);
+
+    /**
+     * 通用表单更新
+     *
+     * @param instanceId 实例id
+     * @param companyCode 公司编号
+     * @param map         form
+     * @return Object
+     */
+    Object updateForm(Long instanceId, String companyCode, Map<String, Object> map, String groupCode);
+
+    /**
+     * 删除
+     *
+     * @param instanceId 实例id
+     * @return 是否成功
+     */
+    Boolean deleteInstanceById(Long instanceId);
+}

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.equipmanage.common.entity.FormInstance;
 import com.yeejoin.equipmanage.common.entity.dto.BuildSearchDTO;
-import com.yeejoin.equipmanage.common.entity.dto.FormGroupColumnDto;
+import com.yeejoin.equipmanage.common.entity.dto.FormGroupColumnEquipDto;
 import com.yeejoin.equipmanage.common.entity.vo.BuildingVideoListVO;
 import com.yeejoin.equipmanage.common.vo.UnitAreaTreeVo;
 
@@ -173,5 +173,5 @@ public interface IFormInstanceService extends IService<FormInstance> {
      */
     List<Map<String, Object>> getSpecialChildrenListByName(String parentId, String bizOrgCode, String name);
 
-    List<FormGroupColumnDto> queryColumnAndValueByGroup(String groupCode, Long instanceId);
+    List<FormGroupColumnEquipDto> queryColumnAndValueByGroup(String groupCode, Long instanceId);
 }

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

@@ -162,6 +162,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     @Autowired
     private IFormInstanceService formInstanceService;
 
+    @Autowired
+    private IFormInstanceEquipService formInstanceEquipService;
+
     @Value("${systemctl.dict.iot-core-param}")
     private String iotCoreParam;
 
@@ -203,6 +206,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     FormInstanceMapper formInstanceMapper;
 
     @Autowired
+    FormInstanceEquipMapper formInstanceEquipMapper;
+
+    @Autowired
     EquipmentSpecificIndexMapper equipmentSpecificIndexMapper;
 
     @Value("${systemctl.sync.switch}")
@@ -1018,7 +1024,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
         }
         if (res > 0) {
             // 删除设备动态表单扩展属性
-            return formInstanceService.deleteInstanceById(id);
+            return formInstanceEquipService.deleteInstanceById(id);
         } else {
             return false;
         }

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

+package com.yeejoin.equipmanage.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.component.feign.utils.FeignUtil;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
+import com.yeejoin.equipmanage.common.entity.FormGroupColumnEquip;
+import com.yeejoin.equipmanage.common.enums.DataOption;
+import com.yeejoin.equipmanage.mapper.FormGroupColumnEquipMapper;
+import com.yeejoin.equipmanage.service.IFormGroupColumnEquipService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.component.cache.Redis;
+import org.typroject.tyboot.component.cache.enumeration.CacheType;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.StringUtil;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author DELL
+ */
+@Service
+public class FormGroupColumnEquipServiceImpl extends ServiceImpl<FormGroupColumnEquipMapper, FormGroupColumnEquip> implements IFormGroupColumnEquipService {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    @Override
+    public List<FormGroupColumnEquip> queryByGroup(String groupCode) {
+        QueryWrapper<FormGroupColumnEquip> wrapper = new QueryWrapper<>();
+        wrapper.eq("group_code",groupCode);
+        return this.baseMapper.selectList(wrapper);
+    }
+
+    @Override
+    public Map<String, Map<String, Object>> processEnumData(String fieldName, String value) {
+        Map<String, Map<String, Object>> returnMap = new HashMap<>();
+        DataOption option = DataOption.getInstance(fieldName);
+        if (!ValidationUtil.isEmpty(option)) {
+            try {
+                String cacheKey = Redis.genKey(CacheType.ERASABLE.name(), "ENUM_DICT_VALUE",option.name());
+                List<DictionarieValueModel> valueModels = redisUtils.get(cacheKey) == null ? new ArrayList<>() : JSONObject.parseArray(redisUtils.get(cacheKey).toString(),DictionarieValueModel.class);
+                if (ValidationUtil.isEmpty(valueModels)) {
+                    valueModels = FeignUtil.remoteCall(() -> Systemctl.dictionarieClient.dictValues(option.name()));
+                    redisUtils.set(cacheKey, JSONObject.toJSONString(valueModels),60*60*24);
+                }
+                if (!ValidationUtil.isEmpty(valueModels)) {
+                    Map<String, Object> map = new HashMap<>();
+                    Map dictValueMap = Bean.listToMap(valueModels, "dictDataKey", "dictDataValue", DictionarieValueModel.class);
+                    String dictKeys[] = StringUtil.string2Array(value);
+                    for (String dictKey : dictKeys){
+                        map.put(dictKey, dictValueMap.get(dictKey));
+                    }
+                    returnMap.put(fieldName + "_dictValue", map);
+                }
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                throw new RuntimeException("枚举类型处理失败.");
+            }
+        }
+        return returnMap;
+    }
+}

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

+package com.yeejoin.equipmanage.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
+import com.yeejoin.equipmanage.common.entity.FormGroup;
+import com.yeejoin.equipmanage.common.entity.FormGroupEquip;
+import com.yeejoin.equipmanage.mapper.FormGroupEquipMapper;
+import com.yeejoin.equipmanage.mapper.FormGroupMapper;
+import com.yeejoin.equipmanage.service.IFormGroupEquipService;
+import com.yeejoin.equipmanage.service.IFormGroupService;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * @author DELL
+ */
+@Service
+public class FormGroupEquipServiceImpl extends ServiceImpl<FormGroupEquipMapper, FormGroupEquip> implements IFormGroupEquipService {
+
+    @Value("${systemctl.dict.allow-operation}")
+    private String allowOperation;
+
+    /**
+     * @param groupCode
+     * @Description 根据groupCode查询
+     * @Return FormGroup
+     * @Date 2020/12/18 10:01
+     */
+    @Override
+    public FormGroupEquip allowOperationByGroupCode(String groupCode) {
+        FormGroupEquip formGroup = this.getOne(new QueryWrapper<FormGroupEquip>()
+                .lambda()
+                .eq(FormGroupEquip::getGroupCode, groupCode));
+        Optional.ofNullable(formGroup).orElseThrow(() -> new BadRequest("分组CODE查询formGroup不存在"));
+        return formGroup;
+    }
+
+    @Override
+    public FormGroupEquip getByUniqueKey(String groupCode) {
+        QueryWrapper<FormGroupEquip> wrapper = new QueryWrapper<>();
+        wrapper.eq("group_code", groupCode);
+        return this.getOne(wrapper);
+    }
+}

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

@@ -13,7 +13,7 @@ import com.yeejoin.equipmanage.common.entity.FormGroupColumn;
 import com.yeejoin.equipmanage.common.entity.FormInstance;
 import com.yeejoin.equipmanage.common.entity.SourceFile;
 import com.yeejoin.equipmanage.common.entity.dto.BuildSearchDTO;
-import com.yeejoin.equipmanage.common.entity.dto.FormGroupColumnDto;
+import com.yeejoin.equipmanage.common.entity.dto.FormGroupColumnEquipDto;
 import com.yeejoin.equipmanage.common.entity.vo.BuildingVideoListVO;
 import com.yeejoin.equipmanage.common.enums.GroupCodeEnum;
 import com.yeejoin.equipmanage.common.enums.GroupColumnDataType;
@@ -574,13 +574,13 @@ public class FormInstanceServiceImpl extends ServiceImpl<FormInstanceMapper, For
     }
 
     @Override
-    public List<FormGroupColumnDto> queryColumnAndValueByGroup(String groupCode, Long instanceId) {
-        List<FormGroupColumnDto> list = new ArrayList<>();
+    public List<FormGroupColumnEquipDto> queryColumnAndValueByGroup(String groupCode, Long instanceId) {
+        List<FormGroupColumnEquipDto> list = new ArrayList<>();
         List<FormGroupColumn> columnList = iFormGroupColumnService.queryByGroup(groupCode);
         if (!CollectionUtils.isEmpty(columnList)) {
             Map<String, Object> map = queryForMap(instanceId);
             columnList.forEach(x -> {
-                FormGroupColumnDto dto = new FormGroupColumnDto();
+                FormGroupColumnEquipDto dto = new FormGroupColumnEquipDto();
                 BeanUtils.copyProperties(x, dto);
                 if (!map.isEmpty()) {
                     dto.setFieldValue(map.get(dto.getFieldName()).toString());

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

@@ -596,41 +596,39 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     public static List<EquipmentSpecificAlarmLog> upAlarmLogStatus(String iotCode, String equipmentSpecificIndexKey,
                                                                    String traceId, IEquipmentSpecificAlarmLogService equipmentSpecificAlarmLogService,
                                                                    boolean flag) {
-        LambdaQueryWrapper<EquipmentSpecificAlarmLog> queryWrapper = new LambdaQueryWrapper();
+        LambdaQueryWrapper<EquipmentSpecificAlarmLog> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(EquipmentSpecificAlarmLog::getIotCode, iotCode);
         queryWrapper.eq(EquipmentSpecificAlarmLog::getEquipmentSpecificIndexKey, equipmentSpecificIndexKey);
         queryWrapper.ne(EquipmentSpecificAlarmLog::getStatus, AlarmStatusEnum.HF.getCode());
         List<EquipmentSpecificAlarmLog> logs = equipmentSpecificAlarmLogService.getBaseMapper().selectList(queryWrapper);
-        EquipmentSpecificAlarmLog log = logs.get(0);
-        EquipmentSpecific specific = equipmentSpecificMapper.selectById(log.getEquipmentSpecificId());
-        Date date = new Date();
-        logs.forEach(x -> {
-            x.setCleanTime(new Date());
-            x.setStatus(AlarmStatusEnum.HF.getCode());
-            if (!flag) {
-                x.setConfirmType(x.getType());
-                x.setConfirmTypeName(ConfirmAlamEnum.getTypeByCode(x.getType()));
-                String equipmentName = StringUtil.isNotEmpty(specific.getCode()) ? specific.getName() + "(" + specific.getCode() + ")" : specific.getName();
-                if (x.getType().equals(AlarmTypeEnum.PB.getCode())) {
-                    x.setAlarmReason(equipmentName + "频繁故障/误报，将设备报警信息屏蔽。");
-                } else {
-                    x.setAlarmReason(equipmentName + "引起设备报警");
+        if(!logs.isEmpty()){
+            EquipmentSpecificAlarmLog log = logs.get(0);
+            EquipmentSpecific specific = equipmentSpecificMapper.selectById(log.getEquipmentSpecificId());
+            Date date = new Date();
+            logs.forEach(x -> {
+                x.setCleanTime(new Date());
+                x.setStatus(AlarmStatusEnum.HF.getCode());
+                if (!flag) {
+                    x.setConfirmType(x.getType());
+                    x.setConfirmTypeName(ConfirmAlamEnum.getTypeByCode(x.getType()));
+                    String equipmentName = StringUtil.isNotEmpty(specific.getCode()) ? specific.getName() + "(" + specific.getCode() + ")" : specific.getName();
+                    if (x.getType().equals(AlarmTypeEnum.PB.getCode())) {
+                        x.setAlarmReason(equipmentName + "频繁故障/误报，将设备报警信息屏蔽。");
+                    } else {
+                        x.setAlarmReason(equipmentName + "引起设备报警");
+                    }
+                    x.setResolveResult(date + "系统收到设备复归（已消除）信号，系统自动处理。");
+                    x.setConfirmUser("");
+                    x.setConfirmUserName("系统自动处理");
+                    x.setConfirmDate(date);
                 }
-                x.setResolveResult(date + "系统收到设备复归（已消除）信号，系统自动处理。");
-                x.setConfirmUser("");
-                x.setConfirmUserName("系统自动处理");
-                x.setConfirmDate(date);
-            }
-            x.setEquipmentSpecificIndexValue(TrueOrFalseEnum.fake.value);
-            if (!StringUtils.isEmpty(traceId)) {
-                x.setTraceId(traceId);
-            }
-        });
-
-        if (!logs.isEmpty()) {
+                x.setEquipmentSpecificIndexValue(TrueOrFalseEnum.fake.value);
+                if (!StringUtils.isEmpty(traceId)) {
+                    x.setTraceId(traceId);
+                }
+            });
             equipmentSpecificAlarmLogService.updateBatchById(logs);
         }
-
         if (flag) {
             List<EquipmentSpecificIndex> indexList = equipmentSpecificIndexService.getEquipmentSpeIndexBySpeIotCode(iotCode);
             publishDataToCanvas(indexList);

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

 package com.yeejoin.equipmanage.service.impl;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
@@ -8,6 +9,7 @@ import java.util.stream.Collectors;
 import javax.annotation.Resource;
 
 import com.yeejoin.equipmanage.common.utils.*;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -609,8 +611,11 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                  AtomicReference<String> fightSysIds = new AtomicReference<>("");
                  String fightingSysCodes = equipmentDetailDownloadVOS.getFightingSysCodes();
                  if (StringUtils.isNotBlank(fightingSysCodes)) {
-                     String[] idsArr = fightingSysCodes.split("-");
-                     List<FireFightingSystemEntity> fightingSystemList = fireFightingSystemService.getFightingSysByCodes(idsArr);
+                     String[] codes = new String[]{};
+                     String[] idsArr1 = fightingSysCodes.split("-");
+                     String[] idsArr2 = fightingSysCodes.split(",");
+                     codes = idsArr1.length >= idsArr2.length ? idsArr1 : idsArr2;
+                     List<FireFightingSystemEntity> fightingSystemList = fireFightingSystemService.getFightingSysByCodes(codes);
                      if (!fightingSystemList.isEmpty()) {
                          fightingSystemList.stream().forEach(x -> {
                              String sysCodes = fightSysIds.get();
@@ -640,9 +645,9 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                  equipmentDetail.setName(equipmentDetailDownloadVOS.getName());
                  equipmentDetail.setArea(equipmentDetailDownloadVOS.getDescription());
                  equipmentDetail.setProductionDate(equipmentDetailDownloadVOS.getProductionDate());
-                 equipmentDetail.setExpiryDate(equipmentDetailDownloadVOS.getExpiryDate());
+                 equipmentDetail.setExpiryDate(ObjectUtils.isEmpty(equipment.getExpiryDate()) ? "" : String.valueOf(equipment.getExpiryDate()));
                  equipmentDetail.setDeliveryDate(equipmentDetailDownloadVOS.getDeliveryDate());
-                 equipmentDetail.setMaintenanceCycle(equipmentDetailDownloadVOS.getMaintenanceCycle());
+                 equipmentDetail.setMaintenanceCycle(ObjectUtils.isEmpty(equipment.getMaintenanceCycle()) ? null : BigDecimal.valueOf(equipment.getMaintenanceCycle()));
 
                  // 导入新增所属单位
 
@@ -685,10 +690,10 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
 
 
                  }
-                 if (StringUtils.isNotBlank(equipmentDetailDownloadVOS.getSystemName())) {
-                     String[] SystemName = equipmentDetailDownloadVOS.getSystemName().split("@");
-                     equipmentSpecific.setSystemId(SystemName[1]);
-                 }
+//                 if (StringUtils.isNotBlank(equipmentDetailDownloadVOS.getSystemName())) {
+//                     String[] SystemName = equipmentDetailDownloadVOS.getSystemName().split("@");
+//                     equipmentSpecific.setSystemId(SystemName[1]);
+//                 }
                  equipmentSpecificMapper.insert(equipmentSpecific);
                  StockServiceImpl controllerProxy = SpringUtils.getBean(StockServiceImpl.class);
                  //添加对于装备类型统计数据的刷新

amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml

@@ -293,4 +293,84 @@
             alter table `wl_equipment_specific_alarm_log` add column `defect_batch_id` varchar(64) DEFAULT NULL COMMENT '缺陷表批次号';
         </sql>
     </changeSet>
+
+
+    <changeSet author="ls" id="202207221028-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <tableExists tableName="wl_form_group_column_equip"/>
+            </not>
+        </preConditions>
+        <comment>create table wl_form_group_column_equip 分组字段表</comment>
+        <sql>
+            CREATE TABLE `wl_form_group_column_equip`  (
+            `id` bigint(20) NOT NULL,
+            `field_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '字段名',
+            `field_label` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '中文名',
+            `data_type` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '数据类型：文本，数字，枚举,日期',
+            `group_id` bigint(20) NOT NULL COMMENT '字段分组主键',
+            `query_strategy` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '查询策略;全等,模糊,区间',
+            `not_null` bit(1) NOT NULL DEFAULT b'0' COMMENT '不能为空',
+            `group_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '所属分组编号',
+            `creator_id` bigint(20) NOT NULL COMMENT '创建者',
+            `create_date` datetime(0) NOT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '创建日期',
+            PRIMARY KEY (`id`) USING BTREE,
+            UNIQUE INDEX `unique_idx_group_code_file_name`(`group_code`, `field_name`) USING BTREE
+            ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '分组字段表' ROW_FORMAT = Dynamic;
+        </sql>
+    </changeSet>
+
+    <changeSet author="ls" id="202207221028-2">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <tableExists tableName="wl_form_group_equip"/>
+            </not>
+        </preConditions>
+        <comment>create table wl_form_group_equip  分组表</comment>
+        <sql>
+            CREATE TABLE `wl_form_group_equip`  (
+            `id` bigint(20) NOT NULL COMMENT '物理主键',
+            `group_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '分组名称',
+            `group_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '分组编号',
+            `group_type` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '0' COMMENT '分组类型（点位图过滤用）',
+            `allow_operation` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '允许的操作（逗号分隔ids）',
+            `creator_id` bigint(20) NOT NULL COMMENT '更新者id',
+            `create_date` datetime(0) NOT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新日期',
+            PRIMARY KEY (`id`) USING BTREE,
+            UNIQUE INDEX `unique_idx_group_code`(`group_code`) USING BTREE
+            ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '分组表' ROW_FORMAT = Dynamic;
+        </sql>
+    </changeSet>
+
+
+    <changeSet author="ls" id="202207221028-3">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <tableExists tableName="wl_form_instance_equip"/>
+            </not>
+        </preConditions>
+        <comment>create table wl_form_instance_equip  实例表</comment>
+        <sql>
+            CREATE TABLE `wl_form_instance_equip`  (
+            `id` bigint(20) NOT NULL,
+            `field_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '字段名',
+            `field_label` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '中文名',
+            `data_type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '数据类型：文本，数字，枚举,日期',
+            `group_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '分组类型(冗余字段便于查询）',
+            `group_id` bigint(20) NOT NULL COMMENT '字段分组id',
+            `field_value` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '动态配置字段的值',
+            `instance_id` bigint(20) NOT NULL COMMENT '设备实例id',
+            `group_column_id` bigint(20) NOT NULL COMMENT '字段定义信息的主键',
+            `query_strategy` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '查询策略;全等,模糊,区间',
+            `group_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '分组编号',
+            `creator_id` bigint(20) NOT NULL COMMENT '创建者',
+            `create_date` datetime(0) NOT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '创建日期',
+            PRIMARY KEY (`id`) USING BTREE,
+            UNIQUE INDEX `u_idx_instance_id`(`instance_id`, `field_name`) USING BTREE,
+            INDEX `idx_group_code`(`group_code`) USING BTREE,
+            INDEX `pk_build_instance_id`(`instance_id`) USING BTREE
+            ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '实例表' ROW_FORMAT = Dynamic;
+
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

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

@@ -4760,7 +4760,7 @@
                         LEFT JOIN wl_equipment_specific_index ei ON es.id = ei.equipment_specific_id
                         LEFT JOIN wl_equipment e ON e.id = ed.equipment_id
                         LEFT JOIN wl_equipment_category ec ON e.category_id = ec.id
-                        LEFT JOIN wl_form_instance fi ON fi.instance_id = es.id
+                        LEFT JOIN wl_form_instance_equip fi ON fi.instance_id = es.id
                 WHERE
                     ed.`code` LIKE '92031900%'
                   AND es.biz_org_code LIKE concat(#{bizOrgCode}, '%')
@@ -4878,14 +4878,14 @@
                          max( CASE WHEN ei.equipment_index_key = 'FHS_PipePressureDetector_PipePressure' THEN DATE_FORMAT( ei.`update_date`, '%m-%d %H:%i:%S' ) END ),
                          '--'
                         ) AS nowPressureDate,
-                    max( CASE WHEN fi.field_name = 'lowLevel' THEN fi.field_value END ) AS minLevel,
-                    max( CASE WHEN fi.field_name = 'highLevel' THEN fi.field_value END ) AS maxLevel
+                    max( CASE WHEN fi.field_name = 'minPressure' THEN fi.field_value END ) AS minLevel,
+                    max( CASE WHEN fi.field_name = 'maxPressure' THEN fi.field_value END ) AS maxLevel
                 FROM
                     wl_equipment_specific es
                         LEFT JOIN wl_equipment_detail ed ON es.equipment_detail_id = ed.id
                         LEFT JOIN wl_warehouse_structure ws ON ws.id = es.warehouse_structure_id
                         LEFT JOIN wl_equipment_specific_index ei ON es.id = ei.equipment_specific_id
-                        LEFT JOIN wl_form_instance fi ON fi.instance_id = es.id
+                        LEFT JOIN wl_form_instance_equip fi ON fi.instance_id = es.id
                 WHERE
                     ed.`code` LIKE '92011000%'
 <!--                  AND es.iot_code IS NOT NULL-->
@@ -4913,7 +4913,7 @@
                 LEFT JOIN wl_equipment_detail ed ON es.equipment_detail_id = ed.id
                 LEFT JOIN wl_warehouse_structure ws ON ws.id = es.warehouse_structure_id
                 LEFT JOIN wl_equipment_specific_index ei ON es.id = ei.equipment_specific_id
-                LEFT JOIN wl_form_instance fi ON fi.instance_id = es.id
+                LEFT JOIN wl_form_instance_equip fi ON fi.instance_id = es.id
         WHERE
             ed.`code` LIKE '92010700%'
           AND es.iot_code IS NOT NULL
@@ -4991,7 +4991,7 @@
                         0,
                         max( CASE WHEN fi.field_name = 'maxLevel' THEN fi.field_value END )) AS maxValues
         FROM
-            wl_form_instance fi
+            wl_form_instance_equip fi
         WHERE
             fi.instance_id = #{equipSpeId}
     </select>
@@ -5011,7 +5011,7 @@
                         0,
                         max( CASE WHEN fi.field_name = 'maxPressure' THEN fi.field_value END )) AS maxValues
         FROM
-            wl_form_instance fi
+            wl_form_instance_equip fi
         WHERE
             fi.instance_id = #{equipSpeId}
     </select>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.equipmanage.mapper.FormGroupColumnEquipMapper">
+
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.equipmanage.mapper.FormGroupEquipMapper">
+
+</mapper>