綜合展示

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjGljbxxGlmdController.java

@@ -7,6 +7,7 @@ import com.elephant.framework.galaxy.aroad.module.zhtj.service.ZhtjGljbxxGlmdSer
 import com.elephant.framework.galaxy.aroad.response.R;
 import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
 import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
 

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjGljsdjqkController.java

@@ -96,4 +96,11 @@ public class ZhtjGljsdjqkController extends BaseController  {
     type = "总计";
     return  new R<>(zhtjGljsdjqkService.getZhtjGljsdjqkztqkEchartData(year,type));
   }
+  /**
+   *  获取全省公路技术等级、行政等级
+   */
+  @GetMapping("/qsgljsxz")
+  public R getQsgljsxz(){
+    return new R<>(zhtjGljsdjqkService.getQsgljsxz());
+  }
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjGljsdjqkService.java

@@ -29,4 +29,6 @@ public interface ZhtjGljsdjqkService extends IService<ZhtjGljsdjqk> {
      * @return
      */
     IPage<List<ZhtjGljsdjqk>> getZhtjGljsdjqkNcglListByTypes(Page page,String types);
+    // 获取全省公路技术等级、行政等级
+    Map<String,Object> getQsgljsxz();
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjGljsdjqkServiceImpl.java

@@ -14,10 +14,7 @@ import com.elephant.framework.galaxy.aroad.module.zhtj.service.ZhtjGljsdjqkServi
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 综合统计_公路技术等级情况
@@ -102,4 +99,39 @@ public class ZhtjGljsdjqkServiceImpl extends ServiceImpl<ZhtjGljsdjqkMapper, Zht
         IPage ipage = zgtjgljsdjqkMapper.selectPage(page,Wrappers.<ZhtjGljsdjqk>query().lambda().inSql(ZhtjGljsdjqk::getType,types));
         return ipage;
     }
+
+    @Override
+    public Map<String, Object> getQsgljsxz() {
+        Map<String,Object> resultMap = new HashMap<>();
+        // 获取全省公路技术等级划分
+        ZhtjGljsdjqk zhtjGljszkpd = super.getOne(Wrappers.<ZhtjGljsdjqk>query().lambda().eq(ZhtjGljsdjqk::getArea,"合计").eq(ZhtjGljsdjqk::getType,"省道"));
+        // 获取全省行政等级划分
+        List<ZhtjGljsdjqk> zhtjGljszkpdList = super.list(Wrappers.<ZhtjGljsdjqk>query().lambda().eq(ZhtjGljsdjqk::getArea,"合计").in(ZhtjGljsdjqk::getType,"国道","省道","县道","乡道","村道","专用公路","总计"));
+        // 存储行政等级处理结果
+        List<Map<String,Object>> withinList = new ArrayList<>();
+        List<Map<String,Object>> abroadData = new ArrayList<>();
+        for(ZhtjGljsdjqk zhtjGljszkpd1 : zhtjGljszkpdList){
+            Map<String,Object> xzMap = new HashMap<>();
+            if(!"总计".equals(zhtjGljszkpd1.getType())){
+                xzMap.put("name",zhtjGljszkpd1.getType());
+                xzMap.put("value",zhtjGljszkpd1.getTotal());
+                abroadData.add(xzMap);
+            }else{
+                withinList.add(new HashMap<String,Object>(){{
+                    put("name","等级公路");
+                    put("value",zhtjGljszkpd1.getTotal());
+                }});
+                withinList.add(new HashMap<String,Object>(){{
+                    put("name","其他");
+                    put("value",zhtjGljszkpd1.getOtherRoad());
+                }});
+            }
+        }
+        resultMap.put("gljsdjhf",zhtjGljszkpd);
+        resultMap.put("glxzdjhf",new HashMap<String,Object>(){{
+            put("withinList",withinList);
+            put("abroadData",abroadData);
+        }});
+        return resultMap;
+    }
 }

src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/aroad?useUnicode=true&characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://192.168.6.198:3306/aroad?useUnicode=true&characterEncoding=utf-8&useSSL=false
     username: root
     password: root
   cache: