后勤资源 接口修改

project-zcustom/src/main/java/com/project/zcustom/service/logistics/impl/LargePlatAssetServiceImpl.java

@@ -165,54 +165,31 @@ public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
     }
 
     public Map<String, Object> getSceneRate(int flag){
-        Map<String, Object> map = new HashMap<>();
         List<LargeLogistics> list;
+        List<String> list1 = new ArrayList<>();
+        List<BigDecimal> list2 = new ArrayList<>();
         if (flag == 0){
-            List<String> appOrg = new ArrayList<>(Arrays.asList("1A003", "1B001", "1C001", "1D001", "1E001", "1F001", "1K001", "1L001", "1H001", "1M001", "1J001"));
-            List<String> appName = new ArrayList<>(Arrays.asList("太原", "大同", "阳泉", "长治", "晋城", "朔州", "晋中", "临汾", "忻州", "运城", "吕梁"));
-            map.put("xList", appName);
             list = platAssetMapper.getSceneRateX();
-            if (list.isEmpty()){
-                map.put("yList", new ArrayList<>(Arrays.asList(0,0,0,0,0,0,0,0,0,0,0)));
-                return map;
-            }
-            List<BigDecimal> list3 = new ArrayList<>();
-            for (String str : appOrg){
-                BigDecimal t = BigDecimal.valueOf(0);
-                for (LargeLogistics it : list){
-                    if (it.getAppOrg().equals(str)){
-                        t = it.getSceneRate();
-                        break;
-                    }
-                }
-                list3.add(t);
+            for (LargeLogistics it : list){
+                it.setAppName(it.getAppName().substring(6, 8));
             }
-            map.put("yList", list3);
-            return map;
         }
         else {
-            List<String> appOrg = new ArrayList<>(Arrays.asList("1A001", "1A002", "1A003", "1A004", "1A005", "1B001", "1C001", "1D001", "1E001", "1F001", "1K001", "1L001", "1H001", "1M001", "1J001"));
-            List<String> appName = new ArrayList<>(Arrays.asList("国网营销服务中心", "国网超高压变电分公司", "国网电力公司太原供电公司", "国网电力科学技术研究院", "国网山西省电力公司党校", "国网电力公司大同供电公司", "国网电力公司阳泉供电公司", "国网电力公司长治供电公司", "国网电力公司晋城供电公司", "国网电力公司朔州供电公司", "国网电力公司晋中供电公司", "国网电力公司临汾供电公司", "国网电力公司忻州供电公司", "国网电力公司运城供电公司", "国网电力公司吕梁供电公司"));
-            map.put("xList", appName);
             list = platAssetMapper.getSceneRateY();
-            if (list.isEmpty()){
-                map.put("yList", new ArrayList<>(Arrays.asList(0,0,0,0,0,0,0,0,0,0,0)));
-                return map;
+        }
+        for (LargeLogistics it : list){
+            list1.add(it.getAppName());
+            if (it.getSceneRate() == null){
+                list2.add(BigDecimal.valueOf(0));
             }
-            List<BigDecimal> list3 = new ArrayList<>();
-            for (String str : appOrg){
-                BigDecimal t = BigDecimal.valueOf(0);
-                for (LargeLogistics it : list){
-                    if (it.getAppOrg().equals(str)){
-                        t = it.getSceneRate();
-                        break;
-                    }
-                }
-                list3.add(t);
+            else {
+                list2.add(it.getSceneRate());
             }
-            map.put("yList", list3);
-            return map;
         }
+        Map<String, Object> map = new HashMap<>();
+        map.put("xList", list1);
+        map.put("yList", list2);
+        return map;
     }
 
     public LargeLogistics getOperation(String appOrg){
@@ -228,26 +205,20 @@ public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
     }
 
     public Map<String, Object> getInspectionSchemeNumX(){
-        Map<String, Object> map = new HashMap<>();
-        List<String> appOrg = new ArrayList<>(Arrays.asList("1A003", "1B001", "1C001", "1D001", "1E001", "1F001", "1K001", "1L001", "1H001", "1M001", "1J001"));
-        List<String> appName = new ArrayList<>(Arrays.asList("太原", "大同", "阳泉", "长治", "晋城", "朔州", "晋中", "临汾", "忻州", "运城", "吕梁"));
-        map.put("xList", appName);
         List<LargeLogistics> list = platAssetMapper.getInspectionSchemeNumX();
-        if (list.isEmpty()){
-            map.put("yList", new ArrayList<>(Arrays.asList(0,0,0,0,0,0,0,0,0,0,0)));
-            return map;
-        }
+        List<String> list1 = new ArrayList<>();
         List<Long> list2 = new ArrayList<>();
-        for (String str : appOrg){
-            Long t = 0L;
-            for (LargeLogistics it : list){
-                if (it.getAppOrg().equals(str)){
-                    t = it.getInspectionSchemeNum();
-                    break;
-                }
+        for (LargeLogistics it : list){
+            list1.add(it.getAppName().substring(6, 8));
+            if (it.getInspectionSchemeNum() == null){
+                list2.add(0L);
+            }
+            else {
+                list2.add(it.getInspectionSchemeNum());
             }
-            list2.add(t);
         }
+        Map<String, Object> map = new HashMap<>();
+        map.put("xList", list1);
         map.put("yList", list2);
         return map;
     }
@@ -258,7 +229,12 @@ public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
         List<Long> list2 = new ArrayList<>();
         for (LargeLogistics it : list){
             list1.add(it.getAppName());
-            list2.add(it.getInspectionSchemeNum());
+            if (it.getInspectionSchemeNum() == null){
+                list2.add(0L);
+            }
+            else {
+                list2.add(it.getInspectionSchemeNum());
+            }
         }
         Map<String, Object> map = new HashMap<>();
         map.put("xList", list1);

project-zcustom/src/main/resources/mapper/zcustom/logistics/PlatAssetMapper.xml

@@ -5,7 +5,6 @@
 <mapper namespace="com.project.zcustom.mapper.logistics.PlatAssetMapper">
     <resultMap type="com.project.zcustom.domain.addional.LargeLogistics" id="LargePlatLogisticsResult">
         <result property="id"    column="id"    />
-        <result property="appOrg"    column="app_org"    />
         <result property="orgId"    column="app_code"    />
         <result property="appName"    column="app_name"    />
         <result property="parentOrgId"    column="app_parent_code"    />
@@ -272,24 +271,24 @@
 
     <select id="getSceneRateX" resultMap="LargePlatLogisticsResult">
         SELECT
-            b.app_org,
+            app_name,
             scene_rate
         FROM
             large_plat_logistics a
-                LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
+                RIGHT JOIN large_plat_app_org b ON a.app_code = b.app_code
         WHERE
             b.app_parent_org = '10001'
-          AND b.app_org NOT IN ('1','1A001','1A002','1A004','1A005')
+          AND b.app_org NOT IN ('10001','1A001','1A002','1A004','1A005')
         order by b.sort
     </select>
 
     <select id="getSceneRateY" resultMap="LargePlatLogisticsResult">
         SELECT
-            b.app_org,
+            app_name,
             scene_rate
         FROM
             large_plat_logistics a
-                LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
+                RIGHT JOIN large_plat_app_org b ON a.app_code = b.app_code
         WHERE
             b.app_parent_org = '10001' order by b.sort
     </select>
@@ -308,15 +307,14 @@
 
     <select id="getInspectionSchemeNumX" resultMap="LargePlatLogisticsResult">
         SELECT
-            b.app_org,
             app_name,
             inspection_scheme_num
         FROM
             large_plat_logistics a
-                LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
+                RIGHT JOIN large_plat_app_org b ON a.app_code = b.app_code
         WHERE
              b.app_parent_org = '10001'
-            AND b.app_org NOT IN ('1','1A001','1A002','1A004','1A005')
+            AND b.app_org NOT IN ('10001','1A001','1A002','1A004','1A005')
         order by b.sort
     </select>
 
@@ -326,7 +324,7 @@
             inspection_scheme_num
         FROM
             large_plat_logistics a
-                LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
+                RIGHT JOIN large_plat_app_org b ON a.app_code = b.app_code
         WHERE
             b.app_parent_org = '10001' order by b.sort
     </select>