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

spring-cloud/server-basic/src/main/java/com/jd/controller/ProcessPlanController.java

@@ -11,7 +11,9 @@ import com.jd.service.ProcessPlanService;
 import com.jd.service.ProcessService;
 import com.jd.util.Blank;
 import com.jd.util.SendUtil;
+import com.jd.util.VoiceInitUtil;
 import io.swagger.annotations.ApiOperation;
+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;
@@ -33,6 +35,10 @@ public class ProcessPlanController {
     private ProcessPlanService processPlanService;
     @Resource
     private ProcessService processService;
+
+    @Value("${web.file}")
+    private String path;
+
     @PostMapping("/addProcessPlan")
     @ApiOperation(value = "新增")
     public Map<String, Object> addProcessPlan(ProcessPlan processPlan) {
@@ -107,4 +113,11 @@ public class ProcessPlanController {
         ProcessPlan processPlan = processPlanService.getById(planId);
        return SendUtil.send(true, ConstString.RESULT_SUCCESS, processPlan);
     }
+
+    @PostMapping("voiceInit")
+    @ApiOperation(value = "初始化流程音频")
+    public Map<String, Object> voiceInit(Integer planId) {
+        boolean init = VoiceInitUtil.init(planId, path);
+        return SendUtil.send(init);
+    }
 }

spring-cloud/server-page/src/main/resources/static/page/js/basic/processPlanManagement.js

@@ -40,7 +40,7 @@ layui.config({
                 fixed: 'right',
                 title: '操作',
                 toolbar: '#planTable_bar',
-                width: 150
+                width: 250
             }]
         ]
     });
@@ -62,7 +62,7 @@ layui.config({
     //监听行工具事件(主要表格)
     table.on('tool(planTable)', function (obj) {
         var data = obj.data;
-        //console.log(obj)
+        console.log(obj)
         if (obj.event === 'del') {
             layer.confirm('是否确认删除', function (index) {
                 deletePlan(data.id);
@@ -77,6 +77,10 @@ layui.config({
             $('#planInfo')[0].reset();
             // 数据初始化
             initPlan(data.id);
+        } else if (obj.event === 'init') {
+            console.log("即将初始化...")
+            //初始化流程音频
+            voiceInit(data.id)
         }
     });
 
@@ -169,6 +173,30 @@ layui.config({
 
 });
 
+function voiceInit(planId) {
+    index = layer.load(2);
+    ly.ajax({
+        type: 'POST',
+        url: PAGE_BASIC + '/processPlan/voiceInit',
+        dataType: 'json',
+        data: {
+            planId: planId
+        },
+        success: function (json) {
+            if (json.result) {
+                layer.msg("初始化成功");
+            } else {
+                layer.msg("初始化失败");
+            }
+            layer.close(index);
+        },
+        error: function (msg) {
+            layer.close(index);
+            goPage(msg, 1);
+        }
+    });
+}
+
 function addPlan() {
     var postData = form.val('planInfo');
     index = layer.load(2);

spring-cloud/server-page/src/main/resources/static/page/processPlanManager.html

@@ -34,6 +34,7 @@
 					{{# if (sessionStorage.getItem("menuid-" + sessionStorage.MENU_ID + "-delete") == 'delete') { }}
 						<a class="main_tab_btn" lay-event="del" style="color: #FC7D8C;"><span class="iconfont">&#xe78d;</span>删除</a>
 					{{# } }}
+					<a class="main_tab_btn" lay-event="init" style="color: #64ADF9;"><span class="layui-icon">&#xe614;</span>初始化</a>
 				</script>
 
 				<div class="search_box">