Explorar el Código

属性列表代码恢复

jichaobo hace 3 años
padre
commit
742e5d8f44

+ 5 - 0
fiveep-controller/src/main/java/com/bizmatics/controller/web/SiteController.java

@@ -124,5 +124,10 @@ public class SiteController {
     public String test(){
         return "这是中文";
     }
+
+    @GetMapping("sitelist")
+    public ApiResult<List<Map<String,Object>>> sitelist(@RequestParam(required = false) String name){
+        return ApiResult.success(siteService.sitelist(name));
+    }
 }
 

+ 3 - 2
fiveep-service/src/main/java/com/bizmatics/service/PlatformAreaService.java

@@ -1,7 +1,7 @@
 package com.bizmatics.service;
 
-import com.bizmatics.model.PlatformArea;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.PlatformArea;
 
 /**
  * <p>
@@ -12,5 +12,6 @@ import com.bizmatics.common.mvc.base.CrudService;
  * @since 2021-09-29
  */
 public interface PlatformAreaService extends CrudService<PlatformArea> {
-
+    void platformAreaAdd(PlatformArea platformArea);
+    void platformAreaUpdate(PlatformArea platformArea);
 }

+ 7 - 0
fiveep-service/src/main/java/com/bizmatics/service/SiteService.java

@@ -75,5 +75,12 @@ public interface SiteService extends CrudService<Site> {
 
     void siteUpdate(@Param("id") SiteVOT siteVOT);
     void sitedel(@Param("id") String id);
+
+    /**
+     * 查看站点列表
+     * @param name
+     * @return
+     */
+    List<Map<String, Object>> sitelist(String name);
 }
 

+ 14 - 0
fiveep-service/src/main/java/com/bizmatics/service/impl/PlatformAreaServiceImpl.java

@@ -17,4 +17,18 @@ import org.springframework.stereotype.Service;
 @Service
 public class PlatformAreaServiceImpl extends AbstractCrudService<PlatformAreaMapper, PlatformArea> implements PlatformAreaService {
 
+    @Override
+    public void platformAreaAdd(PlatformArea platformArea){
+        platformArea.setEnable(1);
+        this.save(platformArea);
+    }
+
+    @Override
+    public void platformAreaUpdate(PlatformArea platformArea){
+        this.updateById(platformArea);
+    }
+
+    public void platformAreaList(){
+
+    }
 }

+ 53 - 0
fiveep-service/src/main/java/com/bizmatics/service/impl/SiteServiceImpl.java

@@ -184,4 +184,57 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
         SiteList1.setEnable(0);
         this.updateById(SiteList1);
     }
+
+    @Override
+    public List<Map<String, Object>> sitelist(String name) {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        Integer userId = SecurityUtils.getLoginUser().getUser().getUserId().intValue();
+        List<Map<String, Object>> list = new ArrayList<>();
+        List<SiteList> site_list = null;
+        List<GroupingList> grouping_list = null;
+        List<SiteList> site_grouping_list = null;
+        grouping_list = baseMapper.GroupingList(name,user.getUserName());
+        site_list = baseMapper.Sitelist(userId, name);
+        site_grouping_list = baseMapper.SiteGroupinglist(userId, name);
+        List<Map<String, Object>> list1 = new ArrayList<>();
+        if (grouping_list.size() > 0) {
+            for (int i = 0; i < grouping_list.size(); i++) {
+                GroupingList grouping_list_one = (GroupingList) grouping_list.get(i);
+                Map<String, Object> map1 = new HashMap<>();
+                List<Map<String, Object>> list2 = new ArrayList<>();
+                map1.put("id", grouping_list_one.getId());
+                map1.put("grouping_id", grouping_list_one.getId());
+                map1.put("grouping_name", grouping_list_one.getGroupingName());
+                if (site_list.size() > 0) {
+                    for (int j = 0; j < site_list.size(); j++) {
+                        SiteList site_list_one = (SiteList) site_list.get(j);
+                        Map<String, Object> map2 = new HashMap<>();
+                        if (grouping_list_one.getId().equals(site_list_one.getGroupingId())) {
+                            map2.put("site_id", site_list_one.getId());
+                            map2.put("site_name", site_list_one.getSiteName());
+//                        map2.put("grouping_id",site_list_one.getGroupingId());
+                            list2.add(map2);
+                        }
+                    }
+                    map1.put("site_list", list2);
+                }else {
+                    map1.put("site_list", list2);
+                }
+                list1.add(map1);
+            }
+        }
+        if (site_grouping_list.size() > 0) {
+            List<Map<String, Object>> list3 = new ArrayList<>();
+            for (int i = 0; i < site_grouping_list.size(); i++) {
+                SiteList site_grouping_list_one = (SiteList) site_grouping_list.get(i);
+                Map<String, Object> map3 = new HashMap<>();
+                map3.put("id", site_grouping_list_one.getId());
+                map3.put("grouping_id", 0);
+                map3.put("grouping_name", site_grouping_list_one.getSiteName());
+                map3.put("site_list", list3);
+                list1.add(map3);
+            }
+        }
+        return list1;
+    }
 }