添加风险二级区域值

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/View3dController.java

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 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;
 
@@ -225,6 +226,20 @@ public class View3dController extends BaseController {
 	}
 	
 	 /**
+     * 二级区域风险等级，风险值
+     *
+     * @return
+     */
+    @Permission
+    @ApiOperation(httpMethod = "GET", value = "二级区域风险等级，风险值", notes = "二级区域风险等级，风险值")
+    @RequestMapping(value = "/secondLevelRiskSource", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+    public CommonResponse queryRiskSourceSecondLevel() {
+    	ReginParams reginParams = getSelectedOrgInfo();
+		String compCode = getOrgCode(reginParams);
+        return CommonResponseUtil.success(riskSourceService.queryRiskSourceSecondLevel(compCode));
+    }
+
+	/**
      * <pre>
      * 初始化三维视图节点
      * </pre>

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/View3dServiceImpl.java

@@ -28,6 +28,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -56,6 +58,7 @@ import com.yeejoin.amos.fas.business.service.intfc.IDataRefreshService;
 import com.yeejoin.amos.fas.business.service.intfc.IView3dService;
 import com.yeejoin.amos.fas.business.vo.ErrorContentVo;
 import com.yeejoin.amos.fas.business.vo.ExceptionRegionVo;
+import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.business.vo.SafetyIndexDetailVo;
 import com.yeejoin.amos.fas.business.vo.TodaySafetyIndexVo;
 import com.yeejoin.amos.fas.business.vo.View3dNodeVo;
@@ -67,6 +70,7 @@ import com.yeejoin.amos.fas.common.enums.RiskSourceLevelEum;
 import com.yeejoin.amos.fas.common.enums.RiskSourceRegionEum;
 import com.yeejoin.amos.fas.common.enums.RpnChangeTypeEum;
 import com.yeejoin.amos.fas.common.enums.StatisticsErrorTypeEum;
+import com.yeejoin.amos.fas.config.Permission;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.request.DateUtil;
 import com.yeejoin.amos.fas.core.common.response.CoordDTO;
@@ -85,6 +89,8 @@ import com.yeejoin.amos.fas.dao.entity.SafetyIndexChangeLog;
 import com.yeejoin.amos.fas.dao.entity.WaterResource;
 import com.yeejoin.amos.fas.exception.YeeException;
 
+import io.swagger.annotations.ApiOperation;
+
 /**
  * @author DELL
  */
@@ -344,6 +350,8 @@ public class View3dServiceImpl implements IView3dService {
         return vo;
     }
     
+   
+
     @Override
     public List<SafetyIndexDetailVo> getSafetyIndexDetail(String type,String orgCode) {
         List<SafetyIndexDetailVo> resultList = Lists.newArrayList();

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_risk_source.xml

@@ -622,9 +622,12 @@
 		SELECT
 			rs.id,
 			rs.`code`,
-			rs.`name`
+			rs.`name`,
+			rl.`level`,
+			rs.rpn
 		FROM
 			`f_risk_source` rs
+		LEFT JOIN f_risk_level rl ON rl.id = rs.risk_level_id 
 		WHERE
 			rs.parent_id = (
 				SELECT