合并冲突

portal-manager-ui/admin/src/views/home/home.vue

@@ -196,7 +196,7 @@ export default {
   position: absolute;
   top: 0px;
   left: 0px;
-  z-index: 100;
+  z-index: 99;
   .logo {
     width: 40px;
   }

portal-manager-ui/admin/src/views/thePlatformIsSet/index.css

+* {
+  margin: 0;
+  padding: 0;
+}
+* {
+  margin: 0;
+  padding: 0;
+}
+
+:root {
+  --base-font-size: 0.0625rem;
+}
+
+@media screen and (max-width: 1440px) {
+  :root {
+    --base-font-size: 0.069vw;
+  }
+}
+
+html {
+  font-size: var(--base-font-size);
+}
+
+body::-webkit-scrollbar {
+  display: none;
+}
+
+.effect-content {
+  /* height: 200vh;
+  min-height: 1864rem; */
+  overflow-y: hidden;
+}
+
+.effect-box {
+  position: sticky;
+  top: 0;
+  /* height: 100vh; */
+  min-height: 932rem;
+  background-color: #031233;
+  perspective: 800px;
+  overflow: hidden;
+}
+
+.e-square {
+  position: absolute;
+  transform-origin: 50% 50%;
+  border-radius: 10%;
+}
+
+.e-logo {
+  position: absolute;
+  transform-origin: 50% 50%;
+  border-radius: 10rem;
+}
+
+.e-icon-box {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform-origin: 50% 50%;
+  width: 1200rem;
+  height: 500rem;
+  transform: translate(-50%, -100rem);
+  display: grid;
+  grid-template-columns: repeat(7, 120rem);
+  grid-gap: 80rem 30rem;
+  grid-auto-rows: 120rem;
+
+  justify-content: center;
+  align-content: center;
+
+  z-index: 10;
+}
+
+.e-icon-box-bg {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(5, 30, 75, 0.66);
+}
+
+.e-icon {
+  position: relative;
+  background-color: #0089ff;
+  border-radius: 10rem;
+}
+.title {
+  position: absolute;
+  width: 100%;
+  height: 64px;
+  font-size: 53px;
+  font-family: FZZhengHeiS-EB-GB;
+  font-weight: 600;
+  color: #ffffff;
+  line-height: 64px;
+  text-align: center;
+}
+.desc {
+  position: absolute;
+  width: 100%;
+  height: 34px;
+  font-size: 22px;
+  font-family: Source Han Sans CN;
+  color: #ffffff;
+  line-height: 34px;
+  text-align: center;
+}

portal-manager/src/main/java/com/mortals/xhx/module/model/ModelController.java

@@ -171,12 +171,12 @@ public class ModelController extends BaseJsonBodyController {
         jcMap.put("list",groupMap.get(ModelTypeEnum.JC.getValue()));
         mapList.add(jcMap);
         Map<String,Object> g2gMap = new HashMap<>();
-        jcMap.put("type",ModelTypeEnum.G2G.getDesc());
-        jcMap.put("list",groupMap.get(ModelTypeEnum.G2G.getValue()));
+        g2gMap.put("type",ModelTypeEnum.G2G.getDesc());
+        g2gMap.put("list",groupMap.get(ModelTypeEnum.G2G.getValue()));
         mapList.add(g2gMap);
         Map<String,Object> g2cMap = new HashMap<>();
-        jcMap.put("type",ModelTypeEnum.G2C.getDesc());
-        jcMap.put("list",groupMap.get(ModelTypeEnum.G2C.getValue()));
+        g2cMap.put("type",ModelTypeEnum.G2C.getDesc());
+        g2cMap.put("list",groupMap.get(ModelTypeEnum.G2C.getValue()));
         mapList.add(g2cMap);
         return mapList;
     }

portal-manager/src/main/java/com/mortals/xhx/module/page/model/vo/PageInfoVo.java

@@ -8,13 +8,4 @@ import com.mortals.framework.model.BaseEntityLong;
 */
 public class PageInfoVo extends BaseEntityLong {
 
-    private Long platformId;
-
-    public Long getPlatformId() {
-        return platformId;
-    }
-
-    public void setPlatformId(Long platformId) {
-        this.platformId = platformId;
-    }
 }
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/page/web/PageInfoController.java

@@ -6,6 +6,7 @@ import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.common.pdu.RespData;
 import com.mortals.xhx.common.pdu.product.ProductPdu;
 import com.mortals.xhx.feign.product.IProductFeign;
 import com.mortals.xhx.module.page.model.PageInfoEntity;
@@ -58,12 +59,30 @@ public class PageInfoController extends BaseCRUDJsonBodyMappingController<PageIn
 
         int code=1;
         try {
-            List<PageInfoEntity> result = service.getProductList();
-            for(PageInfoEntity item:result){
-                item.setPlatformId(item.getProductId());
+            List<PageInfoEntity> list = service.getProductList();
+            Map<Long,Long> productMap = new HashMap<>();
+            for(PageInfoEntity infoEntity:list){
+                productMap.put(infoEntity.getProductId(),infoEntity.getProductId());
             }
-            model.put("data", result);
+//
+//            model.put("data", result);
+//            model.put("message_info", busiDesc + "成功");
+            Rest<RespData<List<ProductPdu>>> result = productFeign.list(query);
+            code = result.getCode();
+            if(code > 0) {
+                List<ProductPdu> pduList = new ArrayList<>();
+                for(ProductPdu pdu:result.getData().getData()){
+                    if(productMap.containsKey(pdu.getId())){
+                        pduList.add(pdu);
+                    }
+                }
+                model.put("data", pduList);
+//                model.put("pageInfo", result.getData().getPageInfo());
+                model.put("dict", result.getData().getDict());
                 model.put("message_info", busiDesc + "成功");
+            }else {
+                model.put("message_info", result.getMsg());
+            }
             this.recordSysLog(this.request, busiDesc + " 【成功】");
         } catch (Exception var9) {
             code = -1;

portal-manager/src/main/java/com/mortals/xhx/module/user/web/UserModelCollectController.java

 package com.mortals.xhx.module.user.web;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.annotation.RepeatSubmit;
 import com.mortals.framework.exception.AppException;
@@ -14,6 +15,7 @@ import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.pdu.ModelPdu;
 import com.mortals.xhx.feign.model.IApiModelFeign;
+import com.mortals.xhx.feign.model.vo.ModelFeignVO;
 import com.mortals.xhx.feign.rsp.ApiResp;
 import com.mortals.xhx.module.user.model.UserModelCollectEntity;
 import com.mortals.xhx.module.user.service.UserModelCollectService;
@@ -81,9 +83,22 @@ public class UserModelCollectController extends BaseCRUDJsonBodyMappingControlle
                     if (apiResp.getCode() != YesNoEnum.YES.getValue()) {
                         throw new AppException("获取站点列表信息失败：" + apiResp.getMsg());
                     }
+                    try {
+                        List<ModelFeignVO> modelFeignVOList = JSONArray.parseArray(JSONObject.toJSONString(apiResp.getData().get("data")), ModelFeignVO.class);
+                        Map<Long,ModelFeignVO> map = new HashMap<>();
+                        for (ModelFeignVO vo:modelFeignVOList){
+                            map.put(vo.getId(),vo);
+                        }
+                        List<ModelFeignVO> result = new ArrayList<>();
+                        for(Long id:idList){
+                            result.add(map.get(id));
+                        }
+                        model.put("data", result);
+                    }catch (Exception e){
                         model.put("data", apiResp.getData().get("data"));
                     }
                 }
+            }
             model.put("message_info", busiDesc + "成功");
             if (!ObjectUtils.isEmpty(context) && !ObjectUtils.isEmpty(context.getUser())) {
                 this.recordSysLog(this.request, busiDesc + " 【成功】");