管控页面匹配字典值返回

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

@@ -6,6 +6,8 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import com.yeejoin.amos.patrol.business.dao.mapper.InputItemMapper;
 import com.yeejoin.amos.patrol.business.dao.repository.IInputItemDao;
 import com.yeejoin.amos.patrol.business.dao.repository.IPointInputItemDao;
@@ -89,6 +91,9 @@ public class InputItemController extends AbstractBaseController {
 
 	private static final String ITEMTYPE = "选择,文本:";
 
+	//管控形式 字典
+	private static final String formOfManagementAndControl= "riskForm";
+
 
 /**
  * 新加接口*****************************************************************************
@@ -150,6 +155,9 @@ public class InputItemController extends AbstractBaseController {
 		for (Map<String, String> map : allCategoryNameList) {
 			resultMap.put(map.get("code"), map.get("name"));
 		}
+		HashMap<String, String> dictMap = new HashMap<>();
+		List<DictionarieValueModel> result = Systemctl.dictionarieClient.dictValues(formOfManagementAndControl).getResult();
+		result.forEach(x-> dictMap.put(x.getDictDataKey(),x.getDictDataValue()));
 		for (InputItemVo inputItemVo : page.getContent()) {
 			String finalTypeName = "";
 			finalTypeName = StringUtils.isNotEmpty(inputItemVo.getCustomType())? "自定义巡检点" : "";
@@ -172,6 +180,8 @@ public class InputItemController extends AbstractBaseController {
 				finalTypeName = facilitiesTypeName;
 			}
 			inputItemVo.setTypeName(finalTypeName);
+			//匹配 管控形式 字典值
+			inputItemVo.setInputClassify(dictMap.getOrDefault(inputItemVo.getInputClassify(),null));
 		}
 			return CommonResponseUtil.success(page);
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/vo/InputItemVo.java

@@ -97,6 +97,11 @@ public class InputItemVo {
 	private String riskDesc;
 
 	/**
+	 *管控形式
+	 */
+	private String inputClassify;
+
+	/**
 	 * 新加字段
 	 *
 	 * */
@@ -334,5 +339,12 @@ public class InputItemVo {
 	public void setRiskDesc(String riskDesc) {
 		this.riskDesc = riskDesc;
 	}
+	public String getInputClassify() {
+		return inputClassify;
+	}
+
+	public void setInputClassify(String inputClassify) {
+		this.inputClassify = inputClassify;
+	}
 
 }

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

@@ -294,6 +294,7 @@
 		a.is_score,
 		b.name as catalog_name,
 		a.remark,
+		a.input_classify,
 		(CASE a.level
 		WHEN 1 THEN
 		'1级'