Merge branch 'master' of http://116.63.33.55/git/dt2

cms/src/main/java/com/jd/cms/controller/FileController.java

@@ -36,4 +36,13 @@ public class FileController {
     public Map<String, Object> getNotices() {
         return fileService.selectNotices();
     }
+
+    /**
+     * 获取轻应用文件
+     * @return
+     */
+    @GetMapping("getQYYFiles")
+    public Map<String, Object> getQYYFiles(Integer current, Integer size) {
+        return fileService.getQYYFiles(current, size);
+    }
 }

cms/src/main/java/com/jd/cms/service/FileService.java

@@ -21,4 +21,12 @@ public interface FileService {
      * @return
      */
     Map<String, Object> selectNotices();
+
+    /**
+     * 获取轻应用文件库
+     * @param current
+     * @param size
+     * @return
+     */
+    Map<String, Object> getQYYFiles(Integer current, Integer size);
 }

cms/src/main/java/com/jd/cms/service/impl/FileServiceImpl.java

@@ -1,5 +1,9 @@
 package com.jd.cms.service.impl;
 
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.jd.cms.base.Constants;
 import com.jd.cms.mapper.FileMapper;
 import com.jd.cms.service.FileService;
@@ -24,6 +28,22 @@ public class FileServiceImpl implements FileService {
     private FileMapper fileMapper;
 
     @Override
+    public Map<String, Object> getQYYFiles(Integer current, Integer size) {
+        //调用http请求
+        String url = "http://172.16.100.101:9876/sms/getQYYFiles";
+        Map<String, Object> param = new HashMap<>();
+        param.put("current", current);
+        param.put("size", size);
+        String body = HttpRequest.get(url).form(param).execute().body();
+        if (StrUtil.isNotBlank(body)) {
+            JSONObject jsonObject = JSON.parseObject(body);
+            JSONObject data = jsonObject.getJSONObject("data");
+            return SendUtil.send(true, Constants.code200, data);
+        }
+        return SendUtil.send(false);
+    }
+
+    @Override
     public Map<String, Object> selectNotices() {
         // 通知公告获取
         // 获取通知公告栏目id

cms/src/main/resources/static/ftl/fzzd/dhl/hdgn/wjll.ftl

@@ -329,7 +329,7 @@
         } else if (iden === "lswj") {
             // 加载临时文件库
             $(".file_list").load("/${data.websiteInfo.rootPath }/dhl/hdgn/wjll/lswj/list.html");
-        } else if (iden === "qyy") {
+        } else if (iden === "qyywj") {
             // 请求轻应用文件获取接口
             getFileListForQYY()
             // 加载轻应用文件库
@@ -342,16 +342,15 @@
     function getFileListForQYY() {
         $.ajax({
             type: 'get',
-            url: QYYFILE_PATH + 'base/api/upload/record/list',
+            url: HOME_PATH + 'cms/files/getQYYFiles',
             dataType: 'json',
             data: {
                 current: 1,
                 size: 10000,
             },
             success: function (res) {
-                if (res.code == 200) {
+                if (res.result) {
                     let data = res.data.records;
-                    console.log(data)
                     var qyyHtml = '';
                     if (data && data.length > 0) {
                         for (let i = 0; i < data.length; i++) {

sms/src/main/java/com/jd/sms/controller/SmsController.java

@@ -1,13 +1,16 @@
 package com.jd.sms.controller;
 
+import cn.hutool.http.HttpRequest;
 import com.jd.sms.util.Blank;
-import com.jd.sms.util.ConstString;
 import com.jd.sms.util.SendUtil;
 import com.jd.sms.util.SmsUtil;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -18,6 +21,20 @@ import java.util.Map;
 @RestController
 @RequestMapping("sms")
 public class SmsController {
+    @Value("${qyy.fileUrl}")
+    String qyyFileUrl;
+    /**
+     * 短信发送接口
+     * @param mobiles
+     * @param ecName
+     * @param apId
+     * @param secretKey
+     * @param sign
+     * @param url
+     * @param content
+     * @param addSerial
+     * @return
+     */
     @PostMapping("sendMessage")
     public Map<String, Object> sendMsg(String mobiles, String ecName, String apId, String secretKey, String sign, String url, String content, String addSerial) {
         // 判断参数
@@ -51,4 +68,23 @@ public class SmsController {
         }
         return SendUtil.send(true, "短信发送失败");
     }
+
+    /**
+     * 获取轻应用文件库列表
+     * @param current
+     * @param size
+     * @return
+     */
+    @GetMapping("getQYYFiles")
+    public String getQYYFiles(Integer current, Integer size) {
+        if (Blank.isEmpty(current, size)) {
+            current = 1;
+            size = 10000;
+        }
+        Map<String, Object> param = new HashMap<>();
+        param.put("current", current);
+        param.put("size", size);
+        String body = HttpRequest.get(qyyFileUrl).form(param).execute().body();
+        return body;
+    }
 }

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test62/test62.css

@@ -84,3 +84,95 @@
   right: 11%;
   top: 15%;
 }
+
+/* svg */
+.svg-item {
+  position: relative;
+  z-index: 66;
+}
+
+svg {
+  width: 1540px;
+  height: 650px;
+}
+
+svg path {
+	stroke: red;
+	fill: none;
+	stroke-width: 5;
+}
+
+.rect {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 10px;
+	height: 10px;
+	background: transparent;
+}
+.rect::after {
+		height: 0px;
+		width: 0px;
+		/* background-color: aqua; */
+		position: absolute;
+		right: 0px;
+		top: -5px;
+		content: "";
+		border-top: 10px solid transparent;
+		border-right: 10px solid aqua;
+		border-bottom: 10px solid transparent;
+		transform: rotate(180deg);
+}
+
+
+.qxRect {
+	offset-path: path("M800 260, L 860 300, L 900 250,L 1000 300");
+	offset-distance: 0%;
+	animation: svg-path-animation 5s ease-in-out 0s infinite normal;
+}
+
+.qxRect2 {
+	offset-path: path("M780 320, L 820 340, L 760 400");
+	offset-distance: 0%;
+	animation: svg-path-animation 5s ease-in-out 0s infinite normal;
+}
+
+.qxRect3 {
+	offset-path: path("M700 240, L 600 280, L 630 305, L 530 350");
+	offset-distance: 0%;
+	animation: svg-path-animation 5s ease-in-out 0s infinite normal;
+}
+
+.qxRect4 {
+	offset-path: path("M700 220, L 660 195, L 740 155");
+	offset-distance: 0%;
+	animation: svg-path-animation 5s ease-in-out 0s infinite normal;
+}
+
+.qxRect5 {
+	offset-path: path("M750 220, L 900 220");
+	offset-distance: 0%;
+	animation: svg-path-animation 5s ease-in-out 0s infinite normal;
+}
+
+.qxRect6 {
+	offset-path: path("M400 260, L 320 220, L 400 190, L 320 140");
+	offset-distance: 0%;
+	animation: svg-path-animation 5s ease-in-out 0s infinite normal;
+}
+
+.qxRect7 {
+	offset-path: path("M280 60, L 600 60, L 630 30, L 900 30, L 930 60, L 1180 60");
+	offset-distance: 0%;
+	animation: svg-path-animation 5s ease-in-out 0s infinite normal;
+}
+
+@keyframes svg-path-animation {
+	from {
+		offset-distance: 0%;
+	}
+
+	to {
+		offset-distance: 100%;
+	}
+}

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test62/test62.html

@@ -3,6 +3,27 @@
     <span class="fit"></span>
     <span class="close"></span>
   </div>
+  <div class="svg-contanier">
+    <div class="svg-item">
+      <svg>
+        <path d="M800 260, L 860 300, L 900 250,L 1000 300" />
+        <path d="M780 320, L 820 340, L 760 400" />
+        <path d="M700 240, L 600 280, L 630 305, L 530 350" />
+        <path d="M700 220, L 660 195, L 740 155" />
+        <path d="M750 220, L 900 220" />
+        <path d="M400 260, L 320 220, L 400 190, L 320 140" />
+        <path d="M280 60, L 600 60, L 630 30, L 900 30, L 930 60, L 1180 60" />
+        <path d="M1120 140, L 1060 190, L 1130 220" />
+      </svg>
+      <div class="rect qxRect"></div>
+      <div class="rect qxRect2"></div>
+      <div class="rect qxRect3"></div>
+      <div class="rect qxRect4"></div>
+      <div class="rect qxRect5"></div>
+      <div class="rect qxRect6"></div>
+      <div class="rect qxRect7"></div>
+    </div>
+  </div>
   <div class="test-box">
     <div class="concent">
 
@@ -18,27 +39,27 @@
         <p>郊区区县</p>
       </div>
       <div class="c-center1">
-        <img src="../images/zybz/组240拷贝.png" alt="" style="width: 1666px" />
+        <img src="../images/zybz/组240拷贝.png" alt="" style="width: 150px" />
         <p style="font-family: '庞门正道标题体'">指挥大厅</p>
       </div>
       <div class="c-center2">
-        <img src="../images/zybz/icon_jifang拷贝3.png" alt="">
+        <img src="../images/zybz/icon_jifang拷贝3.png" alt="" style="width: 100px">
         <p>1号配线间机房</p>
       </div>
       <div class="c-center3">
-        <img src="../images/zybz/icon_jifang拷贝3.png" alt="">
+        <img src="../images/zybz/icon_jifang拷贝3.png" alt="" style="width: 100px">
         <p>城管局UPS主供电房</p>
       </div>
       <div class="c-center4">
-        <img src="../images/zybz/icon_jifang拷贝3.png" alt="">
+        <img src="../images/zybz/icon_jifang拷贝3.png" alt="" style="width: 100px">
         <p>2号楼中心机房</p>
       </div>
       <div class="c-center5">
-        <img src="../images/zybz/icon_jifang拷贝3.png" alt="">
+        <img src="../images/zybz/icon_jifang拷贝3.png" alt="" style="width: 100px">
         <p>档案室库房</p>
       </div>
       <div class="c-center6">
-        <img style="width: 49%;" src="../images/zybz/icon_jifang拷贝3.png" alt="">
+        <img style="width: 49%;" src="../images/zybz/icon_jifang拷贝3.png" alt="" style="width: 100px">
         <p>城管局网络核心机房</p>
       </div>