消防监督更新

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/SupervisionFeign.java

+package com.yeejoin.amos.boot.module.common.api.feign;
+
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+// 消防监督调用
+@FeignClient(name = "${supervision.feign.name}", path = "supervision", configuration = {MultipartSupportConfig.class})
+public interface SupervisionFeign {
+
+    @RequestMapping(value = "/api/point/teamInput", method = RequestMethod.POST, consumes = "application/json")
+    ResponseModel asyncOwner(@RequestBody OrgUsrFormDto orgUsrFormDto);
+
+    @RequestMapping(value = "/api/point/delete", method = RequestMethod.POST, consumes = "application/json")
+    ResponseModel deleteOwner(@RequestBody Long id);
+}
+

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/DictTypeEnum.java

@@ -17,7 +17,11 @@ public enum DictTypeEnum {
     EQUIPTYPE("设备类型","EQUIP_TYPE"),
     DANGERLEVEL("隐患等级", "DANGER_LEVEL"),
     OUTERPOINTTYPE("导入外部安全检查表分类", "OUTER_POINT_TYPE"),
-    MAINTENANCE_CLASSIFY("维保项分类","MAINTENANCE_CLASSIFY");
+    MAINTENANCE_CLASSIFY("维保项分类","MAINTENANCE_CLASSIFY"),
+    CHECK_ITEM_CLASSIFY("消防监督检查项分类","CHECK_ITEM_CLASSIFY"),
+    CHECK_ITEM_TYPE("消防监督检查类别","CHECK_ITEM_TYPE"),
+    CHECK_ITEM_LEVEL("消防监督检查项等级","CHECK_ITEM_LEVEL"),
+    CHECK_ITEM_CONTENT("消防监督检查类型","CHECK_ITEM_CONTENT");
 
     /**
      * 名称，描述

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/InputItem.java

@@ -182,6 +182,90 @@ public class InputItem extends BasicEntity {
     @Column(name = "test_requirement")
     private String testRequirement;
 
+    /**
+     * 检查类型
+     */
+    @Column(name="check_type")
+    private String checkType;
+
+    /**
+     * 父类检查项id
+     */
+    @Column(name="item_parent")
+    private String itemParent;
+
+    /**
+     * 检查项分类
+     */
+    @Column(name="item_classify")
+    private String itemClassify;
+
+    /**
+     * 适用检查类别
+     */
+    @Column(name="item_type_classify")
+    private String itemTypeClassify;
+
+    /**
+     * 检查项等级
+     */
+    @Column(name="item_level")
+    private String itemLevel;
+
+    /**
+     * 检查项启用
+     */
+    @Column(name="item_start")
+    private String itemStart;
+
+    public String getItemStart() {
+        return itemStart;
+    }
+
+    public void setItemStart(String itemStart) {
+        this.itemStart = itemStart;
+    }
+
+    public String getItemParent() {
+        return itemParent;
+    }
+
+    public void setItemParent(String itemParent) {
+        this.itemParent = itemParent;
+    }
+
+    public String getItemClassify() {
+        return itemClassify;
+    }
+
+    public void setItemClassify(String itemClassify) {
+        this.itemClassify = itemClassify;
+    }
+
+    public String getItemTypeClassify() {
+        return itemTypeClassify;
+    }
+
+    public void setItemTypeClassify(String itemTypeClassify) {
+        this.itemTypeClassify = itemTypeClassify;
+    }
+
+    public String getItemLevel() {
+        return itemLevel;
+    }
+
+    public void setItemLevel(String itemLevel) {
+        this.itemLevel = itemLevel;
+    }
+
+    public String getCheckType() {
+        return checkType;
+    }
+
+    public void setCheckType(String checkType) {
+        this.checkType = checkType;
+    }
+
     public void setMaintenanceContent(String maintenanceContent) {
         this.maintenanceContent = maintenanceContent;
     }

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/Point.java

@@ -268,6 +268,34 @@ public class Point extends BasicEntity {
 	private String riskSourceId;
 
 	/**
+	 * 所在建筑名称
+	 */
+	@Column(name="building_name")
+	private String buildingName;
+
+	public String getBuildingName() {
+		return buildingName;
+	}
+
+	public void setBuildingName(String buildingName) {
+		this.buildingName = buildingName;
+	}
+
+	public String getBuildingId() {
+		return buildingId;
+	}
+
+	public void setBuildingId(String buildingId) {
+		this.buildingId = buildingId;
+	}
+
+	/**
+	 * 所在建筑Id
+	 */
+	@Column(name="building_id")
+	private String buildingId;
+
+	/**
 	 * ue4位置
 	 */
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java

@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
+import com.yeejoin.amos.boot.module.common.api.feign.SupervisionFeign;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,6 +35,8 @@ import java.util.Map;
 public class OrgPersonController {
     @Autowired
     OrgUsrServiceImpl iOrgUsrService;
+    @Autowired
+    SupervisionFeign supervisionFeign;
   
 
     /**
@@ -63,6 +66,7 @@ public class OrgPersonController {
         // 删除时，只作逻辑删除
         iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete",
                 CommonConstant.IS_DELETE_01));
+        supervisionFeign.deleteOwner(id);
         return ResponseHelper.buildResponse(null);
     }
 

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

@@ -11,6 +11,7 @@ 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.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
+import com.yeejoin.amos.boot.module.common.api.feign.SupervisionFeign;
 import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
 import com.yeejoin.amos.feign.privilege.Privilege;
@@ -50,7 +51,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	DynamicFormColumnServiceImpl alertFormServiceImpl;
 	@Resource
 	OrgUsrMapper orgUsrMapper;
-
+	@Autowired
+	SupervisionFeign supervisionFeign;
 	@Autowired
 	ESOrgUsrService eSOrgUsrService;
 	@Override
@@ -399,7 +401,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	@Override
-	public void saveOrgUsrDynamicFormInstance(OrgUsr orgUsr, List<DynamicFormInstance> alertFromValuelist) {
+	public void saveOrgUsrDynamicFormInstance(OrgUsr orgUsr, List<DynamicFormInstance> alertFromValuelist) throws Exception {
 		orgUsr.setRecDate(new Date());
 		AgencyUserModel user = Privilege.agencyUserClient.getme().getResult();
 		orgUsr.setRecUserName(user.getRealName());
@@ -417,6 +419,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		});
 		// 保存动态表单数据
 		alertFormValueServiceImpl.saveBatch(alertFromValuelist);
+		OrgUsrFormDto formDto = this.selectCompanyById(orgUsr.getSequenceNbr());
+		if (OrgPersonEnum.公司.getKey().equals(orgUsr.getBizOrgType())) {
+			supervisionFeign.asyncOwner(formDto);
+		}
 	}
 
 	@Override

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/InputItemController.java

@@ -402,4 +402,18 @@ public class InputItemController extends AbstractBaseController {
         List<InputItemTemplateVo> itemTemplateVoList = ExcelUtils.importExcel(file, 1, 1, InputItemTemplateVo.class);
         return CommonResponseUtil.success(inputItemService.uploadListByTemplate(itemTemplateVoList, orgCode, userId));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "获取字典值", notes = "获取字典值")
+    @GetMapping(value = "/diction")
+    public CommonResponse getCheckItemClassify() {
+        return CommonResponseUtil.success(inputItemService.generateDictionaryValue());
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "获取上一级", notes = "获取上一级")
+    @GetMapping(value = "/parent/item")
+    public CommonResponse getItemParent(@ApiParam(value = "检查项id") @RequestParam(required = false) String id) {
+        return CommonResponseUtil.success(inputItemService.getItemParent(id));
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/PointController.java

@@ -11,6 +11,7 @@ import java.util.Set;
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.yeejoin.amos.supervision.business.dto.OrgUsrFormDto;
 import com.yeejoin.amos.supervision.business.vo.MaintenanceResourceData;
 import com.yeejoin.amos.supervision.business.vo.PointClassifyVo;
 import com.yeejoin.amos.supervision.business.vo.PointInputItemVo;
@@ -216,7 +217,7 @@ public class PointController extends AbstractBaseController {
     /**
      * 查询巡检点信息
      *
-     * @param point
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -270,7 +271,7 @@ public class PointController extends AbstractBaseController {
     /**
      * 查询巡检点信息
      *
-     * @param point
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -499,7 +500,7 @@ public class PointController extends AbstractBaseController {
     /**
      * 查询巡检点的巡检项
      *
-     * @param id
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -518,7 +519,7 @@ public class PointController extends AbstractBaseController {
     /**
      * 查询巡检点的巡检项
      *
-     * @param id
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -537,7 +538,7 @@ public class PointController extends AbstractBaseController {
     /**
      * 查询巡检点的分类
      *
-     * @param id
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -556,7 +557,7 @@ public class PointController extends AbstractBaseController {
     /**
      * 根据分类id查询对应项
      *
-     * @param id
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -576,7 +577,7 @@ public class PointController extends AbstractBaseController {
     /**
      * 根据点id查询点的分类及对应项
      *
-     * @param id
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -672,7 +673,7 @@ public class PointController extends AbstractBaseController {
     /**
      * 查询巡检点信息
      *
-     * @param point
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -808,15 +809,34 @@ public class PointController extends AbstractBaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "装备维保项", notes = "装备维保项")
-    @RequestMapping(value = "/equipmentInput", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
+    @ApiOperation(value = "机场单位同步", notes = "机场单位同步")
+    @RequestMapping(value = "/teamInput", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse syncSavePoint(
-            @ApiParam(value = "同步请求参数") @RequestBody() List<MaintenanceResourceData> list) {
+            @ApiParam(value = "同步请求参数") @RequestBody OrgUsrFormDto orgUsrFormDto) {
         ReginParams reginParams = getSelectedOrgInfo();
         AgencyUserModel model = getUserInfo();
         String orgCode = getOrgCode(reginParams);
-        iPointService.syncSavePoint(list, orgCode, model.getUserId());
+        iPointService.syncSavePoint(orgUsrFormDto, orgCode, model.getUserId());
         return CommonResponseUtil.success();
     }
 
+    /**
+     * 删除巡检点
+     *
+     * @param id
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "同步删除机场单位", notes = "同步删除机场单位")
+    @PostMapping(value = "/delete", produces = "application/json;charset=UTF-8")
+    public CommonResponse deleteOwner(@ApiParam(value = "巡检点ID", required = true) @RequestBody Long id) {
+        try {
+            iPointService.delPointByPointNo(id);
+            return CommonResponseUtil.success();
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return CommonResponseUtil.failure("删除检查点失败");
+        }
+    }
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/InputItemMapper.java

@@ -32,4 +32,6 @@ public interface InputItemMapper {
     List<PointInputItemVo> queryCustomInputItemByPointId(@Param("pointId") Long pointId, @Param("equipmentId") String equipmentName);
 
     Integer insertList(List<InputItem> list);
+
+    List<InputItemVo> getInputItemParent(@Param("id") String id);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/IPointDao.java

@@ -36,4 +36,12 @@ public interface IPointDao extends BaseDao<Point, Long> {
     void delPointBIds(Long id);
 
     List<Point> findAllByOriginalId(String relationId);
+
+    @Modifying
+    @Transactional
+    @Query(value = "UPDATE p_point SET is_delete = 1 WHERE point_no IN (?1)", nativeQuery = true)
+    void delPointByPointNo(Long id);
+
+    @Query(value = "SELECT id FROM p_point p WHERE is_delete = 0 AND p.point_no = (?1)", nativeQuery = true)
+    List<Long> findPointByPointNo(String pointNo);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dto/FormValue.java

+package com.yeejoin.amos.supervision.business.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * @return
+ * <PRE>
+ * author tw
+ * date 2021/6/21
+ * </PRE>
+ * 动态表单值
+ */
+@Data
+@ApiModel(value="FormValue", description="动态表单值")
+public class FormValue implements Serializable{
+
+	private static final long serialVersionUID = 1L;
+	@ApiModelProperty(value = "key")
+    private String  key;
+    @ApiModelProperty(value = "label")
+    private String label;
+    @ApiModelProperty(value = "type")
+    private String type;
+    @ApiModelProperty(value = "value")
+    private String value;
+    @ApiModelProperty(value = "是否一行显示")
+    private boolean block;
+  
+    public FormValue() {
+    }
+
+	public FormValue(String key, String label, String type, String value, boolean block) {
+		super();
+		this.key = key;
+		this.label = label;
+		this.type = type;
+		this.value = value;
+		this.block = block;
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dto/OrgPersonFormDto.java

+package com.yeejoin.amos.supervision.business.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+* 机构/部门/人员表
+*
+* @author tb
+* @date 2021-06-18
+*/
+@Data
+@Accessors(chain = true)
+@TableName("cb_org_usr")
+@ApiModel(value="OrgUsrVo", description="人员信息")
+public class OrgPersonFormDto extends BaseEntity{
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "机构/部门id")
+    private Long id;
+    @ApiModelProperty(value = "机构/部门名称")
+    private String bizOrgName;
+
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
+
+    @ApiModelProperty(value = "amos中公司/部门ID")
+    private String amosOrgId;
+
+    @ApiModelProperty(value = "amos中公司/部门编码")
+    private String amosOrgCode;
+
+    @ApiModelProperty(value = "机构类型`")
+    private String bizOrgType;
+
+    @ApiModelProperty(value = "所属建筑名称")
+    private String buildName;
+
+    @ApiModelProperty(value = "所属建筑ID")
+    private String buildId;
+
+    @ApiModelProperty(value = "归属机构/部门/人员")
+    private String parentId;
+    @ApiModelProperty(value = "归属机构/部门/人员")
+    private String parentName;
+
+    @ApiModelProperty(value = "动态表单值")
+    private List<FormValue> dynamicFormAlert;
+
+    public OrgPersonFormDto() {
+    }
+
+    public OrgPersonFormDto(List<FormValue> dynamicFormAlert) {
+        this.dynamicFormAlert = dynamicFormAlert;
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dto/OrgUsrFormDto.java

+package com.yeejoin.amos.supervision.business.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+* 机构/部门/人员表
+*
+* @author tb
+* @date 2021-06-18
+*/
+@Data
+@Accessors(chain = true)
+@TableName("cb_org_usr")
+@ApiModel(value="OrgUsrVo", description="机构/部门/人员表")
+public class OrgUsrFormDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位id")
+    private Long id;
+    @ApiModelProperty(value = "单位id")
+    protected Long sequenceNbr;
+
+    @ApiModelProperty(value = "单位名称")
+    private String currentUnit;
+
+    @ApiModelProperty(value = "归属机构/部门")
+    private String parentId;
+    
+    @ApiModelProperty(value = "机构/部门名称")
+    private String bizOrgName;
+
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
+
+    @ApiModelProperty(value = "amos中公司/部门ID")
+    private String amosOrgId;
+
+    @ApiModelProperty(value = "amos中公司/部门编码")
+    private String amosOrgCode;
+
+    @ApiModelProperty(value = "机构类型`")
+    private String bizOrgType;
+
+    @ApiModelProperty(value = "所属建筑名称")
+    private String buildName;
+
+    @ApiModelProperty(value = "所属建筑ID")
+    private String buildId;
+
+    private Integer personNum;
+
+    @ApiModelProperty(value = "动态表单值")
+    private List<FormValue> dynamicFormAlert;
+
+    @ApiModelProperty(value = "单位人员信息值")
+    private List<OrgPersonFormDto> children;
+
+    public List<FormValue> getDynamicFormAlert() {
+		return dynamicFormAlert;
+	}
+
+    @ApiModelProperty(value = "转换动态表单")
+    private Map<String,Object> map=new HashMap<>();;
+
+	public void setDynamicFormAlert(List<FormValue> dynamicFormAlert) {
+		  if(dynamicFormAlert!=null) {
+			  dynamicFormAlert.forEach(formValue->{
+					this.map.put(formValue.getKey(), formValue.getValue());
+				});
+		  }
+		  this.dynamicFormAlert=dynamicFormAlert;
+	}
+
+	public OrgUsrFormDto() {
+    }
+}

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

@@ -10,9 +10,11 @@ import com.yeejoin.amos.supervision.business.param.InputItemPageParam;
 import com.yeejoin.amos.supervision.business.service.intfc.ICatalogTreeService;
 import com.yeejoin.amos.supervision.business.service.intfc.IInputItemService;
 import com.yeejoin.amos.supervision.business.util.DaoCriteria;
+import com.yeejoin.amos.supervision.business.util.StringUtil;
 import com.yeejoin.amos.supervision.business.vo.InputItemTemplateVo;
 import com.yeejoin.amos.supervision.business.vo.InputItemVo;
 import com.yeejoin.amos.supervision.business.vo.PointInputItemVo;
+import com.yeejoin.amos.supervision.common.enums.DictTypeEnum;
 import com.yeejoin.amos.supervision.core.util.query.BaseQuerySpecification;
 import com.yeejoin.amos.supervision.dao.entity.InputItem;
 import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
@@ -25,6 +27,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 
 import java.util.*;
 
@@ -93,6 +96,46 @@ public class InputItemServiceImpl implements IInputItemService {
     }
 
     @Override
+    public List<Map<String, Object>> generateDictionaryValue() {
+        List<Map<String, Object>> list = new ArrayList<>();
+        for (Map<String, String> map : DictTypeEnum.getEnumList()) {
+            JSONArray jsonArray = remoteSecurityService.listDictionaryByDictCode(RequestContext.getToken(),
+                    RequestContext.getProduct(), RequestContext.getAppKey(), map.get("code"));
+            Map<String, Object> map1 = new HashMap<>();
+            List lists = new LinkedList();
+            for (int i = 0, size = jsonArray.size(); i < size; i++) {
+                Map<String, String> m = new HashMap<>();
+                JSONObject jsonObject = jsonArray.getJSONObject(i);
+                m.put("id", jsonObject.get("dictDataKey").toString());
+                m.put("name", jsonObject.get("dictDataValue").toString());
+                lists.add(m);
+            }
+            if ("itemClassify".equals(map.get("code"))) {
+                map1.put("CHECK_ITEM_CLASSIFY", lists);
+                list.add(map1);
+            }
+            if ("itemType".equals(map.get("code"))) {
+                map1.put("CHECK_ITEM_TYPE", lists);
+                list.add(map1);
+            }
+            if ("itemLevel".equals(map.get("code"))) {
+                map1.put("CHECK_ITEM_LEVEL", lists);
+                list.add(map1);
+            }
+            if ("checkType".equals(map.get("code"))) {
+                map1.put("CHECK_ITEM_CONTENT", lists);
+                list.add(map1);
+            }
+        }
+        return list;
+    }
+
+    @Override
+    public List getItemParent(String id) {
+        return inputItemMapper.getInputItemParent(id);
+    }
+
+    @Override
     public List<InputItem> queryInputItemByCondition(List<DaoCriteria> criterias) {
         BaseQuerySpecification<InputItem> specification = new BaseQuerySpecification<>(criterias);
         return inputItemDao.findAll(specification);

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

 package com.yeejoin.amos.supervision.business.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
@@ -20,6 +21,8 @@ import com.yeejoin.amos.supervision.business.dao.repository.IPointInputItemDao;
 import com.yeejoin.amos.supervision.business.dao.repository.IPointPhotoDao;
 import com.yeejoin.amos.supervision.business.dao.repository.IRoutePointDao;
 import com.yeejoin.amos.supervision.business.dao.repository.IRoutePointItemDao;
+import com.yeejoin.amos.supervision.business.dto.FormValue;
+import com.yeejoin.amos.supervision.business.dto.OrgUsrFormDto;
 import com.yeejoin.amos.supervision.business.dto.PointDto;
 import com.yeejoin.amos.supervision.business.entity.mybatis.CheckPtListBo;
 import com.yeejoin.amos.supervision.business.feign.EquipFeign;
@@ -1118,45 +1121,53 @@ public class PointServiceImpl implements IPointService {
     }
 
     @Override
-    public void syncSavePoint(List<MaintenanceResourceData> list, String orgCode, String userId) {
+    public void syncSavePoint(OrgUsrFormDto orgUsrFormDto, String orgCode, String userId) {
         List<Point> points = new ArrayList<>();
         List<PointInputItem> inputItems = new ArrayList<>();
         List<Long> ids = new ArrayList<Long>();
-        for (MaintenanceResourceData x : list) {
-            Point point = new Point();
-            String pointNo = StringUtil.isNotEmpty(x.getFireFacilityCode()) ? x.getFireFacilityCode() : String.valueOf(sequence.nextId());
-            String originalId = String.valueOf(x.getFireFacilityId());
-            point.setOriginalId(originalId);
-            point.setName(x.getFireFacilityName());
-            point.setPointNo(pointNo);
-            point.setEquipmentId(x.getClassifyId() == null ? "" : x.getClassifyId().toString());
-            point.setEquipmentName(x.getClassifyName());
-            point.setBelongSystemId(x.getFireFightSysId() == null ? "" : x.getFireFightSysId().toString());
-            point.setBelongSystemName(x.getFireFightSysName());
-            point.setOwnerId(String.valueOf(x.getOwnerUnitId()));
-            point.setOwnerName(x.getOwnerUnitName());
-            point.setAddress(x.getLocation());
-            point.setLevel("");
-            point.setCreatorId(userId);
-            point.setOrgCode(orgCode);
-            points.add(point);
-            Long id = iPointDao.findPointByEquipmentIdAndFireFacilityId(pointNo, originalId);
-            if (null != id) {
-                ids.add(id);
-                iPointDao.delPointBIds(id);
-            }
-            iPointDao.save(point);
-            List<InputItem> inputItemVos = inputItemMapper.getInputItemByEquipmentName(x.getClassifyName(), orgCode);
-            if (0 < inputItemVos.size()) {
-                inputItemVos.forEach(y -> {
-                    PointInputItem inputItem = new PointInputItem();
-                    inputItem.setPointId(point.getId());
-                    inputItem.setOrderNo(y.getOrderNo());
-                    inputItem.setInputItemId(y.getId());
-                    inputItems.add(inputItem);
-                });
+        Point point = new Point();
+        String pointNo = StringUtil.isNotEmpty(orgUsrFormDto.getSequenceNbr()) ? String.valueOf(orgUsrFormDto.getSequenceNbr()) : String.valueOf(sequence.nextId());
+        point.setName(orgUsrFormDto.getBizOrgName());
+        point.setPointNo(pointNo);
+        point.setOrgCode(orgUsrFormDto.getBizOrgCode());
+        point.setBuildingId(orgUsrFormDto.getBuildId());
+        point.setBuildingName(orgUsrFormDto.getBuildName());
+        point.setOriginalId(orgUsrFormDto.getParentId());
+        String data = JSON.toJSONString(orgUsrFormDto.getMap());
+        point.setExtendJson(data);
+        point.setOwnerId(pointNo);
+        point.setOwnerName(orgUsrFormDto.getBizOrgName());
+        if (0 < orgUsrFormDto.getDynamicFormAlert().size()) {
+            for (FormValue formValue : orgUsrFormDto.getDynamicFormAlert()) {
+                if ("longitude".equals(formValue.getKey())) {
+                    point.setLongitude(formValue.getValue());
+                }
+                if ("latitude".equals(formValue.getKey())) {
+                    point.setLatitude(formValue.getValue());
+                }
+                if ("companyLocation".equals(formValue.getKey())) {
+                    point.setAddress(formValue.getValue());
+                }
             }
         }
+        point.setOrgCode(orgUsrFormDto.getAmosOrgCode());
+        points.add(point);
+        Long id = iPointDao.findPointByEquipmentIdAndFireFacilityId(pointNo, point.getOriginalId());
+        if (null != id) {
+            ids.add(id);
+            iPointDao.delPointBIds(id);
+        }
+        iPointDao.save(point);
+        List<InputItem> inputItemVos = inputItemMapper.getInputItemByEquipmentName(point.getName(), orgCode);
+        if (0 < inputItemVos.size()) {
+            inputItemVos.forEach(y -> {
+                PointInputItem inputItem = new PointInputItem();
+                inputItem.setPointId(point.getId());
+                inputItem.setOrderNo(y.getOrderNo());
+                inputItem.setInputItemId(y.getId());
+                inputItems.add(inputItem);
+            });
+        }
         if (0 < ids.size()) {
             iPointInputItemDao.deleteByPointId(ids);
         }
@@ -1183,4 +1194,12 @@ public class PointServiceImpl implements IPointService {
         Pageable pageable = new CommonPageable(pointPage.getNumber(), pointPage.getSize(), pointPage.getSort());
         return new PageImpl<>(pointDtos, pageable, pointPage.getTotalElements());
     }
+
+    @Override
+    public void delPointByPointNo(Long id) {
+        List<Long> idLists = new ArrayList<>();
+        idLists = iPointDao.findPointByPointNo(String.valueOf(id));
+        iPointInputItemDao.deleteByPointId(idLists);
+        iPointDao.delPointByPointNo(id);
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/IInputItemService.java

@@ -112,4 +112,8 @@ public interface IInputItemService {
     Boolean uploadListByTemplate(List<InputItemTemplateVo> itemTemplateVoList, String orgCode, String userId) throws Exception;
 
     Integer insertList(List<InputItem> list);
+
+    List generateDictionaryValue();
+
+    List getItemParent(String id);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/IPointService.java

 package com.yeejoin.amos.supervision.business.service.intfc;
 
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.supervision.business.dto.OrgUsrFormDto;
 import com.yeejoin.amos.supervision.business.dto.PointDto;
 import com.yeejoin.amos.supervision.business.param.*;
 import com.yeejoin.amos.supervision.business.param.CheckPtListPageParam;
@@ -309,7 +310,7 @@ public interface IPointService {
 
     LinkedHashMap<String,Object> getRegionTress ();
 
-    void syncSavePoint(List<MaintenanceResourceData> list, String orgCode, String userId);
+    void syncSavePoint(OrgUsrFormDto orgUsrFormDto, String orgCode, String userId);
     /**
      * 查询巡检点及点及点的项
      * @param queryRequests 请求参数
@@ -319,4 +320,11 @@ public interface IPointService {
      */
     Page<PointDto> queryPointInfoWithItem(List<DaoCriteria> queryRequests, CommonPageable commonPageable, Long ownerId);
 
+    /**
+     * 删除巡检点
+     *
+     * @param ids
+     */
+    void delPointByPointNo(Long id);
+
 }

amos-boot-system-supervision/src/main/resources/db/changelog/mt-1.0.0.xml

@@ -16,4 +16,76 @@
              ALTER TABLE p_point ADD COLUMN `last_check_id` varchar(32) DEFAULT NULL COMMENT '最近检查记录（漏检不算）' AFTER `original_id`;
         </sql>
     </changeSet>
+
+    <changeSet author="keyong" id="1629261435-1" runOnChange="true">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_input_item" columnName="check_type"/>
+            </not>
+        </preConditions>
+        <comment>p_input_item ADD COLUMN check_type</comment>
+        <sql>
+            ALTER TABLE p_input_item ADD COLUMN `check_type` varchar(32) DEFAULT NULL COMMENT '检查类别' AFTER `test_requirement`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629261435-2" runOnChange="true">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_input_item" columnName="item_parent"/>
+            </not>
+        </preConditions>
+        <comment>p_input_item ADD COLUMN item_parent</comment>
+        <sql>
+            ALTER TABLE p_input_item ADD COLUMN `item_parent` varchar(50) DEFAULT NULL COMMENT '父类检查项id' AFTER `check_type`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629261435-3" runOnChange="true">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_input_item" columnName="item_classify"/>
+            </not>
+        </preConditions>
+        <comment>p_input_item ADD COLUMN item_classify</comment>
+        <sql>
+            ALTER TABLE p_input_item ADD COLUMN `item_classify` varchar(50) DEFAULT NULL COMMENT '检查项分类' AFTER `item_parent`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629261435-4" runOnChange="true">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_input_item" columnName="item_type_classify"/>
+            </not>
+        </preConditions>
+        <comment>p_input_item ADD COLUMN item_type_classify</comment>
+        <sql>
+            ALTER TABLE p_input_item ADD COLUMN `item_type_classify` varchar(50) DEFAULT NULL COMMENT '适用检查类别' AFTER `item_classify`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629261435-5" runOnChange="true">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_input_item" columnName="item_level"/>
+            </not>
+        </preConditions>
+        <comment>p_input_item ADD COLUMN item_level</comment>
+        <sql>
+            ALTER TABLE p_input_item ADD COLUMN `item_level` varchar(50) DEFAULT NULL COMMENT '检查项等级' AFTER `item_type_classify`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629261435-6" runOnChange="true">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_input_item" columnName="item_start"/>
+            </not>
+        </preConditions>
+        <comment>p_input_item ADD COLUMN item_start</comment>
+        <sql>
+            ALTER TABLE p_input_item ADD COLUMN `item_start` bit(1) DEFAULT b'0' COMMENT '检查项状态' AFTER `item_level`;
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_input_item.xml

@@ -94,7 +94,8 @@
 		a.test_requirement,
 		a.check_method,
 		a.create_date,
-		a.input_classify
+		a.input_classify,
+		a.check_type
 		from
 		p_input_item a left join p_catalog_tree b on a.catalog_id = b.id
 		where a.is_delete = '0'
@@ -226,9 +227,9 @@
         from
         p_input_item pii
         where is_delete = '0' and input_type = 1 and equipment_name=#{equipmentName}
-        <if test="orgCode!=null and orgCode !=''">
-            and org_Code = #{orgCode}
-        </if>
+<!--        <if test="orgCode!=null and orgCode !=''">-->
+<!--            and org_Code = #{orgCode}-->
+<!--        </if>-->
     </select>
     <insert id="insertList" parameterType="java.util.List">
         INSERT INTO p_input_item (
@@ -260,4 +261,18 @@
             )
         </foreach>
     </insert>
+
+	<select id="getInputItemParent" resultType="com.yeejoin.amos.supervision.business.vo.InputItemVo">
+		SELECT
+			pii.id AS id,
+			pii.name AS name
+		FROM
+			p_input_item pii
+		WHERE
+		1=1
+		<if test="id !=null and id !=''">
+			AND pii.id != #{id}
+		</if>
+		ORDER BY create_date DESC;
+	</select>
 </mapper>
\ No newline at end of file