提交

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/base/domain/controller/StDomainController.java

@@ -26,7 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
- 
+import java.util.function.Function;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
@@ -399,6 +399,40 @@ public class StDomainController extends JeecgController<StDomain, IStDomainServi
 		 return Result.OK(stDomain);
 	 }
 
+	 @GetMapping(value = "/queryByCode")
+	 public Result<List<String>> queryByCode(@RequestParam(name="code",required=true) String code) {
+
+		 List<String> codeList = new ArrayList<>();
+		 for (int i = 0; i < code.length(); i += 2) {
+			 if (i + 2 <= code.length()) {
+				 codeList.add(code.substring(0, i + 2));
+			 }
+		 }
+
+		 QueryWrapper<StDomain> queryWrapper = new QueryWrapper<>();
+		 queryWrapper.in("domain_code", codeList);
+		 List<StDomain> stDomainList = stDomainService.list(queryWrapper);
+
+		 if(stDomainList.isEmpty()) {
+			 return Result.error("未找到对应数据");
+		 }
+
+		 List<String> domainNameList = new ArrayList<>();
+		 Map<String, StDomain> domainMap = stDomainList.stream()
+				 .collect(Collectors.toMap(StDomain::getDomainCode, Function.identity()));
+
+		 for (String codeItem : codeList) {
+			 StDomain domain = domainMap.get(codeItem);
+			 if (domain != null) {
+				 domainNameList.add(domain.getDomainName());
+			 } else {
+				 domainNameList.add(null); // 或者添加空字符串，根据需求决定
+			 }
+		 }
+
+		 return Result.OK(domainNameList);
+	 }
+
 	 /**
 	  * 导出excel
 	  *

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/metric/controller/MetricReportApprovalController.java

@@ -27,9 +27,12 @@ public class MetricReportApprovalController extends JeecgController<MetricReport
 
 	private final Executor asyncExecutor = Executors.newFixedThreadPool(10);
 	@GetMapping(value = "/list")
-	public Result<List<Map<String,Object>>> queryMetricReportData(MetricQueryCond metricQueryCond, HttpServletRequest req) {
+	public Result<List<Map<String,Object>>> queryMetricReportData(
+			MetricQueryCond metricQueryCond,
+//			@RequestParam(name="pageNum", defaultValue="1") Integer pageNum,
+//			@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+			HttpServletRequest req) {
 		try {
-
 			List<Map<String,Object>> list = metricReportService.queryMetricReportData(metricQueryCond);
 			return Result.OK(list);
 		} catch (Exception e) {

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/metric/entity/MetricMonitorSet.java

@@ -82,7 +82,6 @@ public class MetricMonitorSet implements Serializable {
      * 是否统计 1：统计 2：不统计
      */
     @Excel(name = "指标分类", width = 15)
-
     @Dict(dicCode="metrictype")
     private java.lang.Integer mtrcTp;
 
@@ -91,7 +90,6 @@ public class MetricMonitorSet implements Serializable {
      * 2:计算指标（组合指标）
      */
     @Excel(name = "指标分类2", width = 15)
-
     @Dict(dicCode="mtrcctp")
     private java.lang.Integer mtrcCtp;
 

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/metric/service/impl/MetricStatReportServiceImpl.java

@@ -224,7 +224,7 @@ public class MetricStatReportServiceImpl extends ServiceImpl<MetricStatReportMap
         sb.append("有").append(numMap.get("low")).append("项指标监测结果良好，属于正常状态（绿区）;");
         sb.append(numMap.get("middle")).append("项指标处于预警状态（黄区）;");
         sb.append(numMap.get("hight")).append("项指标处于干预状态（红区）;");
-        sb.append("其它区域指标").append(numMap.get("other")).append("项。");
+        //sb.append("其它区域指标").append(numMap.get("other")).append("项。");
         sb.append("处于正常状态指标占比").append(percentMap.get("low")).append("%");
         return sb.toString();
     }

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/resources/mapping/metric/MetricReportMapper.xml

@@ -49,7 +49,7 @@
         END AS appSta
         FROM metric_monitor_set A
         INNER JOIN metric_report B ON A.mtrc_no = B.mtrc_no
-        INNER JOIN st_domain C ON A.domain_no LIKE CONCAT(C.domain_code, '%') AND C.level = 2
+        LEFT JOIN st_domain C ON A.domain_no LIKE CONCAT(C.domain_code, '%') AND C.level = 2
         <where>
         <if test="query.startTime != null and query.endTime != null">
             AND B.fill_time BETWEEN #{query.startTime} AND #{query.endTime}
@@ -86,7 +86,6 @@
         <if test="query.mtrcName != null ">
             AND A.mtrc_name like  CONCAT('%',#{query.mtrcName}, '%')
         </if>
-
         </where>
         ORDER BY B.fill_time DESC,B.app_sta
     </select>